diff --git a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
index 3801d5de860fb0b621d7f304738c6a70db38711f..85ad686f660887dbed5c33c1a8f8fbe9a4f1f3b1 100644
--- a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
+++ b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
@@ -16,7 +16,6 @@
#include <cassert>
-#include "StoreGate/StoreGate.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/SGtests.h"
#include "AthenaKernel/ILockable.h"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventNoSplit.ref b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventNoSplit.ref
index 731751c56a693b9b44a95349a84aea1363f4e47e..dd7afcab0b7161b026feb15dd904852864e1223e 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventNoSplit.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventNoSplit.ref
@@ -1,5 +1,6 @@
Py:Athena INFO including file "AthenaPoolMultiTest/ExampleStreamConfig.py"
PoolSvc INFO Setting up APR FileCatalog and Streams
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
Splitter1 DEBUG Property update for OutputLevel : new value = 2
Splitter1 INFO in initialize()
Splitter1 DEBUG input handles: 3
@@ -13,28 +14,27 @@ Splitter3 DEBUG output handles: 0
Splitter3 DEBUG Data Deps for Splitter3
Triggered INFO in initialize()
DecisionSvc INFO Inserting stream: Stream2 with no Algs
-OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
Stream2.Stream2... INFO Initializing Stream2.Stream2Tool - package version AthenaServices-00-00-00
Stream2.Stream2... INFO Initializing Stream2.Stream2_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo'])
+Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream2_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream2'])
Stream2 INFO Data output: AthenaPoolMultiTest_NoSplit2.root
Stream2 INFO I/O reinitialization...
DecisionSvc INFO Inserting stream: Stream1 with no Algs
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: AthenaPoolMultiTest_NoSplit1.root
Stream1 INFO I/O reinitialization...
DecisionSvc INFO Inserting stream: Stream3 with no Algs
Stream3.Stream3... INFO Initializing Stream3.Stream3Tool - package version AthenaServices-00-00-00
Stream3.Stream3... INFO Initializing Stream3.Stream3_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream3 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream3_MakeEventStreamInfo'])
+Stream3 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream3_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream3_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream3'])
Stream3 INFO Data output: AthenaPoolMultiTest_NoSplit3.root
Stream3 INFO I/O reinitialization...
DecisionSvc INFO Inserting stream: StreamAll with no Algs
StreamAll.Strea... INFO Initializing StreamAll.StreamAllTool - package version AthenaServices-00-00-00
StreamAll.Strea... INFO Initializing StreamAll.StreamAll_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-StreamAll INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/StreamAll_MakeEventStreamInfo'])
+StreamAll INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/StreamAll_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/StreamAll_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_StreamAll'])
StreamAll INFO Data output: AthenaPoolMultiTest_StreamAll.root
StreamAll INFO I/O reinitialization...
Splitter1 DEBUG in execute()
@@ -50,7 +50,7 @@ Splitter3 INFO L1 failed
Triggered INFO EventInfo event: 0 run: 0
Triggered INFO L1 passed
Domain[ROOT_All] INFO AthenaPoolMultiTest_StreamAll.root
-RootDatabase.open INFO AthenaPoolMultiTest_StreamAll.root File version:61800
+RootDatabase.open INFO AthenaPoolMultiTest_StreamAll.root File version:62200
Splitter1 DEBUG in execute()
Splitter1 INFO EventInfo event: 1 run: 0
Splitter1 DEBUG Trigmask = 2
@@ -285,5 +285,6 @@ Splitter1 INFO in finalize()
Splitter2 INFO in finalize()
Splitter3 INFO in finalize()
Triggered INFO in finalize()
-ItemListSvc DEBUG STREAM StreamAll has (7) items
+ItemListSvc DEBUG STREAM StreamAll has (8) items
ItemListSvc DEBUG - EventStreamInfo_StreamAll
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatStreamAll
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref
index 8444568729a3c331e9ec1046babec069e87e0037..086dfc875ed39e776ede6f73ed0715568e069fdd 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref
@@ -1,5 +1,6 @@
Py:Athena INFO including file "AthenaPoolMultiTest/ExampleStreamConfig.py"
PoolSvc INFO Setting up APR FileCatalog and Streams
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
Splitter1 DEBUG Property update for OutputLevel : new value = 2
Splitter1 INFO in initialize()
Splitter1 DEBUG input handles: 3
@@ -13,34 +14,33 @@ Splitter3 DEBUG output handles: 0
Splitter3 DEBUG Data Deps for Splitter3
Triggered INFO in initialize()
DecisionSvc INFO Inserting stream: Stream2 with no Algs
-OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
Stream2.Stream2... INFO Initializing Stream2.Stream2Tool - package version AthenaServices-00-00-00
Stream2.Stream2... INFO Initializing Stream2.Stream2_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo'])
+Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream2_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream2'])
Stream2 INFO Data output: AthenaPoolMultiTest_Split2.root
Stream2 INFO I/O reinitialization...
DecisionSvc INFO Inserting stream: Stream1 with no Algs
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: AthenaPoolMultiTest_Split1.root
Stream1 INFO I/O reinitialization...
DecisionSvc INFO Inserting stream: Stream3 with no Algs
Stream3.Stream3... INFO Initializing Stream3.Stream3Tool - package version AthenaServices-00-00-00
Stream3.Stream3... INFO Initializing Stream3.Stream3_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream3 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream3_MakeEventStreamInfo'])
+Stream3 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream3_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream3_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream3'])
Stream3 INFO Data output: AthenaPoolMultiTest_Split3.root
Stream3 INFO I/O reinitialization...
DecisionSvc INFO Inserting stream: Others with no Algs
Others.OthersTool INFO Initializing Others.OthersTool - package version AthenaServices-00-00-00
Others.Others_M... INFO Initializing Others.Others_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Others INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Others_MakeEventStreamInfo'])
+Others INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Others_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Others_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Others'])
Others INFO Data output: AthenaPoolMultiTest_Missed.root
Others INFO I/O reinitialization...
DecisionSvc INFO Inserting stream: Bad with no Algs
Bad.BadTool INFO Initializing Bad.BadTool - package version AthenaServices-00-00-00
Bad.Bad_MakeEve... INFO Initializing Bad.Bad_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Bad INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Bad_MakeEventStreamInfo'])
+Bad INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Bad_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Bad_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Bad'])
Bad INFO Data output: AthenaPoolMultiTest_Missed.root
Bad INFO I/O reinitialization...
Splitter1 DEBUG in execute()
@@ -293,25 +293,30 @@ Splitter1 INFO in finalize()
Splitter2 INFO in finalize()
Splitter3 INFO in finalize()
Triggered INFO in finalize()
-ItemListSvc DEBUG STREAM Bad has (1) items
+ItemListSvc DEBUG STREAM Bad has (2) items
ItemListSvc DEBUG - EventStreamInfo_Bad
-ItemListSvc DEBUG STREAM Others has (6) items
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatBad
+ItemListSvc DEBUG STREAM Others has (7) items
ItemListSvc DEBUG - EventStreamInfo_Others
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatOthers
ItemListSvc DEBUG --> Overlap with Stream1 (5) items
ItemListSvc DEBUG --> Overlap with Stream2 (5) items
ItemListSvc DEBUG --> Overlap with Stream3 (5) items
-ItemListSvc DEBUG STREAM Stream1 has (7) items
+ItemListSvc DEBUG STREAM Stream1 has (8) items
ItemListSvc DEBUG - EventStreamInfo_Stream1
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatStream1
ItemListSvc DEBUG --> Overlap with Others (5) items
ItemListSvc DEBUG --> Overlap with Stream2 (6) items
ItemListSvc DEBUG --> Overlap with Stream3 (6) items
-ItemListSvc DEBUG STREAM Stream2 has (7) items
+ItemListSvc DEBUG STREAM Stream2 has (8) items
ItemListSvc DEBUG - EventStreamInfo_Stream2
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatStream2
ItemListSvc DEBUG --> Overlap with Others (5) items
ItemListSvc DEBUG --> Overlap with Stream1 (6) items
ItemListSvc DEBUG --> Overlap with Stream3 (6) items
-ItemListSvc DEBUG STREAM Stream3 has (7) items
+ItemListSvc DEBUG STREAM Stream3 has (8) items
ItemListSvc DEBUG - EventStreamInfo_Stream3
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatStream3
ItemListSvc DEBUG --> Overlap with Others (5) items
ItemListSvc DEBUG --> Overlap with Stream1 (6) items
ItemListSvc DEBUG --> Overlap with Stream2 (6) items
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplitDecision.ref b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplitDecision.ref
index 74c966d9e96f5cc80e5b0ad6b0bb31b932874751..85271ed7e576a61d2c08d5d32f6cf73b408e2fe7 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplitDecision.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestEventSplitDecision.ref
@@ -1,5 +1,6 @@
Py:Athena INFO including file "AthenaPoolMultiTest/ExampleStreamConfig.py"
PoolSvc INFO Setting up APR FileCatalog and Streams
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
Splitter1 DEBUG Property update for OutputLevel : new value = 2
Splitter1 INFO in initialize()
Splitter1 DEBUG input handles: 3
@@ -15,10 +16,9 @@ DecisionSvc INFO Inserting stream: Stream1 with no Algs
DecisionSvc INFO Inserting stream: Stream2 with no Algs
DecisionSvc INFO Inserting stream: Stream3 with no Algs
DecisionSvc INFO Inserting stream: StreamAll2 with no Algs
-OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
StreamAll2.Stre... INFO Initializing StreamAll2.StreamAll2Tool - package version AthenaServices-00-00-00
StreamAll2.Stre... INFO Initializing StreamAll2.StreamAll2_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-StreamAll2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/StreamAll2_MakeEventStreamInfo'])
+StreamAll2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/StreamAll2_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/StreamAll2_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_StreamAll2'])
StreamAll2 INFO Data output: AthenaPoolMultiTest_StreamAll2.root
StreamAll2 INFO I/O reinitialization...
Splitter1 DEBUG in execute()
@@ -32,7 +32,7 @@ Splitter3 INFO EventInfo event: 0 run: 0
Splitter3 DEBUG Trigmask = 1
Splitter3 INFO L1 failed
Domain[ROOT_All] INFO AthenaPoolMultiTest_StreamAll2.root
-RootDatabase.open INFO AthenaPoolMultiTest_StreamAll2.root File version:61800
+RootDatabase.open INFO AthenaPoolMultiTest_StreamAll2.root File version:62200
Splitter1 DEBUG in execute()
Splitter1 INFO EventInfo event: 1 run: 0
Splitter1 DEBUG Trigmask = 2
@@ -228,5 +228,6 @@ StreamAll2 INFO Metadata records written: 21
Splitter1 INFO in finalize()
Splitter2 INFO in finalize()
Splitter3 INFO in finalize()
-ItemListSvc DEBUG STREAM StreamAll2 has (7) items
+ItemListSvc DEBUG STREAM StreamAll2 has (8) items
ItemListSvc DEBUG - EventStreamInfo_StreamAll2
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatStreamAll2
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestPropagate.ref b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestPropagate.ref
index 1fe945cedc3fe6c5016fdb04257bc2b2f44d6b45..e27bdef3bd017ddc52c67fd6e825e101b9a14639 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestPropagate.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/AthenaPoolMultiTestPropagate.ref
@@ -1,13 +1,14 @@
Py:Athena INFO including file "AthenaPoolMultiTest/ExampleStreamConfig.py"
PoolSvc INFO Setting up APR FileCatalog and Streams
-DecisionSvc INFO Inserting stream: StreamAllP with no Algs
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
+DecisionSvc INFO Inserting stream: StreamAllP with no Algs
StreamAllP.Stre... INFO Initializing StreamAllP.StreamAllPTool - package version AthenaServices-00-00-00
StreamAllP.Stre... INFO Initializing StreamAllP.StreamAllP_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-StreamAllP INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/StreamAllP_MakeEventStreamInfo'])
+StreamAllP INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/StreamAllP_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/StreamAllP_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_StreamAllP'])
StreamAllP INFO Data output: AthenaPoolMultiTest_Propagate.root
StreamAllP INFO I/O reinitialization...
StorageSvc INFO EventStreamInfo_p3 [11DF1B8C-0DEE-4687-80D7-E74B520ACBB4]
StreamAllP INFO Metadata records written: 21
-ItemListSvc DEBUG STREAM StreamAllP has (7) items
+ItemListSvc DEBUG STREAM StreamAllP has (8) items
ItemListSvc DEBUG - EventStreamInfo_StreamAllP
+ItemListSvc DEBUG - xAOD::EventFormat_EventFormatStreamAllP
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/SplittableData_jo.py b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/SplittableData_jo.py
index bc1881cdfd38eb405552e70f64b2563ddedd4983..f2c5c32905b998aa54579914f1565c678d4c2610 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/SplittableData_jo.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/share/SplittableData_jo.py
@@ -72,8 +72,6 @@ topSequence += AddTrigMap
#topSequence += TagEventTagWriter
topSequence += DummyLumirangeTool
-theApp.CreateSvc += ['xAODMaker::EventFormatSvc']
-
from AthenaPoolExampleAlgorithms.AthenaPoolExampleAlgorithmsConf import AthPoolEx__WriteData
topSequence += AthPoolEx__WriteData("WriteData")
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx
index 0d1368cc277122c22052c9a889f63a7b37de08fe..d275488a9d300c4c317b98ab2f94029924772120 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "IOVDbTestAlg.h"
@@ -11,7 +11,6 @@
#include "IOVDbTestConditions/IOVDbTestAmdbCorrection.h"
// Athena includes
-#include "StoreGate/StoreGate.h"
#include "AthenaKernel/IAthenaOutputStreamTool.h"
// Gaudi includes
diff --git a/Build/AtlasBuildScripts/gitlab_merge.sh b/Build/AtlasBuildScripts/gitlab_merge.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8b4e9df26e1e5a3029caf0422b66369703bded69
--- /dev/null
+++ b/Build/AtlasBuildScripts/gitlab_merge.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# Script to merge a set of MRs with given labels into the local branch.
+#
+
+# Defaults
+branch='master'
+remote='origin'
+
+usage() {
+ cat <<EOF
+Usage: gitlab_merge.sh -l labels [-b branch] [-r remote] [-p project]
+Fetch and merge MRs with the given labels into current local git branch.
+
+ -l labels comma separate list of labels
+ -b branch GitLab target branch of MRs [${branch}]
+ -r remote name of remote in local repository [${remote}]
+ -p project GitLab project [derived from remote]
+EOF
+}
+
+set -e
+
+while getopts "l:b:r:p:h" opt; do
+ case $opt in
+ l ) labels=$OPTARG;;
+ b ) branch=$OPTARG;;
+ r ) remote=$OPTARG;;
+ p ) project=$OPTARG;;
+ h ) usage; exit;;
+ ? ) exit 1;; # unknown option
+ : ) exit 1;; # missing argument
+ esac
+done
+
+if [ -z "${labels}" ]; then
+ usage
+ exit 1
+fi
+
+# Extract GitLab project name from URL if not given
+if [ -z "${project}" ]; then
+ project=`git remote get-url ${remote} | rev | cut -d '/' -f 1,2 | rev | sed 's#\.git##'`
+fi
+
+# URL encode project name (mostly because of "/")
+project_url=`jq -nr --arg v ${project} '$v|@uri'`
+
+# Get MRs matching label via GitLab API (one page with 100 MRs is enough)
+json=`curl --silent "https://gitlab.cern.ch/api/v4/projects/${project_url}/merge_requests?state=opened&per_page=100&target_branch=${branch}&labels=${labels}"`
+merge_requests=`echo "$json" | jq '.[]|.iid'` || { echo $json; exit 1; }
+
+if [ -z "${merge_requests}" ]; then
+ echo "No MRs matching label '${labels}' for branch '${branch}' in '${project}' found."
+ exit 0
+fi
+
+# Fetch all MRs and merge into current branch
+# Based on https://stackoverflow.com/questions/44992512
+for id in ${merge_requests}; do
+ br="mr-${remote}-${id}"
+ echo "Merging ${project}!${id}"
+ git fetch ${remote} merge-requests/${id}/head:${br}
+ git merge --commit --no-edit ${br}
+ git branch -D ${br} # delete local branch again
+done
diff --git a/Calorimeter/CaloBadChannelTool/CMakeLists.txt b/Calorimeter/CaloBadChannelTool/CMakeLists.txt
index c39f645f516c8da248454da5c954207ce7c06ebb..3e3f350e1a0e6ecfe74c6f4f7d84b97d2f9a679f 100644
--- a/Calorimeter/CaloBadChannelTool/CMakeLists.txt
+++ b/Calorimeter/CaloBadChannelTool/CMakeLists.txt
@@ -1,28 +1,15 @@
-################################################################################
-# Package: CaloBadChannelTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloBadChannelTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- LArCalorimeter/LArRecConditions
- GaudiKernel
- PRIVATE
- Control/StoreGate )
-
# Component(s) in the package:
atlas_add_component( CaloBadChannelTool
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES CaloConditions LArRecConditions CaloIdentifier AthenaBaseComps GaudiKernel StoreGateLib SGtests )
+ LINK_LIBRARIES CaloConditions LArRecConditions CaloIdentifier AthenaBaseComps GaudiKernel StoreGateLib )
# Install files from the package:
-atlas_install_headers( CaloBadChannelTool )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Tests:
diff --git a/Calorimeter/CaloCalibHitRec/CMakeLists.txt b/Calorimeter/CaloCalibHitRec/CMakeLists.txt
index 3342db7af7594ef1b7aa2f8540c08858285f597f..2b0ab6d53ff4cfd35fb082cba86673267672a0ce 100644
--- a/Calorimeter/CaloCalibHitRec/CMakeLists.txt
+++ b/Calorimeter/CaloCalibHitRec/CMakeLists.txt
@@ -1,50 +1,23 @@
-################################################################################
-# Package: CaloCalibHitRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCalibHitRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloDmDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloRec
- Calorimeter/CaloSimEvent
- Control/AthenaBaseComps
- Control/StoreGate
- DetectorDescription/Identifier
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODTruth
- Control/CxxUtils
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- LArCalorimeter/LArRecEvent
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- TileCalorimeter/TileEvent
- Tools/PathResolver )
-
# External dependencies:
find_package( CLHEP )
# Component(s) in the package:
atlas_add_library( CaloCalibHitRecLib
- src/*.cxx
- PUBLIC_HEADERS CaloCalibHitRec
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDmDetDescr CaloGeoHelpers CaloIdentifier CaloRecLib CaloSimEvent AthenaBaseComps StoreGateLib SGtests Identifier xAODCaloEvent xAODTruth GaudiKernel CaloDetDescrLib CaloEvent AthenaKernel AtlasDetDescr LArRecEvent McParticleEvent TileEvent PathResolver CxxUtils )
+ src/*.cxx
+ PUBLIC_HEADERS CaloCalibHitRec
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CaloDmDetDescr CaloGeoHelpers CaloIdentifier CaloRecLib CaloSimEvent CxxUtils GaudiKernel Identifier StoreGateLib xAODCaloEvent xAODTruth
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasDetDescr CaloDetDescrLib CaloEvent CaloUtilsLib LArRecEvent McParticleEvent PathResolver TileEvent )
# Component(s) in the package:
atlas_add_component( CaloCalibHitRec
- src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDmDetDescr CaloGeoHelpers CaloIdentifier CaloRecLib CaloSimEvent AthenaBaseComps StoreGateLib SGtests Identifier xAODCaloEvent xAODTruth GaudiKernel CaloDetDescrLib CaloEvent AthenaKernel AtlasDetDescr LArRecEvent McParticleEvent TileEvent PathResolver CxxUtils )
+ LINK_LIBRARIES CaloCalibHitRecLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloCellCorrection/CMakeLists.txt b/Calorimeter/CaloCellCorrection/CMakeLists.txt
index dc5e7573e31a2b4361bbaf44c5b7943915a2b0a9..c809277d207f5921914e196402b822651a2758d6 100644
--- a/Calorimeter/CaloCellCorrection/CMakeLists.txt
+++ b/Calorimeter/CaloCellCorrection/CMakeLists.txt
@@ -1,26 +1,8 @@
-################################################################################
-# Package: CaloCellCorrection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCellCorrection )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Calorimeter/CaloUtils
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- DetectorDescription/Identifier )
-
# External dependencies:
find_package( CLHEP )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -30,7 +12,7 @@ atlas_add_component( CaloCellCorrection
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} CaloCondBlobObjs CaloIdentifier CaloUtilsLib AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CaloDetDescrLib CaloEvent Identifier )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CaloCondBlobObjs CaloConditions CaloDetDescrLib CaloEvent CaloIdentifier CaloInterfaceLib CaloUtilsLib GaudiKernel Identifier StoreGateLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloClusterCorrection/CMakeLists.txt b/Calorimeter/CaloClusterCorrection/CMakeLists.txt
index 0503a4e6690d5a2a651e4f8979f3586838b790c3..c25ec3234ed0c210110e573d5d757c5802a77c67 100644
--- a/Calorimeter/CaloClusterCorrection/CMakeLists.txt
+++ b/Calorimeter/CaloClusterCorrection/CMakeLists.txt
@@ -1,40 +1,10 @@
-################################################################################
-# Package: CaloClusterCorrection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloClusterCorrection )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloConditions
- TileCalorimeter/TileConditions
- LArCalorimeter/LArRecConditions
- Calorimeter/CaloEvent
- Calorimeter/CaloInterface
- Calorimeter/CaloRec
- Control/AthenaKernel
- Control/CxxUtils
- Control/StoreGate
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaBaseComps
- Database/AthenaPOOL/AthenaPoolUtilities
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloUtils
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloIdentifier
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArCabling
- Control/AthContainers
- DetectorDescription/Identifier
- Event/EventKernel
- Tools/PathResolver )
-
# External dependencies:
+find_package( Boost )
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -44,19 +14,19 @@ atlas_add_library( CaloClusterCorrectionLib
PUBLIC_HEADERS CaloClusterCorrection
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES CaloCondBlobObjs CaloConditions CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel CxxUtils AthenaPoolUtilities xAODCaloEvent GaudiKernel LArIdentifier LArRecConditions TileConditionsLib CaloRecLib StoreGateLib SGtests LArToolsLib CaloDetDescrLib CaloUtilsLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TestTools CaloGeoHelpers Identifier EventKernel PathResolver )
+ LINK_LIBRARIES AthenaKernel CaloConditions CaloEvent CaloInterfaceLib CaloRecLib CaloUtilsLib CxxUtils GaudiKernel StoreGateLib TileConditionsLib xAODCaloEvent
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps CaloDetDescrLib CaloGeoHelpers CaloIdentifier LArRecConditions PathResolver )
atlas_add_component( CaloClusterCorrection
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES CaloClusterCorrectionLib )
+# Test(s) in the package:
atlas_add_test( interpolate_test
SOURCES
test/interpolate_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloCondBlobObjs CaloConditions CaloEvent CaloIdentifier CaloRecLib AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests AthenaPoolUtilities xAODCaloEvent GaudiKernel LArIdentifier LArToolsLib TestTools CaloDetDescrLib CaloGeoHelpers CaloUtilsLib Identifier EventKernel PathResolver CaloClusterCorrectionLib )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} CaloClusterCorrectionLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloClusterCorrection/src/CaloClusterLogPos.cxx b/Calorimeter/CaloClusterCorrection/src/CaloClusterLogPos.cxx
index 035deb219b6ed3803679b1766ed33dafddd5cfc2..81159bacf912d2ff6e0d9c8fdd979d96cc6f6edd 100644
--- a/Calorimeter/CaloClusterCorrection/src/CaloClusterLogPos.cxx
+++ b/Calorimeter/CaloClusterCorrection/src/CaloClusterLogPos.cxx
@@ -8,7 +8,6 @@
#include "CaloIdentifier/CaloCell_ID.h"
#include "GaudiKernel/MsgStream.h"
#include <CLHEP/Units/SystemOfUnits.h>
-#include "StoreGate/StoreGate.h"
using CLHEP::deg;
diff --git a/Calorimeter/CaloClusterCorrection/src/CaloSwTransitionRegionsCorr.cxx b/Calorimeter/CaloClusterCorrection/src/CaloSwTransitionRegionsCorr.cxx
index 28321b8e202f5c5768acf2db7f955e50426ede01..7a304c60bfa357993528870205f71e7807007b3d 100755
--- a/Calorimeter/CaloClusterCorrection/src/CaloSwTransitionRegionsCorr.cxx
+++ b/Calorimeter/CaloClusterCorrection/src/CaloSwTransitionRegionsCorr.cxx
@@ -20,7 +20,6 @@ PURPOSE: Effective corrections for transition regions like eta=0
#include "CaloSwTransitionRegionsCorr.h"
#include "GaudiKernel/StatusCode.h"
-#include "StoreGate/StoreGate.h"
#include "GaudiKernel/MsgStream.h"
#include <iostream>
diff --git a/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt b/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
index 9998079e5a23adfe63f21c9e25c4bdf5a6f27c9e..b95ae7934287f63f851c203071163f50949ce47a 100644
--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
@@ -1,26 +1,14 @@
-################################################################################
-# Package: CaloCondAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Calorimeter/CaloConditions
- Calorimeter/CaloTriggerTool
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# Component(s) in the package:
atlas_add_poolcnv_library( CaloCondAthenaPoolPoolCnv
src/*.cxx
FILES CaloTriggerTool/LArTTCellMap.h CaloTriggerTool/CaloTTOnOffIdMap.h CaloTriggerTool/CaloTTOnAttrIdMap.h CaloTriggerTool/CaloTTPpmRxIdMap.h CaloConditions/ToolConstants.h CaloConditions/CaloCellFactor.h CaloConditions/CaloCellPositionShift.h CaloConditions/CaloHadWeight.h CaloConditions/CaloEMFrac.h CaloConditions/CaloHadDMCoeff.h CaloConditions/CaloHadDMCoeff2.h CaloConditions/CaloLocalHadCoeff.h
TYPES_WITH_NAMESPACE CaloRec::ToolConstants CaloRec::CaloCellFactor CaloRec::CaloCellPositionShift
- LINK_LIBRARIES AthenaPoolUtilities CaloConditions CaloTriggerToolLib AthenaKernel StoreGateLib SGtests AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES CaloConditions CaloTriggerToolLib AthenaKernel GaudiKernel AthenaPoolCnvSvcLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..a82f9d0d88c1edae5c1dc88b59d323eb10bad53f
--- /dev/null
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
index 71802d794d10d78b1529b1256fce62d8c050cd0b..74b59f777ab5fe90993fa4324c7ce6a706c0722c 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
@@ -8,7 +8,7 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloDetDescr/CaloDetectorElements.h"
@@ -54,34 +54,40 @@ StatusCode CaloMgrDetDescrCnv::initialize()
MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "in initialize" << endmsg;
- if (sc.isFailure())
+ if (sc.isFailure())
{
log << MSG::ERROR << "DetDescrConverter::initialize failed" << endmsg;
return sc;
}
-
- return StatusCode::SUCCESS;
+
+ return StatusCode::SUCCESS;
}
StatusCode CaloMgrDetDescrCnv::finalize()
{
MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << "in finalize" << endmsg;
-
- return StatusCode::SUCCESS;
+
+ return StatusCode::SUCCESS;
}
-StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
+StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
{
// Ensure that this object is created inside the event loop
- auto ctx = Gaudi::Hive::currentContext();
- MsgStream log( msgSvc(), "CaloMgrDetDescrCnv" );
- if ( !ctx.valid() ) {
- log << MSG::WARNING << "Attempting to create a Calo Detector Manager object outside of the event loop. Geometry may not be aligned." << endmsg;
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
+ if (!ctx.valid()) {
+ log << MSG::WARNING
+ << "Attempting to create a Calo Detector Manager object outside of the "
+ "event loop. Geometry may not be aligned."
+ << endmsg;
}
- log << MSG::INFO << "in createObj: creating a Calo Detector Manager object in the detector store" << endmsg;
+ log << MSG::INFO
+ << "in createObj: creating a Calo Detector Manager object in the "
+ "detector store"
+ << endmsg;
- bool debug = log.level()<=MSG::DEBUG;
+ bool debug = log.level()<=MSG::DEBUG;
DetDescrAddress* ddAddr;
ddAddr = dynamic_cast<DetDescrAddress*> (pAddr);
@@ -102,7 +108,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// --- --- Get CaloCell_ID and CaloIdManager helpers --- ---
StoreGateSvc * detStore;
StatusCode status = serviceLocator()->service("DetectorStore", detStore);
- if (status.isFailure())
+ if (status.isFailure())
{
log << MSG::FATAL << "DetectorStore service not found !" << endmsg;
return StatusCode::FAILURE;
@@ -110,25 +116,25 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
const CaloCell_ID* cell_id;
status = detStore->retrieve(cell_id, "CaloCell_ID");
- if (status.isFailure())
+ if (status.isFailure())
{
log << MSG::FATAL << "Could not get CaloCell_ID helper !" << endmsg;
return status;
- }
- else
+ }
+ else
log << MSG::DEBUG << " Found the CaloCell_ID helper. " << endmsg;
const CaloIdManager* caloId_mgr;
status = detStore->retrieve(caloId_mgr, "CaloIdManager");
- if (status.isFailure())
+ if (status.isFailure())
{
log << MSG::ERROR << "Could not get CaloIdManager helper !" << endmsg;
return status;
- }
- else
- if (debug) log << MSG::DEBUG << " Found the CaloIdManager helper. " << endmsg;
+ }
+ else
+ if (debug) log << MSG::DEBUG << " Found the CaloIdManager helper. " << endmsg;
// --- --- Get CaloCell_ID and CaloIdManager helpers --- ---
-
+
// --- --- Create CaloDetDescrManager object --- ---
CaloDetDescrManager* caloMgr = new CaloDetDescrManager();
pObj = StoreGateSvc::asStorable(caloMgr);
@@ -149,7 +155,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
//unsigned int idhash;
IdentifierHash min;
IdentifierHash max;
-
+
const LArEM_ID* em_id = caloId_mgr->getEM_ID();
const LArHEC_ID* hec_id = caloId_mgr->getHEC_ID();
const LArFCAL_ID* fcal_id = caloId_mgr->getFCAL_ID();
@@ -177,18 +183,18 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
log << MSG::WARNING << "Could not get the EMBDetectorManager. No Calo Elements will be built for EMB" << endmsg;
}
else
- {
- // --- --- Iterate over EMB regions and cells --- ---
+ {
+ // --- --- Iterate over EMB regions and cells --- ---
EMBDetectorManager::DetectorRegionConstIterator embregIt;
- for (embregIt=embManager->beginDetectorRegion(); embregIt!=embManager->endDetectorRegion(); embregIt++)
+ for (embregIt=embManager->beginDetectorRegion(); embregIt!=embManager->endDetectorRegion(); embregIt++)
{
const EMBDetectorRegion *embRegion = *embregIt;
-
+
// *** *** Create descriptor for this region *** ***
- // Region identifier.
+ // Region identifier.
// Do some mapping between LArReadoutGeometry and CaloID
-
+
int barrel_ec = 0;
switch(embRegion->getEndcapIndex())
{
@@ -215,7 +221,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
EMBDescriptor* embDescr = new EMBDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,embRegion);
caloMgr->add(embDescr);
-
+
double phi_min = 0.;
double z_min = 10000.;
double z_max = -10000.;
@@ -224,7 +230,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
double reg_min = 10000.;
double reg_max = -10000.;
-
+
std::vector<double> depth_in;
std::vector<double> depth_out;
@@ -233,18 +239,18 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
//
// *** *** *** Iterate over cells *** *** ***
//
- for (unsigned int iPhi=embRegion->beginPhiIndex();iPhi<embRegion->endPhiIndex();iPhi++)
+ for (unsigned int iPhi=embRegion->beginPhiIndex();iPhi<embRegion->endPhiIndex();iPhi++)
{
- for (unsigned int iEta=embRegion->beginEtaIndex();iEta<embRegion->endEtaIndex();iEta++)
+ for (unsigned int iEta=embRegion->beginEtaIndex();iEta<embRegion->endEtaIndex();iEta++)
{
EMBCellConstLink cellPtr = embRegion->getEMBCell(iEta,iPhi);
-
+
// build hash identifier for this cell
Identifier chanId = em_id->channel_id(barrel_ec,
cellPtr->getSamplingIndex(),
cellPtr->getRegionIndex(),
iEta,iPhi);
-
+
// Create the element and store it
EMBDetectorElement* embElement = new EMBDetectorElement(em_id->channel_hash(chanId),
0,0,
@@ -257,24 +263,24 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// cell volume
embElement->set_volume(cellVol.CellVolume(chanId));
-
+
caloMgr->add(embElement);
-
+
if(r_min > embElement->r()-0.5*embElement->dr())
r_min = embElement->r()-0.5*embElement->dr();
if(r_max < embElement->r()+0.5*embElement->dr())
r_max = embElement->r()+0.5*embElement->dr();
-
+
if(z_min > fabs(embElement->z_raw())-0.5*embElement->dz())
z_min = fabs(embElement->z_raw())-0.5*embElement->dz();
if(z_max < fabs(embElement->z_raw())+0.5*embElement->dz())
z_max = fabs(embElement->z_raw())+0.5*embElement->dz();
-
+
if(reg_min > embElement->eta()-0.5*embElement->deta())
reg_min = embElement->eta()-0.5*embElement->deta();
if(reg_max < embElement->eta()+0.5*embElement->deta())
reg_max = embElement->eta()+0.5*embElement->deta();
-
+
// deal with depth
if(iPhi==embRegion->beginPhiIndex())
{
@@ -289,7 +295,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
if(embRegion->getSamplingIndex()==1 && embRegion->getRegionIndex()==0)
{
// special case for this region: strip 0 is missing
- eta_min = (embRegion->getDescriptor()->getEtaBinning()).getStart() -
+ eta_min = (embRegion->getDescriptor()->getEtaBinning()).getStart() -
(embRegion->getDescriptor()->getEtaBinning()).getDelta();
}
else
@@ -339,21 +345,21 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
}
else
{
- // --- --- Iterate over EMEC regions and cells --- ---
+ // --- --- Iterate over EMEC regions and cells --- ---
EMECDetectorManager::DetectorRegionConstIterator emecregIt;
- for (emecregIt=emecManager->beginDetectorRegion(); emecregIt!=emecManager->endDetectorRegion(); emecregIt++)
+ for (emecregIt=emecManager->beginDetectorRegion(); emecregIt!=emecManager->endDetectorRegion(); emecregIt++)
{
const EMECDetectorRegion *emecRegion = *emecregIt;
-
+
// *** *** Create descriptor for this region *** ***
- // Region identifier.
+ // Region identifier.
// Do some mapping between LArReadoutGeometry and CaloID
EMECDetectorRegion::DetectorSide endcapInd = emecRegion->getEndcapIndex();
-
+
unsigned int radialInd = emecRegion->getRadialIndex();
int barrel_ec;
-
+
switch(endcapInd)
{
case EMECDetectorRegion::NEG:
@@ -372,7 +378,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
return StatusCode::FAILURE;
}
}// switch(endcapInd)
-
+
switch(radialInd)
{
case 0:
@@ -382,7 +388,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
}
case 1:
{
- barrel_ec *= 3; // inner wheel
+ barrel_ec *= 3; // inner wheel
break;
}
default:
@@ -391,41 +397,41 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
return StatusCode::FAILURE;
}
}// switch(radialInd)
-
+
Identifier regId = em_id->region_id(barrel_ec,
emecRegion->getSamplingIndex(),
emecRegion->getRegionIndex());
-
+
EMECDescriptor* emecDescr = new EMECDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,emecRegion);
caloMgr->add(emecDescr);
-
+
double phi_min = 0.;
double z_min = 10000.;
double z_max = -10000.;
double r_min = 10000.;
double r_max = -10000.;
-
+
double reg_min = 10000.;
double reg_max = -10000.;
-
+
std::vector<double> depth_in;
- std::vector<double> depth_out;
+ std::vector<double> depth_out;
// *** *** Create descriptor for this region *** ***
-
+
//
// *** *** *** Iterate over cells *** *** ***
//
- for (unsigned int iPhi=emecRegion->beginPhiIndex();iPhi<emecRegion->endPhiIndex();iPhi++)
+ for (unsigned int iPhi=emecRegion->beginPhiIndex();iPhi<emecRegion->endPhiIndex();iPhi++)
{
- for (unsigned int iEta=emecRegion->beginEtaIndex();iEta<emecRegion->endEtaIndex();iEta++)
+ for (unsigned int iEta=emecRegion->beginEtaIndex();iEta<emecRegion->endEtaIndex();iEta++)
{
EMECCellConstLink cellPtr = emecRegion->getEMECCell(iEta,iPhi);
-
+
Identifier chanId = em_id->channel_id(barrel_ec,
cellPtr->getSamplingIndex(),
cellPtr->getRegionIndex(),
iEta,iPhi);
-
+
// Create the element and store it
EMECDetectorElement* emecElement = new EMECDetectorElement(em_id->channel_hash(chanId),
0,0,
@@ -439,22 +445,22 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// cell volume
emecElement->set_volume(cellVol.CellVolume(chanId));
caloMgr->add(emecElement);
-
+
if(r_min > emecElement->r()-0.5*emecElement->dr())
r_min = emecElement->r()-0.5*emecElement->dr();
if(r_max < emecElement->r()+0.5*emecElement->dr())
r_max = emecElement->r()+0.5*emecElement->dr();
-
+
if(z_min > fabs(emecElement->z_raw())-0.5*emecElement->dz())
z_min = fabs(emecElement->z_raw())-0.5*emecElement->dz();
if(z_max < fabs(emecElement->z_raw())+0.5*emecElement->dz())
z_max = fabs(emecElement->z_raw())+0.5*emecElement->dz();
-
+
if(reg_min > emecElement->eta()-0.5*emecElement->deta())
reg_min = emecElement->eta()-0.5*emecElement->deta();
if(reg_max < emecElement->eta()+0.5*emecElement->deta())
reg_max = emecElement->eta()+0.5*emecElement->deta();
-
+
// depths
if(iPhi==emecRegion->beginPhiIndex())
{
@@ -478,12 +484,12 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
emecDescr->setCaloZMax(z_max);
emecDescr->setCaloRMin(r_min);
emecDescr->setCaloRMax(r_max);
-
+
// depths
emecDescr->set_n_calo_depth(depth_in.size());
emecDescr->set_depth_in(depth_in);
emecDescr->set_depth_out(depth_out);
-
+
// 'alignable' values
emecDescr->setLArRegMin(reg_min);
emecDescr->setLArRegMax(reg_max);
@@ -495,7 +501,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ****************************************************************
// ** --- --- EMEC --- --- **
// ****************************************************************
-
+
// ****************************************************************
// ** --- --- HEC --- --- **
@@ -510,56 +516,56 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
}
else
{
- // --- --- Iterate over HEC regions and cells --- ---
+ // --- --- Iterate over HEC regions and cells --- ---
HECDetectorManager::DetectorRegionConstIterator hecregIt;
-
- for (hecregIt=hecManager->beginDetectorRegion(); hecregIt!=hecManager->endDetectorRegion(); hecregIt++)
+
+ for (hecregIt=hecManager->beginDetectorRegion(); hecregIt!=hecManager->endDetectorRegion(); hecregIt++)
{
const HECDetectorRegion *hecregion = *hecregIt;
-
+
// *** *** Create descriptor for this region *** ***
- // Region identifier.
+ // Region identifier.
// Do some mapping between LArReadoutGeometry and CaloID
HECDetectorRegion::DetectorSide endcapInd = hecregion->getEndcapIndex();
int pos_neg = endcapInd==HECDetectorRegion::NEG ? -2 : 2;
-
+
Identifier regId = hec_id->region_id(pos_neg,
hecregion->getSamplingIndex(),
hecregion->getRegionIndex());
-
+
HECDescriptor* hecDescr = new HECDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,hecregion);
caloMgr->add(hecDescr);
-
+
double phi_min = 0.;
double z_min = 10000.;
double z_max = -10000.;
double r_min = 10000.;
double r_max = -10000.;
-
+
double reg_min = 10000.;
double reg_max = -10000.;
-
+
std::vector<double> depth_in;
std::vector<double> depth_out;
-
+
//
// *** *** *** Iterate over cells *** *** ***
//
- for (unsigned int iPhi=hecregion->beginPhiIndex();iPhi<hecregion->endPhiIndex();iPhi++)
+ for (unsigned int iPhi=hecregion->beginPhiIndex();iPhi<hecregion->endPhiIndex();iPhi++)
{
- for (unsigned int iEta=hecregion->beginEtaIndex();iEta<hecregion->endEtaIndex();iEta++)
+ for (unsigned int iEta=hecregion->beginEtaIndex();iEta<hecregion->endEtaIndex();iEta++)
{
HECCellConstLink cellPtr = hecregion->getHECCell(iEta,iPhi);
// build hash identifier for this cell
// Do some mapping between LArReadoutGeometry and CaloID
-
+
if(cellPtr)
{
Identifier chanId = hec_id->channel_id(pos_neg,
cellPtr->getSamplingIndex(),
cellPtr->getRegionIndex(),
iEta,iPhi);
-
+
// Create the element and store it
HECDetectorElement* hecElement = new HECDetectorElement(hec_id->channel_hash(chanId),
0,0,
@@ -569,38 +575,38 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
isTestBeam);
if(iPhi==hecregion->beginPhiIndex())
phi_min = hecElement->phi() - 0.5*hecElement->dphi();
-
+
// cell volume
hecElement->set_volume(cellVol.CellVolume(chanId));
-
+
caloMgr->add(hecElement);
if(r_min > cellPtr->getRMinLocalNominal(HECCell::FRONT))
r_min = cellPtr->getRMinLocalNominal(HECCell::FRONT);
- if(r_max < cellPtr->getRMaxLocalNominal(HECCell::FRONT))
- r_max = cellPtr->getRMaxLocalNominal(HECCell::FRONT);
-
+ if(r_max < cellPtr->getRMaxLocalNominal(HECCell::FRONT))
+ r_max = cellPtr->getRMaxLocalNominal(HECCell::FRONT);
+
if(z_min > fabs(hecElement->z_raw())-hecElement->dz())
z_min = fabs(hecElement->z_raw())-hecElement->dz();
if(z_max < fabs(hecElement->z_raw())+hecElement->dz())
z_max = fabs(hecElement->z_raw())+hecElement->dz();
-
+
if(reg_min > hecElement->eta()-0.5*hecElement->deta())
reg_min = hecElement->eta()-0.5*hecElement->deta();
if(reg_max < hecElement->eta()+0.5*hecElement->deta())
reg_max = hecElement->eta()+0.5*hecElement->deta();
-
+
if(iPhi==hecregion->beginPhiIndex() && iEta==hecregion->beginEtaIndex())
{
depth_in.push_back(fabs(hecElement->z_raw())-hecElement->dz());
depth_out.push_back(fabs(hecElement->z_raw())+hecElement->dz());
}
-
+
}
} // Eta loop
} // Phi loop
// *** *** *** Iterate over cells *** *** ***
-
+
double eta_min = (hecregion->getDescriptor()->getEtaBinning()).getStart();
double eta_max = (hecregion->getDescriptor()->getEtaBinning()).getEnd();
double phi_max = phi_min + fabs((hecregion->getDescriptor()->getPhiBinning()).getDelta())*hecDescr->n_phi();
@@ -614,12 +620,12 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
hecDescr->setCaloZMax(z_max);
hecDescr->setCaloRMin(r_min);
hecDescr->setCaloRMax(r_max);
-
+
// depths
hecDescr->set_n_calo_depth(depth_in.size());
hecDescr->set_depth_in(depth_in);
hecDescr->set_depth_out(depth_out);
-
+
// 'alignable' values
hecDescr->setLArRegMin(reg_min);
hecDescr->setLArRegMax(reg_max);
@@ -646,40 +652,40 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
}
else
{
- // --- --- Iterate over FCAL modules and tiles --- ---
+ // --- --- Iterate over FCAL modules and tiles --- ---
FCALDetectorManager::ConstIterator fcalmodIt;
-
- for (fcalmodIt=fcalManager->beginFCAL(); fcalmodIt!=fcalManager->endFCAL(); fcalmodIt++)
+
+ for (fcalmodIt=fcalManager->beginFCAL(); fcalmodIt!=fcalManager->endFCAL(); fcalmodIt++)
{
const FCALModule* fcalmodule = *fcalmodIt;
-
+
// *** *** Create descriptor for this module *** ***
- // Module identifier.
+ // Module identifier.
// Do some mapping between LArReadoutGeometry and CaloID
-
+
FCALModule::Endcap endcapInd = fcalmodule->getEndcapIndex();
-
+
int pos_neg = endcapInd==FCALModule::NEG ? -2 : 2;
-
+
Identifier regId = fcal_id->module_id(pos_neg,
(int)fcalmodule->getModuleIndex());
-
+
FCALDescriptor* fcalDescr = new FCALDescriptor(regId,(AtlasDetectorID *)cell_id,cell_id,fcalmodule);
caloMgr->add(fcalDescr);
-
+
double eta_min = 10000.;
double eta_max = -10000.;
double z_min = 10000.;
double z_max = -10000.;
double r_min = 10000.;
double r_max = -10000.;
-
+
double reg_min = 10000.;
double reg_max = -10000.;
-
+
std::vector<double> depth_in;
std::vector<double> depth_out;
-
+
//
// *** *** *** Iterate over cells *** *** ***
//
@@ -690,7 +696,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
(int)fcalmodule->getModuleIndex(),
fcaltileIt->getIndexJ(), // eta
fcaltileIt->getIndexI()); // phi
-
+
FCALDetectorElement* fcalElement = new FCALDetectorElement(fcal_id->channel_hash(chanId),
0,0,
fcalDescr,
@@ -704,7 +710,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
fcalElement->set_volume(.5*sqrt(3)*numTubes*tubeSpacing*tubeSpacing*dz);
caloMgr->add(fcalElement);
-
+
if(eta_min > std::fabs(fcalElement->eta_raw())-0.5*fcalElement->deta())
eta_min = std::fabs(fcalElement->eta_raw())-0.5*fcalElement->deta();
if(eta_max < std::fabs(fcalElement->eta_raw())+0.5*fcalElement->deta())
@@ -721,14 +727,14 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
reg_min = fcalElement->eta()-0.5*fcalElement->deta();
if(reg_max < fcalElement->eta()+0.5*fcalElement->deta())
reg_max = fcalElement->eta()+0.5*fcalElement->deta();
-
+
if(fcaltileIt==fcalmodule->beginTiles())
{
depth_in.push_back(fabs(fcalElement->z_raw()) - fcalElement->dz());
depth_out.push_back(fabs(fcalElement->z_raw()) + fcalElement->dz());
}
}
-
+
// These values have no importance for FCAL - hardwire them here.
fcalDescr->setCaloPhiMin(0.);
fcalDescr->setCaloPhiMax(2*M_PI);
@@ -743,17 +749,17 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
fcalDescr->setCaloRMax(r_max);
fcalDescr->setLArRegMin(reg_min);
fcalDescr->setLArRegMax(reg_max);
-
+
// depths
fcalDescr->set_n_calo_depth(depth_in.size());
fcalDescr->set_depth_in(depth_in);
fcalDescr->set_depth_out(depth_out);
-
+
if(fcalmodule->getEndcapIndex()==FCALModule::NEG)
fcalDescr->setLArEtaMin(-reg_max);
else
fcalDescr->setLArEtaMin(reg_min);
-
+
}// Module loop
}// if FCAL manager has been retrieved
@@ -766,25 +772,25 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ** --- --- Tile --- --- **
// ****************************************************************
const TileDetDescrManager* tile_mgr;
-
+
status = detStore->retrieve(tile_mgr);
- if (status.isFailure())
+ if (status.isFailure())
{
log << MSG::WARNING << "Could not get the TileDetectorManager. No Calo Elements will be built for Tile" << endmsg;
- }
- else
+ }
+ else
{
if (debug) log << MSG::DEBUG << " Found the TileDetDescrManager " << endmsg;
cell_id->calo_cell_hash_range((int)CaloCell_ID::TILE,min,max);
for(unsigned int idhash=0; idhash < max-min; idhash++)
{
- CaloDetDescrElement* newelt = tile_mgr->get_cell_element(idhash);
+ CaloDetDescrElement* newelt = tile_mgr->get_cell_element(idhash);
if(newelt) caloMgr->add(newelt);
}
-
+
std::vector<CaloDetDescriptor*>::const_iterator itr = tile_mgr->calo_descriptors_begin();
std::vector<CaloDetDescriptor*>::const_iterator end = tile_mgr->calo_descriptors_end();
-
+
for(; itr != end; ++itr) caloMgr->add_tile(*itr);
}
// ****************************************************************
@@ -794,10 +800,10 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
// ****************************************************************
// ** --- Additional elements --- **
// ****************************************************************
- if(isTestBeam)
- {
+ if(isTestBeam)
+ {
CaloDetDescrElementContainer *cDDEvec;
- if(detStore->retrieve(cDDEvec) == StatusCode::SUCCESS)
+ if(detStore->retrieve(cDDEvec) == StatusCode::SUCCESS)
{ // We have additional elements
for (CaloDetDescrElement* elt : *cDDEvec) {
caloMgr->add (elt);
@@ -805,7 +811,7 @@ StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pOb
}
}
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
//--------------------------------------------------------------------
@@ -817,13 +823,13 @@ CaloMgrDetDescrCnv::storageType()
}
//--------------------------------------------------------------------
-const CLID&
-CaloMgrDetDescrCnv::classID() {
- return ClassID_traits<CaloDetDescrManager>::ID();
+const CLID&
+CaloMgrDetDescrCnv::classID() {
+ return ClassID_traits<CaloDetDescrManager>::ID();
}
//--------------------------------------------------------------------
-CaloMgrDetDescrCnv::CaloMgrDetDescrCnv(ISvcLocator* svcloc)
+CaloMgrDetDescrCnv::CaloMgrDetDescrCnv(ISvcLocator* svcloc)
:
DetDescrConverter(ClassID_traits<CaloDetDescrManager>::ID(), svcloc)
{}
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
index 6fa74fd3844b2ed02ab00c70d874d6c3233666e9..7e37acc4f0d88306b7bcaf449b2ade289dae0dc5 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
@@ -1,27 +1,12 @@
-################################################################################
-# Package: CaloIdCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloIdCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- DetectorDescription/DetDescrCnvSvc
- PRIVATE
- Control/StoreGate
- DetectorDescription/IdDictDetDescr
- DetectorDescription/Identifier
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_component( CaloIdCnv
src/*.cxx
- LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib SGtests IdDictDetDescr Identifier GaudiKernel )
+ LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib IdDictDetDescr Identifier GaudiKernel )
# Install files from the package:
-atlas_install_headers( CaloIdCnv )
atlas_install_joboptions( share/*.py )
-
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_IDDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_IDDetDescrCnv.cxx
index e35c573e2aed0867118a71fecb0ded6dd03bad0e..0a511afb5161354b08e89de80ec8f07c48cefe60 100755
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_IDDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_IDDetDescrCnv.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file CaloIdCnv/src/CaloCell_IDDetDescrCnv.cxx
* @author RD Schaffer, F. Ledroit, scott snyder <snyder@bnl.gov>
@@ -12,7 +10,7 @@
#include "CaloIdCnv/CaloCell_IDDetDescrCnv.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "CaloIdentifier/CaloID.h"
#include "CaloIdentifier/CaloCell_ID.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_SuperCell_IDDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_SuperCell_IDDetDescrCnv.cxx
index fff01c84d6387a08c78d12b570ebca48cbf6a870..55eba9184f602569dd4d21a53da5a515f2a35795 100755
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_SuperCell_IDDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloCell_SuperCell_IDDetDescrCnv.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file CaloIdCnv/src/CaloCell_SuperCell_IDDetDescrCnv.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -12,7 +10,7 @@
#include "CaloIdCnv/CaloCell_SuperCell_IDDetDescrCnv.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "CaloIdentifier/CaloID.h"
#include "CaloIdentifier/CaloCell_SuperCell_ID.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx
index c16a67a290de8a0638ae51c2808a37237850ba6a..5915ac923ae1b804c732615fa15a49c58f06a852 100755
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdMgrDetDescrCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -19,7 +19,7 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/errorcheck.h"
// Identifier includes
diff --git a/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt b/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt
index 9d62b72a25c3773152c4e768fb5505a0145c74eb..9c75e75f6953c609149a3f3d8ecdd6d3f2722862 100644
--- a/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt
@@ -1,31 +1,8 @@
-################################################################################
-# Package: CaloJiveXML
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloJiveXML )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- GaudiKernel
- LArCalorimeter/LArCabling
- TileCalorimeter/TileConditions
- TileCalorimeter/TileEvent
- graphics/JiveXML
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Control/AthenaKernel
- DetectorDescription/Identifier
- Event/EventContainers
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRawEvent
- TileCalorimeter/TileCalib/TileCalibBlobObjs
- TileCalorimeter/TileIdentifier )
-
# External dependencies:
find_package( CLHEP )
@@ -34,9 +11,7 @@ atlas_add_component( CaloJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps GaudiKernel LArToolsLib TileConditionsLib TileEvent JiveXMLLib CaloDetDescrLib CaloEvent AthenaKernel Identifier LArIdentifier LArRawEvent TileCalibBlobObjs TileIdentifier )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CaloDetDescrLib CaloEvent CaloIdentifier EventContainers GaudiKernel Identifier JiveXMLLib LArCablingLib LArElecCalib LArIdentifier LArRawEvent TileCalibBlobObjs TileConditionsLib TileEvent TileIdentifier )
# Install files from the package:
-atlas_install_headers( CaloJiveXML )
atlas_install_joboptions( share/*.py )
-
diff --git a/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt b/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt
index d0060d22782d2b2f4e60e53f342e55ae506be186..6266d001a50ec47ad0f23700acd2aa510432e0f0 100644
--- a/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt
@@ -1,20 +1,10 @@
-################################################################################
-# Package: CaloSimEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloSimEventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Calorimeter/CaloCnv/CaloSimEventTPCnv
- Calorimeter/CaloSimEvent
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# Component(s) in the package:
atlas_add_poolcnv_library( CaloSimEventAthenaPoolPoolCnv
src/*.cxx
FILES CaloSimEvent/CaloCalibrationHitContainer.h
- LINK_LIBRARIES AthenaPoolUtilities CaloSimEventTPCnv CaloSimEvent AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES CaloSimEventTPCnv CaloSimEvent AthenaPoolCnvSvcLib GaudiKernel )
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
index c80dbcb477bc305c866079de4da99b430dbc65a1..212f2f9fecd6d0e1e95e4d25978a6d3e0cf9574e 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
@@ -1,73 +1,49 @@
-################################################################################
-# Package: CaloSimEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloSimEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloSimEvent
- Database/AthenaPOOL/AthenaPoolCnvSvc
- DetectorDescription/Identifier
- PRIVATE
- AtlasTest/TestTools
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( CaloSimEventTPCnv
src/*.cxx
PUBLIC_HEADERS CaloSimEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel )
+ LINK_LIBRARIES CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel )
atlas_add_dictionary( CaloSimEventTPCnvDict
CaloSimEventTPCnv/CaloSimEventTPCnvDict.h
CaloSimEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_dictionary( OLD_CaloSimEventTPCnvDict
CaloSimEventTPCnv/CaloSimEventTPCnvDict.h
CaloSimEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_test( CaloCalibrationHitCnv_p1_test
SOURCES
test/CaloCalibrationHitCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_test( CaloCalibrationHitCnv_p2_test
SOURCES
test/CaloCalibrationHitCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_test( CaloCalibrationHitContainerCnv_p1_test
SOURCES
test/CaloCalibrationHitContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv
+ LINK_LIBRARIES CaloSimEventTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
atlas_add_test( CaloCalibrationHitContainerCnv_p2_test
SOURCES
test/CaloCalibrationHitContainerCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv
+ LINK_LIBRARIES CaloSimEventTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
atlas_add_test( CaloCalibrationHitContainerCnv_p3_test
SOURCES
test/CaloCalibrationHitContainerCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv
+ LINK_LIBRARIES CaloSimEventTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
diff --git a/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt
index 36e1c9be4c97f13b067e4f2dac2d6cc7775f9e6c..a67dbc1210aa60e6eceb6eab08fb75fdcd6489c1 100644
--- a/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt
@@ -1,79 +1,44 @@
-################################################################################
-# Package: CaloTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Control/AthenaKernel
- Control/AthAllocators
- Control/AthLinks
- Control/DataModelAthenaPool
- Control/Navigation
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Event/EventCommonTPCnv
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Calorimeter/CaloConditions
- Calorimeter/CaloGeoHelpers
- #Calorimeter/CaloInterface
- Calorimeter/CaloUtils
- Control/CxxUtils
- Control/SGTools
- Event/EventKernel
- LArCalorimeter/LArRecEvent
- TileCalorimeter/TileEvent
- DetectorDescription/IdDictParser
- )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_tpcnv_library( CaloTPCnv
src/*.cxx
PUBLIC_HEADERS CaloTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel LArRecEvent TileEvent )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel LArRecEvent TileEvent )
atlas_add_dictionary( CaloTPCnvDict
CaloTPCnv/CaloTPCnvDict.h
CaloTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv LArRecEvent TileEvent)
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_dictionary( OLD_CaloTPCnvDict
CaloTPCnv/CaloTPCnvDict.h
CaloTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv LArRecEvent TileEvent)
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_test( CaloCellLinkContainerCnv_p2_test
SOURCES
test/CaloCellLinkContainerCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv
+ LINK_LIBRARIES CaloTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
atlas_add_test( CaloClusterContainerCnv_test
SOURCES
test/CaloClusterContainerCnv_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv )
-
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_test( CaloClusterCellLinkContainerCnv_p1_test
SOURCES
test/CaloClusterCellLinkContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv )
-
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_test( CaloCellPackerUtils_test
SOURCES test/CaloCellPackerUtils_test.cxx
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
index 307036458fb809c33561e357681b0727250e5505..3de2fffe7d33c637c8f687fc49aefee113d45b67 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
@@ -1,24 +1,9 @@
-################################################################################
-# Package: CaloTTDetDescrCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTTDetDescrCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Calorimeter/CaloTTDetDescr
- Calorimeter/CaloTriggerTool
- Control/StoreGate
- DetectorDescription/DetDescrCnvSvc
- LArCalorimeter/LArCabling )
-
# Component(s) in the package:
atlas_add_component( CaloTTDetDescrCnv
src/*.cxx
- LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloIdentifier CaloTTDetDescr CaloTriggerToolLib StoreGateLib SGtests DetDescrCnvSvcLib LArCablingLib )
-
+ LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloIdentifier CaloTTDetDescr CaloTriggerToolLib StoreGateLib DetDescrCnvSvcLib )
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx
index fb8e446005e726190a4aa3635a351b051548b116..311574e08fafaf7a3a6d3b3408aa923b25999b5d 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTMgrDetDescrCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -17,7 +17,6 @@
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
#include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
#include "StoreGate/StoreGateSvc.h"
// detdescr includes
diff --git a/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt b/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
index 50707e0da7fc38e100df5d6a8f44fe383d500797..572963c1df70cee602533bd8415c5466d0ea8b63 100644
--- a/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
+++ b/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: CaloCondBlobAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondBlobAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- Event/xAOD/xAODEventInfo
- GaudiKernel )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -26,9 +11,8 @@ atlas_add_component( CaloCondBlobAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} CaloCondBlobObjs CaloDetDescrLib CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier xAODEventInfo GaudiKernel )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} CaloCondBlobObjs CaloDetDescrLib CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib AthenaPoolUtilities Identifier xAODEventInfo GaudiKernel )
# Install files from the package:
-atlas_install_headers( CaloCondBlobAlgs )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/Calorimeter/CaloCondBlobAlgs/src/CaloNoiseDbExample.cxx b/Calorimeter/CaloCondBlobAlgs/src/CaloNoiseDbExample.cxx
index 89d45720186b597779957c9dc091c81df55c9e70..f8c8cd9750e0e214c0e127533c68c44cc1de38e7 100644
--- a/Calorimeter/CaloCondBlobAlgs/src/CaloNoiseDbExample.cxx
+++ b/Calorimeter/CaloCondBlobAlgs/src/CaloNoiseDbExample.cxx
@@ -5,9 +5,6 @@
#include "CaloCondBlobAlgs/CaloNoiseDbExample.h"
//#include "CaloInterface/ICaloNoiseTool.h"
-//=== Athena includes
-#include "StoreGate/StoreGate.h"
-
//=== Gaudi includes
#include "GaudiKernel/MsgStream.h"
diff --git a/Calorimeter/CaloCondBlobObjs/CMakeLists.txt b/Calorimeter/CaloCondBlobObjs/CMakeLists.txt
index 0e9c07db0f1f9151fa0414d1f9ddb8a6567d80dc..19a1ac916d004e4e9c7c9c38fc91723f9f567c42 100644
--- a/Calorimeter/CaloCondBlobObjs/CMakeLists.txt
+++ b/Calorimeter/CaloCondBlobObjs/CMakeLists.txt
@@ -1,38 +1,24 @@
-################################################################################
-# Package: CaloCondBlobObjs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondBlobObjs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaKernel
- AtlasTest/TestTools )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CORAL COMPONENTS CoralBase )
find_package( Boost COMPONENTS unit_test_framework )
-# tag NEEDS_CORAL_BASE was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_library( CaloCondBlobObjs
src/*.cxx
PUBLIC_HEADERS CaloCondBlobObjs
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${CORAL_LIBRARIES} GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel )
+ PRIVATE_LINK_LIBRARIES AthenaKernel )
atlas_add_dictionary( CaloCondBlobObjsDict
CaloCondBlobObjs/CaloCondBlobObjsDict.h
CaloCondBlobObjs/selection.xml
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} GaudiKernel AthenaKernel CaloCondBlobObjs )
+ LINK_LIBRARIES CaloCondBlobObjs )
atlas_add_test( CaloCondBlobBase_test
SOURCES
diff --git a/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..47be11715106ad624bd513222d3a11d8c67ab27e
--- /dev/null
+++ b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloCondBlobObjs
diff --git a/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobBase.h b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobBase.h
index 88b400a1c47df39b6a7830d41566ef4816e40e1f..34b8cd85b60e46d5545dba276a702c43aa407784 100644
--- a/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobBase.h
+++ b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOCONDBLOBOBJS_CALOCONDBLOBBASE_H
@@ -104,13 +104,17 @@ class CaloCondBlobBase{
//==================================================================
/** @brief Returns start address of iEle-th basic unit.
@param iEle sequential basic unit number */
- void* getAddress(unsigned int iEle) const;
+ const void* getAddress(unsigned int iEle) const;
+ void* getAddress(unsigned int iEle);
protected:
/** @brief Ctor for const blob. */
CaloCondBlobBase(const coral::Blob& blob);
+ /** @brief Ctor for non-const blob. */
+ CaloCondBlobBase(coral::Blob& blob);
+
/** @brief (re-)creation of the referenced BLOB object.
@param objType Object type
@param objVersion Object version
@@ -136,16 +140,24 @@ class CaloCondBlobBase{
void dumpHeader(std::ostream& stm) const;
private:
+ /** @brief Internal ctor. */
+ CaloCondBlobBase(coral::Blob* blob_nc, const coral::Blob* blob);
uint32_t packGainAndNchans(const uint32_t gain, const uint32_t nChans);
uint32_t unpacknGains(const uint32_t gainAndnChans);
uint32_t unpacknChans(const uint32_t gainAndnChans);
/** @brief Returns the BLOB start address as uint32_t pointer. */
- uint32_t* getBlobStart() const;
+ const uint32_t* getBlobStart() const;
+ /** @brief Returns the BLOB start address as uint32_t pointer. */
+ uint32_t* getBlobStart();
+
+ /** @brief Non-const reference to the BLOB
+ (Only present if we were created with a non-const blob. */
+ coral::Blob* m_blob_nc;
- /** @brief Reference to the BLOB*/
- coral::Blob* m_blob;
+ /** @brief Const reference to the BLOB (always there) */
+ const coral::Blob* m_blob;
/** Do I own the BLOB? */
bool m_isBlobOwner;
@@ -159,10 +171,18 @@ class CaloCondBlobBase{
//
//_________________________________________________________
-inline uint32_t*
+inline const uint32_t*
CaloCondBlobBase::getBlobStart() const
{
- return static_cast<uint32_t*>(m_blob->startingAddress());
+ return static_cast<const uint32_t*>(m_blob->startingAddress());
+}
+
+//
+//_________________________________________________________
+inline uint32_t*
+CaloCondBlobBase::getBlobStart()
+{
+ return static_cast<uint32_t*>(m_blob_nc->startingAddress());
}
//
@@ -172,7 +192,7 @@ CaloCondBlobBase::getObjType() const
{
if(uint64_t(m_blob->size())<getHdrSize()*sizeof(uint32_t))
throw CaloCond::InvalidBlob("CaloCondBlobBase::getObjType");
- return static_cast<uint16_t*>(m_blob->startingAddress())[0];
+ return static_cast<const uint16_t*>(m_blob->startingAddress())[0];
}
//
@@ -182,7 +202,7 @@ CaloCondBlobBase::getObjVersion() const
{
if(uint64_t(m_blob->size())<getHdrSize()*sizeof(uint32_t))
throw CaloCond::InvalidBlob("CaloCondBlobBase::getObjVersion");
- return static_cast<uint16_t*>(m_blob->startingAddress())[1];
+ return static_cast<const uint16_t*>(m_blob->startingAddress())[1];
}
//
@@ -200,7 +220,7 @@ CaloCondBlobBase::getNObjs() const
{
if(uint64_t(m_blob->size())<getHdrSize()*sizeof(uint32_t))
throw CaloCond::InvalidBlob("CaloCondBlobBase::getNObjs");
- return static_cast<uint32_t*>(m_blob->startingAddress())[2];
+ return static_cast<const uint32_t*>(m_blob->startingAddress())[2];
}
//
@@ -228,13 +248,25 @@ CaloCondBlobBase::getCommentSizeUint32() const
{
if(uint64_t(m_blob->size())<getHdrSize()*sizeof(uint32_t))
throw CaloCond::InvalidBlob("CaloCondBlobBase::getCommentSizeUint32");
- return static_cast<uint32_t*>(m_blob->startingAddress())[4];
+ return static_cast<const uint32_t*>(m_blob->startingAddress())[4];
}
//
//_________________________________________________________
-inline void*
+inline const void*
CaloCondBlobBase::getAddress(unsigned int iEle) const
+{
+ if(iEle>=getNObjs()){
+ throw CaloCond::IndexOutOfRange("CaloCondBlobBase::getAddress", iEle, getNObjs());
+ }
+ return static_cast<const void*>
+ ( getBlobStart() + getHdrSize() + getObjSizeUint32()*iEle );
+}
+
+//
+//_________________________________________________________
+inline void*
+CaloCondBlobBase::getAddress(unsigned int iEle)
{
if(iEle>=getNObjs()){
throw CaloCond::IndexOutOfRange("CaloCondBlobBase::getAddress", iEle, getNObjs());
@@ -249,8 +281,8 @@ inline uint64_t
CaloCondBlobBase::getTimeStamp() const
{
if(!getCommentSizeUint32()) return 0;
- return *(reinterpret_cast<uint64_t*>(getBlobStart()+getHdrSize() +
- getNObjs()*getObjSizeUint32()));
+ return *(reinterpret_cast<const uint64_t*>(getBlobStart()+getHdrSize() +
+ getNObjs()*getObjSizeUint32()));
}
#endif
diff --git a/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobDat.h b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobDat.h
index a8bba1ad941ff0e95275404a42961e42394622c9..d379c4a64c9e9f020aa16ff646a456c44fcd8248 100644
--- a/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobDat.h
+++ b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobDat.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOCONDBLOBOBJS_CALOCONDBLOBDAT_H
@@ -86,12 +86,15 @@ class CaloCondBlobDat : public CaloCondBlobBase
protected:
/** @brief Ctor. */
CaloCondBlobDat(const coral::Blob& blob) : CaloCondBlobBase(blob){}
+ /** @brief Ctor. */
+ CaloCondBlobDat(coral::Blob& blob) : CaloCondBlobBase(blob){}
/** @brief Returns a pointer to the first value for the specified channel/gain.
@param channel The channel number; if >= getNChans() it is reset to 0 without warning (default policy)
@param adc The gain index; if >= getNGains() it is reset to 0 without warning (default policy) */
- T* getAddress(const unsigned int channel, const unsigned int adc) const;
+ const T* getAddress(const unsigned int channel, const unsigned int adc) const;
+ T* getAddress(const unsigned int channel, const unsigned int adc);
};
//
@@ -147,7 +150,7 @@ CaloCondBlobDat<T>::setData(unsigned int channel, unsigned int adc, const std::v
//
//______________________________________________________________
-template<class T> T*
+template<class T> const T*
CaloCondBlobDat<T>::getAddress(const unsigned int channel, const unsigned int adc) const
{
//=== check for out of bounds
@@ -158,6 +161,23 @@ CaloCondBlobDat<T>::getAddress(const unsigned int channel, const unsigned int ad
throw CaloCond::IndexOutOfRange("CaloCondBlobDat::getAddress(gain)",adc,getNGains());
}
+ const unsigned int idx = channel*getNGains() + adc;
+ return static_cast<const T*>(CaloCondBlobBase::getAddress(idx));
+}
+
+//
+//______________________________________________________________
+template<class T> T*
+CaloCondBlobDat<T>::getAddress(const unsigned int channel, const unsigned int adc)
+{
+ //=== check for out of bounds
+ if(channel >= getNChans()){
+ throw CaloCond::IndexOutOfRange("CaloCondBlobDat::getAddress(channel)",channel,getNChans());
+ }
+ if(adc>=getNGains()){
+ throw CaloCond::IndexOutOfRange("CaloCondBlobDat::getAddress(gain)",adc,getNGains());
+ }
+
const unsigned int idx = channel*getNGains() + adc;
return static_cast<T*>(CaloCondBlobBase::getAddress(idx));
}
diff --git a/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobFlt.h b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobFlt.h
index 1e545e71775ba06e2b6e6babf19e80a4ef72537f..3f17b26d9829ef444008dc504a49322920e05c44 100644
--- a/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobFlt.h
+++ b/Calorimeter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobFlt.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOCONDBLOBOBJS_CALOCONDBLOBFLT_H
@@ -51,6 +51,8 @@ class CaloCondBlobFlt : public CaloCondBlobDat<float>
protected:
/** @brief Ctor. */
CaloCondBlobFlt(const coral::Blob& blob);
+ /** @brief Ctor. */
+ CaloCondBlobFlt(coral::Blob& blob);
};
#endif
diff --git a/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobBase.cxx b/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobBase.cxx
index 489fe4e8a7371937a09fe68e4f56099c0aad681f..e4d2e41e22c976ad5054f8695016770eca7c9406 100644
--- a/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobBase.cxx
+++ b/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobBase.cxx
@@ -9,21 +9,34 @@
//
//_____________________________________________________________
-CaloCondBlobBase::CaloCondBlobBase(const coral::Blob& blob)
- : m_blob(const_cast<coral::Blob*>(&blob))
+CaloCondBlobBase::CaloCondBlobBase(coral::Blob* blob_nc,
+ const coral::Blob* blob)
+ : m_blob_nc(blob_nc),
+ m_blob(blob)
, m_isBlobOwner(false),m_sizeOfObj(0),m_nChans(0),m_nGains(0)
{
if(uint64_t(m_blob->size())>=getHdrSize()*sizeof(uint32_t)) {
- m_sizeOfObj=static_cast<uint32_t*>(m_blob->startingAddress())[1];
+ m_sizeOfObj=static_cast<const uint32_t*>(m_blob->startingAddress())[1];
//m_nChans=static_cast<uint16_t*>(m_blob->startingAddress())[6];
//m_nGains=static_cast<uint16_t*>(m_blob->startingAddress())[7];
- m_nChans=unpacknChans(getBlobStart()[3]);
- m_nGains=unpacknGains(getBlobStart()[3]);
+ const CaloCondBlobBase& this_c = *this;
+ m_nChans=unpacknChans(this_c.getBlobStart()[3]);
+ m_nGains=unpacknGains(this_c.getBlobStart()[3]);
//std::cout << "CaloCondBlobObj: nChans=" << m_nChans << " nGains=" << m_nGains << std::endl;
}
return;
}
+CaloCondBlobBase::CaloCondBlobBase(const coral::Blob& blob)
+ : CaloCondBlobBase (nullptr, &blob)
+{
+}
+
+CaloCondBlobBase::CaloCondBlobBase(coral::Blob& blob)
+ : CaloCondBlobBase (&blob, &blob)
+{
+}
+
//
//_____________________________________________________________
CaloCondBlobBase::~CaloCondBlobBase()
@@ -35,7 +48,8 @@ CaloCondBlobBase::~CaloCondBlobBase()
//
//_____________________________________________________________
CaloCondBlobBase::CaloCondBlobBase(const CaloCondBlobBase& other)
- : m_blob(new coral::Blob(*other.m_blob))
+ : m_blob_nc(new coral::Blob(*other.m_blob))
+ , m_blob (m_blob_nc)
, m_isBlobOwner(true),
m_sizeOfObj(other.getObjSizeUint32()),
m_nChans(other.getNChans()),
@@ -50,7 +64,13 @@ CaloCondBlobBase::operator=(const CaloCondBlobBase& other)
{
//=== catch self-assignment
if(&other == this) {return *this;}
+ if (m_isBlobOwner) delete m_blob;
m_blob = other.m_blob;
+ m_blob_nc = other.m_blob_nc;
+ m_isBlobOwner = false;
+ m_sizeOfObj=static_cast<const uint32_t*>(m_blob->startingAddress())[1];
+ m_nChans=unpacknChans(getBlobStart()[3]);
+ m_nGains=unpacknGains(getBlobStart()[3]);
return *this;
}
@@ -83,7 +103,7 @@ CaloCondBlobBase::createBlob(uint16_t objType,
//=== create blob
const uint32_t blobSizeInBytes = dataSizeByte+commentSizeChar;
- m_blob->resize(blobSizeInBytes);
+ m_blob_nc->resize(blobSizeInBytes);
//=== fill header
reinterpret_cast<uint16_t*>(getBlobStart())[0] = objType;
@@ -153,9 +173,10 @@ std::string
CaloCondBlobBase::getAuthor() const
{
if(!getCommentSizeUint32()) return std::string("");
- char* iBeg = reinterpret_cast<char*>(getBlobStart()+getHdrSize() +
- getNObjs()*getObjSizeUint32() +
- sizeof(uint64_t)/sizeof(uint32_t));
+ const char* iBeg =
+ reinterpret_cast<const char*>(getBlobStart()+getHdrSize() +
+ getNObjs()*getObjSizeUint32() +
+ sizeof(uint64_t)/sizeof(uint32_t));
return std::string(iBeg);
}
@@ -166,10 +187,11 @@ std::string
CaloCondBlobBase::getComment() const
{
if(!getCommentSizeUint32()) return std::string("");
- char* iBeg = reinterpret_cast<char*>(getBlobStart()+getHdrSize() +
- getNObjs()*getObjSizeUint32() +
- sizeof(uint64_t)/sizeof(uint32_t));
- char* iEnd = iBeg + getCommentSizeChar();
+ const char* iBeg =
+ reinterpret_cast<const char*>(getBlobStart()+getHdrSize() +
+ getNObjs()*getObjSizeUint32() +
+ sizeof(uint64_t)/sizeof(uint32_t));
+ const char* iEnd = iBeg + getCommentSizeChar();
iBeg = std::find(iBeg,iEnd,0);
return std::string(++iBeg);
}
@@ -181,7 +203,8 @@ CaloCondBlobBase::getDate() const
{
if(!getCommentSizeUint32()) return std::string("");
::time_t timeStamp = getTimeStamp();
- char* iBeg = ::ctime(&timeStamp);
+ char buf[23];
+ char* iBeg = ::ctime_r(&timeStamp, buf);
char* iEnd = iBeg;
while(*iEnd!='\n'){++iEnd;}
return std::string(iBeg,iEnd-iBeg);
diff --git a/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobFlt.cxx b/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobFlt.cxx
index d669f6ef23fb7f253c79bcb34d6906ce4e9c75c9..817ddb32353d3306e335ae2dcfa16fe5f601ebaf 100644
--- a/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobFlt.cxx
+++ b/Calorimeter/CaloCondBlobObjs/src/CaloCondBlobFlt.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloCondBlobObjs/CaloCondBlobFlt.h"
@@ -34,6 +34,19 @@ CaloCondBlobFlt::CaloCondBlobFlt(const coral::Blob& blob)
}
}
+//
+//_______________________________________________________________
+CaloCondBlobFlt::CaloCondBlobFlt(coral::Blob& blob)
+ : CaloCondBlobDat<float>(blob)
+{
+ //=== check for correct blob type
+ if(getBlobSize()){
+ if(getObjType() != getType()){
+ throw CaloCond::TypeConflict("CaloCondBlobFlt::Ctor",getObjType(),getType());
+ }
+ }
+}
+
//
//______________________________________________________________
float
diff --git a/Calorimeter/CaloCondBlobObjs/test/CaloCondBlobBase_test.cxx b/Calorimeter/CaloCondBlobObjs/test/CaloCondBlobBase_test.cxx
index 6c8316ea8822491a70ff988b4c3b249b71c05fe7..6ff78b1d2324de3439fa81b68a00075f91e82195 100644
--- a/Calorimeter/CaloCondBlobObjs/test/CaloCondBlobBase_test.cxx
+++ b/Calorimeter/CaloCondBlobObjs/test/CaloCondBlobBase_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#define BOOST_TEST_DYN_LINK
@@ -23,6 +23,9 @@ public:
CaloCondBlobStub(const coral::Blob & aBlob):CaloCondBlobBase(aBlob){
//nop
}
+ CaloCondBlobStub(coral::Blob & aBlob):CaloCondBlobBase(aBlob){
+ //nop
+ }
uint32_t
createBlobExposed(uint16_t objType,
uint16_t objVersion,
diff --git a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
index 2a7b7ca629b8d9ff8c323cfabe04bd4eed4cad7d..07375e965d69b678018d9894da2768db41a07a5a 100644
--- a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
+++ b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
@@ -1,45 +1,13 @@
-################################################################################
-# Package: CaloCondPhysAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondPhysAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- GaudiKernel
- LArCalorimeter/LArCabling
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRecUtils
- LArCalorimeter/LArTools
- LArCalorimeter/LArRawConditions
- Trigger/TrigAnalysis/TrigDecisionTool
- PRIVATE
- Calorimeter/CaloConditions
- Calorimeter/CaloEvent
- Calorimeter/CaloUtils
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- Event/xAOD/xAODEventInfo
- LArCalorimeter/LArGeoModel/LArHV
- LArCalorimeter/LArGeoModel/LArReadoutGeometry
- LArCalorimeter/LArSimEvent
- Control/CxxUtils)
-
# External dependencies:
find_package( CLHEP )
find_package( COOL COMPONENTS CoolKernel )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CORAL COMPONENTS CoralBase )
+find_package( ROOT COMPONENTS Core Tree )
# Component(s) in the package:
atlas_add_component( CaloCondPhysAlgs
@@ -47,8 +15,8 @@ atlas_add_component( CaloCondPhysAlgs
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} ${CLHEP_LIBRARIES} CaloCondBlobObjs CaloDetDescrLib CaloGeoHelpers
- CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel LArCablingLib LArIdentifier TrigDecisionToolLib LArRawConditions
- CaloConditions CaloEvent CaloUtilsLib AthenaPoolUtilities Identifier xAODEventInfo LArHV LArReadoutGeometry LArSimEvent CxxUtils)
+ CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel LArCablingLib LArElecCalib LArIdentifier TrigDecisionToolLib LArRawConditions
+ CaloConditions CaloEvent CaloInterfaceLib CaloUtilsLib AthenaPoolUtilities Identifier xAODEventInfo LArHV LArReadoutGeometry LArSimEvent CxxUtils)
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Calorimeter/CaloConditions/CMakeLists.txt b/Calorimeter/CaloConditions/CMakeLists.txt
index 2f59bd843129689d30eea7c0ed3893189fd87689..660f86bec23a0474f3034dff1c0550cbd49e446f 100644
--- a/Calorimeter/CaloConditions/CMakeLists.txt
+++ b/Calorimeter/CaloConditions/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: CaloConditions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloConditions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/CxxUtils
- Control/AthenaKernel
- DetectorDescription/Identifier
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloIdentifier
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system timer )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -25,22 +12,19 @@ atlas_add_library( CaloConditions
src/*.cxx
PUBLIC_HEADERS CaloConditions
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES CxxUtils Identifier CaloIdentifier CaloCondBlobObjs AthenaKernel GaudiKernel
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} TestTools )
+ LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils Identifier CaloIdentifier CaloCondBlobObjs AthenaKernel GaudiKernel
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( CaloConditionsDict
CaloConditions/CaloConditionsDict.h
CaloConditions/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils Identifier GaudiKernel TestTools CaloConditions )
+ LINK_LIBRARIES CaloConditions )
atlas_add_test( ToolConstants_test
SOURCES
test/ToolConstants_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils Identifier GaudiKernel TestTools CaloConditions )
+ LINK_LIBRARIES CaloConditions )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Calorimeter/CaloConditions/CaloConditions/CaloLocalHadCoeff.h b/Calorimeter/CaloConditions/CaloConditions/CaloLocalHadCoeff.h
index 4ee43eaa910ceae92b00f4a2752f01d73acf613b..ca91e017fbf63924d550f67a76e58da0a2d360ad 100644
--- a/Calorimeter/CaloConditions/CaloConditions/CaloLocalHadCoeff.h
+++ b/Calorimeter/CaloConditions/CaloConditions/CaloLocalHadCoeff.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOCONDITIONS_CALOLOCALHADCOEFF_H
@@ -72,12 +72,13 @@ class CaloLocalHadCoeff {
* @param xbins Bins borders, vector of size m_nbins+1
*/
LocalHadDimension(const char *title, unsigned int typ, std::vector<float > &xbins) :
- m_title(title), m_type(typ), m_dx(0.0)
+ m_title(title), m_type(typ),
+ m_nbins (xbins.size() - 1),
+ m_xmin (xbins.front()),
+ m_xmax (xbins.back()),
+ m_dx(0.0),
+ m_xbins (xbins)
{
- m_xbins = xbins;
- m_xmin = xbins.front();
- m_xmax = xbins.back();
- m_nbins = xbins.size() -1;
}
/**
* @brief Copy constructor
diff --git a/Calorimeter/CaloConditions/CaloConditions/ToolConstants.h b/Calorimeter/CaloConditions/CaloConditions/ToolConstants.h
index f0bcd25b581e12a0b9ce30a06f308151c1ba662f..21c1ff355dc7f84493e13a000404daa30da8d943 100755
--- a/Calorimeter/CaloConditions/CaloConditions/ToolConstants.h
+++ b/Calorimeter/CaloConditions/CaloConditions/ToolConstants.h
@@ -1,10 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id: ToolConstants.h,v 1.5 2009-04-09 14:41:17 ssnyder Exp $
/**
* @file ToolConstants.h
* @author scott snyder <snyder@bnl.gov>
diff --git a/Calorimeter/CaloConditions/src/ToolConstants.cxx b/Calorimeter/CaloConditions/src/ToolConstants.cxx
index e3527bdb80b84e587535cff3151682835019975a..007fdd6081ddebf879348019b7ab0ec1ac9a6eb6 100755
--- a/Calorimeter/CaloConditions/src/ToolConstants.cxx
+++ b/Calorimeter/CaloConditions/src/ToolConstants.cxx
@@ -125,11 +125,9 @@ void ToolConstants::error (const std::string& context,
void ToolConstants::writeConstants(std::ostream& stream,
const std::string& name) const
{
- Maptype::const_iterator it=m_map.begin();
- Maptype::const_iterator it_e=m_map.end();
- for (;it!=it_e;it++) {
- stream << name << "." << it->first << " = ";
- it->second.write_array(stream);
+ for (const std::pair<const std::string, CxxUtils::Arrayrep>& p : m_map) {
+ stream << name << "." << p.first << " = ";
+ p.second.write_array(stream);
}
stream << std::endl;
}
diff --git a/Calorimeter/CaloDmDetDescr/CMakeLists.txt b/Calorimeter/CaloDmDetDescr/CMakeLists.txt
index a8030ad3bf598b9d0deb70213301b4c79a168ae9..be2ccb33fab360383530bacc589da1f16db5438e 100644
--- a/Calorimeter/CaloDmDetDescr/CMakeLists.txt
+++ b/Calorimeter/CaloDmDetDescr/CMakeLists.txt
@@ -1,24 +1,13 @@
-################################################################################
-# Package: CaloDmDetDescr
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloDmDetDescr )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/StoreGate
- PRIVATE
- Control/AthenaKernel
- GaudiKernel
- Tools/PathResolver )
-
# Component(s) in the package:
atlas_add_library( CaloDmDetDescr
src/*.cxx
PUBLIC_HEADERS CaloDmDetDescr
- LINK_LIBRARIES CaloIdentifier StoreGateLib SGtests
+ LINK_LIBRARIES CaloIdentifier StoreGateLib
PRIVATE_LINK_LIBRARIES AthenaKernel GaudiKernel PathResolver )
# Install files from the package:
diff --git a/Calorimeter/CaloEvent/CMakeLists.txt b/Calorimeter/CaloEvent/CMakeLists.txt
index 39776224fdd061aac017a4f7523129c41b01f924..5a2cab4b510ebae8b0e3664ceb5b77da056999e7 100644
--- a/Calorimeter/CaloEvent/CMakeLists.txt
+++ b/Calorimeter/CaloEvent/CMakeLists.txt
@@ -1,43 +1,14 @@
-################################################################################
-# Package: CaloEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloEvent )
# Extra dependencies, based on the environment:
-set( extra_deps )
set( extra_libs )
if( NOT GENERATIONBASE )
- set( extra_deps LArCalorimeter/LArRawConditions ) # not ideal... LAr should depend on Calo
set( extra_libs LArRawConditions )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Control/AthAllocators
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- Control/CxxUtils
- Control/Navigation
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- Event/EventKernel
- Event/FourMom
- Event/NavFourMom
- ${extra_deps}
- PRIVATE
- AtlasTest/TestTools
- Control/StoreGate
- DetectorDescription/IdDictParser
- GaudiKernel )
-
# External dependencies:
find_package( Boost )
find_package( CLHEP )
diff --git a/Calorimeter/CaloEvent/CaloEvent/CaloCellClusterWeights.h b/Calorimeter/CaloEvent/CaloEvent/CaloCellClusterWeights.h
new file mode 100644
index 0000000000000000000000000000000000000000..2f3ad212b7ee36ef0911aec046eb3baae1383d19
--- /dev/null
+++ b/Calorimeter/CaloEvent/CaloEvent/CaloCellClusterWeights.h
@@ -0,0 +1,159 @@
+// -*- c++ -*-
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+
+#ifndef CALOEVENT_CALOCELLCLUSTERWEIGHTS_H
+#define CALOEVENT_CALOCELLCLUSTERWEIGHTS_H
+
+#include "AthenaKernel/CLASS_DEF.h"
+
+#include <string>
+#include <vector>
+#include <boost/tuple/tuple.hpp>
+
+class CaloCell;
+
+/// @brief Hash lookup of calibration weights for calorimeter cells
+///
+/// This object wraps a random access lookup of calibration weights based on the hash id of a calorimeter cell. It is meant to
+/// provide these weights to several tools, thus e.g. reducing the number of searches for cells in topo-clusters.
+///
+/// The data object reserves a fixed memory segment sufficient to store one weight per cell, and is of a fixed size which is defaulted to
+/// the total number of calorimeter cells, but can also be set at construction.
+class CaloCellClusterWeights
+{
+public:
+
+ /// @name Storage and payload types
+ /// @{
+ typedef std::vector<double> weight_t; ///< @brief Type of weight
+ typedef boost::tuples::tuple<bool,weight_t> value_t; ///< @brief Type of payload
+ typedef std::vector<value_t> store_t; ///< @brief Store type
+ typedef store_t::const_iterator const_iterator; ///< @brief Iterator type for const access
+ typedef store_t::iterator iterator; ///< @brief Iterator type
+ /// @}
+
+ /// @brief Default constructor
+ ///
+ /// The constructed data object provides a reserved and sized store appropriate for the total number of cells in the calorimeter.
+ /// The store is pre-filled with the default payload value (0).
+ CaloCellClusterWeights();
+ /// @brief Constructor with client-defined size
+ ///
+ /// A store with the specified size is created and pre-filled with the default payload value (0).
+ ///
+ /// @param size requested store size
+ CaloCellClusterWeights(size_t size);
+ /// @brief Copy constructor
+ CaloCellClusterWeights(const CaloCellClusterWeights& cellClusterWeights);
+ /// @brief Destructor
+ virtual ~CaloCellClusterWeights();
+
+ /// @name Random access to payload
+ /// @{
+ /// @brief Accessing value using operator
+ ///
+ /// @return Stored value at given index if index is valid, else payload default value (0).
+ /// @param hash index (calorimeter cell hash id)
+ const weight_t& operator[](size_t hash) const;
+ /// @brief Accessing value using function and hash
+ ///
+ /// @return Stored value at given index if index is valid, else payload default value (0).
+ /// @param hash index (calorimeter cell hash id)
+ const weight_t& at(size_t hash) const;
+ /// @brief Accessing value using function and cell pointer
+ ///
+ /// @return Stored value at given index if index is valid, else payload default value (0).
+ /// @param hash index (calorimeter cell hash id)
+ const weight_t& at(const CaloCell* pCell) const;
+ /// @brief Safe checking if cell is used by any cluster
+ ///
+ /// @return @c true if cell is part of any cluster and has valid hash index
+ bool check(size_t hash) const;
+ /// @brief Safe checking if cell is used by any cluster
+ ///
+ /// @return @c true if cell is part of any cluster and has valid hash index
+ bool check(const CaloCell* pCell) const;
+ /// @brief Fast checking if cell is used by any cluster
+ ///
+ /// @return @c true if cell is part of any cluster
+ bool fastCheck(size_t hash) const;
+ /// @brief Fast checking if cell is used by any cluster
+ ///
+ /// @return @c true if cell is part of any cluster
+ bool fastCheck(const CaloCell* pCell) const;
+ /// @}
+
+ /// @name Store modifiers
+ /// @{
+ /// @brief Loading a value by hash id
+ ///
+ /// This method overwrites the stored value at the given index. It also sets the "used" flag in the store for the cell.
+ /// @param hash index in store
+ /// @param value value to be stored at index
+ void set(size_t hash,double value);
+ /// @brief Loading a value by cell pointer
+ ///
+ /// This method overwrites the stored value at the given index. It also sets the "used" flag in the store for the cell.
+ /// @param hash index in store
+ /// @param value value to be stored at index
+ void set(const CaloCell* pCell,double value);
+ /// @brief Reset the store
+ ///
+ /// All stored values are overwritten with the default payload value (0).
+ void reset();
+ /// @brief Clear the store
+ ///
+ /// All stored values are overwritten with the default payload value (0).
+ void clear();
+ /// @brief Clear a specific entry in the store
+ ///
+ /// The value stored at the given index is overwritten with the default payload value (0).
+ /// @param hash index in store
+ void clear(size_t hash);
+ /// @}
+
+ /// @name Store parameters
+ /// @{
+ size_t size() const; ///< Store size
+ size_t reserve() const; ///< Reserved memory
+ /// @}
+
+ /// @name Iterators
+ /// @{
+ const_iterator begin() const; ///< Constant access iterator pointing to beginning of the store
+ const_iterator end() const; ///< Constant iterator indicating the end of the store
+ iterator begin(); ///< Access iterator pointing to beginning of the store
+ iterator end(); ///< Iterator indicating the end of the store
+ /// @}
+
+ /// @name Store access
+ /// @{
+ const store_t& store() const; ///< Read-only access to underlying store
+ store_t& store(); ///< Read/write access to underlying store
+ /// @}
+
+ /// @brief Construct a SG key for this object
+ static std::string key(const std::string& pref);
+
+private:
+
+ store_t m_hashTable; ///< Store implementation
+ weight_t m_defaultValue { weight_t() }; ///< Default (empty) entry
+};
+
+//CLASS_DEF( CaloCellClusterWeights, 249044352, 1 )
+
+inline CaloCellClusterWeights::const_iterator CaloCellClusterWeights::begin() const { return m_hashTable.begin(); }
+inline CaloCellClusterWeights::iterator CaloCellClusterWeights::begin() { return m_hashTable.begin(); }
+
+inline CaloCellClusterWeights::const_iterator CaloCellClusterWeights::end() const { return m_hashTable.end(); }
+inline CaloCellClusterWeights::iterator CaloCellClusterWeights::end() { return m_hashTable.end(); }
+
+inline size_t CaloCellClusterWeights::size() const { return m_hashTable.size(); }
+inline size_t CaloCellClusterWeights::reserve() const { return m_hashTable.capacity(); }
+
+inline const CaloCellClusterWeights::store_t& CaloCellClusterWeights::store() const { return m_hashTable; }
+inline CaloCellClusterWeights::store_t& CaloCellClusterWeights::store() { return m_hashTable; }
+
+inline std::string CaloCellClusterWeights::key(const std::string& pref) { return pref+std::string("_CCW"); }
+#endif
diff --git a/Calorimeter/CaloEvent/src/CaloCellClusterWeights.cxx b/Calorimeter/CaloEvent/src/CaloCellClusterWeights.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..0185aa1e572b4ee492ac6284fb712a85f22292d7
--- /dev/null
+++ b/Calorimeter/CaloEvent/src/CaloCellClusterWeights.cxx
@@ -0,0 +1,59 @@
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+#include "CaloEvent/CaloCellClusterWeights.h"
+
+#include "CaloEvent/CaloCell.h"
+
+#include <algorithm>
+
+#ifndef CELLCLUSTERLOOKUP
+#define CELLCLUSTERLOOKUP 200000
+#endif
+
+CaloCellClusterWeights::CaloCellClusterWeights(size_t size)
+ : m_hashTable(size)
+{
+ this->clear();
+}
+
+CaloCellClusterWeights::CaloCellClusterWeights()
+ : CaloCellClusterWeights( CELLCLUSTERLOOKUP )
+{ }
+
+CaloCellClusterWeights::CaloCellClusterWeights(const CaloCellClusterWeights& cellClusterWeights)
+ : m_hashTable(cellClusterWeights.m_hashTable)
+{ }
+
+CaloCellClusterWeights::~CaloCellClusterWeights()
+{ }
+
+const CaloCellClusterWeights::weight_t& CaloCellClusterWeights::operator[](size_t hash) const
+{ return this->check(hash) ? m_hashTable.at(hash).get<1>() : m_defaultValue; }
+const CaloCellClusterWeights::weight_t& CaloCellClusterWeights::at(size_t hash) const
+{ return this->check(hash) ? m_hashTable.at(hash).get<1>() : m_defaultValue; }
+const CaloCellClusterWeights::weight_t& CaloCellClusterWeights::at(const CaloCell* pCell) const
+{ return this->at(static_cast<size_t>(pCell->caloDDE()->calo_hash())); }
+
+bool CaloCellClusterWeights::fastCheck(size_t hash) const { return m_hashTable.at(hash).get<0>(); }
+bool CaloCellClusterWeights::fastCheck(const CaloCell* pCell) const { return this->fastCheck(static_cast<size_t>(pCell->caloDDE()->calo_hash())); }
+bool CaloCellClusterWeights::check(size_t hash) const { return hash < m_hashTable.size() && this->fastCheck(hash); }
+bool CaloCellClusterWeights::check(const CaloCell* pCell) const { return this->check(static_cast<size_t>(pCell->caloDDE()->calo_hash())); }
+
+void CaloCellClusterWeights::set(size_t hash,double value)
+{
+ if ( hash < m_hashTable.size() ) {
+ if ( this->fastCheck(hash) ) {
+ m_hashTable[hash].get<1>().push_back(value);
+ } else {
+ m_hashTable[hash].get<0>() = true;
+ m_hashTable[hash].get<1>().push_back(value);
+ }
+ }
+}
+
+void CaloCellClusterWeights::set(const CaloCell* pCell,double value) { this->set(static_cast<size_t>(pCell->caloDDE()->calo_hash()),value); }
+
+void CaloCellClusterWeights::clear() { std::fill(m_hashTable.begin(),m_hashTable.end(),value_t(false,m_defaultValue)); }
+void CaloCellClusterWeights::clear(size_t hash) {
+ if ( hash < m_hashTable.size() ) { m_hashTable[hash].get<0>() = false; m_hashTable[hash].get<1>() = m_defaultValue; }
+}
+void CaloCellClusterWeights::reset() { this->clear(); }
diff --git a/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py b/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py
index db91de8baf3088653b0c4291b3957d9e9b8ce83c..136e4c3b1ffa7586dedafd621aa94f1e598e6f2c 100644
--- a/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py
+++ b/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py
@@ -17,6 +17,12 @@ CaloClusterItemList=[]
CaloClusterKeys=[]
CaloClusterKeys+=["CaloCalTopoClusters"]
+if jobproperties.CaloRecFlags.doCaloTopoTower.get_Value():
+ CaloClusterKeys+=["CaloCalTopoTowers"]
+if jobproperties.CaloRecFlags.doCaloTopoSignal.get_Value():
+ CaloClusterKeys+=["CaloCalTopoSignals"]
+##CaloClusterKeys+=["CaloCalFwdTopoTowers"]
+
CaloClusterKeys+=["CombinedCluster"]
#CaloClusterKeys+=["EMTopoCluster430"]
CaloClusterKeys+=["EMTopoSW35"]
@@ -105,6 +111,18 @@ AODMoments=[#"LATERAL"
,"BadChannelList"
,#"LATERAL"
]
+
+if jobproperties.CaloRecFlags.doExtendedClusterMoments.get_Value():
+ AODMoments += ["LATERAL"
+ ,"LONGITUDINAL"
+ ,"ENG_BAD_HV_CELLS"
+ ,"N_BAD_HV_CELLS"
+ ,"SIGNIFICANCE"
+ ,"CELL_SIGNIFICANCE"
+ ,"CELL_SIG_SAMPLING"
+ ,"PTD"
+ ,"MASS"
+ ]
try:
from Digitization.DigitizationFlags import digitizationFlags
if digitizationFlags.doDigiTruth():
@@ -133,6 +151,15 @@ try:
,"ETA_DigiHSTruth"
,"PHI_DigiHSTruth"
]
+ if jobproperties.CaloRecFlags.doExtendedClusterMoments.get_Value():
+ AODMoments+=["ENG_BAD_HV_CELLS_Truth"
+ ,"N_BAD_HV_CELLS_Truth"
+ ,"SIGNIFICANCE_Truth"
+ ,"CELL_SIGNIFICANCE_Truth"
+ ,"CELL_SIG_SAMPLING_Truth"
+ ,"PTD_Truth"
+ ]
+
except:
log = logging.getLogger('CaloRecOutputItemList')
log.info('Unable to import DigitizationFlags in CaloRecOutputItemList_jobOptions. Expected in AthenaP1')
@@ -149,6 +176,11 @@ CaloClusterKeys=[]
CaloClusterKeys+=["CaloCalTopoClusters"]
+if jobproperties.CaloRecFlags.doCaloTopoTower.get_Value():
+ CaloClusterKeys+=["CaloCalTopoTowers"]
+if jobproperties.CaloRecFlags.doCaloTopoSignal.get_Value():
+ CaloClusterKeys+=["CaloCalTopoSignals"]
+
CaloClusterKeys+=["CombinedCluster"]
#CaloClusterKeys+=["EMTopoCluster430"]
CaloClusterKeys+=["EMTopoSW35"]
diff --git a/Calorimeter/CaloExample/CaloTests/CMakeLists.txt b/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
index a5f2473b8234e7d3671796c38d8043579c265835..4b3ddcb9c00a2e57e04bbf1b1e7936f01a7c7bf3 100644
--- a/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
+++ b/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
@@ -1,46 +1,19 @@
-################################################################################
-# Package: CaloTests
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTests )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Control/StoreGate
- DetectorDescription/Identifier
- GaudiKernel
- LArCalorimeter/LArElecCalib
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloSimEvent
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- Generators/AtlasHepMC
- Generators/GeneratorObjects
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRawEvent
- LArCalorimeter/LArRawUtils
- LArCalorimeter/LArSimEvent
- LArCalorimeter/LArCabling )
-
# External dependencies:
find_package( AIDA )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_component( CaloTests
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib CaloDetDescrLib CaloIdentifier AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel CaloEvent CaloGeoHelpers CaloSimEvent AthenaKernel AtlasDetDescr GeneratorObjects LArIdentifier LArRawEvent LArRawUtilsLib LArSimEvent LArCablingLib )
+ INCLUDE_DIRS ${AIDA_INCLUDE_DIRS}
+ LINK_LIBRARIES AtlasHepMCLib CaloDetDescrLib CaloIdentifier AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel CaloEvent CaloGeoHelpers CaloSimEvent AthenaKernel AtlasDetDescr GeneratorObjects LArIdentifier LArRawEvent LArRawUtilsLib LArSimEvent LArCablingLib )
# Install files from the package:
-atlas_install_headers( CaloTests )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( test/CaloTests_TestConfiguration.xml share/*.C share/rttTest.css share/CaloTests_HistoComparison.txt share/*Checks.py )
diff --git a/Calorimeter/CaloIdentifier/CMakeLists.txt b/Calorimeter/CaloIdentifier/CMakeLists.txt
index 9a645822a8bf6607e1f188082f69ae7039d4cdc7..48b3b8ca1568f25b83cc686b102a825b548d318a 100644
--- a/Calorimeter/CaloIdentifier/CMakeLists.txt
+++ b/Calorimeter/CaloIdentifier/CMakeLists.txt
@@ -1,68 +1,43 @@
-################################################################################
-# Package: CaloIdentifier
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloIdentifier )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloGeoHelpers
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- DetectorDescription/IdDict
- DetectorDescription/Identifier
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/CxxUtils
- Control/StoreGate
- DetectorDescription/IdDictParser
- Tools/PathResolver )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( CaloIdentifier
src/*.cxx
PUBLIC_HEADERS CaloIdentifier
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools CxxUtils IdDictParser PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel
+ PRIVATE_LINK_LIBRARIES CxxUtils IdDictParser PathResolver )
atlas_add_dictionary( CaloIdentifierDict
CaloIdentifier/CaloIdentifierDict.h
CaloIdentifier/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier )
atlas_add_executable( test_lar_id
test/test_lar_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( test_calo_dm_id
test/test_calo_dm_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( test_cell_id
test/test_cell_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( test_lvl1_id
test/test_lvl1_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( caloCellLookup
utils/caloCellLookup.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
#atlas_add_test( GTower_ID_test
# SOURCES
@@ -81,91 +56,79 @@ atlas_add_executable( caloCellLookup
atlas_add_test( LArEM_ID_test
SOURCES
test/LArEM_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArEM_SuperCell_ID_test
SOURCES
test/LArEM_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArHEC_ID_test
SOURCES
test/LArHEC_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArHEC_SuperCell_ID_test
SOURCES
test/LArHEC_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArFCAL_ID_test
SOURCES
test/LArFCAL_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArFCAL_SuperCell_ID_test
SOURCES
test/LArFCAL_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArMiniFCAL_ID_test
SOURCES
test/LArMiniFCAL_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( TileID_test
SOURCES
test/TileID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( Tile_SuperCell_ID_test
SOURCES
test/Tile_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloCell_ID_test
SOURCES
test/CaloCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloCell_SuperCell_ID_test
SOURCES
test/CaloCell_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloIDHelper_test
SOURCES
test/CaloIDHelper_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloHelpersTest_test
SOURCES
test/CaloHelpersTest_test.cxx
- LINK_LIBRARIES CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloInterface/CMakeLists.txt b/Calorimeter/CaloInterface/CMakeLists.txt
index cb86afa8e98dee83803acf77d5def03999076c86..d88a1b539a2854dfba7e2f5d1bb11c9a8ffcf7cd 100644
--- a/Calorimeter/CaloInterface/CMakeLists.txt
+++ b/Calorimeter/CaloInterface/CMakeLists.txt
@@ -1,32 +1,16 @@
-################################################################################
-# Package: CaloInterface
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloInterface )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloConditions
- Control/AthenaKernel
- DetectorDescription/Identifier
- Event/xAOD/xAODCaloEvent
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( CaloInterfaceLib
CaloInterface/*.h
INTERFACE
PUBLIC_HEADERS CaloInterface
- LINK_LIBRARIES AthenaKernel CaloConditions CaloEvent CaloIdentifier GaudiKernel xAODCaloEvent )
+ LINK_LIBRARIES AthenaKernel CaloConditions CaloEvent CaloIdentifier CxxUtils GaudiKernel xAODCaloEvent )
atlas_add_dictionary( CaloInterfaceDict
CaloInterface/CaloInterfaceDict.h
CaloInterface/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloInterfaceLib )
+ LINK_LIBRARIES CaloInterfaceLib )
diff --git a/Calorimeter/CaloInterface/CaloInterface/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloInterface/CaloInterface/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..042fa631f1e10554a6cd66c2cd2256669e18b745
--- /dev/null
+++ b/Calorimeter/CaloInterface/CaloInterface/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloInterface
diff --git a/Calorimeter/CaloInterface/CaloInterface/IToolWithConstants.h b/Calorimeter/CaloInterface/CaloInterface/IToolWithConstants.h
index d58d79b057cb86e2492aa9ea8c39b6ad5840018b..ba5023b3c087c6ed4da59a00349f37bf132c123d 100644
--- a/Calorimeter/CaloInterface/CaloInterface/IToolWithConstants.h
+++ b/Calorimeter/CaloInterface/CaloInterface/IToolWithConstants.h
@@ -15,7 +15,7 @@
#include "CaloConditions/ToolConstants.h"
-#include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/EventContext.h"
#include <string>
@@ -27,7 +27,7 @@
* Defines operations needed by CaloClusterCorrDBWriter.
*/
class IToolWithConstants
- : virtual public IAlgTool
+ : virtual public IInterface
{
public:
DeclareInterfaceID (IToolWithConstants, 1, 0);
diff --git a/Calorimeter/CaloLocalHadCalib/CMakeLists.txt b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
index 39c7914a7451a59d796becedf759fe93ad3df950..2b2959e7946045e8e948cd331f147fd6cece05bc 100644
--- a/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
+++ b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
@@ -1,56 +1,27 @@
-################################################################################
-# Package: CaloLocalHadCalib
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloLocalHadCalib )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloGeoHelpers
- Control/AthenaBaseComps
- Control/StoreGate
- Control/CxxUtils
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloDmDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloSimEvent
- Calorimeter/CaloUtils
- Control/AthenaKernel
- Generators/GeneratorObjects
- TestBeam/TBEvent
- Tools/PathResolver )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
find_package( ROOT COMPONENTS Gpad Graf Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf3d Html Postscript Gui GX11TTF GX11 )
-# this line failed automatic conversion in cmt2cmake :
-# use AtlasReflex AtlasReflex-* External -no_CALOATHENAPOOL_ROOTauto_imports
-
# Component(s) in the package:
atlas_add_component( CaloLocalHadCalib
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib CxxUtils
- SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent CaloUtilsLib CxxUtils GaudiKernel GeneratorObjects PathResolver StoreGateLib TBEvent xAODCaloEvent )
atlas_add_dictionary( CaloLocalHadCalibDict
CaloLocalHadCalib/CaloLocalHadCalibDict.h
CaloLocalHadCalib/selection.xml
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib CxxUtils
- SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent CaloUtilsLib CxxUtils GaudiKernel GeneratorObjects PathResolver StoreGateLib TBEvent xAODCaloEvent )
# Install files from the package:
-atlas_install_headers( CaloLocalHadCalib )
atlas_install_joboptions( share/*.txt share/*.py )
atlas_install_runtime( share/CaloHadDMCoeff_init_v1.txt share/CaloHadDMCoeff_init_v2.txt )
diff --git a/Calorimeter/CaloLumiConditions/CMakeLists.txt b/Calorimeter/CaloLumiConditions/CMakeLists.txt
index e2cf193fd6fc6d1f6da20f313435c445bde713ef..55ba96083f619f8534c7b27edeb04b0e5a152457 100644
--- a/Calorimeter/CaloLumiConditions/CMakeLists.txt
+++ b/Calorimeter/CaloLumiConditions/CMakeLists.txt
@@ -1,22 +1,8 @@
-################################################################################
-# Package: CaloLumiConditions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloLumiConditions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/CxxUtils
- Control/AthenaKernel
- DetectorDescription/Identifier
- PRIVATE
- DetectorDescription/IdDictParser
- AtlasTest/TestTools
- LumiBlock/LumiBlockData
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier )
-
# External dependencies:
find_package( Boost COMPONENTS timer )
@@ -24,21 +10,18 @@ find_package( Boost COMPONENTS timer )
atlas_add_library( CaloLumiConditions
src/*.cxx
PUBLIC_HEADERS CaloLumiConditions
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES CxxUtils Identifier AthenaKernel LArElecCalib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} TestTools LArIdentifier LumiBlockData )
+ PRIVATE_LINK_LIBRARIES LArIdentifier LumiBlockData )
atlas_add_test( CaloBCIDCoeffs_test
SOURCES
test/CaloBCIDCoeffs_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils Identifier TestTools CaloLumiConditions IdDictParser LArIdentifier LArElecCalib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} CaloLumiConditions IdDictParser LArIdentifier TestTools )
atlas_add_test( CaloBCIDLumi_test
SOURCES
test/CaloBCIDLumi_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils Identifier TestTools CaloLumiConditions IdDictParser LumiBlockData LArIdentifier LArElecCalib
+ LINK_LIBRARIES CaloLumiConditions IdDictParser LArIdentifier LumiBlockData TestTools
PROPERTIES TIMEOUT 300 )
-
-
diff --git a/Calorimeter/CaloRec/CMakeLists.txt b/Calorimeter/CaloRec/CMakeLists.txt
index 4ab7bf01e16e56f07df5df2dc1e5cda9fb3ff1ad..1b8deec908aeb85ca6ee690b50099a3398689fcd 100644
--- a/Calorimeter/CaloRec/CMakeLists.txt
+++ b/Calorimeter/CaloRec/CMakeLists.txt
@@ -1,44 +1,8 @@
-################################################################################
-# Package: CaloRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloEvent
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/CxxUtils
- Control/AthAllocators
- DetectorDescription/IdDictParser
- DetectorDescription/Identifier
- Event/EventKernel
- Event/FourMom
- Event/NavFourMom
- Event/xAOD/xAODEventInfo
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Calorimeter/CaloUtils
- Calorimeter/CaloLumiConditions
- LArCalorimeter/LArTools
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRawConditions
- LumiBlock/LumiBlockComps
- Control/AthenaMonitoringKernel )
-
# External dependencies:
find_package( AIDA )
find_package( CLHEP )
@@ -60,8 +24,7 @@ atlas_add_library( CaloRecLib
StoreGateLib LArToolsLib LumiBlockCompsLib AthenaMonitoringKernelLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES}
${EIGEN_LIBRARIES} AthAllocators IdDictParser EventKernel CaloLumiConditions
- LArRawConditions
- FourMom NavFourMom )
+ LArRawConditions FourMom NavFourMom )
atlas_add_component( CaloRec
src/components/*.cxx
@@ -137,7 +100,7 @@ atlas_add_test( CaloThinCellsByClusterAlg_test
atlas_add_test( ToolConstantsCondAlg_test
SCRIPT test/ToolConstantsCondAlg_test.py
- LOG_IGNORE_PATTERN "Cache alignment|Current filenames|Unable to locate catalog|peeking into" )
+ LOG_IGNORE_PATTERN "Cache alignment|Current filenames|Unable to locate catalog|peeking into|IOVDbSvc +INFO" )
atlas_add_test( CaloCellContainerAliasAlgConfig_test
diff --git a/Calorimeter/CaloRec/CaloRec/CaloTowerCollectionProcessor.h b/Calorimeter/CaloRec/CaloRec/CaloTowerCollectionProcessor.h
new file mode 100644
index 0000000000000000000000000000000000000000..784e1fefd8d733f90af2bed1cf0aa9009601d772
--- /dev/null
+++ b/Calorimeter/CaloRec/CaloRec/CaloTowerCollectionProcessor.h
@@ -0,0 +1,49 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: CaloTowerCollectionProcessor.h, 2020-09-16 03:49:56 ssnyder Exp $
+/**
+ * @file CaloTowerCollectionProcessor.h
+ * @author Tasnuva Chowdhury
+ * @date September, 2020
+ * @brief Base class for cluster processing tools called from
+ * @c CaloClusterMaker.
+ *
+ */
+
+#ifndef CALOREC_CALOTOWERCOLLECTIONPROCESSOR_H
+#define CALOREC_CALOTOWERCOLLECTIONPROCESSOR_H
+
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
+#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+#include "CaloEvent/CaloCellClusterWeights.h"
+
+static const InterfaceID IID_CaloTowerCollectionProcessor ("CaloTowerCollectionProcessor", 1 , 0);
+
+class CaloTowerCollectionProcessor
+ : virtual public IAlgTool
+{
+public:
+
+ /**
+ * @brief Execute on an entire collection of clusters.
+ * @param collection The container of clusters.
+ * param ctx The event context.
+ */
+ virtual StatusCode execute (const EventContext& ctx,
+ xAOD::CaloClusterContainer* collection,
+ CaloCellClusterWeights* cellWeights) const = 0;
+ /**
+ * @brief Standard Gaudi interface ID method.
+ */
+ static const InterfaceID& interfaceID() {return IID_CaloTowerCollectionProcessor;}
+};
+
+
+#endif // not CALOREC_CaloTowerCollectionProcessor_H
diff --git a/Calorimeter/CaloRec/python/CaloConfigFlags.py b/Calorimeter/CaloRec/python/CaloConfigFlags.py
index 75ae806ab7007b783056b076441fe5913ed0f022..d21452e1f79257cf27b9056e5276ad9a405f169c 100644
--- a/Calorimeter/CaloRec/python/CaloConfigFlags.py
+++ b/Calorimeter/CaloRec/python/CaloConfigFlags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.AthConfigFlags import AthConfigFlags
@@ -21,4 +21,57 @@ def createCaloConfigFlags():
ccf.addFlag("Calo.TopoCluster.doTreatEnergyCutAsAbsolute",False)
ccf.addFlag("Calo.TopoCluster.doTopoClusterLocalCalib",True)
+ #### Cluster correction flags:
+ # If true, then reweight cells to prevent double-counting between clusters.
+ ccf.addFlag ('Calo.ClusterCorrection.doSlidingWindowCellWeights', False)
+
+ # If true, then among groups of clusters very close to each other,
+ # remove all clusters but one.
+ ccf.addFlag ('Calo.ClusterCorrection.doSlidingWindowRemoveDuplicates', False)
+
+ # If true, remove clusters with energy below a threshold.
+ ccf.addFlag ('Calo.ClusterCorrection.doSlidingWindowRemoveBad', True)
+
+ # Defines from where we should try to construct the tools.
+ # May be one of 'jo', 'pool', 'cool'.
+ # May also be a list of them, to try in order.
+ # It may also be set to a string defined in poolfiles to try to
+ # read all tools from that file (except those marked as nopool).
+ ccf.addFlag ('Calo.ClusterCorrection.defaultSource',
+ ['cool', 'pool', 'jo'])
+
+ # Override the default correction version for sliding window clusters.
+ ccf.addFlag ('Calo.ClusterCorrection.caloSwWhichCorrection', '')
+
+ # Override the default correction version for EM topo clusters.
+ ccf.addFlag ('Calo.ClusterCorrection.caloTopoEMWhichCorrection', '')
+
+ # This flag allows setting additional correction arguments for
+ # sliding window clusters. It should normally be empty, but it may be
+ # set for testing new correction versions.
+ ccf.addFlag ('Calo.ClusterCorrection.caloSwCorrectionArgs', {})
+
+ # This flag allows setting additional correction arguments for
+ # EM topo clusters. It should normally be empty, but it may be
+ # set for testing new correction versions.
+ ccf.addFlag ('Calo.ClusterCorrection.caloTopoEMCorrectionArgs', {})
+
+ # Correction generation string that's embedded in database tags.
+ # This string gets changed every time the database is updated.
+ ccf.addFlag ('Calo.ClusterCorrection.caloSwGeneration', '')
+
+ # Correction generation string that's embedded in database tags.
+ # This string gets changed every time the database is updated.
+ ccf.addFlag ('Calo.ClusterCorrection.caloTopoEMGeneration', '')
+
+ # This flag allows overriding the subdetector name used for
+ # database connections. It's a dictionary, the keys of which are the
+ # correction classes (normally either `CaloSwClusterCorrections'
+ # or `EMTopoClusterCorrections'). If the correction class isn't
+ # found, we use a key of None instead as a default.
+ #
+ # The subdetector name is normally `CALO'. However, it can be set to the
+ # name of a local sqlite file to force reading COOL information from there.
+ ccf.addFlag ('Calo.ClusterCorrection.dbSubdetName', {None : 'CALO'})
+
return ccf
diff --git a/Calorimeter/CaloRec/python/CaloRecFlags.py b/Calorimeter/CaloRec/python/CaloRecFlags.py
index 6fa0d33277e133b1ab6e4f14eb93a59fb2276853..c72e2978e0fb690d8ee007abe5857bf2c674e1bb 100644
--- a/Calorimeter/CaloRec/python/CaloRecFlags.py
+++ b/Calorimeter/CaloRec/python/CaloRecFlags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#=======================================================================
# File: RecExConfig/python/CaloFlags.py
@@ -94,6 +94,20 @@ class doCaloTopoTower(CaloRecFlagsJobProperty):
statusOn=True
allowedTypes=['bool']
StoredValue=False
+
+class doCaloTopoSignal(CaloRecFlagsJobProperty):
+ """ produce mixed topo-cluster and topo-tower container
+ """
+ statusOn=True
+ allowedTypes=['bool']
+ storedValue=False
+
+class doExtendedClusterMoments(CaloRecFlagsJobProperty):
+ """ add more cluster moments for R&D
+ """
+ statusOn=True
+ allowedTypes=['bool']
+ storedValue=True
class doTileMuId(CaloRecFlagsJobProperty):
""" switch for TileMuId - muon finding algorighm
@@ -170,7 +184,7 @@ jobproperties.add_Container(CaloRecFlags)
# I want always the following flags in the Rec container
-_list_Calo=[Enabled,doCaloTopoCluster,doEmCluster,doCaloEMTopoCluster,emTopoClusterThreshold,doCaloCluster,doCaloTopoTower,doTileMuId,doTileCellCorrection,doLArAffectedRegion,doLArAutoConfiguration,doLArNoisyRO,doEMDigits,doFillMBTSBackgroundBit,doLArNoiseBurstVeto,clusterCellGetterName,doCaloTowerFromCells,doCaloTowerFromCluster]
+_list_Calo=[Enabled,doCaloTopoCluster,doEmCluster,doCaloEMTopoCluster,emTopoClusterThreshold,doCaloCluster,doCaloTopoTower,doCaloTopoSignal,doExtendedClusterMoments,doTileMuId,doTileCellCorrection,doLArAffectedRegion,doLArAutoConfiguration,doLArNoisyRO,doEMDigits,doFillMBTSBackgroundBit,doLArNoiseBurstVeto,clusterCellGetterName,doCaloTowerFromCells,doCaloTowerFromCluster]
for j in _list_Calo:
jobproperties.CaloRecFlags.add_JobProperty(j)
del _list_Calo
diff --git a/Calorimeter/CaloRec/python/MakeTowersFromClusters.py b/Calorimeter/CaloRec/python/MakeTowersFromClusters.py
new file mode 100644
index 0000000000000000000000000000000000000000..11f243a88dae6cc1bb24309e832c843039a09b65
--- /dev/null
+++ b/Calorimeter/CaloRec/python/MakeTowersFromClusters.py
@@ -0,0 +1,261 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+
+from CaloRec.CaloRecConf import CaloTopoTowerFromClusterMaker
+from CaloRec.CaloRecConf import CaloTowerGeometrySvc
+
+from AthenaCommon.Logging import logging
+import AthenaCommon.Constants as Lvl
+#from AthenaCommon.GlobalFlags import globalflags
+
+####################################
+## Tower configuration dictionary ##
+####################################
+
+def TowersFromClustersDict(clusterBuilderName = 'TowerFromClusterTool',
+ towerGeometrySvc = CaloTowerGeometrySvc('CaloTowerGeometrySvc'),
+ cellContainerKey = 'AllCalo',
+ buildTopoTowers = True,
+ topoClusterContainerKey = 'CaloTopoCluster',
+ orderClusterByPt = False,
+ applyCellEnergyThreshold = False,
+ doCellIndexCheck = False,
+ cellEnergyThreshold = 0.,
+ applyLCW = False,
+ buildCombinedSignal = False,
+ clusterRange = 5.):
+ ''' Configuration dictionary for tower-to-cluster converter
+ '''
+ configDict = { 'ClusterBuilderName' : clusterBuilderName, ### name of the tower builder tool
+ 'CaloTowerGeometrySvc' : towerGeometrySvc, ### tower geometry provider
+ 'CaloCellContainerKey' : cellContainerKey, ### (input) cell container key
+ 'CaloTopoClusterContainerKey' : topoClusterContainerKey, ### (input) topo-cluster container key
+ 'BuildTopoTowers' : buildTopoTowers, ### (control) form topo-towers
+ 'OrderClusterByPt' : orderClusterByPt, ### (control) order final clusters by Pt
+ 'ApplyCellEnergyThreshold' : applyCellEnergyThreshold, ### (control) apply energy thresholds to cells
+ 'CellEnergyThreshold' : cellEnergyThreshold, ### (control) value of energy threshold
+ 'PrepareLCW' : applyLCW, ### (control) prepare (and apply) LCW
+ 'DoCellIndexCheck' : doCellIndexCheck, ### (control) check cell hash indices
+ 'BuildCombinedTopoSignal' : buildCombinedSignal, ### (control) build combined topo-cluster/topo-tower container
+ 'TopoClusterRange' : clusterRange, ### (control) range for topo-cluster in combined mode
+ }
+ return configDict
+
+###################################
+## Tower algorithm configuration ##
+###################################
+
+def MakeTowersFromClusters(towerMakerName = 'CaloTowerBuilderAlg', ### name of tower builder algorithm
+ towerContainerKey = 'CaloTowerTopoCluster', ### output container key
+ configDict = TowersFromClustersDict(), ### tower builder tool configuration
+ debugOn = True): #False
+ ''' This function generates an instance of a cluster algorithm configuration producting clusters trom towers with or without moments.
+ '''
+ mlog = logging.getLogger('MakeTowersFromClusters.py:: ')
+ mlog.info('TowerMakerName = "'+towerMakerName+'"')
+ mlog.info('TowerContainerKey = <'+towerContainerKey+'>')
+
+ ########################################
+ ## Configuring the tower builder tool ##
+ ########################################
+
+ ''' collect properties from dictionary and set correct dependencies
+ '''
+ mlog.info('Converter properties: ',configDict)
+ excludedKeys = [ 'ClusterBuilderName' ]
+ if configDict['PrepareLCW']:
+ towerBuilder = CaloTopoTowerFromClusterMaker(configDict['ClusterBuilderName'],OrderClusterByPt=False) ### order by pt after LCW calibration!
+ excludedKeys += [ 'OrderClusterByPt' ]
+ else:
+ towerBuilder = CaloTopoTowerFromClusterMaker(configDict['ClusterBuilderName'])
+
+ ''' Copy properties from dictionary
+ '''
+ for key,value in configDict.items():
+ if key not in excludedKeys:
+ setattr(towerBuilder,key,value)
+
+ ''' Check basic consistency of configuration
+ '''
+ mlog.info('Consistency check')
+ if towerBuilder.PrepareLCW and not towerBuilder.BuildTopoTowers:
+ raise RuntimeError('{0}[inconsistent configuration] applying LCW requires to build topo-towers'.format(towerBuilder.name()))
+ if towerBuilder.BuildCombinedTopoSignal and not towerBuilder.BuildTopoTowers:
+ raise RuntimeError('{0}[inconsistent configuration] building combined topo-cluster/topo-tower signals requires to build topo-towers'.format(towerBuilder.name()))
+ if towerBuilder.ApplyCellEnergyThreshold and towerBuilder.BuildTopoTowers:
+ raise RuntimeError('{0}[inconsistent configuration] applying cell energy thresholds for topo-towers not yet implemented'.format(towerBuilder.name()))
+
+ ''' Tower converter configuration summary
+ '''
+ if towerBuilder.BuildTopoTowers:
+ if towerBuilder.PrepareLCW:
+ ''' LCW topo-towers
+ '''
+ mlog.info('################################################')
+ mlog.info('## Produce LCW calibrated topo-tower clusters ##')
+ mlog.info('################################################')
+ mlog.info('CaloTopoClusterContainerKey .. {0}'.format(towerBuilder.CaloTopoClusterContainerKey))
+ #mlog.info('CellClusterWeightKey ......... {0}'.format(towerBuilder.CellClusterWeightKey))
+ else:
+ ''' EM topo-towers
+ '''
+ mlog.info('###############################################')
+ mlog.info('## Produce EM calibrated topo-tower clusters ##')
+ mlog.info('###############################################')
+ mlog.info('CaloTopoClusterContainerKey .. {0}'.format(towerBuilder.CaloTopoClusterContainerKey))
+
+ if towerBuilder.BuildCombinedTopoSignal:
+ mlog.info(' ')
+ mlog.info('Combined topo-cluster/topo-towermode with y_max = {0}'.format(towerBuilder.TopoClusterRange))
+ else:
+ ''' EM towers
+ '''
+ mlog.info('########################################')
+ mlog.info('## Produce EM standard tower clusters ##')
+ mlog.info('########################################')
+
+ ''' Set debug flag (not a property in the dictionary)
+ '''
+ if debugOn:
+ towerBuilder.OutputLevel = Lvl.DEBUG
+
+ towerCoreName = towerMakerName
+ if towerCoreName.find('Builder') > 0:
+ (towerCoreName.replace('Builder',' ')).rstrip(' ')
+ elif towerCoreName.find('Maker') > 0:
+ (towerCoreName.replace('Maker',' ')).rstrip(' ')
+
+ ############################
+ ## Setting up the moments ##
+ ############################
+
+ ''' External tools for moment calculation
+ '''
+ ##from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
+ #from AthenaCommon.AppMgr import ToolSvc
+ #caloNoiseTool = CaloNoiseToolDefault()
+ #ToolSvc += caloNoiseTool
+
+ from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
+ CaloNoiseCondAlg ()
+ CaloNoiseCondAlg(noisetype="totalNoise") # "electronicNoise","pileupNoise","totalNoise"
+
+ ''' Cluster moment maker (all general moments)
+ '''
+ from CaloRec.CaloTopoClusterFlags import jobproperties
+ from AthenaCommon.SystemOfUnits import deg #, GeV, MeV
+ from CaloRec.CaloRecConf import CaloClusterMomentsMaker
+ clusterMoments = CaloClusterMomentsMaker (towerMakerName+'MomentMaker')
+ clusterMoments.MaxAxisAngle = 20*deg
+ #clusterMoments.CaloNoiseTool = caloNoiseTool
+ #clusterMoments.UsePileUpNoise = True
+ clusterMoments.TwoGaussianNoise = jobproperties.CaloTopoClusterFlags.doTwoGaussianNoise()
+ clusterMoments.MinBadLArQuality = 4000
+ clusterMoments.MomentsNames = [
+ "FIRST_PHI"
+ ,"FIRST_ETA"
+ ,"SECOND_R"
+ ,"SECOND_LAMBDA"
+ ,"DELTA_PHI"
+ ,"DELTA_THETA"
+ ,"DELTA_ALPHA"
+ ,"CENTER_X"
+ ,"CENTER_Y"
+ ,"CENTER_Z"
+ ,"CENTER_MAG"
+ ,"CENTER_LAMBDA"
+ ,"LATERAL"
+ ,"LONGITUDINAL"
+ ,"FIRST_ENG_DENS"
+ ,"ENG_FRAC_EM"
+ ,"ENG_FRAC_MAX"
+ ,"ENG_FRAC_CORE"
+ ,"SECOND_ENG_DENS"
+ ,"ISOLATION"
+ ,"ENG_BAD_CELLS"
+ ,"N_BAD_CELLS"
+ ,"N_BAD_CELLS_CORR"
+ ,"BAD_CELLS_CORR_E"
+ ,"BADLARQ_FRAC"
+ ,"ENG_POS"
+ ,"SIGNIFICANCE"
+ ,"CELL_SIGNIFICANCE"
+ ,"CELL_SIG_SAMPLING"
+ ,"AVG_LAR_Q"
+ ,"AVG_TILE_Q"
+ ,"PTD"
+ ,"MASS"
+ ]
+
+ from IOVDbSvc.CondDB import conddb
+ if not conddb.isOnline:
+ #from LArRecUtils.LArHVScaleRetrieverDefault import LArHVScaleRetrieverDefault
+ #clusterMoments.LArHVScaleRetriever = LArHVScaleRetrieverDefault()
+ clusterMoments.MomentsNames += ["ENG_BAD_HV_CELLS","N_BAD_HV_CELLS"]
+
+ ###############################################################
+ ## Set up the tower builder algorithm - as a cluster builder ##
+ ###############################################################
+
+ ''' Basic algorithm properties
+ '''
+ #from CaloRec.CaloRecConf import CaloClusterMaker
+ from CaloRec.CaloRecConf import CaloTopoTowerMaker
+ towerMaker = CaloTopoTowerMaker(towerMakerName)
+ towerMaker.TowersOutputName = towerContainerKey
+ towerMaker.TowerMakerTool = towerBuilder
+ mlog.info('instantiated CaloTopoTowerMaker "{0}" configuration'.format(towerMaker.name()))
+
+ ''' Set up bad cell corrections
+ '''
+ from CaloClusterCorrection.CaloClusterBadChannelListCorr import CaloClusterBadChannelListCorr
+ badChannelCorr = CaloClusterBadChannelListCorr()
+
+ ''' Register correction and moment tools
+ '''
+ towerMaker.TowerCorrectionTools += [ badChannelCorr ]
+ towerMaker.TowerCorrectionTools += [ clusterMoments ]
+ towerMaker += clusterMoments
+
+ ####################################
+ ## Configure LCW calibration tool ##
+ ####################################
+
+ if towerBuilder.PrepareLCW:
+ from CaloRec.CaloRecConf import CaloTopoTowerFromClusterCalibrator
+ ''' Configure name for calibration tool
+ '''
+ towerCalName = towerCoreName+'Calibrator'
+ towerCalibrator = CaloTopoTowerFromClusterCalibrator(towerCalName)
+ mlog.info('add LCW calibration tool <'+towerCalName+'>')
+ #mlog.info('TopoTowers: '+towerCalName+'.CellClusterWeightKey = "'+towerBuilder.CellClusterWeightKey+'"')
+ #towerCalibrator.CellClusterWeightKey = towerBuilder.CellClusterWeightKey
+ towerCalibrator.OrderClusterByPt = configDict['OrderClusterByPt']
+ if debugOn:
+ towerCalibrator.OutputLevel = Lvl.DEBUG
+ ''' Schedule calibration tool
+ '''
+ towerMaker.TowerCalibratorTool = towerCalibrator
+
+ #######################
+ # Configuration done ##
+ #######################
+
+ return towerMaker
+
+##
+## toolname = configDict['ClusterBuilderName'] ### name of the tower builder tool
+## cellkey = configDict['CaloCellContainerKey'] ### cell container key
+## buildtopotower = configDict['BuildTopoTowers'] ### controls if topo-towers or inclusive towers are built
+## towergeosvc = configDict['CaloTowerGeometrySvc'] ### tower geometry provider
+## if ( buildtopotower ):
+## topoclusterkey = configDict['CaloTopoClusterContainerKey']
+## else:
+## topoclusterkey = 'N/A'
+##
+## cellweightkey = configDict['CellClusterWeightKey']
+##
+## mlog.info('(input) CaloCellContainer <'+cellkey+'>')
+## mlog.info('(input) CaloTopoClusterContainer <'+topoclusterkey+'>')
+## mlog.info('(input) CellClusterWeightKey <'+cellweightkey+'>')
diff --git a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
index 1a3bdfe062df03796210ae15c65b0f4245819c39..5d2ef1e9964e6ccc856835074079fc42838ec746 100644
--- a/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
+++ b/Calorimeter/CaloRec/share/CaloRec_jobOptions.py
@@ -248,7 +248,7 @@ else:
#
# functionality : Noise suppressed tower
#
-if jobproperties.CaloRecFlags.doCaloTopoTower() and DetFlags.haveRIO.Calo_on():
+if jobproperties.CaloRecFlags.doCaloTowerFromCluster() and DetFlags.haveRIO.Calo_on():
try:
include ("CaloRec/CaloTopoTower_jobOptions.py")
except Exception:
@@ -361,3 +361,11 @@ if rec.doWritexAOD():
#L1Calo Trigger tower decoration
if globalflags.DataSource()=='data' and rec.doESD() and rec.doCalo() and rec.doTrigger():
include("TrigT1CaloCalibTools/DecorateL1CaloTriggerTowers_prodJobOFragment.py")
+
+#new style CaloTopoTowers
+if jobproperties.CaloRecFlags.doCaloTopoTower():
+ include ( "CaloRec/CaloTopoTowerFragment.py" )
+#mixed topo-cluster/topo-tower
+if jobproperties.CaloRecFlags.doCaloTopoSignal():
+ include ("CaloRec/CaloTopoSignalFragment.py" )
+
diff --git a/Calorimeter/CaloRec/share/CaloTopoSignalFragment.py b/Calorimeter/CaloRec/share/CaloTopoSignalFragment.py
new file mode 100644
index 0000000000000000000000000000000000000000..79bcb1076bdcb72859eae661db5c0a919ebea7c3
--- /dev/null
+++ b/Calorimeter/CaloRec/share/CaloTopoSignalFragment.py
@@ -0,0 +1,64 @@
+######################################
+## Create standard 0.1 x 0.1 towers ##
+######################################
+
+
+from AthenaCommon.Logging import logging
+mlog = logging.getLogger('CaloTopoSignalFragment.py:: ')
+
+import AthenaCommon.Constants as Lvl
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+
+from CaloRec.MakeTowersFromClusters import TowersFromClustersDict, MakeTowersFromClusters
+from CaloRec.CaloRecConf import CaloTowerGeometrySvc, CaloTopoClusterTowerMerger
+
+mlog.info(' ')
+mlog.info('##################################')
+mlog.info('## Topological Signal Formation ##')
+mlog.info('##################################')
+mlog.info(' ')
+
+#############################
+## Tower Geometry Provider ##
+#############################
+
+if not hasattr(svcMgr,'CaloTowerGeometryProvider'):
+ mlog.info("setting up tower geometry provider")
+ caloTowerGeoSvc = CaloTowerGeometrySvc('CaloTowerGeometryProvider')
+ caloTowerGeoSvc.TowerEtaBins = 100
+ caloTowerGeoSvc.TowerEtaMin = -5.
+ caloTowerGeoSvc.TowerEtaMax = 5.
+ svcMgr += caloTowerGeoSvc
+
+
+#############################
+## CaloTopoTower Formation ##
+#############################
+
+caloTowerDict = TowersFromClustersDict(clusterBuilderName='CaloFwdTopoTowerBuilder',
+ towerGeometrySvc=svcMgr.CaloTowerGeometryProvider,
+ cellContainerKey='AllCalo',
+ buildTopoTowers=True,
+ topoClusterContainerKey='CaloCalTopoClusters',
+ orderClusterByPt=False,
+ applyCellEnergyThreshold=False,
+ doCellIndexCheck=False,
+ cellEnergyThreshold=0.,
+ applyLCW=True,
+ buildCombinedSignal=True,
+ clusterRange=2.5)
+
+caloTowerAlgo = MakeTowersFromClusters(towerMakerName = 'CaloFwdTopoTowerMaker',
+ towerContainerKey = 'CaloCalFwdTopoTowers',
+ configDict = caloTowerDict,
+ debugOn = False)
+#merging
+caloTowerMerger = CaloTopoClusterTowerMerger("CaloTopoSignalMaker")
+caloTowerMerger.TopoClusterRange = caloTowerDict['TopoClusterRange'] #### caloTowerAlgo.CaloFwdTopoTowerBuilder.TopoClusterRange
+caloTowerMerger.TopoClusterContainerKey = caloTowerDict['CaloTopoClusterContainerKey'] #### caloTowerAlgo.CaloFwdTopoTowerBuilder.CaloTopoClusterContainerKey
+caloTowerMerger.TopoTowerContainerKey = caloTowerAlgo.TowersOutputName
+caloTowerMerger.TopoSignalContainerKey = 'CaloCalTopoSignals'
+caloTowerMerger.OutputLevel = Lvl.DEBUG
+
+topSequence+=caloTowerAlgo
+topSequence+=caloTowerMerger
diff --git a/Calorimeter/CaloRec/share/CaloTopoTowerFragment.py b/Calorimeter/CaloRec/share/CaloTopoTowerFragment.py
new file mode 100644
index 0000000000000000000000000000000000000000..15f6f3663410a66ca7e95275b2ebfeb833774a21
--- /dev/null
+++ b/Calorimeter/CaloRec/share/CaloTopoTowerFragment.py
@@ -0,0 +1,56 @@
+######################################
+## Create standard 0.1 x 0.1 towers ##
+######################################
+
+
+from AthenaCommon.Logging import logging
+mlog = logging.getLogger('CaloTopoTowerFragment.py:: ')
+
+import AthenaCommon.Constants as Lvl
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+
+from CaloRec.MakeTowersFromClusters import TowersFromClustersDict, MakeTowersFromClusters
+from CaloRec.CaloRecConf import CaloTowerGeometrySvc
+
+mlog.info(' ')
+mlog.info('##################################')
+mlog.info('## Standard Tower Configuration ##')
+mlog.info('##################################')
+mlog.info(' ')
+
+#############################
+## Tower Geometry Provider ##
+#############################
+
+if not hasattr(svcMgr,'CaloTowerGeometryProvider'):
+ mlog.info("setting up tower geometry provider")
+ caloTowerGeoSvc = CaloTowerGeometrySvc('CaloTowerGeometryProvider')
+ caloTowerGeoSvc.TowerEtaBins = 100
+ caloTowerGeoSvc.TowerEtaMin = -5.
+ caloTowerGeoSvc.TowerEtaMax = 5.
+ svcMgr += caloTowerGeoSvc
+
+#############################
+## CaloTopoTower Formation ##
+#############################
+
+caloTowerDict = TowersFromClustersDict(clusterBuilderName='CaloTopoTowerBuilder',
+ towerGeometrySvc=svcMgr.CaloTowerGeometryProvider,
+ cellContainerKey='AllCalo',
+ buildTopoTowers=True,
+ topoClusterContainerKey='CaloCalTopoClusters',
+# cellClusterWeightKey='CaloCalTopoTowerCellWeights',
+ orderClusterByPt=False,
+ applyCellEnergyThreshold=False,
+ doCellIndexCheck=False,
+ cellEnergyThreshold=0.,
+ applyLCW=True,
+ buildCombinedSignal=False,
+ clusterRange=5.)
+
+caloTowerAlgo = MakeTowersFromClusters(towerMakerName = 'CaloTopoTowerMaker',
+ towerContainerKey = 'CaloCalTopoTowers',
+ configDict = caloTowerDict,
+ debugOn = False)
+
+topSequence+=caloTowerAlgo
diff --git a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
index 112dce5bb51bcfb60002c3855c2fba145aef9ca3..48047219529956980b209341fd523ade5eebfb83 100644
--- a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
+++ b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
@@ -4,21 +4,26 @@ Py:MetaReader INFO Current filenames: ['/cvmfs/atlas-nightlies.cern.ch/re
Py:MetaReader INFO MetaReader is called with the parameter "unique_tag_info_values" set to True. This is a workaround to remove all duplicate values from "/TagInfo" key
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on 1fe14f8366e2 on Tue Jul 21 15:04:16 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:13:20 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 23453 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 23732 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
+IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
+IOVDbSvc INFO Global tag: OFLCOND-MC16-SDR-17 set from joboptions
+IOVDbSvc INFO Initialised with 2 connections and 1 folders
+IOVDbSvc INFO Service IOVDbSvc initialised successfully
+MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-07-20T2135/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host 1fe14f8366e2 [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
@@ -27,30 +32,14 @@ PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: OFLCOND-MC16-SDR-17 set from joboptions
-IOVDbSvc INFO Initialised with 2 connections and 1 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool'])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
CondProxyProvider INFO Initializing CondProxyProvider - package version EventSelectorAthenaPool-00-00-00
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] BC292F26-AE73-9041-BF5C-BCE6C5C651EC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000079.gen.COND/cond09_mc.000079.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000079.gen.COND/cond09_mc.000079.gen.COND._0002.pool.root File version:53413
-ClassIDSvc INFO getRegistryEntries: read 1546 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1569 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-warn [frontier.c:1025]: Request 1 on chan 1 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 128.142.168.202:3127: No route to host
-warn [frontier.c:1125]: Trying next proxy atlasbpfrontier.cern.ch[128.142.33.31] with same server atlasfrontier-ai.cern.ch
-warn [frontier.c:1025]: Request 2 on chan 1 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 128.142.33.31:3127: No route to host
-warn [frontier.c:1125]: Trying next proxy atlasbpfrontier.fnal.gov with same server atlasfrontier-ai.cern.ch
-warn [frontier.c:1025]: Request 3 on chan 1 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 131.225.188.245:3127: No route to host
-warn [frontier.c:1125]: Trying next proxy atlasbpfrontier.fnal.gov[131.225.188.246] with same server atlasfrontier-ai.cern.ch
-warn [frontier.c:1025]: Request 4 on chan 1 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 131.225.188.246:3127: No route to host
-warn [frontier.c:1138]: Trying direct connect to server atlasfrontier-ai.cern.ch
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
@@ -66,7 +55,7 @@ Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] BC292F26-AE73-9041-BF5C-BCE6C5C651EC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000079.gen.COND/cond09_mc.000079.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000079.gen.COND/cond09_mc.000079.gen.COND._0002.pool.root File version:53413
-ClassIDSvc INFO getRegistryEntries: read 110 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 112 CLIDRegistry entries for module ALL
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/LAR/CellCorrOfl/deadOTX' ) ->
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
@@ -97,16 +86,9 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 284500 <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #284500 0 events processed so far <<<===
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-warn [frontier.c:1025]: Request 1 on chan 2 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 128.142.168.202:3127: No route to host
-warn [frontier.c:1125]: Trying next proxy atlasbpfrontier.cern.ch[128.142.33.31] with same server atlasfrontier-ai.cern.ch
-warn [frontier.c:1025]: Request 2 on chan 2 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 128.142.33.31:3127: No route to host
-warn [frontier.c:1125]: Trying next proxy atlasbpfrontier.fnal.gov with same server atlasfrontier-ai.cern.ch
-warn [frontier.c:1025]: Request 3 on chan 2 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 131.225.188.246:3127: No route to host
-warn [frontier.c:1125]: Trying next proxy atlasbpfrontier.fnal.gov[131.225.188.245] with same server atlasfrontier-ai.cern.ch
-warn [frontier.c:1025]: Request 4 on chan 2 failed at Tue Jul 21 15:04:18 2020: -9 [fn-socket.c:107]: network error on connect to 131.225.188.245:3127: No route to host
-warn [frontier.c:1138]: Trying direct connect to server atlasfrontier-ai.cern.ch
IOVDbFolder INFO HVS tag OFLCOND-MC16-SDR-17 resolved to LARCellCorrOflDeadOTX-000-00 for folder /LAR/CellCorrOfl/deadOTX
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
dumper1 INFO dumper.energyCalibrationTypes = [0, 0, 0, -1]
dumper.energyCalibrations = [2, 0.9959, 0.07493, -0.1599, 2, 2, 0.9962, 0.04997, -0.1839, 2, 2, 0.9984, 0.0143, -0.9648, 2]
dumper.etaCalibrationSizes = [14, 14, 13, 0]
@@ -2568,17 +2550,17 @@ IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
IncidentProcAlg2 INFO Finalize
EventSelector INFO finalize
-ToolSvc INFO Removing all tools created by ToolSvc
-IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.73 ))s
-IOVDbSvc INFO bytes in (( 0.73 ))s
+IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.07 ))s
+IOVDbSvc INFO bytes in (( 0.07 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.73 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.07 ))s
+ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 3
-cObj_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 13.3(+- 12.5)/ 0/ 30 [ms] #= 3
-ChronoStatSvc INFO Time User : Tot= 0.6 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 3.33(+- 4.71)/ 0/ 10 [ms] #= 3
+cObj_ALL INFO Time User : Tot= 60 [ms] Ave/Min/Max= 20(+- 21.6)/ 0/ 50 [ms] #= 3
+ChronoStatSvc INFO Time User : Tot= 0.74 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.cxx b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..59b8c88544a996646454d43fb9362dd6a17605a8
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.cxx
@@ -0,0 +1,192 @@
+/* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */
+#include "CaloTopoClusterFromTowerHelpers.h"
+
+#include "CaloEvent/CaloCell.h"
+
+#include "xAODCaloEvent/CaloCluster.h"
+
+#include "CaloGeoHelpers/CaloPhiRange.h"
+#include "CaloGeoHelpers/proxim.h"
+
+#include <cmath>
+
+std::string CaloRec::Helpers::fmtMsg(const char* fmt,...) {
+ char buffer[1024];
+ va_list args;
+ va_start(args,fmt);
+ vsprintf(buffer,fmt,args);
+ va_end(args);
+ return std::string(buffer);
+}
+
+
+bool CaloRec::Helpers::cellAccumulator(const CaloCell& rcell,CaloClusterSignalAccumulator& accum,double weight,bool onlyKine)
+{
+ ///////////////////////////
+ // Collecting Kinematics //
+ ///////////////////////////
+
+
+ // required info
+ const CaloDetDescrElement* dde = rcell.caloDDE(); if ( dde == 0 ) { return false; }
+ // energy and weights
+ accum.cluster.cellWeight = weight;
+ accum.cluster.cellAbsWeight = std::fabs(accum.cluster.cellWeight);
+ accum.cluster.cellE = accum.cluster.cellWeight*rcell.e();
+ accum.cluster.cellAbsE = accum.cluster.cellAbsWeight*std::fabs(rcell.e());
+ // direction
+ double celleta(dde->eta());
+ double cellphi(dde->phi());
+ // energy sum and normalizations
+ accum.cluster.accumE += accum.cluster.cellE;
+ accum.cluster.accumAbsE += accum.cluster.cellAbsE;
+ if ( accum.cluster.firstCell ) {
+ accum.cluster.phiSeed = cellphi; accum.cluster.firstCell = false;
+ } else {
+ cellphi = proxim(cellphi,accum.cluster.phiSeed);
+ }
+ accum.cluster.accumPhi += accum.cluster.cellAbsE*cellphi;
+ accum.cluster.accumEta += accum.cluster.cellAbsE*celleta;
+ // kine kinmatic updates done
+ if ( onlyKine ) return true;
+
+ /////////////////////////
+ // Sampling Quantities //
+ /////////////////////////
+
+ // check if cell has valid sampling
+ CaloSampling::CaloSample sam = dde->getSampling();
+ int isam((int)sam);
+ int fsam((int)CaloSampling::Unknown);
+ if ( isam < 0 || isam >= fsam ) { return false; }
+
+ // mark sampling in cluster
+ accum.sampling.presenceInSample[isam] = true;
+
+ // collecting in samples
+ accum.sampling.energyInSample[isam] += accum.cluster.cellE;
+ accum.sampling.posNormInSample[isam] += accum.cluster.cellAbsE;
+ accum.sampling.etaInSample[isam] += accum.cluster.cellAbsE*celleta;
+ accum.sampling.phiInSample[isam] += accum.cluster.cellAbsE*cellphi;
+
+ // maximum energies in samplings
+ if ( accum.cluster.cellE > accum.sampling.maxEnergyInSample[isam] ) {
+ accum.sampling.maxEnergyInSample[isam] = accum.cluster.cellE;
+ accum.sampling.etaMaxEnergyInSample[isam] = celleta;
+ accum.sampling.phiMaxEnergyInSample[isam] = cellphi;
+ }
+
+ // counting cells in barrel and endcap
+ if ( accum.cluster.cellE != 0. && accum.cluster.cellWeight != 0. ) {
+ switch (sam) {
+ case CaloSampling::PreSamplerE:
+ case CaloSampling::EME1:
+ case CaloSampling::EME2:
+ case CaloSampling::EME3:
+ case CaloSampling::HEC0:
+ case CaloSampling::HEC1:
+ case CaloSampling::HEC2:
+ case CaloSampling::HEC3:
+ case CaloSampling::FCAL0:
+ case CaloSampling::FCAL1:
+ case CaloSampling::FCAL2:
+ case CaloSampling::MINIFCAL0:
+ case CaloSampling::MINIFCAL1:
+ case CaloSampling::MINIFCAL2:
+ case CaloSampling::MINIFCAL3:
+ accum.cluster.nEndcap++;
+ break;
+ default:
+ accum.cluster.nBarrel++;
+ break;
+ }
+
+ // time where available
+ if ( sam != CaloSampling::PreSamplerB && sam != CaloSampling::PreSamplerE ) {
+ unsigned int pmask = dde->is_tile() ? 0x8080 : 0x2000;
+ // is time defined?
+ if ( rcell.provenance() & pmask ) {
+ double tnorm(accum.cluster.cellAbsE*accum.cluster.cellWeight*rcell.e()); // sign of weight preserved!
+ accum.cluster.accumTime += tnorm*rcell.time();
+ accum.cluster.accumTimeNorm += tnorm;
+ } // cell ok for time
+ } // sampling contributes to time
+ } // cell has energy and weight != 0
+ return true;
+}
+
+bool CaloRec::Helpers::calculateKine(xAOD::CaloCluster* pClus,bool onlyKine)
+{
+ // input
+ if ( pClus == 0 ) { return false; }
+
+ // get cell links
+ const CaloClusterCellLink* clk = pClus->getCellLinks();
+ if ( clk == 0 || clk->size() == 0 ) { return false; }
+
+ // accumulator object ////////////////////////////////////////////////
+ CaloClusterSignalAccumulator accum; // Strict enforcement of valid cell pointers! //
+ // accumulate cells ////////////////////////////////////////////////
+ bool retflg(true);
+ auto citer(clk->begin());
+ while ( citer != clk->end() && retflg ) {
+ if ( *citer != 0 ) { retflg = cellAccumulator(**citer,accum,citer.weight(),onlyKine); } ++citer; }
+ if ( !retflg ) { return false; }
+
+ // set cluster kinematics: energy & mass
+ pClus->setE(accum.cluster.accumE);
+ pClus->setM(0.);
+
+ // set cluster kinematics: directions
+ if ( accum.cluster.accumAbsE != 0. ) {
+ double invPosNorm(1./accum.cluster.accumAbsE);
+ pClus->setEta(accum.cluster.accumEta*invPosNorm);
+ pClus->setPhi(CaloPhiRange::fix(accum.cluster.accumPhi*invPosNorm));
+ } else {
+ pClus->setEta(0.);
+ pClus->setPhi(0.);
+ }
+
+ // bail out if only global kinematice to be updated
+ if ( onlyKine ) { return true; }
+
+ // set cluster kinematics: time
+ if ( accum.cluster.accumTimeNorm != 0. ) {
+ pClus->setTime(accum.cluster.accumTime/accum.cluster.accumTimeNorm);
+ } else {
+ pClus->setTime(0.);
+ }
+
+ // set sampling pattern
+ uint32_t samplingPattern(0);
+ for ( int i(0); i<(int)CaloSampling::Unknown; ++i ) {
+ if ( accum.sampling.presenceInSample[i] ) { samplingPattern |= (0x1U<<i); }
+ if ( samplingPattern != pClus->samplingPattern() ) {
+ pClus->clearSamplingData();
+ pClus->setSamplingPattern(samplingPattern,true);
+ }
+ }
+
+ // set sampling variables
+ for ( int i(0); i<(int)CaloSampling::Unknown; ++i ) {
+ if ( accum.sampling.presenceInSample[i] ) {
+ CaloSampling::CaloSample sam = (CaloSampling::CaloSample)i;
+ pClus->setEnergy(sam,accum.sampling.energyInSample[i]);
+ double enorm(accum.sampling.posNormInSample[i]);
+ double eta(accum.sampling.etaInSample[i]);
+ double phi(accum.sampling.phiInSample[i]);
+ if ( enorm != 0. ) {
+ pClus->setEta(sam,eta/enorm);
+ pClus->setPhi(sam,CaloPhiRange::fix(phi/enorm));
+ } else {
+ pClus->setEta(sam,eta);
+ pClus->setPhi(sam,CaloPhiRange::fix(phi));
+ }
+ pClus->setEmax(sam,accum.sampling.maxEnergyInSample[i]);
+ pClus->setEtamax(sam,accum.sampling.etaMaxEnergyInSample[i]);
+ pClus->setPhimax(sam,accum.sampling.phiMaxEnergyInSample[i]);
+ } // check if sampling is in cluster
+ } // loop on samplings
+
+ return true;
+}
diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.h b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.h
new file mode 100644
index 0000000000000000000000000000000000000000..797de7a586b8ec3570d9c301d7204e6b3b413193
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerHelpers.h
@@ -0,0 +1,271 @@
+// -*- c++ -*-
+/* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */
+#ifndef CALOREC_CALOTOPOCLUSTERFROMTOWERHELPERS
+#define CALOREC_CALOTOPOCLUSTERFROMTOWERHELPERS
+
+#include "CaloGeoHelpers/CaloSampling.h"
+
+#include "xAODCaloEvent/CaloCluster.h"
+
+#include <cstdarg>
+#include <string>
+#include <map>
+
+#define _SNAMELU( NAME ) { CaloSampling::NAME , std::string( #NAME ) }
+#define _SIDLU( ID ) { std::string( #ID ) , CaloSampling::ID }
+
+#define _MNAMELU( NAME ) { xAOD::CaloCluster::NAME, std::string( #NAME ) }
+#define _MIDLU( ID ) { std::string( #ID ) , xAOD::CaloCluster::ID }
+
+class CaloCell;
+
+// namespace xAOD {
+// class CaloCluster;
+// }
+
+/// @brief Namespace for helper functions
+///
+/// These functions are largely a copy of @c xAOD::CaloEvent::CaloKineHelper but avoid the proximity stepper which
+/// seems to create a problem. Additional functions are added.
+///
+namespace CaloRec {
+ namespace Helpers {
+ /// @name Types
+ /// @{
+ typedef std::array<double,CaloSampling::Unknown> valarray_t; ///< @brief Array accommodating data for samplings
+ typedef std::vector<bool> boolarray_t; ///< @brief Vector of flags indicating sampling contribution
+ /// @}
+
+ /// @name Messaging
+ /// @{
+ /// @brief Message formatter
+ std::string fmtMsg(const char* fmt,...) ;//{
+ // char _buffer[1024];
+ // va_list args;
+ // va_start(args,fmt);
+ // vsprintf(_buffer,fmt,args);
+ // va_end(args);
+ // return std::string(_buffer);
+ // }
+ /// @}
+
+ /// @brief Cache for data accumulator
+ struct CaloClusterSignalAccumulator
+ {
+ /// @brief Pre-fill array with given value
+ /// @param array array of numbers
+ /// @param value pre-fill value (optional, default is 0.)
+ static void fill(valarray_t& array,double value=0.) { array.fill(value); }
+
+ /// @brief Sampling quantities
+ struct Sampling
+ {
+ /// @{
+ boolarray_t presenceInSample; ///< @brief Flag for presens of sampling in cluster
+ valarray_t energyInSample; ///< @brief Energy
+ valarray_t etaInSample; ///< @brief Eta
+ valarray_t phiInSample; ///< @brief Phi
+ valarray_t maxEnergyInSample; ///< @brief Maxmimum energy
+ valarray_t etaMaxEnergyInSample; ///< @brief Eta of maximum energy
+ valarray_t phiMaxEnergyInSample; ///< @brief Phi of maximum energy
+ valarray_t posNormInSample; ///< @brief Positive (absolute) normalization energy
+ /// @}
+ Sampling()
+ : presenceInSample((size_t)CaloSampling::Unknown,false)
+ {
+ fill(energyInSample);
+ fill(etaInSample);
+ fill(phiInSample);
+ fill(maxEnergyInSample);
+ fill(etaMaxEnergyInSample);
+ fill(phiMaxEnergyInSample);
+ fill(posNormInSample);
+ }
+ };
+ Sampling sampling;
+
+ /// @brief Cluster quantities
+ struct Cluster
+ {
+ /// @name Actual cell signals
+ /// @{
+ double cellWeight; ///< @brief Signal weight
+ double cellAbsWeight; ///< @brief Absolute Signal weight
+ double cellE; ///< @brief Signal
+ double cellAbsE; ///< @brief Absolute signal
+ /// @}
+ /// @name Accumulated cell signals
+ /// @{
+ double accumE; ///< @brief Signal
+ double accumAbsE; ///< @brief Absolute signal
+ double accumTimeNorm; ///< @brief Time normalization
+ double accumEta; ///< @brief Accumulated energy-weighted eta
+ double accumPhi; ///< @brief Accumulated energy-weighted phi
+ double accumTime; ///< @brief Time
+ int nBarrel; ///< @brief Number of cells in barrel
+ int nEndcap; ///< @brief Number of cells in endcap
+ /// @}
+ /// @name Parameters
+ double phiSeed; ///< @brief Phi seed
+ bool firstCell; ///< @brief Flags first cell
+ /// @}
+ /// @brief Constructor
+ Cluster()
+ : cellWeight(0.)
+ , cellAbsWeight(0.)
+ , cellE(0.)
+ , cellAbsE(0.)
+ , accumE(0.)
+ , accumAbsE(0.)
+ , accumTimeNorm(0.)
+ , accumEta(0.)
+ , accumPhi(0.)
+ , accumTime(0.)
+ , nBarrel(0)
+ , nEndcap(0)
+ , phiSeed(0.)
+ , firstCell(true)
+ { }
+ };
+ Cluster cluster;
+
+ /// @brief Constructor
+ CaloClusterSignalAccumulator()
+ : sampling(), cluster()
+ { }
+ };
+
+ /// @name Cluster building and refinement
+ /// @{
+ /// @brief Accumulator function
+ ///
+ /// This function fills the @c CaloClusterSignalAccumulator object. It is invoked for each cell in a cluster.
+ ///
+ /// @param rcell reference to non-modifiable @c CaloCell object
+ /// @param accum reference to modifiable @c CaloClusterSignalAccumulator object
+ /// @param weight weight of cell contribution
+ /// @param onlyKine update only global cluster kinematics when @c true, else update all cluster variables
+ bool cellAccumulator(const CaloCell& rcell,CaloClusterSignalAccumulator& accum,double weight,bool onlyKine=false);
+ /// @brief Kinematic updates
+ ///
+ /// This function updates the kinematics of a cluster e.g. after calibration
+ ///
+ /// @param pClus pointer to modifiable cluster object
+ /// @param onlyKine update only global cluster kinematics when @c true, else update all cluster variables
+ bool calculateKine(xAOD::CaloCluster* pClus,bool onlyKine=false);
+ /// @}
+ } // Helpers
+
+ ///@brief Stores
+ namespace Lookup {
+ ///@name Sampling names and identifier maps
+ ///@{
+ static const std::map<CaloSampling::CaloSample,std::string> samplingNames = {
+ // EM
+ _SNAMELU( PreSamplerB ), _SNAMELU( EMB1 ), _SNAMELU( EMB2 ), _SNAMELU( EMB3 ),
+ _SNAMELU( PreSamplerE ), _SNAMELU( EME1 ), _SNAMELU( EME2 ), _SNAMELU( EME3 ),
+ // HAD
+ _SNAMELU( HEC0 ), _SNAMELU( HEC1 ), _SNAMELU( HEC2 ), _SNAMELU( HEC3 ),
+ _SNAMELU( TileBar0 ), _SNAMELU( TileBar1 ), _SNAMELU( TileBar2 ),
+ // Tile
+ _SNAMELU( TileBar0 ), _SNAMELU( TileBar1 ), _SNAMELU( TileBar2 ),
+ _SNAMELU( TileGap1 ), _SNAMELU( TileGap2 ), _SNAMELU( TileGap3 ),
+ _SNAMELU( TileExt0 ), _SNAMELU( TileExt1 ), _SNAMELU( TileExt2 ),
+ // FCal
+ _SNAMELU( FCAL0 ), _SNAMELU( FCAL1 ), _SNAMELU( FCAL2 ),
+ // Mini-FCal
+ _SNAMELU( MINIFCAL0 ), _SNAMELU( MINIFCAL1 ), _SNAMELU( MINIFCAL2 ), _SNAMELU( MINIFCAL3 ),
+ // unknown
+ _SNAMELU( Unknown )
+ }; ///< Name lookup by sampling identifier (data)
+ static const std::map<std::string,CaloSampling::CaloSample> samplingIds = {
+ // EM
+ _SIDLU( PreSamplerB ), _SIDLU( EMB1 ), _SIDLU( EMB2 ), _SIDLU( EMB3 ),
+ _SIDLU( PreSamplerE ), _SIDLU( EME1 ), _SIDLU( EME2 ), _SIDLU( EME3 ),
+ // HAD
+ _SIDLU( HEC0 ), _SIDLU( HEC1 ), _SIDLU( HEC2 ), _SIDLU( HEC3 ),
+ _SIDLU( TileBar0 ), _SIDLU( TileBar1 ), _SIDLU( TileBar2 ),
+ // Tile
+ _SIDLU( TileBar0 ), _SIDLU( TileBar1 ), _SIDLU( TileBar2 ),
+ _SIDLU( TileGap1 ), _SIDLU( TileGap2 ), _SIDLU( TileGap3 ),
+ _SIDLU( TileExt0 ), _SIDLU( TileExt1 ), _SIDLU( TileExt2 ),
+ // FCal
+ _SIDLU( FCAL0 ), _SIDLU( FCAL1 ), _SIDLU( FCAL2 ),
+ // Mini-FCal
+ _SIDLU( MINIFCAL0 ), _SIDLU( MINIFCAL1 ), _SIDLU( MINIFCAL2 ), _SIDLU( MINIFCAL3 ),
+ // unknown
+ _SIDLU( Unknown )
+ }; ///< Identifier lookup by sampling name (data)
+ static const std::string& getSamplingName(CaloSampling::CaloSample sid); ///< Lookup sampling name by identifier (function)
+ static CaloSampling::CaloSample getSamplingId(const std::string& sname); ///< Lookup sampling identifier by name (function)
+ ///@}
+ ///@name Cluster moment names and identifier maps
+ ///@{
+ static const std::map<xAOD::CaloCluster::MomentType,std::string> clusterMomentNames = {
+ _MNAMELU( FIRST_PHI ),_MNAMELU( FIRST_ETA ),_MNAMELU( SECOND_R ),_MNAMELU( SECOND_LAMBDA ),_MNAMELU( DELTA_PHI ),_MNAMELU( DELTA_THETA ),_MNAMELU( DELTA_ALPHA ),
+ _MNAMELU( CENTER_X ),_MNAMELU( CENTER_Y ),_MNAMELU( CENTER_Z ),_MNAMELU( CENTER_MAG ),_MNAMELU( CENTER_LAMBDA ),_MNAMELU( LATERAL ),_MNAMELU( LONGITUDINAL ),
+ _MNAMELU( ENG_FRAC_EM ),_MNAMELU( ENG_FRAC_MAX ),_MNAMELU( ENG_FRAC_CORE ),_MNAMELU( FIRST_ENG_DENS ),_MNAMELU( SECOND_ENG_DENS ),_MNAMELU( ENG_POS ),
+ _MNAMELU( ISOLATION ),_MNAMELU( ENG_BAD_CELLS ),_MNAMELU( N_BAD_CELLS ),_MNAMELU( N_BAD_CELLS_CORR ),_MNAMELU( BAD_CELLS_CORR_E ),_MNAMELU( BADLARQ_FRAC ),
+ _MNAMELU( SIGNIFICANCE ),_MNAMELU( CELL_SIGNIFICANCE ),_MNAMELU( CELL_SIG_SAMPLING ),_MNAMELU( AVG_LAR_Q ),_MNAMELU( AVG_TILE_Q ),_MNAMELU( ENG_BAD_HV_CELLS ),
+ _MNAMELU( N_BAD_HV_CELLS ),_MNAMELU( PTD ),_MNAMELU( MASS ),_MNAMELU( EM_PROBABILITY ),_MNAMELU( HAD_WEIGHT ),_MNAMELU( OOC_WEIGHT ),_MNAMELU( DM_WEIGHT ),
+ _MNAMELU( TILE_CONFIDENCE_LEVEL ),_MNAMELU( VERTEX_FRACTION ),_MNAMELU( NVERTEX_FRACTION ),_MNAMELU( ETACALOFRAME ),_MNAMELU( PHICALOFRAME ),_MNAMELU( ETA1CALOFRAME ),
+ _MNAMELU( PHI1CALOFRAME ),_MNAMELU( ETA2CALOFRAME ),_MNAMELU( PHI2CALOFRAME ),_MNAMELU( ENG_CALIB_TOT ),_MNAMELU( ENG_CALIB_OUT_L ),_MNAMELU( ENG_CALIB_OUT_M ),
+ _MNAMELU( ENG_CALIB_OUT_T ),_MNAMELU( ENG_CALIB_DEAD_L ),_MNAMELU( ENG_CALIB_DEAD_M ),_MNAMELU( ENG_CALIB_DEAD_T ),_MNAMELU( ENG_CALIB_EMB0 ),_MNAMELU( ENG_CALIB_EME0 ),
+ _MNAMELU( ENG_CALIB_TILEG3 ),_MNAMELU( ENG_CALIB_DEAD_TOT ),_MNAMELU( ENG_CALIB_DEAD_EMB0 ),_MNAMELU( ENG_CALIB_DEAD_TILE0 ),_MNAMELU( ENG_CALIB_DEAD_TILEG3 ),
+ _MNAMELU( ENG_CALIB_DEAD_EME0 ),_MNAMELU( ENG_CALIB_DEAD_HEC0 ),_MNAMELU( ENG_CALIB_DEAD_FCAL ),_MNAMELU( ENG_CALIB_DEAD_LEAKAGE ),_MNAMELU( ENG_CALIB_DEAD_UNCLASS ),
+ _MNAMELU( ENG_CALIB_FRAC_EM ),_MNAMELU( ENG_CALIB_FRAC_HAD ),_MNAMELU( ENG_CALIB_FRAC_REST ),_MNAMELU( ENERGY_DigiHSTruth ),_MNAMELU( ETA_DigiHSTruth ),_MNAMELU( PHI_DigiHSTruth ),
+ _MNAMELU( TIME_DigiHSTruth ),_MNAMELU( ENERGY_CALIB_DigiHSTruth ),_MNAMELU( ETA_CALIB_DigiHSTruth ),_MNAMELU( PHI_CALIB_DigiHSTruth ),_MNAMELU( TIME_CALIB_DigiHSTruth ),
+ _MNAMELU( FIRST_PHI_DigiHSTruth ),_MNAMELU( FIRST_ETA_DigiHSTruth ),_MNAMELU( SECOND_R_DigiHSTruth ),_MNAMELU( SECOND_LAMBDA_DigiHSTruth ),_MNAMELU( DELTA_PHI_DigiHSTruth ),
+ _MNAMELU( DELTA_THETA_DigiHSTruth ),_MNAMELU( DELTA_ALPHA_DigiHSTruth ),_MNAMELU( CENTER_X_DigiHSTruth ),_MNAMELU( CENTER_Y_DigiHSTruth ),_MNAMELU( CENTER_Z_DigiHSTruth ),
+ _MNAMELU( CENTER_MAG_DigiHSTruth ),_MNAMELU( CENTER_LAMBDA_DigiHSTruth ),_MNAMELU( LATERAL_DigiHSTruth ),_MNAMELU( LONGITUDINAL_DigiHSTruth ),_MNAMELU( ENG_FRAC_EM_DigiHSTruth ),
+ _MNAMELU( ENG_FRAC_MAX_DigiHSTruth ),_MNAMELU( ENG_FRAC_CORE_DigiHSTruth ),_MNAMELU( FIRST_ENG_DENS_DigiHSTruth ),_MNAMELU( SECOND_ENG_DENS_DigiHSTruth ),
+ _MNAMELU( ISOLATION_DigiHSTruth ),_MNAMELU( ENG_BAD_CELLS_DigiHSTruth ),_MNAMELU( N_BAD_CELLS_DigiHSTruth ),_MNAMELU( N_BAD_CELLS_CORR_DigiHSTruth ),
+ _MNAMELU( BAD_CELLS_CORR_E_DigiHSTruth ),_MNAMELU( BADLARQ_FRAC_DigiHSTruth ),_MNAMELU( ENG_POS_DigiHSTruth ),_MNAMELU( SIGNIFICANCE_DigiHSTruth ),
+ _MNAMELU( CELL_SIGNIFICANCE_DigiHSTruth ),_MNAMELU( CELL_SIG_SAMPLING_DigiHSTruth ),_MNAMELU( AVG_LAR_Q_DigiHSTruth ),_MNAMELU( AVG_TILE_Q_DigiHSTruth ),
+ _MNAMELU( ENG_BAD_HV_CELLS_DigiHSTruth ),_MNAMELU( N_BAD_HV_CELLS_DigiHSTruth ),_MNAMELU( EM_PROBABILITY_DigiHSTruth ),_MNAMELU( HAD_WEIGHT_DigiHSTruth ),
+ _MNAMELU( OOC_WEIGHT_DigiHSTruth ),_MNAMELU( DM_WEIGHT_DigiHSTruth )
+ }; ///< Moment names by moment types
+ static const std::map<std::string,xAOD::CaloCluster::MomentType> clusterMomentTypes = {
+ _MIDLU( FIRST_PHI ),_MIDLU( FIRST_ETA ),_MIDLU( SECOND_R ),_MIDLU( SECOND_LAMBDA ),_MIDLU( DELTA_PHI ),_MIDLU( DELTA_THETA ),_MIDLU( DELTA_ALPHA ),
+ _MIDLU( CENTER_X ),_MIDLU( CENTER_Y ),_MIDLU( CENTER_Z ),_MIDLU( CENTER_MAG ),_MIDLU( CENTER_LAMBDA ),_MIDLU( LATERAL ),_MIDLU( LONGITUDINAL ),
+ _MIDLU( ENG_FRAC_EM ),_MIDLU( ENG_FRAC_MAX ),_MIDLU( ENG_FRAC_CORE ),_MIDLU( FIRST_ENG_DENS ),_MIDLU( SECOND_ENG_DENS ),_MIDLU( ENG_POS ),
+ _MIDLU( ISOLATION ),_MIDLU( ENG_BAD_CELLS ),_MIDLU( N_BAD_CELLS ),_MIDLU( N_BAD_CELLS_CORR ),_MIDLU( BAD_CELLS_CORR_E ),_MIDLU( BADLARQ_FRAC ),
+ _MIDLU( SIGNIFICANCE ),_MIDLU( CELL_SIGNIFICANCE ),_MIDLU( CELL_SIG_SAMPLING ),_MIDLU( AVG_LAR_Q ),_MIDLU( AVG_TILE_Q ),_MIDLU( ENG_BAD_HV_CELLS ),
+ _MIDLU( N_BAD_HV_CELLS ),_MIDLU( PTD ),_MIDLU( MASS ),_MIDLU( EM_PROBABILITY ),_MIDLU( HAD_WEIGHT ),_MIDLU( OOC_WEIGHT ),_MIDLU( DM_WEIGHT ),
+ _MIDLU( TILE_CONFIDENCE_LEVEL ),_MIDLU( VERTEX_FRACTION ),_MIDLU( NVERTEX_FRACTION ),_MIDLU( ETACALOFRAME ),_MIDLU( PHICALOFRAME ),_MIDLU( ETA1CALOFRAME ),
+ _MIDLU( PHI1CALOFRAME ),_MIDLU( ETA2CALOFRAME ),_MIDLU( PHI2CALOFRAME ),_MIDLU( ENG_CALIB_TOT ),_MIDLU( ENG_CALIB_OUT_L ),_MIDLU( ENG_CALIB_OUT_M ),
+ _MIDLU( ENG_CALIB_OUT_T ),_MIDLU( ENG_CALIB_DEAD_L ),_MIDLU( ENG_CALIB_DEAD_M ),_MIDLU( ENG_CALIB_DEAD_T ),_MIDLU( ENG_CALIB_EMB0 ),_MIDLU( ENG_CALIB_EME0 ),
+ _MIDLU( ENG_CALIB_TILEG3 ),_MIDLU( ENG_CALIB_DEAD_TOT ),_MIDLU( ENG_CALIB_DEAD_EMB0 ),_MIDLU( ENG_CALIB_DEAD_TILE0 ),_MIDLU( ENG_CALIB_DEAD_TILEG3 ),
+ _MIDLU( ENG_CALIB_DEAD_EME0 ),_MIDLU( ENG_CALIB_DEAD_HEC0 ),_MIDLU( ENG_CALIB_DEAD_FCAL ),_MIDLU( ENG_CALIB_DEAD_LEAKAGE ),_MIDLU( ENG_CALIB_DEAD_UNCLASS ),
+ _MIDLU( ENG_CALIB_FRAC_EM ),_MIDLU( ENG_CALIB_FRAC_HAD ),_MIDLU( ENG_CALIB_FRAC_REST ),_MIDLU( ENERGY_DigiHSTruth ),_MIDLU( ETA_DigiHSTruth ),_MIDLU( PHI_DigiHSTruth ),
+ _MIDLU( TIME_DigiHSTruth ),_MIDLU( ENERGY_CALIB_DigiHSTruth ),_MIDLU( ETA_CALIB_DigiHSTruth ),_MIDLU( PHI_CALIB_DigiHSTruth ),_MIDLU( TIME_CALIB_DigiHSTruth ),
+ _MIDLU( FIRST_PHI_DigiHSTruth ),_MIDLU( FIRST_ETA_DigiHSTruth ),_MIDLU( SECOND_R_DigiHSTruth ),_MIDLU( SECOND_LAMBDA_DigiHSTruth ),_MIDLU( DELTA_PHI_DigiHSTruth ),
+ _MIDLU( DELTA_THETA_DigiHSTruth ),_MIDLU( DELTA_ALPHA_DigiHSTruth ),_MIDLU( CENTER_X_DigiHSTruth ),_MIDLU( CENTER_Y_DigiHSTruth ),_MIDLU( CENTER_Z_DigiHSTruth ),
+ _MIDLU( CENTER_MAG_DigiHSTruth ),_MIDLU( CENTER_LAMBDA_DigiHSTruth ),_MIDLU( LATERAL_DigiHSTruth ),_MIDLU( LONGITUDINAL_DigiHSTruth ),_MIDLU( ENG_FRAC_EM_DigiHSTruth ),
+ _MIDLU( ENG_FRAC_MAX_DigiHSTruth ),_MIDLU( ENG_FRAC_CORE_DigiHSTruth ),_MIDLU( FIRST_ENG_DENS_DigiHSTruth ),_MIDLU( SECOND_ENG_DENS_DigiHSTruth ),
+ _MIDLU( ISOLATION_DigiHSTruth ),_MIDLU( ENG_BAD_CELLS_DigiHSTruth ),_MIDLU( N_BAD_CELLS_DigiHSTruth ),_MIDLU( N_BAD_CELLS_CORR_DigiHSTruth ),
+ _MIDLU( BAD_CELLS_CORR_E_DigiHSTruth ),_MIDLU( BADLARQ_FRAC_DigiHSTruth ),_MIDLU( ENG_POS_DigiHSTruth ),_MIDLU( SIGNIFICANCE_DigiHSTruth ),
+ _MIDLU( CELL_SIGNIFICANCE_DigiHSTruth ),_MIDLU( CELL_SIG_SAMPLING_DigiHSTruth ),_MIDLU( AVG_LAR_Q_DigiHSTruth ),_MIDLU( AVG_TILE_Q_DigiHSTruth ),
+ _MIDLU( ENG_BAD_HV_CELLS_DigiHSTruth ),_MIDLU( N_BAD_HV_CELLS_DigiHSTruth ),_MIDLU( EM_PROBABILITY_DigiHSTruth ),_MIDLU( HAD_WEIGHT_DigiHSTruth ),
+ _MIDLU( OOC_WEIGHT_DigiHSTruth ),_MIDLU( DM_WEIGHT_DigiHSTruth )
+ }; ///< Moment names buy moment identifiers
+ static const std::string& getMomentName(xAOD::CaloCluster::MomentType momentType); ///< Get moment name associated with a moment type
+ static bool getMomentType(const std::string& momentName,xAOD::CaloCluster::MomentType& momentType); ///< Get moment type associated with a moment name
+ static bool haveMomentType(const std::string& momentName); ///< Returns @c true in case moment is known
+ ///@}
+ } // Lookup
+} // CaloRec
+
+inline const std::string& CaloRec::Lookup::getSamplingName(CaloSampling::CaloSample sid) { return samplingNames.find(sid)->second; }
+inline CaloSampling::CaloSample CaloRec::Lookup::getSamplingId(const std::string& sname) {
+ auto fid(samplingIds.find(sname)); return fid != samplingIds.end() ? fid->second : samplingIds.find("Unknown")->second;
+}
+
+inline bool CaloRec::Lookup::haveMomentType(const std::string& momentName) { return clusterMomentTypes.find(momentName) != clusterMomentTypes.end(); }
+inline const std::string& CaloRec::Lookup::getMomentName(xAOD::CaloCluster::MomentType momentType) { return clusterMomentNames.at(momentType); }
+inline bool CaloRec::Lookup::getMomentType(const std::string& momentName,xAOD::CaloCluster::MomentType& momentType) {
+ bool isOk(haveMomentType(momentName)); if ( isOk ) { momentType = clusterMomentTypes.at(momentName); } return isOk;
+}
+
+
+#endif
diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerMonitor.cxx b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerMonitor.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..75e41911895b45445d06b6c21cb480f395402edd
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerMonitor.cxx
@@ -0,0 +1,421 @@
+
+#include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
+#include "GaudiKernel/PhysicalConstants.h"
+
+#include "CaloTopoClusterFromTowerMonitor.h"
+
+#include "CaloGeoHelpers/CaloPhiRange.h"
+
+#include "CaloDetDescr/CaloDetDescrElement.h"
+#include "CaloDetDescr/CaloDetDescrManager.h"
+
+#include "TH1D.h"
+#include "TH2D.h"
+
+#include <vector>
+
+namespace {
+ MsgStream& operator<<(MsgStream& mstr,const SG::ReadHandleKey<xAOD::CaloClusterContainer>& ckey) { mstr << ckey.key(); return mstr; }
+ MsgStream& operator<<(MsgStream& mstr,const ServiceHandle<CaloTowerGeometrySvc>& shdl) { mstr << shdl->name(); return mstr; }
+}
+
+CaloTopoClusterFromTowerMonitor::CaloTopoClusterFromTowerMonitor(const std::string& name,ISvcLocator* pSvcLocator)
+ : AthHistogramAlgorithm(name,pSvcLocator)
+ , m_towerContainerKey("LCWTowerTopoClusterStd")
+ , m_towerGeometrySvc("CaloTowerGeometrySvc",name)
+ , m_ncBins(100)
+ , m_ncMin(-0.5)
+ , m_ncMax(m_ncMin+m_ncBins)
+ , m_nBins(320)
+ , m_nMin(-0.05)
+ , m_nMax(m_nMin+m_nBins*20.)
+ , m_ptBins(220)
+ , m_ptMin(-10.)
+ , m_ptMax(100.)
+ , m_etaBins(100)
+ , m_etaMin(-5.)
+ , m_etaMax(5.)
+ , m_phiBins(64)
+ , m_phiMin(-Gaudi::Units::pi)
+ , m_phiMax(Gaudi::Units::pi)
+ , m_hsEtaMin(0.)
+ , m_hsEtaMax(0.1)
+ , m_hsPhiMin(0.)
+ , m_hsPhiMax(0.1)
+ , m_doGeoAutoBins(true)
+ , m_doHotspot(false)
+ , m_h_n((TH1D*)0), m_h_pt((TH1D*)0), m_h_eta((TH1D*)0), m_h_phi((TH1D*)0), m_h_nc((TH1D*)0), m_h_samp((TH1D*)0)
+ , m_d_n_eta_phi((TH2D*)0), m_d_nc_eta_phi((TH2D*)0)
+ , m_d_pt_eta((TH2D*)0), m_d_nc_eta((TH2D*)0)
+ , m_d_wgt_samp((TH2D*)0), m_d_ntt_samp((TH2D*)0), m_d_geo_samp((TH2D*)0)
+ , m_d_maxtowers_samp((TH2D*)0), m_d_wgttowers_samp((TH2D*)0)
+ , m_d_maxcells_eta((TH2D*)0), m_d_allwghts_eta((TH2D*)0)
+ , m_d_deta_eta((TH2D*)0), m_d_dphi_eta((TH2D*)0), m_d_dphi_deta((TH2D*)0)
+ , m_d_detac_eta((TH2D*)0), m_d_dphic_eta((TH2D*)0), m_d_dphic_detac((TH2D*)0), m_d_detac_samp((TH2D*)0), m_d_dphic_samp((TH2D*)0)
+ , m_h_nc_hs((TH1D*)0), m_h_n_hs((TH1D*)0), m_h_pt_hs((TH1D*)0), m_h_eta_hs((TH1D*)0), m_h_phi_hs((TH1D*)0), m_h_samp_hs((TH1D*)0)
+ , m_d_n_eta_phi_hs((TH2D*)0), m_d_nc_eta_phi_hs((TH2D*)0)
+ , m_d_deta_eta_hs((TH2D*)0), m_d_dphi_eta_hs((TH2D*)0), m_d_dphi_deta_hs((TH2D*)0)
+ , m_d_detac_eta_hs((TH2D*)0), m_d_dphic_eta_hs((TH2D*)0), m_d_dphic_detac_hs((TH2D*)0), m_d_detac_samp_hs((TH2D*)0), m_d_dphic_samp_hs((TH2D*)0)
+{
+ declareProperty("CaloTowerContainerKey", m_towerContainerKey, "Input container key" );
+ declareProperty("CaloTowerGeometrySvc", m_towerGeometrySvc, "Tower geometry provider" );
+ declareProperty("NTowerCellsBins", m_ncBins, "Number of bins in cell-in-tower multiplicity");
+ declareProperty("NTowerCellsMin", m_ncMin, "Lower limit in cell-in-tower multiplicity");
+ declareProperty("NTowerCellsMax", m_ncMax, "Upper limit in cell-in-tower multiplicity");
+ declareProperty("NTowersBins", m_nBins, "Number of bins in tower multiplicity binning");
+ declareProperty("NTowersMin", m_nMin, "Lower limit in tower multiplicity binning");
+ declareProperty("NTowersMax", m_nMax, "Upper limit in tower multiplicity binning");
+ declareProperty("PtTowersBins", m_ptBins, "Number of bins in tower pT binning");
+ declareProperty("PtTowersMin", m_ptMin, "Lower limit in tower pT binning");
+ declareProperty("PtTowersMax", m_ptMax, "Upper limit in tower pT binning");
+ declareProperty("EtaTowersBins", m_etaBins, "Number of bins in tower rapidity binning");
+ declareProperty("EtaTowersMin", m_etaMin, "Lower limit in tower rapidity binning");
+ declareProperty("EtaTowersMax", m_etaMax, "Upper limit in tower rapidity binning");
+ declareProperty("PhiTowersBins", m_phiBins, "Number of bins in tower azimuth binning");
+ declareProperty("PhiTowersMin", m_phiMin, "Lower limit in tower azimuth binning");
+ declareProperty("PhiTowersMax", m_phiMax, "Upper limit in tower azimuth binning");
+ declareProperty("EtaMinHotspot", m_hsEtaMin, "lower limit in tower rapidity for hotspot");
+ declareProperty("EtaMaxHotspot", m_hsEtaMax, "Upper limit in tower rapidity for hotspot");
+ declareProperty("PhiMinHotspot", m_hsPhiMin, "lower limit in tower azimuth for hotspot");
+ declareProperty("PhiMaxHotspot", m_hsPhiMax, "Upper limit in tower azimuth for hotspot");
+ declareProperty("DoGeoAutoBins", m_doGeoAutoBins, "Flag controls automatic binning for rapidity and azimuth");
+}
+
+CaloTopoClusterFromTowerMonitor::~CaloTopoClusterFromTowerMonitor()
+{ }
+
+StatusCode CaloTopoClusterFromTowerMonitor::initialize()
+{
+ // initialize read handle key
+ ATH_CHECK(m_towerContainerKey.initialize());
+
+ // tower geometry service
+ ATH_MSG_INFO( "Allocate tower geometry service:" );
+ if ( !m_towerGeometrySvc.isValid() ) {
+ ATH_MSG_ERROR("[reject] - cannot allocate tower geometry service - fatal");
+ return StatusCode::FAILURE;
+ } else {
+ ATH_MSG_INFO( "[accept] - allocated tower geometry provider \042" << m_towerGeometrySvc << "\042");
+ }
+
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Tower geometry service is allocated, describes %6zu towers in grid:", m_towerGeometrySvc->towerBins()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[accept] %3zu eta bins in [%5.2f,%5.2f]",m_towerGeometrySvc->etaBins(),m_towerGeometrySvc->etaMin(),m_towerGeometrySvc->etaMax()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[accept] %3zu phi bins in [%5.2f,%5.2f]",m_towerGeometrySvc->phiBins(),m_towerGeometrySvc->phiMin(),m_towerGeometrySvc->phiMax()) );
+
+ std::string cfgStr;
+ if ( m_doGeoAutoBins ) {
+ ATH_MSG_INFO("Eta and phi binning taken from tower geometry provider");
+ m_etaBins = m_towerGeometrySvc->etaBins();
+ m_etaMin = m_towerGeometrySvc->etaMin();
+ m_etaMax = m_towerGeometrySvc->etaMax();
+ m_phiBins = m_towerGeometrySvc->phiBins();
+ m_phiMin = m_towerGeometrySvc->phiMin();
+ m_phiMax = m_towerGeometrySvc->phiMax();
+ m_hsPhiMax = m_hsPhiMin+m_towerGeometrySvc->phiWidth();
+ cfgStr = "autoconfig";
+ } else {
+ ATH_MSG_INFO("Eta and phi binning taken from specific configuration");
+ cfgStr = "userconfig";
+ }
+
+ m_doHotspot = m_hsEtaMin < m_hsEtaMax && m_hsPhiMin < m_hsPhiMax;
+
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Eta and phi binning for histograms (total %zu towers)",m_etaBins*m_phiBins) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[%s] %3zu eta bins in [%5.2f,%5.2f]",cfgStr.c_str(),m_etaBins,m_etaMin,m_etaMax) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[%s] %3zu phi bins in [%5.2f,%5.2f]",cfgStr.c_str(),m_phiBins,m_phiMin,m_phiMax) );
+
+ ATH_CHECK( book() );
+
+ // database plots
+ std::vector<std::vector<double> > cWghts(m_towerGeometrySvc->towerBins(),std::vector<double>());
+ size_t chash(0);
+ for ( auto fLnk(m_towerGeometrySvc->begin()); fLnk != m_towerGeometrySvc->end(); ++fLnk, ++chash ) {
+ CaloSampling::CaloSample samp = CaloDetDescrManager::instance()->get_element(chash)->getSampling();
+ double cs(static_cast<double>(samp));
+ double nt(static_cast<double>(fLnk->size()));
+ m_d_maxtowers_samp->Fill(cs,nt);
+ for ( auto elm : *fLnk ) {
+ // collect for towers
+ size_t tidx(static_cast<size_t>(m_towerGeometrySvc->towerIndex(elm)));
+ double weight(m_towerGeometrySvc->cellWeight(elm));
+ cWghts[tidx].push_back(weight);
+ // plot for smaplings
+ m_d_wgttowers_samp->Fill(cs,weight);
+ }
+ }
+
+ for ( size_t tidx(0); tidx<cWghts.size(); ++tidx ) {
+ double eta(m_towerGeometrySvc->towerEta(tidx));
+ double phi(m_towerGeometrySvc->towerPhi(tidx));
+ double nc(1.0*cWghts.at(tidx).size());
+ m_d_maxcells_eta->Fill(eta,nc);
+ size_t etaIdx(m_towerGeometrySvc->etaIndexFromTowerIndex(tidx));
+ m_d_maxcells_phi_eta_slice[etaIdx]->Fill(phi,nc);
+ for ( auto w : cWghts.at(tidx) ) { m_d_allwghts_eta->Fill(eta,w); m_d_allwghts_phi_eta_slice[etaIdx]->Fill(phi,w); }
+ }
+
+ if ( msgLvl(MSG::DEBUG) ) {
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("+------------+--------------+") );
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("| SamplingId | SamplingName |") );
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("+------------+--------------+") );
+ const auto& smap = CaloRec::Lookup::samplingNames;
+ for ( auto fsamp(smap.begin()); fsamp != smap.end(); ++fsamp ) {
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("| %02i | %11.11s |",fsamp->first,fsamp->second.c_str()) );
+ }
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("+------------+--------------+") );
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode CaloTopoClusterFromTowerMonitor::book()
+{
+ ////////////////////////////////////////////////////////////
+ // composition, multiplicity, kinematics (event by event) //
+ ////////////////////////////////////////////////////////////
+
+ int detaBins(105); int dphiBins(128);
+ double detaMin(-1.05); double dphiMin(-Gaudi::Units::pi/2.);
+ double detaMax(1.05); double dphiMax(Gaudi::Units::pi/2.);
+
+ // re-center delta phi
+ double dphi((dphiMax-dphiMin)/(1.*dphiBins)); double dphiMinOld(dphiMin); double dphiMaxOld(dphiMax); //int dphiBinsOld(dphiBins);
+ int dphiBinsOld = (dphiMax-dphiMin)/dphi;
+ dphiMin -= (dphi/2.); dphiMax += (dphi/2.);
+ double dphim(dphi);
+ dphiBins = (dphiMax-dphiMin)/dphim;
+
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("re-center delta_phi distributions, old/new binning [%6.3f,%6.3f]/[%6.3f,%6.3f] with %3i/%3i bins %5.3f/%5.3f rad wide",
+ dphiMinOld,dphiMaxOld,dphiMin,dphiMax,dphiBinsOld,dphiBins,dphi,dphim) );
+
+
+ m_h_n = bookAny<TH1D>("TowerMultiplicity", "N_{tower}", m_nBins, m_nMin, m_nMax);
+ m_h_pt = bookAny<TH1D>("TowerPt", "p_{T}^{tower} [GeV]",m_ptBins,m_ptMin,m_ptMax);
+ m_h_nc = bookAny<TH1D>("TowerCellMultiplicity","N_{cell}^{tower}", m_ncBins,m_ncMin,m_ncMax);
+ m_h_eta = bookForEta<TH1D>("TowerRapidity", "y_{tower}");
+ m_h_phi = bookForPhi<TH1D>("TowerAzimuth", "#phi_{tower} [rad]");
+
+ m_h_samp = bookForSamplings<TH1D>("TowerCellSamplings","TowerCellSamplings"); setAxisTitle(m_h_samp,"N_{cells} in sampling","y");
+ // relations (event by event)
+ m_d_n_eta_phi = bookAny<TH2D>("TowerMultiplicityVsEtaVsPhi", "N_{tower}(y_{tower},#phi_{tower})", "y_{tower}",m_etaBins,m_etaMin,m_etaMax,m_phiBins,m_phiMin,m_phiMax);
+ setAxisTitle(m_d_n_eta_phi,"#phi_{tower} [rad]","y"); setAxisTitle(m_d_n_eta_phi,"N_{tower}","z");
+ m_d_nc_eta_phi = bookAny<TH2D>("TowerCellMultiplicityVsEtaBsPhi","N_{cell}^{tower}(y_{tower},#phi_{tower})","y_{tower}",m_etaBins,m_etaMin,m_etaMax,m_phiBins,m_phiMin,m_phiMax);
+ setAxisTitle(m_d_nc_eta_phi,"#phi_{tower} [rad]","y"); setAxisTitle(m_d_nc_eta_phi,"N_{cell}^{tower}","z");
+ m_d_pt_eta = bookAny<TH2D>("TowerPtVsEta", "p_{T}^{tower}(y_{tower})", "y_{tower}",m_etaBins,m_etaMin,m_etaMax,m_ptBins, m_ptMin, m_ptMax );
+ setAxisTitle(m_d_pt_eta,"p_{T}^{tower} [GeV]","y");
+ m_d_nc_eta = bookAny<TH2D>("TowerCellMultiplicityVsEta", "N_{cell}^{tower}(y_{tower})", "y_{tower}",m_etaBins,m_etaMin,m_etaMax,m_ncBins, m_ncMin, m_ncMax );
+ setAxisTitle(m_d_pt_eta,"N_{cell}^{tower} [GeV]","y");
+ // distance to nominal
+ m_d_deta_eta = bookAny<TH2D>("TowerDeltaEtaVsEta", "(y_{tower}-y_{tower,0})(y_{tower})", "y_{tower}", m_etaBins,m_etaMin,m_etaMax,detaBins,detaMin,detaMax);
+ setAxisTitle(m_d_deta_eta,"#Deltay_{tower}","y");
+ m_d_dphi_eta = bookAny<TH2D>("TowerDeltaPhiVsEta", "(#phi_{tower}-#phi_{tower,0})(y_{tower})","y_{tower}", m_etaBins,m_etaMin,m_etaMax,dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphi_eta,"#Delta#phi_{tower} [rad]","y");
+ m_d_dphi_deta = bookAny<TH2D>("TowerDeltaPhiVsDeltaEta", "#Delta#phi_{tower}(#Deltay_{tower})", "#Deltay_{tower}",detaBins, detaMin, detaMax, dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphi_deta,"#Delta#phi_{tower} [rad]","y");
+ // cell distance to nominal
+ m_d_detac_eta = bookAny<TH2D>("CellDeltaEtaVsEta", "(y_{cell #in tower}#minusy_{tower,0})(y_{tower})", "y_{tower}",
+ m_etaBins,m_etaMin,m_etaMax,detaBins,detaMin,detaMax);
+ setAxisTitle(m_d_detac_eta,"#Deltay_{cell #in tower}","y");
+ m_d_dphic_eta = bookAny<TH2D>("CellDeltaPhiVsEta", "(#phi_{cell #in tower}^{cell}#minus#phi_{tower,0})(y_{tower})","y_{tower}",
+ m_etaBins,m_etaMin,m_etaMax,dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphic_eta,"#Delta#phi_{cell #in tower}","y");
+ m_d_dphic_detac = bookAny<TH2D>("CellDeltaPhiVsDeltaEta", "#Delta#phi_{cell #in tower}^{cell}(#Deltay_{tower}^{cell})", "#Deltay_{cell #in tower}",
+ detaBins,detaMin,detaMax,dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphic_detac,"#Delta#phi_{cell #in tower}","y");
+
+ ///////////////////////////
+ // features in samplings //
+ ///////////////////////////
+
+ int fwbins(250);
+ double fwmin(-0.1);
+ double fwmax(4.9);
+
+ int gwbins(60);
+ double gwmin(-0.1);
+ double gwmax(1.1);
+
+ int ctbins(20);
+ double ctmin(-0.5);
+ double ctmax(19.5);
+
+ // per event
+ m_d_wgt_samp = bookForSamplings<TH2D>("EvtFullWeightvsSampling", "[Event] Full weight vs sampling", fwbins,fwmin,fwmax);
+ setAxisTitle(m_d_wgt_samp,"w_{geo#plusLCW}","y");
+ m_d_ntt_samp = bookForSamplings<TH2D>("EvtNTowersPerCellvsSampling","[Event] Number of towers/cell vs sampling", ctbins,ctmin,ctmax);
+ setAxisTitle(m_d_ntt_samp,"N_{towers}/cell","y");
+ m_d_geo_samp = bookForSamplings<TH2D>("EvtGeoWeightvsSampling", "[Event] Geometrical weight vs sampling", gwbins,gwmin,gwmax);
+ setAxisTitle(m_d_geo_samp,"w_{geo}","y");
+ m_d_detac_samp = bookForSamplings<TH2D>("EvtDetaCellvsSampling", "[Event] y_{cell #in tower}#minusy_{0}^{tower}", detaBins,detaMin,detaMax);
+ setAxisTitle(m_d_detac_samp,"#Deltay_{cell #in tower}","y");
+ m_d_dphic_samp = bookForSamplings<TH2D>("EvtDphiCellvsSampling", "[Event] #phi_{cell #in tower}#minus#phi_{0}^{tower}",dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphic_samp,"#Delta#phi_{cell #in tower}","y");
+
+ // from database
+ m_d_maxtowers_samp = bookForSamplings<TH2D>("DBNTowersPerCellvsSampling", "[DB] Number of towers/cell vs sampling",ctbins,ctmin,ctmax);
+ setAxisTitle(m_d_maxtowers_samp,"N_{towers}/cell (maximum sharing)","y");
+ m_d_wgttowers_samp = bookForSamplings<TH2D>("DBGeoWeightvsSampling", "[DB] Geometrical weight vs sampling", gwbins,gwmin,gwmax);
+ setAxisTitle(m_d_wgttowers_samp,"w_{geo} (from database)","y");
+
+ /////////////////////
+ // features in eta //
+ /////////////////////
+
+ int tcbins(100);
+ double tcmin(-0.5);
+ double tcmax(99.5);
+
+ m_d_maxcells_eta = bookForEta<TH2D>("DBNTowerCellsvsEta","[DB] Cells in towers vs y_{tower}", tcbins,tcmin,tcmax); setAxisTitle(m_d_maxcells_eta,"N_{cells #in tower} (from database)","y");
+ m_d_allwghts_eta = bookForEta<TH2D>("DBGeoWeightvsEta", "[DB] Geometrical weight vs y_{tower}",gwbins,gwmin,gwmax); setAxisTitle(m_d_allwghts_eta,"w_{geo} (from database)","y");
+
+ // analyzing the database (in tower eta slices)
+ double deta((m_etaMax-m_etaMin)/(1.*m_etaBins));
+ double eta0(m_etaMin);
+
+ m_d_maxcells_phi_eta_slice.resize(m_etaBins,(TH2D*)0);
+ m_d_allwghts_phi_eta_slice.resize(m_etaBins,(TH2D*)0);
+
+ std::string hname; std::string htitle;
+ for ( int i(0); i<m_etaBins; ++i, eta0+=deta ) {
+ hname = CaloRec::Helpers::fmtMsg("DBTowerCellsvsPhiEta%02i",i);
+ htitle = CaloRec::Helpers::fmtMsg("[DB] Cells in towers vs #phi_{tower} for y #in [%6.3f,%6.3f]",eta0,eta0+deta);
+ m_d_maxcells_phi_eta_slice[i] = bookForPhi<TH2D>(hname,htitle,tcbins,tcmin,tcmax); setAxisTitle(m_d_maxcells_phi_eta_slice.at(i),"N_{cells #in tower} (from database)","y");
+ hname = CaloRec::Helpers::fmtMsg("DBGeoWeightvsPhiEta%02i",i);
+ htitle = CaloRec::Helpers::fmtMsg("[DB] Geometrical weight vs #phi_{tower} for y #in [%6.3f,%6.3f]",eta0,eta0+deta);
+ m_d_allwghts_phi_eta_slice[i] = bookForPhi<TH2D>(hname,htitle,gwbins,gwmin,gwmax); setAxisTitle(m_d_allwghts_phi_eta_slice.at(i),"w_{geo} (from database)","y");
+ }
+
+ /////////////////////////
+ // debugging y=0,phi=0 //
+ /////////////////////////
+
+ if ( m_doHotspot ) {
+ m_h_n_hs = bookAny<TH1D>("HSTowerMultiplicity", "[Hotspot] N_{tower}", "N_{tower}", m_nBins, m_nMin, m_nMax);
+ m_h_pt_hs = bookAny<TH1D>("HSTowerPt", "[Hotspot] p_{T}^{tower}", "p_{T}^{tower} [GeV]",m_ptBins,m_ptMin,m_ptMax);
+ m_h_nc_hs = bookAny<TH1D>("HSTowerCellMultiplicity","[Hotspot] N_{cell}^{tower}","N_{cell}^{tower}", m_ncBins,m_ncMin,m_ncMax);
+ m_h_eta_hs = bookForEta<TH1D>("HSTowerEta", "[Hotspot] y_{tower}");
+ m_h_phi_hs = bookForPhi<TH1D>("HSTowerPhi", "[Hotspot] #phi_{tower}");
+
+ m_h_samp_hs = bookForSamplings<TH1D>("HSTowerCellSampling","HSTowerCellSampling");
+
+ m_d_n_eta_phi_hs = bookAny<TH2D>("HSTowerMultiplicityVsEtaVsPhi", "[Hotspot] N_{tower}(y_{tower},#phi_{tower})" "y_{tower}",m_etaBins,m_etaMin,m_etaMax,m_phiBins,m_phiMin,m_phiMax);
+ setAxisTitle(m_d_n_eta_phi_hs,"#phi_{tower} [rad]","y"); setAxisTitle(m_d_n_eta_phi_hs,"N_{tower}","z");
+ m_d_nc_eta_phi_hs = bookAny<TH2D>("HSTowerCellMultiplicityVsEtaVsPhi","[Hotspot] N_{cell}^{tower}(y_{tower},#phi_{tower})","y_{tower}",m_etaBins,m_etaMin,m_etaMax,m_phiBins,m_phiMin,m_phiMax);
+ setAxisTitle(m_d_nc_eta_phi_hs,"#phi_{tower} [rad]","y"); setAxisTitle(m_d_nc_eta_phi_hs,"N_{cell}^{tower}","z");
+ m_d_deta_eta_hs = bookForEta<TH2D>("HSTowerDeltaEtaVsEta", "[Hotspot] #Deltay(y_{tower})",detaBins,detaMin,detaMax); setAxisTitle(m_d_deta_eta_hs,"#Deltay_{tower}","y");
+ setAxisTitle(m_d_deta_eta_hs,"#Deltay_{tower}","y");
+ m_d_dphi_eta_hs = bookForEta<TH2D>("HSTowerDeltaPhiVsEta", "[Hotspot] #Delta#phi(y_{tower})",dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphi_eta_hs,"#Delta#phi_{tower} [rad]","y");
+ m_d_dphi_deta_hs = bookAny<TH2D>("HSTowerDeltaPhiVsDeltaEta", "[Hotspot] #Delta#phi_{tower}(#Deltay_{tower})","#Deltay_{tower}",detaBins,detaMin,detaMax,dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphi_deta_hs,"#Delta#phi_{tower} [rad]","y");
+ m_d_detac_eta_hs = bookForEta<TH2D>("HSCellDeltaEtaVsEta", "[Hotspot] #Deltay_{cell #in tower}(y_{tower})",detaBins,detaMin,detaMax);
+ setAxisTitle(m_d_detac_eta_hs,"#Deltay_{cell #in tower}","y");
+ m_d_dphic_eta_hs = bookForEta<TH2D>("HSCellDeltaPhiVsEta", "[Hotspot] #Delta#phi_{cell #in tower}(y_{tower})",dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphic_eta_hs,"#Delta#phi_{cell #in tower}","y");
+ m_d_dphic_detac_hs = bookAny<TH2D>("HSCellDeltaPhiVsCellDeltaEta", "[Hotspot] #Delta#phi_{cell #in tower}(#Deltay_{cell #in tower})","#Deltay_{cell #in tower}",
+ detaBins,detaMin,detaMax,dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphic_detac_hs,"#Delta#phi_{cell #in tower}","y");
+ m_d_detac_samp_hs = bookForSamplings<TH2D>("HSCellDeltaEtavsSampling", "[Hotspot] #Deltay_{cell #in tower} in samplings", detaBins,detaMin,detaMax);
+ setAxisTitle(m_d_detac_samp_hs,"#Deltay_{cell #in tower}","y");
+ m_d_dphic_samp_hs = bookForSamplings<TH2D>("HSCelLDeltaPhivsSampling", "[Hotspot] #Delta#phi_{cell #in tower} in samplings",dphiBins,dphiMin,dphiMax);
+ setAxisTitle(m_d_dphic_samp_hs,"#Delta#phi_{cell #in tower}","y");
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode CaloTopoClusterFromTowerMonitor::execute()
+{
+ SG::ReadHandle<xAOD::CaloClusterContainer> towerHandle(m_towerContainerKey);
+ if ( !towerHandle.isValid() ) {
+ ATH_MSG_ERROR( "cannot allocate cluster container with key <" << m_towerContainerKey << ">" );
+ return StatusCode::FAILURE;
+ }
+
+ // fill plots
+ size_t nhs(0);
+ m_cellTags.reset();
+ std::vector<double> deta; deta.reserve(1000);
+ std::vector<double> dphi; dphi.reserve(deta.capacity());
+ std::vector<CaloSampling::CaloSample> csam; csam.reserve(deta.capacity());
+ m_h_n->Fill(1.0*towerHandle->size());
+ for ( auto ftow(towerHandle->begin()); ftow!=towerHandle->end(); ++ftow ) {
+ const xAOD::CaloCluster* ptow = *ftow;
+ // tower kinematics
+ double pt(ptow->pt()/Gaudi::Units::GeV);
+ double eta(ptow->eta());
+ double phi(CaloPhiRange::fix(ptow->phi()));
+ double nc(1.0*ptow->size());
+ // tower composition and get distances
+ this->fillComposition(*ptow,deta,dphi,csam);
+ double deltaEta(ptow->eta()-ptow->eta0());
+ double deltaPhi(CaloPhiRange::fix(ptow->phi()-ptow->phi0()));
+ // inclusive plots
+ m_h_pt->Fill(pt); m_h_eta->Fill(eta); m_h_phi->Fill(phi); m_h_nc->Fill(nc);
+ m_d_n_eta_phi->Fill(eta,phi); m_d_nc_eta_phi->Fill(eta,phi,nc);
+ m_d_pt_eta->Fill(eta,pt);
+ m_d_nc_eta->Fill(eta,nc);
+ m_d_deta_eta->Fill(eta,deltaEta);
+ m_d_dphi_eta->Fill(eta,deltaPhi);
+ m_d_dphi_deta->Fill(deltaEta,deltaPhi);
+ for ( size_t ic(0); ic<deta.size(); ++ic ) {
+ m_d_detac_eta->Fill(eta,deta.at(ic));
+ m_d_dphic_eta->Fill(eta,dphi.at(ic));
+ m_d_dphic_detac->Fill(deta.at(ic),dphi.at(ic));
+ fillSampling<TH2D>(m_d_detac_samp,csam.at(ic),deta.at(ic));
+ fillSampling<TH2D>(m_d_dphic_samp,csam.at(ic),dphi.at(ic));
+ fillSampling<TH1D>(m_h_samp,csam.at(ic));
+ }
+ // hot spot
+ if ( this->isInHotspot(*ptow) ) {
+ ++nhs;
+ m_h_pt_hs->Fill(pt);
+ m_h_eta_hs->Fill(eta);
+ m_h_phi_hs->Fill(phi);
+ m_h_nc_hs->Fill(nc);
+ m_d_n_eta_phi_hs->Fill(eta,phi);
+ m_d_nc_eta_phi_hs->Fill(eta,phi,nc);
+ m_d_deta_eta_hs->Fill(eta,deltaEta);
+ m_d_dphi_eta_hs->Fill(eta,deltaPhi);
+ m_d_dphi_deta_hs->Fill(deltaEta,deltaPhi);
+ for ( size_t ic(0); ic<deta.size(); ++ic ) {
+ m_d_detac_eta_hs->Fill(eta,deta.at(ic));
+ m_d_dphic_eta_hs->Fill(eta,dphi.at(ic));
+ m_d_dphic_detac_hs->Fill(deta.at(ic),dphi.at(ic));
+ fillSampling<TH2D>(m_d_detac_samp_hs,csam.at(ic),deta.at(ic));
+ fillSampling<TH2D>(m_d_dphic_samp_hs,csam.at(ic),dphi.at(ic));
+ fillSampling<TH1D>(m_h_samp_hs,csam.at(ic));
+ }
+ }
+ // fill in samplings
+ for ( auto fCell(ptow->getCellLinks()->begin()); fCell!=ptow->getCellLinks()->end(); ++fCell ) {
+ CaloSampling::CaloSample csamp = (*fCell)->caloDDE()->getSampling();
+ fillSampling<TH2D>(m_d_wgt_samp,csamp,fCell.weight());
+ // check for cell which other tower it contributes to and plot geometrical weights (only 1/cell)
+ size_t chash(static_cast<size_t>((*fCell)->caloDDE()->calo_hash()));
+ if ( !m_cellTags.test(chash) ) {
+ CaloTowerGeometrySvc::elementvector_t lOfTowers = m_towerGeometrySvc->getTowers(chash);
+ double ntowers(1.0*lOfTowers.size());
+ fillSampling<TH2D>(m_d_ntt_samp,csamp,ntowers);
+ for ( auto elm : lOfTowers ) { fillSampling<TH2D>(m_d_geo_samp,csamp,m_towerGeometrySvc->cellWeight(elm)); }
+ m_cellTags.set(chash);
+ }
+ }
+ }
+ // number of towers in hot spot
+ m_h_n_hs->Fill(1.0*nhs);
+
+ return StatusCode::SUCCESS;
+}
+
+bool CaloTopoClusterFromTowerMonitor::fillComposition(const xAOD::CaloCluster& ptow,std::vector<double>& deta,std::vector<double>& dphi,std::vector<CaloSampling::CaloSample>& csam) const
+{
+ deta.clear(); dphi.clear(); csam.clear();
+ for ( auto fCell(ptow.getCellLinks()->begin()); fCell != ptow.getCellLinks()->end(); ++fCell ) {
+ deta.push_back((*fCell)->eta()-ptow.eta0());
+ dphi.push_back(CaloPhiRange::fix((*fCell)->phi()-ptow.phi0()));
+ csam.push_back((*fCell)->caloDDE()->getSampling());
+ }
+ return !deta.empty();
+}
diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerMonitor.h b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerMonitor.h
new file mode 100644
index 0000000000000000000000000000000000000000..44f18b3b16c9352943554f5b3ffa68efa6af0888
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoClusterFromTowerMonitor.h
@@ -0,0 +1,342 @@
+// -*- c++ -*-
+#ifndef CALOREC_CALOTOPOCLUSTERFROMTOWERMONITOR_H
+#define CALOREC_CALOTOPOCLUSTERFROMTOWERMONITOR_H
+
+#include "StoreGate/ReadHandleKey.h"
+
+#include "GaudiKernel/ServiceHandle.h"
+
+#include "AthenaBaseComps/AthHistogramAlgorithm.h"
+
+#include "xAODCaloEvent/CaloClusterContainer.h"
+
+#include "CaloTowerGeometrySvc.h"
+#include "CaloTopoClusterFromTowerHelpers.h"
+
+#include "xAODCaloEvent/CaloCluster.h"
+#include "CaloEvent/CaloCell.h"
+
+#include <vector>
+#include <bitset>
+#include <map>
+#include <cmath>
+
+#include "TH1D.h"
+#include "TH2D.h"
+
+///@brief Algorithm to monitor kinematics and composition of towers (and clusters)
+///
+/// This algorithm fills a few histograms relevant for monitoring tower-related information, As both topo-clusters and towers
+/// use the same representation in data, both signal definitions can be monitored - even though most histograms are designed
+/// for distributions of tower-specific signal features.
+///
+/// The algorithm has several process control properties and configured values:
+///
+/// | Property | Default | Controled feature or value
+/// :------------------ | :----------: |:-------------------------------------------------------------------------------------------
+/// | @c DoGeoAutoBins | @c true | if @c true the binning of @f$ y @f$ and @f$ \phi @f$ is constructed from the tower geometry database;
+/// | ^ | ^ | else it is user-defined by the corresponding value property
+/// | Hotspot analysis is on if @f$ y_{\rm min}^{\rm hotspot} < y_{\rm max}^{\rm hotspot} @f$ and @f$ \phi_{\rm min}^{\rm hotspot} < \phi_{\rm max}^[\rm hotspot} @f$ (on by defaults) ||
+/// | @c EtaMinHotspot | 0. | defines lower limit @f$ y_{\rm min}^{\rm hotspot} @f$ of rapidity for the hotspot analysis
+/// | @c EtaMaxHotspot | 0.1 | defines upper limit @f$ y_{\rm max}^{\rm hotspot} @f$ of rapidity for the hotspot analysis
+/// | @c PhiMinHotspot | 0. | defines lower limit @f$ \phi_{\rm min}^{\rm hotspot} @f$ of azimuth for the hotspot analysis
+/// | @c PhiMaxHotspot | 0.1 | defines upper limit @f$ \phi_{\rm max}^{\rm hotspot} @f$ of azimuth for the hotspot analysis
+/// | Histogram binning: (pseudo)-rapidity (@f$ y_{\rm min} \geq y_{\rm max} @f$ returns error) ||
+/// | @c EtaTowersBins | 100 | number of rapidity bins
+/// | @c EtaTowersMin | -5. | lower limit of rapidity range @f$ y_{\rm min} @f$
+/// | @c EtaTowersMax | 5. | upper limit of rapidity range @f$ y_{\rm max} @f$
+/// | Histogram binning: azimuth (@f$ \phi_{\rm min \geq \phi_[\rm max} @f$ returns error) ||
+/// | @c PhiTowersBins | 64 | number of azimuth bins
+/// | @c PhiTowersMin | @f$ -\pi @f$ | lower limit of azimuth range @f$ \phi_{\rm min} @f$
+/// | @c PhiTowersMax | @f$ +\pi @f$ | upper limit of azimuth range @f$ \phi_{\rm max} @f$
+/// | Histogram binning: transverse momentum (@f$ p_{\rm T,min} < p_{\rm T,max} @f$ returns error) ||
+/// | @c PtTowersBins | 220 | number of transverse momentum bins
+/// | @c PtTowersMin | -10 GeV | lower limit of transverse momentum range @f$ p_{\rm T,min} @f$
+/// | @c PtTowersMax | 100 GeV | upper limit of transverse momentum range @f$ p_{\rm T,max} @f$
+class CaloTopoClusterFromTowerMonitor : public AthHistogramAlgorithm
+{
+public:
+
+ /// Default algorithm constructor
+ CaloTopoClusterFromTowerMonitor(const std::string& name,ISvcLocator* pSvcLocator);
+ /// Base-class destructor
+ virtual ~CaloTopoClusterFromTowerMonitor();
+
+ ///@brief Initialization
+ ///
+ /// This method configures the algorithm, allocates the tower geometry service and books the histograms by
+ /// invoking the @c book() method. In addition, histograms are filled with geometry information retrieved
+ /// from the tower geometry service (static information not depending on event variables).
+ virtual StatusCode initialize();
+ ///@brief Execution
+ ///
+ /// This method allocates the input data container and fills all histograms. If configured, it also provides
+ ///
+ virtual StatusCode execute(); ///< Execution fills histograms.
+
+
+private:
+
+ ///@name Data access properties
+ ///@{
+ SG::ReadHandleKey<xAOD::CaloClusterContainer> m_towerContainerKey; ///< Allocator for input @c xAOD::CaloClusterContainer
+ ServiceHandle<CaloTowerGeometrySvc> m_towerGeometrySvc; ///< Allocator for tower geometry services
+ ///@}
+
+ ///@name Histogram binning properties
+ ///@{
+ int m_ncBins; ///< Number of cells in towers - number of bins
+ double m_ncMin; ///< Number of cells in towers - lower limit of value range
+ double m_ncMax; ///< Number of cells in towers - upper limit of value range
+ int m_nBins; ///< Tower multiplicity - number of bins
+ double m_nMin; ///< Tower multiplicity - lower limit of value range
+ double m_nMax; ///< Tower multiplicity - upper limit of value range
+ int m_ptBins; ///< Tower @f$ p_{\rm T} @f$ - number of bins
+ double m_ptMin; ///< Tower @f$ p_{\rm T} @f$ - lower limit of value range (in GeV)
+ double m_ptMax; ///< Tower @f$ p_{\rm T} @f$ - upper limit of value range (in GeV)
+ int m_etaBins; ///< Tower rapidity - number of bins
+ double m_etaMin; ///< Tower rapidity - lower limit of value range
+ double m_etaMax; ///< Tower rapidity - upper limit of value range
+ int m_phiBins; ///< Tower azimuth - number of bins
+ double m_phiMin; ///< Tower azimuth - lower limit of value range
+ double m_phiMax; ///< Tower azimuth - upper limit of value range
+
+ double m_hsEtaMin; double m_hsEtaMax;
+ double m_hsPhiMin; double m_hsPhiMax;
+
+ bool m_doGeoAutoBins;
+ bool m_doHotspot;
+ ///@}
+
+ TH1D*m_h_n;
+ TH1D*m_h_pt;
+ TH1D*m_h_eta;
+ TH1D*m_h_phi;
+ TH1D*m_h_nc;
+ TH1D*m_h_samp;
+
+ TH2D* m_d_n_eta_phi;
+ TH2D* m_d_nc_eta_phi;
+ TH2D* m_d_pt_eta;
+ TH2D* m_d_nc_eta;
+
+ TH2D* m_d_wgt_samp;
+ TH2D* m_d_ntt_samp;
+ TH2D* m_d_geo_samp;
+ TH2D* m_d_maxtowers_samp;
+ TH2D* m_d_wgttowers_samp;
+
+ TH2D* m_d_maxcells_eta;
+ TH2D* m_d_allwghts_eta;
+
+ TH2D* m_d_deta_eta;
+ TH2D* m_d_dphi_eta;
+ TH2D* m_d_dphi_deta;
+
+ TH2D* m_d_detac_eta;
+ TH2D* m_d_dphic_eta;
+ TH2D* m_d_dphic_detac;
+
+ TH2D* m_d_detac_samp;
+ TH2D* m_d_dphic_samp;
+
+ // hot spot
+ TH1D*m_h_nc_hs;
+ TH1D*m_h_n_hs;
+ TH1D*m_h_pt_hs;
+ TH1D*m_h_eta_hs;
+ TH1D*m_h_phi_hs;
+ TH1D*m_h_samp_hs;
+
+ TH2D* m_d_n_eta_phi_hs;
+ TH2D* m_d_nc_eta_phi_hs;
+
+ TH2D* m_d_deta_eta_hs;
+ TH2D* m_d_dphi_eta_hs;
+ TH2D* m_d_dphi_deta_hs;
+
+ TH2D* m_d_detac_eta_hs;
+ TH2D* m_d_dphic_eta_hs;
+ TH2D* m_d_dphic_detac_hs;
+
+ TH2D* m_d_detac_samp_hs;
+ TH2D* m_d_dphic_samp_hs;
+
+ std::vector<TH2D*> m_d_maxcells_phi_eta_slice;
+ std::vector<TH2D*> m_d_allwghts_phi_eta_slice;
+
+protected:
+
+ bool isInHotspot(const xAOD::CaloCluster& ptow) const;
+ bool fillComposition(const xAOD::CaloCluster& ptow,std::vector<double>& deta,std::vector<double>& dphi,std::vector<CaloSampling::CaloSample>& csam) const;
+ bool setAxisTitle(TH1* h,const std::string& title,const std::string& axis="x");
+
+ virtual StatusCode book();
+ std::bitset<200000> m_cellTags;
+
+ ///////////////////////
+ // BookAny Templates //
+ ///////////////////////
+
+ template<class H>
+ H* bookAny(const std::string& hname,const std::string& htitle,const std::string& xtitle,int nxbins,double xmin,double xmax) {
+ H* hptr = (H*)bookGetPointer( H(hname.c_str(),htitle.c_str(),nxbins,xmin,xmax) );
+ if ( hptr == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Cannot book distribution \042%s\042 with title \042%s\042",hname.c_str(),htitle.c_str()) );
+ } else {
+ hptr->Sumw2();
+ if ( !xtitle.empty() && xtitle != "" ) { hptr->GetXaxis()->SetTitle(xtitle.c_str()); }
+ }
+ return hptr;
+ }
+
+ template<class H>
+ H* bookAny(const std::string& hname,const std::string& htitle,const std::string& xtitle,int nxbins,double xmin,double xmax,int nybins,double ymin,double ymax) {
+ H* hptr = (H*)bookGetPointer( H(hname.c_str(),htitle.c_str(),nxbins,xmin,xmax,nybins,ymin,ymax) );
+ if ( hptr == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Cannot book distribution \042%s\042 with title \042%s\042",hname.c_str(),htitle.c_str()) );
+ } else {
+ hptr->Sumw2();
+ if ( !xtitle.empty() && xtitle != "" ) { hptr->GetXaxis()->SetTitle(xtitle.c_str()); }
+ }
+ return hptr;
+ }
+
+ template<class H>
+ H* bookAny(const std::string& hname,const std::string& htitle,const std::string& xtitle,
+ int nxbins,double xmin,double xmax,int nybins,double ymin,double ymax,int nzbins,double zmin,double zmax) {
+ H* hptr = (H*)bookGetPointer( H(hname.c_str(),htitle.c_str(),nxbins,xmin,xmax,nybins,ymin,ymax,nzbins,zmin,zmax) );
+ if ( hptr == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Cannot book distribution \042%s\042 with title \042%s\042",hname.c_str(),htitle.c_str()) );
+ } else {
+ hptr->Sumw2();
+ if ( !xtitle.empty() && xtitle != "" ) { hptr->GetXaxis()->SetTitle(xtitle.c_str()); }
+ }
+ return hptr;
+ }
+
+ template<class H>
+ H* bookAny(const std::string& hname,const std::string& htitle,int nxbins,double xmin,double xmax) {
+ H* hptr = (H*)bookGetPointer( H(hname.c_str(),htitle.c_str(),nxbins,xmin,xmax) );
+ if ( hptr == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Cannot book distribution \042%s\042 with title \042%s\042",hname.c_str(),htitle.c_str()) );
+ } else {
+ hptr->Sumw2();
+ hptr->GetXaxis()->SetTitle(hptr->GetTitle());
+ }
+ return hptr;
+ }
+
+ template<class H>
+ H* bookAny(const std::string& hname,const std::string& htitle,int nxbins,double xmin,double xmax,int nybins,double ymin,double ymax) {
+ H* hptr = (H*)bookGetPointer( H(hname.c_str(),htitle.c_str(),nxbins,xmin,xmax,nybins,ymin,ymax) );
+ if ( hptr == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Cannot book distribution \042%s\042 with title \042%s\042",hname.c_str(),htitle.c_str()) );
+ } else {
+ hptr->Sumw2();
+ hptr->GetXaxis()->SetTitle(hptr->GetTitle());
+ }
+ return hptr;
+ }
+
+ template<class H>
+ H* bookAny(const std::string& hname,const std::string& htitle,int nxbins,double xmin,double xmax,int nybins,double ymin,double ymax,int nzbins,double zmin,double zmax) {
+ H* hptr = (H*)bookGetPointer( H(hname.c_str(),htitle.c_str(),nxbins,xmin,xmax,nybins,ymin,ymax,nzbins,zmin,zmax) );
+ if ( hptr == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Cannot book distribution \042%s\042 with title \042%s\042",hname.c_str(),htitle.c_str()) );
+ } else {
+ hptr->Sumw2();
+ hptr->GetXaxis()->SetTitle(hptr->GetTitle());
+ }
+ return hptr;
+ }
+
+ ////////////////////////
+ // Book for Samplings //
+ ////////////////////////
+
+ template<class H>
+ H* bookForSamplings(const std::string& hname,const std::string& htitle) {
+ int nsamp((int)CaloRec::Lookup::getSamplingId("MINIFCAL0")); double xmin(-0.5); double xmax(xmin+1.*(nsamp+1));
+ H* hptr = bookAny<H>(hname,htitle,"",nsamp+1,xmin,xmax);
+ if ( hptr != 0 ) {
+ for ( int isamp(0); isamp < nsamp; ++isamp ) {
+ hptr->GetXaxis()->SetBinLabel(isamp+1,CaloRec::Lookup::getSamplingName((CaloSampling::CaloSample)isamp).c_str());
+ }
+ hptr->GetXaxis()->SetBinLabel(hptr->GetNbinsX(),CaloRec::Lookup::getSamplingName(CaloSampling::Unknown).c_str());
+ }
+ return hptr;
+ }
+
+ template<class H>
+ H* bookForSamplings(const std::string& hname,const std::string& htitle,int nybins,double ymin,double ymax) {
+ int nsamp((int)CaloRec::Lookup::getSamplingId("MINIFCAL0")); double xmin(-0.5); double xmax(xmin+1.*(nsamp+1));
+ H* hptr = bookAny<H>(hname,htitle,"",nsamp+1,xmin,xmax,nybins,ymin,ymax);
+ if ( hptr != 0 ) {
+ for ( int isamp(0); isamp < nsamp; ++isamp ) {
+ hptr->GetXaxis()->SetBinLabel(isamp+1,CaloRec::Lookup::getSamplingName((CaloSampling::CaloSample)isamp).c_str());
+ }
+ hptr->GetXaxis()->SetBinLabel(hptr->GetNbinsX(),CaloRec::Lookup::getSamplingName(CaloSampling::Unknown).c_str());
+ }
+ return hptr;
+ }
+
+ ///////////////////////
+ // Book for Rapidity //
+ ///////////////////////
+
+ template<class H>
+ H* bookForEta(const std::string& hname,const std::string& htitle) { return bookAny<H>(hname,htitle,"y_{tower}",m_etaBins,m_etaMin,m_etaMax); }
+
+ template<class H>
+ H* bookForEta(const std::string& hname,const std::string& htitle,int nybins,double ymin,double ymax) {
+ return bookAny<H>(hname,htitle,"y_{tower}",m_etaBins,m_etaMin,m_etaMax,nybins,ymin,ymax);
+ }
+
+ //////////////////////
+ // Book for Azimuth //
+ //////////////////////
+
+ template<class H>
+ H* bookForPhi(const std::string& hname,const std::string& htitle) { return bookAny<H>(hname,htitle,"#phi_{tower} [rad]",m_phiBins,m_phiMin,m_phiMax); }
+
+ template<class H>
+ H* bookForPhi(const std::string& hname,const std::string& htitle,int nybins,double ymin,double ymax) {
+ return bookAny<H>(hname,htitle,"#phi_{tower} [rad]",m_phiBins,m_phiMin,m_phiMax,nybins,ymin,ymax);
+ }
+
+ ///////////////////
+ // Fill Sampling //
+ ///////////////////
+
+ template<class H>
+ void fillSampling(H* hptr,CaloSampling::CaloSample csamp) {
+ int isamp(std::min(static_cast<int>(csamp),static_cast<int>(CaloRec::Lookup::getSamplingId("MINIFCAL0"))));
+ hptr->Fill(1.*isamp);
+ }
+
+ template<class H>
+ void fillSampling(H* hptr,CaloSampling::CaloSample csamp,double yval) {
+ int isamp(std::min(static_cast<int>(csamp),static_cast<int>(CaloRec::Lookup::getSamplingId("MINIFCAL0"))));
+ hptr->Fill(1.*isamp,yval);
+ }
+
+ template<class H>
+ void fillSampling(H* hptr,CaloSampling::CaloSample csamp,double yval,double zval) {
+ int isamp(std::min(static_cast<int>(csamp),static_cast<int>(CaloRec::Lookup::getSamplingId("MINIFCAL0"))));
+ hptr->Fill(1.*isamp,yval,zval);
+ }
+}; // CaloTopoClusterFromTowerMonitor
+
+inline bool CaloTopoClusterFromTowerMonitor::isInHotspot(const xAOD::CaloCluster& ptow) const
+{ return m_doHotspot && ( ptow.eta() >= m_hsEtaMin && ptow.eta() < m_hsEtaMax ) && ( ptow.phi() >= m_hsPhiMin && ptow.phi() < m_hsPhiMax ); }
+
+inline bool CaloTopoClusterFromTowerMonitor::setAxisTitle(TH1* hptr,const std::string& title,const std::string& axis) {
+ if ( axis == "x" ) { hptr->GetXaxis()->SetTitle(title.c_str()); return true; }
+ if ( axis == "y" ) { hptr->GetYaxis()->SetTitle(title.c_str()); return true; }
+ if ( axis == "z" ) { hptr->GetZaxis()->SetTitle(title.c_str()); return true; }
+ return false;
+}
+#endif
+
+
diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterTowerMerger.cxx b/Calorimeter/CaloRec/src/CaloTopoClusterTowerMerger.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..eeec478d048508bbd7266da2639f3d08624a17c8
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoClusterTowerMerger.cxx
@@ -0,0 +1,181 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/WriteHandle.h"
+
+#include "xAODCaloEvent/CaloClusterAuxContainer.h"
+
+#include "CaloTopoClusterTowerMerger.h"
+#include "CaloTopoClusterFromTowerHelpers.h"
+
+#include "CaloUtils/CaloClusterStoreHelper.h"
+
+#define CL_RHMSG( NAME ) MsgStream& operator<<(MsgStream& mstr,const SG::ReadHandleKey< NAME >& ckey ) { mstr << ckey.key(); return mstr; }
+#define CL_WHMSG( NAME ) MsgStream& operator<<(MsgStream& mstr,const SG::WriteHandleKey< NAME >& ckey ) { mstr << ckey.key(); return mstr; }
+
+namespace {
+ CL_RHMSG( xAOD::CaloClusterContainer )
+}
+
+// std::vector<xAOD::CaloCluster::MomentType> CaloTopoClusterTowerMerger::m_momentList = std::vector< CL_MNAME( MomentType ) >();
+// std::vector<std::tuple<xAOD::CaloCluster::MomentType,std::string> > CaloTopoClusterTowerMerger::m_momentMap {
+// CL_ENTRY( FIRST_PHI ),
+// CL_ENTRY( FIRST_ETA ),
+// CL_ENTRY( SECOND_R ),
+// CL_ENTRY( SECOND_LAMBDA ),
+// CL_ENTRY( DELTA_PHI ),
+// CL_ENTRY( DELTA_THETA ),
+// CL_ENTRY( DELTA_ALPHA ),
+// CL_ENTRY( CENTER_X ),
+// CL_ENTRY( CENTER_Y ),
+// CL_ENTRY( CENTER_Z ),
+// CL_ENTRY( CENTER_MAG ),
+// CL_ENTRY( CENTER_LAMBDA ),
+// CL_ENTRY( LATERAL ),
+// CL_ENTRY( LONGITUDINAL ),
+// CL_ENTRY( ENG_FRAC_EM ),
+// CL_ENTRY( ENG_FRAC_MAX ),
+// CL_ENTRY( ENG_FRAC_CORE ),
+// CL_ENTRY( FIRST_ENG_DENS ),
+// CL_ENTRY( SECOND_ENG_DENS ),
+// CL_ENTRY( ISOLATION ),
+// CL_ENTRY( ENG_BAD_CELLS ),
+// CL_ENTRY( N_BAD_CELLS ),
+// CL_ENTRY( N_BAD_CELLS_CORR ),
+// CL_ENTRY( BAD_CELLS_CORR_E ),
+// CL_ENTRY( BADLARQ_FRAC ),
+// CL_ENTRY( ENG_POS ),
+// CL_ENTRY( SIGNIFICANCE ),
+// CL_ENTRY( CELL_SIGNIFICANCE ),
+// CL_ENTRY( CELL_SIG_SAMPLING ),
+// CL_ENTRY( AVG_LAR_Q ),
+// CL_ENTRY( AVG_TILE_Q ),
+// CL_ENTRY( ENG_BAD_HV_CELLS ),
+// CL_ENTRY( N_BAD_HV_CELLS ),
+// CL_ENTRY( PTD ),
+// CL_ENTRY( EM_PROBABILITY ),
+// CL_ENTRY( HAD_WEIGHT ),
+// CL_ENTRY( OOC_WEIGHT ),
+// CL_ENTRY( DM_WEIGHT ),
+// CL_ENTRY( TILE_CONFIDENCE_LEVEL ),
+// CL_ENTRY( VERTEX_FRACTION ),
+// CL_ENTRY( NVERTEX_FRACTION ),
+// CL_ENTRY( ETACALOFRAME ),
+// CL_ENTRY( PHICALOFRAME ),
+// CL_ENTRY( ETA1CALOFRAME ),
+// CL_ENTRY( PHI1CALOFRAME ),
+// CL_ENTRY( ETA2CALOFRAME ),
+// CL_ENTRY( PHI2CALOFRAME ),
+// CL_ENTRY( ENG_CALIB_TOT ),
+// CL_ENTRY( ENG_CALIB_OUT_L ),
+// CL_ENTRY( ENG_CALIB_OUT_M ),
+// CL_ENTRY( ENG_CALIB_OUT_T ),
+// CL_ENTRY( ENG_CALIB_DEAD_L ),
+// CL_ENTRY( ENG_CALIB_DEAD_M ),
+// CL_ENTRY( ENG_CALIB_DEAD_T ),
+// CL_ENTRY( ENG_CALIB_EMB0 ),
+// CL_ENTRY( ENG_CALIB_EME0 ),
+// CL_ENTRY( ENG_CALIB_TILEG3 ),
+// CL_ENTRY( ENG_CALIB_DEAD_TOT ),
+// CL_ENTRY( ENG_CALIB_DEAD_EMB0 ),
+// CL_ENTRY( ENG_CALIB_DEAD_TILE0 ),
+// CL_ENTRY( ENG_CALIB_DEAD_TILEG3 ),
+// CL_ENTRY( ENG_CALIB_DEAD_EME0 ),
+// CL_ENTRY( ENG_CALIB_DEAD_HEC0 ),
+// CL_ENTRY( ENG_CALIB_DEAD_FCAL ),
+// // CL_ENTRY( ENG_CALIB_DEAD_LEAKAG ), // not in r21
+// // CL_ENTRY( ENG_CALIB_DEAD_UNCLAS ), // not in r21
+// CL_ENTRY( ENG_CALIB_FRAC_EM ),
+// CL_ENTRY( ENG_CALIB_FRAC_HAD ),
+// CL_ENTRY( ENG_CALIB_FRAC_REST )
+// };
+
+CaloTopoClusterTowerMerger::CaloTopoClusterTowerMerger(const std::string& name,ISvcLocator* pSvcLocator)
+ : AthReentrantAlgorithm(name,pSvcLocator)
+ , m_clusterContainerKey("CaloCalTopoCluster")
+ , m_towerContainerKey("CaloCalFwdTopoTower")
+ , m_topoSignalContainerKey("CaloCalTopoSignal")
+ , m_cellLinkContainerKey("")
+ , m_clusterRange(3.2)
+{
+ declareProperty("TopoClusterContainerKey",m_clusterContainerKey, "Topo-cluster container key" );
+ declareProperty("TopoTowerContainerKey", m_towerContainerKey, "Topo-tower container key" );
+ declareProperty("TopoSignalContainerKey", m_topoSignalContainerKey,"Topo-signal container key" );
+ declareProperty("TopoSignalCellLinksKey", m_cellLinkContainerKey, "Topo-signal cell links key" );
+ declareProperty("TopoClusterRange", m_clusterRange, "Rapidity range for using topo-clusters in combined signal mode");
+}
+
+CaloTopoClusterTowerMerger::~CaloTopoClusterTowerMerger()
+{ }
+
+StatusCode CaloTopoClusterTowerMerger::initialize()
+{
+ if ( m_clusterRange <= 0. ) {
+ ATH_MSG_ERROR( CaloRec::Helpers::fmtMsg("Invalid topo-cluster range |y| < %6.3f - algorithm non-functional",m_clusterRange) );
+ return StatusCode::FAILURE;
+ }
+
+ if ( m_cellLinkContainerKey.key().empty() ) { m_cellLinkContainerKey = m_topoSignalContainerKey.key() + std::string("_links"); }
+ ATH_CHECK( m_clusterContainerKey.initialize() ); // topo-cluster input key
+ ATH_CHECK( m_towerContainerKey.initialize() ); // topo-tower input key
+ ATH_CHECK( m_topoSignalContainerKey.initialize() ); // topo-signal (topo-cluster+topo-tower) output key
+ ATH_CHECK( m_cellLinkContainerKey.initialize() ); // cell link container key (ESD only)
+
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Topo_cluster with |y| < %.2f will be merged with topo-towers with |y| > %.2f",m_clusterRange,m_clusterRange) );
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode CaloTopoClusterTowerMerger::execute(const EventContext& ctx) const
+{
+
+ // collect input
+ rhandle_t clusterHandle(m_clusterContainerKey,ctx);
+ if ( !clusterHandle.isValid() ) {
+ ATH_MSG_WARNING( "Topo-cluster container with key <" << m_clusterContainerKey << "> not found" );
+ return StatusCode::SUCCESS;
+ }
+ rhandle_t towerHandle(m_towerContainerKey,ctx);
+ if ( !towerHandle.isValid() ) {
+ ATH_MSG_WARNING( "Topo-tower container with key <" << m_towerContainerKey << "> not found" );
+ return StatusCode::SUCCESS;
+ }
+
+ // prepare output
+ whandle_t signalHandle(m_topoSignalContainerKey,ctx);
+ ATH_CHECK(this->addContainerWriteHandle(signalHandle));
+
+ // fill output from topo-clusters
+ for ( auto pClus : *clusterHandle ) { if ( clusterFilter(*pClus) ) { this->makeDeepCopy(*pClus,signalHandle.ptr()); } }
+ // fill output from topo-towers
+ for ( auto pTowr : *towerHandle ) { if ( towerFilter(*pTowr) ) { this->makeDeepCopy(*pTowr,signalHandle.ptr()); } }
+
+ // finalize the clusters/towers
+ lhandle_t linkHandle(m_cellLinkContainerKey,ctx);
+ ATH_CHECK(CaloClusterStoreHelper::finalizeClusters (linkHandle,signalHandle.ptr()));
+
+ return StatusCode::SUCCESS;
+}
+
+bool CaloTopoClusterTowerMerger::makeDeepCopy(const xAOD::CaloCluster& rClus,xAOD::CaloClusterContainer* pClusCont) const
+{ pClusCont->push_back(new xAOD::CaloCluster(rClus)); return true; }
+
+StatusCode CaloTopoClusterTowerMerger::addContainerWriteHandle(whandle_t& signalHandle) const
+{ return CaloClusterStoreHelper::AddContainerWriteHandle(&(*evtStore()),signalHandle,msg()); }
+// // get a new signal handle
+// signalHandle = std::unique_ptr<xAOD::CaloClusterContainer>(new xAOD::CaloClusterContainer());
+// if ( !signalHandle.isValid() ) { return StatusCode::FAILURE; }
+// // get AUX container
+// xAOD::CaloClusterAuxContainer* auxData = new xAOD::CaloClusterAuxContainer();
+// std::string auxName(m_topoSignalContainerKey.key()+"Aux.");
+// if ( evtStore()->overwrite(auxData,auxName).isFailure() ) {
+// ATH_MSG_ERROR("Failed to record xAOD::CaloClusterAuxContainer with key <" << auxName << ">");
+// delete auxData;
+// return StatusCode::FAILURE;
+// }
+// // connect store with object container
+// signalHandle.ptr()->setStore(auxData);
+// return StatusCode::SUCCESS;
+// }
diff --git a/Calorimeter/CaloRec/src/CaloTopoClusterTowerMerger.h b/Calorimeter/CaloRec/src/CaloTopoClusterTowerMerger.h
new file mode 100644
index 0000000000000000000000000000000000000000..d22ebc35ae11af90c2c5ecda3874a2b8cd4af035
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoClusterTowerMerger.h
@@ -0,0 +1,84 @@
+// -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#ifndef CALOREC_CALOTOPOCLUSTERTOWERMERGER_H
+#define CALOREC_CALOTOPOCLUSTERTOWERMERGER_H
+
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/WriteHandleKey.h"
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+
+#include "xAODCaloEvent/CaloCluster.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
+
+#include "CaloEvent/CaloClusterCellLinkContainer.h"
+
+#include <vector>
+//#include <tuple>
+#include <string>
+#include <cmath>
+
+class CaloTopoClusterTowerMerger : public AthReentrantAlgorithm
+{
+public:
+ ///@brief Algorithm constructor
+ CaloTopoClusterTowerMerger(const std::string& name,ISvcLocator* pSvcLocator);
+ ///@brief Baseclass destructor
+ virtual ~CaloTopoClusterTowerMerger();
+
+ ///@name Algorithm interface
+ ///@{
+ virtual StatusCode initialize(); ///< Initialization sets up read and write handle keys
+ virtual StatusCode execute(const EventContext& ctx) const override; ///< Execution merges the container contents
+ ///@}
+
+private:
+
+ ///@name Internally used types
+ ///@{
+ typedef SG::ReadHandleKey<xAOD::CaloClusterContainer> rhandlekey_t; ///< Input data handle key type
+ typedef SG::WriteHandleKey<xAOD::CaloClusterContainer> whandlekey_t; ///< Output data handle key type
+ typedef SG::WriteHandleKey<CaloClusterCellLinkContainer> lhandlekey_t; ///< Cell link container output data handle key
+ typedef SG::ReadHandle<xAOD::CaloClusterContainer> rhandle_t; ///< Input data handle type
+ typedef SG::WriteHandle<xAOD::CaloClusterContainer> whandle_t; ///< Output data handle type
+ typedef SG::WriteHandle<CaloClusterCellLinkContainer> lhandle_t; ///< Cell link container output data handle
+ ///@}
+
+ ///@name Algorithm properties
+ ///@{
+ rhandlekey_t m_clusterContainerKey; ///< Input topo-cluster container
+ rhandlekey_t m_towerContainerKey; ///< Input topo-tower container
+ whandlekey_t m_topoSignalContainerKey; ///< Output merged container
+ lhandlekey_t m_cellLinkContainerKey; ///< Output cell links for merged container
+ double m_clusterRange; ///< Rapidity range for topo-clusters
+ ///@}
+
+ ///@name Helpers
+ ///@{
+ bool makeDeepCopy(const xAOD::CaloCluster& rClus,xAOD::CaloClusterContainer* pClusCont) const; ///< Attaches a deep copy to container, returns @c true if successful.
+ // bool fillMoments(const xAOD::CaloCluster& rClus); ///< Copies list of filled moments into lookup
+ bool clusterFilter(const xAOD::CaloCluster& rClus) const; ///< Filter topo-cluster
+ bool towerFilter(const xAOD::CaloCluster& rTowr) const; ///< Filter topo-tower
+ StatusCode addContainerWriteHandle(whandle_t& signalHandle) const; ///< Add a write handle for a container (in CaloClusterStoreHelper from r21.9)
+ ///@}
+};
+
+
+inline bool CaloTopoClusterTowerMerger::clusterFilter(const xAOD::CaloCluster& rClus) const { return std::abs(rClus.eta()) <= m_clusterRange; }
+inline bool CaloTopoClusterTowerMerger::towerFilter(const xAOD::CaloCluster& /*rTowr*/) const { return true; }
+
+///@class CaloTopoClusterTowerMerger
+///
+/// This algorithm merges objects from two @c xAOD::CaloClusterContainer. In the context of the
+/// mixed topo-tower/topo-cluster output, the objects in the topo-cluster container are taken
+/// up to a client-defined (symmetric) rapidity range. The rest of the phase space is then filled
+/// with the objects from the topo-tower container. It is assumed that the overlap resolution
+/// is performed when the topo-tower container is filled. The mixed object container contains deep copies
+/// of the objects in the input containers.
+///
+#endif
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterCalibrator.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterCalibrator.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..67763152daaedf409f024f672e75a739fdae0a3e
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterCalibrator.cxx
@@ -0,0 +1,91 @@
+/* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */
+
+#include "CaloTopoTowerFromClusterCalibrator.h"
+#include "CaloTopoClusterFromTowerHelpers.h"
+
+#include "CaloEvent/CaloCellClusterWeights.h"
+
+#include "CaloGeoHelpers/CaloSampling.h"
+
+#include <numeric>
+
+namespace { /////////////////////////////////////////////////////////////
+ double accumulateWeight(const CaloCellClusterWeights::weight_t& wght) // A cell can be split across clusters (usually only two). //
+ { return wght.empty() // It thus receives two different calibration weights, //
+ ? 0. // including geometrical weight introduced by splitting. //
+ : wght.size() == 1 // The overall weight is the sum of the two. //
+ ? wght.front() /////////////////////////////////////////////////////////////
+ : std::accumulate(wght.begin(),wght.end(),0.);
+ }
+}
+
+CaloTopoTowerFromClusterCalibrator::CaloTopoTowerFromClusterCalibrator(const std::string& type,const std::string& name,const IInterface* pParent)
+ : AthAlgTool(type,name,pParent)
+{
+ declareInterface<CaloTowerCollectionProcessor>(this);
+ declareProperty("OrderClusterByPt", m_orderByPt, "Order clusters by calibrated Pt (input)");
+}
+
+StatusCode CaloTopoTowerFromClusterCalibrator::execute(const EventContext& /*ctx*/,
+ xAOD::CaloClusterContainer* pClusCont,
+ CaloCellClusterWeights* cellWeights) const
+{
+
+ // protection needed?
+ if ( cellWeights == nullptr ) {
+ ATH_MSG_ERROR("Tower calibrator needs valid pointer to LCW weight lookup");
+ return StatusCode::FAILURE;
+ }
+
+ /////////////////////////
+ // Calibrated clusters //
+ /////////////////////////
+
+ // loop towers
+ for ( auto pClus : *pClusCont ) {
+ // loop cells in towers
+ for ( auto fCell(pClus->cell_begin()); fCell != pClus->cell_end(); ++fCell ) {
+ // pick up the LCW weights (one if cell is only in one topo-cluster, two if cell is split between two) -> w_cell
+ const CaloCellClusterWeights::weight_t& wght(cellWeights->at(*fCell));
+ // pick up geometrical weight of cells in tower
+ double weight(fCell.weight());
+ // combine the weights -> w_geo * w_cell
+ weight *= accumulateWeight(wght);
+ if ( weight == 0. ) {
+ // weight = 0 should actualy never happen!!!!
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("[NO_LCW_REWEIGHT] Tower (%6.3f,%6.3f) cell [%6zu] weight = %6.3f [# LCW weights %zu geo %6.3f LCW %6.3f] SamplingID %2u Name \042%s\042",
+ pClus->eta(),pClus->phi(),(size_t)fCell->caloDDE()->calo_hash(),weight,wght.size(),fCell.weight(),weight/std::max(fCell.weight(),1e-08),
+ (unsigned int)fCell->caloDDE()->getSampling(),CaloSampling::getSamplingName(fCell->caloDDE()->getSampling()).c_str()) );
+ } else {
+ // valid weight, apply to cell in tower
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("[DO_LCW_REWEIGHT] Tower (%6.3f,%6.3f) cell [%6zu] weight = %6.3f [# LCW weights %zu geo %6.3f LCW %6.3f]",
+ pClus->eta(),pClus->phi(),(size_t)fCell->caloDDE()->calo_hash(),weight,wght.size(),fCell.weight(),weight/fCell.weight()) );
+ pClus->reweightCell(fCell,weight); // Set new weight. //
+ }
+ } ////////////////////////////////////////////////////////////
+ // preserve raw (EM) kinematics
+ double rawE(pClus->e()); ////////////////////////////////////////////////////////////////////////////////////////////
+ double rawEta(pClus->eta()); // Clusters are instantiated with signal state CALIBRATED. The kinematics prior to the //
+ double rawPhi(pClus->phi()); // application of LCW is EM. This code saves the EM scale kinematics. //
+ double rawM(pClus->m()); ////////////////////////////////////////////////////////////////////////////////////////////
+ // update cluster kinematics
+ CaloRec::Helpers::calculateKine(pClus,true); ////////////////////////////////////////////////////////////////////////////////////////////
+ pClus->setRawE(rawE); // The calculateKine function recombines cell signals with the updated weights (combined //
+ pClus->setRawEta(rawEta); // LCW and tower geometry weights). After this function, the CALIBRATED state reflects //
+ pClus->setRawPhi(rawPhi); // these combined weights. The EM scale kinematics is restored as raw (UNCALIBRATED). //
+ pClus->setRawM(rawM); ////////////////////////////////////////////////////////////////////////////////////////////
+ } // cluster loop
+
+ // order clusters by Pt if requested
+ if ( m_orderByPt ) {
+ std::sort(pClusCont->begin(),pClusCont->end(),[](xAOD::CaloCluster* pc1,xAOD::CaloCluster* pc2) {
+ volatile double pt1(pc1->pt());
+ volatile double pt2(pc2->pt());
+ return ( pt1 > pt2 );
+ }
+ );
+ }
+
+ return StatusCode::SUCCESS;
+}
+
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterCalibrator.h b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterCalibrator.h
new file mode 100644
index 0000000000000000000000000000000000000000..4c8372318225735f52c66ddb92e1ef9e471bc7fc
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterCalibrator.h
@@ -0,0 +1,48 @@
+// -*- c++ -*-
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+#ifndef CALOREC_CALOTOPOTOWERFROMCLUSTERCALIBRATOR_H
+#define CALOREC_CALOTOPOTOWERFROMCLUSTERCALIBRATOR_H
+
+#include "StoreGate/ReadHandleKey.h"
+
+#include "AthenaBaseComps/AthAlgTool.h"
+
+#include "CaloRec/CaloTowerCollectionProcessor.h"
+
+#include <string>
+
+class CaloCellClusterWeights;
+
+class CaloTopoTowerFromClusterCalibrator : public AthAlgTool, virtual public CaloTowerCollectionProcessor
+{
+public:
+
+ /// @brief Tool constructor
+ CaloTopoTowerFromClusterCalibrator(const std::string& type,const std::string& name,const IInterface* pParent);
+
+ /// @brief Tool execution
+
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::CaloClusterContainer* pClusCont,
+ CaloCellClusterWeights* cellWeights) const override;
+ // virtual StatusCode initialize() override;
+private:
+
+ /// @name Tool properties
+ /// @{
+ bool m_orderByPt = { false }; ///< Turn on pT ordering if @c true
+ /// @}
+};
+/// @class CaloTopoTowerFromClusterCalibrator
+///
+/// @brief A cluster builder tool to calibrate topo-clusters formed from (EM) calorimeter towers to the LCW scale.
+///
+/// This module applies LCW weights to cells contributing to towers represented by @c xAOD::CaloCluster objects.
+/// The overall energy contribution of a given cell contributing to a given tower is then @f$ w_{\rm geo} \times w_{\rm LCW} \times E_{\rm cell} @f$,
+/// where @f$ w_{\rm geo} @f$ is the geometrical weight, @f$ w_{\rm LCW} @f$ is
+/// the calibration weight the cell received from the LCW calibration in the context of the @c xAOD::CaloCluster objects it contributes to (at most two),
+/// and @f$ E_{\rm cell} @f$ is the cell energy on EM scale. More details on the weights are given on
+/// <a href="https://twiki.cern.ch/twiki/bin/view/AtlasSandboxProtected/CaloTowerPerformance" title="https://twiki.cern.ch/twiki/bin/view/AtlasSandboxProtected/CaloTowerPerformance">this page</a>.
+///
+/// @author Peter Loch <loch@physics.arizona.edu>
+#endif
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b3861bb3f862ca3ba15d134129f61c586380966b
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.cxx
@@ -0,0 +1,608 @@
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
+#include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
+
+#include "AthenaKernel/Units.h"
+
+#include "CaloTopoTowerFromClusterMaker.h"
+#include "CaloTopoClusterFromTowerHelpers.h"
+
+#include "xAODCaloEvent/CaloClusterKineHelper.h"
+
+#include "CaloEvent/CaloClusterCellLink.h"
+#include "CaloEvent/CaloCellClusterWeights.h"
+
+#include "CaloGeoHelpers/CaloSampling.h"
+#include "CaloGeoHelpers/CaloPhiRange.h"
+#include "CaloGeoHelpers/proxim.h"
+
+#include "CaloProtoCluster.h"
+#include "CaloTowerGeometrySvc.h"
+
+#include "CaloDetDescr/CaloDetDescrElement.h"
+#include "CaloDetDescr/CaloDetDescrManager.h"
+
+#include <algorithm>
+
+#include <cstdio>
+#include <cstdarg>
+#include <string>
+#include <cmath>
+#include <memory>
+#include <vector>
+#include <atomic>
+#include <tuple>
+
+namespace {
+ MsgStream& operator<<(MsgStream& mstr,const SG::ReadHandleKey<CaloCellContainer>& ckey) { mstr << ckey.key(); return mstr; }
+ MsgStream& operator<<(MsgStream& mstr,const SG::ReadHandleKey<xAOD::CaloClusterContainer>& ckey) { mstr << ckey.key(); return mstr; }
+}
+
+std::atomic<bool> CaloTopoTowerFromClusterMaker_checkCellIndices(false);
+
+///////////////////////////////////
+// CaloTopoTowerFromClusterMaker //
+///////////////////////////////////
+
+double CaloTopoTowerFromClusterMaker::m_energyThresholdDef = -100000000.; // in MeV
+double CaloTopoTowerFromClusterMaker::m_clusterRangeDef = 5.;
+std::string CaloTopoTowerFromClusterMaker::m_defaultKey = "NONE";
+CaloTopoTowerFromClusterMaker::uint_t CaloTopoTowerFromClusterMaker::m_errorValueUINT = uint_t(-1);
+
+CaloTopoTowerFromClusterMaker::CaloTopoTowerFromClusterMaker(const std::string& type,
+ const std::string& name,
+ const IInterface* pParent)
+ : AthAlgTool(type,name,pParent)
+ , m_towerGeometrySvc("CaloTowerGeometrySvc",name)
+ , m_clusterContainerKey("CaloTopoCluster")
+ , m_cellContainerKey("AllCalo")
+ , m_energyThreshold(m_energyThresholdDef-1.)
+ , m_clusterRange(m_clusterRangeDef)
+ , m_numberOfCells(0)
+ , m_maxCellHash(0)
+ , m_numberOfSamplings(static_cast<uint_t>(CaloSampling::Unknown))
+ , m_numberOfTowers(0)
+{
+ declareInterface<CaloTowerCollectionProcessor>(this);
+ declareProperty("CaloTowerGeometrySvc", m_towerGeometrySvc=ServiceHandle<CaloTowerGeometrySvc>("CaloTowerGeometrySvc",name), "Service providing tower geometry");
+ declareProperty("CaloCellContainerKey", m_cellContainerKey, "SG Key for CaloCellContainer (input)");
+ declareProperty("BuildTopoTowers", m_useCellsFromClusters, "Turn on/off topo-tower formation");
+ declareProperty("CaloTopoClusterContainerKey", m_clusterContainerKey, "SG Key for CaloClusterContainer (input)");
+ declareProperty("OrderClusterByPt", m_orderByPt, "Turn on/off pT-ordering of CaloClusterContainer (output)");
+ declareProperty("ApplyCellEnergyThreshold", m_applyCellEnergyThreshold, "Turn on/off cell energy thresholds");
+ declareProperty("CellEnergyThreshold", m_energyThreshold, "Energy threshold for cells filled in clusters");
+ declareProperty("PrepareLCW", m_prepareLCW, "Prepare data structure to apply LCW");
+ declareProperty("ExcludedSamplings", m_excludedSamplingsName, "Excluded samplings by name");
+ declareProperty("DoCellIndexCheck", m_doCellIndexCheck, "Check cell hash indices for consistency");
+ declareProperty("BuildCombinedTopoSignal", m_buildCombinedSignal, "Build topo-clusters and topo-towers");
+ declareProperty("TopoClusterRange", m_clusterRange, "Rapidity range for using topo-clusters in combined signal mode");
+}
+
+StatusCode CaloTopoTowerFromClusterMaker::initialize()
+{
+ //--------------------//
+ // Set up handle keys //
+ //--------------------//
+
+ ATH_CHECK(m_cellContainerKey.initialize());
+
+ //---------------------//
+ // Check configuration //
+ //---------------------//
+
+ // tower geometry service
+ ATH_MSG_INFO("Allocate tower geometry service:");
+ if ( !m_towerGeometrySvc.isValid() ) {
+ ATH_MSG_ERROR("[reject] cannot allocate tower geometry service - fatal");
+ return StatusCode::FAILURE;
+ } else {
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Tower geometry service is allocated, describes %6zu towers in grid:", m_towerGeometrySvc->towerBins()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[accept] %3zu eta bins in [%5.2f,%5.2f]",m_towerGeometrySvc->etaBins(),m_towerGeometrySvc->etaMin(),m_towerGeometrySvc->etaMax()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[accept] %3zu phi bins in [%5.2f,%5.2f]",m_towerGeometrySvc->phiBins(),m_towerGeometrySvc->phiMin(),m_towerGeometrySvc->phiMax()) );
+ }
+
+ // tower builder configurations
+ if ( m_useCellsFromClusters ) {
+ // topo-tower
+ ATH_MSG_INFO("Configure for building topo-towers (filtered mode):");
+ // energy threshold not (yet) implemented for topo-towers
+ if ( m_applyCellEnergyThreshold ) {
+ ATH_MSG_WARNING("[ignore] cannot apply energy thresholds to topo-towers!");
+ m_applyCellEnergyThreshold = false;
+ }
+ ATH_CHECK(m_clusterContainerKey.initialize());
+ // // check on request for LCW
+ // if ( m_prepareLCW ) {
+ // ATH_CHECK(m_cellClusterWeightKey.initialize());
+ // ATH_MSG_INFO("[accept] prepare for LCW calibration - initialize CaloCellClusterWeights key object <" << m_cellClusterWeightKey << ">");
+ // } else {
+ // ATH_MSG_INFO("[accept] use EM scale");
+ // }
+ } else {
+ // inclusive/exclusive towers
+ ATH_MSG_INFO("Configure for building cell towers:");
+ if ( m_applyCellEnergyThreshold ) {
+ ATH_MSG_INFO("[accept] configure exclusive towers: use cell energy threshold");
+ if ( m_energyThreshold < m_energyThresholdDef ) {
+ ATH_MSG_ERROR("######## [reject] invalid cell energy threshold " << m_energyThreshold/Athena::Units::GeV
+ << " GeV is smaller than default (no-op) " << m_energyThresholdDef/Athena::Units::GeV << " GeV - fatal");
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_INFO("######## [accept] energy threshold for cells to contribute to towers is " << m_energyThreshold/Athena::Units::GeV << " GeV");
+ } else {
+ ATH_MSG_INFO("[accept] configure inclusive towers");
+ } // end inclusive/exclusive tower configuration
+ } // end tower builder configuration
+
+ // local data (constant parameters)
+ m_numberOfCells = m_towerGeometrySvc->totalNumberCells();
+ m_maxCellHash = m_towerGeometrySvc->maxCellHash();
+ m_numberOfTowers = m_towerGeometrySvc->towerBins();
+ ATH_MSG_INFO("Additional tool parameters:");
+ if ( m_numberOfCells > 0 ) {
+ ATH_MSG_INFO("[accept] maximum cell hash index is " << m_maxCellHash);
+ ATH_MSG_INFO("[accept] maximum number of cells is " << m_numberOfCells);
+ } else {
+ ATH_MSG_ERROR("[reject] invalid maximum cell hash index/total number of cells " << m_maxCellHash << "/" << m_numberOfCells << " - fatal");
+ return StatusCode::FAILURE;
+ }
+ if ( m_numberOfTowers > 0 ) {
+ ATH_MSG_INFO("[accept] maximum number of towers is " << m_numberOfTowers);
+ } else {
+ ATH_MSG_ERROR("[reject] invalid maximum number of towers " << m_numberOfTowers << " - fatal");
+ return StatusCode::FAILURE;
+ }
+
+ if ( m_excludedSamplingsName.empty() ) {
+ m_excludedSamplings.clear();
+ m_excludedSamplingsPattern.reset();
+ ATH_MSG_INFO("Cells from all samplings used for topo-cluster included");
+ } else {
+ size_t nex(std::min(m_excludedSamplingsName.size(), m_excludedSamplingsPattern.size()));
+ if ( m_excludedSamplingsName.size() > m_excludedSamplingsPattern.size() ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Configuration problem: number of excluded sampling names %zu exceeds expected maximum %zu - ignore last %zu name(s)",
+ m_excludedSamplingsName.size(), m_excludedSamplingsPattern.size(),m_excludedSamplingsName.size()-m_excludedSamplingsPattern.size()) );
+ }
+ m_excludedSamplings.resize(nex);
+ m_excludedSamplingsPattern.reset();
+ for ( size_t i(0); i<nex; ++i ) {
+ m_excludedSamplings[i] = CaloRec::Lookup::getSamplingId(m_excludedSamplingsName.at(i));
+ m_excludedSamplingsPattern.set(i);
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("CaloSampling \042%10.10s\042 has id %2zu (name in lookup table \042%10.10s\042)",
+ m_excludedSamplingsName.at(i).c_str(),(size_t)m_excludedSamplings.at(i),CaloRec::Lookup::getSamplingName(m_excludedSamplings.at(i)).c_str()) );
+ }
+ }
+
+ ATH_MSG_INFO("Other properties:");
+ std::map<bool,std::string> blu { { true, "true" }, { false, "false" } };
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("PrepareLCW ................. %s", blu[m_prepareLCW].c_str()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("BuildTopoTowers ............ %s", blu[m_useCellsFromClusters].c_str()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("ApplyCellEnergyThreshold ... %s", blu[m_applyCellEnergyThreshold].c_str()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("OrderClusterByPt ........... %s", blu[m_orderByPt].c_str()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("DoCellIndexCheck ........... %s", blu[m_doCellIndexCheck].c_str()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("BuildCombinedTopoSignal .... %s", blu[m_buildCombinedSignal].c_str()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("TopoClusterRange ........... %.2f", m_clusterRange) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("ExcludedSamplings .......... %zu (number of)",m_excludedSamplingsName.size()) );
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode CaloTopoTowerFromClusterMaker::finalize()
+{ return StatusCode::SUCCESS; }
+
+StatusCode CaloTopoTowerFromClusterMaker::execute(const EventContext& ctx,
+ xAOD::CaloClusterContainer* pClusCont,
+ CaloCellClusterWeights* cellWeights) const
+{
+ /////////////////
+ // Check input //
+ /////////////////
+
+ // CaloCellContainer is needed to construct CaloProtoCluster
+ SG::ReadHandle<CaloCellContainer> pCellCont(m_cellContainerKey,ctx);
+ if ( !pCellCont.isValid() ) {
+ ATH_MSG_ERROR("Cannot allocate CaloCellContainer with key <" << m_cellContainerKey << ">");
+ return StatusCode::FAILURE;
+ }
+
+ if ( msgLvl(MSG::DEBUG) && m_numberOfCells != pCellCont->size() ) {
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("[mismatch] number of cells in CaloCellContainer %6zu, total number of cell descriptors %6zu",
+ pCellCont->size(),m_towerGeometrySvc->totalNumberCells()) );
+ }
+
+ if ( m_doCellIndexCheck ) { this->checkCellIndices(pCellCont.cptr()); }
+
+ /////////////////////////
+ // Set up ProtoCluster //
+ /////////////////////////
+
+ // index of CaloProtoCluster in container relates to tower position! DO NOT sort, shuffle, or remove elements!
+ protocont_t pProtoCont; pProtoCont.reserve(m_numberOfTowers);
+ for ( uint_t i(0); i<m_numberOfTowers; ++i ) { pProtoCont.push_back(CaloProtoCluster(pCellCont.cptr())); }
+
+ //////////////////////////////////////////////////////
+ // Apply overall cell filter and fill protoclusters //
+ //////////////////////////////////////////////////////
+
+ // The weights extracted for cells from clusters are LCW weights (typically). The total
+ // contribution of a LCW-weighted cell to towers is Ecell*Weight_LCW*Weight_tower.
+
+ // If EM clusters are used, the weights of a clustered cell are completely defined
+ // by the tower grid. As cells can shared between clusters, each cell can only be
+ // projected onto the towergrid once, with Ecell*Weight_tower
+
+ // The CaloCellClusterWeights object is used to store the combined LCW weight.
+ // for each clustered cell. In case of EM, the LCW weights are ignored and this
+ // object is not used - a simple vector<bool> tags cells already put into towers.
+
+ uint_t cCtr(0);
+ if ( m_useCellsFromClusters ) {
+ // retrieve topo-cluster container for topo-towers
+ SG::ReadHandle<xAOD::CaloClusterContainer> pTopoClusCont(m_clusterContainerKey,ctx);
+ if ( !pTopoClusCont.isValid() ) {
+ ATH_MSG_ERROR("Cannot allocate xAOD::CaloClusterContainer with key <" << m_clusterContainerKey << ">");
+ return StatusCode::FAILURE;
+ } // check on ReadHandle validity
+ cCtr = m_prepareLCW && cellWeights != nullptr ? this->buildLCWTopoTowers(*pTopoClusCont,pProtoCont,cellWeights) : this->buildEMTopoTowers(*pTopoClusCont,pProtoCont);
+ if ( !isValidIndex(cCtr) ) { ATH_MSG_WARNING("problems building EM or LCW topo-towers"); return StatusCode::SUCCESS; }
+ } else {
+ // fill inclusive/exclusive towers
+ cCtr = m_applyCellEnergyThreshold ? this->buildExclTowers(*pCellCont,pProtoCont) : this->buildInclTowers(*pCellCont,pProtoCont);
+ if ( !isValidIndex(cCtr) ) { ATH_MSG_WARNING("problems building EM inclusive or exclusive towers"); return StatusCode::SUCCESS; }
+ } // end topo-towers/inclusive-exclusive towers
+
+
+
+ // allocate sufficient space in vector
+ pClusCont->reserve(cCtr);
+ // pick up cluster size tag and set up counter
+ xAOD::CaloCluster::ClusterSize csize = this->getClusterSize(m_numberOfTowers);
+ // loop proto-clusters
+ for ( uint_t ipc(0); ipc<pProtoCont.size(); ++ipc ) {
+ CaloProtoCluster& pProto = pProtoCont.at(ipc); // pick up proto-cluster
+ CaloClusterCellLink* lptr = pProto.releaseCellLinks(); // take over CaloClusterCellLink object
+ this->cleanupCells(lptr,ipc); // clean up cell links
+ if ( this->filterProtoCluster(*lptr) ) { // ignore empty proto-clusters (no cells assigned)
+ xAOD::CaloCluster* clptr = new xAOD::CaloCluster(); // new empty cluster
+ pClusCont->push_back(clptr); // put into container
+ clptr->addCellLink(lptr); // transfer cell links to CaloCluster
+ clptr->setClusterSize(csize); // set the cluster size spec
+ CaloRec::Helpers::calculateKine(clptr,false); // calculate kinematics and other signals from cells
+ clptr->setEta0(m_towerGeometrySvc->towerEta(ipc)); // save the tower center eta
+ clptr->setPhi0(m_towerGeometrySvc->towerPhi(ipc)); // save the tower center phi
+ } else {
+ delete lptr;
+ }
+ } // proto-cluster loop
+
+ // clean up proto-cluster container
+ pProtoCont.clear();
+
+ /////////////
+ // Sorting //
+ /////////////
+
+ // All towers/clusters at this point are on EM scale. Sorting LCW towers by pT should be done in the
+ // CaloTopoClusterFromTowerCalibrator tool to assure desired ordering on the final scale.
+ // The link between tower location and index of tower representation (CaloCluster) in its
+ // container is definitively broken after sorting (was never ok in mixed cluster/tower mode).
+ if ( m_orderByPt ) {
+ std::sort(pClusCont->begin(),pClusCont->end(),[](xAOD::CaloCluster* pc1,xAOD::CaloCluster* pc2) {
+ volatile double pt1(pc1->pt()); // FIXME needed? (this was just copied)
+ volatile double pt2(pc2->pt()); // FIXME needed? (this was just copied)
+ return ( pt1 > pt2 );
+ }
+ );
+ } // end ordered by pT
+
+ return StatusCode::SUCCESS;
+} // end execute
+
+//////////////////////
+// Fill topo-towers //
+//////////////////////
+
+// EM
+CaloTopoTowerFromClusterMaker::uint_t CaloTopoTowerFromClusterMaker::buildEMTopoTowers(const xAOD::CaloClusterContainer& pClusCont,protocont_t& pProtoCont) const
+{
+ // presets
+ uint_t cCtr(0);
+ std::vector<bool> cellTags(m_numberOfCells,false);
+
+ // -- EM scale clusters
+ if ( !m_buildCombinedSignal ) {
+ // topo-towers
+ for ( auto pClus : pClusCont ) {
+ for ( auto fCell(pClus->cell_begin()); fCell != pClus->cell_end(); ++fCell ) {
+ uint_t cidx(static_cast<uint_t>((*fCell)->caloDDE()->calo_hash()));
+ if ( cidx < cellTags.size() ) {
+ if ( !cellTags.at(cidx) ) { cellTags[cidx] = this->addCellToProtoCluster(*fCell,pProtoCont); }
+ } else {
+ ATH_MSG_ERROR( CaloRec::Helpers::fmtMsg("Invalid cell hash index %6zu >= maximum index %6zu for cell in %s at (eta,phi) = (%6.3,%f6.3)",
+ cidx,cellTags.size(),CaloSampling::getSamplingName((*fCell)->caloDDE()->getSampling()).c_str(),(*fCell)->eta(),(*fCell)->phi()) );
+ return m_errorValueUINT;
+ }
+ } // end cells-in-cluster loop
+ } // end cluster loop
+ } else {
+ // selected topo-towers for combined signal
+ std::vector<std::tuple<const CaloCell*,double> > cellList(m_numberOfCells,std::tuple<const CaloCell*,double>(0,0.));
+ for ( auto pClus : pClusCont ) {
+ if ( std::abs(pClus->eta()) > m_clusterRange ) {
+ for ( auto fCell(pClus->cell_begin()); fCell != pClus->cell_end(); ++fCell ) {
+ uint_t cidx(static_cast<uint_t>((*fCell)->caloDDE()->calo_hash()));
+ if ( cellTags.at(cidx) ) {
+ std::get<1>(cellList[cidx]) += fCell.weight();
+ } else {
+ cellList[cidx] = std::tuple<const CaloCell*,double>(*fCell,fCell.weight());
+ cellTags[cidx] = true;
+ }
+ } // cell in cluster loop
+ } else {
+ ++cCtr;
+ } // cluster range check
+ } // cluster loop
+ // fill proto-cluster
+ for ( auto tpl : cellList ) { this->addCellToProtoCluster(std::get<0>(tpl),pProtoCont,std::get<1>(tpl)); }
+ } // end of fill mode
+
+ //
+ return cCtr+pProtoCont.size();
+}
+
+// LCW
+CaloTopoTowerFromClusterMaker::uint_t CaloTopoTowerFromClusterMaker::buildLCWTopoTowers(const xAOD::CaloClusterContainer& pClusCont,protocont_t& pProtoCont,CaloCellClusterWeights* cellWeights) const
+{
+ // Need to keep track of LCW weights (up to two per cell) available from the topo-cluster(s) the cell is assigned to.
+ // Each cell in a topo-cluster is, at first occurance, added to the CaloProtoCluster(s) representing the tower(s) and its
+ // LCW calibration weight is stored in a lookup table indexed by the calorimeter hash id of the cell. The second
+ // time the same cell is found in another topo-cluster, only its LCW weight is added to the lookup table (stored in
+ // CaloCellClusterWeights for use in the downstream tower calibration tool) - the assignment to tower(s) has already
+ // happened.
+
+ uint_t cCtr(0);
+ // project cells on tower grid
+ if ( !m_buildCombinedSignal ) {
+ // loop original topo-cluster container
+ for ( auto pClus : pClusCont ) {
+ // loop over cells in the original topo-cluster
+ for ( auto fCell(pClus->cell_begin()); fCell != pClus->cell_end(); ++fCell ) {
+ // map to towers only once
+ if ( !cellWeights->check(*fCell) ) { this->addCellToProtoCluster(*fCell,pProtoCont); }
+ // store all associated LCW weights
+ cellWeights->set(*fCell,fCell.weight());
+ } // end cells-in-cluster loop
+ } // end cluster loop
+ } else {
+ // loop topo-cluster
+ for ( auto pClus : pClusCont ) {
+ // keep top-clusters in configured eta range
+ if ( std::abs(pClus->eta()) > m_clusterRange ) {
+ // loop over cells of topo-clusters for the forward towards
+ for ( auto fCell(pClus->cell_begin()); fCell != pClus->cell_end(); ++fCell ) {
+ // map to towers only once
+ if ( !cellWeights->check(*fCell) ) { this->addCellToProtoCluster(*fCell,pProtoCont); }
+ // store all associated LCW weights
+ cellWeights->set(*fCell,fCell.weight());
+ } // end cells-in-cluster loop
+ } else {
+ ++cCtr;
+ } // end range check
+ } // end cluster loop
+ } // end combined signal check
+
+ //
+ return cCtr+pProtoCont.size();
+}
+
+/////////////////
+// Fill towers //
+/////////////////
+
+// inclusive
+CaloTopoTowerFromClusterMaker::uint_t CaloTopoTowerFromClusterMaker::buildInclTowers(const CaloCellContainer& pCellCont,protocont_t& pProtoCont) const
+{
+ // loop cell container - counter icl replaces cell hash index for NULL pointers in cell container
+ uint_t icl(0);
+ for ( auto cptr : pCellCont ) {
+ if ( cptr == 0 ) {
+ ATH_MSG_ERROR( CaloRec::Helpers::fmtMsg("CaloCellContainer[%6zu] contains invalid cell object pointer %p",icl,(void*)cptr) );
+ return m_errorValueUINT;
+ } else {
+ // existing cell with non-zero energy (negative or positive)
+ if ( std::fabs(cptr->e()) > 0. ) { this->addCellToProtoCluster(cptr,pProtoCont); }
+ } // end pointer check
+ ++icl;
+ } // end cell loop
+ return pProtoCont.size();
+}
+
+// exclusive
+CaloTopoTowerFromClusterMaker::uint_t CaloTopoTowerFromClusterMaker::buildExclTowers(const CaloCellContainer& pCellCont,protocont_t& pProtoCont) const
+{
+ // loop cell container
+ uint_t icl(0);
+ for ( auto cptr : pCellCont ) {
+ if ( cptr == 0 ) {
+ ATH_MSG_ERROR( CaloRec::Helpers::fmtMsg("CaloCellContainer[%6zu] contains invalid cell object pointer %p",icl,(void*)cptr) );
+ return m_errorValueUINT;
+ } else {
+ // existing cell with energy above threshold
+ if ( cptr->e() > m_energyThreshold ) { this->addCellToProtoCluster(cptr,pProtoCont); }
+ } // end pointer check
+ ++icl;
+ } // end cell loop
+ //return StatusCode::SUCCESS;
+ return pProtoCont.size();
+}
+
+bool CaloTopoTowerFromClusterMaker::addCellToProtoCluster(const CaloCell* cptr,protocont_t& pProtoCont,double weight) const
+{
+ // invalid input
+ if ( cptr == 0 ) { return false; }
+
+ // get towers for cell from geometry service
+ uint_t nctr(0);
+ for ( auto elm : m_towerGeometrySvc->getTowers(cptr) ) {
+ auto towerIdx(m_towerGeometrySvc->towerIndex(elm));
+ if ( !m_towerGeometrySvc->isInvalidIndex(towerIdx) ) {
+ if ( !m_excludedSamplingsPattern[(size_t)cptr->caloDDE()->getSampling()] ) {
+ uint_t cellIdx(pProtoCont.at(towerIdx).getCellLinks()->getCellContainer()->findIndex(cptr->caloDDE()->calo_hash()));
+ pProtoCont[towerIdx].addCell(cellIdx,m_towerGeometrySvc->cellWeight(elm)*weight); ++nctr;
+ }
+ }
+ }
+ return nctr > 0;
+}
+
+/////////////
+// Helpers //
+/////////////
+
+xAOD::CaloCluster::ClusterSize CaloTopoTowerFromClusterMaker::getClusterSize(uint_t etaBins,uint_t phiBins) const
+{ return this->getClusterSize(etaBins*phiBins); }
+
+xAOD::CaloCluster::ClusterSize CaloTopoTowerFromClusterMaker::getClusterSize(uint_t nTowers) const
+{
+ // check for tower sizes
+ return nTowers == 6400 // known "standard" towers 0,1 x 0.1
+ ? xAOD::CaloCluster::Tower_01_01
+ : nTowers == 25600 // known "fine" towers 0.05 x 0.05
+ ? xAOD::CaloCluster::Tower_005_005
+ : xAOD::CaloCluster::Tower_fixed_area; // unspecified towers
+}
+
+int CaloTopoTowerFromClusterMaker::cleanupCells(CaloClusterCellLink* clk,uint_t nclus) const
+{
+ // Any pathology here probably indicates a configuration problem with the conditions (geometry)
+ // database (wrong tag for data?)
+
+ // check on null pointers in cell links
+ int nrc(0); int hid(0);
+ auto fcell(clk->begin());
+ while ( fcell != clk->end() ) {
+ const CaloCell* pCell = *fcell;
+ auto nc(clk->getCellContainer()->size());
+ const CaloCell* aCell = fcell.index() < nc ? clk->getCellContainer()->at(fcell.index()) : (const CaloCell*)0;
+ if ( pCell == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("CaloCellContainer[%6zu/%6zu] - tower %5zu at (%6.3f,%6.3f) - cell pointer invalid (%p/%p) [removed %3i of %3zu cells]",
+ fcell.index(),nc-1,nclus,m_towerGeometrySvc->towerEta(nclus),m_towerGeometrySvc->towerPhi(nclus),
+ (void*)pCell,(void*)aCell,++nrc,clk->size()) );
+ fcell = clk->removeCell(fcell);
+ } else {
+ uint_t chash(static_cast<uint_t>(pCell->caloDDE()->calo_hash()));
+ uint_t csamp(static_cast<uint_t>(pCell->caloDDE()->getSampling()));
+ if (chash > m_maxCellHash ) {
+ // check cell hash
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Tower %5zu at (%6.3f,%6.3f) linked cell %3i - cell hash index (%6zu/%6zu) invalid",
+ nclus,m_towerGeometrySvc->towerEta(nclus),m_towerGeometrySvc->towerPhi(nclus),hid,chash,m_maxCellHash) );
+ fcell = clk->removeCell(fcell); ++nrc;
+ } else if ( csamp >= m_numberOfSamplings ) {
+ // check sampling id
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Tower %5zu at (%6.3f,%6.3f) linked cell %3i -cell sampling id (%3zu/%3zu) invalid",
+ nclus,m_towerGeometrySvc->towerEta(nclus),m_towerGeometrySvc->towerPhi(nclus),hid,csamp,m_numberOfSamplings) );
+ fcell = clk->removeCell(fcell); ++nrc;
+ } else if ( fcell.weight() <= 0.0000001 ) {
+ // remove cells with 0 weight
+ fcell = clk->removeCell(fcell); ++nrc;
+ } else {
+ // next cell
+ ++fcell;
+ }
+ } // end remove cell due to pointer invalid
+ ++hid;
+ } // end loop on cells in cell link object
+ return nrc;
+}
+
+bool CaloTopoTowerFromClusterMaker::filterProtoCluster(const CaloClusterCellLink& clnk) const
+{ return clnk.size() > 0; }
+
+bool CaloTopoTowerFromClusterMaker::checkCellIndices(const CaloCellContainer* pCellCont) const
+{
+ ////////////////////////////
+ // input and setup checks //
+ ////////////////////////////
+
+ // check argument
+ if ( pCellCont == 0 ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Invalid pointer to CaloCellContainer (%p)",(void*)pCellCont) ); return false;
+ } else if ( pCellCont->empty() ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("CaloCellContainer at %p is empty (size %zu)",(void*)pCellCont,pCellCont->size()) ); return false;
+ }
+ // check the atomic state
+ if ( CaloTopoTowerFromClusterMaker_checkCellIndices ) { return true; }
+ // set the atomic flag
+ ATH_MSG_INFO( "Cell hash index check requested" );
+ CaloTopoTowerFromClusterMaker_checkCellIndices = true;
+ // assign output file
+ std::string algname(this->name());
+ if ( algname.find_last_of('.') != std::string::npos ) { algname = algname.substr(algname.find_last_of('.')+1); }
+ std::string logname(CaloRec::Helpers::fmtMsg("%s.cellhash_index_check.dat",this->name().c_str()));
+ std::ofstream logstream; logstream.open(logname);
+ if ( !logstream.is_open() ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("Cannot open log file \042%s\042 - no hash index checking",logname.c_str()) );
+ return false;
+ }
+ logstream << "##########################################################################" << std::endl;
+ logstream << "### This file contains a list of CaloCell indices in CaloCellContainer ###" << std::endl;
+ logstream << "### for which this index is not the same as the calorimeter cell hash ###" << std::endl;
+ logstream << "### identifier. An empty list indicates full consistency between this ###" << std::endl;
+ logstream << "### index and the hash identifier for all cells. ###" << std::endl;
+ logstream << "##########################################################################" << std::endl;
+ logstream << "<begin list>--------------------------------------------------------------" << std::endl;
+
+ /////////////////////////
+ // loop cell container //
+ /////////////////////////
+
+ // prepare tag store
+ size_t ifc(0); std::bitset<200000> chkflg; chkflg.reset();
+ for ( size_t i(0); i<pCellCont->size(); ++i ) {
+ if ( pCellCont->at(i) != 0 ) {
+ size_t chash((size_t)pCellCont->at(i)->caloDDE()->calo_hash());
+ if ( chash != i ) {
+ std::string cni("UKNOWN");
+ double etai(0.); double phii(0.);
+ const CaloDetDescrElement* iel = i < CaloDetDescrManager::instance()->element_size() ? CaloDetDescrManager::instance()->get_element(i) : 0;
+ if ( iel != 0 ) {
+ cni = CaloRec::Lookup::getSamplingName(iel->getSampling());
+ etai = iel->eta_raw();
+ phii = iel->phi_raw();
+ }
+ std::string cnc("UNKNOWN");
+ double etac(0.); double phic(0.);
+ const CaloDetDescrElement* cel = chash < CaloDetDescrManager::instance()->element_size() ? CaloDetDescrManager::instance()->get_element(chash) : 0;
+ if ( cel != 0 ) {
+ cnc = CaloRec::Lookup::getSamplingName(cel->getSampling());
+ etac = cel->eta_raw();
+ phic = cel->phi_raw();
+ }
+ size_t cidx(pCellCont->findIndex(chash));
+ logstream << CaloRec::Helpers::fmtMsg("[%06zu] Cell %6zu [%12.12s %5.3f %5.3f] non-matching id %6zu [%12.12s %5.3f %5.3f] findCell() index %6zu",
+ ++ifc,i,cni.c_str(),etai,phii,chash,cnc.c_str(),etac,phic,cidx) << std::endl;
+ }
+ chkflg.set(chash);
+ }
+ }
+ logstream << "<end list>----------------------------------------------------------------" << std::endl;
+ logstream.close();
+
+ /////////////////////////
+ // check missed hashes //
+ /////////////////////////
+
+ // number of non-matched hashes
+ if ( ifc > 0 ) {
+ ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("Found %zu non-matching cell hashes",ifc) );
+ }
+ // list of non-matched hashes
+ std::vector<size_t> chl; chl.reserve(m_towerGeometrySvc->totalNumberCells());
+ for ( size_t i(0); i<chl.size(); ++i ) { if ( !chkflg.test(i) ) { chl.push_back(i); } }
+ if ( !chl.empty() ) {
+ for ( auto h : chl ) { ATH_MSG_DEBUG( CaloRec::Helpers::fmtMsg("Cell hash %6zu not in CaloCellContainer",h) ); }
+ }
+
+ return true;
+}
+
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.h b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.h
new file mode 100644
index 0000000000000000000000000000000000000000..9bfd45b6b7d50dcaba0513cb5351b7170a7e5084
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerFromClusterMaker.h
@@ -0,0 +1,255 @@
+// -*- c++ -*-
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+#ifndef CALOREC_CALOTOPOTOWERFROMCLUSTERMAKER_H
+#define CALOREC_CALOTOPOTOWERFROMCLUSTERMAKER_H
+
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/WriteHandleKey.h"
+
+#include "GaudiKernel/ServiceHandle.h"
+
+#include "AthenaBaseComps/AthAlgTool.h"
+
+#include "CaloRec/CaloTowerCollectionProcessor.h"
+#include "CaloTowerGeometrySvc.h"
+#include "CaloProtoCluster.h"
+
+#include "CaloEvent/CaloCell.h"
+#include "CaloEvent/CaloClusterCellLink.h"
+#include "CaloEvent/CaloCellClusterWeights.h"
+#include "CaloEvent/CaloCellContainer.h"
+
+#include "CaloGeoHelpers/CaloSampling.h"
+
+#include "xAODCaloEvent/CaloClusterContainer.h"
+
+#include <string>
+#include <vector>
+#include <bitset>
+#include <map>
+
+#ifndef _CALOTOPOTOWERFROMCLUSTERMAKER_BITSET_SIZE
+#define _CALOTOPOTOWERFROMCLUSTERMAKER_BITSET_SIZE 28
+#endif
+
+class CaloTopoTowerFromClusterMaker : public AthAlgTool, virtual public CaloTowerCollectionProcessor
+{
+public:
+
+ ///@brief Tool constructor
+ CaloTopoTowerFromClusterMaker(const std::string& type,const std::string& name,const IInterface* pParent);
+ ///@name @c AthAlgTool and @c CaloClusterCellProcessor interface implementations
+ ///@{
+ virtual StatusCode initialize() override; ///< Setting up the operational mode and corresponding parameters
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::CaloClusterContainer* pClusCont,
+ CaloCellClusterWeights* cellWeights) const override; ///< Execute the tool and fill the @c xAOD::CaloClusterContainer pointed to by @c pClusCont
+ virtual StatusCode finalize() override; ///< Finalize the tool (no action)
+ ///@}
+
+
+private:
+
+ ///@name Internally used types
+ ///@{
+ typedef std::vector<CaloProtoCluster> protocont_t; ///< Container for @c CaloProtoCluster objects
+ typedef std::size_t uint_t; ///< Unsigned integral type
+ ///@}
+
+ /// @name Tool properties
+ /// @{
+ ServiceHandle<CaloTowerGeometrySvc> m_towerGeometrySvc; ///< Tower geometry service
+ SG::ReadHandleKey<xAOD::CaloClusterContainer> m_clusterContainerKey; ///< Topo-cluster container key
+ SG::ReadHandleKey<CaloCellContainer> m_cellContainerKey; ///< Calorimeter cell container
+ bool m_orderByPt = { false }; ///< Orders cluster container by @f$ p_{\text{T}} @f$, default @c true
+ bool m_prepareLCW = { false }; ///< Prepare LCW calibration, default is @c false
+ bool m_useCellsFromClusters = { true }; ///< Use cells from topo-clusters if @c true, else use all cells, default is @c true
+ bool m_applyCellEnergyThreshold = { false }; ///< Apply cell energy threshold, default is @c false
+ bool m_doCellIndexCheck = { false }; ///< Check cell hash index consistency if @c true (default @c false)
+ bool m_buildCombinedSignal = { false }; ///< Build topo-clusters within given @f$ y @f$ range, else topo-towers
+ double m_energyThreshold; ///< Cell energy threshold, default is set in @c m_energyThresholdDef
+ double m_clusterRange; ///< Range where topo-clusters are used when <tt>m_buildCombinedSignal = true</tt>
+ /// @}
+
+ /// @name Constants and parameters
+ /// @{
+ uint_t m_numberOfCells; ///< Number of cells (highest cell index + 1)
+ uint_t m_maxCellHash; ///< Maximum hash index of cell ( number of cells - 1)
+ uint_t m_numberOfSamplings; ///< Number of samplings
+ uint_t m_numberOfTowers; ///< Number of towers
+ static double m_energyThresholdDef; ///< Default energy threshold
+ static double m_clusterRangeDef; ///< Default cluster @f$ y @f$ range
+ static std::string m_defaultKey; ///< Default container key
+ static uint_t m_errorValueUINT; ///< Error value for @c uint_t type values
+ /// @}
+
+ ///@name Internally used helpers
+ ///@{
+ xAOD::CaloCluster::ClusterSize getClusterSize(uint_t etaBins,uint_t phiBins) const; ///< Returns a cluster size tag from number of eta and phi bins in tower grid
+ xAOD::CaloCluster::ClusterSize getClusterSize(uint_t towerBins) const; ///< Returns a cluster size tag from number of towers (bins) in tower grid
+ int cleanupCells(CaloClusterCellLink* clk,uint_t nclus) const; ///< Checks @c CaloClusterCellLink for consistency
+ ///@}
+
+ ///@name Tower builders
+ ///
+ ///@return @c false in case of problems with data access or inconsistent data structures
+ ///
+ ///@param pCellCont reference to non-modifiable @c CaloCellContainer
+ ///@param pProtoCont reference to @c CaloProtoCluster container filled on output.
+ ///@param clusCont reference to non-modifiable @c xAOD::CaloClusterContainer
+ ///@param protoCont reference to modifiable proto-cluster container
+ ///
+ ///@return
+ ///@{
+ uint_t buildInclTowers(const CaloCellContainer& pCellCont,protocont_t& pProtoCont)const; ///< Inclusive towers
+ uint_t buildExclTowers(const CaloCellContainer& pCellCont,protocont_t& pProtoCont)const; ///< Exclusive towers
+ uint_t buildEMTopoTowers(const xAOD::CaloClusterContainer& clusCont,protocont_t& protoCont)const; ///< EM topo-towers
+ uint_t buildLCWTopoTowers(const xAOD::CaloClusterContainer& clusCont,protocont_t& protoCont,CaloCellClusterWeights* cellWeights) const; ///< LCW topo-towers
+ ///@}
+ /// @brief Adding cells to proto-clusters
+ ///
+ /// @return @c true if cell successfully added to one (or more) proto-clusters
+ ///
+ /// @param cptr pointer ton non-modifiable @c CaloCell object
+ /// @param pProtoCont reference to proto-cluster container
+ /// @param weight additional (global) weight of cell (e.g. for geometrical weight for combined EM-scale signals)
+ bool addCellToProtoCluster(const CaloCell* cptr,protocont_t& pProtoCont,double weight=1.) const;
+
+ ///@name Helpers
+ ///@{
+ bool filterProtoCluster(const CaloClusterCellLink& clnk) const; ///< Checks for and removes invalid cell links
+ bool checkCellIndices(const CaloCellContainer* pCellCont) const; ///< Checks consistency between cell indices and hash identifiers
+ bool isValidIndex(uint_t idx) const; ///< Checks if argument is a valid index value
+ uint_t badIndexValue() const; ///< Returns value indicating a bad index
+ ///@}
+
+ ///@name Excluded samplings
+ ///@{
+ std::vector<CaloSampling::CaloSample> m_excludedSamplings; ///< List of excluded samplings (@c CaloSampling::CaloSample enumerators)
+ std::vector<std::string> m_excludedSamplingsName; ///< List of excluded samplings (human-readable names)
+ std::bitset< _CALOTOPOTOWERFROMCLUSTERMAKER_BITSET_SIZE > m_excludedSamplingsPattern; ///< Bit pattern indicates if sampling is excluded
+ ///@}
+
+ ///@name Monitoring
+ ///@{
+ ///@}
+};
+
+inline CaloTopoTowerFromClusterMaker::uint_t CaloTopoTowerFromClusterMaker::badIndexValue() const { return m_errorValueUINT; }
+inline bool CaloTopoTowerFromClusterMaker::isValidIndex(uint_t idx) const { return idx != badIndexValue(); }
+
+///@class CaloTopoTowerFromClusterMaker
+///
+/// @brief A cluster builder tool forming topo-clusters representing calorimeter tower signals on a regular grid in @f$ (\eta,\phi) @f$ space. By default,
+/// EM-scale <i>topo-towers</i> are created from cells in topo-clusters.
+///
+/// This tool fills EM-scale towers and stores them as @c xAOD::CaloCluster. It supports several operational modes, which are
+/// controlled by tool properties. It fills a container of type @c xAOD::CaloClusterContainer. The properties controlling its
+/// specific behavior are:
+///
+/// <table width="90%" align="center" style="border-width:0px;">
+/// <tr><td align="center" colspan="4" style="background-color:rgb(245,245,220);color:rgb(165,42,42);"><b>Properties defining tool behavior</b></td></tr>
+/// <tr style="color:rgb(131,42,34);">
+/// <td align="left" width="25%">Property name</td>
+/// <td align="center" width="25%">Property type</td>
+/// <td align="center" width="25%">Default value</td>
+/// <td align="left" width="25%">Comment</td>
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>OrderClusterByPt</tt></td>
+/// <td align="center" valign="top"><tt>bool</tt></td>
+/// <td align="center" valign="top"><tt>false</tt></td>
+/// <td align="left" valign="top">if @c true, the @c xAOD::CaloClusterContainer is ordered by @f$ p_{\rm T}^{\rm clus} @f$. See further comments below.</td>
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>PrepareLCW</tt></td>
+/// <td align="center" valign="top"><tt>bool</tt></td>
+/// <td align="center" valign="top"><tt>false</tt></td>
+/// <td align="left" valign="top">if @c true, the tool fills a @c CaloCellClusterWeights object and records it into the event store to be used by @c CaloTopoClusterFromTowerCalibrator</td>
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>UseCellsFromClusters</tt></td>
+/// <td align="center" valign="top"><tt>bool</tt></td>
+/// <td align="center" valign="top"><tt>true</tt></td>
+/// <td align="left" valign="top">if @c true, only cells from topo-clusters are used to fill the towers (<i>topo-towers</i>); else, @a inclusive @a towers are filled with all cells.</td>
+/// </tr>
+/// <tr><td align="center" colspan="4" style="background-color:rgb(245,245,220);color:rgb(165,42,42);"><b>Properties setting variables for operational modes</b></td></tr>
+/// <tr style="color:rgb(131,42,34)">
+/// <td align="left" width="25%">Property name</td>
+/// <td align="center" width="25%">Property type</td>
+/// <td align="center" width="25%">Default value</td>
+/// <td align="left" width="25%">Comment</td>
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>CellEnergyThreshold</tt></td>
+/// <td align="center" valign="top"><tt>double</tt></td>
+/// <td align="center" valign="top"><tt>m_energyThresholdDef</tt></td>
+/// <td align="left" valign="top">cell energy threshold used in exclusive mode only. See further comments below.</td>
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>CellContainerKey</tt></td>
+/// <td align="center" valign="top"><tt>SG::ReadHandleKey<CaloCellContainer></tt></td>
+/// <td align="center" valign="top"><tt>"AllCalo"</tt></td>
+/// <td align="left" valign="top">cell container key is needed to pick up @c CaloCellContainer for all operational modes.</td>
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>ClusterContainerKey</tt></td>
+/// <td align="center" valign="top"><tt>SG::ReadHandleKey<xAOD::CaloClusterContainer></tt></td>
+/// <td align="center" valign="top"><tt>"CaloTopoCluster"</tt></td>
+/// <td align="left" valign="top">cluster container key is needed to pick up @c xAOD::CaloClusterContainer for filtered mode (<tt>UseCellsFromCluster = true</tt>)
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>CellClusterWeightKey</tt></td>
+/// <td align="center" valign="top"><tt>SG::WriteHandleKey<CaloCellClusterWeights></tt></td>
+/// <td align="center" valign="top"><tt>−N/A−</tt></td>
+/// <td align="left" valign="top">key for @c CaloCellClusterWeights object is needed if <tt>PrepareLCW = true</tt>. Default is empty key.
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>BuildCombinedTopoSignal</tt></td>
+/// <td align="center" valign="top"><tt>bool</tt></td>
+/// <td align="center" valign="top"><tt>false</tt></td>
+/// <td align="left" valign="top">turns on combined topo-cluster/topo-tower output, with topo-clusters used within the rapidity range defined by <tt>TopoClusterRange</tt> and topo-towers elsewhere.</td></tr>
+/// </tr>
+/// <tr>
+/// <td align="left" valign="top"><tt>TopoClusterRange</tt></td>
+/// <td align="center" valign="top"><tt>double</tt></td>
+/// <td align="center" valign="top"><tt>5.</tt></td>
+/// <td align="left" valign="top">sets the range @f$ y_{\rm topo-cluster}^{\rm max} @f$ for using topo-clusters when <tt>BuildCombinedTopoSignal = true</tt>;
+/// topo-clusters with @f$ \left|y_{\rm topo-cluster}\right| < y_{\rm topo-cluster}^{\rm max} @f$ are used.
+/// </tr>
+/// </table>
+///
+/// The towers can be classified as:
+/// -# <b>inclusive cell towers</b>
+/// All cells are collected into inclusive towers, independent of their signal. Requires properties <tt>UseCellsFromClusters = false</tt> and <tt>UseCellEnergyThreshold = false</tt>. Only EM
+/// towers are possible, as cells not collected into topo-clustersdo not have a calibration applied.
+/// -# <b>exclusive cell towers</b>
+/// Cells with @f$ E > E_{\rm min} @f$ are collected into exclusive towers. This behaviour is turned on by <tt>UseCellsFromClusters = false</tt> and <tt>UseCellEnergyThreshold = true</tt>. A
+/// meaningful <tt>CellEnergyThreshold</tt> value needs to be provided in addition.
+/// -# <b>filtered mode</b>
+/// Cells contributing to standard topo-clusters are collected into topo-towers. This behaviour is triggered by <tt>UseCellsFromClusters = true</tt>. Optionally, LCW calibration can be applied
+/// to these towers by setting <tt>PrepareLCW = true</tt> and scheduling a @c CaloTopoClusterFromTowerCalibrator tool after the cluster moment calculators. The values of the <tt>UseEnergyThreshold</tt>
+/// and <tt>CellEnergyThreshold</tt> properties are ignored in this mode. A valid event store key needs to be provided in the to pick up the topo-cluster container. Note that building EM
+/// topo-towers requires topo-clusters on EM scale (no LCW applied) to get the correct geometrical cell weights only. LCW topo-towers require LCW scale topo-clusters to get the correct full geometrical
+/// and calibration weights.
+/// -# <b>mixed mode</b>
+/// Cells contributing to standard topo-clusters are collected into towers if these topo-clusters are outside of a give rapidity range. The rapidity range is defined by the <tt>TopoClusterRange</tt>
+/// property. This mode is turned on by setting the property <tt>BuildCombinedTopoSignal = true</tt>. It is turned off by default (<tt>BuildCombinedTopoSignal = false</tt>).
+/// EM scale and LCW scale is possible, as in the filtered mode.
+///
+/// Configuration 2 and 3 are exclusive, with 3 overwriting 2. The output topo-clusters represent calorimeter towers on the EM scale. The can be handed to cluster moment
+/// tools (needs EM scale) and, if desired, to a dedicated cluster calibration tool of type @c xAOD::CaloTowerClusterFromTowerCalibrator .
+///
+/// To avoid multiple retrievals of the same weights by searching for cells in (many) topo-clusters, the overall weight of the cell signal is stored in a random access
+/// look-up table stored in a @c CaloCellClusterWeights object in the detector store. This object is created by this tool, if needed. If the tool property
+/// @c CellWeightLookupKey is set, this object will be generated, filled, and recorded. This is essential for calibrated topo-towers!
+///
+///@note The @c OrderByPt property, which orders the container by descending transverse momentum, is only useful for EM towers. Applyin LCW may lead to a different
+/// order - if a container with LCW towers should be ordered, the corresponding property @c OrderByPt of the @c CaloTopoClusterFromTowerCalibrator tool should
+/// be set to @c true.
+///
+///@note Many more details on the towers are available on
+/// <a href="https://twiki.cern.ch/twiki/bin/view/AtlasSandboxProtected/CaloTowerPerformance" title="https://twiki.cern.ch/twiki/bin/view/AtlasSandboxProtected/CaloTowerPerformance">this page</a>.
+///
+/// @author Peter Loch <loch@physics.arizona.edu>
+#endif
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerMaker.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerMaker.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..12be83c4c276819313b79b2e5a58b1cd2a5f5edf
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerMaker.cxx
@@ -0,0 +1,224 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+//-----------------------------------------------------------------------
+// File and Version Information:
+// $Id: CaloTopoTowerMaker.cxx,v 1.26 2009-04-18 02:56:18 ssnyder Exp $
+//
+// Description: see CaloTopoTowerMaker.h
+//
+// Environment:
+// Software developed for the ATLAS Detector at CERN LHC
+//
+// Author List:
+// Sven Menke
+//
+// Modified: Feb 09, 2005 (DLelas)
+// - CaloTopoTowerMaker applies correction type tool on a whole
+// cluster collection now. Needed for Sliding Window
+// cell weights calculation.
+//
+// Modified Feb 2014 (W Lampl)
+// - Migrate to xAOD::CaloCluster(Container)
+// - Move to AthAlgorithm, some simplifications
+//
+// Modified Sep 2020 (T Chowdhury)
+// -
+//-----------------------------------------------------------------------
+
+//-----------------------
+// This Class's Header --
+//-----------------------
+#include "CaloTopoTowerMaker.h"
+
+//---------------
+// C++ Headers --
+//---------------
+#include "xAODCaloEvent/CaloClusterContainer.h"
+#include "xAODCaloEvent/CaloClusterAuxContainer.h"
+#include "CaloEvent/CaloClusterCellLinkContainer.h"
+#include "CaloEvent/CaloCellClusterWeights.h"
+
+#include "CaloUtils/CaloClusterSignalState.h"
+#include "CaloUtils/CaloClusterStoreHelper.h"
+#include "AthenaKernel/errorcheck.h"
+
+#include "GaudiKernel/IChronoStatSvc.h"
+
+#include "CaloTopoClusterFromTowerHelpers.h"
+
+#include <memory> // for the std::unique_ptr
+#include <cmath>
+
+//###############################################################################
+CaloTopoTowerMaker::CaloTopoTowerMaker(const std::string& name,
+ ISvcLocator* pSvcLocator)
+ : AthReentrantAlgorithm(name, pSvcLocator)
+ , m_towerOutput("")
+ , m_towerCellLinkOutput("")
+ , m_towerMakerTool(this)
+ , m_towerCorrectionTools(this)
+ , m_towerCalibratorTool(this)
+ , m_chrono("ChronoStatSvc", name)
+{
+ // Name of Cluster Container to be registered in TDS
+ declareProperty("TowersOutputName",m_towerOutput);
+ declareProperty("TowerCellLinkOutputName",m_towerCellLinkOutput);
+
+ // Name(s) of Cluster Maker Tools
+ declareProperty("TowerMakerTool",m_towerMakerTool);
+
+ // Name(s) of Cluster Correction Tools
+ declareProperty("TowerCorrectionTools",m_towerCorrectionTools);
+
+ // Tower calibrator tool
+ declareProperty("TowerCalibratorTool",m_towerCalibratorTool);
+
+ // save uncalibrated cluster signal state
+ declareProperty("SaveUncalibratedSignalState",m_saveSignalState);
+
+ //Make Chrono Auditors for Cluster maker and correction tools
+ declareProperty("ChronoTools", m_chronoTools);
+
+ // apply LCW calibration for towers
+ declareProperty("UseLCWCalibration",m_useLCWCalibration);
+}
+
+//###############################################################################
+
+CaloTopoTowerMaker::~CaloTopoTowerMaker()
+{ }
+
+//###############################################################################
+
+StatusCode CaloTopoTowerMaker::initialize()
+{
+ // -- allocate tower geometry service
+ ATH_MSG_INFO("Allocate tower geometry service:");
+ if ( !m_towerGeometrySvc.isValid() ) {
+ ATH_MSG_ERROR("[reject] cannot allocate tower geometry service - fatal");
+ return StatusCode::FAILURE;
+ } else {
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Tower geometry service is allocated, describes %6zu towers in grid:", m_towerGeometrySvc->towerBins()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[accept] %3zu eta bins in [%5.2f,%5.2f]",m_towerGeometrySvc->etaBins(),m_towerGeometrySvc->etaMin(),m_towerGeometrySvc->etaMax()) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("[accept] %3zu phi bins in [%5.2f,%5.2f]",m_towerGeometrySvc->phiBins(),m_towerGeometrySvc->phiMin(),m_towerGeometrySvc->phiMax()) );
+ }
+
+ // -- retrieve the needed tower maker tool
+ if (m_towerMakerTool.retrieve().isFailure()) {
+ ATH_MSG_ERROR("Failed to retrieve essential tower maker tool"
+ << m_towerMakerTool);
+ } else {
+ ATH_MSG_DEBUG("Successfully retrieved tower maker tool "
+ << m_towerMakerTool);
+ }
+
+ // -- retrieve the (optional) list of correction tools
+ if (m_towerCorrectionTools.retrieve().isFailure()) {
+ ATH_MSG_ERROR("Failed to retrieve requested tower correction tools "
+ << m_towerCorrectionTools);
+ } else {
+ ATH_MSG_DEBUG("Successfully retrieved tower correction tools "
+ << m_towerCorrectionTools);
+ }
+
+ // -- retrieve tower calibrator tool
+ if ( m_useLCWCalibration ) {
+ if ( m_towerCalibratorTool.retrieve().isFailure() ) {
+ ATH_MSG_ERROR("Failed to retrieve requested tower calibrator tool " << m_towerCalibratorTool);
+ } else {
+ ATH_MSG_DEBUG("Sucessfully retrieved requested tower calibrator tool " << m_towerCalibratorTool);
+ }
+ }
+
+ if (m_chronoTools) {
+ msg(MSG::INFO) << "Will use ChronoStatSvc to monitor ClusterMaker and ClusterCorrection tools" << endmsg;
+ ATH_CHECK( m_chrono.retrieve() );
+ }
+
+ ATH_CHECK( m_towerOutput.initialize() );
+
+ if (m_towerCellLinkOutput.key().empty()) {
+ m_towerCellLinkOutput = m_towerOutput.key() + "_links";
+ }
+ ATH_CHECK( m_towerCellLinkOutput.initialize() );
+
+ return StatusCode::SUCCESS;
+}
+
+//###############################################################################
+
+StatusCode CaloTopoTowerMaker::finalize() {
+ return StatusCode::SUCCESS;
+}
+
+//###############################################################################
+
+StatusCode CaloTopoTowerMaker::execute (const EventContext& ctx) const
+{
+
+ // make a Cluster Container
+ SG::WriteHandle<xAOD::CaloClusterContainer> clusColl (m_towerOutput, ctx);
+ ATH_CHECK(CaloClusterStoreHelper::AddContainerWriteHandle(&(*evtStore()), clusColl, msg()));
+
+ std::string chronoName(this->name()+std::string("_"));
+ if ( !m_useLCWCalibration ) {
+ // fill the towers without preparing for calibratoin
+ if ( m_chronoTools ) { m_chrono->chronoStart(chronoName+m_towerMakerTool->name()); }
+ ATH_CHECK( m_towerMakerTool->execute(ctx,clusColl.ptr(),nullptr) );
+ if ( m_chronoTools ) { m_chrono->chronoStop(chronoName+m_towerMakerTool->name()); }
+ // save original signals bevore corrections and calibrations
+ if ( m_saveSignalState ) {
+ for (xAOD::CaloCluster* fClus : *clusColl) {
+ fClus->setRawE (fClus->e() );
+ fClus->setRawEta(fClus->eta());
+ fClus->setRawPhi(fClus->phi());
+ fClus->setRawM (fClus->m() );
+ }//end loop over clusters
+ }
+ // apply the correction tools (really moment calculators)
+ for ( auto iter(m_towerCorrectionTools.begin()); iter != m_towerCorrectionTools.end(); ++iter ) {
+ if ( m_chronoTools ) { m_chrono->chronoStart(chronoName+iter->name()); }
+ ATH_CHECK( (*iter)->execute(ctx,clusColl.ptr()) );
+ if ( m_chronoTools ) { m_chrono->chronoStop(chronoName+iter->name()); }
+ } // correction tool loop
+ } else {
+ // fill the towers with LCW calibration
+ std::unique_ptr<CaloCellClusterWeights> cellWeights(new CaloCellClusterWeights(std::max(m_towerGeometrySvc->maxCellHash(),m_towerGeometrySvc->totalNumberCells())));
+ if ( m_chronoTools ) { m_chrono->chronoStart(chronoName+m_towerMakerTool->name()); }
+ ATH_CHECK( m_towerMakerTool->execute(ctx,clusColl.ptr(),cellWeights.get()) );
+ if ( m_chronoTools ) { m_chrono->chronoStop(chronoName+m_towerMakerTool->name()); }
+ // save original signals bevore corrections and calibrations
+ if ( m_saveSignalState ) {
+ for (xAOD::CaloCluster* fClus : *clusColl) {
+ fClus->setRawE (fClus->e() );
+ fClus->setRawEta(fClus->eta());
+ fClus->setRawPhi(fClus->phi());
+ fClus->setRawM (fClus->m() );
+ }//end loop over clusters
+ }
+ // apply the correction tools (really moment calculators)
+ for ( auto iter(m_towerCorrectionTools.begin()); iter != m_towerCorrectionTools.end(); ++iter ) {
+ if ( m_chronoTools ) { m_chrono->chronoStart(chronoName+iter->name()); }
+ ATH_CHECK( (*iter)->execute(ctx,clusColl.ptr()) );
+ if ( m_chronoTools ) { m_chrono->chronoStop(chronoName+iter->name()); }
+ } // correction tool loop
+ // apply calibration
+ if ( m_chronoTools ) { m_chrono->chronoStart(chronoName+m_towerCalibratorTool->name()); }
+ ATH_CHECK( m_towerCalibratorTool->execute(ctx,clusColl.ptr(),cellWeights.get()) );
+ if ( m_chronoTools ) { m_chrono->chronoStop(chronoName+m_towerCalibratorTool->name()); }
+ } // end of processing blocks
+
+ ATH_MSG_DEBUG("Created tower container (of type xAOD::CaloClusterContainer) with " << clusColl->size() << " towers");
+ SG::WriteHandle<CaloClusterCellLinkContainer> cellLinks (m_towerCellLinkOutput, ctx);
+ ATH_CHECK(CaloClusterStoreHelper::finalizeClusters (cellLinks,
+ clusColl.ptr()));
+ return StatusCode::SUCCESS;
+}
+
+
+const std::string& CaloTopoTowerMaker::getOutputContainerName() const {
+ return m_towerOutput.key();
+}
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerMaker.h b/Calorimeter/CaloRec/src/CaloTopoTowerMaker.h
new file mode 100644
index 0000000000000000000000000000000000000000..ae0f86c9bbb31479bb5adc8b454407b42188556c
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerMaker.h
@@ -0,0 +1,117 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+//Dear emacs, this is -*-c++-*-
+
+#ifndef CALOREC_CALOTOPOTOWERMAKER_H
+#define CALOREC_CALOTOPOTOWERMAKER_H
+
+/// @class CaloTopoTowerMaker
+/// @author Tasnuva Chowdhury
+/// @date 16-September-2020
+/// @brief Top algorithm to reconstruct @c xAOD::CaloCluster objects representing topo-towers from CaloClusters
+///
+/// This class is an Algorithm to reconstruct CaloTopoTowers which are represented by
+/// objects of type @c xAOD::CaloCluster from cells extracted from existing
+/// topo-clusters (also represented by @c xAOD::CaloCluster type objects).
+/// The algorithm first extracts all cells form the topo-clusters, stores the
+/// LCW calibration weights for each cell (if configured), fills the towers
+/// with the cells and applys a topo-tower calibration using the LCW weights
+/// (if configured)>
+///
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+// -- interfaces
+#include "CaloRec/CaloClusterCollectionProcessor.h"
+#include "CaloRec/CaloTowerCollectionProcessor.h"
+#include "CaloEvent/CaloCellClusterWeights.h"
+
+#include "CaloTowerGeometrySvc.h"
+
+class CaloClusterCellLinkContainer;
+class IChronoStatSvc;
+
+class CaloTopoTowerMaker : public AthReentrantAlgorithm
+{
+
+ public:
+
+ CaloTopoTowerMaker(const std::string& name, ISvcLocator* pSvcLocator);
+ virtual ~CaloTopoTowerMaker() override;
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
+ virtual StatusCode finalize() override;
+
+ const std::string& getOutputContainerName() const;
+
+ private:
+
+ /**
+ * @brief Method to create a CaloClusterContainer together with it's AuxStore and Link container
+ *
+ */
+ StatusCode makeContainer();
+
+
+ /** @brief the name of the key in StoreGate for the output
+ CaloClusterContainer */
+ SG::WriteHandleKey<xAOD::CaloClusterContainer> m_towerOutput;
+
+ /** @brief the name of the key in StoreGate for the output
+ CaloClusterCellLinkContainer */
+ SG::WriteHandleKey<CaloClusterCellLinkContainer> m_towerCellLinkOutput;
+
+ /// @brief Tower makers
+ ///
+ /// This tool is the tower maker. It fills
+ /// a @c xAOD::CaloClusterContainer with clusters representing
+ /// towers and also retuns the LCW cell weights if configured.
+ ToolHandle<CaloTowerCollectionProcessor> m_towerMakerTool;
+
+ /// @brief Tower (cluster) moment makers
+ ///
+ /// The tools in this list calculate cluster moments for towers after those
+ /// are filled. The tools are the as the ones used for topo-clusters.
+ /// Any number of tools can be scheduled.
+ ToolHandleArray<CaloClusterCollectionProcessor> m_towerCorrectionTools;
+
+ /// @brief Tower calibrator(s)
+ ///
+ /// This tool provides the (optional) LCW calibration.
+ ToolHandle<CaloTowerCollectionProcessor> m_towerCalibratorTool;
+
+ /// @brief Tower geometry service
+ ServiceHandle<CaloTowerGeometrySvc> m_towerGeometrySvc { this, "CaloTowerGeometrySvc", "CaloTowerGeometrySvc", "CaloTower geometry provider" };
+
+ /// Handle to the ChronoStatSvc
+ ServiceHandle<IChronoStatSvc> m_chrono;
+
+ /** @brief Keep the individual results of each correction.
+ *
+ * If true, we keep in StoreGate the complete list of clusters
+ * before each correction has been performed. */
+ //MT-unfriendly:bool m_keep_each_correction;
+
+ /**
+ * @brief controls saving the uncalibrated signal state just before
+ * the first @c CaloClusterCorrectionTool is invoked. Is a configurable
+ * property with default value @c true.
+ */
+ bool m_saveSignalState = { true };
+
+ ///Use ChronotStatSvc to monitor each tool
+ bool m_chronoTools = { false };
+
+ /// @brief Use LCW calibration for topo-towers (default is @c true)
+ bool m_useLCWCalibration = { true };
+
+};
+#endif // CALOREC_CALOTOPOTOWERMAKER_H
+
+
+
diff --git a/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.cxx b/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..acc274e89f4b4692e4bb481d768a0a07cf86429c
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.cxx
@@ -0,0 +1,410 @@
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
+#include "CaloTowerGeometrySvc.h"
+#include "CaloTopoClusterFromTowerHelpers.h"
+
+#include <cmath>
+
+namespace { constexpr auto pi = 3.14159265358979323846; }
+
+CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::m_invalidIndex = index_t(-1);
+double CaloTowerGeometrySvc::m_invalidValue = -999.;
+
+CaloTowerGeometrySvc::CaloTowerGeometrySvc(const std::string& name,ISvcLocator* pSvcLocator)
+ : AthService(name,pSvcLocator)
+ , m_caloDDM((const CaloDetDescrManager*)0)
+ , m_logFileName("logfile")
+ , m_towerEtaWidth(0.)
+ , m_towerPhiWidth(0.)
+ , m_towerArea(0.)
+ , m_towerBins(0)
+ , m_maxCellHash(0) //----------------------------------------//
+ , m_towerEtaBins(100) // Default tower definition is "hadronic" //
+ , m_towerEtaMin(-5.0) // towers of size 0.1 x pi/32. //
+ , m_towerEtaMax(5.0) //----------------------------------------//
+ , m_adjustEta(true)
+ , m_towerPhiBins(64)
+ , m_towerPhiMin(-pi) //----------------------------------------//
+ , m_towerPhiMax(pi) // FCal vertical and horizontal cell //
+ , m_fcal1Xslice(8.) // slicing creates "mini-cells" which are //
+ , m_fcal1Yslice(8.) // then projected onto towers. The mini- //
+ , m_fcal2Xslice(8.) // cell signal is 1/(Nx x Ny) x Ecell, //
+ , m_fcal2Yslice(12.) // where Nx(y) are the number of x(y) //
+ , m_fcal3Xslice(12.) // slices. //
+ , m_fcal3Yslice(12.) //----------------------------------------//
+{
+ // Properties
+ declareProperty("TowerEtaBins", m_towerEtaBins, "Number of pseudorapidity bins in tower grid");
+ declareProperty("TowerEtaMin", m_towerEtaMin, "Lower boundary of pseudorapidity range");
+ declareProperty("TowerEtaMax", m_towerEtaMax, "Upper boundary of pseudorapidity range");
+ declareProperty("AdjustFCalToTowerEtaBounds", m_adjustEta, "Adjust FCal cells to eta boundaries");
+ declareProperty("TowerPhiBins", m_towerPhiBins, "Number of azimuthal bins in tower grid");
+ declareProperty("TowerPhiMin", m_towerPhiMin, "Lower boundary of azimuthal range");
+ declareProperty("TowerPhiMax", m_towerPhiMax, "Upper boundary of azimuthal range");
+ // change only for R&D
+ declareProperty("FCal1NSlicesX", m_fcal1Xslice, "Number of X slices for FCal1 cells");
+ declareProperty("FCal1NSlicesY", m_fcal1Yslice, "Number of Y slices for FCal1 cells");
+ declareProperty("FCal2NSlicesX", m_fcal2Xslice, "Number of X slices for FCal2 cells");
+ declareProperty("FCal2NSlicesY", m_fcal2Yslice, "Number of Y slices for FCal2 cells");
+ declareProperty("FCal3NSlicesX", m_fcal3Xslice, "Number of X slices for FCal3 cells");
+ declareProperty("FCal3NSlicesY", m_fcal3Yslice, "Number of Y slices for FCal3 cells");
+}
+
+//-------------//
+// Gaudi stuff //
+//-------------//
+
+StatusCode CaloTowerGeometrySvc::queryInterface(const InterfaceID& riid,void** ppvInterface)
+{
+ if ( CaloTowerGeometrySvc::interfaceID().versionMatch(riid) ) {
+ *ppvInterface = this;
+ return StatusCode::SUCCESS;
+ } else {
+ return AthService::queryInterface(riid,ppvInterface);
+ }
+}
+
+//-------------------------//
+// Initialize and Finalize //
+//-------------------------//
+
+StatusCode CaloTowerGeometrySvc::initialize()
+{
+ // set up services and managers
+ if ( f_setupSvc().isFailure() ) {
+ ATH_MSG_ERROR("Cannot allocate the calorimeter detector description manager");
+ return StatusCode::FAILURE;
+ }
+
+ // prepare FCal segmentation
+ m_ndxFCal[0] = m_fcal1Xslice; m_ndxFCal[1] = m_fcal2Xslice; m_ndxFCal[2] = m_fcal3Xslice;
+ m_ndyFCal[0] = m_fcal1Yslice; m_ndyFCal[1] = m_fcal2Yslice; m_ndyFCal[2] = m_fcal3Yslice;
+ for ( uint_t i(0); i<m_ndxFCal.size(); ++i ) { m_wgtFCal[i] = 1./(m_ndxFCal.at(i)*m_ndyFCal.at(i)); }
+
+ // other derived quantities
+ if ( m_towerEtaBins > 0 ) {
+ m_towerEtaWidth = (m_towerEtaMax-m_towerEtaMin)/((double)m_towerEtaBins);
+ } else {
+ ATH_MSG_ERROR("Number of tower eta bins is invalid (" << m_towerEtaBins << " bins)");
+ return StatusCode::FAILURE;
+ }
+ if ( m_towerPhiBins > 0 ) {
+ m_towerPhiWidth = (m_towerPhiMax-m_towerPhiMin)/((double)m_towerPhiBins);
+ } else {
+ ATH_MSG_ERROR("Number of tower phi bins is invalid (" << m_towerPhiBins << " bins)");
+ return StatusCode::FAILURE;
+ }
+
+ m_towerBins = m_towerEtaBins*m_towerPhiBins;
+ m_towerArea = m_towerEtaWidth*m_towerPhiWidth;
+ m_maxCellHash = f_caloDDM()->element_size()-1;
+ m_numberOfCells = f_caloDDM()->element_size();
+
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Tower description - Eta(bins,min,max,width) = (%3zu,%6.3f,%6.3f,%6.4f)",m_towerEtaBins,m_towerEtaMin,m_towerEtaMax,m_towerEtaWidth) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Tower description - Phi(bins,min,max,width) = (%3zu,%6.3f,%6.3f,%6.4f)",m_towerPhiBins,m_towerPhiMin,m_towerPhiMax,m_towerPhiWidth) );
+ ATH_MSG_INFO( CaloRec::Helpers::fmtMsg("Tower description - maximum number of towers %5zu; (eta,phi)-space area %6.4f; maximum cell hash index %6zu",m_towerBins,m_towerArea,m_maxCellHash) );
+
+ if ( this->msgLvl(MSG::VERBOSE) ) {
+ std::vector<std::string> logger; logger.reserve(m_towerBins+10);
+ logger.push_back(CaloRec::Helpers::fmtMsg("[CaloTowerGeometrySvc::%s] +-------- Tower Index Mapping ---------+------------+------------+",this->name().c_str()));
+ logger.push_back(CaloRec::Helpers::fmtMsg("[CaloTowerGeometrySvc::%s] | %10.10s | %10.10s | %10.10s | %10.10s | %10.10s |",this->name().c_str(),"TowerIndex", " EtaIndex ", " PhiIndex "," Eta "," Phi "));
+ logger.push_back(CaloRec::Helpers::fmtMsg("[CaloTowerGeometrySvc::%s] +------------+------------+------------+------------+------------+",this->name().c_str()));
+ for ( size_t i(0); i<m_towerBins; ++i ) {
+ size_t etaIndex(this->etaIndexFromTowerIndex(i));
+ size_t phiIndex(this->phiIndexFromTowerIndex(i));
+ double eta(this->towerEta(i)); double phi(this->towerPhi(i));
+ logger.push_back(CaloRec::Helpers::fmtMsg("[CaloTowerGeometrySvc::%s] | %5zu | %5zu | %5zu | %6.3f | %6.3f |",this->name().c_str(),i,etaIndex,phiIndex,eta,phi));
+ }
+ logger.push_back(CaloRec::Helpers::fmtMsg("[CaloTowerGeometrySvc::%s] +------------+------------+------------+------------+------------+",this->name().c_str()));
+ //
+ std::string logFileName = m_logFileName+"."+this->name()+".dat";
+ std::ofstream logfile;
+ logfile.open(logFileName); for ( auto mlog : logger ) { logfile << mlog << std::endl; } logfile.close();
+ }
+ return f_setupTowerGrid();
+}
+
+StatusCode CaloTowerGeometrySvc::finalize()
+{ return StatusCode::SUCCESS; }
+
+//-------//
+// Setup //
+//-------//
+
+StatusCode CaloTowerGeometrySvc::f_setupTowerGrid()
+{
+ // initialized
+ if ( m_maxCellHash == 0 ) {
+ ATH_MSG_ERROR("Service not initialized? Maximum cell hash is " << m_maxCellHash );
+ return StatusCode::FAILURE;
+ }
+
+ // payload template
+ elementvector_t ev;
+
+ // set up lookup table
+ ATH_MSG_INFO( "Setting up cell-to-tower lookup for " << m_numberOfCells << " calorimeter cells" );
+ m_towerLookup.resize(m_numberOfCells,ev);
+
+ // dump projections
+ std::ofstream logger;
+ if ( msgLvl(MSG::DEBUG) ) {
+ logger.open(CaloRec::Helpers::fmtMsg("%s.calocellprojections_dump.dat",this->name().c_str()));
+ logger << CaloRec::Helpers::fmtMsg("############################################################################") << std::endl;
+ logger << CaloRec::Helpers::fmtMsg("## CaloCell projections onto %3.1f x %3.1f tower grid (projective cells only) ##",m_towerEtaWidth,m_towerPhiWidth) << std::endl;
+ logger << CaloRec::Helpers::fmtMsg("############################################################################") << std::endl;
+ logger << std::endl;
+ }
+
+ // loop cells
+ for ( auto fcell(m_caloDDM->element_begin()); fcell != m_caloDDM->element_end(); ++fcell ) {
+ // reference cell descriptor
+ const CaloDetDescrElement* pCaloDDE = *fcell;
+ // check hash id validity
+ index_t cidx(pCaloDDE->calo_hash());
+ if ( cidx >= m_towerLookup.size() ) {
+ ATH_MSG_WARNING( "Cell hash identifier out of range " << cidx << "/" << m_towerLookup.size() << ", ignore cell" );
+ } else {
+ if ( pCaloDDE->is_lar_fcal() ) {
+ if ( this->f_setupTowerGridFCal(pCaloDDE,logger).isFailure() ) { return StatusCode::FAILURE; }
+ } else {
+ if ( this->f_setupTowerGridProj(pCaloDDE,logger).isFailure() ) { return StatusCode::FAILURE; }
+ }
+ } // cell hash in range?
+ } // loop cell descriptors
+ if ( logger.is_open() ) { logger.close(); }
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode CaloTowerGeometrySvc::f_setupTowerGridFCal(const CaloDetDescrElement* pCaloDDE,std::ofstream& /*logger*/)
+{
+ //-----------------------------------------------------------------------------------------//
+ // FCal special - the rectangular (in linear space) calorimeter cells are sub-divided into //
+ // small cells and then shared across as many towers as the small cells cover. //
+ //-----------------------------------------------------------------------------------------//
+
+ // collect geometrical variables
+ int cLayer(pCaloDDE->getLayer()-1); // FCal layer number 1..3 -> array indices 0..2
+
+ double cXpos(pCaloDDE->x()); // FCal cell x position (cell center)
+ double cYpos(pCaloDDE->y()); // FCal cell y position (cell center)
+ double cZpos(pCaloDDE->z()); // FCal cell z position (cell center)
+ double cZpos2(cZpos*cZpos);
+
+ double cXwid(pCaloDDE->dx()); // FCal cell x full width
+ double cYwid(pCaloDDE->dy()); // FCal cell y full width
+
+ // double xSlice(cXwid/m_ndxFCal[cLayer]); // FCal cell x slize width
+ // double ySlice(cYwid/m_ndyFCal[cLayer]); // FCal cell y slice width
+ double cWght(m_wgtFCal[cLayer]); // FCal cell geometrical (signal) weight
+
+ int nXslice((int)m_ndxFCal[cLayer]); // FCal number of x slices
+ int nYslice((int)m_ndyFCal[cLayer]); // FCal number of y slices
+ double cXstp(cXwid/((double)nXslice)); // FCal slice x width
+ double cYstp(cYwid/((double)nYslice)); // FCal slice y width
+
+ // fill cell fragments
+ // double xoff(cXpos-cXwid/2.+cXstp/2.); double yoff(cYpos-cYwid/2.+cYstp/2.);
+ double x(cXpos-(cXwid-cXstp)/2.);
+ double xlim(cXpos+cXwid/2.); double ylim(cYpos+cYwid/2.);
+ double etaOrig(0.);
+ // for ( int ix(0); ix < nXslice; ++ix ) {
+ // double x(xoff+ix*cXstp);
+ while ( x < xlim ) {
+ // for ( int iy(0); iy < nYslice; ++iy ) {
+ // double y(yoff+iy*cYstp);
+ double y(cYpos-(cYwid-cYstp)/2.);
+ while ( y < ylim ) {
+ double r(std::sqrt(x*x+y*y+cZpos2));
+ double eta(-0.5*std::log((r-cZpos)/(r+cZpos)));
+ bool etaAdjusted(false);
+ if ( m_adjustEta ) {
+ if ( eta < m_towerEtaMin ) {
+ etaAdjusted = true;
+ etaOrig = eta;
+ eta = m_towerEtaMin+m_towerEtaWidth/2.;
+ } else if ( eta > m_towerEtaMax ) {
+ etaAdjusted = true;
+ etaOrig = eta;
+ eta = m_towerEtaMax-m_towerEtaWidth/2.;
+ }
+ }
+ double phi(CaloPhiRange::fix(std::atan2(y,x)));
+ index_t towerIdx(this->towerIndex(eta,phi));
+ // tower index not valid
+ if ( isInvalidIndex(towerIdx) ) {
+ ATH_MSG_WARNING("Found invalid tower index for FCal cell (eta,phi) = (" << eta << "," << phi << ") at (x,y,z) = (" << x << "," << y << "," << cZpos << ") [cell ignored]");
+ } else {
+ // add tower to lookup
+ if ( etaAdjusted ) {
+ ATH_MSG_WARNING("FCal cell direction (eta,phi) = (" << etaOrig << "," << phi << ") for cell at (x,y,z) = ("
+ << x << "," << y << "," << cZpos << ") adjusted to (eta,phi) = (" << eta << "," << phi << ") [cell adjusted]");
+ }
+ f_assign(pCaloDDE->calo_hash(),towerIdx,cWght);
+ } // tower index ok
+ y += cYstp;
+ } // loop on y fragments
+ x += cXstp;
+ } // loop on x fragments
+ return StatusCode::SUCCESS;
+}
+
+StatusCode CaloTowerGeometrySvc::f_setupTowerGridProj(const CaloDetDescrElement* pCaloDDE,std::ofstream& logger)
+{
+ // projective readout calos - collect geometrical variables
+ double cEtaPos(pCaloDDE->eta_raw()); // projective cell center in pseudorapidity
+ double cEtaWid(pCaloDDE->deta()); // projective cell width in pseudorapidity
+ double cPhiPos(pCaloDDE->phi_raw()); // projective cell center in azimuth
+ double cPhiWid(pCaloDDE->dphi()); // projective cell width in azimuth
+
+ // check cell-tower overlap area fractions
+ uint_t kEta(static_cast<uint_t>(cEtaWid/m_towerEtaWidth+0.5)); kEta = kEta == 0 ? 1 : kEta; // fully contained cell may have 0 fragments (protection)
+ uint_t kPhi(static_cast<uint_t>(cPhiWid/m_towerPhiWidth+0.5)); kPhi = kPhi == 0 ? 1 : kPhi;
+
+ // print out
+ if ( kEta > 1 || kPhi > 1 ) {
+ ATH_MSG_VERBOSE("Found cell [" << pCaloDDE->calo_hash() << "/0x" << std::hex << pCaloDDE->identify().get_compact() << std::dec << "] spawning several towers."
+ << " Neta = " << kEta << ", Nphi = " << kPhi );
+ }
+
+ // share cells
+ double cWght(1./((double)kEta*kPhi)); // area weight
+ double sEta(cEtaWid/((double)kEta)); // step size (pseudorapidity)
+ double sPhi(cPhiWid/((double)kPhi)); // step size (azimuth)
+ double oEta(cEtaPos-sEta/2.); // offset (pseudorapidity)
+ double oPhi(cPhiPos-sPhi/2.); // offset (azimuth)
+
+ // loop over cell fragments
+ for ( uint_t ie(1); ie<=kEta; ++ie ) {
+ double ceta(oEta+((double)ie-0.5)*sEta); // eta of fragment
+ for ( uint_t ip(1); ip<=kPhi; ++ip ) {
+ double cphi(oPhi+((double)ip-0.5)*sPhi); // phi fragment
+ // tower index
+ index_t towerIdx(this->towerIndex(ceta,cphi));
+ if ( isInvalidIndex(towerIdx) ) {
+ ATH_MSG_ERROR("Found invalid tower index for non-FCal cell (id,eta,phi) = (" << pCaloDDE->calo_hash() << "," << ceta << "," << cphi << ")");
+ return StatusCode::FAILURE;
+ } // invalid tower index
+ // m_towerLookup[pCaloDDE->calo_hash()].emplace_back(towerIdx,cWght); // add to tower lookup
+ f_assign(pCaloDDE->calo_hash(),towerIdx,cWght);
+ if ( logger.is_open() ) {
+ double el(this->towerEta(towerIdx)-this->etaWidth()/2.); double eh(this->towerEta(towerIdx)+this->etaWidth()/2.);
+ double pl(this->towerPhi(towerIdx)-this->phiWidth()/2.); double ph(this->towerPhi(towerIdx)+this->phiWidth()/2.);
+ if ( cEtaPos >= el && cEtaPos <= eh && cPhiPos >= pl && cPhiPos <= ph ) {
+ logger << CaloRec::Helpers::fmtMsg("Cell [%6zu] at (%6.3f,%6.3f) in Sampling %10.10s contributes to tower [%5zu] at ([%6.3f,%6.3f],[%6.3f,%6.3f]) with weight %6.4f [IN_BOUNDS]",
+ (size_t)pCaloDDE->calo_hash(),cEtaPos,cPhiPos,CaloRec::Lookup::getSamplingName(pCaloDDE->getSampling()).c_str(),towerIdx,el,eh,pl,ph,cWght) << std::endl;
+ } else {
+ logger << CaloRec::Helpers::fmtMsg("Cell [%6zu] at (%6.3f,%6.3f) in Sampling %10.10s contributes to tower [%5zu] at ([%6.3f,%6.3f],[%6.3f,%6.3f]) with weight %6.4f [OUT_OF_BOUNDS]",
+ (size_t)pCaloDDE->calo_hash(),cEtaPos,cPhiPos,CaloRec::Lookup::getSamplingName(pCaloDDE->getSampling()).c_str(),towerIdx,el,eh,pl,ph,cWght) << std::endl;
+ }
+ } // debugging central region
+ } // phi fragment loop
+ } // eta fragment loop
+ return StatusCode::SUCCESS;
+}
+
+//------//
+// Fill //
+//------//
+
+double CaloTowerGeometrySvc::f_assign(IdentifierHash cellHash,index_t towerIdx,double wght)
+{
+ // check if cell-tower already related
+ uint_t cidx(static_cast<uint_t>(cellHash));
+ for ( element_t& elm : m_towerLookup.at(cidx) ) {
+ if ( towerIndex(elm) == towerIdx ) { std::get<1>(elm) += wght; return cellWeight(elm); }
+ }
+ // not yet related
+ m_towerLookup[cidx].emplace_back(towerIdx,wght);
+ return cellWeight(m_towerLookup.at(cidx).back());
+}
+
+//--------//
+// Access //
+//--------//
+
+StatusCode CaloTowerGeometrySvc::access(const CaloCell* pCell,std::vector<index_t>& towerIdx,std::vector<double>& towerWghts) const
+{ return this->access(f_caloDDE(pCell)->calo_hash(),towerIdx,towerWghts); }
+
+StatusCode CaloTowerGeometrySvc::access(IdentifierHash cellHash,std::vector<index_t>& towerIdx,std::vector<double>& towerWghts) const
+{
+ towerIdx.clear();
+ towerWghts.clear();
+
+ uint_t cidx(static_cast<uint_t>(cellHash));
+
+ if ( cidx >= m_towerLookup.size() ) {
+ ATH_MSG_WARNING("Invalid cell hash index " << cellHash << ", corresponding index " << cidx << " not found in tower lookup");
+ return StatusCode::SUCCESS;
+ }
+
+ if ( towerIdx.capacity() < m_towerLookup.at(cidx).size() ) { towerIdx.reserve(m_towerLookup.at(cidx).size()); }
+ if ( towerWghts.capacity() < m_towerLookup.at(cidx).size() ) { towerWghts.reserve(m_towerLookup.at(cidx).size()); }
+
+ for ( const auto& elm : m_towerLookup.at(cidx) ) { towerIdx.push_back(towerIndex(elm)); towerWghts.push_back(cellWeight(elm)); }
+
+ return StatusCode::SUCCESS;
+}
+
+CaloTowerGeometrySvc::elementvector_t CaloTowerGeometrySvc::getTowers(const CaloCell* pCell) const
+{ return pCell != 0 ? this->getTowers(f_caloDDE(pCell)->calo_hash()) : elementvector_t(); }
+
+CaloTowerGeometrySvc::elementvector_t CaloTowerGeometrySvc::getTowers(IdentifierHash cellHash) const
+{
+ // check input
+ uint_t cidx(static_cast<uint_t>(cellHash));
+ if ( cidx >= m_towerLookup.size() ) {
+ ATH_MSG_WARNING( CaloRec::Helpers::fmtMsg("invalid cell hash %6zu beyond range (max hash is %6zu)",cidx,m_maxCellHash) );
+ return elementvector_t();
+ } else {
+ return m_towerLookup.at(cidx);
+ }
+}
+
+//-----------------------//
+// Tower Geometry Helper //
+//-----------------------//
+
+double CaloTowerGeometrySvc::cellWeight(IdentifierHash cellHash,index_t towerIdx) const
+{
+ index_t cidx(static_cast<uint_t>(cellHash));
+ double cwght(0.);
+
+ if ( cidx < m_towerLookup.size() ) {
+ for ( auto elm : m_towerLookup.at(cidx) ) {
+ if ( towerIndex(elm) == towerIdx ) { cwght = cellWeight(elm); break; }
+ }
+ }
+ return cwght;
+}
+
+//---------------//
+// Index Helpers //
+//---------------//
+
+CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::etaIndex(IdentifierHash cellHash) const
+{
+ const auto cdde = f_caloDDE(cellHash);
+ return cdde != 0 ? etaIndex(cdde->eta()) : invalidIndex();
+}
+
+CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::etaIndex(double eta) const
+{
+ return eta >= m_towerEtaMin && eta <= m_towerEtaMax
+ ? index_t(std::min(static_cast<uint_t>((eta-m_towerEtaMin)/m_towerEtaWidth),m_towerEtaBins-1))
+ : invalidIndex();
+}
+
+CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::phiIndex(IdentifierHash cellHash) const
+{
+ const auto cdde = f_caloDDE(cellHash);
+ return cdde != 0 ? phiIndex(cdde->phi()) : invalidIndex();
+}
+
+CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::phiIndex(double phi) const
+{
+ double dphi(CaloPhiRange::diff(phi,m_towerPhiMin));
+ return dphi >= m_towerPhiMin && dphi <= m_towerPhiMax
+ ? index_t(std::min(static_cast<uint_t>((phi-m_towerPhiMin)/m_towerPhiWidth),m_towerPhiBins-1))
+ : invalidIndex();
+}
diff --git a/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.h b/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.h
new file mode 100644
index 0000000000000000000000000000000000000000..6d2f445548ea860896ee62dad476ca57bcd72b70
--- /dev/null
+++ b/Calorimeter/CaloRec/src/CaloTowerGeometrySvc.h
@@ -0,0 +1,414 @@
+// -*- c++ -*-
+#ifndef CALOREC_CALOTOWERGEOMETRYSVC_H
+#define CALOREC_CALOTOWERGEOMETRYSVC_H
+
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
+
+#include "AthenaBaseComps/AthService.h"
+
+#include "Identifier/IdentifierHash.h"
+
+#include "CaloGeoHelpers/CaloPhiRange.h"
+
+#include "CaloDetDescr/CaloDetDescrElement.h"
+#include "CaloDetDescr/CaloDetDescrManager.h"
+
+#include "CaloEvent/CaloCell.h"
+
+#include <string>
+#include <vector>
+#include <cmath>
+#include <array>
+#include <tuple>
+#include <fstream>
+
+///@name Forward declarations
+///@{
+///template<class T> class SvcFactory;
+///@}
+
+///@brief Interface accessor for @c CaloTowerGeometrySvc
+static const InterfaceID IID_CaloTowerGeometrySvc( "CaloTowerGeometrySvc", 1, 0 );
+
+class CaloTowerGeometrySvc : public AthService
+{
+protected:
+
+ ///@brief To allow interface queries by the service factory (?)
+ friend class SvcFactory<CaloTowerGeometrySvc>;
+
+public:
+
+ ///@name Gaudi interfaces and implementations
+ ///@{
+ static const InterfaceID& interfaceID() { return IID_CaloTowerGeometrySvc; } ///< Interface indentifier needed by Gaudi
+ virtual StatusCode queryInterface(const InterfaceID& riid, void** ppcInterface); ///< Interface query with fallbacks
+ ///@}
+
+ ///@{
+ typedef std::size_t uint_t; ///< Type for unsigned integer
+ typedef IdentifierHash::value_type index_t; ///< Type for scalar (pseudorapidity,azimuth) index (is an unsigned int type)
+ typedef std::tuple<index_t,index_t> towerindex_t; ///< Type for composite (tower) index
+ typedef std::tuple<index_t,double> element_t; ///< Type storing tower index and geometrical weight
+ typedef std::vector<element_t> elementvector_t; ///< Type for list of elements holding tower index and list of weights
+ typedef std::vector<elementvector_t> elementmap_t; ///< Type for lists of lists of elements (lookup table type)
+ ///@}
+
+ ///@brief Standard constructor
+ ///
+ /// Constructs towergrid as defined by properties.
+ ///
+ ///@param[in] name name of service (implementation of @c Gaudi::Service )
+ ///@param[in] pSvc pointer to service locator (from configuration framework)
+ CaloTowerGeometrySvc(const std::string& name,ISvcLocator* pSvc);
+ ///@brief Base class destructor
+ virtual ~CaloTowerGeometrySvc() { };
+
+ ///@name Implementation of (Ath)Service interfaces
+ ///@{
+ virtual StatusCode initialize() override; ///< Initialize service
+ virtual StatusCode finalize() override; ///< Finalize service
+ // virtual StatusCode queryInterface(const InterfaceID& iid,void** ppvInterface); ///< Need to fix compiler issue (FIXME)
+ ///@}
+
+ // --- Full documentation of this block after end of class definition!
+ ///@name Retrieve towers for cells
+ ///@{
+ StatusCode access(const CaloCell* pCell,std::vector<index_t>& towerIdx,std::vector<double>& towerWghts) const;
+ StatusCode access(IdentifierHash cellHash,std::vector<index_t>& towerIdx,std::vector<double>& towerWghts) const;
+ elementvector_t getTowers(const CaloCell* pCell) const;
+ elementvector_t getTowers(IdentifierHash cellHash) const;
+ ///@}
+
+ ///@name Tower bin descriptors and other size information
+ ///@{
+ uint_t maxCellHash() const; ///< Maximum cell hash value
+ uint_t totalNumberCells() const; ///< Total number of cells
+ uint_t etaBins() const; ///< Number of pseudorapidity bins
+ double etaMin() const; ///< Lower boundary of pseudorapidity range
+ double etaMax() const; ///< Upper boundary of pseudorapidity range
+ double etaWidth() const; ///< Width of pseudorapidity bin
+ uint_t phiBins() const; ///< Number of azimuth bins
+ double phiMin() const; ///< Lower boundary of azimuth
+ double phiMax() const; ///< Upper boundary of azimuth
+ double phiWidth() const; ///< Width of azimuth bin
+ uint_t towerBins() const; ///< Total number of towers
+ double towerArea() const; ///< Area of individual tower
+ ///@}
+
+ ///@name Tower index calculators, translaters, manipulators and converters
+ ///@{
+ index_t etaIndex(const CaloCell* pCell) const; ///< Get tower @f$ \eta @f$ bin index for a calorimeter cell referenced by a pointer
+ index_t etaIndex(IdentifierHash cellHash) const; ///< Get tower @f$ \eta @f$ bin index for a calorimeter cell referenced by its hash identifier
+ index_t etaIndex(double eta) const; ///< Get tower @f$ \eta @f$ bin index for a given value of @f$ \eta @f$
+ index_t etaIndexFromTowerIndex(index_t towerIdx) const; ///< Get tower @f$ \eta @f$ bin index for a given global tower index
+ index_t phiIndex(const CaloCell* pCell) const; ///< Get tower @f$ \phi @f$ bin index for a calorimeter cell referenced by a pointer
+ index_t phiIndex(IdentifierHash cellHash) const; ///< Get tower @f$ \phi @f$ bin index for a calorimeter cell referenced by its hash identifier
+ index_t phiIndex(double phi) const; ///< Get tower @f$ \phi @f$ bin index for a given value of @f$ \phi @f$
+ index_t phiIndexFromTowerIndex(index_t towerIdx) const; ///< Get tower @f$ \phi @f$ bin index for a given global tower index
+ index_t towerIndex(const CaloCell* pCell) const; ///< Get global tower index for a calorimeter cell referenced by a pointer
+ index_t towerIndex(IdentifierHash cellHash) const; ///< Get global tower index for a calorimeter cell referenced by its hash identifier
+ index_t towerIndex(double eta,double phi) const; ///< Get global tower index for a pair of @f$ (\eta,\phi) @f$ values
+ index_t towerIndex(index_t etaIdx,index_t phiIdx) const; ///< Get global tower index for a pair of @f$ (\eta,\phi) @f$ indices
+ index_t towerIndex(const element_t& elm) const; ///< Get global tower index from payload data
+ index_t invalidIndex() const; ///< Returns value of invalid index
+ bool isInvalidIndex(index_t idx) const; ///< Returns @c true if argument is equal to the value provided by @c invalidIndex()
+ bool isInvalidIndex(index_t idx,index_t maxIdx) const; ///< Returns @c true if first argument is equal to the value provided by @c invalidIndex() or if first argument is not smaller than second argument
+ bool isInvalidEtaIndex(index_t idx) const; ///< Returns @c true if argument is not a valid pseudorapidity index
+ bool isInvalidPhiIndex(index_t idx) const; ///< Returns @c true if argumant is not a valid azimuth index
+ bool isInvalidTowerIndex(index_t idx) const; ///< Returns @c true if argument is not a valid tower index
+ ///@}
+
+ ///@name Variable generators using tower indices
+ ///@{
+ double towerEtaLocal(index_t etaIndex) const; ///< Return pseudorapdity from local index (bin center)
+ double towerPhiLocal(index_t phiIndex) const; ///< Return azimuth from local index (bin center)
+ double towerEta(index_t towerIndex) const; ///< Return pseudorapidity from global tower index (bin center)
+ double towerPhi(index_t towerIndex) const; ///< Return azimuth from global tower index (bin center)
+ double invalidValue() const; ///< Return invalid value
+ bool isInvalidValue(double val) const; ///< Return @c true if given value is invalid
+ ///@}
+
+ ///@name Helper functions
+ ///@{
+ double cellWeight(const element_t& elm) const; ///< Retrieve cell signal weight from lookup table entry
+ double cellWeight(IdentifierHash cellHash,index_t towerIdx) const; ///< Retrieve cell signal weight from cell identifier and tower index
+ double cellWeight(const CaloCell* pCell, index_t towerIdx) const; ///< Retrieve cell signal weight from pointer to cell object and tower index
+ ///@}
+
+ ///@name Access to storage
+ ///@{
+ elementmap_t::const_iterator begin() const; ///< Iterator points to first entry in internal look-up table (only @c const access!)
+ elementmap_t::const_iterator end() const; ///< Iterator marks end of internal look-up table (only @c const access)
+ size_t size() const; ///< Size of internal look-up table
+ bool empty() const; ///< Internal look-up table is empty if @c true
+ ///@}
+
+private:
+
+ ///@name Helpers
+ ///@{
+ StatusCode f_setupSvc(); ///< Internally used function setting up other services needed by this service
+ StatusCode f_setupTowerGrid(); ///< Internally used function setting up the lookup store
+ StatusCode f_setupTowerGridFCal(const CaloDetDescrElement* pCaloDDE,std::ofstream& logger); ///< Internally used function mapping an FCal cell onto the tower grid
+ StatusCode f_setupTowerGridProj(const CaloDetDescrElement* pCaloDDE,std::ofstream& logger); ///< Internally used function mapping a projective cell onto the tower grid
+ double f_assign(IdentifierHash cellHash,index_t towerIdx,double wgt); ///< Internally used function assigning tower to cell with update of weight if same tower is already assigned
+ ///@}
+
+ ///@name Access to detector store and other services and stores
+ ///@{
+ const CaloDetDescrManager* m_caloDDM; ///< Pointer to calorimeter detector description
+ std::string m_logFileName; ///< Name of log file
+ ///@}
+
+protected:
+
+ ///@name Internal stores and derived parameters
+ ///@{
+ elementmap_t m_towerLookup; ///< Cell-to-tower mapping lookup store
+ double m_towerEtaWidth; ///< Width of tower bin in pseudorapidity
+ double m_towerPhiWidth; ///< Width of tower bin in azimuth
+ double m_towerArea; ///< Area of individual tower
+ uint_t m_towerBins; ///< Maximum number of towers
+ uint_t m_maxCellHash; ///< Maximum cell hash value
+ uint_t m_numberOfCells; ///< Total number of cells
+ ///@}
+
+ ///@name Properties
+ ///@{
+ ///@brief Internally stored tower grid descriptors
+ uint_t m_towerEtaBins; ///< Number of @f$ \eta @f$ bins
+ double m_towerEtaMin; ///< Lower boundary @f$ \eta_{\rm min} @f$
+ double m_towerEtaMax; ///< Upper boundary @f$ \eta_{\rm max} @f$
+ bool m_adjustEta; ///< Adjust FCal cells to eta boundary (default @c true )
+ uint_t m_towerPhiBins; ///< Number of @f$ \phi @f$ bins
+ double m_towerPhiMin; ///< Lower boundary @f$ \phi_{\rm min} @f$
+ double m_towerPhiMax; ///< Upper boundary @f$ \phi_{\rm max} @f$
+ double m_fcal1Xslice; ///< Number of x slices for cells in FCal1
+ double m_fcal1Yslice; ///< Number of y slices for cells in FCal1
+ double m_fcal2Xslice; ///< Number of x slices for cells in FCal2
+ double m_fcal2Yslice; ///< Number of y slices for cells in FCal2
+ double m_fcal3Xslice; ///< Number of x slices for cells in FCal3
+ double m_fcal3Yslice; ///< Number of y slices for cells in FCal3
+ ///@}
+
+ ///@name Process flags, helpers and numerical constants
+ ///@{
+ static index_t m_invalidIndex; ///< Invalid index indicator
+ static double m_invalidValue; ///< Return value for out-of-range indices andother invalid conversions to a physical quantity
+ const CaloDetDescrManager* f_caloDDM() const; ///< Pointer to calorimeter detector description manager
+ const CaloDetDescrElement* f_caloDDE(const CaloCell* pCell) const; ///< Retrieve calorimeter detector description element for a cell object referenced by a pointer
+ const CaloDetDescrElement* f_caloDDE(IdentifierHash cellHash) const; ///< Retrieve calorimeter detector description element for a given cell hash identifier
+ double f_cellEta(const CaloCell* pCell) const; ///< Retrieve calorimeter cell pseudorapidity for a cell object referenced by a pointer
+ double f_cellEta(IdentifierHash cellHash) const; ///< Retrieve calorimeter cell pseudorapidity for a given cell hash identifier
+ double f_cellPhi(const CaloCell* pCell) const; ///< Retrieve calorimeter cell azimuth for a cell object referenced by a pointer
+ double f_cellPhi(IdentifierHash cellHash) const; ///< Retrieve calorimeter cell azimuth for a given cell hash identifier
+ ///@}
+
+ ///@name Stores
+ ///@{
+ std::array<double,3> m_ndxFCal; ///< Stores number of fragments along x for each FCal module
+ std::array<double,3> m_ndyFCal; ///< Stores number of fragments along y for each FCal module
+ std::array<double,3> m_wgtFCal; ///< Stores geometrical weights
+ ///@}
+};
+
+//-------------------------------------------------//
+// Documentation for grouped methods and functions //
+// (removed from before/after method for better //
+// formatting by doxygen in html). //
+//-------------------------------------------------//
+
+///@fn StatusCode CaloTowerGeometrySvc::access(const CaloCell* pCell,std::vector<index_t>& towerIdx,std::vector<double>& towerWghts) const
+///
+///@brief Retrieve the list of towers associated with a calorimeter cell referenced by a pointer
+///
+/// The tower indices and weights are returned in two index-parallel vectors.
+/// Previous content of these two vectors is removed if this method finds towers for the cell.
+///
+///@return Returns @c StatusCode::SUCCESS if list of towers found, else @s StatusCode::FAILURE.
+///
+///@param[in] pCell pointer to non-modifiable @c CaloCell object.
+///@param[in] towerIdx reference to modifiable vector of indices (payload type @c index_t ); vector is filled if cell is successfully mapped.
+///@param[in] towerWghts reference to modifiable vector of weights (payload type @c double ); vector is filled if cell is successfully mapped.
+
+///@fn StatusCode CaloTowerGeometrySvc::access(IdentifierHash cellHash,std::vector<index_t>& towerIdx,std::vector<double>& towerWghts) const;
+///
+///@brief Retrieve the list of towers associated with a calorimeter cell referenced its hash identifier
+///
+/// The tower indices and weights are returned in two index-parallel vectors.
+/// Previous content of these two vectors is removed if this method finds towers for the cell.
+///
+///@return Returns @c StatusCode::SUCCESS if list of towers found, else @s StatusCode::FAILURE.
+///
+///@param[in] cellHash hash identifier referencing a calorimeter cell.
+///@param[in] towerIdx reference to modifiable vector of indices (payload type @c index_t ); vector is filled if cell is successfully mapped.
+///@param[in] towerWghts reference to modifiable vector of weights (payload type @c double ); vector is filled if cell is successfully mapped.
+
+///@fn CaloTowerGeometrySvc::elementvector_t CaloTowerGeometrySvc::getTowers(const CaloCell* pCell) const;
+///
+///@brief Retrieve the list of towers associated with a calorimeter cell referenced by a pointer
+///
+///@return Returns a vector of (index,weight) pairs as a @c elementvector_t container. The container is empty
+/// if the cell does not have any overlap with a tower.
+///
+///@param[in] pCell pointer to non-modifiable @c CaloCell object.
+
+///@fn CaloTowerGeometrySvc::elementvector_t CaloTowerGeometrySvc::getTowers(IdentifierHash cellHash) const;
+///
+///@brief Retrieve the list of towers associated with a calorimeter cell referenced by its hash identifier
+///
+///@return Returns a vector of (index,weight) pairs as a @c elementvector_t container. The container is empty
+/// if the cell does not have any overlap with a tower.
+///
+///@param[in] cellHash hash identifier referencing a calorimeter cell.
+
+//---------------------//
+// Class documentation //
+//---------------------//
+
+/// @class CaloTowerGeometrySvc
+///
+/// @brief Tower geometry store and description provider
+///
+/// This service sets up a lookup table storing the geometrical area overlap fraction of a calorimeter cell
+/// with towers in a given grid. This lookup table is set up at instantiation of the service. It can only be
+/// defined at that time. The default setup is a @f$ \Delta\eta\times\Delta\phi = 0.1 \times \pi/32 @f$ grid.
+/// Any regular grid can be constructed. The grid definition can be provided as property.
+///
+/// The cell-to-tower information is stored internally as a (random access) lookup table. For a given cell,
+/// the hash index is used to retrieve a list of towers this cell overlaps with, and the overlap paramater
+/// (area fraction used as a geometrical weight). This indices and geometrical weights are represented by
+/// a list of pairs of @c int and @c double numbers. Each cell can potential overlap with more than one
+/// tower. A more detailed description of towers and the geometrical overlap is available on the
+/// <a href="https://twiki.cern.ch/twiki/bin/view/AtlasSandboxProtected/CaloTowerPerformance">calorimeter tower project page</a>.
+///
+/// The lookup table is implemented for random access and using the cell hash identifier to retrieve the
+/// requested list of twoer indices and weights. Several retrieval mechanisms are supported (see documentation
+/// of the corresponding methods).
+///
+/// To map the azimuth of a cell to a tower, @f$ -\pi < \phi < \pi @f$ is used (ATLAS standard). For
+/// consistency, all @f$ \phi @f$ values are mapped into this range.
+///
+/// The service inherits from @c AthService and thus from the @c Service base class in Gaudi. The managed tower grid
+/// is defined by service properties, with the following naming convention:
+/// - pseudorapidity range
+/// - number of bins <tt>TowerEtaBins</tt> (default 100)
+/// - lower boundary of pseudorapidity range <tt>TowerEtaMin</tt> (default -5.0)
+/// - upper boundary of pseudorapidity range <tt>TowerEtaMax</tt> (default 5.0)
+/// - azimuth range
+/// - number of bins <tt>TowerPhiBins</tt> (default 64)
+/// - lower boundary of azimuthal range <tt>TowerPhiMin</tt> (default -π)
+/// - upper boundary of azimuthal range <tt>TowerPhiMax</tt> (default π)
+///
+/// Addtional properties of this service define the granularity of the cell splitting in the ATLAS FCal. This
+/// is used to map the FCal readout cells (rectangular slabs) onto the tower grid and calculate the geometrical
+/// (area) overlap fraction, which is used to distribute the cell energy to the towers.
+/// - horizontal FCal cell splitting (along @a x axis)
+/// - number of @a x slices in FCal1 <tt>FCal1NSlicesX</tt> (default 4)
+/// - number of @a x slices in FCal2 <tt>FCal2NSlicesX</tt> (default 4)
+/// - number of @a x slices in FCal3 <tt>FCal3NSlicesX</tt> (default 6)
+/// - vertical FCal cell splitting (along @a y axis)
+/// - number of @a y slices in FCal1 <tt>FCal1NSlicesY</tt> (default 4)
+/// - number of @a y slices in FCal2 <tt>FCal2NSlicesY</tt> (default 6)
+/// - number of @a y slices in FCal3 <tt>FCal3NSlicesY</tt> (default 6)
+///
+/// @warning It is recommended to @b not change the parameters for the FCal cell slicing. This configuration option is provided for expert use for R & D purposes only.
+///
+/// @todo Allow regional grids (varying segmentation as function of @f$ \eta @f$ . This requires additional interfaces (or interface changes) and
+/// and modifications of the index construction.
+///
+/// @author Peter Loch <loch@physics.arizona.edu>
+///
+
+//------------------//
+// Inline Functions //
+//------------------//
+
+//---------------------------//
+// Control and configuration //
+//---------------------------//
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::invalidIndex() const { return m_invalidIndex; }
+inline StatusCode CaloTowerGeometrySvc::f_setupSvc() {
+ m_caloDDM = CaloDetDescrManager::instance();
+ return f_caloDDM() != 0 ? StatusCode::SUCCESS : StatusCode::FAILURE;
+}
+
+//------------------------------------//
+// Public access to tower descriptors //
+//------------------------------------//
+inline CaloTowerGeometrySvc::uint_t CaloTowerGeometrySvc::maxCellHash() const { return m_maxCellHash; }
+inline CaloTowerGeometrySvc::uint_t CaloTowerGeometrySvc::totalNumberCells() const { return m_numberOfCells; }
+
+inline CaloTowerGeometrySvc::uint_t CaloTowerGeometrySvc::etaBins() const { return m_towerEtaBins; }
+inline double CaloTowerGeometrySvc::etaMin() const { return m_towerEtaMin; }
+inline double CaloTowerGeometrySvc::etaMax() const { return m_towerEtaMax; }
+inline double CaloTowerGeometrySvc::etaWidth() const { return m_towerEtaWidth; }
+
+inline CaloTowerGeometrySvc::uint_t CaloTowerGeometrySvc::phiBins() const { return m_towerPhiBins; }
+inline double CaloTowerGeometrySvc::phiMin() const { return m_towerPhiMin; }
+inline double CaloTowerGeometrySvc::phiMax() const { return m_towerPhiMax; }
+inline double CaloTowerGeometrySvc::phiWidth() const { return m_towerPhiWidth; }
+
+inline CaloTowerGeometrySvc::uint_t CaloTowerGeometrySvc::towerBins() const { return m_towerBins; }
+inline double CaloTowerGeometrySvc::towerArea() const { return m_towerArea; }
+
+//----------------//
+// Index checking //
+//----------------//
+inline bool CaloTowerGeometrySvc::isInvalidIndex(index_t idx) const { return idx == invalidIndex(); }
+inline bool CaloTowerGeometrySvc::isInvalidIndex(index_t idx,index_t maxIdx) const { return idx == invalidIndex() || idx >= maxIdx; }
+inline bool CaloTowerGeometrySvc::isInvalidEtaIndex(index_t idx) const { return isInvalidIndex(idx,m_towerEtaBins); }
+inline bool CaloTowerGeometrySvc::isInvalidPhiIndex(index_t idx) const { return isInvalidIndex(idx,m_towerPhiBins); }
+inline bool CaloTowerGeometrySvc::isInvalidTowerIndex(index_t idx) const { return isInvalidIndex(idx,m_towerBins); }
+
+//------------------------------//
+// Index retrieval/construction //
+//------------------------------//
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::etaIndex(const CaloCell* pCell) const { return etaIndex(pCell->eta()); }
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::phiIndex(const CaloCell* pCell) const { return phiIndex(pCell->phi()); }
+
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::towerIndex(IdentifierHash cellHash) const { return towerIndex(etaIndex(cellHash),phiIndex(cellHash)); }
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::towerIndex(double eta,double phi) const { return towerIndex(etaIndex(eta),phiIndex(phi)); }
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::towerIndex(index_t etaIdx,index_t phiIdx) const { return !isInvalidEtaIndex(etaIdx) && !isInvalidPhiIndex(phiIdx) ? phiIdx+etaIdx*m_towerPhiBins : invalidIndex(); }
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::towerIndex(const CaloCell* pCell) const { return towerIndex(pCell->eta(),pCell->phi()); }
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::towerIndex(const element_t& elm) const { return std::get<0>(elm); }
+
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::etaIndexFromTowerIndex(index_t towerIdx) const { return (index_t)(towerIdx/phiBins()); }
+inline CaloTowerGeometrySvc::index_t CaloTowerGeometrySvc::phiIndexFromTowerIndex(index_t towerIdx) const { return (index_t)(towerIdx%phiBins()); }
+
+//-----------------------------//
+// Access to tower description //
+//-----------------------------//
+
+inline double CaloTowerGeometrySvc::invalidValue() const { return m_invalidValue; }
+inline bool CaloTowerGeometrySvc::isInvalidValue(double val) const { return val == invalidValue(); }
+inline double CaloTowerGeometrySvc::towerEtaLocal(index_t etaIdx) const { return !isInvalidEtaIndex(etaIdx) ? etaMin()+(static_cast<double>(etaIdx)+0.5)*etaWidth() : invalidValue(); }
+inline double CaloTowerGeometrySvc::towerPhiLocal(index_t phiIdx) const { return !isInvalidPhiIndex(phiIdx) ? phiMin()+(static_cast<double>(phiIdx)+0.5)*phiWidth() : invalidValue(); }
+inline double CaloTowerGeometrySvc::towerEta(index_t towerIdx) const { return towerEtaLocal(etaIndexFromTowerIndex(towerIdx)); }
+inline double CaloTowerGeometrySvc::towerPhi(index_t towerIdx) const { return towerPhiLocal(phiIndexFromTowerIndex(towerIdx)); }
+
+inline CaloTowerGeometrySvc::elementmap_t::const_iterator CaloTowerGeometrySvc::begin() const { return m_towerLookup.begin(); }
+inline CaloTowerGeometrySvc::elementmap_t::const_iterator CaloTowerGeometrySvc::end() const { return m_towerLookup.end(); }
+inline size_t CaloTowerGeometrySvc::size() const { return m_towerLookup.size(); }
+inline bool CaloTowerGeometrySvc::empty() const { return m_towerLookup.empty(); }
+
+//-------------------//
+// Other data access //
+//-------------------//
+inline double CaloTowerGeometrySvc::cellWeight(const CaloCell* pCell,index_t towerIdx) const { return cellWeight(pCell->caloDDE()->calo_hash(),towerIdx); }
+inline double CaloTowerGeometrySvc::cellWeight(const element_t& elm) const { return std::get<1>(elm); }
+
+
+//----------------------------------//
+// Internal functions and accessors //
+//----------------------------------//
+inline const CaloDetDescrManager* CaloTowerGeometrySvc::f_caloDDM() const { return m_caloDDM; }
+inline const CaloDetDescrElement* CaloTowerGeometrySvc::f_caloDDE(const CaloCell* pCell) const { return pCell->caloDDE(); }
+inline const CaloDetDescrElement* CaloTowerGeometrySvc::f_caloDDE(IdentifierHash cellHash) const { return f_caloDDM()->get_element(cellHash); }
+
+inline double CaloTowerGeometrySvc::f_cellEta(IdentifierHash cellHash) const { return f_caloDDE(cellHash)->eta(); }
+inline double CaloTowerGeometrySvc::f_cellEta(const CaloCell* pCell) const { return pCell->eta(); }
+inline double CaloTowerGeometrySvc::f_cellPhi(IdentifierHash cellHash) const { return CaloPhiRange::fix(f_caloDDE(cellHash)->phi()); }
+inline double CaloTowerGeometrySvc::f_cellPhi(const CaloCell* pCell) const { return pCell->phi(); }
+#endif
diff --git a/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx b/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
index d75f56a76f9d804605556ef32581c04880c3d3c2..00e961b95874de4964f8ca0c09b08adf836b1e01 100644
--- a/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
+++ b/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
@@ -36,6 +36,13 @@
#include "../CaloCellContainerAliasAlg.h"
#include "../ToolConstantsCondAlg.h"
+//Includes for CaloTopoTowers
+#include "../CaloTowerGeometrySvc.h"
+#include "../CaloTopoClusterTowerMerger.h"
+#include "../CaloTopoClusterFromTowerMonitor.h"
+#include "../CaloTopoTowerFromClusterCalibrator.h"
+#include "../CaloTopoTowerFromClusterMaker.h"
+#include "../CaloTopoTowerMaker.h"
DECLARE_COMPONENT( CaloTowerMonitor )
DECLARE_COMPONENT( CaloTowerAlgorithm )
@@ -80,3 +87,10 @@ DECLARE_COMPONENT (CaloThinCellsByClusterAlg)
DECLARE_COMPONENT (CaloThinCellsBySamplingAlg)
DECLARE_COMPONENT (CaloCellContainerAliasAlg)
DECLARE_COMPONENT (ToolConstantsCondAlg)
+
+DECLARE_COMPONENT( CaloTopoClusterFromTowerMonitor )
+DECLARE_COMPONENT( CaloTowerGeometrySvc )
+DECLARE_COMPONENT( CaloTopoClusterTowerMerger )
+DECLARE_COMPONENT( CaloTopoTowerFromClusterMaker )
+DECLARE_COMPONENT( CaloTopoTowerFromClusterCalibrator )
+DECLARE_COMPONENT( CaloTopoTowerMaker )
diff --git a/Calorimeter/CaloSimEvent/CMakeLists.txt b/Calorimeter/CaloSimEvent/CMakeLists.txt
index 4c30237f5bba49348db4292d68d40dbd5bcf67e8..9feef2e380a81297565f956186ae1d4cc965c960 100644
--- a/Calorimeter/CaloSimEvent/CMakeLists.txt
+++ b/Calorimeter/CaloSimEvent/CMakeLists.txt
@@ -1,32 +1,16 @@
-################################################################################
-# Package: CaloSimEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloSimEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/Identifier
- Simulation/HitManagement
- PRIVATE
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( CaloSimEvent
src/*.cxx
PUBLIC_HEADERS CaloSimEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES Identifier HitManagement
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
+ LINK_LIBRARIES AthenaKernel Identifier HitManagement
+ PRIVATE_LINK_LIBRARIES GaudiKernel )
atlas_add_dictionary( CaloSimEventDict
CaloSimEvent/CaloSimEventDict.h
CaloSimEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} Identifier HitManagement GaudiKernel CaloSimEvent )
-
+ LINK_LIBRARIES CaloSimEvent )
diff --git a/Calorimeter/CaloTTDetDescr/CMakeLists.txt b/Calorimeter/CaloTTDetDescr/CMakeLists.txt
index 000a484ae74a5e3de38ab8ee433c8dd8df959c47..f156ec2c91eb7a9b1a31fac2ccc97bf36887b94a 100644
--- a/Calorimeter/CaloTTDetDescr/CMakeLists.txt
+++ b/Calorimeter/CaloTTDetDescr/CMakeLists.txt
@@ -1,21 +1,12 @@
-################################################################################
-# Package: CaloTTDetDescr
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTTDetDescr )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/Identifier
- PRIVATE
- Calorimeter/CaloIdentifier )
-
# Component(s) in the package:
atlas_add_library( CaloTTDetDescr
src/*.cxx
PUBLIC_HEADERS CaloTTDetDescr
- LINK_LIBRARIES Identifier
+ LINK_LIBRARIES AthenaKernel Identifier
PRIVATE_LINK_LIBRARIES CaloIdentifier )
diff --git a/Calorimeter/CaloTools/CMakeLists.txt b/Calorimeter/CaloTools/CMakeLists.txt
index a14f3bfad85ed815c73b071012d8d52ea70dcfa6..28fc0847ed4cc8d2c589f60aba7de1ae0585dfd6 100644
--- a/Calorimeter/CaloTools/CMakeLists.txt
+++ b/Calorimeter/CaloTools/CMakeLists.txt
@@ -1,45 +1,8 @@
-# $Id: CMakeLists.txt 740701 2016-04-15 18:22:55Z ssnyder $
-################################################################################
-# Package: CaloTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthAllocators
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/AtlasDetDescr
- DetectorDescription/Identifier
- GaudiKernel
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRecEvent
- LArCalorimeter/LArCabling
- LArCalorimeter/LArRawConditions
- LumiBlock/LumiBlockComps
- TileCalorimeter/TileConditions
- TileCalorimeter/TileEvent
- Control/CxxUtils
- PRIVATE
- Calorimeter/CaloCondBlobObjs
- Control/AthAllocators
- DetectorDescription/IdDictParser
- Event/xAOD/xAODBase
- Event/xAOD/xAODEventInfo
- TileCalorimeter/TileIdentifier )
-
# External dependencies:
find_package( Boost )
find_package( CLHEP )
@@ -49,22 +12,13 @@ find_package( ROOT COMPONENTS Core MathCore )
# Component(s) in the package:
atlas_add_component( CaloTools
CaloTools/*.h CaloTools/*.icc src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES}
- ${CLHEP_LIBRARIES} CaloConditions CaloDetDescrLib CaloEvent CaloGeoHelpers
- CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib
- AthenaPoolUtilities AtlasDetDescr Identifier GaudiKernel LArIdentifier
- LArRecEvent LArToolsLib LumiBlockCompsLib TileConditionsLib TileEvent
- CxxUtils CaloCondBlobObjs AthAllocators IdDictParser xAODBase xAODEventInfo
- TileIdentifier LArRawConditions CaloInterfaceLib )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities AtlasDetDescr CaloCondBlobObjs CaloConditions CaloDetDescrLib CaloEvent CaloGeoHelpers CaloIdentifier CaloInterfaceLib CxxUtils GaudiKernel Identifier LArCablingLib LArElecCalib LArRawConditions LArRecEvent StoreGateLib TileConditionsLib TileEvent TileIdentifier xAODBase )
# Install files from the package:
-atlas_install_headers( CaloTools )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
-
atlas_add_test( CaloEstimatedGainToolConfig_test
SCRIPT python -m CaloTools.CaloEstimatedGainToolConfig
LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
diff --git a/Calorimeter/CaloTrackUtils/CMakeLists.txt b/Calorimeter/CaloTrackUtils/CMakeLists.txt
index 3ce63604af145f938dabe5c2d93e39dfd476a808..a4898da6daa14010436cf153e72c1ea085e52212 100644
--- a/Calorimeter/CaloTrackUtils/CMakeLists.txt
+++ b/Calorimeter/CaloTrackUtils/CMakeLists.txt
@@ -1,39 +1,15 @@
-################################################################################
-# Package: CaloTrackUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTrackUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloRec
- GaudiKernel
- PRIVATE
- DetectorDescription/GeoPrimitives
- Event/xAOD/xAODCaloEvent
- Reconstruction/Particle
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkTrackLink
- Tracking/TrkEvent/VxVertex
- Tracking/TrkExtrapolation/TrkExInterfaces )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
-
# Component(s) in the package:
atlas_add_library( CaloTrackUtilsLib
src/*.cxx
PUBLIC_HEADERS CaloTrackUtils
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES GaudiKernel CaloRecLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives xAODCaloEvent Particle TrkSurfaces TrkParameters TrkParticleBase VxVertex TrkExInterfaces )
+ PRIVATE_LINK_LIBRARIES GeoPrimitives Particle TrkExInterfaces TrkParameters TrkParticleBase TrkSurfaces TrkTrackLink VxVertex xAODCaloEvent )
atlas_add_component( CaloTrackUtils
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES CaloTrackUtilsLib )
-
diff --git a/Calorimeter/CaloTrackingGeometry/CMakeLists.txt b/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
index 6465c5c24b463435c3f1ea96081b7196276004b2..4e3a1b0b5e32ff8e07c5c9b75f6ed4687fd4a4f8 100644
--- a/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
+++ b/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
@@ -1,44 +1,18 @@
-################################################################################
-# Package: CaloTrackingGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTrackingGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- AtlasGeometryCommon/SubDetectorEnvelopes
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- PRIVATE
- Control/StoreGate
- TileCalorimeter/TileDetDescr
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkGeometrySurfaces
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
atlas_add_library( CaloTrackingGeometryLib
INTERFACE
PUBLIC_HEADERS CaloTrackingGeometry
- LINK_LIBRARIES GaudiKernel GeoPrimitives CaloIdentifier CaloGeoHelpers CaloDetDescrLib )
+ LINK_LIBRARIES AthenaBaseComps CaloDetDescrLib CaloGeoHelpers CaloIdentifier GaudiKernel GeoPrimitives SubDetectorEnvelopesLib TrkDetDescrInterfaces TrkDetDescrUtils )
# Component(s) in the package:
atlas_add_component( CaloTrackingGeometry
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaBaseComps GeoPrimitives GaudiKernel TrkDetDescrInterfaces StoreGateLib SGtests TileDetDescr TrkDetDescrUtils TrkGeometry TrkGeometrySurfaces TrkSurfaces TrkVolumes SubDetectorEnvelopesLib CaloTrackingGeometryLib )
+ LINK_LIBRARIES CaloTrackingGeometryLib TileDetDescr TrkGeometry TrkGeometrySurfaces TrkSurfaces TrkVolumes)
atlas_add_dictionary( CaloTrackingGeometryDict
CaloTrackingGeometry/CaloTrackingGeometryDict.h
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
index 129bfe85157ee70c167dbbc9c80042dfd81d1c28..e7d4f08faf482754367472240ff74e43051a9edf 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
@@ -81,7 +81,10 @@ const Trk::Surface& CaloSurfaceHelper::GetFlatEntrySurface (const CaloCell_ID::
const Trk::Surface* surf = side>0 ? m_flatEntrySurfs[sample].first : m_flatEntrySurfs[sample].second;
- if (!surf) ATH_MSG_FATAL(" failed to retrieve flat entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+ if (!surf) {
+ ATH_MSG_FATAL(" failed to retrieve flat entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+ std::abort();
+ }
return *surf;
}
@@ -89,7 +92,10 @@ const Trk::Surface& CaloSurfaceHelper::GetEntrySurface(const CaloCell_ID::CaloSa
const Trk::Surface* surf = side>0 ? m_entrySurfs[sample].first : m_entrySurfs[sample].second;
- if (!surf) ATH_MSG_FATAL(" failed to retrieve entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+ if (!surf) {
+ ATH_MSG_FATAL(" failed to retrieve entry layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+ std::abort();
+ }
return *surf;
}
@@ -97,7 +103,10 @@ const Trk::Surface& CaloSurfaceHelper::GetExitSurface (const CaloCell_ID::CaloSa
const Trk::Surface* surf = side>0 ? m_exitSurfs[sample].first : m_exitSurfs[sample].second;
- if (!surf) ATH_MSG_FATAL(" failed to retrieve exit layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+ if (!surf) {
+ ATH_MSG_FATAL(" failed to retrieve exit layer for sample:"<<sample<<" on side:"<<side<<" crashing....");
+ std::abort();
+ }
return *surf;
}
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
index 876a01a83c1da11427105e069f650b70f02fd87a..a1c927350e470431133a438899e123da59e900fb 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
@@ -284,8 +284,8 @@ const Trk::TrackingGeometry* Calo::CaloTrackingGeometryBuilder::trackingGeometry
if ( msCutouts.empty() ) msCutouts.push_back( envelopeDefs[i] );
else {
RZPairVector::iterator envIter = msCutouts.begin();
- while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) envIter++;
- while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first > envelopeDefs[i].first ) envIter++;
+ while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) ++envIter;
+ while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first > envelopeDefs[i].first ) ++envIter;
msCutouts.insert(envIter, envelopeDefs[i]);
}
}
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
index 1992999c271be8fc4091b294a3cfefb1592722b3..f2a4f973f7f2ed37e952e29681258fd0d7898819 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
@@ -291,8 +291,8 @@ std::pair<EventIDRange, const Trk::TrackingGeometry*> Calo::CaloTrackingGeometry
if ( msCutouts.empty() ) msCutouts.push_back( envelopeDefs[i] );
else {
RZPairVector::iterator envIter = msCutouts.begin();
- while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) envIter++;
- while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first > envelopeDefs[i].first ) envIter++;
+ while (envIter!= msCutouts.end() && (*envIter).second < envelopeDefs[i].second ) ++envIter;
+ while (envIter!= msCutouts.end() && (*envIter).second == envelopeDefs[i].second && (*envIter).first > envelopeDefs[i].first ) ++envIter;
msCutouts.insert(envIter, envelopeDefs[i]);
}
}
diff --git a/Calorimeter/CaloTriggerTool/CMakeLists.txt b/Calorimeter/CaloTriggerTool/CMakeLists.txt
index 41987f4cd29f8ddc3f3989c15171f87a3dc58c2a..c24a672fa974575fcd665741bebce6c9fc91eafa 100644
--- a/Calorimeter/CaloTriggerTool/CMakeLists.txt
+++ b/Calorimeter/CaloTriggerTool/CMakeLists.txt
@@ -1,44 +1,23 @@
-################################################################################
-# Package: CaloTriggerTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTriggerTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/Identifier
- GaudiKernel
- Trigger/TrigT1/TrigT1CaloCalibConditions
- PRIVATE
- Control/AthenaBaseComps
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArCabling )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( CaloTriggerToolLib
src/*.cxx
PUBLIC_HEADERS CaloTriggerTool
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel Identifier GaudiKernel TrigT1CaloCalibConditions StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES AthenaBaseComps LArIdentifier LArCablingLib )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CaloIdentifier GaudiKernel Identifier StoreGateLib TrigT1CaloCalibConditions
+ PRIVATE_LINK_LIBRARIES LArCablingLib LArIdentifier )
atlas_add_component( CaloTriggerTool
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES CaloTriggerToolLib AthenaBaseComps )
+ LINK_LIBRARIES CaloTriggerToolLib )
atlas_add_dictionary( CaloTriggerToolDict
CaloTriggerTool/CaloTriggerToolDict.h
CaloTriggerTool/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel StoreGateLib SGtests Identifier GaudiKernel TrigT1CaloCalibConditions AthenaBaseComps LArIdentifier CaloTriggerToolLib )
+ LINK_LIBRARIES CaloTriggerToolLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt
index a7a37b92e2a3a6f56a9e38a00e5eb14df7241c03..c1b999aab1249670da2938ffa26c33d9a3d61054 100644
--- a/Calorimeter/CaloUtils/CMakeLists.txt
+++ b/Calorimeter/CaloUtils/CMakeLists.txt
@@ -11,11 +11,8 @@ find_package( CLHEP )
atlas_add_library( CaloUtilsLib CaloUtils/*.h CaloUtils/*.icc src/*.h src/*.cxx
PUBLIC_HEADERS CaloUtils
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES CaloConditions CaloEvent CaloGeoHelpers CaloIdentifier
- AthenaBaseComps AthenaKernel Navigation FourMom xAODCaloEvent xAODCore GaudiKernel
- CaloDetDescrLib StoreGateLib CaloInterfaceLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CxxUtils
- SGTools IdDictParser Identifier )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloEvent CaloGeoHelpers CaloIdentifier CaloInterfaceLib CxxUtils FourMom GaudiKernel Navigation StoreGateLib xAODCaloEvent
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} GeoModelInterfaces Identifier SGTools TestTools )
atlas_add_component( CaloUtils src/components/*.cxx
LINK_LIBRARIES CaloUtilsLib )
@@ -33,24 +30,21 @@ set( _jobOPath "${_jobOPath}:$ENV{JOBOPTSEARCHPATH}" )
atlas_add_test( CaloLayerCalculator_test
SOURCES test/CaloLayerCalculator_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier
- StoreGateLib xAODCaloEvent GaudiKernel TestTools IdDictParser CaloUtilsLib
+ LINK_LIBRARIES LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloUtilsLib CxxUtils IdDictParser TestTools
LOG_IGNORE_PATTERN "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::"
ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
atlas_add_test( CaloVertexedCell_test
SOURCES test/CaloVertexedCell_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier
- StoreGateLib GaudiKernel TestTools IdDictParser CaloUtilsLib
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloUtilsLib TestTools
LOG_IGNORE_PATTERN "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::"
ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
atlas_add_test( CaloVertexedCluster_test
SOURCES test/CaloVertexedCluster_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloIdentifier StoreGateLib
- xAODCaloEvent GaudiKernel TestTools IdDictParser CaloUtilsLib
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloUtilsLib TestTools
LOG_IGNORE_PATTERN "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::"
ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
@@ -60,18 +54,18 @@ atlas_add_test( exceptions_test
atlas_add_test( CaloTowerStore_test
SCRIPT test/CaloTowerStore_test.sh
- LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment"
+ LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment|IOVDbSvc +INFO"
PROPERTIES TIMEOUT 500 )
atlas_add_test( CaloTowerBuilderTool_test
SCRIPT test/CaloTowerBuilderTool_test.sh
- LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment"
+ LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment|IOVDbSvc +INFO"
ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-13"
PROPERTIES TIMEOUT 500 )
atlas_add_test( ToolWithConstants_test
SCRIPT test/ToolWithConstants_test.py
- LOG_IGNORE_PATTERN "no dictionary for|by peeking into|Current filenames:" )
+ LOG_IGNORE_PATTERN "no dictionary for|by peeking into|Current filenames:|IOVDbSvc +INFO|Added successfully Conversion|DetDescrCnvSvc +INFO|GeoModelSvc +INFO|IOVSvc +INFO|with default tag" )
# Install files from the package:
atlas_install_joboptions( share/*.txt share/*.py )
diff --git a/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h b/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
index e636571c33bd1d53829f9d98849f6b9f6fc030ba..5209170e64b66ecbddde3ec05dd87c2cc2c96b23 100644
--- a/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
+++ b/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
@@ -20,6 +20,7 @@
#include "CaloUtils/exceptions.h"
+#include "CaloInterface/IToolWithConstants.h"
#include "CaloConditions/ToolConstants.h"
#include "AthenaBaseComps/AthCheckMacros.h"
#include "StoreGate/ReadCondHandleKey.h"
@@ -434,7 +435,7 @@ private:
template <class BASE>
ATH_REQUIRES( requires (BASE& b, Gaudi::Property<int>& p) { { b.declareProperty(p) }; } )
class ToolWithConstants
- : public BASE
+ : public extends<BASE, IToolWithConstants>
{
public:
/// Shorthand for derived classes.
@@ -442,7 +443,7 @@ public:
/// Inherit constructor.
- using BASE::BASE;
+ using extends<BASE, IToolWithConstants>::extends;
/// Convenient alias for the Context type.
@@ -485,7 +486,7 @@ public:
* @param ctx Event context.
*/
virtual StatusCode mergeConstants (CaloRec::ToolConstants& out,
- const EventContext& ctx) const;
+ const EventContext& ctx) const override;
/**
diff --git a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
index b597552a0de5f775d80f5c35eb038e0b7c555fb4..acdbf23cbfdc9d15778dd4fee544481872ebe0ef 100644
--- a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
@@ -1,16 +1,16 @@
-Wed Aug 5 18:46:10 CEST 2020
+Tue Oct 6 18:57:36 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.17] [x86_64-centos7-gcc8-opt] [CaloMgrTooEarlyError/1cd056abc58] -- built on [2020-08-05T1835]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1855]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
-Py:Athena INFO including file "CaloTowerStore_test.py"
+Py:Athena INFO including file "CaloUtils/CaloTowerStore_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5547 configurables from 23 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.17
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
@@ -20,23 +20,21 @@ Py:Athena INFO including file "TileIdCnv/TileIdCnv_jobOptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on 05d0ccd909cb on Wed Aug 5 18:46:19 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 18:57:48 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3581 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host 05d0ccd909cb [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -47,14 +45,13 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-SDR-BS14T-IBL-06 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 7 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1488 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -68,9 +65,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 239 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 243 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -155,7 +152,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 5947 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6007 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -173,7 +170,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -185,15 +182,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
@@ -203,18 +200,19 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 2529 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2430 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARAlign-mc11-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix2 for folder /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -231,12 +229,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -256,25 +254,25 @@ IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
IncidentProcAlg2 INFO Finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 1.07 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.05 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.69 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.77 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.22 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.02 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 2.53 ))s
+IOVDbSvc INFO bytes in (( 0.28 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 2.53 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.28 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 105(+- 105)/ 0/ 210 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 270 [ms] Ave/Min/Max= 135(+- 125)/ 10/ 260 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 1.71 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 245(+- 235)/ 10/ 480 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.275(+- 0.245)/ 0.03/ 0.52 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 2.21 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref b/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
index 69b318350b3cbb2e93beeaa2bebcc1fb8b31d3db..368b72218fd6bada8ebd9df03b71c9bae3fddf80 100644
--- a/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
+++ b/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
@@ -1,19 +1,9 @@
-Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root
Py:MetaReader INFO Current mode used: peeker
-Py:MetaReader INFO Current filenames: ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root']
Py:MetaReader INFO MetaReader is called with the parameter "unique_tag_info_values" set to True. This is a workaround to remove all duplicate values from "/TagInfo" key
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on lxplus747.cern.ch on Sun Aug 30 00:06:23 2020
-====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
PyComponentMgr INFO Initializing PyComponentMgr...
TestAlg INFO Initializing TestAlg...
-ClassIDSvc INFO getRegistryEntries: read 20739 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 423 CLIDRegistry entries for module ALL
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
@@ -88,8 +78,8 @@ testMerge: CaloUtils::ToolWithConstantsTestTool 2 .test.ca1 = [3, 4.5, 6]
.test.order = 0
-ToolSvc.tool1 ERROR CaloUtils/src/ToolWithConstants.cxx:112 (StatusCode CaloUtils::ToolWithConstantsImpl::mergeConstants(const std::string&, int, CaloUtils::ToolWithConstantsImpl::Context&, bool, CaloRec::ToolConstants&) const): code FAILURE: Trying to write to ToolConstants for tools of differing types: foofoo and CaloUtils::ToolWithConstantsTestTool
-ToolSvc.tool1 ERROR CaloUtils/src/ToolWithConstants.cxx:118 (StatusCode CaloUtils::ToolWithConstantsImpl::mergeConstants(const std::string&, int, CaloUtils::ToolWithConstantsImpl::Context&, bool, CaloRec::ToolConstants&) const): code FAILURE: Trying to write to ToolConstants for differing versions of tool CaloUtils::ToolWithConstantsTestTool: 10 and 2
+ToolSvc.tool1 ERROR ../ToolWithConstants.cxx (StatusCode CaloUtils::ToolWithConstantsImpl::mergeConstants(const std::string&, int, CaloUtils::ToolWithConstantsImpl::Context&, bool, CaloRec::ToolConstants&) const): code FAILURE: Trying to write to ToolConstants for tools of differing types: foofoo and CaloUtils::ToolWithConstantsTestTool
+ToolSvc.tool1 ERROR ../ToolWithConstants.cxx (StatusCode CaloUtils::ToolWithConstantsImpl::mergeConstants(const std::string&, int, CaloUtils::ToolWithConstantsImpl::Context&, bool, CaloRec::ToolConstants&) const): code FAILURE: Trying to write to ToolConstants for differing versions of tool CaloUtils::ToolWithConstantsTestTool: 10 and 2
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #284500 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #284500 1 events processed so far <<<===
284500 0 1000
@@ -247,11 +237,6 @@ ToolSvc.tool2 INFO m_ca1 [3, 4.5, 6]
ToolSvc.tool2 INFO m_ca2 Can't find key in
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #284500 8 events processed so far <<<===
ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-TestAlg INFO Finalizing TestAlg...
-IncidentProcAlg2 INFO Finalize
-EventSelector INFO finalize
ToolSvc INFO Removing all tools created by ToolSvc
-PyComponentMgr INFO Finalizing PyComponentMgr...
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx
index ea5bc10ca8d0239b41a8d51b3feda9408761ebb9..d2365b7d6fc7566b23f1db738b4eb108b9f3e94e 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file CaloTowerBuilderToolTestAlg.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -12,9 +10,6 @@
#undef NDEBUG
-//This is a test so no need to be thread safe
-#include "CxxUtils/checker_macros.h"
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY;
#include "CaloTowerBuilderToolTestAlg.h"
#include "CaloUtils/CaloTowerBuilderTool.h"
@@ -22,6 +17,7 @@ ATLAS_NO_CHECK_FILE_THREAD_SAFETY;
#include "CaloEvent/CaloTowerContainer.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "AthenaKernel/errorcheck.h"
+#include "TestTools/random.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include <cstdlib>
#include <iostream>
@@ -35,34 +31,6 @@ using CLHEP::GeV;
namespace {
-// Dufus-quality RNG, using LCG. Constants from numerical recipies.
-// I don't particularly care about RNG quality here, just about
-// getting something that's reproducible.
-#include <cstdint>
-uint32_t seed = 1;
-uint32_t rngmax = static_cast<uint32_t> (-1);
-uint32_t rng()
-{
- seed = (1664525*seed + 1013904223);
- return seed;
-}
-
-float randf (float rmax, float rmin = 0)
-{
- return static_cast<float>(rng()) / rngmax * (rmax-rmin) + rmin;
-}
-int randi (int rmax, int rmin = 0)
-{
- return static_cast<int> (randf(rmax, rmin));
-}
-
-struct RNG
-{
- int operator() (int n) const { return randi (n); }
-};
-//RNG stlrand;
-
-
bool comp (double x1, double x2, double thresh = 1e-6)
{
double den = std::abs(x1) + std::abs(x2);
@@ -82,7 +50,8 @@ CaloTowerBuilderToolTestAlg::CaloTowerBuilderToolTestAlg
(const std::string& name,
ISvcLocator* pSvcLocator)
: AthAlgorithm (name, pSvcLocator),
- m_builder ("CaloTowerBuilderTool")
+ m_builder ("CaloTowerBuilderTool"),
+ m_seed (1)
{
}
@@ -115,7 +84,7 @@ CaloTowerBuilderToolTestAlg::make_cells()
for (const CaloDetDescrElement* dde :
ddman->element_range (subcalo))
{
- float energy = randf (100*GeV);
+ float energy = Athena_test::randf_seed (m_seed, 100*GeV);
cells->push_back (new CaloCell (dde, energy, 0, 0, 0,
CaloGain::LARMEDIUMGAIN) );
}
diff --git a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.h b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.h
index 1c6516f292b571621380bcad53637d88db087a28..59d909b11bd8eb0c02ccb3073d14420e23987f5f 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.h
+++ b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.h
@@ -1,10 +1,7 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file CaloTowerBuilderToolTestAlg.h
* @author scott snyder <snyder@bnl.gov>
@@ -23,9 +20,10 @@
#include "CaloIdentifier/CaloCell_ID.h"
#include "GaudiKernel/ToolHandle.h"
#include <vector>
+#include <cstdint>
class CaloCellContainer;
class CaloTowerContainer;
-class ICaloTowerBuilderToolBase;
+class ICaloTowerBuilderToolBase;
class CaloTowerBuilderToolTestAlg
@@ -61,6 +59,8 @@ private:
ToolHandle<ICaloTowerBuilderToolBase> m_builder;
std::vector<CaloCell_ID::SUBCALO> m_calos;
CaloTowerSeg m_seg;
+
+ uint32_t m_seed;
};
diff --git a/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx b/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
index 17fcdc4782dff18cdbc9d1303435def2bed64af6..c5556a927911a4a7e846f4df44341070a2ed04ca 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
@@ -22,6 +22,12 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#if __clang__
+// Work around warnings from gtest code. See
+// https://github.com/google/googletest/pull/2316.
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
+
//
// method implementations
//
@@ -321,7 +327,7 @@ namespace asg
// check make(type)
TEST_F (AnaToolHandleUseTest, makeTyped)
{
- ASSERT_DEATH (tool.make ("asg::UnitTestTool1"), "");
+ ASSERT_DEATH (tool.make ("asg::UnitTestTool1").ignore(), "");
}
#endif
@@ -345,7 +351,7 @@ namespace asg
// check makeNew<type>()
TEST_F (AnaToolHandleUseTest, makeNew)
{
- ASSERT_DEATH (tool.makeNew<asg::UnitTestTool1> ("asg::UnitTestTool1"), "");
+ ASSERT_SUCCESS (tool.makeNew<asg::UnitTestTool1> ("asg::UnitTestTool1"));
}
#endif
@@ -426,7 +432,7 @@ namespace asg
// check setProperty<int>()
TEST_F (AnaToolHandleUseTest, setPropertyInt)
{
- ASSERT_DEATH (tool.setProperty<int> ("propertyInt", 42), "");
+ ASSERT_DEATH (tool.setProperty<int> ("propertyInt", 42).ignore(), "");
}
#endif
@@ -455,7 +461,7 @@ namespace asg
// check setProperty(const char*)
TEST_F (AnaToolHandleUseTest, setPropertyString)
{
- ASSERT_DEATH (tool.setProperty ("propertyString", "42"), "");
+ ASSERT_DEATH (tool.setProperty ("propertyString", "42").ignore(), "");
}
#endif
@@ -481,7 +487,7 @@ namespace asg
// check initialize()
TEST_F (AnaToolHandleUseTest, initialize)
{
- ASSERT_DEATH (tool.initialize(), "");
+ ASSERT_DEATH (tool.initialize().ignore(), "");
}
#endif
@@ -690,7 +696,7 @@ namespace asg
}
};
- TYPED_TEST_CASE_P (SetToolHandlePropertyTest);
+ TYPED_TEST_SUITE_P (SetToolHandlePropertyTest);
TYPED_TEST_P (SetToolHandlePropertyTest, setRegPublicHandle)
{
@@ -712,7 +718,7 @@ namespace asg
this->testSetToolHandle ("anaPrivateHandle", false, false);
}
- REGISTER_TYPED_TEST_CASE_P (SetToolHandlePropertyTest, setRegPublicHandle, setRegPrivateHandle, setAnaPublicHandle, setAnaPrivateHandle);
+ REGISTER_TYPED_TEST_SUITE_P (SetToolHandlePropertyTest, setRegPublicHandle, setRegPrivateHandle, setAnaPublicHandle, setAnaPrivateHandle);
@@ -731,7 +737,7 @@ namespace asg
AnaToolHandle<IUnitTestTool1> handle;
};
#ifdef ROOTCORE
- INSTANTIATE_TYPED_TEST_CASE_P (PublicAnaSubToolTest, SetToolHandlePropertyTest, PublicAnaSubTool);
+ INSTANTIATE_TYPED_TEST_SUITE_P (PublicAnaSubToolTest, SetToolHandlePropertyTest, PublicAnaSubTool);
#endif
struct PrivateAnaSubTool
@@ -752,7 +758,7 @@ namespace asg
AnaToolHandle<IUnitTestTool1> handle;
};
#ifdef ROOTCORE
- INSTANTIATE_TYPED_TEST_CASE_P (PrivateAnaSubToolTest, SetToolHandlePropertyTest, PrivateAnaSubTool);
+ INSTANTIATE_TYPED_TEST_SUITE_P (PrivateAnaSubToolTest, SetToolHandlePropertyTest, PrivateAnaSubTool);
#endif
struct EmptyRegSubTool
@@ -767,7 +773,7 @@ namespace asg
ToolHandle<IUnitTestTool1> handle;
};
- INSTANTIATE_TYPED_TEST_CASE_P (EmptyRegSubToolTest, SetToolHandlePropertyTest, EmptyRegSubTool);
+ INSTANTIATE_TYPED_TEST_SUITE_P (EmptyRegSubToolTest, SetToolHandlePropertyTest, EmptyRegSubTool);
struct InvalidSubTool
{
@@ -782,7 +788,7 @@ namespace asg
ToolHandle<IUnitTestTool1> handle;
};
- INSTANTIATE_TYPED_TEST_CASE_P (InvalidSubToolTest, SetToolHandlePropertyTest, InvalidSubTool);
+ INSTANTIATE_TYPED_TEST_SUITE_P (InvalidSubToolTest, SetToolHandlePropertyTest, InvalidSubTool);
struct NamedSubTool
{
@@ -810,7 +816,7 @@ namespace asg
#endif
ToolHandle<IUnitTestTool1> handle;
};
- INSTANTIATE_TYPED_TEST_CASE_P (NamedSubToolTest, SetToolHandlePropertyTest, NamedSubTool);
+ INSTANTIATE_TYPED_TEST_SUITE_P (NamedSubToolTest, SetToolHandlePropertyTest, NamedSubTool);
#ifdef ROOTCORE
struct PointerRegSubTool
@@ -829,7 +835,7 @@ namespace asg
AnaToolHandle<IUnitTestTool1> tool;
ToolHandle<IUnitTestTool1> handle;
};
- INSTANTIATE_TYPED_TEST_CASE_P (PointerRegSubToolTest, SetToolHandlePropertyTest, PointerRegSubTool);
+ INSTANTIATE_TYPED_TEST_SUITE_P (PointerRegSubToolTest, SetToolHandlePropertyTest, PointerRegSubTool);
#endif
diff --git a/Control/AthToolSupport/AsgMessaging/AsgMessaging/StatusCode.h b/Control/AthToolSupport/AsgMessaging/AsgMessaging/StatusCode.h
index 21e9e7058e95f448079faffe5a9e07ecb6c95860..7c40c952be0ede007cbcf26bb37be4056238e120 100644
--- a/Control/AthToolSupport/AsgMessaging/AsgMessaging/StatusCode.h
+++ b/Control/AthToolSupport/AsgMessaging/AsgMessaging/StatusCode.h
@@ -25,7 +25,7 @@
/// $Revision: 612639 $
/// $Date: 2014-08-20 14:26:10 +0200 (Wed, 20 Aug 2014) $
///
-class StatusCode {
+class [[nodiscard]] StatusCode {
public:
/// Convenience StatusCode types
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc b/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc
index cc3f11022101af51a7c5ba76c9a23982a72a56c9..77cda10fb7ca7a5c9a67501d8772d2a1abd1dbe9 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc
@@ -9,7 +9,7 @@
#define ASGTOOLS_ASGCOMPONENT_ICC
#include <AsgTools/PropertyMgr.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <AsgTools/TProperty.h>
#include <utility>
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h
deleted file mode 100644
index cf6f1a5d6708d9dfbe43151ddec9edabbcc6db04..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_AsgMessaging_h
-#define FILE_AsgTools_AsgMessaging_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/AsgMessaging.h>
-#include <AsgTools/IAsgTool.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h
deleted file mode 100644
index 9cbd12a981e13aa5bdcc85f486ce499462bd0c95..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_AsgMessagingForward_h
-#define FILE_AsgTools_AsgMessagingForward_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/AsgMessagingForward.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/Check.h b/Control/AthToolSupport/AsgTools/AsgTools/Check.h
deleted file mode 100644
index 913c7989d24bc2af2217bc08efdfbf4272ed825b..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/Check.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_Check_h
-#define FILE_AsgTools_Check_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/Check.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
deleted file mode 100644
index 3c56d65513b87389c0c7a7a162d3c8ecc549b8eb..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_IMessagePrinter_h
-#define FILE_AsgTools_IMessagePrinter_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/IMessagePrinter.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h b/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h
deleted file mode 100644
index bd805ef4596245a283aad8d7c7d7ffe8086afd6e..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_INamedInterface_h
-#define FILE_AsgTools_INamedInterface_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/INamedInterface.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h b/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
deleted file mode 100644
index a45a5acd86debe30d8d47fe5ab08c1708a877ab6..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MessageCheck_h
-#define FILE_AsgTools_MessageCheck_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/MessageCheck.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
deleted file mode 100644
index 00cbf476f57408f54c6dc4223adfe3789aee2a69..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MessagePrinter_h
-#define FILE_AsgTools_MessagePrinter_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/MessagePrinter.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
deleted file mode 100644
index 9638bb07b73ab4549fcd76d388cbfbbac5538d3b..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MessagePrinterErrorCollect_h
-#define FILE_AsgTools_MessagePrinterErrorCollect_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/MessagePrinterErrorCollect.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h
deleted file mode 100644
index fe0c3a2c0472731ecf350d9d976ff80b5ea7842a..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MessagePrinterOverlay_h
-#define FILE_AsgTools_MessagePrinterOverlay_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/MessagePrinterOverlay.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MsgLevel.h b/Control/AthToolSupport/AsgTools/AsgTools/MsgLevel.h
deleted file mode 100644
index 0f562ecc75b7aacc72daf47033d589fcd63ebc8b..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MsgLevel.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MsgMevel_h
-#define FILE_AsgTools_MsgMevel_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/MsgLevel.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h b/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h
deleted file mode 100644
index b71648c3cae61ea6a3977a3b0ae72916fdc4083b..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MsgStream_h
-#define FILE_AsgTools_MsgStream_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/MsgStream.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MsgStreamMacros.h b/Control/AthToolSupport/AsgTools/AsgTools/MsgStreamMacros.h
deleted file mode 100644
index 13c88e282d8142097a43ab3a495d67878a1e9f6b..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MsgStreamMacros.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MsgStreamMacros_h
-#define FILE_AsgTools_MsgStreamMacros_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/MsgStreamMacros.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h b/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h
deleted file mode 100644
index 677f7145e82295ed54c8a1fd88eb49c17e415f38..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_StatusCode_h
-#define FILE_AsgTools_StatusCode_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2. once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/StatusCode.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
index 9ff58a0e8b3a2ff85e833aacec2c400b11d442a1..1687aae831eec9c369575bba743805c1f07f43e6 100644
--- a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
@@ -22,7 +22,7 @@
#include <regex>
#else
#include <GaudiKernel/AlgTool.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <GaudiKernel/IToolSvc.h>
#include <GaudiKernel/IJobOptionsSvc.h>
#endif
diff --git a/Control/AthViews/CMakeLists.txt b/Control/AthViews/CMakeLists.txt
index 8cfbffaab5b77b1237b32d2e7c621fab940f3d3b..594026fe12ec14d50f6e3dd822cb95b638dfa042 100644
--- a/Control/AthViews/CMakeLists.txt
+++ b/Control/AthViews/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_add_library( AthViews
src/*.cxx
PUBLIC_HEADERS AthViews
INCLUDE_DIRS ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${TBB_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel GaudiKernel StoreGateLib TrigSteeringEvent )
+ LINK_LIBRARIES ${TBB_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel GaudiKernel StoreGateLib TrigSteeringEvent SGTools )
atlas_add_component( AthViewsAlgs
src/components/*.cxx
diff --git a/Control/AthViews/src/SimpleView.cxx b/Control/AthViews/src/SimpleView.cxx
index 5b2821f7055510d444da388c3eacc3433deeb4ef..9c232b98026abfc7b5c723a32bae6d5c010740f0 100644
--- a/Control/AthViews/src/SimpleView.cxx
+++ b/Control/AthViews/src/SimpleView.cxx
@@ -5,6 +5,7 @@
#include <stdexcept>
#include "AthViews/SimpleView.h"
#include "AthViews/View.h"
+#include "SGTools/transientKey.h"
SimpleView::SimpleView( std::string Name, bool AllowFallThrough, std::string const& storeName ) :
m_store( storeName, Name ),
@@ -25,7 +26,7 @@ SimpleView::~SimpleView()
*/
std::string SimpleView::viewKey (const std::string& key) const
{
- return m_name + "_" + key;
+ return SG::transientKey (m_name + "_" + key);
}
diff --git a/Control/AthViews/test/ViewCollectionMerge_test.cxx b/Control/AthViews/test/ViewCollectionMerge_test.cxx
index 87b69137572312ff7e06cac63fa42eef9ff54d94..cb23953eff99669ec293348e9e52a9dbeb4908d3 100644
--- a/Control/AthViews/test/ViewCollectionMerge_test.cxx
+++ b/Control/AthViews/test/ViewCollectionMerge_test.cxx
@@ -477,7 +477,7 @@ TEST_F( ViewCollectionMerge_test, elementLinkViewRemapTest ) {
ASSERT_TRUE( outputDataHandle2.isValid() );
// Declare remapping - pretty hacky, have to specify view object names explicitly
- evtStore()->remap( ClassID_traits< DataVector< int > >::ID(), "testView_" + DATA_NAME, "testView_" + DATA_NAME + "2", 0 );
+ evtStore()->remap( ClassID_traits< DataVector< int > >::ID(), "_testView_" + DATA_NAME, "_testView_" + DATA_NAME + "2", 0 );
// Test the link again - should not have changed
ASSERT_TRUE( dataLink.isValid() );
@@ -566,8 +566,8 @@ TEST_F( ViewCollectionMerge_test, elementLinkMergeRemapTest ) {
ASSERT_TRUE( outputDataHandle.isValid() );
// Declare remapping - pretty hacky, have to specify view object names explicitly
- evtStore()->remap( ClassID_traits< DataVector< int > >::ID(), "testView_1_" + DATA_NAME, DATA_NAME, 0 );
- evtStore()->remap( ClassID_traits< DataVector< int > >::ID(), "testView_2_" + DATA_NAME, DATA_NAME, 1 );
+ evtStore()->remap( ClassID_traits< DataVector< int > >::ID(), "_testView_1_" + DATA_NAME, DATA_NAME, 0 );
+ evtStore()->remap( ClassID_traits< DataVector< int > >::ID(), "_testView_2_" + DATA_NAME, DATA_NAME, 1 );
// Element link should still be pointing to view container
ASSERT_TRUE( dataLink.isValid() );
@@ -665,8 +665,8 @@ TEST_F( ViewCollectionMerge_test, elementLinkMergeRemapBookkeepTest ) {
ASSERT_TRUE( auxHandle.isValid() );
// Declare remapping - pretty hacky, have to specify view object names explicitly
- evtStore()->remap( ClassID_traits< DataVector< DummyData > >::ID(), "testView_1_" + DATA_NAME, DATA_NAME, 0 );
- evtStore()->remap( ClassID_traits< DataVector< DummyData > >::ID(), "testView_2_" + DATA_NAME, DATA_NAME, 1 );
+ evtStore()->remap( ClassID_traits< DataVector< DummyData > >::ID(), "_testView_1_" + DATA_NAME, DATA_NAME, 0 );
+ evtStore()->remap( ClassID_traits< DataVector< DummyData > >::ID(), "_testView_2_" + DATA_NAME, DATA_NAME, 1 );
// Element link should still be pointing to view container
ASSERT_TRUE( dataLink.isValid() );
diff --git a/Control/AthViews/test/ViewLinking_test.cxx b/Control/AthViews/test/ViewLinking_test.cxx
index 565846bbc34c8999be7494fa2286107be6b61581..eee8ae53b1686fe59ec69c33c35963889c63e005 100644
--- a/Control/AthViews/test/ViewLinking_test.cxx
+++ b/Control/AthViews/test/ViewLinking_test.cxx
@@ -4,7 +4,6 @@
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h"
#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/getMessageSvc.h"
#include "StoreGate/ReadHandle.h"
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthConstConverter.h b/Control/AthenaBaseComps/AthenaBaseComps/AthConstConverter.h
new file mode 100644
index 0000000000000000000000000000000000000000..0dcc82c3942799cac74c17f4ce1eeb912347e7fa
--- /dev/null
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthConstConverter.h
@@ -0,0 +1,75 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file AthenaBaseComps/AthConstConverter.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Oct, 2020
+ * @brief Gaudi converter base class with const interfaces.
+ */
+
+
+#ifndef ATHENABASECOMPS_ATHCONSTCONVERTER_H
+#define ATHENABASECOMPS_ATHCONSTCONVERTER_H
+
+
+#include "AthenaBaseComps/AthMessaging.h"
+#include "AthenaBaseComps/AthMsgStreamMacros.h"
+#include "GaudiKernel/Converter.h"
+
+
+/**
+ * @brief Gaudi converter base class with const interfaces.
+ *
+ * This is a version of Gaudi Converter which uses const
+ * @c createRepConst and @c createObjConst methods instead
+ * of @c createObj and @c createRep. This can be used for converters
+ * that one wants to execute concurrently in MT jobs.
+ *
+ * As a bonus, we also include @c AthMessaging functionality.
+ */
+class AthConstConverter : public Converter, public AthMessaging
+{
+public:
+ AthConstConverter (long storage_type,
+ const CLID& class_type,
+ ISvcLocator* svc,
+ const std::string& name)
+ : Converter (storage_type, class_type, svc),
+ AthMessaging (msgSvc().get(), name),
+ m_name (name)
+ {
+ }
+
+
+ /// Create the transient representation of an object.
+ virtual StatusCode createObjConst( IOpaqueAddress* pAddress,
+ DataObject*& refpObject ) const;
+
+ /// Convert the transient object to the requested representation.
+ virtual StatusCode createRepConst( DataObject* pObject,
+ IOpaqueAddress*& refpAddress ) const;
+
+
+ /// Create the transient representation of an object.
+ // Non-const version; just calls the const version.
+ virtual StatusCode createObj( IOpaqueAddress* pAddress,
+ DataObject*& refpObject ) override final;
+
+
+ /// Convert the transient object to the requested representation.
+ // Non-const version; just calls the const version.
+ virtual StatusCode createRep( DataObject* pObject,
+ IOpaqueAddress*& refpAddress ) override final;
+
+
+ std::string name() const { return m_name; }
+
+
+private:
+ std::string m_name;
+};
+
+
+#endif // not ATHENABASECOMPS_ATHCONSTCONVERTER_H
diff --git a/Control/AthenaBaseComps/src/AthConstConverter.cxx b/Control/AthenaBaseComps/src/AthConstConverter.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..2b22a70b6ca40adbd94f59b2f2e7624ae35719bd
--- /dev/null
+++ b/Control/AthenaBaseComps/src/AthConstConverter.cxx
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file AthenaBaseComps/AthConstConverter.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Oct, 2020
+ * @brief Gaudi converter base class with const interfaces.
+ */
+
+
+#include "AthenaBaseComps/AthConstConverter.h"
+
+
+/**
+ * @brief Create the transient representation of an object.
+ *
+ * The default implementation is a no-op.
+ */
+StatusCode AthConstConverter::createObjConst( IOpaqueAddress* /*pAddress*/,
+ DataObject*& /*refpObject*/ ) const
+{
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Convert the transient object to the requested representation.
+ *
+ * The default implementation is a no-op.
+ */
+StatusCode AthConstConverter::createRepConst( DataObject* /*pObject*/,
+ IOpaqueAddress*& /*refpAddress*/ ) const
+{
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Create the transient representation of an object.
+ *
+ * Non-const version; just calls the const version.
+ */
+StatusCode AthConstConverter::createObj( IOpaqueAddress* pAddress,
+ DataObject*& refpObject )
+{
+ return createObjConst (pAddress, refpObject);
+}
+
+
+/**
+ * @brief Convert the transient object to the requested representation.
+ *
+ * Non-const version; just calls the const version.
+ */
+StatusCode AthConstConverter::createRep( DataObject* pObject,
+ IOpaqueAddress*& refpAddress )
+{
+ return createRepConst (pObject, refpAddress);
+}
+
diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index a8197ba6b870b417f1078aeecae63cf517a52e8f..15f9cdc6b878b2c4c34ba83182450994405ae513 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_install_python_modules( python/*.py python/Utils
POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/Preparation.py share/Execution.py share/Atlas.UnixStandardJob.py test/*.py
share/zeroJO.py share/Atlas_Gen.UnixStandardJob.py share/MemTraceInclude.py share/runbatch.py)
-atlas_install_scripts( share/athena.py share/athena3.py share/athena_preload.sh share/chappy.py share/find_cfg_dups.py share/test_cfg_pickling.py share/ThinCAWrapper.sh)
+atlas_install_scripts( share/athena.py share/athena3.py share/athena_preload.sh share/chappy.py share/test_cfg_pickling.py share/ThinCAWrapper.sh)
atlas_install_runtime(share/*.pkl)
# Aliases:
diff --git a/Control/AthenaCommon/python/AthArgumentParser.py b/Control/AthenaCommon/python/AthArgumentParser.py
new file mode 100644
index 0000000000000000000000000000000000000000..74f40f32a29f27fe4e1caf2dac943e6acb55052f
--- /dev/null
+++ b/Control/AthenaCommon/python/AthArgumentParser.py
@@ -0,0 +1,128 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+""" Helper wrapper to argparse.ArgumentParser for use in athena
+
+ The user's options are separated from athena's command line arguments by a
+ single '-' character when athena is called.
+
+ Public classes:
+ AthArgumentParser
+
+ Usage:
+ from AthenaCommon.AthArgumentParser import AthArgumentParser
+ parser = AthArgumentParser()
+ parser.add_argument("-a", "--arg", action="store", help="Argument")
+
+ args = parser.parse_args()
+ print(args.arg) # etc
+"""
+
+import argparse
+import sys
+import inspect
+import os
+from subprocess import Popen, PIPE
+
+# import the command line options back from the main process.
+# This means that this code only runs in something like an athena call.
+from __main__ import opts
+
+
+class AthArgumentParser(argparse.ArgumentParser):
+ """ Parse user commandline arguments in a job option. """
+
+ def __init__(self, jo_name=None, prog=None, print_caller_help=True, **kwargs):
+ """ Create the parser
+ ---------
+ Arguments
+ ---------
+ jo_name:
+ The name of the calling job option, used to format the help
+ text. Will attempt to deduce it if possible
+ prog:
+ The start of the usage message, usually can be deduced
+ print_caller_help:
+ Whether or not to print the help text from the calling program
+ (usually athena)
+
+ All other keyword arguments are forwarded to the base class
+ constructor
+ """
+
+ caller = sys.argv[0]
+ if prog is None:
+ if jo_name is None:
+ # Use inspect to find which job option we're in. This isn't
+ # completely foolproof but it's just a cosmetic detail so
+ # doesn't need to be
+ for frame in inspect.stack():
+ # For each frame in the stack, check the file name and keep
+ # it if it matches one of the scripts supplied
+ fname = inspect.getfile(frame[0])
+ try:
+ jo_name = next(
+ script for script in opts.scripts if fname.endswith(script)
+ )
+ break
+ except StopIteration:
+ pass
+ else:
+ # fallback name
+ jo_name = "User job option"
+ prog = "{0} {1} [{0} options] -".format(os.path.basename(caller), jo_name)
+ if print_caller_help:
+ # Get the help options for the caller
+ caller_help, _ = Popen(
+ [caller, "--help"], stdout=PIPE, stderr=PIPE
+ ).communicate()
+ # decode from bytes
+ caller_help = caller_help.decode("utf-8")
+ if caller.endswith("athena.py"):
+ # If this is being called from athena, we know that there are
+ # some lines to strip off
+ caller_help = caller_help.split("\n", 3)[3]
+ self.caller_help = "{} options:\n{}".format(
+ os.path.basename(caller), caller_help
+ )
+ else:
+ self.caller_help = ""
+ super().__init__(prog=prog, **kwargs)
+ super().add_argument(
+ "remaining scripts",
+ nargs="*",
+ help="Any remaining scripts to be run by athena after this job option. Mainly used to run the 'post' script on the grid.",
+ )
+
+ def add_argument(self, *args, **kwargs):
+ """ Add a new argument
+
+ The difference between this and the base class is that it disallows
+ adding positional arguments which are reserved by athena for job
+ options. In particular, even if user code uses only one job option
+ (which is common) pathena will add more when running on the grid
+ """
+ if not args or len(args) and args[0][0] not in self.prefix_chars:
+ raise ValueError(
+ "Positional arguments are not allowed! Defining them could mess up grid running!"
+ )
+ return super().add_argument(*args, **kwargs)
+
+ def parse_args(self, args=None, namespace=None):
+ """ Override the base class to use the leftover athena argumnets by
+ default
+ """
+ if args is None:
+ args = opts.user_opts
+ return super().parse_args(args, namespace)
+
+ def parse_known_args(self, args=None, namespace=None):
+ """ Override the base class to use the leftover athena argumnets by
+ default
+ """
+ if args is None:
+ args = opts.user_opts
+ return super().parse_known_args(args, namespace)
+
+ def format_help(self):
+ text = super().format_help()
+ return "\n".join([text, self.caller_help])
diff --git a/Control/AthenaCommon/python/AthOptionsParser.py b/Control/AthenaCommon/python/AthOptionsParser.py
index db5feb0ca7d122b5dc8dd0ea2bb0983fc15bd7b5..fc01a7ee194637c6e87a36434aca1f4618909e7f 100644
--- a/Control/AthenaCommon/python/AthOptionsParser.py
+++ b/Control/AthenaCommon/python/AthOptionsParser.py
@@ -214,7 +214,7 @@ def parse(chk_tcmalloc=True):
try:
optlist, args = getopt.getopt(_opts, _useropts, _userlongopts)
except getopt.error:
- print (sys.exc_value)
+ print (sys.exc_info()[1])
_help_and_exit()
if warn_tcmalloc and chk_tcmalloc:
@@ -256,8 +256,14 @@ def parse(chk_tcmalloc=True):
opts.command = arg.strip()
elif opt in ("-h", "--help"):
- print (_error_msg)
- sys.exit()
+ if len(scripts) > 0:
+ # If we have user scripts, we should also check if they have
+ # helptext to print
+ opts.msg_lvl = "WARNING"
+ opts.user_opts += ["-h"]
+ else:
+ print (_error_msg)
+ sys.exit()
elif opt in ("-l", "--loglevel"):
opts.msg_lvl = arg.upper()
diff --git a/Control/AthenaCommon/python/CFElements.py b/Control/AthenaCommon/python/CFElements.py
index baa105312be9803c8105e05f5a0d016b50d489d9..f8c593ff7955c68d385794ea392f371bf511cd83 100755
--- a/Control/AthenaCommon/python/CFElements.py
+++ b/Control/AthenaCommon/python/CFElements.py
@@ -201,10 +201,10 @@ def flatAlgorithmSequences( start ):
if isSequence( c ):
__inner( c, collector )
- from collections import defaultdict
+ from collections import defaultdict,OrderedDict
c = defaultdict(list)
__inner(start, c)
- return c
+ return OrderedDict(c)
def flatSequencers( start, algsCollection=None ):
""" Returns dict of sequences keyed by name and containing list of it's members """
diff --git a/Control/AthenaCommon/share/Execution.py b/Control/AthenaCommon/share/Execution.py
index 03751374fd8fe08ffe58c14d088cf85bd80edfbc..032a68539d2392496361244105842c9fcdb6683e 100644
--- a/Control/AthenaCommon/share/Execution.py
+++ b/Control/AthenaCommon/share/Execution.py
@@ -46,6 +46,13 @@ for script in opts.scripts:
else:
## only get here if all scripts successfully included
+ if "-h" in opts.user_opts or "--help" in opts.user_opts:
+ # The user script was displaying help messages stop here
+ # In most cases, the user script should kill the process already (argparse
+ # does this for you) but just in case print our help message and stop
+ from AthenaCommon.AthOptionsParser import _error_msg
+ print(_error_msg)
+ theApp.exit()
## load from .pkl file if given
if opts.fromdb:
diff --git a/Control/AthenaCommon/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
index 5b5ae6824a7ce8f8a9390da74e5a31d04d96fe84..85531f8c0cd6eee4e3adfa7f3dab25ffe93cbdd7 100644
--- a/Control/AthenaCommon/share/GenerateBootstrapTest.ref
+++ b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
@@ -1,16 +1,14 @@
Willing to acquire file bootstrap.pkl from
-/afs/cern.ch/work/s/smh/ol_reggie/bld/x86_64-centos7-gcc8-opt/share/bootstrap.pkl
+/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-dbg/x86_64-centos7-gcc8-dbg/share/bootstrap.pkl
copy bootstrap.pkl
... Read 2 items from python pickle file: bootstrap.pkl
... Read 2 items from python pickle file: bootstrap_test.pkl
-Given list of size 0. Not looking for differences.
Step 1: reference file #components: 27
Step 2: file to check #components: 27
Willing to acquire file bootstrap_threaded.pkl from
-/afs/cern.ch/work/s/smh/ol_reggie/bld/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl
+/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-dbg/x86_64-centos7-gcc8-dbg/share/bootstrap_threaded.pkl
copy bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded_test.pkl
-Given list of size 0. Not looking for differences.
Step 1: reference file #components: 33
Step 2: file to check #components: 33
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 2d09407b2e9d01c28e484f149a88f1fedfca05ad..89cfa2833b86440ec8d4a6331742b92ed4c696ae 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -30,6 +30,7 @@ def _createCfgFlags():
acf.addFlag('Input.SecondaryFiles', []) # secondary input files for DoubleEventSelector
acf.addFlag('Input.isMC', lambda prevFlags : "IS_SIMULATION" in GetFileMD(prevFlags.Input.Files).get("eventTypes",[]) ) # former global.isMC
acf.addFlag('Input.RunNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("runNumbers",[]))) # former global.RunNumber
+ acf.addFlag('Input.LumiBlockNumber', lambda prevFlags : list(GetFileMD(prevFlags.Input.Files).get("lumiBlockNumbers",[]))) # former global.RunNumber
acf.addFlag('Input.ProjectName', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("project_name","data17_13TeV") ) # former global.ProjectName
acf.addFlag('Input.Format', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("file_type","") ) # former global.InputFormat
@@ -167,7 +168,12 @@ def _createCfgFlags():
def __indet():
from InDetConfig.InDetConfigFlags import createInDetConfigFlags
return createInDetConfigFlags()
- _addFlagsCategory(acf, "InDet", __indet, 'InDetConfig' )
+ _addFlagsCategory(acf, "InDet", __indet, 'InDetConfig' )
+
+ def __itk():
+ from InDetConfig.ITkConfigFlags import createITkConfigFlags
+ return createITkConfigFlags()
+ _addFlagsCategory(acf, "ITk", __itk, 'InDetConfig' )
def __muon():
from MuonConfig.MuonConfigFlags import createMuonConfigFlags
diff --git a/Control/AthenaConfiguration/python/GeoModelConfigFlags.py b/Control/AthenaConfiguration/python/GeoModelConfigFlags.py
index 53fea8c5945ff2f91eaf28805dcc695a22bf0a00..077dde3dfd56635d44c254c140d5d5cbea41733c 100644
--- a/Control/AthenaConfiguration/python/GeoModelConfigFlags.py
+++ b/Control/AthenaConfiguration/python/GeoModelConfigFlags.py
@@ -6,7 +6,7 @@ from AthenaConfiguration.AutoConfigFlags import GetFileMD, GetDetDescrInfo
def createGeoModelConfigFlags():
gcf=AthConfigFlags()
gcf.addFlag('GeoModel.Layout', 'atlas') # replaces global.GeoLayout
- gcf.addFlag("GeoModel.AtlasVersion", lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("GeoAtlas",None) or "ATLAS-R2-2016-01-00-01") #
+ gcf.addFlag("GeoModel.AtlasVersion", lambda prevFlags : (prevFlags.Input.Files and prevFlags.Input.Files != ["_ATHENA_GENERIC_INPUTFILE_NAME_"] and GetFileMD(prevFlags.Input.Files).get("GeoAtlas",None)) or "ATLAS-R2-2016-01-00-01") #
gcf.addFlag("GeoModel.Align.Dynamic", lambda prevFlags : (not prevFlags.Detector.Simulate and not prevFlags.Input.isMC))
gcf.addFlag("GeoModel.StripGeoType", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('StripGeoType',"GMX")) # Based on CommonGeometryFlags.StripGeoType
gcf.addFlag("GeoModel.Run", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('Run',"RUN2")) # Based on CommonGeometryFlags.Run (InDetGeometryFlags.isSLHC replaced by GeoModel.Run=="RUN4")
diff --git a/Control/AthenaConfiguration/python/MainServicesConfig.py b/Control/AthenaConfiguration/python/MainServicesConfig.py
index 0b8a8eba503825d897449e9d945a2ea6b6fce4ad..5ae6073308f84590b110fb94489074c4eecce72c 100644
--- a/Control/AthenaConfiguration/python/MainServicesConfig.py
+++ b/Control/AthenaConfiguration/python/MainServicesConfig.py
@@ -77,10 +77,6 @@ def MainServicesCfg(cfgFlags):
cfg.addService(StoreGateSvc("DetectorStore"))
cfg.addService(StoreGateSvc("HistoryStore"))
cfg.addService(StoreGateSvc("ConditionStore"))
-
- from AtlasGeoModel.GeoModelConfig import GeoModelCfg
- cfg.merge( GeoModelCfg(cfgFlags) )
- cfg.addService(CompFactory.DetDescrCnvSvc(), create=True)
cfg.addService(CompFactory.CoreDumpSvc(), create=True)
cfg.setAppProperty('InitializationLoopCheck',False)
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index b1a35018220897d10b13123bb6c595c598f7d4f3..efc9307840e715e73f1b4f9a55ac6dfca47754ac 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -11,6 +11,16 @@ class defaultTestFiles(object):
HITS= [d + "/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"]
HITS_SPECIAL = [d + "/DigitizationTests/mc16_13TeV.HITS.16965029._000024.pool.root.1"]
HITS_DATA_OVERLAY = [d + "/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.OverlaySim/HITS.pool.root"]
+ HITS_MINBIAS_HIGH = [
+ d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000005.pool.root.1",
+ d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000013.pool.root.1",
+ d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000018.pool.root.1",
+ ]
+ HITS_MINBIAS_LOW = [
+ d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000003.pool.root.1",
+ d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000024.pool.root.1",
+ d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000044.pool.root.1",
+ ]
RAW = [d + "/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
RAW_BKG = [d + "/OverlayMonitoringRTT/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1"]
RDO = [d + "/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root"]
diff --git a/Control/AthenaConfiguration/share/confTool.py b/Control/AthenaConfiguration/share/confTool.py
index 3ae4bc6447e583f6814285a2ff0e9d36428ea174..29534568ce180be9722c9301da2e2bdec4fc89c5 100755
--- a/Control/AthenaConfiguration/share/confTool.py
+++ b/Control/AthenaConfiguration/share/confTool.py
@@ -100,12 +100,15 @@ def main(args):
sys.exit("ERROR, can diff exactly two files at a time, got: %s" % args.file)
configRef = _loadSingleFile(args.file[0], args)
configChk = _loadSingleFile(args.file[1], args)
- for ref, chk in zip(configRef, configChk):
- if isinstance(ref, dict) and isinstance(chk, dict):
- _compareConfig(ref, chk, args)
- else:
- print("Given list of size %d. Not looking for differences." % len(ref))
-
+ flattenedRef = {}
+ flattenedChk = {}
+ for ref in configRef:
+ if isinstance(ref, dict):
+ flattenedRef.update(ref)
+ for chk in configChk:
+ if isinstance(chk, dict):
+ flattenedChk.update(chk)
+ _compareConfig(flattenedRef, flattenedChk, args)
def _loadSingleFile(fname, args):
conf = []
@@ -122,7 +125,7 @@ def _loadSingleFile(fname, args):
to_json[comp][name] = value
conf = [to_json, props[0], props[1]]
- elif isinstance(cfg, collections.defaultdict): # old configuration
+ elif isinstance(cfg, (collections.defaultdict, dict)): # old configuration
cfg.update(pickle.load(input_file))
conf.append(pickle.load(input_file))
conf.append(cfg)
diff --git a/Control/AthenaKernel/AthenaKernel/IMetaDataSvc.h b/Control/AthenaKernel/AthenaKernel/IMetaDataSvc.h
index bf81f6019be4a58f1906b467b20a6050295ec1c4..1c84d4cd5cb9afdbf503cac22e0fcde2eb2a6471 100644
--- a/Control/AthenaKernel/AthenaKernel/IMetaDataSvc.h
+++ b/Control/AthenaKernel/AthenaKernel/IMetaDataSvc.h
@@ -12,9 +12,11 @@
#include "GaudiKernel/INamedInterface.h"
#include "AthenaKernel/MetaCont.h"
+#include "StoreGate/StoreGateSvc.h"
#include <string>
#include <mutex>
+#include <typeinfo>
/** @class IMetaDataSvc
* @brief This class provides the interface for MetaDataSvc
@@ -56,6 +58,12 @@ public: // Non-static members
/// Gaudi boilerplate
static const InterfaceID& interfaceID();
+ /// Hook for implementation to react to recording an object
+ virtual void recordHook(const std::type_info&) {}
+
+ /// Hook for implementation to react to removing an object
+ virtual void removeHook(const std::type_info&) {}
+
private: // Data
std::mutex m_mutex;
};
@@ -99,7 +107,9 @@ StatusCode IMetaDataSvc::record(T* pObject, const TKEY& key)
if( !container ) {
auto cont_uptr = std::make_unique< MetaCont<T> >();
if( cont_uptr->insert( currentRangeID() , pObject) ) {
- return outputDataStore()->record( std::move(cont_uptr), key );
+ StatusCode sc = outputDataStore()->record( std::move(cont_uptr), key );
+ if (sc.isSuccess()) recordHook(typeid(T));
+ return sc;
}
return StatusCode::FAILURE;
}
@@ -112,6 +122,7 @@ template <typename T, typename TKEY>
StatusCode IMetaDataSvc::record(std::unique_ptr<T> pUnique, const TKEY& key)
{
if( this->record( pUnique.get(), key ).isSuccess() ) {
+ recordHook(typeid(T));
pUnique.release();
return StatusCode::SUCCESS;
}
@@ -126,6 +137,7 @@ StatusCode IMetaDataSvc::remove(const TKEY& key, bool ignoreIfAbsent)
std::lock_guard lock(m_mutex);
// change erase to setting nullptr?
MetaCont<T>* container = outputDataStore()->tryRetrieve< MetaCont<T> >(key);
+ removeHook(typeid(T));
if( container and container->erase( currentRangeID() ) ) return StatusCode::SUCCESS;
return ignoreIfAbsent? StatusCode::SUCCESS : StatusCode::FAILURE;
}
diff --git a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
index d9ec2bd41db2038b453cfe05fc3b9c2a34e2660a..227b9d99cb2dc10ddf8b990a9ee3ae36b13576dd 100644
--- a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
+++ b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
@@ -102,6 +102,8 @@ class AthMonitorCfgHelper(object):
tool -- a GenericMonitoringTool Configurable object. This can be used to define
histograms associated with that group (using defineHistogram).
'''
+ if name == alg.getName():
+ raise ValueError(f"Cannot have a monitoring group with the same name as the parent algorithm ({name})")
array = self.addArray([1],alg,name,topPath=topPath,defaultDuration=defaultDuration)
return array[0]
@@ -132,6 +134,7 @@ class AthMonitorCfgHelper(object):
pathToSet = self.inputFlags.DQ.FileKey+('/%s' % topPath if topPath else '')
array.broadcast('HistPath',pathToSet)
+ array.broadcast('UseCache',True)
# in the future, autodetect if we are online or not
array.broadcast('convention','OFFLINE')
array.broadcast('defaultDuration',defaultDuration)
@@ -271,6 +274,7 @@ class AthMonitorCfgHelperOld(object):
# Broadcast member values to each element of the array
array.broadcast('THistSvc',svcMgr.THistSvc)
array.broadcast('HistPath',pathToSet)
+ array.broadcast('UseCache',True)
array.broadcast('convention',conventionName)
array.broadcast('defaultDuration',defaultDuration)
alg.GMTools += array.toolList()
diff --git a/Control/AthenaMonitoring/python/AthenaMonitoringCfg.py b/Control/AthenaMonitoring/python/AthenaMonitoringCfg.py
index df758b81ca21c07a17fcfece931949079348c4e2..24d0eb08a4e7eeedc4b428f186d169d6222fc304 100644
--- a/Control/AthenaMonitoring/python/AthenaMonitoringCfg.py
+++ b/Control/AthenaMonitoring/python/AthenaMonitoringCfg.py
@@ -22,6 +22,11 @@ def AthenaMonitoringCfg(flags):
info('Set up TRT monitoring')
from TRTMonitoringRun3.TRTMonitoringRun3Config import TRTMonitoringRun3Cfg
result.merge(TRTMonitoringRun3Cfg(flags))
+
+ if flags.DQ.Steering.doInDetMon:
+ info('Set up InDet Global monitoring')
+ from InDetGlobalMonitoringRun3Test.InDetGlobalMonitoringRun3TestConfig import InDetGlobalMonitoringRun3TestConfig
+ result.merge(InDetGlobalMonitoringRun3TestConfig(flags))
if flags.DQ.Steering.doLArMon:
info('Set up LAr monitoring')
diff --git a/Control/AthenaMonitoring/python/DQConfigFlags.py b/Control/AthenaMonitoring/python/DQConfigFlags.py
index 08ce9be8d9a482e6a02983b8fe6450370481ebbb..603243c208641ce6213ef6106297242714f4b6a5 100644
--- a/Control/AthenaMonitoring/python/DQConfigFlags.py
+++ b/Control/AthenaMonitoring/python/DQConfigFlags.py
@@ -27,9 +27,11 @@ def createDQConfigFlags():
acf.addFlag('DQ.disableAtlasReadyFilter', False)
acf.addFlag('DQ.enableLumiAccess', True)
acf.addFlag('DQ.FileKey', 'CombinedMonitoring')
- from PyUtils.moduleExists import moduleExists
- hlt_exists = moduleExists ('TrigHLTMonitoring')
- acf.addFlag('DQ.useTrigger', hlt_exists)
+ # two flags here, with different meaning.
+ # triggerDataAvailable determines whether we expect trigger objects in the event store
+ acf.addFlag('DQ.triggerDataAvailable', True)
+ # useTrigger determines whether we should use TrigDecisionTool
+ acf.addFlag('DQ.useTrigger', getUseTrigger)
# temp thing for steering from inside old-style ...
acf.addFlag('DQ.isReallyOldStyle', False)
@@ -52,6 +54,11 @@ def createDQConfigFlags():
acf.join(createHLTDQConfigFlags())
return acf
+def getUseTrigger(flags):
+ from PyUtils.moduleExists import moduleExists
+ hlt_exists = moduleExists ('TrigHLTMonitoring')
+ return hlt_exists and flags.DQ.triggerDataAvailable
+
def getDataType(flags):
if flags.Input.isMC:
return 'monteCarlo'
diff --git a/Control/AthenaMonitoring/python/TriggerInterface.py b/Control/AthenaMonitoring/python/TriggerInterface.py
index fd3f07f7602a446944dbe3860840054998e8a7bf..66bd119289194eedd59f8aadef92a60352fae371 100644
--- a/Control/AthenaMonitoring/python/TriggerInterface.py
+++ b/Control/AthenaMonitoring/python/TriggerInterface.py
@@ -28,10 +28,10 @@ def getTrigDecisionTool(flags):
tdt = CompFactory.Trig.TrigDecisionTool('TrigDecisionTool')
tdt.TrigConfigSvc = cfgsvc
- if not flags.Input.isMC and flags.Input.Format == 'BS' and min(flags.Input.RunNumber) <= 380000:
+ if not flags.Input.isMC:
# need to work through exact details here
# tdt.UseOldEventInfoDecisionFormat = True
- tdt.NavigationFormat = "TrigComposite"
+ tdt.NavigationFormat = "TrigComposite" if flags.Trigger.EDMDecodingVersion == 3 else "TriggerElement"
else:
tdt.NavigationFormat = "TrigComposite" if 'HLTNav_Summary' in flags.Input.Collections else "TriggerElement"
rv.addPublicTool(tdt)
diff --git a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
index dfb1421e91687d48958a416b526e9f08206f5661..622d300eeb240f2ebf16be4a56acb00f4cbcdac1 100644
--- a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
@@ -66,7 +66,8 @@ else:
local_logger.warning("invalid DQMonFlags.monType: %s, using default monManEnvironment", DQMonFlags.monType())
# the meaning of this flag has changed in MT
-if rec.doTrigger() == False and not (TriggerFlags.doMT() and DQMonFlags.monManEnvironment=='tier0ESD'):
+if (rec.doTrigger() == False and
+ not (TriggerFlags.doMT() and DQMonFlags.monManEnvironment=='tier0ESD' and DQMonFlags.useTrigger())):
DQMonFlags.useTrigger=False # steers trigger-awareness
DQMonFlags.doLVL1CaloMon=False
DQMonFlags.doCTPMon=False
diff --git a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
index fababdb80e0ae6fe17a8818461bce12acbb8cc90..b5c2e04adbe7dacb7699327c4cc66f0752cd64c5 100644
--- a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
@@ -341,6 +341,7 @@ if DQMonFlags.doMonitoring():
ConfigFlags.DQ.FileKey=DQMonFlags.monManFileKey()
ConfigFlags.DQ.Environment=DQMonFlags.monManEnvironment()
ConfigFlags.DQ.useTrigger=DQMonFlags.useTrigger()
+ ConfigFlags.DQ.triggerDataAvailable=DQMonFlags.useTrigger()
ConfigFlags.IOVDb.GlobalTag=globalflags.ConditionsTag()
ConfigFlags.DQ.isReallyOldStyle=False
@@ -357,6 +358,7 @@ if DQMonFlags.doMonitoring():
Steering.doPixelMon=DQMonFlags.doPixelMon()
Steering.doSCTMon=DQMonFlags.doSCTMon()
Steering.doTRTMon=DQMonFlags.doTRTMon()
+ Steering.doInDetMon=DQMonFlags.doInDetGlobalMon()
Steering.doLArMon=DQMonFlags.doLArMon()
Steering.doTileMon=DQMonFlags.doTileMon()
Steering.doCaloGlobalMon=DQMonFlags.doCaloMon()
diff --git a/Control/AthenaMonitoring/share/Run3DQTestingDriver.py b/Control/AthenaMonitoring/share/Run3DQTestingDriver.py
index fc30f1f78ab8d0694d5923bdac761ce78c64f63b..30f6de92cb2dd569d34a6744149d52ff2f16f9e6 100755
--- a/Control/AthenaMonitoring/share/Run3DQTestingDriver.py
+++ b/Control/AthenaMonitoring/share/Run3DQTestingDriver.py
@@ -27,6 +27,10 @@ if __name__=='__main__':
help='Maximum number of events to process (alias for --evtMax)')
parser.add_argument('--printDetailedConfig', action='store_true',
help='Print detailed Athena configuration')
+ parser.add_argument('--threads', type=int, default=0,
+ help='Number of threads/concurrent events')
+ parser.add_argument('--perfmon', action='store_true',
+ help='Run perfmon')
args, _ = parser.parse_known_args()
# Setup the Run III behavior
@@ -38,6 +42,10 @@ if __name__=='__main__':
from AthenaCommon.Constants import *
log.setLevel(INFO)
+ # set threads
+ ConfigFlags.Concurrency.NumThreads=args.threads
+ ConfigFlags.Concurrency.NumConcurrentEvents=args.threads
+
# Set the Athena configuration flags
from AthenaConfiguration.AutoConfigFlags import GetFileMD
@@ -68,6 +76,10 @@ if __name__=='__main__':
ConfigFlags.DQ.Environment)
log.warning('Will proceed but best guess is this is an error')
+ # perfmon
+ if args.perfmon:
+ ConfigFlags.PerfMon.doFullMonMT=True
+
if args.preExec:
# bring things into scope
from AthenaMonitoring.DQConfigFlags import allSteeringFlagsOff
@@ -97,6 +109,16 @@ if __name__=='__main__':
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg = MainServicesCfg(ConfigFlags)
+ # add FPE auditor
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ cfg.addService(CompFactory.AuditorSvc(Auditors=[CompFactory.FPEAuditor().getFullJobOptName()]))
+
+ # add perfmon
+ if args.perfmon:
+ from PerfMonComps.PerfMonCompsConfig import PerfMonMTSvcCfg
+ cfg.merge(PerfMonMTSvcCfg(ConfigFlags))
+
+
if isReadingRaw:
# attempt to start setting up reco ...
from CaloRec.CaloRecoConfig import CaloRecoCfg
@@ -111,7 +133,6 @@ if __name__=='__main__':
# Force loading of conditions in MT mode
if ConfigFlags.Concurrency.NumThreads > 0:
- from AthenaConfiguration.ComponentFactory import CompFactory
if len([_ for _ in cfg._conditionsAlgs if _.name=="PixelDetectorElementCondAlg"]) > 0:
beginseq = cfg.getSequence("AthBeginSeq")
beginseq.Members.append(CompFactory.ForceIDConditionsAlg("ForceIDConditionsAlg"))
diff --git a/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx b/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
index 10e3b70046ea790a924a114f6908f417c1c669a7..5fba3f9c633c1ea639a7ab56c71bd706fcb19dc6 100644
--- a/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
+++ b/Control/AthenaMonitoring/src/ManagedMonitorToolBase.cxx
@@ -756,7 +756,7 @@ initialize()
if (joSvc->has(name))
var = joSvc->get(name);
else
- ATH_MSG_ERROR("Cannot read " << name);
+ ATH_MSG_DEBUG("Cannot read " << name); // on purpose not an ERROR (will be set by setMonManager)
};
getProp( m_fileKey, client + ".FileKey");
getProp( m_dataTypeStr, client + ".DataType");
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
index 171b265f584bd8237e0490030eaae84bda1e325f..985cc5ca7d3c748c29087e4a63e47de3188b00e6 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger.sh
@@ -6,7 +6,7 @@
# art-output: ExampleMonitorOutput.root
# art-output: log*
-art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_mt1_grid.py
+art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_v1Dev_grid.py
AODFILE=(./ref-*/AOD.pool.root)
Run3DQTestingDriver.py 'Input.Files=["'${AODFILE}'"]' DQ.Steering.doHLTMon=True DQ.Environment=AOD --dqOffByDefault > log.HIST_Creation 2>&1
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
index 26a81ffdfb3dae7c5f1dd31d015bfa7608718b07..f57f8a44ac64e8668e848a324d107ded103256d4 100755
--- a/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_aod_trigger_mt.sh
@@ -6,7 +6,7 @@
# art-output: ExampleMonitorOutput.root
# art-output: log*
-art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_mt1_grid.py
+art.py download TrigAnalysisTest test_trigAna_RDOtoAOD_v1Dev_grid.py
AODFILE=(./ref-*/AOD.pool.root)
Run3DQTestingDriver.py 'Input.Files=["'${AODFILE}'"]' DQ.Steering.doHLTMon=True DQ.Environment=AOD Concurrency.NumThreads=1 Concurrency.NumConcurrentEvents=1 --dqOffByDefault > log.HIST_Creation 2>&1
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d6653eca3c38cd7347604389111115b12f69f95e
--- /dev/null
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# art-description: new DQ in Reco_tf, two-step, data q431
+# art-type: grid
+# art-memory: 3072
+# art-include: master/Athena
+# art-output: myHIST.root
+# art-output: log*
+
+Reco_tf.py --athenaopts='--threads=1' --AMI=q431 --preExec="DQMonFlags.doNewMonitoring=True;DQMonFlags.doHLTMon=False" > log.HIST_Creation 2>&1
+
+echo "art-result: $? HIST_Creation"
+rm -rf ref-*
+
+ArtPackage=$1
+ArtJobName=$2
+art.py download ${ArtPackage} ${ArtJobName}
+REFFILE=(./ref-*/myHIST.root)
+hist_diff.sh myHIST.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1
+echo "art-result: $? HIST_Diff"
diff --git a/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall.sh b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall.sh
new file mode 100755
index 0000000000000000000000000000000000000000..958d3a3b3a65d78d13cfd4e87ed1695bdf848f2c
--- /dev/null
+++ b/Control/AthenaMonitoring/test/test_run3dq_r22_recotf_rawtoall.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# art-description: new DQ in Reco_tf, RAWtoALL, data q431
+# art-type: grid
+# art-memory: 4096
+# art-include: master/Athena
+# art-output: myHIST.root
+# art-output: log*
+
+Reco_tf.py --athenaopts='--threads=1' --AMI=q431 --preExec="DQMonFlags.doNewMonitoring=True;DQMonFlags.doHLTMon=False" --steering doRAWtoALL > log.HIST_Creation 2>&1
+
+echo "art-result: $? HIST_Creation"
+rm -rf ref-*
+
+ArtPackage=$1
+ArtJobName=$2
+art.py download ${ArtPackage} ${ArtJobName}
+REFFILE=(./ref-*/myHIST.root)
+hist_diff.sh myHIST.root $REFFILE -x TIME_execute -i > log.HIST_Diff 2>&1
+echo "art-result: $? HIST_Diff"
diff --git a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h
index 8deb6504183a603cb0a8ef3518b2a4cb3aacd674..b152e39e4b5b91f525e46da4f454deb27e3bc8cb 100644
--- a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h
+++ b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h
@@ -80,10 +80,12 @@ private:
Gaudi::Property<std::vector<std::string> > m_histograms { this, "Histograms", {}, "Definitions of histograms"};
Gaudi::Property<bool> m_explicitBooking { this, "ExplicitBooking", false, "Do not create histograms automatically in initialize but wait until the method book is called." };
Gaudi::Property<bool> m_failOnEmpty { this, "FailOnEmpty", true, "Fail in initialize() if no histograms defined" };
+ BooleanProperty m_useCache { this, "UseCache", true, "Cache filler lookups" };
std::vector<std::shared_ptr<Monitored::HistogramFiller>> m_fillers; //!< plain list of fillers
mutable std::mutex m_fillMutex;
mutable Monitored::HistogramFiller::VariablesPack m_vars ATLAS_THREAD_SAFE;
+ mutable std::map<std::vector<std::string>,std::vector<std::shared_ptr<Monitored::HistogramFiller>>,std::less<>> m_fillerCacheMap ATLAS_THREAD_SAFE; //!< lookup map to speed up filler searches
};
/**
diff --git a/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx b/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx
index 3431c7a2138ef45c0ffab32d45a2e0e0a9646064..ea0575f4a1001711d7f6385c6380f569f6451e2e 100644
--- a/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx
+++ b/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx
@@ -100,70 +100,127 @@ namespace Monitored {
}
}
+namespace std {
+ // Next four functions are for speeding up lookups in the the caching of invokeFillers
+ // They allow us to directly compare keys of the cache std::map
+ // with vectors of IMonitoredVariables, avoiding memory allocations
+ // these compare strings and IMonitoredVariables
+ bool operator<(const std::string& a, const std::reference_wrapper<Monitored::IMonitoredVariable>& b) {
+ return a < b.get().name();
+ }
+ bool operator<(const std::reference_wrapper<Monitored::IMonitoredVariable>& a, const std::string& b) {
+ return a.get().name() < b;
+ }
+
+ // lexicographical comparison of cache map items and vector of IMonitoredVariables
+ bool operator<(const std::vector<std::string>& lhs,
+ const std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>>& rhs) {
+ return std::lexicographical_compare(lhs.begin(), lhs.end(),
+ rhs.begin(), rhs.end());
+ }
+ bool operator<(const std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>>& lhs,
+ const std::vector<std::string>& rhs) {
+ return std::lexicographical_compare(lhs.begin(), lhs.end(),
+ rhs.begin(), rhs.end());
+ }
+}
void GenericMonitoringTool::invokeFillers(const std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>>& monitoredVariables) const {
std::scoped_lock guard(m_fillMutex);
- for ( auto filler: m_fillers ) {
+ // This is the list of fillers to consider in the invocation.
+ // If we are using the cache then this may be a proper subset of m_fillers; otherwise will just be m_fillers
+ const std::vector<std::shared_ptr<Monitored::HistogramFiller>>* fillerList{nullptr};
+ // do we need to update the cache?
+ bool makeCache = false;
+ // list of matched fillers, if we need to update the cache
+ std::vector<std::shared_ptr<Monitored::HistogramFiller>> matchedFillerList;
+ if (m_useCache) {
+ const auto match = m_fillerCacheMap.find(monitoredVariables);
+ if (match != m_fillerCacheMap.end()) {
+ fillerList = &(match->second);
+ } else {
+ fillerList = &m_fillers;
+ makeCache = true;
+ }
+ } else {
+ fillerList = &m_fillers;
+ }
+ for ( auto filler: *fillerList ) {
m_vars.reset();
const int fillerCardinality = filler->histogramVariablesNames().size() + (filler->histogramWeightName().empty() ? 0: 1) + (filler->histogramCutMaskName().empty() ? 0 : 1);
if ( fillerCardinality == 1 ) { // simplest case, optimising this to be super fast
for ( auto& var: monitoredVariables ) {
if ( var.get().name().compare( filler->histogramVariablesNames()[0] ) == 0 ) {
- m_vars.var[0] = &var.get();
+ m_vars.var[0] = &var.get();
filler->fill( m_vars );
+ if (makeCache) {
+ matchedFillerList.push_back(filler);
+ }
break;
}
}
} else { // a more complicated case, and cuts or weights
int matchesCount = 0;
for ( const auto& var: monitoredVariables ) {
- bool matched = false;
- for ( unsigned fillerVarIndex = 0; fillerVarIndex < filler->histogramVariablesNames().size(); ++fillerVarIndex ) {
- if ( var.get().name().compare( filler->histogramVariablesNames()[fillerVarIndex] ) == 0 ) {
- m_vars.set(fillerVarIndex, &var.get());
- matched = true;
- matchesCount++;
- break;
- }
- }
- if ( matchesCount == fillerCardinality ) break;
- if ( not matched ) { // may be a weight or cut variable still
- if ( var.get().name().compare( filler->histogramWeightName() ) == 0 ) {
- m_vars.weight = &var.get();
- matchesCount ++;
- } else if ( var.get().name().compare( filler->histogramCutMaskName() ) == 0 ) {
- m_vars.cut = &var.get();
- matchesCount++;
- }
- }
- if ( matchesCount == fillerCardinality ) break;
+ bool matched = false;
+ for ( unsigned fillerVarIndex = 0; fillerVarIndex < filler->histogramVariablesNames().size(); ++fillerVarIndex ) {
+ if ( var.get().name().compare( filler->histogramVariablesNames()[fillerVarIndex] ) == 0 ) {
+ m_vars.set(fillerVarIndex, &var.get());
+ matched = true;
+ matchesCount++;
+ break;
+ }
+ }
+ if ( matchesCount == fillerCardinality ) break;
+ if ( not matched ) { // may be a weight or cut variable still
+ if ( var.get().name().compare( filler->histogramWeightName() ) == 0 ) {
+ m_vars.weight = &var.get();
+ matchesCount ++;
+ } else if ( var.get().name().compare( filler->histogramCutMaskName() ) == 0 ) {
+ m_vars.cut = &var.get();
+ matchesCount++;
+ }
+ }
+ if ( matchesCount == fillerCardinality ) break;
}
if ( matchesCount == fillerCardinality ) {
- filler->fill( m_vars );
+ filler->fill( m_vars );
+ if (makeCache) {
+ matchedFillerList.push_back(filler);
+ }
} else if ( ATH_UNLIKELY( matchesCount != 0 ) ) { // something has matched, but not all, worth informing user
- bool reasonFound = false;
- if (ATH_UNLIKELY(!filler->histogramWeightName().empty() && !m_vars.weight)) {
- reasonFound = true;
- ATH_MSG_DEBUG("Filler weight not found in monitoredVariables:"
- << "\n Filler weight : " << filler->histogramWeightName()
- << "\n Asked to fill from mon. vars: " << monitoredVariables);
- }
- if (ATH_UNLIKELY(!filler->histogramCutMaskName().empty() && !m_vars.cut)) {
- reasonFound = true;
- ATH_MSG_DEBUG("Filler cut mask not found in monitoredVariables:"
- << "\n Filler cut mask : " << filler->histogramCutMaskName()
- << "\n Asked to fill from mon. vars: " << monitoredVariables);
- }
- if ( not reasonFound ) {
- ATH_MSG_DEBUG("Filler has different variables than monitoredVariables:"
- << "\n Filler variables : " << filler->histogramVariablesNames()
- << "\n Asked to fill from mon. vars: " << monitoredVariables
- << "\n Selected monitored variables: " << m_vars.names() );
- }
+ bool reasonFound = false;
+ if (ATH_UNLIKELY(!filler->histogramWeightName().empty() && !m_vars.weight)) {
+ reasonFound = true;
+ ATH_MSG_DEBUG("Filler weight not found in monitoredVariables:"
+ << "\n Filler weight : " << filler->histogramWeightName()
+ << "\n Asked to fill from mon. vars: " << monitoredVariables);
+ }
+ if (ATH_UNLIKELY(!filler->histogramCutMaskName().empty() && !m_vars.cut)) {
+ reasonFound = true;
+ ATH_MSG_DEBUG("Filler cut mask not found in monitoredVariables:"
+ << "\n Filler cut mask : " << filler->histogramCutMaskName()
+ << "\n Asked to fill from mon. vars: " << monitoredVariables);
+ }
+ if ( not reasonFound ) {
+ ATH_MSG_DEBUG("Filler has different variables than monitoredVariables:"
+ << "\n Filler variables : " << filler->histogramVariablesNames()
+ << "\n Asked to fill from mon. vars: " << monitoredVariables
+ << "\n Selected monitored variables: " << m_vars.names() );
+ }
}
}
}
+
+ if (makeCache) {
+ std::vector<std::string> key;
+ key.reserve(monitoredVariables.size());
+ for (const auto& mv : monitoredVariables) {
+ key.push_back(mv.get().name());
+ }
+ m_fillerCacheMap[key] = matchedFillerList;
+ }
}
uint32_t GenericMonitoringTool::runNumber() {
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
index 07f5bdf52af566b1c2eda5ca002e2b51a67aadc4..44737932c44bd9e459cbd6a3d5f7a7870c0562af 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
@@ -59,7 +59,6 @@ namespace Monitored {
++idx; continue;
}
TBranch* branch = static_cast<TBranch*>(branchList->At(idxgood));
- std::cout << "Calling filler function for var : " << vars.var[idx]->name() << " branch " << branch->GetName() << "\n";
m_fillerFunctions[idx](branch, *vars.var[idx]);
++idx; ++idxgood;
}
diff --git a/Control/AthenaPython/python/FilePeekerLib.py b/Control/AthenaPython/python/FilePeekerLib.py
index 8862a188bbcd1f85bb15c7bf4c532a5d2b3e783e..41a0f4f7a2e20a980d5ce8b785b89df4adfb3bf7 100644
--- a/Control/AthenaPython/python/FilePeekerLib.py
+++ b/Control/AthenaPython/python/FilePeekerLib.py
@@ -231,7 +231,7 @@ class FilePeeker(PyAthena.Alg):
spec = a.specification()
a_type = spec.typeName()
if a_type.find('string') >= 0:
- a_data = a.data('string')()
+ a_data = a.data['string']()
try:
a_data = eval(a_data,{},{})
except Exception:
diff --git a/Control/AthenaServices/share/AthenaOutputStream_test.ref b/Control/AthenaServices/share/AthenaOutputStream_test.ref
index 77fc1b609ceb35cb2b75de202581443fed081b27..e244ec7ae167102dda8b4bb8ddb751ba466400b5 100644
--- a/Control/AthenaServices/share/AthenaOutputStream_test.ref
+++ b/Control/AthenaServices/share/AthenaOutputStream_test.ref
@@ -1,8 +1,8 @@
*** AthenaOutputStream_test starts ***
-Initializing Gaudi ApplicationMgr using job opts /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
-JobOptionsSvc INFO # =======> /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
+Initializing Gaudi ApplicationMgr using job opts /home/atlas/athena/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
+JobOptionsSvc INFO # =======> /home/atlas/athena/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
JobOptionsSvc INFO # (5,1): MessageSvc.OutputLevel = 2
JobOptionsSvc INFO # (6,1): StoreGateSvc.OutputLevel = 2
JobOptionsSvc INFO # (8,1): AthenaOutputStream.OutputLevel = 1
@@ -12,13 +12,13 @@ JobOptionsSvc INFO # (21,1): AthenaOutputStream.CompressionListHigh = ["B
JobOptionsSvc INFO # (22,1): AthenaOutputStream.CompressionBitsLow = 16
JobOptionsSvc INFO # (23,1): AthenaOutputStream.CompressionListLow = ["BazAuxContainer#compAux.zzz"]
JobOptionsSvc INFO # (25,1): AthenaOutputStream.AcceptAlgs = ["AthenaOutputStream", "aSFQS"]
-JobOptionsSvc INFO Job options successfully read in from /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
+JobOptionsSvc INFO Job options successfully read in from /home/atlas/athena/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
MessageSvc DEBUG Service base class initialized successfully
ApplicationMgr DEBUG Getting my own properties
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on atpc002 on Fri Aug 7 15:13:36 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on 93d7764165d7 on Fri Sep 11 10:18:05 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
ServiceManager DEBUG Initializing service AppMgrRunable
@@ -39,20 +39,20 @@ ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
ClassIDSvc DEBUG Service base class initialized successfully
IncidentSvc DEBUG Adding [ModuleLoaded] listener 'ClassIDSvc' with priority 100
-ClassIDSvc INFO getRegistryEntries: read 1581 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1596 CLIDRegistry entries for module ALL
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <B1> for CLID 8111: Known name for this ID <Baz> It was set by AthenaServices-00-00-00
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <D1> for CLID 8112: Known name for this ID <BazAuxContainer> It was set by AthenaServices-00-00-00
-ClassIDSvc DEBUG processCLIDDB: read 1747 entries from CLIDDB file: /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/share/clid.db
+ClassIDSvc DEBUG processCLIDDB: read 1757 entries from CLIDDB file: /home/atlas/athena/build/x86_64-centos7-gcc8-opt/share/clid.db
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <B1> for CLID 8111: Known name for this ID <Baz> It was set by AthenaServices-00-00-00
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <D1> for CLID 8112: Known name for this ID <BazAuxContainer> It was set by AthenaServices-00-00-00
-ClassIDSvc DEBUG processCLIDDB: read 1746 entries from CLIDDB file: /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/clid.db
+ClassIDSvc DEBUG processCLIDDB: read 1757 entries from CLIDDB file: /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-09-10T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/clid.db
StoreGateSvc DEBUG Service base class initialized successfully
StoreGateSvc DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl
StoreGateSvc_Impl DEBUG Service base class initialized successfully
ProxyProviderSvc DEBUG Service base class initialized successfully
IncidentSvc DEBUG Adding [EndEvent] listener 'StoreGateSvc' with priority 100
IncidentSvc DEBUG Adding [BeginEvent] listener 'StoreGateSvc' with priority 100
-ClassIDSvc INFO getRegistryEntries: read 2389 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2375 CLIDRegistry entries for module ALL
AthenaOutputStream DEBUG Property update for OutputLevel : new value = 1
ToolSvc DEBUG Service base class initialized successfully
AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
@@ -92,21 +92,14 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc DEBUG Service base class initialized successfully
-DBReplicaSvc DEBUG HOSTNAME atpc002 has no domain - try hostname --fqdn
-DBReplicaSvc DEBUG HOSTNAME from fqdn: atpc002.dyndns.cern.ch
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc DEBUG Candidate server ATLF (priority -2700)
-DBReplicaSvc DEBUG Candidate server ATLAS_COOLPROD (priority -695)
-DBReplicaSvc DEBUG Candidate server atlas_dd (priority -690)
-DBReplicaSvc DEBUG Candidate server ATLAS_CONFIG (priority -685)
-DBReplicaSvc DEBUG Candidate server INT8R (priority -680)
-DBReplicaSvc DEBUG Candidate server INTR (priority -675)
-DBReplicaSvc DEBUG Candidate server ATONR_COOL (priority -670)
-DBReplicaSvc DEBUG Candidate server ATONR_CONF (priority -665)
-DBReplicaSvc DEBUG Candidate server DEVDB11 (priority -660)
-DBReplicaSvc DEBUG Candidate server ATLF (priority -2200)
-DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc DEBUG HOSTNAME 93d7764165d7 has no domain - try hostname --fqdn
+DBReplicaSvc DEBUG HOSTNAME from fqdn: 93d7764165d7
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-09-10T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc DEBUG Candidate server ATLF (priority -2000)
+DBReplicaSvc DEBUG Candidate server atlas_dd (priority 5)
+DBReplicaSvc INFO Total of 2 servers found for host 93d7764165d7 [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -139,43 +132,43 @@ AthenaOutputStream DEBUG Data Deps for AthenaOutputStream
+ INPUT IGNORED ( 'AthenaAttributeList' , '' )
+ OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_AthenaOutputStream' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_AthenaOutputStream' )
-StoreGateSvc DEBUG Recorded object @0x667f4c0 with key uno of type Foo(CLID 8101)
- in DataObject @0x667f6b0
+StoreGateSvc DEBUG Recorded object @0x5647790 with key uno of type Foo(CLID 8101)
+ in DataObject @0x5647980
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x667fc50 with key due of type Foo(CLID 8101)
- in DataObject @0x667fe00
+StoreGateSvc DEBUG Recorded object @0x5647f50 with key due of type Foo(CLID 8101)
+ in DataObject @0x5648190
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x667fbd0 with key uno of type Bar(CLID 8107)
- in DataObject @0x66800d0
+StoreGateSvc DEBUG Recorded object @0x5647f30 with key uno of type Bar(CLID 8107)
+ in DataObject @0x5648460
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x667fbb0 with key due of type Bar(CLID 8107)
- in DataObject @0x6680400
+StoreGateSvc DEBUG Recorded object @0x5647f10 with key due of type Bar(CLID 8107)
+ in DataObject @0x5648760
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x6680790 with key quattro of type Bar(CLID 8107)
- in DataObject @0x6680700
+StoreGateSvc DEBUG Recorded object @0x5648ac0 with key quattro of type Bar(CLID 8107)
+ in DataObject @0x5648a30
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x6680b80 with key cinque of type Bar(CLID 8107)
- in DataObject @0x6680ad0
+StoreGateSvc DEBUG Recorded object @0x5648eb0 with key cinque of type Bar(CLID 8107)
+ in DataObject @0x5648e00
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x6681120 with key sei of type Baz(CLID 8111)
- in DataObject @0x6687a40
+StoreGateSvc DEBUG Recorded object @0x56493f0 with key sei of type Baz(CLID 8111)
+ in DataObject @0x5647ce0
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x6681150 with key seiAux. of type BazAuxContainer(CLID 8112)
- in DataObject @0x667f960
+StoreGateSvc DEBUG Recorded object @0x5649420 with key seiAux. of type BazAuxContainer(CLID 8112)
+ in DataObject @0x564ff30
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x66881a0 with key comp of type Baz(CLID 8111)
- in DataObject @0x2767290
+StoreGateSvc DEBUG Recorded object @0x5650810 with key comp of type Baz(CLID 8111)
+ in DataObject @0x5657240
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x6688710 with key compAux. of type BazAuxContainer(CLID 8112)
- in DataObject @0x6689530
+StoreGateSvc DEBUG Recorded object @0x5650840 with key compAux. of type BazAuxContainer(CLID 8112)
+ in DataObject @0x56576d0
object modifiable when retrieved
-ClassIDSvc INFO getRegistryEntries: read 714 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 727 CLIDRegistry entries for module ALL
AthenaOutputStr...WARNING add: can not find clid 13 in clid db
AthenaOutputStream DEBUG addItemObjects(13,"*") called
AthenaOutputStream DEBUG Key:*
AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc DEBUG Service base class initialized successfully
InputMetaDataStore DEBUG Service base class initialized successfully
@@ -197,19 +190,22 @@ IncidentSvc DEBUG Adding [BeginInputFile] listener 'MetaDataSvc' with pr
IncidentSvc DEBUG Adding [EndInputFile] listener 'MetaDataSvc' with priority 10
IoComponentMgr DEBUG --> io_register(MetaDataSvc)
IoComponentMgr DEBUG registering IoComponent "MetaDataSvc"
+MetaDataSvc DEBUG Not translating metadata item ID #13
AthenaOutputStream DEBUG Failed to receive proxy iterators from StoreGate for 13,"*". Skipping
AthenaOutputStream DEBUG addItemObjects(8101,"*") called
AthenaOutputStream DEBUG Key:*
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8101
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], *, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [, ], *, *)
AthenaOutputStream DEBUG Added object 8101,"due"
AthenaOutputStream DEBUG Added object 8101,"uno"
AthenaOutputStream DEBUG addItemObjects(8107,"due") called
AthenaOutputStream DEBUG Key:due
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8107
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], due, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [due], due, *)
AthenaOutputStreamVERBOSE Calling matchKey( [due], cinque)
@@ -224,8 +220,9 @@ AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [due], uno) with result: 0
AthenaOutputStream DEBUG addItemObjects(8107,"tre") called
AthenaOutputStream DEBUG Key:tre
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8107
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], tre, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [tre], tre, *)
AthenaOutputStreamVERBOSE Calling matchKey( [tre], cinque)
@@ -243,8 +240,9 @@ AthenaOutputStreamVERBOSE Done calling matchKey( [tre], uno) with result: 0
AthenaOutputStream DEBUG No object matching 8107,"tre" found
AthenaOutputStream DEBUG addItemObjects(8107,"uno") called
AthenaOutputStream DEBUG Key:uno
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8107
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], uno, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [uno], uno, *)
AthenaOutputStreamVERBOSE Calling matchKey( [uno], cinque)
@@ -259,8 +257,9 @@ AthenaOutputStreamVERBOSE Done calling matchKey( [uno], quattro) with result: 0
AthenaOutputStream DEBUG Added object 8107,"uno"
AthenaOutputStream DEBUG addItemObjects(8108,"cinque") called
AthenaOutputStream DEBUG Key:cinque
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8108
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], cinque, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [cinque], cinque, *)
AthenaOutputStream DEBUG Added object 8108,"cinque"
@@ -269,8 +268,9 @@ AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [cinque], quattro) with result: 0
AthenaOutputStream DEBUG addItemObjects(8108,"quattro") called
AthenaOutputStream DEBUG Key:quattro
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8108
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], quattro, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [quattro], quattro, *)
AthenaOutputStreamVERBOSE Calling matchKey( [quattro], cinque)
@@ -279,8 +279,9 @@ AthenaOutputStreamVERBOSE Done calling matchKey( [quattro], cinque) with result:
AthenaOutputStream DEBUG Added object 8108,"quattro"
AthenaOutputStream DEBUG addItemObjects(8111,"comp") called
AthenaOutputStream DEBUG Key:comp
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8111
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], comp, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [comp], comp, *)
AthenaOutputStream DEBUG Added object 8111,"comp"
@@ -289,8 +290,9 @@ AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [comp], sei) with result: 0
AthenaOutputStream DEBUG addItemObjects(8111,"sei") called
AthenaOutputStream DEBUG Key:sei
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8111
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], sei, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [sei], sei, *)
AthenaOutputStreamVERBOSE Calling matchKey( [sei], comp)
@@ -300,32 +302,32 @@ AthenaOutputStream DEBUG Added object 8111,"sei"
AthenaOutputStream DEBUG addItemObjects(8112,"compAux.") called
AthenaOutputStream DEBUG Key:compAux.
AthenaOutputStream DEBUG Aux Attr:foo.bar.zzz
-AthenaOutputStream DEBUG Comp Attr High: 2 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 2 with 10 mantissa bits.
AthenaOutputStream DEBUG >> bar
AthenaOutputStream DEBUG >> foo
-AthenaOutputStream DEBUG Comp Attr Low: 1 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 1 with 16 mantissa bits.
AthenaOutputStream DEBUG >> zzz
+MetaDataSvc DEBUG Not translating metadata item ID #8112
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], compAux., *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [compAux.], compAux., *)
AthenaOutputStream DEBUG Added object 8112,"compAux."
-AthenaOutputStream DEBUG Lossy float compression level 10 contains 1 elements for container comp
-AthenaOutputStream DEBUG Lossy float compression level 16 contains 1 elements for container comp
+AthenaOutputStream DEBUG Container comp has 1 variables that'll be lossy float compressed with 10 mantissa bits
+AthenaOutputStream DEBUG Container comp has 1 variables that'll be lossy float compressed with 16 mantissa bits
AthenaOutputStreamVERBOSE Calling matchKey( [compAux.], seiAux.)
AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [compAux.], seiAux.) with result: 0
AthenaOutputStream DEBUG addItemObjects(8112,"seiAux.") called
AthenaOutputStream DEBUG Key:seiAux.
AthenaOutputStream DEBUG Aux Attr:aaa.ccc
-AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr 0 with 16 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #8112
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], seiAux., *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [seiAux.], seiAux., *)
AthenaOutputStreamVERBOSE Calling matchKey( [seiAux.], compAux.)
AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [seiAux.], compAux.) with result: 0
AthenaOutputStream DEBUG Added object 8112,"seiAux."
-AthenaOutputStream DEBUG Lossy float compression level 10 contains 0 elements for container sei
-AthenaOutputStream DEBUG Lossy float compression level 16 contains 0 elements for container sei
8112 compAux.
8112 seiAux.
8101 due
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 1472648ee1f1c585ec93628df9e676bbebdecfea..1c574879f78ec8436d31d33889a1eb5ee374e5ce 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -24,6 +24,7 @@
#include "StoreGate/WriteHandle.h"
#include "SGTools/DataProxy.h"
#include "SGTools/TransientAddress.h"
+#include "SGTools/transientKey.h"
#include "SGTools/ProxyMap.h"
#include "SGTools/SGIFolder.h"
#include "AthenaKernel/CLIDRegistry.h"
@@ -349,7 +350,7 @@ void AthenaOutputStream::handle(const Incident& inc)
std::unique_lock<mutex_t> lock(m_mutex);
// Handle Event Ranges for Event Service
- if( m_outSeqSvc->inUse() and m_outSeqSvc->inConcurrentEventsMode() )
+ if( m_outSeqSvc->inUse() )
{
if( inc.type() == "MetaDataStop" ) {
// all substreams should be closed by this point
@@ -648,12 +649,18 @@ StatusCode AthenaOutputStream::collectAllObjects() {
folderclids.push_back(i->id());
}
- // FIXME This is a bruteforece hack to remove items erroneously
+ // FIXME This is a bruteforce hack to remove items erroneously
// added somewhere in the morass of the addItemObjects logic
IDataSelector prunedList;
for (auto it = m_objects.begin(); it != m_objects.end(); ++it) {
if (std::find(folderclids.begin(),folderclids.end(),(*it)->clID())!=folderclids.end()) {
- prunedList.push_back(*it); // build new list that is correct
+ if (SG::isTransientKey ((*it)->name())) {
+ ATH_MSG_ERROR("Request to write transient object key " <<
+ (*it)->name() << " ignored");
+ }
+ else {
+ prunedList.push_back(*it); // build new list that is correct
+ }
}
else {
ATH_MSG_DEBUG("Object " << (*it)->clID() <<","<< (*it)->name() << " found that was not in itemlist");
diff --git a/Control/AthenaServices/src/MetaDataSvc.cxx b/Control/AthenaServices/src/MetaDataSvc.cxx
index 2a81f9dd6bb051ea394654d5b4e179548cfe765b..6359f7475840fd3b5ad7f3b010fd7363c83953f0 100644
--- a/Control/AthenaServices/src/MetaDataSvc.cxx
+++ b/Control/AthenaServices/src/MetaDataSvc.cxx
@@ -17,6 +17,7 @@
#include "GaudiKernel/IIoComponentMgr.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/FileIncident.h"
+#include "GaudiKernel/System.h"
#include "AthenaBaseComps/AthCnvSvc.h"
#include "StoreGate/StoreGateSvc.h"
@@ -292,6 +293,7 @@ StatusCode MetaDataSvc::retireMetadataSource(const Incident& inc)
return StatusCode::FAILURE;
}
const std::string guid = fileInc->fileGuid();
+ ATH_MSG_DEBUG("retireMetadataSource: " << fileInc->fileName());
for (auto it = m_metaDataTools.begin(); it != m_metaDataTools.end(); ++it) {
if ( (*it)->endInputFile(guid).isFailure() ) {
ATH_MSG_ERROR("Unable to call endInputFile for " << it->name());
@@ -396,11 +398,17 @@ void MetaDataSvc::handle(const Incident& inc) {
}
}
}
+
//__________________________________________________________________________
-StatusCode MetaDataSvc::transitionMetaDataFile() {
- if( !m_allowMetaDataStop ) {
- return(StatusCode::FAILURE);
- }
+// This method is currently called only from OutputStreamSequencerSvc for MP EventService
+StatusCode MetaDataSvc::transitionMetaDataFile()
+{
+ ATH_MSG_DEBUG("transitionMetaDataFile()");
+
+ // this is normally called through EndInputFile inc, simulate it for EvSvc
+ FileIncident inc("transitionMetaDataFile", "EndInputFile", "dummyMetaInputFileName", "");
+ ATH_CHECK(retireMetadataSource(inc));
+
// Make sure metadata is ready for writing
ATH_CHECK(this->prepareOutput());
@@ -418,6 +426,7 @@ StatusCode MetaDataSvc::transitionMetaDataFile() {
return(StatusCode::SUCCESS);
}
+
//__________________________________________________________________________
StatusCode MetaDataSvc::io_reinit() {
ATH_MSG_INFO("I/O reinitialization...");
@@ -613,13 +622,67 @@ const std::string MetaDataSvc::currentRangeID() const
}
-CLID MetaDataSvc::remapMetaContCLID( const CLID& item_id ) const
+CLID MetaDataSvc::remapMetaContCLID( const CLID& itemID ) const
{
- // for now just a simple dumb if
- if( item_id == 167728019 ) {
- return 167729019; // MetaCont<EventStreamInfo> CLID
+ auto it = m_handledClasses.find(itemID);
+ if (it == m_handledClasses.end()) {
+ ATH_MSG_DEBUG("Not translating metadata item ID #" << itemID);
+ return itemID;
}
- return item_id;
+
+ std::string itemName;
+ CLID contID = 0;
+ if (m_classIDSvc->getTypeNameOfID(itemID, itemName).isSuccess()) {
+ const std::string contName = "MetaCont<" + itemName + ">";
+ ATH_MSG_DEBUG("Transforming " << contName << " to " << itemName
+ << " for output");
+ if (m_classIDSvc->getIDOfTypeName(contName, contID).isSuccess())
+ return contID;
+ }
+
+ return itemID;
+}
+
+void MetaDataSvc::recordHook(const std::type_info& typeInfo) {
+ const std::string& typeName = System::typeinfoName(typeInfo);
+ ATH_MSG_VERBOSE("Handling recod event of type " << typeName);
+
+ CLID itemID = 0;
+ if (m_classIDSvc->getIDOfTypeInfoName(typeName, itemID).isSuccess()) {
+
+ ATH_MSG_DEBUG("MetaDataSvc will handle ClassID " << itemID);
+ auto it = m_handledClasses.find(itemID);
+
+ if (it == m_handledClasses.end())
+ m_handledClasses[itemID] = 1;
+ else
+ (it->second)++;
+
+ }
+
+}
+
+void MetaDataSvc::removeHook(const std::type_info& typeInfo) {
+ const std::string& typeName = System::typeinfoName(typeInfo);
+ ATH_MSG_VERBOSE("Handling removal of event of type " << typeName);
+
+ CLID itemID = 0;
+ // use Gaudi::System to get type name
+ if (m_classIDSvc->getIDOfTypeInfoName(typeName, itemID).isSuccess()) {
+
+ ATH_MSG_DEBUG("MetaDataSvc will handle ClassID " << itemID);
+ auto it = m_handledClasses.find(itemID);
+
+ if (it == m_handledClasses.end())
+ return;
+
+ (it->second)--;
+
+ if (it->second == 0)
+ m_handledClasses.erase(it);
+
+ }
+
}
diff --git a/Control/AthenaServices/src/MetaDataSvc.h b/Control/AthenaServices/src/MetaDataSvc.h
index 4a6c181c12f66605f4870c7e749890979f5231ce..7904cb0b37f5bc0edfdd1652fc26b9fa989a793c 100644
--- a/Control/AthenaServices/src/MetaDataSvc.h
+++ b/Control/AthenaServices/src/MetaDataSvc.h
@@ -16,12 +16,14 @@
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/IFileMgr.h" // for FILEMGR_CALLBACK_ARGS
+#include "GaudiKernel/IClassIDSvc.h"
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaBaseComps/AthService.h"
#include "AthenaKernel/IMetaDataTool.h"
#include "AthenaKernel/IMetaDataSvc.h"
#include <map>
+#include <typeinfo>
// Forward declarations
class IAddressCreator;
@@ -125,6 +127,9 @@ public: // Non-static members
void lockTools() const;
void unlockTools() const;
+
+ void recordHook(const std::type_info&) override;
+ void removeHook(const std::type_info&) override;
private:
/// Add proxy to input metadata store - can be called directly or via BeginInputFile incident
@@ -139,6 +144,7 @@ private: // data
ServiceHandle<IFileMgr> m_fileMgr;
ServiceHandle<IIncidentSvc> m_incSvc;
ServiceHandle<OutputStreamSequencerSvc> m_outSeqSvc;
+ ServiceHandle< IClassIDSvc > m_classIDSvc{"ClassIDSvc", name()};
long m_storageType;
bool m_clearedInputDataStore;
@@ -149,6 +155,8 @@ private: // data
std::map<CLID, std::string> m_toolForClid;
std::map<std::string, std::string> m_streamForKey;
+ std::map<CLID, unsigned int> m_handledClasses;
+
private: // properties
/// MetaDataContainer, POOL container name for MetaData.
StringProperty m_metaDataCont;
diff --git a/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx b/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx
index 6008b0d787c26e845ae526f79b572a93b314f264..1b991f24cb117b5cf3e71ac33b4a2e77f513965a 100644
--- a/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx
+++ b/Control/AthenaServices/src/OutputStreamSequencerSvc.cxx
@@ -95,28 +95,32 @@ void OutputStreamSequencerSvc::handle(const Incident& inc)
if( slot == EventContext::INVALID_CONTEXT_ID ) slot = 0;
if( inc.type() == incidentName() ) { // NextEventRange
- // finish the old range if needed
- if( m_fileSequenceNumber >= 0 and !inConcurrentEventsMode() ) {
- // When processing events sequentially (threads<2) write metadata on the NextRange incident
- // but ignore the first incident because it only starts the first sequence
- ATH_MSG_DEBUG("MetaData transition");
- // Retrieve MetaDataSvc
- if( !m_metaDataSvc.isValid() and !m_metaDataSvc.retrieve().isSuccess() ) {
- throw GaudiException("Cannot get MetaDataSvc", name(), StatusCode::FAILURE);
- }
- if( !m_metaDataSvc->transitionMetaDataFile().isSuccess() ) {
- throw GaudiException("Cannot transition MetaData", name(), StatusCode::FAILURE);
- }
- }
- // start a new range
- std::lock_guard lockg( m_mutex );
std::string rangeID;
- m_fileSequenceNumber++;
const FileIncident* fileInc = dynamic_cast<const FileIncident*>(&inc);
if (fileInc != nullptr) {
rangeID = fileInc->fileName();
- ATH_MSG_DEBUG("Requested (through incident) next event range filename extension: " << rangeID);
+ ATH_MSG_DEBUG("Requested (through incident) Next Event Range filename extension: " << rangeID);
}
+ if( rangeID=="dummy") {
+ // finish the previous range
+ if( not inConcurrentEventsMode() ) {
+ // SEQUENTIAL (threads<2) event processing
+ // Write metadata on the incident finishing a Range (filename=="dummy")
+ ATH_MSG_DEBUG("MetaData transition");
+ // Retrieve MetaDataSvc
+ if( !m_metaDataSvc.isValid() and !m_metaDataSvc.retrieve().isSuccess() ) {
+ throw GaudiException("Cannot get MetaDataSvc", name(), StatusCode::FAILURE);
+ }
+ if( !m_metaDataSvc->transitionMetaDataFile().isSuccess() ) {
+ throw GaudiException("Cannot transition MetaData", name(), StatusCode::FAILURE);
+ }
+ }
+ // exit now, wait for the next incident that will start the next range
+ return;
+ }
+ // start a new range
+ std::lock_guard lockg( m_mutex );
+ m_fileSequenceNumber++;
if( rangeID.empty() ) {
std::ostringstream n;
n << "_" << std::setw(4) << std::setfill('0') << m_fileSequenceNumber;
diff --git a/Control/CxxUtils/CxxUtils/vec.h b/Control/CxxUtils/CxxUtils/vec.h
index a12dd9eee44f8655ebdbc5b0322e5e9a0d8d6d27..db70b62758bd2193b6a692d0b3767934c0854d3c 100644
--- a/Control/CxxUtils/CxxUtils/vec.h
+++ b/Control/CxxUtils/CxxUtils/vec.h
@@ -71,8 +71,19 @@
* Mask is a list of integers that specifies the elements
* that should be extracted and returned in src.
* dst[i] = src[mask[i]] where mask[i] is the ith integer
- * is the mask.
- *
+ * in the mask.
+ * - @c CxxUtils::vblend<mask> (VEC& dst, const VEC& src1,const VEC& src2)
+ * Fills dst with permutation of src1 and src2
+ * according to mask.
+ * Mask is a list of integers that specifies the elements
+ * that should be extracted and returned in src1 and src2.
+ * An index i in the interval [0,N) indicates that element number i
+ * from the first input vector should be placed in the
+ * corresponding position in the result vector.
+ * An index in the interval [N,2N)
+ * indicates that the element number i-N
+ * from the second input vector should be placed
+ * in the corresponding position in the result vector.
*
* In terms of expected performance it might be advantageous to
* use vector types that fit the size of the ISA.
@@ -83,10 +94,6 @@
*
* Consider using Function Multiversioning (CxxUtils/features.h)
* if you really need to target efficiently multiple ISAs.
- *
- * Obviously, one should also consider if the same result can be achieved via
- * the auto-vectorization compiler optimizations
- * (e.g see vectorize.h for GCC -O2)
*/
#ifndef CXXUTILS_VEC_H
@@ -323,6 +330,7 @@ ivec<T, N> operator|| (const vec_fb<T, N>& a, const vec_fb<T, N>& b)
+
#if HAVE_VECTOR_SIZE_ATTRIBUTE
/// Define a nice alias for a built-in vectorized type.
@@ -359,7 +367,7 @@ template<class VEC>
using vec_type_t = typename vec_type<VEC>::type;
/**
- * brief Deduce the type of a mask , type returned by relational operations,
+ * brief Deduce the type of the mask returned by relational operations,
* for a vectorized type.
*/
template<class VEC>
@@ -398,8 +406,7 @@ vec_size(const VEC&)
}
/**
- * brief Copy a scalar to each element of a vectorized type.
- * Similar functionality to _mm_set/_mm_broadcast x86-64 intrinsics.
+ * @brief Copy a scalar to each element of a vectorized type.
*/
template<typename VEC, typename T>
inline void
@@ -434,7 +441,7 @@ vload(VEC& dst, vec_type_t<VEC> const* src)
/*
* @brief store elements from a vectorized type src to
* to a memory address dst (C-array).
- * Uses memcpy to avoid alignment issue
+ * Uses memcpy to avoid alignment issues
*/
template<typename VEC>
inline void
@@ -444,7 +451,7 @@ vstore(vec_type_t<VEC>* dst, const VEC& src)
}
/*
- * @brief select/blend function.
+ * @brief select elements based on a mask
* Fill dst according to
* dst[i] = mask[i] ? a[i] : b[i]
*/
@@ -499,8 +506,7 @@ vmax(VEC& dst, const VEC& a, const VEC& b)
}
/*
- * Need for static asserts on argument
- * packs
+ * Helper for static asserts for argument packs
*/
namespace bool_pack_helper {
template<bool...>
@@ -508,17 +514,10 @@ struct bool_pack;
template<bool... bs>
using all_true = std::is_same<bool_pack<bs..., true>, bool_pack<true, bs...>>;
}
-
/**
* @brief vpermute function.
* move any element of a vector src
* into any or multiple position inside dst.
- *
- * We try to wrap both
- * gcc's __builtin_shuffle
- * and
- * clang's __builtin_shufflevector
- *
*/
template<size_t... Indices, typename VEC>
inline void
@@ -541,6 +540,39 @@ vpermute(VEC& dst, const VEC& src)
#endif
}
+/**
+ * @brief vblend function.
+ * permutes and blends elements from two vectors
+ * Similar to the permute functions, but with two input vectors.
+ */
+template<size_t... Indices, typename VEC>
+inline void
+vblend(VEC& dst, const VEC& src1, const VEC& src2)
+{
+ constexpr size_t N = vec_size<VEC>();
+ static_assert((sizeof...(Indices) == N),
+ "Number of indices different than vector size");
+ static_assert(
+ bool_pack_helper::all_true<(Indices >= 0 && Indices < 2 * N)...>::value,
+ "blend indices outside allowed range");
+
+#if !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+ size_t pos{ 0 };;
+ for (size_t i : { Indices... }) {
+ if (i < N) {
+ dst[pos] = src1[i];
+ } else {
+ dst[pos] = src2[i - N];
+ }
+ ++pos;
+ }
+#elif defined(__clang__)
+ dst = __builtin_shufflevector(src1, src2, Indices...);
+#else // gcc
+ dst = __builtin_shuffle(src1, src2, mask_type_t<VEC>{ Indices... });
+#endif
+}
+
} // namespace CxxUtils
#endif // not CXXUTILS_VEC_H
diff --git a/Control/CxxUtils/test/vec_test_common.h b/Control/CxxUtils/test/vec_test_common.h
index c5872d7eadc79cf2d2f6288fd22af1ce00afefac..deb4128c4a20429a4cb5bd9ff1363c9efebc1f40 100644
--- a/Control/CxxUtils/test/vec_test_common.h
+++ b/Control/CxxUtils/test/vec_test_common.h
@@ -4,9 +4,9 @@
/**
* @file CxxUtils/test/vec_test_common.h
* @author scott snyder <snyder@bnl.gov>
+ * @author Christos Anastopoulos
* @date Feb, 2020
* @brief Common part for vec vec_fb unit tests.
- *
*/
#ifndef CXXUTILS_VEC_TEST_COMMON
@@ -378,6 +378,34 @@ test_permute(const VEC& v1)
assert(v2[i] == v1[(N-1)-i]);
}
}
+template<class VEC>
+void
+test_blend(const VEC& v1)
+{
+ // Add 10 to V1 (so as to be different)
+ VEC v2 = v1 + 10;
+ VEC v3;
+ // take the bottom half of v1 and v2 and put them together
+ constexpr size_t N = CxxUtils::vec_size<VEC>();
+ if constexpr (N == 2) {
+ CxxUtils::vblend<0, 2>(v3, v1, v2);
+ } else if constexpr (N == 4) {
+ CxxUtils::vblend<0, 1, 4, 5>(v3, v1, v2);
+ } else if constexpr (N == 8) {
+ CxxUtils::vblend<0, 1, 2, 3, 8, 9, 10, 11>(v3, v1, v2);
+ } else {
+ // N==16
+ CxxUtils::vblend<0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23>(
+ v3, v1, v2);
+ }
+ for (size_t i = 0; i < N; i++) {
+ if (i < N / 2) {
+ assert(v3[i] == v1[i]);
+ } else {
+ assert(v3[i] == v2[i - N/2]);
+ }
+ }
+}
template<template<class T, size_t N> class VEC>
void
@@ -409,6 +437,7 @@ testFloat1()
test_min(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
test_max(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
test_permute(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ test_blend(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
} while (0)
TEST_FLOAT(float, 4); // 128 bit wide 4 floats
@@ -457,6 +486,8 @@ testInt1()
N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
test_permute(VEC<T, N> INITN( \
N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_blend(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
test_int(VEC<T, N> INITN( \
N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
test_logops( \
diff --git a/Control/DataModelRoot/DataModelRoot/RootType.h b/Control/DataModelRoot/DataModelRoot/RootType.h
index 66de2f305af5d6ae7b4327a87bf50742d4fa1439..d9e25d7c84840b2c8b9ab7b9eb50d1cefdacad00 100644
--- a/Control/DataModelRoot/DataModelRoot/RootType.h
+++ b/Control/DataModelRoot/DataModelRoot/RootType.h
@@ -185,6 +185,12 @@ public:
TTypeAdapter ToType() const { return *this; }
TScopeAdapter TypeOf() const { return *this; }
+ /// Cast obj of this class type up to baseclass cl if up is true.
+ /// Cast obj of this class type down from baseclass cl if up is false.
+ /// If this class is not a baseclass of cl return 0, else the pointer
+ /// to the cl part of this (up) or to this (down).
+ void* Cast (const TScopeAdapter& cl, void* obj, bool up) const;
+
// for STL containers
bool operator==( const TScopeAdapter& rh ) const;
bool operator!=( const TScopeAdapter& rh ) const {
diff --git a/Control/DataModelRoot/src/RootType.cxx b/Control/DataModelRoot/src/RootType.cxx
index 639a6acbe01c6b2a7920791d31cad4d6c200409e..07c69def8756e10ff32c69186b715b1c4eba2f59 100644
--- a/Control/DataModelRoot/src/RootType.cxx
+++ b/Control/DataModelRoot/src/RootType.cxx
@@ -950,6 +950,12 @@ Bool_t TScopeAdapter::IsAbstract() const
return kFALSE;
}
+//____________________________________________________________________________
+void* TScopeAdapter::Cast (const TScopeAdapter& cl, void* obj, bool up) const
+{
+ return fClass->DynamicCast (cl.Class(), obj, up);
+}
+
//____________________________________________________________________________
bool TScopeAdapter::operator==( const TScopeAdapter& rh ) const
{
diff --git a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
index 2ed04ff3492c2cb2d1d37e4e97a543c3f5a6f0c6..45a3a4dd5c8cdba48c071e7ca6946d2338755d4e 100644
--- a/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
+++ b/Control/DataModelTest/DataModelRunTests/CMakeLists.txt
@@ -30,7 +30,7 @@ function (datamodel_run_test testName)
atlas_add_test( ${testName}
SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/datamodel_${testName}.sh
PROPERTIES TIMEOUT 300
- LOG_IGNORE_PATTERN "has different type than the branch|no dictionary for class|^StorageSvc +INFO|Cache alignment|Unable to locate catalog${ARG_EXTRA_IGNORE}"
+ LOG_IGNORE_PATTERN "has different type than the branch|no dictionary for class|^StorageSvc +INFO|Cache alignment|Unable to locate catalog|IOVDbSvc[0-9 ]+INFO${ARG_EXTRA_IGNORE}"
ENVIRONMENT "ATLAS_REFERENCE_TAG=DataModelRunTests/DataModelRunTestsReference-01-00-03"
)
if( ARG_DEPENDS )
diff --git a/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite.ref b/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite.ref
index a57229cabe99a46be80112ad0c0e12dc59a480b9..a06527b918e3b2fdb0b089fe114a1ab5ac511218 100644
--- a/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite.ref
@@ -1,7 +1,7 @@
-Thu Jul 16 19:15:01 CEST 2020
+Wed Oct 7 04:22:45 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.16] [x86_64-centos7-gcc8-opt] [atlas-work3/e277cdc296a] -- built on [2020-07-16T1652]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [atlas-work3/2257af3c1fa] -- built on [2020-10-07T0138]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
@@ -10,68 +10,52 @@ Py:Athena INFO including file "DataModelRunTests/loadWriteDicts.py"
Py:Athena INFO including file "DataModelRunTests/commonTrailer.py"
Py:Athena INFO including file "DataModelRunTests/setCatalog.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-Py:ConfigurableDb INFO Read module info for 5551 configurables from 77 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 77 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING -TrigInDetAccelerationTool: TrigInDetAccelerationTool.TrigInDetAccelerationToolConf - ['TrigFastTrackFinder.TrigFastTrackFinderConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+Py:ConfigurableDb INFO Read module info for 5570 configurables from 51 genConfDb files
+Py:ConfigurableDb INFO No duplicates have been found: that's good !
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus708.cern.ch on Thu Jul 16 19:15:12 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on lxplus773.cern.ch on Wed Oct 7 04:22:54 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 705 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1734 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 6320 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 722 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6214 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-ClassIDSvc INFO getRegistryEntries: read 423 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 430 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
LoadWriteDicts INFO Initializing LoadWriteDicts...
-ClassIDSvc INFO getRegistryEntries: read 3020 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3126 CLIDRegistry entries for module ALL
TrigSerializeCn... INFO initialize()
-ClassIDSvc INFO getRegistryEntries: read 109 CLIDRegistry entries for module ALL
-Warning in <TClass::Init>: no dictionary for class CosmicMuonCollection_tlp1 is available
-Warning in <TClass::Init>: no dictionary for class MdtTrackSegmentCollection_tlp1 is available
-Warning in <TClass::Init>: no dictionary for class CosmicMuonCollection_p1 is available
-Warning in <TClass::Init>: no dictionary for class CosmicMuon_p1 is available
-Warning in <TClass::Init>: no dictionary for class MdtTrackSegmentCollection_p1 is available
-Warning in <TClass::Init>: no dictionary for class MdtTrackSegment_p1 is available
-Warning in <TClass::Init>: no dictionary for class MdtTrackSegmentCollection_p2 is available
-Warning in <TClass::Init>: no dictionary for class PanTauDetails_p1 is available
+ClassIDSvc INFO getRegistryEntries: read 111 CLIDRegistry entries for module ALL
ToolSvc.TrigSer... INFO Initializing - Package version: TrigSerializeTP-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 17975 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 17980 CLIDRegistry entries for module ALL
DecisionSvc INFO Inserting stream: StreamBSFileOutput with no Algs
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
StreamBSFileOut... INFO Initializing StreamBSFileOutput.DefaultNameTool - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-07-15T2139/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus708.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host lxplus773.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+ClassIDSvc INFO getRegistryEntries: read 1297 CLIDRegistry entries for module ALL
ByteStreamEvent... INFO Initializing ByteStreamEventStorageOutputSvc - package version ByteStreamCnvSvc-00-00-00
-ByteStreamEvent... INFO eformat version to use: "current"
-ByteStreamEvent... INFO event storage (BS) version to use: "current"
+ByteStreamEvent... INFO eformat version to use: " 'EformatVersion':'current'"
+ByteStreamEvent... INFO event storage (BS) version to use: " 'EventStorageVersion':'current'"
ByteStreamEvent... INFO Reinitialization...
StreamBSFileOutput INFO Found HelperTools = PrivateToolHandleArray([])
StreamBSFileOutput INFO Data output: ByteStreamEventStorageOutputSvc
@@ -83,19 +67,17 @@ ApplicationMgr INFO Application Manager Started successfully
EventPersistenc... INFO Added successfully Conversion service:McCnvSvc
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 1379 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 110 CLIDRegistry entries for module ALL
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ROBDataProviderSvc INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
ROBDataProviderSvc INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
-InputMetaDataStoreWARNING retrieve(const): No valid proxy for object ByteStreamMetadata of type ByteStreamMetadataContainer(CLID 1076128893)
-DetectorStore WARNING retrieve(default): No valid proxy for default object
- of type TagInfo(CLID 61780915)
+ByteStreamEvent...WARNING failed to retrieve ByteStreamMetaData
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #0 1 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 328 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 334 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #0 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #0 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #0 3 events processed so far <<<===
@@ -149,3 +131,11 @@ ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Py:Athena INFO leaving with code 0: "successful run"
+TClass::Init:0: RuntimeWarning: no dictionary for class CosmicMuonCollection_tlp1 is available
+TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegmentCollection_tlp1 is available
+TClass::Init:0: RuntimeWarning: no dictionary for class CosmicMuonCollection_p1 is available
+TClass::Init:0: RuntimeWarning: no dictionary for class CosmicMuon_p1 is available
+TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegmentCollection_p1 is available
+TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegment_p1 is available
+TClass::Init:0: RuntimeWarning: no dictionary for class MdtTrackSegmentCollection_p2 is available
+TClass::Init:0: RuntimeWarning: no dictionary for class PanTauDetails_p1 is available
diff --git a/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite_jo.py
index f8209a97bffc78dd4d3897db11d41e1a2ed3c05c..4b57b1579419889835324dbf9272bd746614a0b6 100755
--- a/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/ByteStreamTestWrite_jo.py
@@ -94,6 +94,7 @@ athenaCommonFlags.BSRDOOutput = 'test.bs'
from ByteStreamCnvSvc import WriteByteStream
from StoreGate.StoreGateConf import StoreGateSvc
svcMgr += StoreGateSvc('InputMetaDataStore')
+svcMgr += StoreGateSvc('MetaDataStore')
StreamBSFileOutput = WriteByteStream.getStream("EventStorage","StreamBSFileOutput")
# List of DO's to write out
StreamBSFileOutput.ItemList += fullItemList
diff --git a/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref b/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref
index 2eee7689daf9eee1e73947f72250644d3bc4d529..a46bff238fb6261d4ce9322189fffba1347a0a9c 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref
@@ -1,7 +1,7 @@
-Mon Apr 13 19:56:26 CEST 2020
+Tue Oct 6 19:46:51 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.12] [x86_64-centos7-gcc8-opt] [atlas-work3/b3d13b8558d] -- built on [2020-04-13T1856]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
@@ -21,37 +21,33 @@ Folder created
>== Storing COOL object succeeded. Current content:
[0,0] - [0,5) (0) [xint (Int32) : 10]
[0,5] - [2147483647,4294967295) (0) [xint (Int32) : 20]
-Py:ConfigurableDb INFO Read module info for 5552 configurables from 69 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.12
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "DataModelRunTests/commonTrailer.py"
Py:Athena INFO including file "DataModelRunTests/setCatalog.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus775.cern.ch on Mon Apr 13 19:56:49 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:47:10 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3463 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc 0 INFO getRegistryEntries: read 1934 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 1971 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Initializing CondInputLoader...
MetaDataSvc 0 INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc 0 INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc 0 INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc 0 INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc 0 INFO Frontier compression level set to 5
DBReplicaSvc 0 INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc 0 INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-04-12T2139/Athena/22.0.12/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc 0 INFO Total of 10 servers found for host lxplus775.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc 0 INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc 0 INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc 0 INFO Successfully setup replica sorting algorithm
PoolSvc 0 INFO Setting up APR FileCatalog and Streams
PoolSvc 0 WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -61,13 +57,13 @@ PoolSvc 0 INFO POOL WriteCatalog is xml
DbSession 0 INFO Open DbSession
Domain[ROOT_All] 0 INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc 0 INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc 0 INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSequencerSvc 0 INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc 0 INFO Only 5 POOL conditions files will be open at once
IOVDbFolder 0 INFO Read from meta data only for folder /TagInfo
IOVDbFolder 0 INFO Extensible folder /DMTest/TestAttrList
IOVDbSvc 0 INFO Initialised with 2 connections and 2 folders
IOVDbSvc 0 INFO Service IOVDbSvc initialised successfully
-ClassIDSvc 0 INFO getRegistryEntries: read 1785 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc 0 INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc 0 INFO Opening COOL connection for sqlite://;schema=condtest_rw.db;dbname=OFLP200
IOVSvc 0 INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -78,7 +74,7 @@ CondInputLoader 0 INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TestAttrList' ) ->
CondInputLoader 0 INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TestAttrList' )
-ClassIDSvc 0 INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
xAODMaker::EventInfoCnvAlg 0 INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::EventInfoCnvAlg.EventInfoC... 0 INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::EventInfoCnvAlg.EventInfoC... 0 WARNING Beam conditions service not available
@@ -86,17 +82,17 @@ xAODMaker::EventInfoCnvAlg.EventInfoC... 0 WARNING Will not fill beam spot
EventSelector 0 INFO Enter McEventSelector Initialization
AthenaEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
-ClassIDSvc 0 INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 110 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TestAttrList'
ApplicationMgr 0 INFO Application Manager Started successfully
EventPersistencySvc 0 INFO Added successfully Conversion service:McCnvSvc
AthenaEventLoopMgr 0 0 INFO ===>>> start of run 0 <<<===
EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc 0 0 INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
AthenaEventLoopMgr 0 0 INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
IOVDbSvc 0 0 INFO Opening COOL connection for sqlite://;schema=condtest_rw.db;dbname=OFLP200
IOVDbSvc 0 0 INFO Disconnecting from sqlite://;schema=condtest_rw.db;dbname=OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
DMTest::CondWriterExtAlg 0 0 INFO Event 0 LBN 0
DMTest::CondReaderAlg 0 0 INFO Event 0 LBN 0
DMTest::CondReaderAlg 0 0 INFO xint xint (int) : 10
diff --git a/Control/DataModelTest/DataModelRunTests/share/CondReader.ref b/Control/DataModelTest/DataModelRunTests/share/CondReader.ref
index 319d8ff0b75f35e48da615b66f5bbece9a3bc949..1409fbd9807c874a37efcbf864f706a83940686f 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondReader.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondReader.ref
@@ -1,60 +1,57 @@
-Tue Dec 11 15:25:53 CET 2018
+Tue Oct 6 19:46:10 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3g/fc1ea6b7761] -- built on [2018-12-11T1514]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "DataModelRunTests/CondReader_jo.py"
Py:Athena INFO including file "AthenaPoolCnvSvc/AthenaPool_jobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5443 configurables from 42 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Py:Athena INFO including file "DataModelRunTests/loadReadDicts.py"
-EventInfoMgtInit: Got release version Athena-22.0.1
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
+Py:Athena INFO including file "DataModelRunTests/commonTrailer.py"
+Py:Athena INFO including file "DataModelRunTests/setCatalog.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-[?1034hApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
- running on lxplus079.cern.ch on Tue Dec 11 15:26:12 2018
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:46:21 2020
====================================================================================================================================
-ApplicationMgr INFO Successfully loaded modules : AthenaServices
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 2946 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 1877 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1971 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus079.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 2 connections and 5 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
-IOVSvcTool INFO IOVRanges will be checked at every Event
-ClassIDSvc INFO getRegistryEntries: read 1341 CLIDRegistry entries for module ALL
+IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc INFO Added taginfo remove for /DMTest/RLTest
IOVDbSvc INFO Added taginfo remove for /DMTest/S2
@@ -71,14 +68,18 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TestAttrList' )
+ ( 'DMTest::S1' , 'ConditionStore+/DMTest/S2' )
+ ( 'DMTest::S2' , 'ConditionStore+/DMTest/S2' )
-ClassIDSvc INFO getRegistryEntries: read 319 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 271 CLIDRegistry entries for module ALL
+xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
+xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
+xAODMaker::Even...WARNING Beam conditions service not available
+xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
LoadReadDicts INFO Initializing LoadReadDicts...
-HistogramPersis...WARNING Histograms saving not required.
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 7221 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 9320 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/RLTest'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TSTest'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TestAttrList'
@@ -88,13 +89,19 @@ EventPersistenc... INFO Added successfully Conversion service:McCnvSvc
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 109 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
IOVDbSvc INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] A834E12A-0572-2942-88EC-5A969061BCA7
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+IOVDbSvc INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
+IOVDbSvc INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
+IOVDbSvc INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
+IOVDbSvc INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
+IOVDbSvc INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
+IOVDbSvc INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 04EAD7FD-B145-8B49-BF7D-419CCEC08071
Domain[ROOT_All] INFO condtest.pool.root
-RootDatabase.open INFO condtest.pool.root File version:61404
+RootDatabase.open INFO condtest.pool.root File version:62200
DMTest::CondRea... INFO Event 0 LBN 0
DMTest::CondRea... INFO xint xint (int) : 10
DMTest::CondRea... INFO scond 1000
@@ -365,7 +372,7 @@ DMTest::CondRea... INFO ts xint (int) : 900
DMTest::CondRea... INFO s3 907
AthenaEventLoopMgr INFO ===>>> done processing event #29, run #0 30 events processed so far <<<===
condtest.pool.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] A834E12A-0572-2942-88EC-5A969061BCA7
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 04EAD7FD-B145-8B49-BF7D-419CCEC08071
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
IncidentProcAlg1 INFO Finalize
@@ -374,13 +381,13 @@ LoadReadDicts INFO Finalizing LoadReadDicts...
IncidentProcAlg2 INFO Finalize
EventSelector INFO finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
-IOVDbFolder INFO Folder /DMTest/RLTest (AttrList) db-read 1/7 objs/chan/bytes 7/1/28 (( 0.01 ))s
-IOVDbFolder INFO Folder /DMTest/S2 (PoolRef) db-read 1/5 objs/chan/bytes 15/1/2715 (( 0.00 ))s
-IOVDbFolder INFO Folder /DMTest/TSTest (AttrList) db-read 1/9 objs/chan/bytes 9/1/36 (( 0.00 ))s
-IOVDbFolder INFO Folder /DMTest/TestAttrList (AttrList) db-read 1/10 objs/chan/bytes 30/1/120 (( 0.00 ))s
-IOVDbSvc INFO bytes in (( 0.01 ))s
+IOVDbFolder INFO Folder /DMTest/RLTest (AttrList) db-read 4/7 objs/chan/bytes 28/1/112 (( 0.02 ))s
+IOVDbFolder INFO Folder /DMTest/S2 (PoolRef) db-read 4/5 objs/chan/bytes 60/1/10860 (( 0.01 ))s
+IOVDbFolder INFO Folder /DMTest/TSTest (AttrList) db-read 4/9 objs/chan/bytes 36/1/144 (( 0.00 ))s
+IOVDbFolder INFO Folder /DMTest/TestAttrList (AttrList) db-read 4/10 objs/chan/bytes 120/1/480 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.03 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection sqlite://;schema=condtest.db;dbname=OFLP200 : nConnect: 2 nFolders: 4 ReadTime: (( 0.01 ))s
+IOVDbSvc INFO Connection sqlite://;schema=condtest.db;dbname=OFLP200 : nConnect: 5 nFolders: 4 ReadTime: (( 0.03 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ChronoStatSvc.f... INFO Service finalized successfully
diff --git a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
index 750f7b01db70de1dab659af9af29f8ab824757f6..bb166a6ab97087822c1a0d13a0730e3d44958083 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
@@ -1,7 +1,7 @@
-Wed Jun 3 16:05:38 PDT 2020
+Tue Oct 6 19:46:30 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1534]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
@@ -10,59 +10,54 @@ Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "DataModelRunTests/CondReaderMT_jo.py"
Py:Athena INFO including file "DataModelRunTests/CondReader_jo.py"
Py:Athena INFO including file "AthenaPoolCnvSvc/AthenaPool_jobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 17 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Py:Athena INFO including file "DataModelRunTests/loadReadDicts.py"
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "DataModelRunTests/commonTrailer.py"
Py:Athena INFO including file "DataModelRunTests/setCatalog.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
MessageSvc INFO Activating in a separate thread
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:05:46 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:46:41 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3835 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSequencerSvc INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 2 connections and 5 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc 0 INFO getRegistryEntries: read 2133 CLIDRegistry entries for module ALL
-ClassIDSvc 0 INFO getRegistryEntries: read 1454 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 2351 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
xAODMaker::EventInfoCnvAlg 0 INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::EventInfoCnvAlg.EventInfoC... 0 INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
IOVDbSvc 0 INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc 0 INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVSvc 0 INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool 0 INFO IOVRanges will be checked at every Event
-ClassIDSvc 0 INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVDbSvc 0 INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc 0 INFO Added taginfo remove for /DMTest/RLTest
IOVDbSvc 0 INFO Added taginfo remove for /DMTest/S2
@@ -72,7 +67,7 @@ xAODMaker::EventInfoCnvAlg.EventInfoC... 0 WARNING Beam conditions service
xAODMaker::EventInfoCnvAlg.EventInfoC... 0 WARNING Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr 0 INFO Initializing PyComponentMgr...
LoadReadDicts 0 INFO Initializing LoadReadDicts...
-ClassIDSvc 0 INFO getRegistryEntries: read 9186 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 9210 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Initializing CondInputLoader...
CondInputLoader 0 INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/RLTest' ) ->
@@ -146,7 +141,7 @@ AvalancheSchedulerSvc 0 INFO o Scheduling of condit
EventSelector 0 INFO Enter McEventSelector Initialization
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
-ClassIDSvc 0 INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 110 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/RLTest'
CondInputLoader 0 INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TSTest'
CondInputLoader 0 INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TestAttrList'
@@ -157,19 +152,19 @@ EventPersistencySvc 0 0 INFO Added successfully Conv
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start of run 0 <<<===
EventPersistencySvc 0 0 INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistencySvc 0 0 INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc 0 0 INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #0, run #0 on slot 0, 0 events processed so far <<<===
IOVDbSvc 0 0 INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc 0 0 INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc 0 0 INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc 0 0 INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc 0 0 INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc 0 0 INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc 0 0 INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc 0 0 INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
-Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 7C834F50-C775-6244-B465-8E3C1EC9CC44
+Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 04EAD7FD-B145-8B49-BF7D-419CCEC08071
Domain[ROOT_All] 0 0 INFO condtest.pool.root
-RootDatabase.open 0 0 INFO condtest.pool.root File version:62002
+RootDatabase.open 0 0 INFO condtest.pool.root File version:62200
DMTest::CondReaderAlg 0 0 INFO Event 0 LBN 0
DMTest::CondReaderAlg 0 0 INFO xint xint (int) : 10
DMTest::CondReaderAlg 0 0 INFO scond 1000
@@ -179,7 +174,7 @@ DMTest::CondReaderAlg 0 0 INFO ts xint (int) : 100
DMTest::CondReaderAlg 0 0 INFO s3 101
AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #0, run #0 on slot 0, 1 events processed so far <<<===
AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1, run #0 on slot 0, 1 events processed so far <<<===
-ClassIDSvc 1 0 INFO getRegistryEntries: read 62 CLIDRegistry entries for module ALL
+ClassIDSvc 1 0 INFO getRegistryEntries: read 59 CLIDRegistry entries for module ALL
DMTest::CondReaderAlg 1 0 INFO Event 1 LBN 0
DMTest::CondReaderAlg 1 0 INFO xint xint (int) : 10
DMTest::CondReaderAlg 1 0 INFO scond 1000
@@ -440,9 +435,9 @@ DMTest::CondReaderAlg 29 0 INFO rl xint (int) : 7
DMTest::CondReaderAlg 29 0 INFO ts xint (int) : 900
DMTest::CondReaderAlg 29 0 INFO s3 907
AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #29, run #0 on slot 0, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 0 INFO ---> Loop Finished (seconds): 0.26469
+AthenaHiveEventLoopMgr 29 0 INFO ---> Loop Finished (seconds): 0.308121
condtest.pool.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 7C834F50-C775-6244-B465-8E3C1EC9CC44
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 04EAD7FD-B145-8B49-BF7D-419CCEC08071
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
IncidentProcAlg1 INFO Finalize
@@ -454,7 +449,7 @@ EventSelector INFO finalize
AvalancheSchedulerSvc INFO Joining Scheduler thread
PyComponentMgr INFO Finalizing PyComponentMgr...
EventDataSvc INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder INFO Folder /DMTest/RLTest (AttrList) db-read 4/7 objs/chan/bytes 28/1/112 (( 0.02 ))s
+IOVDbFolder INFO Folder /DMTest/RLTest (AttrList) db-read 4/7 objs/chan/bytes 28/1/112 (( 0.03 ))s
IOVDbFolder INFO Folder /DMTest/S2 (PoolRef) db-read 4/5 objs/chan/bytes 60/1/10860 (( 0.01 ))s
IOVDbFolder INFO Folder /DMTest/TSTest (AttrList) db-read 4/9 objs/chan/bytes 36/1/144 (( 0.01 ))s
IOVDbFolder INFO Folder /DMTest/TestAttrList (AttrList) db-read 4/10 objs/chan/bytes 120/1/480 (( 0.01 ))s
diff --git a/Control/DataModelTest/DataModelRunTests/share/CondWriter.ref b/Control/DataModelTest/DataModelRunTests/share/CondWriter.ref
index 62c522b7d4813bc40ff2ce3431fa30ce04f68c34..0f0751cb7802814232428548c8218fb95f1f0d4c 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondWriter.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondWriter.ref
@@ -1,66 +1,58 @@
-Sat Feb 9 06:07:09 CET 2019
+Tue Oct 6 19:45:42 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [AthenaExternals-22.0.1] [x86_64-centos7-gcc8-opt] [2.0.22/2840e19] -- built on [2019-02-07T2103]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "DataModelRunTests/CondWriter_jo.py"
-Py:ConfigurableDb INFO Read module info for 5454 configurables from 43 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Py:Athena INFO including file "DataModelRunTests/loadWriteDicts.py"
-EventInfoMgtInit: Got release version Athena-22.0.1
+EventInfoMgtInit: Got release version Athena-22.0.19
+Py:Athena INFO including file "DataModelRunTests/commonTrailer.py"
Py:Athena INFO including file "DataModelRunTests/setCatalog.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
- running on lxplus054.cern.ch on Sat Feb 9 06:07:23 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:45:52 2020
====================================================================================================================================
-ApplicationMgr INFO Successfully loaded modules : AthenaServices
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3045 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 770 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1295 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 722 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-02-07T2139/Athena/22.0.1/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus054.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO POOL WriteCatalog is file:CondWriter_catalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 1 connections and 1 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-xAODMaker::Even... INFO Luminosity information not available
-xAODMaker::Even... INFO Will take information from the EventInfo object
-ClassIDSvc INFO getRegistryEntries: read 1612 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
LoadWriteDicts INFO Initializing LoadWriteDicts...
-ClassIDSvc INFO getRegistryEntries: read 7317 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 9274 CLIDRegistry entries for module ALL
DMTest::CondWri... INFO Initializing DMTest::CondWriterAlg.CondStream - package version AthenaServices-00-00-00
-HistogramPersis...WARNING Histograms saving not required.
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
@@ -70,27 +62,27 @@ AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 217 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 110 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
IOVDbSvc INFO *** COOL exception caught: The database does not exist
IOVDbSvc INFO Create a new conditions database: sqlite://;schema=condtest.db;dbname=OFLP200
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain UPDATE [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] 56DD3528-75B9-E244-AE4D-904205EE8FDE
+Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] 04EAD7FD-B145-8B49-BF7D-419CCEC08071
Domain[ROOT_All] INFO condtest.pool.root
-RootDatabase.open INFO condtest.pool.root File version:61404
+RootDatabase.open INFO condtest.pool.root File version:62200
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO DMTest::S2 [EC2D9BCD-4B99-41EB-A799-82BAF48887FC]
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO DataHeader_p6 [4DDBD295-EFCE-472A-9EC8-15CD35A9EB8D]
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO DataHeaderForm_p6 [7BE56CEF-C866-4BEE-9348-A5F34B5F1DAD]
-ClassIDSvc INFO getRegistryEntries: read 37 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #0 1 events processed so far <<<===
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
-IOVSvcTool INFO IOVRanges will be checked at every Event
-ClassIDSvc INFO getRegistryEntries: read 54 CLIDRegistry entries for module ALL
+IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #0 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #0 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #0 3 events processed so far <<<===
@@ -150,7 +142,7 @@ AthenaEventLoopMgr INFO ===>>> start processing event #29, run #0 29 events
AthenaEventLoopMgr INFO ===>>> done processing event #29, run #0 30 events processed so far <<<===
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
condtest.pool.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] 56DD3528-75B9-E244-AE4D-904205EE8FDE
+Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] 04EAD7FD-B145-8B49-BF7D-419CCEC08071
Domain[ROOT_All] INFO > Deaccess DbDomain UPDATE [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
IncidentProcAlg1 INFO Finalize
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead.ref
index 2be80a31b53315dda307c1df69af43b1b09c95d9..c15c711e5fe79d5dd5c361982dc715f20b93c8ee 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead.ref
@@ -1,39 +1,41 @@
-Wed May 22 16:18:31 CEST 2019
+Wed Sep 9 14:46:24 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.2] [x86_64-centos7-gcc8-dbg] [atlas-work3/a2d84b85b4c] -- built on [2019-05-22T0547]
+Py:Athena INFO using release [WorkDir-22.0.18] [x86_64-centos7-gcc8-opt] [EventFormatMetaData/ed94d57] -- built on [2020-09-08T1647]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "DataModelRunTests/xAODTestRead_jo.py"
-Py:ConfigurableDb INFO Read module info for 5470 configurables from 64 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5573 configurables from 15 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Py:Athena INFO including file "DataModelRunTests/loadReadDicts.py"
Py:Athena INFO including file "EventAthenaPool/EventAthenaPoolItemList_joboptions.py"
+Py:Athena INFO including file "DataModelRunTests/commonTrailer.py"
Py:Athena INFO including file "DataModelRunTests/setCatalog.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v31r0)
- running on lxplus729.cern.ch on Wed May 22 16:18:53 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on ed38202b3ca6 on Wed Sep 9 14:46:30 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7341 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3362 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-xAODMaker::Even... INFO Initialising - Package version: xAODEventFormatCnv-00-00-00
+AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
+ClassIDSvc INFO getRegistryEntries: read 2023 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6539 CLIDRegistry entries for module ALL
+PyComponentMgr INFO Initializing PyComponentMgr...
+LoadReadDicts INFO Initializing LoadReadDicts...
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-20T2152/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-dbg/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus729.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-09-08T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host ed38202b3ca6 [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO POOL WriteCatalog is file:xAODTestRead_catalog.xml
@@ -42,26 +44,10 @@ Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool'])
EventSelector INFO EventSelection with query
PoolSvc INFO File is not in Catalog! Attempt to open it anyway.
-Warning in <TClass::Init>: no dictionary for class DMTest::C_v1 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::CAuxContainer_v1 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::CInfoAuxContainer_v1 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::CTrigAuxContainer_v1 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::G_v1 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::GAuxContainer_v1 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::CVecWithData_v1 is available
-Warning in <TClass::Init>: no dictionary for class ViewVector<DataVector<DMTest::C_v1> > is available
-Warning in <TClass::Init>: no dictionary for class DMTest::H_v1 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::HAuxContainer_v1 is available
-Warning in <TClass::Init>: no dictionary for class ViewVector<DataVector<DMTest::H_v1> > is available
-Warning in <TClass::Init>: no dictionary for class DMTest::S2 is available
-Warning in <TClass::Init>: no dictionary for class DMTest::S1 is available
-Warning in <TClass::Init>: no dictionary for class ElementLink<DataVector<DMTest::C_v1> > is available
-Warning in <TClass::Init>: no dictionary for class DataVector<DMTest::C_v1> is available
-Warning in <TClass::Init>: no dictionary for class DataVector<DMTest::H_v1> is available
DbSession INFO Open DbSession
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 1AA9ED5E-1E4B-3A55-A718-BF5CAC995112
Domain[ROOT_All] INFO xaoddata.root
-RootDatabase.open INFO xaoddata.root File version:61600
+RootDatabase.open INFO xaoddata.root File version:62006
xaoddata.root INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 1AA9ED5E-1E4B-3A55-A718-BF5CAC995112
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -70,51 +56,44 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 1AA9ED5E-1E4B-3A55-A718-BF5CAC995112
Domain[ROOT_All] INFO xaoddata.root
-RootDatabase.open INFO xaoddata.root File version:61600
+RootDatabase.open INFO xaoddata.root File version:62006
xaoddata.root INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 1AA9ED5E-1E4B-3A55-A718-BF5CAC995112
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 08312C01-E986-CD48-BFB5-512B5E9FED1A
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] A234C939-27F1-9149-B62A-7F0E38DD8890
Domain[ROOT_All] INFO xaoddata.root
-RootDatabase.open INFO xaoddata.root File version:61600
-ClassIDSvc INFO getRegistryEntries: read 1876 CLIDRegistry entries for module ALL
+RootDatabase.open INFO xaoddata.root File version:62006
+ClassIDSvc INFO getRegistryEntries: read 4440 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 1458 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 4601 CLIDRegistry entries for module ALL
-PyComponentMgr INFO Initializing PyComponentMgr...
-LoadReadDicts INFO Initializing LoadReadDicts...
-ClassIDSvc INFO getRegistryEntries: read 536 CLIDRegistry entries for module ALL
-DecisionSvc INFO Inserting stream: Stream1 with no Algs
+ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
+DecisionSvc INFO Inserting stream: Stream1 with no Algs
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: xaoddata2.root
Stream1 INFO I/O reinitialization...
-HistogramPersis...WARNING Histograms saving not required.
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
xaoddata.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 08312C01-E986-CD48-BFB5-512B5E9FED1A
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] A234C939-27F1-9149-B62A-7F0E38DD8890
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 08312C01-E986-CD48-BFB5-512B5E9FED1A
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] A234C939-27F1-9149-B62A-7F0E38DD8890
Domain[ROOT_All] INFO xaoddata.root
-RootDatabase.open INFO xaoddata.root File version:61600
+RootDatabase.open INFO xaoddata.root File version:62006
ApplicationMgr INFO Application Manager Started successfully
-ClassIDSvc INFO getRegistryEntries: read 345 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 521 CLIDRegistry entries for module ALL
AlgResourcePool INFO TopAlg list empty. Recovering the one of Application Manager
AthenaPoolConve... INFO massageEventInfo: unable to get OverrideRunNumberFromInput property from EventSelector
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #0, run #0 0 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 65 CLIDRegistry entries for module ALL
xAODTestReadCVec INFO cvec aux items: aFloat anInt anInt2 cEL dInt1 dVar1 dpInt1 dpvFloat pFloat pInt pvFloat pvInt
xAODTestReadCVec INFO Type of aux store: DMTest::CAuxContainer_v1
-RootAuxDynReader INFO FILE:LINE (const RootAuxDynReader::BranchInfo& RootAuxDynReader::getBranchInfo(const unsigned long&, const SG::AuxStoreInternal&)): attribute dVar1 (id=225 typename=f) has different type than the branch vector<int>
+RootAuxDynReader INFO FILE:LINE (const RootAuxDynReader::BranchInfo& RootAuxDynReader::getBranchInfo(const unsigned long&, const SG::AuxStoreInternal&)): attribute dVar1 (id=258 typename=f) has different type than the branch vector<int>
xAODTestReadCVec INFO anInt1 101 aFloat: 200 pInt: 501 pFloat: 0.01 anInt2: 301 dInt1: 401 dVar1: 451 dpInt1: 51 cEL: cvec[9]
pvInt: []
pvFloat: []
@@ -193,26 +172,26 @@ xAODTestRead INFO cvecWD 1001: 201 202 203 204 205 206 207 208 209 210
xAODTestReadCView INFO cview: 110 109 108 107 106 105 104 103 102 101
xAODTestReadHVec INFO hvec: 401.5 402.5 403.5 404.5 405.5 406.5 407.5 408.5 409.5 410.5 411.5 412.5 413.5 414.5 415.5 416.5 417.5 418.5 419.5 420.5
xAODTestReadHVec INFO hview: 420.5 419.5 418.5 417.5 416.5 415.5 414.5 413.5 412.5 411.5 410.5 409.5 408.5 407.5 406.5 405.5 404.5 403.5 402.5 401.5
-ClassIDSvc INFO getRegistryEntries: read 32 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 69 CLIDRegistry entries for module ALL
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain UPDATE [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] C63120BB-9387-D943-ACAF-377DCAB24B30
+Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] AFB33048-6EB5-2E46-A9EF-B3C0B57DB473
Domain[ROOT_All] INFO xaoddata2.root
-RootDatabase.open INFO xaoddata2.root File version:61600
-StorageSvc INFO Building shape according to reflection information using shape ID for:
-StorageSvc INFO DataVector<DMTest::H_v2> [CD6C3074-425B-4C08-AF1C-43D7E8C84288]
+RootDatabase.open INFO xaoddata2.root File version:62006
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO DMTest::HAuxContainer_v2 [2BDBFB04-C1C2-4B14-A977-3A61B8054700]
StorageSvc INFO Building shape according to reflection information using shape ID for:
-StorageSvc INFO ViewVector<DataVector<DMTest::H_v2> > [17849966-6667-4732-A1C7-096FBC778CF3]
-StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO xAOD::ShallowAuxInfo [BE505E75-8760-4F39-9331-689CB5443DB1]
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO xAOD::ShallowAuxContainer [C63C39D7-9501-49DC-B1B0-6AD98B1AEEFA]
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO xAOD::AuxContainerBase [C87C71B3-B03F-42FC-AF99-DF497F148397]
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO DataVector<DMTest::H_v2> [CD6C3074-425B-4C08-AF1C-43D7E8C84288]
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO ViewVector<DataVector<DMTest::H_v2> > [17849966-6667-4732-A1C7-096FBC778CF3]
+ClassIDSvc INFO getRegistryEntries: read 89 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #0 1 events processed so far <<<===
xAODTestReadCVec INFO cvec aux items: aFloat anInt anInt2 cEL dInt1 dVar1 dpInt1 dpvFloat pFloat pInt pvFloat pvInt
xAODTestReadCVec INFO Type of aux store: DMTest::CAuxContainer_v1
@@ -1721,21 +1700,21 @@ xAODTestReadCView INFO cview: 2010 2009 2008 2007 2006 2005 2004 2003 2002 20
xAODTestReadHVec INFO hvec: 8001.5 8002.5 8003.5 8004.5 8005.5 8006.5 8007.5 8008.5 8009.5 8010.5 8011.5 8012.5 8013.5 8014.5 8015.5 8016.5 8017.5 8018.5 8019.5 8020.5
xAODTestReadHVec INFO hview: 8020.5 8019.5 8018.5 8017.5 8016.5 8015.5 8014.5 8013.5 8012.5 8011.5 8010.5 8009.5 8008.5 8007.5 8006.5 8005.5 8004.5 8003.5 8002.5 8001.5
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #0 20 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 6 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
xaoddata.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 08312C01-E986-CD48-BFB5-512B5E9FED1A
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] A234C939-27F1-9149-B62A-7F0E38DD8890
xaoddata2.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] C63120BB-9387-D943-ACAF-377DCAB24B30
+Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] AFB33048-6EB5-2E46-A9EF-B3C0B57DB473
Domain[ROOT_All] INFO > Deaccess DbDomain UPDATE [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
IncidentProcAlg1 INFO Finalize
LoadReadDicts INFO Finalizing LoadReadDicts...
IncidentProcAlg2 INFO Finalize
DecisionSvc INFO Finalized successfully.
-PyComponentMgr INFO Finalizing PyComponentMgr...
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
XMLCatalog INFO File 'xAODTestRead_catalog.xml' does not exist. New file created.
+PyComponentMgr INFO Finalizing PyComponentMgr...
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ChronoStatSvc.f... INFO Service finalized successfully
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py
index 5636b77cb7902204ed8cc67338c8d2d1b952e313..fa57e02c166ff8d90a619c85f1685211666a0320 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead2_jo.py
@@ -42,14 +42,6 @@ include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
fullItemList+=["DMTest::CVec#cvec"]
fullItemList+=["xAOD::AuxContainerBase#cvecAux."]
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatSvc
-fmtsvc = xAODMaker__EventFormatSvc (FormatNames =
- ['DataVector<DMTest::C_v1>',
- 'DMTest::CAuxContainer_v1',
- 'DMTest::C_v1',
- ])
-ServiceMgr += fmtsvc
-
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += ["DEFAULT_SPLITLEVEL='1'"]
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
@@ -102,11 +94,19 @@ topSequence += DMTest__xAODTestReadHVec ("xAODTestReadHVec_scopy",
# Stream's output file
Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata2x.root',asAlg=True, noTag=True)
-Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
Stream1 = Stream1_Augmented.GetEventStream()
Stream1.WritingTool.SubLevelBranchName = '<key>'
Stream1.ItemList += fullItemList # List of DO's to write out
+from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
+for tool in Stream1.HelperTools:
+ if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
+ tool.TypeNames += [
+ 'DataVector<DMTest::C_v1>',
+ 'DMTest::CAuxContainer_v1',
+ 'DMTest::C_v1',
+ ]
+ break
# Avoid races when running tests in parallel.
FILECATALOG = 'xAODTestRead2_catalog.xml'
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py
index ecc06de1166cacaab317f2e2f08dbaa3891a1c0f..952308abb3d571b6f82ceb34008353fa736e8365 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadFilter_jo.py
@@ -47,14 +47,6 @@ fullItemList+=["xAOD::AuxContainerBase!#cvecAux."]
fullItemList+=["DMTest::C#cinfo"]
fullItemList+=["DMTest::CInfoAuxContainer#cinfoAux."]
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatSvc
-fmtsvc = xAODMaker__EventFormatSvc (FormatNames =
- ['DataVector<DMTest::C_v1>',
- 'DMTest::CAuxContainer_v1',
- 'DMTest::C_v1',
- ])
-ServiceMgr += fmtsvc
-
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += ["DEFAULT_SPLITLEVEL='1'"]
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
@@ -86,7 +78,19 @@ topSequence += DMTest__xAODTestDecor ('xAODTestDecor',
# Stream's output file
Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata_filt.root',asAlg=True,noTag=True)
-Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
+
+from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
+for tool in Stream1_Augmented.GetEventStream().HelperTools:
+ if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
+ tool.TypeNames += [
+ 'DataVector<DMTest::C_v1>',
+ 'DMTest::CAuxContainer_v1',
+ 'DMTest::C_v1',
+ ]
+ break
+
+
+
Stream1 = Stream1_Augmented.GetEventStream()
Stream1.WritingTool.SubLevelBranchName = '<key>'
Stream1.ItemList += fullItemList # List of DO's to write out
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadThinned.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadThinned.ref
index a94946954a00d5a914f6e6502e17247925017838..e7d30a1b356be37aa5ca632aa18d144e0bb1d4e7 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadThinned.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadThinned.ref
@@ -1,41 +1,39 @@
-Thu Oct 31 10:31:58 EDT 2019
+Wed Sep 9 15:05:53 CEST 2020
+Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [?-21.0.0] [?] [?/?] -- built on [?]
+Py:Athena INFO using release [WorkDir-22.0.18] [x86_64-centos7-gcc8-opt] [EventFormatMetaData/ed94d57] -- built on [2020-09-08T1647]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "DataModelRunTests/xAODTestReadThinned_jo.py"
-Py:ConfigurableDb INFO Read module info for 820 configurables from 2 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5573 configurables from 15 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Py:Athena INFO including file "DataModelRunTests/loadWriteDicts.py"
+Py:Athena INFO including file "DataModelRunTests/commonTrailer.py"
Py:Athena INFO including file "DataModelRunTests/setCatalog.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-# setting LC_ALL to "C"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Thu Oct 31 10:32:03 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on ed38202b3ca6 on Wed Sep 9 15:05:58 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3753 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3362 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 10214 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2023 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
LoadWriteDicts INFO Initializing LoadWriteDicts...
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Read replica configuration from /home/sss/atlas/dvtest/build/share/dbreplica.config
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-09-08T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 1 servers found for host karma [atlas_dd ]
+DBReplicaSvc INFO Total of 2 servers found for host ed38202b3ca6 [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc INFO POOL WriteCatalog is file:xAODTestReadThinned_catalog.xml
@@ -47,7 +45,7 @@ PoolSvc INFO File is not in Catalog! Attempt to open it anyway.
DbSession INFO Open DbSession
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] BF012F5D-24ED-4D8F-2F0B-73143B82F680
Domain[ROOT_All] INFO xaodthinned1.root
-RootDatabase.open INFO xaodthinned1.root File version:61800
+RootDatabase.open INFO xaodthinned1.root File version:62006
xaodthinned1.root INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] BF012F5D-24ED-4D8F-2F0B-73143B82F680
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -56,30 +54,30 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] BF012F5D-24ED-4D8F-2F0B-73143B82F680
Domain[ROOT_All] INFO xaodthinned1.root
-RootDatabase.open INFO xaodthinned1.root File version:61800
+RootDatabase.open INFO xaodthinned1.root File version:62006
xaodthinned1.root INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] BF012F5D-24ED-4D8F-2F0B-73143B82F680
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 2CDDCA0D-462F-5D42-B5DB-6E2BF9556CA1
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EAB90F90-4500-D944-987B-2E9A405C4EE2
Domain[ROOT_All] INFO xaodthinned1.root
-RootDatabase.open INFO xaodthinned1.root File version:61800
-ClassIDSvc INFO getRegistryEntries: read 2127 CLIDRegistry entries for module ALL
+RootDatabase.open INFO xaodthinned1.root File version:62006
+ClassIDSvc INFO getRegistryEntries: read 10589 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-HistogramPersis...WARNING Histograms saving not required.
+ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
xaodthinned1.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 2CDDCA0D-462F-5D42-B5DB-6E2BF9556CA1
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EAB90F90-4500-D944-987B-2E9A405C4EE2
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 2CDDCA0D-462F-5D42-B5DB-6E2BF9556CA1
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EAB90F90-4500-D944-987B-2E9A405C4EE2
Domain[ROOT_All] INFO xaodthinned1.root
-RootDatabase.open INFO xaodthinned1.root File version:61800
+RootDatabase.open INFO xaodthinned1.root File version:62006
ApplicationMgr INFO Application Manager Started successfully
-ClassIDSvc INFO getRegistryEntries: read 10 CLIDRegistry entries for module ALL
AlgResourcePool INFO TopAlg list empty. Recovering the one of Application Manager
AthenaPoolConve... INFO massageEventInfo: unable to get OverrideRunNumberFromInput property from EventSelector
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
@@ -99,11 +97,11 @@ xAODTestReadCLinks INFO (:inv) (:inv) (:inv) (:inv) (:inv) (:inv) (:inv) (:i
xAODTestReadCLinks INFO (:inv) (:inv) (:inv) (:inv) (:inv) (:inv) (:inv) (:inv) (:inv) (:inv)
xAODTestReadCVec2 INFO cvec2 101 102 103 105 106 107 109 110
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 65 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 57 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #0 1 events processed so far <<<===
xAODTestReadCVec INFO cvec aux items: aFloat anInt anInt2 cEL dVar1 dpInt1 dpvFloat pFloat pInt pvFloat pvInt
xAODTestReadCVec INFO Type of aux store: DMTest::CAuxContainer_v1
-RootAuxDynReader INFO FILE:LINE (const RootAuxDynReader::BranchInfo& RootAuxDynReader::getBranchInfo(const unsigned long&, const SG::AuxStoreInternal&)): attribute dVar1 (id=225 typename=f) has different type than the branch vector<int>
+RootAuxDynReader INFO FILE:LINE (const RootAuxDynReader::BranchInfo& RootAuxDynReader::getBranchInfo(const unsigned long&, const SG::AuxStoreInternal&)): attribute dVar1 (id=258 typename=f) has different type than the branch vector<int>
xAODTestReadCVec INFO anInt1 201 aFloat: 400 pInt: 1001 pFloat: 0.02 anInt2: 601 dVar1: 901 dpInt1: 101 cEL: [0]
pvInt: []
pvFloat: []
@@ -856,7 +854,7 @@ xAODTestReadCLinks INFO (cvec:5) (cvec:4) (:inv) (:inv) (cvec:3) (cvec:2) (:
xAODTestReadCVec2 INFO cvec2 2001 2002 2003 2005 2006 2007 2009 2010
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #0 20 events processed so far <<<===
xaodthinned1.root INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 2CDDCA0D-462F-5D42-B5DB-6E2BF9556CA1
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EAB90F90-4500-D944-987B-2E9A405C4EE2
ApplicationMgr INFO Application Manager Stopped successfully
IncidentProcAlg1 INFO Finalize
LoadWriteDicts INFO Finalizing LoadWriteDicts...
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
index 11f7b161da81f53ed472694803fa91ce5fd741cc..32f75aa484cfc21f0115d58a90b1f8475775adf7 100755
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead_jo.py
@@ -79,16 +79,6 @@ fullItemList+=["xAOD::ShallowAuxInfo#scopy_cinfoAux."]
fullItemList+=["DMTest::HVec#scopy_hvec"]
fullItemList+=["xAOD::ShallowAuxContainer#scopy_hvecAux."]
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatSvc
-fmtsvc = xAODMaker__EventFormatSvc (FormatNames =
- ['DataVector<DMTest::C_v1>',
- 'DMTest::CAuxContainer_v1',
- 'DMTest::CVecWithData_v1',
- 'DMTest::CTrigAuxContainer_v1',
- 'DMTest::C_v1',
- 'DMTest::CInfoAuxContainer_v1'])
-ServiceMgr += fmtsvc
-
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += ["DEFAULT_SPLITLEVEL='1'"]
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
@@ -143,13 +133,22 @@ topSequence += DMTest__xAODTestDecor ('AuxDataTestDecor1_scopy',
# Stream's output file
Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata2.root',asAlg=True, noTag=True)
-Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
Stream1 = Stream1_Augmented.GetEventStream()
Stream1.WritingTool.SubLevelBranchName = '<key>'
Stream1.ItemList += fullItemList # List of DO's to write out
-theApp.CreateSvc += ['xAODMaker::EventFormatSvc']
-
+from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
+for tool in Stream1.HelperTools:
+ if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
+ tool.TypeNames += [
+ 'DataVector<DMTest::C_v1>',
+ 'DMTest::CAuxContainer_v1',
+ 'DMTest::CVecWithData_v1',
+ 'DMTest::CTrigAuxContainer_v1',
+ 'DMTest::C_v1',
+ 'DMTest::CInfoAuxContainer_v1',
+ ]
+ break
# Avoid races when running tests in parallel.
FILECATALOG = 'xAODTestRead_catalog.xml'
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py
index 58e431e76aedb2a1f5e0aed17ea0a6fc5857fa4a..ac94beb28e9a7f1b2c544babb6b2b294350ea91b 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestTypelessRead_jo.py
@@ -65,16 +65,6 @@ fullItemList+=["DMTest::HVec#copy_hvec"]
fullItemList+=["DMTest::HAuxContainer#copy_hvecAux."]
fullItemList+=["DMTest::HView#copy_hview"]
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatSvc
-fmtsvc = xAODMaker__EventFormatSvc (FormatNames =
- ['DataVector<DMTest::C_v1>',
- 'DMTest::CVecWithData_v1',
- 'DMTest::CAuxContainer_v1',
- 'DMTest::CTrigAuxContainer_v1',
- 'DMTest::C_v1',
- 'DMTest::CInfoAuxContainer_v1'])
-ServiceMgr += fmtsvc
-
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += ["DEFAULT_SPLITLEVEL='1'"]
#--------------------------------------------------------------
@@ -94,12 +84,24 @@ topSequence += DMTest__xAODTestTypelessRead ("xAODTestTypelessRead",
# Stream's output file
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata3.root',asAlg=True,noTag=True)
-Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
Stream1 = Stream1_Augmented.GetEventStream()
Stream1.WritingTool.SubLevelBranchName = '<key>'
# List of DO's to write out
Stream1.ItemList += fullItemList
+from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
+for tool in Stream1.HelperTools:
+ if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
+ tool.TypeNames += [
+ 'DataVector<DMTest::C_v1>',
+ 'DMTest::CVecWithData_v1',
+ 'DMTest::CAuxContainer_v1',
+ 'DMTest::CTrigAuxContainer_v1',
+ 'DMTest::C_v1',
+ 'DMTest::CInfoAuxContainer_v1',
+ ]
+ break
+
# Avoid races when running tests in parallel.
FILECATALOG = 'xAODTestTypelessRead_catalog.xml'
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestWriteThinned_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestWriteThinned_jo.py
index 5a75d8bcb6b778a43e2ff765cf07a2619778f688..092568973ec180d57acac36befab14c37fbaefca 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestWriteThinned_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestWriteThinned_jo.py
@@ -58,8 +58,6 @@ topSequence += DMTest__xAODTestThinCVec ("xAODTestThinCVec2b", Stream = 'Thinned
#--------------------------------------------------------------
# Output options
#--------------------------------------------------------------
-theApp.CreateSvc += ['xAODMaker::EventFormatSvc']
-
# ItemList:
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
fullItemList+=["DMTest::CVec#cvec"]
@@ -74,27 +72,28 @@ fullItemList+=["DMTest::CLinksContainer#clinksContainer2"]
fullItemList+=["DMTest::CLinksAuxContainer#clinksContainer2Aux."]
fullItemList+=["DMTest::CLinksAOD#clinksAOD"]
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatSvc
-fmtsvc = xAODMaker__EventFormatSvc (FormatNames =
- ['DataVector<DMTest::C_v1>',
- 'DMTest::CAuxContainer_v1',
- 'DMTest::C_v1',
- 'DMTest::CLinks_v1',
- 'DataVector<DMTest::CLinks_v1>',
- 'DMTest::CLinksAuxInfo_v1',
- 'DMTest::CLinksAuxContainer_v1',
- ])
-ServiceMgr += fmtsvc
-
# Stream's output file
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
Thinned1_Augmented = MSMgr.NewPoolStream ('Thinned1', 'xaodthinned1.root', asAlg=True, noTag=True)
-Thinned1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
Thinned1 = Thinned1_Augmented.GetEventStream()
Thinned1.WritingTool.SubLevelBranchName = '<key>'
# List of DO's to write out
Thinned1.ItemList += fullItemList
+from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
+for tool in Thinned1.HelperTools:
+ if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
+ tool.TypeNames += [
+ 'DataVector<DMTest::C_v1>',
+ 'DMTest::CAuxContainer_v1',
+ 'DMTest::C_v1',
+ 'DMTest::CLinks_v1',
+ 'DataVector<DMTest::CLinks_v1>',
+ 'DMTest::CLinksAuxInfo_v1',
+ 'DMTest::CLinksAuxContainer_v1',
+ ]
+ break
+
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += ["DEFAULT_SPLITLEVEL='1'"]
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
index ee72dfc4c5b8c04d6f214553f97f21919205cecc..14dde8f7587a223ecb076edf5c921ec8c5e9e719 100755
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestWrite_jo.py
@@ -63,7 +63,6 @@ topSequence += DMTest__MetaWriterAlg ("MetaWriterAlg")
#--------------------------------------------------------------
# Output options
#--------------------------------------------------------------
-theApp.CreateSvc += ['xAODMaker::EventFormatSvc']
# ItemList:
include( "EventAthenaPool/EventAthenaPoolItemList_joboptions.py" )
@@ -83,29 +82,9 @@ fullItemList+=["DMTest::HAuxContainer#hvecAux."]
fullItemList+=["DMTest::HView#hview"]
fullItemList+=["DMTest::S2#S2"]
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatSvc
-fmtsvc = xAODMaker__EventFormatSvc (FormatNames =
- ['DataVector<DMTest::C_v1>',
- 'DMTest::CVecWithData_v1',
- 'DMTest::CAuxContainer_v1',
- 'DMTest::CTrigAuxContainer_v1',
- 'ViewVector<DataVector<DMTest::C_v1,DataModel_detail::NoBase> >',
- 'DMTest::C_v1',
- 'DMTest::CInfoAuxContainer_v1',
- 'DataVector<DMTest::G_v1>',
- 'DMTest::GAuxContainer_v1',
- 'DMTest::G_v1',
- 'DMTest::H_v1',
- 'DataVector<DMTest::H_v1>',
- 'ViewVector<DataVector<DMTest::H_v1,DataModel_detail::NoBase> >',
- 'DMTest::HAuxContainer_v1',
- ])
-ServiceMgr += fmtsvc
-
# Stream's output file
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
Stream1_Augmented = MSMgr.NewPoolStream ('Stream1', 'xaoddata.root', asAlg=True, noTag=True)
-Stream1_Augmented.AddMetaDataItem ('xAOD::EventFormat#EventFormat')
Stream1 = Stream1_Augmented.GetEventStream()
Stream1.WritingTool.SubLevelBranchName = '<key>'
# List of DO's to write out
@@ -115,6 +94,27 @@ Stream1.MetadataItemList += [ 'DMTest::S1#MetaS1',
'DMTest::CInfoAuxContainer#MetaCAux.' ]
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += ["DEFAULT_SPLITLEVEL='1'"]
+from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
+for tool in Stream1.HelperTools:
+ if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
+ tool.TypeNames += [
+ 'DataVector<DMTest::C_v1>',
+ 'DMTest::CVecWithData_v1',
+ 'DMTest::CAuxContainer_v1',
+ 'DMTest::CTrigAuxContainer_v1',
+ 'ViewVector<DataVector<DMTest::C_v1,DataModel_detail::NoBase> >',
+ 'DMTest::C_v1',
+ 'DMTest::CInfoAuxContainer_v1',
+ 'DataVector<DMTest::G_v1>',
+ 'DMTest::GAuxContainer_v1',
+ 'DMTest::G_v1',
+ 'DMTest::H_v1',
+ 'DataVector<DMTest::H_v1>',
+ 'ViewVector<DataVector<DMTest::H_v1,DataModel_detail::NoBase> >',
+ 'DMTest::HAuxContainer_v1',
+ ]
+ break
+
# Increment LBN every two events.
from McEventSelector import McEventSelectorConf
diff --git a/Control/RngComps/python/RandomServices.py b/Control/RngComps/python/RandomServices.py
index aa4f9555958eda455b5cebd10eefba1726a6a271..16f7018c8ac0bc18f3ca327f41665e2f5892d829 100755
--- a/Control/RngComps/python/RandomServices.py
+++ b/Control/RngComps/python/RandomServices.py
@@ -18,8 +18,8 @@ AthEngines = {
def dSFMT(seed, name="AtDSFMTGenSvc"):
"""Return a ComponentAccumulator containing an AtDSFMTGenSvc with seed"""
- acc = ComponentAccumulator(name)
- service = AtDSFMTGenSvc()
+ acc = ComponentAccumulator()
+ service = AtDSFMTGenSvc(name)
service.Seeds.append(seed)
acc.addService(service)
return acc
diff --git a/Control/RootUtils/CMakeLists.txt b/Control/RootUtils/CMakeLists.txt
index 1ef859b0e00d54ec43cd77cb559b0dfe714dbc72..0bb8ca72952e1051be1f163085057c29b4a5f4ab 100644
--- a/Control/RootUtils/CMakeLists.txt
+++ b/Control/RootUtils/CMakeLists.txt
@@ -4,61 +4,53 @@
atlas_subdir( RootUtils )
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost COMPONENTS thread )
find_package( Python COMPONENTS Development )
-find_package( ROOT COMPONENTS RIO Hist Tree PyROOT Core MathCore ROOTTPython )
-string( REPLACE PyROOT Core ROOT_LIBRARIES_NOPYROOT "${ROOT_LIBRARIES}" )
+find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore ROOTTPython
+ cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} )
# Component(s) in the package:
-atlas_generate_reflex_dictionary( dict_cpp RootUtils
- HEADER ${CMAKE_CURRENT_SOURCE_DIR}/RootUtils/RootUtilsDict.h
- SELECTION ${CMAKE_CURRENT_SOURCE_DIR}/RootUtils/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- )
+atlas_generate_reflex_dictionary( dict_cpp RootUtils
+ HEADER ${CMAKE_CURRENT_SOURCE_DIR}/RootUtils/RootUtilsDict.h
+ SELECTION ${CMAKE_CURRENT_SOURCE_DIR}/RootUtils/selection.xml
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES CxxUtils )
atlas_add_library( RootUtils
- src/*.cxx ${dict_cpp}
- PUBLIC_HEADERS RootUtils
- INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES CxxUtils ${Boost_LIBRARIES}
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES_NOPYROOT} TestTools )
-
+ src/*.cxx ${dict_cpp}
+ PUBLIC_HEADERS RootUtils
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} CxxUtils )
add_dependencies( RootUtils RootUtilsDictGen )
atlas_add_library( RootUtilsPyROOT
- src/pyroot/*.cxx
- PUBLIC_HEADERS RootUtils
- INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} RootUtils
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
+ src/pyroot/*.cxx
+ PUBLIC_HEADERS RootUtils
+ INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
+ ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} ${ROOT_LIBRARIES}
+ CxxUtils )
atlas_add_dictionary( RootUtilsPyROOTDict
- RootUtils/RootUtilsPyROOTDict.h
- RootUtils/selection_PyROOT.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES_NOPYROOT} ${Boost_LIBRARIES} TestTools RootUtils RootUtilsPyROOT )
+ RootUtils/RootUtilsPyROOTDict.h
+ RootUtils/selection_PyROOT.xml
+ LINK_LIBRARIES RootUtilsPyROOT )
+# Test(s) in the package:
atlas_add_test( Type_test
- SOURCES
- test/Type_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Python_LIBRARIES} ${Boost_LIBRARIES} TestTools RootUtils RootUtilsPyROOT
- PROPERTIES TIMEOUT 300 )
+ SOURCES test/Type_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} RootUtils
+ PROPERTIES TIMEOUT 300 )
atlas_add_test( TSMethodCall_test
- SOURCES
- test/TSMethodCall_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Python_LIBRARIES} ${Boost_LIBRARIES} TestTools RootUtils RootUtilsPyROOT )
+ SOURCES test/TSMethodCall_test.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} RootUtils )
-if( NOT XAOD_ANALYSIS )
-# Doesn't work in AnalysisBase because ROOT_INCLUDE_PATH is not set correctly.
atlas_add_test( TTreePatch_test
- SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/TTreePatch_t.py )
-endif()
-
+ SCRIPT ${Python_EXECUTABLE}
+ ${CMAKE_CURRENT_SOURCE_DIR}/test/TTreePatch_t.py )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Control/RootUtils/python/PyROOTFixes.py b/Control/RootUtils/python/PyROOTFixes.py
index 6a1de3856c364947d1850fa1e831bb07e0928a0a..42ab7731250681dceb699dc3fd0c99d9cb1ab00d 100644
--- a/Control/RootUtils/python/PyROOTFixes.py
+++ b/Control/RootUtils/python/PyROOTFixes.py
@@ -45,6 +45,12 @@ def _getClassIfDictionaryExists (cname):
if cl.HasDictionary(): return cl
return None
+# Force-load the main Gaudi library if it's available. If this package's library
+# is loaded before Gaudi, the application gets into a weird state. Hopefully we
+# will be able to remove this with future compiler versions. (GCC 10?...)
+if cppyy.gbl.gSystem.FindDynamicLibrary( 'libGaudiKernel', True ):
+ cppyy.load_library( 'libGaudiKernel' )
+ pass
ROOT.RootUtils.PyLogger
ROOT.RootUtils.PyROOTTypePatch.initialize()
diff --git a/Control/SGComps/src/SGInputLoader.cxx b/Control/SGComps/src/SGInputLoader.cxx
index 6bc175d0ef462f7fadf8de830c9824c7a9057b98..fd70dbf70b2c26dd35731c5e87feb0beb9570e64 100644
--- a/Control/SGComps/src/SGInputLoader.cxx
+++ b/Control/SGComps/src/SGInputLoader.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2017, 2019, 2020 CERN for the benefit of the ATLAS collaboration
*/
// SGInputLoader.cxx
@@ -114,8 +114,14 @@ SGInputLoader::execute()
SG::VarHandleKey vhk(obj->clid(),obj->key(),Gaudi::DataHandle::Writer);
if (StoreID::findStoreID(vhk.storeHandle().name()) == StoreID::EVENT_STORE) {
toLoad.emplace(*obj);
- } else {
- ATH_MSG_WARNING("Will not auto-load proxy for non-EventStore object: "
+ }
+ else if (StoreID::findStoreID(vhk.storeHandle().name()) == StoreID::CONDITION_STORE) {
+ ATH_MSG_ERROR("Unresolved conditions dependency: "
+ << *obj);
+ return StatusCode::FAILURE;
+ }
+ else {
+ ATH_MSG_DEBUG("Will not auto-load proxy for non-EventStore object: "
<< *obj);
}
}
diff --git a/Control/StoreGateBindings/python/Bindings.py b/Control/StoreGateBindings/python/Bindings.py
index 8400673b2e54284944ef76b90fe69efdd169be0e..cc8f7c746c5d75a9c08e0131cd3c603a37d7b3ca 100644
--- a/Control/StoreGateBindings/python/Bindings.py
+++ b/Control/StoreGateBindings/python/Bindings.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# @file: StoreGateBindings/python/Bindings.py
# @author: Wim Lavrijsen <WLavrijsen@lbl.gov>
@@ -83,7 +83,7 @@ def _setup():
# dict-pythonization of storegate: __getitem__
def __getitem__ (self, key):
try:
- ret = py_sg_getitem(self, key.encode())
+ ret = py_sg_getitem(self, str(key).encode())
except LookupError as err:
raise KeyError(str(err))
if ret and hasattr(ret,'setStore') and not ret.hasStore():
@@ -136,16 +136,16 @@ def _setup():
clid = self._pyclidsvc.clid(clid.__name__)
if clid is None:
return [p.name() for p in self.proxies()]
- return list(self._cpp_keys(clid, allKeys))
+ return [str(x) for x in self._cpp_keys(clid, allKeys)]
StoreGateSvc._cpp_keys = StoreGateSvc.keys
StoreGateSvc.keys = keys
#The cppyy version that comes with ROOT v6.22 checks also __len__!=0
#when casting to bool. Since we defined a __len__ method, newly-created
- #(empty) StoreGate instances are always casted to False and therfore
+ #(empty) StoreGate instances are always casted to False and therefore
#considered invalid.
- #Work-aroudn by implementing our own __bool__ method
+ #Work-around by implementing our own __bool__ method
StoreGateSvc.__bool__ = lambda self : True
return
diff --git a/Control/xAODRootAccess/Root/TEvent.cxx b/Control/xAODRootAccess/Root/TEvent.cxx
index 056528db31f0c969d133bdf78e03355cb943a848..0f3c8fdc91e13a36ce1c285aa0772541cf76670b 100644
--- a/Control/xAODRootAccess/Root/TEvent.cxx
+++ b/Control/xAODRootAccess/Root/TEvent.cxx
@@ -424,8 +424,9 @@ namespace xAOD {
}
// Check if the EventFormat branch is available:
- static const char* EVENTFORMAT_BRANCH_NAME = "EventFormat";
- if( ! m_inMetaTree->GetBranch( EVENTFORMAT_BRANCH_NAME ) ) {
+ static const std::string eventFormatBranchName =
+ Utils::getFirstBranchMatch( m_inMetaTree, "EventFormat");
+ if( ! m_inMetaTree->GetBranch( eventFormatBranchName.c_str() ) ) {
// This can happen when the file was produced by an Athena job that
// didn't have any input events itself. This means that the file
// doesn't actually have any useful metadata.
@@ -439,7 +440,7 @@ namespace xAOD {
// Read in the event format object:
EventFormat* format = 0; ::TBranch* br = 0;
const Int_t status =
- m_inMetaTree->SetBranchAddress( EVENTFORMAT_BRANCH_NAME,
+ m_inMetaTree->SetBranchAddress( eventFormatBranchName.c_str(),
&format, &br );
if( status < 0 ) {
::Error( "xAOD::TEvent::readFrom",
@@ -3399,4 +3400,5 @@ namespace xAOD {
return getOutputObject( key, ti, metadata );
}
+
} // namespace xAOD
diff --git a/Control/xAODRootAccess/Root/Utils.cxx b/Control/xAODRootAccess/Root/Utils.cxx
index 56ee1090c47a97d5e91f25fc67da44cdf331a119..1d7d08b92fcd018c32ac15f30b2b1519c848185d 100644
--- a/Control/xAODRootAccess/Root/Utils.cxx
+++ b/Control/xAODRootAccess/Root/Utils.cxx
@@ -6,6 +6,7 @@
// STL include(s):
#include <functional>
+#include <regex>
// ROOT include(s):
#include <TError.h>
@@ -313,6 +314,22 @@ namespace xAOD {
return result;
}
+ std::string getFirstBranchMatch( TTree * tree,
+ const std::string& pre ) {
+ const TObjArray * pBranches = tree->GetListOfBranches();
+ const std::regex pattern( ".*" + pre + ".*" );
+
+ for( int i = 0; i < pBranches->GetLast() ; ++i ) {
+ const std::string name = pBranches->At(i)->GetName();
+
+ if( std::regex_match( name, pattern ) )
+ return name;
+
+ }
+
+ return pre;
+ }
+
} // namespace Utils
} // namespace xAOD
diff --git a/Control/xAODRootAccess/xAODRootAccess/tools/TReturnCode.h b/Control/xAODRootAccess/xAODRootAccess/tools/TReturnCode.h
index 2f103abe55c31b5f206f681ed0a053e680d2be23..dab7eaac86b2b2d2f88da8c7eba48649fab0c88a 100644
--- a/Control/xAODRootAccess/xAODRootAccess/tools/TReturnCode.h
+++ b/Control/xAODRootAccess/xAODRootAccess/tools/TReturnCode.h
@@ -27,7 +27,7 @@ namespace xAOD {
/// $Revision: 598368 $
/// $Date: 2014-05-22 12:23:54 +0200 (Thu, 22 May 2014) $
///
- class TReturnCode {
+ class [[nodiscard]] TReturnCode {
public:
/// Enumeration listing the possible return codes
diff --git a/Control/xAODRootAccess/xAODRootAccess/tools/Utils.h b/Control/xAODRootAccess/xAODRootAccess/tools/Utils.h
index 2dec08cd0d7360e125903ec77a712ebf67b308f5..28db3560c6f3834fbeed663d66b94fe3d8aadeae 100644
--- a/Control/xAODRootAccess/xAODRootAccess/tools/Utils.h
+++ b/Control/xAODRootAccess/xAODRootAccess/tools/Utils.h
@@ -17,6 +17,7 @@ extern "C" {
// ROOT include(s):
#include <TDataType.h>
+#include <TTree.h>
namespace xAOD {
@@ -37,6 +38,9 @@ namespace xAOD {
/// Get the type name as it is known to ROOT, based on std::type_info
std::string getTypeName( const std::type_info& ti );
+ /// Search for branches, returns search term on no result
+ std::string getFirstBranchMatch( TTree* tree, const std::string& pre );
+
} // namespace Utils
} // namespace xAOD
diff --git a/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config b/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config
index 902fe0284263ff85a0dad4fc4500007dc5ce9429..d3746b9f85b458c19bc57112b69e642da839b829 100644
--- a/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/AFP/collisions_run.config
@@ -1,6 +1,6 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
+#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
############################################################
# AFP
# Nikola Dikic
@@ -10,7 +10,7 @@
# Reference
reference AFPBinContentReference {
location = /eos/atlas/atlascerngroupdisk/data-dqm/references/Other/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/Other/
- file = data18_13TeV.00337176.physics_Main.merge.HIST.f940_h308.root
+ file = AFPOutput62-337176-500k.root
path = run_337176
name = same_name
}
@@ -24,31 +24,111 @@ output top_level {
output AFP {
output SiT {
output pixelColRow2D {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
output PixelColIDChip {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
output PixelRowIDChip {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
output SiTimeOverThreshold {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
+ }
+ output HitsPerPlanes {
}
output Cluster {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
output Track {
}
output clustersPerPlane {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
output clustersPerStation {
}
output clustersPerPlaneFront {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
output clustersPerPlaneEnd {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
output clustersPerPlaneMiddle {
+ output nearAside {
+ }
+ output farAside {
+ }
+ output nearCside {
+ }
+ output farCside {
+ }
}
}
output ToF {
output HitBarvsTrain {
}
+ output HitsPerBarsInTrain {
+ output farAside {
+ }
+ output farCside {
+ }
+ }
}
}
}
@@ -60,413 +140,480 @@ output top_level {
dir AFP {
dir SiT {
dir pixelColRow2D {
- hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P0 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P1 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P2 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P3 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P0 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P1 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P2 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P3 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farAside_P0 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farAside_P1 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farAside_P2 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farAside_P3 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farCside_P0 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farCside_P1 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farCside_P2 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
- }
- hist pixelColIDChip_vs_pixelRowIDChip_farCside_P3 {
- algorithm = HNE
- output = AFP/SiT/pixelColRow2D
- display = LogZ,Draw=COLZ
+ dir nearAside {
+ hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_nearAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ }
+ dir nearCside {
+ hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_nearCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ }
+ dir farAside {
+ hist pixelColIDChip_vs_pixelRowIDChip_farAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farAside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_farAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farAside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_farAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farAside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_farAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farAside
+ display = LogZ,Draw=COLZ
+ }
+ }
+ dir farCside {
+ hist pixelColIDChip_vs_pixelRowIDChip_farCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farCside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_farCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farCside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_farCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farCside
+ display = LogZ,Draw=COLZ
+ }
+ hist pixelColIDChip_vs_pixelRowIDChip_farCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/pixelColRow2D/farCside
+ display = LogZ,Draw=COLZ
+ }
}
}
dir PixelColIDChip {
- hist pixelColIDChip_nearAside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_nearAside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_nearAside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_nearAside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farAside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farAside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farAside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farAside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_nearCside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_nearCside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_nearCside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_nearCside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farCside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farCside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farCside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
- }
- hist pixelColIDChip_farCside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelColIDChip
- display = Draw=HIST
+ dir nearAside {
+ hist pixelColIDChip_nearAside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearAside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_nearAside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearAside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_nearAside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearAside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_nearAside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearAside
+ display = Draw=HIST
+ }
+ }
+ dir farAside {
+ hist pixelColIDChip_farAside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farAside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_farAside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farAside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_farAside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farAside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_farAside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farAside
+ display = Draw=HIST
+ }
+ }
+ dir nearCside {
+ hist pixelColIDChip_nearCside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearCside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_nearCside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearCside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_nearCside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearCside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_nearCside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/nearCside
+ display = Draw=HIST
+ }
+ }
+ dir farCside {
+ hist pixelColIDChip_farCside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farCside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_farCside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farCside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_farCside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farCside
+ display = Draw=HIST
+ }
+ hist pixelColIDChip_farCside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelColIDChip/farCside
+ display = Draw=HIST
+ }
}
}
dir PixelRowIDChip {
- hist pixelRowIDChip_nearAside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_nearAside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_nearAside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_nearAside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farAside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farAside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farAside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farAside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_nearCside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_nearCside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_nearCside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_nearCside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farCside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farCside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farCside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
- }
- hist pixelRowIDChip_farCside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/PixelRowIDChip
- display = Draw=HIST
+ dir nearAside {
+ hist pixelRowIDChip_nearAside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearAside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_nearAside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearAside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_nearAside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearAside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_nearAside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearAside
+ display = Draw=HIST
+ }
+ }
+ dir farAside {
+ hist pixelRowIDChip_farAside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farAside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_farAside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farAside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_farAside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farAside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_farAside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farAside
+ display = Draw=HIST
+ }
+ }
+ dir nearCside {
+ hist pixelRowIDChip_nearCside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearCside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_nearCside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearCside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_nearCside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearCside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_nearCside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/nearCside
+ display = Draw=HIST
+ }
+ }
+ dir farCside {
+ hist pixelRowIDChip_farCside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farCside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_farCside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farCside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_farCside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farCside
+ display = Draw=HIST
+ }
+ hist pixelRowIDChip_farCside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/PixelRowIDChip/farCside
+ display = Draw=HIST
+ }
}
}
dir SiTimeOverThreshold {
- hist timeOverThreshold_nearAside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_nearAside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_nearAside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_nearAside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_farAside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_farAside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_farAside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_farAside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_nearCside_P0 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
+ dir nearAside {
+ hist timeOverThreshold_nearAside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearAside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_nearAside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearAside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_nearAside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearAside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_nearAside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearAside
+ display = Draw=HIST
+ }
+ }
+ dir farAside {
+ hist timeOverThreshold_farAside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farAside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_farAside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farAside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_farAside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farAside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_farAside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farAside
+ display = Draw=HIST
+ }
+ }
+ dir nearCside {
+ hist timeOverThreshold_nearCside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearCside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_nearCside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearCside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_nearCside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearCside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_nearCside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/nearCside
+ display = Draw=HIST
+ }
+ }
+ dir farCside {
+ hist timeOverThreshold_farCside_P0 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farCside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_farCside_P1 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farCside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_farCside_P2 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farCside
+ display = Draw=HIST
+ }
+ hist timeOverThreshold_farCside_P3 {
+ algorithm = AFPBinContentComp
+ output = AFP/SiT/SiTimeOverThreshold/farCside
+ display = Draw=HIST
+ }
}
- hist timeOverThreshold_nearCside_P1 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_nearCside_P2 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
- display = Draw=HIST
- }
- hist timeOverThreshold_nearCside_P3 {
- algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
+ }
+ dir HitsPerPlanes {
+ hist planeHitsAll {
+ algorithm = HNE
+ output = AFP/SiT/HitsPerPlanes
display = Draw=HIST
}
- hist timeOverThreshold_farCside_P0 {
+ hist planeHits_nearAside {
algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
+ output = AFP/SiT/HitsPerPlanes
display = Draw=HIST
}
- hist timeOverThreshold_farCside_P1 {
+ hist planeHits_nearCside {
algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
+ output = AFP/SiT/HitsPerPlanes
display = Draw=HIST
}
- hist timeOverThreshold_farCside_P2 {
+ hist planeHits_farAside {
algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
+ output = AFP/SiT/HitsPerPlanes
display = Draw=HIST
}
- hist timeOverThreshold_farCside_P3 {
+ hist planeHits_farCside {
algorithm = AFPBinContentComp
- output = AFP/SiT/SiTimeOverThreshold
+ output = AFP/SiT/HitsPerPlanes
display = Draw=HIST
}
}
dir Cluster {
- hist clusterX_vs_clusterY_nearAside_P0 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_nearAside_P1 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_nearAside_P2 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_nearAside_P3 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farAside_P0 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farAside_P1 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farAside_P2 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farAside_P3 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_nearCside_P0 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_nearCside_P1 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_nearCside_P2 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_nearCside_P3 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farCside_P0 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farCside_P1 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farCside_P2 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
- }
- hist clusterX_vs_clusterY_farCside_P3 {
- algorithm = HNE
- output = AFP/SiT/Cluster
- display = LogZ,Draw=COLZ
+ dir nearAside {
+ hist clusterX_vs_clusterY_nearAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_nearAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_nearAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_nearAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearAside
+ display = LogZ,Draw=COLZ
+ }
+ }
+ dir farAside {
+ hist clusterX_vs_clusterY_farAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farAside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_farAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farAside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_farAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farAside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_farAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farAside
+ display = LogZ,Draw=COLZ
+ }
+ }
+ dir nearCside {
+ hist clusterX_vs_clusterY_nearCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_nearCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_nearCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_nearCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/nearCside
+ display = LogZ,Draw=COLZ
+ }
+ }
+ dir farCside {
+ hist clusterX_vs_clusterY_farCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farCside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_farCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farCside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_farCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farCside
+ display = LogZ,Draw=COLZ
+ }
+ hist clusterX_vs_clusterY_farCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/Cluster/farCside
+ display = LogZ,Draw=COLZ
+ }
}
}
dir Track {
@@ -492,331 +639,363 @@ dir AFP {
}
}
dir clustersPerPlane {
- hist clustersPerPlane_vs_lb_farAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_farAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_farAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_farAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_farCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_farCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_farCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_farCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
- }
- hist clustersPerPlane_vs_lb_nearCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlane
- display = Draw=COLZ
+ dir farAside {
+ hist clustersPerPlane_vs_lb_farAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_farAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_farAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_farAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farAside
+ display = Draw=COLZ
+ }
+ }
+ dir nearAside {
+ hist clustersPerPlane_vs_lb_nearAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_nearAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_nearAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_nearAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearAside
+ display = Draw=COLZ
+ }
+ }
+ dir farCside {
+ hist clustersPerPlane_vs_lb_farCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_farCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_farCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_farCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/farCside
+ display = Draw=COLZ
+ }
+ }
+ dir nearCside {
+ hist clustersPerPlane_vs_lb_nearCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_nearCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_nearCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlane_vs_lb_nearCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlane/nearCside
+ display = Draw=COLZ
+ }
}
}
dir clustersPerPlaneFront {
- hist clustersPerPlaneFront_vs_lb_farAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_farAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_farAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_farAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_farCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_farCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_farCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_farCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
- }
- hist clustersPerPlaneFront_vs_lb_nearCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneFront
- display = Draw=COLZ
+ dir farAside {
+ hist clustersPerPlaneFront_vs_lb_farAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_farAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_farAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_farAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farAside
+ display = Draw=COLZ
+ }
+ }
+ dir nearAside {
+ hist clustersPerPlaneFront_vs_lb_nearAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_nearAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_nearAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_nearAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearAside
+ display = Draw=COLZ
+ }
+ }
+ dir farCside {
+ hist clustersPerPlaneFront_vs_lb_farCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_farCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_farCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_farCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/farCside
+ display = Draw=COLZ
+ }
+ }
+ dir nearCside {
+ hist clustersPerPlaneFront_vs_lb_nearCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_nearCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_nearCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneFront_vs_lb_nearCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneFront/nearCside
+ display = Draw=COLZ
+ }
}
}
dir clustersPerPlaneEnd {
- hist clustersPerPlaneEnd_vs_lb_farAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_farAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_farAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_farAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_farCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_farCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_farCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_farCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
- }
- hist clustersPerPlaneEnd_vs_lb_nearCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneEnd
- display = Draw=COLZ
+ dir farAside {
+ hist clustersPerPlaneEnd_vs_lb_farAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_farAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_farAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_farAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farAside
+ display = Draw=COLZ
+ }
+ }
+ dir nearAside {
+ hist clustersPerPlaneEnd_vs_lb_nearAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_nearAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_nearAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_nearAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearAside
+ display = Draw=COLZ
+ }
+ }
+ dir farCside {
+ hist clustersPerPlaneEnd_vs_lb_farCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_farCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_farCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_farCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/farCside
+ display = Draw=COLZ
+ }
+ }
+ dir nearCside {
+ hist clustersPerPlaneEnd_vs_lb_nearCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_nearCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_nearCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneEnd_vs_lb_nearCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneEnd/nearCside
+ display = Draw=COLZ
+ }
}
}
dir clustersPerPlaneMiddle {
- hist clustersPerPlaneMiddle_vs_lb_farAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_farAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_farAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_farAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearAside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearAside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearAside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearAside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_farCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_farCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_farCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_farCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearCside_P0 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearCside_P1 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearCside_P2 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
- }
- hist clustersPerPlaneMiddle_vs_lb_nearCside_P3 {
- algorithm = HNE
- output = AFP/SiT/clustersPerPlaneMiddle
- display = Draw=COLZ
+ dir farAside {
+ hist clustersPerPlaneMiddle_vs_lb_farAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_farAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_farAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_farAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farAside
+ display = Draw=COLZ
+ }
+ }
+ dir nearAside {
+ hist clustersPerPlaneMiddle_vs_lb_nearAside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_nearAside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_nearAside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearAside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_nearAside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearAside
+ display = Draw=COLZ
+ }
+ }
+ dir farCside {
+ hist clustersPerPlaneMiddle_vs_lb_farCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_farCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_farCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_farCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/farCside
+ display = Draw=COLZ
+ }
+ }
+ dir nearCside {
+ hist clustersPerPlaneMiddle_vs_lb_nearCside_P0 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_nearCside_P1 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_nearCside_P2 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearCside
+ display = Draw=COLZ
+ }
+ hist clustersPerPlaneMiddle_vs_lb_nearCside_P3 {
+ algorithm = HNE
+ output = AFP/SiT/clustersPerPlaneMiddle/nearCside
+ display = Draw=COLZ
+ }
}
}
dir clustersPerStation {
@@ -935,6 +1114,62 @@ dir AFP {
display = Draw=COLZ
}
}
+ dir HitsPerBarsInTrain {
+ hist barInTrainAllA {
+ algorithm = HNE
+ output = AFP/ToF/HitsPerBarsInTrain
+ display = Draw=COLZ
+ }
+ hist barInTrainAllC {
+ algorithm = HNE
+ output = AFP/ToF/HitsPerBarsInTrain
+ display = Draw=COLZ
+ }
+ dir farAside {
+ hist barInTrainIDA_train0 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farAside
+ display = Draw=COLZ
+ }
+ hist barInTrainIDA_train1 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farAside
+ display = Draw=COLZ
+ }
+ hist barInTrainIDA_train2 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farAside
+ display = Draw=COLZ
+ }
+ hist barInTrainIDA_train3 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farAside
+ display = Draw=COLZ
+ }
+ }
+ dir farCside {
+ hist barInTrainIDC_train0 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farCside
+ display = Draw=COLZ
+ }
+ hist barInTrainIDC_train1 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farCside
+ display = Draw=COLZ
+ }
+ hist barInTrainIDC_train2 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farCside
+ display = Draw=COLZ
+ }
+ hist barInTrainIDC_train3 {
+ algorithm = AFPBinContentComp
+ output = AFP/ToF/HitsPerBarsInTrain/farCside
+ display = Draw=COLZ
+ }
+ }
+ }
}
}
@@ -952,7 +1187,7 @@ algorithm AFPBinContentComp {
thresholds = AFPTestThreshold
NSigma = 3
reference = AFPBinContentReference
- publish = 1
+ publish = 4
NormRef = 1
}
############################################################
@@ -962,8 +1197,8 @@ algorithm AFPBinContentComp {
# Thresholds
thresholds AFPTestThreshold {
limits NBins {
- warning = 3
- error = 5
+ warning = 0
+ error = 1
}
}
###########################################################
diff --git a/DataQuality/DataQualityInterfaces/CMakeLists.txt b/DataQuality/DataQualityInterfaces/CMakeLists.txt
index 5082eaa1373918493ed92843cf5c8d6331d2a79b..80334eebfd7e7f3096fba6f8d30d1bb85f6c68e6 100644
--- a/DataQuality/DataQualityInterfaces/CMakeLists.txt
+++ b/DataQuality/DataQualityInterfaces/CMakeLists.txt
@@ -47,7 +47,7 @@ atlas_add_executable( han
atlas_add_executable( han-config-gen
src/han_config_gen.cxx
- LINK_LIBRARIES DataQualityInterfaces )
+ LINK_LIBRARIES DataQualityInterfaces CxxUtils )
atlas_add_executable( han-config-print
src/han_config_print.cxx
diff --git a/DataQuality/DataQualityInterfaces/src/han_config_gen.cxx b/DataQuality/DataQualityInterfaces/src/han_config_gen.cxx
index 5a569247e132b212797850a1ef128ea129622184..d792f0050545820802f7dd266129807a78b7dbf1 100644
--- a/DataQuality/DataQualityInterfaces/src/han_config_gen.cxx
+++ b/DataQuality/DataQualityInterfaces/src/han_config_gen.cxx
@@ -13,6 +13,9 @@
#include "DataQualityInterfaces/HanConfig.h"
#include "DataQualityInterfaces/ConditionsSingleton.h"
+#include "CxxUtils/ubsan_suppress.h"
+#include "TInterpreter.h"
+
namespace {
void usage( const std::string& command_name, int exit_code );
@@ -36,6 +39,8 @@ public:
int main( int argc, char *argv[] )
{
+ CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); });
+
CmdLineArgs arg( argc, argv );
std::string infileName( arg.mconfig );
diff --git a/DataQuality/DataQualityTools/DataQualityTools/DQTBackgroundMon.h b/DataQuality/DataQualityTools/DataQualityTools/DQTBackgroundMon.h
index 6e12617d9fb3ff84a7ed5d26af03732fd06d6f0c..4f1118dfa66441118348878f1712b424b8ca306b 100644
--- a/DataQuality/DataQualityTools/DataQualityTools/DQTBackgroundMon.h
+++ b/DataQuality/DataQualityTools/DataQualityTools/DQTBackgroundMon.h
@@ -33,7 +33,6 @@ private:
template <class T> using GP = Gaudi::Property<T>;
// Activates trigger and muon parts of the algorithm
- GP<bool> m_doTrigger {this, "Trigger", true};
GP<bool> m_doMuons {this, "Muons", true};
// StoreGate keys
diff --git a/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py b/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
index 38e58dd84a9664c59d73ee1f4d3a55958c0c386a..2d1b17a757f864f4e8e52af99e659e64f9fca45d 100644
--- a/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
+++ b/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
@@ -15,11 +15,12 @@ def DQTLumiMonAlgConfig(flags, isOld=False):
helper = AthMonitorCfgHelper(flags, 'DQTLumiMonAlgCfg')
# Three instances of the algorithm. One using any trigger, another using only muon
# triggers, and the final using only electron triggers.
- DQTLumiMonAlgConfigByTriggerChain(helper, DQTLumiMonAlg)
- DQTLumiMonAlgConfigByTriggerChain(helper, DQTLumiMonAlg,
- 'CATEGORY_monitoring_muonIso','EF_muX')
- DQTLumiMonAlgConfigByTriggerChain(helper, DQTLumiMonAlg,
- 'CATEGORY_primary_single_ele','EF_eX')
+ DQTLumiMonAlgConfigByTriggerChain(helper, DQTLumiMonAlg, flags, isOld)
+ if (flags.useTrigger if isOld else flags.DQ.useTrigger):
+ DQTLumiMonAlgConfigByTriggerChain(helper, DQTLumiMonAlg, flags, isOld,
+ 'CATEGORY_monitoring_muonIso','EF_muX')
+ DQTLumiMonAlgConfigByTriggerChain(helper, DQTLumiMonAlg, flags, isOld,
+ 'CATEGORY_primary_single_ele','EF_eX')
if isOld:
return helper.result()
else:
@@ -28,7 +29,7 @@ def DQTLumiMonAlgConfig(flags, isOld=False):
result.merge(AtlasGeometryCfg(flags))
return result
-def DQTLumiMonAlgConfigByTriggerChain(helper, algConfObj, triggerChain='', triggerPath=''):
+def DQTLumiMonAlgConfigByTriggerChain(helper, algConfObj, flags, isOld, triggerChain='', triggerPath=''):
monAlg = helper.addAlgorithm(algConfObj, 'DQTLumiMonAlg'+triggerPath)
if triggerChain:
@@ -49,6 +50,16 @@ def DQTLumiMonAlgConfigByTriggerChain(helper, algConfObj, triggerChain='', trigg
monAlg.TightTrackWeight = 0.01
monAlg.TightNTracks = 4
+ if isOld:
+ from RecExConfig.AutoConfiguration import GetLBNumber
+ lbnum = GetLBNumber()
+ lbdict = { 'xmin': lbnum-0.5 if lbnum>0 else 0.5,
+ 'xmax': lbnum+0.5 if lbnum>0 else 1.5 }
+ else:
+ lbdict = { 'xmin': min(flags.Input.LumiBlockNumber)-0.5 if flags.Input.LumiBlockNumber else 0.5,
+ 'xmax': max(flags.Input.LumiBlockNumber)+0.5 if flags.Input.LumiBlockNumber else 1.5 }
+ lbdict['xbins'] = int(lbdict['xmax']-lbdict['xmin'])
+
# Raw plots of lumi variables
group.defineHistogram('avgIntPerXing', type='TH1F', xbins=100, xmin=0, xmax=100,
title='Average number of interactions per bunch Xing')
@@ -56,40 +67,46 @@ def DQTLumiMonAlgConfigByTriggerChain(helper, algConfObj, triggerChain='', trigg
title='Actual number of interactions per bunch Xing')
# Plots of luminosity variables as a function of lb number
- group.defineHistogram('LB,avgLumi', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
- title='Average Lumi vs LB', opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,avgIntPerXing', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
+ group.defineHistogram('LB,avgLumi', type='TProfile',
+ title='Average Lumi vs LB', opt='kAddBinsDynamically',
+ merge='merge', **lbdict)
+ group.defineHistogram('LB,avgIntPerXing', type='TProfile',
title='Number of interactions per event;LB;<#mu>_{LB}',
- opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,lumiPerBCID', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
- title='Instantaneous Luminosity vs LB', opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,intPerXing', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
- title='Instaneous interactions vs LB', opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,duration', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
- title='Lumi Block time in sec vs LB', opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,avgLiveFrac', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
+ opt='kAddBinsDynamically', merge='merge', **lbdict)
+ group.defineHistogram('LB,lumiPerBCID', type='TProfile',
+ title='Instantaneous Luminosity vs LB', opt='kAddBinsDynamically',
+ merge='merge', **lbdict)
+ group.defineHistogram('LB,intPerXing', type='TProfile',
+ title='Instaneous interactions vs LB', opt='kAddBinsDynamically',
+ merge='merge', **lbdict)
+ group.defineHistogram('LB,duration', type='TProfile',
+ title='Lumi Block time in sec vs LB', opt='kAddBinsDynamically',
+ merge='merge', **lbdict)
+ group.defineHistogram('LB,avgLiveFrac', type='TProfile',
title='Average live fraction lumi over all BCIDs vs LB',
- opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,liveFracPerBCID', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
- title='Current BCID lumi vs LB', opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,lumiWeight', type='TProfile', xbins=1000, xmin=0.5, xmax=1000.5,
- title='Current BCID lumi vs LB', opt='kAddBinsDynamically', merge='merge')
+ opt='kAddBinsDynamically', merge='merge', **lbdict)
+ group.defineHistogram('LB,liveFracPerBCID', type='TProfile',
+ title='Current BCID lumi vs LB', opt='kAddBinsDynamically',
+ merge='merge', **lbdict)
+ group.defineHistogram('LB,lumiWeight', type='TProfile',
+ title='Current BCID lumi vs LB', opt='kAddBinsDynamically',
+ merge='merge', **lbdict)
# Vertex counts vs. lb number (loose and tight)
- group.defineHistogram('LB,nLooseVtx', type='TProfile', xbins=200, xmin=0.5, xmax=200.5,
+ group.defineHistogram('LB,nLooseVtx', type='TProfile',
title=nLooseT+' per event;LB;<NlooseVtx/event>_{LB}',
- opt='kAddBinsDynamically', merge='merge')
- group.defineHistogram('LB,nTightVtx', type='TProfile', xbins=200, xmin=0.5, xmax=200.5,
+ opt='kAddBinsDynamically', merge='merge', **lbdict)
+ group.defineHistogram('LB,nTightVtx', type='TProfile',
title=nTightT+' per event;LB;<NtightVtx/event>_{LB}',
- opt='kAddBinsDynamically', merge='merge')
+ opt='kAddBinsDynamically', merge='merge', **lbdict)
# Vertex counts per avg mu vs. lb number. (Same as above, just weighted.)
group.defineHistogram('LB,nLooseVtxPerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nLooseT+' per event per Mu;LB;<NlooseVtx/event/#mu>_{LB}', merge='merge')
+ title=nLooseT+' per event per Mu;LB;<NlooseVtx/event/#mu>_{LB}',
+ merge='merge', **lbdict)
group.defineHistogram('LB,nTightVtxPerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nTightT+' per event per Mu;LB;<NtightVtx/event/#mu>_{LB}', merge='merge')
+ title=nTightT+' per event per Mu;LB;<NtightVtx/event/#mu>_{LB}',
+ merge='merge', **lbdict)
# Vertex counts vs. avg mu.
group.defineHistogram('avgIntPerXing,nLooseVtx', type='TProfile', xbins=250, xmin=0, xmax=100,
@@ -99,43 +116,43 @@ def DQTLumiMonAlgConfigByTriggerChain(helper, algConfObj, triggerChain='', trigg
# Pixel clusters vs lb number. All, and then eparately for each endcap and barrel layer.
pixelgroup.defineHistogram('LB,nClustersAll', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+', all;LB;<NclustersAll/event>_{LB}', merge='merge')
+ title=nPixClusterT+', all;LB;<NclustersAll/event>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersECA', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+', endcap A;LB;<NlustersECA/event>_{LB}', merge='merge')
+ title=nPixClusterT+', endcap A;LB;<NlustersECA/event>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersECC', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+', endcap C;LB;<NclustersECC/event>_{LB}', merge='merge')
+ title=nPixClusterT+', endcap C;LB;<NclustersECC/event>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersB0', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+', barrel layer 0;LB;<NclustersB0/event>_{LB}', merge='merge')
+ title=nPixClusterT+', barrel layer 0;LB;<NclustersB0/event>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersB1', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+', barrel layer 1;LB;<NclustersB1/event>_{LB}', merge='merge')
+ title=nPixClusterT+', barrel layer 1;LB;<NclustersB1/event>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersB2', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+', barrel layer 2;LB;<NclustersB2/event>_{LB}', merge='merge')
+ title=nPixClusterT+', barrel layer 2;LB;<NclustersB2/event>_{LB}',
+ merge='merge', **lbdict)
# Pixel clusters per avg mu vs. lb number. (Same as above, just weighted.)
pixelgroup.defineHistogram('LB,nClustersAllPerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+' per Mu, all;LB;<NclustersAll/event/#mu>_{LB}', merge='merge')
+ title=nPixClusterT+' per Mu, all;LB;<NclustersAll/event/#mu>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersECAPerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+' per Mu, endcap A;LB;<NlustersECA/event/#mu>_{LB}', merge='merge')
+ title=nPixClusterT+' per Mu, endcap A;LB;<NlustersECA/event/#mu>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersECCPerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+' per Mu, endcap C;LB;<NclustersECC/event/#mu>_{LB}', merge='merge')
+ title=nPixClusterT+' per Mu, endcap C;LB;<NclustersECC/event/#mu>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersB0PerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+' per Mu, barrel layer 0;LB;<NclustersB0/event/#mu>_{LB}', merge='merge')
+ title=nPixClusterT+' per Mu, barrel layer 0;LB;<NclustersB0/event/#mu>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersB1PerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+' per Mu, barrel layer 1;LB;<NclustersB1/event/#mu>_{LB}', merge='merge')
+ title=nPixClusterT+' per Mu, barrel layer 1;LB;<NclustersB1/event/#mu>_{LB}',
+ merge='merge', **lbdict)
pixelgroup.defineHistogram('LB,nClustersB2PerAvgMu', type='TProfile', opt='kAddBinsDynamically',
- xbins=200, xmin=0.5, xmax=200.5,
- title=nPixClusterT+' per Mu, barrel layer 2;LB;<NclustersB2/event/#mu>_{LB}', merge='merge')
+ title=nPixClusterT+' per Mu, barrel layer 2;LB;<NclustersB2/event/#mu>_{LB}',
+ merge='merge', **lbdict)
# Pixel clusters vs. avg mu. All, then separately for each endcap and barrel layer.
pixelgroup.defineHistogram('avgIntPerXing,nClustersAll', type='TProfile',
diff --git a/DataQuality/DataQualityTools/src/DQTBackgroundMon.cxx b/DataQuality/DataQualityTools/src/DQTBackgroundMon.cxx
index 35aa97ae4d398e11bef753249357a3581d4f0237..3d0489a1dad4d97cdbeffdd3ff7fb01a961e404c 100644
--- a/DataQuality/DataQualityTools/src/DQTBackgroundMon.cxx
+++ b/DataQuality/DataQualityTools/src/DQTBackgroundMon.cxx
@@ -43,7 +43,7 @@ StatusCode DQTBackgroundMon::fillHistograms( const EventContext& ctx ) const {
RH<xAOD::VertexContainer> vertexContainer(m_VertexContainerKey,ctx);
if ( eventInfo.isValid() ) {
- if (m_doTrigger) {
+ if (!getTrigDecisionTool().empty()) {
unsigned int bgCode = getTrigDecisionTool()->getBGCode();
filled = bgCode & (1<<m_filledBG);
empty = bgCode & (1<<m_emptyBG);
diff --git a/DataQuality/GoodRunsLists/CMakeLists.txt b/DataQuality/GoodRunsLists/CMakeLists.txt
index 9683d2affca791902675e7fd3b35590c3629174e..4a5248f232287dd02007804dd096c746e5496781 100644
--- a/DataQuality/GoodRunsLists/CMakeLists.txt
+++ b/DataQuality/GoodRunsLists/CMakeLists.txt
@@ -15,15 +15,29 @@ atlas_add_root_dictionary( GoodRunsListsLib
GoodRunsLists/DQHelperFunctions.h Root/LinkDef.h
EXTERNAL_PACKAGES LibXml2 ROOT )
+if( NOT XAOD_STANDALONE )
+ if( XAOD_ANALYSIS )
+ set( extra_libs )
+ else()
+ set( extra_libs DerivationFrameworkInterfaces )
+ endif()
+endif()
+
atlas_add_library( GoodRunsListsLib
GoodRunsLists/*.h Root/*.cxx ${GoodRunsListsLibDictSource}
PUBLIC_HEADERS GoodRunsLists
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AsgAnalysisInterfaces
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEventInfo AsgAnalysisInterfaces
+ AnaAlgorithmLib ${extra_libs}
PRIVATE_LINK_LIBRARIES ${LIBXML2_LIBRARIES} PathResolver )
if( NOT XAOD_STANDALONE )
+ if( XAOD_ANALYSIS )
+ set( extra_libs )
+ else()
+ set( extra_libs DetectorStatusLib )
+ endif()
atlas_add_component( GoodRunsLists
src/*.cxx src/components/*.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel EventInfo GaudiKernel GoodRunsListsLib PathResolver StoreGateLib xAODEventInfo )
diff --git a/DataQuality/GoodRunsLists/src/GRLSelectorAlg.h b/DataQuality/GoodRunsLists/GoodRunsLists/GRLSelectorAlg.h
similarity index 71%
rename from DataQuality/GoodRunsLists/src/GRLSelectorAlg.h
rename to DataQuality/GoodRunsLists/GoodRunsLists/GRLSelectorAlg.h
index 6b3c7156a9dbf3922f3fa99c2b048fb435133780..e4a905a6fa285b504eea24ad6eb3fcae0c800008 100644
--- a/DataQuality/GoodRunsLists/src/GRLSelectorAlg.h
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/GRLSelectorAlg.h
@@ -5,8 +5,9 @@
#ifndef GOODRUNSLISTS_GRLSELECTORALG_H
#define GOODRUNSLISTS_GRLSELECTORALG_H 1
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ToolHandle.h" //included under assumption you'll want to use some tools! Remove if you don't!
+#include <AnaAlgorithm/AnaAlgorithm.h>
+#include <AnaAlgorithm/FilterReporterParams.h>
+#include <AsgTools/ToolHandle.h> //included under assumption you'll want to use some tools! Remove if you don't!
#include "AsgAnalysisInterfaces/IGoodRunsListSelectionTool.h"
@@ -17,7 +18,7 @@
///masterseq += CfgMgr.GRLSelectorAlg(Tool=ToolSvc.myGRLTool)
-class GRLSelectorAlg: public ::AthAlgorithm {
+class GRLSelectorAlg: public EL::AnaAlgorithm {
public:
GRLSelectorAlg( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~GRLSelectorAlg();
@@ -28,9 +29,7 @@ class GRLSelectorAlg: public ::AthAlgorithm {
private:
ToolHandle<IGoodRunsListSelectionTool> m_grlTool;
- int m_passed = 0;
- int m_total = 0;
-
+ EL::FilterReporterParams m_filterParams {this, "Good Runs Lists selection"};
};
#endif //> !GOODRUNSLISTS_GRLSELECTORALG_H
diff --git a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h
index a732e8bec0a677c03b4715b8223d6690e889ad7e..adab65a5985d878057278f7f364379a834066867 100644
--- a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h
@@ -18,6 +18,10 @@
#include "AsgAnalysisInterfaces/IGoodRunsListSelectionTool.h"
#include "GoodRunsLists/TGRLCollection.h"
+#ifndef XAOD_STANDALONE
+#include "DerivationFrameworkInterfaces/ISkimmingTool.h"
+#endif
+
/// Tool implementing the GRL selection
///
/// This tool needs to be used to select good lumiblocks for a physics
@@ -27,10 +31,13 @@
/// $Date$
///
class GoodRunsListSelectionTool : virtual public IGoodRunsListSelectionTool,
+#ifndef XAOD_STANDALONE
+ virtual public DerivationFramework::ISkimmingTool,
+#endif
public asg::AsgTool {
// Declare the proper constructor(s) for Athena:
- ASG_TOOL_CLASS( GoodRunsListSelectionTool, IGoodRunsListSelectionTool )
+ ASG_TOOL_CLASS2( GoodRunsListSelectionTool, IGoodRunsListSelectionTool, DerivationFramework::ISkimmingTool )
public:
GoodRunsListSelectionTool( const std::string& name =
@@ -72,6 +79,12 @@ public:
return m_brlcollection;
}
+#ifndef XAOD_STANDALONE
+ /// ISkimmingTool method:
+ /// will retrieve eventInfo from storegate and use that with above methods
+ virtual bool eventPassesFilter() const;
+#endif
+
/// @}
protected:
diff --git a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h
index cd881202c9dc6957f74ec7895568a864c71d1418..e1d09c4387c6c9fc550ca3bb44478795f56a390b 100644
--- a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h
@@ -7,6 +7,7 @@
#include "GoodRunsLists/GoodRunsListSelectionTool.h"
+#include "GoodRunsLists/GRLSelectorAlg.h"
/* removed for now ... maybe move to AsgAnalysisInterfaces if need a dictionary for specific ToolHandle
#include "AsgTools/ToolHandle.h"
diff --git a/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml b/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml
index 5ed3d8b5608eb77117a301d2cf5538b3e0ff6063..565d736f2a7c7ba09896c902e6696157a83658b9 100644
--- a/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml
@@ -2,6 +2,7 @@
<!-- GoodRunsListSelectionTool -->
<class name="GoodRunsListSelectionTool" />
+ <class name="GRLSelectorAlg" />
<exclusion>
diff --git a/DataQuality/GoodRunsLists/src/GRLSelectorAlg.cxx b/DataQuality/GoodRunsLists/Root/GRLSelectorAlg.cxx
similarity index 60%
rename from DataQuality/GoodRunsLists/src/GRLSelectorAlg.cxx
rename to DataQuality/GoodRunsLists/Root/GRLSelectorAlg.cxx
index d42bae93bc202ecdce1dc0cd7b851e686ff89640..35bc5c42a5593066ef77a45965da9b780271f302 100644
--- a/DataQuality/GoodRunsLists/src/GRLSelectorAlg.cxx
+++ b/DataQuality/GoodRunsLists/Root/GRLSelectorAlg.cxx
@@ -3,12 +3,13 @@
*/
// GoodRunsLists includes
-#include "GRLSelectorAlg.h"
-
+#include <GoodRunsLists/GRLSelectorAlg.h>
+#include <AnaAlgorithm/FilterReporter.h>
+#include <AsgMessaging/MessageCheck.h>
#include "xAODEventInfo/EventInfo.h"
-GRLSelectorAlg::GRLSelectorAlg( const std::string& name, ISvcLocator* pSvcLocator ) : AthAlgorithm( name, pSvcLocator )
- , m_grlTool("GoodRunsListSelectionTool")
+GRLSelectorAlg::GRLSelectorAlg( const std::string& name, ISvcLocator* pSvcLocator ) : AnaAlgorithm( name, pSvcLocator )
+ , m_grlTool("GoodRunsListSelectionTool", this)
{
declareProperty( "Tool", m_grlTool , "The GoodRunsListSelectionTool" );
@@ -21,32 +22,27 @@ GRLSelectorAlg::~GRLSelectorAlg() {}
StatusCode GRLSelectorAlg::initialize() {
//ATH_MSG_INFO ("Initializing " << name() << "...");
- m_total=0;
- m_passed=0;
- CHECK( m_grlTool.retrieve() );
+ ANA_CHECK( m_grlTool.retrieve() );
+ ANA_CHECK( m_filterParams.initialize() );
return StatusCode::SUCCESS;
}
StatusCode GRLSelectorAlg::finalize() {
// ATH_MSG_INFO ("Finalizing " << name() << "...");
- ATH_MSG_INFO("Events passing GRL " << m_grlTool.name() << " : " << m_passed << " / " << m_total);
+ ANA_CHECK (m_filterParams.finalize());
return StatusCode::SUCCESS;
}
StatusCode GRLSelectorAlg::execute() {
- setFilterPassed(false);
+ EL::FilterReporter filter (m_filterParams, false);
- m_total++;
const xAOD::EventInfo* evtInfo = 0;
- CHECK( evtStore()->retrieve( evtInfo ) );
+ ANA_CHECK( evtStore()->retrieve( evtInfo, "EventInfo" ) );
if(!m_grlTool->passRunLB(*evtInfo)) return StatusCode::SUCCESS;
- m_passed++;
- setFilterPassed(true);
+ filter.setPassed (true);
return StatusCode::SUCCESS;
}
-
-
diff --git a/DataQuality/GoodRunsLists/Root/GoodRunsListSelectionTool.cxx b/DataQuality/GoodRunsLists/Root/GoodRunsListSelectionTool.cxx
index 614abebf631d17b6ce1738952a3afdb3026f85a7..3057c5858f9994ef6a4e8ab7cdd3b11945a770ef 100644
--- a/DataQuality/GoodRunsLists/Root/GoodRunsListSelectionTool.cxx
+++ b/DataQuality/GoodRunsLists/Root/GoodRunsListSelectionTool.cxx
@@ -184,3 +184,14 @@ GoodRunsListSelectionTool::readXMLs( Root::TGRLCollection& grl,
// Return gracefully:
return StatusCode::SUCCESS;
}
+
+#ifndef XAOD_STANDALONE
+bool GoodRunsListSelectionTool::eventPassesFilter() const {
+ const xAOD::EventInfo* ei = 0;
+ if( evtStore()->retrieve( ei , "EventInfo" ).isFailure() ) {
+ ATH_MSG_ERROR("Unable to retrieve EventInfo, returning false");
+ return false;
+ }
+ return passRunLB( *ei );
+}
+#endif
diff --git a/DataQuality/GoodRunsLists/src/GoodRunsListSelectorTool.cxx b/DataQuality/GoodRunsLists/src/GoodRunsListSelectorTool.cxx
index a2ffa589077a57fa9445603a934c5a99dd8d2f18..38d0f9564ea22eacffd7af148dc1df66c6b43c56 100644
--- a/DataQuality/GoodRunsLists/src/GoodRunsListSelectorTool.cxx
+++ b/DataQuality/GoodRunsLists/src/GoodRunsListSelectorTool.cxx
@@ -1,5 +1,7 @@
+#ifndef XAOD_ANALYSIS
+
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -14,7 +16,6 @@
#include "GaudiKernel/MsgStream.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
-#include "StoreGate/StoreGate.h"
#include "TFormula.h"
#include "TSystem.h"
@@ -358,3 +359,4 @@ GoodRunsListSelectorTool::registerGRLSelector(const std::string& name, const std
return true;
}
+#endif // XAOD_ANALYSIS
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
index 388feacfcbcdef7fd19ffcf3d3cfd7c9ebae7f41..40dbca4064c8a1d73707feb41119dfeea34c1343 100644
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
+++ b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
@@ -1,12 +1,9 @@
#include "GoodRunsLists/GoodRunsListSelectorTool.h"
#include "GoodRunsLists/TriggerRegistryTool.h"
#include "GoodRunsLists/GoodRunsListSelectionTool.h"
+#include "GoodRunsLists/GRLSelectorAlg.h"
DECLARE_COMPONENT( GoodRunsListSelectorTool )
DECLARE_COMPONENT( GoodRunsListSelectionTool )
DECLARE_COMPONENT( TriggerRegistryTool )
-
-
-#include "../GRLSelectorAlg.h"
DECLARE_COMPONENT( GRLSelectorAlg )
-
diff --git a/Database/APR/RootCollection/CMakeLists.txt b/Database/APR/RootCollection/CMakeLists.txt
index 86c23f101f15090976de2b82923931a5769f87de..ac58b3fca44ff34c5eccf0ebe5b639055acbd263 100644
--- a/Database/APR/RootCollection/CMakeLists.txt
+++ b/Database/APR/RootCollection/CMakeLists.txt
@@ -24,8 +24,8 @@ atlas_add_library( RootCollection
FileCatalog GaudiKernel POOLCore PersistencySvc PersistentDataModel RootUtils )
atlas_add_library( RootCollectionComponents
- NO_PUBLIC_HEADERS
src/components/*.cpp
+ NO_PUBLIC_HEADERS
LINK_LIBRARIES CollectionBase RootCollection )
atlas_add_test( read_test
diff --git a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
index 30ee7f659d6a3fd388af3cecd611d2eff42e6129..8b5bec22e3348e166b852bafa9093ddc768fc42c 100755
--- a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
+++ b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp
@@ -1209,7 +1209,7 @@ DbStatus RootTreeContainer::transAct(Transaction::Action action)
return Success;
}
// check if all TTree branches were filled and write the TTree
- Branches::const_iterator k;
+ Branches::iterator k;
for(k=m_branches.begin(); k !=m_branches.end(); ++k) {
Long64_t branchEntries = k->branch->GetEntries();
Long64_t treeEntries = m_tree->GetEntries();
@@ -1233,6 +1233,8 @@ DbStatus RootTreeContainer::transAct(Transaction::Action action)
<< DbPrint::endmsg;
return Error;
}
+ BranchDesc& dsc = (*k);
+ dsc.rows_written = 0;
}
return Success;
}
diff --git a/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.cpp b/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.cpp
index eea0dc2bdd28ae296547b71c01bf8ca8230e8837..509786e179163e26de729ba99428777940829a71 100644
--- a/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.cpp
+++ b/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.cpp
@@ -18,7 +18,7 @@
using namespace pool;
using namespace std;
-RootTreeIndexContainer::RootTreeIndexContainer() : RootTreeContainer(), m_index_ref(nullptr), m_index_entries(0), m_index_multi(0), m_index(nullptr) {
+RootTreeIndexContainer::RootTreeIndexContainer() : RootTreeContainer(), m_index_ref(nullptr), m_index_shr(nullptr), m_index_entries(0), m_ttree_entries(0), m_index_multi(0), m_index(nullptr) {
m_index = new long long int;
m_index_multi = getpid();
}
@@ -32,40 +32,40 @@ RootTreeIndexContainer::~RootTreeIndexContainer() {
long long int RootTreeIndexContainer::nextRecordId() {
long long int s = m_index_multi;
s = s << 32;
- if (m_tree->GetBranch("index_ref") != nullptr) {
- s += m_index_entries;
- } else {
+ if (m_index_ref == nullptr && m_index_shr == nullptr) {
s += RootTreeContainer::nextRecordId();
+ } else {
+ s += m_index_entries;
}
return s;
}
DbStatus RootTreeIndexContainer::writeObject(ActionList::value_type& action) {
- long long int s = 0;
- if (isBranchContainer()) {
- TBranch * pBranch = m_tree->GetBranch(m_branchName.c_str());
- if (pBranch != nullptr) s = pBranch->GetEntries();
- } else {
- s = m_tree->GetEntries();
- }
- if (m_index_ref == nullptr && m_tree->GetBranch("index_ref") == nullptr) {
- m_index_ref = (TBranch*)m_tree->Branch("index_ref", m_index);
+ // If ROOT TTree has index_ref TBranch share it, otherwise create one and make it part of this POOL container
+ if (m_index_ref == nullptr && m_index_shr == nullptr) {
+ m_index_shr = m_tree->GetBranch("index_ref");
+ if (m_index_shr == nullptr) {
+ m_index_ref = static_cast<TBranch*>(m_tree->Branch("index_ref", m_index));
+ }
}
- if (m_index_ref != nullptr && s >= m_index_ref->GetEntries()) {
+ // POOL container that owns the index_ref TBranch fills it.
+ if (m_index_ref != nullptr && m_index_entries >= m_index_ref->GetEntries()) {
*m_index = this->nextRecordId();
m_index_ref->SetAddress(m_index);
if (isBranchContainer() && !m_treeFillMode) m_index_ref->Fill();
}
if (isBranchContainer() && !m_treeFillMode) {
- m_tree->SetEntries(s);
+ m_tree->SetEntries(m_ttree_entries);
m_index_entries++;
+ m_ttree_entries++;
}
DbStatus status = RootTreeContainer::writeObject(action);
if (isBranchContainer() && !m_treeFillMode) {
- m_tree->SetEntries(s + 1);
+ m_tree->SetEntries(m_ttree_entries);
} else {
m_index_entries++;
+ m_ttree_entries++;
}
return status;
}
@@ -74,6 +74,7 @@ DbStatus RootTreeIndexContainer::writeObject(ActionList::value_type& action) {
DbStatus RootTreeIndexContainer::transAct(Transaction::Action action) {
DbStatus status = RootTreeContainer::transAct(action);
if (action == Transaction::TRANSACT_FLUSH) {
+ m_ttree_entries = 0;
if (m_tree == nullptr) return Error;
if (m_index_ref != nullptr && m_tree->GetEntries() > 0 && dynamic_cast<TMemFile*>(m_tree->GetCurrentFile()) == nullptr && m_tree->GetEntryNumberWithIndex(nextRecordId()) == -1) {
m_tree->BuildIndex("index_ref");
diff --git a/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.h b/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.h
index 158839e8223aa6aaf92f24fc7a132c67ee41afe0..13cc88ed2a8b8918a2b0a7ffa77536a0eb266a07 100644
--- a/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.h
+++ b/Database/APR/RootStorageSvc/src/RootTreeIndexContainer.h
@@ -59,9 +59,11 @@ namespace pool {
virtual DbStatus transAct(Transaction::Action action);
private:
- /// Pointer to index branch
+ /// Pointer to index branch (ref owns the branch, shr doesn't)
TBranch* m_index_ref;
+ TBranch* m_index_shr;
long long int m_index_entries;
+ long long int m_ttree_entries;
/// Index multiplier (e.g. pid - ppid), fill in c'tor
int m_index_multi;
/// Index (64 bit)
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py
index 3e5503f4349d357695052262cda628c0ea575b87..26dbaebe095d6413e6c28dc9e32c3059b4ae990e 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/ReadAthenaPool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
## @file ReadAthena.py
## @brief AthenaPool python module for reading event objects.
@@ -59,26 +59,26 @@ def _configureReadAthenaPool():
# Add in EventSelector
svcMgr += CfgMgr.EventSelectorAthenaPool ("EventSelector")
#default InputCollections to FilesInput value of AthenaCommonFlags
- from AthenaCommon.JobProperties import jobproperties as jps
+ from AthenaCommon.AthenaCommonFlags import jobproperties as jps
svcMgr.EventSelector.InputCollections = jps.AthenaCommonFlags.FilesInput()
-
+
_n = svcMgr.EventSelector.getFullJobOptName()
theApp.EvtSel = _n
del _n
# For Analysis release use lower heartbeat
- import os
- if "AthAnalysisBase" in os.environ.get('CMTEXTRATAGS',""):
- # From Will Buttinger to suppress the event loop heartbeat as it is somewhat I/O hungry for
- # no real gain in analysis scenarii
- if not hasattr(svcMgr, theApp.EventLoop):
- svcMgr += getattr(CfgMgr, theApp.EventLoop)()
- evtloop = getattr(svcMgr, theApp.EventLoop)
- try:
- evtloop.EventPrintoutInterval = 10000
+ import os
+ if "AthAnalysisBase" in os.environ.get('CMTEXTRATAGS',""):
+ # From Will Buttinger to suppress the event loop heartbeat as it is somewhat I/O hungry for
+ # no real gain in analysis scenarii
+ if not hasattr(svcMgr, theApp.EventLoop):
+ svcMgr += getattr(CfgMgr, theApp.EventLoop)()
+ evtloop = getattr(svcMgr, theApp.EventLoop)
+ try:
+ evtloop.EventPrintoutInterval = 10000
except Exception:
- msg.info('failed suppressing event loop heartbeat. performances might be sub-par... sorry.')
- pass
+ msg.info('failed suppressing event loop heartbeat. performances might be sub-par... sorry.')
+ pass
# Add in AthenaPoolAddressProviderSvc
if not hasattr (svcMgr, 'AthenaPoolAddressProviderSvc'):
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx
index be51bbc79c3f06019db6d2bb0ae24d03cad3a028..ae52fa8e12ea57e5486361ee8a2fa855cc7dd9ca 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx
@@ -9,15 +9,40 @@
#include "AthenaRootSharedWriterSvc.h"
+#include "TBranch.h"
#include "TClass.h"
#include "TFile.h"
#include "TFileMerger.h"
#include "TKey.h"
+#include "TLeaf.h"
#include "TMemFile.h"
#include "TMessage.h"
#include "TMonitor.h"
#include "TServerSocket.h"
#include "TSocket.h"
+#include "TTree.h"
+
+/// Definiton of a branch descriptor from RootTreeContainer
+struct BranchDesc {
+public:
+ TClass* clazz;
+ using dummy_ptr_t = std::unique_ptr<void, std::function<void(void*)> >;
+ std::unique_ptr<void, std::function<void(void*)> > dummyptr;
+ void* dummy = 0;
+
+ BranchDesc(TClass* cl) : clazz(cl) {}
+
+ void* dummyAddr()
+ {
+ if (clazz) {
+ std::function<void(void*)> del = std::bind(&TClass::Destructor, clazz, std::placeholders::_1, false);
+ dummyptr = std::unique_ptr<void, std::function<void(void*)> >(clazz->New(), std::move(del));
+ dummy = dummyptr.get();
+ return &dummy;
+ }
+ return nullptr;
+ }
+};
/* Code from ROOT tutorials/net/parallelMergeServer.C, reduced to handle TTrees only */
@@ -35,7 +60,7 @@ struct ParallelFileMerger : public TObject
{
}
- ULong_t Hash() const
+ ULong_t Hash() const
{
return fFilename.Hash();
}
@@ -45,13 +70,67 @@ struct ParallelFileMerger : public TObject
return fFilename;
}
+// Add missing branches to client tree and BackFill before merging
+ bool syncBranches(TTree* fromTree, TTree* toTree)
+ {
+ bool updated = false;
+ const TObjArray* fromBranches = fromTree->GetListOfBranches();
+ const TObjArray* toBranches = toTree->GetListOfBranches();
+ int nBranches = fromBranches->GetEntriesFast();
+ for (int k = 0; k < nBranches; ++k) {
+ TBranch* branch = static_cast<TBranch*>(fromBranches->UncheckedAt(k));
+ if (toBranches->FindObject(branch->GetName()) == nullptr) {
+ TBranch* newBranch = nullptr;
+ TClass* cl = TClass::GetClass(branch->GetClassName());
+ BranchDesc desc(cl);
+ void* empty = desc.dummyAddr();
+ char buff[32];
+ if (strlen(branch->GetClassName()) > 0) {
+ newBranch = toTree->Branch(branch->GetName(), branch->GetClassName(), nullptr, branch->GetBasketSize(), branch->GetSplitLevel());
+ newBranch->SetAddress(empty);
+ } else {
+ TObjArray* outLeaves = branch->GetListOfLeaves();
+ TLeaf* leaf = static_cast<TLeaf*>(outLeaves->UncheckedAt(0));
+ std::string type = leaf->GetTypeName();
+ std::string attr = leaf->GetName();
+ if (type == "Int_t") type = attr + "/I";
+ else if (type == "Short_t") type = attr + "/S";
+ else if (type == "Long_t") type = attr + "/L";
+ else if (type == "UInt_t") type = attr + "/i";
+ else if (type == "UShort_t") type = attr + "/s";
+ else if (type == "UShort_t") type = attr + "/s";
+ else if (type == "Float_t") type = attr + "/F";
+ else if (type == "Double_t") type = attr + "/D";
+ else if (type == "Char_t") type = attr + "/B";
+ else if (type == "UChar_t") type = attr + "/b";
+ else if (type == "Bool_t") type = attr + "/O";
+ newBranch = toTree->Branch(branch->GetName(), buff, type.c_str(), 2048);
+ }
+ int nEntries = toTree->GetEntries();
+ for (int m = 0; m < nEntries; ++m) {
+ newBranch->BackFill();
+ }
+ updated = true;
+ }
+ }
+ return updated;
+ }
+
Bool_t MergeTrees(TFile *input)
{
fMerger.AddFile(input);
+ TTree* outCollTree = static_cast<TTree*>(fMerger.GetOutputFile()->Get("CollectionTree"));
+ TTree* inCollTree = static_cast<TTree*>(input->Get("CollectionTree"));
+ if (inCollTree != nullptr && outCollTree != nullptr) {
+ if (syncBranches(outCollTree, inCollTree)) {
+ input->Write();
+ }
+ syncBranches(inCollTree, outCollTree);
+ }
Bool_t result = fMerger.PartialMerge(TFileMerger::kIncremental | TFileMerger::kResetable | TFileMerger::kKeepCompression);
TIter nextKey(input->GetListOfKeys());
while (TKey* key = static_cast<TKey*>(nextKey())) {
- TClass *cl = TClass::GetClass(key->GetClassName());
+ TClass* cl = TClass::GetClass(key->GetClassName());
if (0 != cl->GetResetAfterMerge()) {
key->Delete();
input->GetListOfKeys()->Remove(key);
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
index 2e91e610786ef6a85272bfcd75f8600c8713dcca..ddee97751d9bed495f8dedbe6c2688dd0c945439 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
@@ -1,17 +1,17 @@
-Fri Sep 11 23:47:28 CEST 20?0
+Tue Oct 6 16:04:23 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ConcatJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5568 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Fri Sep 11 23:47:40 20?0
+ running on 58dd451bc47f on Tue Oct 6 16:04:28 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
@@ -30,9 +30,10 @@ PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-09-10T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -74,9 +75,11 @@ Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: SimplePoolFile1.root
+ClassIDSvc INFO getRegistryEntries: read 171 CLIDRegistry entries for module ALL
Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
@@ -84,6 +87,7 @@ Stream1 DEBUG input handles: 0
Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
@@ -109,8 +113,9 @@ Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2.Stream2... INFO Initializing Stream2.Stream2Tool - package version AthenaServices-00-00-00
Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2.Stream2... INFO Initializing Stream2.Stream2_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream2'])
+Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream2_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream2'])
Stream2 INFO Data output: SimplePoolFile3.root
Stream2 INFO I/O reinitialization...
Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
@@ -119,6 +124,7 @@ Stream2 DEBUG input handles: 0
Stream2 DEBUG output handles: 2
Stream2 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream2 DEBUG Adding private ToolHandle tool Stream2.ThinningCacheTool_Stream2 (Athena::ThinningCacheTool)
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2Tool (AthenaOutputStreamTool)
Stream2 DEBUG Data Deps for Stream2
@@ -1602,12 +1608,17 @@ AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events
Stream1 DEBUG AthenaOutputStream Stream1 ::stop()
Stream2 DEBUG AthenaOutputStream Stream2 ::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*]
+Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream1]
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream1 DEBUG Added object 167728019,"Stream1"
+Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
+Stream1 DEBUG Key:EventFormatStream1
+Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 243004407,"EventFormatStream1"
Stream1 DEBUG addItemObjects(1316383046,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1625,30 +1636,47 @@ SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::EventFormat_v1 [????]
+SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 14 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
Stream1 DEBUG Leaving incident handler for MetaDataStop
Stream2 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream2 DEBUG metadataItemList: [EventStreamInfo#Stream2, IOVMetaDataContainer#*]
+Stream2 DEBUG metadataItemList: [EventStreamInfo#Stream2, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream2]
Stream2 DEBUG addItemObjects(167728019,"Stream2") called
Stream2 DEBUG Key:Stream2
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream2 DEBUG Added object 167728019,"Stream2"
+Stream2 DEBUG addItemObjects(243004407,"EventFormatStream2") called
+Stream2 DEBUG Key:EventFormatStream2
+Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream2 DEBUG Added object 243004407,"EventFormatStream2"
Stream2 DEBUG addItemObjects(1316383046,"*") called
Stream2 DEBUG Key:*
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1664,19 +1692,29 @@ SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[4 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream2)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream2'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream2) of type ROOT_Tree
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
Stream2 INFO Metadata records written: 21
Stream2 DEBUG Leaving incident handler for MetaDataStop
@@ -1704,10 +1742,10 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 42
-cRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.242(+- 1.54)/ 0/ 10 [ms] #=124
-cRepR_ALL INFO Time User : Tot= 50 [ms] Ave/Min/Max= 0.128(+- 1.12)/ 0/ 10 [ms] #=390
-fRep_ALL INFO Time User : Tot= 80 [ms] Ave/Min/Max= 0.645(+- 2.46)/ 0/ 10 [ms] #=124
-ChronoStatSvc INFO Time User : Tot= 370 [ms] #= 1
+cRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.238(+- 1.52)/ 0/ 10 [ms] #=126
+cRepR_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.0765(+- 0.871)/ 0/ 10 [ms] #=392
+fRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.238(+- 1.52)/ 0/ 10 [ms] #=126
+ChronoStatSvc INFO Time User : Tot= 210 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
index 1f1e7202e3df5952082627e711c6fc6783ccb914..ca92aa4462ba819fa8077616ac51ec065b3183a1 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
@@ -1,17 +1,17 @@
-Fri Sep 11 23:46:29 CEST 20?0
+Tue Oct 6 16:03:57 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_CopyJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5568 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Fri Sep 11 23:46:41 20?0
+ running on 58dd451bc47f on Tue Oct 6 16:04:02 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
@@ -29,9 +29,10 @@ PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-09-10T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -65,7 +66,9 @@ SimplePoolFile1... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -90,11 +93,13 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -139,9 +144,11 @@ Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: SimplePoolReplica1.root
+ClassIDSvc INFO getRegistryEntries: read 171 CLIDRegistry entries for module ALL
Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
@@ -149,6 +156,7 @@ Stream1 DEBUG input handles: 0
Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
@@ -858,12 +866,17 @@ Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
AthenaEventLoopMgr INFO No more events in event selection
Stream1 DEBUG AthenaOutputStream Stream1 ::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*]
+Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream1]
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream1 DEBUG Added object 167728019,"Stream1"
+Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
+Stream1 DEBUG Key:EventFormatStream1
+Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 243004407,"EventFormatStream1"
Stream1 DEBUG addItemObjects(1316383046,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -881,20 +894,33 @@ SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolRepli... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::EventFormat_v1 [????]
+SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG ---->ClassID:????
+SimplePoolRepli... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
+SimplePoolRepli... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolRepli... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (16 , ffffffff)
+SimplePoolRepli... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
+ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
Stream1 DEBUG Leaving incident handler for MetaDataStop
Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] ????
@@ -911,12 +937,12 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
-cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
+cObj_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
+cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 63
cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 65
-cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.0617(+- 0.783)/ 0/ 10 [ms] #=324
-cObj_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.484(+- 2.8)/ 0/ 20 [ms] #= 62
-fRep_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 0.645(+- 3.04)/ 0/ 20 [ms] #= 62
-ChronoStatSvc INFO Time User : Tot= 430 [ms] #= 1
+cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0308(+- 0.554)/ 0/ 10 [ms] #=325
+fRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
+ChronoStatSvc INFO Time User : Tot= 210 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
index 9c9e89381bdae68b6d8a7871cc6b34815de7e310..39dc8733fe7c62e4e81216f2dd18e9b5a88e9c88 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RCond.ref
@@ -1,28 +1,24 @@
-Sat Nov 2 01:41:28 CET 2019
+Tue Oct 6 16:04:43 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_RCondJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5598 configurables from 9 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on aibuild028.cern.ch on Sat Nov 2 01:41:38 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on 58dd451bc47f on Tue Oct 6 16:04:49 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3286 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 861 CLIDRegistry entries for module ALL
ReadCond DEBUG Property update for OutputLevel : new value = 2
ReadCond INFO in initialize()
ReadCond DEBUG input handles: 0
@@ -33,14 +29,14 @@ ReadData INFO in initialize()
MetaDataSvc DEBUG Property update for OutputLevel : new value = 2
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc DEBUG Service base class initialized successfully
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-10-31T2131/Athena/22.0.7/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -84,7 +80,9 @@ SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -127,11 +125,13 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (14 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 21 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 22 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -146,7 +146,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 2053 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1666 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -155,6 +155,7 @@ MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
MetaDataSvc DEBUG Loaded input meta data store proxies
ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
AthenaPoolAddre... DEBUG Property update for OutputLevel : new value = 2
AthenaPoolAddre... DEBUG Service base class initialized successfully
CondProxyProvider DEBUG Property update for OutputLevel : new value = 2
@@ -202,7 +203,6 @@ ReadData DEBUG output handles: 0
ReadData DEBUG Data Deps for ReadData
+ INPUT ( 'ExampleHitContainer' , 'StoreGateSvc+MyHits' )
+ INPUT ( 'ExampleTrackContainer' , 'StoreGateSvc+MyTracks' )
-HistogramPersis...WARNING Histograms saving not required.
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
EventSelector DEBUG Try item: "SimplePoolFile1.root" from the collection list.
@@ -333,7 +333,7 @@ EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-ClassIDSvc INFO getRegistryEntries: read 27 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
@@ -958,6 +958,7 @@ ReadData INFO Hit x = 1926.91 y = 52.2238 z = -1855.07 detector = Du
ReadData INFO Hit x = 1930.12 y = 46.5449 z = -1856.17 detector = DummyHitDetector
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
AthenaEventLoopMgr INFO No more events in event selection
@@ -974,9 +975,9 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max=0.204(+- 1.41)/ 0/ 10 [ms] #= 49
-cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max=0.444(+- 2.06)/ 0/ 10 [ms] #= 45
-ChronoStatSvc INFO Time User : Tot= 450 [ms] #= 1
+cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.204(+- 1.41)/ 0/ 10 [ms] #= 49
+cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.444(+- 2.06)/ 0/ 10 [ms] #= 45
+ChronoStatSvc INFO Time User : Tot= 160 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
index 7d016fd5f3f7e26c842e419a85acec8500c621f3..3c77f1afb29bd703012ba537dd88d02ae67be1f2 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMeta.ref
@@ -1,43 +1,39 @@
-Sat Nov 2 01:41:54 CET 2019
+Tue Oct 6 16:04:56 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_RMetaJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5598 configurables from 9 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on aibuild028.cern.ch on Sat Nov 2 01:42:03 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on 58dd451bc47f on Tue Oct 6 16:05:02 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3286 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 861 CLIDRegistry entries for module ALL
ReadData DEBUG Property update for OutputLevel : new value = 2
ReadData INFO in initialize()
MetaDataSvc DEBUG Property update for OutputLevel : new value = 2
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc DEBUG Service base class initialized successfully
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog2.xml) [ok]
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-10-31T2131/Athena/22.0.7/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -81,7 +77,9 @@ SimplePoolFile5... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile5... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
+SimplePoolFile5... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -126,11 +124,13 @@ SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(ExampleHitContainer_p1
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (15 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (16 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (17 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 22 Entries in total.
+SimplePoolFile5... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (18 , ffffffff)
+SimplePoolFile5... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 23 Entries in total.
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -145,7 +145,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 2053 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1666 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -154,6 +154,7 @@ MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
MetaDataSvc DEBUG Loaded input meta data store proxies
ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
AthenaPoolAddre... DEBUG Property update for OutputLevel : new value = 2
AthenaPoolAddre... DEBUG Service base class initialized successfully
ReadData DEBUG input handles: 2
@@ -161,7 +162,6 @@ ReadData DEBUG output handles: 0
ReadData DEBUG Data Deps for ReadData
+ INPUT ( 'ExampleHitContainer' , 'StoreGateSvc+MyHits' )
+ INPUT ( 'ExampleTrackContainer' , 'StoreGateSvc+MyTracks' )
-HistogramPersis...WARNING Histograms saving not required.
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
EventSelector DEBUG Try item: "SimplePoolFile5.root" from the collection list.
@@ -185,7 +185,7 @@ EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000].
-ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6 CLIDRegistry entries for module ALL
EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000000]
SimplePoolFile5... DEBUG --> Access DbContainer READ [ROOT_Tree] POOLContainer(DataHeader)
POOLContainer(D... DEBUG Opening
@@ -826,6 +826,7 @@ ReadData INFO Hit x = 1926.91 y = -47.7762 z = -1855.07 detector = D
ReadData INFO Hit x = 1930.12 y = -53.4551 z = -1856.17 detector = DummyHitDetector
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #0 20 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -841,9 +842,9 @@ ToolSvc.AthPool... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max=0.213(+- 1.44)/ 0/ 10 [ms] #= 47
-cObj_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max=0.682(+- 2.52)/ 0/ 10 [ms] #= 44
-ChronoStatSvc INFO Time User : Tot= 450 [ms] #= 1
+cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 47
+cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.227(+- 1.49)/ 0/ 10 [ms] #= 44
+ChronoStatSvc INFO Time User : Tot= 150 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
index 814f5dd5a1bdea2b0ebb0a57524a01fbc078de3d..ba91a2a9f3f74e7b38a964774901fe8e28e3de66 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
@@ -1,17 +1,17 @@
-Wed Sep 23 17:58:44 CEST 20?0
+Tue Oct 6 16:03:44 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_RWJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5565 configurables from 45 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on lxplus750.cern.ch on Wed Sep 23 17:58:51 20?0
+ running on 58dd451bc47f on Tue Oct 6 16:03:49 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
@@ -31,9 +31,10 @@ PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-09-22T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus750.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -70,7 +71,9 @@ SimplePoolFile1... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -95,11 +98,13 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -161,16 +166,21 @@ Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: SimplePoolFile3.root
+ClassIDSvc INFO getRegistryEntries: read 171 CLIDRegistry entries for module ALL
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
Stream1 INFO I/O reinitialization...
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
@@ -284,11 +294,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 1
@@ -400,6 +412,10 @@ SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber)
SimplePoolFile3... DEBUG ---->ClassID:????
AthenaPoolCnvSvc DEBUG setAttribute BRANCH_BASKET_SIZE to 256000 for db: SimplePoolFile3.root and cont: POOLContainer(DataHeader)
AthenaPoolCnvSvc DEBUG setAttribute BRANCH_BASKET_SIZE to 1024000 for db: SimplePoolFile3.root and cont: POOLContainerForm(DataHeaderForm)
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 243004407
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 243004407
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
@@ -465,11 +481,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 2
@@ -540,11 +558,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 3
@@ -615,11 +635,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 4
@@ -690,11 +712,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 5
@@ -765,11 +789,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 6
@@ -840,11 +866,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 7
@@ -915,11 +943,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 8
@@ -990,11 +1020,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 9
@@ -1065,11 +1097,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 10
@@ -1140,11 +1174,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 11
@@ -1215,11 +1251,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 12
@@ -1290,11 +1328,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 13
@@ -1365,11 +1405,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 14
@@ -1440,11 +1482,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 15
@@ -1515,11 +1559,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 16
@@ -1590,11 +1636,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 17
@@ -1665,11 +1713,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 18
@@ -1740,11 +1790,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 19
@@ -1815,11 +1867,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 20
@@ -1827,6 +1881,7 @@ Stream1 DEBUG Object/count: ExampleTrackContainer_MyTracks, 20
Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1836,16 +1891,24 @@ MetaDataSvc DEBUG MetaDataSvc::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
MetaDataSvc DEBUG calling metaDataStop for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG Locking metadata tools
-Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*]
+Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream1]
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Transforming MetaCont<EventStreamInfo> to EventStreamInfo for output
Stream1 DEBUG Added object 167728019,"Stream1"
+Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
+Stream1 DEBUG Key:EventFormatStream1
+Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Transforming MetaCont<xAOD::EventFormat> to xAOD::EventFormat for output
+Stream1 DEBUG Added object 243004407,"EventFormatStream1"
Stream1 DEBUG addItemObjects(1316383046,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #1316383046
Stream1 DEBUG connectOutput done for SimplePoolFile3.root
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO EventStreamInfo_p3 [????]
@@ -1859,20 +1922,33 @@ SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::EventFormat_v1 [????]
+SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
+ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
MetaDataSvc DEBUG Unlocking metadata tools
Stream1 DEBUG Leaving incident handler for MetaDataStop
@@ -1893,13 +1969,13 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
-cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 66
commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
-cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.159(+- 1.25)/ 0/ 10 [ms] #= 63
-fRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.323(+- 1.77)/ 0/ 10 [ms] #= 62
-cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.139(+- 1.17)/ 0/ 10 [ms] #=144
-ChronoStatSvc INFO Time User : Tot= 280 [ms] #= 1
+cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 66
+cRep_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.159(+- 1.25)/ 0/ 10 [ms] #= 63
+cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
+cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.069(+- 0.828)/ 0/ 10 [ms] #=145
+fRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
+ChronoStatSvc INFO Time User : Tot= 210 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
index 4ec01f4e859a4e072d09b64e053436aa9dead769..758f74e9a89fccf603209502dc68a832ba059514 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
@@ -1,17 +1,17 @@
-Wed Sep 23 17:41:03 CEST 20?0
+Tue Oct 6 16:04:03 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ReWriteAgainJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5565 configurables from 45 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on lxplus750.cern.ch on Wed Sep 23 17:41:10 20?0
+ running on 58dd451bc47f on Tue Oct 6 16:04:09 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
@@ -31,9 +31,10 @@ PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-09-22T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus750.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -76,7 +77,9 @@ SimplePoolRepli... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolRepli... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
+SimplePoolRepli... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
+SimplePoolRepli... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -119,11 +122,13 @@ SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (14 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (15 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (16 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 21 Entries in total.
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
+SimplePoolRepli... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 22 Entries in total.
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -185,16 +190,21 @@ Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: SimplePoolFile3.root
+ClassIDSvc INFO getRegistryEntries: read 171 CLIDRegistry entries for module ALL
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
Stream1 INFO I/O reinitialization...
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
@@ -308,11 +318,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 1
@@ -423,6 +435,10 @@ SimplePoolFile3... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber)
SimplePoolFile3... DEBUG ---->ClassID:????
AthenaPoolCnvSvc DEBUG setAttribute BRANCH_BASKET_SIZE to 256000 for db: SimplePoolFile3.root and cont: POOLContainer(DataHeader)
AthenaPoolCnvSvc DEBUG setAttribute BRANCH_BASKET_SIZE to 1024000 for db: SimplePoolFile3.root and cont: POOLContainerForm(DataHeaderForm)
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 243004407
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 243004407
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
@@ -488,11 +504,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 2
@@ -563,11 +581,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 3
@@ -638,11 +658,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 4
@@ -713,11 +735,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 5
@@ -788,11 +812,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 6
@@ -863,11 +889,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 7
@@ -938,11 +966,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 8
@@ -1013,11 +1043,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 9
@@ -1088,11 +1120,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 10
@@ -1163,11 +1197,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 11
@@ -1238,11 +1274,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 12
@@ -1313,11 +1351,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 13
@@ -1388,11 +1428,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 14
@@ -1463,11 +1505,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 15
@@ -1538,11 +1582,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 16
@@ -1613,11 +1659,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 17
@@ -1688,11 +1736,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 18
@@ -1763,11 +1813,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 19
@@ -1838,11 +1890,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 20
@@ -1850,6 +1904,7 @@ Stream1 DEBUG Object/count: ExampleTrackContainer_MyTracks, 20
Stream1 DEBUG connectOutput done for SimplePoolFile3.root
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1859,16 +1914,24 @@ MetaDataSvc DEBUG MetaDataSvc::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
MetaDataSvc DEBUG calling metaDataStop for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG Locking metadata tools
-Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*]
+Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream1]
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Transforming MetaCont<EventStreamInfo> to EventStreamInfo for output
Stream1 DEBUG Added object 167728019,"Stream1"
+Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
+Stream1 DEBUG Key:EventFormatStream1
+Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Transforming MetaCont<xAOD::EventFormat> to xAOD::EventFormat for output
+Stream1 DEBUG Added object 243004407,"EventFormatStream1"
Stream1 DEBUG addItemObjects(1316383046,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #1316383046
Stream1 DEBUG connectOutput done for SimplePoolFile3.root
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO EventStreamInfo_p3 [????]
@@ -1882,20 +1945,33 @@ SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::EventFormat_v1 [????]
+SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
+ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
MetaDataSvc DEBUG Unlocking metadata tools
Stream1 DEBUG Leaving incident handler for MetaDataStop
@@ -1916,13 +1992,13 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
-cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 65
commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
+cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 63
cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.159(+- 1.25)/ 0/ 10 [ms] #= 63
-cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0694(+- 0.83)/ 0/ 10 [ms] #=144
-fRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.323(+- 1.77)/ 0/ 10 [ms] #= 62
-ChronoStatSvc INFO Time User : Tot= 260 [ms] #= 1
+cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.154(+- 1.23)/ 0/ 10 [ms] #= 65
+cRepR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #=145
+fRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
+ChronoStatSvc INFO Time User : Tot= 180 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
index 51941979e8ecf7d93a05fdd48378a7ad1b70bdc5..39239bb3182a25bfc1176adf0bd1aad961fe8e2f 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
@@ -1,17 +1,17 @@
-Wed Sep 23 16:50:48 CEST 20?0
+Tue Oct 6 16:04:10 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ReWriteNextJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5565 configurables from 45 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on lxplus750.cern.ch on Wed Sep 23 16:50:56 20?0
+ running on 58dd451bc47f on Tue Oct 6 16:04:15 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
@@ -31,9 +31,10 @@ PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-09-22T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus750.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -70,7 +71,9 @@ SimplePoolFile3... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
+SimplePoolFile3... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -95,11 +98,13 @@ SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -161,16 +166,21 @@ Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: SimplePoolFile4.root
+ClassIDSvc INFO getRegistryEntries: read 171 CLIDRegistry entries for module ALL
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
Stream1 INFO I/O reinitialization...
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
@@ -252,11 +262,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 1
@@ -366,6 +378,10 @@ SimplePoolFile4... DEBUG --->Adding Assoc :????/POOLCollectionTree(MagicNumber)
SimplePoolFile4... DEBUG ---->ClassID:????
AthenaPoolCnvSvc DEBUG setAttribute BRANCH_BASKET_SIZE to 256000 for db: SimplePoolFile4.root and cont: POOLContainer(DataHeader)
AthenaPoolCnvSvc DEBUG setAttribute BRANCH_BASKET_SIZE to 1024000 for db: SimplePoolFile4.root and cont: POOLContainerForm(DataHeaderForm)
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 167728019
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 243004407
+MetaDataSvc DEBUG MetaDataSvc will handle ClassID 243004407
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
@@ -399,11 +415,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 2
@@ -442,11 +460,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 3
@@ -485,11 +505,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 4
@@ -528,11 +550,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 5
@@ -571,11 +595,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 6
@@ -614,11 +640,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 7
@@ -657,11 +685,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 8
@@ -700,11 +730,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 9
@@ -743,11 +775,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 10
@@ -786,11 +820,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 11
@@ -829,11 +865,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 12
@@ -872,11 +910,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 13
@@ -915,11 +955,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 14
@@ -958,11 +1000,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 15
@@ -1001,11 +1045,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 16
@@ -1044,11 +1090,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 17
@@ -1087,11 +1135,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 18
@@ -1130,11 +1180,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 19
@@ -1173,11 +1225,13 @@ Stream1 DEBUG addItemObjects(2101,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #2101
Stream1 DEBUG Added object 2101,"McEventInfo"
Stream1 DEBUG addItemObjects(9103,"MyTracks") called
Stream1 DEBUG Key:MyTracks
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #9103
Stream1 DEBUG Added object 9103,"MyTracks"
Stream1 DEBUG Collected objects:
Stream1 DEBUG Object/count: EventInfo_McEventInfo, 20
@@ -1185,6 +1239,7 @@ Stream1 DEBUG Object/count: ExampleTrackContainer_MyTracks, 20
Stream1 DEBUG connectOutput done for SimplePoolFile4.root
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1194,16 +1249,24 @@ MetaDataSvc DEBUG MetaDataSvc::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
MetaDataSvc DEBUG calling metaDataStop for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG Locking metadata tools
-Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*]
+Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream1]
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Transforming MetaCont<EventStreamInfo> to EventStreamInfo for output
Stream1 DEBUG Added object 167728019,"Stream1"
+Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
+Stream1 DEBUG Key:EventFormatStream1
+Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Transforming MetaCont<xAOD::EventFormat> to xAOD::EventFormat for output
+Stream1 DEBUG Added object 243004407,"EventFormatStream1"
Stream1 DEBUG addItemObjects(1316383046,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+MetaDataSvc DEBUG Not translating metadata item ID #1316383046
Stream1 DEBUG connectOutput done for SimplePoolFile4.root
StorageSvc INFO Building shape according to reflection information using shape ID for:
StorageSvc INFO EventStreamInfo_p3 [????]
@@ -1217,20 +1280,33 @@ SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile4... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::EventFormat_v1 [????]
+SimplePoolFile4... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
+SimplePoolFile4... DEBUG ---->ClassID:????
+SimplePoolFile4... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile4... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile4... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile4... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile4... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
+ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
MetaDataSvc DEBUG Unlocking metadata tools
Stream1 DEBUG Leaving incident handler for MetaDataStop
@@ -1252,12 +1328,12 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
-cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
-fRep_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.161(+- 1.26)/ 0/ 10 [ms] #= 62
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.154(+- 1.23)/ 0/ 10 [ms] #= 65
-cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0694(+- 0.83)/ 0/ 10 [ms] #=144
-cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.159(+- 1.25)/ 0/ 10 [ms] #= 63
-ChronoStatSvc INFO Time User : Tot= 270 [ms] #= 1
+cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 63
+fRep_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.159(+- 1.25)/ 0/ 10 [ms] #= 63
+cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 65
+cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.069(+- 0.828)/ 0/ 10 [ms] #=145
+cObj_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 63
+ChronoStatSvc INFO Time User : Tot= 170 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
index d55e8196116aebbf6d413d8eef65b4d6d62b7aa8..4e5d1aa79c5e7befade783b3f7471aaf309c421c 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Read.ref
@@ -1,41 +1,37 @@
-Sat Nov 2 01:39:50 CET 2019
+Tue Oct 6 16:03:50 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5598 configurables from 9 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on aibuild028.cern.ch on Sat Nov 2 01:40:00 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on 58dd451bc47f on Tue Oct 6 16:03:55 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3286 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 861 CLIDRegistry entries for module ALL
ReadData DEBUG Property update for OutputLevel : new value = 2
ReadData INFO in initialize()
MetaDataSvc DEBUG Property update for OutputLevel : new value = 2
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc DEBUG Service base class initialized successfully
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-10-31T2131/Athena/22.0.7/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -60,10 +56,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -72,11 +70,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -116,7 +116,9 @@ SimplePoolFile1... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -141,11 +143,13 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (b , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -160,7 +164,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 2053 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1666 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -169,6 +173,7 @@ MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
MetaDataSvc DEBUG Loaded input meta data store proxies
ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
AthenaPoolAddre... DEBUG Property update for OutputLevel : new value = 2
AthenaPoolAddre... DEBUG Service base class initialized successfully
ReadData DEBUG input handles: 2
@@ -176,7 +181,6 @@ ReadData DEBUG output handles: 0
ReadData DEBUG Data Deps for ReadData
+ INPUT ( 'ExampleHitContainer' , 'StoreGateSvc+MyHits' )
+ INPUT ( 'ExampleTrackContainer' , 'StoreGateSvc+MyTracks' )
-HistogramPersis...WARNING Histograms saving not required.
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
EventSelector DEBUG Try item: "EmptyPoolFile.root" from the collection list.
@@ -190,10 +194,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -202,11 +208,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -234,6 +242,7 @@ MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of ty
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG handle() EndInputFile for eventless EmptyPoolFile.root
+MetaDataSvc DEBUG retireMetadataSource: eventless EmptyPoolFile.root
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
EventSelector DEBUG Try item: "SimplePoolFile1.root" from the collection list.
ApplicationMgr INFO Application Manager Started successfully
@@ -320,14 +329,14 @@ ReadData INFO Hit x = 1020.49 y = 63.5816 z = -951.864 detector = Du
ReadData INFO Hit x = 1023.7 y = 57.9027 z = -953.684 detector = DummyHitDetector
ReadData INFO Hit x = 1026.91 y = 52.2238 z = -955.073 detector = DummyHitDetector
ReadData INFO Hit x = 1030.12 y = 46.5449 z = -956.169 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 3
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-ClassIDSvc INFO getRegistryEntries: read 27 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
@@ -354,7 +363,7 @@ ReadData INFO Hit x = 1120.49 y = 63.5816 z = -1051.86 detector = Du
ReadData INFO Hit x = 1123.7 y = 57.9027 z = -1053.68 detector = DummyHitDetector
ReadData INFO Hit x = 1126.91 y = 52.2238 z = -1055.07 detector = DummyHitDetector
ReadData INFO Hit x = 1130.12 y = 46.5449 z = -1056.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -387,7 +396,7 @@ ReadData INFO Hit x = 1220.49 y = 63.5816 z = -1151.86 detector = Du
ReadData INFO Hit x = 1223.7 y = 57.9027 z = -1153.68 detector = DummyHitDetector
ReadData INFO Hit x = 1226.91 y = 52.2238 z = -1155.07 detector = DummyHitDetector
ReadData INFO Hit x = 1230.12 y = 46.5449 z = -1156.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -420,7 +429,7 @@ ReadData INFO Hit x = 1320.49 y = 63.5816 z = -1251.86 detector = Du
ReadData INFO Hit x = 1323.7 y = 57.9027 z = -1253.68 detector = DummyHitDetector
ReadData INFO Hit x = 1326.91 y = 52.2238 z = -1255.07 detector = DummyHitDetector
ReadData INFO Hit x = 1330.12 y = 46.5449 z = -1256.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -453,7 +462,7 @@ ReadData INFO Hit x = 1420.49 y = 63.5816 z = -1351.86 detector = Du
ReadData INFO Hit x = 1423.7 y = 57.9027 z = -1353.68 detector = DummyHitDetector
ReadData INFO Hit x = 1426.91 y = 52.2238 z = -1355.07 detector = DummyHitDetector
ReadData INFO Hit x = 1430.12 y = 46.5449 z = -1356.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -486,7 +495,7 @@ ReadData INFO Hit x = 1520.49 y = 63.5816 z = -1451.86 detector = Du
ReadData INFO Hit x = 1523.7 y = 57.9027 z = -1453.68 detector = DummyHitDetector
ReadData INFO Hit x = 1526.91 y = 52.2238 z = -1455.07 detector = DummyHitDetector
ReadData INFO Hit x = 1530.12 y = 46.5449 z = -1456.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -519,7 +528,7 @@ ReadData INFO Hit x = 1620.49 y = 63.5816 z = -1551.86 detector = Du
ReadData INFO Hit x = 1623.7 y = 57.9027 z = -1553.68 detector = DummyHitDetector
ReadData INFO Hit x = 1626.91 y = 52.2238 z = -1555.07 detector = DummyHitDetector
ReadData INFO Hit x = 1630.12 y = 46.5449 z = -1556.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -552,7 +561,7 @@ ReadData INFO Hit x = 1720.49 y = 63.5816 z = -1651.86 detector = Du
ReadData INFO Hit x = 1723.7 y = 57.9027 z = -1653.68 detector = DummyHitDetector
ReadData INFO Hit x = 1726.91 y = 52.2238 z = -1655.07 detector = DummyHitDetector
ReadData INFO Hit x = 1730.12 y = 46.5449 z = -1656.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -585,7 +594,7 @@ ReadData INFO Hit x = 1820.49 y = 63.5816 z = -1751.86 detector = Du
ReadData INFO Hit x = 1823.7 y = 57.9027 z = -1753.68 detector = DummyHitDetector
ReadData INFO Hit x = 1826.91 y = 52.2238 z = -1755.07 detector = DummyHitDetector
ReadData INFO Hit x = 1830.12 y = 46.5449 z = -1756.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -618,10 +627,11 @@ ReadData INFO Hit x = 1920.49 y = 63.5816 z = -1851.86 detector = Du
ReadData INFO Hit x = 1923.7 y = 57.9027 z = -1853.68 detector = DummyHitDetector
ReadData INFO Hit x = 1926.91 y = 52.2238 z = -1855.07 detector = DummyHitDetector
ReadData INFO Hit x = 1930.12 y = 46.5449 z = -1856.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 25378
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26833
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 10 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -638,10 +648,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -650,11 +662,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -677,6 +691,7 @@ MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG handle() EndInputFile for eventless EmptyPoolFile.root
+MetaDataSvc DEBUG retireMetadataSource: eventless EmptyPoolFile.root
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
EventSelector DEBUG Try item: "SimplePoolFile2.root" from the collection list.
@@ -701,7 +716,9 @@ SimplePoolFile2... DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+SimplePoolFile2... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -724,11 +741,13 @@ SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (a , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 11 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -802,7 +821,7 @@ ReadData INFO EventInfo event: 0 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -824,7 +843,7 @@ ReadData INFO EventInfo event: 1 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -846,7 +865,7 @@ ReadData INFO EventInfo event: 2 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -868,7 +887,7 @@ ReadData INFO EventInfo event: 3 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -890,7 +909,7 @@ ReadData INFO EventInfo event: 4 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -912,7 +931,7 @@ ReadData INFO EventInfo event: 5 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -934,7 +953,7 @@ ReadData INFO EventInfo event: 6 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -956,7 +975,7 @@ ReadData INFO EventInfo event: 7 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -978,7 +997,7 @@ ReadData INFO EventInfo event: 8 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1000,7 +1019,7 @@ ReadData INFO EventInfo event: 9 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 20 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1022,7 +1041,7 @@ ReadData INFO EventInfo event: 10 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 21 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1044,7 +1063,7 @@ ReadData INFO EventInfo event: 11 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 22 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1066,7 +1085,7 @@ ReadData INFO EventInfo event: 12 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 23 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1088,7 +1107,7 @@ ReadData INFO EventInfo event: 13 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 24 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1110,7 +1129,7 @@ ReadData INFO EventInfo event: 14 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 25 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1132,7 +1151,7 @@ ReadData INFO EventInfo event: 15 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 26 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1154,7 +1173,7 @@ ReadData INFO EventInfo event: 16 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 27 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1176,7 +1195,7 @@ ReadData INFO EventInfo event: 17 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 28 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1198,7 +1217,7 @@ ReadData INFO EventInfo event: 18 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 29 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1220,10 +1239,11 @@ ReadData INFO EventInfo event: 19 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 30 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1251,7 +1271,9 @@ SimplePoolFile3... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
+SimplePoolFile3... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -1276,11 +1298,13 @@ SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (b , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -1363,7 +1387,7 @@ ReadData INFO Track pt = 74.8928 eta = 3.1676 phi = 2.6161 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 31 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1389,7 +1413,7 @@ ReadData INFO Track pt = 137.584 eta = -39.525 phi = 17.2679 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 32 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1415,7 +1439,7 @@ ReadData INFO Track pt = 228.154 eta = -6.2704 phi = 31.9197 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 33 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1441,7 +1465,7 @@ ReadData INFO Track pt = 324.306 eta = -15.8941 phi = 46.5715 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 34 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1467,7 +1491,7 @@ ReadData INFO Track pt = 422.255 eta = -13.279 phi = 61.2233 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 35 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1493,7 +1517,7 @@ ReadData INFO Track pt = 520.987 eta = -12.3511 phi = 75.8751 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 36 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1519,7 +1543,7 @@ ReadData INFO Track pt = 620.127 eta = -11.8468 phi = 90.5269 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 37 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1545,7 +1569,7 @@ ReadData INFO Track pt = 719.507 eta = -11.5247 phi = 105.179 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 38 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1571,7 +1595,7 @@ ReadData INFO Track pt = 819.038 eta = -11.2998 phi = 119.831 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 39 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1597,7 +1621,7 @@ ReadData INFO Track pt = 918.671 eta = -11.1334 phi = 134.482 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 40 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1623,7 +1647,7 @@ ReadData INFO Track pt = 1018.38 eta = -11.0052 phi = 149.134 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 41 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1649,7 +1673,7 @@ ReadData INFO Track pt = 1118.13 eta = -10.9031 phi = 163.786 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 42 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1675,7 +1699,7 @@ ReadData INFO Track pt = 1217.93 eta = -10.82 phi = 178.438 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 43 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1701,7 +1725,7 @@ ReadData INFO Track pt = 1317.76 eta = -10.751 phi = 193.09 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 44 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1727,7 +1751,7 @@ ReadData INFO Track pt = 1417.61 eta = -10.6927 phi = 207.741 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 45 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1753,7 +1777,7 @@ ReadData INFO Track pt = 1517.49 eta = -10.6429 phi = 222.393 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 46 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1779,7 +1803,7 @@ ReadData INFO Track pt = 1617.37 eta = -10.5997 phi = 237.045 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 47 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1805,7 +1829,7 @@ ReadData INFO Track pt = 1717.27 eta = -10.562 phi = 251.697 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 48 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1831,7 +1855,7 @@ ReadData INFO Track pt = 1817.19 eta = -10.5288 phi = 266.349 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 49 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1857,10 +1881,11 @@ ReadData INFO Track pt = 1917.11 eta = -10.4993 phi = 281 detector =
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 24304
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25757
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 50 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1875,9 +1900,9 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max=0.068(+-0.822)/ 0/ 10 [ms] #=147
-cObj_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max=0.288(+- 1.67)/ 0/ 10 [ms] #=139
-ChronoStatSvc INFO Time User : Tot= 0.51 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #=147
+cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.144(+- 1.19)/ 0/ 10 [ms] #=139
+ChronoStatSvc INFO Time User : Tot= 180 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
index 5b39c54ec2337ab5ad76f6248e60c849b8e373ec..17d9d836652ce5ec39eb51724d624336995dbb85 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadAgain.ref
@@ -1,40 +1,38 @@
-Sat Nov 2 01:40:39 CET 2019
+Tue Oct 6 16:04:16 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadAgainJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5598 configurables from 9 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on aibuild028.cern.ch on Sat Nov 2 01:40:49 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on 58dd451bc47f on Tue Oct 6 16:04:22 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3286 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
-ReadData DEBUG Property update for OutputLevel : new value = 2
+ClassIDSvc INFO getRegistryEntries: read 722 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 591 CLIDRegistry entries for module ALL
+EventInfoCnvAlg INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
+EventInfoCnvAlg... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
MetaDataSvc DEBUG Property update for OutputLevel : new value = 2
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc DEBUG Service base class initialized successfully
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-10-31T2131/Athena/22.0.7/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -59,10 +57,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -71,11 +71,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -121,7 +123,9 @@ SimplePoolRepli... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolRepli... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolRepli... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
+SimplePoolRepli... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
+SimplePoolRepli... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -164,11 +168,13 @@ SimplePoolRepli... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight)
SimplePoolRepli... DEBUG ---->ClassID:????
SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (14 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (15 , ffffffff)
+SimplePoolRepli... DEBUG ---->ClassID:????
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (16 , ffffffff)
+SimplePoolRepli... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
SimplePoolRepli... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 21 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 22 Entries in total.
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -183,7 +189,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 1642 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1666 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -218,10 +224,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -230,11 +238,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -262,6 +272,7 @@ MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of ty
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG handle() EndInputFile for eventless EmptyPoolFile.root
+MetaDataSvc DEBUG retireMetadataSource: eventless EmptyPoolFile.root
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
EventSelector DEBUG Try item: "SimplePoolReplica1.root" from the collection list.
ApplicationMgr INFO Application Manager Started successfully
@@ -348,7 +359,7 @@ ReadData INFO Hit x = 1020.49 y = 63.5816 z = -951.864 detector = Du
ReadData INFO Hit x = 1023.7 y = 57.9027 z = -953.684 detector = DummyHitDetector
ReadData INFO Hit x = 1026.91 y = 52.2238 z = -955.073 detector = DummyHitDetector
ReadData INFO Hit x = 1030.12 y = 46.5449 z = -956.169 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -382,7 +393,7 @@ ReadData INFO Hit x = 1120.49 y = 63.5816 z = -1051.86 detector = Du
ReadData INFO Hit x = 1123.7 y = 57.9027 z = -1053.68 detector = DummyHitDetector
ReadData INFO Hit x = 1126.91 y = 52.2238 z = -1055.07 detector = DummyHitDetector
ReadData INFO Hit x = 1130.12 y = 46.5449 z = -1056.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -415,7 +426,7 @@ ReadData INFO Hit x = 1220.49 y = 63.5816 z = -1151.86 detector = Du
ReadData INFO Hit x = 1223.7 y = 57.9027 z = -1153.68 detector = DummyHitDetector
ReadData INFO Hit x = 1226.91 y = 52.2238 z = -1155.07 detector = DummyHitDetector
ReadData INFO Hit x = 1230.12 y = 46.5449 z = -1156.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -448,7 +459,7 @@ ReadData INFO Hit x = 1320.49 y = 63.5816 z = -1251.86 detector = Du
ReadData INFO Hit x = 1323.7 y = 57.9027 z = -1253.68 detector = DummyHitDetector
ReadData INFO Hit x = 1326.91 y = 52.2238 z = -1255.07 detector = DummyHitDetector
ReadData INFO Hit x = 1330.12 y = 46.5449 z = -1256.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -481,7 +492,7 @@ ReadData INFO Hit x = 1420.49 y = 63.5816 z = -1351.86 detector = Du
ReadData INFO Hit x = 1423.7 y = 57.9027 z = -1353.68 detector = DummyHitDetector
ReadData INFO Hit x = 1426.91 y = 52.2238 z = -1355.07 detector = DummyHitDetector
ReadData INFO Hit x = 1430.12 y = 46.5449 z = -1356.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -514,7 +525,7 @@ ReadData INFO Hit x = 1520.49 y = 63.5816 z = -1451.86 detector = Du
ReadData INFO Hit x = 1523.7 y = 57.9027 z = -1453.68 detector = DummyHitDetector
ReadData INFO Hit x = 1526.91 y = 52.2238 z = -1455.07 detector = DummyHitDetector
ReadData INFO Hit x = 1530.12 y = 46.5449 z = -1456.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -547,7 +558,7 @@ ReadData INFO Hit x = 1620.49 y = 63.5816 z = -1551.86 detector = Du
ReadData INFO Hit x = 1623.7 y = 57.9027 z = -1553.68 detector = DummyHitDetector
ReadData INFO Hit x = 1626.91 y = 52.2238 z = -1555.07 detector = DummyHitDetector
ReadData INFO Hit x = 1630.12 y = 46.5449 z = -1556.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -580,7 +591,7 @@ ReadData INFO Hit x = 1720.49 y = 63.5816 z = -1651.86 detector = Du
ReadData INFO Hit x = 1723.7 y = 57.9027 z = -1653.68 detector = DummyHitDetector
ReadData INFO Hit x = 1726.91 y = 52.2238 z = -1655.07 detector = DummyHitDetector
ReadData INFO Hit x = 1730.12 y = 46.5449 z = -1656.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -613,7 +624,7 @@ ReadData INFO Hit x = 1820.49 y = 63.5816 z = -1751.86 detector = Du
ReadData INFO Hit x = 1823.7 y = 57.9027 z = -1753.68 detector = DummyHitDetector
ReadData INFO Hit x = 1826.91 y = 52.2238 z = -1755.07 detector = DummyHitDetector
ReadData INFO Hit x = 1830.12 y = 46.5449 z = -1756.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -646,10 +657,11 @@ ReadData INFO Hit x = 1920.49 y = 63.5816 z = -1851.86 detector = Du
ReadData INFO Hit x = 1923.7 y = 57.9027 z = -1853.68 detector = DummyHitDetector
ReadData INFO Hit x = 1926.91 y = 52.2238 z = -1855.07 detector = DummyHitDetector
ReadData INFO Hit x = 1930.12 y = 46.5449 z = -1856.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 26538
+PoolSvc INFO Database (SimplePoolReplica1.root) attribute [BYTES_READ]: 27536
PoolSvc INFO Database (SimplePoolReplica1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 10 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -666,10 +678,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -678,11 +692,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -705,6 +721,7 @@ MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG handle() EndInputFile for eventless EmptyPoolFile.root
+MetaDataSvc DEBUG retireMetadataSource: eventless EmptyPoolFile.root
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
EventSelector DEBUG Try item: "SimplePoolFile2.root" from the collection list.
@@ -729,7 +746,9 @@ SimplePoolFile2... DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+SimplePoolFile2... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -752,11 +771,13 @@ SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (a , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 11 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -830,7 +851,7 @@ ReadData INFO EventInfo event: 0 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -852,7 +873,7 @@ ReadData INFO EventInfo event: 1 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -874,7 +895,7 @@ ReadData INFO EventInfo event: 2 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -896,7 +917,7 @@ ReadData INFO EventInfo event: 3 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -918,7 +939,7 @@ ReadData INFO EventInfo event: 4 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -940,7 +961,7 @@ ReadData INFO EventInfo event: 5 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -962,7 +983,7 @@ ReadData INFO EventInfo event: 6 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -984,7 +1005,7 @@ ReadData INFO EventInfo event: 7 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1006,7 +1027,7 @@ ReadData INFO EventInfo event: 8 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1028,7 +1049,7 @@ ReadData INFO EventInfo event: 9 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 20 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1050,7 +1071,7 @@ ReadData INFO EventInfo event: 10 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 21 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1072,7 +1093,7 @@ ReadData INFO EventInfo event: 11 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 22 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1094,7 +1115,7 @@ ReadData INFO EventInfo event: 12 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 23 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1116,7 +1137,7 @@ ReadData INFO EventInfo event: 13 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 24 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1138,7 +1159,7 @@ ReadData INFO EventInfo event: 14 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 25 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1160,7 +1181,7 @@ ReadData INFO EventInfo event: 15 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 26 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1182,7 +1203,7 @@ ReadData INFO EventInfo event: 16 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 27 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1204,7 +1225,7 @@ ReadData INFO EventInfo event: 17 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 28 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1226,7 +1247,7 @@ ReadData INFO EventInfo event: 18 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 29 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1248,10 +1269,11 @@ ReadData INFO EventInfo event: 19 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 22622
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 30 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1279,7 +1301,9 @@ SimplePoolFile4... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile4... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
SimplePoolFile4... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
+SimplePoolFile4... DEBUG --->Reading Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile4... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 8 Entries in total.
SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -1304,11 +1328,13 @@ SimplePoolFile4... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile4... DEBUG ---->ClassID:????
SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (b , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile4... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
+SimplePoolFile4... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
+SimplePoolFile4... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 13 Entries in total.
SimplePoolFile4... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -1391,7 +1417,7 @@ ReadData INFO Track pt = 74.8928 eta = 3.1676 phi = 2.6161 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 31 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1417,7 +1443,7 @@ ReadData INFO Track pt = 137.584 eta = -39.525 phi = 17.2679 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 32 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1443,7 +1469,7 @@ ReadData INFO Track pt = 228.154 eta = -6.2704 phi = 31.9197 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 33 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1469,7 +1495,7 @@ ReadData INFO Track pt = 324.306 eta = -15.8941 phi = 46.5715 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 34 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1495,7 +1521,7 @@ ReadData INFO Track pt = 422.255 eta = -13.279 phi = 61.2233 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 35 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1521,7 +1547,7 @@ ReadData INFO Track pt = 520.987 eta = -12.3511 phi = 75.8751 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 36 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1547,7 +1573,7 @@ ReadData INFO Track pt = 620.127 eta = -11.8468 phi = 90.5269 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 37 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1573,7 +1599,7 @@ ReadData INFO Track pt = 719.507 eta = -11.5247 phi = 105.179 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 38 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1599,7 +1625,7 @@ ReadData INFO Track pt = 819.038 eta = -11.2998 phi = 119.831 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 39 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1625,7 +1651,7 @@ ReadData INFO Track pt = 918.671 eta = -11.1334 phi = 134.482 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 40 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1651,7 +1677,7 @@ ReadData INFO Track pt = 1018.38 eta = -11.0052 phi = 149.134 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 41 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1677,7 +1703,7 @@ ReadData INFO Track pt = 1118.13 eta = -10.9031 phi = 163.786 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 42 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1703,7 +1729,7 @@ ReadData INFO Track pt = 1217.93 eta = -10.82 phi = 178.438 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 43 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1729,7 +1755,7 @@ ReadData INFO Track pt = 1317.76 eta = -10.751 phi = 193.09 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 44 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1755,7 +1781,7 @@ ReadData INFO Track pt = 1417.61 eta = -10.6927 phi = 207.741 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 45 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1781,7 +1807,7 @@ ReadData INFO Track pt = 1517.49 eta = -10.6429 phi = 222.393 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 46 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1807,7 +1833,7 @@ ReadData INFO Track pt = 1617.37 eta = -10.5997 phi = 237.045 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 47 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1833,7 +1859,7 @@ ReadData INFO Track pt = 1717.27 eta = -10.562 phi = 251.697 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 48 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1859,7 +1885,7 @@ ReadData INFO Track pt = 1817.19 eta = -10.5288 phi = 266.349 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 49 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1885,10 +1911,11 @@ ReadData INFO Track pt = 1917.11 eta = -10.4993 phi = 281 detector =
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25094
+PoolSvc INFO Database (SimplePoolFile4.root) attribute [BYTES_READ]: 25851
PoolSvc INFO Database (SimplePoolFile4.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 50 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1903,9 +1930,9 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max=0.0685(+-0.825)/ 0/ 10 [ms] #=146
-cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max=0.144(+- 1.19)/ 0/ 10 [ms] #=139
-ChronoStatSvc INFO Time User : Tot= 0.53 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0685(+- 0.825)/ 0/ 10 [ms] #=146
+cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.144(+- 1.19)/ 0/ 10 [ms] #=139
+ChronoStatSvc INFO Time User : Tot= 190 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
index 31e2e179bfa35f205980d18ab9a0153535712e23..aba80404250401263a581414a85c1b7485649475 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReadConcat.ref
@@ -1,41 +1,37 @@
-Sat Nov 2 01:41:04 CET 2019
+Tue Oct 6 16:04:30 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5598 configurables from 9 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on aibuild028.cern.ch on Sat Nov 2 01:41:13 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on 58dd451bc47f on Tue Oct 6 16:04:35 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3286 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 861 CLIDRegistry entries for module ALL
ReadData DEBUG Property update for OutputLevel : new value = 2
ReadData INFO in initialize()
MetaDataSvc DEBUG Property update for OutputLevel : new value = 2
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc DEBUG Service base class initialized successfully
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-10-31T2131/Athena/22.0.7/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -60,10 +56,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -72,11 +70,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -122,7 +122,9 @@ SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -165,11 +167,13 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (14 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 21 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 22 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -184,7 +188,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 2053 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1666 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -193,6 +197,7 @@ MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
MetaDataSvc DEBUG Loaded input meta data store proxies
ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
AthenaPoolAddre... DEBUG Property update for OutputLevel : new value = 2
AthenaPoolAddre... DEBUG Service base class initialized successfully
ReadData DEBUG input handles: 2
@@ -200,7 +205,6 @@ ReadData DEBUG output handles: 0
ReadData DEBUG Data Deps for ReadData
+ INPUT ( 'ExampleHitContainer' , 'StoreGateSvc+MyHits' )
+ INPUT ( 'ExampleTrackContainer' , 'StoreGateSvc+MyTracks' )
-HistogramPersis...WARNING Histograms saving not required.
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
EventSelector DEBUG Try item: "EmptyPoolFile.root" from the collection list.
@@ -214,10 +218,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -226,11 +232,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -258,6 +266,7 @@ MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of ty
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG handle() EndInputFile for eventless EmptyPoolFile.root
+MetaDataSvc DEBUG retireMetadataSource: eventless EmptyPoolFile.root
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
EventSelector DEBUG Try item: "SimplePoolFile1.root" from the collection list.
ApplicationMgr INFO Application Manager Started successfully
@@ -338,14 +347,14 @@ ReadData INFO Hit x = 1020.49 y = 63.5816 z = -951.864 detector = Du
ReadData INFO Hit x = 1023.7 y = 57.9027 z = -953.684 detector = DummyHitDetector
ReadData INFO Hit x = 1026.91 y = 52.2238 z = -955.073 detector = DummyHitDetector
ReadData INFO Hit x = 1030.12 y = 46.5449 z = -956.169 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 1 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B].
-ClassIDSvc INFO getRegistryEntries: read 27 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-0000000B]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
@@ -372,7 +381,7 @@ ReadData INFO Hit x = 1120.49 y = 63.5816 z = -1051.86 detector = Du
ReadData INFO Hit x = 1123.7 y = 57.9027 z = -1053.68 detector = DummyHitDetector
ReadData INFO Hit x = 1126.91 y = 52.2238 z = -1055.07 detector = DummyHitDetector
ReadData INFO Hit x = 1130.12 y = 46.5449 z = -1056.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 2 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -405,7 +414,7 @@ ReadData INFO Hit x = 1220.49 y = 63.5816 z = -1151.86 detector = Du
ReadData INFO Hit x = 1223.7 y = 57.9027 z = -1153.68 detector = DummyHitDetector
ReadData INFO Hit x = 1226.91 y = 52.2238 z = -1155.07 detector = DummyHitDetector
ReadData INFO Hit x = 1230.12 y = 46.5449 z = -1156.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 3 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -438,7 +447,7 @@ ReadData INFO Hit x = 1320.49 y = 63.5816 z = -1251.86 detector = Du
ReadData INFO Hit x = 1323.7 y = 57.9027 z = -1253.68 detector = DummyHitDetector
ReadData INFO Hit x = 1326.91 y = 52.2238 z = -1255.07 detector = DummyHitDetector
ReadData INFO Hit x = 1330.12 y = 46.5449 z = -1256.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 4 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -471,7 +480,7 @@ ReadData INFO Hit x = 1420.49 y = 63.5816 z = -1351.86 detector = Du
ReadData INFO Hit x = 1423.7 y = 57.9027 z = -1353.68 detector = DummyHitDetector
ReadData INFO Hit x = 1426.91 y = 52.2238 z = -1355.07 detector = DummyHitDetector
ReadData INFO Hit x = 1430.12 y = 46.5449 z = -1356.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 5 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -504,7 +513,7 @@ ReadData INFO Hit x = 1520.49 y = 63.5816 z = -1451.86 detector = Du
ReadData INFO Hit x = 1523.7 y = 57.9027 z = -1453.68 detector = DummyHitDetector
ReadData INFO Hit x = 1526.91 y = 52.2238 z = -1455.07 detector = DummyHitDetector
ReadData INFO Hit x = 1530.12 y = 46.5449 z = -1456.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 6 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -537,7 +546,7 @@ ReadData INFO Hit x = 1620.49 y = 63.5816 z = -1551.86 detector = Du
ReadData INFO Hit x = 1623.7 y = 57.9027 z = -1553.68 detector = DummyHitDetector
ReadData INFO Hit x = 1626.91 y = 52.2238 z = -1555.07 detector = DummyHitDetector
ReadData INFO Hit x = 1630.12 y = 46.5449 z = -1556.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 7 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -570,7 +579,7 @@ ReadData INFO Hit x = 1720.49 y = 63.5816 z = -1651.86 detector = Du
ReadData INFO Hit x = 1723.7 y = 57.9027 z = -1653.68 detector = DummyHitDetector
ReadData INFO Hit x = 1726.91 y = 52.2238 z = -1655.07 detector = DummyHitDetector
ReadData INFO Hit x = 1730.12 y = 46.5449 z = -1656.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 8 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -603,7 +612,7 @@ ReadData INFO Hit x = 1820.49 y = 63.5816 z = -1751.86 detector = Du
ReadData INFO Hit x = 1823.7 y = 57.9027 z = -1753.68 detector = DummyHitDetector
ReadData INFO Hit x = 1826.91 y = 52.2238 z = -1755.07 detector = DummyHitDetector
ReadData INFO Hit x = 1830.12 y = 46.5449 z = -1756.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 9 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -636,10 +645,11 @@ ReadData INFO Hit x = 1920.49 y = 63.5816 z = -1851.86 detector = Du
ReadData INFO Hit x = 1923.7 y = 57.9027 z = -1853.68 detector = DummyHitDetector
ReadData INFO Hit x = 1926.91 y = 52.2238 z = -1855.07 detector = DummyHitDetector
ReadData INFO Hit x = 1930.12 y = 46.5449 z = -1856.17 detector = DummyHitDetector
-PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 26012
+PoolSvc INFO Database (SimplePoolFile1.root) attribute [BYTES_READ]: 27679
PoolSvc INFO Database (SimplePoolFile1.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 10 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -656,10 +666,12 @@ EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Shape
EmptyPoolFile.root DEBUG --->Reading Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[1 , ????]: [1 Column(s)]
-EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --->Reading Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 3 Entries in total.
+##Shapes DEBUG No objects passing selection criteria... Container has 4 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -668,11 +680,13 @@ EmptyPoolFile.root DEBUG --->Reading Assoc:????/##Params [200] (2 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream3) [20?] (3 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 4 Entries in total.
+EmptyPoolFile.root DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 5 Entries in total.
EmptyPoolFile.root DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -695,6 +709,7 @@ MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_
MetaDataSvc DEBUG Loaded input meta data store proxies
MetaDataSvc DEBUG calling beginInputFile for ToolSvc.IOVDbMetaDataTool
MetaDataSvc DEBUG handle() EndInputFile for eventless EmptyPoolFile.root
+MetaDataSvc DEBUG retireMetadataSource: eventless EmptyPoolFile.root
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
EventSelector DEBUG Try item: "SimplePoolFile2.root" from the collection list.
@@ -719,7 +734,9 @@ SimplePoolFile2... DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:unsigned int Typ:unsigned int [3] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 6 Entries in total.
+SimplePoolFile2... DEBUG --->Reading Shape[6 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 7 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -742,11 +759,13 @@ SimplePoolFile2... DEBUG --->Reading Assoc:????/POOLCollectionTree(MagicNumber)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (a , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 11 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 12 Entries in total.
SimplePoolFile2... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -821,7 +840,7 @@ ReadData INFO EventInfo event: 0 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 11 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -843,7 +862,7 @@ ReadData INFO EventInfo event: 1 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 12 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -865,7 +884,7 @@ ReadData INFO EventInfo event: 2 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 13 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -887,7 +906,7 @@ ReadData INFO EventInfo event: 3 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 14 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -909,7 +928,7 @@ ReadData INFO EventInfo event: 4 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 15 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -931,7 +950,7 @@ ReadData INFO EventInfo event: 5 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 16 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -953,7 +972,7 @@ ReadData INFO EventInfo event: 6 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 17 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -975,7 +994,7 @@ ReadData INFO EventInfo event: 7 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 18 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -997,7 +1016,7 @@ ReadData INFO EventInfo event: 8 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 19 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1019,7 +1038,7 @@ ReadData INFO EventInfo event: 9 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 20 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1041,7 +1060,7 @@ ReadData INFO EventInfo event: 10 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 21 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1063,7 +1082,7 @@ ReadData INFO EventInfo event: 11 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 22 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1085,7 +1104,7 @@ ReadData INFO EventInfo event: 12 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 23 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1107,7 +1126,7 @@ ReadData INFO EventInfo event: 13 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 24 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1129,7 +1148,7 @@ ReadData INFO EventInfo event: 14 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 25 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1151,7 +1170,7 @@ ReadData INFO EventInfo event: 15 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 26 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1173,7 +1192,7 @@ ReadData INFO EventInfo event: 16 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 27 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1195,7 +1214,7 @@ ReadData INFO EventInfo event: 17 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 28 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1217,7 +1236,7 @@ ReadData INFO EventInfo event: 18 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 29 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1239,10 +1258,11 @@ ReadData INFO EventInfo event: 19 run: 1
ReadData INFO Get Smart data ptr 1
ReadData INFO Could not find ExampleTrackContainer/MyTracks
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 21905
+PoolSvc INFO Database (SimplePoolFile2.root) attribute [BYTES_READ]: 23369
PoolSvc INFO Database (SimplePoolFile2.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 30 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1266,7 +1286,9 @@ SimplePoolFile3... DEBUG --->Reading Shape[3 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile3... DEBUG --->Reading Shape[4 , ????]: [1 Column(s)]
SimplePoolFile3... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 5 Entries in total.
+SimplePoolFile3... DEBUG --->Reading Shape[5 , ????]: [1 Column(s)]
+SimplePoolFile3... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 6 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -1283,11 +1305,13 @@ SimplePoolFile3... DEBUG --->Reading Assoc:????/POOLContainerForm(DataHeaderFor
SimplePoolFile3... DEBUG ---->ClassID:????
SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream2) [20?] (7 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (8 , ffffffff)
+SimplePoolFile3... DEBUG ---->ClassID:????
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (9 , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (9 , ffffffff)
+SimplePoolFile3... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (a , ffffffff)
SimplePoolFile3... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 8 Entries in total.
+##Links DEBUG No objects passing selection criteria... Container has 9 Entries in total.
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -1370,7 +1394,7 @@ ReadData INFO Track pt = 74.8928 eta = 3.1676 phi = 2.6161 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #1 31 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1396,7 +1420,7 @@ ReadData INFO Track pt = 137.584 eta = -39.525 phi = 17.2679 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 32 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1422,7 +1446,7 @@ ReadData INFO Track pt = 228.154 eta = -6.2704 phi = 31.9197 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 33 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1448,7 +1472,7 @@ ReadData INFO Track pt = 324.306 eta = -15.8941 phi = 46.5715 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 34 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1474,7 +1498,7 @@ ReadData INFO Track pt = 422.255 eta = -13.279 phi = 61.2233 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #4, run #1 35 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1500,7 +1524,7 @@ ReadData INFO Track pt = 520.987 eta = -12.3511 phi = 75.8751 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #5, run #1 36 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1526,7 +1550,7 @@ ReadData INFO Track pt = 620.127 eta = -11.8468 phi = 90.5269 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #6, run #1 37 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1552,7 +1576,7 @@ ReadData INFO Track pt = 719.507 eta = -11.5247 phi = 105.179 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #7, run #1 38 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1578,7 +1602,7 @@ ReadData INFO Track pt = 819.038 eta = -11.2998 phi = 119.831 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #8, run #1 39 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1604,7 +1628,7 @@ ReadData INFO Track pt = 918.671 eta = -11.1334 phi = 134.482 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #9, run #1 40 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1630,7 +1654,7 @@ ReadData INFO Track pt = 1018.38 eta = -11.0052 phi = 149.134 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #10, run #1 41 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1656,7 +1680,7 @@ ReadData INFO Track pt = 1118.13 eta = -10.9031 phi = 163.786 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #11, run #1 42 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1682,7 +1706,7 @@ ReadData INFO Track pt = 1217.93 eta = -10.82 phi = 178.438 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #12, run #1 43 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1708,7 +1732,7 @@ ReadData INFO Track pt = 1317.76 eta = -10.751 phi = 193.09 detector
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #13, run #1 44 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1734,7 +1758,7 @@ ReadData INFO Track pt = 1417.61 eta = -10.6927 phi = 207.741 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #14, run #1 45 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1760,7 +1784,7 @@ ReadData INFO Track pt = 1517.49 eta = -10.6429 phi = 222.393 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #15, run #1 46 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1786,7 +1810,7 @@ ReadData INFO Track pt = 1617.37 eta = -10.5997 phi = 237.045 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #16, run #1 47 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1812,7 +1836,7 @@ ReadData INFO Track pt = 1717.27 eta = -10.562 phi = 251.697 detecto
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #17, run #1 48 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1838,7 +1862,7 @@ ReadData INFO Track pt = 1817.19 eta = -10.5288 phi = 266.349 detect
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #18, run #1 49 events processed so far <<<===
EventSelector DEBUG Get AttributeList from the collection
@@ -1864,13 +1888,14 @@ ReadData INFO Track pt = 1917.11 eta = -10.4993 phi = 281 detector =
DataProxy WARNING accessData: IOA pointer not set
ReadData WARNING Could not follow ExampleTrackContainer/MyTracks ElementLinks to ExampleHitContainer/MyHits
ReadData INFO Could not find ExampleHitContainer/MyHits
-PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 23924
+PoolSvc INFO Database (SimplePoolFile3.root) attribute [BYTES_READ]: 25541
PoolSvc INFO Database (SimplePoolFile3.root) attribute [READ_CALLS]: 21
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 50 events processed so far <<<===
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
AthenaEventLoopMgr INFO No more events in event selection
MetaDataSvc DEBUG MetaDataSvc::stop()
ApplicationMgr INFO Application Manager Stopped successfully
@@ -1882,9 +1907,9 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max=0.073(+-0.851)/ 0/ 10 [ms] #=137
-cObj_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max=0.233(+- 1.51)/ 0/ 10 [ms] #=129
-ChronoStatSvc INFO Time User : Tot= 480 [ms] #= 1
+cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0775(+- 0.877)/ 0/ 10 [ms] #=129
+cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0725(+- 0.848)/ 0/ 10 [ms] #=138
+ChronoStatSvc INFO Time User : Tot= 190 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
index 118106d403c66a1906a0feee5e2fe5929277d4c4..7f6d1a6c6d7b5596e867df09634cb582a14c8bcf 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCond.ref
@@ -1,39 +1,35 @@
-Sat Nov 2 01:41:16 CET 2019
+Tue Oct 6 16:04:36 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_WCondJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5598 configurables from 9 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on aibuild028.cern.ch on Sat Nov 2 01:41:26 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on 58dd451bc47f on Tue Oct 6 16:04:42 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3286 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3308 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 1182 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 120? CLIDRegistry entries for module ALL
Stream1 DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG in initialize()
ToolSvc.Stream1... INFO Initializing ToolSvc.Stream1Tool - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc DEBUG Property update for OutputLevel : new value = 2
PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-10-31T2131/Athena/22.0.7/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -83,7 +79,9 @@ SimplePoolFile1... DEBUG --->Reading Shape[8 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:float Typ:float [10] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --->Reading Shape[9 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
-##Shapes DEBUG No objects passing selection criteria... Container has 10 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
+##Shapes DEBUG No objects passing selection criteria... Container has 11 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Links
##Links DEBUG Opening
##Links DEBUG attributes# = 1
@@ -126,11 +124,13 @@ SimplePoolFile1... DEBUG --->Reading Assoc:????/POOLCollectionTree(EventWeight)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(EventStreamInfo_p3/Stream1) [20?] (14 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (15 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (15 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (16 , ffffffff)
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-##Links DEBUG No objects passing selection criteria... Container has 21 Entries in total.
+SimplePoolFile1... DEBUG --->Reading Assoc:????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+##Links DEBUG No objects passing selection criteria... Container has 22 Entries in total.
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_All] ##Params
##Params DEBUG Opening
##Params DEBUG attributes# = 1
@@ -145,7 +145,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 2047 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1660 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -154,6 +154,7 @@ MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
MetaDataSvc DEBUG Loaded input meta data store proxies
ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
AthenaPoolAddre... DEBUG Property update for OutputLevel : new value = 2
AthenaPoolAddre... DEBUG Service base class initialized successfully
ReadData DEBUG input handles: 2
@@ -168,7 +169,6 @@ WriteCond DEBUG input handles: 1
WriteCond DEBUG output handles: 0
WriteCond DEBUG Data Deps for WriteCond
+ INPUT ( 'ExampleHitContainer' , 'StoreGateSvc+MyHits' )
-HistogramPersis...WARNING Histograms saving not required.
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
EventSelector DEBUG Try item: "SimplePoolFile1.root" from the collection list.
@@ -250,7 +250,7 @@ EventSelector DEBUG Get AttributeList from the collection
EventSelector DEBUG AttributeList size 12
EventSelector DEBUG record AthenaAttribute, name = Token = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
EventSelector DEBUG record AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001].
-ClassIDSvc INFO getRegistryEntries: read 27 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 21 CLIDRegistry entries for module ALL
EventSelector DEBUG found AthenaAttribute, name = eventRef = [DB=????][CNT=POOLContainer(DataHeader)][CLID=????][TECH=0000020?][OID=00000005-00000001]
AthenaPoolAddre... DEBUG The current Event contains: 3 objects
AthenaPoolAddre... DEBUG loadAddresses: DataObject address, clid = 2101, name = McEventInfo
@@ -1065,6 +1065,7 @@ WriteCond INFO Hit x = 1930.12 y = 46.5449 z = -1856.17 detector = Du
WriteCond INFO registered all data
AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events processed so far <<<===
MetaDataSvc DEBUG handle() EndInputFile for FID:????
+MetaDataSvc DEBUG retireMetadataSource: FID:????
EventSelector INFO Disconnecting input sourceID: ????
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] ????
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -1146,13 +1147,13 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-commitOutput INFO Time User : Tot= 0 [us] #= 1
-cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 2
-fRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 2
-cRepR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 3
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max=0.217(+- 1.46)/ 0/ 10 [ms] #= 46
-cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max=0.465(+- 2.11)/ 0/ 10 [ms] #= 43
-ChronoStatSvc INFO Time User : Tot= 470 [ms] #= 1
+commitOutput INFO Time User : Tot= 0 [us] #= 1
+cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 2
+fRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 2
+cRepR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 3
+cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 46
+cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.233(+- 1.51)/ 0/ 10 [ms] #= 43
+ChronoStatSvc INFO Time User : Tot= 160 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
index cbc2ef3aa26a5f8dae0f8a36e06ae2259b7c027c..b579bd82c35f4cd4268239b4cb98f70b4aa3520d 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
@@ -1,17 +1,17 @@
-Fri Sep 11 23:48:28 CEST 20?0
+Tue Oct 6 16:04:50 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_WMetaJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5568 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Fri Sep 11 23:48:40 20?0
+ running on 58dd451bc47f on Tue Oct 6 16:04:55 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
@@ -30,9 +30,10 @@ PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog2.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-09-10T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -68,9 +69,11 @@ Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: ROOTTREE:SimplePoolFile5.root
+ClassIDSvc INFO getRegistryEntries: read 171 CLIDRegistry entries for module ALL
Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
@@ -78,6 +81,7 @@ Stream1 DEBUG input handles: 0
Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
@@ -912,7 +916,7 @@ WriteCond INFO in finalize()
WriteCond INFO Pedestal x = 193136 y = -5580.01 z = -175208 string = <..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o..........o>
Stream1 DEBUG AthenaOutputStream Stream1 ::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, ExampleHitContainer#PedestalWriteData]
+Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream1, ExampleHitContainer#PedestalWriteData]
Stream1 DEBUG addItemObjects(9102,"PedestalWriteData") called
Stream1 DEBUG Key:PedestalWriteData
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -923,6 +927,11 @@ Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream1 DEBUG Added object 167728019,"Stream1"
+Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
+Stream1 DEBUG Key:EventFormatStream1
+Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 243004407,"EventFormatStream1"
Stream1 DEBUG addItemObjects(1316383046,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -947,21 +956,33 @@ SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --->Adding Shape[9 , ????]: [1 Column(s)]
SimplePoolFile5... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile5... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::EventFormat_v1 [????]
+SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (16 , ffffffff)
+SimplePoolFile5... DEBUG ---->ClassID:????
+SimplePoolFile5... DEBUG --->Adding Shape[10 , ????]: [1 Column(s)]
+SimplePoolFile5... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile5... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (16 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (17 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
SimplePoolFile5... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (17 , ffffffff)
+SimplePoolFile5... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (18 , ffffffff)
SimplePoolFile5... DEBUG ---->ClassID:????
-ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 14 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
Stream1 DEBUG Leaving incident handler for MetaDataStop
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
@@ -982,11 +1003,11 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0307(+- 0.553)/ 0/ 10 [ms] #=326
-commitOutput INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.952(+- 2.94)/ 0/ 10 [ms] #= 21
-fRep_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 0.635(+- 2.44)/ 0/ 10 [ms] #= 63
-cRep_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 0.635(+- 3.02)/ 0/ 20 [ms] #= 63
-ChronoStatSvc INFO Time User : Tot= 350 [ms] #= 1
+commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
+cRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.312(+- 1.74)/ 0/ 10 [ms] #= 64
+cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.0612(+- 0.78)/ 0/ 10 [ms] #=327
+fRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.469(+- 2.11)/ 0/ 10 [ms] #= 64
+ChronoStatSvc INFO Time User : Tot= 190 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
index 5c1a51730493697ff5749ede37fb9b6717d117e5..2becbbbeeee7d3d1b5be6d9cce5d63a197ba714c 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
@@ -1,17 +1,17 @@
-Fri Sep 11 23:45:41 CEST 20?0
+Tue Oct 6 16:03:37 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_WriteJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5568 configurables from 4 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 4 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
- running on aibuild028.cern.ch on Fri Sep 11 23:45:54 20?0
+ running on 58dd451bc47f on Tue Oct 6 16:03:42 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
@@ -30,9 +30,10 @@ PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-09-10T2101/Athena/22.0.18/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 58dd451bc47f [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -69,9 +70,11 @@ Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1Tool - package version AthenaServices-00-00-00
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Stream1... INFO Initializing Stream1.Stream1_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
+Stream1 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream1_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream1_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream1'])
Stream1 INFO Data output: SimplePoolFile1.root
+ClassIDSvc INFO getRegistryEntries: read 171 CLIDRegistry entries for module ALL
Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
@@ -79,6 +82,7 @@ Stream1 DEBUG input handles: 0
Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
@@ -102,8 +106,9 @@ Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2.Stream2... INFO Initializing Stream2.Stream2Tool - package version AthenaServices-00-00-00
Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2.Stream2... INFO Initializing Stream2.Stream2_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
+Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2.Thinnin... DEBUG Property update for OutputLevel : new value = 2
-Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream2'])
+Stream2 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream2_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream2'])
Stream2 INFO Data output: SimplePoolFile2.root
Stream2 INFO I/O reinitialization...
Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
@@ -112,6 +117,7 @@ Stream2 DEBUG input handles: 0
Stream2 DEBUG output handles: 2
Stream2 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventStreamInfo (MakeEventStreamInfo)
+Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventFormat (xAODMaker::EventFormatStreamHelperTool)
Stream2 DEBUG Adding private ToolHandle tool Stream2.ThinningCacheTool_Stream2 (Athena::ThinningCacheTool)
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2Tool (AthenaOutputStreamTool)
Stream2 DEBUG Data Deps for Stream2
@@ -122,7 +128,7 @@ Stream2 DEBUG Data Deps for Stream2
DecisionSvc INFO Inserting stream: Stream3 with no Algs
Stream3.Stream3... INFO Initializing Stream3.Stream3Tool - package version AthenaServices-00-00-00
Stream3.Stream3... INFO Initializing Stream3.Stream3_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
-Stream3 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream3_MakeEventStreamInfo','Athena::ThinningCacheTool/ThinningCacheTool_Stream3'])
+Stream3 INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream3_MakeEventStreamInfo','xAODMaker::EventFormatStreamHelperTool/Stream3_MakeEventFormat','Athena::ThinningCacheTool/ThinningCacheTool_Stream3'])
Stream3 INFO Data output: EmptyPoolFile.root
Stream3 INFO I/O reinitialization...
EventSelector INFO Enter McEventSelector Initialization
@@ -1161,12 +1167,17 @@ AthenaEventLoopMgr INFO ===>>> done processing event #19, run #1 20 events
Stream1 DEBUG AthenaOutputStream Stream1 ::stop()
Stream2 DEBUG AthenaOutputStream Stream2 ::stop()
Stream1 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*]
+Stream1 DEBUG metadataItemList: [EventStreamInfo#Stream1, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream1]
Stream1 DEBUG addItemObjects(167728019,"Stream1") called
Stream1 DEBUG Key:Stream1
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream1 DEBUG Added object 167728019,"Stream1"
+Stream1 DEBUG addItemObjects(243004407,"EventFormatStream1") called
+Stream1 DEBUG Key:EventFormatStream1
+Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream1 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream1 DEBUG Added object 243004407,"EventFormatStream1"
Stream1 DEBUG addItemObjects(1316383046,"*") called
Stream1 DEBUG Key:*
Stream1 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1184,30 +1195,47 @@ SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
SimplePoolFile1... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile1... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+StorageSvc INFO Building shape according to reflection information using shape ID for:
+StorageSvc INFO xAOD::EventFormat_v1 [????]
+SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream1)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream1'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream1) of type ROOT_Tree
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream1) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG ---->ClassID:????
+SimplePoolFile1... DEBUG --->Adding Shape[7 , ????]: [1 Column(s)]
+SimplePoolFile1... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile1... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (d , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
SimplePoolFile1... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
+SimplePoolFile1... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (e , ffffffff)
SimplePoolFile1... DEBUG ---->ClassID:????
-ClassIDSvc INFO getRegistryEntries: read 7 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 14 CLIDRegistry entries for module ALL
Stream1 INFO Metadata records written: 21
Stream1 DEBUG Leaving incident handler for MetaDataStop
Stream2 DEBUG slot 0 handle() incident type: MetaDataStop
-Stream2 DEBUG metadataItemList: [EventStreamInfo#Stream2, IOVMetaDataContainer#*]
+Stream2 DEBUG metadataItemList: [EventStreamInfo#Stream2, IOVMetaDataContainer#*, xAOD::EventFormat#EventFormatStream2]
Stream2 DEBUG addItemObjects(167728019,"Stream2") called
Stream2 DEBUG Key:Stream2
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
Stream2 DEBUG Added object 167728019,"Stream2"
+Stream2 DEBUG addItemObjects(243004407,"EventFormatStream2") called
+Stream2 DEBUG Key:EventFormatStream2
+Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
+Stream2 DEBUG Comp Attr 0 with 15 mantissa bits.
+Stream2 DEBUG Added object 243004407,"EventFormatStream2"
Stream2 DEBUG addItemObjects(1316383046,"*") called
Stream2 DEBUG Key:*
Stream2 DEBUG Comp Attr 0 with 7 mantissa bits.
@@ -1223,19 +1251,29 @@ SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --->Adding Shape[5 , ????]: [1 Column(s)]
SimplePoolFile2... DEBUG ---->Class:EventStreamInfo_p3
SimplePoolFile2... DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream2)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream2'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream2) of type ROOT_Tree
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream2) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG ---->ClassID:????
+SimplePoolFile2... DEBUG --->Adding Shape[6 , ????]: [1 Column(s)]
+SimplePoolFile2... DEBUG ---->Class:xAOD::EventFormat_v1
+SimplePoolFile2... DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (b , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (c , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
SimplePoolFile2... DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (c , ffffffff)
+SimplePoolFile2... DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (d , ffffffff)
SimplePoolFile2... DEBUG ---->ClassID:????
Stream2 INFO Metadata records written: 21
Stream2 DEBUG Leaving incident handler for MetaDataStop
@@ -1277,14 +1315,24 @@ EmptyPoolFile.root DEBUG ---->ClassID:????
EmptyPoolFile.root DEBUG --->Adding Shape[0 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:EventStreamInfo_p3
EmptyPoolFile.root DEBUG ---->[0]:EventStreamInfo_p3 Typ:EventStreamInfo_p3 [21] Size:0 Offset:0 #Elements:1
+EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaData(xAOD::EventFormat_v1/EventFormatStream3)
+MetaData(xAOD::... DEBUG Opening
+MetaData(xAOD::... DEBUG attributes# = 1
+MetaData(xAOD::... DEBUG Branch container 'xAOD::EventFormat_v1_EventFormatStream3'
+MetaData(xAOD::... DEBUG Opened container MetaData(xAOD::EventFormat_v1/EventFormatStream3) of type ROOT_Tree
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaData(xAOD::EventFormat_v1/EventFormatStream3) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG ---->ClassID:????
+EmptyPoolFile.root DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG ---->Class:xAOD::EventFormat_v1
+EmptyPoolFile.root DEBUG ---->[0]:xAOD::EventFormat_v1 Typ:xAOD::EventFormat_v1 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdr(DataHeader)
MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (4 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdr(DataHeader) [20?] (5 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Adding Shape[1 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:DataHeader_p6
EmptyPoolFile.root DEBUG ---->[0]:DataHeader_p6 Typ:DataHeader_p6 [21] Size:0 Offset:0 #Elements:1
EmptyPoolFile.root DEBUG --> Access DbContainer CREA/UPDA [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
@@ -1292,9 +1340,9 @@ MetaDataHdrForm... DEBUG Opening
MetaDataHdrForm... DEBUG attributes# = 1
MetaDataHdrForm... DEBUG Branch container 'DataHeaderForm'
MetaDataHdrForm... DEBUG Opened container MetaDataHdrForm(DataHeaderForm) of type ROOT_Tree
-EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (5 , ffffffff)
+EmptyPoolFile.root DEBUG --->Adding Assoc :????/MetaDataHdrForm(DataHeaderForm) [20?] (6 , ffffffff)
EmptyPoolFile.root DEBUG ---->ClassID:????
-EmptyPoolFile.root DEBUG --->Adding Shape[2 , ????]: [1 Column(s)]
+EmptyPoolFile.root DEBUG --->Adding Shape[3 , ????]: [1 Column(s)]
EmptyPoolFile.root DEBUG ---->Class:DataHeaderForm_p6
EmptyPoolFile.root DEBUG ---->[0]:DataHeaderForm_p6 Typ:DataHeaderForm_p6 [21] Size:0 Offset:0 #Elements:1
PoolSvc DEBUG Failed to get ContainerHandle to set POOL property.
@@ -1329,11 +1377,11 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-commitOutput INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.233(+- 1.51)/ 0/ 10 [ms] #= 43
-cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.0735(+- 0.854)/ 0/ 10 [ms] #=272
-cRep_ALL INFO Time User : Tot= 50 [ms] Ave/Min/Max= 0.472(+- 2.88)/ 0/ 20 [ms] #=106
-fRep_ALL INFO Time User : Tot= 80 [ms] Ave/Min/Max= 0.755(+- 2.98)/ 0/ 20 [ms] #=106
-ChronoStatSvc INFO Time User : Tot= 0.51 [s] #= 1
+commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 43
+cRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.183(+- 1.34)/ 0/ 10 [ms] #=109
+cRepR_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.109(+- 1.04)/ 0/ 10 [ms] #=275
+fRep_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 0.367(+- 1.88)/ 0/ 10 [ms] #=109
+ChronoStatSvc INFO Time User : Tot= 210 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt b/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt
index 3f4529a4a7c98344c04e3c467b570c50cf48601e..e9a6c33a4379d9b3f005e608bb48802aea7e27a8 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_component( OutputStreamAthenaPool
src/EventInfoAttListTool.cxx
src/EventInfoTagBuilder.cxx
src/components/*.cxx
- LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel EventInfo EventInfoUtils GaudiKernel PersistentDataModel StoreGateLib xAODEventInfo )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel EventInfo EventInfoUtils GaudiKernel PersistentDataModel StoreGateLib xAODEventInfo )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
index ffa782fb93c76fa42a3b1cfd5f6508308736415f..cb3d49ae862f6ac4548e4457bc520172fc6ffc66 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
@@ -7,6 +7,7 @@
from __future__ import print_function
+from AthenaCommon import CfgMgr
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaServices.AthenaServicesConf import AthenaOutputStream
from AthenaServices.AthenaServicesConf import AthenaOutputStreamTool
@@ -22,6 +23,7 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
if trigNavThinningSvc is None:
trigNavThinningSvc = _trigNavThinningSvcs.get (streamName, None)
+
# define athena output stream
writingTool = AthenaOutputStreamTool( streamName + "Tool" )
outputStream = AthenaOutputStream(
@@ -32,7 +34,10 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
outputStream.ExtraOutputs += [("DataHeader", "StoreGateSvc+" + streamName)]
#outputStream.ItemList += [ "xAOD::EventInfo#*" ]
outputStream.MetadataStore = svcMgr.MetaDataStore
- outputStream.MetadataItemList = [ "EventStreamInfo#" + streamName, "IOVMetaDataContainer#*" ]
+ outputStream.MetadataItemList = [
+ "EventStreamInfo#" + streamName,
+ "IOVMetaDataContainer#*",
+ ]
## get a handle on the default top-level algorithm sequence
from AthenaCommon.AlgSequence import AlgSequence
@@ -68,7 +73,15 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
streamInfoTool = MakeEventStreamInfo( streamName + "_MakeEventStreamInfo" )
streamInfoTool.Key = streamName
streamInfoTool.EventInfoKey = eventInfoKey
- outputStream.HelperTools = [ streamInfoTool ]
+ # for xAOD access, add EventFormat to all POOL output streams
+ # Key to use for event format on this stream
+ event_format_key = 'EventFormat{}'.format(streamName)
+ event_format_tool = CfgMgr.xAODMaker__EventFormatStreamHelperTool(
+ "{}_MakeEventFormat".format(streamName),
+ Key=event_format_key,
+ )
+ outputStream.MetadataItemList += ["xAOD::EventFormat#{}".format(event_format_key)]
+ outputStream.HelperTools = [ streamInfoTool, event_format_tool]
# Support for MT thinning.
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
index 6dc8f05cb06f320eb2ffb24a8dee1e697a21007a..ea94a0686e6467c3966e8d496aa9719876aa18b4 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
@@ -558,8 +558,6 @@ class MultipleStreamManager:
theStream = self.NewStream(StreamName,FileName,type='pool',asAlg=asAlg)
from AthenaCommon.AppMgr import theApp
svcMgr = theApp.serviceMgr()
- theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
- theStream.AddMetaDataItem("xAOD::EventFormat#EventFormat")
from AthenaCommon import CfgMgr
streamMarkUpTool = CfgMgr.xAODMaker__FileMetaDataMarkUpTool( StreamName + "_FileMetaDataMarkUpTool" )
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
index 336db1fff8c346d250ba6993b0b31e942f0ed446..4cf7ba9f51a0a9446ef8f816192d3db93b48ebdc 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
@@ -48,7 +48,10 @@ def OutputStreamCfg(configFlags, streamName, ItemList=[], disableEventTag=False
outputStream.ExtraOutputs += [("DataHeader", "StoreGateSvc+" + streamName)]
result.addService(StoreGateSvc("MetaDataStore"))
outputStream.MetadataStore = result.getService("MetaDataStore")
- outputStream.MetadataItemList = [ "EventStreamInfo#Stream" + streamName, "IOVMetaDataContainer#*" ]
+ outputStream.MetadataItemList = [
+ "EventStreamInfo#Stream" + streamName,
+ "IOVMetaDataContainer#*",
+ ]
# Event Tag
if not disableEventTag:
@@ -60,13 +63,20 @@ def OutputStreamCfg(configFlags, streamName, ItemList=[], disableEventTag=False
Tool=EventInfoAttListTool())
result.addEventAlgo(tagBuilder)
- # For xAOD output
- if streamName=="xAOD":
- xAODMaker__EventFormatSvc=CompFactory.xAODMaker.EventFormatSvc
- # Simplifies naming
- result.addService(xAODMaker__EventFormatSvc())
- outputStream.MetadataItemList.append( "xAOD::EventFormat#EventFormat" )
+ # Make EventFormat object
+ event_format_key = 'EventFormat{}'.format(streamName)
+ event_format_tool = CompFactory.xAODMaker.EventFormatStreamHelperTool(
+ '{}_MakeEventFormat'.format(event_format_key),
+ Key=event_format_key,
+ )
+ outputStream.HelperTools.append(event_format_tool)
+ # Simplifies naming
+ outputStream.MetadataItemList.append(
+ "xAOD::EventFormat#{}".format(event_format_key)
+ )
+ # For xAOD output
+ if "xAOD" in streamName:
xAODMaker__FileMetaDataMarkUpTool=CompFactory.xAODMaker.FileMetaDataMarkUpTool
streamMarkUpTool = xAODMaker__FileMetaDataMarkUpTool( streamName + "_FileMetaDataMarkUpTool" )
streamMarkUpTool.Key = streamName
diff --git a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
index bedf6f4273863cd1d068ec5ee1d9bd7eb3f20bbf..4ccd4b01123d3422a3c5220178af77b763c32ad6 100644
--- a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
+++ b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
@@ -175,11 +175,8 @@ StatusCode PoolSvc::io_reinit() {
}
//__________________________________________________________________________
StatusCode PoolSvc::setupPersistencySvc() {
+ clearState();
ATH_MSG_INFO("Setting up APR FileCatalog and Streams");
- if (m_catalog != nullptr) {
- m_catalog->commit();
- delete m_catalog; m_catalog = nullptr;
- }
m_catalog = createCatalog();
if (m_catalog != nullptr) {
m_catalog->start();
@@ -187,15 +184,6 @@ StatusCode PoolSvc::setupPersistencySvc() {
ATH_MSG_FATAL("Failed to setup POOL File Catalog.");
return(StatusCode::FAILURE);
}
- // Cleanup persistency service
- for (const auto& persistencySvc : m_persistencySvcVec) {
- delete persistencySvc;
- }
- m_persistencySvcVec.clear();
- for (const auto& persistencyMutex : m_pers_mut) {
- delete persistencyMutex;
- }
- m_pers_mut.clear();
// Setup a persistency services
m_persistencySvcVec.push_back(pool::IPersistencySvc::create(*m_catalog).release()); // Read Service
m_pers_mut.push_back(new CallMutex);
@@ -242,8 +230,9 @@ StatusCode PoolSvc::stop() {
}
return(retError ? StatusCode::FAILURE : StatusCode::SUCCESS);
}
+
//__________________________________________________________________________
-StatusCode PoolSvc::finalize() {
+void PoolSvc::clearState() {
// Cleanup persistency service
for (const auto& persistencySvc : m_persistencySvcVec) {
delete persistencySvc;
@@ -252,11 +241,17 @@ StatusCode PoolSvc::finalize() {
for (const auto& persistencyMutex : m_pers_mut) {
delete persistencyMutex;
}
+ m_mainOutputLabel.clear();
+ m_contextLabel.clear();
m_pers_mut.clear();
if (m_catalog != nullptr) {
m_catalog->commit();
delete m_catalog; m_catalog = nullptr;
}
+}
+//__________________________________________________________________________
+StatusCode PoolSvc::finalize() {
+ clearState();
return(::AthService::finalize());
}
//__________________________________________________________________________
@@ -268,18 +263,7 @@ StatusCode PoolSvc::io_finalize() {
ATH_MSG_WARNING("Cannot disconnect output Stream " << i);
}
}
- for (const auto& persistencySvc : m_persistencySvcVec) {
- delete persistencySvc;
- }
- m_persistencySvcVec.clear();
- for (const auto& persistencyMutex : m_pers_mut) {
- delete persistencyMutex;
- }
- m_pers_mut.clear();
- if (m_catalog != nullptr) {
- m_catalog->commit();
- delete m_catalog; m_catalog = nullptr;
- }
+ clearState();
return(StatusCode::SUCCESS);
}
//_______________________________________________________________________
@@ -607,6 +591,7 @@ StatusCode PoolSvc::connect(pool::ITransaction::Type type, unsigned int contextI
ATH_MSG_ERROR("connect failed persSvc = " << persSvc << " type = " << type);
return(StatusCode::FAILURE);
}
+
return(StatusCode::SUCCESS);
}
//__________________________________________________________________________
diff --git a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
index 900aa024c049f05cb87da5eac87e0b089868a8cd..ff7e581c9d1f4a550e4a1c155bc2cb15f16b814e 100644
--- a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
+++ b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
@@ -223,6 +223,9 @@ private: // properties
BooleanProperty m_sortReplicas{this,"SortReplicas",true};
private: // internal helper functions
+ // delete all APR::Persistency Services, Catalog, Mutexes and Indexes
+ void clearState();
+
pool::IFileCatalog* createCatalog();
// setup APR persistency
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
index 7d2a6a64e8c521f1937fac608626220bcb91144e..e0a63e2765a98320cef5fc9d658e297447f4a90f 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
@@ -45,7 +45,7 @@
#include "SGTools/StlMapClids.h" // to make sure we have their clids
#include "SGTools/StlVectorClids.h" // to make sure we have their clids
#include "SGTools/TransientAddress.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "TObject.h"
#include "TTree.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
index 9785f6408b8c79471b23ebb216b47d1eeabf2002..4860a19f06c2e0e155ff596eff702f4796b6ffa6 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
@@ -46,7 +46,7 @@
#include "SGTools/StlMapClids.h" // to make sure we have their clids
#include "SGTools/StlVectorClids.h" // to make sure we have their clids
#include "SGTools/TransientAddress.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
// EventInfo includes
#include "EventInfo/EventInfo.h"
diff --git a/Database/CoolConvUtilities/python/AtlCoolTool.py b/Database/CoolConvUtilities/python/AtlCoolTool.py
index d30686ef56ce9b2f75324beeb85c95bc245059d2..10558b055c5ec863d083000e5f809eee23524643 100755
--- a/Database/CoolConvUtilities/python/AtlCoolTool.py
+++ b/Database/CoolConvUtilities/python/AtlCoolTool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
@@ -814,6 +814,7 @@ class AtlCoolTool:
res.append('Searching under %s for tags referenced by %s' % (node,tag))
nodelist=self.db.listAllNodes()
for inode in nodelist:
+ inode = str(inode)
if (inode[:len(node)]==node):
# look only in multiversion folders
multi=True
diff --git a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
index fd43710ca9f66c6df177b89951e1677d7e3a935a..20c76b34a046b606a41a1169e5d0075a039a3279 100755
--- a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
+++ b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
@@ -18,10 +18,9 @@
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/FileIncident.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "IOVDbDataModel/IOVMetaDataContainer.h"
-#include "AthenaKernel/MetaCont.h"
#include "CxxUtils/checker_macros.h"
IOVDbMetaDataTool::IOVDbMetaDataTool(const std::string& type,
@@ -127,8 +126,7 @@ StatusCode IOVDbMetaDataTool::endInputFile(const SG::SourceID&)
StatusCode IOVDbMetaDataTool::metaDataStop()
{
- StatusCode sc = dumpMetaConts();
- return sc;
+ return StatusCode::SUCCESS;
}
//--------------------------------------------------------------------------
@@ -459,11 +457,6 @@ StatusCode IOVDbMetaDataTool::processInputFileMetaData(const std::string& fileNa
IOVMetaDataContainer* contMaster = getMetaDataContainer(cont->folderName()
, cont->folderDescription());
- // At the same time we want to create a new instance of IOVMetaDataContainer for new SID
- // and store it into MetaCont<IOVMetaDataContainer>
- IOVMetaDataContainer* newCont4Sid = new IOVMetaDataContainer(cont->folderName()
- , cont->folderDescription());
-
// We assume that the folder is the same for all versions, and
// now we loop over versions for the payloads
std::list<SG::ObjectWithVersion<IOVMetaDataContainer> > allVersions;
@@ -537,20 +530,6 @@ StatusCode IOVDbMetaDataTool::processInputFileMetaData(const std::string& fileNa
}
}
- // Do the same with newCont4Sid
- {
- // Should be ok.
- StatusCode sc ATLAS_THREAD_SAFE =
- modifyPayload (newCont4Sid->folderName(), coll);
- if (!sc.isSuccess()) {
- ATH_MSG_ERROR("processInputFileMetaData: Could not modify the payload for folder " << newCont4Sid->folderName());
- return StatusCode::FAILURE;
- }
- }
-
- // Before starting merging, make a copy for newCont4Sid
- CondAttrListCollection* collCopy = new CondAttrListCollection(*coll);
-
ATH_MSG_VERBOSE("processInputFileMetaData: merge minRange: " << coll->minRange());
if (!contMaster->merge(coll)) {
// Did not merge it in - was a duplicate, so we need to delete it
@@ -563,16 +542,6 @@ StatusCode IOVDbMetaDataTool::processInputFileMetaData(const std::string& fileNa
ATH_MSG_VERBOSE(" => merged ");
}
- ATH_MSG_VERBOSE("processInputFileMetaData: merge for MetaCont minRange: " << collCopy->minRange());
- if (!newCont4Sid->merge(collCopy)) {
- // Did not merge it in - was a duplicate, so we need to delete it
- delete collCopy;
- ATH_MSG_VERBOSE(" => not merged ");
- }
- else {
- ATH_MSG_VERBOSE(" => merged ");
- }
-
}
ATH_MSG_DEBUG("processInputFileMetaData: Merged together containers for folder " << cont->folderName() << " ncoll/ndup "
<< ncolls << " " << ndupColls);
@@ -604,12 +573,6 @@ StatusCode IOVDbMetaDataTool::processInputFileMetaData(const std::string& fileNa
}
}
- // Insert the merged container into MetaCont
- if(fillMetaCont(fileName,newCont4Sid).isFailure()) {
- ATH_MSG_ERROR("processInputFileMetaData: Failed to insert the merged IOVMetaDataContainer into MetaCont");
- return StatusCode::FAILURE;
- }
-
// detailed printout after merge
if (msgLvl(MSG::VERBOSE)) {
const IOVPayloadContainer* payloadMaster = contMaster->payloadContainer();
diff --git a/Database/IOVDbSvc/python/CondDB.py b/Database/IOVDbSvc/python/CondDB.py
index fc854f8f1c8b0b385d1f59127965445611024eb7..9dd4aebc60b7449e7135d2a67be33db2de67a881 100644
--- a/Database/IOVDbSvc/python/CondDB.py
+++ b/Database/IOVDbSvc/python/CondDB.py
@@ -267,7 +267,11 @@ This allows the possibility of later adding a new IOV using IOVSvc::setRange."""
if (self.iovdbsvc.Folders[i].find(folder)>=0):
del self.iovdbsvc.Folders[i]
break
-
+ for i in range(0, len(condInputLoader.Load)):
+ if (condInputLoader.Load[i][-1] == self.extractFolder(folder)):
+ del condInputLoader.Load[i]
+ break
+
def folderRequested(self,folder):
"Return true if the given folder has already been requested"
for i in self.iovdbsvc.Folders:
diff --git a/Database/IOVDbSvc/share/IOVDbSvc_test.ref b/Database/IOVDbSvc/share/IOVDbSvc_test.ref
index 177dc6aa85151597c0945bea98012866ba87cb72..8a3c061ff2a119357733adcc4d5909603ab470ad 100644
--- a/Database/IOVDbSvc/share/IOVDbSvc_test.ref
+++ b/Database/IOVDbSvc/share/IOVDbSvc_test.ref
@@ -1,40 +1,28 @@
IOVDbSvc_test
-Initializing Gaudi ApplicationMgr using job opts user_path/athena/Database/IOVDbSvc/share/IOVDbSvc_test.txt
-JobOptionsSvc INFO # =======> user_path/athena/Database/IOVDbSvc/share/../share/IOVDbSvc_test.txt
+Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/m/mnowak/athena/event.service.mp/build/x86_64-centos7-gcc8-opt/jobOptions/IOVDbSvc/IOVDbSvc_test.txt
+JobOptionsSvc INFO # =======> /afs/cern.ch/user/m/mnowak/athena/event.service.mp/build/x86_64-centos7-gcc8-opt/jobOptions/IOVDbSvc/IOVDbSvc_test.txt
JobOptionsSvc INFO # (1,1): ApplicationMgr.CreateSvc += ["StoreGateSvc/DetectorStore"]
-JobOptionsSvc INFO # (2,1): IOVDbSvc.Folders = ["/key1", "/key2<extensible/>"]
+JobOptionsSvc INFO # (2,1): IOVDbSvc.Folders = ["<db>sqlite://none;schema=mytest.db;dbname=OFLP200</db> /key1", "<db>sqlite://none;schema=mytest.db;dbname=OFLP200</db> /key2<extensible/>"]
JobOptionsSvc INFO # (3,1): EventPersistencySvc.CnvServices += ["AthenaPoolCnvSvc"]
-JobOptionsSvc INFO Job options successfully read in from ../share/IOVDbSvc_test.txt
+JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/m/mnowak/athena/event.service.mp/build/x86_64-centos7-gcc8-opt/jobOptions/IOVDbSvc/IOVDbSvc_test.txt
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v30r4)
- running on lxplus021.cern.ch on Mon Nov 19 14:46:10 2018
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild20-040.cern.ch on Fri Oct 2 21:29:07 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ClassIDSvc INFO getRegistryEntries: read 642 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 758 CLIDRegistry entries for module ALL
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
-HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
-PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
-PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-11-17T2340/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus021.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbFolder INFO Extensible folder /key2
IOVDbSvc INFO Initialised with 2 connections and 2 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1467 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for sqlite://none;schema=mytest.db;dbname=OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
@@ -42,9 +30,19 @@ IOVDbSvc INFO Disconnecting from sqlite://none;schema=mytest.db;dbna
test1
IOVDbSvc INFO Opening COOL connection for sqlite://none;schema=mytest.db;dbname=OFLP200
IOVDbSvc INFO Disconnecting from sqlite://none;schema=mytest.db;dbname=OFLP200
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
+PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
+PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
+PoolSvc INFO Frontier compression level set to 5
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-01T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild20-040.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc INFO Successfully setup replica sorting algorithm
+PoolSvc INFO Setting up APR FileCatalog and Streams
+PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
IOVDbFolder INFO Increase cache length (step 1) for folder /key2 to 8589934590 at validityKey 85899345935
IOVDbSvc INFO Opening COOL connection for sqlite://none;schema=mytest.db;dbname=OFLP200
IOVDbSvc INFO Disconnecting from sqlite://none;schema=mytest.db;dbname=OFLP200
-
diff --git a/Database/IOVDbSvc/src/IOVDbSvc.cxx b/Database/IOVDbSvc/src/IOVDbSvc.cxx
index aec06b21e3a8e790dbab6470625457099837fa27..c3f8365826228b48bf420bb4d1d51348434eb7c5 100644
--- a/Database/IOVDbSvc/src/IOVDbSvc.cxx
+++ b/Database/IOVDbSvc/src/IOVDbSvc.cxx
@@ -14,6 +14,7 @@
#include "GaudiKernel/Guards.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/IProperty.h"
+#include "GaudiKernel/IIoComponentMgr.h"
#include "AthenaKernel/IOVRange.h"
#include "IOVDbDataModel/IOVMetaDataContainer.h"
#include "AthenaKernel/IAddressProvider.h"
@@ -54,6 +55,25 @@ IOVDbSvc::queryInterface(const InterfaceID& riid, void** ppvInterface) {
return StatusCode::SUCCESS;
}
+int IOVDbSvc::poolSvcContext()
+{
+ if( m_poolSvcContext < 0 ) {
+ // Get context for POOL conditions files, and created an initial connection
+ if (m_par_managePoolConnections) {
+ m_poolSvcContext=m_h_poolSvc->getInputContext("Conditions", m_par_maxNumPoolFiles);
+ } else {
+ m_poolSvcContext=m_h_poolSvc->getInputContext("Conditions");
+ }
+ if( m_h_poolSvc->connect(pool::ITransaction::READ, m_poolSvcContext).isSuccess() ) {
+ ATH_MSG_INFO( "Opened read transaction for POOL PersistencySvc");
+ } else {
+ // We only emit info for failure to connect (for the moment? RDS 01/2008)
+ ATH_MSG_INFO( "Cannot connect to POOL PersistencySvc" );
+ }
+ }
+ return m_poolSvcContext;
+}
+
StatusCode IOVDbSvc::initialize() {
if (StatusCode::SUCCESS!=AthService::initialize()) return StatusCode::FAILURE;
// subscribe to events
@@ -66,20 +86,16 @@ StatusCode IOVDbSvc::initialize() {
incSvc->addListener( this, "BeginEvent", pri );
incSvc->addListener( this, "StoreCleared", pri );
- // Get context for POOL conditions files, and created an initial connection
- if (m_par_managePoolConnections) {
- m_poolSvcContext=m_h_poolSvc->getInputContext("Conditions", m_par_maxNumPoolFiles);
- } else {
- m_poolSvcContext=m_h_poolSvc->getInputContext("Conditions");
+ // Register this service for 'I/O' events
+ ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
+ if (!iomgr.retrieve().isSuccess()) {
+ ATH_MSG_FATAL("Could not retrieve IoComponentMgr !");
+ return(StatusCode::FAILURE);
}
-
- if (StatusCode::SUCCESS==m_h_poolSvc->connect(pool::ITransaction::READ,m_poolSvcContext)) {
- ATH_MSG_INFO( "Opened read transaction for POOL PersistencySvc");
- } else {
- // We only emit info for failure to connect (for the moment? RDS 01/2008)
- ATH_MSG_INFO( "Cannot connect to POOL PersistencySvc" );
+ if (!iomgr->io_register(this).isSuccess()) {
+ ATH_MSG_FATAL("Could not register myself with the IoComponentMgr !");
+ return(StatusCode::FAILURE);
}
-
// print warnings/info depending on state of job options
if (!m_par_manageConnections)
ATH_MSG_INFO( "COOL connection management disabled - connections kept open throughout job" );
@@ -139,6 +155,19 @@ StatusCode IOVDbSvc::initialize() {
return StatusCode::SUCCESS;
}
+
+StatusCode IOVDbSvc::io_reinit() {
+ ATH_MSG_DEBUG("I/O reinitialization...");
+ // PoolSvc clears all connections on IO_reinit - forget the stored contextId
+ m_poolSvcContext = -1;
+ return(StatusCode::SUCCESS);
+}
+
+StatusCode IOVDbSvc::io_finalize() {
+ ATH_MSG_DEBUG("I/O finalization...");
+ return(StatusCode::SUCCESS);
+}
+
StatusCode IOVDbSvc::finalize() {
// summarise and delete folders, adding total read from COOL
unsigned long long nread=0;
@@ -416,7 +445,7 @@ StatusCode IOVDbSvc::updateAddress(StoreID::type storeID, SG::TransientAddress*
{
Gaudi::Guards::AuditorGuard auditor(std::string("FldrSetup:")+(tad->name().empty() ? "anonymous" : tad->name()),
auditorSvc(), "preLoadProxy");
- if (!folder->getAddress(vkey,&(*m_h_persSvc),m_poolSvcContext,address,
+ if (!folder->getAddress(vkey,&(*m_h_persSvc),poolSvcContext(),address,
range,m_poolPayloadRequested)) {
ATH_MSG_ERROR( "getAddress failed for folder " << folder->folderName() );
return StatusCode::FAILURE;
@@ -506,7 +535,7 @@ StatusCode IOVDbSvc::getRange( const CLID& clid,
{
Gaudi::Guards::AuditorGuard auditor(std::string("FldrSetup:")+(key.empty() ? "anonymous" : key),
auditorSvc(), "preLoadProxy");
- if (!folder->getAddress(vkey,&(*m_h_persSvc),m_poolSvcContext,address,
+ if (!folder->getAddress(vkey,&(*m_h_persSvc),poolSvcContext(),address,
range,m_poolPayloadRequested)) {
ATH_MSG_ERROR("getAddress failed for folder " <<folder->folderName() );
return StatusCode::FAILURE;
@@ -633,17 +662,19 @@ void IOVDbSvc::handle( const Incident& inc) {
// reset POOL connection to close all open conditions POOL files
m_par_managePoolConnections.set(false);
m_poolPayloadRequested=false;
- if (StatusCode::SUCCESS==m_h_poolSvc->disconnect(m_poolSvcContext)) {
- ATH_MSG_DEBUG( "Successfully closed input POOL connections");
- } else {
- ATH_MSG_WARNING( "Unable to close input POOL connections" );
- }
- // reopen transaction
- if (StatusCode::SUCCESS==m_h_poolSvc->connect(pool::ITransaction::READ,
- m_poolSvcContext)) {
- ATH_MSG_DEBUG("Reopend read transaction for POOL conditions input files" );
- } else {
- ATH_MSG_WARNING("Cannot reopen read transaction for POOL conditions input files");
+ if( m_poolSvcContext ) {
+ if (StatusCode::SUCCESS==m_h_poolSvc->disconnect(m_poolSvcContext)) {
+ ATH_MSG_DEBUG( "Successfully closed input POOL connections");
+ } else {
+ ATH_MSG_WARNING( "Unable to close input POOL connections" );
+ }
+ // reopen transaction
+ if (StatusCode::SUCCESS==m_h_poolSvc->connect(pool::ITransaction::READ,
+ m_poolSvcContext)) {
+ ATH_MSG_DEBUG("Reopend read transaction for POOL conditions input files" );
+ } else {
+ ATH_MSG_WARNING("Cannot reopen read transaction for POOL conditions input files");
+ }
}
}
}
diff --git a/Database/IOVDbSvc/src/IOVDbSvc.h b/Database/IOVDbSvc/src/IOVDbSvc.h
index 4f54810e3cdde61d037009e2c4acbc74cbdf5f9c..b8b97e91a4b66dbc4bf6c537cd81c7d0c4290a5e 100644
--- a/Database/IOVDbSvc/src/IOVDbSvc.h
+++ b/Database/IOVDbSvc/src/IOVDbSvc.h
@@ -25,6 +25,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IAddressCreator.h"
+#include "GaudiKernel/IIoComponent.h"
#include "SGTools/DataProxy.h"
#include "EventInfoMgt/ITagInfoMgr.h"
#include "PoolSvc/IPoolSvc.h"
@@ -75,7 +76,8 @@ class IOVDbSvc : public virtual IIOVCondDbSvc,
public virtual IIOVDbSvc,
public virtual IAddressProvider,
public virtual IIncidentListener,
- public virtual AthService
+ public virtual AthService,
+ public virtual IIoComponent
{
// Forward declarations
template <class TYPE> class SvcFactory;
@@ -88,10 +90,12 @@ public:
/// Service init
virtual StatusCode initialize() override;
+ StatusCode io_reinit() override final;
/// Service finalize
virtual StatusCode finalize() override;
-
+ StatusCode io_finalize() override final;
+
/// Query the interfaces.
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
static const InterfaceID& interfaceID();
@@ -240,7 +244,8 @@ private:
bool m_poolPayloadRequested{false};
// Pool service context
- unsigned int m_poolSvcContext{0};
+ int poolSvcContext();
+ int m_poolSvcContext {-1};
// Flag to keep track of which state we are in to know
// how to obtain the IOV time, i.e. during:
diff --git a/Database/RegistrationServices/CMakeLists.txt b/Database/RegistrationServices/CMakeLists.txt
index a25ede806f78736b895a1b1e4eafb80e50301d3e..c20b14352e453d25de825697bbc8b1821589d14d 100644
--- a/Database/RegistrationServices/CMakeLists.txt
+++ b/Database/RegistrationServices/CMakeLists.txt
@@ -20,7 +20,7 @@ atlas_add_component( RegistrationServices
src/IOVRegistrationSvc.cxx
src/OutputConditionsAlg.cxx
src/components/*.cxx
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+ INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${COOL_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CollectionBase DBDataModel FileCatalog IOVDbSvcLib PersistentDataModel PoolSvcLib RegistrationServicesLib SGTools StoreGateLib )
# Install files from the package:
diff --git a/Database/RegistrationServices/src/IOVRegistrationSvc.cxx b/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
index 716c39baec901002a0ff8772a792b59c0e388e7b..fbfa5b51119880150239b3e7c822415aa719cfa3 100644
--- a/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
+++ b/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -20,7 +20,6 @@
//#include "GaudiKernel/DeclareFactoryEntries.h"
// Athena includes
-#include "StoreGate/StoreGate.h"
#include "IOVDbSvc/IIOVCondDbSvc.h"
#include "AthenaKernel/IClassIDSvc.h"
#include "AthenaKernel/IOVTime.h"
diff --git a/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx b/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
index 49b7a840adafc5993946a5ee4f8ddfd364b98d96..e5389e93f4c13b7cc972b2284e86172870776adf 100755
--- a/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
@@ -16,7 +16,7 @@
#include "GaudiKernel/IDataSelector.h"
#include "GaudiKernel/IOpaqueAddress.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
// #include "SGTools/TransientAddress.h"
//External definitions
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.h b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.h
index 8582ff4b3b4df7395e39a85fc82827189be3fd62..daf243f23c9920d9d96c13b6858c06f6019783a3 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.h
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.h
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef _GeoCaloCalibHit_h_
-#define _GeoCaloCalibHit_h_
+#ifndef GEOADAPTORS_GEOCALOCALIBHIT_H
+#define GEOADAPTORS_GEOCALOCALIBHIT_H
//----------------------------------------------------------//
// //
// Adaptor for CaloCalibHits. //
@@ -68,13 +68,13 @@ class GeoCaloCalibHit
const CaloDetDescrElement* getDetDescrElement() const;
private:
+ static const CaloDetDescrManager* initDDMgr();
+ const CaloDetDescrManager* ddmgr() const;
void init(const std::string & collectionName);
const CaloCalibrationHit *m_hit;
- static const CaloIdManager *s_man;
- static const CaloDM_ID *s_dmid;
- static const CaloDetDescrManager *s_caloMan;
+
int m_subdet;
int m_type; // i.e. in the barrel or in the endcap.
int m_sampling;
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.icc b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.icc
index a5bc0f8f70d97bc09934b4ea84a2748fe02bc361..39940a655b21c49e941f16a431151bc518d5ed4e 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.icc
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoCaloCalibHit.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//----------------------------------------------------------//
@@ -11,8 +11,6 @@
// //
// //
//----------------------------------------------------------//
-#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "CaloDetDescr/CaloDetDescrElement.h"
@@ -21,9 +19,6 @@
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CLHEP/Units/SystemOfUnits.h"
-const CaloIdManager* GeoCaloCalibHit::s_man = 0;
-const CaloDM_ID* GeoCaloCalibHit::s_dmid = 0;
-const CaloDetDescrManager * GeoCaloCalibHit::s_caloMan = 0;
#undef DEBUG_GEOHIT
@@ -71,7 +66,8 @@ inline double GeoCaloCalibHit::phiMin() const {
double dphi = m_ddElement->dphi();
return phi-dphi/2.0;
}
- int phiIndex=s_dmid->phi(m_hit->cellID()); // Dead material hits
+ const CaloDM_ID* dmid = ddmgr()->getCalo_Mgr()->getDM_ID();
+ int phiIndex=dmid->phi(m_hit->cellID()); // Dead material hits
int n_phi=32;
if(abs(m_subdet) == 4 && m_type==2 && (m_region == 2 || m_region == 3) ) {
n_phi=16;
@@ -86,7 +82,8 @@ inline double GeoCaloCalibHit::phiMax() const {
double dphi = m_ddElement->dphi();
return phi+dphi/2.0;
}
- int phiIndex=s_dmid->phi(m_hit->cellID()); // Dead material hits
+ const CaloDM_ID* dmid = ddmgr()->getCalo_Mgr()->getDM_ID();
+ int phiIndex=dmid->phi(m_hit->cellID()); // Dead material hits
int n_phi=32;
if(abs(m_subdet) == 4 && m_type==2 && (m_region == 2 || m_region == 3) ) {
n_phi=16;
@@ -100,7 +97,8 @@ inline double GeoCaloCalibHit::phi() const {
double phi = m_ddElement->phi();
return phi;
}
- int phiIndex=s_dmid->phi(m_hit->cellID()); // Dead material hits
+ const CaloDM_ID* dmid = ddmgr()->getCalo_Mgr()->getDM_ID();
+ int phiIndex=dmid->phi(m_hit->cellID()); // Dead material hits
int n_phi=32;
if(abs(m_subdet) == 4 && m_type==2 && (m_region == 2 || m_region == 3) ) {
n_phi=16;
@@ -143,7 +141,8 @@ inline double GeoCaloCalibHit::eta() const {
double eta = m_ddElement->eta();
return eta;
}
- int etaIndex=s_dmid->eta(m_hit->cellID()); // Dead material hits
+ const CaloDM_ID* dmid = ddmgr()->getCalo_Mgr()->getDM_ID();
+ int etaIndex=dmid->eta(m_hit->cellID()); // Dead material hits
double dEta = 0.1;
if ((m_type==1 && m_sampling==3 && m_region==1) ||
(m_type==2 && m_region==3)) {
@@ -151,7 +150,7 @@ inline double GeoCaloCalibHit::eta() const {
}
double etaCenter = m_etaOffset + (etaIndex+0.5)*dEta;
- bool isNegative =s_dmid->pos_neg_z(m_hit->cellID())<0;
+ bool isNegative = dmid->pos_neg_z(m_hit->cellID())<0;
if (isNegative) {
etaCenter = -etaCenter;
}
@@ -204,24 +203,6 @@ inline void GeoCaloCalibHit::init(const std::string & collectionName) {
return;
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
-
- // Dead hits
- if(detStore->retrieve(s_man).isFailure()) {
- m_failed=true;
- return;
- }
- if (s_man) s_dmid = s_man->getDM_ID();
- if (!s_dmid) {
- m_failed=true;
- return;
- }
-
- // Active and Inactive hits
- if(detStore->retrieve(s_caloMan).isFailure()) {
- m_failed=true;
- return;
- }
m_ddElement = getDetDescrElement();
//bool inactive = collectionName=="LArCalibrationHitInactive";
@@ -235,21 +216,23 @@ inline void GeoCaloCalibHit::init(const std::string & collectionName) {
if (m_hitType==DEAD || m_hitType==TILEDM || m_hitType==TILEDEAD) { // Dead hits: LAr: m_subdet= +-4, Tile: m_subdet= +-5)
// from Calorimeter/ CaloIdentifier/ CaloIdentifier/ CaloDM_ID.h
- m_subdet = s_dmid->pos_neg_z(m_hit->cellID());
- m_type = s_dmid->dmat(m_hit->cellID());
- m_sampling = s_dmid->sampling(m_hit->cellID());
- m_region = s_dmid->region(m_hit->cellID());
- m_etaBin = s_dmid->eta(m_hit->cellID());
- m_phiBin = s_dmid->phi(m_hit->cellID());
+ const CaloDM_ID* dmid = ddmgr()->getCalo_Mgr()->getDM_ID();
+ m_subdet = dmid->pos_neg_z(m_hit->cellID());
+ m_type = dmid->dmat(m_hit->cellID());
+ m_sampling = dmid->sampling(m_hit->cellID());
+ m_region = dmid->region(m_hit->cellID());
+ m_etaBin = dmid->eta(m_hit->cellID());
+ m_phiBin = dmid->phi(m_hit->cellID());
} else { // Active and Inactive hit ID from Calorimeter/ CaloIdentifier/ CaloIdentifier/ CaloCell_ID.h
- m_subdet = 1 + s_caloMan->getCaloCell_ID()->sub_calo(m_hit->cellID());
- m_type = s_caloMan->getCaloCell_ID()->pos_neg(m_hit->cellID());
- m_sampling = s_caloMan->getCaloCell_ID()->calo_sample(m_hit->cellID());
- m_region = s_caloMan->getCaloCell_ID()->region(m_hit->cellID());
- m_etaBin = s_caloMan->getCaloCell_ID()->eta(m_hit->cellID());
- m_phiBin = s_caloMan->getCaloCell_ID()->phi(m_hit->cellID());
+ const CaloDetDescrManager* caloMan = ddmgr();
+ m_subdet = 1 + caloMan->getCaloCell_ID()->sub_calo(m_hit->cellID());
+ m_type = caloMan->getCaloCell_ID()->pos_neg(m_hit->cellID());
+ m_sampling = caloMan->getCaloCell_ID()->calo_sample(m_hit->cellID());
+ m_region = caloMan->getCaloCell_ID()->region(m_hit->cellID());
+ m_etaBin = caloMan->getCaloCell_ID()->eta(m_hit->cellID());
+ m_phiBin = caloMan->getCaloCell_ID()->phi(m_hit->cellID());
}
/*
@@ -768,6 +751,6 @@ inline int GeoCaloCalibHit::region() const {
inline const CaloDetDescrElement* GeoCaloCalibHit::getDetDescrElement() const
{
- if (m_hitType!=DEAD && m_hitType!=TILEDM && m_hitType!=TILEDEAD) return s_caloMan->get_element(m_hit->cellID());
+ if (m_hitType!=DEAD && m_hitType!=TILEDM && m_hitType!=TILEDEAD) return ddmgr()->get_element(m_hit->cellID());
return NULL;
}
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.h b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.h
index 5d2d996b5a9f22888f842f37684e6bf098e52430..a49946965a5629aedc62785c6215567924c6bb3c 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.h
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GEOADAPTORS_GEOLARHIT_H
@@ -33,17 +33,16 @@ class GeoLArHit
int SamplingLayer() const;
// Underlying hit.
- const LArHit &data() const { return *m_hit;}
+ const LArHit &data() const { return m_hit;}
// Is this hit OK?
- operator bool () const { return s_man; }
+ operator bool () const { return true; }
private:
-
- static void init();
+ static const CaloDetDescrManager* init();
+ const CaloDetDescrManager* mgr() const;
- const LArHit* m_hit;
- static const CaloDetDescrManager *s_man;
+ const LArHit& m_hit;
};
#include "GeoAdaptors/GeoLArHit.icc"
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.icc b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.icc
index 130a83513e955580d43a09c27f23bbd1ab1ea8fb..512c135c80fc857123c0ff333c35dba1bd6cfd99 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.icc
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoLArHit.icc
@@ -1,45 +1,34 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
-
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloDetDescr/CaloDetDescrElement.h"
#include "LArSimEvent/LArHitContainer.h"
#include "CaloIdentifier/CaloCell_ID.h"
-inline void GeoLArHit::init()
-{
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_man).isFailure())
- std::cout << "GeoLArHit::init() WARNING Unable to retrieve CaloDetDescrManager!" << std::endl;
-}
-
inline GeoLArHit::GeoLArHit(const LArHit & h)
+ : m_hit (h)
{
- m_hit = &h;
- if(!s_man) init();
}
inline const CaloDetDescrElement* GeoLArHit::getDetDescrElement() const
{
- return s_man->get_element(m_hit->cellID());
+ return mgr()->get_element(m_hit.cellID());
}
inline double GeoLArHit::Energy() const
{
- return m_hit->energy();
+ return m_hit.energy();
}
inline double GeoLArHit::Time() const
{
- return m_hit->time();
+ return m_hit.time();
}
inline int GeoLArHit::SamplingLayer() const {
- const CaloCell_ID *caloID = s_man->getCaloCell_ID();
- int layer = caloID->sampling(m_hit->cellID());
+ const CaloCell_ID *caloID = mgr()->getCaloCell_ID();
+ int layer = caloID->sampling(m_hit.cellID());
return layer;
}
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.h b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.h
index a6a683b7707db46cf42cb247d828c6e759d24a25..6706bf36cb6cc5a4f218e4421611e7ebb57c502e 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.h
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GEOADAPTORS_GEOMUONHITS_H
@@ -49,8 +49,19 @@ namespace MuonGM{
}
class Identifier;
-class GeoMDTHit {
+class GeoMuonHitBase
+{
+protected:
+ const MuonGM::MuonDetectorManager* mgr() const;
+
+private:
+ static const MuonGM::MuonDetectorManager* init();
+};
+
+
+class GeoMDTHit : public GeoMuonHitBase
+{
public:
// Constructor:
@@ -63,19 +74,15 @@ class GeoMDTHit {
const MDTSimHit &data() const { return *m_hit;}
// Is this hit OK?
- operator bool () const { return s_man; }
+ operator bool () const { return true; }
private:
-
- static void init();
-
const MDTSimHit* m_hit;
- static const MuonGM::MuonDetectorManager* s_man;
- static const MdtIdHelper* s_mdtID;
};
-class GeoRPCHit {
+class GeoRPCHit : public GeoMuonHitBase
+{
public:
// Constructor:
@@ -88,19 +95,15 @@ class GeoRPCHit {
const RPCSimHit &data() const { return *m_hit;}
// Is this hit OK?
- operator bool () const { return s_man; }
+ operator bool () const { return true; }
private:
- static void init();
-
const RPCSimHit* m_hit;
- static const MuonGM::MuonDetectorManager* s_man;
- static const RpcIdHelper* s_rpcID;
-
};
-class GeoTGCHit {
+class GeoTGCHit : public GeoMuonHitBase
+{
public:
// Constructor:
@@ -113,22 +116,17 @@ class GeoTGCHit {
const TGCSimHit &data() const { return *m_hit;}
// Is this hit OK?
- operator bool () const { return s_man; }
+ operator bool () const { return true; }
private:
- static void init();
-
const TGCSimHit *m_hit;
- static const MuonGM::MuonDetectorManager* s_man;
- static const TgcIdHelper* s_tgcID;
-
};
-class GeoCSCHit {
-
+class GeoCSCHit : public GeoMuonHitBase
+{
public:
// Constructor:
@@ -141,19 +139,15 @@ class GeoCSCHit {
const CSCSimHit &data() const { return *m_hit;}
// Is this hit OK?
- operator bool () const { return s_man; }
+ operator bool () const { return true; }
private:
- static void init();
-
const CSCSimHit *m_hit;
- static const MuonGM::MuonDetectorManager* s_man;
- static const CscIdHelper* s_cscID;
-
};
-class GeoMMHit {
+class GeoMMHit : public GeoMuonHitBase
+{
public:
// Constructor:
@@ -172,21 +166,17 @@ class GeoMMHit {
const MMSimHit &data() const { return *m_hit;}
// Is this hit OK?
- operator bool () const { return s_man; }
+ operator bool () const { return true; }
private:
- static void init();
-
const MMSimHit *m_hit;
- static const MuonGM::MuonDetectorManager* s_man;
- static const MmIdHelper* s_mmID;
-
};
-class GeosTGCHit {
+class GeosTGCHit : public GeoMuonHitBase
+{
public:
// Constructor:
@@ -199,17 +189,11 @@ class GeosTGCHit {
const sTGCSimHit &data() const { return *m_hit;}
// Is this hit OK?
- operator bool () const { return s_man; }
+ operator bool () const { return true; }
-
private:
- static void init();
-
const sTGCSimHit *m_hit;
- static const MuonGM::MuonDetectorManager* s_man;
- static const sTgcIdHelper* s_stgcID;
-
};
#include "GeoAdaptors/GeoMuonHits.icc"
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.icc b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.icc
index d263f8752012d1a6ddaf6b5d6694c270d64dc9fc..ec0c4e1300d1a8224b5c108d91496783c31ecca8 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.icc
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoMuonHits.icc
@@ -2,9 +2,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
-
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonIdHelpers/MdtIdHelper.h"
#include "MuonIdHelpers/RpcIdHelper.h"
@@ -50,17 +47,8 @@
#include "MuonReadoutGeometry/MMReadoutElement.h"
-inline void GeoMDTHit::init()
-{
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_man,"Muon").isSuccess())
- s_mdtID = s_man->mdtIdHelper();
-}
-
-
inline GeoMDTHit::GeoMDTHit (const MDTSimHit & h) {
m_hit = &h;
- if(!s_mdtID) init();
}
@@ -69,7 +57,8 @@ inline Amg::Vector3D GeoMDTHit::getGlobalPosition() const {
HitID hitid = m_hit->MDTid();
- MdtHitIdHelper* mdthhelper = MdtHitIdHelper::GetHelper();
+ const MdtIdHelper* mdtID = mgr()->mdtIdHelper();
+ MdtHitIdHelper* mdthhelper = MdtHitIdHelper::GetHelper(mdtID->tubeMax());
std::string stname = mdthhelper->GetStationName(hitid);
int steta = mdthhelper->GetZSector(hitid);
@@ -78,19 +67,20 @@ inline Amg::Vector3D GeoMDTHit::getGlobalPosition() const {
int tl = mdthhelper->GetLayer(hitid);
int tube = mdthhelper->GetTube(hitid);
- Identifier offid = s_mdtID->channelID(stname,
- steta,
- stphi,ml,tl,tube);
+ Identifier offid = mdtID->channelID(stname,
+ steta,
+ stphi,ml,tl,tube);
if (offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::MdtReadoutElement* mdtdet = s_man->getMdtReadoutElement(offid);
+ const MuonGM::MdtReadoutElement* mdtdet = mgr()->getMdtReadoutElement(offid);
if (mdtdet == NULL)
{
+ const MdtIdHelper* mdtID = mgr()->mdtIdHelper();
std::cerr<<"MDT readout element not found for Id = "
- <<s_mdtID->show_to_string(offid)<<std::endl;
+ <<mdtID->show_to_string(offid)<<std::endl;
return Amg::Vector3D(0,0,0);
}
@@ -103,22 +93,15 @@ inline Amg::Vector3D GeoMDTHit::getGlobalPosition() const {
return simHitPos;
}
-inline void GeoRPCHit::init()
-{
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_man,"Muon").isSuccess())
- s_rpcID = s_man->rpcIdHelper();
-}
-
inline GeoRPCHit::GeoRPCHit (const RPCSimHit & h) {
m_hit = &h;
- if(!s_rpcID) init();
}
inline Amg::Vector3D GeoRPCHit::getGlobalPosition() const {
HitID hitid = m_hit->RPCid();
- RpcHitIdHelper* rpchhelper = RpcHitIdHelper::GetHelper(s_rpcID->gasGapMax());
+ const RpcIdHelper* rpcID = mgr()->rpcIdHelper();
+ RpcHitIdHelper* rpchhelper = RpcHitIdHelper::GetHelper(rpcID->gasGapMax());
std::string stname = rpchhelper->GetStationName(hitid);
int steta = rpchhelper->GetZSector(hitid);
int stphi = rpchhelper->GetPhiSector(hitid);
@@ -128,14 +111,14 @@ inline Amg::Vector3D GeoRPCHit::getGlobalPosition() const {
int gg = rpchhelper->GetGasGapLayer(hitid);
int mfi = rpchhelper->GetMeasuresPhi(hitid);
int strip = 1;
- Identifier offid = s_rpcID->channelID(stname,
- steta,
- stphi,
- dbr, dbz, dbp, gg, mfi, strip);
+ Identifier offid = rpcID->channelID(stname,
+ steta,
+ stphi,
+ dbr, dbz, dbp, gg, mfi, strip);
if ( offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::RpcReadoutElement* rpcdet = s_man->getRpcReadoutElement(offid);
+ const MuonGM::RpcReadoutElement* rpcdet = mgr()->getRpcReadoutElement(offid);
if (rpcdet != NULL)
{
Amg::Vector3D xU;
@@ -146,23 +129,16 @@ inline Amg::Vector3D GeoRPCHit::getGlobalPosition() const {
}
else
{
+ const RpcIdHelper* rpcID = mgr()->rpcIdHelper();
std::cerr<<"RPC readout element not found for Id = "
- <<s_rpcID->show_to_string(offid)<<std::endl;
+ <<rpcID->show_to_string(offid)<<std::endl;
return Amg::Vector3D(0,0,0);
}
}
-inline void GeoTGCHit::init()
-{
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_man,"Muon").isSuccess())
- s_tgcID = s_man->tgcIdHelper();
-}
-
inline GeoTGCHit::GeoTGCHit (const TGCSimHit & h) {
m_hit = &h;
- if(!s_tgcID) init();
}
inline Amg::Vector3D GeoTGCHit::getGlobalPosition() const {
@@ -175,14 +151,15 @@ inline Amg::Vector3D GeoTGCHit::getGlobalPosition() const {
int gg = tgchhelper->GetGasGap(hitid);
int isstrip= 0;
int channel= 1;
- Identifier offid = s_tgcID->channelID(stname,
- steta,
- stphi,
- gg, isstrip, channel);
+ const TgcIdHelper* tgcID = mgr()->tgcIdHelper();
+ Identifier offid = tgcID->channelID(stname,
+ steta,
+ stphi,
+ gg, isstrip, channel);
if ( offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::TgcReadoutElement* tgcdet = s_man->getTgcReadoutElement(offid);
+ const MuonGM::TgcReadoutElement* tgcdet = mgr()->getTgcReadoutElement(offid);
if (tgcdet != NULL)
{
Amg::Vector3D xU;
@@ -193,21 +170,15 @@ inline Amg::Vector3D GeoTGCHit::getGlobalPosition() const {
}
else
{
+ const TgcIdHelper* tgcID = mgr()->tgcIdHelper();
std::cerr<<"TGC readout element not found for Id = "
- <<s_tgcID->show_to_string(offid)<<std::endl;
+ <<tgcID->show_to_string(offid)<<std::endl;
return Amg::Vector3D(0,0,0);
}
}
-inline void GeoCSCHit::init()
-{
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_man,"Muon").isSuccess())
- s_cscID = s_man->cscIdHelper();
-}
inline GeoCSCHit::GeoCSCHit (const CSCSimHit & h) {
m_hit = &h;
- if (!s_cscID) init();
}
inline Amg::Vector3D GeoCSCHit::getGlobalPosition() const {
@@ -223,19 +194,21 @@ inline Amg::Vector3D GeoCSCHit::getGlobalPosition() const {
int measphi = 0;
int channel = 1;
- Identifier offid = s_cscID->channelID(stname,
- steta,
- stphi,ml,wl,measphi,channel);
+ const CscIdHelper* cscID = mgr()->cscIdHelper();
+ Identifier offid = cscID->channelID(stname,
+ steta,
+ stphi,ml,wl,measphi,channel);
if (offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::CscReadoutElement* cscdet = s_man->getCscReadoutElement(offid);
+ const MuonGM::CscReadoutElement* cscdet = mgr()->getCscReadoutElement(offid);
if (cscdet == NULL)
{
+ const CscIdHelper* cscID = mgr()->cscIdHelper();
std::cerr<<"CSC readout element not found for Id = "
- <<s_cscID->show_to_string(offid)<<std::endl;
+ <<cscID->show_to_string(offid)<<std::endl;
return Amg::Vector3D(0,0,0);
}
@@ -247,33 +220,27 @@ inline Amg::Vector3D GeoCSCHit::getGlobalPosition() const {
}
-inline void GeoMMHit::init()
-{
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_man,"Muon").isSuccess())
- s_mmID = s_man->mmIdHelper();
-}
-
inline GeoMMHit::GeoMMHit (const MMSimHit & h) {
m_hit = &h;
- if (!s_mmID) init();
}
inline Amg::Vector3D GeoMMHit::getGlobalPosition() const {
HitID hitid = m_hit->MMId();
- MM_SimIdToOfflineId simToOffline(s_mmID);
+ const MmIdHelper* mmID = mgr()->mmIdHelper();
+ MM_SimIdToOfflineId simToOffline(mmID);
Identifier offid = simToOffline.convert(hitid);
if (offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::MMReadoutElement* mmdet = s_man->getMMReadoutElement(offid);
+ const MuonGM::MMReadoutElement* mmdet = mgr()->getMMReadoutElement(offid);
if (mmdet == NULL)
{
+ const MmIdHelper* mmID = mgr()->mmIdHelper();
std::cerr<<"MM readout element not found for Id = "
- <<s_mmID->show_to_string(offid)<<std::endl;
+ <<mmID->show_to_string(offid)<<std::endl;
return Amg::Vector3D(0,0,0);
}
@@ -285,18 +252,20 @@ inline Amg::Vector3D GeoMMHit::getGlobalPosition() const {
inline Amg::Vector3D GeoMMHit::getTrkGlobalPosition() const {
HitID hitid = m_hit->MMId();
- MM_SimIdToOfflineId simToOffline(s_mmID);
+ const MmIdHelper* mmID = mgr()->mmIdHelper();
+ MM_SimIdToOfflineId simToOffline(mmID);
Identifier offid = simToOffline.convert(hitid);
if (offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::MMReadoutElement* mmdet = s_man->getMMReadoutElement(offid);
+ const MuonGM::MMReadoutElement* mmdet = mgr()->getMMReadoutElement(offid);
if (mmdet == NULL)
{
+ const MmIdHelper* mmID = mgr()->mmIdHelper();
std::cerr<<"MM readout element not found for Id = "
- <<s_mmID->show_to_string(offid)<<std::endl;
+ <<mmID->show_to_string(offid)<<std::endl;
return Amg::Vector3D(0,0,0);
}
Amg::Vector3D trkLocP = getTrkLocalPosition();
@@ -309,18 +278,20 @@ inline Amg::Vector3D GeoMMHit::getTrkLocalPosition() const {
HitID hitid = m_hit->MMId();
- MM_SimIdToOfflineId simToOffline(s_mmID);
+ const MmIdHelper* mmID = mgr()->mmIdHelper();
+ MM_SimIdToOfflineId simToOffline(mmID);
Identifier offid = simToOffline.convert(hitid);
if (offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::MMReadoutElement* mmdet = s_man->getMMReadoutElement(offid);
+ const MuonGM::MMReadoutElement* mmdet = mgr()->getMMReadoutElement(offid);
if (mmdet == NULL)
{
+ const MmIdHelper* mmID = mgr()->mmIdHelper();
std::cerr<<"MM readout element not found for Id = "
- <<s_mmID->show_to_string(offid)<<std::endl;
+ <<mmID->show_to_string(offid)<<std::endl;
}
Amg::Transform3D gToL = mmdet->absTransform().inverse();
@@ -332,32 +303,27 @@ inline Amg::Vector3D GeoMMHit::getTrkLocalPosition() const {
return trkLocHit;
}
-inline void GeosTGCHit::init()
-{
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_man,"Muon").isSuccess())
- s_stgcID = s_man->stgcIdHelper();
-}
inline GeosTGCHit::GeosTGCHit (const sTGCSimHit & h) {
m_hit = &h;
- if (!s_stgcID) init();
}
inline Amg::Vector3D GeosTGCHit::getGlobalPosition() const {
HitID hitid = m_hit->sTGCId();
- sTgcSimIdToOfflineId simToOffline(s_stgcID);
+ const sTgcIdHelper* stgcID = mgr()->stgcIdHelper();
+ sTgcSimIdToOfflineId simToOffline(stgcID);
Identifier offid = simToOffline.convert(hitid);
if (offid == 0)
std::cerr<<" Cannot build a valid Identifier; skip "<<std::endl;
- const MuonGM::sTgcReadoutElement* stgcdet = s_man->getsTgcReadoutElement(offid);
+ const MuonGM::sTgcReadoutElement* stgcdet = mgr()->getsTgcReadoutElement(offid);
if (stgcdet == NULL)
{
+ const sTgcIdHelper* stgcID = mgr()->stgcIdHelper();
std::cerr<<"sTGC readout element not found for Id = "
- <<s_stgcID->show_to_string(offid)<<std::endl;
+ <<stgcID->show_to_string(offid)<<std::endl;
return Amg::Vector3D(0,0,0);
}
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.h b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.h
index 443647d18e9f12ab11b7c843ee8a6a7ec7f45b95..78e7ef68f8fe38e2c37836352cbd4f91fc1d01d2 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.h
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GEOADAPTORS_GEOSIHIT_h
@@ -39,17 +39,20 @@ class GeoSiHit {
// Is this hit ok?
- operator bool () const { return s_sct || s_pix; }
+ operator bool () const { return true; }
private:
-
- static void init();
+ static const InDetDD::PixelDetectorManager* initPixMgr();
+ static const InDetDD::SCT_DetectorManager* initSctMgr();
+ static const PixelID* initPixID();
+ static const SCT_ID* initSctID();
+
+ const InDetDD::PixelDetectorManager* pixMgr() const;
+ const InDetDD::SCT_DetectorManager* sctMgr() const;
+ const PixelID* pixID() const;
+ const SCT_ID* sctID() const;
const SiHit *m_hit;
- static const InDetDD::SCT_DetectorManager *s_sct;
- static const InDetDD::PixelDetectorManager *s_pix;
- static const PixelID *s_pID;
- static const SCT_ID *s_sID;
};
#include "GeoAdaptors/GeoSiHit.icc"
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.icc b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.icc
index 7a8b878e87b4ed740974e46cf10fb87ab00efc9b..b0c16f7502d61253811978ef1a0d2fecdc6281b0 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.icc
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoSiHit.icc
@@ -6,34 +6,13 @@
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "SCT_ReadoutGeometry/SCT_DetectorManager.h"
#include "PixelReadoutGeometry/PixelDetectorManager.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetIdentifier/SCT_ID.h"
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
-inline void GeoSiHit::init() {
-
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_sct,"SCT").isFailure()){
- //if SCT retrieval fails, try ITkStrip
- if(detStore->retrieve(s_sct,"ITkStrip").isFailure()) s_sct=0;
- }
- if(detStore->retrieve(s_pix,"Pixel").isFailure()){
- //if Pixel retrieval fails, try ITkPixel
- if(detStore->retrieve(s_pix,"ITkPixel").isFailure()) s_pix = 0;
- }
- if(detStore->retrieve(s_sID,"SCT_ID").isFailure())
- s_sID = 0;
- if(detStore->retrieve(s_pID,"PixelID").isFailure())
- s_pID = 0;
-}
-
inline GeoSiHit::GeoSiHit (const SiHit & h) {
m_hit = &h;
- //If neither manager exists, may need to re-initialize...
- if (!s_sct && !s_pix) init();
}
inline HepGeom::Point3D<double> GeoSiHit::getGlobalPosition() const {
@@ -44,19 +23,19 @@ inline HepGeom::Point3D<double> GeoSiHit::getGlobalPosition() const {
const InDetDD::SiDetectorElement *geoelement=NULL;
if (m_hit->isPixel()) {
- id = s_pID->wafer_id(Barrel,
+ id = pixID()->wafer_id(Barrel,
m_hit->getLayerDisk(),
m_hit->getPhiModule(),
m_hit->getEtaModule());
- geoelement = s_pix->getDetectorElement(id);
+ geoelement = pixMgr()->getDetectorElement(id);
}
else {
- id = s_sID->wafer_id(Barrel,
+ id = sctID()->wafer_id(Barrel,
m_hit->getLayerDisk(),
m_hit->getPhiModule(),
m_hit->getEtaModule(),
m_hit->getSide() );
- geoelement = s_sct->getDetectorElement(id);
+ geoelement = sctMgr()->getDetectorElement(id);
}
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.h b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.h
index 44ccf1b4c69e9548820ebeeaafec1ae018469a88..324933c2d6a7660500a9f41e972443ff71ad64ae 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.h
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GEOADAPTORS_GEOTRTUNCOMPRESSEDHIT_H
@@ -33,15 +33,13 @@ class GeoTRTUncompressedHit {
HepGeom::Point3D<double> getGlobalPosition() const;
// Is this hit OK?
- operator bool () const { return s_mgr; }
+ operator bool () const { return true; }
private:
-
- static void init();
+ static const InDetDD::TRT_DetectorManager* init();
+ const InDetDD::TRT_DetectorManager* mgr() const;
const TRTUncompressedHit *m_hit;
- static const InDetDD::TRT_DetectorManager *s_mgr;
-
};
#include "GeoAdaptors/GeoTRTUncompressedHit.icc"
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.icc b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.icc
index 32df35e9d439be1bd7965cf1cddf676dc10a2b9e..04bafd0b8f017e67f865f0992b8281b3fdefcc0a 100755
--- a/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.icc
+++ b/DetectorDescription/GeoModel/GeoAdaptors/GeoAdaptors/GeoTRTUncompressedHit.icc
@@ -1,26 +1,17 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetSimEvent/TRTUncompressedHit.h"
#include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
#include "TRT_ReadoutGeometry/TRT_BarrelElement.h"
#include "TRT_ReadoutGeometry/TRT_EndcapElement.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include <bitset>
-inline void GeoTRTUncompressedHit::init() {
-
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- if(detStore->retrieve(s_mgr,"TRT").isFailure())
- std::cout << "GeoTRTUncompressedHit::init() WARNING Unable to retrieve InDetDD::TRT_DetectorManager" << std::endl;
-}
inline GeoTRTUncompressedHit::GeoTRTUncompressedHit (const TRTUncompressedHit & h) {
m_hit = &h;
- if (!s_mgr) init();
}
inline HepGeom::Point3D<double> GeoTRTUncompressedHit::getGlobalPosition() const {
@@ -38,7 +29,7 @@ inline HepGeom::Point3D<double> GeoTRTUncompressedHit::getGlobalPosition() const
hitID >>= shift;
ringID = hitID & mask;
trtID = hitID >> shift;
- const InDetDD::TRT_BarrelElement *element = s_mgr->getBarrelElement(trtID,ringID,moduleID,layerID);
+ const InDetDD::TRT_BarrelElement *element = mgr()->getBarrelElement(trtID,ringID,moduleID,layerID);
if (element) {
HepGeom::Point3D<double> v(m_hit->GetPreStepX(), m_hit->GetPreStepY(), m_hit->GetPreStepZ());
return element->getAbsoluteTransform(strawID)*v;
@@ -54,7 +45,7 @@ inline HepGeom::Point3D<double> GeoTRTUncompressedHit::getGlobalPosition() const
wheelID = hitID & mask;
trtID = hitID >> shift;
bool isPositive = trtID==2 ? 1:0;
- const InDetDD::TRT_EndcapElement *element = s_mgr->getEndcapElement(isPositive,wheelID,planeID,sectorID);
+ const InDetDD::TRT_EndcapElement *element = mgr()->getEndcapElement(isPositive,wheelID,planeID,sectorID);
if (element) {
HepGeom::Point3D<double> v(m_hit->GetPreStepX(), m_hit->GetPreStepY(), m_hit->GetPreStepZ());
return element->getAbsoluteTransform(strawID)*v;
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/src/GeoCaloCalibHit.cxx b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoCaloCalibHit.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..9e5c30fcab4777a0078569efb379e2786e63b9c7
--- /dev/null
+++ b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoCaloCalibHit.cxx
@@ -0,0 +1,27 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#include "GeoAdaptors/GeoCaloCalibHit.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+
+const CaloDetDescrManager* GeoCaloCalibHit::initDDMgr()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoLArHit");
+ const CaloDetDescrManager* mgr = nullptr;
+ if (detStore->retrieve(mgr).isFailure()) {
+ std::abort();
+ }
+ return mgr;
+}
+
+
+const CaloDetDescrManager* GeoCaloCalibHit::ddmgr() const
+{
+ const CaloDetDescrManager* const ddmgr = initDDMgr();
+ return ddmgr;
+}
+
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/src/GeoLArHit.cxx b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoLArHit.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..57eedb92a9520503e0a1042bb21603dc75faec6b
--- /dev/null
+++ b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoLArHit.cxx
@@ -0,0 +1,26 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "GeoAdaptors/GeoLArHit.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+
+const CaloDetDescrManager* GeoLArHit::init()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoLArHit");
+ const CaloDetDescrManager* mgr = nullptr;
+ if (detStore->retrieve(mgr).isFailure()) {
+ std::abort();
+ }
+ return mgr;
+}
+
+
+const CaloDetDescrManager* GeoLArHit::mgr() const
+{
+ static const CaloDetDescrManager* const mgr = init();
+ return mgr;
+}
+
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/src/GeoMuonHits.cxx b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoMuonHits.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..5d8614424d961351bfbfd996b7be6c50c3d1fdcc
--- /dev/null
+++ b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoMuonHits.cxx
@@ -0,0 +1,26 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#include "GeoAdaptors/GeoMuonHits.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+
+const MuonGM::MuonDetectorManager* GeoMuonHitBase::init()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+ const MuonGM::MuonDetectorManager* mgr = nullptr;
+ if(detStore->retrieve(mgr,"Muon").isFailure()) {
+ std::abort();
+ }
+ return mgr;
+}
+
+
+const MuonGM::MuonDetectorManager* GeoMuonHitBase::mgr() const
+{
+ const MuonGM::MuonDetectorManager* const mgr = init();
+ return mgr;
+}
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/src/GeoSiHit.cxx b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoSiHit.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..60b4fc5009c6c9d817f36e249d60522e92d90146
--- /dev/null
+++ b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoSiHit.cxx
@@ -0,0 +1,87 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#include "GeoAdaptors/GeoSiHit.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+
+const InDetDD::PixelDetectorManager* GeoSiHit::initPixMgr()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+ const InDetDD::PixelDetectorManager* pix = nullptr;
+ if(detStore->retrieve(pix,"Pixel").isFailure()){
+ //if Pixel retrieval fails, try ITkPixel
+ if(detStore->retrieve(pix,"ITkPixel").isFailure())
+ {
+ std::abort();
+ }
+ }
+ return pix;
+}
+
+
+const InDetDD::SCT_DetectorManager* GeoSiHit::initSctMgr()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+ const InDetDD::SCT_DetectorManager* sct = nullptr;
+ if(detStore->retrieve(sct,"SCT").isFailure()){
+ if(detStore->retrieve(sct,"ITkStrip").isFailure()) {
+ std::abort();
+ }
+ }
+ return sct;
+}
+
+
+const PixelID* GeoSiHit::initPixID()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+ const PixelID* pix = nullptr;
+ if(detStore->retrieve(pix,"PixelID").isFailure()) {
+ std::abort();
+ }
+ return pix;
+}
+
+
+const SCT_ID* GeoSiHit::initSctID()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+ const SCT_ID* sct = nullptr;
+ if(detStore->retrieve(sct,"SCT_ID").isFailure()) {
+ std::abort();
+ }
+ return sct;
+}
+
+
+const InDetDD::PixelDetectorManager* GeoSiHit::pixMgr() const
+{
+ const InDetDD::PixelDetectorManager* const mgr = initPixMgr();
+ return mgr;
+}
+
+
+const InDetDD::SCT_DetectorManager* GeoSiHit::sctMgr() const
+{
+ const InDetDD::SCT_DetectorManager* const mgr = initSctMgr();
+ return mgr;
+}
+
+
+const PixelID* GeoSiHit::pixID() const
+{
+ const PixelID* const id = initPixID();
+ return id;
+}
+
+
+const SCT_ID* GeoSiHit::sctID() const
+{
+ const SCT_ID* const id = initSctID();
+ return id;
+}
+
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/src/GeoTRTUncompressedHit.cxx b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoTRTUncompressedHit.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..7ef4c781b6f18cc932330ff10cd7e3f44b8f2875
--- /dev/null
+++ b/DetectorDescription/GeoModel/GeoAdaptors/src/GeoTRTUncompressedHit.cxx
@@ -0,0 +1,26 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#include "GeoAdaptors/GeoTRTUncompressedHit.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+
+const InDetDD::TRT_DetectorManager* GeoTRTUncompressedHit::init()
+{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "GeoSiHit");
+ const InDetDD::TRT_DetectorManager* mgr = nullptr;
+ if(detStore->retrieve(mgr,"TRT").isFailure()) {
+ std::abort();
+ }
+ return mgr;
+}
+
+
+const InDetDD::TRT_DetectorManager* GeoTRTUncompressedHit::mgr() const
+{
+ const InDetDD::TRT_DetectorManager* const mgr = init();
+ return mgr;
+}
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/src/statics.cxx b/DetectorDescription/GeoModel/GeoAdaptors/src/statics.cxx
deleted file mode 100644
index e656f5d19e99e9b26771e745520330a9dddb856f..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoAdaptors/src/statics.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GeoAdaptors/GeoLArHit.h"
-#include "GeoAdaptors/GeoSiHit.h"
-#include "GeoAdaptors/GeoMuonHits.h"
-#include "GeoAdaptors/GeoTRTUncompressedHit.h"
-
-const InDetDD::SCT_DetectorManager *GeoSiHit::s_sct = 0;
-const InDetDD::PixelDetectorManager *GeoSiHit::s_pix = 0;
-const PixelID *GeoSiHit::s_pID = 0;
-const SCT_ID *GeoSiHit::s_sID = 0;
-
-
-const MuonGM::MuonDetectorManager* GeoMDTHit::s_man = 0;
-const MdtIdHelper* GeoMDTHit::s_mdtID = 0;
-
-const MuonGM::MuonDetectorManager* GeoTGCHit::s_man = 0;
-const TgcIdHelper* GeoTGCHit::s_tgcID = 0;
-
-const MuonGM::MuonDetectorManager* GeoRPCHit::s_man = 0;
-const RpcIdHelper* GeoRPCHit::s_rpcID = 0;
-
-const MuonGM::MuonDetectorManager* GeoCSCHit::s_man = 0;
-const CscIdHelper* GeoCSCHit::s_cscID = 0;
-
-const MuonGM::MuonDetectorManager* GeosTGCHit::s_man = 0;
-const sTgcIdHelper* GeosTGCHit::s_stgcID = 0;
-
-const MuonGM::MuonDetectorManager* GeoMMHit::s_man = 0;
-const MmIdHelper* GeoMMHit::s_mmID = 0;
-
-const CaloDetDescrManager* GeoLArHit::s_man = 0;
-
-const InDetDD::TRT_DetectorManager *GeoTRTUncompressedHit::s_mgr = 0;
-
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
index 0e29bb5d56017f2fbcf44db87509127a37ca7b63..2e7735f658bc01292eaecbb1835a708eb9f9425e 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
@@ -72,8 +72,9 @@ StatusCode RegSelTestAlg::dumpOne( const std::string& message, double eta, const
StatusCode RegSelTestAlg::dump() const {
// generate list of RoIs for ID
-
- CHECK( dumpOne("Inner Detector ", 2.5, { PIXEL, SCT, TRT } ) );
+
+ /// commented as a reminder until a fix for the new RegSelTools is added
+ // CHECK( dumpOne("Inner Detector ", 2.5, { PIXEL, SCT, TRT } ) );
CHECK( dumpOne("Calorimeters ", 5., { LAR, TTEM, TTHEC, TILE, FCALEM, FCALHAD } ) );
CHECK( dumpOne("Muons ", 5., { MDT, RPC, TGC, CSC } ) );
return StatusCode::SUCCESS;
@@ -184,8 +185,9 @@ StatusCode RegSelTestAlg::mt() const {
std::vector<ParallelCallTest*> tests;
-
- for ( auto detector: {PIXEL, SCT, TRT, LAR, TTEM, TTHEC, TILE, MDT, RPC, TGC, CSC, FCALEM, FCALHAD, FTK} ) {
+ /// commented as a reminder until a fix is added for the new RegSelTools
+ // for ( auto detector: {PIXEL, SCT, TRT, LAR, TTEM, TTHEC, TILE, MDT, RPC, TGC, CSC, FCALEM, FCALHAD, FTK} ) {
+ for ( auto detector: { LAR, TTEM, TTHEC, TILE, MDT, RPC, TGC, CSC, FCALEM, FCALHAD } ) {
for ( auto& roi : rois ) {
tests.push_back( new RoIReqTest( roi, detector, msg(), m_regSelSvc ) );
}
diff --git a/DetectorDescription/RegionSelector/python/RegSelToolConfig.py b/DetectorDescription/RegionSelector/python/RegSelToolConfig.py
index aee84b9695e5f279ae190ec9f3059f39a0391c22..8ed2f0a3b34d4f9c8acb85aa96c528dbac3dbf3f 100644
--- a/DetectorDescription/RegionSelector/python/RegSelToolConfig.py
+++ b/DetectorDescription/RegionSelector/python/RegSelToolConfig.py
@@ -187,11 +187,15 @@ def regSelToolCfg(flags, detector, CondAlg, CablingConfigCfg=0):
# inner detector
+def regSelTool_Pixel_Cfg(flags):
+ return regSelToolCfg(flags, "Pixel", CompFactory.SiRegSelCondAlg)
+
def regSelTool_SCT_Cfg(flags):
return regSelToolCfg(flags, "SCT", CompFactory.SiRegSelCondAlg)
-def regSelTool_Pixel_Cfg(flags):
- return regSelToolCfg(flags, "Pixel", CompFactory.SiRegSelCondAlg)
+def regSelTool_TRT_Cfg(flags):
+ return regSelToolCfg(flags, "TRT", CompFactory.TRT_RegSelCondAlg)
+
# muon spectrometer
diff --git a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
index 0ad022d9fb1836a7593ee998191f94f70e2eb21a..aa6c71ae682e3b1359656bdd0756b623b6338249 100755
--- a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
+++ b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
@@ -175,20 +175,6 @@ StatusCode RegSelSvc::initialize() {
ATH_MSG_INFO( "DeltaZ = " << m_DeltaZ );
-
- std::string sctflag("enabled");
- std::string pixelflag("enabled");
- std::string trtflag("enabled");
-
- if ( m_initOnlyID.value() ) {
- if ( !m_initSCT.value() ) sctflag = "disabled";
- else ATH_CHECK(m_SCTCablingToolInc.retrieve()); // SCT_CablingToolInc has to be retrieved now.
- // Otherwise, SCT_RegionSelectorTable cannot use ready SCT_CablingToolInc.
-
- if ( !m_initPixel.value() ) pixelflag = "disabled";
- if ( !m_initTRT.value() ) trtflag = "disabled";
- }
-
std::string rpcflag("enabled");
std::string mdtflag("enabled");
std::string tgcflag("enabled");
@@ -209,8 +195,6 @@ StatusCode RegSelSvc::initialize() {
msg(MSG::INFO) << "detector switches:"
<< " indet=" << (m_initOnlyID.value() ? "enabled":"disabled");
- if( m_initOnlyID.value() )
- msg() << " ( sct=" << sctflag << " pixel=" << pixelflag << " trt=" << trtflag << " )";
msg() << " calo=" << (m_initOnlyCalo.value() ? "enabled":"disabled")
<< " muon=" << (m_initOnlyMuon.value() ? "enabled":"disabled");
@@ -301,7 +285,6 @@ void RegSelSvc::handle(const Incident& incident) {
initialised = true;
// call Innr detector, Calo and Muon handlers
- if ( m_initOnlyID ) handleID();
if ( m_initOnlyMuon ) handleMuon();
// if ( m_initOnlyCalo ) handleCalo();
@@ -312,122 +295,16 @@ void RegSelSvc::handle(const Incident& incident) {
msg() << " " << *d;
msg() << " detectors have been initialized" << endmsg; // " with Region Type " << m_regionType << endmsg;
}
-
- if ( m_dumpTable ) {
- RegSelSiLUT* tables[7] = { m_newpixel, m_newsct, m_newtrt, m_newrpc, m_newmdt, m_newtgc, m_newcsc };
- for ( int it=0 ; it<7 ; it++ ) {
- if ( tables[it] ) {
- char table[64];
- std::sprintf( table, "table-%d.map", it );
- ATH_MSG_INFO( "dumping table " << it << " to file: " << table );
- tables[it]->write(table);
- }
- }
- }
-
- // if ( m_errorFlag ) return StatusCode::FAILURE;
- // else return StatusCode::SUCCESS;
- }
-
-}
-
-
-
-
-
-void RegSelSvc::disableIDFromConditions(RegSelSiLUT* detector, const std::string& serviceName) {
- ATH_MSG_INFO( " reading detector conditions from " << serviceName );
-
- if (serviceName.empty()){
- ATH_MSG_INFO( "Unspecified conditions summary service, skipping disableIDFromConditions" );
- return;
}
- if ( detector ) {
-
- // get list of all detector elements for this detector
-
- std::vector<IdentifierHash> IDList;
+}
- if ( detector==m_newpixel ) DetHashIDList(PIXEL, IDList);
- if ( detector==m_newsct ) DetHashIDList(SCT, IDList);
- if ( detector==m_newtrt ) DetHashIDList(TRT, IDList);
-
- // there must be a nicer way to do this.
- // basically, I have to enable all modules,
- // then go through them getting the list of
- // modules to enable and the list to disable,
- // then I have to enable and disable them
- // appropriately. hmmm
-
- // get lists of modules to enable and disable
- std::vector<IdentifierHash> DisableList;
- std::vector<IdentifierHash> EnableList;
-
- int active_modules = 0;
- int disabled_modules = 0;
-
- std::vector<IdentifierHash>::iterator mitr(IDList.begin());
- std::vector<IdentifierHash>::iterator mend(IDList.end());
-
- if ( detector==m_newpixel or detector==m_newsct ) {
- // get ConditionsSummaryTool
- ToolHandle<IInDetConditionsTool> condsummary(serviceName, this);
- if ( condsummary.retrieve().isFailure() ) {
- ATH_MSG_ERROR( "failed to get " << serviceName );
- return;
- }
- while ( mitr!=mend ) {
- if ( condsummary->isActive(*mitr) ) {
- EnableList.push_back(*mitr);
- active_modules++;
- }
- else {
- DisableList.push_back(*mitr);
- disabled_modules++;
- }
- ATH_MSG_VERBOSE( serviceName << " module 0x" << std::hex << *mitr << std::dec
- << " isActive()=" << condsummary->isActive(*mitr) );
- mitr++;
- }
- } else {
- // get ConditionsSummarySvc
- ServiceHandle<IInDetConditionsSvc> condsummary(serviceName, name());
- if ( condsummary.retrieve().isFailure() ) {
- ATH_MSG_ERROR( "failed to get " << serviceName );
- return;
- }
- while ( mitr!=mend ) {
- if ( condsummary->isActive(*mitr) ) {
- EnableList.push_back(*mitr);
- active_modules++;
- }
- else {
- DisableList.push_back(*mitr);
- disabled_modules++;
- }
- ATH_MSG_VERBOSE( serviceName << " module 0x" << std::hex << *mitr << std::dec
- << " isActive()=" << condsummary->isActive(*mitr) );
- mitr++;
- }
- }
- ATH_MSG_INFO( serviceName << " Number of modules active " << active_modules );
- ATH_MSG_INFO( serviceName << " Number of modules disabled " << disabled_modules );
-
- // these methods have to be tidied up, since they
- // each rebuild the Disabled module maps, I need
- // methods to enable/disable, and *after* to rebuild
- // the disabled module map
-
- detector->disableModuleList(DisableList);
- // detector->enableModuleList(EnableList);
-
- }
+void RegSelSvc::disableIDFromConditions(RegSelSiLUT* /* detector */, const std::string& /* serviceName */ ) {
}
@@ -437,87 +314,8 @@ void RegSelSvc::disableIDFromConditions(RegSelSiLUT* detector, const std::string
bool RegSelSvc::handleID() {
-
- bool errorFlag = false;
-
- ATH_MSG_INFO( " Initialising Inner Detector maps" );
-
- // new region selector code, we make the (reasonably simple)
- // structures in the SiRegionSelectorTable so we don't need to
- // do any more than just extract the tables.
-
-
- //! Read PIXEL data from Detector Store
- if ( m_initPixel.value() ) {
- StatusCode sc = readFromSG(m_lutCreatorToolPixel, m_newpixel);
- // sc = m_detStore->retrieve(m_newpixel, "PixelRegSelSiLUT");
- if (sc.isFailure()){
- ATH_MSG_WARNING( "Failed to initialize pixel data" );
- errorFlag = true;
- }
- else {
- if ( m_newpixel ) {
- ATH_MSG_INFO( "retrieved new pixel RegSelSiLUT map " << m_newpixel->getName() );
- }
- else {
- ATH_MSG_ERROR( "retrieved new pixel RegSelSiLUT map is NULL" );
- errorFlag = true;
- }
- }
- }
-
- //! Read SCT data from Detector Store
- if ( m_initSCT.value() ) {
- StatusCode sc = readFromSG(m_lutCreatorToolSCT, m_newsct);
- // sc = m_detStore->retrieve(m_newsct, "SCTRegSelSiLUT");
- if (sc.isFailure()){
- ATH_MSG_WARNING( "Failed to initialize SCT data" );
- errorFlag = true;
- }
- else {
- if ( m_newsct )
- ATH_MSG_INFO( "retrieved new sct RegSelSiLUT map " << m_newsct->getName() );
- else {
- ATH_MSG_ERROR( "retrieved new sct RegSelSiLUT map is NULL" );
- errorFlag = true;
- }
- }
- }
-
-
- //! Read TRT data from Detector Store
-
- if ( m_initTRT.value() ) {
- StatusCode sc = readFromSG(m_lutCreatorToolTRT, m_newtrt);
- // sc = m_detStore->retrieve(m_newtrt, "TRTRegSelSiLUT");
- if (sc.isFailure()){
- ATH_MSG_WARNING( "Failed to initialize TRT data" );
- errorFlag = true;
- }
- else {
- if ( m_newtrt )
- ATH_MSG_INFO( "retrieved new trt RegSelSiLUT map " << m_newtrt->getName() );
- else {
- ATH_MSG_ERROR( "retrieved new trt RegSelSiLUT is NULL" );
- errorFlag = true;
- }
- }
- }
-
- // now enable/disable requested robs and modules from OKS
- if ( !reinitialiseInternalFromOKS() ) {
- ATH_MSG_WARNING( " could not enable robs from OKS " );
- }
-
- if ( !reinitialiseInternal() ) {
- ATH_MSG_WARNING( " could not disable requested detector elements " );
- }
-
- m_enabledDetectors.emplace_back("Inner");
-
- m_errorFlag |= errorFlag;
-
- return errorFlag;
+ ATH_MSG_INFO( " Initialising Inner Detector maps - no longer used" );
+ return true;
}
@@ -823,22 +621,14 @@ void RegSelSvc::getRoIData(DETID detectorID,
}
modules.clear();
- // std::cout << "RegSelSvc::getRoIData()" << detectorID << std::endl;
-
RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel) m_newpixel->getRoIData( selroi, modules );
- break;
- }
- case SCT: { // Semiconductor Tracker
- if ( m_newsct ) m_newsct->getRoIData( selroi, modules );
- break;
- }
- case TRT: { // TRT
- if ( m_newtrt ) m_newtrt->getRoIData( selroi, modules );
+ case PIXEL:
+ case SCT:
+ case TRT: {
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case RPC: { // RPC (obviously)
@@ -883,12 +673,11 @@ void RegSelSvc::DetHashIDList(DETID detectorID,
const IRoiDescriptor& roi,
std::vector<IdentifierHash>& IDList)
{
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
if ( roi.composite() ) {
for ( unsigned iroi=roi.size() ; iroi-- ; ) {
DetHashIDList( detectorID, *(roi.at(iroi)), IDList );
- // std::cout << "DetHashIDList:: SuperRoi memeber " << iroi << " IDList.size() " << IDList.size() << *roi.at(iroi) << std::endl;
+
}
if ( roi.size()>1 ) RegSelSiLUT::removeDuplicates( IDList );
return;
@@ -911,19 +700,10 @@ void RegSelSvc::DetHashIDList(DETID detectorID,
switch(detectorID){
- case PIXEL: { // Pixel
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newpixel ) m_newpixel->getHashList(selroi, IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newsct ) m_newsct->getHashList(selroi, IDList);
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT (obviously)
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newtrt ) m_newtrt->getHashList(selroi, IDList);
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: { // etc
@@ -994,8 +774,6 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer,
const IRoiDescriptor& roi,
std::vector<IdentifierHash>& IDList)
{
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
-
if ( roi.composite() ) {
for ( unsigned iroi=roi.size() ; iroi-- ; ) {
DetHashIDList( detectorID, layer, *(roi.at(iroi)), IDList );
@@ -1022,19 +800,10 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer,
long sampling = layer;
switch(detectorID){
- case PIXEL: { // Pixel
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newpixel ) m_newpixel->getHashList(selroi, layer, IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newsct ) m_newsct->getHashList(selroi, layer, IDList);
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT (obviously)
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newtrt ) m_newtrt->getHashList(selroi, layer, IDList);
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: {
@@ -1106,7 +875,6 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer,
void RegSelSvc::DetHashIDList(DETID detectorID,
std::vector<IdentifierHash>& IDList )
{
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
if(IDList.size()!=0 ){
ATH_MSG_VERBOSE( " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID );
@@ -1115,16 +883,10 @@ void RegSelSvc::DetHashIDList(DETID detectorID,
IDList.clear();
switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList(IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getHashList(IDList);
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList(IDList);
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: {
@@ -1194,7 +956,6 @@ void RegSelSvc::DetHashIDList(DETID detectorID,
void RegSelSvc::DetHashIDList(DETID detectorID, long layer,
std::vector<IdentifierHash>& IDList)
{
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
if(IDList.size()!=0 ){
ATH_MSG_VERBOSE( " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID );
@@ -1205,16 +966,10 @@ void RegSelSvc::DetHashIDList(DETID detectorID, long layer,
long sampling = layer;
switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList( layer, IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker
- if ( m_newsct ) m_newsct->getHashList( layer, IDList);
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList( layer, IDList);
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: {
@@ -1284,7 +1039,6 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID,
setDuplicateRemoval( false );
for ( unsigned iroi=roi.size() ; iroi-- ; ) {
DetROBIDListUint( detectorID, *(roi.at(iroi)), outputROBIDList );
- // std::cout << "DetROBIDListUint:: SuperRoi memeber " << iroi << " outputROBIDList.size() " << outputROBIDList.size() << std::endl;
}
RegSelSiLUT::removeDuplicates( outputROBIDList );
setDuplicateRemoval( true );
@@ -1293,8 +1047,6 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID,
if ( roi.isFullscan() ) return DetROBIDListUint( detectorID, outputROBIDList );
- // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl;
-
if(outputROBIDList.size()!=0 ){
ATH_MSG_VERBOSE( " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID );
}
@@ -1313,19 +1065,10 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID,
switch (detectorID) {
- case PIXEL: { // Pixel
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newpixel ) m_newpixel->getRobList(selroi, outputROBIDList, m_duplicateRemoval );
- break;
- }
- case SCT: { // SCT
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newsct ) m_newsct->getRobList(selroi, outputROBIDList, m_duplicateRemoval );
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newtrt ) m_newtrt->getRobList(selroi, outputROBIDList, m_duplicateRemoval );
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: {
@@ -1395,8 +1138,6 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer,
const IRoiDescriptor& roi,
std::vector<uint32_t>& outputROBIDList)
{
- // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl;
-
if ( roi.composite() ) {
setDuplicateRemoval(false);
for ( unsigned iroi=roi.size() ; iroi-- ; ) {
@@ -1425,19 +1166,10 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer,
long sampling = layer;
switch (detectorID) {
- case PIXEL: { // Pixel
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newpixel ) m_newpixel->getRobList(selroi, layer, outputROBIDList, m_duplicateRemoval );
- break;
- }
- case SCT: { // SCT
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newsct ) m_newsct->getRobList(selroi, layer, outputROBIDList, m_duplicateRemoval );
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT
- RegSelRoI selroi( roi.zedMinus(), roi.zedPlus(), roi.phiMinus(), roi.phiPlus(), roi.etaMinus(), roi.etaPlus() );
- if ( m_newtrt ) m_newtrt->getRobList(selroi, layer, outputROBIDList, m_duplicateRemoval );
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: {
@@ -1510,16 +1242,10 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID,
outputROBIDList.clear();
switch (detectorID) {
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobList(outputROBIDList);
- break;
- }
- case SCT: { // SCT
- if ( m_newsct ) m_newsct->getRobList(outputROBIDList);
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT
- if ( m_newtrt ) m_newtrt->getRobList(outputROBIDList);
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: {
@@ -1577,8 +1303,6 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID,
void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer,
std::vector<uint32_t>& outputROBIDList)
{
- // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl;
-
if(outputROBIDList.size()!=0 ){
ATH_MSG_VERBOSE( " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID );
}
@@ -1587,16 +1311,10 @@ void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer,
long sampling = layer;
switch (detectorID) {
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobList( layer, outputROBIDList );
- break;
- }
- case SCT: { // SCT
- if ( m_newsct ) m_newsct->getRobList( layer, outputROBIDList );
- break;
- }
+ case PIXEL:
+ case SCT:
case TRT: { // TRT
- if ( m_newtrt ) m_newtrt->getRobList( layer, outputROBIDList );
+ ATH_MSG_ERROR( "RegSelSvc: should no longer be called for ID: " << detectorID );
break;
}
case MDT: {
@@ -2168,63 +1886,21 @@ void RegSelSvc::printTable(const RegionSelectorLUT * lut){
}
}
-void RegSelSvc::DisableSiRobList(const std::vector<uint32_t>& RobIdList) {
- // if the list of robs to disable is not empty...
- if ( RobIdList.size()>0 ) {
- // check the look up tables actually already exist before
- // trying to disable the robs from them
- if ( m_newpixel ) m_newpixel->disableRobList(RobIdList);
- if ( m_newsct ) m_newsct->disableRobList(RobIdList);
- if ( m_newtrt ) m_newtrt->disableRobList(RobIdList);
- }
+void RegSelSvc::DisableSiRobList(const std::vector<uint32_t>& /* RobIdList */ ) {
}
-void RegSelSvc::DisablePixelHashList(const std::vector<unsigned int>& HashList) {
- // if the list of hashids to disable is not empty...
- if ( HashList.size()>0 ) {
- // check the look up tables actually already exist before
- // trying to disable the modules from them
-
- std::vector<IdentifierHash> hashlist;
- for ( std::vector<unsigned int>::const_iterator hptr(HashList.begin()) ;
- hptr!=HashList.end() ; hptr ++ ) hashlist.emplace_back(*hptr);
-
- if ( m_newpixel ) m_newpixel->disableModuleList(hashlist);
- }
+void RegSelSvc::DisablePixelHashList(const std::vector<unsigned int>& /* HashList */ ) {
}
-void RegSelSvc::DisableSCTHashList(const std::vector<unsigned int>& HashList) {
- // if the list of hashids to disable is not empty...
- if ( HashList.size()>0 ) {
- // check the look up tables actually already exist before
- // trying to disable the modules from them
- std::vector<IdentifierHash> hashlist;
- for ( std::vector<unsigned int>::const_iterator hptr(HashList.begin()) ;
- hptr!=HashList.end() ; hptr ++ ) hashlist.emplace_back(*hptr);
- if ( m_newsct ) m_newsct->disableModuleList(hashlist);
- }
+void RegSelSvc::DisableSCTHashList(const std::vector<unsigned int>& /* HashList */ ) {
}
-void RegSelSvc::DisableTRTHashList(const std::vector<unsigned int>& HashList) {
- // if the list of hashids to disable is not empty...
- if ( HashList.size()>0 ) {
- // check the look up tables actually already exist before
- // trying to disable the modules from them
- std::vector<IdentifierHash> hashlist;
- for ( std::vector<unsigned int>::const_iterator hptr(HashList.begin()) ;
- hptr!=HashList.end() ; hptr ++ ) hashlist.emplace_back(*hptr);
- if ( m_newtrt ) m_newtrt->disableModuleList(hashlist);
- }
+void RegSelSvc::DisableTRTHashList(const std::vector<unsigned int>& /* HashList*/ ) {
}
void RegSelSvc::RestoreSiRobList() {
- // check the look up tables actually already exist before
- // trying to disable the robs from them
- if ( m_newpixel ) m_newpixel->enableRobs();
- if ( m_newsct ) m_newsct->enableRobs();
- if ( m_newtrt ) m_newtrt->enableRobs();
}
@@ -2240,33 +1916,6 @@ StatusCode RegSelSvc::reinitialize() {
// ids from oks and enable the modules corresponding to the
// specified robs
bool RegSelSvc::reinitialiseInternalFromOKS() {
-
- // don't disable anything if not initialising from oks
- if ( m_readSiROBListFromOKS.value()==false ) return true;
-
- if ( m_initPixel.value() ) {
- // disable everything
- m_newpixel->disableRobs();
-
- // enable the robs from OKS
- m_newpixel->enableRobList(m_enabledROBs.value());
- }
-
- if ( m_initSCT.value() ) {
- m_newsct->disableRobs();
-
- // enable robs from list for pixel and sct
- m_newsct->enableRobList(m_enabledROBs.value());
- }
-
- if ( m_initTRT.value() ) {
- // disable everything
- m_newtrt->disableRobs();
-
- // enable the robs from OKS
- m_newtrt->enableRobList(m_enabledROBs.value());
- }
-
return true;
}
@@ -2275,69 +1924,6 @@ bool RegSelSvc::reinitialiseInternalFromOKS() {
bool RegSelSvc::reinitialiseInternal() {
-
- // NB: the conditions summary service names, and probably the services
- // themselves should be setable from a job option, but why make
- // life even more complicated with configurability that may never
- // be used. If it needs it, it can easily be added
-
- // now handle all the disabling for the pixel ...
- if ( m_initPixel.value() ) {
-
- // first disable modules from the conditions summary services
- // if ( m_disableFromConditions ) disableIDFromConditions(m_newpixel, "PixelConditionsSummarySvc");
- if ( m_disableFromConditions && m_disablePixelFromConditions ) disableIDFromConditions(m_newpixel, m_PixConditionsTool);
-
- // now *disable* the modules from robs the user has flagged
- if ( m_deleteRobList.size() ) m_newpixel->disableRobList(m_deleteRobList);
-
- // and disable any other modules from the module list
- // have to convert the std::vector<unsigned int> into std::vector<IdentifierHash>
- std::vector<IdentifierHash> hashlist;
- for ( std::vector<unsigned int>::const_iterator hptr(m_deletePixelHashList.begin()) ;
- hptr!=m_deletePixelHashList.end() ; hptr ++ ) hashlist.emplace_back(*hptr);
-
- if ( m_deletePixelHashList.size() ) m_newpixel->disableModuleList(hashlist);
- }
-
- // and now handle all the disabling for the sct ...
- if ( m_initSCT.value() ) {
-
- // first disable modules from the conditions summary tool
- if ( m_disableFromConditions && m_disableSCTFromConditions ) disableIDFromConditions(m_newsct, m_SCTConditionsTool);
-
- // now *disable* the modules from robs the user has flagged
- if ( m_deleteRobList.size() ) m_newsct->disableRobList(m_deleteRobList);
-
- // and disable any other modules from the module list
- // have to convert the std::vector<unsigned int> into std::vector<IdentifierHash>
- std::vector<IdentifierHash> hashlist;
- for ( std::vector<unsigned int>::const_iterator hptr(m_deleteSCTHashList.begin()) ;
- hptr!=m_deleteSCTHashList.end() ; hptr ++ ) hashlist.emplace_back(*hptr);
-
- if ( m_deleteSCTHashList.size() ) m_newsct->disableModuleList(hashlist);
- }
-
- // and now handle all the disabling for the trt ...
- if ( m_initTRT.value() ) {
-
- // first disable modules from the conditions summary services
- // if ( m_disableFromConditions ) disableIDFromConditions(m_newtrt, "TRT_ConditionsSummarySvc");
- if ( m_disableFromConditions && m_disableTRTFromConditions ) disableIDFromConditions(m_newtrt, m_TRTConditionsSvc);
-
- // now *disable* the modules from robs the user has flagged
- if ( m_deleteRobList.size() ) m_newtrt->disableRobList(m_deleteRobList);
-
- // and disable any other modules from the module list
- // have to convert the std::vector<unsigned int> into std::vector<IdentifierHash>
- std::vector<IdentifierHash> hashlist;
- for ( std::vector<unsigned int>::const_iterator hptr(m_deleteTRTHashList.begin()) ;
- hptr!=m_deleteTRTHashList.end() ; hptr ++ ) hashlist.emplace_back(*hptr);
-
- if ( m_deleteTRTHashList.size() ) m_newtrt->disableModuleList(hashlist);
- }
-
-
return true;
}
diff --git a/DetectorDescription/RegionSelector/src/obsolete.h b/DetectorDescription/RegionSelector/src/obsolete.h
deleted file mode 100644
index 35d3604ff2444cf45d8f09ad4f3e89af65773381..0000000000000000000000000000000000000000
--- a/DetectorDescription/RegionSelector/src/obsolete.h
+++ /dev/null
@@ -1,178 +0,0 @@
-// emacs: this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////////
-/// obsolete methods DO NOT USE
-///////////////////////////////////////////////////////////////////////
-
-
-public:
-
- /// obsolete HashID methods
-
- void DetHashIDList(DETID detectorID,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList );
-
- // inner detector
- void DetHashIDList(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList);
-
-
- void DetHashIDList(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- double xBeam, double yBeam,
- std::vector<IdentifierHash>* IDList);
-
-
- void DetHashIDList(DETID detectorID,
- const IRoiDescriptor& roi,
- std::vector<IdentifierHash>* IDList);
-
- // inner detector layer
- void DetHashIDList(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList);
-
- void DetHashIDList(DETID detectorID, long layer,
- const IRoiDescriptor& roi,
- std::vector<IdentifierHash>* IDList);
-
- // inner detector full scan
- void DetHashIDList(DETID detectorID,
- std::vector<IdentifierHash>* IDList );
-
- // calorimeter
- void DetHashIDList(DETID detectorID, long sampling,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList);
-
- // muon
- void DetHashIDList(DETID detectorID, TYPEID typeID,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList);
-
-
-
- /// obsolete rob identifier methods
-
- void DetROBIDListUint(DETID detectorID,
- double etaMin,double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList);
-
- // inner detector
- void DetROBIDListUint(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList);
-
-
- void DetROBIDListUint(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- double xBeam, double yBeam,
- std::vector<uint32_t>& outputROBIDList);
-
-
- // inner detector by layer
- void DetROBIDListUint(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList);
-
-
-
- // calorimeter
- void DetROBIDListUint(DETID detectorID, long sampling,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList);
-
-
-
-
-
- // Combined inner detector rob id and hash id methods
-
- void DetROBHashIDList(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash>* IDList );
-
- void DetROBHashIDList(DETID detectorID,
- const IRoiDescriptor& roi,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash>* IDList);
-
-
- // inner detector layer
- void DetROBHashIDList(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash>* IDList);
-
- void DetROBHashIDList(DETID detectorID, long layer,
- const IRoiDescriptor& roi,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash>* IDList);
-
- // inner detector full scan
- void DetROBHashIDList(DETID detectorID,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash>* IDList );
-
-
-
-
-
-
- // Find disabled inner detector modules from a layer
- void DetDisabledHashIDList(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList);
-
-#if 0
- void DetDisabledHashIDList(DETID detectorID, long layer,
- const IRoiDescriptor& roi,
- std::vector<IdentifierHash>* IDList);
-#endif
-
-
- void getDisabledLayers(DETID detectorID,
- int subdetector,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<int>& layers);
-
- void getDisabledLayers(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<int>& barrellayers,
- std::vector<int>& endAlayers,
- std::vector<int>& endClayers );
-
diff --git a/DetectorDescription/RegionSelector/src/obsolete.icc b/DetectorDescription/RegionSelector/src/obsolete.icc
deleted file mode 100644
index dea79b16ab50f3780a0bcc580cb0e6b379b012ae..0000000000000000000000000000000000000000
--- a/DetectorDescription/RegionSelector/src/obsolete.icc
+++ /dev/null
@@ -1,1594 +0,0 @@
-// emacs: this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////////
-/// obsolete HashID methods
-///////////////////////////////////////////////////////////////////////
-
-
-// calorimeter
-
-void RegSelSvc::DetROBIDListUint(DETID detectorID,
- long sampling,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList) {
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if ( !checkinput(etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
-
- switch(detectorID){
- case PIXEL:
- case SCT:
- return DetROBIDListUint(detectorID, sampling, -m_DeltaZ, m_DeltaZ, etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- break;
- case TRT:
- break;
- case LAR: // Liquid Argon Calorimeter
- verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax);
- m_larData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "LAR verifyOutput" << endmsg; larData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case TTEM: // Liquid Argon Trigger Tower EM Calorimeter
- verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax);
- m_ttemData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "TTEM verifyOutput" << endmsg; ttemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter
- verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax);
- m_tthecData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "TTHEC verifyOutput" << endmsg; tthecData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case FCALEM: // Liquid Argon Trigger Tower FCALEM Calorimeter
- verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalemData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "FCALEM verifyOutput" << endmsg; ttfcalemData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case FCALHAD: // Liquid Argon Trigger Tower FCALHAD Calorimeter
- verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalhadData.regionSelectorRobIdUint(sampling, etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endmsg; ttfcalhadData.verifyOutput(ROBID, sampling, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case TILE: // Tile Calorimeters
- break;
- case MDT: // MDT Calorimeter
- break;
- case RPC: // RPC Calorimeters
- break;
- case TGC: // TGC Calorimeters
- break;
- case CSC: // CSC Calorimeters
- break;
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID
- << " got " << outputROBIDList.size() << " ROB IDs" << endmsg;
- }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// Combiner inner detector rob id and hash id methods
-
-void RegSelSvc::DetROBHashIDList(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash> *IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl;
-
- // if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " This method is obsolete - please replace" << endmsg;
-
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobHashList(roi, outputROBIDList, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getRobHashList(roi, outputROBIDList, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getRobHashList(roi, outputROBIDList, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-
-#if 1
-void RegSelSvc::DetROBHashIDList(DETID detectorID,
- const IRoiDescriptor& roi,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash> *IDList)
-{
- // std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl;
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- RegSelRoI _roi( roi.zedMinus(), roi.zedPlus(),
- roi.phiMinus(), roi.phiPlus(),
- roi.etaMinus(), roi.etaPlus() );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobHashList(_roi, outputROBIDList, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getRobHashList(_roi, outputROBIDList, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getRobHashList(_roi, outputROBIDList, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-#endif
-
-
-
-
-// inner detector by layer
-
-void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash> *IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobHashList(roi, layer, outputROBIDList, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getRobHashList(roi, layer, outputROBIDList, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getRobHashList(roi, layer, outputROBIDList, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-#if 1
-void RegSelSvc::DetROBHashIDList(DETID detectorID, long layer,
- const IRoiDescriptor& roi,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash> *IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetROBHashIDList() new map " << detectorID << std::endl;
-
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- RegSelRoI _roi( roi.zedMinus(), roi.zedPlus(),
- roi.phiMinus(), roi.phiPlus(),
- roi.etaMinus(), roi.etaPlus() );
-
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobHashList(_roi, layer, outputROBIDList, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getRobHashList(_roi, layer, outputROBIDList, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getRobHashList(_roi, layer, outputROBIDList, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-#endif
-
-
-
-// inner detector full scan
-
-void RegSelSvc::DetROBHashIDList(DETID detectorID,
- std::vector<uint32_t>& outputROBIDList,
- std::vector<IdentifierHash>* IDList )
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- switch (detectorID) {
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobHashList(outputROBIDList, *IDList);
- break;
- }
- case SCT: { // SCT
- if ( m_newsct ) m_newsct->getRobHashList(outputROBIDList, *IDList);
- break;
- }
- case TRT: { // TRT
- if ( m_newtrt ) m_newtrt->getRobHashList(outputROBIDList, *IDList);
- break;
- }
- default:
- break;
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-// methods to return the list of disabled modules from the inner
-// within and roi in a given layer
-
-void RegSelSvc::DetDisabledHashIDList(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetDisabledHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getDisabledHashList(roi, layer, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getDisabledHashList(roi, layer, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getDisabledHashList(roi, layer, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetDisabledHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-
-
-void RegSelSvc::getDisabledLayers(DETID detectorID,
- int subdetector,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<int>& layers)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && layers.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input layers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- layers.clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getDisabledLayers(roi, subdetector, layers);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getDisabledLayers(roi, subdetector, layers);
- break;
- }
- default:
- break;
- }
-
-}
-
-
-
-void RegSelSvc::getDisabledLayers(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<int>& barrellayers,
- std::vector<int>& endAlayers,
- std::vector<int>& endClayers)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && barrellayers.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input barrellayers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- barrellayers.clear();
-
-
- if(m_msgOutputLevel <= MSG::DEBUG && endAlayers.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input endAlayers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- endAlayers.clear();
-
- if(m_msgOutputLevel <= MSG::DEBUG && endClayers.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input endClayers vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- endClayers.clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) {
- m_newpixel->getDisabledLayers(roi, 0, barrellayers);
- m_newpixel->getDisabledLayers(roi, -2, endAlayers);
- m_newpixel->getDisabledLayers(roi, 2, endClayers);
- }
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) {
- m_newsct->getDisabledLayers(roi, 0, barrellayers);
- m_newsct->getDisabledLayers(roi, -2, endAlayers);
- m_newsct->getDisabledLayers(roi, 2, endClayers);
- }
- break;
- }
- default:
- break;
- }
-
-}
-
-
-
-
-
-#if 0
-void RegSelSvc::DetDisabledHashIDList(DETID detectorID, long layer,
- const IRoiDescriptor& roi,
- std::vector<IdentifierHash>* IDList)
-{
- // std::cout << "RegSelSvc::DetDisabledHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- RegSelRoI _roi( roi.zedMinus(), roi.zedPlus(),
- roi.phiMinus(), roi.phiPlus(),
- roi.etaMinus(), roi.etaPlus() );
-
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getDisabledHashList(_roi, layer, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getDisabledHashList(_roi, layer, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getDisabledHashList(_roi, layer, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetDisabledHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-#endif
-
-
-
-
-
-// old Region Selector interface
-
-void RegSelSvc::DetHashIDList(DETID detectorID,
- double etaMin,double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash>* IDList) {
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg;
-
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- switch(detectorID){
- case PIXEL:
- case SCT:
- case TRT:
- case MDT:
- case RPC:
- case TGC:
- case CSC:
- return DetHashIDList(detectorID, -m_DeltaZ, m_DeltaZ, etaMin, etaMax, phiMin, phiMax, IDList);
- break;
- case LAR: // Liquid Argon Calorimeter
- verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax);
- m_larData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "LAR hashID verifyOutput" << endmsg; larDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case TTEM: // Liquid Argon Trigger Tower EM Calorimeter
- verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax);
- m_ttemData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "TTEM hashID verifyOutput" << endmsg; ttemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter
- verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax);
- m_tthecData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endmsg; tthecDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case FCALEM: // Liquid Argon Trigger Tower HEC Calorimeter
- verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalemData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endmsg; ttfcalemDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case FCALHAD: // Liquid Argon Trigger Tower HEC Calorimeter
- verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalhadData.regionSelector(etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "TTHEC hashID verifyOutput" << endmsg; ttfcalhadDataIdentHash.verifyOutput(etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case TILE: // Tile Calorimeters
- verifyInputs(TILE, etaMin, etaMax, phiMin, phiMax);
- m_tileData.regionSelector(TILE,etaMin, etaMax, phiMin, phiMax,(*IDList));
- break;
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-
-
-
-// detector with new lookup tables
-
-void RegSelSvc::DetHashIDList(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash> *IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg;
-
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList(roi, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getHashList(roi, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList(roi, *IDList);
- break;
- }
- case RPC: { // RPC (obviously)
- if ( m_newrpc ) m_newrpc->getHashList(roi, *IDList);
- break;
- }
- case MDT: { // MDT (obviously)
- if ( m_newmdt ) m_newmdt->getHashList(roi, *IDList);
- break;
- }
- case TGC: { // TGC (obviously)
- if ( m_newtgc ) m_newtgc->getHashList(roi, *IDList);
- break;
- }
- case CSC: { // CSC (obviously)
- if ( m_newcsc ) m_newcsc->getHashList(roi, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-
-
-
-
-void RegSelSvc::DetHashIDList(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- double xBeam, double yBeam,
- std::vector<IdentifierHash> *IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg;
-
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList(roi, *IDList, xBeam, yBeam );
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getHashList(roi, *IDList, xBeam, yBeam );
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList(roi, *IDList, xBeam, yBeam );
- break;
- }
- case MDT: {
- if ( m_newmdt ) m_newmdt->getHashList(roi, *IDList, xBeam, yBeam );
- break;
- }
- case RPC: {
- if ( m_newrpc ) m_newrpc->getHashList(roi, *IDList, xBeam, yBeam );
- break;
- }
- case TGC: {
- if ( m_newtgc ) m_newtgc->getHashList(roi, *IDList, xBeam, yBeam );
- break;
- }
- case CSC: {
- if ( m_newcsc ) m_newcsc->getHashList(roi, *IDList, xBeam, yBeam );
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-
-#if 1
-void RegSelSvc::DetHashIDList(DETID detectorID,
- const IRoiDescriptor& roi,
- std::vector<IdentifierHash> *IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if ( roi.isFullscan() ) return DetHashIDList( detectorID, IDList );
-
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
-
- // if(m_msgOutputLevel <= MSG::WARNING )
- // (*m_log) << MSG::WARNING << " THIS METHOD IS OBSOLETE - PLEASE REPLACE" << endmsg;
-
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- RegSelRoI _roi( roi.zedMinus(), roi.zedPlus(),
- roi.phiMinus(), roi.phiPlus(),
- roi.etaMinus(), roi.etaPlus() );
-
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList(_roi, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getHashList(_roi, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList(_roi, *IDList);
- break;
- }
- case MDT: {
- if ( m_newmdt ) m_newmdt->getHashList(_roi, *IDList);
- break;
- }
- case RPC: {
- if ( m_newrpc ) m_newrpc->getHashList(_roi, *IDList);
- break;
- }
- case TGC: {
- if ( m_newtgc ) m_newtgc->getHashList(_roi, *IDList);
- break;
- }
- case CSC: {
- if ( m_newcsc ) m_newcsc->getHashList(_roi, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-
-// detector by layer
-
-void RegSelSvc::DetHashIDList(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<IdentifierHash> *IDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList(roi, layer, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker
- if ( m_newsct ) m_newsct->getHashList(roi, layer, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList(roi, layer, *IDList);
- break;
- }
- case MDT: {
- if ( m_newmdt ) m_newmdt->getHashList(roi, layer, *IDList);
- break;
- }
- case RPC: {
- if ( m_newrpc ) m_newrpc->getHashList(roi, layer, *IDList);
- break;
- }
- case TGC: {
- if ( m_newtgc ) m_newtgc->getHashList(roi, layer, *IDList);
- break;
- }
- case CSC: {
- if ( m_newcsc ) m_newcsc->getHashList(roi, layer, *IDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-void RegSelSvc::DetHashIDList(DETID detectorID, long layer,
- const IRoiDescriptor& roi,
- std::vector<IdentifierHash> *IDList)
-{
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if ( roi.isFullscan() ) return DetHashIDList( detectorID, layer, *IDList );
-
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- RegSelRoI _roi( roi.zedMinus(), roi.zedPlus(),
- roi.phiMinus(), roi.phiPlus(),
- roi.etaMinus(), roi.etaPlus() );
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList(_roi, layer, *IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker
- if ( m_newsct ) m_newsct->getHashList(_roi, layer, *IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList(_roi, layer, *IDList);
- break;
- }
- case MDT: {
- if ( m_newmdt ) m_newmdt->getHashList(_roi, layer, *IDList);
- break;
- }
- case RPC: {
- if ( m_newrpc ) m_newrpc->getHashList(_roi, layer, *IDList);
- break;
- }
- case TGC: {
- if ( m_newtgc ) m_newtgc->getHashList(_roi, layer, *IDList);
- break;
- }
- case CSC: {
- if ( m_newcsc ) m_newcsc->getHashList(_roi, layer, *IDList);
- break;
- }
- default:
- break;
- }
-
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-#endif
-
-
-
-
-
-
-
-
-// detector full scan
-
-void RegSelSvc::DetHashIDList(DETID detectorID,
- std::vector<IdentifierHash>* IDList )
-{
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetHashIDList() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- switch(detectorID){
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getHashList(*IDList);
- break;
- }
- case SCT: { // Semiconductor Tracker (and pixel)
- if ( m_newsct ) m_newsct->getHashList(*IDList);
- break;
- }
- case TRT: { // TRT (obviously)
- if ( m_newtrt ) m_newtrt->getHashList(*IDList);
- break;
- }
- case MDT: {
- if ( m_newmdt ) m_newmdt->getHashList(*IDList);
- break;
- }
- case RPC: {
- if ( m_newrpc ) m_newrpc->getHashList(*IDList);
- break;
- }
- case TGC: {
- if ( m_newtgc ) m_newtgc->getHashList(*IDList);
- break;
- }
- case CSC: {
- if ( m_newcsc ) m_newcsc->getHashList(*IDList);
- break;
- }
- default:
- break;
- }
-}
-
-
-
-
-
-// calorimeter
-
-void RegSelSvc::DetHashIDList(DETID detectorID,
- long sampling,
- double etaMin, double etaMax ,
- double phiMin, double phiMax,
- std::vector<IdentifierHash> *IDList) {
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
-
- switch(detectorID){
- case PIXEL:
- case SCT:
- case TRT:
- case MDT:
- case RPC:
- case TGC:
- case CSC:
- return DetHashIDList(detectorID, sampling, -m_DeltaZ, m_DeltaZ, etaMin, etaMax, phiMin, phiMax, IDList);
- break;
- case LAR: // Liquid Argon Calorimeter
- verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax);
- m_larData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "LAR hashID verifyOutput sampling " << sampling << endmsg; larDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case TTEM: // Liquid Argon Trigger Tower EM Calorimeter
- verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax);
- m_ttemData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "TTEM hashID verifyOutput sampling " << sampling << endmsg; ttemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter
- verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax);
- m_tthecData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "TTEC hashID verifyOutput sampling " << sampling << endmsg; tthecDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case FCALEM: // Liquid Argon Trigger Tower FCALEM Calorimeter
- verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalemData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "FCALEM hashID verifyOutput sampling " << sampling << endmsg; ttfcalemDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case FCALHAD: // Liquid Argon Trigger Tower FCALHAD Calorimeter
- verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalhadData.regionSelector(sampling, etaMin, etaMax, phiMin, phiMax,(*IDList));
- //log<< MSG::DEBUG << "FCALHAD hashID verifyOutput sampling " << sampling << endmsg; ttfcalhadDataIdentHash.verifyOutput(sampling,etaMin, etaMax, phiMin, phiMax,IDList);
- break;
- case TILE: // Tile Calorimeters
- break;
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-// muon
-
-void RegSelSvc::DetHashIDList(DETID detectorID,
- TYPEID typeID,
- double etaMin, double etaMax ,
- double phiMin, double phiMax,
- std::vector<IdentifierHash> *IDList)
-{
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && IDList->size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input IDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- IDList->clear();
-
- if ( !checkinput(etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- if ( detectorID==MDT ) {
- long layer = typeID;
- DetHashIDList(detectorID, layer, -m_DeltaZ, m_DeltaZ, etaMin, etaMax, phiMin, phiMax, IDList);
- }
-
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetHashIDList for detector " << detectorID
- << " got " << IDList->size() << " hash IDs" << endmsg;
- }
-
-}
-
-
-
-
-
-// Methods to retrieve the rob is list
-
-// old region selector interface
-
-void RegSelSvc::DetROBIDListUint(DETID detectorID,
- double etaMin, double etaMax ,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if ( !checkinput(etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
-
- switch(detectorID){
- case PIXEL:
- case SCT:
- case TRT:
- return DetROBIDListUint(detectorID, -m_DeltaZ, m_DeltaZ, etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- break;
- case LAR: // Liquid Argon Calorimeter
- verifyInputs(LAR, etaMin, etaMax, phiMin, phiMax);
- m_larData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "LAR verifyOutput" << endmsg; larData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case TTEM: // Liquid Argon Trigger Tower EM Calorimeter
- verifyInputs(TTEM, etaMin, etaMax, phiMin, phiMax);
- m_ttemData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "TTEM verifyOutput" << endmsg; ttemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case TTHEC: // Liquid Argon Trigger Tower HEC Calorimeter
- verifyInputs(TTHEC, etaMin, etaMax, phiMin, phiMax);
- m_tthecData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "TTHEC verifyOutput" << endmsg; tthecData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case FCALEM: // Liquid Argon Trigger Tower FCALEM Calorimeter
- verifyInputs(FCALEM, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalemData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "FCALEM verifyOutput" << endmsg; ttfcalemData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case FCALHAD: // Liquid Argon Trigger Tower FCALHAD Calorimeter
- verifyInputs(FCALHAD, etaMin, etaMax, phiMin, phiMax);
- m_ttfcalhadData.regionSelectorRobIdUint(etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- //log<< MSG::DEBUG << "FCALHAD verifyOutput" << endmsg; ttfcalhadData.verifyOutput(ROBID, etaMin, etaMax, phiMin, phiMax,outputROBIDList);
- break;
- case TILE: // Tile Calorimeters
- verifyInputs(TILE, etaMin, etaMax, phiMin, phiMax);
- m_tileData.regionSelectorRobIdUint(TILE,etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- break;
- case MDT: // MDT Calorimeter
- //verifyInputs(MDT, etaMin, etaMax, phiMin, phiMax);
- //m_mdtData.regionSelectorRobIdUint(MDT,etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- break;
- case RPC: // RPC Calorimeters
- //verifyInputs(RPC, etaMin, etaMax, phiMin, phiMax);
- //m_rpcData.regionSelectorRobIdUint(RPC,etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- break;
- case TGC: // TGC Calorimeters
- //verifyInputs(TGC, etaMin, etaMax, phiMin, phiMax);
- //m_tgcData.regionSelectorRobIdUint(TGC,etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- break;
- case CSC: // CSC Calorimeters
- //verifyInputs(CSC, etaMin, etaMax, phiMin, phiMax);
- //m_cscData.regionSelectorRobIdUint(CSC,etaMin, etaMax, phiMin, phiMax, outputROBIDList);
- break;
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID
- << " got " << outputROBIDList.size() << " ROB IDs" << endmsg;
- }
-
-}
-
-
-
-
-// inner detector
-
-void RegSelSvc::DetROBIDListUint(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
-
- switch (detectorID) {
- case PIXEL: { // Pixel
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
- if ( m_newpixel ) m_newpixel->getRobList(roi, outputROBIDList);
- break;
- }
- case SCT: { // SCT
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
- if ( m_newsct ) m_newsct->getRobList(roi, outputROBIDList);
- break;
- }
- case TRT: { // TRT
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
- if ( m_newtrt ) m_newtrt->getRobList(roi, outputROBIDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID
- << " got " << outputROBIDList.size() << " ROB IDs" << endmsg;
- }
-
-}
-
-
-
-
-
-void RegSelSvc::DetROBIDListUint(DETID detectorID,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- double xBeam, double yBeam,
- std::vector<uint32_t>& outputROBIDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
-
- switch (detectorID) {
- case PIXEL: { // Pixel
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
- if ( m_newpixel ) m_newpixel->getRobList(roi, outputROBIDList, xBeam, yBeam );
- break;
- }
- case SCT: { // SCT
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
- if ( m_newsct ) m_newsct->getRobList(roi, outputROBIDList, xBeam, yBeam );
- break;
- }
- case TRT: { // TRT
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
- if ( m_newtrt ) m_newtrt->getRobList(roi, outputROBIDList, xBeam, yBeam );
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID
- << " got " << outputROBIDList.size() << " ROB IDs" << endmsg;
- }
-
-}
-
-
-
-// inner detector by layer
-
-void RegSelSvc::DetROBIDListUint(DETID detectorID, long layer,
- double zMin, double zMax,
- double etaMin, double etaMax,
- double phiMin, double phiMax,
- std::vector<uint32_t>& outputROBIDList)
-{
-
- static bool first = true;
- if ( first ) {
- first = false;
- (*m_log) << MSG::WARNING << __func__ << " - This method is obsolete DO NOT USE" << endmsg;
- }
-
- // std::cout << "RegSelSvc::DetROBIDListUint() new map " << detectorID << std::endl;
-
- if(m_msgOutputLevel <= MSG::DEBUG && outputROBIDList.size()!=0 ){
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " input outputROBIDList vector not empty for RegSelSvc call for detectorID " << detectorID << endmsg;
- }
- outputROBIDList.clear();
-
- if ( !checkinput(zMin, zMax, etaMin, etaMax, phiMin, phiMax) ) {
- if(m_msgOutputLevel <= MSG::WARNING )
- (*m_log) << MSG::WARNING << " bad roi parameter to regionselector"
- << "zMin=" << zMin << "\tzMax=" << zMax
- << "\tetaMin=" << etaMin << "\tetaMax=" << etaMax
- << "\tphiMin=" << phiMin << "\tphiMax=" << phiMax << endmsg;
-
- return;
- }
-
- RegSelRoI roi( zMin, zMax, phiMin, phiMax, etaMin, etaMax );
-
- switch (detectorID) {
- case PIXEL: { // Pixel
- if ( m_newpixel ) m_newpixel->getRobList(roi, layer, outputROBIDList);
- break;
- }
- case SCT: { // SCT
- if ( m_newsct ) m_newsct->getRobList(roi, layer, outputROBIDList);
- break;
- }
- case TRT: { // TRT
- if ( m_newtrt ) m_newtrt->getRobList(roi, layer, outputROBIDList);
- break;
- }
- default:
- break;
- }
-
- if(m_msgOutputLevel <= MSG::DEBUG){
- (*m_log) << MSG::DEBUG << "DetROBIDListUint for detector " << detectorID
- << " got " << outputROBIDList.size() << " ROB IDs" << endmsg;
- }
-
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamOutputSvc.h b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamOutputSvc.h
index 0871f3c65b408bc7dfd029e1fa961f9767a8066d..5d773c986ef7a985b72ecce2d12d7c137e296c23 100644
--- a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamOutputSvc.h
+++ b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamOutputSvc.h
@@ -1,28 +1,29 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
#ifndef BYTESTREAMCNVSVC_BYTESTREAMOUTPUTSVC_H
#define BYTESTREAMCNVSVC_BYTESTREAMOUTPUTSVC_H
/** @file ByteStreamOutputSvc.h
- * @brief This file contains the class definition for the ByteStreamOutputSvc class.
+ * @brief This file contains the class definition for the ByteStreamOutputSvcr
+ * class.
* @author Peter van Gemmeren <gemmeren@anl.gov>
* $Id: ByteStreamOutputSvc.h,v 1.51 2009-03-03 16:03:22 gemmeren Exp $
**/
#include "AthenaBaseComps/AthService.h"
-
#include "ByteStreamData/RawEvent.h"
-
#include "GaudiKernel/EventContext.h"
+#include <string>
+
+
/** @class ByteStreamOutputSvc
- * @brief This class provides the base class to services to write bytestream data.
- * The concrete class can provide Raw event to a file, transient store, or through network.
+ * @brief This class provides the base class to services to write bytestream
+ * data.
+ * The concrete class can provide RAW event to a file, transient store, or
+ * through network.
**/
class ByteStreamOutputSvc : public ::AthService {
-public:
+ public:
/// constructor
ByteStreamOutputSvc(const std::string& name, ISvcLocator* svcloc);
/// destructor
@@ -38,10 +39,12 @@ public:
virtual bool putEvent(RawEvent* re, const EventContext& ctx) = 0;
};
+
inline const InterfaceID& ByteStreamOutputSvc::interfaceID() {
- /// Declaration of the interface ID ( interface id, major version, minor version)
+ /// Declaration of the interface ID ( interface id, major version, minor
+ /// version)
static const InterfaceID IID_ByteStreamOutputSvc("ByteStreamOutputSvc", 1, 0);
return(IID_ByteStreamOutputSvc);
}
-#endif
+#endif // BYTESTREAMCNVSVC_BYTESTREAMOUTPUTSVC_H
diff --git a/Event/ByteStreamCnvSvc/CMakeLists.txt b/Event/ByteStreamCnvSvc/CMakeLists.txt
index 7ebfa49d91c177ddd53d9b51bba900a84074610e..91e915fd767a1365619d7a61ab2b5cb9498cde87 100644
--- a/Event/ByteStreamCnvSvc/CMakeLists.txt
+++ b/Event/ByteStreamCnvSvc/CMakeLists.txt
@@ -14,11 +14,11 @@ atlas_add_library( ByteStreamCnvSvcLib
ByteStreamCnvSvc/*.h src/*.cxx
PUBLIC_HEADERS ByteStreamCnvSvc
PRIVATE_INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps ByteStreamData GaudiKernel
+ LINK_LIBRARIES AthenaBaseComps ByteStreamData EventInfo GaudiKernel
ByteStreamCnvSvcBaseLib StoreGateLib rt
PRIVATE_LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${Boost_LIBRARIES}
AthenaKernel SGTools CollectionBase FileCatalog
- AthenaPoolUtilities PersistentDataModel EventInfo xAODEventInfo xAODTrigger
+ AthenaPoolUtilities PersistentDataModel xAODEventInfo xAODTrigger
ByteStreamCnvSvcLegacy )
atlas_add_component( ByteStreamCnvSvc
@@ -42,40 +42,40 @@ atlas_add_executable( AtlListBSEvents test/AtlListBSEvents.cxx
# Test(s) in the package:
atlas_add_test( BSEventSelector
- SCRIPT "athena.py ByteStreamCnvSvc/BSEventSelector_test_jobOptions.py"
+ SCRIPT "athena.py --threads 1 ByteStreamCnvSvc/BSEventSelector_test_jobOptions.py"
LOG_SELECT_PATTERN "ByteStream.*Svc" )
-atlas_add_test( AtlCopyBSEvent1_test
+atlas_add_test( AtlCopyBSEvent1
PRE_EXEC_SCRIPT "rm -f test.data"
SCRIPT "AtlCopyBSEvent -e 186882810,187403142,187404922,187419528 -o test.data /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"
- PROPERTIES DEPENDS ByteStreamCnvSvc_BSEventSelector_ctest )
+ PROPERTIES DEPENDS "ByteStreamCnvSvc_BSEventSelector_ctest")
-atlas_add_test( AtlFindBSEvent2_test
+atlas_add_test( AtlFindBSEvent2
SCRIPT "AtlFindBSEvent -e 187403142 test.data"
- PROPERTIES DEPENDS ByteStreamCnvSvc_AtlCopyBSEvent1_test_ctest )
+ PROPERTIES DEPENDS "ByteStreamCnvSvc_AtlCopyBSEvent1_ctest")
-atlas_add_test( AtlCopyBSEvent3_test
+atlas_add_test( AtlCopyBSEvent3
PRE_EXEC_SCRIPT "rm -f test_defl.data"
SCRIPT "AtlCopyBSEvent -d -e 186882810,187403142,187419528 -o test_defl.data test.data"
- PROPERTIES DEPENDS ByteStreamCnvSvc_AtlCopyBSEvent1_test_ctest )
+ PROPERTIES DEPENDS "ByteStreamCnvSvc_AtlCopyBSEvent1_ctest")
-atlas_add_test( AtlFindBSEvent4_test
+atlas_add_test( AtlFindBSEvent4
SCRIPT "AtlFindBSEvent -e 187403142 test_defl.data"
LOG_IGNORE_PATTERN "+Timestamp"
- PROPERTIES DEPENDS ByteStreamCnvSvc_AtlCopyBSEvent3_test_ctest )
+ PROPERTIES DEPENDS "ByteStreamCnvSvc_AtlCopyBSEvent3_ctest")
-atlas_add_test( AtlCopyBSEvent5_test
+atlas_add_test( AtlCopyBSEvent5
PRE_EXEC_SCRIPT "rm -f test_infl.data"
SCRIPT "AtlCopyBSEvent -e 186882810,187403142,187419528 -o test_infl.data test_defl.data"
- PROPERTIES DEPENDS ByteStreamCnvSvc_AtlCopyBSEvent3_test_ctest )
+ PROPERTIES DEPENDS "ByteStreamCnvSvc_AtlCopyBSEvent3_ctest")
-atlas_add_test( AtlCopyBSEvent6_test
+atlas_add_test( AtlCopyBSEvent6
PRE_EXEC_SCRIPT "rm -f empty*.data && python ${CMAKE_CURRENT_SOURCE_DIR}/test/create_empty_bsfile.py"
SCRIPT "AtlCopyBSEvent -e all -o empty.data empty._0001.data"
- PROPERTIES DEPENDS ByteStreamCnvSvc_AtlCopyBSEvent5_test_ctest )
+ PROPERTIES DEPENDS "ByteStreamCnvSvc_AtlCopyBSEvent5_ctest")
atlas_add_test( ByteStreamConfigTest
- SCRIPT python -m ByteStreamCnvSvc.ByteStreamConfig
+ SCRIPT "python -m ByteStreamCnvSvc.ByteStreamConfig"
POST_EXEC_SCRIPT nopost.sh )
# Install files from the package:
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index 81e839e26de8128dd987efcf02ade43d5da7a73b..06a0eba988af9196128a7a34da90c92d5a087db2 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -23,6 +23,7 @@ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaCommon.Configurable import Configurable
from AthenaCommon.Logging import logging
from AthenaServices.MetaDataSvcConfig import MetaDataSvcCfg
+from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg
def ByteStreamReadCfg(flags, type_names=None):
@@ -129,6 +130,7 @@ def ByteStreamWriteCfg(flags, type_names=None):
OutputDirectory="./",
AppName="Athena",
RunNumber=all_runs.pop(),
+ OutputLevel=2,
)
result.addService(event_storage_output)
# release variable depends the way the env is configured
@@ -137,6 +139,7 @@ def ByteStreamWriteCfg(flags, type_names=None):
bytestream_conversion = comp_factory.ByteStreamCnvSvc(
name="ByteStreamCnvSvc",
ByteStreamOutputSvcList=[event_storage_output.getName()],
+ OutputLevel=2,
)
result.addService(bytestream_conversion)
@@ -145,9 +148,16 @@ def ByteStreamWriteCfg(flags, type_names=None):
EvtConversionSvc=bytestream_conversion.name,
OutputFile="ByteStreamEventStorageOutputSvc",
ItemList=type_names if type_names else list(),
+ OutputLevel=2,
)
result.addEventAlgo(output_stream, primary=True)
+ result.merge(IOVDbSvcCfg(flags))
+
+ result.merge(
+ MetaDataSvcCfg(flags, ["IOVDbMetaDataTool", "ByteStreamMetadataTool"])
+ )
+
return result
@@ -175,6 +185,9 @@ def main():
acc.printConfig()
log.info("Config OK")
+ with open('ByteStreamConfig.pkl', 'wb') as pkl:
+ acc.store(pkl)
+
acc.run(10)
diff --git a/Event/ByteStreamCnvSvc/share/BSEventSelector.ref b/Event/ByteStreamCnvSvc/share/BSEventSelector.ref
index 9a5cc37a2b3df8bd1e705a5a859eae0a86e80c44..d4efeb9bc7a4eb9209f809e14f5706ae20d6c737 100644
--- a/Event/ByteStreamCnvSvc/share/BSEventSelector.ref
+++ b/Event/ByteStreamCnvSvc/share/BSEventSelector.ref
@@ -1,29 +1,40 @@
-ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
-ByteStreamInputSvc DEBUG Property update for OutputLevel : new value = 2
-ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
-ByteStreamInputSvc DEBUG Service base class initialized successfully
-ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ByteStreamInputSvc DEBUG ByteStreamMetadata:
-ByteStreamInputSvc DEBUG Recorded ByteStreamMetadata in InputMetaDataStore
-ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-ByteStreamInputSvc DEBUG nextEvent _above_ high water mark
-ByteStreamInputSvc DEBUG Event Size 1038508
-ByteStreamInputSvc DEBUG First word of the fragment aa1234aa
-ByteStreamInputSvc DEBUG Format version500
-ByteStreamInputSvc DEBUG Made an FullEventFragment from ES 0x15bd2000
-ByteStreamInputSvc DEBUG switched to next event in slot INVALID
-ByteStreamInputSvc DEBUG ByteStream File GUID: 1C43C4AA-2555-E711-BB1F-02163E01794D
-ByteStreamInputSvc DEBUG ByteStream Event Position in File: 1324
-ByteStreamCnvSvc DEBUG Property update for OutputLevel : new value = 2
-EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
-ByteStreamInputSvc DEBUG nextEvent _above_ high water mark
-ByteStreamInputSvc DEBUG Event Size 1000648
-ByteStreamInputSvc DEBUG First word of the fragment aa1234aa
-ByteStreamInputSvc DEBUG Format version500
-ByteStreamInputSvc DEBUG Made an FullEventFragment from ES 0x15cd0000
-ByteStreamInputSvc DEBUG switched to next event in slot s: 0 e: 0
-ByteStreamInputSvc DEBUG ByteStream File GUID: 1C43C4AA-2555-E711-BB1F-02163E01794D
-ByteStreamInputSvc DEBUG ByteStream Event Position in File: 1039848
-ByteStreamInputSvc DEBUG Calling ByteStreamInputSvc::stop()
-ByteStreamCnvSvc DEBUG releasing all workers
+Py:Athena INFO including file "ByteStreamCnvSvc/BSEventSelector_test_jobOptions.py"
+ByteStreamAddressProviderSvc DEBUG Property update for OutputLevel : new value = 2
+ByteStreamAddressProviderSvc INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
+ByteStreamAddressProviderSvc DEBUG Service base class initialized successfully
+ByteStreamAddressProviderSvc INFO initialized
+ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
+ToolSvc.ByteStreamMetadataTool INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
+ByteStreamAddressProviderSvc DEBUG in preLoadAddress
+ByteStreamAddressProviderSvc DEBUG StoreID = 3 does not match required id (0) skip
+ByteStreamAddressProviderSvc DEBUG in preLoadAddress
+ByteStreamAddressProviderSvc DEBUG StoreID = 3 does not match required id (0) skip
+ByteStreamAddressProviderSvc DEBUG in preLoadAddress
+ByteStreamAddressProviderSvc DEBUG in preLoadAddress
+ByteStreamInputSvc 0 DEBUG Property update for OutputLevel : new value = 2
+ByteStreamInputSvc 0 INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
+ByteStreamInputSvc 0 DEBUG Service base class initialized successfully
+ROBDataProviderSvc 0 INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
+ByteStreamInputSvc 0 DEBUG ByteStreamMetadata:
+ByteStreamInputSvc 0 DEBUG Recorded ByteStreamMetadata in InputMetaDataStore
+ByteStreamInputSvc 0 INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
+ByteStreamInputSvc 0 0 DEBUG nextEvent _above_ high water mark
+ByteStreamInputSvc 0 0 DEBUG Event Size 1038508
+ByteStreamInputSvc 0 0 DEBUG First word of the fragment aa1234aa
+ByteStreamInputSvc 0 0 DEBUG Format version500
+ByteStreamInputSvc 0 0 DEBUG Made an FullEventFragment from ES 0x17f98000
+ByteStreamInputSvc 0 0 DEBUG switched to next event in slot s: 0 e: 0
+ByteStreamInputSvc 0 0 DEBUG ByteStream File GUID: 1C43C4AA-2555-E711-BB1F-02163E01794D
+ByteStreamInputSvc 0 0 DEBUG ByteStream Event Position in File: 1324
+ByteStreamCnvSvc 0 0 DEBUG Property update for OutputLevel : new value = 2
+EventPersistencySvc 0 0 INFO Added successfully Conversion service:ByteStreamCnvSvc
+ByteStreamInputSvc 1 0 DEBUG nextEvent _above_ high water mark
+ByteStreamInputSvc 1 0 DEBUG Event Size 1000648
+ByteStreamInputSvc 1 0 DEBUG First word of the fragment aa1234aa
+ByteStreamInputSvc 1 0 DEBUG Format version500
+ByteStreamInputSvc 1 0 DEBUG Made an FullEventFragment from ES 0x18096000
+ByteStreamInputSvc 1 0 DEBUG switched to next event in slot s: 0 e: 1
+ByteStreamInputSvc 1 0 DEBUG ByteStream File GUID: 1C43C4AA-2555-E711-BB1F-02163E01794D
+ByteStreamInputSvc 1 0 DEBUG ByteStream Event Position in File: 1039848
+ByteStreamInputSvc DEBUG Calling ByteStreamInputSvc::stop()
+ByteStreamCnvSvc DEBUG releasing all workers
diff --git a/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py b/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py
index dc0cffe0722b88a20745719cd2ca3623e2c60f61..8d3ec14abeae7d164f589fbf273a134f891befb2 100644
--- a/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py
+++ b/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py
@@ -25,7 +25,8 @@ from AthenaServices.AthenaServicesConf import AthenaOutputStream
topSequence += AthenaOutputStream(
"StreamBS",
EvtConversionSvc = "ByteStreamCnvSvc",
- OutputFile = "ByteStreamRDP_OutputSvc"
+ OutputFile = "ByteStreamRDP_OutputSvc",
+ ExtraInputs = [( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ) ],
)
# ByteStreamCnvSvc is an input CnvSvc now.
EventPersistencySvc = svcMgr.EventPersistencySvc
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.cxx
index c33950ac4c4434582a9ec509ceaddb692520401d..9d3b4164a59ceee142bacc3666dad32609ab552c 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.cxx
@@ -166,6 +166,41 @@ ByteStreamDataWriter::makeWriter(int version,
return std::unique_ptr<ByteStreamDataWriter>(res);
}
+std::unique_ptr<ByteStreamDataWriter>
+ByteStreamDataWriter::makeWriter(const DataWriterParameters& parameters) {
+ // initiate with production file name
+ if (parameters.theFNCB == nullptr)
+ return makeWriter(
+ parameters.version,
+ parameters.writingPath,
+ parameters.fileNameCore,
+ parameters.rPar,
+ parameters.fmdStrings,
+ parameters.maxFileNE,
+ parameters.maxFileMB,
+ parameters.startIndex,
+ parameters.compression,
+ parameters.compLevel);
+
+ // initiate for user-defined file name
+ return makeWriter(
+ parameters.version,
+ parameters.writingPath,
+ parameters.theFNCB,
+ parameters.rPar,
+ parameters.project,
+ parameters.streamType,
+ parameters.streamName,
+ parameters.stream,
+ parameters.lumiBlockNumber,
+ parameters.applicationName,
+ parameters.fmdStrings,
+ parameters.maxFileNE,
+ parameters.maxFileMB,
+ parameters.compression,
+ parameters.compLevel);
+}
+
namespace {
ByteStreamDataWriterCurrent::ByteStreamDataWriterCurrent(const std::string& writingPath,
@@ -178,15 +213,15 @@ ByteStreamDataWriterCurrent::ByteStreamDataWriterCurrent(const std::string& writ
EventStorage::CompressionType compression,
unsigned int compLevel)
{
- m_writer.reset(new EventStorage::DataWriter(writingPath,
- fileNameCore,
- rPar,
- fmdStrings,
- startIndex,
- compression,
- compLevel));
- m_writer->setMaxFileNE(maxFileNE);
- m_writer->setMaxFileMB(maxFileMB);
+ m_writer.reset(new EventStorage::DataWriter(writingPath,
+ fileNameCore,
+ rPar,
+ fmdStrings,
+ startIndex,
+ compression,
+ compLevel));
+ m_writer->setMaxFileNE(maxFileNE);
+ m_writer->setMaxFileMB(maxFileMB);
}
ByteStreamDataWriterCurrent::ByteStreamDataWriterCurrent(const std::string& writingPath,
@@ -204,32 +239,32 @@ ByteStreamDataWriterCurrent::ByteStreamDataWriterCurrent(const std::string& writ
EventStorage::CompressionType compression,
unsigned int compLevel)
{
- m_writer.reset(new EventStorage::DataWriter(writingPath,
- theFNCB,
- rPar,
- project,
- streamType,
- streamName,
- stream,
- lumiBlockNumber,
- applicationName,
- fmdStrings,
- compression,
- compLevel));
- m_writer->setMaxFileNE(maxFileNE);
- m_writer->setMaxFileMB(maxFileMB);
+ m_writer.reset(new EventStorage::DataWriter(writingPath,
+ theFNCB,
+ rPar,
+ project,
+ streamType,
+ streamName,
+ stream,
+ lumiBlockNumber,
+ applicationName,
+ fmdStrings,
+ compression,
+ compLevel));
+ m_writer->setMaxFileNE(maxFileNE);
+ m_writer->setMaxFileMB(maxFileMB);
}
EventStorage::DWError
ByteStreamDataWriterCurrent::putData(unsigned int dataSize, const void *data)
{
- return m_writer->putData(dataSize, data);
+ return m_writer->putData(dataSize, data);
}
bool
ByteStreamDataWriterCurrent::good() const
{
- return m_writer->good();
+ return m_writer->good();
}
} // namespace
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.h b/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.h
index 29802d647e4e51b6cd336a65387147be081e8279..a772bddf8c207c64793da67890dd433e66a6f9a5 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.h
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamDataWriter.h
@@ -21,6 +21,7 @@
#include "EventStorage/FileNameCallback.h"
#include "boost/shared_ptr.hpp"
+struct DataWriterParameters;
/** @class ByteStreamDataWriter
* @brief This class defines abstract interface for data writing.
@@ -107,6 +108,17 @@ public:
EventStorage::CompressionType compression = EventStorage::NONE,
unsigned int compLevel = 1);
+ /**
+ * Factory method returning data writer instance for specified version.
+ * Throws exception in case of problems, never returns zero pointer.
+ *
+ * @param parameters: set of parameters needed to initiate DataWriter
+ *
+ * @throw std::exception (or sub-class) is thrown in case of problems.
+ */
+ static std::unique_ptr<ByteStreamDataWriter>
+ makeWriter(const DataWriterParameters& parameters);
+
ByteStreamDataWriter() {}
virtual ~ByteStreamDataWriter() {}
@@ -133,4 +145,67 @@ public:
};
+/** Class containing parameters needed to initiayte DataWriter
+ *
+ * This class is meant to given to the factory method creating data writer
+ * instances. The parameters need to be set to valid values.
+ */
+struct DataWriterParameters {
+ /** Writer version to instantiate, 0 for most current version
+ *
+ * Other supported values: 5 for run1-compatible output. Exception is thrown
+ * is version is not supported.
+ **/
+ int version{0};
+
+ /// Directory where to write data
+ std::string writingPath{""};
+
+ /// File name not including the ending "._NNNN.data"
+ std::string fileNameCore{""};
+
+ /// Other parameters from IS including the run number
+ EventStorage::run_parameters_record rPar{
+ 0, 0, 0, 0, 0, 0, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0, 0 };
+
+ /// Optional vector of strings containing metadata
+ std::vector<std::string> fmdStrings;
+
+ /// Max size of a file in number of data blocks (or events)
+ unsigned int maxFileNE{0};
+
+ /// Max size of a file in MB. The file is closed before this limit is overrun
+ unsigned int maxFileMB{0};
+
+ /// Initial file sequence index
+ unsigned int startIndex{1};
+
+ /// Compression type
+ EventStorage::CompressionType compression{EventStorage::NONE};
+
+ /// Compression level
+ unsigned int compLevel{1};
+
+ /// callback method for generating file names
+ boost::shared_ptr<EventStorage::FileNameCallback> theFNCB;
+
+ /// project name for use with simple file name
+ std::string project{""};
+
+ /// stream type for use with simple file name
+ std::string streamType{""};
+
+ /// stream name for use with simple file name
+ std::string streamName{""};
+
+ /// not sure for use with simple file name
+ std::string stream{""};
+
+ /// luminosity block number for use with simple file name
+ unsigned int lumiBlockNumber{0};
+
+ /// application name for use with simple file name
+ std::string applicationName{""};
+};
+
#endif // BYTESTREAMCNVSVC_BYTESTREAMDATAWRITER_H
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
index 84d10073ffccdf12617b6b5a86c11b7d6809a850..41bdde3d539e07c627860f1afffe257cc59a9905 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
@@ -1,425 +1,477 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
#include "ByteStreamEventStorageOutputSvc.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IIoComponentMgr.h"
-
-#include "EventStorage/EventStorageRecords.h"
-#include "EventStorage/RawFileName.h"
-#include "EventStorage/SimpleFileName.h"
+#include <stdexcept>
+#include <stdlib.h>
+#include <sstream>
-#include "ByteStreamData/RawEvent.h"
-#include "ByteStreamData/ByteStreamMetadataContainer.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/format.hpp>
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventType.h"
-#include "EventInfo/TagInfo.h"
+#include "ByteStreamDataWriter.h"
-#include "StoreGate/StoreGateSvc.h"
+#include "AthenaKernel/StoreID.h"
#include "ByteStreamCnvSvcLegacy/offline_eformat/old/util.h"
+#include "ByteStreamData/RawEvent.h"
-#include "ByteStreamDataWriter.h"
+#include "EventStorage/EventStorageRecords.h"
+#include "EventStorage/RawFileName.h"
+#include "EventStorage/SimpleFileName.h"
-#include <boost/shared_ptr.hpp>
-#include <stdlib.h>
+#include "xAODEventInfo/EventInfo.h"
+
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/IIoComponentMgr.h"
+
+#include "StoreGate/ReadHandle.h"
-/******************************************************************************/
ByteStreamEventStorageOutputSvc::ByteStreamEventStorageOutputSvc(
const std::string& name, ISvcLocator* pSvcLocator)
- : ByteStreamOutputSvc(name, pSvcLocator)
- , m_totalEventCounter (0)
- , m_inputDir (this, "OutputDirectory", "", "directory for the data files")
- , m_projectTag (this, "ProjectTag", "", "part of filename")
- , m_appName (this, "AppName", "", "part of filename")
- , m_fileTag (this, "FileTag", "", "part of filename")
- , m_streamType (this, "StreamType", "Single", "part of filename")
- , m_streamName (this, "StreamName", "Stream", "part of filename")
- , m_lumiBlockNumber (this, "LumiBlockNumber", 0, "part of filename")
- , m_run (this, "RunNumber", 0, "part of filename")
- , m_dump (this, "DumpFlag", false, "dump fragments")
- , m_writeEventless (this, "WriteEventlessFiles", true, "")
- , m_compressEvents (this, "CompressEvents", false, "")
- , m_maxFileMB (this, "MaxFileMB", 10000, "MB per file")
- , m_maxFileNE (this, "MaxFileNE", 100000, "evens per file")
- , m_eformatVersion (this, "EformatVersion", "current",
- "Version of the event format data, use \"v40\" or \"run1\" "
- "for run1, \"current\" for most current version (default).")
- , m_eventStorageVersion(this, "EventStorageVersion", "current",
- "Version of the ByteStream file data, use \"v5\" or \"run1\" "
- "for run1, \"current\" for most current version (default).")
- , m_bsOutputStreamName (this, "BSOutputStreamName", name, "stream name for muliple output")
- , m_simpleFileName (this, "SimpleFileName", "", "for filename not from AgreedFileName")
-{
- assert(pSvcLocator != nullptr);
+ : base_class(name, pSvcLocator) {
}
-/******************************************************************************/
-ByteStreamEventStorageOutputSvc::~ByteStreamEventStorageOutputSvc()
-{}
+StatusCode
+ByteStreamEventStorageOutputSvc::initialize() {
+ ATH_MSG_INFO("Initializing " << name() << " - package version "
+ << PACKAGE_VERSION);
+ ATH_CHECK(ByteStreamOutputSvc::initialize());
-/******************************************************************************/
-StatusCode
-ByteStreamEventStorageOutputSvc::initialize()
-{
- ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
- if (!ByteStreamOutputSvc::initialize().isSuccess()) {
- ATH_MSG_FATAL("Cannot initialize ByteStreamOutputSvc base class.");
- return(StatusCode::FAILURE);
- }
+ ATH_CHECK(m_eventInfoKey.initialize());
+ ATH_CHECK(m_byteStreamMetadataKey.initialize());
// register this service for 'I/O' events
- ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
- if (!iomgr.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Could not retrieve IoComponentMgr !");
- return(StatusCode::FAILURE);
- }
- if (!iomgr->io_register(this).isSuccess()) {
- ATH_MSG_FATAL("Could not register myself with the IoComponentMgr !");
- return(StatusCode::FAILURE);
- }
+ ATH_CHECK(m_ioMgr.retrieve());
+ ATH_CHECK(m_ioMgr->io_register(this));
// Register output file's name with the I/O manager
- if (!m_simpleFileName.value().empty()) {
- if (!iomgr->io_register(this, IIoComponentMgr::IoMode::WRITE, m_simpleFileName.value()).isSuccess()) {
- ATH_MSG_FATAL("could not register [" << m_simpleFileName.value() << "] for output !");
- return(StatusCode::FAILURE);
- } else {
- ATH_MSG_VERBOSE("io_register[" << this->name() << "](" << m_simpleFileName.value() << ") [ok]");
- }
+ if (!m_simpleFileName.empty()) {
+ ATH_CHECK(m_ioMgr->io_register(this, IIoComponentMgr::IoMode::WRITE,
+ m_simpleFileName));
+ ATH_MSG_VERBOSE("io_register[" << this->name() << "]("
+ << m_simpleFileName << ") [ok]");
}
- // validate m_eformatVersion and m_eventStorageVersion
- const char* choices_ef[] = {"current", "v40", "run1"};
- if (std::find(std::begin(choices_ef), std::end(choices_ef), m_eformatVersion.value()) == std::end(choices_ef)) {
- ATH_MSG_FATAL("Unexpected value for EformatVersion property: " << m_eformatVersion);
- return(StatusCode::FAILURE);
+ // validate m_eformatVersion
+ const std::vector< std::string > choices_ef{"current", "v40", "run1"};
+ if (std::find(choices_ef.begin(), choices_ef.end(), m_eformatVersion)
+ == choices_ef.end()) {
+ ATH_MSG_FATAL("Unexpected value for EformatVersion property: "
+ << m_eformatVersion);
+ return StatusCode::FAILURE;
}
- const char* choices_es[] = {"current", "v5", "run1"};
- if (std::find(std::begin(choices_es), std::end(choices_es), m_eventStorageVersion.value()) == std::end(choices_es)) {
- ATH_MSG_FATAL("Unexpected value for EventStorageVersion property: " << m_eventStorageVersion);
- return(StatusCode::FAILURE);
+ ATH_MSG_INFO("eformat version to use: \"" << m_eformatVersion << "\"");
+
+ // validate m_eventStorageVersion
+ const std::vector< std::string > choices_es{"current", "v5", "run1"};
+ if (std::find(choices_es.begin(), choices_es.end(), m_eventStorageVersion)
+ == choices_es.end()) {
+ ATH_MSG_FATAL("Unexpected value for EventStorageVersion property: "
+ << m_eventStorageVersion);
+ return StatusCode::FAILURE;
}
- ATH_MSG_INFO("eformat version to use: \"" << m_eformatVersion.value() << "\"");
- ATH_MSG_INFO("event storage (BS) version to use: \"" << m_eventStorageVersion.value() << "\"");
+ ATH_MSG_INFO("event storage (BS) version to use: \""
+ << m_eventStorageVersion << "\"");
+
+ m_isRun1 = (m_eformatVersion == "v40" or m_eformatVersion == "run1");
- return(this->reinit());
+ ATH_CHECK(reinit());
+ return StatusCode::SUCCESS;
}
-/******************************************************************************/
StatusCode
-ByteStreamEventStorageOutputSvc::reinit()
-{
+ByteStreamEventStorageOutputSvc::reinit() {
ATH_MSG_INFO("Reinitialization...");
- return(StatusCode::SUCCESS);
+ return StatusCode::SUCCESS;
}
-/******************************************************************************/
StatusCode
-ByteStreamEventStorageOutputSvc::stop()
-{
- // Check whether anything has been written && whether the user wants metadata only files
- bool dWok = false;
- if (m_dataWriter == 0 && m_writeEventless) {
- const ByteStreamMetadataContainer* metaDataCont = 0;
- const ByteStreamMetadata* metaData = 0;
- ServiceHandle<StoreGateSvc> mds("StoreGateSvc/MetaDataStore", name());
- if (mds.retrieve().isFailure()) {
- ATH_MSG_WARNING("Cannot get MetaDataStore");
- } else {
- if (mds->retrieve(metaDataCont, "ByteStreamMetadata").isSuccess()) metaData = *(metaDataCont->begin());
- }
- // Try to write metadata to file
- dWok = initDataWriterContents(0, metaData);
+ByteStreamEventStorageOutputSvc::stop() {
+ // Check whether anything has been written and whether the user wants metadata
+ // only files
+ if (m_dataWriter == 0 and m_writeEventless) {
+ const ByteStreamMetadata* metaData = getByteStreamMetadata();
+
+ // Try to write metadata to eventless file
+ bool dWok = initDataWriterContents(nullptr, metaData);
if (!dWok) ATH_MSG_WARNING("Could not write Metadata for eventless file");
}
- return(StatusCode::SUCCESS);
+
+ return StatusCode::SUCCESS;
}
-/******************************************************************************/
StatusCode
-ByteStreamEventStorageOutputSvc::finalize()
-{
+ByteStreamEventStorageOutputSvc::finalize() {
// clean up
ATH_MSG_DEBUG("deleting DataWriter");
m_dataWriter.reset();
ATH_MSG_INFO("number of events written: " << m_totalEventCounter);
- return(StatusCode::SUCCESS);
+ return StatusCode::SUCCESS;
}
-/******************************************************************************/
-// Open the first input file and read the first event.
bool
-ByteStreamEventStorageOutputSvc::initDataWriter()
-{
- // Retrieve EventInfo to get run number, detector mask and event type
- const EventInfo* evtInfo = 0;
- ServiceHandle<StoreGateSvc> sg("StoreGateSvc", name());
- if (sg.retrieve().isFailure()) {
- ATH_MSG_ERROR("Cannot get StoreGateSvc");
- return(false);
- }
- if (sg->retrieve(evtInfo).isFailure() || evtInfo == 0) {
- ATH_MSG_ERROR("Cannot retrieve EventInfo");
- return(false);
- }
- const ByteStreamMetadataContainer* metaDataCont = 0;
- const ByteStreamMetadata* metaData = 0;
- ServiceHandle<StoreGateSvc> mds("InputMetaDataStore", name());
- if (mds.retrieve().isFailure()) {
- ATH_MSG_WARNING("Cannot get InputMetaDataStore");
- } else {
- if (mds->retrieve(metaDataCont, "ByteStreamMetadata").isSuccess()) metaData = *(metaDataCont->begin());
- }
- // Now try to write metadata to file
- return initDataWriterContents(evtInfo, metaData);
+ByteStreamEventStorageOutputSvc::initDataWriter(const EventContext* ctx) {
+ // Called on first event. Reads run parameters first event and/or first event
+ const xAOD::EventInfo* eventInfo = ctx == nullptr
+ ? SG::get(m_eventInfoKey)
+ : SG::get(m_eventInfoKey, *ctx);
+ if (eventInfo == nullptr) ATH_MSG_WARNING("failed to retrieve EventInfo");
+
+ const ByteStreamMetadata* metaData = ctx == nullptr ? getByteStreamMetadata() : getByteStreamMetadata(*ctx);
+ if (metaData == nullptr)
+ ATH_MSG_WARNING("failed to retrieve ByteStreamMetaData");
+
+ // Now open a file for writing from retrieved parameters
+ return initDataWriterContents(eventInfo, metaData);
}
-/******************************************************************************/
-// Open the first input file and read the first event.
bool
ByteStreamEventStorageOutputSvc::initDataWriterContents(
- const EventInfo* evtInfo, const ByteStreamMetadata* metaData)
-{
- // Initialize parameters
- EventStorage::run_parameters_record runPara = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
- EventStorage::freeMetaDataStrings freeMetaDataStrings;
- runPara.detector_mask_LS=0xFFFFFFFFFFFFFFFFULL;
- runPara.detector_mask_MS=0xFFFFFFFFFFFFFFFFULL;
- int run = 0;
- int lumiNum = 0;
+ const xAOD::EventInfo* evtInfo,
+ const ByteStreamMetadata* metaData) {
+ // check that we have sufficient information to do what we need
+ if (evtInfo or metaData)
+ ATH_MSG_DEBUG("Looking up data writer parameters");
+ else
+ throw std::runtime_error("Cannot write data without run parameters");
+
// The heirarchy of run/lumiblock number, GNARR
- // 1) User override
- // 2) Event data
- // 3) File metadata
- // 4) default = unknown = 0
- if (m_run != 0) {
- run = m_run;
- } else if (evtInfo != 0) {
- run = evtInfo->event_ID()->run_number();
- } else if (metaData != 0) {
- run = metaData->getRunNumber();
- }
- runPara.run_number = run;
-
- if (m_lumiBlockNumber != 0) {
- lumiNum = m_lumiBlockNumber;
- } else if (evtInfo != 0) {
- lumiNum = evtInfo->event_ID()->lumi_block();
- } else if (metaData != 0) {
- lumiNum = metaData->getLumiBlock();
- }
+ //
+ // 1) User override
+ // 2) Event data
+ // 3) File metadata
+ // 4) default = unknown = 0
+ //
+ // Go from 4 to 1 and overwrite
+ DataWriterParameters params;
+ if (metaData != nullptr) updateDataWriterParameters(params, *metaData);
+ if (evtInfo != nullptr) updateDataWriterParameters(params, *evtInfo);
+ updateDataWriterParameters(params);
+
+ m_dataWriter = ByteStreamDataWriter::makeWriter(params);
+
+ bool result = m_dataWriter->good();
+ if (result)
+ ATH_MSG_DEBUG("initialized output stream to file with name "
+ << params.fileNameCore);
+ else
+ ATH_MSG_ERROR("Unable to initialize file");
- if (evtInfo != 0) {
- uint64_t result = evtInfo->event_ID()->detector_mask1();
- result = result << 32;
- result |= evtInfo->event_ID()->detector_mask0();
- runPara.detector_mask_LS = result;
- result = evtInfo->event_ID()->detector_mask3();
- result = result << 32;
- result |= evtInfo->event_ID()->detector_mask2();
- runPara.detector_mask_MS = result;
-
- freeMetaDataStrings.push_back(evtInfo->event_type()->EventType::typeToString());
- } else {
- runPara.detector_mask_LS=0xFFFFFFFFFFFFFFFFULL;
- runPara.detector_mask_MS=0xFFFFFFFFFFFFFFFFULL;
- }
- if (metaData != 0) {
- runPara.max_events = metaData->getMaxEvents();
- runPara.rec_enable = metaData->getRecEnable();
- runPara.trigger_type = metaData->getTriggerType();
- runPara.beam_type = metaData->getBeamType();
- runPara.beam_energy = metaData->getBeamEnergy();
- for (EventStorage::freeMetaDataStrings::const_iterator iter = metaData->getFreeMetaDataStrings().begin(),
- iterEnd = metaData->getFreeMetaDataStrings().end(); iter != iterEnd; iter++) {
- if((*iter).find("Compression=") == std::string::npos) {
- freeMetaDataStrings.push_back(*iter);
- }
- }
- } else {
- ATH_MSG_DEBUG("Cannot retrieve MetaData");
- metaData = 0;
- runPara.max_events = 0;
- runPara.rec_enable = 0;
- runPara.trigger_type = 0;
- runPara.beam_type = 0;
- runPara.beam_energy = 0;
- }
- const TagInfo* tagInfo = 0;
- ServiceHandle<StoreGateSvc> ds("DetectorStore", name());
- if (ds.retrieve().isSuccess()) {
- if (ds->retrieve(tagInfo).isFailure() || tagInfo == 0) {
- ATH_MSG_DEBUG("Cannot retrieve TagInfo");
- } else {
- std::string tagName, tagValue;
- if (metaData == 0) {
- tagName = "beam_type";
- tagInfo->findTag(tagName, tagValue);
- runPara.beam_type = atof(tagValue.c_str());
- tagName = "beam_energy";
- tagInfo->findTag(tagName, tagValue);
- runPara.beam_energy = atof(tagValue.c_str());
- }
- tagName = "GeoAtlas";
- tagInfo->findTag(tagName, tagValue);
- freeMetaDataStrings.push_back(tagName + ": " + tagValue);
- tagName = "IOVDbGlobalTag";
- tagInfo->findTag(tagName, tagValue);
- freeMetaDataStrings.push_back(tagName + ": " + tagValue);
- }
- }
+ return result;
+}
- std::string fileNameCore;
- EventStorage::CompressionType compression = m_compressEvents ? EventStorage::ZLIB : EventStorage::NONE;
- int eventStorageVersion = 0;
- if (m_eventStorageVersion.value() == "v5" || m_eventStorageVersion.value() == "run1") {
- eventStorageVersion = 5;
- }
- if (!m_simpleFileName.value().empty()) {
- fileNameCore = m_simpleFileName.value();
- boost::shared_ptr<EventStorage::SimpleFileName> sfn(new EventStorage::SimpleFileName(m_simpleFileName.value()));
- m_dataWriter = ByteStreamDataWriter::makeWriter(eventStorageVersion,
- m_inputDir.value(), sfn, runPara, m_projectTag.value(),
- m_streamType.value(), m_streamName.value(),
- m_streamType.value() + "_" + m_streamName.value(),
- lumiNum, m_appName.value(), freeMetaDataStrings,
- m_maxFileNE.value(), m_maxFileMB.value(), compression);
- } else {
- // construct file name
- daq::RawFileName fileNameObj(m_projectTag.value(), run, m_streamType.value(), m_streamName.value(), lumiNum, m_appName.value());
- fileNameCore = fileNameObj.fileNameCore();
- m_dataWriter = ByteStreamDataWriter::makeWriter(eventStorageVersion,
- m_inputDir.value(), fileNameCore, runPara, freeMetaDataStrings,
- m_maxFileNE.value(), m_maxFileMB.value(), compression);
- }
- if (!m_dataWriter->good()) {
- ATH_MSG_ERROR("Unable to initialize file");
- return(false);
- } else {
- ATH_MSG_DEBUG("initialized file for with name " << fileNameCore);
- }
- return(true);
+
+bool
+ByteStreamEventStorageOutputSvc::putEvent(RawEvent* re) {
+ // Read the next event.
+ return putEvent(re, Gaudi::Hive::currentContext());
}
-/******************************************************************************/
-// Read the next event.
+
bool
-ByteStreamEventStorageOutputSvc::putEvent(RawEvent* re)
-{
- if (!m_dataWriter) {
- if (!initDataWriter()) {
- ATH_MSG_ERROR("Failed to initialize DataWriter");
- return(false);
- }
- }
- uint32_t size = re->fragment_size_word();
- // write
- OFFLINE_FRAGMENTS_NAMESPACE::PointerType st;
- re->start(st);
- ATH_MSG_DEBUG("event size = " << size << " start = " << st);
-
- // convert to different version
- bool deleteBuffer = false;
- if (m_eformatVersion.value() == "v40" or m_eformatVersion.value() == "run1") {
+ByteStreamEventStorageOutputSvc::putEvent(
+ RawEvent* re, const EventContext& ctx) {
+ // Read the next event.
+ using OFFLINE_FRAGMENTS_NAMESPACE::DataType;
+ using OFFLINE_FRAGMENTS_NAMESPACE::PointerType;
+
+ EventCache* cache = m_eventCache.get(ctx);
+ cache->releaseEvent();
+
+ // we need the size and the start of the event to give to the data writer
+ cache->size = re->fragment_size_word();
+ ATH_MSG_DEBUG("event size = " << cache->size << ", start = " << re->start());
+
+ if (m_isRun1) {
+ // convert to current eformat
// allocate some extra space just in case
- uint32_t bufSize = size + 128;
- auto buf = new OFFLINE_FRAGMENTS_NAMESPACE::DataType[bufSize];
+ ATH_MSG_DEBUG("converting Run 1 format ");
+
+ cache->size += 128;
+ cache->buffer = std::make_unique< DataType[] >(cache->size);
+ ATH_MSG_DEBUG("created buffer 0x"
+ << std::hex << cache->buffer.get() << std::dec);
// This builds no-checksum headers, should use the same
// checksum type as original event
- size = offline_eformat::old::convert_to_40(st, buf, bufSize);
- if (size == 0) {
+ cache->size = offline_eformat::old::convert_to_40(
+ re->start(), cache->buffer.get(), cache->size);
+ ATH_MSG_DEBUG("filled buffer");
+
+ if (cache->size == 0) {
// not enough space in buffer
ATH_MSG_ERROR("Failed to convert event, buffer is too small");
- delete [] buf;
return false;
}
- st = buf;
- deleteBuffer = true;
- ATH_MSG_DEBUG("event size after conversion = " << size << " version = " << st[3]);
- }
+ ATH_MSG_DEBUG("event size after conversion = " << cache->size
+ << " version = " << cache->buffer.get()[3]);
- if (m_dataWriter->putData(sizeof(OFFLINE_FRAGMENTS_NAMESPACE::DataType) * size,
- reinterpret_cast<void*>(const_cast<OFFLINE_FRAGMENTS_NAMESPACE::DataType*>(st))) != EventStorage::DWOK) {
- ATH_MSG_ERROR("Failed to write event to DataWriter");
- if (deleteBuffer) delete [] st;
- return(false);
+ } else {
+ cache->buffer = std::make_unique< DataType[] >(cache->size);
+ std::copy(re->start(), re->start() + cache->size, cache->buffer.get());
}
- ++m_totalEventCounter;
- if (deleteBuffer) delete [] st;
- return(true);
-}
-bool ByteStreamEventStorageOutputSvc::putEvent(RawEvent* /*re*/, const EventContext& /*ctx*/) {
- ATH_MSG_FATAL(name() << " does not implement the context-aware putEvent method");
- return false;
-}
+ {
+ // multiple data writers concurrently sounds like a bad idea
+ std::lock_guard< std::mutex > lock(m_dataWriterMutex);
+ // make sure the data writer is ready
+ ATH_MSG_DEBUG("looking up data writer");
+ if (!m_dataWriter) {
+ if (!initDataWriter(&ctx)) {
+ ATH_MSG_ERROR("Failed to initialize DataWriter");
+ return false;
+ }
+ }
-/******************************************************************************/
-StatusCode
-ByteStreamEventStorageOutputSvc::queryInterface(
- const InterfaceID& riid, void** ppvInterface)
-{
- if (ByteStreamOutputSvc::interfaceID().versionMatch(riid)) {
- *ppvInterface = dynamic_cast<ByteStreamOutputSvc*>(this);
- } else {
- // Interface is not directly available: try out a base class
- return(::AthService::queryInterface(riid, ppvInterface));
+ // write event to disk
+ EventStorage::DWError write_result = m_dataWriter->putData(
+ sizeof(DataType) * cache->size,
+ reinterpret_cast< void* >(cache->buffer.get()));
+
+ // Report success or failure
+ if (write_result != EventStorage::DWOK) {
+ ATH_MSG_ERROR("Failed to write event to DataWriter");
+ return false;
+ }
+ ++m_totalEventCounter;
}
- addRef();
- return(StatusCode::SUCCESS);
+
+ return true;
}
-/******************************************************************************/
StatusCode
-ByteStreamEventStorageOutputSvc::io_reinit()
-{
+ByteStreamEventStorageOutputSvc::io_reinit() {
ATH_MSG_INFO("I/O reinitialization...");
- ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
- if (!iomgr.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Could not retrieve IoComponentMgr !");
- return(StatusCode::FAILURE);
- }
- if (!iomgr->io_hasitem(this)) {
+
+ if (!m_ioMgr->io_hasitem(this)) {
ATH_MSG_FATAL("IoComponentMgr does not know about myself !");
- return(StatusCode::FAILURE);
+ return StatusCode::FAILURE;
}
- if (!m_simpleFileName.value().empty()) {
- std::string outputFile = m_simpleFileName.value();
+
+ if (!m_simpleFileName.empty()) {
+ std::string outputFile = m_simpleFileName;
ATH_MSG_INFO("I/O reinitialization, file = " << outputFile);
std::string &fname = outputFile;
- if (!iomgr->io_contains(this, fname)) {
+ if (!m_ioMgr->io_contains(this, fname)) {
ATH_MSG_ERROR("IoComponentMgr does not know about [" << fname << "] !");
return(StatusCode::FAILURE);
}
- if (!iomgr->io_retrieve(this, fname).isSuccess()) {
+ if (!m_ioMgr->io_retrieve(this, fname).isSuccess()) {
ATH_MSG_FATAL("Could not retrieve new value for [" << fname << "] !");
return(StatusCode::FAILURE);
}
// all good... copy over.
// modify directory
m_inputDir.setValue(outputFile.substr(0, outputFile.find_last_of("/")));
- // FIXME: modify file name, not done for now because of IoUtils.update_io_registry vs. merge conflict.
- //m_simpleFileName.setValue(outputFile.substr(outputFile.find_last_of("/") + 1));
+ // FIXME: modify file name, not done for now because of
+ // IoUtils.update_io_registry vs. merge conflict.
+ //m_simpleFileName.setValue(
+ // outputFile.substr(outputFile.find_last_of("/") + 1));
}
ATH_MSG_DEBUG("Deleting DataWriter");
m_dataWriter.reset();
- return(this->reinit());
+
+ ATH_CHECK(reinit());
+
+ return StatusCode::SUCCESS;
+}
+
+
+const ByteStreamMetadata *
+ByteStreamEventStorageOutputSvc::getByteStreamMetadata()
+{
+ SG::ReadHandle<ByteStreamMetadataContainer> metaDataCont (m_byteStreamMetadataKey);
+
+ if (!metaDataCont.isValid()) return nullptr;
+
+ if (metaDataCont->size() > 1)
+ ATH_MSG_WARNING("Multiple run parameters in MetaDataStore. "
+ "Bytestream format only supports one. Arbitrarily "
+ "choosing first.");
+
+ return metaDataCont->front();
+}
+
+
+const ByteStreamMetadata *
+ByteStreamEventStorageOutputSvc::getByteStreamMetadata(
+ const EventContext& ctx)
+{
+ SG::ReadHandle<ByteStreamMetadataContainer> metaDataCont (m_byteStreamMetadataKey, ctx);
+
+ if (!metaDataCont.isValid()) return nullptr;
+
+ if (metaDataCont->size() > 1)
+ ATH_MSG_WARNING("Multiple run parameters in MetaDataStore. "
+ "Bytestream format only supports one. Arbitrarily "
+ "choosing first.");
+
+ return metaDataCont->front();
+}
+
+
+void
+ByteStreamEventStorageOutputSvc::updateDataWriterParameters(
+ DataWriterParameters& params) const {
+
+ if (m_eventStorageVersion == "v5" or m_eventStorageVersion == "run1")
+ params.version = 5;
+ else params.version = 0;
+
+ params.writingPath = m_inputDir;
+
+ if (m_run != 0) params.rPar.run_number = m_run;
+ ATH_MSG_DEBUG("Run number: " << params.rPar.run_number);
+
+ if (m_lumiBlockNumber != 0) params.lumiBlockNumber = m_lumiBlockNumber;
+ ATH_MSG_DEBUG("LB number: " << params.lumiBlockNumber);
+
+ if (!m_streamType.empty()) params.streamType = m_streamType;
+ if (!m_streamName.empty()) params.streamName = m_streamName;
+
+ if (params.streamType.empty()) params.streamType = "Single";
+ if (params.streamName.empty()) params.streamName = "Stream";
+
+ params.stream = params.streamType + "_" + params.streamName;
+
+ if (!m_projectTag.empty()) params.project = m_projectTag;
+
+ params.applicationName = m_appName;
+
+ if (!m_simpleFileName.empty()) {
+ // set up for simple file name
+ boost::shared_ptr<EventStorage::SimpleFileName> simple_file_name(
+ new EventStorage::SimpleFileName(m_simpleFileName));
+ params.theFNCB = simple_file_name;
+ } else {
+ // set up for production file name
+ daq::RawFileName fileNameObj(
+ params.project,
+ params.rPar.run_number,
+ params.streamType,
+ params.streamName,
+ params.lumiBlockNumber,
+ params.applicationName);
+ params.fileNameCore = fileNameObj.fileNameCore();
+ }
+
+ params.compression = m_compressEvents
+ ? EventStorage::ZLIB
+ : EventStorage::NONE;
+
+ params.maxFileMB = m_maxFileMB;
+ params.maxFileNE = params.rPar.max_events = m_maxFileNE;
+}
+
+
+void
+ByteStreamEventStorageOutputSvc::updateDataWriterParameters(
+ DataWriterParameters& params, const xAOD::EventInfo& eventInfo) const {
+ ATH_MSG_DEBUG("Parsing run parameters from EventInfo" << eventInfo);
+
+ params.rPar.run_number = eventInfo.runNumber();
+ params.lumiBlockNumber = eventInfo.lumiBlock();
+
+ for (const xAOD::EventInfo::StreamTag& tag : eventInfo.streamTags())
+ if(!tag.type().empty()) {
+ params.streamType = tag.type();
+ break;
+ }
+
+ for (const xAOD::EventInfo::StreamTag& tag : eventInfo.streamTags())
+ if (!tag.name().empty()) {
+ params.streamName = tag.name();
+ break;
+ }
+
+ for (const auto& tag : eventInfo.detDescrTags())
+ params.fmdStrings.push_back(tag.first + ' ' + tag.second);
+
+ params.rPar.trigger_type = eventInfo.level1TriggerType();
+ params.rPar.detector_mask_LS = eventInfo.detectorMask();
+ params.rPar.detector_mask_MS = eventInfo.detectorMaskExt();
+
+ std::string event_type = "Event type: sim/data - ";
+ if (eventInfo.eventType(xAOD::EventInfo::EventType::IS_SIMULATION))
+ event_type += "is sim";
+ else event_type += "is data";
+
+ event_type += " , testbeam/atlas - ";
+ if (eventInfo.eventType(xAOD::EventInfo::EventType::IS_TESTBEAM))
+ event_type += "is testbeam";
+ else event_type += "is atlas";
+
+ event_type += " , calibration/physics - ";
+ if (eventInfo.eventType(xAOD::EventInfo::EventType::IS_CALIBRATION))
+ event_type += "is calibration";
+ else event_type += "is physics";
+
+ params.fmdStrings.push_back(event_type);
+}
+
+
+void
+ByteStreamEventStorageOutputSvc::updateDataWriterParameters(
+ DataWriterParameters& params, const ByteStreamMetadata& metaData) const {
+ ATH_MSG_DEBUG("Parsing run parameters from metadata:\n" << metaData);
+
+ params.rPar.run_number = metaData.getRunNumber();
+ params.lumiBlockNumber = metaData.getLumiBlock();
+
+ const std::string stream = metaData.getStream();
+ const std::string::size_type split = stream.find('_');
+
+ if (split != std::string::npos and params.streamType.empty())
+ params.streamType = stream.substr(0,split);
+
+ if (split != std::string::npos and params.streamName.empty())
+ params.streamName = stream.substr(split+1);
+
+ params.project = metaData.getProject();
+ params.maxFileNE = params.rPar.max_events = metaData.getMaxEvents();
+
+ params.rPar.rec_enable = metaData.getRecEnable();
+ params.rPar.trigger_type = metaData.getTriggerType();
+ params.rPar.beam_type = metaData.getBeamType();
+ if (metaData.getBeamEnergy() != 0)
+ params.rPar.beam_energy = metaData.getBeamEnergy();
+
+ params.rPar.detector_mask_LS = metaData.getDetectorMask();
+ params.rPar.detector_mask_MS = metaData.getDetectorMask2();
+
+ for (const std::string& fmd : metaData.getFreeMetaDataStrings())
+ params.fmdStrings.push_back(fmd);
+ // if(fmd.find("Compression=") == std::string::npos)
+}
+
+
+StatusCode
+ByteStreamEventStorageOutputSvc::queryInterface(
+ const InterfaceID& riid, void** ppvInterface) {
+
+ if ( !ppvInterface ) return StatusCode::FAILURE;
+
+ // find indirect interfaces :
+ if (ByteStreamOutputSvc::interfaceID().versionMatch(riid)) {
+ *ppvInterface = dynamic_cast<ByteStreamOutputSvc*>(this);
+ } else if (base_class::queryInterface(riid, ppvInterface).isSuccess()) {
+ return StatusCode::SUCCESS;
+ } else {
+ // Interface is not directly available: try out a base class
+ return ::AthService::queryInterface(riid, ppvInterface);
+ }
+ addRef();
+ return StatusCode::SUCCESS;
}
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h
index 8c9daa9a515e88eb63e0c80405a07cad86e4303f..fb784c48e69e0657f7948a3731463a0caadc609e 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h
@@ -1,24 +1,40 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
- */
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
-#ifndef BYTESTREAMEVENTSTORAGEOUTPUTSVC_H
-#define BYTESTREAMEVENTSTORAGEOUTPUTSVC_H
+#ifndef EVENT_BYTESTREAMCNVSVC_SRC_BYTESTREAMEVENTSTORAGEOUTPUTSVC_H_
+#define EVENT_BYTESTREAMCNVSVC_SRC_BYTESTREAMEVENTSTORAGEOUTPUTSVC_H_
/** @file ByteStreamEventStorageOutputSvc.h
- * @brief This file contains the class definition for the ByteStreamEventStorageOutputSvc class.
+ * @brief This file contains the class definition for the
+ * ByteStreamEventStorageOutputSvc class.
+ *
+ * Writes out BS events to a file, the most obvious thing to do. Used to test
+ * running trigger code in offline athena and to write DRAW output, for example
+ * * Trigger test: test_trig_data_v1Dev_writeBS_build.py.
+ * * DRAW production:
+ * from ByteStreamCnvSvc import WriteByteStream
+ * StreamBSFileOutput = WriteByteStream.getStream("EventStorage",
+ * "StreamBSFileOutput")
+ *
* @author Peter van Gemmeren <gemmeren@anl.gov>
+ * @author Frank Berghaus <fberghaus@anl.gov>
**/
-
#include <memory>
+#include <mutex>
+#include <string>
-#include "EventStorage/EventStorageRecords.h"
#include "ByteStreamDataWriter.h"
-
#include "ByteStreamCnvSvc/ByteStreamOutputSvc.h"
+
+#include "AthenaKernel/SlotSpecificObj.h"
+#include "ByteStreamData/ByteStreamMetadataContainer.h"
#include "ByteStreamData/RawEvent.h"
+#include "EventStorage/EventStorageRecords.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "GaudiKernel/extends.h"
#include "GaudiKernel/IIoComponent.h"
+#include "GaudiKernel/IIoComponentMgr.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -27,69 +43,166 @@ class ByteStreamMetadata;
/** @class ByteStreamEventStorageOutputSvc
- * @brief This class provides the services for writing FullEventFragment into file.
- * This class implements the interface ByteStreamOutputSvc for the conversion service to write the output.
+ * @brief This class provides the services for writing FullEventFragment into
+ * file.
+ * This class implements the interface ByteStreamOutputSvc for the conversion
+ * service to write the output to a file.
**/
-class ByteStreamEventStorageOutputSvc
-: public ByteStreamOutputSvc
-, virtual public IIoComponent
-{
-public:
+class ByteStreamEventStorageOutputSvc :
+ public extends< ByteStreamOutputSvc, IIoComponent > {
+ public:
+ using extends::extends;
+
/// Constructors:
- ByteStreamEventStorageOutputSvc(const std::string& name, ISvcLocator* pSvcLocator);
+ ByteStreamEventStorageOutputSvc(
+ const std::string& name, ISvcLocator* pSvcLocator);
- /// Destructor.
- virtual ~ByteStreamEventStorageOutputSvc();
+ /// Destructor.
+ virtual ~ByteStreamEventStorageOutputSvc() {}
/// Required of all Gaudi Services
- virtual StatusCode initialize() override;
- virtual StatusCode stop () override;
- virtual StatusCode finalize () override;
+ StatusCode initialize() override;
+ StatusCode stop() override;
+ StatusCode finalize() override;
+ StatusCode
+ queryInterface(const InterfaceID& riid, void** ppvInterface) override;
- /// Required of all Gaudi services: see Gaudi documentation for details
- StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface) override;
/// Implementation of the ByteStreamOutputSvc interface method putEvent.
- virtual bool putEvent(RawEvent* re) override;
- virtual bool putEvent(RawEvent* re, const EventContext& ctx) override;
+ bool putEvent(RawEvent* re) override;
+ bool putEvent(RawEvent* re, const EventContext& ctx) override;
// Callback method to reinitialize the internal state of the component
// for I/O purposes (e.g. upon @c fork(2))
- virtual StatusCode io_reinit() override;
+ StatusCode io_reinit() override;
+
+ private: // properties
+ //!< directory for the data files
+ Gaudi::Property<std::string> m_inputDir{this, "OutputDirectory", "",
+ "directory for the data files"};
+
+ //!< Project Tag
+ Gaudi::Property<std::string> m_projectTag{this, "ProjectTag", "",
+ "part of filename"};
+
+ //!< Application Name
+ Gaudi::Property<std::string> m_appName{this, "AppName", "",
+ "part of filename"};
+
+ //!< File Tag
+ Gaudi::Property<std::string> m_fileTag{this, "FileTag", "",
+ "part of filename"};
+
+ //!< stream type
+ Gaudi::Property<std::string> m_streamType{this, "StreamType", "",
+ "part of filename"};
+
+ //!< stream name
+ Gaudi::Property<std::string> m_streamName{this, "StreamName", "",
+ "part of filename"};
+
+ //!< eformat event version to produce, "v40" for run1, or "current"
+ Gaudi::Property<std::string> m_eformatVersion{this, "EformatVersion",
+ "current", "Version of the event format data, use \"v40\" or \"run1\" "
+ "for run1, \"current\" for most current version (default)."};
+
+ //!< EventStorage BS version to produce, "v5" for run1, or "current"
+ Gaudi::Property<std::string> m_eventStorageVersion{this,
+ "EventStorageVersion", "current", "Version of the ByteStream file data, "
+ "use \"v5\" or \"run1\" for run1, \"current\" for most current version "
+ "(default)."};
+
+ //!< stream name for multiple output
+ Gaudi::Property<std::string> m_bsOutputStreamName{this, "BSOutputStreamName",
+ name(), "stream name for muliple output"};
+
+ //! use this string for filename, not from the "AgreedFileName"
+ Gaudi::Property<std::string> m_simpleFileName{this, "SimpleFileName", "",
+ "for filename not from AgreedFileName"};
+
+ //!< luminosity block number
+ Gaudi::Property<int> m_lumiBlockNumber{this, "LumiBlockNumber", 0,
+ "part of filename"};
+
+ //!< run number
+ Gaudi::Property<int> m_run{this, "RunNumber", 0, "part of filename"};
+
+ //!< Dump fragments
+ Gaudi::Property<bool> m_dump{this, "DumpFlag", false, "dump fragments"};
+ //!< Write eventless files
+ Gaudi::Property<bool> m_writeEventless{this, "WriteEventlessFiles", true,
+ ""};
-private: // internal member functions
+ //!< Compress events
+ Gaudi::Property<bool> m_compressEvents{this, "CompressEvents", false, ""};
+
+ //!< number of MB per file
+ Gaudi::Property<unsigned int> m_maxFileMB{this, "MaxFileMB", 10000,
+ "MB per file"};
+
+ //!< number of events per file
+ Gaudi::Property<unsigned int> m_maxFileNE{this, "MaxFileNE", 100000,
+ "evens per file"};
+
+ SG::ReadHandleKey< xAOD::EventInfo > m_eventInfoKey{this, "EventInfoKey",
+ "EventInfo", "Key for EventInfo object in event store"};
+
+ SG::ReadHandleKey< ByteStreamMetadataContainer > m_byteStreamMetadataKey{this,
+ "ByteStreamMetadataKey", "MetaDataStore+ByteStreamMetadata",
+ "Key for bytestream metadata object in metadata store"};
+
+ ServiceHandle< IIoComponentMgr > m_ioMgr{"IoComponentMgr", name()};
+
+ private: // data
+ //! number of event counter
+ int m_totalEventCounter{0};
+
+ bool m_isRun1{false};
+
+ //! pointer to DataWriter
+ std::unique_ptr<ByteStreamDataWriter> m_dataWriter;
+
+ //! mutex to lock data writer during initialization or writing
+ std::mutex m_dataWriterMutex;
+
+ private: // internal helper functions
/// reinitialize the service when a @c fork() occured/was-issued
StatusCode reinit();
- void checkForUserMetadata(EventStorage::freeMetaDataStrings& freeMetaDataStrings);
-
-private: // data
- int m_totalEventCounter; //!< number of event counter
- std::unique_ptr<ByteStreamDataWriter> m_dataWriter; //!< pointer to DataWriter
-
-private: // properties
- Gaudi::Property<std::string> m_inputDir; //!< directory for the data files
- Gaudi::Property<std::string> m_projectTag; //!< Project Tag
- Gaudi::Property<std::string> m_appName; //!< Application Name
- Gaudi::Property<std::string> m_fileTag; //!< File Tag
- Gaudi::Property<std::string> m_streamType; //!< stream type
- Gaudi::Property<std::string> m_streamName; //!< stream name
- Gaudi::Property<int> m_lumiBlockNumber;//!< luminosity block number
- Gaudi::Property<int> m_run; //!< run number
- Gaudi::Property<bool> m_dump; //!< Dump fragments
- Gaudi::Property<bool> m_writeEventless; //!< Write eventless files
- Gaudi::Property<bool> m_compressEvents; //!< Compress events
- Gaudi::Property<unsigned int> m_maxFileMB; //!< number of MB per file
- Gaudi::Property<unsigned int> m_maxFileNE; //!< number of events per file
- Gaudi::Property<std::string> m_eformatVersion; //!< eformat event version to produce, "v40" for run1, or "current"
- Gaudi::Property<std::string> m_eventStorageVersion; //!< EventStorage BS version to produce, "v5" for run1, or "current"
- Gaudi::Property<std::string> m_bsOutputStreamName;//!< stream name for multiple output
- Gaudi::Property<std::string> m_simpleFileName; //!< use this string for filename, not from the "AgreedFileName"
-
-private: // internal helper functions
+
/// initialize EventStorage's DataWriter
- bool initDataWriter();
- bool initDataWriterContents(const EventInfo*, const ByteStreamMetadata* );
+ bool initDataWriter(const EventContext* ctx = nullptr);
+ bool initDataWriterContents(
+ const xAOD::EventInfo*, const ByteStreamMetadata*);
+ const ByteStreamMetadata * getByteStreamMetadata();
+ const ByteStreamMetadata * getByteStreamMetadata(const EventContext& ctx);
+
+ struct EventCache {
+ inline void releaseEvent() {
+ buffer.reset(nullptr);
+ size = 0;
+ }
+
+ //! Underlying data structure
+ std::unique_ptr< uint32_t[] > buffer{nullptr};
+
+ unsigned int size{0};
+ };
+
+ //! Cache of event data for each slot
+ SG::SlotSpecificObj<EventCache> m_eventCache;
+
+ /// Create DataWriter parameters from job properties
+ void updateDataWriterParameters(DataWriterParameters&) const;
+
+ /// Create DataWriter parameters from EventInfo
+ void updateDataWriterParameters(DataWriterParameters& params,
+ const xAOD::EventInfo& evtInfo) const;
+
+ /// Create DataWriter parameters from MetaData
+ void updateDataWriterParameters(DataWriterParameters& params,
+ const ByteStreamMetadata& metaData) const;
+
};
-#endif // BYTESTREAMEVENTSTORAGEOUTPUTSVC_H
+#endif // EVENT_BYTESTREAMCNVSVC_SRC_BYTESTREAMEVENTSTORAGEOUTPUTSVC_H_
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
index 83066ab18beaffecc9193d31e32136b3fcc35783..bb8db3e2d1cca39385db01cef1746e490768906e 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
@@ -92,14 +92,6 @@ public:
unsigned int getLumiBlock() const;
const std::vector<std::string>& getFreeMetaDataStrings() const;
-
- /**
- * pretty print bytestream metadata content
- */
- friend std::ostream& operator<<(std::ostream& os,
- const ByteStreamMetadata& bsmd);
-
-
private:
unsigned int m_runNumber;
unsigned int m_numEvents;
@@ -118,6 +110,12 @@ private:
};
+/**
+ * pretty print bytestream metadata content
+ */
+std::ostream& operator<<(std::ostream& os, const ByteStreamMetadata& bsmd);
+
+
#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(ByteStreamMetadata, 170625359, 1)
#endif
diff --git a/Event/EventBookkeeperTools/util/dump-cbk.cxx b/Event/EventBookkeeperTools/util/dump-cbk.cxx
index 37b02876dbec34b0d9534094c08b7e8a7a135eb4..45036386ec4c962616af7dd0140b1764ada323f5 100644
--- a/Event/EventBookkeeperTools/util/dump-cbk.cxx
+++ b/Event/EventBookkeeperTools/util/dump-cbk.cxx
@@ -12,7 +12,7 @@
#include <xAODRootAccess/tools/TFileAccessTracer.h>
// ASG
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <AsgTools/ToolHandle.h>
#include <AsgTools/AsgMetadataTool.h>
#include <AthAnalysisBaseComps/AthAnalysisHelper.h>
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
index 5e3236432c13837a73067574353c409d6f62cdc3..a080d7b9f4e808c1df6dbac9ab07f3e10eb5ad8e 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/InnerDetectorOverlay_jobOptions.py
@@ -24,6 +24,10 @@ if DetFlags.overlay.pixel_on() or DetFlags.overlay.SCT_on() or DetFlags.overlay.
job.InDetPixelRawDataProvider.RDOKey = overlayFlags.bkgPrefix()+"PixelRDOs"
else:
job.InDetPixelRawDataProvider.RDOKey = overlayFlags.dataStore()+"+PixelRDOs"
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ job.InDetPixelRawDataProvider.RegSelTool = makeRegSelTool_Pixel()
+
#ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "PixelRDO_Container/PixelRDOs" ]
#ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "Trk::PixelClusterContainer/PixelOnlineClusters" ]
else:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
index 93b4df2d61bad269b57508eb81e05b2e5f5067f7..f7559a0b402d0f1c0b8b66e6c45fc4c6bdc956ed 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
@@ -9,8 +9,8 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/T0","TrtCalibT0-Physics-BLK-UPD4-F
conddb.blockFolder("/MDT/RT")
conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT-UPD4-09-BLOB",force=True,forceData=True)
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT-UPD4-09-BLOB",force=True,forceData=True,className="CondAttrListCollection")
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
#can try using MC T0 constants, or force a data tag to use
conddb.blockFolder("/MDT/T0")
@@ -25,7 +25,7 @@ conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force
conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
#conddb.addFolder("PIXEL_OFL","/PIXEL/ReadoutSpeed",force=True,forceData=True)
#conddb.blockFolder("/GLOBAL/BField/Map")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
index 8a0cc248cf7e95301c2a8f1c6fc921e88653f873..6211fc2ff880833cc291e428ab7b4e3849d42701 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
@@ -9,14 +9,14 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/RT","TrtCalibRt-MCnewDigi_ToTon_7T
conddb.blockFolder("/MDT/RT")
conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
conddb.blockFolder("/PIXEL/HLT/DCS/HV")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
index cb78a7e3d084fca5bc3ab52962a8e6d4bf5063ce..a1945ef1d8abbb150cefd1008d8545357d044ef7 100755
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
@@ -12,14 +12,14 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/RT","TrtCalibRt-MCnewDigi_ToTon_7T
#conddb.blockFolder("/MDT/RT")
#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
#conddb.blockFolder("/MDT/RTBLOB")
-#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
conddb.blockFolder("/PIXEL/HLT/DCS/HV")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/PIXEL/PixReco")
conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixReco","PixReco-SIM-RUN12-000-01",force=True,forceMC=True)
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
index 1f253cb14cb395d6c613cb7baa02d0720a35fdaa..aa6723b9d7c4e74c4b2099884691487981f01d65 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
@@ -13,7 +13,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
conddb.addOverride("/LAR/ElecCalibOfl/Shape/RTM/5samples1phase","LARElecCalibOflShapeRTM5samples1phase-UPD1-04")
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -74,7 +74,7 @@ conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/LorentzAngleScale","PixLorentzAngleS
conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/TEMPERATURE","PixDCSTemp-SIM-RUN1-000-00",force=True,forceMC=True)
conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True,className="AthenaAttributeList")
conddb.blockFolder("/SCT/DCS/HV")
conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/HV","SctDcsHv-01",force=True,forceMC=True)
conddb.blockFolder("/SCT/DCS/MODTEMP")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
index 8aff6fb2e8364b5f3235ceb3dfdfc161c15ebf00..07c9cfb66d52e1017a575ab17cc85758b1216730 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
#conddb.blockFolder("/MDT/RT")
#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
#from Guillaume
conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -77,7 +77,7 @@ if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True,className="AthenaAttributeList")
mcIDoverlay=False
if mcIDoverlay:
printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -123,16 +123,16 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
conddb.blockFolder("/LAR/BadChannels/BadChannels")
conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels")
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LARBadChannelsBadChannels-HECAQ3Missing",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LARBadChannelsBadChannels-HECAQ3Missing",force=True,forceMC=True,className="CondAttrListCollection")
conddb.blockFolder("/LAR/BadChannels/MissingFEBs")
conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs")
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
dofolderoverrides = True
if dofolderoverrides:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
index 5b819a37b2c704664951a227fcf9eaf83a790b89..f0ebc6b652a01142121312a5e7e0d7a01164bcef 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
#conddb.blockFolder("/MDT/RT")
#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
#from Guillaume
conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -80,7 +80,7 @@ if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
mcIDoverlay=False
if mcIDoverlay:
printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -126,7 +126,7 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
index 33cd496fa9c30b9a8e4aa2efcae0f923db90f46a..acf529239d1a7028455153bbf02dd5a6397b771f 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
#conddb.blockFolder("/MDT/RT")
#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
#from Guillaume
conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-23 ")
conddb.blockFolder("/LAR/BadChannels/BadChannels");
conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
if not "EOJT_alignMC" in globals():
printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -68,7 +68,7 @@ if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
mcIDoverlay=False
if mcIDoverlay:
printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -114,9 +114,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
dofolderoverrides = True
if dofolderoverrides:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
index 52de09ebb415d8e9353d0f35715814bfdc341cbb..54c3b25854d8dd0a293bec34304be82b7a29e0e9 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
#conddb.blockFolder("/MDT/RT")
#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
#from Guillaume
conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-26 MC condition tag ")
conddb.blockFolder("/LAR/BadChannels/BadChannels");
conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
if not "EOJT_alignMC" in globals():
printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -68,7 +68,7 @@ if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
mcIDoverlay=False
if mcIDoverlay:
printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -106,9 +106,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
dofolderoverrides = True
runN=365681
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
index d3ac9ef535aa00f719dca662f20677df25fd8bd3..40622f6a7e96f1d9932e6dc5fbd7ae8168de6e4c 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
#conddb.blockFolder("/MDT/RT")
#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
#from Guillaume
conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-26 ")
conddb.blockFolder("/LAR/BadChannels/BadChannels");
conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
if not "EOJT_alignMC" in globals():
printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -68,7 +68,7 @@ if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
mcIDoverlay=False
if mcIDoverlay:
printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -104,9 +104,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
dofolderoverrides = True
if dofolderoverrides:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
index 5b997f90004ede866f1384da0a31f68aadee12bf..c9d33be0789a5c1c90abbf371a1dcf8bd3706715 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
#conddb.blockFolder("/MDT/RT")
#conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
#from Guillaume
conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-27 MC condition tag ")
conddb.blockFolder("/LAR/BadChannels/BadChannels");
conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
if not "EOJT_alignMC" in globals():
printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -62,7 +62,7 @@ if DetFlags.writeRDOPool.pixel_on():
conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
mcIDoverlay=True
if mcIDoverlay:
printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -102,9 +102,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
dofolderoverrides = True
runN=365681
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
index 08be4e5deb40848a3ce9e0dc4bd5d7b8724a04a2..21112501e6e14f992e4a898bfce1dad540714f0f 100755
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
@@ -12,14 +12,14 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/RT","TrtCalibRt-MC09_900GeV-REP-Fi
conddb.blockFolder("/MDT/RT")
conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
conddb.blockFolder("/PIXEL/HLT/DCS/HV")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
conddb.blockFolder("/TRT/Cond/DigVers")
conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
diff --git a/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h
index ff100b1dab28b91caaa5c586aa0ede30cccbd56f..d156f3ed2ae67676ef026e5a01d906399bbc08e3 100644
--- a/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h
+++ b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h
@@ -87,8 +87,12 @@ namespace xAOD {
Topo_633 = 12,
// transient cluster for AODCellContainer
SW_7_11 = 13,
- //New (2016) egamma cluster
- SuperCluster=14,
+ //New (2016) egamma cluster
+ SuperCluster=14,
+ //New (2020) cluster representation of towers
+ Tower_01_01 = 15,
+ Tower_005_005 = 16,
+ Tower_fixed_area = 17,
CSize_Unknown = 99
};
diff --git a/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.cxx b/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.cxx
index 12082d97ac42f6c6c50029a06c307755c6d8863f..640d411f9f4b538e91f52b1c019178880399ccf6 100644
--- a/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.cxx
+++ b/Event/xAOD/xAODCoreAthenaPool/src/xAODShallowAuxContainerCnv.cxx
@@ -22,8 +22,8 @@ xAODShallowAuxContainerCnv::createPersistentWithKey( xAOD::ShallowAuxContainer*
///Here follows a specialized version of the copyAuxStoreThinned method, with a few changes for shallow aux containers
const xAOD::ShallowAuxContainer& orig = *trans; //need the 'const' version to ensure use the const methods!
- size_t nremaining = 0;
size_t size = orig.size();
+ size_t nremaining = size;
std::string key2 = key;
if (key2.size() >= 4 && key2.substr (key2.size()-4, 4) == "Aux.")
@@ -37,9 +37,26 @@ xAODShallowAuxContainerCnv::createPersistentWithKey( xAOD::ShallowAuxContainer*
}
//if there is no thinning to do, then just return a regular copy
- if(!dec) return new xAOD::ShallowAuxContainer(orig);
+ // Be sure to also check for variable vetoes.
+ if(!dec) {
+ SG::auxid_set_t ids;
+ if (info) {
+ ids = orig.getSelectedAuxIDs();
+ ids &= info->m_vetoed;
+ }
+ if (ids.empty()) {
+ return new xAOD::ShallowAuxContainer(orig);
+ }
+ }
xAOD::ShallowAuxContainer* newcont = new xAOD::ShallowAuxContainer; //dont use copy constructor (like copyThinned.h), want it to have it's own internal store
- newcont->setParent(trans->parent());newcont->setShallowIO(trans->shallowIO());
+ newcont->setParent(trans->parent());
+
+ // newcont should be set for shallow IO regardless of the setting
+ // of the original container. Below we're going to copy all the
+ // variables that should be written. Any variables left in the
+ // parent that are not also in newcont are ones that were
+ // explicitly vetoed.
+ newcont->setShallowIO(true);
// Access the auxiliary type registry:
SG::AuxTypeRegistry& r = SG::AuxTypeRegistry::instance();
diff --git a/Event/xAOD/xAODEventFormat/CMakeLists.txt b/Event/xAOD/xAODEventFormat/CMakeLists.txt
index c5ebb7ade25739f7700feaf0f101265a4423c58f..fe247a485ef2f775040cf8728553119fdf08e5b9 100644
--- a/Event/xAOD/xAODEventFormat/CMakeLists.txt
+++ b/Event/xAOD/xAODEventFormat/CMakeLists.txt
@@ -1,28 +1,20 @@
-################################################################################
-# Package: xAODEventFormat
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# Declare the package name:
+# Declare the package name.
atlas_subdir( xAODEventFormat )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODCore )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
+# Component(s) in the package.
atlas_add_library( xAODEventFormat
- Root/*.cxx
- PUBLIC_HEADERS xAODEventFormat
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES xAODCore
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ xAODEventFormat/*.h xAODEventFormat/versions/*.h Root/*.cxx
+ PUBLIC_HEADERS xAODEventFormat
+ LINK_LIBRARIES xAODCore )
atlas_add_dictionary( xAODEventFormatDict
- xAODEventFormat/xAODEventFormatDict.h
- xAODEventFormat/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODCore xAODEventFormat )
+ xAODEventFormat/xAODEventFormatDict.h
+ xAODEventFormat/selection.xml
+ LINK_LIBRARIES xAODCore xAODEventFormat )
+# Test(s) in the package.
+atlas_add_test( eventformat_test
+ SOURCES test/ut_xaodeventformat_eventformat_test.cxx
+ LINK_LIBRARIES xAODEventFormat )
diff --git a/Event/xAOD/xAODEventFormat/share/eventformat_test.ref b/Event/xAOD/xAODEventFormat/share/eventformat_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..e0f9b2861ad036669f801458cbd139bf76568484
--- /dev/null
+++ b/Event/xAOD/xAODEventFormat/share/eventformat_test.ref
@@ -0,0 +1,3 @@
+xAOD::EventFormat:
+1. element: Branch name: SGKey1, Class name: xAOD::Type1, Hash: 0x00000101
+2. element: Branch name: SGKey2, Class name: xAOD::Type2, Hash: 0x00000102
diff --git a/Event/xAOD/xAODEventFormat/test/ut_xaodeventformat_eventformat_test.cxx b/Event/xAOD/xAODEventFormat/test/ut_xaodeventformat_eventformat_test.cxx
index 559b64a4d98a73967d0d797372448cd8424fd038..855fac6ede18c9eeec3faed216ca19f57a0f7fe3 100644
--- a/Event/xAOD/xAODEventFormat/test/ut_xaodeventformat_eventformat_test.cxx
+++ b/Event/xAOD/xAODEventFormat/test/ut_xaodeventformat_eventformat_test.cxx
@@ -1,31 +1,29 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: ut_xaodeventformat_eventformat_test.cxx 629218 2014-11-18 17:38:06Z krasznaa $
+// Local include(s).
+#include "xAODEventFormat/EventFormat.h"
-// System include(s):
+// System include(s).
+#undef NDEBUG
+#include <cassert>
#include <iostream>
-// Local include(s):
-#include "xAODEventFormat/EventFormat.h"
+void test1( const xAOD::EventFormat& ef ) {
-/// The name of the application
-static const char* APP_NAME = "ut_xaodeventformat_eventformat_test";
-
-/// Simple macro for checking boolean expressions
-#define SIMPLE_ASSERT( EXP ) \
- do { \
- const bool ret = EXP; \
- if( ! ret ) { \
- std::cerr << APP_NAME << " " __FILE__ << ":" \
- << __LINE__ << " (" \
- << __PRETTY_FUNCTION__ << ") Failed to " \
- << "evaluate: \"" << #EXP << "\"" \
- << std::endl; \
- return 1; \
- } \
- } while( 0 )
+ // Some simple checks:
+ assert( ef.exists( "SGKey1" ) == true );
+ assert( ef.exists( 0x102 ) == true );
+ assert( ef.exists( "SGKey3" ) == false );
+ assert( ef.exists( 0x123 ) == false );
+ assert( ef.get( 0x101 ) );
+ assert( ef.get( "SGKey2" ) );
+ assert( ef.get( 0x101 )->branchName() == "SGKey1" );
+ assert( ef.get( "SGKey1" )->className() == "xAOD::Type1" );
+ assert( ef.get( "SGKey2" )->hash() == 0x102 );
+ assert( ef.get( 0x102 )->parentName() == "Bla" );
+}
int main() {
@@ -36,19 +34,20 @@ int main() {
ef.add( xAOD::EventFormatElement( "SGKey1", "xAOD::Type1", "Bla", 0x101 ) );
ef.add( xAOD::EventFormatElement( "SGKey2", "xAOD::Type2", "Bla", 0x102 ) );
- // Some simple checks:
- SIMPLE_ASSERT( ef.exists( "SGKey1" ) == true );
- SIMPLE_ASSERT( ef.exists( 0x102 ) == true );
- SIMPLE_ASSERT( ef.exists( "SGKey3" ) == false );
- SIMPLE_ASSERT( ef.exists( 0x123 ) == false );
- SIMPLE_ASSERT( ef.get( 0x101 ) );
- SIMPLE_ASSERT( ef.get( "SGKey2" ) );
- SIMPLE_ASSERT( ef.get( 0x101 )->branchName() == "SGKey1" );
- SIMPLE_ASSERT( ef.get( "SGKey1" )->className() == "xAOD::Type1" );
- SIMPLE_ASSERT( ef.get( "SGKey2" )->hash() == 0x102 );
- SIMPLE_ASSERT( ef.get( 0x102 )->parentName() == "Bla" );
-
- // And finally print it:
+ // Execute simple tests on it.
+ test1( ef );
+
+ // Test that the object can be copied correctly using the automatically
+ // generated constructors/copy operators.
+ xAOD::EventFormat copy1( ef );
+ xAOD::EventFormat copy2;
+ copy2 = ef;
+
+ // Test the two copies.
+ test1( copy1 );
+ test1( copy2 );
+
+ // And finally print the object.
std::cout << ef << std::endl;
// Return gracefully:
diff --git a/Event/xAOD/xAODEventFormatCnv/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODEventFormatCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..17d5abf4053f183bffd46a0d92a314d5af92c39c
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODEventFormatCnv
diff --git a/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt b/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt
index e7587ed6183d467a09f8ecbd20eaf853ee04945d..b488fbda41a57d2a3b031d51d638142078b91e9f 100644
--- a/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt
@@ -1,26 +1,90 @@
-################################################################################
-# Package: xAODEventFormatCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# Declare the package name:
+# Declare the package name.
atlas_subdir( xAODEventFormatCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODEventFormat
- GaudiKernel
- PRIVATE
- Control/AthContainers
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate )
-
-# Component(s) in the package:
+find_package( xAODUtilities )
+
atlas_add_component( xAODEventFormatCnv
- src/*.cxx
- src/components/*.cxx
- LINK_LIBRARIES xAODEventFormat GaudiKernel AthContainers AthenaBaseComps AthenaKernel StoreGateLib SGtests )
+ src/*.h src/*.cxx src/components/*.cxx
+ LINK_LIBRARIES
+ GaudiKernel AthenaKernel AthenaBaseComps StoreGateLib xAODEventFormat )
+
+atlas_add_component( xAODEventFormatCnvTest
+ src/test/*.h src/test/*.cxx
+ LINK_LIBRARIES
+ GaudiKernel
+ AthenaBaseComps
+ AthContainers
+ AthContainersInterfaces
+ StoreGateLib
+ xAODCore
+ xAODEventFormat )
+
+atlas_add_library( xAODEventFormatCnvTestLib
+ src/test/*.h src/test/*.cxx
+ PUBLIC_HEADERS xAODEventFormatCnv
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES
+ GaudiKernel
+ AthenaKernel
+ AthContainers
+ AthContainersInterfaces
+ xAODCore
+ xAODEventFormat
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps StoreGateLib )
+
+
+atlas_add_poolcnv_library( xAODEventFormatCnvTestAthenaPoolCnv
+ src/test/cnv/*.h src/test/cnv/*.cxx
+ FILES
+ xAODEventFormatCnv/test/A.h
+ xAODEventFormatCnv/test/AVec.h
+ xAODEventFormatCnv/test/AAuxContainer.h
+ TYPES_WITH_NAMESPACE
+ xAODMakerTest::A
+ xAODMakerTest::AVec
+ xAODMakerTest::AAuxContainer
+ CNV_PFX xAODMakerTest
+ LINK_LIBRARIES
+ AthenaPoolCnvSvcLib
+ AthenaPoolUtilities
+ AthContainers
+ xAODEventFormatCnvTestLib )
+
+atlas_add_dictionary( xAODEventFormatCnvTestDict
+ xAODEventFormatCnv/test/xAODEventFormatCnvTestDict.h
+ xAODEventFormatCnv/test/selection.xml
+ ${_selectionFile}
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES xAODCore xAODEventFormatCnvTestLib
+ EXTRA_FILES src/test/dict/*.cxx )
+
+atlas_add_xaod_smart_pointer_dicts(
+ INPUT xAODEventFormatCnv/test/selection.xml
+ OUTPUT _selectionFile
+ CONTAINERS "xAODMakerTest::AVec_v1" )
+
+
+# Install files from the package.
+atlas_install_joboptions( share/*.py )
+
+atlas_depends_on_subdirs(
+ PUBLIC
+ PRIVATE AtlasTest/TestTools )
+
+# Test(s) in the package.
+atlas_add_test( Write
+ SCRIPT athena.py --threads=8 xAODEventFormatCnv/EventFormatWriteTestJobOptions.py )
+
+atlas_add_test( Read
+ SCRIPT athena.py --threads=8 xAODEventFormatCnv/EventFormatReadTestJobOptions.py
+ PROPERTIES DEPENDS "xAODEventFormatCnv_Write_ctest" )
-# Install files from the package:
-atlas_install_headers( xAODEventFormatCnv )
+atlas_add_test( ReadWrite
+ SCRIPT athena.py --threads=8 xAODEventFormatCnv/EventFormatReadWriteJobOptions.py
+ PROPERTIES DEPENDS "xAODEventFormatCnv_Write_ctest" )
+atlas_add_test( Content
+ SCRIPT test/TestEventFormatContent.py readWriteTestStream0.pool.root EventFormat
+ PROPERTIES DEPENDS "xAODEventFormatCnv_ReadWrite_ctest" )
diff --git a/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadTestJobOptions.py b/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadTestJobOptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..00c39c8f1483d1fe1e84cd37a600fbc20b487b44
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadTestJobOptions.py
@@ -0,0 +1,43 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""Test reading xAOD::EventFormat
+
+Read in POOL files created by the write test job options. Uses the metadata
+tool to transcribe the EventFormat metadata to the MetaDataStore. Then an
+algorithm reads the EventFormat from the MetaDataStore and prints the content.
+
+ Typical usage example
+ 1. run: athena xAODEventFormatCnv/EventFormatWriteTestJobOptions.py
+ 2. run: athena xAODEventFormatCnv/EventFormatReadTestJobOptions.py
+"""
+from AthenaCommon import CfgMgr
+from AthenaCommon.AlgSequence import AlgSequence
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+from AthenaCommon.AppMgr import theApp
+from AthenaCommon.AppMgr import ToolSvc
+import AthenaPoolCnvSvc.ReadAthenaPool
+
+
+# grab input files
+svcMgr.EventSelector.InputCollections = [
+ "testStream0.pool.root",
+ "testStream1.pool.root",
+ "testStream2.pool.root",
+ "testStream3.pool.root",
+ "testStream4.pool.root",
+]
+
+# propogate xAOD::EventFormat from InputMetaDataStore to MetaDataStore
+ToolSvc += CfgMgr.xAODMaker__EventFormatMetaDataTool(
+ "EventFormatMetaDataTool",
+ OutputLevel=1,
+)
+svcMgr.MetaDataSvc.MetaDataTools += [ToolSvc.EventFormatMetaDataTool]
+
+
+# Add the xAOD::EventFormat printer algorithm to main algorithm sequence
+algSeq = AlgSequence()
+algSeq += CfgMgr.xAODMakerTest__EventFormatPrinterAlg()
+
+# read the last event of the first file and the first event of the second file
+# to test metadata access across file boundary
+theApp.EvtMax = -1
diff --git a/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadWriteJobOptions.py b/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadWriteJobOptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..3764709cce5db7d51058df87979bd7fc928e9d0c
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadWriteJobOptions.py
@@ -0,0 +1,77 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""Test writing xAOD::EventFormat in job reading from input
+
+Read in POOL files created by the write test job options. Uses the metadata
+tool to transcribe the EventFormat metadata to the MetaDataStore. Then an
+algorithm reads the EventFormat from the MetaDataStore and prints the content.
+
+ Typical usage example
+ 1. run: athena xAODEventFormatCnv/EventFormatWriteTestJobOptions.py
+ 2. run: athena xAODEventFormatCnv/EventFormatReadWriteTestJobOptions.py
+"""
+from AthenaCommon import CfgMgr
+from AthenaCommon.AlgSequence import AlgSequence
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+from AthenaCommon.AppMgr import theApp
+from AthenaCommon.AppMgr import ToolSvc
+import AthenaPoolCnvSvc.ReadAthenaPool
+from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
+from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
+
+VERBOSE = 1
+DEBUG = 2
+INFO = 3
+NUMBER_OF_STREAMS = 1
+
+
+def makeStream(name='TestStream'):
+ """create and return an output stream"""
+ test_stream = MSMgr.NewStream(
+ StreamName=name,
+ FileName="{}.pool.root".format(name),
+ noTag=True,
+ )
+ # Add dummy items for testing
+ test_stream.AddItem("xAOD::ElectronContainer#TestElectrons")
+ test_stream.AddItem("xAOD::ElectronAuxContainer#TestElectronsAux.")
+ return test_stream
+
+
+# grab input files
+svcMgr.EventSelector.InputCollections = [
+ "testStream0.pool.root",
+ "testStream1.pool.root",
+]
+
+# propogate xAOD::EventFormat from InputMetaDataStore to MetaDataStore
+ToolSvc += CfgMgr.xAODMaker__EventFormatMetaDataTool(
+ "EventFormatMetaDataTool",
+ OutputLevel=VERBOSE,
+)
+svcMgr.MetaDataSvc.MetaDataTools += [ToolSvc.EventFormatMetaDataTool]
+
+
+# Add the xAOD::EventFormat printer algorithm to main algorithm sequence
+algSeq = AlgSequence()
+algSeq += CfgMgr.xAODMakerTest__EventFormatPrinterAlg()
+
+
+# Add (an) xAOD creator algorithm(s) to the job.
+algSeq += CfgMgr.xAODMakerTest__ACreatorAlg(
+ "ACreator", OutputKey="TestObjects2"
+)
+
+# Write some output streams to file with this container.
+streams = [
+ makeStream('readWriteTestStream{}'.format(i)) for i in range(NUMBER_OF_STREAMS)
+]
+
+# Make sure event info is available
+algSeq += xAODMaker__EventInfoCnvAlg()
+
+svcMgr.MessageSvc.OutputLevel = INFO
+svcMgr.MetaDataSvc.OutputLevel = DEBUG
+
+# read the last event of the first file and the first event of the second file
+# to test metadata access across file boundary
+theApp.EvtMax = -1
diff --git a/Event/xAOD/xAODEventFormatCnv/share/EventFormatWriteTestJobOptions.py b/Event/xAOD/xAODEventFormatCnv/share/EventFormatWriteTestJobOptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..20cd4fba85ff4c8f070c8ec834a4d9e327ed82a3
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/share/EventFormatWriteTestJobOptions.py
@@ -0,0 +1,63 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""Test writing event format information
+
+Open an arbitrary number of streams to write to. An algorithm creates dummy
+electrons. The EventFormatStreamHelperTool creates the corresponding
+EventFormat metadata in the output stream.
+
+ Typical usage example:
+
+ athena xAODEventFormatCnv/EventFormatWriteTestJobOptions.py
+"""
+from AthenaCommon import CfgMgr
+from AthenaCommon.AlgSequence import AlgSequence
+from AthenaCommon.AppMgr import theApp
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
+from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
+from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
+
+
+DEBUG = 2
+INFO = 3
+EVENTS_PER_FILE = 5
+NUMBER_OF_STREAMS = 5
+
+
+def makeStream(name='TestStream'):
+ """create and return an output stream"""
+ test_stream = MSMgr.NewStream(
+ StreamName=name,
+ FileName="{}.pool.root".format(name),
+ noTag=True,
+ )
+ # Add dummy items for testing
+ test_stream.AddItem("xAODMakerTest::AVec#TestAVec")
+ test_stream.AddItem("xAODMakerTest::AAuxContainer#TestAAuxContainer.")
+ for tool in test_stream.GetEventStream().HelperTools:
+ if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
+ tool.TypeNames += ['.*xAODMakerTest::.*']
+ break
+ return test_stream
+
+
+algSeq = AlgSequence()
+
+# Add (an) xAOD creator algorithm(s) to the job.
+algSeq += CfgMgr.xAODMakerTest__ACreatorAlg(
+ "ACreator", OutputKey="TestObject"
+)
+
+# Write some output streams to file with this container.
+streams = [
+ makeStream('testStream{}'.format(i)) for i in range(NUMBER_OF_STREAMS)
+]
+
+# Make sure event info is available
+algSeq += xAODMaker__EventInfoCnvAlg()
+
+# Some extra job parameters.
+theApp.EvtMax = EVENTS_PER_FILE
+
+svcMgr.MessageSvc.OutputLevel = INFO
+svcMgr.MetaDataSvc.OutputLevel = DEBUG
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx b/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx
index c3092d2ac630bf8a92f71ecd12f168904f86922e..00de2a04b643d966a30fd1fb431f24d78fb1fee9 100644
--- a/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx
+++ b/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx
@@ -1,13 +1,13 @@
// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
// $Id: EventFormatMetaDataTool.cxx 651874 2015-03-05 14:16:19Z krasznaa $
// System include(s):
+#include <algorithm>
#include <stdexcept>
+#include <utility>
+#include <vector>
// Gaudi/Athena include(s):
#include "AthenaKernel/errorcheck.h"
@@ -17,126 +17,132 @@
namespace xAODMaker {
- /// Name of the incident sent around for metadata writing
- //static const char* METADATASTOP = "MetaDataStop";
-
- EventFormatMetaDataTool::EventFormatMetaDataTool( const std::string& type,
- const std::string& name,
- const IInterface* parent )
- : AthAlgTool( type, name, parent ),
- m_inputMetaStore( "StoreGateSvc/InputMetaDataStore", name ),
- m_outputMetaStore( "StoreGateSvc/MetaDataStore", name ),
- m_format() {
-
- declareProperty( "InputMetaStore", m_inputMetaStore );
- declareProperty( "OutputMetaStore", m_outputMetaStore );
- declareProperty( "InputKey", m_inputKey = "EventFormat" );
- declareProperty( "OutputKey", m_outputKey = "EventFormat" );
-
- declareInterface< ::IMetaDataTool >( this );
- }
-
- StatusCode EventFormatMetaDataTool::initialize() {
+EventFormatMetaDataTool::EventFormatMetaDataTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent):
+ AthAlgTool(type, name, parent) {
+ declareInterface< ::IMetaDataTool >(this);
+ }
+StatusCode
+ EventFormatMetaDataTool::initialize() {
// Greet the user:
- ATH_MSG_DEBUG( "Initialising - Package version: " << PACKAGE_VERSION );
- ATH_MSG_DEBUG( " InputMetaStore = " << m_inputMetaStore );
- ATH_MSG_DEBUG( " OutputMetaStore = " << m_outputMetaStore );
- ATH_MSG_DEBUG( " InputKey = " << m_inputKey );
- ATH_MSG_DEBUG( " OutputKey = " << m_outputKey );
+ ATH_MSG_DEBUG("Initialising - Package version: " << PACKAGE_VERSION);
+ ATH_MSG_DEBUG(" " << m_inputMetaStore);
+ ATH_MSG_DEBUG(" " << m_outputMetaStore);
+ ATH_MSG_DEBUG(" " << m_outputKey);
+ if (!m_inputKey.empty()) ATH_MSG_DEBUG(" " << m_inputKey);
// Connect to the metadata stores:
- ATH_CHECK( m_inputMetaStore.retrieve() );
- ATH_CHECK( m_outputMetaStore.retrieve() );
-
- // Reset the internal object if it exists:
- m_format.reset();
+ ATH_CHECK(m_inputMetaStore.retrieve());
+ ATH_CHECK(m_outputMetaStore.retrieve());
// Return gracefully:
return StatusCode::SUCCESS;
- }
-
-
- StatusCode EventFormatMetaDataTool::beginInputFile()
- {
- StatusCode sc = collectMetaData();
- if( sc.isFailure() ) {
- REPORT_ERROR( sc )
- << "Failed to collect metadata from the input file";
- throw std::runtime_error( "Failed to collect trigger configuration "
- "metadata from the input" );
- }
- return StatusCode::SUCCESS;
- }
-
+ }
- StatusCode EventFormatMetaDataTool::endInputFile()
- {
- return StatusCode::SUCCESS;
- }
+StatusCode
+ EventFormatMetaDataTool::beginInputFile() {
+ // lock the tool, so metaDataStop will wait for write to finish
+ std::lock_guard< std::mutex > guard(m_outputMutex);
+ // Create object to hold information from the new file
+ auto format = std::make_unique< xAOD::EventFormat >();
- StatusCode EventFormatMetaDataTool::metaDataStop()
- {
- StatusCode sc = writeMetaData();
- if( sc.isFailure() ) {
- REPORT_ERROR( sc )
- << "Failed to write metadata to the output store";
- throw std::runtime_error( "Failed write xAOD::EventFormat "
- "to the output" );
+ StatusCode sc = collectMetaData(format);
+ if (sc.isFailure()) {
+ REPORT_ERROR(sc) << "Failed to collect metadata from the input file";
+ throw std::runtime_error("Failed to collect event format "
+ "metadata from the input");
}
+
+ ATH_CHECK(writeMetaData(format));
+
return StatusCode::SUCCESS;
- }
+ }
+
+StatusCode
+ EventFormatMetaDataTool::metaDataStop() {
+ // wait for threads currenly writing to finish
+ std::lock_guard< std::mutex > guard(m_outputMutex);
- StatusCode EventFormatMetaDataTool::collectMetaData() {
+ return StatusCode::SUCCESS;
+ }
+
+StatusCode
+ EventFormatMetaDataTool::collectMetaData(
+ std::unique_ptr< xAOD::EventFormat >& format) {
+
+ std::vector< std::string > keys;
+ m_inputMetaStore->keys< xAOD::EventFormat >(keys);
+ if (!m_inputKey.empty()) keys.push_back(m_inputKey);
+
+ // remove duplicates
+ std::sort(keys.begin(), keys.end());
+ keys.erase(std::unique(keys.begin(), keys.end()), keys.end());
+
+ bool found = false;
+ for (auto itr = keys.begin(); itr != keys.end();) {
+ if (m_inputMetaStore->contains< xAOD::EventFormat >(*itr)) {
+ found = true;
+ ATH_MSG_DEBUG("Found xAOD::EventFormat with key " << *itr);
+ ++itr;
+ } else {
+ itr = keys.erase(itr);
+ }
+ }
// If the input file doesn't have any event format metadata,
// then finish right away:
- if( ! m_inputMetaStore->contains< xAOD::EventFormat >( m_inputKey ) ) {
- return StatusCode::SUCCESS;
- }
+ if (!found) return StatusCode::SUCCESS;
// Retrieve the input container:
- const xAOD::EventFormat* input = 0;
- ATH_CHECK( m_inputMetaStore->retrieve( input, m_inputKey ) );
-
- // Create an output container if it doesn't exist yet:
- if( ! m_format.get() ) {
- ATH_MSG_DEBUG( "Creating output container" );
- m_format.reset( new xAOD::EventFormat() );
- }
-
- // Merge the new object into the output one:
- for( auto itr = input->begin(); itr != input->end(); ++itr ) {
- if( ! m_format->exists( itr->second.hash() ) ) {
- m_format->add( itr->second );
- }
+ const xAOD::EventFormat* input = nullptr;
+ for (const std::string& key : keys) {
+ ATH_CHECK(m_inputMetaStore->retrieve(input, key));
+
+ // Merge the new object into the output one:
+ for (auto itr = input->begin(); itr != input->end(); ++itr) {
+ if (!format->exists(itr->second.hash())) {
+ format->add(itr->second);
+ }
+ }
}
// Return gracefully:
return StatusCode::SUCCESS;
- }
+ }
- StatusCode EventFormatMetaDataTool::writeMetaData() {
+StatusCode
+ EventFormatMetaDataTool::writeMetaData(
+ std::unique_ptr< xAOD::EventFormat >& format) {
// The output may already have such an object, coming from some
// other source. Like the event format service.
- if( m_outputMetaStore->contains< xAOD::EventFormat >( m_outputKey ) ) {
- ATH_MSG_DEBUG( "xAOD::EventFormat object already in the output" );
- return StatusCode::SUCCESS;
- }
- // Record the event format metadata, if any was found in the
- // processed input files.
- if( m_format.get() ) {
- ATH_MSG_DEBUG( "Recording event format metadata" );
- ATH_CHECK( m_outputMetaStore->record( std::move( m_format ),
- m_outputKey ) );
+ xAOD::EventFormat * output =
+ m_outputMetaStore->tryRetrieve< xAOD::EventFormat >(m_outputKey);
+
+ if (output == nullptr) {
+
+ // Record the event format metadata, if any was found in the
+ // processed input files.
+ ATH_MSG_DEBUG("Recording event format metadata");
+ ATH_CHECK(m_outputMetaStore->record(std::move(format), m_outputKey));
+
+ } else {
+
+ ATH_MSG_DEBUG("updating existing xAOD::EventFormat object");
+ // Update the object in the MetaDataStore with new content
+ for (auto itr = format->begin(); itr != format->end(); ++itr)
+ if (!output->exists(itr->second.hash()))
+ output->add(itr->second);
+
}
// Return gracefully:
return StatusCode::SUCCESS;
- }
+ }
-} // namespace xAODMaker
+} // namespace xAODMaker
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.h b/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.h
index b9337d63e0cb11b4d1c350fa3a36c7a4cd0117e5..4010ffa675317ce69bf6ff0a430ff08a7a6e00d0 100644
--- a/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.h
+++ b/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.h
@@ -1,19 +1,19 @@
// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
// $Id: EventFormatMetaDataTool.h 651874 2015-03-05 14:16:19Z krasznaa $
-#ifndef XAODTRIGGERCNV_TRIGGERMENUMETADATATOOL_H
-#define XAODTRIGGERCNV_TRIGGERMENUMETADATATOOL_H
+#ifndef XAODEVENTFORMATCNV_EVENTFORMATMETADATATOOL
+#define XAODEVENTFORMATCNV_EVENTFORMATMETADATATOOL
// System include(s):
#include <string>
#include <memory>
+#include <mutex>
// Gaudi/Athena include(s):
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "AthenaKernel/IMetaDataSvc.h"
#include "AthenaKernel/IMetaDataTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "StoreGate/StoreGateSvc.h"
@@ -23,69 +23,75 @@
namespace xAODMaker {
- /// Tool taking care of copying the event format object from file to file
- ///
- /// This tool does the heavy lifting when fast-merging DxAOD files to
- /// make sure that the xAOD::EventFormat metadata object is propagated
- /// correctly from the input files to the output.
- ///
- /// @author Jack Cranshaw <cranshaw@anl.gov>
- /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- ///
- /// $Revision: 651874 $
- /// $Date: 2015-03-05 15:16:19 +0100 (Thu, 05 Mar 2015) $
- ///
- class EventFormatMetaDataTool : public virtual ::IMetaDataTool,
- public ::AthAlgTool {
-
- public:
- /// Regular AlgTool constructor
- EventFormatMetaDataTool( const std::string& type, const std::string& name,
- const IInterface* parent );
-
- /// Function initialising the tool
- virtual StatusCode initialize();
-
- /// Function collecting the metadata from a new input file
- virtual StatusCode beginInputFile(const SG::SourceID&) {return beginInputFile();}
-
- /// Function collecting the metadata from a new input file
- virtual StatusCode endInputFile(const SG::SourceID&) {return endInputFile();}
-
- /// Function writing the collected metadata to the output
- virtual StatusCode metaDataStop(const SG::SourceID&) {return metaDataStop();}
-
- /// Function called when a new input file is opened
- virtual StatusCode beginInputFile();
-
- /// Function called when the currently open input file got completely
- /// processed
- virtual StatusCode endInputFile();
-
- /// Function called when the tool should write out its metadata
- virtual StatusCode metaDataStop();
-
- private:
- /// Function collecting the event format metadata from the input file
- StatusCode collectMetaData();
- /// Function writing out the collected metadata
- StatusCode writeMetaData();
-
- /// Connection to the input metadata store
- ServiceHandle< ::StoreGateSvc > m_inputMetaStore;
- /// Connection to the output metadata store
- ServiceHandle< ::StoreGateSvc > m_outputMetaStore;
-
- /// The key of the trigger menu in the input file
- std::string m_inputKey;
- /// The key of the trigger menu for the output file
- std::string m_outputKey;
-
- /// The merged event format object
- std::unique_ptr< xAOD::EventFormat > m_format;
-
- }; // class EventFormatMetaDataTool
-
-} // namespace xAODMaker
-
-#endif // XAODTRIGGERCNV_TRIGGERMENUMETADATATOOL_H
+/// Tool taking care of copying the event format object from file to file
+///
+/// This tool does the heavy lifting when fast-merging DxAOD files to
+/// make sure that the xAOD::EventFormat metadata object is propagated
+/// correctly from the input files to the output.
+///
+/// @author Jack Cranshaw <cranshaw@anl.gov>
+/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+/// @author Frank Berghaus <fberghaus@anl.gov>
+///
+/// $Revision: 651874 $
+/// $Date: 2015-03-05 15:16:19 +0100 (Thu, 05 Mar 2015) $
+///
+class EventFormatMetaDataTool : public virtual ::IMetaDataTool, public ::AthAlgTool {
+ public:
+ /// Regular AlgTool constructor
+ EventFormatMetaDataTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ /// Function initialising the tool
+ virtual StatusCode initialize();
+
+ /// Function collecting the metadata from a new input file
+ virtual StatusCode beginInputFile(const SG::SourceID&) {return beginInputFile();}
+
+ /// Function collecting the metadata from a new input file
+ virtual StatusCode endInputFile(const SG::SourceID&) {return endInputFile();}
+
+ /// Wait for metadata write operations to finish, then returns SUCCESS
+ virtual StatusCode metaDataStop(const SG::SourceID&) {return metaDataStop();}
+
+ /// Function called when a new input file is opened
+ virtual StatusCode beginInputFile();
+
+ /// Function called when the currently open input file got completely
+ /// processed
+ virtual StatusCode endInputFile() {return StatusCode::SUCCESS;}
+
+ /// Wait for metadata write operations to finish, then return SUCCESS
+ virtual StatusCode metaDataStop();
+
+ private:
+ /// Function collecting the event format metadata from the input file
+ StatusCode collectMetaData(std::unique_ptr< xAOD::EventFormat >&);
+
+ /// Function writing out the collected metadata
+ StatusCode writeMetaData(std::unique_ptr< xAOD::EventFormat >&);
+
+ /// Connection to the input metadata store
+ ServiceHandle< ::StoreGateSvc > m_inputMetaStore{this, "InputMetaStore",
+ "StoreGateSvc/InputMetaDataStore", name()};
+
+ /// Connection to the output metadata store
+ ServiceHandle< IMetaDataSvc > m_outputMetaStore{this, "MetaDataSvc",
+ "MetaDataSvc", name()};
+
+ /// The key of the trigger menu in the input file
+ Gaudi::Property< std::string > m_inputKey{this, "InputKey", "",
+ "optionally specify the key of the xAOD::EventFormat in the input."};
+
+ /// The key of the trigger menu for the output file
+ Gaudi::Property< std::string > m_outputKey{this, "OutputKey",
+ "EventFormat", "Specifies the key of the xAOD::EventFormat object in "
+ "the MetaDataStore, default: EventFormat"};
+
+ /// MetaDataStop need to wait for ongoing writes
+ std::mutex m_outputMutex;
+}; // class EventFormatMetaDataTool
+} // namespace xAODMaker
+
+#endif // XAODEVENTFORMATCNV_EVENTFORMATMETADATATOOL
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatStreamHelperTool.cxx b/Event/xAOD/xAODEventFormatCnv/src/EventFormatStreamHelperTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..d74ee3ec5e7f22839027f3e97475f1f562e95cd9
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/EventFormatStreamHelperTool.cxx
@@ -0,0 +1,124 @@
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+
+// Local include(s).
+#include "EventFormatStreamHelperTool.h"
+
+// system includes
+#include <memory>
+#include <regex>
+#include <utility>
+
+// EDM include(s).
+#include "xAODEventFormat/EventFormat.h"
+
+namespace xAODMaker {
+
+StatusCode
+ EventFormatStreamHelperTool::initialize() {
+ // Retrieve all needed components.
+ ATH_CHECK(m_metadataStore.retrieve());
+
+ // Return gracefully
+ return StatusCode::SUCCESS;
+ }
+
+StatusCode
+ EventFormatStreamHelperTool::postExecute() {
+ // Notify the event format service that it should collect the metadata
+ // that it needs.
+ ATH_CHECK(collectFormatMetadata());
+ ATH_MSG_VERBOSE("Triggered metadata collection on: " << m_key.value());
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+ }
+
+StatusCode
+ EventFormatStreamHelperTool::collectFormatMetadata() {
+ // Get the EventFormat object
+ xAOD::EventFormat * event_format =
+ m_metadataStore->tryRetrieve< xAOD::EventFormat >(m_key.value());
+
+ if (!event_format) {
+ auto p_event_format = std::make_unique< xAOD::EventFormat >();
+ event_format = p_event_format.get();
+ ATH_CHECK(m_metadataStore->record(std::move(p_event_format), m_key));
+ ATH_MSG_VERBOSE("Created new xAOD::EventFormat: " << m_key.value());
+ } else {
+ ATH_MSG_VERBOSE("Use existing xAOD::EventFormat: " << m_key.value());
+ }
+
+ // Ask StoreGate for all the objects that it's holding on to.
+ const std::vector< const SG::DataProxy* > proxies = evtStore()->proxies();
+
+ // Loop over the proxies.
+ for (const SG::DataProxy* proxy : proxies) {
+ // Construct the branch name that Athena I/O is going to give to
+ // this object.
+ const std::string branchName = proxy->name();
+
+ // Skip objects that were set up to be ignored.
+ {
+ bool ignoreObject = false;
+ for (const std::string& ignorePattern : m_ignoreKeys.value()) {
+ if (std::regex_match(branchName, std::regex(ignorePattern))) {
+ ignoreObject = true;
+ break;
+ }
+ }
+ if (ignoreObject == true) continue;
+ }
+
+ // Get the type name of this object.
+ std::string typeName;
+ if (m_clidSvc->getTypeInfoNameOfID(proxy->clID(), typeName).isFailure()) {
+ // Make sure that nobody else is using @c m_warnedCLIDs right now.
+ std::lock_guard< std::mutex > lock(m_warnedCLIDsMutex);
+
+ // Print a warning if this CLID didn't produce a warning yet:
+ if (m_warnedCLIDs.insert(proxy->clID()).second)
+ ATH_MSG_WARNING("Couldn't get type name for CLID = " << proxy->clID() );
+
+ continue;
+ }
+
+ // Now that we have the type name, check whether metadata for this type
+ // should be stored.
+ {
+ bool ignoreObject = true;
+ for (const std::string& typePattern : m_typeNames.value()) {
+ if (std::regex_match(typeName, std::regex(typePattern))) {
+ ignoreObject = false;
+ break;
+ }
+ }
+ if (ignoreObject) continue;
+ }
+
+ // Update the metadata object.
+ uint32_t hash = 0;
+ {
+ // Make sure that nobody else is modifying @c m_ef or @c m_spool
+ // right now.
+ std::lock_guard< std::mutex > lock(m_efMutex);
+ // If we already know about this object, then don't bother.
+ if (event_format->exists(branchName)) continue;
+
+ // Get the hash for this name.
+ hash = evtStore()->stringToKey(branchName, proxy->clID());
+ // Add the info.
+ event_format->add(xAOD::EventFormatElement(branchName, typeName, "", hash));
+ }
+
+ // Tell the user what happened.
+ ATH_MSG_VERBOSE("Adding info: branchName = \"" << branchName
+ << ", typeName = \"" << typeName << "\""
+ << ", hash = 0x" << std::hex << std::setw(8)
+ << std::setfill('0') << hash);
+ }
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+ }
+
+} // namespace xAODMaker
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatStreamHelperTool.h b/Event/xAOD/xAODEventFormatCnv/src/EventFormatStreamHelperTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..e8599cea961a52ca5cafc9925c16dc0a09876285
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/EventFormatStreamHelperTool.h
@@ -0,0 +1,95 @@
+// Dear emacs, this is -*- c++ -*-
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+#ifndef XAODEVENTFORMATCNV_EVENTFORMATSTREAMHELPERTOOL
+#define XAODEVENTFORMATCNV_EVENTFORMATSTREAMHELPERTOOL
+
+#include <mutex>
+#include <set>
+#include <string>
+#include <vector>
+
+// Gaudi/Athena include(s).
+#include "Gaudi/Property.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "AthenaKernel/IAthenaOutputTool.h"
+#include "AthenaKernel/IMetaDataSvc.h"
+
+namespace xAODMaker {
+/// Tool creating and maintaining @c xAOD::EventFormat at the end-of-events
+///
+/// This tool is meant to be added to every xAOD output stream, so that it
+/// would maintain @c xAOD::EventFormat object every time a new event is
+/// written out.
+///
+/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+/// @author Frank Berghaus <fberghaus@anl.gov>
+///
+class EventFormatStreamHelperTool : public extends< AthAlgTool, IAthenaOutputTool > {
+ public:
+ // Inherit the base class's constructor(s).
+ using extends::extends;
+
+ /// @name Interface inherited from @c AthAlgTool
+ /// @{
+
+ /// Initialise the tool
+ StatusCode initialize() override;
+
+ /// @}
+
+ /// @name Interface inherited from @c IAthenaOutputTool
+ /// @{
+
+ /// Called at the end of initialize
+ StatusCode postInitialize() override {return StatusCode::SUCCESS;}
+
+ /// Called at the beginning of execute
+ StatusCode preExecute() override {return StatusCode::SUCCESS;}
+
+ /// Called at the end of execute
+ StatusCode postExecute() override;
+
+ /// Called at the beginning of finalize
+ StatusCode preFinalize() override {return StatusCode::SUCCESS;}
+
+ /// Called at the
+ StatusCode preStream() override {return StatusCode::SUCCESS;}
+
+ /// @}
+
+ private:
+ /// Use the metadata tool interface to store the EventFormat object
+ ServiceHandle< IMetaDataSvc > m_metadataStore{ this, "MetaDataSvc",
+ "MetaDataSvc", "The metadata service use to record the xAOD::EventFormat" };
+
+ /// Connection to the CLID service
+ ServiceHandle< IClassIDSvc > m_clidSvc{ this, "ClassIDSvc", "ClassIDSvc",
+ "The ClassID service instance to use" };
+
+ Gaudi::Property< std::string > m_key{ this, "Key", "EventInfo",
+ "Key for EventFormat object in metadata store" };
+
+ /// Type names for which a metadata entry should be added
+ Gaudi::Property< std::vector< std::string > > m_typeNames{ this,
+ "TypeNames", { ".*xAOD::.*" },
+ "Type names for which metadata entries are added" };
+
+ /// StoreGate keys that should be ignored during the metadata collection
+ Gaudi::Property< std::vector< std::string > > m_ignoreKeys{ this,
+ "IgnoreKeys", { "HLTAutoKey_.*" },
+ "SG keys that should be ignored during the metadata collection" };
+
+ StatusCode collectFormatMetadata();
+
+ /// CLIDs about which warnings have already been printed
+ std::set< CLID > m_warnedCLIDs;
+ /// Mutex for the @c m_warnedCLIDs variable
+ std::mutex m_warnedCLIDsMutex;
+
+ /// Mutex for the @c m_ef variable
+ mutable std::mutex m_efMutex;
+}; // class EventFormatStreamHelperTool
+} // namespace xAODMaker
+
+#endif // XAODEVENTFORMATCNV_EVENTFORMATSTREAMHELPERTOOL
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.cxx b/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.cxx
deleted file mode 100644
index 940f1ada25425a57a88d60a181cbebdf34005c36..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.cxx
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: EventFormatSvc.cxx 777715 2016-10-11 16:35:49Z ssnyder $
-
-// System include(s):
-#include <fstream>
-#include <ctime>
-#include <locale>
-
-// Athena/Gaudi include(s):
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/System.h"
-#include "AthenaKernel/errorcheck.h"
-
-// EDM include(s):
-#include "AthContainers/AuxTypeRegistry.h"
-
-// Local include(s):
-#include "EventFormatSvc.h"
-
-namespace xAODMaker {
-
- EventFormatSvc::EventFormatSvc( const std::string& name,
- ISvcLocator* svcLoc )
- : AthService( name, svcLoc ),
- m_clidSvc( "ClassIDSvc", name ),
- m_eventStore( "StoreGateSvc", name ),
- m_metaStore( "MetaDataStore", name ),
- m_incidentSvc( "IncidentSvc", name ),
- m_warnedCLIDs(),
- m_ef( 0 ), m_firstEvent( true ) {
-
- declareProperty( "ObjectName", m_objectName = "EventFormat" );
-
- declareProperty( "ClassIDSvc", m_clidSvc );
- declareProperty( "EventStore", m_eventStore );
- declareProperty( "MetaDataStore", m_metaStore );
- declareProperty( "IncidentSvc", m_incidentSvc );
- declareProperty( "FormatNames", m_formatNames );
- }
-
- StatusCode EventFormatSvc::initialize() {
-
- // Greet the user:
- ATH_MSG_INFO( "Initialising - Package version: " << PACKAGE_VERSION );
- ATH_MSG_DEBUG( " Output object key: " << m_objectName );
-
- // Retrieve the needed service(s):
- CHECK( m_clidSvc.retrieve() );
- CHECK( m_eventStore.retrieve() );
- CHECK( m_metaStore.retrieve() );
- CHECK( m_incidentSvc.retrieve() );
-
- // Set up the service to listen to end-of-event incidents:
- m_incidentSvc->addListener( this, IncidentType::EndEvent );
-
- // Clean up:
- m_warnedCLIDs.clear();
-
- // Return gracefully:
- return StatusCode::SUCCESS;
- }
-
- /**
- * This function can be used by some client code to access the EventFormat
- * object describing the contents of the event store.
- *
- * It's debatable how much use case there is for accessing this info in
- * Athena, we'll have to see. The code could also be extended later on
- * to allow access to the EventFormat object read from an input xAOD
- * file. To be seen...
- *
- * @returns The EventFormat object describing the current contents of the
- * event store
- */
- const xAOD::EventFormat* EventFormatSvc::eventFormat() {
-
- // Check if we already have an object:
- if( ! m_ef ) {
- // Request one then:
- const Incident inc( "xAODMaker::EventFormatSvc",
- IncidentType::EndEvent );
- handle( inc );
- // Reset the first event flag, as we obviously didn't get to the
- // end of the first event yet.
- m_firstEvent = true;
- }
-
- // Return the object:
- return m_ef;
- }
-
- void EventFormatSvc::handle( const Incident& inc ) {
-
- // Tell the user what we're doing:
- ATH_MSG_DEBUG( "Callback received with incident: "
- << inc.type() );
-
- // Check that we received the correct incident:
- if( inc.type() != IncidentType::EndEvent ) {
- ATH_MSG_WARNING( "Unknown incident type received: "
- << inc.type() );
- return;
- }
-
- // Create the object if it doesn't exist yet:
- if( ! m_ef ) {
- m_ef = new xAOD::EventFormat();
- if (!m_metaStore->contains(ClassID_traits<xAOD::EventFormat>::ID(),m_objectName ) ) {
- if( m_metaStore->record( m_ef, m_objectName ).isFailure() ) {
- REPORT_MESSAGE( MSG::ERROR )
- << "Couldn't record xAOD::EventFormat object into the "
- << "metadata store with key: " << m_objectName;
- delete m_ef; m_ef = 0;
- return;
- }
- } else {
- StatusCode sc = m_metaStore->retrieve(m_ef,m_objectName);
- if (sc.isFailure()) {
- REPORT_MESSAGE( MSG::ERROR )
- << "Couldn't retrieve xAOD::EventFormat object wit key: " << m_objectName;
- }
- }
- }
-
- // Collect information into the object:
- const int newObjects = collectMetadata( *m_ef );
- if( ( ! m_firstEvent ) && newObjects ) {
- ATH_MSG_DEBUG( newObjects << " new objects encountered during "
- << "event processing (not the first event!)" );
- }
-
- // Now we're past the first event:
- m_firstEvent = false;
-
- return;
- }
-
- StatusCode EventFormatSvc::queryInterface( const InterfaceID& riid,
- void** ppvIf ) {
-
- // Check if the user asked for the IEventFormatSvc interface:
- if( riid == IEventFormatSvc::interfaceID() ) {
- *ppvIf = static_cast< IEventFormatSvc* >( this );
- addRef();
- return StatusCode::SUCCESS;
- }
- // Check if the user asked for the IIncidentListener interface:
- else if( riid == IIncidentListener::interfaceID() ) {
- *ppvIf = static_cast< IIncidentListener* >( this );
- addRef();
- return StatusCode::SUCCESS;
- }
-
- // If not, let the base class handle the request:
- return AthService::queryInterface( riid, ppvIf );
- }
-
- /**
- * This function is used internally to collect the necessary metadata
- * from the event store (StoreGate) and fill the EventFormat object
- * of the service.
- *
- * The function returns the number of "new" objects encountered, which
- * should only be !=0 on the first event in principle. But by now we have
- * a few use cases where this is not true...
- *
- * @param ef The EventFormat object to fill with the metadata
- * @returns The number of "new" objects found in the event
- */
- int EventFormatSvc::collectMetadata( xAOD::EventFormat& ef ) {
-
- // Ask StoreGate for all the object that it's holding on to:
- const std::vector< const SG::DataProxy* > proxies =
- m_eventStore->proxies();
-
- // Number of new objects encountered:
- int newObjects = 0;
-
- // Loop over them:
- std::vector< const SG::DataProxy* >::const_iterator itr = proxies.begin();
- std::vector< const SG::DataProxy* >::const_iterator end = proxies.end();
- for( ; itr != end; ++itr ) {
-
- // Construct the branch name that Athena I/O is going to give to
- // this object:
- const std::string branchName = ( *itr )->name();
-
- // Ignore the temporary containers created by the HLT, as those change
- // event by event:
- if( branchName.find( "HLTAutoKey_" ) == 0 ) continue;
-
- // Get the type name of this object:
- std::string typeName;
- if( m_clidSvc->getTypeInfoNameOfID( ( *itr )->clID(),
- typeName ).isFailure() ) {
- // Print a warning if this CLID didn't produce a warning yet:
- if( m_warnedCLIDs.insert( ( *itr )->clID() ).second ) {
- ATH_MSG_WARNING( "Couldn't get type name for CLID = "
- << ( *itr )->clID() );
- }
- continue;
- }
-
- // Only consider xAOD objects. Note that the type name will not
- // necessarily start with xAOD, but it should have it somewhere.
- // Alternatively, the type name could be listed in FormatNames.
- if( typeName.find( "xAOD" ) == std::string::npos &&
- std::find (m_formatNames.begin(), m_formatNames.end(), typeName) ==
- m_formatNames.end())
- {
- continue;
- }
-
- // Check if we already know about this object:
- if( ef.exists( branchName ) ) continue;
-
- // This will be a new object:
- ++newObjects;
-
- // Retrieve the hash of this name:
- const uint32_t hash = m_eventStore->stringToKey( branchName,
- ( *itr )->clID() );
-
- // Add the info:
- ef.add( xAOD::EventFormatElement( branchName, typeName, "",
- hash ) );
-
- // Tell the user what happened:
- ATH_MSG_VERBOSE( "Adding info: branchName = \"" << branchName
- << ", typeName = \"" << typeName << "\""
- << ", hash = 0x" << std::hex << std::setw( 8 )
- << std::setfill( '0' ) << hash );
- }
-
- // Return how many new objects were encountered:
- return newObjects;
- }
-
-} // namespace xAODMaker
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.h b/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.h
deleted file mode 100644
index b953d173076ca1c4f8545af9d3184a7ee859925f..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventFormatCnv/src/EventFormatSvc.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: EventFormatSvc.h 721421 2016-02-02 15:17:05Z krasznaa $
-#ifndef XAODEVENTFORMATCNV_EVENTFORMATSVC_H
-#define XAODEVENTFORMATCNV_EVENTFORMATSVC_H
-
-// System include(s):
-#include <string>
-#include <set>
-
-// Gaudi/Athena include(s):
-#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "AthenaKernel/IClassIDSvc.h"
-#include "StoreGate/StoreGateSvc.h"
-
-// xAOD include(s):
-#include "xAODEventFormat/EventFormat.h"
-
-// Local include(s):
-#include "xAODEventFormatCnv/IEventFormatSvc.h"
-
-namespace xAODMaker {
-
- /**
- * @short Implementation of the IEventFormatSvc service interface
- *
- * This class takes care of managing the xAOD::EventFormat
- * objects of the xAOD files.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 721421 $
- * $Date: 2016-02-02 16:17:05 +0100 (Tue, 02 Feb 2016) $
- */
- class EventFormatSvc : public AthService,
- public virtual IEventFormatSvc,
- public virtual IIncidentListener {
-
- public:
- /// Regular Service constructor
- EventFormatSvc( const std::string& name, ISvcLocator* svcLoc );
-
- /// Function initialising the service
- virtual StatusCode initialize();
-
- /// @name Implementation of the IEventFormatSvc interface
- /// @{
-
- /// Get the object describing the current input/output file's format
- const xAOD::EventFormat* eventFormat();
-
- /// @}
-
- /// Function handling the incoming incidents
- virtual void handle( const Incident& inc );
-
- /// Function communicating the implemented interfaces to Gaudi
- virtual StatusCode queryInterface( const InterfaceID& riid,
- void** ppvIf );
-
- private:
- /// Fill the internal object with metadata from the event
- int collectMetadata( xAOD::EventFormat& ef );
-
- /// StoreGate key of the EventFormat object
- std::string m_objectName;
-
- /// Connection to the CLID service
- ServiceHandle< IClassIDSvc > m_clidSvc;
- /// Connection to the event store
- ServiceHandle< StoreGateSvc > m_eventStore;
- /// Connection to the metadata store
- ServiceHandle< StoreGateSvc > m_metaStore;
- /// Connection to the incident service
- ServiceHandle< IIncidentSvc > m_incidentSvc;
- /// We automatically generate event format information for type names
- /// that contain the string `xAOD'. This property gives a list of
- /// additional type names that should have format information.
- std::vector< std::string > m_formatNames;
-
- /// CLIDs about which warnings have already been printed
- std::set< CLID > m_warnedCLIDs;
-
- /// The object that we write out in the end
- xAOD::EventFormat* m_ef;
-
- /// Helper variable detecting the first event in the processing
- bool m_firstEvent;
-
- }; // class EventFormatSvc
-
-} // namespace xAODMaker
-
-#endif // XAODEVENTFORMATCNV_EVENTFORMATSVC_H
diff --git a/Event/xAOD/xAODEventFormatCnv/src/components/xAODEventFormatCnv_entries.cxx b/Event/xAOD/xAODEventFormatCnv/src/components/xAODEventFormatCnv_entries.cxx
index 448d539f503996de17cb6572781076036b62129f..e27074b0650ba739898464ff010ec70ccb8f3848 100644
--- a/Event/xAOD/xAODEventFormatCnv/src/components/xAODEventFormatCnv_entries.cxx
+++ b/Event/xAOD/xAODEventFormatCnv/src/components/xAODEventFormatCnv_entries.cxx
@@ -1,6 +1,11 @@
-#include "../EventFormatSvc.h"
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+
+// Local include(s).
#include "../EventFormatMetaDataTool.h"
+#include "../EventFormatStreamHelperTool.h"
-DECLARE_COMPONENT( xAODMaker::EventFormatSvc )
+// Declare the components to Gaudi.
DECLARE_COMPONENT( xAODMaker::EventFormatMetaDataTool )
-
+DECLARE_COMPONENT( xAODMaker::EventFormatStreamHelperTool )
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/AAuxContainer_v1.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/AAuxContainer_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..7345d3f1835ad6148f027edea85c50fc54a4c0ff
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/AAuxContainer_v1.cxx
@@ -0,0 +1,44 @@
+/* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */
+/**
+ * @file xAODEventFormatCnv/src/test/AAuxContainer_v1.xcx
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date Sep, 2020
+ * @brief Class used for testing xAOD::EventFormat reading/writing.
+ */
+
+
+#include "xAODEventFormatCnv/test/versions/AAuxContainer_v1.h"
+#include "AthContainersInterfaces/AuxDataOption.h"
+#include <stdexcept>
+
+
+#define CHECK_OPTION(ret) \
+ do { \
+ if (!ret) { \
+ ATH_MSG_ERROR("setOption failed"); \
+ return StatusCode::FAILURE; \
+ } \
+ } while(0)
+
+
+namespace xAODMakerTest {
+
+
+AAuxContainer_v1::AAuxContainer_v1()
+ : xAOD::AuxContainerBase()
+{
+ AUX_VARIABLE (anInt);
+ AUX_VARIABLE (aFloat);
+ AUX_VARIABLE (pVInt);
+ AUX_VARIABLE (pVFloat);
+
+ if (!pVInt.setOption(SG::AuxDataOption("nbits", 13)) ||
+ !pVFloat.setOption(SG::AuxDataOption("nbits", 13)) ||
+ !pVFloat.setOption(SG::AuxDataOption("nmantissa", 12)) )
+ {
+ throw std::runtime_error("Can't set packing options in AAuxContainer_v1");
+ }
+}
+
+
+} // namespace DMTest
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/ACreatorAlg.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/ACreatorAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..4a206cf430f0dfcb978dd856b804bec5d459aed4
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/ACreatorAlg.cxx
@@ -0,0 +1,59 @@
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+
+// Local include(s).
+#include "ACreatorAlg.h"
+
+// EDM include(s).
+#include "xAODEventFormatCnv/test/A.h"
+#include "xAODEventFormatCnv/test/AVec.h"
+#include "xAODEventFormatCnv/test/AAuxContainer.h"
+
+// Framework include(s).
+#include "StoreGate/WriteHandle.h"
+
+// System include(s).
+#include <cmath>
+#include <memory>
+
+// Declare the type to Gaudi.
+DECLARE_COMPONENT( xAODMakerTest::ACreatorAlg )
+
+namespace xAODMakerTest {
+
+ StatusCode ACreatorAlg::initialize() {
+
+ // Initialise the data handle(s).
+ ATH_CHECK( m_outputKey.initialize() );
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode ACreatorAlg::execute( const EventContext& ctx ) const {
+
+ // Create a dummy electron container.
+ auto vec = std::make_unique< AVec >();
+ auto aux = std::make_unique< AAuxContainer >();
+ vec->setStore(aux.get());
+
+ // Fill it with some nonsensical content.
+ for( int i = 0; i < 10; ++i ) {
+ vec->push_back( std::make_unique< A >() );
+ auto a = vec->back();
+ a->aFloat( 1.0f );
+ a->anInt( 1 );
+ a->pVInt( std::vector< int >(10, 1) );
+ a->pVFloat( std::vector< float >(10, 1.0f) );
+ }
+
+ // Record it into the event store.
+ SG::WriteHandle< AVec > wh( m_outputKey, ctx );
+ ATH_CHECK( wh.record( std::move( vec ), std::move( aux ) ) );
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+ }
+
+} // namespace xAODMakerTest
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/ACreatorAlg.h b/Event/xAOD/xAODEventFormatCnv/src/test/ACreatorAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..827ca6013be2267e0a635323ca72a8298e0c7e67
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/ACreatorAlg.h
@@ -0,0 +1,54 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+#ifndef XAODEVENTFORMATCNV_TEST_ELECTRONCREATORALG_H
+#define XAODEVENTFORMATCNV_TEST_ELECTRONCREATORALG_H
+
+// Framework include(s).
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "StoreGate/WriteHandleKey.h"
+
+// EDM include(s).
+#include "xAODEventFormatCnv/test/AVec.h"
+
+/// Namespace holding test code for the xAOD maker components
+namespace xAODMakerTest {
+
+ /// Algorithm creating a dummy @c xAODMakerTest::AVec
+ ///
+ /// This algorithm can be used to test the functionality of the
+ /// xAODEventFormatCnv code. It just creates a dummy
+ /// @c xAODMkerTest::AVec container that can then be used to create
+ /// a test file.
+ ///
+ /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+ /// @author Frank Berghaus <fberghaus@anl.gov>
+ ///
+ class ACreatorAlg : public AthReentrantAlgorithm {
+
+ public:
+ // Use the base class's constructor
+ using AthReentrantAlgorithm::AthReentrantAlgorithm;
+
+ /// @name Interface inherited from @c AthReentrantAlgorithm
+ /// @{
+
+ /// Initialise the algorithm
+ virtual StatusCode initialize() override;
+ /// Execute the algorithm for one event
+ virtual StatusCode execute( const EventContext& ctx ) const override;
+
+ /// @}
+
+ private:
+ /// Key for the electron container created by the algorithm
+ SG::WriteHandleKey< AVec > m_outputKey { this,
+ "OutputKey", "TestObject",
+ "Key for the object container created by the algorithm" };
+
+ }; // class ElectronCreatorAlg
+
+} // namespace xAODMakerTest
+
+#endif // XAODEVENTFORMATCNV_TEST_ELECTRONCREATORALG_H
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/A_v1.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/A_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..9bb6d69d43a6b6f5766d85fb43c0935c1d4d3054
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/A_v1.cxx
@@ -0,0 +1,25 @@
+/* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */
+/**
+ * @file xAODEventFormatCnv/src/test/A_v1.cxx
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date May, 2020
+ * @brief Class used for testing xAOD::EventFormat reading/writing.
+ */
+#include "xAODEventFormatCnv/test/versions/A_v1.h"
+#include "xAODCore/AuxStoreAccessorMacros.h"
+
+
+namespace xAODMakerTest {
+
+
+AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (A_v1, float, aFloat, aFloat)
+AUXSTORE_PRIMITIVE_SETTER_AND_GETTER (A_v1, int, anInt, anInt)
+
+AUXSTORE_OBJECT_SETTER_AND_GETTER (A_v1, std::vector<int>, pVInt, pVInt)
+AUXSTORE_OBJECT_MOVE (A_v1, std::vector<int>, pVInt, pVInt)
+
+AUXSTORE_OBJECT_SETTER_AND_GETTER (A_v1, std::vector<float>, pVFloat, pVFloat)
+AUXSTORE_OBJECT_MOVE (A_v1, std::vector<float>, pVFloat, pVFloat)
+
+
+} // namespace xAODMakerTest
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/EventFormatPrinterAlg.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/EventFormatPrinterAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..90de45bcfcd55200f3f6702f5c5c5f66dd93ad5f
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/EventFormatPrinterAlg.cxx
@@ -0,0 +1,38 @@
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+
+// Local include(s).
+#include "EventFormatPrinterAlg.h"
+
+// EDM include(s).
+#include "xAODEventFormat/EventFormat.h"
+
+#include "StoreGate/ReadHandle.h"
+
+// Declare the type to Gaudi.
+DECLARE_COMPONENT( xAODMakerTest::EventFormatPrinterAlg )
+
+namespace xAODMakerTest {
+
+ StatusCode EventFormatPrinterAlg::initialize() {
+
+ // Initialise the data handle(s).
+ ATH_CHECK( m_metaDataStore.retrieve() );
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode EventFormatPrinterAlg::execute() {
+ // Read and print the event format object.
+ const xAOD::EventFormat * ef =
+ m_metaDataStore->tryConstRetrieve< xAOD::EventFormat >(m_eventFormatKey);
+ if (ef) ATH_MSG_INFO( "Event format:\n" << *ef );
+ else return StatusCode::FAILURE;
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+ }
+
+} // namespace xAODMakerTest
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/EventFormatPrinterAlg.h b/Event/xAOD/xAODEventFormatCnv/src/test/EventFormatPrinterAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..1c2ccb0f46914fa6769eb483bddcfcb19bb7da69
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/EventFormatPrinterAlg.h
@@ -0,0 +1,56 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+#ifndef XAODEVENTFORMATCNV_TEST_EVENTFORMATPRINTERALG_H
+#define XAODEVENTFORMATCNV_TEST_EVENTFORMATPRINTERALG_H
+
+// Framework include(s).
+#include "Gaudi/Property.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaKernel/IMetaDataSvc.h"
+#include "xAODEventFormat/EventFormat.h"
+
+// System include(s).
+#include <string>
+
+namespace xAODMakerTest {
+
+ /// Algorithm printing an @c xAOD::EventFormat object's payload
+ ///
+ /// This is used to debug/test the functionality of the @c xAOD::EventFormat
+ /// creator components of the package.
+ ///
+ /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+ ///
+ class EventFormatPrinterAlg : public AthAlgorithm {
+
+ public:
+ /// Inherit the base class's constructor
+ using AthAlgorithm::AthAlgorithm;
+
+ /// @name Interface inherited from @c AthAlgorithm
+ /// @{
+
+ /// Initialise the algorithm
+ virtual StatusCode initialize() override;
+ /// Execute the algorithm for one event
+ virtual StatusCode execute() override;
+
+ /// @}
+
+ private:
+ /// Key for the @c xAOD::EventFormat object to read
+ Gaudi::Property< std::string > m_eventFormatKey{this, "EventFormatKey",
+ "EventFormat", "Key to retrieve xAOD::EventFormat, default: EventFormat"
+ };
+
+ ServiceHandle< IMetaDataSvc > m_metaDataStore{this, "MetaDataSvc",
+ "MetaDataSvc", name()
+ };
+ }; // class EventFormatPrinterAlg
+
+} // namespace xAODMakerTest
+
+#endif // XAODEVENTFORMATCNV_TEST_EVENTFORMATPRINTERALG_H
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..10e67cf89bd4efbac35e2775470bb91f5cea9802
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv.cxx
@@ -0,0 +1,6 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// Event/xAOD/xAODEgammaAthenaPool/src/xAODElectronAuxContainerCnv.cxx
+// Dummy file so that the build system knows that this is a custom converter.
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv.h b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv.h
new file mode 100644
index 0000000000000000000000000000000000000000..ae46e41e44c17d7db71451d7fbd5fe24d8e3be7d
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv.h
@@ -0,0 +1,19 @@
+// Dear emacs, this is -*- c++ -*-
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
+#ifndef XAODEVENTFORMATCNV_TEST_XAODAAUXCONTAINERCNV_H
+#define XAODEVENTFORMATCNV_TEST_XAODAAUXCONTAINERCNV_H
+
+// Gaudi/Athena include(s):
+#include "AthenaPoolCnvSvc/T_AthenaPoolAuxContainerCnv.h"
+
+// EDM include(s):
+#include "xAODEventFormatCnv/test/AAuxContainer.h"
+#include "xAODAAuxContainerCnv_v1.h"
+
+/// Base class for the converter
+typedef T_AthenaPoolAuxContainerCnv< xAODMakerTest::AAuxContainer,
+ xAODAAuxContainerCnv_v1 >
+ xAODAAuxContainerCnv;
+
+
+#endif // XAODEVENTFORMATCNV_TEST_XAODAAUXCONTAINERCNV_H
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv_v1.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..25fb9f729d6c56dd32711b0cfc61875d4be52503
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv_v1.cxx
@@ -0,0 +1,86 @@
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
+#include "xAODAAuxContainerCnv_v1.h"
+
+// System include(s):
+#include <memory>
+#include <stdexcept>
+
+// Gaudi/Athena include(s):
+#include "GaudiKernel/MsgStream.h"
+
+// Core EDM include(s):
+#include "AthContainers/tools/copyAuxStoreThinned.h"
+
+// Local include(s):
+#include "xAODEventFormatCnv/test/A.h"
+#include "xAODEventFormatCnv/test/versions/A_v1.h"
+#include "xAODEventFormatCnv/test/AVec.h"
+#include "xAODEventFormatCnv/test/versions/AVec_v1.h"
+
+/// Convenience macro for setting the level of output messages
+#define MSGLVL MSG::DEBUG
+
+/// Another convenience macro for printing messages in the converter
+#define ATH_MSG( MSG ) \
+ do { \
+ if( log.level() <= MSGLVL ) { \
+ log << MSGLVL << MSG << endmsg; \
+ } \
+ } while( 0 )
+
+xAODAAuxContainerCnv_v1::xAODAAuxContainerCnv_v1()
+{
+}
+
+void xAODAAuxContainerCnv_v1::
+persToTrans( const xAODMakerTest::AAuxContainer_v1* oldObj,
+ xAODMakerTest::AAuxContainer* newObj,
+ MsgStream& log ) const {
+
+ // Greet the user:
+ ATH_MSG( "Converting xAODMaker::AAuxContainer_v1 to current version..." );
+
+ // Clear the transient object:
+ newObj->resize( 0 );
+
+ // Copy the payload of the v1 object into the latest one by misusing
+ // the thinning code a bit...
+ SG::copyAuxStoreThinned( *oldObj, *newObj, 0 );
+
+ // Set up interface containers on top of them:
+
+ //The old uses v_1
+ xAODMakerTest::AVec_v1 oldInt;
+ for( size_t i = 0; i < oldObj->size(); ++i ) {
+ oldInt.push_back( std::make_unique< xAODMakerTest::A_v1 >() );
+ }
+ oldInt.setStore( oldObj );
+
+ xAODMakerTest::AVec newInt;
+ for( size_t i = 0; i < newObj->size(); ++i ) {
+ newInt.push_back( std::make_unique< xAODMakerTest::A >() );
+ }
+ newInt.setStore( newObj );
+
+ // Print what happened:
+ ATH_MSG( "Converting xAODMakerTest::AAuxContainer_v1 to current version "
+ "[OK]" );
+
+ return;
+}
+
+/// This function should never be called, as we are not supposed to convert
+/// object before writing.
+void xAODAAuxContainerCnv_v1::
+transToPers( const xAODMakerTest::AAuxContainer*,
+ xAODMakerTest::AAuxContainer_v1*,
+ MsgStream& log ) const {
+
+ log << MSG::ERROR
+ << "Somebody called xAODAAuxContainerCnv_v1::transToPers"
+ << endmsg;
+ throw std::runtime_error( "Somebody called xAODAAuxContainerCnv_v1::"
+ "transToPers" );
+
+ return;
+}
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv_v1.h b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..8b9c4b71633fd75a236dc944cdcad628ce711557
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODAAuxContainerCnv_v1.h
@@ -0,0 +1,36 @@
+// Dear emacs, this is -*- c++ -*-
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
+#ifndef XAODEVENTFORMATCNV_TEST_XAODAAUXCONTAINERCNV_V1_H
+#define XAODEVENTFORMATCNV_TEST_XAODAAUXCONTAINERCNV_V1_H
+
+// Gaudi/Athena include(s):
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+
+// EDM include(s):
+#include "xAODEventFormatCnv/test/versions/AAuxContainer_v1.h"
+#include "xAODEventFormatCnv/test/AAuxContainer.h"
+
+class xAODAAuxContainerCnv_v1 :
+ public T_AthenaPoolTPCnvConstBase< xAODMakerTest::AAuxContainer,
+ xAODMakerTest::AAuxContainer_v1 > {
+
+public:
+ using base_class::transToPers;
+ using base_class::persToTrans;
+
+
+ /// Default constructor
+ xAODAAuxContainerCnv_v1();
+
+ /// Function converting from the old type to the current one
+ virtual void persToTrans( const xAODMakerTest::AAuxContainer_v1* oldObj,
+ xAODMakerTest::AAuxContainer* newObj,
+ MsgStream& log ) const override;
+ /// Dummy function inherited from the base class
+ virtual void transToPers( const xAODMakerTest::AAuxContainer*,
+ xAODMakerTest::AAuxContainer_v1*,
+ MsgStream& log ) const override;
+
+};
+
+#endif // XAODEVENTFORMATCNV_TEST_XAODAAUXCONTAINERCNV_V1_H
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODEventFormatCnvTestCnv.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODEventFormatCnvTestCnv.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..4c686489e9d3fe08eda0fee2f4eebe1358c04d15
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/cnv/xAODEventFormatCnvTestCnv.cxx
@@ -0,0 +1,21 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: xAODEventFormatCnv/testAthenaPoolTPCnv.cxx 619884 2014-10-03 15:00:40Z christos $
+
+// Gaudi/Athena include(s):
+#include "AthenaKernel/TPCnvFactory.h"
+
+// EDM include(s):
+#include "xAODEventFormatCnv/test/AAuxContainer.h"
+#include "xAODEventFormatCnv/test/versions/AAuxContainer_v1.h"
+
+// Local include(s):
+#include "xAODAAuxContainerCnv_v1.h"
+
+// Declare the T/P converter(s):
+DECLARE_TPCNV_FACTORY( xAODAAuxContainerCnv_v1,
+ xAODMakerTest::AAuxContainer,
+ xAODMakerTest::AAuxContainer_v1,
+ Athena::TPCnvVers::Old )
diff --git a/Event/xAOD/xAODEventFormatCnv/src/test/dict/ContainerProxies.cxx b/Event/xAOD/xAODEventFormatCnv/src/test/dict/ContainerProxies.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..1d1a19ec12404f1773f87343c2e29b3d2abed4d0
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/src/test/dict/ContainerProxies.cxx
@@ -0,0 +1,6 @@
+/* Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */
+
+#include "xAODCore/AddDVProxy.h"
+#include "xAODEventFormatCnv/test/AVec.h"
+
+ADD_NS_DV_PROXY (xAODMakerTest, AVec);
diff --git a/Event/xAOD/xAODEventFormatCnv/test/TestEventFormatContent.py b/Event/xAOD/xAODEventFormatCnv/test/TestEventFormatContent.py
new file mode 100755
index 0000000000000000000000000000000000000000..a7c1810c013e6c1d7b4505d46443982a82517f1d
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/test/TestEventFormatContent.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+"""Read in a given file and return how often given metadata item appears
+
+Use MetaReader to look up metadata items in a given file. Search for the given
+key in each key found in the list of metadata items. If the number of matches
+is 1 return success else return failure.
+
+ Common usgage example:
+
+ In a shell:
+ if TestEventFormatContent.py file.pool.root metadata_key; then
+ echo "found one"
+ else
+ echo "found none or many"
+ fi
+"""
+import argparse
+from functools import reduce
+import logging
+import sys
+import PyUtils.MetaReader
+
+
+def main():
+ """parse aruments and return number of matches"""
+ parser = argparse.ArgumentParser(
+ description=""""
+ Read in a given file and return the number of times metadata items with
+ a name matching the given term appear.
+ """
+ )
+
+ parser.add_argument(
+ "file", metavar="FILE", help="the file to read"
+ )
+
+ parser.add_argument(
+ "key", metavar="KEY", help="the key to search for"
+ )
+
+ args = parser.parse_args()
+
+ # silence meta reader
+ reader_msg = logging.getLogger("MetaReader")
+ reader_msg.setLevel(logging.WARNING)
+
+ # get the list of metadata items of the file
+ try:
+ metadata = next(
+ iter(
+ PyUtils.MetaReader.read_metadata([args.file]).items()
+ )
+ )[1]['metadata_items']
+ except (OSError,):
+ print("cannot read metadata from ", args.file)
+ sys.exit(1)
+
+ matches = reduce(
+ lambda n, key: n + 1 if args.key in key else n,
+ [0] + list(metadata)
+ )
+
+ if matches == 1:
+ return 0
+
+ return 1
+
+
+if __name__ == "__main__":
+ main()
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/IEventFormatSvc.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/IEventFormatSvc.h
deleted file mode 100644
index cb665d2b5ec2c5d4959f383d8d201603daf49ecc..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/IEventFormatSvc.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Dear emacs, this is -*- c++ -*-
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: IEventFormatSvc.h 603941 2014-06-27 11:51:35Z krasznaa $
-#ifndef XAODEVENTFORMATCNV_IEVENTFORMATSVC_H
-#define XAODEVENTFORMATCNV_IEVENTFORMATSVC_H
-
-// System include(s):
-#include <iosfwd>
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/IService.h"
-
-// xAOD include(s):
-#include "xAODEventFormat/EventFormat.h"
-
-/// Namespace for all the xAOD making code
-namespace xAODMaker {
-
- /// The interface provided by IEventFormatSvc
- static const InterfaceID
- IID_IEventFormatSvc( "xAODMaker::IEventFormatSvc", 1, 0 );
-
- /**
- * @short Interface for the service creating the xAOD event format object
- *
- * Client code can use this interface within Athena to interact with
- * the event format description of the xAOD files.
- *
- * @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- *
- * $Revision: 603941 $
- * $Date: 2014-06-27 13:51:35 +0200 (Fri, 27 Jun 2014) $
- */
- class IEventFormatSvc : public virtual IService {
-
- public:
- /// Get the object describing the current input/output file's format
- virtual const xAOD::EventFormat* eventFormat() = 0;
-
- /// Gaudi interface definition
- static const InterfaceID& interfaceID() {
- return IID_IEventFormatSvc;
- }
-
- }; // class IEventFormatSvc
-
-} // namespace xAODMaker
-
-#endif // XAODEVENTFORMATCNV_IEVENTFORMATSVC_H
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/A.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/A.h
new file mode 100644
index 0000000000000000000000000000000000000000..5fee7ce3eeb9cebb6ea8bc9db95bb334bd34494d
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/A.h
@@ -0,0 +1,23 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+/**
+ * @file xAODEventFormatCnv/test/A.h
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date Sep, 2020
+ * @brief Class used for testing xAOD::EventFormat reading/writing.
+ */
+
+#ifndef XAODEVENTFORMATCNV_TEST_A_H
+#define XAODEVENTFORMATCNV_TEST_A_H
+
+#include "xAODEventFormatCnv/test/versions/A_v1.h"
+
+
+namespace xAODMakerTest { typedef A_v1 A; }
+
+
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (xAODMakerTest::A, 169367265, 1)
+
+
+#endif // XAODEVENTFORMATCNV_TEST_A_H
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/AAuxContainer.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/AAuxContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..5d0becd41842de1aa79c8d36f3133f58b4062049
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/AAuxContainer.h
@@ -0,0 +1,23 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+/**
+ * @file xAODEventFormatCnv/test/AAuxContainer.h
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date Sep, 2020
+ * @brief Class used for testing xAOD::EventFormat reading/writing.
+ */
+#ifndef XAODEVENTFORMATCNV_TEST_AAUXCONTAINER_H
+#define XAODEVENTFORMATCNV_TEST_AAUXCONTAINER_H
+
+
+#include "xAODEventFormatCnv/test/versions/AAuxContainer_v1.h"
+
+
+namespace xAODMakerTest { typedef AAuxContainer_v1 AAuxContainer; }
+
+
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF (xAODMakerTest::AAuxContainer, 1189570278, 1)
+
+
+#endif // XAODEVENTFORMATCNV_TEST_AAUXCONTAINER_H
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/AVec.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/AVec.h
new file mode 100644
index 0000000000000000000000000000000000000000..38c7d3c3f099daae7b3cba25b25b9ee1fe3ff8d7
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/AVec.h
@@ -0,0 +1,21 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */
+/**
+ * @file xAODEventFormatCnv/test/AVec.h
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date Sep, 2020
+ * @brief Class used for testing xAOD::EventFormat reading/writing.
+ */
+#ifndef XAODEVENTFORMATCNV_TEST_AVEC_H
+#define XAODEVENTFORMATCNV_TEST_AVEC_H
+
+#include "xAODEventFormatCnv/test/versions/AVec_v1.h"
+
+
+namespace xAODMakerTest{ typedef AVec_v1 AVec;}
+
+
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAODMakerTest::AVec , 48660174 , 1 )
+
+#endif // XAODEVENTFORMATCNV_TEST_AVEC_H
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/selection.xml b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/selection.xml
new file mode 100755
index 0000000000000000000000000000000000000000..eeabbbc22faaf0dc2292d5404db70a2ec3327a4c
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/selection.xml
@@ -0,0 +1,8 @@
+<lcgdict>
+
+ <class name="xAODMakerTest::A_v1" />
+ <class name="xAODMakerTest::AVec_v1" />
+ <class name="xAODMakerTest::AAuxContainer_v1" />
+ <class name="SG::AuxElement::ConstAccessor<ElementLink<xAODMakerTest::AVec_v1> >" />
+
+</lcgdict>
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/AAuxContainer_v1.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/AAuxContainer_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..b1833d1da732a00780ec73e69f3c370a7307076e
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/AAuxContainer_v1.h
@@ -0,0 +1,41 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/* Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */
+/**
+ * @file xAODEventFormatCnv/test/versions/AAuxContainer_v1.h
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date May, 2020
+ * @brief Class used for testing xAOD::EventFormat reading/writing.
+ */
+#ifndef XAODEVENTFORMATCNV_TEST_AAUXCONTAINER_V1_H
+#define XAODEVENTFORMATCNV_TEST_AAUXCONTAINER_V1_H
+
+
+#include "xAODCore/AuxContainerBase.h"
+#include "AthContainers/PackedContainer.h"
+#include "AthenaKernel/BaseInfo.h"
+#include <vector>
+
+
+namespace xAODMakerTest {
+
+class AAuxContainer_v1
+ : public xAOD::AuxContainerBase
+{
+public:
+ AAuxContainer_v1();
+
+private:
+ std::vector<int> anInt;
+ std::vector<float> aFloat;
+ SG::PackedContainer<std::vector<int> > pVInt;
+ SG::PackedContainer<std::vector<float> > pVFloat;
+};
+
+
+} // namespace xAODMakerTest
+
+
+SG_BASE (xAODMakerTest::AAuxContainer_v1, xAOD::AuxContainerBase);
+
+
+#endif // XAODEVENTFORMATCNV_TEST_AAUXCONTAINER_V1_H
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/AVec_v1.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/AVec_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..06efb6c4d1061a630a54722d98dab307461b3c32
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/AVec_v1.h
@@ -0,0 +1,18 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/* Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration */
+
+/**
+ * @file xAODEventFormat/test/versions/AVec_v1.h
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date May, 2020
+ * @brief Class used for testing xAOD::EventFormat data reading/writing.
+ */
+#ifndef XAODEVENTFORMATCNV_TEST_AVEC_V1_H
+#define XAODEVENTFORMATCNV_TEST_AVEC_V1_H
+
+#include "xAODEventFormatCnv/test/versions/A_v1.h"
+#include "AthContainers/DataVector.h"
+
+namespace xAODMakerTest { typedef DataVector<A_v1> AVec_v1; }
+
+#endif // XAODEVENTFORMATCNV_TEST_AVEC_V1_H
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/A_v1.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/A_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..5d39f522f7b3ee5a4511b78befb3956a0e8bac85
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/versions/A_v1.h
@@ -0,0 +1,43 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/* Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */
+
+/**
+ * @file xAODEventFormatCnv/test/versions/A_v1.h
+ * @author Frank Berghaus <fberghaus@anl.gov>
+ * @date Sep, 2020
+ * @brief Class used for testing xAOD::EventFormat reading/writing.
+ */
+#ifndef XAODEVENTFORMATCNV_TEST_A_V1_H
+#define XAODEVENTFORMATCNV_TEST_A_V1_H
+
+#include "AthContainers/AuxElement.h"
+#include "AthenaKernel/BaseInfo.h"
+
+
+namespace xAODMakerTest {
+
+class A_v1
+ : public SG::AuxElement
+{
+public:
+ float aFloat() const;
+ void aFloat(float f);
+
+ int anInt() const;
+ void anInt(int i);
+
+ const std::vector<int>& pVInt() const;
+ void pVInt (const std::vector<int>&);
+ void pVInt (std::vector<int>&&);
+
+ const std::vector<float>& pVFloat() const;
+ void pVFloat (const std::vector<float>&);
+ void pVFloat (std::vector<float>&&);
+};
+
+} // namespace xAODMakerTest
+
+
+SG_BASE(xAODMakerTest::A_v1, SG::AuxElement);
+
+#endif // XAODEVENTFORMATCNV_TEST_A_V1_H
diff --git a/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/xAODEventFormatCnvTestDict.h b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/xAODEventFormatCnvTestDict.h
new file mode 100755
index 0000000000000000000000000000000000000000..bd7c6f9b42b35923c5d944653112a815e6dea889
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/xAODEventFormatCnv/test/xAODEventFormatCnvTestDict.h
@@ -0,0 +1,23 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */
+/**
+ * @file xAODEventFormatCnv/test/xAODEventFormatCnvTestDict.h
+ * @author frank berghaus <fberghaus@anl.gov>
+ * @date Nov 2020
+ * @brief Dictionary generation header
+ */
+
+#ifndef XAODEVENTFORMATCNVTESTDICT_H
+#define XAODEVENTFORMATCNVTESTDICT_H
+
+
+#include "xAODEventFormatCnv/test/A.h"
+#include "xAODEventFormatCnv/test/AVec.h"
+#include "xAODEventFormatCnv/test/AAuxContainer.h"
+#include "AthContainers/AuxElement.h"
+#include "AthLinks/ElementLink.h"
+
+
+template class SG::AuxElement::ConstAccessor<ElementLink<xAODMakerTest::AVec> >;
+
+#endif // XAODEVENTFORMATCNVTESTDICT_H
diff --git a/Event/xAOD/xAODForwardCnv/share/xAODForwardCnv_jobOptions.py b/Event/xAOD/xAODForwardCnv/share/xAODForwardCnv_jobOptions.py
index 2423eff07bb2fa1d8292671e207b42de69dbb4b7..07a22ffb93410b4ea57da36623bd15faa8c8f478 100644
--- a/Event/xAOD/xAODForwardCnv/share/xAODForwardCnv_jobOptions.py
+++ b/Event/xAOD/xAODForwardCnv/share/xAODForwardCnv_jobOptions.py
@@ -25,10 +25,6 @@ xAODMBTSModuleCreator()
from xAODForwardCnv.xAODForwardEventInfoCreator import xAODForwardEventInfoCreator
xAODForwardEventInfoCreator()
-# Make sure that the event format object is added to the output:
-theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
-xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#EventFormat" )
-
# Check what happened to the stream:
xaodStream.Print()
diff --git a/Event/xAOD/xAODMetaDataCnv/CMakeLists.txt b/Event/xAOD/xAODMetaDataCnv/CMakeLists.txt
index b9cdc1b3092564a5bee8112c898f546937d2d910..480b16fc6a00810e009fc78a6b7453b530c16dc3 100644
--- a/Event/xAOD/xAODMetaDataCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODMetaDataCnv/CMakeLists.txt
@@ -8,43 +8,46 @@ atlas_subdir( xAODMetaDataCnv )
# Extra dependencies, based on the environment that we're in:
if( NOT XAOD_STANDALONE )
- set( extra_deps
- GaudiKernel
- PRIVATE
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/EventInfo )
+ set(
+ extra_deps
+ GaudiKernel
+ PRIVATE
+ Control/AthenaKernel
+ Database/AthenaPOOL/AthenaPoolUtilities
+ Event/EventInfo
+ )
endif()
# Declare the package's dependencies:
atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODMetaData
- ${extra_deps} )
+ PUBLIC
+ Control/AthToolSupport/AsgTools
+ Event/xAOD/xAODMetaData
+ ${extra_deps}
+)
# Build the package differently in standalone and Athena modes:
if( XAOD_STANDALONE )
- # The main library is an installed one in this case:
- atlas_add_library( xAODMetaDataCnv
- xAODMetaDataCnv/*.h Root/*.cxx
- PUBLIC_HEADERS xAODMetaDataCnv
- LINK_LIBRARIES AsgTools xAODMetaData )
+ # The main library is an installed one in this case:
+ atlas_add_library( xAODMetaDataCnv
+ xAODMetaDataCnv/*.h Root/*.cxx
+ PUBLIC_HEADERS xAODMetaDataCnv
+ LINK_LIBRARIES AsgTools xAODMetaData )
- # Plus we also build a dictionary:
- atlas_add_dictionary( xAODMetaDataCnvDict
- xAODMetaDataCnv/xAODMetaDataCnvDict.h
- xAODMetaDataCnv/selection.xml
- LINK_LIBRARIES xAODMetaDataCnv )
+ # Plus we also build a dictionary:
+ atlas_add_dictionary( xAODMetaDataCnvDict
+ xAODMetaDataCnv/xAODMetaDataCnvDict.h
+ xAODMetaDataCnv/selection.xml
+ LINK_LIBRARIES xAODMetaDataCnv )
else()
- # The main library is a component one in this case:
- atlas_add_component( xAODMetaDataCnv
- xAODMetaDataCnv/*.h src/*.cxx Root/*.cxx src/components/*.cxx
- LINK_LIBRARIES AsgTools xAODMetaData GaudiKernel AthenaKernel
- AthenaPoolUtilities EventInfo )
+ # The main library is a component one in this case:
+ atlas_add_component( xAODMetaDataCnv
+ xAODMetaDataCnv/*.h src/*.cxx Root/*.cxx src/components/*.cxx
+ LINK_LIBRARIES AsgTools xAODMetaData GaudiKernel AthenaKernel
+ AthenaPoolUtilities EventInfo )
endif()
diff --git a/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx b/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx
index 9671c9e90b300978033497fc6c171c24a289896a..352fa3ff7aa019e4ac958ef54ef541ed1a60af4c 100644
--- a/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx
+++ b/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx
@@ -1,32 +1,31 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: FileMetaDataTool.cxx 683697 2015-07-17 09:12:14Z krasznaa $
-
// Local include(s):
#include "xAODMetaDataCnv/FileMetaDataTool.h"
namespace xAODMaker {
- FileMetaDataTool::FileMetaDataTool( const std::string& name )
- : asg::AsgMetadataTool( name ),
- m_md(), m_mdAux(), m_beginFileIncidentSeen( false ) {
-
- declareProperty( "InputKey", m_inputKey = "FileMetaData" );
- declareProperty( "OutputKey", m_outputKey = "FileMetaData" );
+FileMetaDataTool::FileMetaDataTool(const std::string& name)
+ : asg::AsgMetadataTool(name)
+ , m_md()
+ , m_mdAux()
+ , m_beginFileIncidentSeen(false) {
+ declareProperty("InputKey", m_inputKey = "FileMetaData");
+ declareProperty("OutputKey", m_outputKey = "FileMetaData");
#ifndef XAOD_STANDALONE
- declareInterface< ::IMetaDataTool >( this );
-#endif // XAOD_STANDALONE
- }
-
- StatusCode FileMetaDataTool::initialize() {
+ declareInterface< ::IMetaDataTool >(this);
+#endif // XAOD_STANDALONE
+ }
+StatusCode
+ FileMetaDataTool::initialize() {
// Greet the user:
- ATH_MSG_DEBUG( "Initialising xAODMaker::FileMetaDataTool" );
- ATH_MSG_DEBUG( " InputKey = " << m_inputKey );
- ATH_MSG_DEBUG( " OutputKey = " << m_outputKey );
+ ATH_MSG_DEBUG("Initialising xAODMaker::FileMetaDataTool");
+ ATH_MSG_DEBUG(" InputKey = " << m_inputKey);
+ ATH_MSG_DEBUG(" OutputKey = " << m_outputKey);
// Reset the member variable(s):
m_md.reset();
@@ -35,80 +34,82 @@ namespace xAODMaker {
// Return gracefully:
return StatusCode::SUCCESS;
- }
+ }
- StatusCode FileMetaDataTool::endInputFile() {
+StatusCode
+ FileMetaDataTool::endInputFile() {
// Return gracefully:
return StatusCode::SUCCESS;
- }
- StatusCode FileMetaDataTool::beginInputFile() {
+ }
+StatusCode
+ FileMetaDataTool::beginInputFile() {
// Whatever happens, we've seen the incident:
m_beginFileIncidentSeen = true;
// If the input file doesn't have any file-level metadata, then
// finish right away:
- if( ! inputMetaStore()->contains< xAOD::FileMetaData >( m_inputKey ) ) {
- return StatusCode::SUCCESS;
+ if (!inputMetaStore()->contains< xAOD::FileMetaData >(m_inputKey)) {
+ return StatusCode::SUCCESS;
}
// Retrieve the input object:
const xAOD::FileMetaData* input = 0;
- ATH_CHECK( inputMetaStore()->retrieve( input, m_inputKey ) );
+ ATH_CHECK(inputMetaStore()->retrieve(input, m_inputKey));
// Create the output objects if they don't exist yet:
- if( ( ! m_md.get() ) && ( ! m_mdAux.get() ) ) {
- ATH_MSG_DEBUG( "Creating output objects" );
- m_md.reset( new xAOD::FileMetaData() );
- m_mdAux.reset( new xAOD::FileMetaDataAuxInfo() );
- m_md->setStore( m_mdAux.get() );
-
- // Copy the payload of the input object:
- *( m_md.get() ) = *input;
+ if ((!m_md.get()) && (!m_mdAux.get())) {
+ ATH_MSG_DEBUG("Creating output objects");
+ m_md.reset(new xAOD::FileMetaData());
+ m_mdAux.reset(new xAOD::FileMetaDataAuxInfo());
+ m_md->setStore(m_mdAux.get());
+
+ // Copy the payload of the input object:
+ *(m_md.get()) = *input;
}
// Make sure that the objects are compatible:
- if( *( m_md.get() ) != *input ) {
- ATH_MSG_ERROR( "Processing input files with differing conditions" );
- ATH_MSG_ERROR( "Consistent xAOD::FileMetaData can't be provided for "
- "the output" );
- return StatusCode::FAILURE;
+ if (*(m_md.get()) != *input) {
+ ATH_MSG_ERROR("Processing input files with differing conditions");
+ ATH_MSG_ERROR("Consistent xAOD::FileMetaData can't be provided for "
+ "the output");
+ return StatusCode::FAILURE;
}
// Return gracefully:
return StatusCode::SUCCESS;
- }
-
- StatusCode FileMetaDataTool::beginEvent() {
+ }
+StatusCode
+ FileMetaDataTool::beginEvent() {
// In case we missed the BeginInputFile incident for the first input file,
// make sure that we still run the appropriate function.
- if( ! m_beginFileIncidentSeen ) {
- ATH_CHECK( beginInputFile() );
+ if (!m_beginFileIncidentSeen) {
+ ATH_CHECK(beginInputFile());
}
// Return gracefully:
return StatusCode::SUCCESS;
- }
-
- StatusCode FileMetaDataTool::metaDataStop() {
+ }
+StatusCode
+ FileMetaDataTool::metaDataStop() {
// Don't be offended if the metadata already exists in the output:
- if( outputMetaStore()->contains< xAOD::FileMetaData >( m_outputKey ) ) {
- ATH_MSG_DEBUG( "xAOD::FileMetaData already in the output" );
- return StatusCode::SUCCESS;
+ if (outputMetaStore()->contains< xAOD::FileMetaData >(m_outputKey)) {
+ ATH_MSG_DEBUG("xAOD::FileMetaData already in the output");
+ return StatusCode::SUCCESS;
}
// Record the metadata, if any was found on the input:
- if( m_md.get() && m_mdAux.get() ) {
- ATH_MSG_DEBUG( "Recoding file level metadata" );
- ATH_CHECK( outputMetaStore()->record( m_md.release(), m_outputKey ) );
- ATH_CHECK( outputMetaStore()->record( m_mdAux.release(),
- m_outputKey + "Aux." ) );
+ if (m_md.get() && m_mdAux.get()) {
+ ATH_MSG_DEBUG("Recoding file level metadata");
+ ATH_CHECK(outputMetaStore()->record(m_md.release(), m_outputKey));
+ ATH_CHECK(outputMetaStore()->record(m_mdAux.release(),
+ m_outputKey + "Aux."));
}
// Return gracefully:
return StatusCode::SUCCESS;
- }
+ }
-} // namespace xAODMaker
+} // namespace xAODMaker
diff --git a/Event/xAOD/xAODMetaDataCnv/share/FileMetaDataCreatorTool_jobOptions.py b/Event/xAOD/xAODMetaDataCnv/share/FileMetaDataCreatorTool_jobOptions.py
index 9235869dfc9fa383cee3f17879f9d79ca17bd3a3..21d0dcfefac729a314e212520430aeb79ad47b42 100644
--- a/Event/xAOD/xAODMetaDataCnv/share/FileMetaDataCreatorTool_jobOptions.py
+++ b/Event/xAOD/xAODMetaDataCnv/share/FileMetaDataCreatorTool_jobOptions.py
@@ -1,34 +1,50 @@
-# $Id: FileMetaDataCreatorTool_jobOptions.py 670279 2015-05-27 15:18:27Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# Test jobO for exercising xAODMaker::FileMetaDataCreatorTool to create
# the file-level metadata.
#
+from AthenaCommon import CfgMgr
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+from AthenaCommon.AppMgr import ToolSvc
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+from RecExConfig.RecFlags import rec
+from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
# Set up the reading of an input file:
-INFILE = "AOD.pool.root"
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput = [ INFILE ]
+INFILE = (
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/"
+ "data16_13TeV.00311321.physics_Main.recon.AOD.r9264/"
+ "AOD.11038520._000001.pool.root.1"
+)
+
+athenaCommonFlags.FilesInput = [INFILE]
athenaCommonFlags.EvtMax = 10
# Turn off most of what RecExCommon does:
-from RecExConfig.RecFlags import rec
-rec.doCBNT.set_Value_and_Lock( False )
-rec.doWriteAOD.set_Value_and_Lock( False )
-rec.doWriteTAG.set_Value_and_Lock( False )
-rec.AutoConfiguration = [ "everything" ]
+
+rec.doCBNT.set_Value_and_Lock(False)
+rec.doWriteAOD.set_Value_and_Lock(False)
+rec.doWriteTAG.set_Value_and_Lock(False)
+rec.AutoConfiguration = ["everything"]
# Read the file using RecExCommon:
-include( "RecExCommon/RecExCommon_topOptions.py" )
+include("RecExCommon/RecExCommon_topOptions.py")
# Set up the metadata tool:
-ToolSvc += CfgMgr.xAODMaker__FileMetaDataCreatorTool( "FileMetaDataCreatorTool",
- OutputLevel = 2 )
-svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.FileMetaDataCreatorTool ]
+ToolSvc += CfgMgr.xAODMaker__FileMetaDataCreatorTool(
+ "FileMetaDataCreatorTool", OutputLevel=2
+)
+svcMgr.MetaDataSvc.MetaDataTools += [ToolSvc.FileMetaDataCreatorTool]
# Set up the writing of an output file:
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-stream = MSMgr.NewPoolRootStream( "StreamDAOD", "DxAOD.pool.root" )
-stream.AddItem( [ "xAOD::EventInfo#EventInfo",
- "xAOD::EventAuxInfo#EventInfoAux." ] )
-stream.AddMetaDataItem( [ "xAOD::FileMetaData#FileMetaData",
- "xAOD::FileMetaDataAuxInfo#FileMetaDataAux." ] )
+
+stream = MSMgr.NewPoolRootStream("StreamDAOD", "DxAOD.pool.root")
+stream.AddItem(
+ ["xAOD::EventInfo#EventInfo", "xAOD::EventAuxInfo#EventInfoAux."]
+)
+stream.AddMetaDataItem(
+ [
+ "xAOD::FileMetaData#FileMetaData",
+ "xAOD::FileMetaDataAuxInfo#FileMetaDataAux.",
+ ]
+)
diff --git a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx
index a4397199a8436e9a87280a1330c04e66c74b02db..f7cecdc30cc0fdb257d479b6c990cf0da681ccff 100644
--- a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx
+++ b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.cxx
@@ -1,9 +1,7 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: FileMetaDataCreatorTool.cxx 685407 2015-07-24 16:15:06Z cranshaw $
-
// System include(s):
#include <algorithm>
#include <sstream>
@@ -18,255 +16,260 @@
namespace xAODMaker {
- /// The folder in DetectorStore that we get the information from
- static const std::string FOLDER_NAME = "/TagInfo";
- static const std::string SIMFOLDER_NAME = "/Simulation/Parameters";
+/// The folder in DetectorStore that we get the information from
+static const char FOLDER_NAME[] = "/TagInfo";
+static const char SIMFOLDER_NAME[] = "/Simulation/Parameters";
/// Helper macro to execute the setter functions correctly
-#define CHECK_BOOL( EXP ) \
- do { \
- try { \
- if( ! EXP ) { \
- ATH_MSG_ERROR( "Failed to execute: " << #EXP ); \
- return StatusCode::FAILURE; \
- } \
- } catch( const std::exception& ex ) { \
- ATH_MSG_INFO( "Couldn't extract attribute with command: " \
- << #EXP ); \
- } \
- } while( 0 )
-
- FileMetaDataCreatorTool::FileMetaDataCreatorTool( const std::string& name )
- : asg::AsgMetadataTool( name ),
- m_md(), m_mdAux() {
-
- declareProperty( "OutputKey", m_outputKey = "FileMetaData" );
- }
-
- StatusCode FileMetaDataCreatorTool::start() {
+#define CHECK_BOOL(EXP) \
+do { \
+ try { \
+ if (!EXP) { \
+ ATH_MSG_ERROR("Failed to execute: " << #EXP); \
+ return StatusCode::FAILURE; \
+ } \
+ } catch(const std::exception& ex) { \
+ ATH_MSG_INFO("Couldn't extract attribute with command: " \
+ << #EXP); \
+ } \
+} while (0)
+
+FileMetaDataCreatorTool::FileMetaDataCreatorTool(const std::string& name)
+ : asg::AsgMetadataTool(name)
+ , m_md()
+ , m_mdAux() {
+ declareProperty("OutputKey", m_outputKey = "FileMetaData");
+ }
+
+StatusCode
+ FileMetaDataCreatorTool::start() {
const DataHandle< CondAttrListCollection > dummy;
- StatusCode sc = detStore()->
- regFcn( &xAODMaker::FileMetaDataCreatorTool::update,
- this, dummy, FOLDER_NAME, true );
+ StatusCode sc = detStore()->regFcn(
+ &xAODMaker::FileMetaDataCreatorTool::update,
+ this,
+ dummy,
+ FOLDER_NAME,
+ true);
+
if (sc.isFailure()) {
- ATH_MSG_WARNING("Unable to register callback for " << FOLDER_NAME);
- //return StatusCode::FAILURE;
+ ATH_MSG_WARNING("Unable to register callback for " << FOLDER_NAME);
+ // return StatusCode::FAILURE;
}
- if (detStore()->contains< AthenaAttributeList >(SIMFOLDER_NAME) ) {
+
+ if (detStore()->contains< AthenaAttributeList >(SIMFOLDER_NAME)) {
const DataHandle< AthenaAttributeList > dummy2;
- sc = detStore()->regFcn( &xAODMaker::FileMetaDataCreatorTool::update,
- this, dummy2, SIMFOLDER_NAME, true );
+ sc = detStore()->regFcn(
+ &xAODMaker::FileMetaDataCreatorTool::update,
+ this,
+ dummy2,
+ SIMFOLDER_NAME,
+ true);
+
if (sc.isFailure()) {
ATH_MSG_WARNING("Unable to register callback for " << SIMFOLDER_NAME);
- //return StatusCode::FAILURE;
+ // return StatusCode::FAILURE;
}
- }
- else {
+ } else {
ATH_MSG_INFO("Processing file with no " << SIMFOLDER_NAME);
}
return StatusCode::SUCCESS;
- }
-
- StatusCode FileMetaDataCreatorTool::initialize() {
+ }
+StatusCode
+ FileMetaDataCreatorTool::initialize() {
// Greet the user:
- ATH_MSG_DEBUG( "Initialising - Package version: " << PACKAGE_VERSION );
- ATH_MSG_DEBUG( " OutputKey = " << m_outputKey );
+ ATH_MSG_DEBUG("Initialising - Package version: " << PACKAGE_VERSION);
+ ATH_MSG_DEBUG(" OutputKey = " << m_outputKey);
// Return gracefully:
return StatusCode::SUCCESS;
- }
-
- StatusCode FileMetaDataCreatorTool::beginInputFile() {
+ }
+StatusCode
+ FileMetaDataCreatorTool::beginInputFile() {
// Create the output objects if they don't exist yet:
- if( ( ! m_md.get() ) && ( ! m_mdAux.get() ) ) {
- ATH_MSG_DEBUG( "Creating output objects" );
- m_md.reset( new xAOD::FileMetaData() );
- m_mdAux.reset( new xAOD::FileMetaDataAuxInfo() );
- m_md->setStore( m_mdAux.get() );
+ if ((!m_md.get()) && (!m_mdAux.get())) {
+ ATH_MSG_DEBUG("Creating output objects");
+ m_md.reset(new xAOD::FileMetaData());
+ m_mdAux.reset(new xAOD::FileMetaDataAuxInfo());
+ m_md->setStore(m_mdAux.get());
}
- ATH_MSG_DEBUG( "DetectorStore contents:\n\n" << detStore()->dump() );
+ ATH_MSG_DEBUG("DetectorStore contents:\n\n" << detStore()->dump());
// Return gracefully:
return StatusCode::SUCCESS;
- }
+ }
- StatusCode FileMetaDataCreatorTool::endInputFile() {
+StatusCode
+ FileMetaDataCreatorTool::endInputFile() {
// Return gracefully:
return StatusCode::SUCCESS;
- }
-
- StatusCode FileMetaDataCreatorTool::metaDataStop() {
+ }
+StatusCode
+ FileMetaDataCreatorTool::metaDataStop() {
// Don't be offended if the metadata already exists in the output:
- if( outputMetaStore()->contains< xAOD::FileMetaData >( m_outputKey ) ) {
- ATH_MSG_DEBUG( "xAOD::FileMetaData already in the output" );
- return StatusCode::SUCCESS;
+ if (outputMetaStore()->contains< xAOD::FileMetaData >(m_outputKey)) {
+ ATH_MSG_DEBUG("xAOD::FileMetaData already in the output");
+ return StatusCode::SUCCESS;
}
+
SG::ConstIterator<EventStreamInfo> esi_h1;
SG::ConstIterator<EventStreamInfo> esi_h2;
- StatusCode sc = outputMetaStore()->retrieve(esi_h1,esi_h2);
+ StatusCode sc = outputMetaStore()->retrieve(esi_h1, esi_h2);
if (sc.isSuccess() && esi_h1 != esi_h2) {
- if (esi_h1->getProcessingTags().size()==1) {
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::dataType,
- *(esi_h1->getProcessingTags().begin()) ) );
+ if (esi_h1->getProcessingTags().size() == 1) {
+ CHECK_BOOL(m_md->setValue(
+ xAOD::FileMetaData::dataType,
+ *(esi_h1->getProcessingTags().begin())));
} else {
- ATH_MSG_WARNING("Found multiple output process tags");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::dataType,"multiple") );
+ ATH_MSG_WARNING("Found multiple output process tags");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::dataType, "multiple"));
}
- if (esi_h1->getEventTypes().size()==1) {
- float id = esi_h1->getEventTypes().begin()->mc_channel_number();
- CHECK_BOOL(m_md->setValue( xAOD::FileMetaData::mcProcID,id));
+ if (esi_h1->getEventTypes().size() == 1) {
+ float id = esi_h1->getEventTypes().begin()->mc_channel_number();
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::mcProcID, id));
} else {
- ATH_MSG_WARNING("Found multiple eventtypes");
- CHECK_BOOL(m_md->setValue( xAOD::FileMetaData::mcProcID,float(0.0)));
+ ATH_MSG_WARNING("Found multiple eventtypes");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::mcProcID, 0.0f));
}
}
// Record the metadata, if any was found on the input:
- if( m_md.get() && m_mdAux.get() ) {
- ATH_MSG_DEBUG( "Recoding file level metadata" );
- ATH_CHECK( outputMetaStore()->record( m_md.release(), m_outputKey ) );
- ATH_CHECK( outputMetaStore()->record( m_mdAux.release(),
- m_outputKey + "Aux." ) );
+ if (m_md.get() && m_mdAux.get()) {
+ ATH_MSG_DEBUG("Recoding file level metadata");
+ ATH_CHECK(outputMetaStore()->record(m_md.release(), m_outputKey));
+ ATH_CHECK(outputMetaStore()->record(m_mdAux.release(),
+ m_outputKey + "Aux."));
}
// Return gracefully:
return StatusCode::SUCCESS;
- }
-
- StatusCode
- FileMetaDataCreatorTool::update( IOVSVC_CALLBACK_ARGS_K( keys ) ) {
+ }
- ATH_MSG_DEBUG( "update() invoked for key(s): " << keys );
+StatusCode
+ FileMetaDataCreatorTool::update(IOVSVC_CALLBACK_ARGS_K(keys)) {
+ ATH_MSG_DEBUG("update() invoked for key(s): " << keys);
// Bail if the requested folder is not amongst the keys:
- if( std::find( keys.begin(), keys.end(), FOLDER_NAME ) == keys.end() &&
- std::find( keys.begin(), keys.end(), SIMFOLDER_NAME ) == keys.end() ) {
- ATH_MSG_WARNING( "Update callback received without the \""
- << FOLDER_NAME << "\" key" );
- return StatusCode::SUCCESS;
+ if (std::find(keys.begin(), keys.end(), FOLDER_NAME) == keys.end()
+ && std::find(keys.begin(), keys.end(), SIMFOLDER_NAME) == keys.end()) {
+ ATH_MSG_WARNING("Update callback received without the \""
+ << FOLDER_NAME << "\" key");
+ return StatusCode::SUCCESS;
}
// Retrieve the needed metadata:
- if (std::find( keys.begin(), keys.end(), FOLDER_NAME ) != keys.end()) {
- const CondAttrListCollection* tagInfo = 0;
- ATH_CHECK( detStore()->retrieve( tagInfo, FOLDER_NAME ) );
-
- ATH_MSG_DEBUG( "Retrieved object: " << FOLDER_NAME );
-
- // Make sure that it has some the expected size:
- if( tagInfo->size() > 1 ) {
- ATH_MSG_WARNING( "Collection with >1 size received for \""
- << FOLDER_NAME << "\"" );
- }
- if( ! tagInfo->size() ) {
- ATH_MSG_ERROR( "Empty collection received for \""
- << FOLDER_NAME << "\"" );
- return StatusCode::FAILURE;
- }
- // Access the first, and only channel of the object:
- const CondAttrListCollection::AttributeList& al =
- tagInfo->attributeList( 0 );
-
- if (al.exists("AtlasRelease")) {
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::productionRelease, al[ "AtlasRelease" ].data< std::string >() ) );
- }
- else {
- ATH_MSG_WARNING("Did not find AtlasRelease in TagInfo setting to none");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::productionRelease,
- "none" ) );
- }
- if (al.exists("AMITag")) {
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::amiTag,
- al[ "AMITag" ].data< std::string >() ) );
- }
- else {
- ATH_MSG_WARNING("Did not find AMITag in TagInfo setting to none");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::amiTag,
- "none" ) );
- }
- if (al.exists("GeoAtlas")) {
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::geometryVersion,
- al[ "GeoAtlas" ].data< std::string >() ) );
- }
- else {
- ATH_MSG_WARNING("Did not find GeoAtlas in TagInfo setting to none");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::geometryVersion,
- "none" ) );
- }
- if (al.exists("IOVDbGlobalTag")) {
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::conditionsTag,
- al[ "IOVDbGlobalTag" ].data< std::string >() ) );
- }
- else {
- ATH_MSG_WARNING("Did not find IOVDbGlobalTag in TagInfo setting to none");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::conditionsTag,
- "none" ) );
- }
-
- // Convert the beam energy to float. (If it exists.)
- if (al.exists("beam_energy")) {
- try {
- const std::string beamEnergyStr =
- al[ "beam_energy" ].data< std::string >();
- char* endptr = 0;
- float beamEnergy = strtof( beamEnergyStr.c_str(), &endptr );
- if( endptr ) {
- if( ! m_md->setValue( xAOD::FileMetaData::beamEnergy,
- beamEnergy ) ) {
- ATH_MSG_ERROR( "Failed to set the beam energy" );
- return StatusCode::FAILURE;
- }
+ if (std::find(keys.begin(), keys.end(), FOLDER_NAME) != keys.end()) {
+ const CondAttrListCollection* tagInfo = 0;
+ ATH_CHECK(detStore()->retrieve(tagInfo, FOLDER_NAME));
+
+ ATH_MSG_DEBUG("Retrieved object: " << FOLDER_NAME);
+
+ // Make sure that it has some the expected size:
+ if (tagInfo->size() > 1) {
+ ATH_MSG_WARNING("Collection with >1 size received for \""
+ << FOLDER_NAME << "\"");
+ }
+ if (!tagInfo->size()) {
+ ATH_MSG_ERROR("Empty collection received for \""
+ << FOLDER_NAME << "\"");
+ return StatusCode::FAILURE;
+ }
+ // Access the first, and only channel of the object:
+ const CondAttrListCollection::AttributeList& al =
+ tagInfo->attributeList(0);
+
+ if (al.exists("AtlasRelease")) {
+ CHECK_BOOL(m_md->setValue(
+ xAOD::FileMetaData::productionRelease,
+ al[ "AtlasRelease" ].data< std::string >()));
+ } else {
+ ATH_MSG_WARNING("Did not find AtlasRelease in TagInfo setting to none");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::productionRelease, "none"));
+ }
+
+ if (al.exists("AMITag")) {
+ CHECK_BOOL(m_md->setValue(
+ xAOD::FileMetaData::amiTag,
+ al["AMITag"].data< std::string >()));
+ } else {
+ ATH_MSG_WARNING("Did not find AMITag in TagInfo setting to none");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::amiTag, "none"));
+ }
+
+ if (al.exists("GeoAtlas")) {
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::geometryVersion,
+ al["GeoAtlas"].data< std::string >()));
+ } else {
+ ATH_MSG_WARNING("Did not find GeoAtlas in TagInfo setting to none");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::geometryVersion, "none"));
+ }
+
+ if (al.exists("IOVDbGlobalTag")) {
+ CHECK_BOOL(m_md->setValue(
+ xAOD::FileMetaData::conditionsTag,
+ al["IOVDbGlobalTag"].data< std::string >()));
+ } else {
+ ATH_MSG_WARNING("Did not find IOVDbGlobalTag in TagInfo setting to none");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::conditionsTag, "none"));
+ }
+
+ // Convert the beam energy to float. (If it exists.)
+ if (al.exists("beam_energy")) {
+ try {
+ const std::string beamEnergyStr = al["beam_energy"].data< std::string >();
+ char* endptr = 0;
+ float beamEnergy = strtof(beamEnergyStr.c_str(), &endptr);
+ if (endptr) {
+ if (!m_md->setValue(xAOD::FileMetaData::beamEnergy, beamEnergy)) {
+ ATH_MSG_ERROR("Failed to set the beam energy");
+ return StatusCode::FAILURE;
}
- } catch( const std::exception& ex ) {
- ATH_MSG_INFO( "Couldn't set the beam energy" );
- }
- }
- else {
- ATH_MSG_WARNING("Did not find beam_energy in TagInfo setting to -1");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::beamEnergy, -1.0f ) );
- }
-
- if (al.exists("beam_type")) {
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::beamType,
- al[ "beam_type" ].data< std::string >() ) );
- }
- else {
- ATH_MSG_WARNING("Did not find beam_type in TagInfo setting to none");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::beamType,
- "none" ) );
- }
+ }
+ } catch(const std::exception& ex) {
+ ATH_MSG_INFO("Couldn't set the beam energy");
+ }
+ } else {
+ ATH_MSG_WARNING("Did not find beam_energy in TagInfo setting to -1");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::beamEnergy, -1.0f));
+ }
+
+ if (al.exists("beam_type")) {
+ CHECK_BOOL(m_md->setValue(
+ xAOD::FileMetaData::beamType,
+ al["beam_type"].data< std::string >()));
+ } else {
+ ATH_MSG_WARNING("Did not find beam_type in TagInfo setting to none");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::beamType, "none"));
+ }
}
- if (std::find( keys.begin(), keys.end(), SIMFOLDER_NAME ) != keys.end()) {
- const AthenaAttributeList* simInfo = 0;
- ATH_CHECK( detStore()->retrieve( simInfo, SIMFOLDER_NAME ) );
-
- if (simInfo->exists("SimulationFlavour")) {
- std::string flavor = (*simInfo)[ "SimulationFlavour" ].data< std::string >();
- if (flavor == "default") flavor = "FullSim";
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::simFlavour,
- flavor ) );
- }
- else {
- ATH_MSG_ERROR("Unable to retrieve SimulationFlavour from " << SIMFOLDER_NAME);
- }
-
- if (simInfo->exists("IsEventOverlayInputSim")) {
- bool isDataOverlay = (*simInfo)[ "IsEventOverlayInputSim" ].data< std::string >()=="True";
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::isDataOverlay,
- isDataOverlay ) );
- }
- else {
- ATH_MSG_INFO("Unable to retrieve IsEventOverlayInputSim from " << SIMFOLDER_NAME << " - assuming not data overlay");
- CHECK_BOOL( m_md->setValue( xAOD::FileMetaData::isDataOverlay, false ) );
- }
+
+ if (std::find(keys.begin(), keys.end(), SIMFOLDER_NAME) != keys.end()) {
+ const AthenaAttributeList* simInfo = 0;
+ ATH_CHECK(detStore()->retrieve(simInfo, SIMFOLDER_NAME));
+
+ if (simInfo->exists("SimulationFlavour")) {
+ std::string flavor = (*simInfo)["SimulationFlavour"].data< std::string >();
+ if (flavor == "default") flavor = "FullSim";
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::simFlavour, flavor));
+ } else {
+ ATH_MSG_ERROR("Unable to retrieve SimulationFlavour from " << SIMFOLDER_NAME);
+ }
+
+ if (simInfo->exists("IsEventOverlayInputSim")) {
+ bool isDataOverlay = (*simInfo)["IsEventOverlayInputSim"].data< std::string >() == "True";
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::isDataOverlay, isDataOverlay));
+ } else {
+ ATH_MSG_INFO("Unable to retrieve IsEventOverlayInputSim from "
+ << SIMFOLDER_NAME << " - assuming not data overlay");
+ CHECK_BOOL(m_md->setValue(xAOD::FileMetaData::isDataOverlay, false));
+ }
}
// Return gracefully:
return StatusCode::SUCCESS;
- }
+ }
-} // namespace xAODMaker
+} // namespace xAODMaker
diff --git a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.h b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.h
index 433f97de011368fadc8973e7f0f1778358daa1fd..144431f39f522a614fbafe3e9f004f3327d1c2bc 100644
--- a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.h
+++ b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataCreatorTool.h
@@ -1,10 +1,7 @@
// Dear emacs, this is -*- c++ -*-
-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id: FileMetaDataCreatorTool.h 676522 2015-06-18 22:17:03Z cranshaw $
#ifndef XAODMETADATACNV_FILEMETADATACREATORTOOL_H
#define XAODMETADATACNV_FILEMETADATACREATORTOOL_H
@@ -24,40 +21,40 @@
namespace xAODMaker {
- /// Tool creating or propagating xAOD::FileMetaData information
- ///
- /// This Athena-only tool can be used to create xAOD::FileMetaData
- /// information out of the non-ROOT-readable metadata available in
- /// the input.
- ///
- /// Or, if the input file already has xAOD::FileMetaData payload,
- /// it is taken as is, and copied to the output.
- ///
- /// The class uses asg::AsgMetadataTool as a base class for convenience,
- /// but it's not a dual-use tool. (Hence the header is hidden from the
- /// outside world.)
- ///
- /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- ///
- /// $Revision: 676522 $
- /// $Date: 2015-06-19 00:17:03 +0200 (Fri, 19 Jun 2015) $
- ///
- class FileMetaDataCreatorTool : public asg::AsgMetadataTool,
- public virtual ::IMetaDataTool {
-
- /// Declare the correct constructor for Athena
- ASG_TOOL_CLASS( FileMetaDataCreatorTool, IMetaDataTool )
-
- public:
+/// Tool creating or propagating xAOD::FileMetaData information
+///
+/// This Athena-only tool can be used to create xAOD::FileMetaData
+/// information out of the non-ROOT-readable metadata available in
+/// the input.
+///
+/// Or, if the input file already has xAOD::FileMetaData payload,
+/// it is taken as is, and copied to the output.
+///
+/// The class uses asg::AsgMetadataTool as a base class for convenience,
+/// but it's not a dual-use tool. (Hence the header is hidden from the
+/// outside world.)
+///
+/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+///
+/// $Revision: 676522 $
+/// $Date: 2015-06-19 00:17:03 +0200 (Fri, 19 Jun 2015) $
+///
+class FileMetaDataCreatorTool
+ : public asg::AsgMetadataTool
+ , public virtual ::IMetaDataTool {
+ /// Declare the correct constructor for Athena
+ ASG_TOOL_CLASS(FileMetaDataCreatorTool, IMetaDataTool)
+
+ public:
/// Regular AsgTool constructor
- FileMetaDataCreatorTool( const std::string& name =
- "FileMetaDataCreatorTool" );
+ FileMetaDataCreatorTool(const std::string& name =
+ "FileMetaDataCreatorTool");
/// Function initialising the tool
virtual StatusCode initialize();
virtual StatusCode start();
- protected:
+ protected:
/// @name Functions called by the AsgMetadataTool base class
/// @{
@@ -78,9 +75,9 @@ namespace xAODMaker {
/// @}
- private:
+ private:
/// Function called by the DetectorStore when the metadata is updated
- StatusCode update( IOVSVC_CALLBACK_ARGS_P( I, keys ) );
+ StatusCode update(IOVSVC_CALLBACK_ARGS_P(I, keys));
/// Key of the metadata object for the output file
std::string m_outputKey;
@@ -89,9 +86,8 @@ namespace xAODMaker {
std::unique_ptr< xAOD::FileMetaData > m_md;
/// The output auxiliary object
std::unique_ptr< xAOD::FileMetaDataAuxInfo > m_mdAux;
+}; // class FileMetaDataCreatorTool
- }; // class FileMetaDataCreatorTool
-
-} // namespace xAODMaker
+} // namespace xAODMaker
-#endif // XAODMETADATACNV_FILEMETADATACREATORTOOL_H
+#endif // XAODMETADATACNV_FILEMETADATACREATORTOOL_H
diff --git a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.cxx b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.cxx
index 4df951f99e2279eb86a4c9509100fbef7ddb4354..17c31e3c70f6362b9186728c0b06c5e2fa57ecca 100644
--- a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.cxx
+++ b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.cxx
@@ -2,11 +2,10 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id: FileMetaDataMarkUpTool.cxx 685407 2015-07-24 16:15:06Z cranshaw $
-
// System include(s):
#include <algorithm>
#include <sstream>
+#include <vector>
// Athena metadata EDM:
#include "EventInfo/EventStreamInfo.h"
@@ -17,92 +16,107 @@
namespace xAODMaker {
/// Helper macro to execute the setter functions correctly
-#define CHECK_BOOL( EXP ) \
- do { \
- try { \
- if( ! EXP ) { \
- ATH_MSG_ERROR( "Failed to execute: " << #EXP ); \
- return StatusCode::FAILURE; \
- } \
- } catch( const std::exception& ex ) { \
- ATH_MSG_INFO( "Couldn't extract attribute with command: " \
- << #EXP ); \
- } \
- } while( 0 )
-
- FileMetaDataMarkUpTool::FileMetaDataMarkUpTool( const std::string& name )
- : asg::AsgMetadataTool( name ) {
-
- declareProperty( "Key", m_outputKey = "" );
- }
-
- StatusCode FileMetaDataMarkUpTool::initialize() {
- return(StatusCode::SUCCESS);
- }
-
- StatusCode FileMetaDataMarkUpTool::postInitialize() {
- return(StatusCode::SUCCESS);
- }
-
- StatusCode FileMetaDataMarkUpTool::preExecute() {
- return(StatusCode::SUCCESS);
- }
-
- StatusCode FileMetaDataMarkUpTool::preStream() {
- return(StatusCode::SUCCESS);
- }
-
- StatusCode FileMetaDataMarkUpTool::postExecute() {
- return(StatusCode::SUCCESS);
- }
-
- StatusCode FileMetaDataMarkUpTool::preFinalize() {
- ATH_MSG_DEBUG("in preFinalize()");
- std::vector<std::string> fmd_keys;
- outputMetaStore()->keys<xAOD::FileMetaData>( fmd_keys );
- if (fmd_keys.size() != 1) {
- return(StatusCode::SUCCESS);
- }
- if (!outputMetaStore()->transientContains<xAOD::FileMetaData>( *(fmd_keys.begin()) )) {
- return(StatusCode::SUCCESS);
+#define CHECK_BOOL(EXP) \
+ do { \
+ try { \
+ if (!EXP) { \
+ ATH_MSG_ERROR("Failed to execute: " << #EXP); \
+ return StatusCode::FAILURE; \
+ } \
+ } catch(const std::exception& ex) { \
+ ATH_MSG_INFO("Couldn't extract attribute with command: " \
+ << #EXP); \
+ } \
+ } while (0)
+
+ FileMetaDataMarkUpTool::FileMetaDataMarkUpTool(const std::string& name)
+ : asg::AsgMetadataTool(name) {
+ declareProperty("Key", m_outputKey = "");
}
- xAOD::FileMetaData* fmd = nullptr;
- StatusCode sc = outputMetaStore()->retrieve(fmd, *(fmd_keys.begin()) );
- if (!sc.isSuccess()) {
- return(StatusCode::SUCCESS);
- }
- const EventStreamInfo* esi = nullptr;
- sc = outputMetaStore()->retrieve(esi, m_outputKey);
- if (sc.isSuccess()) {
- ATH_MSG_DEBUG( "Setting xAOD::FileMetaData from output EventStreamInfo object " << m_outputKey );
- if (esi->getProcessingTags().size()==1) {
- CHECK_BOOL( fmd->setValue( xAOD::FileMetaData::dataType,
- *(esi->getProcessingTags().begin()) ) );
- } else {
- CHECK_BOOL( fmd->setValue( xAOD::FileMetaData::dataType, m_outputKey ) );
- }
- if (esi->getEventTypes().size()==1) {
+
+ StatusCode
+ FileMetaDataMarkUpTool::initialize() {
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode
+ FileMetaDataMarkUpTool::postInitialize() {
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode
+ FileMetaDataMarkUpTool::preExecute() {
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode
+ FileMetaDataMarkUpTool::preStream() {
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode
+ FileMetaDataMarkUpTool::postExecute() {
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode
+ FileMetaDataMarkUpTool::preFinalize() {
+ ATH_MSG_DEBUG("in preFinalize()");
+
+ std::vector<std::string> fmd_keys;
+ outputMetaStore()->keys<xAOD::FileMetaData>(fmd_keys);
+ if (fmd_keys.size() != 1) {
+ return StatusCode::SUCCESS;
+ }
+
+ if (!outputMetaStore()->transientContains< xAOD::FileMetaData >(
+ *(fmd_keys.begin()))) {
+ return StatusCode::SUCCESS;
+ }
+
+ xAOD::FileMetaData* fmd = nullptr;
+ StatusCode sc = outputMetaStore()->retrieve(fmd, *(fmd_keys.begin()));
+ if (!sc.isSuccess()) {
+ return StatusCode::SUCCESS;
+ }
+
+ const EventStreamInfo* esi = nullptr;
+ sc = outputMetaStore()->retrieve(esi, m_outputKey);
+ if (sc.isSuccess()) {
+ ATH_MSG_DEBUG("Setting xAOD::FileMetaData from output "
+ << "EventStreamInfo object " << m_outputKey);
+ if (esi->getProcessingTags().size() == 1) {
+ CHECK_BOOL(fmd->setValue(xAOD::FileMetaData::dataType,
+ *(esi->getProcessingTags().begin())));
+ } else {
+ CHECK_BOOL(fmd->setValue(xAOD::FileMetaData::dataType, m_outputKey));
+ }
+ if (esi->getEventTypes().size() == 1) {
float id = esi->getEventTypes().begin()->mc_channel_number();
- CHECK_BOOL( fmd->setValue( xAOD::FileMetaData::mcProcID, id) );
- }
+ CHECK_BOOL(fmd->setValue(xAOD::FileMetaData::mcProcID, id));
+ }
+ }
+ return StatusCode::SUCCESS;
}
- return(StatusCode::SUCCESS);
- }
- StatusCode FileMetaDataMarkUpTool::finalize() {
- return(StatusCode::SUCCESS);
- }
+ StatusCode
+ FileMetaDataMarkUpTool::finalize() {
+ return StatusCode::SUCCESS;
+ }
- StatusCode FileMetaDataMarkUpTool::start() {
- return StatusCode::SUCCESS;
- }
+ StatusCode
+ FileMetaDataMarkUpTool::start() {
+ return StatusCode::SUCCESS;
+ }
- StatusCode FileMetaDataMarkUpTool::beginInputFile() {
- return StatusCode::SUCCESS;
- }
+ StatusCode
+ FileMetaDataMarkUpTool::beginInputFile() {
+ return StatusCode::SUCCESS;
+ }
- StatusCode FileMetaDataMarkUpTool::metaDataStop() {
- return StatusCode::SUCCESS;
- }
+ StatusCode
+ FileMetaDataMarkUpTool::metaDataStop() {
+ return StatusCode::SUCCESS;
+ }
-} // namespace xAODMaker
+} // namespace xAODMaker
diff --git a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.h b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.h
index 8e804b5541673f58016f83b9fe820a091332b3c6..50ce08e07e99ef6ff7e05702888926d8fadc9eba 100644
--- a/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.h
+++ b/Event/xAOD/xAODMetaDataCnv/src/FileMetaDataMarkUpTool.h
@@ -1,10 +1,7 @@
// Dear emacs, this is -*- c++ -*-
-
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id: FileMetaDataMarkUpTool.h 676522 2015-06-18 22:17:03Z cranshaw $
#ifndef XAODMETADATACNV_FILEMETADATAMARKUPTOOL_H
#define XAODMETADATACNV_FILEMETADATAMARKUPTOOL_H
@@ -23,70 +20,69 @@
namespace xAODMaker {
- /// Tool creating or propagating xAOD::FileMetaData information
- ///
- /// This Athena-only tool can be used to create xAOD::FileMetaData
- /// information out of the non-ROOT-readable metadata available in
- /// the input.
- ///
- /// Or, if the input file already has xAOD::FileMetaData payload,
- /// it is taken as is, and copied to the output.
- ///
- /// The class uses asg::AsgMetadataTool as a base class for convenience,
- /// but it's not a dual-use tool. (Hence the header is hidden from the
- /// outside world.)
- ///
- /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- ///
- /// $Revision: 676522 $
- /// $Date: 2015-06-19 00:17:03 +0200 (Fri, 19 Jun 2015) $
- ///
- class FileMetaDataMarkUpTool : public asg::AsgMetadataTool,
- public virtual ::IAthenaOutputTool {
-
- /// Declare the correct constructor for Athena
- ASG_TOOL_CLASS( FileMetaDataMarkUpTool, IAthenaOutputTool )
-
- public:
+/// Tool creating or propagating xAOD::FileMetaData information
+///
+/// This Athena-only tool can be used to create xAOD::FileMetaData
+/// information out of the non-ROOT-readable metadata available in
+/// the input.
+///
+/// Or, if the input file already has xAOD::FileMetaData payload,
+/// it is taken as is, and copied to the output.
+///
+/// The class uses asg::AsgMetadataTool as a base class for convenience,
+/// but it's not a dual-use tool. (Hence the header is hidden from the
+/// outside world.)
+///
+/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+///
+/// $Revision: 676522 $
+/// $Date: 2015-06-19 00:17:03 +0200 (Fri, 19 Jun 2015) $
+///
+class FileMetaDataMarkUpTool
+ : public asg::AsgMetadataTool
+ , public virtual ::IAthenaOutputTool {
+ /// Declare the correct constructor for Athena
+ ASG_TOOL_CLASS(FileMetaDataMarkUpTool, IAthenaOutputTool)
+
+ public:
/// Regular AsgTool constructor
- FileMetaDataMarkUpTool( const std::string& name =
- "FileMetaDataMarkUpTool" );
+ explicit FileMetaDataMarkUpTool(
+ const std::string& name = "FileMetaDataMarkUpTool");
/// Required of all IAthenaOutputTools:
/// Called by AthenaOutputStream::initialize() (via ToolSvc retrieve()).
- virtual StatusCode initialize() override;
+ StatusCode initialize() override;
/// Called at the end of AthenaOutputStream::initialize().
- virtual StatusCode postInitialize() override;
+ StatusCode postInitialize() override;
/// Called at the beginning of AthenaOutputStream::execute().
- virtual StatusCode preExecute() override;
+ StatusCode preExecute() override;
/// Called before actually streaming objects.
- virtual StatusCode preStream() override;
+ StatusCode preStream() override;
/// Called at the end of AthenaOutputStream::execute().
- virtual StatusCode postExecute() override;
+ StatusCode postExecute() override;
/// Called at the beginning of AthenaOutputStream::finalize().
- virtual StatusCode preFinalize() override;
+ StatusCode preFinalize() override;
/// Called at the end of AthenaOutputStream::finalize() (via release()).
- virtual StatusCode finalize() override;
- virtual StatusCode start() override;
+ StatusCode finalize() override;
+ StatusCode start() override;
- protected:
+ protected:
/// @name Functions called by the AsgMetadataTool base class
/// @{
/// Function collecting the metadata from a new input file
- virtual StatusCode beginInputFile() override;
+ StatusCode beginInputFile() override;
/// Function writing the collected metadata to the output
- virtual StatusCode metaDataStop() override;
+ StatusCode metaDataStop() override;
/// @}
- private:
+ private:
/// Key of the metadata object for the output file
std::string m_outputKey;
+}; // class FileMetaDataMarkUpTool
- }; // class FileMetaDataMarkUpTool
-
-} // namespace xAODMaker
+} // namespace xAODMaker
-#endif // XAODMETADATACNV_FILEMETADATAMARKUPTOOL_H
+#endif // XAODMETADATACNV_FILEMETADATAMARKUPTOOL_H
diff --git a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h
index 01e15dc64ab5e12983e468ab6f2e5c814068f051..3c3c718a93e53bfea98b4908fcf274a70d68f914 100644
--- a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h
+++ b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h
@@ -1,10 +1,7 @@
// Dear emacs, this is -*- c++ -*-
-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id: FileMetaDataTool.h 683697 2015-07-17 09:12:14Z krasznaa $
#ifndef XAODMETADATACNV_FILEMETADATATOOL_H
#define XAODMETADATACNV_FILEMETADATATOOL_H
@@ -16,7 +13,7 @@
#include "AsgTools/AsgMetadataTool.h"
#ifndef XAOD_STANDALONE
# include "AthenaKernel/IMetaDataTool.h"
-#endif // XAOD_STANDALONE
+#endif // XAOD_STANDALONE
// EDM include(s):
#include "xAODMetaData/FileMetaData.h"
@@ -24,37 +21,37 @@
namespace xAODMaker {
- /// Tool taking care of propagating xAOD::FileMetaData information
- ///
- /// This dual-use tool can be used both in Athena and in AnalysisBase
- /// to propagate the generic file-level metadata from the processed
- /// input files to an output file.
- ///
- /// It relies on the input already containing the information in an
- /// xAOD format.
- ///
- /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- ///
- /// $Revision: 683697 $
- /// $Date: 2015-07-17 11:12:14 +0200 (Fri, 17 Jul 2015) $
- ///
- class FileMetaDataTool : public asg::AsgMetadataTool
+/// Tool taking care of propagating xAOD::FileMetaData information
+///
+/// This dual-use tool can be used both in Athena and in AnalysisBase
+/// to propagate the generic file-level metadata from the processed
+/// input files to an output file.
+///
+/// It relies on the input already containing the information in an
+/// xAOD format.
+///
+/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+///
+/// $Revision: 683697 $
+/// $Date: 2015-07-17 11:12:14 +0200 (Fri, 17 Jul 2015) $
+///
+class FileMetaDataTool
+ : public asg::AsgMetadataTool
#ifndef XAOD_STANDALONE
- , public virtual ::IMetaDataTool
-#endif // XAOD_STANDALONE
- {
-
+ , public virtual ::IMetaDataTool
+#endif // XAOD_STANDALONE
+{
/// Declare the correct constructor for Athena
- ASG_TOOL_CLASS0( FileMetaDataTool )
+ ASG_TOOL_CLASS0(FileMetaDataTool)
- public:
+ public:
/// Regular AsgTool constructor
- FileMetaDataTool( const std::string& name = "FileMetaDataTool" );
+ explicit FileMetaDataTool(const std::string& name = "FileMetaDataTool");
/// Function initialising the tool
virtual StatusCode initialize();
- protected:
+ protected:
/// @name Functions called by the AsgMetadataTool base class
/// @{
@@ -71,15 +68,15 @@ namespace xAODMaker {
virtual StatusCode metaDataStop();
#ifndef XAOD_STANDALONE
- /// Function collecting the metadata from a new input file
- virtual StatusCode beginInputFile(const SG::SourceID&) {return beginInputFile();}
+ /// Function collecting the metadata from a new input file
+ virtual StatusCode beginInputFile(const SG::SourceID&) {return beginInputFile();}
- /// Function collecting the metadata from a new input file
- virtual StatusCode endInputFile(const SG::SourceID&) {return endInputFile();}
-#endif // XAOD_STANDALONE
+ /// Function collecting the metadata from a new input file
+ virtual StatusCode endInputFile(const SG::SourceID&) {return endInputFile();}
+#endif // XAOD_STANDALONE
/// @}
- private:
+ private:
/// Key of the metadata object in the input file
std::string m_inputKey;
/// Key of the metadata object for the output file
@@ -93,9 +90,8 @@ namespace xAODMaker {
/// Internal flag for keeping track of whether a BeginInputFile incident
/// was seen already
bool m_beginFileIncidentSeen;
+}; // class FileMetaDataTool
- }; // class FileMetaDataTool
-
-} // namespace xAODMaker
+} // namespace xAODMaker
-#endif // XAODMETADATACNV_FILEMETADATATOOL_H
+#endif // XAODMETADATACNV_FILEMETADATATOOL_H
diff --git a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvAthena.h b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvAthena.h
index d379b0346bd90e76871244c14fde7de228ae2da2..aa05a376f510c6da2959f819ab92bf3d64e62077 100644
--- a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvAthena.h
+++ b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvAthena.h
@@ -1,7 +1,6 @@
// Dear emacs, this is -*- c++ -*-
-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: xAODMetaDataCnvAthena.h 670279 2015-05-27 15:18:27Z krasznaa $
diff --git a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvDict.h b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvDict.h
index 557f9d7cbec4c2c753e31a063e29bb5978a4a61f..2ba9da9f9e3d628009e0dbecae315998de5d261d 100644
--- a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvDict.h
+++ b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/xAODMetaDataCnvDict.h
@@ -1,7 +1,6 @@
// Dear emacs, this is -*- c++ -*-
-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: xAODMetaDataCnvDict.h 683697 2015-07-17 09:12:14Z krasznaa $
diff --git a/Event/xAOD/xAODMissingET/test/ut_edmTest.cxx b/Event/xAOD/xAODMissingET/test/ut_edmTest.cxx
index c660d7795388b40538d765b062228db281182899..0d6bcdea0b4ebae78f99d3ba370fceefa12b5bc7 100644
--- a/Event/xAOD/xAODMissingET/test/ut_edmTest.cxx
+++ b/Event/xAOD/xAODMissingET/test/ut_edmTest.cxx
@@ -2,14 +2,6 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-/*
- * This test is no thread safe
- * but we are fine with it
- */
-
-#include "CxxUtils/checker_macros.h"
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY;
-
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MAIN
#define BOOST_TEST_MODULE TEST_XAOD_MET_EDM
diff --git a/Event/xAOD/xAODTau/Root/TauTrack_v1.cxx b/Event/xAOD/xAODTau/Root/TauTrack_v1.cxx
index 253665627e41915b6f35b6dceb91648d494704e9..24ef62ab567e7e00c5fce891bc346c01ea24be33 100644
--- a/Event/xAOD/xAODTau/Root/TauTrack_v1.cxx
+++ b/Event/xAOD/xAODTau/Root/TauTrack_v1.cxx
@@ -103,6 +103,7 @@ namespace xAOD {
// AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( TauTrack_v1, float, rConvII, setRConvII)
// AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( TauTrack_v1, float, dRJetSeedAxis, setDRJetSeedAxis)
+ // superseded by z0sinthetaTJVA()
float TauTrack_v1::z0sinThetaTJVA(const xAOD::IParticle& part ) const{
const xAOD::TrackParticle* xTrackParticle = this->track();
const xAOD::TauJet* tau = dynamic_cast<const xAOD::TauJet*> (&part);
@@ -119,14 +120,32 @@ namespace xAOD {
}
}
- float TauTrack_v1::rConv(const xAOD::IParticle& ) const{
- const xAOD::TrackParticle* xTrackParticle = this->track();
- return std::sqrt(std::fabs(xTrackParticle->d0())*xTrackParticle->pt()/(.3 /*0.15*2.*/));
+ static const SG::AuxElement::Accessor< float > d0TJVAAcc( "d0TJVA" );
+ float TauTrack_v1::d0TJVA() const {
+ return d0TJVAAcc(*this);
}
- float TauTrack_v1::rConvII(const xAOD::IParticle& ) const{
- const xAOD::TrackParticle* xTrackParticle = this->track();
- return std::sqrt( std::fabs( xTrackParticle->d0() * xTrackParticle->pt() ) / (0.3) )*(xTrackParticle->d0()/fabs(xTrackParticle->d0()))*xTrackParticle->charge();
+ static const SG::AuxElement::Accessor< float > d0SigTJVAAcc( "d0SigTJVA" );
+ float TauTrack_v1::d0SigTJVA() const {
+ return d0SigTJVAAcc(*this);
+ }
+
+ static const SG::AuxElement::Accessor< float > z0sinthetaTJVAAcc( "z0sinthetaTJVA" );
+ float TauTrack_v1::z0sinthetaTJVA() const {
+ return z0sinthetaTJVAAcc(*this);
+ }
+
+ static const SG::AuxElement::Accessor< float > z0sinthetaSigTJVAAcc( "z0sinthetaSigTJVA" );
+ float TauTrack_v1::z0sinthetaSigTJVA() const {
+ return z0sinthetaSigTJVAAcc(*this);
+ }
+
+ float TauTrack_v1::rConv() const{
+ return std::sqrt(std::fabs(this->d0TJVA())*this->pt()/(0.3 /*0.15*2.*/));
+ }
+
+ float TauTrack_v1::rConvII() const{
+ return std::sqrt( std::fabs( this->d0TJVA() * this->pt() ) / (0.3) )*(this->d0TJVA()/fabs(this->d0TJVA()))*this->track()->charge();
}
float TauTrack_v1::dRJetSeedAxis(const xAOD::IParticle& part) const{
diff --git a/Event/xAOD/xAODTau/xAODTau/versions/TauTrack_v1.h b/Event/xAOD/xAODTau/xAODTau/versions/TauTrack_v1.h
index fe831abb9c9f4693307eef4485c8876c1c739f26..b197f37ae760d613adc383446569b4d50d2162f9 100644
--- a/Event/xAOD/xAODTau/xAODTau/versions/TauTrack_v1.h
+++ b/Event/xAOD/xAODTau/xAODTau/versions/TauTrack_v1.h
@@ -1,7 +1,5 @@
-// Dear emacs, this is -*- c++ -*-
-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAODTAU_VERSIONS_TAUTRACK_V1_H
@@ -67,9 +65,16 @@ namespace xAOD {
// additional bdt input variables
float z0sinThetaTJVA(const xAOD::IParticle&) const;
// void setZ0sinThetaTJVA(float z0sinThetaTJVA);
- float rConv(const xAOD::IParticle&) const;
+
+ // track IP w.r.t. TJVA vertex
+ float d0TJVA() const;
+ float d0SigTJVA() const;
+ float z0sinthetaTJVA() const;
+ float z0sinthetaSigTJVA() const;
+
+ float rConv() const;
// void setRConv(float rConv);
- float rConvII(const xAOD::IParticle&) const;
+ float rConvII() const;
// void setRConvII(float rConvII);
float dRJetSeedAxis(const xAOD::IParticle&) const;
// void setDRJetSeedAxis(float dRJetSeedAxis);
diff --git a/Event/xAOD/xAODTrigCaloCnv/share/xAODTrigCaloCnv_jobOptions.py b/Event/xAOD/xAODTrigCaloCnv/share/xAODTrigCaloCnv_jobOptions.py
index d37037004bb2a89e2c534728c3bcb55a1d4a7155..d4fc97fe4579e66e3ef0be8e54d435073563b41c 100644
--- a/Event/xAOD/xAODTrigCaloCnv/share/xAODTrigCaloCnv_jobOptions.py
+++ b/Event/xAOD/xAODTrigCaloCnv/share/xAODTrigCaloCnv_jobOptions.py
@@ -38,10 +38,6 @@ xaodStream.AddItem( "xAOD::TrigCaloClusterAuxContainer_v1#*" )
xaodStream.AddItem( "xAOD::TrigEMClusterContainer_v1#*" )
xaodStream.AddItem( "xAOD::TrigEMClusterAuxContainer_v1#*" )
-# Make sure that the event format object is added to the output:
-theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
-xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#EventFormat" )
-
# Check what happened to the stream:
xaodStream.Print()
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/share/xAODTrigMinBiasCnv_jobOptions.py b/Event/xAOD/xAODTrigMinBiasCnv/share/xAODTrigMinBiasCnv_jobOptions.py
index 9d3bee49d40978977309679da88faa0162036e66..3dd9a4911257dcd8910167f1852e924b42fd29fc 100755
--- a/Event/xAOD/xAODTrigMinBiasCnv/share/xAODTrigMinBiasCnv_jobOptions.py
+++ b/Event/xAOD/xAODTrigMinBiasCnv/share/xAODTrigMinBiasCnv_jobOptions.py
@@ -33,10 +33,6 @@ xAODTrigT2MbtsBitsCreator()
from xAODTrigMinBiasCnv.xAODTrigSpacePointCountsCreator import xAODTrigSpacePointCountsCreator
xAODTrigSpacePointCountsCreator()
-# Make sure that the event format object is added to the output:
-theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
-xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#EventFormat" )
-
# Check what happened to the stream:
xaodStream.Print()
diff --git a/Event/xAOD/xAODTrigMissingETCnv/share/xAODTrigMissingETCnv_jobOptions.py b/Event/xAOD/xAODTrigMissingETCnv/share/xAODTrigMissingETCnv_jobOptions.py
index 3c8fd8f36c003b632a0016da9e1923318bbbada9..e4f342a4251327209d511605efc222afc7a06588 100644
--- a/Event/xAOD/xAODTrigMissingETCnv/share/xAODTrigMissingETCnv_jobOptions.py
+++ b/Event/xAOD/xAODTrigMissingETCnv/share/xAODTrigMissingETCnv_jobOptions.py
@@ -25,10 +25,6 @@ from xAODTrigMissingETCnv.xAODTrigMissingETCreator import \
xAODTrigMissingETCreator
xAODTrigMissingETCreator()
-# Make sure that the event format object is added to the output:
-theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
-xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#EventFormat" )
-
# Check what happened to the stream:
xaodStream.Print()
diff --git a/Event/xAOD/xAODTriggerCnv/share/xAODTriggerCnv_jobOptions.py b/Event/xAOD/xAODTriggerCnv/share/xAODTriggerCnv_jobOptions.py
index 04a14fc35424f988fff4600c3e597e69721cb98a..fa025d4c6460b3dd96515f5bb59bc15f2a955329 100644
--- a/Event/xAOD/xAODTriggerCnv/share/xAODTriggerCnv_jobOptions.py
+++ b/Event/xAOD/xAODTriggerCnv/share/xAODTriggerCnv_jobOptions.py
@@ -46,10 +46,6 @@ xaodStream.AddItem( "xAOD::VertexAuxContainer_v1#*" )
xaodStream.AddItem( "xAOD::TauJetContainer_v1#*" )
xaodStream.AddItem( "xAOD::TauJetAuxContainer_v1#*" )
-# Make sure that the event format object is added to the output:
-theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
-xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#EventFormat" )
-
# Check what happened to the stream:
xaodStream.Print()
diff --git a/Event/xAOD/xAODTruthCnv/CMakeLists.txt b/Event/xAOD/xAODTruthCnv/CMakeLists.txt
index e226116ad1ce170f66413988f9b59c33c7ebf3b4..023f8a01d15bcc50af6ecb584a5c3804cdd0265d 100644
--- a/Event/xAOD/xAODTruthCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTruthCnv/CMakeLists.txt
@@ -5,29 +5,6 @@
# Declare the package name:
atlas_subdir( xAODTruthCnv )
-# Extra package dependencies, based on the build environment:
-set( extra_dep )
-if( NOT XAOD_STANDALONE )
- set( extra_dep Control/AthenaKernel
- PRIVATE
- Control/AthLinks
- Control/AthenaBaseComps
- Control/StoreGate
- Event/EventInfo
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTruth
- GaudiKernel
- Generators/GeneratorObjects )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/CxxUtils
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODTruth
- ${extra_dep} )
-
# Component(s) in the package:
atlas_add_library( xAODTruthCnvLib
xAODTruthCnv/*.h Root/*.cxx
@@ -38,7 +15,7 @@ if( NOT XAOD_STANDALONE )
atlas_add_component( xAODTruthCnv
src/*.h src/*.cxx src/components/*.cxx
LINK_LIBRARIES AthLinks AthenaBaseComps StoreGateLib EventInfo
- xAODEventInfo xAODTruth GaudiKernel GeneratorObjects
+ xAODEventInfo xAODTruth GaudiKernel GeneratorObjects AthenaPoolUtilities IOVDbDataModel
xAODTruthCnvLib )
endif()
diff --git a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
index 8cf4b77177b417d7f6118a0e28f76ff6d588b13d..5a8b51e03aec14d94ba0e0286795084f16554914 100644
--- a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
+++ b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AthenaKernel/errorcheck.h"
@@ -11,8 +11,6 @@
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-#include "EventInfo/EventStreamInfo.h"
-
#include "xAODTruth/TruthEvent.h"
#include "xAODTruth/TruthEventContainer.h"
#include "xAODTruth/TruthEventAuxContainer.h"
@@ -32,6 +30,9 @@
#include "xAODTruth/TruthMetaDataAuxContainer.h"
#include "xAODTruth/TruthMetaData.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "IOVDbDataModel/IOVMetaDataContainer.h"
+
#include "xAODTruthCnvAlg.h"
@@ -41,7 +42,9 @@ namespace xAODMaker {
xAODTruthCnvAlg::xAODTruthCnvAlg( const string& name, ISvcLocator* svcLoc )
- : AthReentrantAlgorithm( name, svcLoc ), m_metaStore( "MetaDataStore", name ), m_inputMetaStore( "StoreGateSvc/InputMetaDataStore",name)
+ : AthReentrantAlgorithm( name, svcLoc )
+ , m_metaStore( "MetaDataStore", name )
+ , m_firstBeginRun(true)
{
// leaving metadata alone for now--to be updated
declareProperty( "MetaObjectName", m_metaName = "TruthMetaData" );
@@ -69,6 +72,11 @@ namespace xAODMaker {
ATH_CHECK(m_xaodTruthParticleContainerKey.initialize());
ATH_CHECK(m_xaodTruthVertexContainerKey.initialize());
+ ATH_CHECK(m_evtInfo.initialize());
+
+ ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", name());
+ ATH_CHECK(incSvc.retrieve());
+ incSvc->addListener( this, "BeginRun", 10);
ATH_MSG_DEBUG("Initializing; package version: " << PACKAGE_VERSION );
ATH_MSG_DEBUG("AODContainerName = " << m_aodContainerKey.key() );
@@ -196,17 +204,18 @@ namespace xAODMaker {
if (m_writeMetaData) {
//The mcChannelNumber is used as a unique identifier for which truth meta data belongs to
- const EventStreamInfo* esi = nullptr;
- std::vector<std::string> keys;
- m_inputMetaStore->keys<EventStreamInfo>(keys);
- if (keys.size() > 1) { // Multiple EventStreamInfo (default retrieve won't work), just take the first
- CHECK( m_inputMetaStore->retrieve(esi, keys[0]));
- } else {
- CHECK( m_inputMetaStore->retrieve(esi));
+ uint32_t mcChannelNumber = 0;
+ SG::ReadHandle<xAOD::EventInfo> evtInfo (m_evtInfo,ctx);
+ if (evtInfo.isValid()) {
+ mcChannelNumber = evtInfo->mcChannelNumber();
+ if (mcChannelNumber==0) mcChannelNumber = evtInfo->runNumber();
}
- uint32_t mcChannelNumber = esi->getEventTypes().begin()->mc_channel_number();
-
- ATH_CHECK( m_meta.maybeWrite (mcChannelNumber, *genEvt) );
+ else {
+ ATH_MSG_FATAL("Faied to retrieve EventInfo");
+ return StatusCode::FAILURE;
+ }
+
+ ATH_CHECK( m_meta.maybeWrite (mcChannelNumber, *genEvt, m_metaFields) );
}
// Event weights
vector<float> weights;
@@ -400,7 +409,55 @@ namespace xAODMaker {
return StatusCode::SUCCESS;
}
-
+ void xAODTruthCnvAlg::handle(const Incident& incident) {
+ if (m_firstBeginRun && incident.type()==IncidentType::BeginRun) {
+ m_firstBeginRun = false;
+ ServiceHandle<StoreGateSvc> inputStore("StoreGateSvc/InputMetaDataStore", name());
+ if(inputStore.retrieve().isFailure()) {
+ ATH_MSG_ERROR("Failed to retrieve Input Metadata Store");
+ return;
+ }
+ const IOVMetaDataContainer* tagInfo{nullptr};
+ if(inputStore->retrieve(tagInfo,"/TagInfo").isFailure()) {
+ ATH_MSG_WARNING("Failed to retrieve /TagInfo metadata from the input store");
+ return;
+ }
+ if(tagInfo->payloadContainer()->size()>0) {
+ CondAttrListCollection* tagInfoPayload = tagInfo->payloadContainer()->at(0);
+ if(tagInfoPayload->size()>0) {
+ const CondAttrListCollection::AttributeList& al = tagInfoPayload->attributeList(0);
+ if (al.exists("lhefGenerator")){
+ m_metaFields.lhefGenerator = al["lhefGenerator"].data<std::string>();
+ }
+
+ if (al.exists("generators")){
+ m_metaFields.generators = al["generators"].data<std::string>();
+ }
+
+ if (al.exists("evgenProcess")){
+ m_metaFields.evgenProcess = al["evgenProcess"].data<std::string>();
+ }
+
+ if (al.exists("evgenTune")){
+ m_metaFields.evgenTune = al["evgenTune"].data<std::string>();
+ }
+
+ if (al.exists("hardPDF")){
+ m_metaFields.hardPDF = al["hardPDF"].data<std::string>();
+ }
+
+ if (al.exists("softPDF")){
+ m_metaFields.softPDF = al["softPDF"].data<std::string>();
+ }
+ }
+ }
+ else {
+ ATH_MSG_WARNING("Empty Tag Info metadata!");
+ }
+ }
+ }
+
+
// A helper to set up a TruthVertex (without filling the ELs)
void xAODTruthCnvAlg::fillVertex(xAOD::TruthVertex* tv, HepMC::ConstGenVertexPtr gv) {
tv->setId(gv->id());
@@ -459,7 +516,8 @@ namespace xAODMaker {
StatusCode
xAODTruthCnvAlg::MetaDataWriter::maybeWrite (uint32_t mcChannelNumber,
- const HepMC::GenEvent& genEvt)
+ const HepMC::GenEvent& genEvt,
+ const MetadataFields& metaFields)
{
// This bit needs to be serialized.
lock_t lock (m_mutex);
@@ -494,6 +552,25 @@ namespace xAODMaker {
md->setMcChannelNumber(mcChannelNumber);
md->setWeightNames( std::move(orderedWeightNameVec) );
#endif
+
+ if(!metaFields.lhefGenerator.empty()) {
+ md->setLhefGenerator(metaFields.lhefGenerator);
+ }
+ if(!metaFields.generators.empty()) {
+ md->setGenerators(metaFields.generators);
+ }
+ if(!metaFields.evgenProcess.empty()) {
+ md->setEvgenProcess(metaFields.evgenProcess);
+ }
+ if(!metaFields.evgenTune.empty()) {
+ md->setEvgenTune(metaFields.evgenTune);
+ }
+ if(!metaFields.hardPDF.empty()) {
+ md->setHardPDF(metaFields.hardPDF);
+ }
+ if(!metaFields.softPDF.empty()) {
+ md->setSoftPDF(metaFields.softPDF);
+ }
}
return StatusCode::SUCCESS;
diff --git a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
index eff80d6621f0cc775fb49bc65ca90ce3e382d59b..8c1808e14e0f0fbcc1ca2f487606ab0149eef731 100644
--- a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
+++ b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
@@ -39,6 +39,7 @@
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
#include "CxxUtils/checker_macros.h"
+#include "GaudiKernel/IIncidentListener.h"
#include <unordered_set>
@@ -48,6 +49,7 @@
#include "AtlasHepMC/GenVertex_fwd.h"
#include "AtlasHepMC/GenParticle_fwd.h"
+#include "xAODEventInfo/EventInfo.h"
namespace xAODMaker {
@@ -59,7 +61,10 @@ namespace xAODMaker {
/// @author James Catmore <James.Catmore@cern.ch>
/// @author Jovan Mitreski <Jovan.Mitreski@cern.ch>
/// @author Andy Buckley <Andy.Buckley@cern.ch>
- class xAODTruthCnvAlg : public AthReentrantAlgorithm {
+ class xAODTruthCnvAlg
+ : public AthReentrantAlgorithm
+ , virtual public IIncidentListener
+{
public:
/// Regular algorithm constructor
@@ -70,8 +75,20 @@ namespace xAODMaker {
/// Function executing the algorithm
virtual StatusCode execute (const EventContext& ctx) const override;
+ /// Incident handler
+ virtual void handle(const Incident& incident) override;
private:
+ // Truth metadata fields retrieved from TagInfo
+ struct MetadataFields {
+ std::string lhefGenerator;
+ std::string generators;
+ std::string evgenProcess;
+ std::string evgenTune;
+ std::string hardPDF;
+ std::string softPDF;
+ };
+
/// Factor out the pieces dealing with writing to meta data.
/// This will be non-const, so need to protect with a mutex.
class MetaDataWriter
@@ -80,8 +97,8 @@ namespace xAODMaker {
StatusCode initialize (ServiceHandle<StoreGateSvc>& metaStore,
const std::string& metaName);
StatusCode maybeWrite (uint32_t mcChannelNumber,
- const HepMC::GenEvent& genEvt);
-
+ const HepMC::GenEvent& genEvt,
+ const MetadataFields& metaFields);
private:
/// Mutex to control access to meta data writing.
@@ -136,13 +153,18 @@ namespace xAODMaker {
/// Connection to the metadata store
ServiceHandle< StoreGateSvc > m_metaStore;
- ServiceHandle<StoreGateSvc> m_inputMetaStore;
/// SG key and name for meta data
std::string m_metaName;
/// option to disable writing of metadata (e.g. if running a filter on xAOD in generators)
Gaudi::Property<bool> m_writeMetaData{this, "WriteTruthMetaData", true};
+ /// Event Info
+ SG::ReadHandleKey<xAOD::EventInfo> m_evtInfo {this, "EventInfo", "EventInfo", "" };
+
+ /// Tag Info
+ bool m_firstBeginRun;
+ MetadataFields m_metaFields;
}; // class xAODTruthCnvAlg
diff --git a/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx b/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx
index f2a9bc75a9e567282a4b83f2cd07e7e571e43289..e11148aab834e90298b5be8d4d5902850f592c35 100644
--- a/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx
+++ b/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx
@@ -243,7 +243,7 @@ void AFPSiLayerAlgorithm::fillSynchHistogramsStation(Monitored::Scalar<int> &lb,
float clustersPerStationFloat = 0;
for(const auto& cluster : fast.clusters())
{
- if(lb > previouslbStationA && previouslbStationA != 0)
+ if(lb != previouslbStationA && previouslbStationA != 0)
{
for(int i = 0; i < 4; i++)
{
@@ -254,7 +254,7 @@ void AFPSiLayerAlgorithm::fillSynchHistogramsStation(Monitored::Scalar<int> &lb,
clustersPerStationFloat = clustersPerStationFloat/(muPerBCID*counterForEventsStationA*4);
}
else{clustersPerStationFloat = -0.1;}
-
+
if(histogramType == 'S')
{
auto clustersPerStation = Monitored::Scalar<float>("clustersPerStation", 0.0);
@@ -282,7 +282,7 @@ void AFPSiLayerAlgorithm::fillSynchHistogramsStation(Monitored::Scalar<int> &lb,
}
previouslbStationA=lb;
++clusterCounterStationA[lb][cluster.station];
- counterForEventsStationA=1;
+ counterForEventsStationA = 1;
}
else if (clusterCounterStationA[lb][cluster.station] == 0)
{
@@ -299,7 +299,7 @@ void AFPSiLayerAlgorithm::fillSynchHistogramsPlane(Monitored::Scalar<int> &lb, i
float clustersPerPlaneFloat = 0;
for(const auto& cluster : fast.clusters())
{
- if(lb > previouslbPlane && previouslbPlane != 0)
+ if(lb != previouslbPlane && previouslbPlane != 0)
{
for(int i=0; i<4; i++)
{
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ATLAS_CHECK_THREAD_SAFETY b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..ef1e1aa906c6d8f23bab59c32a5fc3003309fb07
--- /dev/null
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h
index 4fd81ade53c8a6e419472b7210947d19f7229515..62206f3dd644f4b5ae3971891f4a4d877cb9b060 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZDCBYTESTREAMCNV_H
@@ -38,6 +38,7 @@ class ISvcLocator;
class StatusCode;
class ZdcByteStreamTool;
class ZdcByteStreamReadV1V2Tool;
+class StoreGateSvc;
// Abstract factory to create the converter
template <typename > class CnvFactory;
@@ -77,8 +78,9 @@ private:
/// Service for WRITING bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
- /// Message log
- mutable MsgStream m_log;
+ ServiceHandle<StoreGateSvc> m_evtStore;
+
+ /// Message log
bool m_debug;
};
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h
index 447b80d3304075b66b6bfbbe44303b719d2b5fe8..00121b9cba747db54e284eb7804334ae1a835707 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -34,6 +34,7 @@ class ZdcPpmSubBlock : public ZdcSubBlock {
~ZdcPpmSubBlock();
/// Clear all data
+ // cppcheck-suppress duplInheritedMember
void clear();
/// Store PPM header
@@ -189,8 +190,7 @@ class ZdcPpmSubBlock : public ZdcSubBlock {
bool unpackUncompressedErrors();
// Global error flags
- mutable uint32_t m_globalError;
- mutable bool m_globalDone;
+ uint32_t m_globalError;
// Triggered slice offsets, pedestal value
int m_lutOffset;
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx
index a8c48afd51221f6238cc22583e385046d4c5b7a6..286597288cf747a7f67e6eb9ea8be36a8e6ee4a8 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -26,6 +26,7 @@
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
+#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/ClassID_traits.h"
#include "AthContainers/DataVector.h"
#include "GaudiKernel/DataObject.h"
@@ -35,6 +36,7 @@
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
///Zdc specific includes.
#include "ZdcEvent/ZdcDigits.h"
@@ -55,7 +57,8 @@ ZdcByteStreamCnv::ZdcByteStreamCnv(ISvcLocator* svcloc) :
//m_tool("ZdcByteStreamTool/ZdcByteStreamTool"), // old style
m_tool("ZdcByteStreamReadV1V2Tool/ZdcByteStreamReadV1V2Tool"), // new style
m_robDataProvider("ROBDataProviderSvc",m_name),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name), m_log(msgSvc(), m_name),
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
+ m_evtStore("StoreGateSvc", m_name),
m_debug(false)
{
}
@@ -99,52 +102,16 @@ StatusCode ZdcByteStreamCnv::initialize()
*/
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version " << PACKAGE_VERSION
- << endmsg;
- //Gaudi Converter Factory
- StatusCode sc = Converter::initialize();
- if (sc.isFailure())
- {
- m_log << MSG::ERROR << "ZDC: Failed to initialize Converter " << endmsg;
- return sc;
- }
- else
- {
- m_log << MSG::DEBUG << "ZDC: Converter initialized " << endmsg;
- }
-
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if (sc.isFailure())
- {
- m_log << MSG::ERROR << "ZDC: Failed to retrieve service " << m_ByteStreamEventAccess << endmsg;
- return sc;
- }
- else
- {
- m_log << MSG::DEBUG << "ZDC: Retrieved service " << m_ByteStreamEventAccess << endmsg;
- }
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
+ ATH_CHECK( m_evtStore.retrieve() );
- // Retrieve Tool
- sc = m_tool.retrieve();
+ StatusCode sc = m_robDataProvider.retrieve();
if (sc.isFailure())
{
- m_log << MSG::ERROR << "ZDC: Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- }
- else m_log << MSG::DEBUG << "ZDC: Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if (sc.isFailure())
- {
- m_log << MSG::WARNING << "ZDC: Failed to retrieve service " << m_robDataProvider << endmsg;
- }
- else
- {
- m_log << MSG::DEBUG << "ZDC: Retrieved service " << m_robDataProvider << endmsg;
+ REPORT_MESSAGE (MSG::WARNING) << "ZDC: Failed to retrieve service " << m_robDataProvider;
}
return StatusCode::SUCCESS;
@@ -156,18 +123,19 @@ StatusCode ZdcByteStreamCnv::initialize()
StatusCode ZdcByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
{
/// Create the RDO from bytestream.
- m_log << MSG::DEBUG << "ZDC: createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *> (pAddr);
if (!pBS_Addr)
{
- m_log << MSG::ERROR << "ZDC: Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << "ZDC: Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *(pBS_Addr->par());
- if (m_debug) m_log << MSG::DEBUG << "ZDC: Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << "ZDC: Creating Objects " << nm;
+ }
// Get SourceIDs; This is NOT related to the ZDC Identifiers
//const std::vector<uint32_t>& vID(m_tool->sourceIDs()); // old style
@@ -180,37 +148,28 @@ StatusCode ZdcByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
// size check
if (m_debug)
{
- m_log << MSG::DEBUG << "ZDC: Number of ROB fragments is " << robFrags.size() << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << "ZDC: Number of ROB fragments is " << robFrags.size();
}
//ZdcDigitsCollection* const ttCollection = new ZdcDigitsCollection;
- xAOD::TriggerTowerContainer* const TTCollection = new xAOD::TriggerTowerContainer; // new style
- xAOD::TriggerTowerAuxContainer* aux = new xAOD::TriggerTowerAuxContainer();
- TTCollection->setStore(aux);
+ auto TTCollection = std::make_unique<xAOD::TriggerTowerContainer>(); // new style
+ auto aux = std::make_unique<xAOD::TriggerTowerAuxContainer>();
+ TTCollection->setStore(aux.get());
if (robFrags.size() == 0)
{
- //pObj = SG::asStorable(ttCollection);
- pObj = SG::asStorable(TTCollection);
+ pObj = SG::asStorable(std::move(TTCollection));
+ ATH_CHECK( m_evtStore->record (std::move(aux), nm + "Aux.") );
return StatusCode::SUCCESS;
}
- //StatusCode sc = m_tool->convert(robFrags, ttCollection); // old style
- StatusCode sc = m_tool->convert(robFrags, TTCollection); // new style
+ ATH_CHECK( m_tool->convert(robFrags, TTCollection.get()) ); // new style
- if (sc.isFailure())
- {
- m_log << MSG::ERROR << "ZDC: Failed to create Objects " << nm << endmsg;
- //delete ttCollection;
- delete TTCollection; // new style
- return sc;
- }
+ pObj = SG::asStorable(std::move(TTCollection)); // new style
+ ATH_CHECK( m_evtStore->record (std::move(aux), nm + "Aux.") );
- //pObj = SG::asStorable(ttCollection); // old style
- pObj = SG::asStorable(TTCollection); // new style
-
- return sc;
+ return StatusCode::SUCCESS;
}
//==================================================================================================
@@ -221,14 +180,12 @@ StatusCode ZdcByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
/*
StatusCode ZdcByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddress*& pAddr)
{
- m_log << MSG::DEBUG << "ZDC: createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
ZdcDigitsCollection* ttCollection = 0;
if (!SG::fromStorable(pObj, ttCollection))
{
- m_log << MSG::ERROR << "ZDC: Cannot cast to ZdcDigitsCollection" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << "ZDC: Cannot cast to ZdcDigitsCollection";
return StatusCode::FAILURE;
}
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamRawData.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamRawData.cxx
index a026007fa9258a22b5b5c1db206fc1d88309f61a..4587e7e4094e26ca79bc0d38f50d611da180de0a 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamRawData.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamRawData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -73,8 +73,7 @@ StatusCode ZdcByteStreamRawData::execute()
/// otherwise just skip this
/// TODO keep record somewhere of this type of error?
- //ZdcDigitsCollection* ttCollection = 0;
- const DataHandle<ZdcDigitsCollection> ttCollection;
+ const ZdcDigitsCollection* ttCollection = nullptr;
msg(MSG::DEBUG) << "Looking for ZDC Digits Collection at " << m_ZdcDigitsCollectionLocation << endmsg;
//std::cout << "Looking for ZDC Digits Collection at " << m_ZdcDigitsCollectionLocation << std::endl;
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx
index 436131d8d62388b7d91a829053db84bff6695383..02556856ad94e32a23a38a209fe554980c221668 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ===========================================================================
@@ -113,7 +113,6 @@ StatusCode ZdcByteStreamReadV1V2Tool::initialize() {
msg(MSG::DEBUG) << "execute: retrieved ZdcID" << endmsg;
}
m_zdcID = zdcID;
- ZdcCablingService::getInstance()->setZdcID(m_zdcID);
ServiceHandle<IIncidentSvc> incidentSvc("IncidentSvc", name());
@@ -1171,18 +1170,15 @@ ZdcDigitsCollection* ZdcByteStreamReadV1V2Tool::convertTT2ZD(xAOD::TriggerTowerC
typedef std::map<uint32_t,ZdcDigits*> hashmapType;
hashmapType digits_map;
Identifier chan_id;
-
- xAOD::TriggerTowerContainer::iterator tt_itr = ttCollection->begin();
- xAOD::TriggerTowerContainer::iterator tt_end = ttCollection->end();
-
- for (;tt_itr != tt_end;tt_itr++)
+
+ for (const xAOD::TriggerTower* tt : *ttCollection)
{
//std::cout << "dumping TT" << std::endl;
- //std::cout << ZdcToString(*(*tt_itr) ) << std::endl;
+ //std::cout << ZdcToString(*tt ) << std::endl;
- //uint32_t coolId = (*tt_itr).coolId();
- //uint32_t coolId = (*tt_itr)->auxdata<uint32_t>("coolId");
- uint32_t coolId = (*tt_itr)->coolId();
+ //uint32_t coolId = tt->coolId();
+ //uint32_t coolId = tt->auxdata<uint32_t>("coolId");
+ uint32_t coolId = tt->coolId();
uint32_t pin = (coolId>>8) & 0xf;
uint32_t asic = coolId & 0xf;
uint32_t slinkChannel = asic*16 + pin;
@@ -1209,10 +1205,10 @@ ZdcDigitsCollection* ZdcByteStreamReadV1V2Tool::convertTT2ZD(xAOD::TriggerTowerC
if (iter != digits_map.end())
{
ATH_MSG_DEBUG("new auxdata for " << chan_id);
- if (gain==0&&delay==0) (*iter).second->set_digits_gain0_delay0( (*tt_itr)->adc() );
- if (gain==1&&delay==0) (*iter).second->set_digits_gain1_delay0( (*tt_itr)->adc() );
- if (gain==0&&delay==1) (*iter).second->set_digits_gain0_delay1( (*tt_itr)->adc() );
- if (gain==1&&delay==1) (*iter).second->set_digits_gain1_delay1( (*tt_itr)->adc() );
+ if (gain==0&&delay==0) (*iter).second->set_digits_gain0_delay0( tt->adc() );
+ if (gain==1&&delay==0) (*iter).second->set_digits_gain1_delay0( tt->adc() );
+ if (gain==0&&delay==1) (*iter).second->set_digits_gain0_delay1( tt->adc() );
+ if (gain==1&&delay==1) (*iter).second->set_digits_gain1_delay1( tt->adc() );
}
}
@@ -1235,7 +1231,7 @@ ZdcDigitsCollection* ZdcByteStreamReadV1V2Tool::convertTT2ZD(xAOD::TriggerTowerC
((*iter).second)->print();
*/
zdcCollection->push_back((*iter).second);
- iter++;
+ ++iter;
}
return zdcCollection;
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTester.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTester.cxx
index 1d1603cf55a98d369fc3775d860170612e13e7ca..35efe938b5ad0daec7285684314865cf20ff81cd 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTester.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTester.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -73,8 +73,7 @@ StatusCode ZdcByteStreamTester::execute()
/// otherwise just skip this
/// TODO keep record somewhere of this type of error?
- //ZdcDigitsCollection* ttCollection = 0;
- const DataHandle<ZdcDigitsCollection> ttCollection;
+ const ZdcDigitsCollection* ttCollection = nullptr;
StatusCode sc = evtStore()->retrieve(ttCollection, m_ZdcDigitsCollectionLocation);
if (sc.isFailure() || !ttCollection || ttCollection->empty())
{
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx
index a92f978637b7134a35e52330b2284d523f317012..8f77b1cab0b7d2ea49c47a37fee34605baa05617 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -125,7 +125,6 @@ StatusCode ZdcByteStreamTool::initialize()
msg(MSG::DEBUG) << "execute: retrieved ZdcID" << endmsg;
}
m_zdcID = zdcID;
- ZdcCablingService::getInstance()->setZdcID(m_zdcID);
return StatusCode::SUCCESS;
}
@@ -562,7 +561,7 @@ StatusCode ZdcByteStreamTool::convert( const IROBDataProviderSvc::VROBFRAG& robF
while (iter != iter_end)
{
ttCollection->push_back((*iter).second);
- iter++;
+ ++iter;
}
msg(MSG::DEBUG) << "-->ZDC: Collection has " << ttCollection->size() << " elements " << endmsg;
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcCaloUserHeader.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcCaloUserHeader.cxx
index b4ae404f77d8ddc6d8ba45240259c16263d6183a..c92f6e36ae6fd4ac35a2549c6675a0cf33f06fe6 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcCaloUserHeader.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcCaloUserHeader.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ZdcByteStream/ZdcCaloUserHeader.h"
@@ -8,7 +8,7 @@
//using namespace LVL1BS;
namespace {
- ZdcWordDecoder caloUserWordDecoder({
+ const ZdcWordDecoder caloUserWordDecoder({
BitField("Length", 0, 4),
BitField("L1A Slice: PP FADC", 4, 5),
BitField("LUT", 9, 3),
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcPpmSubBlock.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcPpmSubBlock.cxx
index b2ea4ebde789d2032bb24dcfb7cdec1124280f83..e4a2c3c7ea0f52c7e8abe8f4f098283c06b7e339 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcPpmSubBlock.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcPpmSubBlock.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** Sub-Block class for PPM data.
@@ -57,7 +57,6 @@ const int ZdcPpmSubBlock::s_ppmChannel[64] = {0, 4, 8, 12, 16, 20, 24
ZdcPpmSubBlock::ZdcPpmSubBlock() :
m_globalError(0),
- m_globalDone(false),
m_lutOffset(-1),
m_fadcOffset(-1),
m_pedestal(10),
@@ -77,7 +76,6 @@ void ZdcPpmSubBlock::clear()
{
ZdcSubBlock::clear();
m_globalError = 0;
- m_globalDone = false;
m_lutOffset = -1;
m_fadcOffset = -1;
m_datamap.clear();
@@ -211,8 +209,10 @@ void ZdcPpmSubBlock::fillPpmError(const int chan, const int errorWord)
if (m_errormap.empty()) m_errormap.resize(s_glinkPins);
// Expand one ASIC channel disabled bit to four
const uint32_t chanDisabled = (errorWord & 0x1) << asic(chan);
- m_errormap[pin(chan)] |= (((errorWord >> 1) << s_asicChannels)
- | chanDisabled) & s_errorMask;
+ uint32_t word = (((errorWord >> 1) << s_asicChannels)
+ | chanDisabled) & s_errorMask;
+ m_errormap[pin(chan)] |= word;
+ m_globalError |= word;
}
// Store an error word corresponding to a G-Link pin
@@ -221,6 +221,10 @@ void ZdcPpmSubBlock::fillPpmPinError(const int pin, const int errorWord)
{
if (m_errormap.empty()) m_errormap.resize(s_glinkPins);
m_errormap[pin] = errorWord & s_errorMask;
+ m_globalError = 0;
+ for (uint32_t word : m_errormap) {
+ m_globalError |= word;
+ }
}
// Return the error word for a data channel
@@ -250,13 +254,6 @@ int ZdcPpmSubBlock::ppmPinError(const int pin) const
bool ZdcPpmSubBlock::errorBit(const int bit) const
{
- if ( ! m_globalDone) {
- std::vector<uint32_t>::const_iterator pos;
- for (pos = m_errormap.begin(); pos != m_errormap.end(); ++pos) {
- m_globalError |= *pos;
- }
- m_globalDone = true;
- }
return m_globalError & (0x1 << bit);
}
@@ -417,10 +414,12 @@ bool ZdcPpmSubBlock::unpackNeutral()
if (!rc) setUnpackErrorCode(ZdcSubBlock::UNPACK_DATA_TRUNCATED);
// Errors
m_errormap.clear();
+ m_globalError = 0;
for (int pin = 0; pin < s_glinkPins; ++pin) {
uint32_t error = unpackerNeutral(pin, s_errorBits);
error |= unpackerNeutralParityError(pin) << s_errorBits;
m_errormap.push_back(error);
+ m_globalError |= error;
}
return rc;
}
@@ -449,8 +448,11 @@ bool ZdcPpmSubBlock::unpackUncompressedErrors()
{
unpackerInit();
m_errormap.clear();
+ m_globalError = 0;
for (int pin = 0; pin < s_glinkPins; ++pin) {
- m_errormap.push_back(unpacker(s_wordLen));
+ uint32_t word = unpacker(s_wordLen);
+ m_errormap.push_back(word);
+ m_globalError |= word;
}
const bool rc = unpackerSuccess();
if (!rc) setUnpackErrorCode(ZdcSubBlock::UNPACK_DATA_TRUNCATED);
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockHeader.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockHeader.cxx
index 64b7f03a39cf943c66c4437992f14a52cbbaf912..280854e2b63d7179f6157a3d0766ab3a24531685 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockHeader.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockHeader.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ZdcByteStream/ZdcSubBlockHeader.h"
@@ -9,7 +9,7 @@
//using namespace LVL1BS;
namespace {
- ZdcWordDecoder subBlockHeaderDecoder(
+ const ZdcWordDecoder subBlockHeaderDecoder(
{
BitField("Type", 28, 4),
BitField("Version", 25, 3),
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockStatus.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockStatus.cxx
index caec1bf47ab6258be469c53a6e1ab00db1431b14..43c38143fa33a03387d4776597b3940a52a23e2e 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockStatus.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcSubBlockStatus.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ZdcByteStream/ZdcSubBlockStatus.h"
@@ -9,7 +9,7 @@
//using namespace LVL1BS;
namespace {
- ZdcWordDecoder subBlockStatusDecoder(
+ const ZdcWordDecoder subBlockStatusDecoder(
{
BitField("Timeout", 7, 1),
BitField("Link", 6, 1),
diff --git a/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ATLAS_CHECK_THREAD_SAFETY b/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..c23f3fa5d40430277921484989ccccd49878d962
--- /dev/null
+++ b/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+ForwardDetectors/ZDC/ZdcConditions
diff --git a/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingService.h b/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingService.h
index d3a778b6d24902a9922ab3d75b9addd6e0229890..3cfead95fcbab866bc76e549322252aa08737cd1 100755
--- a/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingService.h
+++ b/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingService.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZDCCABLINGSERVICE_H
@@ -26,7 +26,7 @@ class ZdcCablingService
public:
/** get pointer to service instance*/
- static ZdcCablingService * getInstance() ;
+ static const ZdcCablingService * getInstance() ;
/** delete service instance */
static void deleteInstance() ;
@@ -62,7 +62,8 @@ public:
protected:
/** Default constructor protected */
- ZdcCablingService() ;
+ ZdcCablingService(const ZdcID* zdcID,
+ const ZdcHardwareID* zdcHWID) ;
/** Destructor protected */
virtual ~ZdcCablingService() ;
@@ -91,29 +92,11 @@ public:
const ZdcHardwareID* m_zdcHWID;
- enum ZdcCablingType { TestBeam = -1,
- Sim = 0,
- FirstData = 1};
-
- ZdcCablingType m_cablingType;
-
- public:
-
- static ZdcCablingService * s_zdcCablingService ;
-
- void setCablingType (ZdcCablingType type);
-
int m_connected[16][16];
void setConnected(int ppm, int channel);
void fillConnectionTables();
void fillDB();
- void setZdcID (const ZdcID* zdcID) {m_zdcID = zdcID;}
- void setZdcHWID (const ZdcHardwareID* zdcHWID) {m_zdcHWID = zdcHWID;}
-
- inline const ZdcID* getZdcID() const { return m_zdcID; }
- inline const ZdcHardwareID* getZdcHWID() const { return m_zdcHWID; }
- inline int getCablingType() const { return m_cablingType; }
inline int crate_index_lookup(int& crate) const
{
int ic=0;
diff --git a/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingSvc.h b/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingSvc.h
index 3f05ca1a1a274144a9014405123201297dbdf440..4b715e65f8801f7c0cac5949b268d1ab3a31bec6 100755
--- a/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingSvc.h
+++ b/ForwardDetectors/ZDC/ZdcConditions/ZdcConditions/ZdcCablingSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZDCCONDITIONS_ZDCCABLINGSVC_H
@@ -35,7 +35,7 @@ class ZdcCablingSvc : public AthService
private:
- ZdcCablingService* m_cablingService;
+ const ZdcCablingService* m_cablingService;
ServiceHandle<StoreGateSvc> m_detStore;
diff --git a/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingService.cxx b/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingService.cxx
index 92e17339b62df73fbabca3d28a93ff7167de5670..6b807f6d9daf92a23819a4d64f9b9e77e2c67b8b 100755
--- a/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingService.cxx
+++ b/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingService.cxx
@@ -1,48 +1,47 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ZdcConditions/ZdcCablingService.h"
+#include "StoreGate/StoreGateSvc.h"
#include <string>
#include <iostream>
#include <algorithm>
-// initialization of singleton instance pointer
-
-ZdcCablingService * ZdcCablingService::s_zdcCablingService = 0 ;
-
// Singleton methods
//------------------------------------------------------------
-ZdcCablingService * ZdcCablingService::getInstance()
+const ZdcCablingService * ZdcCablingService::getInstance()
{
-
- if(s_zdcCablingService == 0){
- std::cout << "==> New ZdcCablingService created" << std::endl;
- s_zdcCablingService = new ZdcCablingService() ;
- }
- return s_zdcCablingService ;
+ static const ZdcCablingService svc (nullptr, nullptr);
+ return &svc;
}
//-------------------------------------------------------------
void ZdcCablingService::deleteInstance()
{
- if(s_zdcCablingService != 0){
- delete s_zdcCablingService ;
- s_zdcCablingService = 0 ;
- }
}
// default constructor
//-------------------------------------------------------------
-ZdcCablingService::ZdcCablingService()
- : m_dbFilled(0), m_zdcID(0), m_zdcHWID(0)
- , m_cablingType(ZdcCablingService::Sim)
+ZdcCablingService::ZdcCablingService (const ZdcID* zdcID,
+ const ZdcHardwareID* zdcHWID)
+ : m_dbFilled(0), m_zdcID(zdcID), m_zdcHWID(zdcHWID)
{
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "ZdcCablingSevice");
+ if (!m_zdcID) {
+ if (detStore->retrieve (m_zdcID).isFailure()) {
+ std::abort();
+ }
+ }
+ if (!m_zdcHWID) {
+ if (detStore->retrieve (m_zdcHWID).isFailure()) {
+ std::abort();
+ }
+ }
fillConnectionTables();
-
fillDB();
}
@@ -263,16 +262,6 @@ ZdcCablingService::~ZdcCablingService()
{
}
-void
-ZdcCablingService::setCablingType(ZdcCablingService::ZdcCablingType type)
-{
-// cabling type can be:
-// -1 for testbeam
-// 0 for standard simulation
-// 1 new configuration
- m_cablingType = type;
-}
-
void
ZdcCablingService::setConnected(int ppm, int channel)
{
diff --git a/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingSvc.cxx b/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingSvc.cxx
index 6866c0c1088214b0769be04f669335f7c554a48a..5a732eea9bcf1238b871e369f44b52eeb3395b1a 100755
--- a/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingSvc.cxx
+++ b/ForwardDetectors/ZDC/ZdcConditions/src/ZdcCablingSvc.cxx
@@ -1,12 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ZdcConditions/ZdcCablingSvc.h"
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
-#include "ZdcIdentifier/ZdcID.h"
-#include "ZdcIdentifier/ZdcHardwareID.h"
#include <cstdlib>
#include "GeoModelInterfaces/IGeoModelSvc.h"
@@ -76,18 +74,6 @@ ZdcCablingSvc::initialize()
}
*/
- const ZdcID* zdcID(0);
- if(m_detStore->retrieve(zdcID).isFailure()){
- log << MSG::ERROR << "Unable to retrieve ZdcID helper from DetectorStore" << endmsg;
- return StatusCode::FAILURE;
- }
-
- const ZdcHardwareID* zdcHWID(0);
- if(m_detStore->retrieve(zdcHWID).isFailure()){
- log << MSG::ERROR << "Unable to retrieve ZdcHWID helper from DetectorStore" << endmsg;
- return StatusCode::FAILURE;
- }
-
//=== Initialize ZdcCablingService singleton
m_cablingService = ZdcCablingService::getInstance();
if(!m_cablingService){
@@ -95,11 +81,6 @@ ZdcCablingSvc::initialize()
return StatusCode::FAILURE ;
}
- //m_cablingService->setCaloLVL1(caloID);
- m_cablingService->setZdcID(zdcID);
- m_cablingService->setZdcHWID(zdcHWID);
-
-
IGeoModelSvc *geoModel=0;
StatusCode sc = service("GeoModelSvc", geoModel);
if(sc.isFailure())
@@ -129,9 +110,6 @@ ZdcCablingSvc::initialize()
}
}
- log << MSG::INFO << "Setting Cabling type to " << m_cablingType << endmsg;
- m_cablingService->setCablingType((ZdcCablingService::ZdcCablingType)m_cablingType);
-
MSG::Level logLevel = log.level();
if (logLevel <= MSG::VERBOSE) {
diff --git a/ForwardDetectors/ZDC/ZdcEvent/ZdcEvent/ATLAS_CHECK_THREAD_SAFETY b/ForwardDetectors/ZDC/ZdcEvent/ZdcEvent/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..1914c2b210071464e7b8dd30c7bc0204ad61d22d
--- /dev/null
+++ b/ForwardDetectors/ZDC/ZdcEvent/ZdcEvent/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+ForwardDetectors/ZDC/ZdcEvent
diff --git a/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigits.cxx b/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigits.cxx
index f9c81bf972fb9124f5cf862b901bac1981b23c5c..62920a21fda69efd473188c9277a761cb9b6009d 100755
--- a/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigits.cxx
+++ b/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigits.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -69,31 +69,28 @@ void ZdcDigits::print() const
//std::cout << std::setiosflags( std::ios::showpoint );
//std::cout << std::setprecision(2);
- std::vector<int>::const_iterator it;
- std::vector<int>::const_iterator it_end;
-
std::cout << "gain0/delay0 (" << m_digits_gain0_delay0.size() << " elements): ";
- it = m_digits_gain0_delay0.begin();
- it_end = m_digits_gain0_delay0.end();
- while (it!=it_end) { std::cout << " " << (*it); it++;}
+ for (int val : m_digits_gain0_delay0) {
+ std::cout << " " << val;
+ }
std::cout << std::endl;
std::cout << "gain0/delay1 (" << m_digits_gain0_delay1.size() << " elements): ";
- it = m_digits_gain0_delay1.begin();
- it_end = m_digits_gain0_delay1.end();
- while (it!=it_end) { std::cout << " " << (*it); it++;}
+ for (int val : m_digits_gain0_delay1) {
+ std::cout << " " << val;
+ }
std::cout << std::endl;
std::cout << "gain1/delay0 (" << m_digits_gain1_delay0.size() << " elements): ";
- it = m_digits_gain1_delay0.begin();
- it_end = m_digits_gain1_delay0.end();
- while (it!=it_end) { std::cout << " " << (*it); it++;}
+ for (int val : m_digits_gain1_delay0) {
+ std::cout << " " << val;
+ }
std::cout << std::endl;
std::cout << "gain1/delay1 (" << m_digits_gain1_delay1.size() << " elements): ";
- it = m_digits_gain1_delay1.begin();
- it_end = m_digits_gain1_delay1.end();
- while (it!=it_end) { std::cout << " " << (*it); it++;}
+ for (int val : m_digits_gain1_delay1) {
+ std::cout << " " << val;
+ }
std::cout << std::endl;
diff --git a/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigitsCollection.cxx b/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigitsCollection.cxx
index 3c805ee7cd098bec909ecd89c846d8726b724423..5f5a5de0c377fc6295f3b18f67f318102ff4042b 100644
--- a/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigitsCollection.cxx
+++ b/ForwardDetectors/ZDC/ZdcEvent/src/ZdcDigitsCollection.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -8,17 +8,12 @@
void ZdcDigitsCollection::print()
{
- iterator it = this->begin();
- iterator it_end = this->end();
-
std::cout << "Dumping ZdcDigitsCollection" << std::endl;
int i = 0;
- while (it != it_end)
+ for (const ZdcDigits* dig : *this)
{
std::cout << "Printing Digit #" << i << std::endl;
- (*it)->print();
- //std::cout << (*it) << std::endl;
- it++;
+ dig->print();
i++;
}
return;
diff --git a/ForwardDetectors/ZDC/ZdcEvent/src/ZdcRawData.cxx b/ForwardDetectors/ZDC/ZdcEvent/src/ZdcRawData.cxx
index 35de5bf85b6351c361b34dd21ae82ec9a16fcc25..12fcc5c8d355f9ab33f8492582783ce458cab7ea 100755
--- a/ForwardDetectors/ZDC/ZdcEvent/src/ZdcRawData.cxx
+++ b/ForwardDetectors/ZDC/ZdcEvent/src/ZdcRawData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -28,8 +28,8 @@
#include <iomanip>
ZdcRawData::ZdcRawData( const Identifier& id )
+ : m_id (id)
{
- m_id = id;
}
void ZdcRawData::print() const
@@ -77,12 +77,9 @@ void ZdcRawData::print_to_stream ( const std::vector<double>& val,
std::ostringstream & text)
{
text << label;
-
- std::vector<double>::const_iterator it1=val.begin();
- std::vector<double>::const_iterator it2=val.end();
-
- for ( ; it1!=it2; ++it1) text << " " << (*it1);
-
+ for (double v : val) {
+ text << " " << v;
+ }
}
void ZdcRawData::print_to_stream ( const std::vector<int>& val,
@@ -90,11 +87,8 @@ void ZdcRawData::print_to_stream ( const std::vector<int>& val,
std::ostringstream & text)
{
text << label;
-
- std::vector<int>::const_iterator it1=val.begin();
- std::vector<int>::const_iterator it2=val.end();
-
- for ( ; it1!=it2; ++it1) text << " " << (*it1);
-
+ for (double v : val) {
+ text << " " << v;
+ }
}
diff --git a/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ATLAS_CHECK_THREAD_SAFETY b/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..a62654cc210865c6fa65e7be393021bea2ce1084
--- /dev/null
+++ b/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+ForwardDetectors/ZDC/ZdcIdentifier
diff --git a/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID.h b/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID.h
index 5c2af90945df05b7010d1c4ddf521c6ca553d299..2ea7953f01bf1cffdf6b74f1263a890da300b8d0 100644
--- a/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID.h
+++ b/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZdcID_H
@@ -131,7 +131,7 @@ IdentifierHash
ZdcID::module_hash (Identifier module_id) const
{
// module hash is composed of side and module
- static unsigned int nmodule = m_module_impl.field().get_maximum() + 1;
+ static const unsigned int nmodule = m_module_impl.field().get_maximum() + 1;
return (nmodule*m_side_impl.unpackToIndex(module_id) + module(module_id));
}
@@ -140,9 +140,9 @@ IdentifierHash
ZdcID::channel_hash (Identifier channel_id) const
{
// module hash is composed of side, module, type and channel
- static unsigned int nmodule = m_module_impl.field().get_maximum() + 1;
- static unsigned int ntype = m_type_impl.field().get_maximum() + 1;
- static unsigned int nchannel = m_channel_impl.field().get_maximum() + 1;
+ static const unsigned int nmodule = m_module_impl.field().get_maximum() + 1;
+ static const unsigned int ntype = m_type_impl.field().get_maximum() + 1;
+ static const unsigned int nchannel = m_channel_impl.field().get_maximum() + 1;
return ((nmodule*ntype*nchannel)*m_side_impl.unpackToIndex(channel_id)
+ (ntype*nchannel)*module(channel_id)
+ nchannel*type(channel_id)
diff --git a/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID_Exception.h b/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID_Exception.h
index 3707bfe114de4cdc71e2de08817fd5ff62dfa7ea..9b18162397b5caa3623143445669fd2f620c5731 100755
--- a/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID_Exception.h
+++ b/ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID_Exception.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZDCID_EXCEPTION_H
@@ -24,12 +24,12 @@ public:
/**
* constructor to be used
*/
- ZdcID_Exception(std::string l_message , int l_code) : m_message ( l_message ) , m_code ( l_code ) { }
+ ZdcID_Exception(const std::string& l_message , int l_code) : m_message ( l_message ) , m_code ( l_code ) { }
/**
* set error message
*/
- void message(std::string l_message) { m_message = l_message ;}
+ void message(const std::string& l_message) { m_message = l_message ;}
/**
* return error message
diff --git a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcSignalSinc.h b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcSignalSinc.h
index 1c6fbd2f84d141e295a1af49c705bb667a4d95cd..09f5ab1c10aa50844ae225953c19d69fa501d17b 100644
--- a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcSignalSinc.h
+++ b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcSignalSinc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -18,6 +18,10 @@ class ZdcSignalSinc {
ZdcSignalSinc(int);
~ZdcSignalSinc();
+
+ ZdcSignalSinc(const ZdcSignalSinc&) = delete;
+ ZdcSignalSinc& operator= (const ZdcSignalSinc&) = delete;
+
int process(double *,double gain=1., double ped=0.,
double frac=1., bool corr=true);
int getError();
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRec.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRec.cxx
index d8f780dc8d0bd501037a24674f295396c9a2ce75..2e9ebbe8b05073bf72d6f08d682b9a7a971159c1 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRec.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRec.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -153,7 +153,7 @@ StatusCode ZdcRec::execute()
// SG has the ownership of m_rawCollection, and it should be copyed intead of just
// being passed around.
- for (iter=tmpCollection->begin();iter!=tmpCollection->end();iter++) {
+ for (iter=tmpCollection->begin();iter!=tmpCollection->end();++iter) {
m_rawCollection->push_back(*iter);
}
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
index 6562974f444b61a848cc25c3e5f8b32ba7ad772d..0b2fbe8312e492cf0d6874db899bf3d944401ac5 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
@@ -134,8 +134,6 @@ StatusCode ZdcRecChannelTool::initialize()
}
m_zdcId = zdcId;
- ZdcCablingService::getInstance()->setZdcID(m_zdcId);
-
msg(MSG::DEBUG) << "--> ZDC : END OF MODIFICATION 0" << endmsg ;
return StatusCode::SUCCESS;
}
@@ -291,10 +289,10 @@ int ZdcRecChannelTool::makeRawFromDigits(
//We need to be carefull. Sometimes the vector size here is zero (PPM flaw) and
//the code crashs if we do not treat this.
i = 0;
- for (vit = wfm.begin(); vit<wfm.end(); vit++) {
+ for (vit = wfm.begin(); vit<wfm.end(); ++vit) {
if (vit->size() == 0) vit->resize(7);
ped = *vit->begin();
- for (it=vit->begin(); it<vit->end();it++) {
+ for (it=vit->begin(); it<vit->end();++it) {
(*it) -= ped;
//if ((i==1) || (i==3) ) (*it) = (*it) * s_GAIN_RATIO;
}
@@ -358,7 +356,7 @@ int ZdcRecChannelTool::makeRawFromDigits(
/// Traditional code bellow (Energy by peak or sum,
/// time by ratio of samples
//////////////////////////////////////////////////
- for (vit = wfm.begin(); vit<wfm.end(); vit++) {
+ for (vit = wfm.begin(); vit<wfm.end(); ++vit) {
v = *vit;
soma = std::accumulate(v.begin(), v.end(), 0) ;
pico = *(std::max_element(v.begin(),v.end()) );
@@ -402,7 +400,7 @@ int ZdcRecChannelTool::makeRawFromDigits(
" m=" << m <<
" Time by CFD=" << tzc <<
" Peak at imax = " << imax <<
- " v[imax-1] = " << v[imax-1] <<
+ " v[imax-1] = " << (imax > 0 ? v[imax-1] : 0) <<
" V[imax] = " << v[imax] <<
" Sample Ratio A1/A2=" << tsr << endmsg;
k++;
@@ -530,10 +528,10 @@ int ZdcRecChannelTool::getTimingCFD(const Identifier& id, const std::vector<std
vf[i] = 0.;
}
- for (vit = wfm.begin(); vit<wfm.end(); vit++) {
+ for (vit = wfm.begin(); vit<wfm.end(); ++vit) {
y = *vit;
i = 4;
- for (it=y.begin();it != y.end();it++) {
+ for (it=y.begin();it != y.end();++it) {
v[i] = *it;
i++;
}
@@ -681,7 +679,7 @@ int ZdcRecChannelTool::getTimingSinc(const Identifier& id, const std::vector<st
<< mType << ";"
<< mChannel << endmsg;
- for (vvi_it = wfm.begin(); vvi_it<wfm.end(); vvi_it++) {
+ for (vvi_it = wfm.begin(); vvi_it<wfm.end(); ++vvi_it) {
//FIXME: Change to the method of ID identification
//if ((zId == 0xec000000) || (zId == 0xed000000) ||
// (zId == 0xec200000) || (zId == 0xed200000) ||
@@ -694,7 +692,7 @@ int ZdcRecChannelTool::getTimingSinc(const Identifier& id, const std::vector<st
t = 0;
//Fill the interpolated vector
- for (vf_it = m_wfm_bwl.begin(); vf_it != m_wfm_bwl.end(); vf_it++ ) {
+ for (vf_it = m_wfm_bwl.begin(); vf_it != m_wfm_bwl.end(); ++vf_it ) {
z = 0.;
for (i=0;i<m_nsamples;i++) {
x = (TMath::Pi() *(t*0.1 - i*25.))/25. ;
@@ -819,7 +817,7 @@ int ZdcRecChannelTool::getTimingSinc2(const Identifier& id, const std::vector<st
//from only a subset
wfmIndex = 2;
i = 0;
- for (vit = wfm.begin(); vit<wfm.end(); vit++) {
+ for (vit = wfm.begin(); vit<wfm.end(); ++vit) {
if ( (i < wfmIndex) && (mType == 0) )
{
y = *vit;
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
index 4753bff93338018bad8e0c5f516954046cf01f8f..4ce9f9be54448d9b170731283cad7e0f2f1db93c 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
@@ -93,8 +93,6 @@ StatusCode ZdcRecChannelToolV2::initialize()
}
m_zdcId = zdcId;
- ZdcCablingService::getInstance()->setZdcID(m_zdcId);
-
msg(MSG::DEBUG) << "--> ZDC : END OF MODIFICATION 0" << endmsg ;
return StatusCode::SUCCESS;
@@ -121,17 +119,14 @@ int ZdcRecChannelToolV2::convertTT2ZM(const xAOD::TriggerTowerContainer* ttColle
hashmapType digits_map;
Identifier chan_id;
- xAOD::TriggerTowerContainer::const_iterator tt_itr = ttCollection->begin();
- xAOD::TriggerTowerContainer::const_iterator tt_end = ttCollection->end();
-
//std::cout << "Zdc TT's have " << ttCollection->size() << " towers" << std::endl;
- for (;tt_itr != tt_end;tt_itr++)
+ for (const xAOD::TriggerTower* tt : *ttCollection)
{
- //std::cout << "ZdcTT coolId = " << (*tt_itr)->coolId() << std::endl;
- //std::cout << ZdcToString(*(*tt_itr)) << std::endl;
+ //std::cout << "ZdcTT coolId = " << tt->coolId() << std::endl;
+ //std::cout << ZdcToString(*tt) << std::endl;
- uint32_t coolId = (*tt_itr)->coolId();
+ uint32_t coolId = tt->coolId();
uint32_t pin = (coolId>>8) & 0xf;
uint32_t asic = coolId & 0xf;
uint32_t slinkChannel = asic*16 + pin;
@@ -175,10 +170,10 @@ int ZdcRecChannelToolV2::convertTT2ZM(const xAOD::TriggerTowerContainer* ttColle
(*iter).second->setType(m_zdcId->type(chan_id));
(*iter).second->setChannel(m_zdcId->channel(chan_id));
//std::cout << "Trying to set element links of " << chan_id << std::dec << std::endl;
- if (gain==0&&delay==0) (*iter).second->setTTg0d0Link( ElementLink<xAOD::TriggerTowerContainer_v2> ((*tt_itr),*ttCollection ) );
- if (gain==0&&delay==1) (*iter).second->setTTg0d1Link( ElementLink<xAOD::TriggerTowerContainer_v2> ((*tt_itr),*ttCollection ) );
- if (gain==1&&delay==0) (*iter).second->setTTg1d0Link( ElementLink<xAOD::TriggerTowerContainer_v2> ((*tt_itr),*ttCollection ) );
- if (gain==1&&delay==1) (*iter).second->setTTg1d1Link( ElementLink<xAOD::TriggerTowerContainer_v2> ((*tt_itr),*ttCollection ) );
+ if (gain==0&&delay==0) (*iter).second->setTTg0d0Link( ElementLink<xAOD::TriggerTowerContainer_v2> (tt,*ttCollection ) );
+ if (gain==0&&delay==1) (*iter).second->setTTg0d1Link( ElementLink<xAOD::TriggerTowerContainer_v2> (tt,*ttCollection ) );
+ if (gain==1&&delay==0) (*iter).second->setTTg1d0Link( ElementLink<xAOD::TriggerTowerContainer_v2> (tt,*ttCollection ) );
+ if (gain==1&&delay==1) (*iter).second->setTTg1d1Link( ElementLink<xAOD::TriggerTowerContainer_v2> (tt,*ttCollection ) );
}
}
@@ -190,7 +185,7 @@ int ZdcRecChannelToolV2::convertTT2ZM(const xAOD::TriggerTowerContainer* ttColle
hashmapType::iterator iter = digits_map.begin();
hashmapType::iterator iter_end = digits_map.end();
- for (;iter != iter_end;iter++)
+ for (;iter != iter_end;++iter)
{
makeWaveformFromDigits( *((*iter).second) );
}
@@ -347,7 +342,7 @@ int ZdcRecChannelToolV2::splitWaveform(std::map<int,float>& waveform, std::vecto
adcs.clear();
std::map<int,float>::const_iterator wf_it = waveform.begin();
std::map<int,float>::const_iterator wf_end = waveform.end();
- for (;wf_it != wf_end;wf_it++)
+ for (;wf_it != wf_end;++wf_it)
{
//std::cout << iwf++ << "t=" << (*wf_it).first << " a=" << (*wf_it).second << std::endl;
times.push_back((*wf_it).first / 10. ); // convert back to ns
diff --git a/Generators/AtlasHepMC/AtlasHepMC/IO_GenEvent.h b/Generators/AtlasHepMC/AtlasHepMC/IO_GenEvent.h
index c835adb2b578c432113887e3db28cb054f460cfa..04dd2c9f6b91111edaaa491f080268a419c50173 100644
--- a/Generators/AtlasHepMC/AtlasHepMC/IO_GenEvent.h
+++ b/Generators/AtlasHepMC/AtlasHepMC/IO_GenEvent.h
@@ -15,6 +15,27 @@ namespace HepMC
{
typedef HepMC3::WriterAsciiHepMC2 WriterAsciiHepMC2;
typedef HepMC3::ReaderAsciiHepMC2 ReaderAsciiHepMC2;
+class IO_GenEvent {
+public:
+ IO_GenEvent( const std::string& filename="IO_GenEvent.dat",
+ std::ios::openmode mode=std::ios::out ) {
+ m_writer=new HepMC3::WriterAsciiHepMC2(filename);
+ }
+ IO_GenEvent( std::ostream & os ) {
+ m_writer=new HepMC3::WriterAsciiHepMC2(os);
+ }
+ ~IO_GenEvent() {
+ if(m_writer) {
+ m_writer->close();
+ delete m_writer;
+ }
+ }
+ void write_event( const HepMC3::GenEvent* evt ) {
+ m_writer->write_event(*evt);
+ }
+private:
+ HepMC3::WriterAsciiHepMC2 *m_writer;
+};
}
#else
#include "HepMC/IO_GenEvent.h"
diff --git a/Generators/AtlasHepMC/AtlasHepMC/IteratorRange.h b/Generators/AtlasHepMC/AtlasHepMC/IteratorRange.h
index 4f8674320ca5ca3d45e9ffd9552d7586a6db30b9..98422d0a128ba000a75c8db78437f19e70d21374 100644
--- a/Generators/AtlasHepMC/AtlasHepMC/IteratorRange.h
+++ b/Generators/AtlasHepMC/AtlasHepMC/IteratorRange.h
@@ -5,5 +5,13 @@
#ifndef ATLASHEPMC_ITERATORRANGE_H
#define ATLASHEPMC_ITERATORRANGE_H
+#ifdef HEPMC3
+namespace HepMC {
+enum IteratorRange { parents, children, family,
+ ancestors, descendants, relatives
+ };
+}
+#else
#include "HepMC/IteratorRange.h"
#endif
+#endif
diff --git a/Generators/AtlasHepMC/AtlasHepMC/Operators.h b/Generators/AtlasHepMC/AtlasHepMC/Operators.h
new file mode 100644
index 0000000000000000000000000000000000000000..911f7fe9bf67088e0ef4b26d181283288877acd3
--- /dev/null
+++ b/Generators/AtlasHepMC/AtlasHepMC/Operators.h
@@ -0,0 +1,34 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/* Author: Andrii Verbytskyi andrii.verbytskyi@mpp.mpg.de */
+
+#ifndef ATLASHEPMC_OPERATORS_H
+#define ATLASHEPMC_OPERATORS_H
+#ifdef HEPMC3
+// This suboptimal piece of code is here because of the googletest suite.
+namespace HepMC3 {
+bool operator ==(const HepMC3::GenParticle* a, const std::shared_ptr<HepMC3::GenParticle> b ) {
+ return a==b.get();
+}
+bool operator ==(const std::shared_ptr<HepMC3::GenParticle> a, const HepMC3::GenParticle* const b) {
+ return a.get()==b;
+}
+bool operator ==(const std::shared_ptr<const HepMC3::GenParticle> a, const HepMC3::GenParticle* const b) {
+ return a.get()==b;
+}
+bool operator ==(const HepMC3::GenParticle a, const HepMC3::GenParticle b) {
+ return a.id()==b.id();
+}
+bool operator !=(const std::shared_ptr<HepMC3::GenParticle> a, const HepMC3::GenParticle* const b) {
+ return a.get()!=b;
+}
+bool operator !=(const std::shared_ptr<const HepMC3::GenParticle> a, const HepMC3::GenParticle* const b) {
+ return a.get()!=b;
+}
+bool operator !=(const HepMC3::GenParticle a, const HepMC3::GenParticle b) {
+ return a.id()!=b.id();
+}
+}
+#endif
+#endif
diff --git a/Generators/FlowAfterburner/src/AddFlowByShifting.cxx b/Generators/FlowAfterburner/src/AddFlowByShifting.cxx
index 2cad2e9bd5ae43c5b40c15039e6226c08c2ee754..c24e4906c46f1f791ce26ef74d55f71c4543b1c8 100644
--- a/Generators/FlowAfterburner/src/AddFlowByShifting.cxx
+++ b/Generators/FlowAfterburner/src/AddFlowByShifting.cxx
@@ -234,7 +234,6 @@ StatusCode AddFlowByShifting::execute() {
m_psi_n[1]=hijing_pars->get_bphi() ;//the psi2 plane is aligned with the impact parameter
m_psi_n[1]=std::atan2(std::sin(2*m_psi_n[1]),std::cos(2*m_psi_n[1]))/2.0;//ensure that Psi2 is within [-PI/2,PI/2]
hijing_pars_nc->set_psi(2,m_psi_n[1]);
- (*hijing_pars).set_psi(2,m_psi_n[1]);
ATH_MSG_DEBUG(" Psi2 for event : "<<(*hijing_pars).get_psi(2));
diff --git a/Generators/GeneratorFilters/CMakeLists.txt b/Generators/GeneratorFilters/CMakeLists.txt
index 8cac1c493a3bac63603497fcb53a2a69351293f7..533134312a582b689dd58a3d5fe54b5ff2b9a4c9 100644
--- a/Generators/GeneratorFilters/CMakeLists.txt
+++ b/Generators/GeneratorFilters/CMakeLists.txt
@@ -41,6 +41,7 @@ atlas_add_component( GeneratorFilters
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib StoreGateLib SGtests GaudiKernel GeneratorModulesLib AthenaKernel CxxUtils EventInfo xAODJet xAODTruth TruthUtils ParticleEvent McParticleEvent GeneratorFiltersLib )
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
+# Install job option fragments from the package:
+atlas_install_joboptions( share/common/*.py )
+
diff --git a/Generators/GeneratorObjects/GeneratorObjects/ATLAS_CHECK_THREAD_SAFETY b/Generators/GeneratorObjects/GeneratorObjects/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..21a0af443023c12a55108d7da363d6375395c4a3
--- /dev/null
+++ b/Generators/GeneratorObjects/GeneratorObjects/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Generators/GeneratorObjects
diff --git a/Generators/GeneratorObjects/GeneratorObjects/HijingEventParams.h b/Generators/GeneratorObjects/GeneratorObjects/HijingEventParams.h
index d9ee6248ba97ed646cd07dcec2167aa58f1263ac..445fc5f8cf8dc60ac08134b6056929a84839385c 100644
--- a/Generators/GeneratorObjects/GeneratorObjects/HijingEventParams.h
+++ b/Generators/GeneratorObjects/GeneratorObjects/HijingEventParams.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GENERATOROBJECTSHIJINGEVENTPARAMS_H
@@ -40,7 +40,7 @@ class HijingEventParams
float get_psi(int n) const;
- void set_psi(int ihar,float psi) const;
+ void set_psi(int ihar,float psi);
private:
@@ -55,7 +55,7 @@ private:
float m_b = 0;
float m_bphi = 0;
- mutable float m_psi_1 = 0,m_psi_2 = 0,m_psi_3 = 0,m_psi_4 = 0,m_psi_5 = 0,m_psi_6 = 0;
+ float m_psi_1 = 0,m_psi_2 = 0,m_psi_3 = 0,m_psi_4 = 0,m_psi_5 = 0,m_psi_6 = 0;
};
inline
@@ -104,7 +104,7 @@ inline float HijingEventParams::get_psi(int ihar) const
return 0;
}
-inline void HijingEventParams::set_psi(int ihar, float psi) const
+inline void HijingEventParams::set_psi(int ihar, float psi)
{
if(ihar==1) m_psi_1=psi;
if(ihar==2) m_psi_2=psi;
diff --git a/Generators/GeneratorObjects/GeneratorObjects/McEventCollection.h b/Generators/GeneratorObjects/GeneratorObjects/McEventCollection.h
index bc193502de52e244820032c07b0588c7552e12f9..a96d9b1384827d8051d45bb112e2f895c5fd5bc3 100644
--- a/Generators/GeneratorObjects/GeneratorObjects/McEventCollection.h
+++ b/Generators/GeneratorObjects/GeneratorObjects/McEventCollection.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef GENERATOROBJECTSMCEVENTCOLLECTION_H
@@ -62,10 +62,9 @@ inline McEventCollection& McEventCollection::operator=(const McEventCollection&
{
// Force a deep copy on the DataVector
//
- for (EventConstIterator iter = in.begin();
- iter != in.end(); iter++)
+ for (const HepMC::GenEvent* ev : in)
{
- DataVector<HepMC::GenEvent>::push_back(new HepMC::GenEvent(**iter));
+ DataVector<HepMC::GenEvent>::push_back(new HepMC::GenEvent(*ev));
}
return *this;
diff --git a/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx b/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx
index 3937568c8eb601766bab942e234f0a5ae2ecd443..f865234c99c75749fc9424639c93b3bfe8e4dd53 100644
--- a/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx
+++ b/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx
@@ -9,6 +9,9 @@
#undef NDEBUG
+#include "CxxUtils/checker_macros.h"
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY;
+
#include <iostream>
#include <limits>
#include <list>
@@ -20,6 +23,7 @@
// HepMC includes
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
// CLHEP includes
#include "CLHEP/Units/SystemOfUnits.h"
@@ -30,17 +34,6 @@
#include "GeneratorObjects/McEventCollection.h"
#include "GeneratorObjects/HepMcParticleLink.h"
-#ifdef HEPMC3
-// This suboptimal piece of code is here because the googletest is the worst testing suite ever.
-namespace HepMC3 {
-bool operator ==(const std::shared_ptr<HepMC3::GenParticle> a, const HepMC3::GenParticle* const b){return a.get()==b;}
-bool operator ==(const std::shared_ptr<const HepMC3::GenParticle> a, const HepMC3::GenParticle* const b){return a.get()==b;}
-bool operator ==(const HepMC3::GenParticle a, const HepMC3::GenParticle b) {return a.id()==b.id();}
-bool operator !=(const std::shared_ptr<HepMC3::GenParticle> a, const HepMC3::GenParticle* const b){return a.get()!=b;}
-bool operator !=(const std::shared_ptr<const HepMC3::GenParticle> a, const HepMC3::GenParticle* const b){return a.get()!=b;}
-bool operator !=(const HepMC3::GenParticle a, const HepMC3::GenParticle b){return a.id()!=b.id();}
-}
-#endif
namespace MCTesting {
diff --git a/Generators/Herwig7_i/share/common/Herwig71EvtGen_H7UE_NNPDF30nlo_dipole_jetjet.py b/Generators/Herwig7_i/share/common/Herwig71EvtGen_H7UE_NNPDF30nlo_dipole_jetjet.py
deleted file mode 100644
index 6a01b3434d2dd351279139ac1dadc5d9cc4999f3..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig71EvtGen_H7UE_NNPDF30nlo_dipole_jetjet.py
+++ /dev/null
@@ -1,58 +0,0 @@
-name = runArgs.jobConfig[0]
-name_info = name.split("_JZ")[1].split(".py")
-slice = int(name_info[0])
-
-minkT = {0:0,1:0,2:15,3:50,4:150,5:350,6:600,7:950,8:1500,9:2200,10:2800,11:3500,12:4200}
-
-# initialize Herwig7 generator configuration for built-in matrix elements
-include("Herwig7_i/Herwig7_BuiltinME.py")
-
-# configure Herwig7
-Herwig7Config.add_commands("set /Herwig/Partons/RemnantDecayer:AllowTop Yes")
-Herwig7Config.me_pdf_commands(order="NLO", name="NNPDF30_nlo_as_0118")
-
-command = """
-insert /Herwig/MatrixElements/SubProcess:MatrixElements[0] /Herwig/MatrixElements/MEQCD2to2
-set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT """+str(minkT[slice])+"""*GeV
-"""
-print command
-
-Herwig7Config.add_commands(command)
-
-command2 = """
-cd /Herwig/EventHandlers
-set EventHandler:CascadeHandler /Herwig/DipoleShower/DipoleShowerHandler
-read snippets/DipoleShowerFiveFlavours.in
-cd /Herwig/DipoleShower
-do DipoleShowerHandler:AddVariation isr:muRfac=2.0_fsr:muRfac=2.0 2.0 2.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=2.0_fsr:muRfac=1.0 2.0 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=2.0_fsr:muRfac=0.5 2.0 0.5 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=2.0" 1.0 2.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.5" 1.0 0.5 All
-do DipoleShowerHandler:AddVariation isr:muRfac=0.5_fsr:muRfac=2.0" 0.5 2.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=0.5_fsr:muRfac=1.0 0.5 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=0.5_fsr:muRfac=0.5 0.5 0.5 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.75_fsr:muRfac=1.0 1.75 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.5_fsr:muRfac=1.0 1.5 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.25_fsr:muRfac=1.0 1.25 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=0.625_fsr:muRfac=1.0" 0.625 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=0.75_fsr:muRfac=1.0 0.75 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=0.875_fsr:muRfac=1.0 0.875 1.0 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=1.75 1.0 1.75 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=1.5 1.0 1.5 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=1.25 1.0 1.25 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.625 1.0 0.625 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.75 1.0 0.75 All
-do DipoleShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.875 1.0 0.85 All
-"""
-print command2
-Herwig7Config.add_commands(command2)
-
-
-# add EvtGen
-include("Herwig7_i/Herwig71_EvtGen.py")
-
-# run Herwig7
-Herwig7Config.run()
-
diff --git a/Generators/Herwig7_i/share/common/Herwig71EvtGen_H7UE_NNPDF30nlo_jetjet.py b/Generators/Herwig7_i/share/common/Herwig71EvtGen_H7UE_NNPDF30nlo_jetjet.py
deleted file mode 100644
index 261a666be550a19e97b8ffae6f10d4be13bf9bde..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig71EvtGen_H7UE_NNPDF30nlo_jetjet.py
+++ /dev/null
@@ -1,50 +0,0 @@
-name = runArgs.jobConfig[0]
-name_info = name.split("_JZ")[1].split(".py")
-slice = int(name_info[0])
-
-minkT = {0:0,1:0,2:15,3:50,4:150,5:350,6:600,7:950,8:1500,9:2200,10:2800,11:3500,12:4200}
-
-# initialize Herwig7 generator configuration for built-in matrix elements
-include("Herwig7_i/Herwig7_BuiltinME.py")
-
-# configure Herwig7
-Herwig7Config.add_commands("set /Herwig/Partons/RemnantDecayer:AllowTop Yes")
-Herwig7Config.me_pdf_commands(order="NLO", name="NNPDF30_nlo_as_0118")
-
-command = """
-insert /Herwig/MatrixElements/SubProcess:MatrixElements[0] /Herwig/MatrixElements/MEQCD2to2
-set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
-set /Herwig/Cuts/JetKtCut:MinKT """+str(minkT[slice])+"""*GeV
-
-cd /Herwig/Shower
-do ShowerHandler:AddVariation isr:muRfac=2.0_fsr:muRfac=2.0 2.0 2.0 All
-do ShowerHandler:AddVariation isr:muRfac=2.0_fsr:muRfac=1.0 2.0 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=2.0_fsr:muRfac=0.5 2.0 0.5 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=2.0" 1.0 2.0 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.5" 1.0 0.5 All
-do ShowerHandler:AddVariation isr:muRfac=0.5_fsr:muRfac=2.0" 0.5 2.0 All
-do ShowerHandler:AddVariation isr:muRfac=0.5_fsr:muRfac=1.0 0.5 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=0.5_fsr:muRfac=0.5 0.5 0.5 All
-do ShowerHandler:AddVariation isr:muRfac=1.75_fsr:muRfac=1.0 1.75 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=1.5_fsr:muRfac=1.0 1.5 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=1.25_fsr:muRfac=1.0 1.25 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=0.625_fsr:muRfac=1.0" 0.625 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=0.75_fsr:muRfac=1.0 0.75 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=0.875_fsr:muRfac=1.0 0.875 1.0 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=1.75 1.0 1.75 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=1.5 1.0 1.5 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=1.25 1.0 1.25 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.625 1.0 0.625 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.75 1.0 0.75 All
-do ShowerHandler:AddVariation isr:muRfac=1.0_fsr:muRfac=0.875 1.0 0.85 All
-"""
-print command
-
-Herwig7Config.add_commands(command)
-
-# add EvtGen
-include("Herwig7_i/Herwig71_EvtGen.py")
-
-# run Herwig7
-Herwig7Config.run()
-
diff --git a/Generators/Herwig7_i/share/common/Herwig71_AngularShowerScaleVariations.py b/Generators/Herwig7_i/share/common/Herwig71_AngularShowerScaleVariations.py
deleted file mode 100644
index 3528ff4e8ef4cae5454c2659be1b8638d6bd6503..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig71_AngularShowerScaleVariations.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## JobOption fragment for Herwig 7.1.3
-assert hasattr(genSeq, "Herwig7")
-
-Herwig7Config.add_commands("""
-cd /Herwig/Shower
-do ShowerHandler:AddVariation MUR2_MUF2_SHOWER_HARD 2 2 Hard
-do ShowerHandler:AddVariation MUR2_MUF1_SHOWER_HARD 2 1 Hard
-do ShowerHandler:AddVariation MUR1_MUF2_SHOWER_HARD 1 2 Hard
-do ShowerHandler:AddVariation MUR1_MUF0.5_SHOWER_HARD 1 0.5 Hard
-do ShowerHandler:AddVariation MUR0.5_MUF1_SHOWER_HARD 0.5 1 Hard
-do ShowerHandler:AddVariation MUR0.5_MUF0.5_SHOWER_HARD 0.5 0.5 Hard
-do ShowerHandler:AddVariation MUR2_MUF2_SHOWER_SEC 2 2 Secondary
-do ShowerHandler:AddVariation MUR2_MUF1_SHOWER_SEC 2 1 Secondary
-do ShowerHandler:AddVariation MUR1_MUF2_SHOWER_SEC 1 2 Secondary
-do ShowerHandler:AddVariation MUR1_MUF0.5_SHOWER_SEC 1 0.5 Secondary
-do ShowerHandler:AddVariation MUR0.5_MUF1_SHOWER_SEC 0.5 1 Secondary
-do ShowerHandler:AddVariation MUR0.5_MUF0.5_SHOWER_SEC 0.5 0.5 Secondary
-set SplittingGenerator:Detuning 2.0
-""")
diff --git a/Generators/Herwig7_i/share/common/Herwig71_DipoleShowerScaleVariations.py b/Generators/Herwig7_i/share/common/Herwig71_DipoleShowerScaleVariations.py
deleted file mode 100644
index 33d2a14e4ffac0248dff2894946aa80881a95368..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig71_DipoleShowerScaleVariations.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## JobOption fragment for Herwig 7.1.3
-assert hasattr(genSeq, "Herwig7")
-
-Herwig7Config.add_commands("""
-cd /Herwig/DipoleShower
-do DipoleShowerHandler:AddVariation MUR2_MUF2_SHOWER_HARD 2 2 Hard
-do DipoleShowerHandler:AddVariation MUR2_MUF1_SHOWER_HARD 2 1 Hard
-do DipoleShowerHandler:AddVariation MUR1_MUF2_SHOWER_HARD 1 2 Hard
-do DipoleShowerHandler:AddVariation MUR1_MUF0.5_SHOWER_HARD 1 0.5 Hard
-do DipoleShowerHandler:AddVariation MUR0.5_MUF1_SHOWER_HARD 0.5 1 Hard
-do DipoleShowerHandler:AddVariation MUR0.5_MUF0.5_SHOWER_HARD 0.5 0.5 Hard
-do DipoleShowerHandler:AddVariation MUR2_MUF2_SHOWER_SEC 2 2 Secondary
-do DipoleShowerHandler:AddVariation MUR2_MUF1_SHOWER_SEC 2 1 Secondary
-do DipoleShowerHandler:AddVariation MUR1_MUF2_SHOWER_SEC 1 2 Secondary
-do DipoleShowerHandler:AddVariation MUR1_MUF0.5_SHOWER_SEC 1 0.5 Secondary
-do DipoleShowerHandler:AddVariation MUR0.5_MUF1_SHOWER_SEC 0.5 1 Secondary
-do DipoleShowerHandler:AddVariation MUR0.5_MUF0.5_SHOWER_SEC 0.5 0.5 Secondary
-set DipoleShowerHandler:Detuning 2.0
-""")
diff --git a/Generators/Herwig7_i/share/common/Herwig71_EvtGen.py b/Generators/Herwig7_i/share/common/Herwig71_EvtGen.py
deleted file mode 100644
index 58a7f58dcb7758d251e6ff984f9e6a25575466f8..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig71_EvtGen.py
+++ /dev/null
@@ -1,57 +0,0 @@
-## Run EvtGen afterburner on top of Pythia 8
-assert hasattr(genSeq, "Herwig7")
-include("EvtGen_i/EvtGen_Fragment.py")
-evgenConfig.auxfiles += ['Herwig71Inclusive.pdt']
-genSeq.EvtInclusiveDecay.pdtFile = "Herwig71Inclusive.pdt"
-
-Herwig7Config.add_commands("""
-# Quick "fix" to the mismatch between Herwig 7 and EvtGen of the masses below
-set /Herwig/Particles/B'_c1+:NominalMass 7.3
-set /Herwig/Particles/B'_c1-:NominalMass 7.3
-set /Herwig/Particles/B_c1+:NominalMass 7.3
-set /Herwig/Particles/B_c1-:NominalMass 7.3
-set /Herwig/Particles/B_c2+:NominalMass 7.35
-set /Herwig/Particles/B_c2-:NominalMass 7.35
-set /Herwig/Particles/B*_c0+:NominalMass 7.25
-set /Herwig/Particles/B*_c0-:NominalMass 7.25
-set /Herwig/Particles/B_c+:NominalMass 6.277
-set /Herwig/Particles/B_c-:NominalMass 6.277
-#
-# This is a complete kludge. Herwig7 has switched the mapping of names and pdgids for the D'(s1) and the D(s1)
-# That means EvtGen misinterprets which particle it should be decaying, since the PDGID is what is written
-# in the record. So, we'll set things up to change the masses so that the HEPMC record lis OK. That means
-# we want:
-# Mass: 2.45960 ID: 20433 (Pythia8 calls this the D*_1s+ , EvtGen calls it D_s1-. 20433 is what Herwig calls
-# D'_s1+ and orginally gave it a mass of 2.53535)
-# Mass: 2.53512 ID: 10433 (Pythia8 calls this the D_1s+ , EvtGen calls it D'_s1+. 10433 is what Herwig calls
-# D_s1+ and orginally gave it a mass of 2.4589
-#
-# Since EvtGen will redecay everything anyway, we'll make these particles stable in Herwig
-#
-set /Herwig/Particles/D'_s1+:NominalMass 2.4595000e+00
-set /Herwig/Particles/D'_s1+:Width 0.001
-set /Herwig/Particles/D'_s1+:WidthCut 0.01
-set /Herwig/Particles/D'_s1+:Width_generator:Initialize Yes
-set /Herwig/Particles/D'_s1+:Mass_generator:Initialize Yes
-set /Herwig/Particles/D'_s1-:NominalMass 2.4595000e+00
-set /Herwig/Particles/D'_s1-:Width 0.001
-set /Herwig/Particles/D'_s1-:WidthCut 0.01
-set /Herwig/Particles/D'_s1-:Width_generator:Initialize Yes
-set /Herwig/Particles/D'_s1-:Mass_generator:Initialize Yes
-set /Herwig/Particles/D_s1+:NominalMass 2.5352800e+00
-set /Herwig/Particles/D_s1+:Width 0.001
-set /Herwig/Particles/D_s1+:WidthCut 0.01
-set /Herwig/Particles/D_s1+:Width_generator:Initialize Yes
-set /Herwig/Particles/D_s1+:Mass_generator:Initialize Yes
-set /Herwig/Particles/D_s1-:NominalMass 2.5352800e+00
-set /Herwig/Particles/D_s1+:Width 0.001
-set /Herwig/Particles/D_s1+:WidthCut 0.01
-set /Herwig/Particles/D_s1+:Width_generator:Initialize Yes
-set /Herwig/Particles/D_s1+:Mass_generator:Initialize Yes
-set /Herwig/Particles/D'_s1-:Stable Stable
-set /Herwig/Particles/D'_s1+:Stable Stable
-set /Herwig/Particles/D_s1-:Stable Stable
-set /Herwig/Particles/D_s1+:Stable Stable
-
-""")
-
diff --git a/Generators/Herwig7_i/share/common/Herwig72_LHEF.py b/Generators/Herwig7_i/share/common/Herwig72_LHEF.py
new file mode 100644
index 0000000000000000000000000000000000000000..fbdc681ab08acb3438699bc13df2d5a0c0315702
--- /dev/null
+++ b/Generators/Herwig7_i/share/common/Herwig72_LHEF.py
@@ -0,0 +1,30 @@
+# initialize Herwig7 generator configuration object for showering of LHE files
+include("EvgenProdTools/merge_lhe_files.py")
+
+from Herwig7_i.Herwig7_iConf import Herwig7
+from Herwig7_i.Herwig72ConfigLHEF import Hw72ConfigLHEF
+
+genSeq += Herwig7()
+Herwig7Config = Hw72ConfigLHEF(genSeq, runArgs)
+
+# handle compressed LHE files passed via runArgs.inputGeneratorFile
+import glob
+from AthenaCommon import Logging
+athMsgLog = Logging.logging.getLogger('Herwig7_i/Herwig72_LHEF.py')
+if ".tar.gz" in runArgs.inputGeneratorFile or ".tgz" in runArgs.inputGeneratorFile:
+ athMsgLog.info("inputGeneratorFile '{}' is compressed - will look for uncompressed LHE file".format(runArgs.inputGeneratorFile))
+ lhe_files = glob.glob("*._*.ev*ts")
+ athMsgLog.info("Number of lhe files {}".format(len(lhe_files)))
+ if len(lhe_files) == 0:
+ raise RuntimeError("Could not find uncompressed LHE file")
+ if len(lhe_files) > 1:
+ athMsgLog.info("Found more than one uncompressed LHE file: {}".format(lhe_files))
+# my_lhe_file = "merged_lhef.events"
+# skeleton.GENtoEVGEN splits the file name on "._" (in rel. 20.7.9.9.6,MCProd,
+# so insert this in the merged file name - to make it run also for this release)
+ my_lhe_file = "merged_lhef._0.events"
+ merge_lhe_files(lhe_files, my_lhe_file )
+ lhe_files[0] = my_lhe_file
+ athMsgLog.info("Using uncompressed LHE file '{}' as inputGeneratorFile".format(lhe_files[0]))
+ runArgs.inputGeneratorFile = lhe_files[0]
+
diff --git a/Generators/Herwig7_i/share/common/Herwig7EG_Matchbox_MG_H7UEMMHT2014_dipole_multijet_withGridpack.py b/Generators/Herwig7_i/share/common/Herwig7EG_Matchbox_MG_H7UEMMHT2014_dipole_multijet_withGridpack.py
deleted file mode 100644
index 65385b1e171eed823e6c19c88995dfc5dd74f5a5..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7EG_Matchbox_MG_H7UEMMHT2014_dipole_multijet_withGridpack.py
+++ /dev/null
@@ -1,110 +0,0 @@
-from Herwig7_i.Herwig7_iConf import Herwig7
-from Herwig7_i.Herwig7ConfigMatchbox import Hw7ConfigMatchbox
-
-name = runArgs.jobConfig[0]
-dsid = int(name.split(".")[1])
-
-genSeq += Herwig7()
-
-## Provide config information
-evgenConfig.generators += ["Herwig7"]
-evgenConfig.tune = "MMHT2014"
-
-## initialize generator configuration object
-Herwig7Config = Hw7ConfigMatchbox(genSeq, runArgs, run_name="HerwigMatchbox", beams="pp")
-
-## configure generator
-include("MC15JobOptions/Herwig71_EvtGen.py")
-Herwig7Config.me_pdf_commands(order="NLO", name="MMHT2014nlo68cl")
-Herwig7Config.tune_commands()
-
-# HT slice boundaries
-pTDict = {0:0,1:6,2:15,3:50,4:150,5:350,6:600,7:950,8:1500,9:2200,10:2800,11:3500,12:4200}
-multDict = {0:1.1,1:1.2,2:2.2,3:4.0,4:5.0,5:6.0,6:7.0,7:8.0,8:9.0,9:10.0,10:10.0,11:10.0,12:10.0}
-
-#Herwig7EvtGen_Matchbox_MadGraph_H7UEMMHT2014_multijet.py
-name_info = name.split("_JZ")[1].split("WithSW.py")[0]
-if "plus" in name_info:
- name_info = 9
-slice = int(name_info)
-mergingscale = 30
-
-evt_multiplier = multDict[slice]
-
-if runArgs.maxEvents > 0:
- nevents=runArgs.maxEvents*evt_multiplier
-else:
- nevents=5000*evt_multiplier
-
-Herwig7Config.add_commands("""
-## Model assumptions
-read Matchbox/StandardModelLike.in
-read Matchbox/DiagonalCKM.in
-
-## Set the order of the couplings
-cd /Herwig/MatrixElements/Matchbox
-set Factory:OrderInAlphaS 2
-set Factory:OrderInAlphaEW 0
-
-## Select the process
-## You may use identifiers such as p, pbar, j, l, mu+, h0 etc.
-do Factory:Process p p -> j j
-
-#read Matchbox/MadGraph-NJet.in
-read Matchbox/MadGraph-OpenLoops.in
-
-## cuts on additional jets
-cd /Herwig/Cuts/
-read Matchbox/DefaultPPJets.in
-
-insert JetCuts:JetRegions 0 FirstJet
-"""
-+ "set FirstJet:PtMin "+str(pTDict[slice])+"*GeV"
-"""
-## Scale choice
-cd /Herwig/MatrixElements/Matchbox
-set Factory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/MaxJetPtScale
-
-## - - - bias to high pt.
-cd /Herwig/MatrixElements/Matchbox
-create Herwig::MergingReweight MPreWeight HwDipoleShower.so
-insert Factory:Preweighters 0 MPreWeight
-set MPreWeight:MaxPTPower 4
-set /Herwig/Samplers/MonacoSampler:Kappa 0.02
-##
-
-## Matching and shower selection
-# read Matchbox/MCatNLO-DefaultShower.in
-read Matchbox/MCatNLO-DipoleShower.in
-
-## PDF choice
-read Matchbox/FiveFlavourNoBMassScheme.in
-read Matchbox/MMHT2014.in
-
-do /Herwig/MatrixElements/Matchbox/Factory:ProductionMode
-""")
-
-include("MC15JobOptions/Herwig71_DipoleShowerScaleVariations.py")
-
-# Using author's default
-Herwig7Config.sampler_commands("MonacoSampler", 20000, 4, 50000, 1, 100)
-
-if runArgs.generatorRunMode == 'build':
- Herwig7Config.do_build(10)
-
-elif runArgs.generatorRunMode == 'integrate':
- Herwig7Config.do_integrate(runArgs.generatorJobNumber)
-
-elif runArgs.generatorRunMode == 'mergegrids':
- Herwig7Config.do_mergegrids(10,gridpack="Herwig7_gridpack.tar.gz")
-
-elif runArgs.generatorRunMode == 'run':
- if runArgs.runNumber == 364933: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364933.multijet_dipole_JZ1W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364902: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364902.multijet_dipole_JZ2W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364903: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364903.multijet_dipole_JZ3W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364904: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364904.multijet_dipole_JZ4W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364905: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364905.multijet_dipole_JZ5W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364906: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364906.multijet_dipole_JZ6W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364907: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364907.multijet_dipole_JZ7W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364908: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364908.multijet_dipole_JZ8W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364909: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364909.multijet_dipole_JZ9W.TXT.mc15_v4._00001.tar.gz")
diff --git a/Generators/Herwig7_i/share/common/Herwig7EvtGen_Matchbox_MadGraph_H7UEMMHT2014_multijet_withGridpack.py b/Generators/Herwig7_i/share/common/Herwig7EvtGen_Matchbox_MadGraph_H7UEMMHT2014_multijet_withGridpack.py
deleted file mode 100644
index 1d4048d7566581bdbe875f05748980a2a4e6bb38..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7EvtGen_Matchbox_MadGraph_H7UEMMHT2014_multijet_withGridpack.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from Herwig7_i.Herwig7_iConf import Herwig7
-from Herwig7_i.Herwig7ConfigMatchbox import Hw7ConfigMatchbox
-
-name = runArgs.jobConfig[0]
-dsid = int(name.split(".")[1])
-
-genSeq += Herwig7()
-
-## Provide config information
-evgenConfig.generators += ["Herwig7"]
-evgenConfig.tune = "MMHT2014"
-
-## initialize generator configuration object
-Herwig7Config = Hw7ConfigMatchbox(genSeq, runArgs, run_name="HerwigMatchbox", beams="pp")
-
-## configure generator
-include("MC15JobOptions/Herwig71_EvtGen.py")
-Herwig7Config.me_pdf_commands(order="NLO", name="MMHT2014nlo68cl")
-Herwig7Config.tune_commands()
-
-# HT slice boundaries
-pTDict = {0:0,1:6,2:15,3:50,4:150,5:350,6:600,7:950,8:1500,9:2200,10:2800,11:3500,12:4200}
-multDict = {0:1.1,1:1.2,2:2.2,3:4.0,4:5.0,5:6.0,6:7.0,7:8.0,8:9.0,9:10.0,10:10.0,11:10.0,12:10.0}
-
-name_info = name.split("_JZ")[1].split("WithSW.py")[0]
-if "plus" in name_info:
- name_info = 9
-slice = int(name_info)
-mergingscale = 30
-
-evt_multiplier = multDict[slice]
-
-if runArgs.maxEvents > 0:
- nevents=runArgs.maxEvents*evt_multiplier
-else:
- nevents=5000*evt_multiplier
-
-Herwig7Config.add_commands("""
-## Model assumptions
-read Matchbox/StandardModelLike.in
-read Matchbox/DiagonalCKM.in
-
-## Set the order of the couplings
-cd /Herwig/MatrixElements/Matchbox
-set Factory:OrderInAlphaS 2
-set Factory:OrderInAlphaEW 0
-
-## Select the process
-## You may use identifiers such as p, pbar, j, l, mu+, h0 etc.
-do Factory:Process p p -> j j
-
-#read Matchbox/MadGraph-NJet.in
-read Matchbox/MadGraph-OpenLoops.in
-
-## cuts on additional jets
-cd /Herwig/Cuts/
-read Matchbox/DefaultPPJets.in
-
-insert JetCuts:JetRegions 0 FirstJet
-"""
-+ "set FirstJet:PtMin "+str(pTDict[slice])+"*GeV"
-"""
-## Scale choice
-cd /Herwig/MatrixElements/Matchbox
-set Factory:ScaleChoice /Herwig/MatrixElements/Matchbox/Scales/MaxJetPtScale
-
-## - - - bias to high pt.
-cd /Herwig/MatrixElements/Matchbox
-create Herwig::MergingReweight MPreWeight HwDipoleShower.so
-insert Factory:Preweighters 0 MPreWeight
-set MPreWeight:MaxPTPower 4
-set /Herwig/Samplers/MonacoSampler:Kappa 0.02
-##
-
-## Matching and shower selection
-read Matchbox/MCatNLO-DefaultShower.in
-#read Matchbox/MCatNLO-DipoleShower.in
-
-## PDF choice
-read Matchbox/FiveFlavourNoBMassScheme.in
-read Matchbox/MMHT2014.in
-
-do /Herwig/MatrixElements/Matchbox/Factory:ProductionMode
-""")
-
-include("MC15JobOptions/Herwig71_AngularShowerScaleVariations.py")
-
-# Using author's default
-Herwig7Config.sampler_commands("MonacoSampler", 20000, 4, 50000, 1, 100)
-
-if runArgs.generatorRunMode == 'build':
- Herwig7Config.do_build(10)
-
-elif runArgs.generatorRunMode == 'integrate':
- Herwig7Config.do_integrate(runArgs.generatorJobNumber)
-
-elif runArgs.generatorRunMode == 'mergegrids':
- Herwig7Config.do_mergegrids(10,gridpack="Herwig7_gridpack.tar.gz")
-
-elif runArgs.generatorRunMode == 'run':
- if runArgs.runNumber == 364934: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364934.multijet_angular_JZ1W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364922: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364922.multijet_angular_JZ2W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364923: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364923.multijet_angular_JZ3W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364924: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364924.multijet_angular_JZ4W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364925: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364925.multijet_angular_JZ5W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364926: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364926.multijet_angular_JZ6W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364927: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364927.multijet_angular_JZ7W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364928: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364928.multijet_angular_JZ8W.TXT.mc15_v4._00001.tar.gz")
- if runArgs.runNumber == 364929: Herwig7Config.do_run(gridpack="group.phys-gener.Herwig7_Matchbox_MG_H7UEMMHT2014.364929.multijet_angular_JZ9W.TXT.mc15_v4._00001.tar.gz")
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_Base_Fragment.py b/Generators/Herwig7_i/share/common/Herwig7_701_Base_Fragment.py
deleted file mode 100644
index 9ef1172dae4c613ab9ac751bead27200f158dbfa..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_Base_Fragment.py
+++ /dev/null
@@ -1,33 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-from Herwig7_i.Herwig7_iConf import Herwig7
-genSeq += Herwig7()
-evgenConfig.generators += ["Herwig7"]
-
-try:
- from Herwig7_i import config as hw
-except:
- raise RuntimeError("""
-The release you have set up features the re-designed Herwig7 interface in athena which makes use of Herwig7 versions >= 7.0.4.
-The JobOptions, that you are trying to run, were written for and can only be used with the now discontinued interface for Herwig7 version 7.0.1, but can't be run with the new interface.
-Please check if you would like to
-* use more recent JobOptions, that are compatible with the new Herwig7 interface
-or
-* set up a different release, that includes the old interface for Herwig7
-Please have a look at https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/Herwig7ForAtlas for more information on release numbers and the corresponding interface versions.
-""")
-
-genSeq.Herwig7.Commands += hw.atlas_parameter_cmds().splitlines()
-
-genSeq.Herwig7.Commands += [
- "## fix for global default settings until released with Herwig7 itself",
- "set /Herwig/Shower/GtoQQbarSplitFn:AngularOrdered Yes",
- "set /Herwig/Shower/GammatoQQbarSplitFn:AngularOrdered Yes",
- "",
- "## fix for GeV-mass photon radiation",
- "set /Herwig/Shower/GammatoQQbarSudakov:Alpha /Herwig/Shower/AlphaQED",
- "",
- "## fix for initial-state (backward evolution) splitting",
- "set /Herwig/Shower/QtoGammaQSudakov:Alpha /Herwig/Shower/AlphaQED",
- ""
-]
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_EvtGen.py b/Generators/Herwig7_i/share/common/Herwig7_701_EvtGen.py
deleted file mode 100644
index abe4ae10a71c054540422a3fc4dbb5d9836a5668..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_EvtGen.py
+++ /dev/null
@@ -1,60 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Run EvtGen afterburner on top of Pythia 8
-assert hasattr(genSeq, "Herwig7")
-include("EvtGen_i/EvtGen_Fragment.py")
-evgenConfig.auxfiles += ['HerwigppInclusiveP8.pdt']
-genSeq.EvtInclusiveDecay.pdtFile = "HerwigppInclusiveP8.pdt"
-
-# quick "fix" to the mismatch between Herwig 7 and EvtGen of the masses below
-cmds1 = """
-set /Herwig/Particles/B'_c1+:NominalMass 7.3
-set /Herwig/Particles/B'_c1-:NominalMass 7.3
-set /Herwig/Particles/B_c1+:NominalMass 7.3
-set /Herwig/Particles/B_c1-:NominalMass 7.3
-set /Herwig/Particles/B_c2+:NominalMass 7.35
-set /Herwig/Particles/B_c2-:NominalMass 7.35
-set /Herwig/Particles/B*_c0+:NominalMass 7.25
-set /Herwig/Particles/B*_c0-:NominalMass 7.25
-set /Herwig/Particles/B_c+:NominalMass 6.277
-set /Herwig/Particles/B_c-:NominalMass 6.277
-#
-# This is a complete kludge. Herwig7 has switched the mapping of names and pdgids for the D'(s1) and the D(s1)
-# That means EvtGen misinterprets which particle it should be decaying, since the PDGID is what is written
-# in the record. So, we'll set things up to change the masses so that the HEPMC record lis OK. That means
-# we want:
-# Mass: 2.45960 ID: 20433 (Pythia8 calls this the D*_1s+ , EvtGen calls it D_s1-. 20433 is what Herwig calls
-# D'_s1+ and orginally gave it a mass of 2.53535)
-# Mass: 2.53512 ID: 10433 (Pythia8 calls this the D_1s+ , EvtGen calls it D'_s1+. 10433 is what Herwig calls
-# D_s1+ and orginally gave it a mass of 2.4589
-#
-# Since EvtGen will redecay everything anyway, we'll make these particles stable in Herwig
-#
-set /Herwig/Particles/D'_s1+:NominalMass 2.4595000e+00
-set /Herwig/Particles/D'_s1+:Width 0.001
-set /Herwig/Particles/D'_s1+:WidthCut 0.01
-set /Herwig/Particles/D'_s1+:Width_generator:Initialize Yes
-set /Herwig/Particles/D'_s1+:Mass_generator:Initialize Yes
-set /Herwig/Particles/D'_s1-:NominalMass 2.4595000e+00
-set /Herwig/Particles/D'_s1-:Width 0.001
-set /Herwig/Particles/D'_s1-:WidthCut 0.01
-set /Herwig/Particles/D'_s1-:Width_generator:Initialize Yes
-set /Herwig/Particles/D'_s1-:Mass_generator:Initialize Yes
-set /Herwig/Particles/D_s1+:NominalMass 2.5352800e+00
-set /Herwig/Particles/D_s1+:Width 0.001
-set /Herwig/Particles/D_s1+:WidthCut 0.01
-set /Herwig/Particles/D_s1+:Width_generator:Initialize Yes
-set /Herwig/Particles/D_s1+:Mass_generator:Initialize Yes
-set /Herwig/Particles/D_s1-:NominalMass 2.5352800e+00
-set /Herwig/Particles/D_s1+:Width 0.001
-set /Herwig/Particles/D_s1+:WidthCut 0.01
-set /Herwig/Particles/D_s1+:Width_generator:Initialize Yes
-set /Herwig/Particles/D_s1+:Mass_generator:Initialize Yes
-set /Herwig/Particles/D'_s1-:Stable Stable
-set /Herwig/Particles/D'_s1+:Stable Stable
-set /Herwig/Particles/D_s1-:Stable Stable
-set /Herwig/Particles/D_s1+:Stable Stable
-"""
-genSeq.Herwig7.Commands += cmds1.splitlines()
-
-del cmds1
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_Common.py
deleted file mode 100644
index 408517dd82f3e2c2b90aa51a9444982ba09ea95d..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_Common.py
+++ /dev/null
@@ -1,15 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with CT10 NLO ME PDF
-include("Herwig7_i/Herwig7_701_Base_Fragment.py")
-
-## Construct command set
-from Herwig7_i import config as hw
-cmds = hw.energy_cmds(runArgs.ecmEnergy) + hw.base_cmds() \
- + hw.nlo_pdf_cmds("CT10.LHgrid", "MMHT2014lo68cl.LHpdf") \
- + hw.ue_tune_cmds("H7-UE-MMHT")
-genSeq.Herwig7.Commands += cmds.splitlines()
-del cmds
-
-evgenConfig.tune = "H7-UE-MMHT"
-
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_EvtGen_Common.py
deleted file mode 100644
index c7661897b81e941393178fd63a54cebfd8b3a428..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_EvtGen_Common.py
+++ /dev/null
@@ -1,5 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with CT10 NLO ME PDF and EvtGen
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_Common.py")
-include("Herwig7_i/Herwig7_701_EvtGen.py")
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_LHEF_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_LHEF_Common.py
deleted file mode 100644
index 43a42cba937a9977d136e9d9bbf12a4eaec0cf26..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_LHEF_Common.py
+++ /dev/null
@@ -1,7 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with CT10 NLO ME PDF with NLO events read from a LHEF file
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_Common.py")
-
-from Herwig7_i import config as hw
-genSeq.Herwig7.Commands += hw.lhef_cmds(filename="events.lhe", nlo=True).splitlines()
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_LHEF_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_LHEF_EvtGen_Common.py
deleted file mode 100644
index 78cd2e19202a0493cc5100ceb33b59af485edf0d..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_LHEF_EvtGen_Common.py
+++ /dev/null
@@ -1,7 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with CT10 NLO ME PDF with NLO events read from a LHEF file and decays done with EvtGen
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_CT10_EvtGen_Common.py")
-
-from Herwig7_i import config as hw
-genSeq.Herwig7.Commands += hw.lhef_cmds(filename="events.lhe", nlo=True).splitlines()
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10f4ME_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10f4ME_EvtGen_Common.py
deleted file mode 100644
index 6a600e65b040cf8301f4ebf80f41639b34a07a5d..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10f4ME_EvtGen_Common.py
+++ /dev/null
@@ -1,15 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with a CT10f4 NLO ME PDF
-include("Herwig7_i/Herwig7_701_Base_Fragment.py")
-
-## Construct command set
-from Herwig7_i import config as hw
-cmds = hw.energy_cmds(runArgs.ecmEnergy) + hw.base_cmds() \
- + hw.nlo_pdf_cmds("CT10f4.LHgrid", "MMHT2014lo68cl.LHpdf") \
- + hw.ue_tune_cmds("H7-UE-MMHT")
-genSeq.Herwig7.Commands += cmds.splitlines()
-del cmds
-include("Herwig7_i/Herwig7_701_EvtGen.py")
-
-evgenConfig.tune = "H7-UE-MMHT"
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10f4ME_LHEF_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10f4ME_LHEF_EvtGen_Common.py
deleted file mode 100644
index 671b2c92e81c2efe0871200ceca2fa01b93894a1..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_CT10f4ME_LHEF_EvtGen_Common.py
+++ /dev/null
@@ -1,7 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with a CT10f4 NLO ME PDF with NLO events read from an LHEF file
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_CT10f4ME_EvtGen_Common.py")
-
-from Herwig7_i import config as hw
-genSeq.Herwig7.Commands += hw.lhef_cmds(filename="events.lhe", nlo=True).splitlines()
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_Common.py
deleted file mode 100644
index c334313442f77bda328a73d7b8c202385fb1e741..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_Common.py
+++ /dev/null
@@ -1,15 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with the MMHT2014 LO ME PDF
-include("Herwig7_i/Herwig7_701_Base_Fragment.py")
-
-## Construct command set
-from Herwig7_i import config as hw
-cmds = hw.energy_cmds(runArgs.ecmEnergy) + hw.base_cmds() \
- + hw.lo_pdf_cmds("MMHT2014lo68cl.LHpdf") \
- + hw.ue_tune_cmds("H7-UE-MMHT")
-genSeq.Herwig7.Commands += cmds.splitlines()
-del cmds
-
-evgenConfig.tune = "H7-UE-MMHT"
-
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_EvtGen_Common.py
deleted file mode 100644
index 3a1b8ef4ab70b8aa9f1c1c3155053c5a4384165c..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_EvtGen_Common.py
+++ /dev/null
@@ -1,5 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with MMHT2014 LO PDF and EvtGen
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_Common.py")
-include("Herwig7_i/Herwig7_701_EvtGen.py")
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_Common.py
deleted file mode 100644
index f712135625b7a7837f956971ad896aeaa0f50311..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_Common.py
+++ /dev/null
@@ -1,15 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with NNPDF3.0 NLO ME PDF
-include("Herwig7_i/Herwig7_701_Base_Fragment.py")
-
-## Construct command set
-from Herwig7_i import config as hw
-cmds = hw.energy_cmds(runArgs.ecmEnergy) + hw.base_cmds() \
- + hw.nlo_pdf_cmds("NNPDF30_nlo_as_0118.LHgrid", "MMHT2014lo68cl.LHpdf") \
- + hw.ue_tune_cmds("H7-UE-MMHT")
-genSeq.Herwig7.Commands += cmds.splitlines()
-del cmds
-
-evgenConfig.tune = "H7-UE-MMHT"
-
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_EvtGen_Common.py
deleted file mode 100644
index 5979883b94fb93b430be01618d588fa9db6b2116..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_EvtGen_Common.py
+++ /dev/null
@@ -1,5 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with NNPDF3.0 NLO ME PDF and EvtGen
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_Common.py")
-include("Herwig7_i/Herwig7_701_EvtGen.py")
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_LHEF_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_LHEF_Common.py
deleted file mode 100644
index 4477caf7404d41047e0602ddc190dc34897889a7..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_LHEF_Common.py
+++ /dev/null
@@ -1,7 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with NNPDF3.0 NLO ME PDF with NLO events read from a LHEF file
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_Common.py")
-
-from Herwig7_i import config as hw
-genSeq.Herwig7.Commands += hw.lhef_cmds(filename="events.lhe", nlo=True).splitlines()
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_LHEF_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_LHEF_EvtGen_Common.py
deleted file mode 100644
index 33204b7ed60803988dcae964794e115fc9c32362..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_LHEF_EvtGen_Common.py
+++ /dev/null
@@ -1,7 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for the H7-UE-MMHT tune series with NNPDF3.0 NLO ME PDF with NLO events read from a LHEF file and decays done with EvtGen
-include("Herwig7_i/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3ME_EvtGen_Common.py")
-
-from Herwig7_i import config as hw
-genSeq.Herwig7.Commands += hw.lhef_cmds(filename="events.lhe", nlo=True).splitlines()
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3nnloME_LHEF_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3nnloME_LHEF_EvtGen_Common.py
deleted file mode 100644
index 111c2b3ec4bf3fa05c864bd5184adceed273cc2c..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_H7UE_MMHT2014lo68cl_NNPDF3nnloME_LHEF_EvtGen_Common.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-include("Herwig7_i/Herwig7_701_Base_Fragment.py")
-
-## Herwig7 config for the H7-UE-MMHT tune series with NNPDF3.0 NNLO ME PDF with events read from a LHEF file and decays done with EvtGen
-
-## Construct command set
-from Herwig7_i import config as hw
-cmds = hw.energy_cmds(runArgs.ecmEnergy) + hw.base_cmds() \
- + hw.nlo_pdf_cmds("NNPDF30_nnlo_as_0118.LHgrid", "MMHT2014lo68cl.LHpdf") \
- + hw.ue_tune_cmds("H7-UE-MMHT")
-genSeq.Herwig7.Commands += cmds.splitlines()
-del cmds
-
-evgenConfig.tune = "H7-UE-MMHT"
-
-genSeq.Herwig7.Commands += hw.lhef_cmds(filename="events.lhe", nlo=True).splitlines()
-
-include("Herwig7_i/Herwig7_701_EvtGen.py")
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_QED_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_QED_Common.py
deleted file mode 100644
index 09508b44e411b3651d3906a3ead5ee62c39725e8..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_QED_Common.py
+++ /dev/null
@@ -1,17 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-# Common job option for gamma gamma processes in Herwig7
-# MPI tune is not relevant as the pdf_gammagamma_cmds() function disables MPI
-# Contact: Oldrich Kepka
-include("MC15JobOptions/Herwig7_701_Base_Fragment.py")
-from Herwig7_i import config as hw
-cmds = hw.energy_cmds(runArgs.ecmEnergy) + hw.base_cmds() + hw.pdf_gammagamma_cmds()
-cmds += """
-set /Herwig/Partons/QCDExtractor:FirstPDF /Herwig/Partons/BudnevPDF
-set /Herwig/Partons/QCDExtractor:SecondPDF /Herwig/Partons/BudnevPDF
-"""
-cmds += "create ThePEG::O1AlphaS /Herwig/AlphaQCD_O1 O1AlphaS.so\n"
-cmds += "set /Herwig/Generators/LHCGenerator:StandardModelParameters:QCD/RunningAlphaS /Herwig/AlphaQCD_O1\n"
-cmds += "set /Herwig/Partons/BudnevPDF:Q2Max 4."
-genSeq.Herwig7.Commands += cmds.splitlines()
-del cmds
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_QED_EvtGen_Common.py b/Generators/Herwig7_i/share/common/Herwig7_701_QED_EvtGen_Common.py
deleted file mode 100644
index 47174618709c5302dcb8da9cf7269553c8af1b9b..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_QED_EvtGen_Common.py
+++ /dev/null
@@ -1,5 +0,0 @@
-## JobOption fragment for Herwig 7.0.1
-
-## Herwig7 config for Herwig7_QED and EvtGen
-include("Herwig7_i/Herwig7_701_QED_Common.py")
-include("Herwig7_i/Herwig7_701_EvtGen.py")
diff --git a/Generators/Herwig7_i/share/common/Herwig7_701_StripWeights.py b/Generators/Herwig7_i/share/common/Herwig7_701_StripWeights.py
deleted file mode 100644
index 8c7b032e9c067bea2d9c5c17efb5de9462e274a6..0000000000000000000000000000000000000000
--- a/Generators/Herwig7_i/share/common/Herwig7_701_StripWeights.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import os, shutil
-
-m_inFile = runArgs.inputGeneratorFile
-
-if not m_inFile:
- exit()
-
-# Pick name Prefix
-# - if original file is compressed then athena places the uncompressed
-# LHE file in the current working directory before this script is executed
-m_Prefix = None
-if m_inFile is not None:
- if '.tar.gz' in m_inFile:
- m_Prefix = os.path.split(m_inFile)[1].split('.tar.gz')[0]
- elif '.events' in m_inFile:
- m_Prefix = os.path.split(m_inFile)[1].split('.events')[0]
- abs_path = os.path.split(os.path.abspath(m_inFile))[0]
- cwd_path = os.getcwd()
- if abs_path != cwd_path: # if original file is in a different folder
- # uncompressed LHE file in a different folder is not supported by job transform,
- # rectify this by copying the original LHE file to the current working directory
- shutil.copyfile(m_inFile, os.path.split(m_inFile)[1])
-
-m_lhe_extracted_old = m_Prefix+".events"
-m_lhe_extracted_new = "new."+m_Prefix+".events"
-
-if m_Prefix is None:
- raise RuntimeError("File title could not be determined because of unknown file extension")
-
-# Strip Weights from old LHE file and write new LHE file
-weights = False
-with open(m_lhe_extracted_old, "r") as lhef_in:
- with open(m_lhe_extracted_new, "w") as lhef_out:
-
- for line in lhef_in:
-
- # find tags related to multiple/optional weights
- if "<initrwgt>" in line or "<rwgt>" in line:
- weights = True
-
- # propagate line if we are currently not in a line
- # related to the optional/multiple event weights
- if not weights:
- lhef_out.write(line)
-
- # remember end of optional/multiple event weights lines
- if "</initrwgt>" in line or "</rwgt>" in line:
- weights = False
-
-# Delete old (unstripped) LHE file
-os.remove(m_lhe_extracted_old)
-
-# Rename new (stripped) LHE file to the old filename
-shutil.move(m_lhe_extracted_new, m_lhe_extracted_old)
diff --git a/Generators/Herwig7_i/share/common/Herwig7_TheP8I.py b/Generators/Herwig7_i/share/common/Herwig7_TheP8I.py
new file mode 100644
index 0000000000000000000000000000000000000000..d76e763b93dd669718a8892d4aed099ec4bdfabc
--- /dev/null
+++ b/Generators/Herwig7_i/share/common/Herwig7_TheP8I.py
@@ -0,0 +1,27 @@
+
+assert hasattr(genSeq, "Herwig7")
+
+#The path is hardcoded, exactly in a way that is done for OpenLoops
+try:
+# This should be a prefix
+ TheP8I_path=os.environ['THEP8I_PATH']
+except:
+ TheP8I_path='/cvmfs/sft.cern.ch/lcg/releases/LCG_88/MCGenerators/thep8i/2.0.0/x86_64-slc6-gcc62-opt'
+os.environ["LD_LIBRARY_PATH"]=TheP8I_path+"/lib64/ThePEG"+":"+TheP8I_path+"/lib/ThePEG"+":"+os.environ["LD_LIBRARY_PATH"]
+
+try:
+ TheP8I_PYTHIA8DATA=os.environ['PYTHIA8DATA']
+except:
+ TheP8I_PYTHIA8DATA='/cvmfs/sft.cern.ch/lcg/releases/LCG_88/MCGenerators/pythia8/244/x86_64-slc6-gcc62-opt/share/Pythia8/xmldoc/'
+os.environ['PYTHIA8DATA']=TheP8I_PYTHIA8DATA
+
+
+
+Herwig7Config.add_commands("""
+mkdir /TheP8I
+create TheP8I::StringFragmentation /TheP8I/Handlers/StringFrag/StringFragmenter libTheP8I.so
+create TheP8I::TheP8IStrategy /TheP8I/StdStrategy libTheP8I.so
+cd /Herwig/Generators
+set EventGenerator:EventHandler:HadronizationHandler /TheP8I/Handlers/StringFrag/StringFragmenter
+set EventGenerator:Strategy /TheP8I/StdStrategy
+""")
diff --git a/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PostInclude.py b/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PostInclude.py
index 3a33458cfb6fe97ac1342df51fd23503330d5025..574da3c9b9ae6fdd5644b171a6e5569a9f4c1b22 100644
--- a/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PostInclude.py
+++ b/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PostInclude.py
@@ -1,5 +1,11 @@
# This comes after all Simplified Model setup files
from MadGraphControl.MadGraphUtils import SUSY_Generation,modify_param_card,check_reset_proc_number
+from MadGraphControl.MadGraphUtilsHelpers import get_physics_short
+
+phys_short = get_physics_short()
+
+if 'rpv' in phys_short.lower() and not 'import ' in process:
+ raise RuntimeError('Please import a model when using an RPV decay; these are not handled by the standard MSSM model in MadGraph')
# Set maximum number of events if the event multiplier has been modified
if evt_multiplier>0:
@@ -10,15 +16,13 @@ if evt_multiplier>0:
else:
# Sensible default
nevts=evgenConfig.nEventsPerJob*2.
-run_settings.update({'nevents':nevts})
+run_settings.update({'nevents':int(nevts)})
# Only needed for something non-standard (not 1/4 heavy mass)
if ktdurham is not None:
run_settings.update({'ktdurham':ktdurham})
# systematic variation
-from MadGraphControl.MadGraphUtilsHelpers import get_physics_short
-phys_short = get_physics_short()
if 'scup' in phys_short:
syst_mod=dict_index_syst[0]
elif 'scdw' in phys_short:
@@ -33,33 +37,28 @@ elif 'qcdw' in phys_short:
syst_mod=dict_index_syst[7]
# Pass arguments as a dictionary: the "decays" argument is not accepted in older versions of MadGraphControl
+if 'mass' in [x.lower() for x in param_blocks]:
+ raise RuntimeError('Do not provide masses in param_blocks; use the masses variable instead')
+param_blocks['MASS']=masses
+# Add decays in if needed
+if len(decays)>0: param_blocks['DECAY']=decays
argdict = {'runArgs' : runArgs,
'process' : process,
- 'params' : {'MASS':masses},
+ 'params' : param_blocks,
'fixEventWeightsForBridgeMode': fixEventWeightsForBridgeMode,
'madspin_card' : madspin_card,
'keepOutput' : keepOutput, # Should only ever be true for testing!
'run_settings' : run_settings, # All goes into the run card
'writeGridpack' : writeGridpack,
'syst_mod' : syst_mod,
- 'param_card' : param_card # Only set if you *can't* modify the default param card to get your settings
+ 'param_card' : param_card, # Only set if you *can't* modify the default param card to get your settings
+ 'add_lifetimes_lhe' : add_lifetimes_lhe
}
-# Add decays in if needed
-if len(decays)>0: argdict['params']['DECAY']=decays
# First the standard case: No input LHE file
if not hasattr(runArgs,'inputGeneratorFile') or runArgs.inputGeneratorFile is None:
- # Try-except block to handle grid pack generation
- try:
- ktdurham = SUSY_Generation(**argdict)
- except RuntimeError as rte:
- for an_arg in rte.args:
- if 'Gridpack sucessfully created' in an_arg:
- print 'Handling exception and exiting'
- theApp.finalize()
- theApp.exit()
- print 'Unhandled exception - re-raising'
- raise rte
+ # Note that for gridpack generation, the job will exit after this command
+ ktdurham = SUSY_Generation(**argdict)
else:
# These manipulations require a dummy SUSY process
@@ -69,20 +68,29 @@ else:
param_card_old = process_dir+'/Cards/param_card.dat'
ktdurham = -1
import tarfile
- myTarball = tarfile.open(runArgs.inputGeneratorFile)
- myEvents = None
- for afile in myTarball.getnames():
- if afile.endswith('.events'): myEvents = afile
- if myEvents is None:
- raise RuntimeError('No input events file found!')
+ if tarfile.is_tarfile(runArgs.inputGeneratorFile):
+ myTarball = tarfile.open(runArgs.inputGeneratorFile)
+ myEvents = None
+ for afile in myTarball.getnames():
+ if afile.endswith('.events'): myEvents = afile
+ if myEvents is None:
+ raise RuntimeError('No input events file found!')
+ else:
+ events_file = myTarball.extractfile( myEvents )
+ update_lhe_file(lhe_file_old=myEvents,param_card_old=param_card_old,masses=masses)
+ for aline in events_file:
+ if 'ktdurham' in aline and "=" in aline:
+ ktdurham = float(aline.split('=')[0].strip())
+ break
+ myTarball.close()
else:
- events_file = myTarball.extractfile( myEvents )
- update_lhe_file(lhe_file_old=myEvents,param_card_old=param_card_old,masses=masses)
- for aline in events_file:
- if 'ktdurham' in aline and "=" in aline:
- ktdurham = float(aline.split('=')[0].strip())
- break
- myTarball.close()
+ # Assume this is already an unzipped file -- happens when we run on multiple LHEs
+ update_lhe_file(lhe_file_old=runArgs.inputGeneratorFile,param_card_old=param_card_old,masses=masses)
+ with open(runArgs.inputGeneratorFile,'r') as events_file:
+ for aline in events_file:
+ if 'ktdurham' in aline and "=" in aline:
+ ktdurham = float(aline.split('=')[0].strip())
+ break
if madspin_card is not None:
# Do a stupid addition of madspin - requires a dummy process
diff --git a/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PreInclude.py b/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PreInclude.py
index 9eb7fabe5b64f1d877773098ef2f61382116aef3..8af341695c26f72c23319c2ee368dab60b2c00ee 100644
--- a/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PreInclude.py
+++ b/Generators/MadGraphControl/share/common/SUSY_SimplifiedModel_PreInclude.py
@@ -2,6 +2,7 @@
# Gets us ready for on-the-fly SUSY SM generation
# Simple variable setups
+param_blocks = {} # For general params
decoupled_mass = '4.5E9'
masses = {}
for p in ['1000001','1000002','1000003','1000004','1000005','1000006','2000001','2000002','2000003','2000004','2000005','2000006','1000021',\
@@ -36,11 +37,11 @@ run_settings = {'event_norm':'sum',
'drjj':0.0,
'lhe_version':'3.0',
'cut_decays':'F',
- 'pdflabel':"'lhapdf'",
- 'lhaid':247000,
'pdgs_for_merging_cut': '1, 2, 3, 4, 21', # Terrible default in MG
'ickkw':0,
'xqcut':0} # use CKKW-L merging (yes, this is a weird setting)
+# Set up default PDF and systematic settings (note: action in import module)
+from MadGraphControl.MadGraph_NNPDF30NLO_Base_Fragment import *
# Setting for writing out a gridpack
writeGridpack = False
@@ -54,6 +55,9 @@ keepOutput = False
# fixing LHE files after madspin? do that here.
fixEventWeightsForBridgeMode=False
+# In case you want to keep lifetimes in the LHE files
+add_lifetimes_lhe = False
+
from MadGraphControl.MadGraphUtilsHelpers import get_physics_short
phys_short = get_physics_short()
if 'py1up' in phys_short:
diff --git a/Generators/MadGraphControl/share/common/setupEFT.py b/Generators/MadGraphControl/share/common/setupEFT.py
index 1c85d288ff491058aa8591e2db9bdf47a693c164..c001947f0728a2b086781c6459fb4315ae769b10 100644
--- a/Generators/MadGraphControl/share/common/setupEFT.py
+++ b/Generators/MadGraphControl/share/common/setupEFT.py
@@ -1,25 +1,24 @@
import os, re, subprocess, shutil
-from MadGraphControl.MadGraphUtils import build_param_card
+from MadGraphControl.MadGraphUtils import modify_param_card
mgmodels='/cvmfs/atlas.cern.ch/repo/sw/Generators/madgraph/models/latest/'
-def parse_JO(input_jobconfig,processes):
- jobconfig_name=input_jobconfig.replace('.py','')
+def parse_SMEFT_JO(physics_short,processes):
# check if reweighting required
reweight_name=None
- for s in jobconfig_name.split('_'):
+ for s in physics_short.split('_'):
if 'rwgt' in s:
reweight_name=s.replace('rwgt','')
- jobconfig_name=jobconfig_name.replace('_'+s,'')
+ physics_short=physics_short.replace('_'+s,'')
break
# check if custom param card needed
param_name=None
- for s in jobconfig_name.split('_'):
+ for s in physics_short.split('_'):
if 'param' in s:
param_name=s.replace('param','')
- jobconfig_name=jobconfig_name.replace('_'+s,'')
+ physics_short=physics_short.replace('_'+s,'')
break
if reweight_name!=None and param_name!=None:
@@ -29,15 +28,15 @@ def parse_JO(input_jobconfig,processes):
eft_params=None
if reweight_name==None and param_name==None:
params_re=r"_(?P<param>[A-Za-z0-9]+)_(?P<value>[-+]?\d+p?\d*)"
- eft_params_list=re.findall(params_re,jobconfig_name)
+ eft_params_list=re.findall(params_re,physics_short)
eft_params={}
for e in eft_params_list:
eft_params[e[0]]=e[1].replace('p','.')
- jobconfig_name=re.sub(params_re,"",jobconfig_name)
+ physics_short=re.sub(params_re,"",physics_short)
# the last three blocks in name, except for reweight and eft parameters
# TODO: update to be more robust and allow e.g. for filters in the name
- jobconfig_tokens=jobconfig_name.split('_')
+ jobconfig_tokens=physics_short.split('_')
print jobconfig_tokens
model_token=jobconfig_tokens[-3]
process_token=jobconfig_tokens[-2]
@@ -59,13 +58,13 @@ def parse_JO(input_jobconfig,processes):
return model_token,process,param_name,reweight_name,eft_params
# build proc, param, and reweight card from 4 last blocks of job config name and 'processes' dict
-def create_SMEFT_cards(input_jobconfig,processes):
- arguments=parse_JO(input_jobconfig,processes)
- return get_SMEFT_cards(*arguments)
-
-def get_SMEFT_cards(model_nick,process,param_name=None,reweight_name=None,eft_params=None):
-
- #determine model from nick and use naming conventions of model
+def setup_SMEFT_from_JOname(processes):
+ physics_short=get_physics_short()
+ model_nick,process,param_name,reweight_name,eft_params=parse_SMEFT_JO(physics_short,processes)
+ return setup_SMEFT(process,model_nick,param_name,reweight_name,eft_params)
+
+def setup_SMEFT(process,model_nick,param_name,reweight_name,eft_params):
+
if model_nick=="EFTAaUm":
model="SMEFTsim_A_U35_alphaScheme_UFO"
eft_parameter_block='frblock'
@@ -124,7 +123,7 @@ def get_SMEFT_cards(model_nick,process,param_name=None,reweight_name=None,eft_pa
# get param card and set non-zero parameters
elif param_name!=None:
param_card_loc='MadGraph_param_card_'+model_nick+'_'+param_name+'.dat'
- param_card_loc='MadGraph_restrict_card_'+model_nick+'_'+param_name+'.dat'
+ restrict_card_loc='MadGraph_restrict_card_'+model_nick+'_'+param_name+'.dat'
get_param_file = subprocess.Popen(['get_files','-data', param_card_loc])
get_param_file.wait()
if not os.path.exists(param_card_loc):
@@ -139,15 +138,8 @@ def get_SMEFT_cards(model_nick,process,param_name=None,reweight_name=None,eft_pa
# dynamically create restricted model that only contains the relevant operators
else:
param_card_default='MadGraph_param_card_'+model_nick+'.dat'
- get_param_file = subprocess.Popen(['get_files','-data', param_card_default])
- get_param_file.wait()
- if not os.path.exists(param_card_default):
- raise RuntimeError("Cannot find "+param_card_default)
param_card_loc=param_card_default.replace('.dat','_updated.dat')
- if len(eft_params)>0:
- build_param_card(param_card_default,param_card_loc,params={eft_parameter_block:eft_params})
- else:
- shutil.copy(param_card_default,param_card_loc)
+ modify_param_card(param_card_default,output_location=param_card_loc,params={eft_parameter_block:eft_params})
if os.path.exists('mgmodels_local'):
shutil.rmtree('mgmodels_local')
os.mkdir('mgmodels_local')
@@ -160,7 +152,7 @@ def get_SMEFT_cards(model_nick,process,param_name=None,reweight_name=None,eft_pa
process=process.replace('NP==0','')
restriction='without_irrelevant_couplings'
if len(eft_params_to_keep)>0:
- build_param_card(param_card_default,restricted_model+'/'+'restrict_'+restriction+'.dat',params={eft_parameter_block:eft_params_to_keep})
+ modify_param_card(param_card_default,output_location=restricted_model+'/'+'restrict_'+restriction+'.dat',params={eft_parameter_block:eft_params_to_keep})
else:
shutil.copy(param_card_default,restricted_model+'/'+'restrict_'+restriction+'.dat')
model='./'+restricted_model
@@ -182,13 +174,14 @@ def get_SMEFT_cards(model_nick,process,param_name=None,reweight_name=None,eft_pa
proc_card+='-'+restriction
proc_card+="\n"
proc_card+=process+"\noutput -f\n"
- proc_card_loc='proc_card.dat'
- f_proc_card=open(proc_card_loc,'w')
- f_proc_card.write(proc_card)
- f_proc_card.close()
+ process_dir=new_process(proc_card)
+ if param_card_loc!=None:
+ shutil.move(param_card_loc,process_dir+'/Cards/param_card.dat')
+ if reweight_card_loc!=None:
+ shutil.move(reweight_card_loc,process_dir+'/Cards/reweight_card.dat')
- return proc_card_loc,param_card_loc,reweight_card_loc
+ return process_dir
diff --git a/Generators/PowhegControl/CMakeLists.txt b/Generators/PowhegControl/CMakeLists.txt
index eb94633ca6d6164b55963da0ea17e82bfb36c783..0faa78f91d673fbdf5dfce5fb9104736f995fb62 100644
--- a/Generators/PowhegControl/CMakeLists.txt
+++ b/Generators/PowhegControl/CMakeLists.txt
@@ -6,6 +6,20 @@
atlas_subdir( PowhegControl )
# Install files from the package:
-atlas_install_python_modules( python/*.py python/decorators python/processes python/strategies python/utility )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py
+ python/algorithms python/decorators python/parameters
+ python/processes python/utility )
+atlas_install_joboptions( share/common/*.py share/control/*.py )
+
+# Set up the runtime environment for Powheg.
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PowhegEnvironmentConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PowhegEnvironmentConfig.cmake
+ @ONLY )
+set( PowhegEnvironment_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}
+ CACHE PATH "Location of PowhegEnvironmentConfig.cmake" )
+
+find_package( PowhegEnvironment )
+
+
diff --git a/Generators/PowhegControl/cmake/PowhegEnvironmentConfig.cmake.in b/Generators/PowhegControl/cmake/PowhegEnvironmentConfig.cmake.in
new file mode 100644
index 0000000000000000000000000000000000000000..da3ff8b471d0779f4bfe616d97ceea803556eed1
--- /dev/null
+++ b/Generators/PowhegControl/cmake/PowhegEnvironmentConfig.cmake.in
@@ -0,0 +1,15 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# This module is used to set up the runtime environment for Powheg
+#
+#
+
+# Set the environment variable(s):
+
+set( POWHEGENVIRONMENT_ENVIRONMENT
+ FORCESET POWHEGPATH "/cvmfs/atlas.cern.ch/repo/sw/Generators/powheg/ATLASOTF-00-04-03" )
+# FORCESET POWHEGPATH \${@CMAKE_PROJECT_NAME@_DIR}/PG-BOX )
+
+# Silently declare the module found.
+set( POWHEGENVIRONMENT_FOUND TRUE )
+
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegHerwigJimmyPhotos_AUET2CT10_ZZ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegHerwigJimmyPhotos_AUET2CT10_ZZ_example.py
deleted file mode 100644
index c9b19478fb25207076ffef1809e68e7828b30b2b..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegHerwigJimmyPhotos_AUET2CT10_ZZ_example.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ZZ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ZZ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Fortran Herwig showering with Jimmy MPI
-#--------------------------------------------------------------
-include("MC12JobOptions/PowhegJimmy_AUET2_CT10_Common.py")
-# Beware! Only used here because Fortran Herwig does not have a native model for QED FSR off charged leptons
-include("MC12JobOptions/Jimmy_Photos.py")
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Herwig ZZ production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'ZZ' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Herwig', 'Jimmy' ]
-
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMGG_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMGG_example.py
deleted file mode 100644
index 7561c0d692d23a2c2ef26eba86a0aca87b26af9c..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMGG_example.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg DMGG setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_DMGG_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with AU2 CT10
-#--------------------------------------------------------------
-include("MC12JobOptions/PowhegPythia8_AU2_CT10_Common.py")
-include('MC12JobOptions/Pythia8_Powheg.py')
-
-# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
-genSeq.Pythia8.Commands += [ '1000022:all = X Xbar 2 0 0 100 0.0 0.0 0.0 0.0',
- '1000022:isVisible = false' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 DMGG production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'BSM', 'WIMP', 'invisible' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch', 'caterina.doglioni@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMS_tloop_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMS_tloop_example.py
deleted file mode 100644
index 941dc6b57eb089c09352510d58e73d23b1a24391..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMS_tloop_example.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg DMV setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_DMS_tloop_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with AU2 CT10
-#--------------------------------------------------------------
-include("MC12JobOptions/PowhegPythia8_AU2_CT10_Common.py")
-include('MC12JobOptions/Pythia8_Powheg.py')
-
-# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
-genSeq.Pythia8.Commands += [ '1000022:all = X Xbar 2 0 0 100 0.0 0.0 0.0 0.0',
- '1000022:isVisible = false' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 DMS t-loop production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'BSM', 'WIMP', 'invisible' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch', 'caterina.doglioni@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMV_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMV_example.py
deleted file mode 100644
index b89c41723175d92442198a5d26361863d0568f1a..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_DMV_example.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg DMV setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_DMV_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with AU2 CT10
-#--------------------------------------------------------------
-include("MC12JobOptions/PowhegPythia8_AU2_CT10_Common.py")
-include('MC12JobOptions/Pythia8_Powheg.py')
-
-# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
-genSeq.Pythia8.Commands += [ '1000022:all = X Xbar 2 0 0 100 0.0 0.0 0.0 0.0',
- '1000022:isVisible = false' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 DMV production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'BSM', 'WIMP', 'invisible' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch', 'caterina.doglioni@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Dijet_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Dijet_example.py
deleted file mode 100644
index fc12537df8732048a42bf693b0bc7b8fa72ecf2f..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Dijet_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Dijet setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Dijet_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 dijet production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'QCD', 'dijet', 'jets' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HJJ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HJJ_example.py
deleted file mode 100644
index c8ea20d23ebf3051690dfc076277cba765489cd5..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HJJ_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg HJJ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_HJJ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 3' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 H+dijet production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'Higgs', 'dijet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HJ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HJ_example.py
deleted file mode 100644
index 47b7d764286d3c4e389751a7a606e6ecf7c7c5ec..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HJ_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg HJ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_HJ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 2' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 H+jet production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'Higgs', 'jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HWJ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HWJ_example.py
deleted file mode 100644
index 90f25a7f389f32acc025ada2bdc86a23d2d3f16d..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HWJ_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg HWJ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_HWJ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 3' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 H+W+jet production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'Higgs', 'W', 'jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HZJ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HZJ_example.py
deleted file mode 100644
index f3b5044a8c3873e71dd16dd6acc1adcd13b2cda1..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_HZJ_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg HZJ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_HZJ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 3' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 H+Z+jet production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'Higgs', 'Z', 'jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_VBF_H_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_VBF_H_example.py
deleted file mode 100644
index bb8bab7d61f2f091af90a3de770bb12ef89cb315..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_VBF_H_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg VBF_H setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_VBF_H_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 3' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 VBF_H production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'Higgs', 'VBF' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_WW_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_WW_example.py
deleted file mode 100644
index 8cc84de883f1245e162a93dc8e66bf1be811d20b..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_WW_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg WW setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_WW_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 WW production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'WW' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_WZ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_WZ_example.py
deleted file mode 100644
index afdf558885746d5eb1dfef63507bf21dfe28ef1f..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_WZ_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg WZ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_WZ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 WZ production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'WZ' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_W_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_W_example.py
deleted file mode 100644
index 266fdc1349b09eeccab10e26af14d83309d2ebeb..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_W_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg W setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_W_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 1' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 W^{+} production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'W' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Wj_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Wj_example.py
deleted file mode 100644
index 7f4110ac417c517b711301c9158c0e6049b4c8d8..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Wj_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Wj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Wj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 W+j production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'W', 'jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Wt_DR_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Wt_DR_example.py
deleted file mode 100644
index 078500a14004b877e0a8d28da0ee3ff26987981e..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Wt_DR_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Wt with diagram removal setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Wt_DR_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 2' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 W+t production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'W', 'top', 'Wt' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ZZ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ZZ_example.py
deleted file mode 100644
index 1cb7a090dc81bd22558d093a4ea51313d790288f..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ZZ_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ZZ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ZZ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 ZZ production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'ZZ' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Z_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Z_example.py
deleted file mode 100644
index 15dd99cf839c26aad4ef64f82c3718cb0745a880..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Z_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Z setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Z_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 1' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 Z production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'Z' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Zj_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Zj_example.py
deleted file mode 100644
index 162c096918bcb1c244ed018b32caabca587fa5c8..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_Zj_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Zj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Zj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 Zj production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'Z', 'jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_bb_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_bb_example.py
deleted file mode 100644
index b12ebf00b4b2ca70dba25fae35e7fce3f2502517..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_bb_example.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg bb setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_bb_Common.py')
-PowhegConfig.PDF = [ 10800, 10801, 10802 ]
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 bb production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'QCD', '2jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ggHZ_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ggHZ_example.py
deleted file mode 100644
index 771271730aac5d67b65380b6a7e4dfb0b8269b3d..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ggHZ_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ggHZ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ggHZ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 ggHZ production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'Higgs', 'Z', 'ZHiggs' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ggH_quark_mass_effects_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ggH_quark_mass_effects_example.py
deleted file mode 100644
index 5615c8c89f57fbf6f3709c41263c00c76247ecf0..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_ggH_quark_mass_effects_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ggH setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ggH_quark_mass_effects_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 ggH_quark_mass_effects production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'Higgs' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_trijet_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_trijet_example.py
deleted file mode 100644
index 860beaf9ac3a00873a2b3e6dd6fe68883a2eb3bd..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythia8_AU2CT10_trijet_example.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg trijet setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_trijet_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with main31 and CTEQ6L1
-#--------------------------------------------------------------
-include('MC12JobOptions/Pythia8_AU2_CTEQ6L1_Common.py')
-include('MC12JobOptions/Pythia8_Powheg_Main31.py')
-topAlg.Pythia8.UserModes += [ 'Main31:NFinal = 3' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 trijet production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'QCD', '3jet', 'jets' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia8' ]
-evgenConfig.weighting = 0 # needed to avoid failure with high weights if using Born suppression
diff --git a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythiaPhotosTauola_Perugia2011_tt_example.py b/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythiaPhotosTauola_Perugia2011_tt_example.py
deleted file mode 100644
index fa7420c255bb7a1bfb7ee22f8ccfa0ec717c26a6..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC12_examples/MC12.101010.PowhegPythiaPhotosTauola_Perugia2011_tt_example.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg tt setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_tt_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia6 (Perugia2011) showering
-#--------------------------------------------------------------
-include('MC12JobOptions/PowhegPythia_Perugia2011C_Common.py')
-include('MC12JobOptions/Pythia_Tauola.py')
-include('MC12JobOptions/Pythia_Photos.py')
-
-#--------------------------------------------------------------
-# Event filter
-#--------------------------------------------------------------
-include('MC12JobOptions/TTbarWToLeptonFilter.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia6 ttbar production with Perugia 2011c tune'
-evgenConfig.keywords = [ 'top', 'ttbar' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
-evgenConfig.generators += [ 'Powheg', 'Pythia' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMGG_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMGG_example.py
deleted file mode 100644
index bce5d046c430d7ae54ee0d69ed16e06dd6835aa0..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMGG_example.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg DMGG setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_DMGG_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
-genSeq.Pythia8.Commands += [ '1000022:all = X Xbar 2 0 0 {0} 0.0 0.0 0.0 0.0'.format(PowhegConfig.DM_mass),
- '1000022:isVisible = false' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 DMGG production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'BSM', 'WIMP', 'invisible' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch', 'caterina.doglioni@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMS_tloop_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMS_tloop_example.py
deleted file mode 100644
index 0ce7b4d9b496efaf83dfd0390239f16ac8e2f3a2..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMS_tloop_example.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg DMS_tloop setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_DMS_tloop_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
-genSeq.Pythia8.Commands += [ '1000022:all = X Xbar 2 0 0 {0} 0.0 0.0 0.0 0.0'.format(PowhegConfig.DM_mass),
- '1000022:isVisible = false' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 DMS t-loop production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'BSM', 'WIMP', 'invisible' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch', 'caterina.doglioni@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMV_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMV_example.py
deleted file mode 100644
index 532eb374e3fc6051e3f7239014c41b2847c60b56..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_DMV_example.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg DMV setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_DMV_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
-genSeq.Pythia8.Commands += [ '1000022:all = X Xbar 2 0 0 {0} 0.0 0.0 0.0 0.0'.format(PowhegConfig.DM_mass),
- '1000022:isVisible = false' ]
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 DMV production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'BSM', 'WIMP', 'invisible' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch', 'caterina.doglioni@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_HWj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_HWj_example.py
deleted file mode 100644
index 0dda5aa198232bbee6b20a6a247796a56ffe75b3..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_HWj_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg HWj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_HWj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 Higgs+W+jet production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'Higgs', 'SMHiggs', 'W', 'WHiggs', '1jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_HZj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_HZj_example.py
deleted file mode 100644
index 4af604d590620e4922e2f8e9b3f76fcd93ed0aae..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_HZj_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg HZj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_HZj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 H+Z+jet production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'Higgs', 'SMHiggs', 'Z', 'ZHiggs', '1jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Hj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Hj_example.py
deleted file mode 100644
index 8da2234ff7c2eb2c524239459cccfd7c3beadeb2..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Hj_example.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Hj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Hj_Common.py')
-# # To construct three additional event weights with user-defined names
-# PowhegConfig.bmass_in_minlo = [ 0, 0, 1 ]
-# PowhegConfig.quarkmasseffects = [ 1, 0, 1 ]
-# PowhegConfig.define_weight_group( group_name='quark_mass_variation', weight_names=['mtmb','mtinf','mtmb-bminlo'] )
-# # To combine the user-defined weights with NNLOPS
-# PowhegConfig.NNLO_reweighting_inputs = { 'nn-mtinf':'H1250_CM13_CT10_APX0_11.top', 'nn-mtmb':'H1250_CM13_CT10_APX2_22.top' }
-# PowhegConfig.NNLO_output_weights = { 'nnlops-mtmb':"combine 'nn-mtmb' and 'mtmb'",\
-# 'nnlops-mtinf':"combine 'nn-mtinf' and 'mtinf'",\
-# 'nnlops-mtmb-bminlo':"combines 'nn-mtmb' and 'mtmb-bminlo'"
-# }
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 tune and NNPDF 2.3
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 H+jet production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'Higgs', 'jets' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Hjj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Hjj_example.py
deleted file mode 100644
index f78a6938a698a8d69ace8bce750a284e449cbd4a..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Hjj_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Hjj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Hjj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 H+jet+jet production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'Higgs', 'SMHiggs', '2jet', 'jets' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_VBF_H_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_VBF_H_example.py
deleted file mode 100644
index 7a8768d9621797a2c20f42f77f523295871a3fbb..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_VBF_H_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg VBF_H setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_VBF_H_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 VBF_H production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'Higgs', 'VBF' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_VBF_ssWW_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_VBF_ssWW_example.py
deleted file mode 100644
index 26fb02be242f67469b15da99a604f944e20333fa..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_VBF_ssWW_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg VBF_ssWW setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_VBF_ssWW_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 VBF same-sign WW production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'WW', 'VBF' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_WZ_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_WZ_example.py
deleted file mode 100644
index 177541ef91f4cf03ade4dc5fd207dd81f181e7e3..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_WZ_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg WZ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_WZ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 bb production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'W', 'Z' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wj_example.py
deleted file mode 100644
index d5538b71f75101214fd245ae74acba05ab9d9545..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wj_example.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Wj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Wj_Common.py')
-# PowhegConfig.NNLO_reweighting_inputs = { 'DYNNLO':'Wp_CM8_MMHT14NNLO_11.top' }
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 W+j production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'W', '1jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wt_DR_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wt_DR_example.py
deleted file mode 100644
index 30a21e9cc942b0971c55a7d9d46ff0cc059f5271..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wt_DR_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Wt_DR setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Wt_DR_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 W+t production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'W', 'top' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wt_DS_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wt_DS_example.py
deleted file mode 100644
index dd5ce312fe181248f694f507ba011b6b1ae5f559..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Wt_DS_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg Wt_DS setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Wt_DS_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 W+t production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'W', 'top' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_bb_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_bb_example.py
deleted file mode 100644
index 180dedbb4cffb96139738d2ddaa61de4e3e76dfa..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_bb_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg bb setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_bb_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 bb production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'QCD', '2jet', 'bottom' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ggF_HZ_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ggF_HZ_example.py
deleted file mode 100644
index 342e19eb45f85bc545a4ddb683b82f7ea58070b9..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ggF_HZ_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ggF_HZ setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ggF_HZ_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 gluon-fusion Higgs+Z production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'Higgs', 'SMHiggs', 'ZHiggs' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ggF_H_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ggF_H_example.py
deleted file mode 100644
index e1ff5f3f5f32fde4a5a253d09f94747e41b9c860..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ggF_H_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ggF_H setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ggF_H_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune'
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 gluon-fusion Higgs production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'Higgs', 'SMHiggs' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_jj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_jj_example.py
deleted file mode 100644
index 102aed51b404bbdc1d75d7bfc6303eee52ed8248..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_jj_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg jet-jet setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_jj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 jet-jet production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'QCD', 'jets', '2jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_jjj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_jjj_example.py
deleted file mode 100644
index 95030dd8c87ac2aa64c1cbb5f787ec0beacc87ce..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_jjj_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg jet-jet-jet setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_jjj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 tune and NNPDF 2.3
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 jet-jet-jet production with AU2 CT10 tune'
-evgenConfig.keywords = [ 'SM', 'QCD', 'jets', '3jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ssWWjj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ssWWjj_example.py
deleted file mode 100644
index adecd13ebea17975ed1c02591a9fbc339df07a7e..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ssWWjj_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ssWWjj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ssWWjj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF 2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 same-sign WW+2jet production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'WW', '2jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_t_sch_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_t_sch_example.py
deleted file mode 100644
index 3f393ec175744f92aa7b8a7adc39b49b9a54aa06..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_t_sch_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg s-channel single top setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_t_sch_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF 2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 s-channel single top production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'singleTop', 'sChannel' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ttH_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ttH_example.py
deleted file mode 100644
index 413bc585c6bad702268229181e400b4dfd9d2b51..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ttH_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ttH setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ttH_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 NNPDF 2.3 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 ttH production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'top', 'Higgs' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ttj_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ttj_example.py
deleted file mode 100644
index 2bd242107bc5accd70d736712b096ef61eb07557..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ttj_example.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg ttj setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ttj_Common.py')
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia8 showering with the A14 tune and NNPDF 2.3
-#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 ttj production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'top', '1jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythiaPhotosTauola_Perugia2011_tt_example.py b/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythiaPhotosTauola_Perugia2011_tt_example.py
deleted file mode 100644
index 16789b7fa978b9f0a60887d282c62bbc46bb4ab3..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythiaPhotosTauola_Perugia2011_tt_example.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-#--------------------------------------------------------------
-# Powheg tt setup starting from ATLAS defaults
-#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_tt_Common.py')
-PowhegConfig.PDF = range(10800,10853)
-PowhegConfig.mu_F = [ 1.0, 0.5, 0.5, 1.0, 1.0, 2.0, 2.0 ]
-PowhegConfig.mu_R = [ 1.0, 0.5, 1.0, 0.5, 2.0, 1.0, 2.0 ]
-PowhegConfig.generate()
-
-#--------------------------------------------------------------
-# Pythia6 showering with the Perugia2011 tune
-#--------------------------------------------------------------
-include('MC15JobOptions/PowhegPythia_Perugia2011C_Common.py')
-include('MC15JobOptions/Pythia_Tauola.py')
-include('MC15JobOptions/Pythia_Photos.py')
-
-#--------------------------------------------------------------
-# EVGEN configuration
-#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia6 ttbar production with Perugia 2011c tune. Additional weights for 52 CT10 PDF uncertainties and 7 scale variations.'
-evgenConfig.keywords = [ 'SM', 'top' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
diff --git a/Generators/PowhegControl/share/PowhegControl_DMGG_Common.py b/Generators/PowhegControl/share/PowhegControl_DMGG_Common.py
deleted file mode 100644
index 9e91e942fa2127b6f6c9bec05064328fbcbc9e47..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_DMGG_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_DMGG
-
-# Use the Powheg_DMGG configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_DMGG( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_DMS_tloop_Common.py b/Generators/PowhegControl/share/PowhegControl_DMS_tloop_Common.py
deleted file mode 100644
index 8b5547b86ec19f4f5076d7c85242d1bfb76f9de7..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_DMS_tloop_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_DMS_tloop
-
-# Use the Powheg_DMS_tloop configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_DMS_tloop( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_DMV_Common.py b/Generators/PowhegControl/share/PowhegControl_DMV_Common.py
deleted file mode 100644
index 259cbcb9b5c636f9cb6292bf56810285dd693f82..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_DMV_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_DMV
-
-# Use the Powheg_DMV configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_DMV( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Dijet_Common.py b/Generators/PowhegControl/share/PowhegControl_Dijet_Common.py
deleted file mode 100644
index bd36a9daaf43bbf6f9755ec16a03d3306902a2b3..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Dijet_Common.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Use the Powheg_jj configuration
-include('PowhegControl/PowhegControl_jj_Common.py')
-PowhegConfig.logger.warning( 'This jobOption fragment is deprecated - please use PowhegControl_jj_Common.py instead.' )
diff --git a/Generators/PowhegControl/share/PowhegControl_HWj_Common.py b/Generators/PowhegControl/share/PowhegControl_HWj_Common.py
deleted file mode 100644
index 6700e2a841a1c7663ca73ddd6b7bd77a29c59576..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_HWj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_HWj
-
-# Use the PowhegConfig_HWj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_HWj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_HZj_Common.py b/Generators/PowhegControl/share/PowhegControl_HZj_Common.py
deleted file mode 100644
index e372090b03c89d802d4fbdb3c23d2562deb9c1dc..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_HZj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_HZj
-
-# Use the PowhegConfig_HZj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_HZj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Hj_Common.py b/Generators/PowhegControl/share/PowhegControl_Hj_Common.py
deleted file mode 100644
index 06374e2e08a5dc98d205c27035bca3efb49bef64..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Hj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_Hj
-
-# Use the PowhegConfig_Hj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_Hj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Hjj_Common.py b/Generators/PowhegControl/share/PowhegControl_Hjj_Common.py
deleted file mode 100644
index a2f586b49bde5d22099bf8b67d143143a8b62729..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Hjj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_Hjj
-
-# Use the PowhegConfig_Hjj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_Hjj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_VBF_H_Common.py b/Generators/PowhegControl/share/PowhegControl_VBF_H_Common.py
deleted file mode 100644
index 621bc2d7de30f051d5d952672aad4af5e0108998..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_VBF_H_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_VBF_H
-
-# Use the Powheg_VBF_H configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_VBF_H( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_VBF_ssWW_Common.py b/Generators/PowhegControl/share/PowhegControl_VBF_ssWW_Common.py
deleted file mode 100644
index 72a174bb2ab39cd59e3a769e7eb04af97f0c38a5..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_VBF_ssWW_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_VBF_ssWW
-
-# Use the Powheg_VBF_ssWW configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_VBF_ssWW( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_WW_Common.py b/Generators/PowhegControl/share/PowhegControl_WW_Common.py
deleted file mode 100644
index 0114483c0557923d2342a85ef46b9abf10e2ff12..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_WW_Common.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from PowhegControl import PowhegConfig_WW
-
-# Use the Powheg_WW configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_WW( runArgs=transform_runArgs, opts=transform_opts )
-
diff --git a/Generators/PowhegControl/share/PowhegControl_WZ_Common.py b/Generators/PowhegControl/share/PowhegControl_WZ_Common.py
deleted file mode 100644
index 7373426ddfc3a3fb42991d376fda9a0e8832b5ec..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_WZ_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_WZ
-
-# Use the Powheg_WZ configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_WZ( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_W_Common.py b/Generators/PowhegControl/share/PowhegControl_W_Common.py
deleted file mode 100644
index 5d0d7284fa67723b0aaa891614694f3cbcf394ce..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_W_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_W
-
-# Use the Powheg_W configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_W( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Wj_Common.py b/Generators/PowhegControl/share/PowhegControl_Wj_Common.py
deleted file mode 100644
index 7a4d767235fbe0c2df5a06ac0b823210d826870f..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Wj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_Wj
-
-# Use the Powheg_Wj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_Wj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Wt_DR_Common.py b/Generators/PowhegControl/share/PowhegControl_Wt_DR_Common.py
deleted file mode 100644
index 2f9ddf8164c5bee561e73fe5f61ccdab7eccb417..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Wt_DR_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_Wt_DR
-
-# Use the PowhegConfig_Wt_DR configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_Wt_DR( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Wt_DS_Common.py b/Generators/PowhegControl/share/PowhegControl_Wt_DS_Common.py
deleted file mode 100644
index e9e073ab6796b70a4a1cf322b3a80c9fcebfc0c6..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Wt_DS_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_Wt_DS
-
-# Use the PowhegConfig_Wt_DS configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_Wt_DS( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_ZZ_Common.py b/Generators/PowhegControl/share/PowhegControl_ZZ_Common.py
deleted file mode 100644
index b34a4323cf8499c2124c58e7d0b8dfdcf4f7ec7a..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ZZ_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_ZZ
-
-# Use the Powheg_ZZ configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_ZZ( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Z_Common.py b/Generators/PowhegControl/share/PowhegControl_Z_Common.py
deleted file mode 100644
index fe7aa8c359214a30d59721211f7fde4e26638f30..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Z_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_Z
-
-# Use the Powheg_Z configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_Z( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_Zj_Common.py b/Generators/PowhegControl/share/PowhegControl_Zj_Common.py
deleted file mode 100644
index 42944b14b81db19df52d55f4ed1098e22ec9c1f9..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_Zj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_Zj
-
-# Use the Powheg_Zj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_Zj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_bb_Common.py b/Generators/PowhegControl/share/PowhegControl_bb_Common.py
deleted file mode 100644
index 0627f9d9f621f750e707332203b3908bde313177..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_bb_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_bb
-
-# Use the Powheg_bb configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_bb( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_ggF_HZ_Common.py b/Generators/PowhegControl/share/PowhegControl_ggF_HZ_Common.py
deleted file mode 100644
index 8fca0ef592aa083167f6ed0a74400d7984594601..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ggF_HZ_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_ggF_HZ
-
-# Use the PowhegConfig_ggF_HZ configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_ggF_HZ( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_ggF_H_Common.py b/Generators/PowhegControl/share/PowhegControl_ggF_H_Common.py
deleted file mode 100644
index c3f234257902a5917f1e42c666212a0db790dbea..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ggF_H_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_ggF_H
-
-# Use the Powheg_ggF_H configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_ggF_H( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_ggHZ_Common.py b/Generators/PowhegControl/share/PowhegControl_ggHZ_Common.py
deleted file mode 100644
index 995678ab2d463ef8ef4e797165bb976917ddd8ad..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ggHZ_Common.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Use the Powheg_ggF_HZ configuration
-include('PowhegControl/PowhegControl_ggF_HZ_Common.py')
-PowhegConfig.logger.warning( 'This jobOption fragment is deprecated - please use PowhegControl_ggF_HZ_Common.py instead.' )
diff --git a/Generators/PowhegControl/share/PowhegControl_ggH_quark_mass_effects_Common.py b/Generators/PowhegControl/share/PowhegControl_ggH_quark_mass_effects_Common.py
deleted file mode 100644
index c95a378ec974bc3a3fc405437c8422130e8da392..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ggH_quark_mass_effects_Common.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Use the Powheg_ggF_H configuration
-include('PowhegControl/PowhegControl_ggF_H_Common.py')
-PowhegConfig.logger.warning( 'This jobOption fragment is deprecated - please use PowhegControl_ggF_H_Common.py instead.' )
diff --git a/Generators/PowhegControl/share/PowhegControl_jj_Common.py b/Generators/PowhegControl/share/PowhegControl_jj_Common.py
deleted file mode 100644
index 768d803288e2de3f66446f53671d1f946a204671..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_jj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_jj
-
-# Use the Powheg_jj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_jj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_jjj_Common.py b/Generators/PowhegControl/share/PowhegControl_jjj_Common.py
deleted file mode 100644
index 46bfd8e5f324ffd050886888cc9701e612bd6d97..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_jjj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_jjj
-
-# Use the Powheg_jjj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_jjj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_ssWWjj_Common.py b/Generators/PowhegControl/share/PowhegControl_ssWWjj_Common.py
deleted file mode 100644
index 23bdf0eaf8dc78461fd933db7d4a558df8862a56..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ssWWjj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_ssWWjj
-
-# Use the Powheg_ssWWjj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_ssWWjj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_t_sch_Common.py b/Generators/PowhegControl/share/PowhegControl_t_sch_Common.py
deleted file mode 100644
index a1c3ea192dcde7a3fb29fdd2b9ea678b91de5450..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_t_sch_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_t_sch
-
-# Use the PowhegConfig_t_sch configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_t_sch( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_ttH_Common.py b/Generators/PowhegControl/share/PowhegControl_ttH_Common.py
deleted file mode 100644
index a49ffbc7737b98fb882b85b1ffdb6dab1b25af08..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ttH_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_ttH
-
-# Use the Powheg_ttH configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_ttH( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_tt_Common.py b/Generators/PowhegControl/share/PowhegControl_tt_Common.py
deleted file mode 100644
index c2f222a0bfcc27dbe7e574fffd552052284b8078..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_tt_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_tt
-
-# Use the Powheg_tt configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_tt( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/PowhegControl_ttj_Common.py b/Generators/PowhegControl/share/PowhegControl_ttj_Common.py
deleted file mode 100644
index e6644c46a0a4a48b7065abd356facb88190a5ecf..0000000000000000000000000000000000000000
--- a/Generators/PowhegControl/share/PowhegControl_ttj_Common.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from PowhegControl import PowhegConfig_ttj
-
-# Use the Powheg_ttj configuration
-transform_runArgs = runArgs if 'runArgs' in dir() else None
-transform_opts = opts if 'opts' in dir() else None
-PowhegConfig = PowhegConfig_ttj( runArgs=transform_runArgs, opts=transform_opts )
diff --git a/Generators/PowhegControl/share/common/PhPy8EG_A14_Wt_inclusive_filt_control.py b/Generators/PowhegControl/share/common/PhPy8EG_A14_Wt_inclusive_filt_control.py
new file mode 100644
index 0000000000000000000000000000000000000000..1a44c6b57fbbb0570db973599f7cb7533bec7511
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PhPy8EG_A14_Wt_inclusive_filt_control.py
@@ -0,0 +1,78 @@
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+
+evgenConfig.description = 'POWHEG+Pythia8+EvtGen Wt production, HT/MET Filter, DR/DS scheme, inclusive, with Powheg hdamp equal 1.5*top mass, A14 tune, ME NNPDF30 NLO, A14 NNPDF23 LO'
+evgenConfig.keywords = [ 'SM', 'top', 'singleTop', 'Wt', 'inclusive']
+evgenConfig.contact = [ 'hass.abouzeid@cern.ch' ]
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
+include("Pythia8_i/Pythia8_Powheg_Main31.py")
+
+genSeq.Pythia8.Commands += [ 'Powheg:pTHard = 0' ]
+genSeq.Pythia8.Commands += [ 'Powheg:NFinal = 2' ]
+genSeq.Pythia8.Commands += [ 'Powheg:pTdef = 2' ]
+genSeq.Pythia8.Commands += [ 'Powheg:veto = 1' ]
+genSeq.Pythia8.Commands += [ 'Powheg:vetoCount = 3' ]
+genSeq.Pythia8.Commands += [ 'Powheg:pTemt = 0' ]
+genSeq.Pythia8.Commands += [ 'Powheg:emitted = 0' ]
+genSeq.Pythia8.Commands += [ 'Powheg:MPIveto = 0' ]
+
+#--------------------------------------------------------------
+# Event filter
+#--------------------------------------------------------------
+# Depending on the DSID, set up MET/HT filters
+thisDSID = runArgs.runNumber
+HT1k5_filter = [411183,411186,411189,411192]
+HT1k_1k5_filter = [411182,411185,411188,411191]
+HT6c_1k_filter = [411181,411184,411187,411190]
+MET200_filter = [411193,411196,411199,411202]
+MET300_filter = [411194,411197,411200,411203]
+MET400_filter = [411195,411198,411201,411204]
+
+if thisDSID in MET200_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 200*GeV
+ filtSeq.MissingEtFilterUpperCut.METCut = 300*GeV
+
+if thisDSID in MET300_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 300*GeV
+ filtSeq.MissingEtFilterUpperCut.METCut = 400*GeV
+
+if thisDSID in MET400_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 400*GeV
+
+if thisDSID in HT6c_1k_filter:
+ include('GeneratorFilters/HTFilter.py')
+ filtSeq.HTFilter.MinJetPt = 35.*GeV # Min pT to consider jet in HT
+ filtSeq.HTFilter.MaxJetEta = 2.5 # Max eta to consider jet in HT
+ filtSeq.HTFilter.MinHT = 600.*GeV # Min HT to keep event
+ filtSeq.HTFilter.MaxHT = 1000.*GeV # Max HT to keep event
+ filtSeq.HTFilter.UseLeptonsFromWZTau = True # Include e/mu from the MC event in the HT
+ filtSeq.HTFilter.MinLeptonPt = 25.*GeV # Min pT to consider muon in HT
+ filtSeq.HTFilter.MaxLeptonEta = 2.5 # Max eta to consider muon in HT
+
+if thisDSID in HT1k_1k5_filter:
+ include('GeneratorFilters/HTFilter.py')
+ filtSeq.HTFilter.MinJetPt = 35.*GeV # Min pT to consider jet in HT
+ filtSeq.HTFilter.MaxJetEta = 2.5 # Max eta to consider jet in HT
+ filtSeq.HTFilter.MinHT = 1000.*GeV # Min HT to keep event
+ filtSeq.HTFilter.MaxHT = 1500.*GeV # Max HT to keep event
+ filtSeq.HTFilter.UseLeptonsFromWZTau = True # Include e/mu from the MC event in the HT
+ filtSeq.HTFilter.MinLeptonPt = 25.*GeV # Min pT to consider muon in HT
+ filtSeq.HTFilter.MaxLeptonEta = 2.5 # Max eta to consider muon in HT
+
+if thisDSID in HT1k5_filter:
+ include('GeneratorFilters/HTFilter.py')
+ filtSeq.HTFilter.MinJetPt = 35.*GeV # Min pT to consider jet in HT
+ filtSeq.HTFilter.MaxJetEta = 2.5 # Max eta to consider jet in HT
+ filtSeq.HTFilter.MinHT = 1500.*GeV # Min HT to keep event
+ filtSeq.HTFilter.MaxHT = 20000.*GeV # Max HT to keep event
+ filtSeq.HTFilter.UseLeptonsFromWZTau = True # Include e/mu from the MC event in the HT
+ filtSeq.HTFilter.MinLeptonPt = 25.*GeV # Min pT to consider muon in HT
+ filtSeq.HTFilter.MaxLeptonEta = 2.5 # Max eta to consider muon in HT
diff --git a/Generators/PowhegControl/share/common/PhPy8EG_A14_ttbar_hdamp258p75_nonallhad_control.py b/Generators/PowhegControl/share/common/PhPy8EG_A14_ttbar_hdamp258p75_nonallhad_control.py
new file mode 100644
index 0000000000000000000000000000000000000000..ebe466a8e582dcf88ed17e36e0c020414a783a28
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PhPy8EG_A14_ttbar_hdamp258p75_nonallhad_control.py
@@ -0,0 +1,106 @@
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = 'POWHEG+Pythia8 ttbar production with Powheg hdamp equal 1.5*top mass, A14 tune, at least one lepton filter, ME NNPDF30 NLO, A14 NNPDF23 LO with shower weights and kinematic filtering'
+evgenConfig.keywords = [ 'SM', 'top', 'ttbar', 'lepton']
+# The contact for the slice configuration
+evgenConfig.contact = [ 'ZLMarshall@lbl.gov' ]
+
+#--------------------------------------------------------------
+# Pythia8 showering - identical to 410470
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
+include("Pythia8_i/Pythia8_Powheg_Main31.py")
+
+genSeq.Pythia8.Commands += [ 'Powheg:pTHard = 0' ]
+genSeq.Pythia8.Commands += [ 'Powheg:NFinal = 2' ]
+genSeq.Pythia8.Commands += [ 'Powheg:pTdef = 2' ]
+genSeq.Pythia8.Commands += [ 'Powheg:veto = 1' ]
+genSeq.Pythia8.Commands += [ 'Powheg:vetoCount = 3' ]
+genSeq.Pythia8.Commands += [ 'Powheg:pTemt = 0' ]
+genSeq.Pythia8.Commands += [ 'Powheg:emitted = 0' ]
+genSeq.Pythia8.Commands += [ 'Powheg:MPIveto = 0' ]
+
+#--------------------------------------------------------------
+# Event filter
+#--------------------------------------------------------------
+# Semi-leptonic decay filter
+include('GeneratorFilters/TTbarWToLeptonFilter.py')
+filtSeq.TTbarWToLeptonFilter.NumLeptons = -1
+filtSeq.TTbarWToLeptonFilter.Ptcut = 0.
+
+# Depending on the DSID, set up MET/HT filters
+thisDSID = runArgs.runNumber
+HT1k5_filter = [407342]
+HT1k_1k5_filter = [407343]
+HT6c_1k_filter = [407344]
+MET100_filter = [345935]
+MET200_filter = [407345]
+MET300_filter = [407346]
+MET400_filter = [407347]
+LJet_Vpt_100200 = [345951]
+LJet_Vpt_200 = [346031]
+
+if thisDSID in LJet_Vpt_100200:
+ include('GeneratorFilters/TTbarLJetsVptFilter.py')
+ filtSeq.TTbarLJetsVptFilter.Ptcut = 22000.
+ filtSeq.TTbarLJetsVptFilter.Etacut = 3.0
+ filtSeq.TTbarLJetsVptFilter.VptMin = 100000
+ filtSeq.TTbarLJetsVptFilter.VptMax = 200000
+ filtSeq.TTbarLJetsVptFilter.FollowTaus=True
+
+if thisDSID in LJet_Vpt_200:
+ include('GeneratorFilters/TTbarLJetsVptFilter.py')
+ filtSeq.TTbarLJetsVptFilter.Ptcut = 22000.
+ filtSeq.TTbarLJetsVptFilter.Etacut = 3.0
+ filtSeq.TTbarLJetsVptFilter.VptMin = 200000
+ filtSeq.TTbarLJetsVptFilter.FollowTaus=True
+
+if thisDSID in MET100_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 100*GeV
+ filtSeq.MissingEtFilterUpperCut.METCut = 200*GeV
+
+if thisDSID in MET200_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 200*GeV
+ filtSeq.MissingEtFilterUpperCut.METCut = 300*GeV
+
+if thisDSID in MET300_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 300*GeV
+ filtSeq.MissingEtFilterUpperCut.METCut = 400*GeV
+
+if thisDSID in MET400_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 400*GeV
+
+if thisDSID in HT6c_1k_filter:
+ include('GeneratorFilters/HTFilter.py')
+ filtSeq.HTFilter.MinJetPt = 35.*GeV # Min pT to consider jet in HT
+ filtSeq.HTFilter.MaxJetEta = 2.5 # Max eta to consider jet in HT
+ filtSeq.HTFilter.MinHT = 600.*GeV # Min HT to keep event
+ filtSeq.HTFilter.MaxHT = 1000.*GeV # Max HT to keep event
+ filtSeq.HTFilter.UseLeptonsFromWZTau = True # Include e/mu from the MC event in the HT
+ filtSeq.HTFilter.MinLeptonPt = 25.*GeV # Min pT to consider muon in HT
+ filtSeq.HTFilter.MaxLeptonEta = 2.5 # Max eta to consider muon in HT
+
+if thisDSID in HT1k_1k5_filter:
+ include('GeneratorFilters/HTFilter.py')
+ filtSeq.HTFilter.MinJetPt = 35.*GeV # Min pT to consider jet in HT
+ filtSeq.HTFilter.MaxJetEta = 2.5 # Max eta to consider jet in HT
+ filtSeq.HTFilter.MinHT = 1000.*GeV # Min HT to keep event
+ filtSeq.HTFilter.MaxHT = 1500.*GeV # Max HT to keep event
+ filtSeq.HTFilter.UseLeptonsFromWZTau = True # Include e/mu from the MC event in the HT
+ filtSeq.HTFilter.MinLeptonPt = 25.*GeV # Min pT to consider muon in HT
+ filtSeq.HTFilter.MaxLeptonEta = 2.5 # Max eta to consider muon in HT
+
+if thisDSID in HT1k5_filter:
+ include('GeneratorFilters/HTFilter.py')
+ filtSeq.HTFilter.MinJetPt = 35.*GeV # Min pT to consider jet in HT
+ filtSeq.HTFilter.MaxJetEta = 2.5 # Max eta to consider jet in HT
+ filtSeq.HTFilter.MinHT = 1500.*GeV # Min HT to keep event
+ filtSeq.HTFilter.MaxHT = 9000.*GeV # Max HT to keep event
+ filtSeq.HTFilter.UseLeptonsFromWZTau = True # Include e/mu from the MC event in the HT
+ filtSeq.HTFilter.MinLeptonPt = 25.*GeV # Min pT to consider muon in HT
+ filtSeq.HTFilter.MaxLeptonEta = 2.5 # Max eta to consider muon in HT
diff --git a/Generators/PowhegControl/share/common/PowhegControl_ttFCNC_NLO.py b/Generators/PowhegControl/share/common/PowhegControl_ttFCNC_NLO.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab9739b6b380f452e4fc94f9e0f982ab74fb0548
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegControl_ttFCNC_NLO.py
@@ -0,0 +1,316 @@
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = 'POWHEG+Pythia8 ttbar production with Powheg hdamp equal 1.5*top mass, A14 tune, ME NNPDF30 NLO, A14 NNPDF23 LO, FCNC Top decays'
+evgenConfig.keywords = [ 'top', 'ttbar', 'Higgs', 'FCNC' ]
+evgenConfig.contact = [ 'andrea.helen.knue@cern.ch','onofrio@liverpool.ac.uk','ian.connelly@cern.ch']
+
+include('PowhegControl/PowhegControl_tt_Common.py')
+# Initial settings
+if hasattr(PowhegConfig, "topdecaymode"):
+ # Use PowhegControl-00-02-XY (and earlier) syntax
+ PowhegConfig.topdecaymode = 22222 # inclusive top decays
+else:
+ # Use PowhegControl-00-03-XY (and later) syntax
+ PowhegConfig.decay_mode = "t t~ > undecayed"
+ PowhegConfig.MadSpin_enabled = False
+
+PowhegConfig.hdamp = 258.75 # 1.5 * mtop
+DoSingleWeight = False
+if DoSingleWeight:
+ PowhegConfig.mu_F = 1.0
+ PowhegConfig.mu_R = 1.0
+ PowhegConfig.PDF = 260000
+else:
+ PowhegConfig.mu_F = [1.0, 2.0, 0.5, 1.0, 1.0, 0.5, 2.0, 0.5, 2.0] # List of factorisation scales which pairs with renormalisation scale below
+ PowhegConfig.mu_R = [1.0, 1.0, 1.0, 2.0, 0.5, 0.5, 2.0, 2.0, 0.5] # List of renormalisation scales
+ PowhegConfig.PDF = [260000, 25200, 13165, 90900] # NNPDF30, MMHT, CT14, PDF4LHC - PDF variations with nominal scale variation
+ PowhegConfig.PDF.extend(range(260001, 260101)) # Include the NNPDF error set
+ PowhegConfig.PDF.extend(range(90901 , 90931 )) # Include the PDF4LHC error set
+
+#PowhegConfig.nEvents *= 1.1 # compensate filter efficiency
+PowhegConfig.nEvents=int(7.0*runArgs.maxEvents)
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Now preparing for MadSpin
+#--------------------------------------------------------------
+
+# The couplings. Only real part.
+# The tqH relevant couplings (c,u) x (LH,RH) (scalar of course)
+RCtphi = 0.
+RCuphi = 0.
+RCtcphi = 0.
+RCctphi = 0.
+
+# The tqZ,tqg relevant couplings (c,u) x (Vector,Tensor) x (LH,RH)
+# vector for tqZ
+RC1utR = 0.
+RC1utL = 0.
+RC3utL = 0.
+RC1ctR = 0.
+RC1ctL = 0.
+RC3ctL = 0.
+
+# tensor for tqZ and tqgamma
+RCtW = 0.
+RCtB = 0.
+RCuW = 0.
+RCuB = 0.
+RCtcW = 0.
+RCtcB = 0.
+RCctW = 0.
+RCctB = 0.
+
+### Nevent adjustment for event filters
+if any("HLepF" in JO for JO in runArgs.jobConfig):
+ PowhegConfig.nEvents = int(7.0*runArgs.maxEvents)
+ print PowhegConfig.nEvents
+else :
+ raise RuntimeError("Event filter not recognised for this job option")
+
+#t-c-H or t-u-H
+istcH = any("Q2cH" in JO for JO in runArgs.jobConfig) or any("Q2cbarH" in JO for JO in runArgs.jobConfig)
+
+# Get the DSID
+thisDSID = runArgs.runNumber
+# Apply the offset
+
+# Temporary fix shift the dsid only if it's not an inclusive H decay sample
+if thisDSID < 411229 or thisDSID > 411232 :
+ if istcH:
+ thisDSID = thisDSID - 64
+ else:
+ thisDSID = thisDSID - 48
+
+model = 'TopFCNC-onlyh' #eventually, change for tqZ, tqphoton, tqgluon
+madspin_card_rep = 'madspin_card.dat'
+madspin_in = 'import run.lhe'
+madspin_rep = 'set ms_dir MadSpin'
+madspin_seed = runArgs.randomSeed
+
+mscard = open(madspin_card_rep,'w')
+mscard.write("""
+set Nevents_for_max_weigth 250 # number of events for the estimate of the max. weight (default: 75)
+set max_weight_ps_point 1000 # number of PS to estimate the maximum for each event (default: 400)
+set seed %i
+%s
+%s
+define l+ = l+ ta+
+define l- = l- ta-
+define All = l+ l- vl vl~ j
+\n
+"""%(madspin_seed,madspin_in,madspin_rep))
+
+## The W decay
+wtyp = thisDSID%4
+# Non inclusive H decay
+if not thisDSID >= 411229 and thisDSID <= 411232 :
+ if wtyp == 0:
+ wstr = ', w- > l- vl~'
+ elif wtyp == 1:
+ wstr = ', w+ > l+ vl'
+ elif wtyp == 2:
+ wstr = ', w- > j j'
+ elif wtyp == 3:
+ wstr = ', w+ > j j'
+# Inclusive H decay dsids
+elif thisDSID >= 411229 and thisDSID <= 411232 :
+ if wtyp == 0 or wtyp == 2:
+ wstr = ', w- > All All'
+ if wtyp == 1 or wtyp == 3:
+ wstr = ', w+ > All All'
+else :
+ raise RuntimeError("No W decays are generated please check the job option")
+## The SM top
+ttyp = thisDSID%2
+if ttyp == 0:
+ t2str = 'decay t~ > w- b~'
+else:
+ t2str = 'decay t > w+ b'
+
+# the tqH part
+# As last block coding dsids to be used for inclusive H decay
+if ( (thisDSID >= 410700 and thisDSID <= 410779) or (thisDSID >= 410588 and thisDSID <= 410595) or (thisDSID >= 411229 and thisDSID <= 411232 ) ):
+
+ keyName = 'Higgs'
+
+ # Non inclusive H decay
+ if not thisDSID >= 411229 and thisDSID <= 411232 :
+ if thisDSID >= 410592 and thisDSID <= 410595 :
+ theDIDS = thisDSID - 410700 + 104
+ elif thisDSID >= 410588 and thisDSID <= 410591:
+ theDIDS = thisDSID - 410700 + 108
+ else :
+ theDIDS = thisDSID - 410700
+
+ # Shift condition for the inclusive H decay, turn the DSID negative
+ if thisDSID >= 411229 and thisDSID <= 411232 :
+ theDIDS = thisDSID - 411233
+
+ #semi-manually setting the couplings (for the inclusive H decay cases)..
+ # Changed the if conditions after a proper shift is applied, inclusive H decay
+ if theDIDS == -2 or theDIDS == -1 :
+ RCtphi = 1.
+ elif theDIDS == -3 or theDIDS == -4 :
+ RCtcphi = 1.
+ #other channels
+ elif theDIDS >= 0 and theDIDS < 20:
+ RCtcphi = 1.
+ elif theDIDS < 40:
+ RCtphi = 1.
+ elif theDIDS < 60:
+ RCctphi = 1.
+ else:
+ RCuphi = 1.
+
+ # Default for channels other than inclusive H decay
+ qtyp = theDIDS/20
+ if theDIDS >= 40:
+ qtyp = (theDIDS-40)/20
+ #For the inclusive H decay samples, 'theDSID' should be negative only for the inclusive H decay
+ elif theDIDS <= 0:
+ if theDIDS == -2 or theDIDS == -1 :
+ qtyp=1
+ elif theDIDS == -4 or theDIDS == -3 :
+ qtyp=0
+
+ if ttyp%2 == 0 and qtyp == 0:
+ t1str = 'decay t > c h'
+ elif ttyp%2 == 1 and qtyp == 0:
+ t1str = 'decay t~ > c~ h'
+ elif ttyp%2 == 0 and qtyp == 1:
+ t1str = 'decay t > u h'
+ elif ttyp%2 == 1 and qtyp == 1:
+ t1str = 'decay t~ > u~ h'
+
+ mscard.write("""%s\n%s%s\nlaunch"""%(t1str,t2str,wstr))
+else:
+ raise RuntimeError("No good runNumber")
+
+mscard.close()
+
+coup = {
+ 'RCtphi' : RCtphi ,
+ 'RCuphi' : RCuphi ,
+ 'RCtcphi' : RCtcphi,
+ 'RCctphi' : RCctphi,
+
+ 'RC1utR' : RC1utR,
+ 'RC1utL' : RC1utL,
+ 'RC3utL' : RC3utL,
+ 'RC1ctR' : RC1ctR,
+ 'RC1ctL' : RC1ctL,
+ 'RC3ctL' : RC3ctL,
+ 'RCtW' : RCtW,
+ 'RCtB' : RCtB,
+ 'RCuW' : RCuW,
+ 'RCuB' : RCuB,
+ 'RCtcW' : RCtcW,
+ 'RCtcB' : RCtcB,
+ 'RCctW' : RCctW,
+ 'RCctB' : RCctB
+ }
+
+import shutil,os,subprocess
+
+paramFileName = 'MadGraph_param_card_ttFCNC_NLO_FixedFCNCBR.dat'
+paramFileNameN = 'param_card.dat'
+paramFile = subprocess.Popen(['get_files','-data',paramFileName]).communicate()
+if not os.access(paramFileName, os.R_OK):
+ print 'ERROR: Could not get param card'
+ raise RuntimeError("parameter card '%s' missing!"%paramFileName)
+
+from MadGraphControl.MadGraphUtils import *
+build_param_card(param_card_old=paramFileName,param_card_new=paramFileNameN,
+ params={'dim6':coup})
+
+##### Start LHE cooking for MadSpin
+
+fin = open('PowhegOTF._1.events','r')
+fout = open('run.lhe','w')
+line = fin.readline()
+while line != "-->\n":
+ fout.write(line)
+ line = fin.readline()
+fout.write(line)
+
+# add the process
+fout.write('<MG5ProcCard>\n')
+fout.write('import model /cvmfs/atlas.cern.ch/repo/sw/Generators/madgraph/models/latest/%s\n'%(model))
+fout.write('generate p p > t t~ [QCD] \n')
+fout.write('</MG5ProcCard>\n')
+
+# add run parameters
+eline = str(PowhegConfig.nEvents)+' = nevents\n'
+fout.write('<MGRunCard>\n')
+fout.write('#0.01 = req_acc_FO\n') #Need because of a new check introduced in 2.5.0 : if not there, RunCardLO will be considered, which wants a line like that "x = nhel ! x = 0,1"
+fout.write(eline)
+fout.write('50.0 = bwcutoff\n')
+fout.write('</MGRunCard>\n')
+
+# add model parameters
+fout.write('<slha>\n')
+shutil.copyfileobj(open(paramFileNameN, 'r'), fout)
+fout.write('</slha>\n')
+fout.write('<montecarlomasses>\n')
+fout.write(' 1 0.330000E+00\n')
+fout.write(' 2 0.330000E+00\n')
+fout.write(' 3 0.500000E+00\n')
+fout.write(' 4 0.150000E+01\n')
+fout.write(' 5 0.480000E+01\n')
+fout.write(' 11 0.510999E-03\n')
+fout.write(' 13 0.105658E+00\n')
+fout.write(' 15 0.177682E+01\n')
+fout.write(' 21 0.000000E+00\n')
+fout.write('</montecarlomasses>\n')
+
+# add the events !
+line = fin.readline()
+while 'LesHouchesEvents' not in line:
+ fout.write(line)
+ line = fin.readline()
+fout.write(line)
+fout.close()
+
+#### End of LHE cooking for MadSpin
+
+# run MadSpin
+os.system('$MADPATH/MadSpin/madspin < madspin_card.dat')
+
+# This is a Powheg job, so expect lhe file to be called PowhegOTF._1.events
+unzip = subprocess.Popen(['gunzip','run_decayed.lhe.gz'])
+unzip.wait()
+os.system('cp run_decayed.lhe PowhegOTF._1.events')
+
+# Does MadSpin add some spurious lines that make the weight names unreadable ?
+# see https://bugs.launchpad.net/mg5amcnlo/+bug/1720979
+with open('PowhegOTF._1.events', 'r+') as f:
+ t = f.read()
+ to_delete = [ '<![CDATA[', ']]>' ]
+ f.seek(0)
+ for line in t.split('\n'):
+ if line not in to_delete:
+ f.write(line + '\n')
+ f.truncate()
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
+include("Pythia8_i/Pythia8_Powheg_Main31.py")
+
+### Lepton filter
+if any("HLepF" in JO for JO in runArgs.jobConfig):
+ if not hasattr(filtSeq,"LeptonFilter"):
+ from GeneratorFilters.GeneratorFiltersConf import LeptonFilter
+ filtSeq += LeptonFilter()
+ filtSeq.LeptonFilter.Ptcut = 15000.0#MeV
+
+genSeq.Pythia8.Commands += [ 'POWHEG:pThard = 0' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:nFinal = 2' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:pTdef = 2' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:vetoCount = 3' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:pTemt = 0' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:emitted = 0' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:MPIveto = 0' ]
diff --git a/Generators/PowhegControl/share/common/PowhegControl_ttHplus_NLO.py b/Generators/PowhegControl/share/common/PowhegControl_ttHplus_NLO.py
new file mode 100644
index 0000000000000000000000000000000000000000..b891af1ad568cb97e3cf0119d749ed0caf6e0135
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegControl_ttHplus_NLO.py
@@ -0,0 +1,195 @@
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = 'POWHEG+Madspin+Pythia8 ttbar production with Powheg hdamp equal 1.5*top mass, A14 tune, ME NNPDF30 NLO, A14 NNPDF23 LO, Higgs plus decays for masses from 80-160'
+evgenConfig.keywords =['Higgs','MSSM','BSMHiggs','chargedHiggs','top','ttbar']
+evgenConfig.contact = [ 'anna.ivina@cern.ch']
+evgenConfig.minevents = 10000
+
+
+include('PowhegControl/PowhegControl_tt_Common.py')
+# Initial settings
+if hasattr(PowhegConfig, "topdecaymode"):
+ # Use PowhegControl-00-02-XY (and earlier) syntax
+ PowhegConfig.topdecaymode = 22222 # inclusive top decays
+else:
+ # Use PowhegControl-00-03-XY (and later) syntax
+ PowhegConfig.decay_mode = "t t~ > undecayed"
+ PowhegConfig.MadSpin_enabled = False
+
+PowhegConfig.hdamp = 258.75 # 1.5 * mtop
+DoSingleWeight = False
+if DoSingleWeight:
+ PowhegConfig.mu_F = 1.0
+ PowhegConfig.mu_R = 1.0
+ PowhegConfig.PDF = 260000
+else:
+ PowhegConfig.mu_F = [1.0, 2.0, 0.5, 1.0, 1.0, 0.5, 2.0, 0.5, 2.0] # List of factorisation scales which pairs with renormalisation scale below
+ PowhegConfig.mu_R = [1.0, 1.0, 1.0, 2.0, 0.5, 0.5, 2.0, 2.0, 0.5] # List of renormalisation scales
+ PowhegConfig.PDF = [260000, 25200, 13165, 90900] # NNPDF30, MMHT, CT14, PDF4LHC - PDF variations with nominal scale variation
+ PowhegConfig.PDF.extend(range(260001, 260101)) # Include the NNPDF error set
+ PowhegConfig.PDF.extend(range(90901 , 90931 )) # Include the PDF4LHC error set
+
+#PowhegConfig.nEvents *= 1.1 # compensate filter efficiency, this will probably is not needed for Hplus
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Now preparing for MadSpin
+#--------------------------------------------------------------
+# Get the DSID and also make the strings
+thisDSID = runArgs.runNumber #you can use it if you want to decay tops or W to something else
+model = '2HDMtypeII'
+madspin_card_rep = 'madspin_card.dat'
+madspin_in = 'import run.lhe'
+madspin_rep = 'set ms_dir MadSpin'
+madspin_seed = runArgs.randomSeed
+
+#open the mscard and write the parameters, set seed,and decay
+#included into the define p and j the b quark
+mscard = open(madspin_card_rep,'w')
+mscard.write("""
+set Nevents_for_max_weigth 250 # number of events for the estimate of the max. weight (default: 75)
+set max_weight_ps_point 1000 # number of PS to estimate the maximum for each event (default: 400)
+set seed %i
+%s
+%s
+define l+ = e+ mu+ ta+
+define l- = e- mu- ta-
+define vl = ve vm vt
+define vl~ = ve~ vm~ vt~
+define p = g u c d b s u~ c~ d~ s~ b~
+define j = g u c d b s u~ c~ d~ s~ b~
+\n
+"""%(madspin_seed,madspin_in,madspin_rep))
+
+
+#make the mscard
+#W decay
+wstr = ', w- > l- vl~'
+## The SM top
+t2str = 'decay t~ > b~ w-'
+t1str = 'decay t > b h+'
+mscard.write("""%s\n%s%s\nlaunch"""%(t1str,t2str,wstr))
+mscard.close()
+
+#--------------------------------------------------------------
+# Charge Higgs, and all other masses in GeV
+#--------------------------------------------------------------
+###take the mass from the JO line
+mhc_str = str(runArgs.jobConfig[0]) # JOB OPTION NAME MUST CONTAIN THE MASS WE WANT TO SIMULATE IN FORMAT LIKE: *_H160_*
+mhc=0
+int(s)
+for s in mhc_str.split("_"):
+ ss=s.replace("H","")
+ if ss.isdigit():
+ mhc = int(ss)
+ print "Charged Higgs mass set to %i"%mhc
+if mhc==0:
+ raise RuntimeError("Charged Higgs mass not set, mhc=0, check joOption name %s"%mhc_str)
+###
+import math
+mh1=1.250e+02
+mh2=math.sqrt(math.pow(mhc,2)+math.pow(8.0399e+01,2))
+mh3=mh2
+
+
+masses = {'25':str(mh1)+' # mh1',
+ '35':str(mh2)+' # mh2',
+ '36':str(mh2)+' # mh2',
+ '37':str(mhc)+' # mhc'}
+decayss={'37': 'DECAY 37 1.300000e+02 # whc'}
+
+
+#write_param_card is part of the 2HDMTypeII model
+import shutil,os,subprocess
+
+paramFileName = 'MadGraph_param_card_ttHplus_NLO.dat'
+paramFileNameN = 'param_card.dat'
+
+from MadGraphControl.MadGraphUtils import *
+build_param_card(param_card_old=paramFileName,param_card_new=paramFileNameN,masses=masses,decays=decayss)
+
+
+##### Start LHE cooking for MadSpin
+fin = open('PowhegOTF._1.events','r')
+fout = open('run.lhe','w')
+line = fin.readline()
+while line != "-->\n":
+ fout.write(line)
+ line = fin.readline()
+fout.write(line)
+
+
+# add the process
+#to use 5 FS you need to set b quark mass to zero at model level, use restrict_nobmass provided in the model folder
+fout.write('<MG5ProcCard>\n')
+fout.write('import model /cvmfs/atlas.cern.ch/repo/sw/Generators/madgraph/models/latest/%s-nobmass\n'%(model))
+fout.write('generate p p > t t~ [QCD] \n')
+fout.write('</MG5ProcCard>\n')
+
+# add run parameters
+eline = str(PowhegConfig.nEvents)+' = nevents\n'
+fout.write('<MGRunCard>\n')
+fout.write('#0.01 = req_acc_FO\n') #Need because of a new check introduced in 2.5.0 : if not there, RunCardLO will be considered, which wants a line like that "x = nhel ! x = 0,1"
+fout.write(eline)
+fout.write('50.0 = bwcutoff\n')
+fout.write('</MGRunCard>\n')
+
+
+
+#add model parameters
+fout.write('<slha>\n')
+shutil.copyfileobj(open(paramFileNameN, 'r'), fout)
+fout.write('</slha>\n')
+fout.write('<montecarlomasses>\n')
+fout.write(' 1 0.330000E+00\n')
+fout.write(' 2 0.330000E+00\n')
+fout.write(' 3 0.500000E+00\n')
+fout.write(' 4 0.1550000E+01\n')
+fout.write(' 5 0.470000E+01\n')
+fout.write(' 11 0.510999E-03\n')
+fout.write(' 13 0.105658E+00\n')
+fout.write(' 15 0.177682E+01\n')
+fout.write(' 21 0.000000E+00\n')
+fout.write('</montecarlomasses>\n')
+
+# add the events !
+line = fin.readline()
+while 'LesHouchesEvents' not in line:
+ fout.write(line)
+ line = fin.readline()
+fout.write(line)
+fout.close()
+#### End of LHE cooking for MadSpin
+
+# run MadSpin
+os.system('$MADPATH/MadSpin/madspin < madspin_card.dat')
+
+# This is a Powheg job, so expect lhe file to be called PowhegOTF._1.events
+unzip = subprocess.Popen(['gunzip','run_decayed.lhe.gz'])
+unzip.wait()
+os.system('cp run_decayed.lhe PowhegOTF._1.events')
+
+# Does MadSpin add some spurious lines that make the weight names unreadable ?
+# see https://bugs.launchpad.net/mg5amcnlo/+bug/1720979
+with open('PowhegOTF._1.events', 'r+') as f:
+ t = f.read()
+ to_delete = [ '<![CDATA[', ']]>' ]
+ f.seek(0)
+ for line in t.split('\n'):
+ if line not in to_delete:
+ f.write(line + '\n')
+ f.truncate()
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
+include("Pythia8_i/Pythia8_Powheg_Main31.py")
+genSeq.Pythia8.Commands += [ 'POWHEG:pThard = 0' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:nFinal = 2' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:pTdef = 2' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:vetoCount = 3' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:pTemt = 0' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:emitted = 0' ]
+genSeq.Pythia8.Commands += [ 'POWHEG:MPIveto = 0' ]
diff --git a/Generators/PowhegControl/share/common/PowhegHerwig7EvtGen_H7UE_tt_hdamp258p75_704_control.py b/Generators/PowhegControl/share/common/PowhegHerwig7EvtGen_H7UE_tt_hdamp258p75_704_control.py
new file mode 100644
index 0000000000000000000000000000000000000000..f22c23bf8522f6d8ea16215b4e1273c3cb59943e
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegHerwig7EvtGen_H7UE_tt_hdamp258p75_704_control.py
@@ -0,0 +1,92 @@
+#---------------------------------------------------------------------------
+# Title: PowhegHerwig7EvtGen_H7UE_tt_hdamp258p75_704_control.py
+#-----------------------------------------------------------------------------
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = 'POWHEG+Herwig704 ttbar production with Powheg hdamp equal 1.5*top mass, H7UE tune, MET/HT filter, ME NNPDF30 NLO, H7UE MMHT2014 LO'
+evgenConfig.keywords = [ 'SM', 'top', 'ttbar', 'lepton']
+evgenConfig.tune = "MMHT2014"
+evgenConfig.contact = [ 'keisuke.yoshihara@cern.ch', 'khoo@cern.ch']
+evgenConfig.generators += ["Powheg", "Herwig7", "EvtGen"]
+
+
+#--------------------------------------------------------------
+# Herwig7 (H7UE) showering
+#--------------------------------------------------------------
+# initialize Herwig7 generator configuration for showering of LHE files
+include("Herwig7_i/Herwig7_LHEF.py")
+
+# configure Herwig7
+Herwig7Config.me_pdf_commands(order="NLO", name="NNPDF30_nlo_as_0118")
+Herwig7Config.tune_commands()
+Herwig7Config.lhef_powhegbox_commands(lhe_filename=runArgs.inputGeneratorFile, me_pdf_order="NLO")
+
+# add EvtGen
+include("Herwig7_i/Herwig7_EvtGen.py")
+
+Herwig7Config.add_commands("""
+set /Herwig/Shower/LtoLGammaSudakov:pTmin 0.000001
+set /Herwig/Shower/QtoGammaQSudakov:Alpha /Herwig/Shower/AlphaQED
+""")
+
+# run Herwig7
+Herwig7Config.run()
+
+#--------------------------------------------------------------
+# Event filter
+#--------------------------------------------------------------
+# Semi-leptonic decay filter
+include('GeneratorFilters/TTbarWToLeptonFilter.py')
+filtSeq.TTbarWToLeptonFilter.NumLeptons = -1
+filtSeq.TTbarWToLeptonFilter.Ptcut = 0.
+
+# Depending on the DSID, set up MET/HT filters
+thisDSID = runArgs.runNumber
+MET200_filter = [407357]
+MET300_filter = [407358]
+MET400_filter = [407359]
+
+if thisDSID in MET200_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 200*GeV
+ filtSeq.MissingEtFilterUpperCut.METCut = 300*GeV
+
+if thisDSID in MET300_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 300*GeV
+ filtSeq.MissingEtFilterUpperCut.METCut = 400*GeV
+
+if thisDSID in MET400_filter:
+ include('GeneratorFilters/MissingEtFilter.py')
+ filtSeq.MissingEtFilter.METCut = 400*GeV
+
+HTcuts = {
+ 407354: (1500, 9000),
+ 407355: (1000, 1500),
+ 407356: ( 600, 1000),
+ 410432: ( 500, 1000),
+ 410433: (1000, 1500),
+ 410446: (1500, 9000),
+}
+
+# Provide the HT cuts in GeV
+def setupStandardHTFilter(HTrange):
+ HTmin,HTmax = HTrange
+ include('GeneratorFilters/HTFilter.py')
+ htfilt = filtSeq.HTFilter
+ htfilt.MinJetPt = 35.*GeV # Min pT to consider jet in HT
+ htfilt.MaxJetEta = 2.5 # Max eta to consider jet in HT
+ htfilt.UseLeptonsFromWZTau = True # Include e/mu from the MC event in the HT
+ htfilt.MinLeptonPt = 25.*GeV # Min pT to consider muon in HT
+ htfilt.MaxLeptonEta = 2.5 # Max eta to consider muon in HT
+ filtSeq.HTFilter.MinHT = HTmin*GeV # Min HT to keep event
+ filtSeq.HTFilter.MaxHT = HTmax*GeV # Max HT to keep event
+
+if thisDSID in HTcuts.keys():
+ setupStandardHTFilter(HTcuts[thisDSID])
+
+isAllHad = thisDSID in [410432,410433,410446]
+if isAllHad:
+ filtSeq.Expression = "((not TTbarWToLeptonFilter) and HTFilter)"
diff --git a/Generators/PowhegControl/share/common/PowhegPy8EG_H2a.py b/Generators/PowhegControl/share/common/PowhegPy8EG_H2a.py
new file mode 100644
index 0000000000000000000000000000000000000000..ca8b269c982b1bafb7ffc53d745374bee7a006fe
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegPy8EG_H2a.py
@@ -0,0 +1,266 @@
+#--------------------------------------------------------------
+# Use LHE files as input
+#--------------------------------------------------------------
+
+# In 20.7.9.9.6, LHE merging means this is no longer needed
+#evgenConfig.inputfilecheck = "TXT"
+
+#--------------------------------------------------------------
+# Modify the events.lhe, since Pythia doesn't like to decay the
+# SM higgs to BSM products: 25 --> 35
+#--------------------------------------------------------------
+
+import os, sys, glob
+for f in glob.glob("*.events"):
+ infile = f
+ f1 = open( infile )
+ newfile = infile+'.temp'
+ f2 = open(newfile,'w')
+ for line in f1:
+ if line.startswith(' 25 1'):
+ f2.write(line.replace(' 25 1',' 35 1'))
+ else:
+ f2.write(line)
+ f1.close()
+ f2.close()
+ os.system('mv %s %s '%(infile, infile+'.old') )
+ os.system('mv %s %s '%(newfile, infile) )
+
+#--------------------------------------------------------------
+# Defining the function to extract parameters
+#--------------------------------------------------------------
+dict_pdgIds = {}
+dict_pdgIds["b"] = 5
+dict_pdgIds["mu"] = 13
+dict_pdgIds["tau"] = 15
+dict_pdgIds["g"] = 21
+dict_pdgIds["y"] = 22
+
+def getParameters():
+ import re
+
+ #--- Read parts of the job option
+ jonamelist = str(runArgs.jobConfig[0]).replace(".py", "").split("_")
+
+ tune=0
+ count=0
+ for substr in jonamelist:
+ if "AZNLO" in substr:
+ tune = count
+ break
+ count += 1
+
+ print("squirrel",jonamelist,tune)
+ process = jonamelist[tune+1]
+ ma = float(jonamelist[tune+3].split("a")[-1].replace("p", "."))
+ decayChan = str(jonamelist[tune+4])
+ partFilter = None
+ if len(jonamelist)-tune>5:
+ partFilter = str(jonamelist[tune+5])
+
+ #--- list of decays, e.g. [mu, tau] for 2mu2tau
+ decayProducts = []
+ for part in dict_pdgIds.keys():
+ decay = re.findall("[1-4]%s" % part, decayChan)
+ if len(decay)>0:
+ decayProducts.append(decay[0][1:]) # remove the number in front of the letter
+
+ return process, ma, decayChan, decayProducts, partFilter
+
+# MC15.999999.PowhegPy8EG_ggH_H125_a60a60_2mu2tau_[filtXXX].py
+process, ma, decayChan, decayProducts, partFilter = getParameters()
+print "Parameters: "
+print process, ma, decayChan, decayProducts, partFilter
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_AZNLO_CTEQ6L1_EvtGen_Common.py')
+
+
+#--------------------------------------------------------------
+# Pythia8 main31 matching
+#--------------------------------------------------------------
+if process=="ggH":
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 2']
+elif process=="VBF":
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+elif process=="WpH":
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+elif process=="WmH":
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+elif process=="ZH":
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+elif process=="ggZH":
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 2']
+
+
+#--------------------------------------------------------------
+# Higgs->aa at Pythia8
+#--------------------------------------------------------------
+
+genSeq.Pythia8.Commands += [
+ 'Higgs:useBSM = on',
+ '35:m0 = 125',
+ '35:mWidth = 0.00407',
+ '35:doForceWidth = on',
+ '35:onMode = off',
+ '35:onIfMatch = 36 36', # h->aa
+ '36:onMode = off',
+ ]
+
+
+#--------------------------------------------------------------
+# a->XX at Pythia8
+#--------------------------------------------------------------
+
+if len(decayProducts)==1: # a->4X
+ genSeq.Pythia8.Commands += [
+ '36:onIfAny = %d' % dict_pdgIds[decayProducts[0]], # decay a->XX
+ '36:m0 = %.1f' % ma, #scalar mass
+ '36:mMin = 0',
+ '36:tau0 = 0',
+ ]
+elif len(decayProducts)==2: # a->2X2Y
+
+ sign = -1
+ for part in decayProducts:
+ pdgId = dict_pdgIds[part]
+ if pdgId==21 or pdgId==22:
+ sign = 1
+
+ genSeq.Pythia8.Commands += [
+ '36:oneChannel = 1 0.5 100 %d %d' % (dict_pdgIds[decayProducts[0]], sign*dict_pdgIds[decayProducts[0]]), #a->XX
+ '36:addChannel = 1 0.5 100 %d %d' % (dict_pdgIds[decayProducts[1]], sign*dict_pdgIds[decayProducts[1]]), #a->YY
+ '36:m0 %.1f' % ma, #scalar mass
+ '36:mMin %.1f' % (ma-0.5), #scalar mass
+ '36:mMax %.1f' % (ma+0.5), #scalar mass
+ '36:mWidth 0.01', # narrow width
+ '36:tau0 0', #scalarlife time
+ ]
+
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.keywords = [ "BSM", "Higgs", "BSMHiggs", "mH125"]
+
+if process=="ggH" and (decayChan=="2b2mu" or decayChan=="2mu2b"):
+ evgenConfig.description = "POWHEG+Pythia8 H+jet production with NNLOPS and the A14 tune, H->aa->bbmumu mh=125 GeV"
+ evgenConfig.process = "ggH H->aa->bbmumu"
+ evgenConfig.contact = [ 'christopher.hayes@cern.ch','ljiljana.morvaj@cern.ch' ]
+
+if process=="VBF" and (decayChan=="2b2mu" or decayChan=="2mu2b"):
+ evgenConfig.description = "POWHEG+Pythia8 VBF H production, H->aa->bbmumu mh=125 GeV"
+ evgenConfig.process = "VBF H->aa->bbmumu"
+ evgenConfig.contact = [ 'christopher.hayes@cern.ch','ljiljana.morvaj@cern.ch' ]
+
+if process=="ggH" and decayChan=="4tau":
+ evgenConfig.description = "POWHEG+Pythia8 H+jet production with NNLOPS and the A14 tune, H->aa->4tau mh=125 GeV"
+ evgenConfig.process = "ggH H->aa->4tau"
+ evgenConfig.contact = [ 'rachel.smith@cern.ch', 'huacheng.cai@cern.ch', 'roger.caminal.armadans@cern.ch' ]
+
+if process=="ggH" and (decayChan=="2mu2tau" or decayChan=="2tau2mu"):
+ evgenConfig.description = "POWHEG+Pythia8 H+jet production with NNLOPS and the A14 tune, H->aa->mumutautau mh=125 GeV"
+ evgenConfig.process = "ggH H->aa->mumutautau"
+ evgenConfig.contact = [ 'josefina.alconada@cern.ch' ]
+
+if process=="ggH" and (decayChan=="2b2tau" or decayChan=="2tau2b"):
+ evgenConfig.description = "POWHEG+Pythia8 H+jet production with NNLOPS and the A14 tune, H->aa->bbtautau mh=125 GeV"
+ evgenConfig.process = "ggH H->aa->bbtautau"
+ evgenConfig.contact = [ 'christopher.hayes@cern.ch','ljiljana.morvaj@cern.ch' ]
+
+if process=="VBF" and (decayChan=="2b2tau" or decayChan=="2tau2b"):
+ evgenConfig.description = "POWHEG+Pythia8 VBF H production, H->aa->bbtautau mh=125 GeV"
+ evgenConfig.process = "VBF H->aa->bbtautau"
+ evgenConfig.contact = [ 'christopher.hayes@cern.ch','ljiljana.morvaj@cern.ch' ]
+
+if process=="ggH" and (decayChan=="2y2g" or decayChan=="2g2y"):
+ evgenConfig.description = "POWHEG+Pythia8 H+jet production with NNLOPS and the A14 tune, H->aa->gamgamgg mh=125 GeV"
+ evgenConfig.process = "ggH H->aa->gamgamgg"
+ evgenConfig.contact = [ 'rubbo@cern.ch' ]
+
+if process=="VBF" and (decayChan=="2y2g" or decayChan=="2g2y"):
+ evgenConfig.description = "POWHEG+Pythia8 VBF H production, H->aa->gamgamgg mh=125 GeV"
+ evgenConfig.process = "VBF H->aa->gamgamgg"
+ evgenConfig.contact = [ 'rubbo@cern.ch' ]
+
+if process=="ggH" and (decayChan=="4mu"):
+ evgenConfig.description = "POWHEG+Pythia8 H+jet production with NNLOPS and the A14 tune, H->aa->4mu mh=125 GeV"
+ evgenConfig.process = "ggH H->aa->4mu"
+ evgenConfig.contact = [ 'roger.caminal.armadans@cern.ch' ]
+
+if process=="WpH" and decayChan=="4b":
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W+jet->l+vbbbarbbbar production"
+ evgenConfig.process = "WpH, H->aa->4b, W->lv"
+ evgenConfig.contact = [ 'roger.caminal.armadans@cern.ch' ]
+
+if process=="WmH" and decayChan=="4b":
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W-jet->l-vbbbarbbbar production"
+ evgenConfig.process = "WmH, H->aa->4b, W->lv"
+ evgenConfig.contact = [ 'roger.caminal.armadans@cern.ch' ]
+
+if process=="ZH" and decayChan=="4b":
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+Z+jet->l+l-bbbarbbbar production"
+ evgenConfig.process = "ZH, H->aa->4b, Z->ll"
+ evgenConfig.contact = [ 'roger.caminal.armadans@cern.ch' ]
+
+if process=="ggZH" and decayChan=="4b":
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 gg->H+Z+jet->l+l-bbbarbbbar production"
+ evgenConfig.process ="ggZH, H->2a->4b, Z->ll"
+ evgenConfig.contact = [ 'roger.caminal.armadans@cern.ch' ]
+
+if process=="ZH" and decayChan=="4g":
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+Z+jet->l+l-gggg production"
+ evgenConfig.process = "ZH, H->aa->4g, Z->ll"
+ evgenConfig.contact = [ 'bnachman@cern.ch' ]
+
+if process=="ggH" and decayChan=="4y":
+ evgenConfig.description = "POWHEG+Pythia8 H+jet production with NNLOPS and the A14 tune, H->aa->4\gamma mh=125 GeV"
+ evgenConfig.process = "ggH, H->aa->4y"
+ evgenConfig.contact = [ 'bnachman@cern.ch' ]
+
+#--------------------------------------------------------------
+# FILTERS (if needed)
+#--------------------------------------------------------------
+if partFilter=="filterXXYY" or partFilter=="filterlh" or partFilter=="filterll":
+ if not hasattr(filtSeq, "XtoVVDecayFilter"):
+ from GeneratorFilters.GeneratorFiltersConf import XtoVVDecayFilter
+ filtSeq += XtoVVDecayFilter()
+ if(partFilter=="filterlh" or partFilter=="filterll"):
+ filtSeq+= XtoVVDecayFilter("tauscalarFilter")
+# ## Add this filter to the algs required to be successful for streaming
+# if "XtoVVDecayFilter" not in StreamEVGEN.RequireAlgs:
+# StreamEVGEN.RequireAlgs += ["XtoVVDecayFilter"]
+ filtSeq.XtoVVDecayFilter.PDGGrandParent = 35
+ filtSeq.XtoVVDecayFilter.PDGParent = 36
+ filtSeq.XtoVVDecayFilter.StatusParent = 22
+ print [dict_pdgIds[decayProducts[0]]], [dict_pdgIds[decayProducts[1]]]
+ filtSeq.XtoVVDecayFilter.PDGChild1 = [dict_pdgIds[decayProducts[0]]]
+ filtSeq.XtoVVDecayFilter.PDGChild2 = [dict_pdgIds[decayProducts[1]]]
+ if(partFilter=="filterlh" or partFilter=="filterll"):
+ filtSeq.tauscalarFilter.PDGGrandParent = 36
+ filtSeq.tauscalarFilter.PDGParent = 15
+ filtSeq.tauscalarFilter.StatusParent = 2
+ filtSeq.tauscalarFilter.PDGChild1 = [11,13]
+ if partFilter=="filterll":
+ filtSeq.tauscalarFilter.PDGChild2 = [11,13]
+ elif partFilter=="filterlh":
+ filtSeq.tauscalarFilter.PDGChild2 = [111,130,211,221,223,310,311,321,323]
+
+elif partFilter=="filter2taulep2tauhad":
+ #from GeneratorFilters.GeneratorFiltersConf import FourTauLepLepHadHadFilter
+ #filtSeq += FourTauLepLepHadHadFilter()
+ from GeneratorFilters.GeneratorFiltersConf import TauFilter
+ lfvfilter = TauFilter("lfvfilter")
+ filtSeq += lfvfilter
+ filtSeq.lfvfilter.UseNewOptions = True
+ filtSeq.lfvfilter.Ntaus = 4
+ filtSeq.lfvfilter.Nleptaus = 2
+ filtSeq.lfvfilter.Nhadtaus = 2
+ filtSeq.lfvfilter.EtaMaxlep = 2.7
+ filtSeq.lfvfilter.EtaMaxhad = 2.7
+ filtSeq.lfvfilter.Ptcutlep = 3000.0 #MeV
+ filtSeq.lfvfilter.Ptcutlep_lead = 3000.0 #MeV
+ filtSeq.lfvfilter.Ptcuthad = 12500.0 #MeV
+ filtSeq.lfvfilter.Ptcuthad_lead = 12500.0 #MeV
diff --git a/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_VBFH_aa_2mu2tau.py b/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_VBFH_aa_2mu2tau.py
new file mode 100644
index 0000000000000000000000000000000000000000..3818c02341ef8b316f28f41401455426c63bc1d2
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_VBFH_aa_2mu2tau.py
@@ -0,0 +1,107 @@
+
+runconf=runArgs.jobConfig[0].split("_")
+A_Mass=runconf[3].replace("a","").replace("p",".")
+
+#--------------------------------------------------------------
+# Powheg ggH_quark_mass_effects setup
+#--------------------------------------------------------------
+include('PowhegControl/PowhegControl_VBF_H_Common.py')
+
+H_Mass = 125.0
+H_Width = 0.00407
+
+# Set Powheg variables, overriding defaults
+# Note: width_H will be overwritten in case of CPS.
+PowhegConfig.mass_H = H_Mass
+PowhegConfig.width_H = H_Width
+
+# CPS for the SM Higgs
+PowhegConfig.complexpolescheme = 1
+
+#
+PowhegConfig.withdamp = 1
+
+# Increase number of events requested to compensate for filter efficiency
+PowhegConfig.nEvents *= 2.
+
+# Generate Powheg events
+PowhegConfig.generateRunCard()
+PowhegConfig.generateEvents()
+
+
+#--------------------------------------------------------------
+# Modify the events.lhe, since Pythia doesn't like to decay the
+# SM higgs to BSM products: 25 --> 35
+#--------------------------------------------------------------
+
+import os, sys
+infile = 'PowhegOTF._1.events'
+f1 = open( infile )
+newfile = infile+'.temp'
+f2 = open(newfile,'w')
+for line in f1:
+ if line.startswith(' 25 1'):
+ f2.write(line.replace(' 25 1',' 35 1'))
+ else:
+ f2.write(line)
+f1.close()
+f2.close()
+os.system('mv %s %s '%(infile, infile+'.old') )
+os.system('mv %s %s '%(newfile, infile) )
+
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_AZNLO_CTEQ6L1_EvtGen_Common.py')
+#--------------------------------------------------------------
+# Pythia8 main31 matching
+#--------------------------------------------------------------
+#include('Pythia8_i/Pythia8_Powheg_Main31.py')
+genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+#--------------------------------------------------------------
+# Higgs->bbar at Pythia8
+#--------------------------------------------------------------
+H_Mass = 125.0
+H_Width = 0.00407
+A_Width = ( float(A_Mass) / 100. ) * 0.1 #100 MeV width for 100 GeV a
+A_MassMin = float(A_Mass) - 100*float(A_Width)
+A_MassMax = float(A_Mass) + 100*float(A_Width)
+genSeq.Pythia8.Commands += [
+ 'Higgs:useBSM = on',
+
+ '35:m0 = '+str(H_Mass),
+ '35:mWidth = '+str(H_Width),
+ '35:doForceWidth = on',
+ '35:onMode = off',
+ '35:onIfMatch = 36 36', # h->aa
+
+ '36:onMode = off', # decay of the a
+ '36:oneChannel = 1 0.5 100 15 -15', #a->tautau
+ '36:addChannel = 1 0.5 100 13 -13', #a->mumu
+ '36:m0 = '+str(A_Mass), #scalar mass
+ '36:mWidth = '+str(A_Width), # narrow width
+ '36:mMin = '+str(A_MassMin), # narrow width
+ '36:mMax = '+str(A_MassMax), # narrow width
+ '36:tau0 0', #lifetime
+ ]
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+MiNLO+Pythia8 VBF H->aa->2mu2tau production, ma = %s GeV" % A_Mass
+evgenConfig.keywords = [ "BSM", "Higgs", "BSMHiggs", "mH125", "VBF" ]
+evgenConfig.contact = [ 'benjamin.kaplan@cern.ch' ]
+evgenConfig.generators = [ "Powheg", "Pythia8", "EvtGen"]
+
+if not hasattr(genSeq, "XtoVVDecayFilter"):
+ from GeneratorFilters.GeneratorFiltersConf import XtoVVDecayFilter
+ genSeq += XtoVVDecayFilter()
+
+### Add this filter to the algs required to be successful for streaming
+#if "XtoVVDecayFilter" not in StreamEVGEN.RequireAlgs:
+# StreamEVGEN.RequireAlgs += ["XtoVVDecayFilter"]
+genSeq.XtoVVDecayFilter.PDGGrandParent = 35
+genSeq.XtoVVDecayFilter.PDGParent = 36
+genSeq.XtoVVDecayFilter.StatusParent = 22
+genSeq.XtoVVDecayFilter.PDGChild1 = [13]
+genSeq.XtoVVDecayFilter.PDGChild2 = [15]
diff --git a/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_ZH_n1n2_n1a_bbMET.py b/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_ZH_n1n2_n1a_bbMET.py
new file mode 100644
index 0000000000000000000000000000000000000000..c506c2d2173fd440b40e158ecccd4b16cbfe1755
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_ZH_n1n2_n1a_bbMET.py
@@ -0,0 +1,130 @@
+
+runconf=runArgs.jobConfig[0].split("_")
+LepFlavor=runconf[2].replace("Z","").replace("H","")
+A_Mass=runconf[6].replace("p",".")
+N1_Mass=runconf[7].replace("p",".")
+N2_Mass=runconf[8].replace("p",".").replace("..y","")
+
+#--------------------------------------------------------------
+# POWHEG+MiNLO+Pythia8 H+W+jet->mu-vmubbar production
+#--------------------------------------------------------------
+include('PowhegControl/PowhegControl_HZj_Common.py')
+
+PowhegConfig.ncall1 = 20000
+PowhegConfig.ncall2 = 10000
+
+PowhegConfig.runningscales = 1 # CHECK
+if( LepFlavor=="ee" ):
+ PowhegConfig.vdecaymode = 1
+if( LepFlavor=="mumu" ):
+ PowhegConfig.vdecaymode = 2
+if( LepFlavor=="tautau" ):
+ PowhegConfig.vdecaymode = 3
+PowhegConfig.hdecaymode = -1
+
+PowhegConfig.bornktmin = 0.26 # settings suggested for pTV reweighting
+PowhegConfig.bornsuppfact = 0.00001
+#PowhegConfig.ptVhigh = 120 # step-wise pTV reweighting
+#PowhegConfig.ptVlow = 200
+#PowhegConfig.Vstep = 10
+
+PowhegConfig.withnegweights = 1 # allow neg. weighted events
+PowhegConfig.doublefsr = 1
+
+#PowhegConfig.storeinfo_rwgt = 1 # store info for PDF / scales variations reweighting
+#PowhegConfig.PDF = range( 10800, 10853 ) # CT10 PDF variations
+#PowhegConfig.mu_F = [ 1.0, 1.0, 1.0, 0.5, 0.5, 0.5, 2.0, 2.0, 2.0 ] # scale variations: first pair is the nominal setting
+#PowhegConfig.mu_R = [ 1.0, 0.5, 2.0, 1.0, 0.5, 2.0, 1.0, 0.5, 2.0 ]
+
+PowhegConfig.nEvents *= 2.2
+
+PowhegConfig.generateRunCard()
+PowhegConfig.generateEvents()
+
+
+#--------------------------------------------------------------
+# Modify the events.lhe, since Pythia doesn't like to decay the
+# SM higgs to BSM products: 25 --> 35
+#--------------------------------------------------------------
+
+import os, sys
+infile = 'PowhegOTF._1.events'
+f1 = open( infile )
+newfile = infile+'.temp'
+f2 = open(newfile,'w')
+for line in f1:
+ if line.startswith(' 25 1'):
+ f2.write(line.replace(' 25 1',' 35 1'))
+ else:
+ f2.write(line)
+f1.close()
+f2.close()
+os.system('mv %s %s '%(infile, infile+'.old') )
+os.system('mv %s %s '%(newfile, infile) )
+
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_AZNLO_CTEQ6L1_EvtGen_Common.py')
+#--------------------------------------------------------------
+# Pythia8 main31 matching
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_Powheg_Main31.py')
+genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+#--------------------------------------------------------------
+# Higgs->bbar at Pythia8
+#--------------------------------------------------------------
+H_Mass = 125.0
+H_Width = 0.00407
+A_Width = ( float(A_Mass) / 100. ) * 0.001 #1 MeV width for 100 GeV a
+A_MassMin = float(A_Mass) - 100*float(A_Width)
+A_MassMax = float(A_Mass) + 100*float(A_Width)
+genSeq.Pythia8.Commands += [
+ 'Higgs:useBSM = on',
+
+ '35:m0 = '+str(H_Mass),
+ '35:mWidth = '+str(H_Width),
+ '35:doForceWidth = on',
+ '35:onMode = off',
+ '35:oneChannel = 1 1 100 1000023 1000022',
+
+ '1000023:onMode = off',
+ '1000023:oneChannel = 1 1 100 36 1000022',
+ '1000023:m0 = '+str(N2_Mass),
+ '1000023:tau0 0',
+
+ '1000022:onMode = off',
+ '1000022:m0 = '+str(N1_Mass),
+ '1000022:tau0 0',
+
+ '36:onMode = off', # decay of the a
+ '36:onIfAny = 5', # decay a->bb
+ '36:m0 = '+str(A_Mass), #scalar mass
+ '36:mWidth = '+str(A_Width), # narrow width
+ '36:mMin = '+str(A_MassMin), # narrow width
+ '36:mMax = '+str(A_MassMax), # narrow width
+ '36:tau0 0', #lifetime
+ ]
+
+#if not hasattr( filtSeq, "MultiLeptonFilter" ):
+# from GeneratorFilters.GeneratorFiltersConf import MultiLeptonFilter
+# filtSeq += MultiLeptonFilter()
+# pass
+
+#MultiLeptonFilter = filtSeq.MultiLeptonFilter
+#MultiLeptonFilter.Ptcut = 10000.
+#MultiLeptonFilter.Etacut = 4.0
+#MultiLeptonFilter.NLeptons = 2
+
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+Z+jet production, H->N1N2;N2->N1a, ma(%s), mN2(%s), mN1(%s)" % ( A_Mass, N2_Mass, N1_Mass )
+evgenConfig.keywords = [ "BSM", "Higgs", "BSMHiggs", "mH125" ]
+evgenConfig.contact = [ 'benjamin.kaplan@cern.ch' ]
+evgenConfig.generators = [ "Powheg", "Pythia8", "EvtGen"]
+evgenConfig.minevents = 5000
+
+
diff --git a/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_ggH_aa_2mu2tau.py b/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_ggH_aa_2mu2tau.py
new file mode 100644
index 0000000000000000000000000000000000000000..7523f7f6543cde90a571f3ad7f1399c1615d40e5
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegPythia8EvtGenControl_BSM_ggH_aa_2mu2tau.py
@@ -0,0 +1,126 @@
+
+runconf=runArgs.jobConfig[0].split("_")
+A_Mass=runconf[3].replace("a","").replace("p",".")
+
+#--------------------------------------------------------------
+# Powheg ggH_quark_mass_effects setup
+#--------------------------------------------------------------
+include('PowhegControl/PowhegControl_ggF_H_Common.py')
+
+# Set Powheg variables, overriding defaults
+# Note: width_H will be overwritten in case of CPS.
+PowhegConfig.mass_H = 125.
+PowhegConfig.width_H = 0.00407
+
+# Turn on the heavy quark effect
+PowhegConfig.use_massive_b = True
+PowhegConfig.use_massive_c = True
+
+# Complex pole scheme or not (1 for NWA and 3(CPS) for SM)
+PowhegConfig.bwshape = 3
+
+# Dynamical scale (sqrt(pT(H)^2+mH^2) real emission contributions)
+# Note: r2330 does not support this option. please use newer versions.
+PowhegConfig.runningscale = 2
+
+# EW correction
+if PowhegConfig.mass_H <= 1000.:
+ PowhegConfig.ew = 1
+else:
+ PowhegConfig.ew = 0
+
+# Set scaling and masswindow parameters
+hfact_scale = 1.2
+masswindow_max = 30.
+
+# Calculate an appropriate masswindow and hfact
+masswindow = masswindow_max
+if PowhegConfig.mass_H <= 700.:
+ masswindow = min( (1799.9 - PowhegConfig.mass_H) / PowhegConfig.width_H, masswindow )
+else:
+ masswindow = min( (1999.9 - PowhegConfig.mass_H) / PowhegConfig.width_H, masswindow )
+PowhegConfig.masswindow = masswindow
+PowhegConfig.hfact = PowhegConfig.mass_H / hfact_scale
+
+# Increase number of events requested to compensate for filter efficiency
+PowhegConfig.nEvents *= 10.
+
+PowhegConfig.generateRunCard()
+PowhegConfig.generateEvents()
+
+#--------------------------------------------------------------
+# Modify the events.lhe, since Pythia doesn't like to decay the
+# SM higgs to BSM products: 25 --> 35
+#--------------------------------------------------------------
+
+import os, sys
+infile = 'PowhegOTF._1.events'
+f1 = open( infile )
+newfile = infile+'.temp'
+f2 = open(newfile,'w')
+for line in f1:
+ if line.startswith(' 25 1'):
+ f2.write(line.replace(' 25 1',' 35 1'))
+ else:
+ f2.write(line)
+f1.close()
+f2.close()
+os.system('mv %s %s '%(infile, infile+'.old') )
+os.system('mv %s %s '%(newfile, infile) )
+
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_AZNLO_CTEQ6L1_EvtGen_Common.py')
+#--------------------------------------------------------------
+# Pythia8 main31 matching
+#--------------------------------------------------------------
+#include('Pythia8_i/Pythia8_Powheg_Main31.py')
+genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 1']
+#--------------------------------------------------------------
+# Higgs->bbar at Pythia8
+#--------------------------------------------------------------
+H_Mass = 125.0
+H_Width = 0.00407
+A_Width = ( float(A_Mass) / 100. ) * 0.1 #100 MeV width for 100 GeV a
+A_MassMin = float(A_Mass) - 100*float(A_Width)
+A_MassMax = float(A_Mass) + 100*float(A_Width)
+genSeq.Pythia8.Commands += [
+ 'Higgs:useBSM = on',
+
+ '35:m0 = '+str(H_Mass),
+ '35:mWidth = '+str(H_Width),
+ '35:doForceWidth = on',
+ '35:onMode = off',
+ '35:onIfMatch = 36 36', # h->aa
+
+ '36:onMode = off', # decay of the a
+ '36:oneChannel = 1 0.5 100 15 -15', #a->tautau
+ '36:addChannel = 1 0.5 100 13 -13', #a->mumu
+ '36:m0 = '+str(A_Mass), #scalar mass
+ '36:mWidth = '+str(A_Width), # narrow width
+ '36:mMin = '+str(A_MassMin), # narrow width
+ '36:mMax = '+str(A_MassMax), # narrow width
+ '36:tau0 0', #lifetime
+ ]
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+MiNLO+Pythia8 ggF H->aa->2mu2tau production, ma = %s GeV" % A_Mass
+evgenConfig.keywords = [ "BSM", "Higgs", "BSMHiggs", "mH125" ]
+evgenConfig.contact = [ 'benjamin.kaplan@cern.ch' ]
+evgenConfig.generators = [ "Powheg", "Pythia8", "EvtGen"]
+
+if not hasattr(genSeq, "XtoVVDecayFilter"):
+ from GeneratorFilters.GeneratorFiltersConf import XtoVVDecayFilter
+ genSeq += XtoVVDecayFilter()
+
+### Add this filter to the algs required to be successful for streaming
+#if "XtoVVDecayFilter" not in StreamEVGEN.RequireAlgs:
+# StreamEVGEN.RequireAlgs += ["XtoVVDecayFilter"]
+genSeq.XtoVVDecayFilter.PDGGrandParent = 35
+genSeq.XtoVVDecayFilter.PDGParent = 36
+genSeq.XtoVVDecayFilter.StatusParent = 22
+genSeq.XtoVVDecayFilter.PDGChild1 = [13]
+genSeq.XtoVVDecayFilter.PDGChild2 = [15]
diff --git a/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_H2a4X_ctauY.py b/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_H2a4X_ctauY.py
new file mode 100644
index 0000000000000000000000000000000000000000..200e43a230edbdcab0582c2292e7a3ea30dbe223
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_H2a4X_ctauY.py
@@ -0,0 +1,317 @@
+#--------------------------------------------------------------
+# Modify the events.lhe, since Pythia doesn't like to decay the
+# SM higgs to BSM products: 25 --> 35
+#--------------------------------------------------------------
+
+#evgenConfig.inputfilecheck = "TXT"
+#evgenConfig.inputfilecheck = "merged_lhef"
+
+import os, sys, glob
+for f in glob.glob("*.events"):
+ infile = f
+ f1 = open( infile )
+ newfile = infile+'.temp'
+ f2 = open(newfile,'w')
+ for line in f1:
+ if line.startswith(' 25 1'):
+ f2.write(line.replace(' 25 1',' 35 1'))
+ else:
+ f2.write(line)
+ f1.close()
+ f2.close()
+ os.system('mv %s %s '%(infile, infile+'.old') )
+ os.system('mv %s %s '%(newfile, infile) )
+
+nProcess = -1 # 0: WpH, 1: WmH, 2: ZH, 3: ggZH
+ma = 0. # 15, 55 GeV
+adecay = 0 # 2, 5, 15
+ctau = 0. # 1, 10, 100 mm
+
+# a->bb
+if runArgs.runNumber==309851: # WpH, ma=15GeV, a->bb, ctau=1mm
+ nProcess = 0
+ ma = 15.
+ ctau = 1.
+ adecay = 5
+elif runArgs.runNumber==309852: # WpH, ma=55GeV, a->bb, ctau=1mm
+ nProcess = 0
+ ma = 55.
+ ctau = 1.
+ adecay = 5
+elif runArgs.runNumber==309853: # WpH, ma=15GeV, a->bb, ctau=10mm
+ nProcess = 0
+ ma = 15.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==309854: # WpH, ma=55GeV, a->bb, ctau=10mm
+ nProcess = 0
+ ma = 55.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==309855: # WpH, ma=15GeV, a->bb, ctau=100mm
+ nProcess = 0
+ ma = 15.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==309856: # WpH, ma=55GeV, a->bb, ctau=100mm
+ nProcess = 0
+ ma = 55.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==309857: # WmH, ma=15GeV, a->bb, ctau=1mm
+ nProcess = 1
+ ma = 15.
+ ctau = 1.
+ adecay = 5
+elif runArgs.runNumber==309858: # WmH, ma=55GeV, a->bb, ctau=1mm
+ nProcess = 1
+ ma = 55.
+ ctau = 1.
+ adecay = 5
+elif runArgs.runNumber==309859: # WmH, ma=15GeV, a->bb, ctau=10mm
+ nProcess = 1
+ ma = 15.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==309860: # WmH, ma=55GeV, a->bb, ctau=10mm
+ nProcess = 1
+ ma = 55.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==309861: # WmH, ma=15GeV, a->bb, ctau=100mm
+ nProcess = 1
+ ma = 15.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==309862: # WmH, ma=55GeV, a->bb, ctau=100mm
+ nProcess = 1
+ ma = 55.
+ ctau = 100.
+ adecay = 5
+
+# a->tautau
+elif runArgs.runNumber==309863: # WpH, ma=55GeV, a->tautau, ctau=100mm
+ nProcess = 0
+ ma = 55.
+ ctau = 100.
+ adecay = 15
+elif runArgs.runNumber==309864: # WmH, ma=55GeV, a->tautau, ctau=100mm
+ nProcess = 1
+ ma = 55.
+ ctau = 100.
+ adecay = 15
+
+# a->uu
+elif runArgs.runNumber==309865: # WpH, ma=55GeV, a->uu, ctau=100mm
+ nProcess = 0
+ ma = 55.
+ ctau = 100.
+ adecay = 2
+elif runArgs.runNumber==309866: # WmH, ma=55GeV, a->uu, ctau=100mm
+ nProcess = 1
+ ma = 55.
+ ctau = 100.
+ adecay = 2
+
+# ZH, a->bb
+elif runArgs.runNumber==312932: # ZH, ma=15GeV, a->bb, ctau=10mm
+ nProcess = 2
+ ma = 15.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312933: # ZH, ma=15GeV, a->bb, ctau=100mm
+ nProcess = 2
+ ma = 15.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312934: # ZH, ma=15GeV, a->bb, ctau=1000mm
+ nProcess = 2
+ ma = 15.
+ ctau = 1000.
+ adecay = 5
+elif runArgs.runNumber==312935: # ZH, ma=25GeV, a->bb, ctau=10mm
+ nProcess = 2
+ ma = 25.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312936: # ZH, ma=25GeV, a->bb, ctau=100mm
+ nProcess = 2
+ ma = 25.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312937: # ZH, ma=25GeV, a->bb, ctau=1000mm
+ nProcess = 2
+ ma = 25.
+ ctau = 1000.
+ adecay = 5
+elif runArgs.runNumber==312938: # ZH, ma=35GeV, a->bb, ctau=10mm
+ nProcess = 2
+ ma = 35.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312939: # ZH, ma=35GeV, a->bb, ctau=100mm
+ nProcess = 2
+ ma = 35.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312940: # ZH, ma=35GeV, a->bb, ctau=1000mm
+ nProcess = 2
+ ma = 35.
+ ctau = 1000.
+ adecay = 5
+elif runArgs.runNumber==312941: # ZH, ma=55GeV, a->bb, ctau=10mm
+ nProcess = 2
+ ma = 55.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312942: # ZH, ma=55GeV, a->bb, ctau=100mm
+ nProcess = 2
+ ma = 35.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312943: # ZH, ma=55GeV, a->bb, ctau=1000mm
+ nProcess = 2
+ ma = 55.
+ ctau = 1000.
+ adecay = 5
+elif runArgs.runNumber==312944: # ggZH, ma=15GeV, a->bb, ctau=10mm
+ nProcess = 3
+ ma = 15.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312945: # ggZH, ma=15GeV, a->bb, ctau=100mm
+ nProcess = 3
+ ma = 15.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312946: # ggZH, ma=15GeV, a->bb, ctau=1000mm
+ nProcess = 3
+ ma = 15.
+ ctau = 1000.
+ adecay = 5
+elif runArgs.runNumber==312947: # ggZH, ma=25GeV, a->bb, ctau=10mm
+ nProcess = 3
+ ma = 25.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312948: # ggZH, ma=25GeV, a->bb, ctau=100mm
+ nProcess = 3
+ ma = 25.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312949: # ggZH, ma=25GeV, a->bb, ctau=1000mm
+ nProcess = 3
+ ma = 25.
+ ctau = 1000.
+ adecay = 5
+elif runArgs.runNumber==312950: # ggZH, ma=35GeV, a->bb, ctau=10mm
+ nProcess = 3
+ ma = 35.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312951: # ggZH, ma=35GeV, a->bb, ctau=100mm
+ nProcess = 3
+ ma = 35.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312952: # ggZH, ma=35GeV, a->bb, ctau=1000mm
+ nProcess = 3
+ ma = 35.
+ ctau = 1000.
+ adecay = 5
+elif runArgs.runNumber==312953: # ggZH, ma=55GeV, a->bb, ctau=10mm
+ nProcess = 3
+ ma = 55.
+ ctau = 10.
+ adecay = 5
+elif runArgs.runNumber==312954: # ggZH, ma=55GeV, a->bb, ctau=100mm
+ nProcess = 3
+ ma = 55.
+ ctau = 100.
+ adecay = 5
+elif runArgs.runNumber==312955: # ggZH, ma=55GeV, a->bb, ctau=1000mm
+ nProcess = 3
+ ma = 55.
+ ctau = 1000.
+ adecay = 5
+
+#--------------------------------------------------------------
+# Pythia8 showering
+#--------------------------------------------------------------
+include('Pythia8_i/Pythia8_AZNLO_CTEQ6L1_EvtGen_Common.py')
+#--------------------------------------------------------------
+# Pythia8 main31 matching
+#--------------------------------------------------------------
+
+if nProcess==0:
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+elif nProcess==1:
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+elif nProcess==2:
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 3']
+elif nProcess==3:
+ genSeq.Pythia8.UserModes += [ 'Main31:NFinal = 2']
+
+#--------------------------------------------------------------
+# Higgs->bbar at Pythia8
+#--------------------------------------------------------------
+genSeq.Pythia8.Commands += [
+ 'Higgs:useBSM = on',
+
+ '35:m0 = 125',
+ '35:mWidth = 0.00407',
+ '35:doForceWidth = on',
+ '35:onMode = off',
+ '35:onIfMatch = 36 36', # h->aa
+
+ '36:onMode = off', # decay of the a
+ '36:onIfAny = %d' % adecay, # decay a->XX
+ '36:m0 = %.1f' % ma, #scalar mass
+ '36:mMin = 0',
+ '36:tau0 = %.1f' % ctau, #nominal proper lifetime (in mm/c)
+ ]
+
+genSeq.Pythia8.Commands = [i for i in genSeq.Pythia8.Commands if (("limitTau0" not in i) and ("tau0Max" not in i))]
+genSeq.Pythia8.Commands += [
+ 'ParticleDecays:tau0Max = 100000.0',
+ 'ParticleDecays:limitTau0 = off'
+ ]
+
+testSeq.TestHepMC.MaxTransVtxDisp = 100000000 #in mm
+testSeq.TestHepMC.MaxVtxDisp = 100000000 #in mm
+
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+if nProcess==0:
+ if adecay==5:
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W+jet->l+vbbbarbbbar production"
+ evgenConfig.process = "WpH, H->2a->4b, W->lv"
+ elif adecay==15:
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W+jet->l+vtau+tau-tau+tau- production"
+ evgenConfig.process = "WpH, H->2a->4tau, W->lv"
+ elif adecay==2:
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W+jet->l+vuubaruubar production"
+ evgenConfig.process = "WpH, H->2a->4u, W->lv"
+elif nProcess==1:
+ if adecay==5:
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W+jet->l-vbbbarbbbar production"
+ evgenConfig.process = "WmH, H->2a->4b, W->lv"
+ elif adecay==15:
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W+jet->l-vtau+tau-tau+tau- production"
+ evgenConfig.process = "WmH, H->2a->4tau, W->lv"
+ elif adecay==2:
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+W+jet->l-vuubaruubar production"
+ evgenConfig.process = "WmH, H->2a->4u, W->lv"
+elif nProcess==2:
+ if adecay==5:
+ evgenConfig.description = "POWHEG+MiNLO+Pythia8 H+Z+jet->l+l-bbbarbbbar production"
+ evgenConfig.process = "ZH, H->aa->4b, Z->ll"
+elif nProcess==3:
+ if adecay==5:
+ evgenConfig.description = "POWHEG+Pythia8 gg->H+Z->l+l-bbbarbbbar production"
+ evgenConfig.process = "gg->ZH, H->aa->4b, Z->ll"
+evgenConfig.keywords = [ "BSM", "Higgs", "BSMHiggs", "mH125"]
+evgenConfig.contact = [ 'manfredi.ronzani@cern.ch' ]
+evgenConfig.minevents = 50
diff --git a/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_jetjet.py b/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_jetjet.py
new file mode 100644
index 0000000000000000000000000000000000000000..f2f31b4b78ddd637f2e988c533ed576ceca3c584
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_jetjet.py
@@ -0,0 +1,71 @@
+# This includes the setting of random seeds and c.o.m. energy
+include('PowhegControl/PowhegControl_Dijet_Common.py')
+PowhegConfig.bornktmin = int(runArgs.runNumber)
+PowhegConfig.pdf = 11000
+
+ktmin = { 1:2 , 2:5 , 3:15 , 4:30 , 5:75 , 6:150 , 7:250 ,
+ 8:750 , 9:1250 }
+supp = { 1:60 , 2:160 , 3:400 , 4:800 , 5:1800 , 6:3200 ,
+ 7:5300 , 8:9000 , 9:11000 }
+
+theRun = int(runArgs.runNumber)%10
+theEnergy = int(runArgs.ecmEnergy)/1000
+PowhegConfig.bornktmin = ktmin[ theRun ]
+PowhegConfig.bornsuppfact = supp[ theRun ]
+
+# Just 22k to make 20k output
+# 22k = 5-7 hrs on a batch node; can do up to 3x as many
+if theRun in [1,2,3]: PowhegConfig.nEvents = 12000
+if theRun in [4]: PowhegConfig.nEvents = 22000
+if theRun in [5]: PowhegConfig.nEvents = 33000
+if theRun in [6,7]: PowhegConfig.nEvents = 66000
+if theRun in [8]: PowhegConfig.nEvents = 55000
+if theRun in [9]: PowhegConfig.nEvents = 36000
+
+# for energy [7,8] we ned to reduce the number of input events
+if theEnergy in [7,8] and theRun in [5]: PowhegConfig.nEvents = 20000
+if theEnergy in [7,8] and theRun in [6,7]: PowhegConfig.nEvents = 40000
+if theEnergy in [7,8] and theRun in [8]: PowhegConfig.nEvents = 30000
+
+print PowhegConfig
+
+#PowhegConfig.generateRunCard()
+#PowhegConfig.generateEvents()
+
+PowhegConfig.generate()
+
+##--------------------------------------------------------------
+## EVGEN transform
+##--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 dijet production with bornktmin = %i GeV, bornsuppfact = %i GeV, muR=muF=1"%(PowhegConfig.bornktmin,PowhegConfig.bornsuppfact)
+evgenConfig.keywords = [ "QCD", "dijet", "jets", "SM" ]
+evgenConfig.contact = [ "ZLMarshall@lbl.gov" ]
+evgenConfig.generators += [ "Pythia8" ]
+
+# For JZ 1-6 this is no problem
+evgenConfig.minevents = 5000
+# For JZ 7 things are a bit tighter
+if theRun in [7]: evgenConfig.minevents = 3000
+# For the remainder, it's way tight
+if theRun in [8]: evgenConfig.minevents = 1000
+if theRun in [9]: evgenConfig.minevents = 200
+
+if theEnergy in [7,8]:
+ if theRun in [4]: evgenConfig.minevents = 4000
+ if theRun in [5]: evgenConfig.minevents = 1000
+ if theRun in [6]: evgenConfig.minevents = 200
+ if theRun in [7]: evgenConfig.minevents = 100
+
+##--------------------------------------------------------------
+## Pythia8 showering with new, main31-style shower
+##--------------------------------------------------------------
+include('Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
+include("Pythia8_i/Pythia8_Powheg_Main31.py")
+
+# Add the jet filter
+include("GeneratorFilters/JetFilter_JZ%i.py"%(theRun))
+# Make J9 inclusive
+if 9==theRun: filtSeq.QCDTruthJetFilter.MaxPt = -1
+
+evgenConfig.inputconfcheck = "jetjet_J%i"%(theRun)
+
diff --git a/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_jetjet_R04.py b/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_jetjet_R04.py
new file mode 100644
index 0000000000000000000000000000000000000000..5b51ccf0275a362a6756ece2936e1a69f2c2d786
--- /dev/null
+++ b/Generators/PowhegControl/share/common/PowhegPythia8EvtGen_jetjet_R04.py
@@ -0,0 +1,58 @@
+# This includes the setting of random seeds and c.o.m. energy
+include('PowhegControl/PowhegControl_Dijet_Common.py')
+PowhegConfig.bornktmin = int(runArgs.runNumber)
+PowhegConfig.pdf = 11000
+
+ktmin = { 0:2, 1:2 , 2:5 , 3:15 , 4:30 , 5:75 , 6:150 , 7:250 ,
+ 8:750 , 9:1250 }
+supp = { 0:20, 1:60 , 2:160 , 3:400 , 4:800 , 5:1800 , 6:3200 ,
+ 7:5300 , 8:9000 , 9:11000 }
+
+theRun = int(runArgs.runNumber)%10
+PowhegConfig.bornktmin = ktmin[ theRun ]
+PowhegConfig.bornsuppfact = supp[ theRun ]
+
+# Modified slices 3-5 to produce enough events for Pythia
+if theRun in [0,1,2,3]: PowhegConfig.nEvents = 15000
+if theRun in [4]: PowhegConfig.nEvents = 30000
+if theRun in [5]: PowhegConfig.nEvents = 45000
+# below values not tested
+if theRun in [6,7]: PowhegConfig.nEvents = 66000
+if theRun in [8]: PowhegConfig.nEvents = 55000
+if theRun in [9]: PowhegConfig.nEvents = 36000
+
+print PowhegConfig
+
+PowhegConfig.generateRunCard()
+PowhegConfig.generateEvents()
+
+##--------------------------------------------------------------
+## EVGEN transform
+##--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 dijet production with bornktmin = %i GeV, bornsuppfact = %i GeV, muR=muF=1"%(PowhegConfig.bornktmin,PowhegConfig.bornsuppfact)
+evgenConfig.keywords = [ "QCD", "dijet", "jets", "SM" ]
+evgenConfig.contact = [ "ZLMarshall@lbl.gov" ]
+evgenConfig.generators += [ "Pythia8" ]
+
+# For JZ 1-3 this is no problem
+evgenConfig.minevents = 5000
+if theRun in [4]: evgenConfig.minevents = 1000
+if theRun in [5]: evgenConfig.minevents = 500
+# below values not tested
+if theRun in [6]: evgenConfig.minevents = 500
+if theRun in [7]: evgenConfig.minevents = 500
+if theRun in [8]: evgenConfig.minevents = 500
+if theRun in [9]: evgenConfig.minevents = 200
+
+##--------------------------------------------------------------
+## Pythia8 showering with new, main31-style shower
+##--------------------------------------------------------------
+include('Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
+include("Pythia8_i/Pythia8_Powheg_Main31.py")
+
+# Add the jet filter
+include("GeneratorFilters/JetFilter_JZ%iR04.py"%(theRun))
+# Make J9 inclusive
+if 9==theRun: filtSeq.QCDTruthJetFilter.MaxPt = -1
+
+evgenConfig.inputconfcheck = "jetjet_JZ%i"%(theRun)
diff --git a/Generators/PowhegControl/share/common/Powheg_tt_mtop_common.py b/Generators/PowhegControl/share/common/Powheg_tt_mtop_common.py
new file mode 100644
index 0000000000000000000000000000000000000000..de924d351c6fd1c16d1a33ea125e594446df124d
--- /dev/null
+++ b/Generators/PowhegControl/share/common/Powheg_tt_mtop_common.py
@@ -0,0 +1,161 @@
+#---------------------------------------------------------------------------------------------------
+# Common generator script for b-filtered non-standard top mass samples
+#---------------------------------------------------------------------------------------------------
+def parseargs(runArgs):
+ # function for parsing the Generate_tf.py arguments
+ options = {}
+ if not hasattr(runArgs,'runNumber'):
+ raise RuntimeError('no runNumber supplied as argument')
+ else:
+ options['runNumber'] = runArgs.runNumber
+
+ if hasattr(runArgs,'ecmEnergy'):
+ options['beamEnergy'] = runArgs.ecmEnergy / 2.
+ else:
+ raise RuntimeError('No center of mass energy found.')
+
+ if hasattr(runArgs,'maxEvents') and runArgs.maxEvents > 0:
+ options['nevents']=runArgs.maxEvents
+ else:
+ raise RuntimeError('No maxEvents provided.')
+
+ if hasattr(runArgs,'randomSeed'):
+ options['randomSeed'] = runArgs.randomSeed
+ else:
+ raise RuntimeError('No random seed provided.')
+
+ if hasattr(runArgs,'inputGeneratorFile'):
+ options['lheFile'] = runArgs.inputGeneratorFile
+ else:
+ options['lheFile'] = ''
+ return options
+
+# get arguments
+options = parseargs(runArgs=runArgs)
+
+# get showering algorithm based on DSID
+herwigDSIDs = range(411125,411143)
+isHerwig = options['runNumber'] in herwigDSIDs
+pythiaDSIDs = range(411143,411162)
+isPythia = options['runNumber'] in pythiaDSIDs
+if not isHerwig and not isPythia:
+ raise RuntimeError('runNumber {0:d} not recognised in these jobOptions.'.format(options['runNumber']))
+
+# get top mass and width based on DSID
+dsidModEighteen = (options['runNumber']-411125) % 18
+
+if dsidModEighteen==0 or dsidModEighteen==1:
+ mtop = 169.0
+ widthtop = 1.228
+elif dsidModEighteen==2 or dsidModEighteen==3:
+ mtop = 171.0
+ widthtop = 1.280
+elif dsidModEighteen==4 or dsidModEighteen==5:
+ mtop = 172.0
+ widthtop = 1.306
+elif dsidModEighteen==6 or dsidModEighteen==7:
+ mtop = 172.25
+ widthtop = 1.313
+elif dsidModEighteen==8 or dsidModEighteen==9:
+ mtop = 172.5
+ widthtop = 1.320
+elif dsidModEighteen==10 or dsidModEighteen==11:
+ mtop = 172.75
+ widthtop = 1.326
+elif dsidModEighteen==12 or dsidModEighteen==13:
+ mtop = 173.0
+ widthtop = 1.333
+elif dsidModEighteen==14 or dsidModEighteen==15:
+ mtop = 174.0
+ widthtop = 1.360
+elif dsidModEighteen==16 or dsidModEighteen==17:
+ mtop = 176.0
+ widthtop = 1.415
+
+# get b or anti-b based on DSID
+if options['runNumber'] % 2 == 0:
+ isbottom = True
+else:
+ isbottom = False
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.keywords = [ 'SM', 'top', 'ttbar', 'lepton', 'Jpsi' ]
+evgenConfig.contact = [ 'derue@lpnhe.in2p3.fr', 'burton@utexas.edu' ]
+evgenConfig.generators += [ 'Powheg', 'EvtGen' ]
+evgenConfig.minevents = 2000
+if isPythia:
+ evgenConfig.generators += ['Pythia8']
+ evgenConfig.description = 'POWHEG+Pythia8 ttbar production with Powheg hdamp equal 1.5*top mass, \
+ A14 tune, A14 NNPDF23 LO, ME NNPDF30 NLO, at least one lepton, \
+ Jpsi->mumu filter.'
+if isHerwig:
+ evgenConfig.generators += ['Herwig7']
+ evgenConfig.tune = "MMHT2014"
+ evgenConfig.description = 'POWHEG+Herwig704 ttbar production with Powheg hdamp equal 1.5*top mass, \
+ H7UE tune, single lepton filter, ME NNPDF30 NLO, H7UE MMHT2014 LO at \
+ least one lepton, Jpsi->mumu filter.'
+
+#--------------------------------------------------------------
+# Powheg matrix element
+#--------------------------------------------------------------
+if options['lheFile'] is '':
+ include('PowhegControl/PowhegControl_tt_Common.py')
+ # Initial settings
+ PowhegConfig.decay_mode = "t t~ > all" # inclusive decay
+ PowhegConfig.mass_t = mtop
+ PowhegConfig.width_t = widthtop
+ PowhegConfig.hdamp = 1.5*mtop
+ PowhegConfig.PDF = 260000 # NNPDF30
+ PowhegConfig.nEvents *= 10. # compensate filter efficiency
+ PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Showering
+#--------------------------------------------------------------
+if isPythia: # Pythia8 (A14) showering
+ include('Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
+ include("Pythia8_i/Pythia8_Powheg_Main31.py")
+ genSeq.Pythia8.Commands += [ 'Powheg:pTHard = 0' ]
+ genSeq.Pythia8.Commands += [ 'Powheg:NFinal = 2' ]
+ genSeq.Pythia8.Commands += [ 'Powheg:pTdef = 2' ]
+ genSeq.Pythia8.Commands += [ 'Powheg:veto = 1' ]
+ genSeq.Pythia8.Commands += [ 'Powheg:vetoCount = 3' ]
+ genSeq.Pythia8.Commands += [ 'Powheg:pTemt = 0' ]
+ genSeq.Pythia8.Commands += [ 'Powheg:emitted = 0' ]
+ genSeq.Pythia8.Commands += [ 'Powheg:MPIveto = 0' ]
+
+elif isHerwig: # Herwig7 (H7UE) showering
+ include("Herwig7_i/Herwig7_LHEF.py")
+ include('Herwig7_i/Herwig7_EvtGen.py')
+ Herwig7Config.me_pdf_commands(order="NLO", name="NNPDF30_nlo_as_0118")
+ Herwig7Config.tune_commands()
+ Herwig7Config.lhef_powhegbox_commands(lhe_filename=runArgs.inputGeneratorFile, me_pdf_order="NLO")
+ Herwig7Config.add_commands("""
+set /Herwig/Shower/LtoLGammaSudakov:pTmin 0.000001
+set /Herwig/Shower/QtoGammaQSudakov:Alpha /Herwig/Shower/AlphaQED""")
+ Herwig7Config.run()
+
+#--------------------------------------------------------------
+# Special decay of anti-B->Jpsi->mumu
+#--------------------------------------------------------------
+from EvtGen_i.EvtGen_iConf import EvtInclusiveDecay
+if isbottom:
+ evgenConfig.auxfiles += ['B2Jpsimumu.DEC']
+ genSeq.EvtInclusiveDecay.userDecayFile = 'B2Jpsimumu.DEC'
+else:
+ evgenConfig.auxfiles += ['AntiB2Jpsimumu.DEC']
+ genSeq.EvtInclusiveDecay.userDecayFile = 'AntiB2Jpsimumu.DEC'
+
+#--------------------------------------------------------------
+# Event filters
+#--------------------------------------------------------------
+# apply a non all-hadronic decay filter
+include('GeneratorFilters/TTbarWToLeptonFilter.py')
+filtSeq.TTbarWToLeptonFilter.NumLeptons = -1
+filtSeq.TTbarWToLeptonFilter.Ptcut = 0.
+
+# apply a J/psi to muons filter
+include('GeneratorFilters/TTbarWithJpsimumuFilter.py')
+filtSeq.TTbarWithJpsimumuFilter.JpsipTMinCut = 5000.
\ No newline at end of file
diff --git a/Generators/PowhegControl/share/control/PowhegControl_DMGG_Common.py b/Generators/PowhegControl/share/control/PowhegControl_DMGG_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..355ae6c25afffb69a254e37ed4213ef3ecd921d9
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_DMGG_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="DMGG", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_DMS_tloop_Common.py b/Generators/PowhegControl/share/control/PowhegControl_DMS_tloop_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..b419943848ff791d45cf757c3e4dd8c0db9e6257
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_DMS_tloop_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="DMS_tloop", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_DMV_Common.py b/Generators/PowhegControl/share/control/PowhegControl_DMV_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..658930115e0668f778f632842888b2195aa23ff3
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_DMV_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="DMV", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_HWj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_HWj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..57573d93e0d1abe2dc2f04966d36e3d698fff816
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_HWj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="HWj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_HWj_EW_Common.py b/Generators/PowhegControl/share/control/PowhegControl_HWj_EW_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..94ffec088b6deeeb575a4d7a3b27b0775ee3341e
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_HWj_EW_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="HWj_EW", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_HZj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_HZj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..10d0ba87a4e7d10655f09024c2cbd73e8badb8b1
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_HZj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="HZj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_HZj_EW_Common.py b/Generators/PowhegControl/share/control/PowhegControl_HZj_EW_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..f77c58d045551fc6b5899eb6e2d7f4645920196a
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_HZj_EW_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="HZj_EW", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Hj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Hj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..e8daa24bb4f191e1f9d7a191200fc574082759e5
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Hj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Hj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Hj_MiNNLO_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Hj_MiNNLO_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..1f3695001c457bd06fc125eb91b51fcb16b75488
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Hj_MiNNLO_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Hj_MiNNLO", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Hjj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Hjj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..ee6d502263ed862ecb4dc893adbaf504c0579c32
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Hjj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Hjj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_PDF_CT14nnlo.py b/Generators/PowhegControl/share/control/PowhegControl_PDF_CT14nnlo.py
new file mode 100644
index 0000000000000000000000000000000000000000..b22dd2ea3e39226a296ccc145afac59c7a848637
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_PDF_CT14nnlo.py
@@ -0,0 +1 @@
+PowhegConfig.PDF = range(13000, 13057)
\ No newline at end of file
diff --git a/Generators/PowhegControl/share/control/PowhegControl_PDF_MMHT2014nnlo68cl.py b/Generators/PowhegControl/share/control/PowhegControl_PDF_MMHT2014nnlo68cl.py
new file mode 100644
index 0000000000000000000000000000000000000000..f83a539d24f9b8914af4add943cd300dd1f02c20
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_PDF_MMHT2014nnlo68cl.py
@@ -0,0 +1 @@
+PowhegConfig.PDF = range(25300, 25351)
\ No newline at end of file
diff --git a/Generators/PowhegControl/share/control/PowhegControl_PDF_NNPDF30nnlo.py b/Generators/PowhegControl/share/control/PowhegControl_PDF_NNPDF30nnlo.py
new file mode 100644
index 0000000000000000000000000000000000000000..c2929795e0ddbf646bbd3ec78b814bbbdd47b1fc
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_PDF_NNPDF30nnlo.py
@@ -0,0 +1 @@
+PowhegConfig.PDF = range(261000, 261101)
\ No newline at end of file
diff --git a/Generators/PowhegControl/share/control/PowhegControl_PDF_PDF4LHC15nnlo30.py b/Generators/PowhegControl/share/control/PowhegControl_PDF_PDF4LHC15nnlo30.py
new file mode 100644
index 0000000000000000000000000000000000000000..6487dfc7a3918811e3ce7d30b63e891b2838980c
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_PDF_PDF4LHC15nnlo30.py
@@ -0,0 +1 @@
+PowhegConfig.PDF = range(91400, 91433)
\ No newline at end of file
diff --git a/Generators/PowhegControl/share/control/PowhegControl_VBF_H_Common.py b/Generators/PowhegControl/share/control/PowhegControl_VBF_H_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5beb107042cc2889c13ecdec8cad2eae541cfef
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_VBF_H_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="VBF_H", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_VBF_W_Common.py b/Generators/PowhegControl/share/control/PowhegControl_VBF_W_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..1817cea8ffad8ff1d7363488854244544ea48367
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_VBF_W_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="VBF_W", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_VBF_Z_Common.py b/Generators/PowhegControl/share/control/PowhegControl_VBF_Z_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..0191fbbf400e04da2c64c9f6909656323159d4b9
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_VBF_Z_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="VBF_Z", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_VBF_osWW_Common.py b/Generators/PowhegControl/share/control/PowhegControl_VBF_osWW_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..dcbb14072809dbc5f2f8872a921e146152c3586c
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_VBF_osWW_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="VBF_osWW", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_VBF_ssWW_Common.py b/Generators/PowhegControl/share/control/PowhegControl_VBF_ssWW_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..57c53b109613011f079ccf03bdf17e213e58abae
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_VBF_ssWW_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="VBF_ssWW", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_WW_Common.py b/Generators/PowhegControl/share/control/PowhegControl_WW_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..b152677a7c10a6655a88c3aeefa655a4c89427fd
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_WW_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="WW", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_WZ_Common.py b/Generators/PowhegControl/share/control/PowhegControl_WZ_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..6a52a3d17648cd4f8ba26d3b993fe9b837886803
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_WZ_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="WZ", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_W_Common.py b/Generators/PowhegControl/share/control/PowhegControl_W_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..9724b3a5745a8d3b6765b78f57c6c438ae2deff9
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_W_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="W", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_W_EW_Common.py b/Generators/PowhegControl/share/control/PowhegControl_W_EW_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..353639c183422280a0444a60170a71b26c9835b4
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_W_EW_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="W_EW", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_W_SMEFT_Common.py b/Generators/PowhegControl/share/control/PowhegControl_W_SMEFT_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..715353608b2df39bbb0d00ea0944cf225da5cbab
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_W_SMEFT_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="W_SMEFT", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wbb_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wbb_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..c9bcbbb629da4750403bd64c0a09fad816b954ca
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wbb_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wbb", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wbbj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wbbj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..58fa254076b24d282e84e87d89dff843ec24626d
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wbbj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wbbj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..3383af1e51dd2a633dc52bff5c1d0ba6ba785448
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wj_MiNNLO_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wj_MiNNLO_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..28552b5f3827eac13d643fa0700361c72209d40b
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wj_MiNNLO_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wj_MiNNLO", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wjj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wjj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..9178115d518306fc4e556d70e351b35217df2682
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wjj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wjj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wt_DR_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wt_DR_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..c7e8c18940850385b386b0eeaf294f5d97ba6d21
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wt_DR_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wt_DR", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wt_DS_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wt_DS_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..1c26bbea8de9415ff62dea681c8fcebe8387479f
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wt_DS_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wt_DS", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Wy_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Wy_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..ccdd80bec6413a9b1c38130cfd45032a558c487c
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Wy_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Wy", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ZZ_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ZZ_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..7639ec63c4d7613d06ad75b14fe2eab10ba44c17
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ZZ_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ZZ", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Z_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Z_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..7d7fcb8ee992ed591dd8326fd157910a84bbf211
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Z_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Z", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Z_EW_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Z_EW_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..04be5f5c7452ed8bf42025a0973454fadc6ab200
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Z_EW_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Z_EW", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Z_SMEFT_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Z_SMEFT_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..922e17f4e8b6b1c69d44da721727f1f2c9c3f7ec
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Z_SMEFT_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Z_SMEFT", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Zj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Zj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..dfbd402f4f7e3f7dc7a849d7ace336ac5c883c3b
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Zj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Zj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Zj_MiNNLO_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Zj_MiNNLO_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..55f23b02e6563ad180e83c2c4efe52e5136b59d0
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Zj_MiNNLO_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Zj_MiNNLO", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_Zjj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_Zjj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..89adb74b6a5f5e466c27d8f606272662398beee1
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_Zjj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="Zjj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_bbH_Common.py b/Generators/PowhegControl/share/control/PowhegControl_bbH_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..28d7fbf4b2c14c8351b459edf22dd2a97fecfc84
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_bbH_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="bbH", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_bb_Common.py b/Generators/PowhegControl/share/control/PowhegControl_bb_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..242353b09f8882e01d19c8d22beabb1e25ac39db
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_bb_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="bb", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_bblvlv_Common.py b/Generators/PowhegControl/share/control/PowhegControl_bblvlv_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ec772029850bb215eb42e1e46d1272cef6d0a8e
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_bblvlv_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="bblvlv", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_chi0chi0_Common.py b/Generators/PowhegControl/share/control/PowhegControl_chi0chi0_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d56e5404d4a711e909c4488b36accfaa7145161
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_chi0chi0_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="chi0chi0", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_chi0chi1_Common.py b/Generators/PowhegControl/share/control/PowhegControl_chi0chi1_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..494bf318ae2df281366bc1feae9222a36a2d5a95
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_chi0chi1_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="chi0chi1", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_chi1chi1_Common.py b/Generators/PowhegControl/share/control/PowhegControl_chi1chi1_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..497c59301a6d24a51db7fb0551784b1de126b91e
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_chi1chi1_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="chi1chi1", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ggF_HH_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ggF_HH_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..c13e1dcb7b6e57544d49bfb37ae44aecf30bd234
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ggF_HH_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ggF_HH", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ggF_HZ_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ggF_HZ_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..15fa668c9b74ae175548b4024254bd6d1393a372
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ggF_HZ_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ggF_HZ", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ggF_H_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ggF_H_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..a96691c89835be1c225c3bf89c9427fc01d3ec82
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ggF_H_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ggF_H", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_jj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_jj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..6502ca79b433319d16fc5f76a45fcdbcaa7f3158
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_jj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="jj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_jjj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_jjj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..bbcb90c237f3e5fdcf2077f743e4e788283814bc
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_jjj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="jjj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ssWWjj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ssWWjj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..f1b6334daa49e123ccaa5ef11e584d46b0f9ecfa
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ssWWjj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ssWWjj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_t_sch_Common.py b/Generators/PowhegControl/share/control/PowhegControl_t_sch_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..1e0aa8d46cb952f62e92c7c25155fab7d813d714
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_t_sch_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="t_sch", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_t_tch_4FS_Common.py b/Generators/PowhegControl/share/control/PowhegControl_t_tch_4FS_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..14bd32f50386801a789c33d365a0363c42dd6d41
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_t_tch_4FS_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="t_tch_4FS", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_tj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_tj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..22fcbdd5937cc1cc5055fcbb3faeff666b68aa9c
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_tj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="tj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ttH_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ttH_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..16805b1b0e2f398d2b1b86caff7df774cb38a00b
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ttH_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ttH", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_tt_Common.py b/Generators/PowhegControl/share/control/PowhegControl_tt_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..31aca4e869258570ede10357c85f471d3d61eac7
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_tt_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="tt", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_tt_NLOdecays_Common.py b/Generators/PowhegControl/share/control/PowhegControl_tt_NLOdecays_Common.py
new file mode 100755
index 0000000000000000000000000000000000000000..0342d9617c45b319f1293cdb1deb32b6e2a2f96b
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_tt_NLOdecays_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="tt_NLOdecays", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ttbb_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ttbb_Common.py
new file mode 100755
index 0000000000000000000000000000000000000000..6519d8f10e769183e7c83d55886ac17da3544cc4
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ttbb_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ttbb", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_ttj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_ttj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..72e21079d6cb17afbc7927bf13763ba63df3a3c9
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_ttj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="ttj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/control/PowhegControl_usePDGvalues.py b/Generators/PowhegControl/share/control/PowhegControl_usePDGvalues.py
new file mode 100644
index 0000000000000000000000000000000000000000..5e9bea429d507e0c5db3b449f873bbd886d99378
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_usePDGvalues.py
@@ -0,0 +1,7 @@
+## Get handle to Athena logging
+from AthenaCommon import Logging
+logger = Logging.logging.getLogger("PowhegControl")
+
+from PowhegControl.parameters import powheg_atlas_common
+powheg_atlas_common.usePDGvalues()
+logger.warning("Using PDG values as 'ATLAS default' parameters for Powheg")
diff --git a/Generators/PowhegControl/share/control/PowhegControl_yj_Common.py b/Generators/PowhegControl/share/control/PowhegControl_yj_Common.py
new file mode 100644
index 0000000000000000000000000000000000000000..7af5dba19af249932cec832f2dfc399714cb51ff
--- /dev/null
+++ b/Generators/PowhegControl/share/control/PowhegControl_yj_Common.py
@@ -0,0 +1,4 @@
+import PowhegControl
+transform_runArgs = runArgs if "runArgs" in dir() else None
+transform_opts = opts if "opts" in dir() else None
+PowhegConfig = PowhegControl.PowhegControl(process_name="yj", run_args=transform_runArgs, run_opts=transform_opts)
diff --git a/Generators/PowhegControl/share/example/features/DYNNLO/mc.PhPy8EG_A14NNPDF23_DYNNLO_example.py b/Generators/PowhegControl/share/example/features/DYNNLO/mc.PhPy8EG_A14NNPDF23_DYNNLO_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..b8a6c1a0f7aeb3eeea5bb87aa3d2e193f61cc1b6
--- /dev/null
+++ b/Generators/PowhegControl/share/example/features/DYNNLO/mc.PhPy8EG_A14NNPDF23_DYNNLO_example.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W+j production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = ["SM", "W", "1jet"]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wj_Common.py")
+
+# --------------------------------------------------------------
+# Set integration parameters to tiny values for fast testing
+# DO NOT USE THESE SETTINGS IN PRODUCTION!
+# --------------------------------------------------------------
+PowhegConfig.ncall1 = 1000
+PowhegConfig.ncall1rm = 1000
+PowhegConfig.ncall2 = 1000
+PowhegConfig.ncall2rm = 1000
+PowhegConfig.nubound = 1000
+PowhegConfig.foldphi = 1
+PowhegConfig.foldcsi = 1
+PowhegConfig.foldy = 1
+PowhegConfig.itmx1 = 1
+PowhegConfig.itmx2 = 1
+
+# --------------------------------------------------------------
+# DYNNLO: specify the input reweighting file
+# --------------------------------------------------------------
+PowhegConfig.NNLO_reweighting_inputs["DYNNLO"] = "Wp_CM8_MMHT14NNLO_11.top"
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+# --------------------------------------------------------------
+# Pythia8 showering with the AZNLO tune
+# --------------------------------------------------------------
+include("Pythia8_i/Pythia8_AZNLO_CTEQ6L1_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/features/MadSpin/mc.PhPy8EG_MadSpin_example.py b/Generators/PowhegControl/share/example/features/MadSpin/mc.PhPy8EG_MadSpin_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..3ed17f05a8160d8c57ebb96d119a835fe73b69d0
--- /dev/null
+++ b/Generators/PowhegControl/share/example/features/MadSpin/mc.PhPy8EG_MadSpin_example.py
@@ -0,0 +1,33 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# --------------------------------------------------------------
+# EVGEN configuration
+# --------------------------------------------------------------
+evgenConfig.description = "PowhegControl example of MadSpin"
+evgenConfig.keywords = ["SM", "top"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg tt process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_tt_Common.py")
+
+# --------------------------------------------------------------
+# Set process options and generate
+# --------------------------------------------------------------
+PowhegConfig.decaymode = "undecayed"
+PowhegConfig.MadSpin_decays.append("decay t > w+ b, w+ > l+ vl")
+PowhegConfig.MadSpin_decays.append("decay t > w+ b, w+ > j j")
+PowhegConfig.MadSpin_process = "\n".join(["generate p p > t t~ [QCD]",
+ "add process b g > t t~ b [QCD]",
+ "add process b~ g > t t~ b~ [QCD]",
+ "add process p p > t t~ j[QCD]",
+ "add process b b~ > t t~ j[QCD]",
+ "add process b b~ > t t~[QCD]"])
+PowhegConfig.generate()
+
+# --------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+# --------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/features/NNLOPS/mc.PhPy8EG_A14NNPDF23_NNLOPS_example.py b/Generators/PowhegControl/share/example/features/NNLOPS/mc.PhPy8EG_A14NNPDF23_NNLOPS_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..2dd32acc39fe626f2ac41ebeaaff8b27a4f40054
--- /dev/null
+++ b/Generators/PowhegControl/share/example/features/NNLOPS/mc.PhPy8EG_A14NNPDF23_NNLOPS_example.py
@@ -0,0 +1,65 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# --------------------------------------------------------------
+# EVGEN configuration
+# --------------------------------------------------------------
+evgenConfig.description = "PowhegControl example of NNLOPS syntax"
+evgenConfig.keywords = ["SM", "Higgs", "jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Hj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Hj_Common.py")
+
+# --------------------------------------------------------------
+# Set integration parameters to tiny values for fast testing
+# DO NOT USE THESE SETTINGS IN PRODUCTION!
+# --------------------------------------------------------------
+PowhegConfig.ncall1 = 1000
+PowhegConfig.ncall1rm = 1000
+PowhegConfig.ncall2 = 1000
+PowhegConfig.ncall2rm = 1000
+PowhegConfig.nubound = 1000
+PowhegConfig.foldphi = 1
+PowhegConfig.foldcsi = 1
+PowhegConfig.foldy = 1
+PowhegConfig.itmx1 = 1
+PowhegConfig.itmx2 = 1
+
+# --------------------------------------------------------------
+# Reweighting: construct event weight group for quark mass variations.
+# --------------------------------------------------------------
+PowhegConfig.define_event_weight_group(group_name="quark_mass_variation", parameters_to_vary=["bmass_in_minlo", "quarkmasseffects"])
+# mtmb means both top and b masses are considered in the loop. This is the nominal choice.
+# mtinf is "EFT", meaning the top quark mass is set to infinity, and mb=0 (ignored)
+# mtmb-bminlo is an alternative treatment of the b-mass
+PowhegConfig.add_weight_to_group(group_name="quark_mass_variation", weight_name="mtmb", parameter_values=[0, 1])
+PowhegConfig.add_weight_to_group(group_name="quark_mass_variation", weight_name="mtinf", parameter_values=[0, 0])
+PowhegConfig.add_weight_to_group(group_name="quark_mass_variation", weight_name="mtmb-bminlo", parameter_values=[1, 1])
+
+# --------------------------------------------------------------
+# NNLOPS: specify the input files
+# --------------------------------------------------------------
+PowhegConfig.NNLO_reweighting_inputs["nn-mtinf"] = "H1250_CM13_CT10_APX0_11.top"
+PowhegConfig.NNLO_reweighting_inputs["nn-mtmb"] = "H1250_CM13_CT10_APX2_22.top"
+
+# --------------------------------------------------------------
+# NNLOPS: specify the output weights: remember to escape nested quotes
+# --------------------------------------------------------------
+PowhegConfig.NNLO_output_weights["nnlops-mtmb"] = "combine 'nn-mtmb' and 'mtmb'"
+PowhegConfig.NNLO_output_weights["nnlops-mtinf"] = "combine \"nn-mtinf\" and \"mtinf\""
+PowhegConfig.NNLO_output_weights["nnlops-mtmb-bminlo"] = "combine \"nn-mtmb\" and 'mtmb-bminlo'"
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+# --------------------------------------------------------------
+# Pythia8 showering with the AZNLO tune
+# --------------------------------------------------------------
+include("Pythia8_i/Pythia8_AZNLO_CTEQ6L1_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
+# Decay to diphoton only
+genSeq.Pythia8.Commands += ["25:onMode = off", "25:onIfMatch = 22 22"]
diff --git a/Generators/PowhegControl/share/example/features/UsingPDGParams/mc.PhPy8EG_A14NNPDF23_tt_example_usingPDGParams.py b/Generators/PowhegControl/share/example/features/UsingPDGParams/mc.PhPy8EG_A14NNPDF23_tt_example_usingPDGParams.py
new file mode 100644
index 0000000000000000000000000000000000000000..5da4ed2d171f163e8225b76a378113e1e686355f
--- /dev/null
+++ b/Generators/PowhegControl/share/example/features/UsingPDGParams/mc.PhPy8EG_A14NNPDF23_tt_example_usingPDGParams.py
@@ -0,0 +1,30 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 top pair production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Making sure to use PDG parameter values as default
+# This fragment needs to be included before the next which creates the PowhegConfig object
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_usePDGvalues.py")
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg tt process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_tt_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/features/VBFNLO/mc.PhPy8EG_A14NNPDF23_VBFNLO_example.py b/Generators/PowhegControl/share/example/features/VBFNLO/mc.PhPy8EG_A14NNPDF23_VBFNLO_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..f05ac1e8f47fa5b48a5af6e5b661233e9397c3bb
--- /dev/null
+++ b/Generators/PowhegControl/share/example/features/VBFNLO/mc.PhPy8EG_A14NNPDF23_VBFNLO_example.py
@@ -0,0 +1,38 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# --------------------------------------------------------------
+# EVGEN configuration
+# --------------------------------------------------------------
+evgenConfig.description = "PowhegControl example of VBFNLO"
+evgenConfig.keywords = ["SM", "VBF", "W"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg VBF_W process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_VBF_W_Common.py")
+
+# --------------------------------------------------------------
+# Set integration parameters to tiny values for fast testing
+# DO NOT USE THESE SETTINGS IN PRODUCTION!
+# --------------------------------------------------------------
+PowhegConfig.ncall1 = 1000
+PowhegConfig.ncall2 = 1000
+PowhegConfig.nubound = 1000
+PowhegConfig.foldphi = 1
+PowhegConfig.foldcsi = 1
+PowhegConfig.foldy = 1
+PowhegConfig.itmx1 = 1
+PowhegConfig.itmx2 = 1
+
+# --------------------------------------------------------------
+# Set process options and generate
+# --------------------------------------------------------------
+PowhegConfig.decay_mode = "w+ > e+ ve"
+PowhegConfig.generate()
+
+# --------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+# --------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/features/multiple_weight/PhPy8EG_multiple_weight_example.py b/Generators/PowhegControl/share/example/features/multiple_weight/PhPy8EG_multiple_weight_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..ddecbf51e668955b651375898ff0dee7a43a2dfb
--- /dev/null
+++ b/Generators/PowhegControl/share/example/features/multiple_weight/PhPy8EG_multiple_weight_example.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# --------------------------------------------------------------
+# EVGEN configuration
+# --------------------------------------------------------------
+evgenConfig.description = "PowhegControl example of multiple weights"
+evgenConfig.keywords = [ "SM", "QCD", "2jet", "bottom" ]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg bb process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_bb_Common.py")
+
+# --------------------------------------------------------------
+# Set process options and generate
+# --------------------------------------------------------------
+PowhegConfig.PDF = (10800, 10853)
+PowhegConfig.mu_F = [ 1.0, 0.5, 0.5, 1.0, 1.0, 2.0, 2.0 ]
+PowhegConfig.mu_R = [ 1.0, 0.5, 1.0, 0.5, 2.0, 1.0, 2.0 ]
+PowhegConfig.generate()
+
+# --------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+# --------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/features/quark_colour_fix/mc.PhPy8EG_A14NNPDF23_quark_colour_fix_example.py b/Generators/PowhegControl/share/example/features/quark_colour_fix/mc.PhPy8EG_A14NNPDF23_quark_colour_fix_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..3f4f9f09dad775341bcc8009e13501b7d6981747
--- /dev/null
+++ b/Generators/PowhegControl/share/example/features/quark_colour_fix/mc.PhPy8EG_A14NNPDF23_quark_colour_fix_example.py
@@ -0,0 +1,40 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# --------------------------------------------------------------
+# EVGEN configuration
+# --------------------------------------------------------------
+evgenConfig.description = "PowhegControl example of automated quark colour fixing"
+evgenConfig.keywords = ["SM", "Higgs", "Z"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ggF_HZ process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ggF_HZ_Common.py")
+
+# --------------------------------------------------------------
+# Set integration parameters to tiny values for fast testing
+# DO NOT USE THESE SETTINGS IN PRODUCTION!
+# --------------------------------------------------------------
+PowhegConfig.ncall1 = 1000
+PowhegConfig.ncall1rm = 1000
+PowhegConfig.ncall2 = 1000
+PowhegConfig.ncall2rm = 1000
+PowhegConfig.nubound = 1000
+PowhegConfig.foldphi = 1
+PowhegConfig.foldcsi = 1
+PowhegConfig.foldy = 1
+PowhegConfig.itmx1 = 1
+PowhegConfig.itmx2 = 1
+
+# --------------------------------------------------------------
+# Set process options and generate
+# --------------------------------------------------------------
+PowhegConfig.decay_mode_Z = "inclusive"
+PowhegConfig.generate()
+
+# --------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+# --------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/DMGG/mc.PhPy8EG_A14NNPDF23_DMGG_example.py b/Generators/PowhegControl/share/example/processes/DMGG/mc.PhPy8EG_A14NNPDF23_DMGG_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..605d5bdb48f523fdc4d0b7b1cd238be2806d7db9
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/DMGG/mc.PhPy8EG_A14NNPDF23_DMGG_example.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 dark matter (GG-mediator) production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["BSM", "WIMP", "invisible"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg DMGG process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_DMGG_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
+
+# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
+genSeq.Pythia8.Commands += ["1000022:all = X Xbar 2 0 0 {0} 0.0 0.0 0.0 0.0".format(PowhegConfig.DM_mass),
+ "1000022:isVisible = false"]
diff --git a/Generators/PowhegControl/share/example/processes/DMS_tloop/mc.PhPy8EG_A14NNPDF23_DMS_tloop_example.py b/Generators/PowhegControl/share/example/processes/DMS_tloop/mc.PhPy8EG_A14NNPDF23_DMS_tloop_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..f9a14822fa35ad452e466d7d7b45285d50e13a47
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/DMS_tloop/mc.PhPy8EG_A14NNPDF23_DMS_tloop_example.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 scalar dark matter production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["BSM", "WIMP", "invisible"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg DMS_tloop process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_DMS_tloop_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
+
+# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
+genSeq.Pythia8.Commands += ["1000022:all = X Xbar 2 0 0 {0} 0.0 0.0 0.0 0.0".format(PowhegConfig.DM_mass),
+ "1000022:isVisible = false"]
diff --git a/Generators/PowhegControl/share/example/processes/DMV/mc.PhPy8EG_A14NNPDF23_DMV_example.py b/Generators/PowhegControl/share/example/processes/DMV/mc.PhPy8EG_A14NNPDF23_DMV_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..6fad157f9bf4ff6e42fe038eead27c89fa265530
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/DMV/mc.PhPy8EG_A14NNPDF23_DMV_example.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 vector dark matter production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["BSM", "WIMP", "invisible"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg DMV process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_DMV_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
+
+# id:all = name antiName spinType chargeType colType m0 mWidth mMin mMax tau0
+genSeq.Pythia8.Commands += ["1000022:all = X Xbar 2 0 0 {0} 0.0 0.0 0.0 0.0".format(PowhegConfig.DM_mass),
+ "1000022:isVisible = false"]
diff --git a/Generators/PowhegControl/share/example/processes/HWj/mc.PhPy8EG_A14NNPDF23_HWj_example.py b/Generators/PowhegControl/share/example/processes/HWj/mc.PhPy8EG_A14NNPDF23_HWj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..ca5e5c2a2f251bcd030c0903db9a331c383e4fc6
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/HWj/mc.PhPy8EG_A14NNPDF23_HWj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Higgs+W+jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["Higgs", "SMHiggs", "W", "WHiggs", "1jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg HWj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_HWj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/HWj_EW/mc.PhPy8EG_A14NNPDF23_HWj_EW_example.py b/Generators/PowhegControl/share/example/processes/HWj_EW/mc.PhPy8EG_A14NNPDF23_HWj_EW_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..0177a42752471ff7f338caa0fbbc839870bf1aa3
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/HWj_EW/mc.PhPy8EG_A14NNPDF23_HWj_EW_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Higgs+W+jet production with electroweak effects using the A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["Higgs", "SMHiggs", "W", "WHiggs", "1jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg HWj_EW process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_HWj_EW_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/HZj/mc.PhPy8EG_A14NNPDF23_HZj_example.py b/Generators/PowhegControl/share/example/processes/HZj/mc.PhPy8EG_A14NNPDF23_HZj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..b0368bfb4003348c254034939848d53b883ffbdb
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/HZj/mc.PhPy8EG_A14NNPDF23_HZj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 H+Z+jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["Higgs", "SMHiggs", "Z", "ZHiggs", "1jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg HZj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_HZj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/HZj_EW/mc.PhPy8EG_A14NNPDF23_HZj_EW_example.py b/Generators/PowhegControl/share/example/processes/HZj_EW/mc.PhPy8EG_A14NNPDF23_HZj_EW_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..146e9097ed6349ad431539aa1dd74d1f20b1baa0
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/HZj_EW/mc.PhPy8EG_A14NNPDF23_HZj_EW_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 H+Z+jet production with electroweak effects using the A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["Higgs", "SMHiggs", "Z", "ZHiggs", "1jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg HZj_EW process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_HZj_EW_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Hj/mc.PhPy8EG_A14NNPDF23_Hj_example.py b/Generators/PowhegControl/share/example/processes/Hj/mc.PhPy8EG_A14NNPDF23_Hj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..e328da93f138b740bf2eece2c4c7708cb29fc9c1
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Hj/mc.PhPy8EG_A14NNPDF23_Hj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 H+jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Hj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Hj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_WW_example.py b/Generators/PowhegControl/share/example/processes/Hj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Hj_MiNNLO_example.py
similarity index 51%
rename from Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_WW_example.py
rename to Generators/PowhegControl/share/example/processes/Hj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Hj_MiNNLO_example.py
index 4ba5d88401d54c4442980560ff5d17f6ff710d16..a5ae6476c2cbfc0b0321ae124149735b935c2207 100644
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_WW_example.py
+++ b/Generators/PowhegControl/share/example/processes/Hj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Hj_MiNNLO_example.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#--------------------------------------------------------------
-# Powheg WW setup starting from ATLAS defaults
+# Powheg Zj setup starting from ATLAS defaults
#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_WW_Common.py')
+include("PowhegControl/PowhegControl_Hj_MiNNLO_Common.py")
PowhegConfig.generate()
#--------------------------------------------------------------
# Pythia8 showering with the A14 NNPDF2.3 tune
#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
#--------------------------------------------------------------
# EVGEN configuration
#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 WW production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'WW' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
+evgenConfig.description = "POWHEG+Pythia8 H+j MiNNLO production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = [ "SM", "H", "1jet" ]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_W_example.py b/Generators/PowhegControl/share/example/processes/Hj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Zj_MiNNLO_example.py
similarity index 51%
rename from Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_W_example.py
rename to Generators/PowhegControl/share/example/processes/Hj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Zj_MiNNLO_example.py
index 3e4f84ec2cea3fefa9660f5ec8793a12b4c2e185..8eb1f70b3b8885d0f5f470a5e8eab1170335b7da 100644
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_W_example.py
+++ b/Generators/PowhegControl/share/example/processes/Hj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Zj_MiNNLO_example.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#--------------------------------------------------------------
-# Powheg W setup starting from ATLAS defaults
+# Powheg Zj setup starting from ATLAS defaults
#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_W_Common.py')
+include("PowhegControl/PowhegControl_Zj_MiNNLO_Common.py")
PowhegConfig.generate()
#--------------------------------------------------------------
# Pythia8 showering with the A14 NNPDF2.3 tune
#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
#--------------------------------------------------------------
# EVGEN configuration
#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 W production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'W' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
+evgenConfig.description = "POWHEG+Pythia8 Z+j MiNNLO production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = [ "SM", "Z", "1jet" ]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
diff --git a/Generators/PowhegControl/share/example/processes/Hjj/mc.PhPy8EG_A14NNPDF23_Hjj_example.py b/Generators/PowhegControl/share/example/processes/Hjj/mc.PhPy8EG_A14NNPDF23_Hjj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..90a2caa941f7ea4ccd1897807362e956c2a7608f
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Hjj/mc.PhPy8EG_A14NNPDF23_Hjj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 H+jet+jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Hjj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Hjj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/VBF_H/mc.PhPy8EG_A14NNPDF23_VBF_H_example.py b/Generators/PowhegControl/share/example/processes/VBF_H/mc.PhPy8EG_A14NNPDF23_VBF_H_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..9413eca2ba28ee2583db38c965287fac74d77315
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/VBF_H/mc.PhPy8EG_A14NNPDF23_VBF_H_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 VBF Higgs production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["Higgs", "SMHiggs", "VBF"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg VBF_H process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_VBF_H_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/VBF_W/mc.PhPy8EG_A14NNPDF23_VBF_W_example.py b/Generators/PowhegControl/share/example/processes/VBF_W/mc.PhPy8EG_A14NNPDF23_VBF_W_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..95e6f5947600cf60ea9d6ef86bf6abd6197d34a4
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/VBF_W/mc.PhPy8EG_A14NNPDF23_VBF_W_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 VBF W production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "VBF", "W"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg VBF_W process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_VBF_W_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/VBF_Z/mc.PhPy8EG_A14NNPDF23_VBF_Z_example.py b/Generators/PowhegControl/share/example/processes/VBF_Z/mc.PhPy8EG_A14NNPDF23_VBF_Z_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..06fb402d0eea76cd515aa6700533bb88f25bb1ee
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/VBF_Z/mc.PhPy8EG_A14NNPDF23_VBF_Z_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 VBF Z production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "VBF", "Z"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg VBF_Z process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_VBF_Z_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/VBF_osWW/mc.PhPy8EG_A14NNPDF23_VBF_osWW_example.py b/Generators/PowhegControl/share/example/processes/VBF_osWW/mc.PhPy8EG_A14NNPDF23_VBF_osWW_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..93bb760ad5c27aec1f890dc9d5c3797d38aeec12
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/VBF_osWW/mc.PhPy8EG_A14NNPDF23_VBF_osWW_example.py
@@ -0,0 +1,34 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 VBF opposite-sign WW production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "diboson", "WW", "VBF"]
+evgenConfig.contact = ["stefan.richter@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg VBF_osWW process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_VBF_osWW_Common.py")
+
+# --------------------------------------------------------------
+# Reweighting to get PDF and QCD scale weight variations
+# is not yet supported for this process (it fails for
+# currently unknown reasons), so it is disabled here by
+# setting single values for the PDF and QCD scale factors
+# --------------------------------------------------------------
+PowhegConfig.PDF = 260000
+PowhegConfig.mu_F = 1.0
+PowhegConfig.mu_R = 1.0
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/VBF_ssWW/mc.PhPy8EG_A14NNPDF23_VBF_ssWW_example.py b/Generators/PowhegControl/share/example/processes/VBF_ssWW/mc.PhPy8EG_A14NNPDF23_VBF_ssWW_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..de291756b73b5fa60c2f142ba15a6c74b9fbd3de
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/VBF_ssWW/mc.PhPy8EG_A14NNPDF23_VBF_ssWW_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 VBF same-sign WW production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "diboson", "WW", "VBF"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg VBF_ssWW process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_VBF_ssWW_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/W/mc.PhPy8EG_A14NNPDF23_W_example.py b/Generators/PowhegControl/share/example/processes/W/mc.PhPy8EG_A14NNPDF23_W_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..1dc1271d62453fe801bcf1aa4cc4d1356c1c71e3
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/W/mc.PhPy8EG_A14NNPDF23_W_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg W process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_W_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/WW/mc.PhPy8EG_A14NNPDF23_WW_example.py b/Generators/PowhegControl/share/example/processes/WW/mc.PhPy8EG_A14NNPDF23_WW_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..0fc39187808823f35880e23449203326f41ef341
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/WW/mc.PhPy8EG_A14NNPDF23_WW_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 WW production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "diboson", "WW"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg WW process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_WW_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/WZ/mc.PhPy8EG_A14NNPDF23_WZ_example.py b/Generators/PowhegControl/share/example/processes/WZ/mc.PhPy8EG_A14NNPDF23_WZ_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..994969b82c9687472261d5704e3d8b9f76a2dc33
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/WZ/mc.PhPy8EG_A14NNPDF23_WZ_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 WZ production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "diboson", "W", "Z"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg WZ process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_WZ_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/W_EW/mc.PhPy8EG_A14NNPDF23_W_EW_example.py b/Generators/PowhegControl/share/example/processes/W_EW/mc.PhPy8EG_A14NNPDF23_W_EW_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..7488e7329e308a5d30f2fc2a3679882a74cc7157
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/W_EW/mc.PhPy8EG_A14NNPDF23_W_EW_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W production (plus EW corrections) with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg W_EW process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_W_EW_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/W_SMEFT/mc.PhPy8EG_A14NNPDF23_W_SMEFT_example.py b/Generators/PowhegControl/share/example/processes/W_SMEFT/mc.PhPy8EG_A14NNPDF23_W_SMEFT_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..8ca75a07c1073ea78e68c6e00a10a6757d0399e7
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/W_SMEFT/mc.PhPy8EG_A14NNPDF23_W_SMEFT_example.py
@@ -0,0 +1,49 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W production in Standard Model Effective Field Theory with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W", "BSM"]
+evgenConfig.contact = ["tpelzer@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg W_SMEFT process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_W_SMEFT_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+
+# Enable dimension-6 operators
+PowhegConfig.dim6 = 1
+
+# Engable flavour-changing neutral currents
+PowhegConfig.fcnc = 1
+
+# Set scale of new physics (in GeV)
+PowhegConfig.LambdaNP = 1000.0
+
+# Set dimension-6 operator coefficients
+PowhegConfig.ReGUw_uu = 0.0
+PowhegConfig.ImGUw_uu = 0.0
+PowhegConfig.ReGDw_ds = 0.0
+PowhegConfig.ImGDw_dd = 0.0
+PowhegConfig.QLu_uu = 0.001
+PowhegConfig.QLd_dd = 0.001
+PowhegConfig.ReLedQ_dd = 0.001
+PowhegConfig.ReLeQu_uu = 0.001
+PowhegConfig.ReLeQu3_uu = 0.001
+PowhegConfig.ReLeQu_uc = 0.01
+PowhegConfig.ReLedQ_ds = 0.01
+PowhegConfig.ReLeQu3_uc = 0.01
+PowhegConfig.QLd_sb = 0.01
+
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Wbb/mc.PhPy8EG_A14NNPDF23_Wbb_example.py b/Generators/PowhegControl/share/example/processes/Wbb/mc.PhPy8EG_A14NNPDF23_Wbb_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..c17d5b0b3f07b20d4167b8e6c0e171dea4b5ec47
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wbb/mc.PhPy8EG_A14NNPDF23_Wbb_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Wbb production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W", "jets", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wbb process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wbb_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Wbbj/mc.PhPy8EG_A14NNPDF23_Wbbj_example.py b/Generators/PowhegControl/share/example/processes/Wbbj/mc.PhPy8EG_A14NNPDF23_Wbbj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..0441b54f5a461808b2ac3ceb8eb1c685023fb4c8
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wbbj/mc.PhPy8EG_A14NNPDF23_Wbbj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+s#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Wbbj production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W", "jets", "3jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wbbj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wbbj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Wj/mc.PhPy8EG_A14NNPDF23_Wj_example.py b/Generators/PowhegControl/share/example/processes/Wj/mc.PhPy8EG_A14NNPDF23_Wj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..91aba7964a436c9b5ed42c8ed1ccb84a03c4d429
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wj/mc.PhPy8EG_A14NNPDF23_Wj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W+jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W", "1jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Wj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Wj_MiNNLO_example.py b/Generators/PowhegControl/share/example/processes/Wj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Wj_MiNNLO_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..4ec2a500bf24ecafbb34244412b40ddce0b9fa11
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Wj_MiNNLO_example.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# Powheg Zj setup starting from ATLAS defaults
+#--------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wj_MiNNLO_Common.py")
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W+j MiNNLO production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = [ "SM", "W", "1jet" ]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
diff --git a/Generators/PowhegControl/share/example/processes/Wjj/mc.PhPy8EG_A14NNPDF23_Wjj_example.py b/Generators/PowhegControl/share/example/processes/Wjj/mc.PhPy8EG_A14NNPDF23_Wjj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..62a0697348e948f131c1407a58363cd42ff51c84
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wjj/mc.PhPy8EG_A14NNPDF23_Wjj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Wjj production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W", "2jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wjj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wjj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Wt_DR/mc.PhPy8EG_A14NNPDF23_Wt_DR_example.py b/Generators/PowhegControl/share/example/processes/Wt_DR/mc.PhPy8EG_A14NNPDF23_Wt_DR_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..4ba5e9b5a3435caec478f7eb5e289713f13d37c0
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wt_DR/mc.PhPy8EG_A14NNPDF23_Wt_DR_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W+t (diagram removal) production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W", "top"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wt_DR process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wt_DR_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Wt_DS/mc.PhPy8EG_A14NNPDF23_Wt_DS_example.py b/Generators/PowhegControl/share/example/processes/Wt_DS/mc.PhPy8EG_A14NNPDF23_Wt_DS_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..7f8c97aa52ceb6b313830aecf3440b31071204fc
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wt_DS/mc.PhPy8EG_A14NNPDF23_Wt_DS_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W+t (diagram subtraction) production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "W", "top"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wt_DS process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wt_DS_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Wy/mc.PhPy8EG_A14NNPDF23_Wy_example.py b/Generators/PowhegControl/share/example/processes/Wy/mc.PhPy8EG_A14NNPDF23_Wy_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..f108f0225312d0b9e86e5692c376bc4d083572f2
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Wy/mc.PhPy8EG_A14NNPDF23_Wy_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 W+gamma production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Wy process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Wy_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Z/mc.PhPy8EG_A14NNPDF23_Z_example.py b/Generators/PowhegControl/share/example/processes/Z/mc.PhPy8EG_A14NNPDF23_Z_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..1f0b6d2e0f4d51958428ce18fe971e93b6107526
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Z/mc.PhPy8EG_A14NNPDF23_Z_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Z production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "Z"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Z process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Z_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ZZ_example.py b/Generators/PowhegControl/share/example/processes/ZZ/mc.PhPy8EG_A14NNPDF23_ZZ_example.py
similarity index 56%
rename from Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ZZ_example.py
rename to Generators/PowhegControl/share/example/processes/ZZ/mc.PhPy8EG_A14NNPDF23_ZZ_example.py
index a5fd5d1c525419500e67db92e70d1c0ea16cd417..2972c93f0d4fbb79e3dcec646de570d03cef7e41 100644
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_ZZ_example.py
+++ b/Generators/PowhegControl/share/example/processes/ZZ/mc.PhPy8EG_A14NNPDF23_ZZ_example.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#--------------------------------------------------------------
# Powheg ZZ setup starting from ATLAS defaults
#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_ZZ_Common.py')
+include("PowhegControl/PowhegControl_ZZ_Common.py")
PowhegConfig.generate()
#--------------------------------------------------------------
# Pythia8 showering with the A14 NNPDF2.3 tune
#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
#--------------------------------------------------------------
# EVGEN configuration
#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 ZZ production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'diboson', 'ZZ' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
+evgenConfig.description = "POWHEG+Pythia8 ZZ production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = [ "SM", "diboson", "ZZ" ]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
diff --git a/Generators/PowhegControl/share/example/processes/Z_EW/mc.PhPy8EG_A14NNPDF23_Z_EW_example.py b/Generators/PowhegControl/share/example/processes/Z_EW/mc.PhPy8EG_A14NNPDF23_Z_EW_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..ad7c9430f709fffdbf5a0d6cdad402d1a1ff4851
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Z_EW/mc.PhPy8EG_A14NNPDF23_Z_EW_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Z production (plus EW corrections) with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "Z"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Z_EW process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Z_EW_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/Z_SMEFT/mc.PhPy8EG_A14NNPDF23_Z_SMEFT_example.py b/Generators/PowhegControl/share/example/processes/Z_SMEFT/mc.PhPy8EG_A14NNPDF23_Z_SMEFT_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..85352b4f7d78bcca0e9d0305de152e7d420679cd
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Z_SMEFT/mc.PhPy8EG_A14NNPDF23_Z_SMEFT_example.py
@@ -0,0 +1,59 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Z production in Standard Model Effective Field Theory with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "Z", "BSM"]
+evgenConfig.contact = ["stefan.richter@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg Z_SMEFT process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_Z_SMEFT_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+
+# Enable dimension-6 operators
+PowhegConfig.dim6 = 1
+
+# Engable flavour-changing neutral currents
+PowhegConfig.fcnc = 1
+
+# Set scale of new physics (in GeV)
+PowhegConfig.LambdaNP = 1000.0
+
+# Set dimension-6 operator coefficients
+PowhegConfig.ReGUw_uu = 0.0
+PowhegConfig.ReGUe_uu = 0.0
+PowhegConfig.ImGUw_uu = 0.0
+PowhegConfig.ImGUe_uu = 0.0
+PowhegConfig.ReGDw_ds = 0.0
+PowhegConfig.ReGDe_dd = 0.0
+PowhegConfig.ImGDw_dd = 0.0
+PowhegConfig.ImGDe_dd = 0.0
+PowhegConfig.QLu_uu = 0.001
+PowhegConfig.QLd_dd = 0.001
+PowhegConfig.Ceu_uu = 0.001
+PowhegConfig.Ced_dd = 0.001
+PowhegConfig.CLu_uu = 0.001
+PowhegConfig.CLd_dd = 0.001
+PowhegConfig.Qe_dd = 0.1
+PowhegConfig.ReLedQ_dd = 0.001
+PowhegConfig.ReLeQu_uu = 0.001
+PowhegConfig.ReLeQu3_uu = 0.001
+PowhegConfig.ReLeQu_uc = 0.01
+PowhegConfig.ReLedQ_ds = 0.01
+PowhegConfig.ReLeQu3_uc = 0.01
+PowhegConfig.QLd_sb = 0.01
+PowhegConfig.CLd_sb = 0.01
+
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Zj_example.py b/Generators/PowhegControl/share/example/processes/Zj/mc.PhPy8EG_A14NNPDF23_Zj_example.py
similarity index 56%
rename from Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Zj_example.py
rename to Generators/PowhegControl/share/example/processes/Zj/mc.PhPy8EG_A14NNPDF23_Zj_example.py
index 10eb6028a8a7bd8ebb343270ead5e3ae3425f395..4aa4ee830163cbe3bcd917aaee97f7e079729a38 100644
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Zj_example.py
+++ b/Generators/PowhegControl/share/example/processes/Zj/mc.PhPy8EG_A14NNPDF23_Zj_example.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#--------------------------------------------------------------
# Powheg Zj setup starting from ATLAS defaults
#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Zj_Common.py')
+include("PowhegControl/PowhegControl_Zj_Common.py")
PowhegConfig.generate()
#--------------------------------------------------------------
# Pythia8 showering with the A14 NNPDF2.3 tune
#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
#--------------------------------------------------------------
# EVGEN configuration
#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 Z+j production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'Z', '1jet' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
+evgenConfig.description = "POWHEG+Pythia8 Z+j production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = [ "SM", "Z", "1jet" ]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
diff --git a/Generators/PowhegControl/share/example/processes/Zj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Zj_MiNNLO_example.py b/Generators/PowhegControl/share/example/processes/Zj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Zj_MiNNLO_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..8eb1f70b3b8885d0f5f470a5e8eab1170335b7da
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/Zj_MiNNLO/mc.PhPy8EG_A14NNPDF23_Zj_MiNNLO_example.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# Powheg Zj setup starting from ATLAS defaults
+#--------------------------------------------------------------
+include("PowhegControl/PowhegControl_Zj_MiNNLO_Common.py")
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 Z+j MiNNLO production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = [ "SM", "Z", "1jet" ]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
diff --git a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Z_example.py b/Generators/PowhegControl/share/example/processes/Zjj/mc.PhPy8EG_A14NNPDF23_Zjj_example.py
similarity index 52%
rename from Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Z_example.py
rename to Generators/PowhegControl/share/example/processes/Zjj/mc.PhPy8EG_A14NNPDF23_Zjj_example.py
index 648ce0203e3d36c506480e777d90fd566f15dbb6..f83778d31df639253de1254f2d19ef81c319885e 100644
--- a/Generators/PowhegControl/examples/MC15_examples/MC15.101010.PowhegPythia8EvtGen_A14NNPDF23_Z_example.py
+++ b/Generators/PowhegControl/share/example/processes/Zjj/mc.PhPy8EG_A14NNPDF23_Zjj_example.py
@@ -1,20 +1,20 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#--------------------------------------------------------------
-# Powheg Z setup starting from ATLAS defaults
+# Powheg Zj setup starting from ATLAS defaults
#--------------------------------------------------------------
-include('PowhegControl/PowhegControl_Z_Common.py')
+include("PowhegControl/PowhegControl_Zjj_Common.py")
PowhegConfig.generate()
#--------------------------------------------------------------
# Pythia8 showering with the A14 NNPDF2.3 tune
#--------------------------------------------------------------
-include('MC15JobOptions/Pythia8_A14_NNPDF23LO_EvtGen_Common.py')
-include('MC15JobOptions/Pythia8_Powheg.py')
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
#--------------------------------------------------------------
# EVGEN configuration
#--------------------------------------------------------------
-evgenConfig.description = 'POWHEG+Pythia8 bb production with A14 NNPDF2.3 tune'
-evgenConfig.keywords = [ 'SM', 'Z' ]
-evgenConfig.contact = [ 'james.robinson@cern.ch' ]
+evgenConfig.description = "POWHEG+Pythia8 Z+jj production with A14 NNPDF2.3 tune"
+evgenConfig.keywords = [ "SM", "Z", "2jet" ]
+evgenConfig.contact = [ "simone.amoroso@cern.ch" ]
diff --git a/Generators/PowhegControl/share/example/processes/bb/mc.PhPy8EG_A14NNPDF23_bb_example.py b/Generators/PowhegControl/share/example/processes/bb/mc.PhPy8EG_A14NNPDF23_bb_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..29027ce981a0e68de8ba9820de23aef84a8f5dd9
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/bb/mc.PhPy8EG_A14NNPDF23_bb_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 bb production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg bb process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_bb_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/bbH/mc.PhPy8EG_A14NNPDF23_bbH_example.py b/Generators/PowhegControl/share/example/processes/bbH/mc.PhPy8EG_A14NNPDF23_bbH_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..8a7a1911897d87e8c23d51bd8abf8588aba677e5
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/bbH/mc.PhPy8EG_A14NNPDF23_bbH_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 bbH production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "bottom", "Higgs"]
+evgenConfig.contact = ["simone.amoroso@cern.ch", "riccardo.di.sipio@cern.ch" ]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg bbH process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_bbH_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/bblvlv/mc.PhPy8EG_A14NNPDF23_bblvlv_example.py b/Generators/PowhegControl/share/example/processes/bblvlv/mc.PhPy8EG_A14NNPDF23_bblvlv_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..5a427bb9b809d5c1ed89d2b8f28e5528b52787a4
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/bblvlv/mc.PhPy8EG_A14NNPDF23_bblvlv_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 bblvlv production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "WW", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg bblvlv process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_bblvlv_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/chi0chi0/mc.PhPy8EG_A14NNPDF23_chi0chi0_example.py b/Generators/PowhegControl/share/example/processes/chi0chi0/mc.PhPy8EG_A14NNPDF23_chi0chi0_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..b6e4c74a7f1536fd919558327cb7ccd1fb4c9d30
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/chi0chi0/mc.PhPy8EG_A14NNPDF23_chi0chi0_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 chi0chi0 production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SUSY"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg chi0chi0 process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_chi0chi0_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/chi0chi1/mc.PhPy8EG_A14NNPDF23_chi0chi1_example.py b/Generators/PowhegControl/share/example/processes/chi0chi1/mc.PhPy8EG_A14NNPDF23_chi0chi1_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..ba5cb54c324842c6f025817f076493f834b45129
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/chi0chi1/mc.PhPy8EG_A14NNPDF23_chi0chi1_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 chi0chi1 production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SUSY"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg chi0chi1 process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_chi0chi1_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/chi1chi1/mc.PhPy8EG_A14NNPDF23_chi1chi1_example.py b/Generators/PowhegControl/share/example/processes/chi1chi1/mc.PhPy8EG_A14NNPDF23_chi1chi1_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..7646f2cd4813f8d8702ff4c3ee931149c8409117
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/chi1chi1/mc.PhPy8EG_A14NNPDF23_chi1chi1_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 chi1chi1 production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SUSY"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg chi1chi1 process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_chi1chi1_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/ggF_H/mc.PhPy8EG_A14NNPDF23_ggF_H_example.py b/Generators/PowhegControl/share/example/processes/ggF_H/mc.PhPy8EG_A14NNPDF23_ggF_H_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..7493a616bbbff81011d1dc2ffcc906c128435fc3
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ggF_H/mc.PhPy8EG_A14NNPDF23_ggF_H_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 gluon-fusion Higgs production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["Higgs", "SMHiggs"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ggF_H process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ggF_H_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/ggF_HH/mc.PhPy8EG_A14NNPDF23_ggF_HH_example.py b/Generators/PowhegControl/share/example/processes/ggF_HH/mc.PhPy8EG_A14NNPDF23_ggF_HH_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..9b0f7453fdc3cbea133ad378e19bcccbe020c4e3
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ggF_HH/mc.PhPy8EG_A14NNPDF23_ggF_HH_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 gluon-fusion di-Higgs production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["Higgs", "SMHiggs"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ggF_H process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ggF_HH_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/ggF_HZ/mc.PhPy8EG_A14NNPDF23_ggF_HZ_example.py b/Generators/PowhegControl/share/example/processes/ggF_HZ/mc.PhPy8EG_A14NNPDF23_ggF_HZ_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..b0f7f0ba431e6a285c1d9171ca431258f3d593d5
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ggF_HZ/mc.PhPy8EG_A14NNPDF23_ggF_HZ_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 gluon-fusion Higgs+Z production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ggF_HZ process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ggF_HZ_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/jj/mc.PhPy8EG_A14NNPDF23_jj_example.py b/Generators/PowhegControl/share/example/processes/jj/mc.PhPy8EG_A14NNPDF23_jj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..3924567f28346d1a4966c8c5868b8c7148038635
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/jj/mc.PhPy8EG_A14NNPDF23_jj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 dijet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "jets", "2jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg jj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_jj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/jjj/mc.PhPy8EG_A14NNPDF23_jjj_example.py b/Generators/PowhegControl/share/example/processes/jjj/mc.PhPy8EG_A14NNPDF23_jjj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..f970f8a8f7200d15b3f9791592f960356bc4737a
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/jjj/mc.PhPy8EG_A14NNPDF23_jjj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 trijet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "jets", "3jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg jjj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_jjj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/ssWWjj/mc.PhPy8EG_A14NNPDF23_ssWWjj_example.py b/Generators/PowhegControl/share/example/processes/ssWWjj/mc.PhPy8EG_A14NNPDF23_ssWWjj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..0c583e401ed0448bc0fc59d5a7ee3e8f3d3fee7d
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ssWWjj/mc.PhPy8EG_A14NNPDF23_ssWWjj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 same-sign WW+2jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "diboson", "WW", "2jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg bb process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ssWWjj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/t_sch/mc.PhPy8EG_A14NNPDF23_t_sch_example.py b/Generators/PowhegControl/share/example/processes/t_sch/mc.PhPy8EG_A14NNPDF23_t_sch_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab14bdeb30af859d0b096b07915dfd6597d14689
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/t_sch/mc.PhPy8EG_A14NNPDF23_t_sch_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 s-channel single top production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg t_sch process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_t_sch_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/t_tch_4FS/mc.PhPy8EG_A14NNPDF23_t_tch_4FS_example.py b/Generators/PowhegControl/share/example/processes/t_tch_4FS/mc.PhPy8EG_A14NNPDF23_t_tch_4FS_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..46b00174d7c984f58e419aaabcfbc5ae551d1313
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/t_tch_4FS/mc.PhPy8EG_A14NNPDF23_t_tch_4FS_example.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 t-channel single top production (4-flavour scheme) with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "2jet", "bottom"]
+evgenConfig.contact = ["simone.amoroso@cern.ch", "disipio@cern.ch"]
+evgenConfig.generators = [ "Powheg", "Pythia8", "EvtGen" ]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg t_tch_4FS process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_t_tch_4FS_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/tj/mc.PhPy8EG_A14NNPDF23_tj_example.py b/Generators/PowhegControl/share/example/processes/tj/mc.PhPy8EG_A14NNPDF23_tj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..a30c0455acfa5c3177f165bb0d2ec3d97a5ff193
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/tj/mc.PhPy8EG_A14NNPDF23_tj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 single top plus jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top"]
+evgenConfig.contact = ["stefan.richter@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg tj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_tj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/tt/mc.PhPy8EG_A14NNPDF23_tt_example.py b/Generators/PowhegControl/share/example/processes/tt/mc.PhPy8EG_A14NNPDF23_tt_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..83e767e045e2f6f1be4d157ec44c891a042202a2
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/tt/mc.PhPy8EG_A14NNPDF23_tt_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 top pair production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg tt process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_tt_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/ttH/mc.PhPy8EG_A14NNPDF23_ttH_example.py b/Generators/PowhegControl/share/example/processes/ttH/mc.PhPy8EG_A14NNPDF23_ttH_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..1769614957da84f87b5775923f5139541bb1500f
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ttH/mc.PhPy8EG_A14NNPDF23_ttH_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 ttH production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top", "Higgs"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ttH process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ttH_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/tt_NLOdecays/mc.PhPy8EG_A14NNPDF23_tt_NLOdecays_example.py b/Generators/PowhegControl/share/example/processes/tt_NLOdecays/mc.PhPy8EG_A14NNPDF23_tt_NLOdecays_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..9b7d944aa2ef9e5f29555ec1bc2b88661255b032
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/tt_NLOdecays/mc.PhPy8EG_A14NNPDF23_tt_NLOdecays_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 top pair production (NLO decays) with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top"]
+evgenConfig.contact = ["simone.amoroso@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ttb_NLO_dec process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_tt_NLOdecays_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/ttbb/mc.PhPy8EG_A14NNPDF23_ttbb_example.py b/Generators/PowhegControl/share/example/processes/ttbb/mc.PhPy8EG_A14NNPDF23_ttbb_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe4a819fd71d1807fffa71a100b3a9a780c8bdbc
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ttbb/mc.PhPy8EG_A14NNPDF23_ttbb_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 top pair plus bottom pair production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top"]
+evgenConfig.contact = ["stefan.richter@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ttbb process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ttbb_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/ttj/mc.PhPy8EG_A14NNPDF23_ttj_example.py b/Generators/PowhegControl/share/example/processes/ttj/mc.PhPy8EG_A14NNPDF23_ttj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..9d0d23da80e76724b963c9fb9a54d60061d61afe
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/ttj/mc.PhPy8EG_A14NNPDF23_ttj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 tt+jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "top", "1jet"]
+evgenConfig.contact = ["simone.amoroso@cern.ch", "stefan.richter@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg ttj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_ttj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/PowhegControl/share/example/processes/yj/mc.PhPy8EG_A14NNPDF23_yj_example.py b/Generators/PowhegControl/share/example/processes/yj/mc.PhPy8EG_A14NNPDF23_yj_example.py
new file mode 100644
index 0000000000000000000000000000000000000000..8a09b7c689db01e8c10ac870ffa7d7a23ea8abea
--- /dev/null
+++ b/Generators/PowhegControl/share/example/processes/yj/mc.PhPy8EG_A14NNPDF23_yj_example.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#--------------------------------------------------------------
+# EVGEN configuration
+#--------------------------------------------------------------
+evgenConfig.description = "POWHEG+Pythia8 direct photon plus jet production with A14 NNPDF2.3 tune."
+evgenConfig.keywords = ["SM", "QCD", "QED", "photon"]
+evgenConfig.contact = ["stefan.richter@cern.ch"]
+
+# --------------------------------------------------------------
+# Load ATLAS defaults for the Powheg yj process
+# --------------------------------------------------------------
+include("PowhegControl/PowhegControl_yj_Common.py")
+
+# --------------------------------------------------------------
+# Generate events
+# --------------------------------------------------------------
+PowhegConfig.generate()
+
+#--------------------------------------------------------------
+# Pythia8 showering with the A14 NNPDF2.3 tune
+#--------------------------------------------------------------
+include("Pythia8_i/Pythia8_A14_NNPDF23LO_EvtGen_Common.py")
+include("Pythia8_i/Pythia8_Powheg.py")
diff --git a/Generators/Pythia8_i/share/common/Pythia8_RapidityOrderMPI.py b/Generators/Pythia8_i/share/common/Pythia8_RapidityOrderMPI.py
index 86d7b3664fe2ee558b1f9b019e0ac9248ee48537..eabf4643af1b2c49faba118218420e28c04718d8 100644
--- a/Generators/Pythia8_i/share/common/Pythia8_RapidityOrderMPI.py
+++ b/Generators/Pythia8_i/share/common/Pythia8_RapidityOrderMPI.py
@@ -16,33 +16,8 @@ for cmd in genSeq.Pythia8.Commands:
# rel = os.popen("echo $AtlasVersion").read()
# if rel[:2].isdigit() and int(rel[:2])<=20 :
cmak_sys = os.getenv('CMAKE_PREFIX_PATH')
- if not cmak_sys:
- verstr = os.popen("cmt show versions External/Pythia8").read()
- start=1
- versions=[]
- while start > 0:
- start = verstr.find("Pythia8-", start + 1)
- if start < 0:
- break
- versions.append(verstr[start+8: start+16])
-
- versions.sort()
- series = versions[-1][0:2]
- majorStr = versions[-1][3:5]
-
- else:
- print(" running in cmake system")
- verstr = os.popen("acmake.py show_versions Pythia8_i").read()
- majorStr=0
- ver1=verstr[-6:-4]
- ver2=verstr[-9:-7]
- if ver1 == 12 and ver2==8:
- majorStr=19
- series="02"
-
- if int(majorStr) >= 19 and series != "01" :
- rapidityOrderMPICommand = ["SpaceShower:rapidityOrderMPI = " + val]
+ rapidityOrderMPICommand = ["SpaceShower:rapidityOrderMPI = " + val]
if addRapidityOrderMPI and len(rapidityOrderMPICommand) != 0:
genSeq.Pythia8.Commands += rapidityOrderMPICommand
diff --git a/Generators/Rivet_i/examples/convert2root b/Generators/Rivet_i/examples/convert2root
new file mode 100755
index 0000000000000000000000000000000000000000..d5ef4ca467ec25136188e11c08524d7606beab4f
--- /dev/null
+++ b/Generators/Rivet_i/examples/convert2root
@@ -0,0 +1,30 @@
+#! /usr/bin/env python
+
+from array import array
+import ROOT as rt
+import yoda, sys
+
+fName = str(sys.argv[1])
+yodaAOs = yoda.read(fName)
+rtFile = rt.TFile(fName[:fName.find('.yoda')] + '.root', 'recreate')
+for name in yodaAOs:
+ yodaAO = yodaAOs[name]; rtAO = None
+ if 'Histo1D' in str(yodaAO):
+ rtAO = rt.TH1D(name, '', yodaAO.numBins(), array('d', yodaAO.xEdges()))
+ rtAO.Sumw2(); rtErrs = rtAO.GetSumw2()
+ for i in range(rtAO.GetNbinsX()):
+ rtAO.SetBinContent(i + 1, yodaAO.bin(i).sumW())
+ rtErrs.AddAt(yodaAO.bin(i).sumW2(), i+1)
+ elif 'Scatter2D' in str(yodaAO):
+ rtAO = rt.TGraphAsymmErrors(yodaAO.numPoints())
+ for i in range(yodaAO.numPoints()):
+ x = yodaAO.point(i).x(); y = yodaAO.point(i).y()
+ xLo, xHi = yodaAO.point(i).xErrs()
+ yLo, yHi = yodaAO.point(i).yErrs()
+ rtAO.SetPoint(i, x, y)
+ rtAO.SetPointError(i, xLo, xHi, yLo, yHi)
+ else:
+ continue
+ rtAO.Write(name)
+rtFile.Close()
+
diff --git a/Generators/Rivet_i/examples/grid_jO.py b/Generators/Rivet_i/examples/grid_jO.py
new file mode 100644
index 0000000000000000000000000000000000000000..43132985b0f30077c756ed51811b1f3caa59a7bf
--- /dev/null
+++ b/Generators/Rivet_i/examples/grid_jO.py
@@ -0,0 +1,19 @@
+theApp.EvtMax = -1
+
+import AthenaPoolCnvSvc.ReadAthenaPool
+
+from AthenaCommon.AlgSequence import AlgSequence
+job = AlgSequence()
+
+from Rivet_i.Rivet_iConf import Rivet_i
+rivet = Rivet_i()
+import os
+rivet.AnalysisPath = os.environ['PWD']
+
+rivet.Analyses += [ 'MC_JETS' ]
+rivet.RunName = ''
+rivet.HistoFile = 'MyOutput.yoda.gz'
+rivet.CrossSection = 1.0
+#rivet.IgnoreBeamCheck = True
+job += rivet
+
diff --git a/Generators/Rivet_i/examples/jobOptions.rivet-readevgenfile.py b/Generators/Rivet_i/examples/jobOptions.rivet-readevgenfile.py
deleted file mode 100644
index 096697599657386b3e7196f261e5ed96fb384345..0000000000000000000000000000000000000000
--- a/Generators/Rivet_i/examples/jobOptions.rivet-readevgenfile.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## Example job option script to run Rivet inside Athena
-## using events read in from an EVGEN POOL/ROOT file.
-##
-## Author: James Monk <jmonk@hep.ucl.ac.uk>
-## Author: Andy Buckley <andy.buckley@cern.ch>
-
-include("GeneratorUtils/StdAnalysisSetup.py")
-theApp.EvtMax = 1000
-
-## Specify input evgen files
-import glob, AthenaPoolCnvSvc.ReadAthenaPool
-svcMgr.EventSelector.InputCollections = ["/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.6/minbias-pythia8-7000.evgen.pool.root"]
-
-## Now set up Rivet
-from Rivet_i.Rivet_iConf import Rivet_i
-topAlg += Rivet_i("Rivet")
-topAlg.Rivet.Analyses = ["EXAMPLE", "MC_GENERIC"]
-topAlg.Rivet.Analyses += ["ATLAS_2012_I1082936"]
-
-## Configure ROOT file output
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from GaudiSvc.GaudiSvcConf import THistSvc
-svcMgr += THistSvc()
-svcMgr.THistSvc.Output = ["Rivet DATAFILE='Rivet.root' OPT='RECREATE'"]
-#svcMgr.MessageSvc.OutputLevel = ERROR
diff --git a/Generators/Rivet_i/examples/jobOptions.rivet.py b/Generators/Rivet_i/examples/jobOptions.rivet.py
deleted file mode 100644
index f00d807b4df1c7e0ec7ee61724f4b54ca4ef6fb7..0000000000000000000000000000000000000000
--- a/Generators/Rivet_i/examples/jobOptions.rivet.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## Example job option script to run an event generator
-## and Rivet inside Athena
-##
-## Author: James Monk <jmonk@hep.ucl.ac.uk>
-## Author: Andy Buckley <andy.buckley@cern.ch>
-
-include("GeneratorUtils/StdEvgenSetup.py")
-theApp.EvtMax = 1000
-
-## Configure and add an event generator to the alg seq
-from Pythia8_i.Pythia8_iConf import Pythia8_i
-topAlg += Pythia8_i("Pythia8")
-topAlg.Pythia8.CollisionEnergy = 7000.0
-topAlg.Pythia8.Commands += ['HardQCD:all = on', 'PhaseSpace:pTHatMin = 30.0']
-
-## Now set up Rivet
-from Rivet_i.Rivet_iConf import Rivet_i
-topAlg += Rivet_i("Rivet")
-topAlg.Rivet.Analyses = ["MC_GENERIC"]
-#topAlg.Rivet.Analyses += ["ATLAS_2012_I1082936"]
-#topAlg.Rivet.DoRootHistos = False
-#topAlg.Rivet.OutputLevel = DEBUG
-
-## Configure ROOT file output
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from GaudiSvc.GaudiSvcConf import THistSvc
-svcMgr += THistSvc()
-svcMgr.THistSvc.Output = ["Rivet DATAFILE='Rivet.root' OPT='RECREATE'"]
-#svcMgr.MessageSvc.OutputLevel = ERROR
diff --git a/Generators/Rivet_i/examples/local_jO.py b/Generators/Rivet_i/examples/local_jO.py
new file mode 100644
index 0000000000000000000000000000000000000000..01c4089f2addf6587a6a9c81f7f843fbc0575170
--- /dev/null
+++ b/Generators/Rivet_i/examples/local_jO.py
@@ -0,0 +1,20 @@
+theApp.EvtMax = -1
+
+import AthenaPoolCnvSvc.ReadAthenaPool
+svcMgr.EventSelector.InputCollections = [ 'EVNT.root' ]
+
+from AthenaCommon.AlgSequence import AlgSequence
+job = AlgSequence()
+
+from Rivet_i.Rivet_iConf import Rivet_i
+rivet = Rivet_i()
+import os
+rivet.AnalysisPath = os.environ['PWD']
+
+rivet.Analyses += [ 'MC_JETS' ]
+rivet.RunName = ''
+rivet.HistoFile = 'MyOutput.yoda.gz'
+rivet.CrossSection = 1.0
+#rivet.IgnoreBeamCheck = True
+job += rivet
+
diff --git a/Generators/Rivet_i/src/Rivet_i.cxx b/Generators/Rivet_i/src/Rivet_i.cxx
index a9399d0b62c7f0ce4c1c6e34705272de8b3abfe7..e5f1d048a7d8955c7acf6d8d565043d0b3406bf8 100644
--- a/Generators/Rivet_i/src/Rivet_i.cxx
+++ b/Generators/Rivet_i/src/Rivet_i.cxx
@@ -10,7 +10,6 @@
#include "AtlasHepMC/GenEvent.h"
#include "GeneratorObjects/McEventCollection.h"
-#include "GenInterfaces/IHepMCWeightSvc.h"
#include "AthenaKernel/errorcheck.h"
#include "PathResolver/PathResolver.h"
@@ -36,15 +35,14 @@
Rivet_i::Rivet_i(const std::string& name, ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator),
- m_hepMCWeightSvc("HepMCWeightSvc", name),
m_analysisHandler(0),
m_init(false)
{
// Options
declareProperty("McEventKey", m_genEventKey="GEN_EVENT");
declareProperty("Analyses", m_analysisNames);
- declareProperty("CrossSection", m_crossSection=-1.0);
- declareProperty("CrossSectionUncertainty", m_crossSection_uncert=-1.0);
+ declareProperty("CrossSection", m_crossSection=0.0);
+ declareProperty("CrossSectionUncertainty", m_crossSection_uncert=0.0);
declareProperty("Stream", m_stream="/Rivet");
declareProperty("RunName", m_runname="");
declareProperty("HistoFile", m_file="Rivet.yoda");
@@ -53,8 +51,8 @@ Rivet_i::Rivet_i(const std::string& name, ISvcLocator* pSvcLocator) :
declareProperty("IgnoreBeamCheck", m_ignorebeams=false);
declareProperty("DoRootHistos", m_doRootHistos=false);
declareProperty("SkipWeights", m_skipweights=false);
- //declareProperty("MatchWeights", m_matchWeights="");
- //declareProperty("UnmatchWeights", m_unmatchWeights="");
+ declareProperty("MatchWeights", m_matchWeights="");
+ declareProperty("UnmatchWeights", m_unmatchWeights="");
declareProperty("WeightCap", m_weightcap=-1.0);
}
@@ -123,7 +121,7 @@ StatusCode Rivet_i::initialize() {
m_analysisHandler = new Rivet::AnalysisHandler(m_runname);
assert(m_analysisHandler);
m_analysisHandler->setIgnoreBeams(m_ignorebeams); //< Whether to do beam ID/energy consistency checks
- m_analysisHandler->skipMultiWeights(m_skipweights); //< Whether to skip weights or not
+ m_analysisHandler->skipMultiWeights(m_skipweights); //< Only run on the nominal weight
//m_analysisHandler->selectMultiWeights(m_matchWeights); //< Only run on a subset of the multi-weights
//m_analysisHandler->deselectMultiWeights(m_unmatchWeights); //< Veto a subset of the multi-weights
if (m_weightcap>0) m_analysisHandler->setWeightCap(m_weightcap);
@@ -208,11 +206,11 @@ StatusCode Rivet_i::execute() {
StatusCode Rivet_i::finalize() {
ATH_MSG_INFO("Rivet_i finalizing");
- // Set xsec in Rivet
- // Set xsec in Rivet
- double custom_xs = m_crossSection > 0 ? m_crossSection : 1.0;
- double custom_xserr = m_crossSection_uncert > 0 ? m_crossSection_uncert : 0.0;
- m_analysisHandler->setCrossSection({custom_xs, custom_xserr});
+ // Setting cross-section in Rivet
+ // If no user-specified cross-section available,
+ // set AMI cross-section at plotting time
+ double custom_xs = m_crossSection != 0 ? m_crossSection : 1.0;
+ m_analysisHandler->setCrossSection({custom_xs, m_crossSection_uncert});
// Call Rivet finalize
m_analysisHandler->finalize();
@@ -256,45 +254,36 @@ const HepMC::GenEvent* Rivet_i::checkEvent(const HepMC::GenEvent* event) {
// weight-name cleaning
#ifdef HEPMC3
- std::vector<std::string> w_names = event->weight_names();
- std::vector<std::pair<std::string,std::string> > w_subs = {
- {" nominal ",""},
- {" set = ","_"},
- {" = ","_"},
- {"=",""},
- {",",""},
- {".",""},
- {":",""},
- {" ","_"},
- {"#","num"},
- {"\n","_"},
- {"/","over"}
- };
- for (std::string& wname : w_names) {
- for (const auto& sub : w_subs) {
- size_t start_pos = wname.find(sub.first);
- while (start_pos != std::string::npos) {
- wname.replace(start_pos, sub.first.length(), sub.second);
- start_pos = wname.find(sub.first);
+ std::vector<std::string> w_wnames = event->weight_names();
+ if (w_names.size()) {
+ std::vector<std::pair<std::string,std::string> > w_subs = {
+ {" nominal ",""},
+ {" set = ","_"},
+ {" = ","_"},
+ {"=",""},
+ {",",""},
+ {".",""},
+ {":",""},
+ {" ","_"},
+ {"#","num"},
+ {"\n","_"},
+ {"/","over"}
+ };
+ for (std::string& wname : w_names) {
+ for (const auto& sub : w_subs) {
+ size_t start_pos = wname.find(sub.first);
+ while (start_pos != std::string::npos) {
+ wname.replace(start_pos, sub.first.length(), sub.second);
+ start_pos = wname.find(sub.first);
+ }
}
}
+ modEvent->run_info()->set_weight_names(w_names);
}
- modEvent->run_info()->set_weight_names(w_names);
#else
const HepMC::WeightContainer& old_wc = event->weights();
- std::ostringstream stream;
- old_wc.print(stream);
- std::string str = stream.str();
- // if it only has one element,
- // then it doesn't use named weights
- // --> no need for weight-name cleaning
- if (str.size() > 1) {
- std::vector<std::string> orig_order(m_hepMCWeightSvc->weightNames().size());
- for (const auto& item : m_hepMCWeightSvc->weightNames()) {
- orig_order[item.second] = item.first;
- }
- std::map<std::string, double> new_name_to_value;
- std::map<std::string, std::string> old_name_to_new_name;
+ std::vector<std::string> old_wnames = old_wc.weight_names();
+ if (old_wnames.size()) {
HepMC::WeightContainer& new_wc = modEvent->weights();
new_wc.clear();
std::vector<std::pair<std::string,std::string> > w_subs = {
@@ -311,33 +300,66 @@ const HepMC::GenEvent* Rivet_i::checkEvent(const HepMC::GenEvent* event) {
{"/","over"}
};
std::regex re("(([^()]+))"); // Regex for stuff enclosed by parentheses ()
- for (std::sregex_iterator i = std::sregex_iterator(str.begin(), str.end(), re);
- i != std::sregex_iterator(); ++i ) {
- std::smatch m = *i;
- std::vector<std::string> temp = ::split(m.str(), "[,]");
- if (temp.size() == 2 || temp.size() == 3) {
- std::string wname = temp[0];
- if (temp.size() == 3) wname += "," + temp[1];
- std::string old_name = std::string(wname);
- double value = old_wc[wname];
- for (const auto& sub : w_subs) {
- size_t start_pos = wname.find(sub.first);
- while (start_pos != std::string::npos) {
- wname.replace(start_pos, sub.first.length(), sub.second);
- start_pos = wname.find(sub.first);
- }
+ // TEMP from Rivet dev branch
+ std::vector<std::std::regex> select_patterns, deselect_patterns;
+ if (m_matchWeights != "") {
+ // Compile regex from each string in the comma-separated list
+ for (const std::string& pattern : split(m_matchWeights, ",")) {
+ select_patterns.push_back( std::regex(pattern) );
+ }
+ }
+ if (m_unmatchWeights != "") {
+ // Compile regex from each string in the comma-separated list
+ for (const std::string& pattern : split(m_unmatchWeights, ",")) {
+ deselect_patterns.push_back( std::regex(pattern) );
+ }
+ }
+ // END OF TEMP
+
+ std::map<std::string, double> new_name_to_value;
+ std::map<std::string, std::string> old_name_to_new_name;
+ for (const std::string& old_name : old_wnames) {
+ std::string wname = std::string(old_name);
+ double value = old_wc[old_name];
+ for (const auto& sub : w_subs) {
+ size_t start_pos = wname.find(sub.first);
+ while (start_pos != std::string::npos) {
+ wname.replace(start_pos, sub.first.length(), sub.second);
+ start_pos = wname.find(sub.first);
+ }
+ }
+ // Pulling some logic from the Rivet development branch
+ // until we have a release with this patch:
+
+ // Check if weight name matches a supplied string/regex and filter to select those only
+ bool match = select_patterns.empty();
+ for (const std::regex& re : select_patterns) {
+ if ( std::regex_match(wname, re) ) {
+ match = true;
+ break;
}
- new_name_to_value[wname] = value;
- old_name_to_new_name[old_name] = wname;
}
+ // Check if the remaining weight names match supplied string/regexes and *de*select accordingly
+ bool unmatch = false;
+ for (const std::regex& re : deselect_patterns) {
+ if ( std::regex_match(wname, re) ) { unmatch = true; break; }
+ }
+ if (!match || unmatch) continue;
+
+ // end of borrowing logic from the Rivet development branch
+ new_name_to_value[wname] = value;
+ old_name_to_new_name[old_name] = wname;
}
- for (const std::string& old_name : orig_order) {
- const std::string& new_name = old_name_to_new_name[old_name];
+ auto itEnd = old_name_to_new_name.end();
+ for (const string& old_name : old_wnames) {
+ if (old_name_to_new_name.find(old_name) == itEnd) continue;
+ const string& new_name = old_name_to_new_name[old_name];
new_wc[ new_name ] = new_name_to_value[new_name];
}
// end of weight-name cleaning
}
#endif
+
#ifdef HEPMC3
if (
false//!modEvent->valid_beam_particles()//FIXME!
diff --git a/Generators/Rivet_i/src/Rivet_i.h b/Generators/Rivet_i/src/Rivet_i.h
index dd236df9e71a0c9dbedfc5bf6913f735eea978b4..25d97878cffc28887ef6b3b81afe2034f89a7582 100644
--- a/Generators/Rivet_i/src/Rivet_i.h
+++ b/Generators/Rivet_i/src/Rivet_i.h
@@ -6,22 +6,20 @@
#define RIVET_I_H
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ServiceHandle.h"
#include "Rivet/AnalysisHandler.hh"
-#include "AtlasHepMC/GenEvent.h"
#include <vector>
#include <string>
class ISvcLocator;
-class IHepMCWeightSvc;
//class ITHistSvc;
/// Interface to the Rivet analysis package
/// @author James Monk <jmonk@cern.ch>
/// @author Andy Buckley <andy.buckley@cern.ch>
+/// @author Christian Gutschow <chris.g@cern.ch>
class Rivet_i : public AthAlgorithm {
public:
@@ -56,9 +54,6 @@ private:
/// A pointer to the THistSvc
//ServiceHandle<ITHistSvc> m_histSvc;
- /// A pointer to the HepMCWeightSvc
- ServiceHandle<IHepMCWeightSvc> m_hepMCWeightSvc;
-
/// The stream name for storing the output plots under (default "/Rivet")
std::string m_stream;
@@ -111,10 +106,10 @@ private:
bool m_skipweights;
/// String of weight names (or regex) to select multiweights
- //std::string m_matchWeights;
+ std::string m_matchWeights;
/// String of weight names (or regex) to veto multiweights
- //std::string m_unmatchWeights;
+ std::string m_unmatchWeights;
///Weight cap to set allowed maximum for weights
double m_weightcap;
diff --git a/Generators/Sherpa_i/CMakeLists.txt b/Generators/Sherpa_i/CMakeLists.txt
index ad8a9aa8c3340d8430cd439b1999963d28bbd109..fde33ef972995b1ea38df45c8ea95a9d3cca5c99 100644
--- a/Generators/Sherpa_i/CMakeLists.txt
+++ b/Generators/Sherpa_i/CMakeLists.txt
@@ -40,3 +40,6 @@ atlas_add_component( Sherpa_i
# Install files from the package:
atlas_install_headers( Sherpa_i )
+# Install JOs common fragments from the package share directory
+atlas_install_joboptions( share/common/*.py )
+
diff --git a/Generators/Tauolapp_i/CMakeLists.txt b/Generators/Tauolapp_i/CMakeLists.txt
index b86c0c1ba2eec0f60203c9cc4b320eb0604030fd..732d3039b0b5678746d21deace5081295c94f9c4 100644
--- a/Generators/Tauolapp_i/CMakeLists.txt
+++ b/Generators/Tauolapp_i/CMakeLists.txt
@@ -20,4 +20,4 @@ atlas_add_component( Tauolapp_i
GeneratorObjects )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/common/*.py )
diff --git a/Generators/Tauolapp_i/share/TauolaJobOption.py b/Generators/Tauolapp_i/share/common/TauolaJobOption.py
similarity index 100%
rename from Generators/Tauolapp_i/share/TauolaJobOption.py
rename to Generators/Tauolapp_i/share/common/TauolaJobOption.py
diff --git a/Generators/Tauolapp_i/share/TauolaJobOptionGen.py b/Generators/Tauolapp_i/share/common/TauolaJobOptionGen.py
similarity index 100%
rename from Generators/Tauolapp_i/share/TauolaJobOptionGen.py
rename to Generators/Tauolapp_i/share/common/TauolaJobOptionGen.py
diff --git a/Generators/Tauolapp_i/share/TauolaJobOptionGenPythia8.py b/Generators/Tauolapp_i/share/common/TauolaJobOptionGenPythia8.py
similarity index 100%
rename from Generators/Tauolapp_i/share/TauolaJobOptionGenPythia8.py
rename to Generators/Tauolapp_i/share/common/TauolaJobOptionGenPythia8.py
diff --git a/Generators/Tauolapp_i/share/common/TauolaPP_Fragment.py b/Generators/Tauolapp_i/share/common/TauolaPP_Fragment.py
new file mode 100644
index 0000000000000000000000000000000000000000..c0ee8588d39e2c72044c2aa33d3f9268b0237356
--- /dev/null
+++ b/Generators/Tauolapp_i/share/common/TauolaPP_Fragment.py
@@ -0,0 +1,13 @@
+## Tauola config
+from Tauolapp_i.Tauolapp_iConf import TauolaPP
+genSeq += TauolaPP()
+
+TauolaPP.decay_mode_same = 0;
+TauolaPP.decay_mode_opposite = 0;
+TauolaPP.decay_particle = 15;
+TauolaPP.tau_mass = 1.77684;
+TauolaPP.spin_correlation=True;
+TauolaPP.setRadiation=True;
+TauolaPP.setRadiationCutOff=0.01;
+
+evgenConfig.generators += [ "TauolaPP" ]
diff --git a/Generators/TruthUtils/TruthUtils/HepMCHelpers.h b/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
index ded69543e7e1d10cb864eb883668715539225048..6f3ac4f0f4e5bfac396181051bb4ea6977347779 100644
--- a/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
+++ b/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
@@ -138,11 +138,12 @@ template <class T> std::vector<T> findChildren(T p)
{
std::vector<T> ret;
if (!p) return ret;
+ auto v=p->end_vertex();
+ if (!v) return ret;
#ifdef HEPMC3
- ret=HepMC::children_particles(p);
+ for (auto pp: v->particles_out()) ret.push_back(pp);
#else
- auto v=p->end_vertex();
- if (p) for (auto pp=v->particles_out_const_begin();pp!=v->particles_out_const_end();++pp) ret.push_back(*pp);
+ for (auto pp=v->particles_out_const_begin();pp!=v->particles_out_const_end();++pp) ret.push_back(*pp);
#endif
if (ret.size()==1) if (ret.at(0)->pdg_id()==p->pdg_id()) ret=findChildren(ret.at(0));
return ret;
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
index 9a328f352eb55bde3d2767460c2dc15dc4f2d1cf..b2ba3f8023f3774f9e716fdde85a1ddc4fdb5c63 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
@@ -271,10 +271,10 @@ def configure_hlt_result(hypo_algs):
# Give the menu json name to HLTConfigSvc
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- if not hasattr(svcMgr, 'HLTConfigSvc'):
- from TrigConfigSvc.TrigConfigSvcConfig import HLTConfigSvc
- svcMgr += HLTConfigSvc()
- svcMgr.HLTConfigSvc.JsonFileName = menu_json
+ from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc
+ hltConfigSvc = getHLTConfigSvc(ConfigFlags)
+ hltConfigSvc.JsonFileName = menu_json
+ svcMgr += hltConfigSvc
# Tool adding stream tags to HLT result
stmaker = StreamTagMakerToolCfg()
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
index 9e363ea071c8e9adf2b69c038c017a6c6e53b3fe..068d32ec5d94478926fca56be4af243a80d65231 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
@@ -127,9 +127,6 @@ class HltEventLoopMgr(_HltEventLoopMgr):
super(HltEventLoopMgr, self).__init__(name)
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
self.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name)
- self.MonTool.defineHistogram('ErrorAlgName,ErrorCode', path='EXPERT', type='TH2I',
- title='Error StatusCodes per algorithm;Algorithm name;StatusCode',
- xbins=1, xmin=0, xmax=1, ybins=1, ymin=0, ymax=1)
self.MonTool.defineHistogram('TotalTime', path='EXPERT', type='TH1F',
title='Total event processing time (all events);Time [ms];Events',
xbins=200, xmin=0, xmax=10000)
@@ -142,4 +139,8 @@ class HltEventLoopMgr(_HltEventLoopMgr):
self.MonTool.defineHistogram('SlotIdleTime', path='EXPERT', type='TH1F',
title='Time between freeing and assigning a scheduler slot;Time [ms];Events',
xbins=400, xmin=0, xmax=400)
+
+ from TrigSteerMonitor.TrigSteerMonitorConfig import getTrigErrorMonTool
+ self.TrigErrorMonTool = getTrigErrorMonTool()
+
return
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
index c619cb671b528f585a3966e9fe7a37674ca396d8..8718714de1eaa92575a46bb6b16ff456cb3b9943 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
@@ -196,8 +196,9 @@ StatusCode HltEventLoopMgr::initialize()
ATH_CHECK(m_coolHelper.retrieve());
// HLT result builder
ATH_CHECK(m_hltResultMaker.retrieve());
- // Monitoring tool
+ // Monitoring tools
if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
+ ATH_CHECK(m_errorMonTool.retrieve());
//----------------------------------------------------------------------------
// Initialise data handle keys
@@ -1183,22 +1184,6 @@ void HltEventLoopMgr::runEventTimer()
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
}
-// =============================================================================
-std::unordered_map<std::string_view,StatusCode> HltEventLoopMgr::algExecErrors(const EventContext& eventContext) const {
- std::unordered_map<std::string_view,StatusCode> algErrors;
- for (const auto& [key, state] : m_aess->algExecStates(eventContext)) {
- if (!state.execStatus().isSuccess()) {
- ATH_MSG_DEBUG("Algorithm " << key << " returned StatusCode " << state.execStatus().message()
- << " in event " << eventContext.eventID());
- algErrors[key.str()] = state.execStatus();
- auto monErrorAlgName = Monitored::Scalar<std::string>("ErrorAlgName", key.str());
- auto monErrorCode = Monitored::Scalar<std::string>("ErrorCode", state.execStatus().message());
- auto mon = Monitored::Group(m_monTool, monErrorAlgName, monErrorCode);
- }
- }
- return algErrors;
-}
-
// =============================================================================
/**
* @brief Retrieves finished events from the scheduler, processes their output and cleans up the slots
@@ -1258,7 +1243,7 @@ HltEventLoopMgr::DrainSchedulerStatusCode HltEventLoopMgr::drainScheduler()
// Check the event processing status
if (m_aess->eventStatus(*thisFinishedEvtContext) != EventStatus::Success) {
markFailed();
- auto algErrors = algExecErrors(*thisFinishedEvtContext);
+ auto algErrors = m_errorMonTool->algExecErrors(*thisFinishedEvtContext);
HLT::OnlineErrorCode errCode = isTimedOut(algErrors) ?
HLT::OnlineErrorCode::TIMEOUT : HLT::OnlineErrorCode::PROCESSING_FAILURE;
HLT_DRAINSCHED_CHECK(sc, "Processing event with context " << *thisFinishedEvtContext
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
index 163ffa1e83cd1652674a08de210d880c784eaa5e..f3ff73ae52cab366d06ddb37957537e65fe8ab25 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
@@ -10,6 +10,7 @@
#include "TrigOutputHandling/HLTResultMTMaker.h"
#include "TrigSteeringEvent/OnlineErrorCode.h"
#include "TrigSteerMonitor/ISchedulerMonSvc.h"
+#include "TrigSteerMonitor/ITrigErrorMonTool.h"
// Athena includes
#include "AthenaBaseComps/AthService.h"
@@ -156,9 +157,6 @@ private:
/// The method executed by the event timeout monitoring thread
void runEventTimer();
- /// Produce a subset of IAlgExecStateSvc::algExecStates with only non-success StatusCodes
- std::unordered_map<std::string_view,StatusCode> algExecErrors(const EventContext& eventContext) const;
-
/// Drain the scheduler from all actions that may be queued
DrainSchedulerStatusCode drainScheduler();
@@ -186,6 +184,7 @@ private:
ToolHandle<TrigCOOLUpdateHelper> m_coolHelper{this, "CoolUpdateTool", "TrigCOOLUpdateHelper"};
ToolHandle<HLTResultMTMaker> m_hltResultMaker{this, "ResultMaker", "HLTResultMTMaker"};
ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", "", "Monitoring tool"};
+ ToolHandle<ITrigErrorMonTool> m_errorMonTool{this, "TrigErrorMonTool", "TrigErrorMonTool", "Error monitoring tool"};
SmartIF<IHiveWhiteBoard> m_whiteboard;
SmartIF<IAlgResourcePool> m_algResourcePool;
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
index 5745a8fe3e1092f6f25762232e7e3b61603a44e3..a9d7030af49dff0e35d0904fe73616a4f38398d5 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
@@ -219,11 +219,9 @@ void HltROBDataProviderSvc::addROBData(const EventContext& context, const std::v
// allocate vector of missing ROB Ids
std::vector<uint32_t> robIds_missing ;
- robIds_missing.reserve( robIds.size() ) ;
// allocate vector with existing ROB fragments in cache
std::vector<const ROBF*> robFragments_inCache ;
- robFragments_inCache.reserve( robIds.size() ) ;
// check input ROB list against cache
eventCache_checkRobListToCache(cache,robIds, robFragments_inCache, robIds_missing ) ;
@@ -325,7 +323,6 @@ void HltROBDataProviderSvc::getROBData(const EventContext& context,
// allocate vector of missing ROB Ids
std::vector<uint32_t> robIds_missing ;
- robIds_missing.reserve( robIds.size() ) ;
// check input ROB list against cache
eventCache_checkRobListToCache(cache, robIds, robFragments, robIds_missing) ;
@@ -375,8 +372,6 @@ void HltROBDataProviderSvc::getROBData(const EventContext& context,
eventCache_addRobData(cache, robFragments_missing) ;
// return all the requested ROB fragments from the cache
- robFragments.clear() ;
- robIds_missing.clear() ;
eventCache_checkRobListToCache(cache, robIds, robFragments, robIds_missing) ;
}
@@ -534,7 +529,7 @@ void HltROBDataProviderSvc::eventCache_clear(EventCache* cache)
cache->globalEventNumber = 0;
cache->eventStatus = 0;
cache->isEventComplete = false;
- cache->robmap.clear();
+ { cache->robmap.clear(); }
}
void HltROBDataProviderSvc::eventCache_checkRobListToCache(EventCache* cache, const std::vector<uint32_t>& robIds_toCheck,
@@ -543,6 +538,15 @@ void HltROBDataProviderSvc::eventCache_checkRobListToCache(EventCache* cache, co
{
ATH_MSG_VERBOSE("start of " << __FUNCTION__ << " number of ROB Ids to check = " << robIds_toCheck.size());
+ // clear output arrays
+ robFragments_inCache.clear();
+ robIds_missing.clear();
+
+ // allocate sufficient space for output arrays
+ robFragments_inCache.reserve( robIds_toCheck.size() );
+ robIds_missing.reserve( robIds_toCheck.size() );
+
+ // check input ROB ids
for (uint32_t id : robIds_toCheck) {
// check for duplicate IDs on the list of missing ROBs
@@ -553,12 +557,13 @@ void HltROBDataProviderSvc::eventCache_checkRobListToCache(EventCache* cache, co
}
// check if ROB is already in cache
- ROBMAP::const_iterator map_it = cache->robmap.find(id);
- if (map_it != cache->robmap.end()) {
- ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id 0x" << MSG::hex << id << MSG::dec
- << " found for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
- robFragments_inCache.push_back( &(map_it->second) );
- continue;
+ { ROBMAP::const_iterator map_it = cache->robmap.find(id);
+ if (map_it != cache->robmap.end()) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " ROB Id 0x" << MSG::hex << id << MSG::dec
+ << " found for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
+ robFragments_inCache.push_back( &(map_it->second) );
+ continue;
+ }
}
// check if ROB is actually enabled for readout
@@ -603,11 +608,12 @@ void HltROBDataProviderSvc::eventCache_addRobData(EventCache* cache, const std::
}
// check if ROB is already in cache
- ROBMAP::const_iterator it = cache->robmap.find(id);
- if (it != cache->robmap.end()) {
- ATH_MSG_VERBOSE(__FUNCTION__ << " Duplicate ROB Id 0x" << MSG::hex << id << MSG::dec
- << " found for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
- continue;
+ { ROBMAP::const_iterator it = cache->robmap.find(id);
+ if (it != cache->robmap.end()) {
+ ATH_MSG_VERBOSE(__FUNCTION__ << " Duplicate ROB Id 0x" << MSG::hex << id << MSG::dec
+ << " found for (global Id, L1 Id) = (" << cache->globalEventNumber << "," << cache->currentLvl1ID <<")" );
+ continue;
+ }
}
// check for ROBs with no data
@@ -632,12 +638,12 @@ void HltROBDataProviderSvc::eventCache_addRobData(EventCache* cache, const std::
}
// add ROB to map
- cache->robmap[id] = rob;
+ { cache->robmap[id] = rob; }
}
}
HltROBDataProviderSvc::EventCache::~EventCache()
{
// delete event;
- robmap.clear();
+ { robmap.clear(); }
}
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
index 3826852f22e49e9aacd3d343d97534930ee6e1cf..b4e35e65d4e96a4bd77f39796a63f7898303f223 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
@@ -14,7 +14,6 @@ atlas_depends_on_subdirs(
InnerDetector/InDetRecEvent/InDetPrepRawData
PRIVATE
Database/AthenaPOOL/AthenaPoolUtilities
- Database/CoralDB
DetectorDescription/DetDescrCond/DetDescrConditions
DetectorDescription/Identifier
Event/EventInfo
@@ -32,7 +31,6 @@ atlas_depends_on_subdirs(
# External dependencies:
find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase )
find_package( ROOT COMPONENTS Graf Core Tree MathCore Hist RIO MathMore Physics
Matrix Gpad )
@@ -41,57 +39,14 @@ atlas_add_library( PixelCalibAlgsLib
PixelCalibAlgs/*.h src/*.cxx
PUBLIC_HEADERS PixelCalibAlgs
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps CxxUtils
GaudiKernel InDetPrepRawData InDetConditionsSummaryService PixelCablingLib
- PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaPoolUtilities CoralDB
+ PRIVATE_LINK_LIBRARIES AthenaPoolUtilities
DetDescrConditions Identifier EventInfo PixelConditionsData InDetIdentifier
- InDetReadoutGeometry PixelReadoutGeometry InDetRawData PathResolver PixelGeoModelLib PixelConditionsToolsLib CoralDB )
+ InDetReadoutGeometry PixelReadoutGeometry InDetRawData PathResolver PixelGeoModelLib PixelConditionsToolsLib )
atlas_add_component( PixelCalibAlgs
src/components/*.cxx
LINK_LIBRARIES GaudiKernel InDetByteStreamErrors PixelConditionsData PixelCalibAlgsLib )
-# Executables in the package:
-atlas_add_executable( doPixelOfflineCalib
- Application/doPixelOfflineCalib.cxx
- LINK_LIBRARIES PixelCalibAlgsLib )
-
-atlas_add_executable( doPixelOfflineCalibG4
- Application/doPixelOfflineCalibG4.cxx
- LINK_LIBRARIES PixelCalibAlgsLib )
-
-atlas_add_executable( PlotChargeSharingConstants
- Application/PlotChargeSharingConstants.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib )
-
-atlas_add_executable( PlotPixelClusterOnTrackErrors
- Application/PlotPixelClusterOnTrackErrors.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib )
-
-atlas_add_executable( updateNoiseMaps
- Application/updateNoiseMaps.C
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib )
-
-atlas_add_executable( updateDeadMaps
- Application/updateDeadMaps.C
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib )
-
-atlas_add_executable( createDeadModuleList
- Application/createDeadModuleList.C
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib )
-
-atlas_add_executable( hackNoiseMapsForStudyCP
- Application/hackNoiseMapsForStudyCP.C
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} PixelConditionsData PixelCalibAlgsLib )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-atlas_install_runtime( share/*.txt share/*.sh share/*.dat )
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/ATLAS_CHECK_THREAD_SAFETY
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/ATLAS_CHECK_THREAD_SAFETY
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/DepletionDepthCalibration.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/DepletionDepthCalibration.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/DepletionDepthCalibration.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/DepletionDepthCalibration.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/LorentzAngleCalibration.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/LorentzAngleCalibration.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/LorentzAngleCalibration.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/LorentzAngleCalibration.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/NoiseMapBuilder.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/NoiseMapBuilder.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/NoiseMapBuilder.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/NoiseMapBuilder.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/OfflineCalibrationLoop.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/OfflineCalibrationLoop.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/OfflineCalibrationLoop.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/OfflineCalibrationLoop.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapDBWriter.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixMapDBWriter.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapDBWriter.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixMapDBWriter.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapOverlayWriter.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixMapOverlayWriter.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapOverlayWriter.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixMapOverlayWriter.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelBarrelSurvey.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelBarrelSurvey.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelBarrelSurvey.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelBarrelSurvey.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelBarrelSurveyUtils.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelBarrelSurveyUtils.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelBarrelSurveyUtils.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelBarrelSurveyUtils.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelClusterOnTrackErrorPlot.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelClusterOnTrackErrorPlot.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelClusterOnTrackErrorPlot.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelClusterOnTrackErrorPlot.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelConvert.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelConvert.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelConvert.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelConvert.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelRIOs.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelRIOs.h
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelRIOs.h
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/PixelCalibAlgs/PixelRIOs.h
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/DepletionDepthCalibration.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/DepletionDepthCalibration.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/DepletionDepthCalibration.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/DepletionDepthCalibration.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/LorentzAngleCalibration.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/LorentzAngleCalibration.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/LorentzAngleCalibration.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/LorentzAngleCalibration.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/NoiseMapBuilder.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/NoiseMapBuilder.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/OfflineCalibrationLoop.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/OfflineCalibrationLoop.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/OfflineCalibrationLoop.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/OfflineCalibrationLoop.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapDBWriter.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapDBWriter.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapDBWriter.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapDBWriter.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapOverlayWriter.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapOverlayWriter.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapOverlayWriter.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixMapOverlayWriter.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurvey.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelBarrelSurvey.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurvey.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelBarrelSurvey.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurveyUtils.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelBarrelSurveyUtils.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurveyUtils.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelBarrelSurveyUtils.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelClusterOnTrackErrorPlot.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelClusterOnTrackErrorPlot.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelClusterOnTrackErrorPlot.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelClusterOnTrackErrorPlot.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelConvert.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelConvert.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelConvert.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelConvert.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelRIOs.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelRIOs.cxx
similarity index 100%
rename from InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelRIOs.cxx
rename to InnerDetector/InDetCalibAlgs/PixelCalibAlgs/run2/src/PixelRIOs.cxx
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py
index 67a11a30b79b11bdfad63f0e66fa9ce03a63e3fd..aa1c8eaf42b7919e09478bcbca8746f7f95b52a1 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/share/NoiseMapBuilder.py
@@ -137,7 +137,6 @@ else :
from PixelConditionsServices.PixelConditionsServicesConf import PixelConditionsSummarySvc
ServiceMgr += PixelConditionsSummarySvc()
-ServiceMgr.PixelConditionsSummarySvc.UseSpecialPixelMap = False
ServiceMgr.PixelConditionsSummarySvc.UseDCS = False
ServiceMgr.PixelConditionsSummarySvc.UseByteStream = True
@@ -166,7 +165,12 @@ if doClusterization :
include( "PixelConditionsServices/PixelCalibSvc_jobOptions.py" )
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__PixelClusterization
- topSequence += InDet__PixelClusterization("PixelClusterization")
+
+ pixelClusterization = InDet__PixelClusterization("PixelClusterization")
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ pixelClusterization.RegSelTool = makeReagSelTool_Pixel()
+
+ topSequence += pixelClusterization
import logging
logger = logging.getLogger( 'PixelCalibAlgs' )
logger.info(topSequence.PixelClusterization)
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
index bee47e765f6e7ff6b3561b38a46709cff651d47b..0c751525b68a4349ebfa0a5ed8e06b18e74d17fa 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
@@ -1,12 +1,4 @@
-#include "PixelCalibAlgs/PixelBarrelSurvey.h"
-#include "PixelCalibAlgs/NoiseMapBuilder.h"
-#include "PixelCalibAlgs/PixMapDBWriter.h"
-#include "PixelCalibAlgs/PixMapOverlayWriter.h"
#include "PixelCalibAlgs/PixelChargeToTConversion.h"
-DECLARE_COMPONENT( PixelBarrelSurvey )
-DECLARE_COMPONENT( NoiseMapBuilder )
-DECLARE_COMPONENT( PixMapDBWriter )
-DECLARE_COMPONENT( PixMapOverlayWriter )
DECLARE_COMPONENT( PixelChargeToTConversion )
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
index 9675ae23a0f98a2bbd85af9ca566f9501518c900..455f0adf6775338e796aa750267e7070fdd71fb8 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/share/RAWHITemplate.py
@@ -422,6 +422,7 @@ print TRT_StrawStatus
+
topSequence.InDetTRT_RIO_Maker.TRTEffiCut=0.5
topSequence.InDetSCT_Clusterization.TRTEffiCut=0.5
topSequence.InDetPixelClusterization.TRTEffiCut=0.5
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
index 3b8fbef05ef5728cbe397e9b17ce05b02a59c098..ee236f632a43cbd78faaa6ddb2005d4fe184f9f3 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
@@ -8,8 +8,6 @@ atlas_subdir( PixelConditionsAlgorithms )
# External dependencies:
find_package( CLHEP )
find_package( COOL COMPONENTS CoolKernel )
-find_package( CORAL COMPONENTS CoralBase )
-find_package( ROOT COMPONENTS Core Hist RIO )
# Component(s) in the package:
atlas_add_library( PixelConditionsAlgorithmsLib
@@ -21,11 +19,9 @@ atlas_add_library( PixelConditionsAlgorithmsLib
atlas_add_component( PixelConditionsAlgorithms
src/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
${COOL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES}
- ${CLHEP_LIBRARIES} CommissionEvent AthenaBaseComps AthenaKernel AthenaPoolUtilities
- GaudiKernel PixelConditionsData SGTools StoreGateLib CoralDB
+ LINK_LIBRARIES ${COOL_LIBRARIES} ${CLHEP_LIBRARIES} CommissionEvent AthenaBaseComps AthenaKernel AthenaPoolUtilities
+ GaudiKernel PixelConditionsData SGTools StoreGateLib
GeoModelUtilities Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry
PixelCablingLib PixelConditionsAlgorithmsLib PathResolver )
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index 45a1de73d1b8c7f978cb6000c1f372fcb07f4e36..a335d30072ac3ddd8b22690ba88e4469d36bd031 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -16,16 +16,6 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
# FIXME commented properties are not currently accepted by PixelConfigCondAlg
CondArgs = {}
- # Switch parameters
- CondArgs.update(
- UseCalibConditions=True,
- UseDeadmapConditions=True,
- UseDCSStateConditions=(not flags.Input.isMC and flags.InDet.usePixelDCS),
- UseDCSStatusConditions=(not flags.Input.isMC and flags.InDet.usePixelDCS),
- UseDCSHVConditions=True,
- UseDCSTemperatureConditions=True,
- UseTDAQConditions=False,
- )
if flags.Beam.Type == "cosmics":
CondArgs.update(
UseComTime=True,
@@ -53,7 +43,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
DBMTimeOffset=[5.0,5.0,5.0]
)
- if flags.Input.isMC:
+ if flags.Input.isMC or flags.Overlay.DataOverlay:
# Digitization parameters
CondArgs.update(
BunchSpace=25.0,
@@ -375,8 +365,6 @@ def PixelDCSCondHVAlgCfg(flags, name="PixelDCSCondHVAlg", **kwargs):
acc.merge(addFolders(flags, "/PIXEL/HLT/DCS/HV", "PIXEL_ONL", className="CondAttrListCollection"))
else:
acc.merge(addFolders(flags, "/PIXEL/DCS/HV", "DCS_OFL", className="CondAttrListCollection"))
- kwargs.setdefault("PixelModuleData", "PixelModuleData")
- kwargs.setdefault("ReadKey", "/PIXEL/DCS/HV")
kwargs.setdefault("WriteKey", "PixelDCSHVCondData")
acc.addCondAlgo(CompFactory.PixelDCSCondHVAlg(name, **kwargs))
return acc
@@ -389,7 +377,6 @@ def PixelDCSCondStateAlgCfg(flags, name="PixelDCSCondStateAlg", **kwargs):
kwargs.setdefault("ReadKeyState", "/PIXEL/DCS/FSMSTATE")
else:
kwargs.setdefault("ReadKeyState", "")
- kwargs.setdefault("PixelModuleData", "PixelModuleData")
kwargs.setdefault("WriteKeyState", "PixelDCSStateCondData")
acc.addCondAlgo(CompFactory.PixelDCSCondStateAlg(name, **kwargs))
return acc
@@ -402,7 +389,6 @@ def PixelDCSCondStatusAlgCfg(flags, name="PixelDCSCondStatusAlg", **kwargs):
kwargs.setdefault("ReadKeyStatus", "/PIXEL/DCS/FSMSTATUS")
else:
kwargs.setdefault("ReadKeyStatus", "")
- kwargs.setdefault("PixelModuleData", "PixelModuleData")
kwargs.setdefault("WriteKeyStatus", "PixelDCSStatusCondData")
acc.addCondAlgo(CompFactory.PixelDCSCondStatusAlg(name, **kwargs))
return acc
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
index ef10e7d4be3456bd407c18458bac32cf8fd38b76..26aa988b7a064274e96dccc40d769b2078603e7e 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
@@ -52,8 +52,12 @@ StatusCode PixelCablingCondAlg::initialize() {
std::unique_ptr<PixelCablingCondData> writeCdo(std::make_unique<PixelCablingCondData>());
const EventIDBase::number_type UNDEFNUM = EventIDBase::UNDEFNUM;
const EventIDBase::event_number_t UNDEFEVT = EventIDBase::UNDEFEVT;
+
+ /// FIXME: this is a hack to get the code to work - the comfiguration should be
+ /// such that the cabling is now only configured with a proper IoV and not
+ /// in the initialise method
EventIDRange rangeW (EventIDBase (0, UNDEFEVT, UNDEFNUM, 0, 0),
- EventIDBase (1, UNDEFEVT, UNDEFNUM, 0, 0));
+ EventIDBase (9999999, UNDEFEVT, UNDEFNUM, 0, 0));
// Signed values
int barrel_ec, eta_module;
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.cxx
index 5c98e6946f4cbdc68dbe8000e27a86c4a7e68afa..40513629ff8ad1705c7f4a9f96b0d72cae30414c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.cxx
@@ -22,7 +22,7 @@ StatusCode PixelChargeCalibCondAlg::initialize() {
ATH_CHECK(m_pixelDetEleCollKey.initialize());
ATH_CHECK(m_condSvc.retrieve());
ATH_CHECK(m_configKey.initialize());
- ATH_CHECK(m_readKey.initialize());
+ ATH_CHECK(m_readKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this,m_writeKey).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
@@ -56,7 +56,7 @@ StatusCode PixelChargeCalibCondAlg::execute(const EventContext& ctx) const {
const EventIDBase stop {EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
EventIDRange rangeW{start, stop};
- if (configData->getUseCalibConditions()) {
+ if (!m_readKey.empty()) {
SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKey, ctx);
const CondAttrListCollection* readCdo = *readHandle;
if (readCdo==nullptr) {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
index 62ae68d35b07692ba15058850ff6ba606fb55145..5d03579142f4a40f504b861b0d7df4718dfefb37 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.cxx
@@ -22,7 +22,7 @@ StatusCode PixelChargeLUTCalibCondAlg::initialize() {
ATH_CHECK(m_pixelDetEleCollKey.initialize());
ATH_CHECK(m_condSvc.retrieve());
ATH_CHECK(m_configKey.initialize());
- ATH_CHECK(m_readKey.initialize());
+ ATH_CHECK(m_readKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this,m_writeKey).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
@@ -56,7 +56,7 @@ StatusCode PixelChargeLUTCalibCondAlg::execute(const EventContext& ctx) const {
const EventIDBase stop {EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
EventIDRange rangeW{start, stop};
- if (configData->getUseCalibConditions()) {
+ if (!m_readKey.empty()) {
SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKey, ctx);
const CondAttrListCollection* readCdo = *readHandle;
if (readCdo==nullptr) {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
index b6fbbaa61fb03650bcc54e9909535dc685484dcf..8a098f76b9964b05c0258f2ab7b91a61d630967a 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
@@ -29,9 +29,7 @@ StatusCode PixelConfigCondAlg::initialize() {
}
ATH_CHECK(m_condSvc.retrieve());
-
- if (m_useDeadmapConditions) { ATH_CHECK(m_readDeadMapKey.initialize()); }
-
+ ATH_CHECK(m_readDeadMapKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this,m_writeKey).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
@@ -62,7 +60,7 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
// Set dead map
//==============
EventIDRange rangeDeadMap{start, stop};
- if (m_useDeadmapConditions) {
+ if (!m_readDeadMapKey.empty()) {
SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readDeadMapKey, ctx);
const CondAttrListCollection* readCdo = *readHandle;
if (readCdo==nullptr) {
@@ -111,13 +109,6 @@ StatusCode PixelConfigCondAlg::execute(const EventContext& ctx) const {
}
// Switch parameters
- writeCdo -> setUseCalibConditions(m_useCalibConditions);
- writeCdo -> setUseDeadmapConditions(m_useDeadmapConditions);
- writeCdo -> setUseDCSStateConditions(m_useDCSStateConditions);
- writeCdo -> setUseDCSStatusConditions(m_useDCSStatusConditions);
- writeCdo -> setUseDCSHVConditions(m_useDCSHVConditions);
- writeCdo -> setUseDCSTemperatureConditions(m_useDCSTemperatureConditions);
- writeCdo -> setUseTDAQConditions(m_useTDAQConditions);
writeCdo -> setUseCablingConditions(m_useCablingConditions);
// Digitization parameters
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index 597e8a2bf12a15e993371f7dd238d520e04e0f69..5852fd614ed7d53074e83f970a90e938309337f9 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -37,27 +37,6 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
{this, "WriteKey", "PixelModuleData", "Output key of pixel module data"};
// Switch parameters
- Gaudi::Property<bool> m_useCalibConditions
- {this, "UseCalibConditions", true, "Use conditions DB for charge calibration"};
-
- Gaudi::Property<bool> m_useDeadmapConditions
- {this, "UseDeadmapConditions", true, "Use conditions DB for pixel deadmap module/FE"};
-
- Gaudi::Property<bool> m_useDCSStateConditions
- {this, "UseDCSStateConditions", false, "Use DCSState conditions DB"};
-
- Gaudi::Property<bool> m_useDCSStatusConditions
- {this, "UseDCSStatusConditions", false, "Use DCSStatus conditions DB"};
-
- Gaudi::Property<bool> m_useDCSHVConditions
- {this, "UseDCSHVConditions", true, "Use DCS HV conditions DB"};
-
- Gaudi::Property<bool> m_useDCSTemperatureConditions
- {this, "UseDCSTemperatureConditions", true, "Use DCS temperature conditions DB"};
-
- Gaudi::Property<bool> m_useTDAQConditions
- {this, "UseTDAQConditions", false, "Use TDAQ conditions DB (NOTE only valid in RUN-1)"};
-
Gaudi::Property<bool> m_useCablingConditions
{this, "UseCablingConditions", true, "Use cabling map conditions DB"};
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.cxx
index 1dc57b344ff99455f2e23287a2a1c358df40cf58..a331b71c5ad8602a286aa925923937ac450fd633 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelDCSCondHVAlg.h"
@@ -18,7 +18,7 @@ StatusCode PixelDCSCondHVAlg::initialize() {
ATH_CHECK(m_condSvc.retrieve());
ATH_CHECK(m_moduleDataKey.initialize());
- ATH_CHECK(m_readKey.initialize());
+ ATH_CHECK(m_readKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this,m_writeKey).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
@@ -35,28 +35,33 @@ StatusCode PixelDCSCondHVAlg::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid.. In theory this should not be called, but may happen if multiple concurrent events are being processed out of order.");
return StatusCode::SUCCESS;
}
-
-
SG::ReadCondHandle<PixelModuleData> modDataHdl(m_moduleDataKey,ctx);
const PixelModuleData* modData=(*modDataHdl);
- writeHandle.addDependency(modDataHdl);
ATH_MSG_INFO("Range of input PixelModule data is " << modDataHdl.getRange());
// Construct the output Cond Object and fill it in
std::unique_ptr<PixelDCSHVData> writeCdo(std::make_unique<PixelDCSHVData>());
- //if (SG::ReadCondHandle<PixelModuleData>(m_moduleDataKey,ctx)->getUseDCSHVConditions()) {
- if (modData->getUseDCSHVConditions()) {
+ const EventIDBase start{EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, 0, 0, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
+ const EventIDBase stop {EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
+
+ EventIDRange rangeW{start, stop};
+
+ if (!m_readKey.empty()) {
SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKey, ctx);
- writeHandle.addDependency(readHandle);
const CondAttrListCollection* readCdo = *readHandle;
if (readCdo==nullptr) {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
+ // Get the validitiy range
+ if (not readHandle.range(rangeW)) {
+ ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
+ return StatusCode::FAILURE;
+ }
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of DCS input is " << readHandle.getRange());
+ ATH_MSG_INFO("Range of DCS input is " << rangeW);
// Read HV info
std::string param("HV");
@@ -84,7 +89,7 @@ StatusCode PixelDCSCondHVAlg::execute(const EventContext& ctx) const {
}
}
- if (writeHandle.record(std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record PixelDCSHVData " << writeHandle.key() << " with EventRange "
<< writeHandle.getRange() << " into Conditions Store");
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.cxx
index 4d904b38231e919645a42f5ec3bd67a60782c63f..bd17f3802aaea299d34c62d5d15f9030e76813e6 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelDCSCondStateAlg.h"
@@ -17,9 +17,7 @@ StatusCode PixelDCSCondStateAlg::initialize() {
ATH_CHECK(detStore()->retrieve(m_pixelID,"PixelID"));
ATH_CHECK(m_condSvc.retrieve());
-
- ATH_CHECK(m_moduleDataKey.initialize());
- ATH_CHECK(m_readKeyState.initialize(!m_readKeyState.empty()));
+ ATH_CHECK(m_readKeyState.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKeyState.initialize());
if (m_condSvc->regHandle(this, m_writeKeyState).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKeyState.fullKey() << " with CondSvc");
@@ -40,24 +38,26 @@ StatusCode PixelDCSCondStateAlg::execute(const EventContext& ctx) const {
// Construct the output Cond Object and fill it in
std::unique_ptr<PixelDCSStateData> writeCdoState(std::make_unique<PixelDCSStateData>());
-
-
- SG::ReadCondHandle<PixelModuleData> modDataHdl(m_moduleDataKey,ctx);
- const PixelModuleData* modData=(*modDataHdl);
- writeHandleState.addDependency(modDataHdl);
- ATH_MSG_INFO("Range of input PixelModule data is " << modDataHdl.getRange());
+ const EventIDBase start{EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, 0, 0, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
+ const EventIDBase stop {EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
- if (modData->getUseDCSStateConditions()) {
- SG::ReadCondHandle<CondAttrListCollection> readHandleState(m_readKeyState, ctx);
- writeHandleState.addDependency(readHandleState);
- const CondAttrListCollection* readCdoState(*readHandleState);
+ EventIDRange rangeW{start, stop};
+
+ if (!m_readKeyState.empty()) {
+ SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKeyState, ctx);
+ const CondAttrListCollection* readCdoState(*readHandle);
if (readCdoState==nullptr) {
ATH_MSG_FATAL("Null pointer to the read conditions object (state)");
return StatusCode::FAILURE;
}
- ATH_MSG_INFO("Size of CondAttrListCollection " << readHandleState.fullKey() << " readCdo->size()= " << readCdoState->size());
- ATH_MSG_INFO("Range of state input is " << readHandleState.getRange());
+ // Get the validitiy range
+ if (not readHandle.range(rangeW)) {
+ ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdoState->size());
+ ATH_MSG_INFO("Range of state input is " << rangeW);
// Read state info
std::string paramState = "FSM_state";
@@ -82,7 +82,7 @@ StatusCode PixelDCSCondStateAlg::execute(const EventContext& ctx) const {
for (int i=0; i<(int)m_pixelID->wafer_hash_max(); i++) { writeCdoState->setModuleStatus(i,PixelDCSStateData::DCSModuleState::READY); }
}
- if (writeHandleState.record(std::move(writeCdoState)).isFailure()) {
+ if (writeHandleState.record(rangeW, std::move(writeCdoState)).isFailure()) {
ATH_MSG_FATAL("Could not record PixelDCSStateData " << writeHandleState.key() << " with EventRange " << writeHandleState.getRange() << " into Conditions Store");
return StatusCode::FAILURE;
}
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
index 6555a6287cab7385a6ef9ff49273eca41e5bc8fd..56b2658eef3a103cb8053b8dba7c1d8887d7a91b 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file PixelConditionsAlgorithms/PixelDCSCondStatusAlg.h
@@ -17,7 +17,6 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "StoreGate/WriteCondHandleKey.h"
-#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelDCSStateData.h"
#include "InDetIdentifier/PixelID.h"
@@ -38,11 +37,8 @@ class PixelDCSCondStateAlg : public AthReentrantAlgorithm {
ServiceHandle<ICondSvc> m_condSvc{this, "CondSvc", "CondSvc"};
- SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
- {this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
-
SG::ReadCondHandleKey<CondAttrListCollection> m_readKeyState
- {this, "ReadKeyState", "/PIXEL/DCS/FSMSTATE", "Key of input DCS state conditions folder"};
+ {this, "ReadKeyState", "", "Key of input DCS state conditions folder"};
SG::WriteCondHandleKey<PixelDCSStateData> m_writeKeyState
{this, "WriteKeyState", "PixelDCSStateCondData", "Key of output DCS state data"};
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.cxx
index a6b31994a949c8ff750fab2a497a277003ca5ed2..7ea2c9581678e184ce625ad757becb3f3a839156 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelDCSCondStatusAlg.h"
@@ -17,15 +17,12 @@ StatusCode PixelDCSCondStatusAlg::initialize() {
ATH_CHECK(detStore()->retrieve(m_pixelID,"PixelID"));
ATH_CHECK(m_condSvc.retrieve());
-
- ATH_CHECK(m_moduleDataKey.initialize());
- ATH_CHECK(m_readKeyStatus.initialize(!m_readKeyStatus.empty()));
+ ATH_CHECK(m_readKeyStatus.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKeyStatus.initialize());
if (m_condSvc->regHandle(this, m_writeKeyStatus).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKeyStatus.fullKey() << " with CondSvc");
return StatusCode::FAILURE;
}
-
return StatusCode::SUCCESS;
}
@@ -41,23 +38,25 @@ StatusCode PixelDCSCondStatusAlg::execute(const EventContext& ctx) const {
// Construct the output Cond Object and fill it in
std::unique_ptr<PixelDCSStatusData> writeCdoStatus(std::make_unique<PixelDCSStatusData>());
-
- SG::ReadCondHandle<PixelModuleData> modDataHdl(m_moduleDataKey,ctx);
- const PixelModuleData* modData=(*modDataHdl);
- writeHandleStatus.addDependency(modDataHdl);
- ATH_MSG_INFO("Range of input PixelModule data is " << modDataHdl.getRange());
-
+ const EventIDBase start{EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, 0, 0, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
+ const EventIDBase stop {EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
+
+ EventIDRange rangeW{start, stop};
- if (modData->getUseDCSStatusConditions()) {
- SG::ReadCondHandle<CondAttrListCollection> readHandleStatus(m_readKeyStatus, ctx);
- const CondAttrListCollection* readCdoStatus(*readHandleStatus);
+ if (!m_readKeyStatus.empty()) {
+ SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKeyStatus, ctx);
+ const CondAttrListCollection* readCdoStatus(*readHandle);
if (readCdoStatus==nullptr) {
ATH_MSG_FATAL("Null pointer to the read conditions object (state)");
return StatusCode::FAILURE;
}
- writeHandleStatus.addDependency(readHandleStatus);
- ATH_MSG_INFO("Size of CondAttrListCollection " << readHandleStatus.fullKey() << " readCdo->size()= " << readCdoStatus->size());
- ATH_MSG_INFO("Range of state input is " << readHandleStatus.getRange());
+ // Get the validitiy range
+ if (not readHandle.range(rangeW)) {
+ ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdoStatus->size());
+ ATH_MSG_INFO("Range of state input is " << rangeW);
// Read state info
const std::string paramStatus = "FSM_status";
@@ -83,7 +82,7 @@ StatusCode PixelDCSCondStatusAlg::execute(const EventContext& ctx) const {
}
}
- if (writeHandleStatus.record(std::move(writeCdoStatus)).isFailure()) {
+ if (writeHandleStatus.record(rangeW, std::move(writeCdoStatus)).isFailure()) {
ATH_MSG_FATAL("Could not record PixelDCSStatusData " << writeHandleStatus.key() << " with EventRange "
<< writeHandleStatus.getRange() << " into Conditions Store");
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
index c50e26c24fc62292e613856621f833ff297eaf21..e28c76bf19badcc4263d501a5757e58aa32a8aa1 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file PixelConditionsAlgorithms/PixelDCSCondStatusAlg.h
@@ -17,7 +17,6 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "StoreGate/WriteCondHandleKey.h"
-#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelDCSStatusData.h"
#include "InDetIdentifier/PixelID.h"
@@ -38,11 +37,8 @@ class PixelDCSCondStatusAlg : public AthReentrantAlgorithm {
ServiceHandle<ICondSvc> m_condSvc{this, "CondSvc", "CondSvc"};
- SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
- {this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
-
SG::ReadCondHandleKey<CondAttrListCollection> m_readKeyStatus
- {this, "ReadKeyStatus", "/PIXEL/DCS/FSMSTATUS", "Key of input DCS status conditions folder"};
+ {this, "ReadKeyStatus", "", "Key of input DCS status conditions folder"};
SG::WriteCondHandleKey<PixelDCSStatusData> m_writeKeyStatus
{this, "WriteKeyStatus", "PixelDCSStatusCondData", "Key of output DCS status data"};
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.cxx
index f8a6f8447e5f6006a420037de9184870df3511f9..ffc6988e44bc029a7ea5402510b46375564d544e 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelDCSCondTempAlg.h"
@@ -20,7 +20,7 @@ StatusCode PixelDCSCondTempAlg::initialize() {
ATH_CHECK(m_condSvc.retrieve());
ATH_CHECK(m_moduleDataKey.initialize());
- ATH_CHECK(m_readKey.initialize());
+ ATH_CHECK(m_readKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this, m_writeKey).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
@@ -44,19 +44,27 @@ StatusCode PixelDCSCondTempAlg::execute(const EventContext& ctx) const {
SG::ReadCondHandle<PixelModuleData> modDataHdl(m_moduleDataKey,ctx);
const PixelModuleData* modData=(*modDataHdl);
- writeHandle.addDependency(modDataHdl);
ATH_MSG_INFO("Range of input PixelModule data is " << modDataHdl.getRange());
- if (modData->getUseDCSTemperatureConditions()) {
+ const EventIDBase start{EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, 0, 0, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
+ const EventIDBase stop {EventIDBase::UNDEFNUM, EventIDBase::UNDEFEVT, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
+
+ EventIDRange rangeW{start, stop};
+
+ if (!m_readKey.empty()) {
SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKey, ctx);
const CondAttrListCollection* readCdo(*readHandle);
if (readCdo==nullptr) {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- writeHandle.addDependency(readHandle);
+ // Get the validitiy range
+ if (not readHandle.range(rangeW)) {
+ ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
+ return StatusCode::FAILURE;
+ }
ATH_MSG_INFO("Size of CondAttrListCollection " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << readHandle.getRange());
+ ATH_MSG_INFO("Range of input is " << rangeW);
// Read temperature info
const std::string param{"temperature"};
@@ -84,7 +92,7 @@ StatusCode PixelDCSCondTempAlg::execute(const EventContext& ctx) const {
}
}
- if (writeHandle.record(std::move(writeCdo)).isFailure()) {
+ if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
ATH_MSG_FATAL("Could not record PixelDCSTempData " << writeHandle.key() << " with EventRange "
<< writeHandle.getRange() << " into Conditions Store");
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx
index 4421fc4c34beb7b1ca56ff138ad48d2c058fab3a..54b4ac5330969471be3120b62693935dd3479541 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelDeadMapCondAlg.h"
@@ -16,8 +16,7 @@ StatusCode PixelDeadMapCondAlg::initialize() {
ATH_MSG_DEBUG("PixelDeadMapCondAlg::initialize()");
ATH_CHECK(m_condSvc.retrieve());
- ATH_CHECK(m_moduleDataKey.initialize());
- ATH_CHECK(m_readKey.initialize());
+ ATH_CHECK(m_readKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this,m_writeKey).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
@@ -44,8 +43,7 @@ StatusCode PixelDeadMapCondAlg::execute(const EventContext& ctx) const {
EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
EventIDRange rangeW{start, stop};
-
- if (SG::ReadCondHandle<PixelModuleData>(m_moduleDataKey,ctx)->getUseDeadmapConditions()) {
+ if (!m_readKey.empty()) {
SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKey, ctx);
const CondAttrListCollection* readCdo = *readHandle;
if (readCdo==nullptr) {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
index c4e2ff1b5a6c864542ef4a816d1db59a2d5f7a81..470e57f4e650466d052afc2a9df2e753c3a9c050 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file PixelConditionsAlgorithms/PixelDeadMapCondAlg.h
@@ -17,7 +17,6 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "StoreGate/WriteCondHandleKey.h"
-#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelDeadMapCondData.h"
#include "GaudiKernel/ICondSvc.h"
@@ -33,9 +32,6 @@ class PixelDeadMapCondAlg : public AthReentrantAlgorithm {
private:
ServiceHandle<ICondSvc> m_condSvc{this, "CondSvc", "CondSvc"};
- SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
- {this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
-
SG::ReadCondHandleKey<CondAttrListCollection> m_readKey
{this, "ReadKey", "/PIXEL/PixelModuleFeMask", "Input deadmap folder"};
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.cxx
index 2f76d4d8628efd82e5f348d65033eaece1f47313..2ea72a0ad170382960768810d122d165ef8a32f9 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelTDAQCondAlg.h"
@@ -16,10 +16,7 @@ StatusCode PixelTDAQCondAlg::initialize() {
ATH_MSG_INFO("PixelTDAQCondAlg::initialize()");
ATH_CHECK(detStore()->retrieve(m_pixelID,"PixelID"));
-
ATH_CHECK(m_condSvc.retrieve());
-
- ATH_CHECK(m_moduleDataKey.initialize());
ATH_CHECK(m_readKey.initialize(!m_readKey.empty()));
ATH_CHECK(m_writeKey.initialize());
if (m_condSvc->regHandle(this,m_writeKey).isFailure()) {
@@ -46,8 +43,7 @@ StatusCode PixelTDAQCondAlg::execute(const EventContext& ctx) const {
EventIDBase::UNDEFNUM-1, EventIDBase::UNDEFNUM, EventIDBase::UNDEFNUM};
EventIDRange rangeW{start, stop};
-
- if (SG::ReadCondHandle<PixelModuleData>(m_moduleDataKey,ctx)->getUseTDAQConditions()) {
+ if (!m_readKey.empty()) {
SG::ReadCondHandle<CondAttrListCollection> readHandle(m_readKey, ctx);
const CondAttrListCollection* readCdo = *readHandle;
if (readCdo==nullptr) {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
index 77e01c616b872f20302efc3acc74ea3ce38da126..1b682def006350624151a8b465b2c118fef688c1 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file PixelConditionsAlgorithms/PixelTDAQCondAlg.h
@@ -17,7 +17,6 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "StoreGate/WriteCondHandleKey.h"
-#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelTDAQData.h"
#include "InDetIdentifier/PixelID.h"
@@ -37,11 +36,8 @@ class PixelTDAQCondAlg : public AthReentrantAlgorithm {
const PixelID* m_pixelID{nullptr};
ServiceHandle<ICondSvc> m_condSvc{this, "CondSvc", "CondSvc"};
- SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
- {this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
-
SG::ReadCondHandleKey<CondAttrListCollection> m_readKey
- {this, "ReadKey", "/TDAQ/Resources/ATLAS/PIXEL/Modules", "Input key of TDAQ deadmap conditions folder"};
+ {this, "ReadKey", "", "Input key of TDAQ deadmap conditions folder"};
SG::WriteCondHandleKey<PixelTDAQData> m_writeKey
{this, "WriteKey", "PixelTDAQCondData", "Output key of pixel module data"};
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt b/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
index f2a96745d492124ff188454ea8694041d9da66fa..e1d3edc2ab58a954c579db84159edec267e5dea2 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/PixelConditionsData/CMakeLists.txt
@@ -5,29 +5,16 @@
# Declare the package name:
atlas_subdir( PixelConditionsData )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/CxxUtils
- DetectorDescription/Identifier
- DetectorDescription/GeoPrimitives
- Database/AthenaPOOL/AthenaPoolUtilities
- InnerDetector/InDetConditions/InDetByteStreamErrors
- InnerDetector/InDetConditions/PixelCoralClientUtils
- PRIVATE
- Control/AthenaKernel
- GaudiKernel )
-
# External dependencies:
find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( PixelConditionsData
src/*.cxx
PUBLIC_HEADERS PixelConditionsData
- PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES CxxUtils Identifier GeoPrimitives PixelCoralClientUtils
- PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel AthenaPoolUtilities GaudiKernel )
+ LINK_LIBRARIES CxxUtils Identifier GeoPrimitives InDetByteStreamErrors
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel AthenaPoolUtilities GaudiKernel )
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
index f9a0e096c3905cd5f1123b1ed5a1d7be84f80e05..677b4c1d46a1ba607837eeef868b6e670f1e3c45 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
+++ b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file PixelConditionsData/PixelModuleData.h
@@ -28,27 +28,6 @@ class PixelModuleData {
int getChipStatus(const int chanNum) const;
// Switch parameters
- void setUseCalibConditions(bool UseCalibConditions);
- bool getUseCalibConditions() const;
-
- void setUseDeadmapConditions(bool UseDeadmapConditions);
- bool getUseDeadmapConditions() const;
-
- void setUseDCSStateConditions(bool UseDCSStateConditions);
- bool getUseDCSStateConditions() const;
-
- void setUseDCSStatusConditions(bool UseDCSStatusConditions);
- bool getUseDCSStatusConditions() const;
-
- void setUseDCSHVConditions(bool UseDCSHVConditions);
- bool getUseDCSHVConditions() const;
-
- void setUseDCSTemperatureConditions(bool UseDCSTemperatureConditions);
- bool getUseDCSTemperatureConditions() const;
-
- void setUseTDAQConditions(bool UseTDAQConditions);
- bool getUseTDAQConditions() const;
-
void setUseCablingConditions(bool UseCablingConditions);
bool getUseCablingConditions() const;
@@ -213,13 +192,6 @@ class PixelModuleData {
typedef std::map<int, std::vector<float>> chipCharge;
- bool m_useCalibConditions;
- bool m_useDeadmapConditions;
- bool m_useDCSStateConditions;
- bool m_useDCSStatusConditions;
- bool m_useDCSHVConditions;
- bool m_useDCSTemperatureConditions;
- bool m_useTDAQConditions;
bool m_useCablingConditions;
double m_bunchSpace;
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/SpecialPixelMap.h b/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/SpecialPixelMap.h
deleted file mode 100755
index 7afe6762b2bdb233b907388a7d301ff75cd4a0d3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/SpecialPixelMap.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCONDITIONSDATA_SPECIALPIXELMAP_H
-#define PIXELCONDITIONSDATA_SPECIALPIXELMAP_H
-
-#include "PixelCoralClientUtils/SpecialPixelMap.hh"
-
-#include "AthenaKernel/CLASS_DEF.h"
-#include "AthenaKernel/CondCont.h"
-#include "CxxUtils/checker_macros.h"
-#include<map>
-#include<string>
-
-
-/**
- * Classes to hold data about special pixels in the detector store and make it
- * accessible to athena components.
- *
- * ruwiedel@physik.uni-bonn.de
- *
- */
-
-
-namespace coral{
- class Blob;
-}
-class IdentifierHash;
-class ModuleSpecialPixelMap;
-
-/** A class for a map of special pixels for the whole pixel detector
- or any subgroup of modules. A DetectorSpecialPixelMap is an std::vector
- of pointers to ModuleSpecialPixelMaps which hold the actual pixel
- status codes. A ModuleSpecialPixelMap is accessed by its IdentifierHash.
- */
-
-class DetectorSpecialPixelMap : public PixelCoralClientUtils::DetectorSpecialPixelMap{
-
- public:
- DetectorSpecialPixelMap();
- DetectorSpecialPixelMap(const DetectorSpecialPixelMap& dspm); //!< construct a copy
- DetectorSpecialPixelMap(const std::vector<ModuleSpecialPixelMap*>& modules); //!< construct from contents
- ~DetectorSpecialPixelMap();
-
- DetectorSpecialPixelMap& operator=(const DetectorSpecialPixelMap& spm);
- DetectorSpecialPixelMap& operator+=(const DetectorSpecialPixelMap& spm); //!< merge two pixel maps into one
-
- const ModuleSpecialPixelMap* module(IdentifierHash moduleHash) const; //!< const access to a ModuleSpecialPixelMap*
-
-};
-
-/** A class for a map of special pixels for a single module of the pixel
- detector. A ModuleSpecialPixelMap is an std::map of the status codes
- (unsigned integers) for all pixels with special properties on a module.
- The possible status codes are explained on the wiki page
- https://twiki.cern.ch/twiki/bin/view/Atlas/PixelCOOLoffline#Dead_and_special_pixels_map
-
- The status for a pixel can be retrieved with pixelStatus(pixelID).
- The pixel ID can be calculated with encodePixelID. In addition to
- pixelStatus, several accessors for individual status bits are provided.
- */
-
-
-class ModuleSpecialPixelMap : public PixelCoralClientUtils::ModuleSpecialPixelMap{
-
- public:
- ModuleSpecialPixelMap();
- ModuleSpecialPixelMap(const ModuleSpecialPixelMap& mspm);
- //!< construct a copy
- ModuleSpecialPixelMap(const char* filename, unsigned int mchips);
- //!< construct from text file (for details on the format see the README file in PixelConditionsServices/doc)
- ModuleSpecialPixelMap(const std::string& clob, unsigned int mchips);
- //!< construct from string
- ModuleSpecialPixelMap(const coral::Blob& blob, unsigned int mchips);
- //!< construct from blob
- ModuleSpecialPixelMap(const std::map<unsigned int, unsigned int>& pixels,
- unsigned int module_status,
- std::vector<unsigned int> chip_status,
- std::vector<std::vector<unsigned int> > column_pair_status, unsigned int mchips);
- //!< construct from contents
- ~ModuleSpecialPixelMap();
-
- ModuleSpecialPixelMap& operator=(const ModuleSpecialPixelMap& mspm);
- ModuleSpecialPixelMap& operator+=(ModuleSpecialPixelMap mspm);
- //!< merge two pixel maps into one
-
- void print(int component, unsigned int layer, unsigned int phi, int eta,
- bool verbosePixelID = true, bool binaryPixelStatus = true) const;
- //!< print map to screen
-
- StatusCode fill_from_string(const std::string& clob);
- //!< fills the map from a string, used for conversion of data from the database
- StatusCode fill_from_blob(const coral::Blob& blob);
- //!< fills the map from a blob, used for conversion of data from the database
-};
-
-CLASS_DEF(DetectorSpecialPixelMap, 203854058, 1)
-CLASS_DEF(ModuleSpecialPixelMap, 84153642, 1)
-
-CONDCONT_DEF( DetectorSpecialPixelMap, 70046420);
-CONDCONT_DEF( ModuleSpecialPixelMap, 153445648);
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
index 8418d74e105514ab31b19ffd2c2d6f7f19fe9bab..0c605f097e8f3bd4712aad5598a06d836dbba593 100644
--- a/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelConditionsData/PixelModuleData.h"
@@ -35,27 +35,6 @@ int PixelModuleData::getChipStatus(const int chanNum) const {
}
// Switch parameters
-void PixelModuleData::setUseCalibConditions(bool UseCalibConditions) { m_useCalibConditions = UseCalibConditions; }
-bool PixelModuleData::getUseCalibConditions() const { return m_useCalibConditions; }
-
-void PixelModuleData::setUseDeadmapConditions(bool UseDeadmapConditions) { m_useDeadmapConditions = UseDeadmapConditions; }
-bool PixelModuleData::getUseDeadmapConditions() const { return m_useDeadmapConditions; }
-
-void PixelModuleData::setUseDCSStateConditions(bool UseDCSStateConditions) { m_useDCSStateConditions = UseDCSStateConditions; }
-bool PixelModuleData::getUseDCSStateConditions() const { return m_useDCSStateConditions; }
-
-void PixelModuleData::setUseDCSStatusConditions(bool UseDCSStatusConditions) { m_useDCSStatusConditions = UseDCSStatusConditions; }
-bool PixelModuleData::getUseDCSStatusConditions() const { return m_useDCSStatusConditions; }
-
-void PixelModuleData::setUseDCSHVConditions(bool UseDCSHVConditions) { m_useDCSHVConditions = UseDCSHVConditions; }
-bool PixelModuleData::getUseDCSHVConditions() const { return m_useDCSHVConditions; }
-
-void PixelModuleData::setUseDCSTemperatureConditions(bool UseDCSTemperatureConditions) { m_useDCSTemperatureConditions = UseDCSTemperatureConditions; }
-bool PixelModuleData::getUseDCSTemperatureConditions() const { return m_useDCSTemperatureConditions; }
-
-void PixelModuleData::setUseTDAQConditions(bool UseTDAQConditions) { m_useTDAQConditions = UseTDAQConditions; }
-bool PixelModuleData::getUseTDAQConditions() const { return m_useTDAQConditions; }
-
void PixelModuleData::setUseCablingConditions(bool UseCablingConditions) { m_useCablingConditions = UseCablingConditions; }
bool PixelModuleData::getUseCablingConditions() const { return m_useCablingConditions; }
diff --git a/InnerDetector/InDetConditions/PixelConditionsData/src/SpecialPixelMap.cxx b/InnerDetector/InDetConditions/PixelConditionsData/src/SpecialPixelMap.cxx
deleted file mode 100755
index c8296aaf9b983076b485f3921ca1142173730a2e..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelConditionsData/src/SpecialPixelMap.cxx
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelConditionsData/SpecialPixelMap.h"
-
-// Athena/Gaudi
-#include "GaudiKernel/MsgStream.h"
-#include "AthenaKernel/getMessageSvc.h"
-
-#include "CoralBase/Blob.h"
-#include "Identifier/IdentifierHash.h"
-
-// standard library
-#include<fstream>
-#include<sstream>
-#include<string>
-#include<iomanip>
-
-
-//***** DetectorSpecialPixelMap *****//
-const int nmtype(5);
-static const unsigned int columnsPerFEIX[5]={18,80,132,80,132}; // number of columns per FEI3, 4, 50, 51, 52
-//static unsigned int rowsPerFEIX[5]={164, 336, 672, 339, 678}; // number of rows per FEI3, 4, 50, 51, 52
-//static unsigned int rowsRdoPerFEIX[5]={160, 336, 672, 336, 672}; // number of rows readout per FEI3, 4, 50, 51, 52
-
-
-DetectorSpecialPixelMap::DetectorSpecialPixelMap(){}
-
-DetectorSpecialPixelMap::DetectorSpecialPixelMap(const DetectorSpecialPixelMap& spm) :
- PixelCoralClientUtils::DetectorSpecialPixelMap(){
-
- for(DetectorSpecialPixelMap::const_iterator module = spm.begin(); module != spm.end(); ++module){
-
- push_back(new ModuleSpecialPixelMap( dynamic_cast<ModuleSpecialPixelMap&>(**module)));
-
- }
-}
-
-DetectorSpecialPixelMap::DetectorSpecialPixelMap(const std::vector<ModuleSpecialPixelMap*>& modules){
-
- for(std::vector<ModuleSpecialPixelMap*>::const_iterator module = modules.begin(); module != modules.end(); ++module){
-
- push_back(new ModuleSpecialPixelMap(**module));
-
- }
-}
-
-DetectorSpecialPixelMap::~DetectorSpecialPixelMap(){}
-
-
-const ModuleSpecialPixelMap* DetectorSpecialPixelMap::module(IdentifierHash moduleHash) const{
- return dynamic_cast<const ModuleSpecialPixelMap*>(PixelCoralClientUtils::DetectorSpecialPixelMap::module(moduleHash));
-}
-
-
-DetectorSpecialPixelMap& DetectorSpecialPixelMap::operator=(const DetectorSpecialPixelMap& spm){
- if(this !=&spm){
- *this = dynamic_cast<DetectorSpecialPixelMap&>(PixelCoralClientUtils::DetectorSpecialPixelMap::operator=(spm));
- }
- return (*this);
-}
-
-DetectorSpecialPixelMap& DetectorSpecialPixelMap::operator+=(const DetectorSpecialPixelMap& spm){
- return dynamic_cast<DetectorSpecialPixelMap&>(PixelCoralClientUtils::DetectorSpecialPixelMap::operator+=(spm));
-}
-
-
-
-//***** ModuleSpecialPixelMap *****//
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(){}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const ModuleSpecialPixelMap& mspm) :
- PixelCoralClientUtils::ModuleSpecialPixelMap(mspm){}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const char* filename, unsigned int mchips) :
- PixelCoralClientUtils::ModuleSpecialPixelMap(filename, mchips){}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const std::string& clob, unsigned int mchips) :
- PixelCoralClientUtils::ModuleSpecialPixelMap(clob, mchips){}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const coral::Blob& blob, unsigned int mchips) :
- PixelCoralClientUtils::ModuleSpecialPixelMap(blob, mchips){}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const std::map<unsigned int, unsigned int>& pixels,
- unsigned int module_status,
- std::vector<unsigned int> chip_status,
- std::vector<std::vector<unsigned int> > column_pair_status,
- unsigned int mchips) :
- PixelCoralClientUtils::ModuleSpecialPixelMap(pixels, module_status, chip_status, column_pair_status, mchips){}
-
-ModuleSpecialPixelMap::~ModuleSpecialPixelMap(){}
-
-
-ModuleSpecialPixelMap& ModuleSpecialPixelMap::operator=(const ModuleSpecialPixelMap& mspm){
- if(this !=&mspm){
- *this =dynamic_cast<ModuleSpecialPixelMap&>(PixelCoralClientUtils::ModuleSpecialPixelMap::operator=(mspm));
- }
- return (*this);
-}
-
-ModuleSpecialPixelMap& ModuleSpecialPixelMap::operator+=(ModuleSpecialPixelMap mspm){
- return dynamic_cast<ModuleSpecialPixelMap&>(PixelCoralClientUtils::ModuleSpecialPixelMap::operator+=(mspm));
-}
-
-void ModuleSpecialPixelMap::print(int component,
- unsigned int layer,
- unsigned int phi,
- int eta,
- bool verbosePixelID,
- bool binaryPixelStatus) const{
-
- MsgStream log(Athena::getMessageSvc(), "ModuleSpecialPixelMap");
-
- unsigned int system, subSystem;
- system = 2;
- subSystem = 1;
-
- int itype = (int)m_chipsPerModule%10;
- if(itype>(nmtype-1))itype=nmtype-1;
- int mch = (int)m_chipsPerModule/10;
- int mcolumns = columnsPerFEIX[itype]; // set protection here
-
- int moduleID = itype==0 ? ( ((component + 2) / 2) << 25 ) + ( layer << 23 ) + ( phi << 17 ) + ( (eta + 6) << 13 ) : -1;
-
- //print header
-
- log << MSG::INFO << " " << endmsg;
- if(moduleID>-1)log << MSG::INFO << "ModuleSpecialPixelMap for module " << moduleID << ":" << endmsg;
- log << MSG::INFO << "Offline ID [system,subsystem,endcap/barrel,layer/disk,phi,eta] : ["
- << system << ',' << subSystem << ',' << component << ',' << layer << ',' << phi << ',' << eta << ']' << endmsg;
- log << MSG::INFO << "Module status: ";
- log.width(10);
- log << m_module_status << endmsg;
- log << MSG::INFO << " " << endmsg;
-
- bool print_chip_status = false;
- bool print_column_pair_status = false;
-
- for(int i = 0; i < mch; i++){
- if(m_chip_status.size() != 0 && m_chip_status[i] != 0){
- print_chip_status = true;
- }
- for(int j = 0; j < mcolumns/2; j++){
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0
- && m_column_pair_status[i][j] != 0){
- print_chip_status = true;
- print_column_pair_status = true;
- }
- }
- }
- if(mch>2){
- if(print_chip_status){
- log <<MSG::INFO << "Chip number: ";
- for(int i = mch-1; i>mch/2-1; i--)log<<i<<" ";
- log<< endmsg;
-
- log << MSG::INFO << "Chip status: ";
- for(int i = mch-1; i > mch/2-1; i--){
- log.width(10);
- if(m_chip_status.size() != 0){
- log << m_chip_status[i] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- log << MSG::INFO << " " << endmsg;
-
- if(print_column_pair_status){
- log << MSG::INFO << "Column pairs: ";
- for(int i = mch-1; i > mch/2-1; i--){
- log.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- log << m_column_pair_status[i][0] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- log << MSG::INFO << "pairs 0 to "<<mch/2<<" ";
- for(int i = mch-1; i > mch/2-1; i--){
- log.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- log << m_column_pair_status[i][1] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- for(int j = 2; j < mcolumns/2; j++){
- log << MSG::INFO << " ";
- for(int i = mch-1; i > mch/2-1; i--){
- log.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- log << m_column_pair_status[i][j] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- }
- log << MSG::INFO << " " << endmsg;
-
-
- log << MSG::INFO << "Column pairs: ";
- for(int i = 0; i < mch/2; i++){
- log.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- log << m_column_pair_status[i][0] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- log << MSG::INFO << "pairs 0 to "<<mch/2<<" ";
- for(int i = 0; i < mch/2; i++){
- log.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- log << m_column_pair_status[i][1] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- for(int j = 2; j < mcolumns/2; j++){
- log << MSG::INFO << " ";
- for(int i = 0; i < mch/2; i++){
- log.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- log << m_column_pair_status[i][j] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- }
- log << MSG::INFO << " " << endmsg;
- }
- else{
- log << MSG::INFO << "No special column pairs on this module" << endmsg;
- log << MSG::INFO << " " << endmsg;
- }
-
- log << MSG::INFO << "Chip status: ";
- for(int i = 0; i < mch/2; i++){
- log.width(10);
- if(m_chip_status.size() != 0){
- log << m_chip_status[i] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- log << MSG::INFO << "Chip number: ";
- for(int i = 0; i<mch/2; ++i)log<<i<<" ";
- log<< endmsg;
- log << MSG::INFO << " " << endmsg;
- log << MSG::INFO << " " << endmsg;
- }
- else{
- log << MSG::INFO << "No special chips and/or column pairs on this module" << endmsg;
- log << MSG::INFO << " " << endmsg;
- }
-
- //print map
-
- for(const_iterator pixel = begin(); pixel != end(); ++pixel){
- if(verbosePixelID){
- unsigned int pixelID = pixel->first;
- unsigned int chip = pixelID % 16;
- unsigned int column = (itype==0) ? ((pixelID / 16) % 32) : ((pixelID / 16) % 256);
- unsigned int row = (itype==0) ? (pixelID / 512) : (pixelID / 4096);
- log << "Pixel (chip/column/row) ";
- log << ' ';
- log << chip << "/";
- log << ' ';
-
- log << column << "/";
-
- log << ' ';
- log << row;
- }
- else{
- log << MSG::INFO << "Pixel " << pixel->first;
- }
- if(binaryPixelStatus){
- unsigned int pixelStatus = pixel->second;
- log << " status: ";
- for(int i = 31; i >= 0; i--){
- bool statusBit = pixelStatus & (1 << i);
- log << statusBit;
- if(!(i%4)) log << ' ';
- }
- log << endmsg;
- }
- else{
- log << " status: " << pixel->second << endmsg;
- }
- }
- }
- else{// IBL FEI4 module
- //
- if(print_chip_status){
- log<<MSG::INFO << "Chip number: ";
- for(int i =0; i<mch; ++i)log<<i<<" ";
- log<<endmsg;
- log <<MSG::INFO << "Chip status: ";
- for(int i = 0; i < (int)mch; i++){
- log.width(10);
- if(m_chip_status.size() != 0){
- log << m_chip_status[i] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- log <<MSG::INFO << " " << endmsg;
-
- if(print_column_pair_status){
- log <<MSG::INFO <<"Column pairs 0 to "<<mcolumns/2<<" ";
- log << endmsg;
- for(int j = 0; j<mcolumns/2; ++j){
- for(int i = 0; i < (int)mch; i++){
- log.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- log << m_column_pair_status[i][j] << " ";
- }
- else{
- log << 0 << " ";
- }
- }
- log << endmsg;
- }
-
- log << " " << endmsg;
-
- }
- else{
- log << "No special column pairs on this module" << endmsg;
- log << " " << endmsg;
- }
- }
- else{
- log << "No special chips and/or column pairs on this module" << endmsg;
- log << " " << endmsg;
- }
- //print map
-
- for(const_iterator pixel = begin(); pixel != end(); ++pixel){
- if(verbosePixelID){
- unsigned int pixelID = pixel->first;
- unsigned int chip = pixelID % 16;
- unsigned int column = (itype==0) ? ((pixelID / 16) % 32) : ((pixelID / 16) % 256);
- unsigned int row = (itype==0) ? (pixelID / 512) : (pixelID / 4096);
-
- log << "Pixel (chip/column/row) ";
- log << ' ';
- log << chip << "/";
- log <<' ';
- log << column << "/";
- log << ' ';
- log << row;
- }
- else{
- log << MSG::INFO <<"Pixel " << pixel->first;
- }
- if(binaryPixelStatus){
- unsigned int pixelStatus = pixel->second;
- log << " status: ";
- for(int i = 31; i >= 0; i--){
- bool statusBit = pixelStatus & (1 << i);
- log << statusBit;
- if(!(i%4)) log << ' ';
- }
- log << endmsg;
- }
- else{
- log << " status: " << pixel->second << endmsg;
- }
- }
- //
- }
-
- return;
-}
-
-StatusCode ModuleSpecialPixelMap::fill_from_string(const std::string& clob){
- if( PixelCoralClientUtils::ModuleSpecialPixelMap::fill_from_string(clob) ){
- return StatusCode::FAILURE;
- }
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode ModuleSpecialPixelMap::fill_from_blob(const coral::Blob& blob){
- if( PixelCoralClientUtils::ModuleSpecialPixelMap::fill_from_blob(blob) ){
- return StatusCode::FAILURE;
- }
-
- return StatusCode::SUCCESS;
-}
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/PixelConditionsTools/ISpecialPixelMapSvc.h b/InnerDetector/InDetConditions/PixelConditionsTools/PixelConditionsTools/ISpecialPixelMapSvc.h
deleted file mode 100755
index 6aa5773afa1328dec25ae2a479576a2984a7cc4b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelConditionsTools/PixelConditionsTools/ISpecialPixelMapSvc.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCONDITIONSTOOLS_ISPECIALPIXELMAPSERVICE_H
-#define PIXELCONDITIONSTOOLS_ISPECIALPIXELMAPSERVICE_H
-
-
-#include "GaudiKernel/IInterface.h"
-#include "AthenaKernel/IOVSvcDefs.h"
-
-#include "AthenaPoolUtilities/CondAttrListCollection.h"
-#include "PixelConditionsData/SpecialPixelMap.h"
-
-
-
-/**
- * Abstract interface for SpecialPixelMapSvc
- *
- * Creates and manages a set of special pixel map objects in the detector store. If not explicitly switched
- * off in the job options, a callback funtion is registered that creates the special pixel map objects in the
- * detector store and automatically keeps them up to date for the current run/lumi block. By default all
- * special pixel maps are merged into one map which is stored in place of the first map in the list of
- * StoreGate keys.
- *
- * In addition to the callback function the following functions are provided: A special pixel map object can
- * be created explicitly with the create method. This method can be configured to either use the data from
- * the offline COOL database or from text files. The contents of maps for selected modules can be printed to
- * the screen with print(). The number of maps managed can be retrieved with getNPixelMaps(), and the maps
- * can be retrieved with getPixelMap(unsigned int index).
- *
- * ruwiedel@physik.uni-bonn.de
- *
- */
-
-
-class ISpecialPixelMapSvc: virtual public IInterface{
-
-public:
- virtual ~ISpecialPixelMapSvc(){}
-
- static const InterfaceID& interfaceID();
-
- /** automatically creates and updates pixel map objects in the detector store for the current run/lumi block */
- virtual StatusCode IOVCallBack(IOVSVC_CALLBACK_ARGS) = 0; //!< callback function registered in initialize()
-
- virtual StatusCode createFromTextfiles(bool fillMissing = true) const = 0;
- //!< create special pixel map objects using data read from text files (for details see the README file in the doc directory)
- virtual StatusCode createFromDetectorStore(const std::string condAttrListCollectionKey, const std::string pixelMapKey,
- bool fillMissing = true ) const = 0;
- //!< create special pixel map from CondAttrListCollection at key
- virtual StatusCode createFromDetectorStore(bool fillMissing = true) const = 0;
- //!< create special pixel map objects using data from the offline COOL database
- virtual StatusCode create() const = 0;
- //!< create special pixel map objects using the data source specified in the job options
- virtual StatusCode print() const = 0;
- //!< print pixel maps for the modules specified in the job options to the screen
-
- virtual unsigned int getNPixelMaps() const = 0;
- //!< returns the number of special pixel map objects managed by the SpecialPixelMapSvc
- virtual const DetectorSpecialPixelMap *getPixelMap(unsigned int index) const = 0;
- //!< returns a const pointer to the index'th special pixel map
-
- virtual unsigned int getChips(const unsigned int & index) const = 0;
- //!< returns the number of chips and type of module as 10*mchips+i
-
- virtual StatusCode registerCondAttrListCollection(const DetectorSpecialPixelMap* spm) const = 0;
- //!< convert spm to CondAttrListCollection and register in the detector store
- //!< used when preparing database write
-};
-
-inline const InterfaceID& ISpecialPixelMapSvc::interfaceID(){
- static const InterfaceID IID_ISpecialPixelMapSvc("ISpecialPixelMapSvc", 1, 0);
- return IID_ISpecialPixelMapSvc;
-}
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/CMakeLists.txt b/InnerDetector/InDetConditions/PixelCoralClientUtils/CMakeLists.txt
deleted file mode 100644
index e683f06057c379051ba74ef12b9fff89661f3bd9..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/CMakeLists.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-################################################################################
-# Package: PixelCoralClientUtils
-################################################################################
-
-# Declare the package name:
-atlas_subdir( PixelCoralClientUtils )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/CxxUtils
- Database/CoraCool )
-
-# External dependencies:
-find_package( COOL COMPONENTS CoolKernel )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
-atlas_add_library( PixelCoralClientUtils
- src/CoralClient.cc
- src/PCDio.cc
- src/SpecialPixelMap.cc
- src/PCDDb.cxx
- src/PixCalibCoralCoolDb.cc
- src/PixCalibKnowledgeDb.cc
- PUBLIC_HEADERS PixelCoralClientUtils
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} CxxUtils CoraCool
- PRIVATE_LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} )
-
-atlas_add_executable( CORAL-read
- src/CORAL-read.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( CORAL-create
- src/CORAL-create.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( CORAL-fill
- src/CORAL-fill.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( CORAL-listVariables
- src/CORAL-listVariables.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( extractAnalysis
- src/extractAnalysis.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( fixTimewalk
- src/fixTimewalk.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( extractSPM
- src/extractSPM.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( talkToPCDDb
- src/talkToPCDDb.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
-atlas_add_executable( calibDbInterface
- src/calibDbInterface.cc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CxxUtils CoraCool PixelCoralClientUtils )
-
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index 67cfcbd2e284e0854366bd99c355881822926e1b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-InnerDetector/InDetConditions/PixelCoralClientUtils
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/AnalysisResultList_t.hh b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/AnalysisResultList_t.hh
deleted file mode 100644
index 6e6b7fde0cdceab2534dd421a83371e9910bc1ed..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/AnalysisResultList_t.hh
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCORALCLIENTUTILS_ANALYSISRESULTLIST_T_HH
-#define PIXELCORALCLIENTUTILS_ANALYSISRESULTLIST_T_HH
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/PixResultsException.hh"
-#include <map>
-#include <vector>
-#include <sstream>
-#include "PixelMap.h"
-
-namespace CAN {
-
- class AnalysisResultList_t;
-
- class AnalysisResultValueNotFound : public CAN::PixResultsException
- {
- friend class AnalysisResultList_t;
- protected:
- AnalysisResultValueNotFound(const std::string &function_name,
- const std::string &message)
- : CAN::PixResultsException("ANAVAL_NOTEXISTING "+function_name+": "+message)
- {}
-
- };
-
- class AverageResult_t
- {
- public:
- AverageResult_t(const unsigned int n, const float mean, const float rms, const float lower99, const float upper99)
- : m_n(n)
- {
- m_values[kMean]=mean;
- m_values[kRMS]=rms;
- m_values[kLower99]=lower99;
- m_values[kUpper99]=upper99;
- }
-
- AverageResult_t()
- : m_n(0)
- {
- for(unsigned int i=0; i<kNValues; ++i) {
- m_values[i]=0;
- }
- }
-
- enum EValues {kMean, kRMS, kLower99, kUpper99, kNValues};
- float value(int i) const {return m_values[i];};
- unsigned int n() const {return m_n;};
-
- private:
- unsigned int m_n;
- float m_values[kNValues];
- };
-
-
- /** Container for analysis results.
- * Can store :
- * <ul>
- * <li>unsigned ints<li/>
- * <li>bools<li/>
- * <li>average value given by : n, meam, rms, lower 99% and upper 99% bounds.<li/>
- * </ul>
- * Each value is assigned to a variable name and a connectivity name.
- * The values are stored by <tt>analysis_results.addValue<unsigned int>("a_value","ROD_C1_S11",1)<tt>,
- * they are retrieved by <tt>unsignd int a_value = analysis_results.value<unsigned int>("a_value","ROD_C1_S11")<tt>,
- * or one can iteratre over all stored values. The iterators can be obtained by <tt>analysis_results.begin<unsigned int>()</tt>
- * and <tt>analysis_results.end<unsigned int>()</tt>.
- */
- class AnalysisResultList_t {
- public:
-
-// void addValue(const std::string &name, const float value) {
-// m_floatValues.insert(std::make_pair(name, value));
-// }
-
- protected:
- template <class T>
- std::map<std::string, std::map<std::string, T> > &getMap();
-
- template <class T>
- const std::map<std::string, std::map<std::string, T> > &getMap() const;
-
- void throwValueDoesNotExist(const std::string &var_name, const std::string& conn_name) const {
- std::stringstream message;
- message << "No value of name " << var_name << " for connectivity object " << conn_name << ".";
- throw AnalysisResultValueNotFound("AnalysisResultList_t::value<T>",message.str());
- }
-
- public:
- template <class T>
- void insertValue(const std::string &var_name, const std::string &conn_name, const T &value) {
- getMap<T>()[var_name].insert(std::make_pair(conn_name,value));
- }
-
- template <class T>
- void addValue(const std::string &var_name, const std::string &conn_name, const T &value) {
- getMap<T>()[var_name][conn_name]=value;
- }
-
- template <class T>
- const T &value(const std::string &var_name, const std::string &conn_name) const {
- typename std::map< std::string, std::map<std::string, T> >::const_iterator iter=getMap<T>().find(var_name);
- if (iter == getMap<T>().end()) {
- throwValueDoesNotExist(var_name,conn_name);
- }
- typename std::map<std::string, T>::const_iterator val_iter=iter->second.find(conn_name);
- if (val_iter == iter->second.end()) {
- throwValueDoesNotExist(var_name,conn_name);
- }
- return val_iter->second;
- }
-
- template <class T>
- bool has(const std::string &var_name, const std::string &conn_name) const {
- typename std::map< std::string, std::map<std::string, T> >::const_iterator iter=getMap<T>().find(var_name);
- if (iter != getMap<T>().end()) {
- typename std::map<std::string, T>::const_iterator val_iter=iter->second.find(conn_name);
- if (val_iter != iter->second.end()) {
- return true;
- }
- }
- return false;
- }
-
- int nPixelMaps() { return m_pixelMap.size(); };
-
- template <class T>
- typename std::map< std::string, std::map<std::string, T> >::iterator begin()
- { return getMap<T>().begin(); }
-
- template <class T>
- typename std::map< std::string, std::map<std::string, T> >::const_iterator begin () const
- { return getMap<T>().begin(); }
-
- template <class T>
- typename std::map< std::string, std::map<std::string, T> >::const_iterator end () const
- { return getMap<T>().end(); }
-
- protected:
- std::map<std::string, std::map<std::string, bool> > m_boolValues;
- std::map<std::string, std::map<std::string, unsigned int> > m_uintValues;
- std::map<std::string, std::map<std::string, float> > m_floatValues; //CLA
- std::map<std::string, std::map<std::string, AverageResult_t> > m_avValues;
- std::map<std::string, std::map<std::string, PixelMap_t> > m_pixelMap; //CLA
- };
-
-
- template <> inline
- std::map<std::string, std::map<std::string, bool> > &
- AnalysisResultList_t::getMap<bool>() { return AnalysisResultList_t::m_boolValues; }
-
- template <> inline
- const std::map<std::string, std::map<std::string, bool> > &
- AnalysisResultList_t::getMap<bool>() const { return AnalysisResultList_t::m_boolValues; }
-
- template <> inline
- std::map<std::string, std::map<std::string, unsigned int> > &
- AnalysisResultList_t::getMap<unsigned int>() { return AnalysisResultList_t::m_uintValues; }
-
- template <> inline
- const std::map<std::string, std::map<std::string, unsigned int> > &
- AnalysisResultList_t::getMap<unsigned int>() const { return AnalysisResultList_t::m_uintValues; }
-
- template <> inline
- std::map<std::string, std::map<std::string, float> > &
- AnalysisResultList_t::getMap<float>() { return AnalysisResultList_t::m_floatValues; } //CLA
-
- template <> inline
- const std::map<std::string, std::map<std::string, float> > &
- AnalysisResultList_t::getMap<float>() const { return AnalysisResultList_t::m_floatValues; } //CLA
-
- template <> inline
- std::map<std::string, std::map<std::string, AverageResult_t> > &
- AnalysisResultList_t::getMap<AverageResult_t>() { return AnalysisResultList_t::m_avValues; }
-
- template <> inline
- const std::map<std::string, std::map<std::string, AverageResult_t> > &
- AnalysisResultList_t::getMap<AverageResult_t>() const { return AnalysisResultList_t::m_avValues; }
-
- template <> inline
- std::map<std::string, std::map<std::string, PixelMap_t> > &
- AnalysisResultList_t::getMap<PixelMap_t>() { return AnalysisResultList_t::m_pixelMap; }
-
- template <> inline
- const std::map<std::string, std::map<std::string, PixelMap_t> > &
- AnalysisResultList_t::getMap<PixelMap_t>() const { return AnalysisResultList_t::m_pixelMap; }
-
- // example:
- //
- // inline void test() {
- // AnalysisResultList_t a;
- // a.addValue<unsigned int>("test","ROD_C1_S11",1);
- // unsigned int a_value = a.value<unsigned int>("test","ROD_C1_S11");
- //
- // for (std::map<std::string, std::map<std::string, unsigned int > >::const_iterator iter=a.begin<unsigned int>();
- // iter != a.end<unsigned int>();
- // iter ++) {
- //
- // for (std::map<std::string, unsigned int >::const_iterator val_iter=iter->second.begin();
- // val_iter != iter->second.end();
- // val_iter ++) {
- // unsigned int b=val_iter->second;
- // }
- // }
- // }
-
-}
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/CoralClient.hh b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/CoralClient.hh
deleted file mode 100644
index dc5285d607b21f1ec25f3dafc9d1e058cf47cb16..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/CoralClient.hh
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef CORALCLIENT
-#define CORALCLIENT
-
-// GENERIC C++/C headers
-#include <time.h>
-#include <sys/time.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <set>
-#include <cstdio>
-
-#include "PixelCoralClientUtils/IPixResultsDbListener.hh"
-#include "PixelCoralClientUtils/AnalysisResultList_t.hh"
-
-// same definitions are done by seal and omni
-
-#ifdef HAVE_NAMESPACES
-# undef HAVE_NAMESPACES
-#endif
-#ifdef HAVE_BOOL
-# undef HAVE_BOOL
-#endif
-#ifdef HAVE_DYNAMIC_CAST
-# undef HAVE_DYNAMIC_CAST
-#endif
-
-// CORAL API
-#include "CoralKernel/Context.h"
-#include "CoralBase/Attribute.h"
-#include "CoralBase/AttributeList.h"
-#include "CoralBase/AttributeListException.h"
-#include "RelationalAccess/IConnectionService.h"
-#include "RelationalAccess/IConnectionServiceConfiguration.h"
-#include "RelationalAccess/AccessMode.h"
-#include "RelationalAccess/ISessionProxy.h"
-#include "RelationalAccess/ISchema.h"
-#include "RelationalAccess/ITransaction.h"
-
-#include "RelationalAccess/ITable.h"
-#include "RelationalAccess/ITableDescription.h"
-#include "RelationalAccess/IColumn.h"
-#include "RelationalAccess/ICursor.h"
-#include "RelationalAccess/IQuery.h"
-#include "RelationalAccess/TableDescription.h"
-#include "RelationalAccess/ITableDataEditor.h"
-#include "RelationalAccess/ITableSchemaEditor.h"
-#include "RelationalAccess/IBulkOperation.h"
-#include "RelationalAccess/SchemaException.h"
-
-// COOL API: database service bootstrap
-//#include "CoolApplication/Application.h"
-//#include "CoolApplication/DatabaseSvcFactory.h"
-#include <CoralBase/TimeStamp.h>
-
-
-//using namespace cool;
-
-namespace CAN {
- // Added typedef to remove dependency on idl (PixCalibDbCoral/Common.idl)
-#ifdef __x86_64__
- typedef unsigned int SerialNumber_t;
-#else
- typedef unsigned long SerialNumber_t;
-#endif
- class AverageResult_t;
-}
-
-// added -- A.X.
-namespace PixelCalib {
- class PixelCalibData;
-}
-
-class PixCoralClient {
-
-private:
- std::string m_connString;
- coral::AccessMode m_accessMode;
-
- coral::IHandle<coral::IConnectionService> m_connectionService;
- coral::ISessionProxy *m_session;
-
- std::string m_pixeltable;
- bool m_verbose;
-
- void connect();
- static coral::IHandle<coral::IConnectionService> connectionService(bool verbose=false);
-
-protected:
-
- void transactionStartReadOnly();
- void transactionStartUpdate();
- void transactionCommit();
-
-public:
- // added table name -- A.X.
- PixCoralClient(const std::string& id1,
- bool verbose = false, coral::AccessMode access_mode = coral::Update, const char* tableName = "CALIB_ANAL");
- PixCoralClient(bool verbose = false, coral::AccessMode access_mode = coral::Update, const char* tableName = "CALIB_ANAL");
- ~PixCoralClient();
-
- void disconnect();
-
- void printTables(const char* option = 0); // added option -- A.X.
- void printTableDesc(const std::string& tableName);
- void printTableContent(const std::string& tableName);
- void createTables(const char* option = 0); // added option -- A.X.
- template <typename T> void createTable();
- template <typename T> int fillTable(long long fk, CAN::AnalysisResultList_t *results);
- // added -- A.X.
- int fillTablePixelCalibData(long long fk, const char* option);
- void dropTables();
- void fillTables(CAN::SerialNumber_t id, CAN::AnalysisResultList_t *results);
- // fill pcd table -- A.X.
- void fillTables(const char* option);
-
- //PVSS methods
- double get_value_from_PVSSarch(const std::string&,const coral::TimeStamp &,const coral::TimeStamp &);
- double get_values_from_PVSSarch(const std::string&,const coral::TimeStamp &,const coral::TimeStamp &);
- void get_alias_from_PVSSarch();
-
- void queryTable(CAN::SerialNumber_t anal_id, const std::string& varname="", const std::string& connName="");
- CAN::AnalysisResultList_t getAnalysisResultsFromDB(CAN::SerialNumber_t anal_id, const std::string& varname="", const std::string& connName="");
- CAN::AnalysisResultList_t getAnalysisResultsFromDB(CAN::SerialNumber_t anal_id, const std::vector<std::string> &connName, const std::string& varname="");
-
- /** Get analysis results for a list of connectivity objects.
- * @param analysis_id list of analysis serial numbers,
- * @param connName list of connectivity names for which the values should be retrieved
- * @param listener object which will be notified about new variables.
- */
- void getAnalysisResultsFromDB(std::vector<CAN::SerialNumber_t> analysis_id,
- const std::vector<std::string> &connName,
- IPixResultsDbListener &listener);
-
- /** Get analysis results for a list of connectivity objects.
- * @param analysis_id the analysis serial number,
- * @param connName list of connectivity names for which the values should be retrieved
- * @param listener object which will be notified about new variables.
- */
- void getAnalysisResultsFromDB(CAN::SerialNumber_t analysis_id, const std::vector<std::string> &connName, IPixResultsDbListener &listener) {
- std::vector<CAN::SerialNumber_t> temp;
- temp.push_back(analysis_id);
- getAnalysisResultsFromDB(temp,connName,listener);
- }
-
- // get PCD -- A.X.
- void getCalibrationDataFromDB(const char* option);
-
- void createAuxTables();
- long long updateKey();
- void verboseOutput(bool verbose) {m_verbose = verbose;};
-
- /** Get the chip number from the column and row
- */
- static int chip(int col, int row) {
- int FE = -1;
- if ((int)row/160 == 0) FE = (int)col/18;
- if ((int)row/160 == 1) FE = 8 + (int)(143-col)/18;
- return FE;
- }
-
- static std::string PixelMapToCLOB(const PixelMap_t & pixmap);
- static PixelMap_t CLOBtoPixelMap(const std::string & clob);
-
-
- // Convert local time t to GMT (UTC)
- std::time_t LocalToGMTTime (std::time_t t) {
- std::time_t rawtime = t ? t : time(0);
- struct tm result;
- tm * ptm;
- ptm = gmtime_r(&rawtime, &result);
- return mktime(ptm);
- }
- // Get current time in GMT (UTC)
- std::time_t GMTCurrentTime() { return LocalToGMTTime(0); } // Thread unsafe LocalToGMTTime method is used.
- // Convert GMT (UTC) time to local time
- std::time_t GMTtoLocalTime (std::time_t gmttime) { // Thread unsafe gmtime is used.
- struct tm result;
- return 2*gmttime - mktime (gmtime_r(&gmttime, &result));
- }
-};
-
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/IPixResultsDbListener.hh b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/IPixResultsDbListener.hh
deleted file mode 100644
index 8c58c62589bce91f90035ac6e94209ddef19824c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/IPixResultsDbListener.hh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef _IPIXRESULTSDBLISTENER_
-#define _IPIXRESULTSDBLISTENER_
-
-#include <string>
-#include "PixelCoralClientUtils/PixelMap.h"
-
-namespace CAN {
- class AverageResult_t;
-}
-
-class IPixResultsDbListener {
- public:
- virtual ~IPixResultsDbListener() {}
- virtual void newValue(const std::string &var_name, const std::string &conn_name, bool value) = 0;
- virtual void newValue(const std::string &var_name, const std::string &conn_name, unsigned int value) = 0;
- virtual void newValue(const std::string &var_name, const std::string &conn_name, float value) = 0 ;
- virtual void newValue(const std::string &var_name, const std::string &conn_name, const CAN::AverageResult_t &value) = 0 ;
- virtual void newValue(const std::string &var_name, const std::string &conn_name, const PixelMap_t &value) = 0 ;
-};
-
-#endif // _IPIXRESULTSDBLISTENER_
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDDb.h b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDDb.h
deleted file mode 100644
index 88282cd0e4eb17f9f15d4a8551a9a91713df237e..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDDb.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCORALCLIENTUTILS_PCDDB_H
-#define PIXELCORALCLIENTUTILS_PCDDB_H
-
-#include <string>
-
-namespace PixelCoralClientUtils {
- class PixelCalibData;
-}
-
-namespace coral {
- class ISessionProxy;
- class IQuery;
- class ICursor;
-}
-
-class PCDDb
-{
- public:
- PCDDb(const std::string& connString,
- const std::string& tableName,
- bool verbose, bool load_text);
- ~PCDDb();
-
- bool init(const std::string& tag, int revision);
- int next();
- bool set(int idmod_cur, PixelCoralClientUtils::PixelCalibData& pcd);
-
- private:
- bool m_verbose;
- coral::ISessionProxy *m_session;
- std::string m_connString;
- std::string m_pixeltable;
-
- coral::IQuery* m_query;
- coral::IQuery* m_query_2;
- coral::ICursor* m_cursor;
-
- void transactionStartReadOnly();
- void transactionStartUpdate();
- void transactionCommit();
-};
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDio.h b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDio.h
deleted file mode 100644
index ca3bfa03d2776fc479260a615439e616f1a15250..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDio.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCORALCLIENTUTILS_PCDIO_H
-#define PIXELCORALCLIENTUTILS_PCDIO_H
-
-#include "CxxUtils/checker_macros.h"
-#include "RelationalAccess/AccessMode.h"
-
-#include <string>
-
-namespace coral {
- class ISessionProxy;
-}
-
-class PCDio
-{
- public:
- PCDio(const std::string& connString,
- const std::string& tableName,
- int verbose);
- ~PCDio();
-
- void init(coral::AccessMode access_mode);
- void load(const std::string& tag, int revision);
- void save(const std::string& tag, int revision, const std::string& sources);
-
- private:
- std::string m_connString;
- std::string m_pixeltable;
- int m_verbose;
- coral::ISessionProxy *m_session;
-
- void createTable();
- void createAuxTables();
- void createHeaderTable();
- void createDataTable();
- long long updateKey();
-
- void transactionStartReadOnly();
- void transactionStartUpdate();
- void transactionCommit();
-};
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDkr.h b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDkr.h
deleted file mode 100644
index 7b72f5cee190b09e4c6a5be464bb0c4dadd26f76..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PCDkr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCORALCLIENTUTILS_PCDKR_H
-#define PIXELCORALCLIENTUTILS_PCDKR_H
-
-#include "RelationalAccess/AccessMode.h"
-
-#include <string>
-
-namespace coral {
- class ISessionProxy;
-}
-
-class PCDkr
-{
- public:
- PCDkr(const std::string& connString,
- const std::string& tableName,
- int verbose);
- ~PCDkr();
-
- void init(coral::AccessMode access_mode);
- void load();
- void save(cosnt std::string& tag, const std::string& cid);
- void validate(const std::string& tag);
-
- private:
- std::string m_connString;
- std::string m_pixeltable;
- int m_verbose;
- coral::ISessionProxy *m_session;
-
- void createTable();
-
- void transactionStartReadOnly();
- void transactionStartUpdate();
- void transactionCommit();
-};
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixCalibCoralCoolDb.h b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixCalibCoralCoolDb.h
deleted file mode 100644
index a94d8339ec62281ce6cd9107c91dbbf639f5ce21..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixCalibCoralCoolDb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCORALCLIENTUTILS_PIXCALIBCORALCOOLDB_H
-#define PIXELCORALCLIENTUTILS_PIXCALIBCORALCOOLDB_H
-
-#include "CoraCool/CoraCoolDatabase.h"
-#include "CxxUtils/checker_macros.h"
-
-#include <string>
-
-class ATLAS_NOT_THREAD_SAFE PixCalibCoralCoolDb // Use of singleton databaseService
-{
- public:
- PixCalibCoralCoolDb(const std::string& dbString, int verbose);
- ~PixCalibCoralCoolDb();
-
- bool init();
- bool load(cool::ValidityKey vk);
-
-/* bool save(cool::ValidityKey vk1, */
-/* cool::ValidityKey vk2); */
-
- bool saveCalibData(std::string textfile, long long FK);
- bool referenceToRunInterval(long long FK, cool::ValidityKey vk1, cool::ValidityKey vk2, const std::string& tagname );
-
- private:
- std::string m_dbstring;
-
- CoraCoolDatabasePtr m_coradb;
-};
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixCalibKnowledgeDb.h b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixCalibKnowledgeDb.h
deleted file mode 100644
index 2d94ce1e40533d33436bc432165913ae41b72a3a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixCalibKnowledgeDb.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELCORALCLIENTUTILS_PIXCALIBKNOWLEDGEDB_H
-#define PIXELCORALCLIENTUTILS_PIXCALIBKNOWLEDGEDB_H
-
-#include "RelationalAccess/AccessMode.h"
-
-#include <string>
-
-namespace coral {
- class ISessionProxy;
-}
-
-class PixCalibKnowledgeDb
-{
- public:
- PixCalibKnowledgeDb(const std::string& connString,
- const std::string& tableName,
- int verbose);
- ~PixCalibKnowledgeDb();
-
- void init(coral::AccessMode access_mode);
- //long long findFK(std::string tag);
-
- void saveCorrespondingConfig(long int UnixTimeInSeconds, long int RunNumber, const std::string& calibtags_in_string, const std::string& idTag, const std::string& connTag, const std::string& cfgTag, const std::string& cfgModTag );
-
- void readCorrespondingCalibTag(long int Utime);
-
- private:
- std::string m_connString;
- std::string m_pixeltable;
- int m_verbose;
- coral::ISessionProxy *m_session;
- //std::string findTag(long long fk);
-
- void createTable();
- void createAuxTables();
- // void createHeaderTable();
- void createConfigurationTable();
- // void createDataTable();
- long long updateKey();
-
- void transactionStartReadOnly();
- void transactionStartUpdate();
- void transactionCommit();
-};
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixResultsException.hh b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixResultsException.hh
deleted file mode 100644
index 506523b82bf86eb9ac249e2c863e0288793d8127..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixResultsException.hh
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef _CAN_PixResultsException_hh_
-#define _CAN_PixResultsException_hh_
-
-#include <exception>
-#include <string>
-
-namespace CAN {
-
-class PixResultsException : public std::exception {
-public:
- PixResultsException(const std::string& msg) : m_msg(msg) {}
- ~PixResultsException() throw() {}
- const char* what() const throw() { return m_msg.c_str(); }
-
-private:
- std::string m_msg;
-};
-} // namespace CAN
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixelCalibData.hh b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixelCalibData.hh
deleted file mode 100644
index 7a5fad1ad345f2e464db2bc90587dbf76857e3dc..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixelCalibData.hh
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// PixelCalibData.hh, (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-
-#ifndef PIXELCALIBDATA_HH
-#define PIXELCALIBDATA_HH
-
-#include <string>
-#include <vector>
-#include <iostream>
-#include <algorithm>
-#include <cmath>
-
-/** @class PixelCalibData
-
- The PixelCalibData is a class that designed to hold the calibration data for each module that contains
- 16 FE PixelChipSummaryData. The calibration data consist of threshold, timewalk information and Time over
- threshold calibration that averages per FE chip. The details can be found at
- https://twiki.cern.ch/twiki/bin/view/Atlas/PixelCOOLoffline#Calibrations
- .
-
- @author Weiming Yao <WMYAO@LBL.GOV>
-*/
-
-namespace PixelCoralClientUtils {
-
-
-class PixelCalibData{
-
- public:
- /** Constructor:*/
- PixelCalibData();
- PixelCalibData(unsigned int ident,int nmax);
-
- /** default destructor */
- ~PixelCalibData () = default;
-
- const static int nPixelChipSummaryDataMax = 16; /** maximum number of chips per module */
- /** embedded class PixelChipSummaryData holds all the calibration data for a chip */
-
- class PixelChipSummaryData {
-
- public:
- PixelChipSummaryData();
- ~PixelChipSummaryData() = default;
-
- /** Methods to access the calibration data */
- int getChipID() const { return (int)m_chip; } //<! get the chip id inside a module from 0 to 15
- int getThreshold(int type) const; //<! get threshold for type=0/1/2 for standard,long and ganged pixels
- int getThresholdSigma(int type) const; //<! get threshold sigma
- int getNoise(int type) const; //<! get noise
- int getTimeWalk(int type) const; //<! get time walk
- float getQ2TotA(int type) const; //<! get charge to tot conversion constants A with Tot=A(Q+E)/(Q+C)
- float getQ2TotE(int type) const; //<! get constants E
- float getQ2TotC(int type) const; //<! get constants C
- float getQ2Tot(int type, float Q) const; //<! conver Q to tot
- float getTotP1() const; //<! get P1 parameter that parametrized the tot resolution sigma=P1 +p2*tot
- float getTotP2() const; //<! get P2 parameter for tot resolution
- float getTotRes(float Q) const; //<! get tot resolution for charge Q
-
- /** Methods to set the calibration data */
- void setChipID(int ichip); //<! set chip id
- void setThreshold(int type, int thres, int sigma, int noise, int timewalk); //<! set threshold with inputs as int.
- void setThreshold(int type, float thres, float sigma, float noise, float timewalk);//<! set threshold with inputs as float.
- void setQ2Tot(int type, float A, float E, float C); //<! set charge to tot conversion constants
- void setTotRes(float p1, float p2); //<! set tot resolution dependent constants
-
- // for packed format db, this has to be public -- A.X.
- private:
- char m_chip; //<! 0-15 which chip number
- char m_threshold[4]; //<! one Word(thres, sigma, Noise,TW):
- char m_thresholdlong[4]; //<! one Word(thres, sigma, Noise,TW) for long pixel
- char m_thresholdganged[4]; //<! one Word(thres, sigma, Noise,TW) for ganged pixel
- float m_q2tot[3]; //<! a,c,e for standard pixel and long
- float m_q2totganged[3]; //<! a,b,c for ganged
- char m_totres[2]; //<! for (p1, p2) each chip
-
- // alternative to public chip data -- A.X.
- //friend int PixCoralClient::fillTablePixelCalibData(long long fk, const char* option);
- //friend void PixCoralClient::getCalibrationDataFromDB(const char* option);
- };
-
- /** define const iterator defination */
- typedef std::vector<PixelChipSummaryData>::const_iterator PixelChipSummaryData_citer;
- int size() const;
- PixelChipSummaryData_citer cbegin() const;
- PixelChipSummaryData_citer cend() const;
-
- /** define non-const iterator defination */
- typedef std::vector<PixelChipSummaryData>::iterator PixelChipSummaryData_iter;
- PixelChipSummaryData_iter begin();
- PixelChipSummaryData_iter end();
-
- /** return pointer to particular module */
- PixelChipSummaryData_citer findChipID(int ichip) const;
- PixelChipSummaryData_iter findChipID(int ichip);
-
- /** return pointer to the identifier */
- unsigned int getModuleID() const;
- int getNFEIX() const ;
-
- /** add a new member to the PixelCalibData */
- void add(const PixelChipSummaryData& idat);
- bool update(const PixelChipSummaryData& idat);
- void sortv();
- void print() const;
- const PixelChipSummaryData* getPixelChipSummaryData(int circ) const; //<! get the pointer to iith PixelChipSummaryData
-
- protected:
- unsigned int m_ident; //<! module identifier
- int m_nfeix; // number of FEIX chips per module
- std::vector<PixelChipSummaryData> m_vec; //<! data vector contains 0-15 PixelChipSummarydata per module
-};
-
-//CLASS_DEF(PixelCalibData, 27089939, 1)
-
-inline int PixelCalibData::PixelChipSummaryData::getThreshold(int type) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==1){ return m_thresholdlong[0]*30+3500;}
- else if(type==2){ return m_thresholdganged[0]*30+3500;}
- else{ return m_threshold[0]*30+3500;}
-}
-
-inline int PixelCalibData::PixelChipSummaryData::getThresholdSigma(int type) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==1){ return m_thresholdlong[1]*3+300;}
- else if(type==2){ return m_thresholdganged[1]*3+300;}
- else{ return m_threshold[1]*3+300;}
- }
-
- inline int PixelCalibData::PixelChipSummaryData::getNoise(int type) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==1){ return m_thresholdlong[2]*3+300;}
- else if(type==2){ return m_thresholdganged[2]*3+300;}
- else{ return m_threshold[2]*3+300;}
- }
-
- inline int PixelCalibData::PixelChipSummaryData::getTimeWalk(int type) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==1){ return m_thresholdlong[3]*30+5000;}
- else if(type==2){ return m_thresholdganged[3]*30+5000;}
- else{ return m_threshold[3]*30+5000;}
- }
-
- inline float PixelCalibData::PixelChipSummaryData::getQ2TotA(int type) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==2){ return m_q2totganged[0];}
- else{ return m_q2tot[0];}
- }
-
- inline float PixelCalibData::PixelChipSummaryData::getQ2TotE(int type) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==2){ return m_q2totganged[1];}
- else{ return m_q2tot[1];}
- }
-
- inline float PixelCalibData::PixelChipSummaryData::getQ2TotC(int type) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==2){ return m_q2totganged[2];}
- else{ return m_q2tot[2];}
- }
-
- inline float PixelCalibData::PixelChipSummaryData::getQ2Tot(int type, float Q) const{
- // type=0/1/2 for standard, long and ganged pixels
- if(type==2){ return m_q2totganged[0]*(Q+m_q2totganged[1])/(Q+m_q2totganged[2]);}
- else{ return m_q2tot[0]*(Q+m_q2tot[1])/(Q+m_q2tot[2]);}
- }
-
- inline float PixelCalibData::PixelChipSummaryData::getTotP1() const{ return m_totres[0]* (1/100.); }
-
- inline float PixelCalibData::PixelChipSummaryData::getTotP2() const{ return m_totres[1]*(1./1000.); }
-
- inline float PixelCalibData::PixelChipSummaryData::getTotRes(float Q) const{
- float p1 = m_totres[0]*(1/100.0);
- float p2 = m_totres[1]*(1/1000.0);
- return p1+p2*Q;
- }
-
- //Set Methods
- inline void PixelCalibData::PixelChipSummaryData::setChipID(int ichip){
- m_chip = (char)ichip; }
-
- inline void PixelCalibData::PixelChipSummaryData::setThreshold(int type, float thres, float sigma, float noise, float timewalk){
- using std::abs;
- int ax0 = ((int)thres-3500)/30;
- if(abs(ax0)>127) ax0 = 127*ax0/abs(ax0);
- int ax1 = ((int)sigma-300)/3;
- if(abs(ax1)>127) ax1 = 127*ax1/abs(ax1);
- int ax2 = ((int)noise-300)/3;
- if(abs(ax2)>127) ax2 = 127*ax2/abs(ax2);
- int ax3 = ((int)timewalk-5000)/30;
- if(abs(ax3)>127) ax3 = 127*ax3/abs(ax3);
-
- if(type==0) {
- m_threshold[0] = (char)ax0;
- m_threshold[1] = (char)ax1;
- m_threshold[2] = (char)ax2;
- m_threshold[3] = (char)ax3;
- }
- if(type==1){
- m_thresholdlong[0] = (char)ax0;
- m_thresholdlong[1] = (char)ax1;
- m_thresholdlong[2] = (char)ax2;
- m_thresholdlong[3] = (char)ax3;
- }
- if(type==2){
- m_thresholdganged[0] = (char)ax0;
- m_thresholdganged[1] = (char)ax1;
- m_thresholdganged[2] = (char)ax2;
- m_thresholdganged[3] = (char)ax3;
- }
- }
-
- inline void PixelCalibData::PixelChipSummaryData::setThreshold(int type, int thres, int sigma, int noise, int timewalk){
- using std::abs;
- int ax0 = (thres-3500)/30;
- if(abs(ax0)>127) ax0 = 127*ax0/abs(ax0);
- int ax1 = (sigma-300)/3;
- if(abs(ax1)>127) ax1 = 127*ax1/abs(ax1);
- int ax2 = (noise-300)/3;
- if(abs(ax2)>127) ax2 = 127*ax2/abs(ax2);
- int ax3 = (timewalk-5000)/30;
- if(abs(ax3)>127) ax3 = 127*ax3/abs(ax3);
-
- if(type==0) {
- m_threshold[0] = (char)ax0;
- m_threshold[1] = (char)ax1;
- m_threshold[2] = (char)ax2;
- m_threshold[3] = (char)ax3;
- }
- if(type==1){
- m_thresholdlong[0] = (char)ax0;
- m_thresholdlong[1] = (char)ax1;
- m_thresholdlong[2] = (char)ax2;
- m_thresholdlong[3] = (char)ax3;
- }
- if(type==2){
- m_thresholdganged[0] = (char)ax0;
- m_thresholdganged[1] = (char)ax1;
- m_thresholdganged[2] = (char)ax2;
- m_thresholdganged[3] = (char)ax3;
- }
- }
-
-
-
-
-inline void PixelCalibData::PixelChipSummaryData::setQ2Tot(int type, float A, float E, float C){
- if(type==0||type==1){
- m_q2tot[0] = A;
- m_q2tot[1] = E;
- m_q2tot[2] = C;
- }
- if(type==2){
- m_q2totganged[0] = A;
- m_q2totganged[1] = E;
- m_q2totganged[2] = C;
- }
-}
-
-inline void PixelCalibData::PixelChipSummaryData::setTotRes(float p1, float p2){
-
- // careful with rounding -- A.X.
- using std::abs;
- int p1x = (int)roundf(p1*100);
- if (p1x > 127) p1x = 127;
- else if (p1x < -127) p1x = -127;
- int p2x = (int)roundf(p2*1000);
- if (p2x > 127) p2x = 127;
- else if (p2x < -127) p2x = -127;
-
- m_totres[0] = (char)p1x;
- m_totres[1] = (char)p2x;
-}
-
- inline bool operator< (const PixelCalibData::PixelChipSummaryData& lhs,
- const PixelCalibData::PixelChipSummaryData& rhs){
-
- return lhs.getChipID()<rhs.getChipID();
-}
-
- inline PixelCalibData::PixelCalibData()
- : m_ident(-1), m_nfeix(0), m_vec()
-{
- m_vec.reserve(PixelCalibData::nPixelChipSummaryDataMax);
-}
-
- inline PixelCalibData::PixelCalibData(unsigned int ident,int nmax )
- :
- m_ident(ident), m_nfeix(nmax),m_vec()
- {
- m_vec.reserve(PixelCalibData::nPixelChipSummaryDataMax);
- }
-
-inline void PixelCalibData::add(const PixelChipSummaryData& idat){
- m_vec.push_back(idat);
- }
-
-inline bool PixelCalibData::update(const PixelChipSummaryData& idat){
- PixelChipSummaryData_iter it = findChipID(idat.getChipID());
- if(it==m_vec.end()) return false;
- it->setThreshold(0,idat.getThreshold(0),idat.getThresholdSigma(0),idat.getNoise(0),idat.getTimeWalk(0));
- it->setThreshold(1,idat.getThreshold(1),idat.getThresholdSigma(1),idat.getNoise(1),idat.getTimeWalk(1));
- it->setThreshold(2,idat.getThreshold(2),idat.getThresholdSigma(2),idat.getNoise(2),idat.getTimeWalk(2));
- it->setQ2Tot(0, idat.getQ2TotA(0),idat.getQ2TotE(0),idat.getQ2TotC(0));
- it->setQ2Tot(2, idat.getQ2TotA(2),idat.getQ2TotE(2),idat.getQ2TotC(2));
- it->setTotRes(idat.getTotP1(), idat.getTotP2());
- return true;
- }
-
-inline void PixelCalibData::print() const {
- std::cout<< "PixelCalibData::print tagname:"<< m_ident<<" vector size "<<m_vec.size()<<std::endl;
- // print out the calibration data for each chip
- int i = 0;
- for(PixelChipSummaryData_citer cit=cbegin(); cit !=cend(); ++cit){
- std::cout<<" Item: "<< i++<<" ChipId: "<<cit->getChipID()
- <<" TotP1: "<<cit->getTotP1()<<" TotP2: "<<cit->getTotP2()<<std::endl
- <<" Standard Pixel Threshold: "<<cit->getThreshold(0)<<" sigma: "
- <<cit->getThresholdSigma(0)<<" noise:"<<cit->getNoise(0)<<" TimeWalk: "
- <<cit->getTimeWalk(0)<<" Q2TotA: "<<cit->getQ2TotA(0)<<" Q2TotE: "
- <<cit->getQ2TotE(0)<<" Q2TotC: "<<cit->getQ2TotC(0)<<std::endl
- <<" Long Pixel Threshold: "<<cit->getThreshold(1)<<" sigma: "
- <<cit->getThresholdSigma(1)<<" noise:"<<cit->getNoise(1)<<" TimeWalk: "
- <<cit->getTimeWalk(1)<<" Q2TotA: "<<cit->getQ2TotA(1)<<" Q2TotE: "
- <<cit->getQ2TotE(1)<<" Q2TotC: "<<cit->getQ2TotC(1)<<std::endl
- <<" Ganged Pixel Threshold: "<<cit->getThreshold(2)<<" sigma: "
- <<cit->getThresholdSigma(2)<<" noise:"<<cit->getNoise(2)<<" TimeWalk: "
- <<cit->getTimeWalk(2)<<" Q2TotA: "<<cit->getQ2TotA(2)<<" Q2TotE: "
- <<cit->getQ2TotE(2)<<" Q2TotC: "<<cit->getQ2TotC(2)<<std::endl;
- }
- }
-
-inline PixelCalibData::PixelChipSummaryData::PixelChipSummaryData(){
- // initialised to zero for all members
- m_chip=0;
- for(int i = 0; i<4; ++i){
- m_threshold[i] = 0;
- m_thresholdlong[i] = 0;
- m_thresholdganged[i] = 0;
- if(i<3){
- m_q2tot[i] = 0.;
- m_q2totganged[i] = 0.;
- }
- if(i<2)m_totres[i] = 0.;
- }
-}
-
-
-inline int PixelCalibData::size() const
- { return (int)m_vec.size();}
-
-inline PixelCalibData::PixelChipSummaryData_citer PixelCalibData::cbegin() const
-{ return m_vec.begin();}
-
-inline PixelCalibData::PixelChipSummaryData_citer PixelCalibData::cend() const
-{ return m_vec.end();}
-
-inline PixelCalibData::PixelChipSummaryData_iter PixelCalibData::begin()
-{ return m_vec.begin();}
-
-inline PixelCalibData::PixelChipSummaryData_iter PixelCalibData::end()
-{ return m_vec.end();}
-
-inline PixelCalibData::PixelChipSummaryData_citer
-PixelCalibData::findChipID(int ichip) const{
- PixelCalibData::PixelChipSummaryData obj;
- obj.setChipID(ichip);
- PixelCalibData::PixelChipSummaryData_citer rc =std::lower_bound(m_vec.begin(),m_vec.end(),obj);
- if(rc !=m_vec.end()&&rc->getChipID()!=ichip) rc = m_vec.end();
- return rc;
-}
-
-inline PixelCalibData::PixelChipSummaryData_iter
-PixelCalibData::findChipID(int ichip) {
- PixelCalibData::PixelChipSummaryData obj;
- obj.setChipID(ichip);
- PixelCalibData::PixelChipSummaryData_iter rc =std::lower_bound(m_vec.begin(),m_vec.end(),obj);
- if(rc !=m_vec.end()&&rc->getChipID()!=ichip) rc = m_vec.end();
- return rc;
-}
-
-inline unsigned int PixelCalibData::getModuleID() const { return m_ident;}
-
-inline int PixelCalibData::getNFEIX() const { return m_nfeix;}
-
-inline void PixelCalibData::sortv(){
- sort(m_vec.begin(), m_vec.end()); }
-
-inline const PixelCalibData::PixelChipSummaryData* PixelCalibData::getPixelChipSummaryData(int circ) const{ // ith chip
- if(circ>=(int)m_vec.size())return 0;
- return &m_vec[circ];
-}
-
-
-}
-#endif // PIXELCALIBDATA_HH
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixelMap.h b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixelMap.h
deleted file mode 100644
index 4ee5f1ff0b47f1d5deb2e17ae9ff0b138a56fc6a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/PixelMap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef _PIXELMAP_hh_
-#define _PIXELMAP_hh_
-
-#include <vector>
-#include <map>
-
-/* class Pixel_t */
-/* { */
-/* public: */
-/* Pixel_t(const unsigned int row, const unsigned int column, */
-/* const unsigned int status) */
-/* : m_row(row), m_column(column), m_status(status) */
-/* {} */
-/* const unsigned int row() const { return m_row; } */
-/* const unsigned int column() const { return m_column; } */
-/* const unsigned int status() const { return m_status; } */
-/* private: */
-/* unsigned int m_row; */
-/* unsigned int m_column; */
-/* unsigned int m_status; */
-/* }; */
-
-//typedef std::vector< Pixel_t > PixelMap_t;
-
-typedef std::map< std::pair<int, int>, unsigned int > PixelMap_t; // mapping 2D index (col,row) to status
-
-#endif
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/SpecialPixelMap.hh b/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/SpecialPixelMap.hh
deleted file mode 100644
index b857b789885528f700f9c60542492626983667fb..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/PixelCoralClientUtils/SpecialPixelMap.hh
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-//****************************************************************************
-// SpecialPixelMap.hh
-//
-// Classes to hold data about special pixels in the detector store and make it
-// accessible to athena components.
-//
-// author Christoph Ruwiedel <ruwiedel@physik.uni-bonn.de>
-//
-
-#ifndef SPECIALPIXELMAP_HH
-#define SPECIALPIXELMAP_HH
-
-#include "CoralBase/Blob.h"
-#include "CxxUtils/checker_macros.h"
-
-#include<map>
-#include<vector>
-#include<string>
-#include<iostream>
-
-class ModuleSpecialPixelMap;
-class SpecialPixelMapSvc;
-
-namespace PixelCoralClientUtils {
-
- //static unsigned int columnsPerFEI3 = 18; // number of columns per FEI3
- //static unsigned int rowsPerFEI3 = 164; // number of rows per FEI3
- //static unsigned int FEI3sPerModule = 16; // number of FEI3s in a row
- //static unsigned int columnsPerFEI4 = 80; // number of columns per FEI4
- //static unsigned int rowsPerFEI4 = 336; // number of rows per FEI4
- const unsigned int nmtype(5);
- static const unsigned int columnsPerFEIX[5]={18,80,132,80,132}; // number of columns per FEI3, 4, 50, 51, 52
- static const unsigned int rowsPerFEIX[5]={164, 336, 672, 339, 678}; // number of rows per FEI3, 4, 50, 51, 52
- static const unsigned int rowsRdoPerFEIX[5]={160, 336, 672, 336, 672}; // number of rows readout per FEI3, 4, 50, 51, 52
-
-class ModuleSpecialPixelMap;
-
-/** A class for a map of special pixels for the whole pixel detector,
- or any subgroup of modules. A DetectorSpecialPixelMap is
- std::vector of pointers to ModuleSpecialPixelMaps which hold the
- actual pixel status codes. A ModuleSpecialPixelMap is accessed by
- its IdentifierHash.
-*/
-
-class DetectorSpecialPixelMap : public std::vector<ModuleSpecialPixelMap*>{
-
- public:
- DetectorSpecialPixelMap();
- DetectorSpecialPixelMap(const DetectorSpecialPixelMap& dspm); //!< construct a copy
- DetectorSpecialPixelMap(const std::vector<ModuleSpecialPixelMap*>& modules); //!< construct from contents
- virtual ~DetectorSpecialPixelMap();
-
- DetectorSpecialPixelMap& operator=(const DetectorSpecialPixelMap& spm);
- DetectorSpecialPixelMap& operator+=(const DetectorSpecialPixelMap& spm); //!< merge two pixel maps into one
- void merge(const DetectorSpecialPixelMap* spm); //!< operation equivalent to operator+=, but more convenient for pointers
-
- const ModuleSpecialPixelMap* module(unsigned int moduleHash) const; //!< const access to a ModuleSpecialPixelMap*
-
- void markSpecialRegions();
- //!< automatically identify regions of pixels with the same status and mark them
- void setNeighbourFlags();
- //!< fill the information about special neighbouring pixels, bits 25 - 28
-
- void clear();
-
- private:
- void erase(iterator);
- void erase(iterator, iterator);
-
-};
-
-/** A class for a map of special pixels for a single module of the
- pixel detector. A ModuleSpecialPixelMap is a std::map of the
- status codes (unsigned integers) for all pixels with special
- properties on a module. The possible status codes are explained on
- a wiki page:
- https://twiki.cern.ch/twiki/bin/view/Atlas/PixelCOOLoffline#Dead_and_special_pixels_map
-
- The status for a pixel can be retrieved with
- pixelStatus(pixelID). The pixel ID can be calculated with
- encodePixelID. In addition to pixelStatus, several accessors for
- individual status bits are provided.
-
- NOTE: pixelid = row*128*2 + column*2 + chip for FEI4
- unsigned int hashID = ( ((m_pixelID->barrel_ec(moduleID) + 4) / 2) << 26 ) +
- ( m_pixelID->layer_disk(moduleID) << 24) +
- ( m_pixelID->phi_module(moduleID) << 18) +
- ( (m_pixelID->eta_module(moduleID) + 10) << 13);
-
- pixelid = row*32*16 + column*16 + chip for FEI3
-
- unsigned int hashID = ( ((m_pixelID->barrel_ec(moduleID) + 2) / 2) << 25 ) +
- ( m_pixelID->layer_disk(moduleID) << 23) +
- ( m_pixelID->phi_module(moduleID) << 17) +
- ( (m_pixelID->eta_module(moduleID) + 6) << 13);
-
-**/
-
-class ModuleSpecialPixelMap : private std::map<unsigned int, unsigned int>{
-
- public:
- friend class ::ModuleSpecialPixelMap;
- friend class ::SpecialPixelMapSvc;
-
- ModuleSpecialPixelMap();
- ModuleSpecialPixelMap(const ModuleSpecialPixelMap& mspm);
- //!< construct a copy
- ModuleSpecialPixelMap(const char* filename, unsigned int mchips);
- //!< construct from text file (for details on the format see the README file in PixelConditionsServices/doc)
- ModuleSpecialPixelMap(const std::string& clob, unsigned int mchips);
- //!< construct from string
- ModuleSpecialPixelMap(const coral::Blob& blob, unsigned int mchips);
- //!< construct from blob
- ModuleSpecialPixelMap(const std::map<unsigned int, unsigned int>& pixels,
- unsigned int module_status,
- const std::vector<unsigned int>& chip_status,
- const std::vector<std::vector<unsigned int> >& column_pair_status,unsigned int mchips = 16);
- //!< construct from contents
- virtual ~ModuleSpecialPixelMap();
-
- ModuleSpecialPixelMap& operator=(const ModuleSpecialPixelMap& mspm);
- ModuleSpecialPixelMap& operator+=(ModuleSpecialPixelMap mspm);
- //!< merge two pixel maps into one
-
- void merge(const ModuleSpecialPixelMap* mspm); //!< operation equivalent to operator+=, but more convenient for pointers
-
- unsigned int pixelStatus(unsigned int pixelID) const; //!< retrieve pixel status as unsigned int
- bool pixelStatusBit(unsigned int pixelID, unsigned int bit) const; //!< retrieve a single status bit
- bool pixelUseful(unsigned int pixelID) const; //!< retrieve negation of bit 0 (pixel useful or not)
- bool pixelNoisy(unsigned int pixelID) const; //!< retrieve content of bit 15 (pixel noisy or not)
-
- /** only different from 0 if all pixels on the module have the same status and special regions have been marked */
- unsigned int moduleStatus() const; //!< retrieve module status as unsigned int
- /** only different from 0 if all pixels on the chip have the same status and special regions have been marked */
- unsigned int chipStatus(unsigned int chip) const; //!< retrieve chip status as unsigned int
- /** only different from 0 if all pixels in the column pair have the same status and special regions have been marked */
- unsigned int columnPairStatus(unsigned int chip, unsigned int column_pair) const; //!< retrieve column pair status as unsigned int
-
- std::string to_string() const;
- //!< convert pixel map to string, used when preparing database write
- coral::Blob* to_blob() const;
- //!< convert pixel map to blob, used when preparing database write
- virtual void print(int component, unsigned int layer, unsigned int phi, int eta,
- bool verbosePixelID = true, bool binaryPixelStatus = true) const;
- //!< print map to screen
-
- static unsigned int pixelType(unsigned int column, unsigned int row, unsigned int mchips = 16);
- //static unsigned int pixelType(unsigned int column, unsigned int row);
-
- //!< returns pixel type (normal, long etc.) -- global
- static std::vector<unsigned int> decodePixelID(unsigned int pixelID, unsigned int type);
- static unsigned int encodePixelID(unsigned int chip, unsigned int column, unsigned int row, unsigned int mchips);
- static unsigned int encodePixelID(unsigned int chip, unsigned int column, unsigned int row);
-
- //!< returns pixel ID to be used in accessors
- static unsigned int encodePixelID(int component, unsigned int module_phi_index,
- unsigned int pixel_eta_index, unsigned int pixel_phi_index, unsigned int mchips);
- // static unsigned int encodePixelID(int component, unsigned int module_phi_index,
- // unsigned int pixel_eta_index, unsigned int pixel_phi_index);
-
- //!< returns pixel ID to be used in accessors
-
- void setPixelStatus(unsigned int pixelID, unsigned int status);
- void setPixelStatusBit(unsigned int pixelID, unsigned int bit);
- void clearPixelStatusBit(unsigned int pixelID, unsigned int bit);
- void setPixelNotUseful(unsigned int pixelID); //!< set pixel status bit 0
- void setPixelUseful(unsigned int pixelID); //!< clear pixel status bit 0
- void setPixelNoisy(unsigned int pixelID); //!< set pixel status bit 15
- void setPixelNotNoisy(unsigned int pixelID); //!< clear pixel status bit 15
-
- void setModuleStatus(unsigned int status);
- //!< set module status, clears single pixel information if argument != 0
- void setChipStatus(unsigned int chip, unsigned int status);
- //!< set chip status, clears single pixel information if argument != 0
- void setColumnPairStatus(unsigned int chip, unsigned int column_pair, unsigned int status);
- //!< set column pair status, clears single pixel information if argument != 0
-
- bool fill_from_string(const std::string& clob);
- //!< fills the map from a string, used for conversion of data from the database
- bool fill_from_blob(const coral::Blob& blob);
- //!< fills the map from a blob, used for conversion of data from the database
-
- bool validPixelID(unsigned int chip, unsigned int column, unsigned int row) const;
- //!< checks whether the pixel ID is in the allowed range
- bool validPixelID(unsigned int pixel_eta_index, unsigned int pixel_phi_index) const;
- //!< checks whether the pixel ID is in the allowed range
- bool validPixelID(unsigned int pixelID) const;
- //!< checks whether the pixel ID is in the allowed range
-
- void markSpecialRegions();
- //!< automatically identify regions of pixels with the same status and mark them
- void setNeighbourFlags();
- //!< fill the information about special neighbouring pixels, bits 25 - 28
-
- typedef std::map<unsigned int, unsigned int>::iterator iterator;
- //!< std::map iterators are forwarded for access to all special pixels on a module
- //!< These iterate *only* over the special pixels that are *not* in a special region, one has to check special regions independently
- typedef std::map<unsigned int, unsigned int>::const_iterator const_iterator;
- //!< std::map iterators are forwarded for access to all special pixels on a module
- //!< These iterate *only* over the special pixels that are *not* in a special region, one has to check special regions independently
-
- typedef std::map<unsigned int, unsigned int>::size_type size_type;
-
- size_type size() const;
- //!< only for special pixels that are not in a special region
- bool empty() const;
- //!< only for special pixels that are not in a special region
-
- iterator begin();
- //!< only for special pixels that are not in a special region, need to check special regions separately
- const_iterator begin() const;
- //!< only for special pixels that are not in a special region, need to check special regions separately
-
- iterator end();
- //!< only for special pixels that are not in a special region, need to check special regions separately
- const_iterator end() const;
- //!< only for special pixels that are not in a special region, need to check special regions separately
-
- unsigned int chipsPerModule() const;
- unsigned int chipType() const;
-
- void setchipsPerModule(unsigned int chipsPerModule);
- unsigned int columnsPerChip() const;
- unsigned int rowsPerChip() const;
- unsigned int rowsrdoPerChip() const;
-
-
- bool hasSpecialChips() const;
- //!< true if there are any special frontends on the module
- bool hasSpecialColumnPairs() const;
- //!< true if there are any special column pairs on the module
- bool hasSpecialColumnPairs(unsigned int chip) const;
- //!< true if there are any special column pairs on frontend 'chip'
-
- private:
- unsigned int m_chipsPerModule; // decoded the number of chips*10 + chip type(0=FEI3, 1=FEI4, 2=FEI50, 3=FEI51, 4=FEI52)
- unsigned int m_module_status;
- std::vector<unsigned int> m_chip_status;
- std::vector<std::vector<unsigned int> > m_column_pair_status;
-
- void resetSpecialRegions();
- void condResetSpecialRegions(unsigned int pixelID, unsigned status);
-
-};
-
-
-
-// inline functions
-
-inline bool ModuleSpecialPixelMap::pixelUseful(unsigned int pixelID) const{
- return !pixelStatusBit(pixelID, 0);
-}
-
-inline bool ModuleSpecialPixelMap::pixelNoisy(unsigned int pixelID) const{
- return pixelStatusBit(pixelID, 15);
-}
-
-inline unsigned int ModuleSpecialPixelMap::moduleStatus() const{
- return m_module_status;
-}
-
-inline unsigned int ModuleSpecialPixelMap::chipStatus(unsigned int chip) const{
- if(chip < m_chipsPerModule/10){
- if(m_chip_status.size() != 0){
- return m_chip_status[chip];
- }
- else{
- return 0;
- }
- }
- else{
- std::cout << "In ModuleSpecialPixelMap::chipStatus(unsigned int): Chip number "<<chip<< " > "<<m_chipsPerModule<< " requested " << std::endl;
- return 0;
- }
-}
-
-inline unsigned int ModuleSpecialPixelMap::columnPairStatus(unsigned int chip, unsigned int column_pair) const{
- unsigned int itype = std::min(m_chipsPerModule%10,nmtype-1);
- if(chip < (m_chipsPerModule/10) && column_pair < (columnsPerFEIX[itype]/2)){
- if(m_column_pair_status.size() != 0 && m_column_pair_status[chip].size() != 0){
- return m_column_pair_status[chip][column_pair];
- }
- else{
- return 0;
- }
- }
- else{
- std::cout << "Invalid chip/column pair combination requested" << std::endl;
- return 0;
- }
-}
-
-inline void ModuleSpecialPixelMap::setPixelNotUseful(unsigned int pixelID){
- setPixelStatusBit(pixelID, 0);
- return;
-}
-
-inline void ModuleSpecialPixelMap::setPixelUseful(unsigned int pixelID){
- clearPixelStatusBit(pixelID, 0);
- return;
-}
-
-inline void ModuleSpecialPixelMap::setPixelNoisy(unsigned int pixelID){
- setPixelStatusBit(pixelID, 15);
- return;
-}
-
-inline void ModuleSpecialPixelMap::setPixelNotNoisy(unsigned int pixelID){
- clearPixelStatusBit(pixelID, 15);
- return;
-}
-
-inline bool ModuleSpecialPixelMap::validPixelID(unsigned int pixelID) const{
- int i = m_chipsPerModule%10;
- return i==0 ? validPixelID(pixelID % 16, (pixelID & (31 << 4))/16, pixelID/512): validPixelID(pixelID % 16, (pixelID & (255 << 4))/16, pixelID/4096);
-}
-
-inline bool ModuleSpecialPixelMap::validPixelID(unsigned int chip, unsigned int column, unsigned int row) const{
- unsigned int itype = std::min(m_chipsPerModule%10,nmtype-1);
- return (chip<(m_chipsPerModule/10)&&column<columnsPerFEIX[itype]&&row<rowsPerFEIX[itype]) ? true : false;
-}
-
-inline bool ModuleSpecialPixelMap::validPixelID(unsigned int pixel_eta_index, unsigned int pixel_phi_index) const{
- unsigned int i = std::min(m_chipsPerModule%10,nmtype-1);
- int m = m_chipsPerModule/10;
- unsigned int rowsMax = m>2 ? 2*rowsPerFEIX[i] : rowsPerFEIX[i];
- unsigned int columnsMax = m>2 ? m/2*columnsPerFEIX[i] : m*columnsPerFEIX[i];
- return (pixel_eta_index<columnsMax&&pixel_phi_index<rowsMax)?true:false;
-}
-
-inline unsigned int ModuleSpecialPixelMap::chipsPerModule() const{
- return m_chipsPerModule/10;
-}
-
-inline unsigned int ModuleSpecialPixelMap::chipType() const{
- return m_chipsPerModule%10;
-}
-
-inline void ModuleSpecialPixelMap::setchipsPerModule(unsigned int chipsPerModule){
- m_chipsPerModule = chipsPerModule;
-}
-
-inline unsigned int ModuleSpecialPixelMap::columnsPerChip() const{
- unsigned int itype = std::min(m_chipsPerModule%10,nmtype-1);
- return columnsPerFEIX[itype];
-}
-
-inline unsigned int ModuleSpecialPixelMap::rowsPerChip() const{
- unsigned int itype = std::min(m_chipsPerModule%10,nmtype-1);
- return rowsPerFEIX[itype];
-}
-
-inline unsigned int ModuleSpecialPixelMap::rowsrdoPerChip() const{
- unsigned int itype = std::min(m_chipsPerModule%10,nmtype-1);
- return rowsRdoPerFEIX[itype];
-}
-
-} // namespace PixelCoralClientUtils
-#endif // SPECIALPIXELMAP_HH
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/pcd.sh b/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/pcd.sh
deleted file mode 100755
index cae295a9a6be9e4bc56e959fb475cc84eb7563d6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/pcd.sh
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-#
-# PCDio wrapper
-#
-
-err () {
- echo '*' commands:
- echo
- echo $0 init tag[:rev] [filename]
- echo '*' create a new calibration tag=tag, revision=rev, origin=file:filename from the text file filename. By default rev=1, filename=pcd.dat .
- echo
- echo $0 copy tag[:rev] oldtag[:oldrev]
- echo '*' create a new calibration tag=tag, revision=rev, origin=\"oldtag:oldrev\" from existing calibration tag=oldtag, revision=oldrev. By default rev=1, oldrev=largest available revision for tag oldtag.
- echo
- echo $0 update tag[:rev] analid [opt]
- echo '*' take the calibration tag=tag, revision=rev, apply analisys analid, and create a new calibration tag=tag, revision=largest available revision + 1, origin=\"tag:rev:analid\". By default rev=largest available revision. opt=option accepted by extractAnalysis.
- echo
- #echo $0 list [tag]
- #echo '*' list calibrations which exist for tag tag. By default, list all existing calibrations.
- #echo
- echo $0 dump tag[:rev] [filename]
- echo '*' dump calibration tag=tag, revision=rev to the text file filename. By default rev=largest available revision, filename=pcd.dat .
- exit 1
-}
-
-#
-# tag:rev parser
-#
-
-parse_tagrev () {
- have_rev=yes
- tag=${tagrev%:*}
- rev=${tagrev#*:}
- if [[ $tag == $tagrev ]]; then
- have_rev=no
- rev=1
- fi
-}
-
-#
-# main switch
-#
-
-if [[ $# -lt 1 ]]; then
- err
-fi
-
-case $1 in
-init)
- if [[ $# -lt 2 ]]; then
- err
- fi
-
- filename=
- if [[ $# -ge 3 ]]; then
- filename=$3
- if [[ -e $filename ]]; then
- cp $filename pcd.dat
- else
- echo file $filename does not exist
- exit 1
- fi
- fi
-
- tagrev=$2
- parse_tagrev
-
- echo talkToPCDDb -s $tag $rev file:$filename
- talkToPCDDb -s $tag $rev file:$filename
- ;;
-
-copy)
- if [[ $# -lt 3 ]]; then
- err
- fi
-
- tagrev=$2
- parse_tagrev
- newtag=$tag
- newrev=$rev
-
- tagrev=$3
- parse_tagrev
-
- if [[ $have_rev == yes ]]; then
- talkToPCDDb -r $tag $rev
- else
- talkToPCDDb -r $tag
- rev=`cat pcd.rev`
- fi
- mv pcd.sav pcd.dat
- echo talkToPCDDb -s $newtag $newrev $tag:$rev
- talkToPCDDb -s $newtag $newrev $tag:$rev
- ;;
-
-update)
- if [[ $# -lt 3 ]]; then
- err
- fi
-
- tagrev=$2
- parse_tagrev
- talkToPCDDb -r $tag
- newrev=`cat pcd.rev`
- if [[ $have_rev == yes ]]; then
- talkToPCDDb -r $tag $rev
- fi
- newrev=$[$newrev + 1]
- mv pcd.sav pcd.dat
-
- analid=$3
- opt=
- if [[ $# -ge 4 ]]; then
- opt=$4
- fi
-
- temp=$CAN_CALIB_DB
- export CAN_CALIB_DB=oracle://ATLAS_COOLPROD/ATLAS_COOLONL_PIXEL
- echo extractAnalysis $opt $analid
- extractAnalysis $opt $analid
- export CAN_CALIB_DB=$temp
- mv pcd.sav pcd.dat
- echo talkToPCDDb -s $tag $newrev $tag:$rev:$analid
- talkToPCDDb -s $tag $newrev $tag:$rev:$analid
- ;;
-
-list)
- ;;
-
-dump)
- if [[ $# -lt 2 ]]; then
- err
- fi
-
- tagrev=$2
- parse_tagrev
- if [[ $have_rev == yes ]]; then
- talkToPCDDb -r $tag $rev
- else
- talkToPCDDb -r $tag
- fi
- mv pcd.sav pcd.dat
-
- if [[ $# -ge 3 ]]; then
- filename=$3
- cp pcd.dat $filename
- fi
- ;;
-
-*)
- echo pcd: unrecognized command $1
- err
-
-esac
-
-exit 0
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/probe_fill.src b/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/probe_fill.src
deleted file mode 100644
index 8719dab0c79b6b21e12eaed6c2957a629ad9beb8..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/probe_fill.src
+++ /dev/null
@@ -1,8 +0,0 @@
-rm -rf testdb.sql
-export CAN_CALIB_DB="sqlite_file:testdb.sql"
-CORAL-fill 1 "tag:mytag revision:1234 sources:Offline:0 file:pixelcalibsvc_dump.txt"
-CORAL-fill 1 "tag:mytag1 revision:5678 sources:Offline:0 file:pixelcalibsvc_dump_assembly_02.txt"
-echo "========= reading first calibration ========="
-CORAL-read 1 "tag:mytag revision:1234"
-echo "========= reading second calibration ========="
-CORAL-read 1 "tag:mytag1 revision:5678"
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/talkToPCDDb_example.sh b/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/talkToPCDDb_example.sh
deleted file mode 100755
index 56a637c51b63e9648f25630e560f06c4ee110d43..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/talkToPCDDb_example.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-#!/bin/sh
-###############################################################################
-
-rm -f testdb.sql
-
-export CAN_CALIB_DB="sqlite_file:testdb.sql"
-#export CAN_CALIB_DB=oracle://devdb10/atlas_pixel_khanov
-
-./pcd.sh init mytag pixelcalibsvc_dump_assembly_02.txt
-./pcd.sh update mytag 5620 -t
-./pcd.sh copy mytag1 mytag
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/talkToPCDkr_example.sh b/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/talkToPCDkr_example.sh
deleted file mode 100755
index 0c53d5d732e68ae880e0909f41aeb9cb7c91e2b3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/cmt/talkToPCDkr_example.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-#!/bin/sh
-###############################################################################
-
-rm -f testdb.sql
-
-export CAN_CALIB_DB="sqlite_file:testdb.sql"
-#export CAN_CALIB_DB=oracle://devdb10/atlas_pixel_khanov
-
-talkToPCDkr -s hello/world mytag
-talkToPCDkr -s hello/again mytag1
-talkToPCDkr -s hello/oncemore mytag2
-talkToPCDkr -r
-talkToPCDkr -v hello/again
-talkToPCDkr -r
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/example/calibDbInterface_example.sh b/InnerDetector/InDetConditions/PixelCoralClientUtils/example/calibDbInterface_example.sh
deleted file mode 100755
index ba29a85ee30380747c6ea113fa68e2a9560fde01..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/example/calibDbInterface_example.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-#!/bin/sh
-###############################################################################
-
-export PATH=$PATH:$PWD/../i686-slc5-gcc43-opt/calibDbInterface.exe
-
-export PIXEL_CAL_KNOWLEDGE="oracle://INTR/ATLAS_MLIMPER"
-#export PIXEL_CAL_KNOWLEDGE="oracle://DEVDB10/ATLAS_COOL_MLIMPER"
-#export PIXEL_CAL_KNOWLEDGE="sqlite_file:/detpriv/pix/data/PixCalibDataOffline/pcd_knowledge.db"
-
-#store the latest updated calibration strings
-calibDbInterface.exe -s PixCalib-BLKP-UPD4-000-01 string2 string3
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-create.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-create.cc
deleted file mode 100644
index 8648d4f79c9cb9c77a0038c1ec54e1bde3e2ab44..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-create.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/CoralClient.hh"
-
-int main (int argc, char **argv){
-//printf("COOL-create starting \n");
-
-
- // --------------------------------------------------
- // Main part
- // --------------------------------------------------
-
- try {
-
- // Start CORAL client
- printf("CORAL-create starting \n");
-// PixCoralClient coralClient(coralConnStr,app.context());
- const char* tableName = argc>1 ? "CALIB_DATA" : "CALIB_ANAL";
- PixCoralClient coralClient(true, coral::Update, tableName);
-
- //coralClient.dropTables();
- if (argc>1) {
- coralClient.createTables(argv[1]);
- } else {
- coralClient.createTables();
- }
- // coralClient.fillCoralTables();
- std::cout << "DONE" << std::endl;
- }
-
- // COOL, CORAL POOL exceptions inherit from std exceptions: catching
- // std::exception will catch all errors from COOL, CORAL and POOL
-
- catch ( std::exception& e ) {
- std::cout << "std::exception caught: " << e.what() << std::endl;
- return -1;
- }
-
- catch (...) {
- std::cout << "Unknown exception caught!" << std::endl;
- return -1;
- }
-
- return 0;
-
-}
-
-
-
-
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-fill.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-fill.cc
deleted file mode 100644
index 9d232774da87636bc1f91d02341c4f6ba2999853..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-fill.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/CoralClient.hh"
-
-int main (int argc, char **argv){
- //printf("CORAL-fill starting \n");
-
- CAN::SerialNumber_t anal_id = 123456789;
- if (argc > 1) anal_id = atoi(argv[1]);
-
-
- // --------------------------------------------------
- // Main part
- // --------------------------------------------------
-
- try {
-
- // Start CORAL client
- printf("CORAL-fill starting \n");
-// PixCoralClient coralClient(coralConnStr,app.context());
- const char* tableName = argc>2 ? "CALIB_DATA" : "CALIB_ANAL";
- PixCoralClient coralClient(true, coral::Update, tableName);
-
- if (argc>2) {
- coralClient.fillTables(argv[2]);
- } else {
- CAN::AnalysisResultList_t results;
- results.addValue("a_value","ROD_test",false);
- results.addValue("Status","Some module",true);
- results.addValue("Status","Other module",false);
- results.addValue<float>("aFloat","Other module",111);
- results.addValue<unsigned int>("Myint","New module",43);
- CAN::AverageResult_t avRes(3,13.4,2.3,2,50.2);
- results.addValue("FirstAv","AV module",avRes);
-
- PixelMap_t pixelmap;
- pixelmap[std::make_pair(2,3)]=4; //CLA
- pixelmap[std::make_pair(3,3)]=4;
- pixelmap[std::make_pair(3,23)]=4;
-// special column pairs
-// for (int i=0; i<160; ++i) {
-// pixelmap.push_back(CAN::Pixel_t(i,0,3));
-// pixelmap.push_back(CAN::Pixel_t(i,1,3));
-// pixelmap.push_back(CAN::Pixel_t(i,24,5));
-// pixelmap.push_back(CAN::Pixel_t(i,25,5));
-// }
-// special chip
-// for (int i=160; i<320; ++i) {
-// for (int j=36; j<54; ++j) {
-// pixelmap.push_back(CAN::Pixel_t(i,j,6));
-// }
-// }
-// special module
-// for (int i=0; i<320; ++i) {
-// for (int j=0; j<144; ++j) {
-// pixelmap.push_back(CAN::Pixel_t(i,j,7));
-// }
-// }
- results.addValue("Map","this module",pixelmap);
- coralClient.fillTables(anal_id, &results);
- }
-
- }
-
- // COOL, CORAL POOL exceptions inherit from std exceptions: catching
- // std::exception will catch all errors from COOL, CORAL and POOL
- catch ( std::exception& e ) {
- std::cout << "std::exception caught: " << e.what() << std::endl;
- return -1;
- }
-
- catch (...) {
- std::cout << "Unknown exception caught!" << std::endl;
- return -1;
- }
-
- return 0;
-
-}
-
-
-
-
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-listVariables.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-listVariables.cc
deleted file mode 100644
index c6299af218261a0acfa060175d565dc48afbce6f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-listVariables.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/CoralClient.hh"
-#include <string>
-#include <vector>
-#include <cstring>
-
-
- class DummyCoralClientListener : public IPixResultsDbListener {
- public:
-
- protected:
- void newValue(const std::string &var_name, const std::string &conn_name, bool value) {
- std::cout << "INFO [DummyCoralClientListener::newValue<bool>] var_name = " << var_name << ", conn_name = " << conn_name
- << " value = " << (value ? "true" : "false") << std::endl;
- }
- void newValue(const std::string &var_name, const std::string &conn_name, unsigned int value) {
- std::cout << "INFO [DummyCoralClientListener::newValue<unsigned int>] var_name = " << var_name << ", conn_name = " << conn_name
- << " value = " << value << std::endl;
- }
- void newValue(const std::string &var_name, const std::string &conn_name, float value) {
- std::cout << "INFO [DummyCoralClientListener::newValue<float>] var_name = " << var_name << ", conn_name = " << conn_name
- << " value = " << value << std::endl;
- }
- void newValue(const std::string &var_name, const std::string &conn_name, const CAN::AverageResult_t &value) {
- std::cout << "INFO [DummyCoralClientListener::newValue<AverageResult_t>] var_name = " << var_name << ", conn_name = " << conn_name
- << " value = " << value.value(CAN::AverageResult_t::kLower99)
- << " < " << value.value(CAN::AverageResult_t::kMean) << " +- " << value.value(CAN::AverageResult_t::kRMS)
- << " < " << value.value(CAN::AverageResult_t::kUpper99)
- << std::endl;
- }
- void newValue(const std::string &var_name, const std::string &conn_name, const PixelMap_t & value) {
- std::cout << "INFO [DummyCoralClientListener::newValue<PixelMap_t>] var_name = " << var_name << ", conn_name = " << conn_name<< std::endl;
- std::cout<< " row/column status"<< std::endl;
- for (PixelMap_t::const_iterator it=value.begin(); it != value.end(); ++it)
- std::cout<<" "<<(*it).first.second<<"/"<<(*it).first.first<<" "<<(*it).second<< std::endl;//CLA
- }
- };
-
-
-int main (int argc, char **argv){
-
- CAN::SerialNumber_t analysis_id = 0;
- std::vector<std::string> connectivity_name;
- bool error=false;
-
- for (int arg_i=1; arg_i<argc; arg_i++) {
- if (strcmp(argv[arg_i],"-s")==0 && arg_i+1<argc && argv[arg_i+1][0]!='-') {
- analysis_id = atoi(argv[++arg_i]);
- }
- else if (strcmp(argv[arg_i],"-c")==0 && arg_i+1<argc && argv[arg_i+1][0]!='-') {
- arg_i++;
- do {
-
- connectivity_name.push_back( argv[arg_i] );
-
- } while ( ++arg_i<argc && argv[arg_i][0]!='-' );
-
- }
- else {
- std::cout << "ERROR [" << argv[0] << ":main] unsupported argument : " << argv[arg_i] << "." << std::endl;
- error=true;
- break;
- }
- }
- if (analysis_id<=0 || error) {
- std::cout << "USAGE " << argv[0] << " -s analysis-serial-number [-c connectivity-name ... ]" << std::endl;
- return -1;
- }
-
-
- // --------------------------------------------------
- // Main part
- // --------------------------------------------------
-
- try {
-
- PixCoralClient coralClient(true);
- DummyCoralClientListener listener;
-
- coralClient.getAnalysisResultsFromDB(analysis_id,connectivity_name, listener);
-
- } catch ( std::exception& e ) {
- std::cout << "std::exception caught: " << e.what() << std::endl;
- return -1;
- }
-
- catch (...) {
- std::cout << "Unknown exception caught!" << std::endl;
- return -1;
- }
-
- return 0;
-
-}
-
-
-
-
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-read.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-read.cc
deleted file mode 100644
index 20e95f217f91b5aaee0d9e28cc3d02d812ffbc50..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CORAL-read.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/CoralClient.hh"
-
-int main (int argc, char **argv){
- //printf("CORAL-create starting \n");
-
- CAN::SerialNumber_t anal_id = 123456789;
- if (argc > 1) anal_id = atoi(argv[1]);
-
-
- // --------------------------------------------------
- // Main part
- // --------------------------------------------------
-
- try {
-
- // Start CORAL client
- printf("CORAL-read starting \n");
-// PixCoralClient coralClient(coralConnStr,app.context());
- const char* tableName = argc>2 ? "CALIB_DATA" : "CALIB_ANAL";
- PixCoralClient coralClient(true, coral::ReadOnly, tableName);
-
- if (argc>2) {
-
- // ------------------------------------------------
- // read PCD table -- A.X.
- // ------------------------------------------------
-
- // Show the structure of the master table
- try {
- coralClient.printTableDesc("CALIB_DATA");
- coralClient.printTableContent("CALIB_DATA");
- } catch (coral::TableNotExistingException& err) {
- std::cout<<"TableNotExistingException: "<<err.what()<<std::endl;
- }
-
- // Get all results for given tag/revision
- try {
- coralClient.getCalibrationDataFromDB(argv[2]);
- } catch (coral::TableNotExistingException& err) {
- std::cout<<"TableNotExistingException: "<<err.what()<<std::endl;
- }
-
- } else {
-
- // ------------------------------------------------
- // old functionality -- A.X.
- // ------------------------------------------------
-
- // Show the structure of the master table
- try {
- coralClient.printTableDesc("CALIB_ANAL");
- coralClient.printTableContent("CALIB_ANAL");
- } catch (coral::TableNotExistingException& err) {
- std::cout<<"TableNotExistingException: "<<err.what()<<std::endl;
- }
-
- // Get all results for analysis anal_id
- try {
- // Print content on the screen
-// coralClient.queryTable(anal_id);
- // Return a CAN::AnalysisResultList_t object
- coralClient.getAnalysisResultsFromDB(anal_id);
- } catch (coral::TableNotExistingException& err) {
- std::cout<<"TableNotExistingException: "<<err.what()<<std::endl;
- }
-
- // Get results for variable FirstAv and analysis anal_id
- try {
- // Print content on the screen
-// coralClient.queryTable(anal_id,"FirstAv");
- // Return a CAN::AnalysisResultList_t object
- coralClient.getAnalysisResultsFromDB(anal_id,"FirstAv");
- } catch (coral::TableNotExistingException& err) {
- std::cout<<"TableNotExistingException: "<<err.what()<<std::endl;
- }
-
- // Get results for module L0_B08_S1_A6_M6A, variable Status
- // and analysis anal_id
- try {
- // Print content on the screen
-// coralClient.queryTable(anal_id,"Status","L0_B08_S1_A6_M6A");
- // Return a CAN::AnalysisResultList_t object
- coralClient.getAnalysisResultsFromDB(anal_id,"Status","L0_B08_S1_A6_M6A");
- } catch (coral::TableNotExistingException& err) {
- std::cout<<"TableNotExistingException: "<<err.what()<<std::endl;
- }
-
- // Get results for vector of modules, variable ASpecialPixelMap
- // and analysis anal_id
- try {
- // Return a CAN::AnalysisResultList_t object
- std::vector<std::string> mods;
- mods.push_back("L2_B25_S2_C6_M4C");
- mods.push_back("L2_B25_S1_C7_M2C");
- coralClient.getAnalysisResultsFromDB(anal_id,mods,"ASpecialPixelMap");
- } catch (coral::TableNotExistingException& err) {
- std::cout<<"TableNotExistingException: "<<err.what()<<std::endl;
- }
-
- } // endif -- A.X.
-
- // COOL, CORAL POOL exceptions inherit from std exceptions: catching
- // std::exception will catch all errors from COOL, CORAL and POOL
- } catch ( std::exception& e ) {
- std::cout << "std::exception caught: " << e.what() << std::endl;
- return -1;
- }
-
- catch (...) {
- std::cout << "Unknown exception caught!" << std::endl;
- return -1;
- }
-
- return 0;
-
-}
-
-
-
-
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CoralClient.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CoralClient.cc
deleted file mode 100644
index 3d8d54d390e7ca7680900b95faec8b61fd3b039f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/CoralClient.cc
+++ /dev/null
@@ -1,2224 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-//////////////////////////////////////////////////
-///
-/** @file Coralclient.cpp
-
-C++ class for creating the calibration DB schema,
-fill the DB, read it back
-
-*/
-///////////////////////////////////////////////////
-
-#include "PixelCoralClientUtils/CoralClient.hh"
-#include "PixelCoralClientUtils/SpecialPixelMap.hh"
-#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-#include <assert.h>
-#include <cstring>
-#include <string>
-
-// definition of table types
-enum ETableTypeId {kBoolType, kUIntType, kFloatType, kAvresType, kPixelMapType, kCalibData, kNTableTypes};
-const std::string s_tableTypeName[kNTableTypes]={"BOOL","UINT","FLOAT","AVRES","SPECIALPIXELS","CALIBDATA"};
-
-/** Returns the string used to identify a particular type
- */
-template <typename T>
-ETableTypeId variableType();
-
-
-template <> ETableTypeId variableType<float>() {
- return kFloatType;
-}
-
-template <> ETableTypeId variableType<bool>() {
- return kBoolType;
-}
-
-template <> ETableTypeId variableType<unsigned int>() {
- return kUIntType;
-}
-
-template <> ETableTypeId variableType<CAN::AverageResult_t>() {
- return kAvresType;
-}
-
-template <> ETableTypeId variableType<PixelMap_t>() {
- return kPixelMapType;
-}
-
-template <> ETableTypeId variableType<PixelCoralClientUtils::PixelCalibData>() {
- return kCalibData;
-}
-
-template <class T> inline std::string tableTypeName() {
- return s_tableTypeName[ variableType<T>() ];
-}
-
-/** Create the RCDConnectionService
- */
-coral::IHandle<coral::IConnectionService> PixCoralClient::connectionService(bool verbose)
-{
- if(verbose) std::cout << "Creating Connection Service"<<std::endl;
-
- // Instantiate connection service
- coral::Context* context = &coral::Context::instance();
-
- // Load CORAL connection service
- coral::IHandle<coral::IConnectionService> lookSvcH = context->query<coral::IConnectionService>();
- if (!lookSvcH.isValid()) {
- context->loadComponent( "CORAL/Services/ConnectionService" );
- lookSvcH = context->query<coral::IConnectionService>();
- }
- if (!lookSvcH.isValid()) {
- throw std::runtime_error( "Could not locate the connection service" );
- }
- return lookSvcH;
-}
-
-
-std::string connectionString(const std::string &connection_string_in) {
- if (connection_string_in.empty()) {
- char * ctmp = getenv("CAN_CALIB_DB");
- if (ctmp != NULL) {
- return ctmp;
- }
- }
- return connection_string_in;
-}
-
-
-//---------------------------------------------------------------------------
-/** Constructor.
- Open a database identified by the connection string.
-*/
-PixCoralClient::PixCoralClient(const std::string& id1,
- bool verbose, coral::AccessMode access_mode, const char* tableName)
- : m_connString(connectionString(id1)),
- m_accessMode(access_mode),
- m_connectionService(connectionService(verbose)),
- m_session(0),
- m_pixeltable(tableName),
- m_verbose(verbose)
-{
-}
-
-
-//---------------------------------------------------------------------------
-/** Constructor.
- Open the default database and seal context.
-*/
-PixCoralClient::PixCoralClient(bool verbose, coral::AccessMode access_mode, const char* tableName)
- : m_connString(connectionString("")),
- m_accessMode(access_mode),
- m_connectionService(connectionService(verbose)),
- m_session(0),
- m_pixeltable(tableName),
- m_verbose(verbose)
-{
-}
-
-
-void PixCoralClient::disconnect() {
- if (m_verbose) {
- std::cout << "INFO [PixCoralClient::disconnect] disconnect from " << m_connString << "." << std::endl;
- }
- delete m_session;
- m_session=NULL;
-}
-
-void PixCoralClient::connect() {
- if (!m_session) {
- if (m_verbose) {
- std::cout << "INFO [PixCoralClient::connect] Try to connect to " << m_connString << "." << std::endl;
- }
- m_session = m_connectionService->connect( m_connString, m_accessMode );
- }
-}
-
-
-//---------------------------------------------------------------------------
-/** Destructor.
- Close the connection
-*/
-PixCoralClient::~PixCoralClient() {
- disconnect();
- try {
- m_connectionService->purgeConnectionPool();
- }
- catch (coral::Exception & ex) {
- std::cout << "INFO [PixCoralClient::~PixCoralClien] Exception caught in purging connection pool. " <<std::endl;
- std::cout << ex.what() <<std::endl;
- }
-}
-
-
-
-
-//---------------------------------------------------------------------------
-/** Get the list of tables on the database and print it on stdout.
- */
-void PixCoralClient::printTables(const char* /* option */)
-{
- if (m_verbose) std::cout << "\nCOOLCORAL Client: list of tables" << std::endl;
-
- transactionStartReadOnly();
-
- std::set<std::string> tables = m_session->nominalSchema().listTables();
- transactionCommit();
- for ( std::set<std::string>::iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
- std::cout << "\t" << *tName << std::endl;
- }
-}
-
-
-
-
-//--------------------------------------------------------------------------
-/** Get the description of a table identified by an input string on the database and print it on stdout.
- */
-void PixCoralClient::printTableDesc(const std::string& tableName)
-{
- if (m_verbose) std::cout << "\nCOOLCORAL Client: " << tableName <<" Table description" << std::endl;
-
- transactionStartReadOnly();
-
- const coral::ITableDescription& tableDesc =
- m_session->nominalSchema().tableHandle(tableName).description();
- std::string Name = tableDesc.name();
- int NumCol = tableDesc.numberOfColumns();
- std::vector<std::string> colName; colName.resize(NumCol);
- std::vector<std::string> colType; colType.resize(NumCol);
- for(int i=0; i<NumCol; ++i){
- const coral::IColumn& colDesc = tableDesc.columnDescription(i);
- colName[i] = colDesc.name();
- colType[i] = colDesc.type();
- }
-
- transactionCommit();
-
- std::cout << "\nName : "<< Name << std::endl;
- //std::cout << "\nType :"<< Type << std::endl;
- printf(" Num of cols : %d",NumCol);
- std::cout << "\n Columns :"<< std::endl;
- for(int i=0; i<NumCol; ++i)
- std::cout <<" "<< colName[i] <<" ("<< colType[i]<<")"<< std::endl;
-}
-
-
-
-
-//---------------------------------------------------------------------------
-/** Get the content of a table identified by an input string on the
- database and print its number of lines.
- */
-void PixCoralClient::printTableContent(const std::string& tableName){
- if (m_verbose) std::cout << "\nCOOLCORAL Client: " << tableName
- <<" Table content"<< std::endl;
-
- transactionStartReadOnly();
-
- coral::IQuery* query = m_session->nominalSchema().tableHandle(tableName).newQuery();
- coral::ICursor& cursor = query->execute();
- int nRows = 0;
- while ( cursor.next() ) {
- ++nRows;
- }
- delete query;
-
- transactionCommit();
-
- printf("Total %d records\n", nRows);
-}
-
-
-
-
-
-//---------------------------------------------------------------------------
-/** Create CORAL tables
- */
-void PixCoralClient::createTables(const char* option)
-{
- if (m_verbose) {
- std::cout << "\nCOOLCORAL Client: Create tables";
- if (option) std::cout << " with option " << option;
- std::cout << std::endl;
- }
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- createAuxTables();
-
- transactionStartUpdate();
-
- // std::cout << " Deleting the old table: " << m_pixeltable << std::endl;
- // m_session->nominalSchema().dropIfExistsTable(m_pixeltable);
-
- if (!m_session->nominalSchema().existsTable(m_pixeltable)) {
- if (m_verbose) std::cout << " Creating table: " << m_pixeltable << std::endl;
- coral::TableDescription pixel_columns( "SchemaDefinition_PIXEL" );
- pixel_columns.setName( m_pixeltable );
- // modified -- A.X.
- if (option==0) {
- pixel_columns.insertColumn( "ANAL_ID",
- coral::AttributeSpecification::typeNameForType<CAN::SerialNumber_t>());
- } else {
- pixel_columns.insertColumn("TAG", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- pixel_columns.insertColumn("REVISION", coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("SOURCES", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- }
- pixel_columns.insertColumn( "DATE",
- coral::AttributeSpecification::typeNameForType<time_t>());
- pixel_columns.insertColumn( "FK",
- coral::AttributeSpecification::typeNameForType<long long>());
-
- // modified -- A.X.
- if (option==0) {
- pixel_columns.createIndex("ANAL_ID_IDX", "ANAL_ID");
- pixel_columns.setNotNullConstraint ("ANAL_ID");
- }
- pixel_columns.setUniqueConstraint("FK","FK_UNIQ");
-
- // Create the actual table
- try {
- m_session->nominalSchema().createTable( pixel_columns );
- } catch (coral::TableAlreadyExistingException & ex) {
- //Must have been created in parallel
- }
- }
-
- transactionCommit();
-
- // modified -- A.X.
- if (option==0) {
- createTable<bool>();
- createTable<unsigned int>();
- createTable<float>();
- createTable<CAN::AverageResult_t>();
- createTable<PixelMap_t>();
- } else {
- createTable<PixelCoralClientUtils::PixelCalibData>();
- }
-
- // measuring elapsed time
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << " Total time was " << total_usecs << " usec" << std::endl;
-}
-
-
-
-
-
-//---------------------------------------------------------------------------
-/** Drop CORAL tables
- */
-void PixCoralClient::dropTables(){
- if (m_verbose) std::cout << "\nCOOLCORAL Client: Drop tables" << std::endl;
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
-
- transactionStartUpdate();
-
- std::set<std::string> tables = m_session->nominalSchema().listTables();
-
- if (tables.size() > 0)
- if (m_verbose) std::cout << "Deleting the old tables: " << std::endl;
- for ( std::set<std::string>::reverse_iterator tName = tables.rbegin();
- tName != tables.rend(); ++tName ){
- if ((*tName).find(m_pixeltable) != std::string::npos) {
- if (m_verbose) std::cout << "\t" << *tName << std::endl;
- m_session->nominalSchema().dropTable(*tName);
- }
- }
-
- transactionCommit();
-
- // measuring elapsed time
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << "Total time was " << total_usecs << " usec" << std::endl;
-}
-
-
-
-
-//---------------------------------------------------------------------------
-/** Fill analysis result tables
- */
-void PixCoralClient::fillTables(CAN::SerialNumber_t serialNumber,
- CAN::AnalysisResultList_t *results){
- if (m_verbose) std::cout << "\nCOOLCORAL Client: Fill tables" << std::endl;
-
- // get a new foreign key
- long long fk = updateKey();
-
- transactionStartUpdate();
-
- // Create if not yet there
- if (!m_session->nominalSchema().existsTable(m_pixeltable)) {
- createTables();
- transactionStartUpdate();
- }
-
- // Find bool variables
- if (results->begin<bool>() != results->end<bool>()) {
- if (!m_session->nominalSchema().existsTable(m_pixeltable+"_BOOL")) {
- createTable<bool>();
- transactionStartUpdate();
- }
- }
-
- // Find unsigned int variables
- if (results->begin<unsigned int>() != results->end<unsigned int>()) {
- if (!m_session->nominalSchema().existsTable(m_pixeltable+"_UINT")) {
- createTable<unsigned int>();
- transactionStartUpdate();
- }
- }
-
- // Find float variables
- if (results->begin<float>() != results->end<float>()) {
- if (!m_session->nominalSchema().existsTable(m_pixeltable+"_FLOAT")) {
- createTable<float>();
- transactionStartUpdate();
- }
- }
-
- // Find AverageResult_t variables
- if (results->begin<CAN::AverageResult_t>() != results->end<CAN::AverageResult_t>()) {
- if (!m_session->nominalSchema().existsTable(m_pixeltable+"_AVRES")) {
- createTable<CAN::AverageResult_t>();
- transactionStartUpdate();
- }
- }
-
- // Find special pixel map variables
- if (results->begin<PixelMap_t>() != results->end<PixelMap_t>()) {
- if (!m_session->nominalSchema().existsTable(m_pixeltable+"_SPECIALPIXELS")) {
- createTable<PixelMap_t>();
- transactionStartUpdate();
- }
- }
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- if (m_verbose) std::cout << " Filling table " << m_pixeltable << " for analysis "<< serialNumber << std::endl;
- coral::ITableDataEditor& pixel_editor = m_session->nominalSchema().tableHandle(m_pixeltable ).dataEditor();
- coral::AttributeList pixel_row ATLAS_THREAD_SAFE; // Not shared, ok
-
- //unsigned int id = serialNumber;
- time_t date = time(0);
-
- struct timeval nunc_time;
- gettimeofday(&nunc_time, NULL);
-
- int run = 0;
-
- pixel_row.extend<CAN::SerialNumber_t>("ANAL_ID");
- pixel_row.extend<time_t>("DATE");
- pixel_row.extend<long long>("FK");
- pixel_row["ANAL_ID"].data<CAN::SerialNumber_t>() = serialNumber;
- pixel_row["DATE"].data<time_t>() = LocalToGMTTime(date);
- pixel_row["FK"].data<long long>() = fk;
- pixel_editor.insertRow(pixel_row);
-
- transactionCommit();
-
- run += fillTable<bool>(fk,results);
- run += fillTable<unsigned int>(fk,results);
- run += fillTable<float>(fk,results);
- run += fillTable<CAN::AverageResult_t>(fk,results);
- run += fillTable<PixelMap_t>(fk,results);
-
- if (m_verbose) printf("\n Total: %d rows\n",run);
-
- // measuring elapsed time
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << " Total time was " << total_usecs << " usec" << std::endl;
-
-}
-
-/** fill PCD table -- A.X.
- */
-void PixCoralClient::fillTables(const char* option){
-
- if (option==NULL || !strlen(option)) { return; }
-
- if (m_verbose) {
- std::cout << "\nCOOLCORAL Client: Fill tables";
- if (option) std::cout << " with option " << option;
- std::cout << std::endl;
- }
-
- // get a new foreign key
- long long fk = updateKey();
-
- transactionStartUpdate();
-
-
- // Create if not yet there
- if (!m_session->nominalSchema().existsTable(m_pixeltable)) {
- createTables(option);
- transactionStartUpdate();
- }
-
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- if (m_verbose) std::cout << " Filling table " << m_pixeltable << std::endl;
- coral::ITableDataEditor& pixel_editor = m_session->nominalSchema().tableHandle(m_pixeltable ).dataEditor();
- coral::AttributeList pixel_row ATLAS_THREAD_SAFE; // Not shared, ok
-
- //unsigned int id = serialNumber;
- time_t date = time(0);
-
- struct timeval nunc_time;
- gettimeofday(&nunc_time, NULL);
-
- int run = 0;
-
- pixel_row.extend<std::string>("TAG");
- pixel_row.extend<int>("REVISION");
- pixel_row.extend<std::string>("SOURCES");
- pixel_row.extend<time_t>("DATE");
- pixel_row.extend<long long>("FK");
-
- // parse option -- A.X.
- std::string tag("");
- std::string revision("");
- std::string sources("");
- std::string delimiters(", ");
- std::string str(option);
- std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
- std::string::size_type pos = str.find_first_of(delimiters, lastPos);
- while (std::string::npos != pos || std::string::npos != lastPos) {
- if (str.substr(lastPos,4)=="tag:")
- tag = str.substr(lastPos+4, pos-lastPos-4);
- if (str.substr(lastPos,9)=="revision:")
- revision = str.substr(lastPos+9, pos-lastPos-9);
- if (str.substr(lastPos,8)=="sources:")
- sources = str.substr(lastPos+8, pos-lastPos-8);
- lastPos = str.find_first_not_of(delimiters, pos);
- pos = str.find_first_of(delimiters, lastPos);
- }
- if (m_verbose) {
- std::cout << "TAG: " << tag << std::endl;
- std::cout << "REVISION: " << atoi(revision.c_str()) << std::endl;
- std::cout << "SOURCES: " << sources << std::endl;
- }
-
- pixel_row["TAG"].data<std::string>() = tag;
- pixel_row["REVISION"].data<int>() = atoi(revision.c_str());
- pixel_row["SOURCES"].data<std::string>() = sources;
- pixel_row["DATE"].data<time_t>() = LocalToGMTTime(date);
- pixel_row["FK"].data<long long>() = fk;
-
- pixel_editor.insertRow(pixel_row);
-
- transactionCommit();
-
- run += fillTablePixelCalibData(fk, option);
-
- if (m_verbose) printf("\n Total: %d rows\n",run);
-
- // measuring elapsed time
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << " Total time was " << total_usecs << " usec" << std::endl;
-
-}
-
-
-
-//---------------------------------------------------------------------------
-/** Get results for a particular analysis ID
- Optionally get only variable "varname" and/or connectivity object connName
- */
-void PixCoralClient::queryTable(CAN::SerialNumber_t anal_id, const std::string& varname, const std::string& connName){
-
- std::cout << "\n COOLCORAL Client: " << m_pixeltable <<" Putting table content in AnalysisResultList for analysis " << anal_id;
- if (varname != "") std::cout<<", variable " << varname;
- if (connName != "") std::cout<<", object " << connName;
- std::cout<< std::endl;
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- transactionStartReadOnly();
-
- // Get all entries for anal_id
- coral::IQuery* query = m_session->nominalSchema().tableHandle(m_pixeltable).newQuery();
- query->addToOutputList("ANAL_ID");
- query->defineOutputType("ANAL_ID",coral::AttributeSpecification::typeNameForType<CAN::SerialNumber_t>());
- query->addToOutputList("DATE");
- query->defineOutputType("DATE",coral::AttributeSpecification::typeNameForType<time_t>());
- query->addToOutputList("FK");
- std::string pixel_cond = m_pixeltable+".ANAL_ID = :analid";
- coral::AttributeList pixel_condData ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData.extend<CAN::SerialNumber_t>( "analid" );
- query->setCondition( pixel_cond, pixel_condData);
- pixel_condData[0].data<CAN::SerialNumber_t>() = anal_id;
- coral::ICursor& cursor = query->execute();
-
- int nRows = 0;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- std::time_t timet = GMTtoLocalTime(row0[1].data<time_t>());
- char buf[32];
- std::string time = ctime_r(&timet, buf);
- std::cout << " ANAL_ID = " << row0[0].data<CAN::SerialNumber_t>()
- << " DATE = " << time.substr(0,time.size()-1)
- << " FK = " << row0[2].data<long long>() << std::endl;
- //row0.toOutputStream(std::cout)<<endl;
- ++nRows;
- // Show the variables
- std::set<std::string> tables = m_session->nominalSchema().listTables();
- for ( std::set<std::string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
- if ((*tName).find(m_pixeltable+"_") != std::string::npos) {
- coral::IQuery* query_2 = m_session->nominalSchema().tableHandle(*tName).newQuery();
-
- // Get the list of columns
- const coral::ITableDescription& tableDesc =
- m_session->nominalSchema().tableHandle(*tName).description();
- int NumCol = tableDesc.numberOfColumns();
- std::vector<std::string> colName; colName.resize(NumCol);
- std::vector<std::string> colType; colType.resize(NumCol);
- for(int i=0; i<NumCol; ++i){
- const coral::IColumn& colDesc = tableDesc.columnDescription(i);
- colName[i] = colDesc.name();
- colType[i] = colDesc.type();
- query_2->addToOutputList(colDesc.name());
- //if (m_verbose) std::cout <<" "<<i<<": "<< colName[i] <<" ("<< colType[i]<<")"<< std::endl;
- }
-
- // Second query to get entries in each table
- std::string pixel_cond_2 = (*tName)+".FK = :analfk";
- coral::AttributeList pixel_condData_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData_2.extend<long long>( "analfk" );
- pixel_condData_2[0].data<long long>() = row0[2].data<long long>();
- if (varname != "") {
- pixel_cond_2 += " AND "+(*tName)+".VARIABLE = :var";
- pixel_condData_2.extend<std::string>("var");
- pixel_condData_2["var"].data<std::string>() = varname;
- }
- if (connName != "") {
- pixel_cond_2 += " AND "+(*tName)+".CONNECTIVITY = :conn";
- pixel_condData_2.extend<std::string>("conn");
- pixel_condData_2["conn"].data<std::string>() = connName;
- }
- query_2->setCondition( pixel_cond_2, pixel_condData_2);
- coral::ICursor& cursor_2 = query_2->execute();
- while ( cursor_2.next() ) {
- const coral::AttributeList &row0_2 = cursor_2.currentRow();
- std::cout << " conn = " << row0_2[1].data<std::string>();
- std::cout<< " ("<<colType[3]<<")"<<row0_2[2].data<std::string>()<<"=";
- // If only I could use colType[i] and pass it to the template somehow
- for(int i=3; i<NumCol; ++i){
- if (colType[i] == "float")
- std::cout<< " ("<<colType[i]<<")"<<colName[i]<<"=" << row0_2[i].data<float>();
- else if (colType[i] == "int")
- std::cout<< " ("<<colType[i]<<")"<<colName[i]<<"=" << row0_2[i].data<int>();
- else if (colType[i] == "long long")
- std::cout<< " ("<<colType[i]<<")"<<colName[i]<<"=" << row0_2[i].data<long long>();
- else if (colType[i] == "bool")
- std::cout<< " ("<<colType[i]<<")"<<colName[i]<<"=" << row0_2[i].data<bool>();
- }
- std::cout<< std::endl;
- }
- delete query_2;
- }
- }
- }
- delete query;
-
- transactionCommit();
-
- if (m_verbose) printf(" Total %d analyses\n", nRows);
-
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << " Total time was " << total_usecs << " usec" << std::endl;
-}
-
-
-
-
-//--------------------------------------------------------------------------
-/** Create and fill the CALIB_KEYGEN key generation table
- */
-void PixCoralClient::createAuxTables(){
- std::string FK_TABLE = "CALIB_KEYGEN";
- transactionStartUpdate();
-
- // std::cout << "Deleting the old table: " << FK_TABLE << std::endl;
- // m_session->nominalSchema().dropIfExistsTable(FK_TABLE);
-
- if (!m_session->nominalSchema().existsTable(FK_TABLE)) {
- if (m_verbose) std::cout << "Creating table: " <<FK_TABLE << std::endl;
- coral::TableDescription key_columns( "SchemaDefinition_KEY" );
- key_columns.setName( FK_TABLE );
- key_columns.insertColumn( "KEY",
- coral::AttributeSpecification::typeNameForType<long long>());
- key_columns.createIndex ("KEY_INDEX", "KEY");
- // Create the actual table
- try {
- m_session->nominalSchema().createTable( key_columns );
- // Fill the first key
- coral::ITableDataEditor& keyeditor = m_session->nominalSchema().tableHandle( FK_TABLE ).dataEditor();
- coral::AttributeList rowBuffer ATLAS_THREAD_SAFE; // Not shared, ok
- rowBuffer.extend<long long>( "KEY" );
- long long& key = rowBuffer[ "KEY" ].data<long long>();
- key = 1000;
- keyeditor.insertRow( rowBuffer );
- } catch (coral::TableAlreadyExistingException & ex) {
- //Must have been created in parallel
- }
- }
- transactionCommit();
-}
-
-
-
-
-//---------------------------------------------------------------------------
-/** Method to update the key in the KEYGEN table
- */
-long long PixCoralClient::updateKey(){
- if (m_verbose) std::cout << "\nCOOLCORAL Client: Update Key" << std::endl;
- std::string FK_TABLE = "CALIB_KEYGEN";
- transactionStartUpdate();
- if (!m_session->nominalSchema().existsTable(FK_TABLE)) {
- createAuxTables();
- transactionStartUpdate();
- }
-
- coral::ITableDataEditor& keyeditor = m_session->nominalSchema().tableHandle( FK_TABLE ).dataEditor();
- std::string updateAction = "KEY = KEY + :offset";
- coral::AttributeList updateData ATLAS_THREAD_SAFE; // Not shared, ok
- updateData.extend<long long>("offset");
- updateData[0].data<long long>() = 1;
- //long rowsUpdated =
- keyeditor.updateRows( updateAction, "", updateData );
- //std::cout << " Updated " << rowsUpdated << " rows" << std::endl;
-
- coral::IQuery* query = m_session->nominalSchema().tableHandle(FK_TABLE).newQuery();
- query->addToOutputList("KEY");
- coral::ICursor& cursor = query->execute();
- long long key = -1;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- key = row0[0].data<long long>();
- if (m_verbose) std::cout << " KEY = " << key << std::endl;
- }
- transactionCommit();
- return key;
-}
-
-
-
-
-
-/** Template to create a table for variable columnName.
- Works only for simple types (one value to save)
-*/
-template <typename T>
-void PixCoralClient::createTable(){
-
- transactionStartUpdate();
-
- std::string PIXEL_TABLE_DATA=m_pixeltable+"_"+tableTypeName<T>();
-
- if (!m_session->nominalSchema().existsTable(PIXEL_TABLE_DATA)) {
- if (m_verbose) {
- std::cout << "\nCOOLCORAL Client: Creating table: " << PIXEL_TABLE_DATA <<" for ";
- try {
- std::cout <<tableTypeName<T>() << std::endl;
- } catch (const coral::AttributeListException&) {
- std::cout <<typeid(T).name() << std::endl;
- }
- }
-
- // Create the table
- coral::TableDescription pixel_columns( "SchemaDefinition_PIXEL" );
- pixel_columns.setName( PIXEL_TABLE_DATA );
- pixel_columns.insertColumn("FK", coral::AttributeSpecification::typeNameForType<long long>());
- pixel_columns.insertColumn("CONNECTIVITY", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 100, /*fixed_size=*/ false);
- pixel_columns.insertColumn("VARIABLE", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 100, /*fixed_size=*/ false);
-
- if (typeid(T)==typeid(CAN::AverageResult_t)) {
- pixel_columns.insertColumn("N", coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("MEAN", coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("RMS", coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("LOW99", coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("UP99", coral::AttributeSpecification::typeNameForType<float>());
- } else if (typeid(T)==typeid(PixelMap_t)) {
- // A size > 4000 triggers the use of a CLOB object
- pixel_columns.insertColumn("VALUE", coral::AttributeSpecification::typeNameForType<std::string>(), /*size = */ 4001, /*fixed_size=*/ false);
- // added -- A.X.
- } else if (typeid(T)==typeid(PixelCoralClientUtils::PixelCalibData)) {
- pixel_columns.insertColumn("IDMOD",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("CHIP",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLD1",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLD2",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLD3",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLD4",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDLONG1",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDLONG2",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDLONG3",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDLONG4",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDGANGED1",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDGANGED2",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDGANGED3",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("THRESHOLDGANGED4",coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("Q2TOT1",coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("Q2TOT2",coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("Q2TOT3",coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("Q2TOTGANGED1",coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("Q2TOTGANGED2",coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("Q2TOTGANGED3",coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("TOTRES1",coral::AttributeSpecification::typeNameForType<float>());
- pixel_columns.insertColumn("TOTRES2",coral::AttributeSpecification::typeNameForType<float>());
- } else {
- pixel_columns.insertColumn("VALUE", coral::AttributeSpecification::typeNameForType<T>());
- }
-
- //set the foreign key
- pixel_columns.createForeignKey(tableTypeName<T>()+"_FK","FK",m_pixeltable,"FK");
- // create indices
- pixel_columns.createIndex(tableTypeName<T>()+"_CONNECTIVITY_IDX", "CONNECTIVITY");
- pixel_columns.createIndex(tableTypeName<T>()+"_VARIABLE_IDX", "VARIABLE");
- pixel_columns.setNotNullConstraint ( "CONNECTIVITY" );
- pixel_columns.setNotNullConstraint ( "VARIABLE" );
-
- // Create the actual table
- try {
- //coral::ITable& table =
- m_session->nominalSchema().createTable( pixel_columns );
- } catch (coral::TableAlreadyExistingException & ex) {
- //Must have been created in parallel
- }
- }
-
- transactionCommit();
-}
-
-template <class T>
-std::string valueQuote() {
- return std::string();
-}
-
-template <>
-std::string valueQuote<std::string>() {
- return std::string("'");
-}
-
-template <class T>
-void createCondition(const std::vector<T> &search_list,
- const std::string &table_name,
- const std::string &var_name,
- const std::string &bind_name,
- coral::AttributeList &attribut_list,
- std::string &condition,
- bool use_attr_list=false)
-{
- if (!search_list.empty()) {
- condition += table_name;
- condition += ".";
- condition += var_name;
-
- if (search_list.size()==1) {
- attribut_list.extend< T >( bind_name );
- assert(attribut_list.size()>0);
- attribut_list[attribut_list.size()-1].setValue( search_list.back() );
- condition += " = :";
- condition += bind_name;
- }
- else {
- if (use_attr_list) {
-
- condition += " in (";
-
- std::string sep=":";
- std::string sep2=",:";
-
- std::stringstream a_var_name;
- unsigned int counter=attribut_list.size();
- for(typename std::vector<T>::const_iterator iter=search_list.begin();
- iter != search_list.end();
- ++iter, ++counter) {
-
- a_var_name.clear();
- a_var_name << bind_name << counter;
- attribut_list.extend< T >( a_var_name.str() );
- attribut_list[counter].setValue< T >( *iter );
-
- condition += sep;
- condition += a_var_name.str();
- sep = sep2;
- }
- condition += ")";
- }
- else {
- condition += " in (";
- typename std::vector<T>::const_iterator iter=search_list.begin();
-
- std::string quote(valueQuote<T>());
- condition += quote;
- condition += *iter;
- condition += quote;
- for(;
- iter != search_list.end();
- ++iter) {
- condition += ',';
- condition += quote;
- condition += *iter;
- condition += quote;
- }
- condition += ")";
- }
- }
- }
-}
-
-
-enum EValueType {kValFloat,kValInt, kValUInt, kValBool, kValString, kValExtendedAverageValue, kValAverageValue, kNValueTypes};
-//---------------------------------------------------------------------------
-void PixCoralClient::getAnalysisResultsFromDB(std::vector<CAN::SerialNumber_t> analysis_id,
- const std::vector<std::string> &connName,
- IPixResultsDbListener &listener) {
-
- if (analysis_id.empty()) return;
- struct timeval start_time, end_time;
- int total_usecs;
- unsigned int n_rows=0;
-
- if (m_verbose) {
- std::cout << "\n COOLCORAL Client: " << m_pixeltable <<" Putting table content in AnalysisResultList for:";
- std::cout<<"\n analysis :" ;
- for (std::vector<CAN::SerialNumber_t>::const_iterator iter = analysis_id.begin();
- iter != analysis_id.end();
- ++iter) {
- std::cout << *iter;
- }
- std::cout << std::endl;
- gettimeofday(&start_time, NULL);
- }
-
- char *test=getenv("CANRESULTS_USE_ATTRL");
- bool use_attr_list=false;
- if (test && strcmp(test,"y")==0) {
- use_attr_list=true;
- }
-
- transactionStartReadOnly();
-
- // want to produce query :
- // select t1.ANAL_ID, t2.CONNECTIVITY, t2.VARIABLE, t2.VALUE from
- // (select ANAL_ID,FK from CALIB_ANAL where ANAL_ID = 1394 ) t1,
- // CALIB_ANAL_FLOAT t2 where (t2.FK=t1.FK);
-
- std::set<std::string> tables = m_session->nominalSchema().listTables();
- for ( std::set<std::string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
-
- if ((*tName).find(m_pixeltable+"_") != std::string::npos) {
- // only consider tables CALIB_ANAL_FLOAT etc. not CALIB_ANAL.
-
- // define output columns depending on the table type :
- // first identify table type
- std::string col_type;
- EValueType value_type=kNValueTypes;
- const coral::ITableDescription& tableDesc =
- m_session->nominalSchema().tableHandle(*tName).description();
-
- try {
- const coral::IColumn& colDesc = tableDesc.columnDescription("VALUE");
-
- col_type= colDesc.type();
- value_type=kNValueTypes;
- if (col_type == "float") {
- value_type = kValFloat;
- }
- else if (col_type == "int") {
- value_type=kValInt;
- }
- else if (col_type == "unsigned int") {
- value_type=kValUInt;
- }
- else if (col_type == "bool") {
- value_type=kValBool;
- }
- else if (col_type == "string") {
- value_type=kValString;
- }
- }
- catch(coral::InvalidColumnNameException &) {
-
- try {
- // check whether the columns exist
- tableDesc.columnDescription("N");
- tableDesc.columnDescription("MEAN");
- tableDesc.columnDescription("RMS");
- value_type = kValAverageValue;
- }
- catch(coral::InvalidColumnNameException &) {
- }
-
- try {
- // check whether the columns exist
- tableDesc.columnDescription("LOW99");
- tableDesc.columnDescription("UP99");
- value_type = kValExtendedAverageValue;
- }
- catch(coral::InvalidColumnNameException &) {
- }
-
- }
- if (value_type>=kNValueTypes) {
- std::cerr << "ERROR [CoralClient::getAnalysisResultsFromDB] Failed to identify value type for " << *tName << "."<< std::endl;
- continue;
- }
-
- // now define output columns
- std::unique_ptr<coral::IQuery> query( m_session->nominalSchema().newQuery() );
- if (!query.get()) {
- std::cerr << "ERROR [CoralClient::getAnalysisResultsFromDB] Failed to create queries for table " << *tName << "."<< std::endl;
- continue;
- }
- query->addToTableList(*tName, "V");
-
- query->addToOutputList("V.CONNECTIVITY");
- query->addToOutputList("V.VARIABLE");
-
- switch (value_type) {
- case kValAverageValue: {
- std::cerr << "ERROR [CoralClient::getAnalysisResultsFromDB] unsupported table " << *tName << std::endl;
- return;
- }
- case kValExtendedAverageValue: {
- query->addToOutputList("V.N");
- query->addToOutputList("V.MEAN");
- query->addToOutputList("V.RMS");
- query->addToOutputList("V.LOW99");
- query->addToOutputList("V.UP99");
- break;
- }
- default: {
- query->addToOutputList("V.VALUE");
- }
- }
-
- query->setRowCacheSize(2000);
-
- // select all entries which match the serial number and return the rod list key
- coral::IQueryDefinition& rod_list_query = query->defineSubQuery( "R" );
- rod_list_query.addToOutputList( "I.FK" ,"FK");
- rod_list_query.addToTableList("CALIB_ANAL","I");
-
- coral::AttributeList analysis_id_condition_inputs ATLAS_THREAD_SAFE; // Not shared, ok
- std::string analysis_id_condition;
- createCondition<CAN::SerialNumber_t>(analysis_id, "I","ANAL_ID","id",analysis_id_condition_inputs,analysis_id_condition,use_attr_list);
- rod_list_query.setCondition(analysis_id_condition, analysis_id_condition_inputs);
- query->addToTableList( "R" );
-
- // Get the list of columns
-
- // prepare the query condition
- coral::AttributeList condition_inputs ATLAS_THREAD_SAFE; // Not shared, ok
- std::string condition;
- condition = "R.FK = V.FK";
- if (!connName.empty() ) {
- condition+= " AND ";
- createCondition<std::string>(connName, "V","CONNECTIVITY","conn",condition_inputs, condition,use_attr_list);
- }
- query->setCondition(condition, condition_inputs);
- coral::ICursor& cursor = query->execute();
-
- while ( cursor.next() ) {
-
- const coral::AttributeList &row = cursor.currentRow();
- const std::string &conn = row[0].data<std::string>();
- const std::string &the_var_name (row[1].data<std::string>());
- n_rows++;
- if (m_verbose) std::cout<< " ("<<col_type << " -> " << value_type <<") =";
-
- switch (value_type) {
- case kValFloat: {
- if (m_verbose) std::cout << row[2].data<float>();
- listener.newValue( the_var_name, conn, row[2].data<float>() );
- break;
- }
- case kValInt: {
- if (m_verbose) std::cout << row[2].data<int>();
- listener.newValue( the_var_name, conn, static_cast<unsigned int>(row[2].data<int>()) );
- break;
- }
- case kValUInt: {
- if (m_verbose) std::cout << row[2].data<unsigned int>();
- listener.newValue( the_var_name, conn, static_cast<unsigned int>(row[2].data<unsigned int>()) );
- break;
- }
- case kValBool: {
- if (m_verbose) std::cout << row[2].data<bool>();
- listener.newValue( the_var_name, conn, row[2].data<bool>() );
- break;
- }
- case kValString: {
- if (m_verbose) std::cout << row[2].data<std::string>();
- listener.newValue( the_var_name, conn,CLOBtoPixelMap(row[2].data<std::string>()));
- break;
- }
- case kValExtendedAverageValue: {
- if (m_verbose) {
- std::cout<<" (avres)"
- << the_var_name
- <<"="<<row[2].data<int>()
- <<"/"<<row[3].data<float>()
- <<"/"<<row[4].data<float>()
- <<"/"<<row[5].data<float>()
- <<"/"<<row[6].data<float>();
- }
-
- CAN::AverageResult_t avres(row[2].data<int>(),row[3].data<float>(),row[4].data<float>(),row[5].data<float>(),row[6].data<float>());
- listener.newValue( the_var_name, conn, avres );
- break;
- }
- default:
- std::cerr << "ERROR [CoralClient::getAnalysisResultsFromDB] Unsupported column type " << col_type << std::endl;
- }
- if (m_verbose) std::cout<< std::endl;
- }
- }
- }
-
- transactionCommit();
-
- if (m_verbose) {
- std::cout << " Total " << n_rows << " analyses" << std::endl;
-
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- std::cout << " Total time was " << total_usecs << " usec" << std::endl;
- }
-}
-
-// helper function to store values into table rows.
-
-// all types
-template <typename T> inline void addValueToRow(coral::AttributeList &attribute_list, const T &value) {
- attribute_list["VALUE"].data<T>() = value;
-}
-
-template <typename T> inline void extendAttributeList(coral::AttributeList &attribute_list) {
- attribute_list.extend<T>("VALUE");
-}
-
-
-// special handling for AverageResult
-template <> inline void addValueToRow<CAN::AverageResult_t>(coral::AttributeList &attribute_list, const CAN::AverageResult_t &value) {
- attribute_list["N"].setValue((int)value.n());
- attribute_list["MEAN"].setValue(value.value(CAN::AverageResult_t::kMean));
- attribute_list["RMS"].setValue(value.value(CAN::AverageResult_t::kRMS));
- attribute_list["LOW99"].setValue(value.value(CAN::AverageResult_t::kLower99));
- attribute_list["UP99"].setValue(value.value(CAN::AverageResult_t::kUpper99));
-}
-
-template <> inline void extendAttributeList<CAN::AverageResult_t>(coral::AttributeList &attribute_list) {
- attribute_list.extend<int>("N");
- attribute_list.extend<float>("MEAN");
- attribute_list.extend<float>("RMS");
- attribute_list.extend<float>("LOW99");
- attribute_list.extend<float>("UP99");
-}
-
-
-// special handling for PixelMap_t
-template <> inline void addValueToRow<PixelMap_t> (coral::AttributeList &attribute_list, const PixelMap_t &value) {
- attribute_list["VALUE"].setValue(PixCoralClient::PixelMapToCLOB(value));
-}
-
-template <> inline void extendAttributeList<PixelMap_t>(coral::AttributeList &attribute_list) {
- attribute_list.extend<std::string>("VALUE");
-}
-
-
-// type name helper functions
-template <typename T> inline std::string typeName() {
- return coral::AttributeSpecification::typeNameForType<T>();
-}
-
-template <> inline std::string typeName<CAN::AverageResult_t>() {
- return std::string("CAN::AverageResult_t");
-}
-
-template <> inline std::string typeName<PixelMap_t>() {
- return std::string("PixelMap_t");
-}
-
-void emptyNamesErrorMessage(unsigned int empty_var_names, unsigned int empty_conn_names, const std::string &table_name)
-{
- if (empty_conn_names>0 || empty_var_names>0) {
- std::cerr << "ERROR [PixCoralClient::fillTable] Tried to fill ";
- if (empty_var_names>0) {
- std::cerr << empty_var_names << " result(s) without variable name ";
- if (empty_conn_names>0) {
- std::cerr << "and ";
- }
- }
- if (empty_conn_names>0) {
- std::cerr << empty_conn_names << " result(s) without connectivity name ";
- }
- std::cerr << " into " << table_name << std::endl;
- }
-}
-
-/** Template to fill a table with analysis results.
- Works only for simple types (one value to save)
-*/
-template <typename T>
-int PixCoralClient::fillTable(long long fk, CAN::AnalysisResultList_t *results){
-
- if (m_verbose) std::cout << "\nCOOLCORAL Client: fill table for type "<< tableTypeName<T>() << std::endl;
-
- transactionStartUpdate();
-
- int nrows = 0;
-
- std::string table_name = m_pixeltable+"_"+tableTypeName<T>();
- unsigned int empty_var_names=0;
- unsigned int empty_conn_names=0;
- for (typename std::map<std::string, std::map<std::string, T> >::const_iterator iter=results->begin<T>();
- iter != results->end<T>();
- ++iter) {
-
- if (iter->first.empty()) {
- empty_var_names++;
- continue;
- }
-
- std::string tname = iter->first;
- if (m_verbose) std::cout << " Filling table " << table_name << " for variable " << tname << std::endl;
- coral::ITableDataEditor& pixel_editor_2 = m_session->nominalSchema().tableHandle(table_name).dataEditor();
- coral::AttributeList pixel_row_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_row_2.extend<long long>("FK");
- pixel_row_2.extend<std::string>("CONNECTIVITY");
- pixel_row_2.extend<std::string>("VARIABLE");
- // pixel_row_2.extend<T>("VALUE");
- extendAttributeList<T>(pixel_row_2);
- {
- std::unique_ptr<coral::IBulkOperation> pixel_bulk_2(pixel_editor_2.bulkInsert(pixel_row_2,iter->second.size()));
- for (typename std::map<std::string, T >::const_iterator val_iter=iter->second.begin();
- val_iter != iter->second.end();
- ++val_iter) {
-
- if (val_iter->first.empty()) {
- empty_conn_names++;
- continue;
- }
-
- pixel_row_2["FK"].data<long long>() = fk;
- pixel_row_2["CONNECTIVITY"].data<std::string>() = val_iter->first;
- pixel_row_2["VARIABLE"].data<std::string>() = tname;
- // pixel_row_2["VALUE"].data<T>() = val_iter->second;
- addValueToRow(pixel_row_2, val_iter->second);
- ++nrows;
- pixel_bulk_2->processNextIteration();
- }
- pixel_bulk_2->flush();
- }
- }
-
- if (empty_conn_names>0 || empty_var_names>0) {
- emptyNamesErrorMessage(empty_var_names, empty_conn_names, table_name);
- }
-
- transactionCommit();
- return nrows;
-}
-
-
-
-// /** Fill a table with analysis results of type AverageResult_t.
-// Couldn't use the templated fillTable<T> above because the object
-// structure is different...
-// */
-// int PixCoralClient::fillTableAverageResult(long long fk, CAN::AnalysisResultList_t *results){
-// if (m_verbose) std::cout << "\nCOOLCORAL Client: fill table for CAN::AverageResult_t" << std::endl;
-// int nrows = 0;
-// transactionStartUpdate();
-// for (std::map<std::string, std::map<std::string, CAN::AverageResult_t> >::const_iterator iter=results->begin<CAN::AverageResult_t>();
-// iter != results->end<CAN::AverageResult_t>();
-// iter ++) {
-// if (m_verbose) std::cout << " Filling table " << m_pixeltable+"_AVRES" << std::endl;
-// coral::ITableDataEditor& pixel_editor_2 = m_session->nominalSchema().tableHandle(m_pixeltable+"_AVRES").dataEditor();
-// coral::AttributeList pixel_row_2;
-// pixel_editor_2.rowBuffer(pixel_row_2);
-// coral::IBulkOperation* pixel_bulk_2= pixel_editor_2.bulkInsert(pixel_row_2,iter->second.size());
-// for (std::map<std::string, CAN::AverageResult_t >::const_iterator val_iter=iter->second.begin();
-// val_iter != iter->second.end();
-// val_iter ++) {
-// pixel_row_2["FK"].setValue <long long> (fk);
-// pixel_row_2["CONNECTIVITY"].setValue <std::string> (val_iter->first);
-// pixel_row_2["VARIABLE"].setValue <std::string> (iter->first);
-// pixel_row_2["N"].setValue((int)val_iter->second.n());
-// pixel_row_2["MEAN"].setValue(val_iter->second.value(CAN::AverageResult_t::kMean));
-// pixel_row_2["RMS"].setValue(val_iter->second.value(CAN::AverageResult_t::kRMS));
-// pixel_row_2["LOW99"].setValue(val_iter->second.value(CAN::AverageResult_t::kLower99));
-// pixel_row_2["UP99"].setValue(val_iter->second.value(CAN::AverageResult_t::kUpper99));
-// ++nrows;
-// pixel_bulk_2->processNextIteration();
-// }
-// pixel_bulk_2->flush();
-// delete pixel_bulk_2;
-// }
-// transactionCommit();
-// return nrows;
-// }
-
-
-
-// /** Fill a table with analysis results of type PixelMap_t.
-// Couldn't use the templated fillTable<T> above because the CLOB
-// has to be constructed first.
-// */
-// int PixCoralClient::fillTableSpecialPixelMap(long long fk, CAN::AnalysisResultList_t *results){
-// if (m_verbose) std::cout << "\nCOOLCORAL Client: fill table for PixelMap_t" << std::endl;
-// int nrows = 0;
-// transactionStartUpdate();
-// for (std::map<std::string, std::map<std::string, PixelMap_t> >::const_iterator iter=results->begin<PixelMap_t>();
-// iter != results->end<PixelMap_t>();
-// iter ++) {
-// if (m_verbose) std::cout << " Filling table " << m_pixeltable+"_SPECIALPIXELS" << std::endl;
-// coral::ITableDataEditor& pixel_editor_2 = m_session->nominalSchema().tableHandle(m_pixeltable+"_SPECIALPIXELS").dataEditor();
-// coral::AttributeList pixel_row_2;
-// pixel_editor_2.rowBuffer(pixel_row_2);
-// coral::IBulkOperation* pixel_bulk_2= pixel_editor_2.bulkInsert(pixel_row_2,iter->second.size());
-// for (std::map<std::string, PixelMap_t >::const_iterator val_iter=iter->second.begin();
-// val_iter != iter->second.end();
-// val_iter ++) {
-// pixel_row_2["FK"].setValue <long long> (fk);
-// pixel_row_2["CONNECTIVITY"].setValue <std::string> (val_iter->first);
-// pixel_row_2["VARIABLE"].setValue <std::string> (iter->first);
-// pixel_row_2["VALUE"].setValue(PixelMapToCLOB(val_iter->second));
-// ++nrows;
-// pixel_bulk_2->processNextIteration();
-// }
-// pixel_bulk_2->flush();
-// delete pixel_bulk_2;
-// }
-// transactionCommit();
-// return nrows;
-// }
-
-
-
-/** Fill a table with PixelCalibData -- A.X.
- Couldn't use the templated fillTable<T> above because the object
- structure is different...
-*/
-int PixCoralClient::fillTablePixelCalibData(long long fk, const char* option){
- if (m_verbose) std::cout << "\nCOOLCORAL Client: fill table for PixelCoralClientUtils::PixelCalibData" << std::endl;
-
- const char* filename = strstr(option,"file:");
- if (filename==0) {
- std::cout << "incorrect option (no file:)" << std::endl;
- return 0;
- }
-
- std::ifstream in(filename+5);
- if (!in.is_open()) {
- std::cout << "could not open calibration file" << std::endl;
- return 0;
- }
-
- int nrows = 0;
- transactionStartUpdate();
-
- {
- coral::ITableDataEditor& pixel_editor_2 = m_session->nominalSchema().tableHandle(m_pixeltable+"_PCD").dataEditor();
- coral::AttributeList pixel_row_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_editor_2.rowBuffer(pixel_row_2);
- int mysize = 1;
- coral::IBulkOperation* pixel_bulk_2= pixel_editor_2.bulkInsert(pixel_row_2,mysize);
-
- while (in) {
- int idmod; in >> idmod;
- if (in.eof()) break;
-
- bool ok = true;
- for (int i = 0; i<16; ++i) {
- char dummy; in >> dummy;
- if (dummy!='I') { ok = false; break; }
- int idchip; in >> idchip;
- if (idchip!=i) { ok = false; break; }
-
- pixel_row_2["FK"].setValue <long long> (fk);
- pixel_row_2["IDMOD"].setValue <int> (idmod);
- pixel_row_2["CHIP"].setValue <int> (idchip);
- int thres, sigma, noise, timewalk;
- in >> thres >> sigma >> noise >> timewalk;
- pixel_row_2["THRESHOLD1"].setValue <int> (thres);
- pixel_row_2["THRESHOLD2"].setValue <int> (sigma);
- pixel_row_2["THRESHOLD3"].setValue <int> (noise);
- pixel_row_2["THRESHOLD4"].setValue <int> (timewalk);
- in >> thres >> sigma >> noise >> timewalk;
- pixel_row_2["THRESHOLDLONG1"].setValue <int> (thres);
- pixel_row_2["THRESHOLDLONG2"].setValue <int> (sigma);
- pixel_row_2["THRESHOLDLONG3"].setValue <int> (noise);
- pixel_row_2["THRESHOLDLONG4"].setValue <int> (timewalk);
- in >> thres >> sigma >> noise >> timewalk;
- pixel_row_2["THRESHOLDGANGED1"].setValue <int> (thres);
- pixel_row_2["THRESHOLDGANGED2"].setValue <int> (sigma);
- pixel_row_2["THRESHOLDGANGED3"].setValue <int> (noise);
- pixel_row_2["THRESHOLDGANGED4"].setValue <int> (timewalk);
- float A, E, C;
- in >> A >> E >> C;
- pixel_row_2["Q2TOT1"].setValue <float> (A);
- pixel_row_2["Q2TOT2"].setValue <float> (E);
- pixel_row_2["Q2TOT3"].setValue <float> (C);
- in >> A >> E >> C;
- pixel_row_2["Q2TOTGANGED1"].setValue <float> (A);
- pixel_row_2["Q2TOTGANGED2"].setValue <float> (E);
- pixel_row_2["Q2TOTGANGED3"].setValue <float> (C);
- float p1, p2;
- in >> p1 >> p2;
- pixel_row_2["TOTRES1"].setValue <float> (p1);
- pixel_row_2["TOTRES2"].setValue <float> (p2);
-
- ++nrows;
- pixel_bulk_2->processNextIteration();
- }
- if (!ok) break;
- }
- if (m_verbose) std::cout << "PixelCalibData: loaded " << nrows << " chips" << std::endl;
-
- pixel_bulk_2->flush();
- delete pixel_bulk_2;
- }
- transactionCommit();
- return nrows;
-}
-
-
-
-//---------------------------------------------------------------------------
-/** Get results for a particular analysis ID
- and fill an AnalysisResultList_t container
- Optionally get only variable "varname" and/or connectivity object connName
- */
-CAN::AnalysisResultList_t PixCoralClient::getAnalysisResultsFromDB(CAN::SerialNumber_t anal_id, const std::string& varname, const std::string& connName){
-
- if (m_verbose) {
- std::cout << "\n COOLCORAL Client: " << m_pixeltable <<" Putting table content in AnalysisResultList for analysis " << anal_id;
- if (varname != "") std::cout<<", variable " << varname;
- if (connName != "") std::cout<<", object " << connName;
- std::cout<< std::endl;
- }
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- transactionStartReadOnly();
-
- CAN::AnalysisResultList_t anal_results;
-
- // Get all entries for anal_id
- coral::IQuery* query = m_session->nominalSchema().tableHandle(m_pixeltable).newQuery();
- query->addToOutputList("ANAL_ID");
- query->defineOutputType("ANAL_ID",coral::AttributeSpecification::typeNameForType<CAN::SerialNumber_t>());
- query->addToOutputList("DATE");
- query->defineOutputType("DATE",coral::AttributeSpecification::typeNameForType<time_t>());
- query->addToOutputList("FK");
- std::string pixel_cond = m_pixeltable+".ANAL_ID = :analid";
- coral::AttributeList pixel_condData ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData.extend<CAN::SerialNumber_t>( "analid" );
- query->setCondition( pixel_cond, pixel_condData);
- pixel_condData[0].data<CAN::SerialNumber_t>() = anal_id;
- coral::ICursor& cursor = query->execute();
-
- int nRows = 0;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- if (m_verbose) {
- std::time_t timet = GMTtoLocalTime(row0[1].data<time_t>());
- char buf[32];
- std::string time = ctime_r(&timet, buf);
- std::cout << " ANAL_ID = " << row0[0].data<CAN::SerialNumber_t>()
- << " DATE = " << time.substr(0,time.size()-1)
- << " FK = " << row0[2].data<long long>() << std::endl;
- }
- //row0.toOutputStream(std::cout)<<endl;
- ++nRows;
- // Show the variables
- std::set<std::string> tables = m_session->nominalSchema().listTables();
- for ( std::set<std::string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
- if ((*tName).find(m_pixeltable+"_") != std::string::npos) {
- coral::IQuery* query_2 = m_session->nominalSchema().tableHandle(*tName).newQuery();
-
- // Get the list of columns
- const coral::ITableDescription& tableDesc =
- m_session->nominalSchema().tableHandle(*tName).description();
- int NumCol = tableDesc.numberOfColumns();
- std::vector<std::string> colName; colName.resize(NumCol);
- std::vector<std::string> colType; colType.resize(NumCol);
- //if (m_verbose) std::cout << "\n Name: "<< *tName << std::endl;
- for(int i=0; i<NumCol; ++i){
- const coral::IColumn& colDesc = tableDesc.columnDescription(i);
- colName[i] = colDesc.name();
- colType[i] = colDesc.type();
- query_2->addToOutputList(colDesc.name());
- //if (m_verbose) std::cout <<" "<<i<<": "<< colName[i] <<" ("<< colType[i]<<")"<< std::endl;
- }
-
- // Second query to get entries in each table
- std::string pixel_cond_2 = (*tName)+".FK = :analfk";
- coral::AttributeList pixel_condData_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData_2.extend<long long>( "analfk" );
- pixel_condData_2[0].data<long long>() = row0[2].data<long long>();
- if (varname != "") {
- pixel_cond_2 += " AND "+(*tName)+".VARIABLE = :var";
- pixel_condData_2.extend<std::string>("var");
- pixel_condData_2["var"].data<std::string>() = varname;
- }
- if (connName != "") {
- pixel_cond_2 += " AND "+(*tName)+".CONNECTIVITY = :conn";
- pixel_condData_2.extend<std::string>("conn");
- pixel_condData_2["conn"].data<std::string>() = connName;
- }
- query_2->setCondition( pixel_cond_2, pixel_condData_2);
- coral::ICursor& cursor_2 = query_2->execute();
- while ( cursor_2.next() ) {
- const coral::AttributeList &row0_2 = cursor_2.currentRow();
- const std::string conn = row0_2[1].data<std::string>();
- if (m_verbose) std::cout << " conn = " << conn;
- if (NumCol == 4) { // single value
- if (m_verbose) std::cout<< " ("<<colType[3]<<")"<<row0_2[2].data<std::string>()<<"=";
- if (colType[3] == "float") {
- if (m_verbose) std::cout << row0_2[3].data<float>();
- anal_results.addValue<float>(row0_2[2].data<std::string>(),conn,row0_2[3].data<float>());
- } else if (colType[3] == "int") {
- if (m_verbose) std::cout << row0_2[3].data<int>();
- anal_results.addValue<unsigned int>(row0_2[2].data<std::string>(),conn,row0_2[3].data<int>());
- } else if (colType[3] == "bool") {
- if (m_verbose) std::cout << row0_2[3].data<bool>();
- anal_results.addValue<bool>(row0_2[2].data<std::string>(),conn,row0_2[3].data<bool>());
- } else if (colType[3] == "string") {
- if (m_verbose) std::cout << row0_2[3].data<std::string>();
- anal_results.addValue<PixelMap_t>(row0_2[2].data<std::string>(),conn,CLOBtoPixelMap(row0_2[3].data<std::string>()));
- }
-
- } else { //AverageResult_t
- if (m_verbose) std::cout<<" (avres)"<<row0_2[2].data<std::string>()<<"="<<row0_2[3].data<int>()<<"/"<<row0_2[4].data<float>()<<"/"<<row0_2[5].data<float>()<<"/"<<row0_2[6].data<float>()<<"/"<<row0_2[7].data<float>();
- CAN::AverageResult_t avres(row0_2[3].data<int>(),row0_2[4].data<float>(),row0_2[5].data<float>(),row0_2[6].data<float>(),row0_2[7].data<float>());
- anal_results.addValue<CAN::AverageResult_t>(row0_2[2].data<std::string>(),conn,avres);
- }
- if (m_verbose) std::cout<< std::endl;
- }
- delete query_2;
- }
- }
- }
- delete query;
-
- transactionCommit();
-
- if (m_verbose) printf(" Total %d analyses\n", nRows);
-
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << " Total time was " << total_usecs << " usec" << std::endl;
- return anal_results;
-}
-
-
-
-
-
-
-//---------------------------------------------------------------------------
-/** Get results for a particular analysis ID and a vector of connectivity
- objects connName and fill an AnalysisResultList_t container
- Optionally get only variable "varname"
- */
-CAN::AnalysisResultList_t PixCoralClient::getAnalysisResultsFromDB(CAN::SerialNumber_t anal_id, const std::vector<std::string> &connName, const std::string& varname){
-
- if (m_verbose) {
- std::cout << "\n COOLCORAL Client: " << m_pixeltable <<" Putting table content in AnalysisResultList for analysis " << anal_id;
- if (varname != "") std::cout<<", variable " << varname;
- if (!connName.empty()) {
- std::cout<<", objects ";
- for (std::vector<std::string>::const_iterator it=connName.begin();
- it != connName.end(); ++it)
- std::cout << *it <<", ";
- }
- std::cout<< std::endl;
- }
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- transactionStartReadOnly();
-
- CAN::AnalysisResultList_t anal_results;
-
- // Get all entries for anal_id
- coral::IQuery* query = m_session->nominalSchema().tableHandle(m_pixeltable).newQuery();
- query->addToOutputList("ANAL_ID");
- query->defineOutputType("ANAL_ID",coral::AttributeSpecification::typeNameForType<CAN::SerialNumber_t>());
- query->addToOutputList("DATE");
- query->defineOutputType("DATE",coral::AttributeSpecification::typeNameForType<time_t>());
- query->addToOutputList("FK");
- std::string pixel_cond = m_pixeltable+".ANAL_ID = :analid";
- coral::AttributeList pixel_condData ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData.extend<CAN::SerialNumber_t>( "analid" );
- query->setCondition( pixel_cond, pixel_condData);
- pixel_condData[0].data<CAN::SerialNumber_t>() = anal_id;
- coral::ICursor& cursor = query->execute();
-
- int nRows = 0;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- if (m_verbose) {
- std::time_t timet = GMTtoLocalTime(row0[1].data<time_t>());
- char buf[32];
- std::string time = ctime_r(&timet, buf);
- std::cout << " ANAL_ID = " << row0[0].data<CAN::SerialNumber_t>()
- << " DATE = " << time.substr(0,time.size()-1)
- << " FK = " << row0[2].data<long long>() << std::endl;
- }
- //row0.toOutputStream(std::cout)<<endl;
- ++nRows;
- // Show the variables
- std::set<std::string> tables = m_session->nominalSchema().listTables();
- for ( std::set<std::string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
- if ((*tName).find(m_pixeltable+"_") != std::string::npos) {
- coral::IQuery* query_2 = m_session->nominalSchema().tableHandle(*tName).newQuery();
-
- // Get the list of columns
- const coral::ITableDescription& tableDesc =
- m_session->nominalSchema().tableHandle(*tName).description();
- int NumCol = tableDesc.numberOfColumns();
- std::vector<std::string> colName; colName.resize(NumCol);
- std::vector<std::string> colType; colType.resize(NumCol);
- for(int i=0; i<NumCol; ++i){
- const coral::IColumn& colDesc = tableDesc.columnDescription(i);
- colName[i] = colDesc.name();
- colType[i] = colDesc.type();
- query_2->addToOutputList(colDesc.name());
- //if (m_verbose) std::cout <<" "<<i<<": "<< colName[i] <<" ("<< colType[i]<<")"<< std::endl;
- }
-
- // Second query to get entries in each table
- std::string pixel_cond_2 = (*tName)+".FK = :analfk";
- coral::AttributeList pixel_condData_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData_2.extend<long long>( "analfk" );
- pixel_condData_2[0].data<long long>() = row0[2].data<long long>();
- if (varname != "") {
- pixel_cond_2 += " AND "+(*tName)+".VARIABLE = :var";
- pixel_condData_2.extend<std::string>("var");
- pixel_condData_2["var"].data<std::string>() = varname;
- }
- if (!connName.empty()) {
- // now restrict to certain connectivity names.
- pixel_cond_2 += " AND (";
- for (std::vector<std::string>::const_iterator conn_iter=connName.begin();
- conn_iter != connName.end();
- ++conn_iter) {
- unsigned int counter=pixel_condData_2.size();
- std::stringstream var_name;
- var_name << "conn" << counter;
- pixel_condData_2.extend<std::string>( var_name.str() );
- assert( pixel_condData_2.size() > counter ); // sanity check
- pixel_condData_2[counter].data<std::string>() = *conn_iter;
-
- pixel_cond_2 += *tName;
- pixel_cond_2 += ".CONNECTIVITY = :";
- pixel_cond_2 += var_name.str();
- if (connName.end()-conn_iter > 1 ) {
- pixel_cond_2 += " OR ";
- }
- }
- pixel_cond_2 += ")";
- }
- query_2->setCondition( pixel_cond_2, pixel_condData_2);
- coral::ICursor& cursor_2 = query_2->execute();
- while ( cursor_2.next() ) {
- const coral::AttributeList &row0_2 = cursor_2.currentRow();
- const std::string conn = row0_2[1].data<std::string>();
- if (m_verbose) std::cout << " conn = " << conn;
- if (NumCol == 4) { // single value
- if (m_verbose) std::cout<< " ("<<colType[3]<<")"<<row0_2[2].data<std::string>()<<"=";
- if (colType[3] == "float") {
- if (m_verbose) std::cout << row0_2[3].data<float>();
- anal_results.addValue<float>(row0_2[2].data<std::string>(),conn,row0_2[3].data<float>());
- } else if (colType[3] == "int") {
- if (m_verbose) std::cout << row0_2[3].data<int>();
- anal_results.addValue<unsigned int>(row0_2[2].data<std::string>(),conn,row0_2[3].data<int>());
- } else if (colType[3] == "bool") {
- if (m_verbose) std::cout << row0_2[3].data<bool>();
- anal_results.addValue<bool>(row0_2[2].data<std::string>(),conn,row0_2[3].data<bool>());
- } else if (colType[3] == "string") {
- if (m_verbose) std::cout << row0_2[3].data<std::string>();
- anal_results.addValue<PixelMap_t>(row0_2[2].data<std::string>(),conn,CLOBtoPixelMap(row0_2[3].data<std::string>()));
- }
-
- } else { //AverageResult_t
- if (m_verbose) std::cout<<" (avres)"<<row0_2[2].data<std::string>()<<"="<<row0_2[3].data<int>()<<"/"<<row0_2[4].data<float>()<<"/"<<row0_2[5].data<float>()<<"/"<<row0_2[6].data<float>()<<"/"<<row0_2[7].data<float>();
- CAN::AverageResult_t avres(row0_2[3].data<int>(),row0_2[4].data<float>(),row0_2[5].data<float>(),row0_2[6].data<float>(),row0_2[7].data<float>());
- anal_results.addValue<CAN::AverageResult_t>(row0_2[2].data<std::string>(),conn,avres);
- }
- if (m_verbose) std::cout<< std::endl;
- }
- delete query_2;
- }
- }
- }
- delete query;
-
- transactionCommit();
-
- if (m_verbose) printf(" Total %d analyses\n", nRows);
-
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << " Total time was " << total_usecs << " usec" << std::endl;
- return anal_results;
-}
-
-
-/** access calibration data using tag / revision -- A.X.
- */
-void PixCoralClient::getCalibrationDataFromDB(const char* option){
- if (m_verbose) {
- std::cout << "\n COOLCORAL Client: " << m_pixeltable << " loading calibration data using option " << option << std::endl;
- }
-
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- transactionStartReadOnly();
-
- // Get all entries for anal_id
- coral::IQuery* query = m_session->nominalSchema().tableHandle(m_pixeltable).newQuery();
-
- query->addToOutputList("TAG");
- query->defineOutputType("TAG",coral::AttributeSpecification::typeNameForType<std::string>());
- query->addToOutputList("REVISION");
- query->defineOutputType("REVISION",coral::AttributeSpecification::typeNameForType<int>());
- query->addToOutputList("SOURCES");
- query->defineOutputType("SOURCES",coral::AttributeSpecification::typeNameForType<std::string>());
- query->addToOutputList("DATE");
- query->defineOutputType("DATE",coral::AttributeSpecification::typeNameForType<time_t>());
- query->addToOutputList("FK");
-
- // parse option
- std::string tag("");
- std::string revision("");
- std::string sources("");
- std::string delimiters(", ");
- std::string str(option);
- std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
- std::string::size_type pos = str.find_first_of(delimiters, lastPos);
- while (std::string::npos != pos || std::string::npos != lastPos) {
- if (str.substr(lastPos,4)=="tag:")
- tag = str.substr(lastPos+4, pos-lastPos-4);
- if (str.substr(lastPos,9)=="revision:")
- revision = str.substr(lastPos+9, pos-lastPos-9);
- if (str.substr(lastPos,8)=="sources:")
- sources = str.substr(lastPos+8, pos-lastPos-8);
- lastPos = str.find_first_not_of(delimiters, pos);
- pos = str.find_first_of(delimiters, lastPos);
- }
-
- coral::AttributeList pixel_condData ATLAS_THREAD_SAFE; // Not shared, ok
- std::string pixel_cond = m_pixeltable+".TAG = :tag";
- pixel_condData.extend<std::string>( "tag" );
- pixel_condData[0].data<std::string>() = tag;
- // can make it conditional (e.g. if revision!="")
- pixel_cond += " AND "+m_pixeltable+".REVISION = :revision";
- pixel_condData.extend<int>( "revision" );
- pixel_condData["revision"].data<int>() = atoi(revision.c_str());
- query->setCondition( pixel_cond, pixel_condData);
- coral::ICursor& cursor = query->execute();
-
- int nRows = 0;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- if (m_verbose) {
- std::time_t timet = GMTtoLocalTime(row0[3].data<time_t>());
- char buf[32];
- std::string time = ctime_r(&timet, buf);
- std::cout << " TAG = " << row0[0].data<std::string>()
- << " REVISION = " << row0[1].data<int>()
- << " SOURCES = " << row0[2].data<std::string>()
- << " DATE = " << time.substr(0,time.size()-1)
- << " FK = " << row0[4].data<long long>() << std::endl;
- }
- //row0.toOutputStream(std::cout)<<endl;
- ++nRows;
- // Show the variables
- std::set<std::string> tables = m_session->nominalSchema().listTables();
- for ( std::set<std::string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
- if ((*tName).find(m_pixeltable+"_") != std::string::npos) {
- if (m_verbose) {
- std::cout << "found table " << (*tName) << std::endl;
- }
-
- coral::IQuery* query_2 = m_session->nominalSchema().tableHandle(*tName).newQuery();
-
- // Get the list of columns
- const coral::ITableDescription& tableDesc =
- m_session->nominalSchema().tableHandle(*tName).description();
- int NumCol = tableDesc.numberOfColumns();
- std::vector<std::string> colName; colName.resize(NumCol);
- std::vector<std::string> colType; colType.resize(NumCol);
- for(int i=0; i<NumCol; ++i){
- const coral::IColumn& colDesc = tableDesc.columnDescription(i);
- colName[i] = colDesc.name();
- colType[i] = colDesc.type();
- query_2->addToOutputList(colDesc.name());
- if (m_verbose) std::cout <<" "<<i<<": "<< colName[i] <<" ("<< colType[i]<<")"<< std::endl;
- }
-
- // Second query to get entries in each table
- std::string pixel_cond_2 = (*tName)+".FK = :fk";
- coral::AttributeList pixel_condData_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData_2.extend<long long>( "fk" );
- pixel_condData_2[0].data<long long>() = row0[4].data<long long>();
- query_2->setCondition( pixel_cond_2, pixel_condData_2);
- coral::ICursor& cursor_2 = query_2->execute();
- // TO BE FIXED: the whole thing should not go to a single pcd :)
- PixelCoralClientUtils::PixelCalibData pcd;
- while ( cursor_2.next() ) {
- const coral::AttributeList &row0_2 = cursor_2.currentRow();
- //int ix = 3;
- //int idmod = row0_2[ix++].data<int>();
- int ix = 4;
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData pcsd;
- int idchip = row0_2[ix++].data<int>();
- pcsd.setChipID(idchip);
- int iv[4];
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(0,iv[0],iv[1],iv[2],iv[3]);
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(1,iv[0],iv[1],iv[2],iv[3]);
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(2,iv[0],iv[1],iv[2],iv[3]);
- float fv[3];
- for (int m=0; m<3; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setQ2Tot(0,fv[0],fv[1],fv[2]);
- for (int m=0; m<3; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setQ2Tot(2,fv[0],fv[1],fv[2]);
- for (int m=0; m<2; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setTotRes(fv[0],fv[1]);
- pcd.add(pcsd);
- }
- if (m_verbose) {
- pcd.print();
- }
- delete query_2;
- }
- }
- }
- delete query;
-
- transactionCommit();
-
- if (m_verbose) printf(" Total %d analyses\n", nRows);
-
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) std::cout << " Total time was " << total_usecs << " usec" << std::endl;
-}
-
-
-
-/** CORAL helper to start a transaction in readonly mode
- */
-void PixCoralClient::transactionStartReadOnly(){
- connect();
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(true /*ReadOnly*/);
-}
-
-
-
-/** CORAL helper to start a transaction in update mode
- */
-void PixCoralClient::transactionStartUpdate(){
- connect();
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(false /*update*/);
-}
-
-
-
-/** CORAL helper to commit changes at the end of a transaction
- */
-void PixCoralClient::transactionCommit(){
- if (m_session->transaction().isActive()) m_session->transaction().commit();
-}
-
-namespace PixA {
- /** Translate between chip and module coordinates.
- * copied from PixelDataContainer
- *
- * @authors Joern Grosse-Knetter <joern.grosse-knetter@uni-bonn.de>
- */
- class PixelCoord_t
- {
- public:
- static const int s_nChip = 16;
- static const int s_nPix = 2880;
- static const int s_nSpecialPix = 448;
- static const int s_nCol = 18;
- static const int s_nRow = 160;
-
- PixelCoord_t(int xval, int yval) {
- if(yval<s_nRow){ // chips 0-7
- m_row = yval;
- m_col = xval%s_nCol;
- m_chip = xval/s_nCol;
- } else{
- m_row = 2*s_nRow-1- yval;
- m_col = s_nCol-1 - xval%s_nCol;
- m_chip = s_nChip-1 - xval/s_nCol;
- }
- }
-
- PixelCoord_t(int chip, int col, int row) : m_chip(chip), m_col(col), m_row(row) {}
-
- int chip() const {return m_chip;}
- int col() const {return m_col;}
- int row() const {return m_row;}
-
- int pixel() const { return chip()*s_nPix+row()+s_nRow*col(); }
-
- int x() const {
-
- if(m_chip<s_nChip/2) {
- return m_chip*s_nCol+m_col;
- }
- else {
- return (s_nCol-1-m_col + s_nCol*(s_nChip-1-m_chip));
- }
-
- }
-
- int y() const {
- if (m_chip<s_nChip/2) {
- return m_row;
- }
- else {
- return 2*s_nRow-1-m_row;
- }
- }
-
- private:
- int m_chip;
- int m_col;
- int m_row;
- };
-
-
-
- unsigned int encodePixelID (unsigned int mod_column, unsigned int mod_row) {
- unsigned int chip = 0, column = 0, row = 0;
-
- PixelCoord_t pix(mod_column, mod_row);
- chip = pix.chip();
- column = pix.col();
- row = pix.row();
-
- return PixelCoralClientUtils::ModuleSpecialPixelMap::encodePixelID(chip,column,row);
-
- }
-
-}
-
-/**
- Converts a CAN::PixelMap_t object to a CLOB compatible with
- ModuleSpecialPixelMap
-*/
-std::string PixCoralClient::PixelMapToCLOB(const PixelMap_t & pixmap) {
- std::map<unsigned int, unsigned int> pixels;
- for (PixelMap_t::const_iterator it=pixmap.begin(); it != pixmap.end(); ++it) {
- pixels[PixA::encodePixelID((*it).first.first,(*it).first.second)] = (*it).second;
- }
- unsigned int module_status = 0;
- std::vector<unsigned int> chip_status;
- std::vector<std::vector<unsigned int> > column_pair_status;
- PixelCoralClientUtils::ModuleSpecialPixelMap special = PixelCoralClientUtils::ModuleSpecialPixelMap(pixels,module_status,chip_status,column_pair_status);
- special.markSpecialRegions();
- //std::cout<<"CLOB: "<<special.to_string()<<std::endl;;
- return special.to_string();
-}
-
-/**
- Converts a CLOB compatible with ModuleSpecialPixelMap to a
- CAN::PixelMap_t object
-*/
-PixelMap_t PixCoralClient::CLOBtoPixelMap(const std::string & clob) {
- PixelCoralClientUtils::ModuleSpecialPixelMap special;
- special.fill_from_string(clob);
- PixelMap_t pixels;
- //std::cout<<"CLOB content: "<<std::endl;
- unsigned int fe, col, row;
- for (PixelCoralClientUtils::ModuleSpecialPixelMap::const_iterator it=special.begin(); it != special.end(); ++it) {
- //std::cout<<" "<<it->first<<" "<<it->second<<" ";
- fe = it->first%16;
- col = (it->first >> 4)%32;
- row = (it->first>>9);
- //std::cout<<fe<<" "<<col<<"/"<<row<<std::endl;
- PixA::PixelCoord_t pixel_coord(fe, col, row);
- pixels[std::make_pair(pixel_coord.x(), pixel_coord.y())] = it->second;//CLA
- }
- if (special.moduleStatus() != 0) {
- unsigned int status = special.moduleStatus();
- // if (m_verbose) std::cout<<"Special module with status "<<status<<std::endl;
- for (unsigned int chip=0; chip<16; ++chip) {
- for (unsigned int c=0; c<18; ++c) {
- for (unsigned int r=0; r<160; ++r) {
- PixA::PixelCoord_t pixel_coord(chip, c, r);
- pixels[std::make_pair(pixel_coord.x(), pixel_coord.y())] = status;
-
- }
- }
- }
- } else if (special.hasSpecialChips()) {
- for (unsigned int chip=0; chip<16; ++chip) {
- unsigned int status = special.chipStatus(chip);
- if (status != 0) {
- //if (m_verbose) std::cout<<"Special chip "<<chip<<" with status "<<status<<std::endl;
- for (unsigned int c=0; c<18; ++c) {
- for (unsigned int r=0; r<160; ++r) {
- PixA::PixelCoord_t pixel_coord(chip, c, r);
- pixels[std::make_pair(pixel_coord.x(), pixel_coord.y())] = status;
- }
- }
- }
- }
- }
- if (special.hasSpecialColumnPairs()) {
- for (unsigned int chip=0; chip<16; ++chip) {
- if (special.hasSpecialColumnPairs(chip)) {
- for (unsigned int pair=0; pair<9; ++pair) {
- unsigned int status = special.columnPairStatus(chip,pair);
- if (status != 0) {
- // if (m_verbose) std::cout<<"Special pair "<<pair<<" on chip "<<chip<<" with status "<<status<<std::endl;
- for (int i=0; i<160; ++i) {
- PixA::PixelCoord_t pixel_coord(chip, pair*2, i);
- pixels[std::make_pair(pixel_coord.x(),pixel_coord.y())] = status;
- PixA::PixelCoord_t pixel_coord2(chip, pair*2+1, i);
- pixels[std::make_pair(pixel_coord2.x(),pixel_coord2.y())] = status;
- }
- }
- }
- }
- }
- }
-
- return pixels;
-}
-
-
-
-//------------------------------------------------
-/// Get value from PVSS archive
-//------------------------------------------------
-double PixCoralClient::get_value_from_PVSSarch(const std::string& element_name, const coral::TimeStamp &since, const coral::TimeStamp &until)
-{
- double result=0;
-
- transactionStartReadOnly();
-
- // Perform a query involving a subquery.
-
- coral::IQuery* query = m_session->nominalSchema().newQuery();
- query->addToOutputList( "A.ELEMENT_NAME", "NAME" );
- query->addToOutputList( "A.ALIAS", "ALIAS" );
- query->addToOutputList( "B.TS", "TS" );
- query->addToOutputList( "B.VALUE_NUMBER", "VALUE" );
-
- coral::IQueryDefinition& subQuery1 = query->defineSubQuery( "A" );
- subQuery1.addToOutputList( "ELEMENT_ID" );
- subQuery1.addToOutputList( "ELEMENT_NAME" );
- subQuery1.addToOutputList( "ALIAS" );
- subQuery1.addToTableList( "ELEMENTS" );
- coral::AttributeList cond1 ATLAS_THREAD_SAFE; // Not shared, ok
- cond1.extend<std::string>( "el_name" );
- subQuery1.setCondition( "ELEMENT_NAME = :el_name", cond1 );
- query->addToTableList( "A" );
-
- coral::IQueryDefinition& subQuery2 = query->defineSubQuery( "B" );
- subQuery2.addToOutputList( "ELEMENT_ID" );
- subQuery2.addToOutputList( "TS" );
- subQuery2.addToOutputList( "VALUE_NUMBER");
- subQuery2.addToTableList( "EVENTHISTORY" );
- query->addToTableList( "B" );
-
- coral::AttributeList time ATLAS_THREAD_SAFE; // Not shared, ok
- time.extend<coral::TimeStamp>( "since" );
- time.extend<coral::TimeStamp>( "until" );
-
- query->setCondition( "A.ELEMENT_ID = B.ELEMENT_ID AND B.TS > :since AND B.TS < :until" , time);
- query ->addToOrderList("B.TS DESC");
-
-
- cond1[0].data<std::string>() = element_name;
- time[0].data<coral::TimeStamp>() = since;
- time[1].data<coral::TimeStamp>() = until;
-
- coral::ICursor& cursor = query->execute();
- coral::AttributeList sel ATLAS_THREAD_SAFE; // Not shared, ok
- if ( cursor.next() ){ sel = cursor.currentRow();
-
- result = sel[3].data<double>();
- std::cout << "Element name = " << sel[0].data<std::string>() << std::endl;
- std::cout << "Alias = " << sel[1].data<std::string>() << std::endl;
- std::cout << "Value = " << result << std::endl;
-
-}
- // cursor.currentRow().toOutputStream( std::cout ) << std::endl;
-
- std::cout << "Result = " << result << std::endl;
-
- delete query;
- transactionCommit();
-
- return result;
-
-}
-
-//------------------------------------------------
-/// Get value from PVSS archive
-//------------------------------------------------
-double PixCoralClient::get_values_from_PVSSarch(const std::string& element_name, const coral::TimeStamp &since, const coral::TimeStamp &until){
-
- double result=0;
-
- transactionStartReadOnly();
-
- // Perform a query involving a subquery.
-
- coral::IQuery* query = m_session->nominalSchema().newQuery();
- query->addToOutputList( "A.ELEMENT_NAME", "NAME" );
- query->addToOutputList( "B.TS", "TS" );
- query->addToOutputList( "B.VALUE_NUMBER", "VALUE" );
-
- coral::IQueryDefinition& subQuery1 = query->defineSubQuery( "A" );
- subQuery1.addToOutputList( "ELEMENT_ID" );
- subQuery1.addToOutputList( "ELEMENT_NAME" );
- subQuery1.addToTableList( "ELEMENTS" );
- coral::AttributeList cond1 ATLAS_THREAD_SAFE; // Not shared, ok
- cond1.extend<std::string>( "el_name" );
- subQuery1.setCondition( "ELEMENT_NAME = :el_name", cond1 );
- query->addToTableList( "A" );
-
- coral::IQueryDefinition& subQuery2 = query->defineSubQuery( "B" );
- subQuery2.addToOutputList( "ELEMENT_ID" );
- subQuery2.addToOutputList( "TS" );
- subQuery2.addToOutputList( "VALUE_NUMBER");
- subQuery2.addToTableList( "EVENTHISTORY" );
- query->addToTableList( "B" );
-
- coral::AttributeList time ATLAS_THREAD_SAFE; // Not shared, ok
- time.extend<coral::TimeStamp>( "since" );
- time.extend<coral::TimeStamp>( "until" );
-
- query->setCondition( "A.ELEMENT_ID = B.ELEMENT_ID AND B.TS > :since AND B.TS < :until" , time);
- query ->addToOrderList("B.TS DESC");
-
-
- cond1[0].data<std::string>() = element_name;
- time[0].data<coral::TimeStamp>() = since;
- time[1].data<coral::TimeStamp>() = until;
-
- coral::ICursor& cursor = query->execute();
- coral::AttributeList sel ATLAS_THREAD_SAFE; // Not shared, ok
- // if ( cursor.next() ){
- while ( cursor.next() ){
- sel = cursor.currentRow();
- result = sel[2].data<double>();
- // cursor.currentRow().toOutputStream( std::cout ) << std::endl;
- std::cout << "Result = " << result << std::endl;
- }
-
- delete query;
- transactionCommit();
-
- return result;
- }
-
-//------------------------------------------------
-/// Get value from PVSS archive
-//------------------------------------------------
-void PixCoralClient::get_alias_from_PVSSarch(){
-
- transactionStartReadOnly();
-
- // Perform a query involving a subquery.
-
- coral::IQuery* query = m_session->nominalSchema().tableHandle("ELEMENTS").newQuery();
- query->addToOutputList( "ELEMENT_NAME");
- query->addToOutputList( "ALIAS");
-
- // query->setCondition( "A.ELEMENT_ID = B.ELEMENT_ID AND B.TS > :since AND B.TS < :until" , time);
- // query ->addToOrderList("B.TS DESC");
-
-
-// cond1[0].data<std::string>() = element_name;
-// time[0].data<coral::TimeStamp>() = since;
-// time[1].data<coral::TimeStamp>() = until;
-
- coral::ICursor& cursor = query->execute();
- coral::AttributeList sel ATLAS_THREAD_SAFE; // Not shared, ok
- // if ( cursor.next() ){
- std::cout << "NAME\t\t\t ALIAS" << std::endl;
- while ( cursor.next() ){
- sel = cursor.currentRow();
- std::string elname = sel[0].data<std::string>();
- std::string elalias = sel[1].data<std::string>();
-
-
- std::cout << elname << "\t\t\t " << elalias << std::endl;
- }
-
- delete query;
- transactionCommit();
-
- // return result;
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDDb.cxx b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDDb.cxx
deleted file mode 100644
index eece038f893566a6d7354efb81bdf731d7909eda..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDDb.cxx
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PCDDb.h"
-#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-// CORAL API
-#include "CoralKernel/Context.h"
-#include "CoralBase/Attribute.h"
-#include "CoralBase/AttributeList.h"
-#include "CoralBase/AttributeListException.h"
-#include "RelationalAccess/IConnectionService.h"
-#include "RelationalAccess/IConnectionServiceConfiguration.h"
-#include "RelationalAccess/AccessMode.h"
-#include "RelationalAccess/ISessionProxy.h"
-#include "RelationalAccess/ISchema.h"
-#include "RelationalAccess/ITransaction.h"
-
-#include "RelationalAccess/ITable.h"
-#include "RelationalAccess/ITableDescription.h"
-#include "RelationalAccess/IColumn.h"
-#include "RelationalAccess/ICursor.h"
-#include "RelationalAccess/IQuery.h"
-#include "RelationalAccess/TableDescription.h"
-#include "RelationalAccess/ITableDataEditor.h"
-#include "RelationalAccess/ITableSchemaEditor.h"
-#include "RelationalAccess/IBulkOperation.h"
-#include "RelationalAccess/SchemaException.h"
-
-#include "CxxUtils/checker_macros.h"
-
-// std lib
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <set>
-using namespace std;
-
-//---------------------------------------------------------------------------
-/** Constructor.
- Open the default database and seal context.
-*/
-PCDDb::PCDDb(const std::string& connString,
- const std::string& tableName,
- bool verbose, bool /*load_text*/) :
- m_verbose(verbose),
- m_session(0), m_connString(connString), m_pixeltable(tableName),
- m_query(0), m_query_2(0), m_cursor(0)
-{
- //char* ctmp = getenv("CAN_CALIB_DB");
- //if (ctmp) m_connString = ctmp;
- // Create the RCDConnectionService
- if (m_verbose) cout << "Creating Connection Service to \"" << m_connString << "\"" << endl;
-
- // Instantiate connection service
- coral::Context* context = &coral::Context::instance();
-
- // Load CORAL connection service
- coral::IHandle<coral::IConnectionService> lookSvcH = context->query<coral::IConnectionService>();
- if (!lookSvcH.isValid()) {
- context->loadComponent( "CORAL/Services/ConnectionService" );
- lookSvcH = context->query<coral::IConnectionService>();
- }
- if (!lookSvcH.isValid()) {
- throw std::runtime_error( "Could not locate the connection service" );
- }
- /// connection to CORAL
- m_session = lookSvcH->connect( m_connString, coral::Update );
-}
-
-PCDDb::~PCDDb()
-{
- if (m_session) {
- bool was_there = m_query!=0;
-
- // cleanup
- delete m_query_2; // ok if m_query_2==0
- delete m_query; // ditto
- if (was_there) transactionCommit();
-
- if (m_verbose) cout << "Disconnecting \"" << m_connString << "\"" << endl;
- delete m_session;
- }
-}
-
-bool PCDDb::init (const std::string& tag, int revision)
-{
- if (m_verbose) cout << "PCDDb::init(" << tag << ", " << revision << ")" << endl;
-
- transactionStartReadOnly();
- m_query = m_session->nominalSchema().tableHandle(m_pixeltable).newQuery();
-
- m_query->addToOutputList("TAG");
- m_query->defineOutputType("TAG",coral::AttributeSpecification::typeNameForType<std::string>());
- m_query->addToOutputList("REVISION");
- m_query->defineOutputType("REVISION",coral::AttributeSpecification::typeNameForType<int>());
- m_query->addToOutputList("SOURCES");
- m_query->defineOutputType("SOURCES",coral::AttributeSpecification::typeNameForType<std::string>());
- m_query->addToOutputList("DATE");
- m_query->defineOutputType("DATE",coral::AttributeSpecification::typeNameForType<time_t>());
- m_query->addToOutputList("FK");
-
- coral::AttributeList pixel_condData ATLAS_THREAD_SAFE; // Not shared, ok
- std::string pixel_cond = m_pixeltable+".TAG = :tag";
- pixel_condData.extend<string>( "tag" );
- pixel_condData[0].data<string>() = tag;
- pixel_cond += " AND "+m_pixeltable+".REVISION = :revision";
- pixel_condData.extend<int>( "revision" );
- pixel_condData["revision"].data<int>() = revision;
- m_query->setCondition( pixel_cond, pixel_condData);
- coral::ICursor& cursor = m_query->execute();
-
- while (cursor.next()) {
- const coral::AttributeList &row0 = cursor.currentRow();
- if (m_verbose) {
- time_t timet = row0[3].data<time_t>();
- char buf[32];
- string time = ctime_r(&timet, buf);
- cout << " TAG = " << row0[0].data<string>()
- << " REVISION = " << row0[1].data<int>()
- << " SOURCES = " << row0[2].data<string>()
- << " TIME = " << time.substr(0,time.size()-1)
- << " FK = " << row0[4].data<long long>() << endl;
- }
- std::set<string> tables = m_session->nominalSchema().listTables();
- for (std::set<string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName) {
- if ((*tName).find(m_pixeltable+"_") != string::npos) {
- if (m_verbose) cout << "found table " << *tName << endl;
- m_query_2 = m_session->nominalSchema().tableHandle(*tName).newQuery();
-
- // Get the list of columns
- const coral::ITableDescription& tableDesc = m_session->nominalSchema().tableHandle(*tName).description();
- int NumCol = tableDesc.numberOfColumns();
- std::vector<string> colName; colName.resize(NumCol);
- std::vector<string> colType; colType.resize(NumCol);
- for(int i = 0; i<NumCol; ++i){
- const coral::IColumn& colDesc = tableDesc.columnDescription(i);
- colName[i] = colDesc.name();
- colType[i] = colDesc.type();
- m_query_2->addToOutputList(colDesc.name());
- if (m_verbose) cout << " " << i << ": " << colName[i] <<" ("<< colType[i] << ")" << endl;
- }
-
- // Second query to get entries
- string pixel_cond_2 = (*tName)+".FK = :fk";
- coral::AttributeList pixel_condData_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData_2.extend<long long>( "fk" );
- pixel_condData_2[0].data<long long>() = row0[4].data<long long>();
- m_query_2->setCondition( pixel_cond_2, pixel_condData_2);
- coral::ICursor& cursor_2 = m_query_2->execute();
-
- // .. and keep the cursor for data extraction
- m_cursor = &cursor_2;
-
- // success
- return true;
- }
- }
- }
-
- // table not found
- return false;
-}
-
-int PCDDb::next()
-{
- if (!m_cursor->next()) return 0;
- const coral::AttributeList& row0_2 = m_cursor->currentRow();
- int idmod = row0_2[1].data<int>();
- return idmod;
-}
-
-bool PCDDb::set(int idmod_cur, PixelCoralClientUtils::PixelCalibData& pcd)
-{
- const coral::AttributeList& row0_2 = m_cursor->currentRow();
- int ix = 1;
- int idmod = row0_2[ix++].data<int>();
- if (idmod != idmod_cur) return false;
-
- for (int i = 0; i<16; ++i) {
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData pcsd;
- pcsd.setChipID(i);
- int iv[4];
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(0,iv[0],iv[1],iv[2],iv[3]);
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(1,iv[0],iv[1],iv[2],iv[3]);
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(2,iv[0],iv[1],iv[2],iv[3]);
- float fv[3];
- for (int m=0; m<3; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setQ2Tot(0,fv[0],fv[1],fv[2]);
- for (int m=0; m<3; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setQ2Tot(2,fv[0],fv[1],fv[2]);
- for (int m=0; m<2; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setTotRes(fv[0],fv[1]);
- pcd.add(pcsd);
- }
-
- return true;
-}
-
-/** CORAL helper to start a transaction in readonly mode
- */
-void PCDDb::transactionStartReadOnly(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(true /*ReadOnly*/);
-}
-
-
-
-/** CORAL helper to start a transaction in update mode
- */
-void PCDDb::transactionStartUpdate(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(false /*update*/);
-}
-
-
-
-/** CORAL helper to commit changes at the end of a transaction
- */
-void PCDDb::transactionCommit(){
- if (m_session->transaction().isActive()) m_session->transaction().commit();
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDio.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDio.cc
deleted file mode 100644
index 3f30e34ab259b39956405bc39f9e67cc0472af1f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDio.cc
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PCDio.h"
-#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-// CORAL API
-#include "CoralKernel/Context.h"
-#include "CoralBase/Attribute.h"
-#include "CoralBase/AttributeList.h"
-#include "CoralBase/AttributeListException.h"
-#include "RelationalAccess/IConnectionService.h"
-#include "RelationalAccess/IConnectionServiceConfiguration.h"
-#include "RelationalAccess/AccessMode.h"
-#include "RelationalAccess/ISessionProxy.h"
-#include "RelationalAccess/ISchema.h"
-#include "RelationalAccess/ITransaction.h"
-
-#include "RelationalAccess/ITable.h"
-#include "RelationalAccess/ITableDescription.h"
-#include "RelationalAccess/IColumn.h"
-#include "RelationalAccess/ICursor.h"
-#include "RelationalAccess/IQuery.h"
-#include "RelationalAccess/TableDescription.h"
-#include "RelationalAccess/ITableDataEditor.h"
-#include "RelationalAccess/ITableSchemaEditor.h"
-#include "RelationalAccess/IBulkOperation.h"
-#include "RelationalAccess/SchemaException.h"
-
-// std lib
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <set>
-#include <sys/time.h>
-using namespace std;
-
-//---------------------------------------------------------------------------
-/** Constructor.
- Open the default database and seal context.
- */
-PCDio::PCDio(const std::string& connString,
- const std::string& tableName,
- int verbose) :
- m_connString(connString), m_pixeltable(tableName),
- m_verbose(verbose), m_session(0) {}
-
-PCDio::~PCDio()
-{
- if (m_verbose) cout << "Disconnecting \"" << m_connString << "\"" << endl;
- delete m_session;
-}
-
-/** initialize connection
- */
-void PCDio::init(coral::AccessMode access_mode)
-{
- if (m_verbose) cout << "Creating Connection Service to \"" << m_connString << "\"" << endl;
-
- coral::Context* context = &coral::Context::instance();
- coral::IHandle<coral::IConnectionService> lookSvcH = context->query<coral::IConnectionService>();
- if (!lookSvcH.isValid()) {
- context->loadComponent("CORAL/Services/ConnectionService");
- lookSvcH = context->query<coral::IConnectionService>();
- }
- if (!lookSvcH.isValid()) {
- throw runtime_error("Could not locate the connection service");
- }
-
- m_session = lookSvcH->connect(m_connString, access_mode);
- if (m_verbose) cout << "Connection established" << endl;
-}
-
-/** DB -> pcd.sav
- */
-void PCDio::load(const std::string& tag, int revision)
-{
- // start timer
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
-//// TEMP
-
- transactionStartReadOnly();
- set<string> tables = m_session->nominalSchema().listTables();
- transactionCommit();
-
- for (set<string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
- cout << "Table: <" << *tName << ">";
-
- transactionStartReadOnly();
- coral::IQuery* query = m_session->nominalSchema().tableHandle(*tName).newQuery();
- coral::ICursor& cursor = query->execute();
- int nRows = 0;
- while ( cursor.next() ) {
- ++nRows;
- }
- delete query;
- transactionCommit();
-
- cout << ", Rows = " << nRows << endl;
-
- }
-
- transactionStartReadOnly();
-////
-
- // build a query
- coral::IQuery* query = m_session->nominalSchema().tableHandle(m_pixeltable).newQuery();
-
- query->addToOutputList("TAG");
- query->defineOutputType("TAG",coral::AttributeSpecification::typeNameForType<string>());
- query->addToOutputList("REVISION");
- query->defineOutputType("REVISION",coral::AttributeSpecification::typeNameForType<int>());
- query->addToOutputList("SOURCES");
- query->defineOutputType("SOURCES",coral::AttributeSpecification::typeNameForType<string>());
- query->addToOutputList("DATE");
- query->defineOutputType("DATE",coral::AttributeSpecification::typeNameForType<time_t>());
- query->addToOutputList("FK");
-
- // construct query condition
- coral::AttributeList pixel_condData ATLAS_THREAD_SAFE; // Not shared, ok.
- string pixel_cond = m_pixeltable+".TAG = :tag";
- pixel_condData.extend<string>("tag");
- pixel_condData[0].data<string>() = tag;
- if (revision>0) {
- pixel_cond += " AND "+m_pixeltable+".REVISION = :revision";
- pixel_condData.extend<int>("revision");
- pixel_condData["revision"].data<int>() = revision;
- }
- query->setCondition( pixel_cond, pixel_condData);
- coral::ICursor& cursor = query->execute();
-
- int loaded_revision = 0;
-
- // go through the list of found tables
- int nRows = 0;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- if (m_verbose) {
- //time_t timet = GMTtoLocalTime(row0[3].data<time_t>());
- time_t timet = row0[3].data<time_t>();
- char buf[32];
- string time = ctime_r(&timet, buf);
- cout << " TAG = " << row0[0].data<string>()
- << " REVISION = " << row0[1].data<int>()
- << " SOURCES = " << row0[2].data<string>()
- << " DATE = " << time.substr(0,time.size()-1)
- << " FK = " << row0[4].data<long long>() << endl;
- }
- int current_revision = row0[1].data<int>();
- //row0.toOutputStream(cout)<<endl;
- ++nRows;
- // Show the variables
- set<string> tables = m_session->nominalSchema().listTables();
- for (set<string>::const_iterator tName = tables.begin();
- tName != tables.end(); ++tName ){
- if ((*tName).find(m_pixeltable+"_") != string::npos) {
- if (m_verbose) {
- cout << "found table " << (*tName) << endl;
- }
-
- // open the output text file
- ofstream* outPtr = 0;
- if (loaded_revision<current_revision) {
- loaded_revision = current_revision;
- outPtr = new ofstream("pcd.sav");
- }
-
- coral::IQuery* query_2 = m_session->nominalSchema().tableHandle(*tName).newQuery();
-
- // Get the list of columns
- const coral::ITableDescription& tableDesc =
- m_session->nominalSchema().tableHandle(*tName).description();
- int NumCol = tableDesc.numberOfColumns();
- vector<string> colName; colName.resize(NumCol);
- vector<string> colType; colType.resize(NumCol);
- for(int i=0; i<NumCol; ++i){
- const coral::IColumn& colDesc = tableDesc.columnDescription(i);
- colName[i] = colDesc.name();
- colType[i] = colDesc.type();
- query_2->addToOutputList(colDesc.name());
- }
-
- // Second query to get entries in each table
- string pixel_cond_2 = (*tName)+".FK = :fk";
- coral::AttributeList pixel_condData_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_condData_2.extend<long long>("fk");
- pixel_condData_2[0].data<long long>() = row0[4].data<long long>();
- query_2->setCondition( pixel_cond_2, pixel_condData_2);
- coral::ICursor& cursor_2 = query_2->execute();
- while ( cursor_2.next() ) {
- // populate PixelChipSummaryData
- const coral::AttributeList &row0_2 = cursor_2.currentRow();
- PixelCoralClientUtils::PixelCalibData pcd;
- int ix = 1;
- int idmod = row0_2[ix++].data<int>();
- for (int i = 0; i<16; ++i) {
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData pcsd;
- pcsd.setChipID(i);
- int iv[4];
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(0,iv[0],iv[1],iv[2],iv[3]);
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(1,iv[0],iv[1],iv[2],iv[3]);
- for (int m=0; m<4; ++m) iv[m] = row0_2[ix++].data<int>();
- pcsd.setThreshold(2,iv[0],iv[1],iv[2],iv[3]);
- float fv[3];
- for (int m=0; m<3; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setQ2Tot(0,fv[0],fv[1],fv[2]);
- for (int m=0; m<3; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setQ2Tot(2,fv[0],fv[1],fv[2]);
- for (int m=0; m<2; ++m) fv[m] = row0_2[ix++].data<float>();
- pcsd.setTotRes(fv[0],fv[1]);
- pcd.add(pcsd);
- }
-
- if (outPtr) {
- // print out PixelChipSummaryData
- for (int i = 0; i<16; ++i) {
- const PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData& pcsd = *pcd.getPixelChipSummaryData(i);
- ofstream& out = *outPtr;
- if (pcsd.getChipID()==0) out << idmod << endl;
- out << "I" << pcsd.getChipID()
- << " " << pcsd.getThreshold(0)
- << " " << pcsd.getThresholdSigma(0)
- << " " << pcsd.getNoise(0)
- << " " << pcsd.getTimeWalk(0)
- << " " << pcsd.getThreshold(1)
- << " " << pcsd.getThresholdSigma(1)
- << " " << pcsd.getNoise(1)
- << " " << pcsd.getTimeWalk(1)
- << " " << pcsd.getThreshold(2)
- << " " << pcsd.getThresholdSigma(2)
- << " " << pcsd.getNoise(2)
- << " " << pcsd.getTimeWalk(2)
- << " " << pcsd.getQ2TotA(0)
- << " " << pcsd.getQ2TotE(0)
- << " " << pcsd.getQ2TotC(0)
- << " " << pcsd.getQ2TotA(2)
- << " " << pcsd.getQ2TotE(2)
- << " " << pcsd.getQ2TotC(2)
- << " " << pcsd.getTotP1()
- << " " << pcsd.getTotP2() << endl;
- }
- }
- }
- delete query_2;
- if (outPtr) {
- outPtr->close();
- outPtr = 0;
- }
- }
- }
- }
- delete query;
-
- transactionCommit();
-
- if (m_verbose) cout << "Total analyses: " << nRows << endl;
-
- if (revision==0) {
- if (m_verbose) cout << "Loaded revision: " << loaded_revision << endl;
- // save loaded revision number to a file
- ofstream outr("pcd.rev");
- outr << loaded_revision << endl;
- outr.close();
- }
-
- // stop timer
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) cout << " Total time was " << total_usecs << " usec" << endl;
-}
-
-/** pcd.dat -> DB
- */
-void PCDio::save(const std::string& tag, int revision, const std::string& sources)
-{
- // start timer
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- // create tables if needed
- createTable();
-
- // get a new foreign key
- long long fk = updateKey();
-
- transactionStartUpdate();
-
- // fill header
- coral::ITableDataEditor& pixel_editor = m_session->nominalSchema().tableHandle(m_pixeltable ).dataEditor();
-
- coral::AttributeList pixel_row ATLAS_THREAD_SAFE; // Not shared, ok.
- pixel_row.extend<std::string>("TAG");
- pixel_row.extend<int>("REVISION");
- pixel_row.extend<std::string>("SOURCES");
- pixel_row.extend<time_t>("DATE");
- pixel_row.extend<long long>("FK");
-
- pixel_row["TAG"].data<std::string>() = tag;
- pixel_row["REVISION"].data<int>() = revision;
- pixel_row["SOURCES"].data<std::string>() = sources;
- pixel_row["DATE"].data<time_t>() = time(0);
- pixel_row["FK"].data<long long>() = fk;
-
- pixel_editor.insertRow(pixel_row);
- transactionCommit();
-
- // fill pcd
- transactionStartUpdate();
- {
- coral::ITableDataEditor& pixel_editor_2 = m_session->nominalSchema().tableHandle(m_pixeltable+"_PCD").dataEditor();
- coral::AttributeList pixel_row_2 ATLAS_THREAD_SAFE; // Not shared, ok
- pixel_editor_2.rowBuffer(pixel_row_2);
- int mysize = 1;
- coral::IBulkOperation* pixel_bulk_2= pixel_editor_2.bulkInsert(pixel_row_2,mysize);
-
- int nRows = 0;
-
- ifstream in("pcd.dat");
- while (in) {
- int idmod; in >> idmod;
- if (in.eof()) break;
-
- pixel_row_2["FK"].setValue <long long> (fk);
- pixel_row_2["IDMOD"].setValue <int> (idmod);
-
- bool ok = true;
- for (int i = 0; i<16; ++i) {
- char dummy; in >> dummy;
- if (dummy!='I') { ok = false; break; }
- int idchip; in >> idchip;
- if (idchip!=i) { ok = false; break; }
-
- char buf[256];
- int thres, sigma, noise, timewalk;
- in >> thres >> sigma >> noise >> timewalk;
- sprintf(buf,"THRESHOLD1I%d",i);
- pixel_row_2[buf].setValue <int> (thres);
- sprintf(buf,"THRESHOLD2I%d",i);
- pixel_row_2[buf].setValue <int> (sigma);
- sprintf(buf,"THRESHOLD3I%d",i);
- pixel_row_2[buf].setValue <int> (noise);
- sprintf(buf,"THRESHOLD4I%d",i);
- pixel_row_2[buf].setValue <int> (timewalk);
-
- in >> thres >> sigma >> noise >> timewalk;
- sprintf(buf,"THRESHOLDLONG1I%d",i);
- pixel_row_2[buf].setValue <int> (thres);
- sprintf(buf,"THRESHOLDLONG2I%d",i);
- pixel_row_2[buf].setValue <int> (sigma);
- sprintf(buf,"THRESHOLDLONG3I%d",i);
- pixel_row_2[buf].setValue <int> (noise);
- sprintf(buf,"THRESHOLDLONG4I%d",i);
- pixel_row_2[buf].setValue <int> (timewalk);
-
- in >> thres >> sigma >> noise >> timewalk;
- sprintf(buf,"THRESHOLDGANGED1I%d",i);
- pixel_row_2[buf].setValue <int> (thres);
- sprintf(buf,"THRESHOLDGANGED2I%d",i);
- pixel_row_2[buf].setValue <int> (sigma);
- sprintf(buf,"THRESHOLDGANGED3I%d",i);
- pixel_row_2[buf].setValue <int> (noise);
- sprintf(buf,"THRESHOLDGANGED4I%d",i);
- pixel_row_2[buf].setValue <int> (timewalk);
-
- float A, E, C;
- in >> A >> E >> C;
- sprintf(buf,"Q2TOT1I%d",i);
- pixel_row_2[buf].setValue <float> (A);
- sprintf(buf,"Q2TOT2I%d",i);
- pixel_row_2[buf].setValue <float> (E);
- sprintf(buf,"Q2TOT3I%d",i);
- pixel_row_2[buf].setValue <float> (C);
-
- in >> A >> E >> C;
- sprintf(buf,"Q2TOTGANGED1I%d",i);
- pixel_row_2[buf].setValue <float> (A);
- sprintf(buf,"Q2TOTGANGED2I%d",i);
- pixel_row_2[buf].setValue <float> (E);
- sprintf(buf,"Q2TOTGANGED3I%d",i);
- pixel_row_2[buf].setValue <float> (C);
-
- float p1, p2;
- in >> p1 >> p2;
- sprintf(buf,"TOTRES1I%d",i);
- pixel_row_2[buf].setValue <float> (p1);
- sprintf(buf,"TOTRES2I%d",i);
- pixel_row_2[buf].setValue <float> (p2);
- }
-
- ++nRows;
- pixel_bulk_2->processNextIteration();
- if (!ok) break;
- }
- if (m_verbose) cout << "PixelCalibData: loaded " << nRows << " chips" << endl;
-
- pixel_bulk_2->flush();
- delete pixel_bulk_2;
- }
- transactionCommit();
-
- // stop timer
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) cout << " Total time was " << total_usecs << " usec" << endl;
-}
-
-/** part of save(): create new tables
- */
-void PCDio::createTable()
-{
- createAuxTables();
- createHeaderTable();
- createDataTable();
-}
-
-/** part of save(): create header table
- */
-void PCDio::createHeaderTable()
-{
- // create header
- transactionStartUpdate();
- if (!m_session->nominalSchema().existsTable(m_pixeltable)) {
- if (m_verbose) cout << "creating " << m_pixeltable << endl;
- coral::TableDescription pixel_columns( "SchemaDefinition_PIXEL" );
- pixel_columns.setName( m_pixeltable );
- pixel_columns.insertColumn("TAG", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- pixel_columns.insertColumn("REVISION", coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.insertColumn("SOURCES", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- pixel_columns.insertColumn( "DATE", coral::AttributeSpecification::typeNameForType<time_t>());
- pixel_columns.insertColumn( "FK", coral::AttributeSpecification::typeNameForType<long long>());
- pixel_columns.setUniqueConstraint("FK","FK_UNIQ");
- m_session->nominalSchema().createTable( pixel_columns );
- }
- transactionCommit();
-}
-
-/** part of save(): create data table
- */
-void PCDio::createDataTable()
-{
- transactionStartUpdate();
- string PIXEL_TABLE_DATA = m_pixeltable + "_PCD";
- if (!m_session->nominalSchema().existsTable(PIXEL_TABLE_DATA)) {
- if (m_verbose) cout << "creating " << PIXEL_TABLE_DATA << endl;
- coral::TableDescription pixel_columns( "SchemaDefinition_PIXEL" );
- pixel_columns.setName(PIXEL_TABLE_DATA);
- pixel_columns.insertColumn("FK", coral::AttributeSpecification::typeNameForType<long long>());
- pixel_columns.insertColumn("IDMOD",coral::AttributeSpecification::typeNameForType<int>());
- char buf[256];
- for (int i = 0; i<16; ++i) {
- for (int j = 1; j<=4; ++j) {
- sprintf(buf,"THRESHOLD%dI%d",j,i);
- pixel_columns.insertColumn(buf,coral::AttributeSpecification::typeNameForType<int>());
- }
- for (int j = 1; j<=4; ++j) {
- sprintf(buf,"THRESHOLDLONG%dI%d",j,i);
- pixel_columns.insertColumn(buf,coral::AttributeSpecification::typeNameForType<int>());
- }
- for (int j = 1; j<=4; ++j) {
- sprintf(buf,"THRESHOLDGANGED%dI%d",j,i);
- pixel_columns.insertColumn(buf,coral::AttributeSpecification::typeNameForType<int>());
- }
- for (int j = 1; j<=3; ++j) {
- sprintf(buf,"Q2TOT%dI%d",j,i);
- pixel_columns.insertColumn(buf,coral::AttributeSpecification::typeNameForType<float>());
- }
- for (int j = 1; j<=3; ++j) {
- sprintf(buf,"Q2TOTGANGED%dI%d",j,i);
- pixel_columns.insertColumn(buf,coral::AttributeSpecification::typeNameForType<float>());
- }
- for (int j = 1; j<=2; ++j) {
- sprintf(buf,"TOTRES%dI%d",j,i);
- pixel_columns.insertColumn(buf,coral::AttributeSpecification::typeNameForType<float>());
- }
- }
-
- pixel_columns.createForeignKey("PCD_FK","FK",m_pixeltable,"FK");
- //pixel_columns.createIndex("PCD_CONNECTIVITY_IDX", "CONNECTIVITY");
- //pixel_columns.createIndex("PCD_VARIABLE_IDX", "VARIABLE");
- //pixel_columns.setNotNullConstraint ( "CONNECTIVITY" );
- //pixel_columns.setNotNullConstraint ( "VARIABLE" );
-
- m_session->nominalSchema().createTable( pixel_columns );
- }
- transactionCommit();
-}
-
-/** part of save(): create key table
- */
-void PCDio::createAuxTables()
-{
- transactionStartUpdate();
- string FK_TABLE = "CALIB_KEYGEN";
- if (!m_session->nominalSchema().existsTable(FK_TABLE)) {
- coral::TableDescription key_columns( "SchemaDefinition_KEY" );
- key_columns.setName( FK_TABLE );
- key_columns.insertColumn( "KEY", coral::AttributeSpecification::typeNameForType<long long>());
- key_columns.createIndex ("KEY_INDEX", "KEY");
- m_session->nominalSchema().createTable( key_columns );
- // fill the first key
- coral::ITableDataEditor& keyeditor = m_session->nominalSchema().tableHandle( FK_TABLE ).dataEditor();
- coral::AttributeList rowBuffer ATLAS_THREAD_SAFE; // Not shared, ok
- rowBuffer.extend<long long>( "KEY" );
- long long& key = rowBuffer[ "KEY" ].data<long long>();
- key = 1000;
- keyeditor.insertRow( rowBuffer );
- }
- transactionCommit();
-}
-
-/** part of save(): update the key
- */
-long long PCDio::updateKey()
-{
- std::string FK_TABLE = "CALIB_KEYGEN";
- transactionStartUpdate();
-
- coral::ITableDataEditor& keyeditor = m_session->nominalSchema().tableHandle( FK_TABLE ).dataEditor();
- std::string updateAction = "KEY = KEY + :offset";
- coral::AttributeList updateData ATLAS_THREAD_SAFE; // Not shared, ok
- updateData.extend<long long>("offset");
- updateData[0].data<long long>() = 1;
- keyeditor.updateRows( updateAction, "", updateData );
-
- coral::IQuery* query = m_session->nominalSchema().tableHandle(FK_TABLE).newQuery();
- query->addToOutputList("KEY");
- coral::ICursor& cursor = query->execute();
- long long key = -1;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- key = row0[0].data<long long>();
- if (m_verbose) std::cout << " KEY = " << key << std::endl;
- }
- transactionCommit();
- return key;
-}
-
-/** CORAL helper to start a transaction in readonly mode
- */
-void PCDio::transactionStartReadOnly(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(true /*ReadOnly*/);
-}
-
-/** CORAL helper to start a transaction in update mode
- */
-void PCDio::transactionStartUpdate(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(false /*update*/);
-}
-
-/** CORAL helper to commit changes at the end of a transaction
- */
-void PCDio::transactionCommit(){
- if (m_session->transaction().isActive()) m_session->transaction().commit();
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDkr.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDkr.cc
deleted file mode 100644
index 8acd6984d1cdb97dfab8617719e0e106339ca261..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PCDkr.cc
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PCDkr.h"
-#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-// CORAL API
-#include "CoralKernel/Context.h"
-#include "CoralBase/Attribute.h"
-#include "CoralBase/AttributeList.h"
-#include "CoralBase/AttributeListException.h"
-#include "RelationalAccess/IConnectionService.h"
-#include "RelationalAccess/IConnectionServiceConfiguration.h"
-#include "RelationalAccess/AccessMode.h"
-#include "RelationalAccess/ISessionProxy.h"
-#include "RelationalAccess/ISchema.h"
-#include "RelationalAccess/ITransaction.h"
-
-#include "RelationalAccess/ITable.h"
-#include "RelationalAccess/ITableDescription.h"
-#include "RelationalAccess/IColumn.h"
-#include "RelationalAccess/ICursor.h"
-#include "RelationalAccess/IQuery.h"
-#include "RelationalAccess/TableDescription.h"
-#include "RelationalAccess/ITableDataEditor.h"
-#include "RelationalAccess/ITableSchemaEditor.h"
-#include "RelationalAccess/IBulkOperation.h"
-#include "RelationalAccess/SchemaException.h"
-
-// std lib
-#include <iostream>
-using namespace std;
-
-//---------------------------------------------------------------------------
-/** Constructor.
- Open the default database and seal context.
- */
-PCDkr::PCDkr(const std::string& connString,
- const std::string& tableName,
- int verbose) :
- m_connString(connString), m_pixeltable(tableName),
- m_verbose(verbose), m_session(0) {}
-
-PCDkr::~PCDkr()
-{
- if (m_verbose) cout << "Disconnecting \"" << m_connString << "\"" << endl;
- delete m_session;
-}
-
-/** initialize connection
- */
-void PCDkr::init(coral::AccessMode access_mode)
-{
- if (m_verbose) cout << "Creating Connection Service to \"" << m_connString << "\"" << endl;
-
- coral::Context* context = &coral::Context::instance();
- coral::IHandle<coral::IConnectionService> lookSvcH = context->query<coral::IConnectionService>();
- if (!lookSvcH.isValid()) {
- context->loadComponent("CORAL/Services/ConnectionService");
- lookSvcH = context->query<coral::IConnectionService>();
- }
- if (!lookSvcH.isValid()) {
- throw runtime_error("Could not locate the connection service");
- }
-
- m_session = lookSvcH->connect(m_connString, access_mode);
- if (m_verbose) cout << "Connection established" << endl;
-}
-
-/** dump DB
- */
-void PCDkr::load()
-{
- // start timer
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- transactionStartReadOnly();
-
- // build a query
- coral::IQuery* query = m_session->nominalSchema().tableHandle(m_pixeltable).newQuery();
-
- query->addToOutputList("TAG");
- query->defineOutputType("TAG",coral::AttributeSpecification::typeNameForType<string>());
- query->addToOutputList("CID");
- query->defineOutputType("CID",coral::AttributeSpecification::typeNameForType<string>());
- query->addToOutputList("VALID");
- query->defineOutputType("VALID",coral::AttributeSpecification::typeNameForType<int>());
-
- coral::ICursor& cursor = query->execute();
-
- // go through the list of found tables
- int nRows = 0;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- if (m_verbose) {
- cout << " TAG = " << row0[0].data<string>()
- << " CID = " << row0[1].data<string>()
- << " VALID = " << row0[2].data<int>() << endl;
- }
- ++nRows;
- }
- delete query;
-
- transactionCommit();
-
- if (m_verbose) cout << "Total configurations: " << nRows << endl;
-
- // stop timer
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) cout << " Total time was " << total_usecs << " usec" << endl;
-}
-
-/** add a new record to DB
- */
-void PCDkr::save(const std::string& tag, const std::string& cid)
-{
- // start timer
- struct timeval start_time, end_time;
- int total_usecs;
- gettimeofday(&start_time, NULL);
-
- // create tables if needed
- createTable();
-
- transactionStartUpdate();
-
- // fill header
- coral::ITableDataEditor& pixel_editor = m_session->nominalSchema().tableHandle(m_pixeltable ).dataEditor();
-
- coral::AttributeList pixel_row;
- pixel_row.extend<std::string>("TAG");
- pixel_row.extend<std::string>("CID");
- pixel_row.extend<int>("VALID");
-
- pixel_row["TAG"].data<std::string>() = tag;
- pixel_row["CID"].data<std::string>() = cid;
- pixel_row["VALID"].data<int>() = 0;
-
- pixel_editor.insertRow(pixel_row);
- transactionCommit();
-
- // stop timer
- gettimeofday(&end_time, NULL);
- total_usecs = (end_time.tv_sec-start_time.tv_sec) * 1000000 +
- (end_time.tv_usec-start_time.tv_usec);
- if (m_verbose) cout << " Total time was " << total_usecs << " usec" << endl;
-}
-
-/** part of save(): create the table
- */
-void PCDkr::createTable()
-{
- // create header
- transactionStartUpdate();
- if (!m_session->nominalSchema().existsTable(m_pixeltable)) {
- if (m_verbose) cout << "creating " << m_pixeltable << endl;
- coral::TableDescription pixel_columns( "SchemaDefinition_KR" );
- pixel_columns.setName( m_pixeltable );
- pixel_columns.insertColumn("TAG", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- pixel_columns.insertColumn("CID", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- pixel_columns.insertColumn( "VALID", coral::AttributeSpecification::typeNameForType<int>());
- pixel_columns.setPrimaryKey("TAG");
- m_session->nominalSchema().createTable( pixel_columns );
- }
- transactionCommit();
-}
-
-/** validate a record
- example: Integration_Basic/src/DmlOperations.cpp
- */
-void PCDkr::validate(const std::string& tag)
-{
- transactionStartUpdate();
-
- coral::ITableDataEditor& pixel_editor = m_session->nominalSchema().tableHandle(m_pixeltable ).dataEditor();
-
- string updateAction = "VALID = 1";
- string updateCondition = "TAG = :tvalue";
- coral::AttributeList updateData;
- updateData.extend<std::string>("tvalue");
- updateData[0].data<std::string>() = tag;
-
- int nRows = pixel_editor.updateRows(updateAction,updateCondition,updateData);
- cout << "Updated rows: " << nRows << endl;
- transactionCommit();
-}
-
-/** CORAL helper to start a transaction in readonly mode
- */
-void PCDkr::transactionStartReadOnly(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(true /*ReadOnly*/);
-}
-
-/** CORAL helper to start a transaction in update mode
- */
-void PCDkr::transactionStartUpdate(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(false /*update*/);
-}
-
-/** CORAL helper to commit changes at the end of a transaction
- */
-void PCDkr::transactionCommit(){
- if (m_session->transaction().isActive()) m_session->transaction().commit();
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PixCalibCoralCoolDb.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PixCalibCoralCoolDb.cc
deleted file mode 100644
index 0fcfe824b3e239c790f80ca40e927bed50798a0b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PixCalibCoralCoolDb.cc
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PixCalibCoralCoolDb.h"
-
-// CoraCool stuff -- A.X.
-#include "CoraCool/CoraCoolDatabaseSvcFactory.h"
-#include "CoraCool/CoraCoolDatabaseSvc.h"
-#include "CoolKernel/IDatabaseSvc.h"
-#include "CoolKernel/ChannelSelection.h"
-#include "CoraCool/CoraCoolFolder.h"
-#include "CoraCool/CoraCoolObjectIter.h"
-#include "CoraCool/CoraCoolObject.h"
-
-#include "CxxUtils/checker_macros.h"
-
-// std lib
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <vector>
-using namespace std;
-
-//
-// this code is based on CoraCoolExample by R. Hawkings
-//
-PixCalibCoralCoolDb::PixCalibCoralCoolDb(const std::string& dbString,
- int /*verbose*/) :
- m_dbstring(dbString)
-{
-
- CoraCoolDatabaseSvc& corasvc=CoraCoolDatabaseSvcFactory::databaseService();
-
- //std::cout << "Done the CoraCool initialisation" << std::endl;
-
- // open the CORAL database connection which implicitly opens
- // the corresponding COOL connection
- // you can also pass in the COOL connection explicitly
- // std::cout << "Opening CORAL database" << std::endl;
- try {
- m_coradb=corasvc.openDatabase(m_dbstring,false);
- //std::cout << "Database connections open OK" << std::endl;
- }
- catch (std::exception&e) {
- std::cout << "Problem opening CORAL database: " << e.what() << std::endl;
- }
- //std::cout << "Done the database opening" << std::endl;
-
-}
-
-PixCalibCoralCoolDb::~PixCalibCoralCoolDb()
-{
-}
-
-bool PixCalibCoralCoolDb::init()
-{
- // open the database connection, move to constructor
- // if (m_verbose) cout << "HEY HEY Connecting to " << m_dbstring << endl;
- // CoraCoolDatabaseSvc& corasvc=CoraCoolDatabaseSvcFactory::databaseService();
- // try {
- // m_coradb = corasvc.openDatabase(m_dbstring, readonly);
- // }
- // catch (std::exception& e) {
- // cout << "problem opening database: " << e.what() << endl;
- // return false;
- // }
- // if (m_verbose) cout << "Connection established" << endl;
-
- return true;
-}
-
-bool PixCalibCoralCoolDb::load(cool::ValidityKey vkx)
-{
- CoraCoolFolderPtr folder;
- string folderName("/PIXEL/PixCalibData");
-
- try {
- folder = m_coradb->getFolder(folderName);
- }
- catch (cool::Exception& e) {
- cout << "problem getting folder: " << e.what() << endl;
- return false;
- }
-
- // open text file for output
- ofstream out("pcd.sav");
- int nload = 0;
-
- CoraCoolObjectIterPtr itr = folder->browseObjects(vkx, cool::ChannelSelection::all());
- while (itr->hasNext()) {
- CoraCoolObjectPtr obj = itr->next();
- for (CoraCoolObject::const_iterator payitr = obj->begin();
- payitr != obj->end(); ++payitr) {
- const coral::Blob& blob = (*payitr)["data"].data<coral::Blob>();
- const char* p = static_cast<const char*>(blob.startingAddress());
- unsigned int len = blob.size();
- for (unsigned int i = 0; i!=len; ++i) out << *p++;
- }
- ++nload;
- }
- out.close();
- cout << "loaded " << nload << " channels" << endl;
-
- return true;
-}
-
-bool PixCalibCoralCoolDb::saveCalibData ( string textfile , long long FK )
-{
- cool::RecordSpecification payloadspec;
- // primary / foreign keys
- payloadspec.extend("PrimKey",cool::StorageType::Int32);
- payloadspec.extend("ForeignKey",cool::StorageType::Int64);
- // other data members
- payloadspec.extend("data",cool::StorageType::Blob64k);
-
- cool::RecordSpecification fkspec;
- fkspec.extend("CoolKey",cool::StorageType::Int64);
-
- string desc="<timeStamp>run-lumi</timeStamp><addrHeader><address_header service_type=\"71\" clid=\"55403898\" /></addrHeader><typeName>AthenaAttributeList</typeName>";
-
- string folderName("/PIXEL/PixCalibData");
- string cfolderName("PixCalibData");
-
- CoraCoolFolderPtr folder;
-
- // delete existing folder, if any
- bool do_delete = false;
- if (do_delete && m_coradb->existsFolder(folderName)) {
- try {
- m_coradb->deleteFolder(folderName);
- }
- catch (cool::Exception& e) {
- cout << "problem deleting folder: " << e.what() << endl;
- return false;
- }
- }
-
- // create new folder or get the old one, if any
- if (!m_coradb->existsFolder(folderName)) {
- try {
- folder = m_coradb->createFolder(folderName, cfolderName,
- fkspec, payloadspec, "ForeignKey", "PrimKey", desc,
- cool::FolderVersioning::MULTI_VERSION, true);
- }
- catch (cool::Exception& e) {
- cout << "problem creating folder: " << e.what() << endl;
- return false;
- }
- } else {
- folder = m_coradb->getFolder(folderName);
- }
-
- std::cout << "Succesfully opened/created folders!" << std::endl;
-
- // open text file for input
- ifstream in(textfile.c_str() );
- if( !(in.is_open() ) ){
- cout << "calib-data file: " << textfile << " not found!" << endl;
- return false;
- }
- //return error if textfile not found!
-
- string s;
- int nsave = 0;
-
- string dataString;
- while (in) {
- getline(in,s);
- if (in.eof()) break;
- dataString += s + '\n';
-
- for (int i = 0; i<16; ++i) {
- getline(in,s);
- dataString += s + '\n';
- }
- ++nsave;
- }
- cout << "read " << nsave << " channels" << endl;
-
- // prepare data to save in the payload
- // No sharing, ok.
- coral::AttributeList data ATLAS_THREAD_SAFE = folder->emptyAttrList();
- data["PrimKey"].data<int>() = 0;
- data["ForeignKey"].data<long long>() = FK;
- coral::Blob& blob = data["data"].data<coral::Blob>();
- unsigned int len = dataString.size();
- blob.resize(len);
- char* p = static_cast<char*>(blob.startingAddress());
- for (unsigned int i = 0; i!=len; ++i) *p++ = dataString[i];
-
- vector<coral::AttributeList> datavec;
- datavec.reserve(1);
- datavec.push_back(data);
-
- try {
- //store object and range of run-number
- //folder->storeObject(vk1, vk2, datavec.begin(), datavec.end(), chan);
-
- //just add payload
- folder->addPayload(datavec.begin(), datavec.end());
- }
- catch (cool::Exception& e) {
- cout << "problem writing data: " << e.what() << endl;
- return false;
- }
-
- return true;
-}
-
-bool PixCalibCoralCoolDb::referenceToRunInterval(long long FK, cool::ValidityKey vk1,cool::ValidityKey vk2, const std::string& tagname)
-{
- cool::RecordSpecification payloadspec;
- // primary / foreign keys
- payloadspec.extend("CoolKey",cool::StorageType::Int64);
- payloadspec.extend("PrimKey",cool::StorageType::Int32);
- // payloadspec.extend("ModuleID",cool::StorageType::Int64);
- payloadspec.extend("data",cool::StorageType::String16M);
-
- cool::RecordSpecification fkspec;
- fkspec.extend("CoolKey",cool::StorageType::Int64);
-
- string desc="<timeStamp>run-lumi</timeStamp><addrHeader><address_header service_type=\"71\" clid=\"55403898\" /></addrHeader><typeName>AthenaAttributeList</typeName>";
-
- string folderName("/PIXEL/PixCalibData");
- string cfolderName("PixCalibData");
-
- CoraCoolFolderPtr folder;
-
- // delete existing folder, if any
- bool do_delete = false;
- if (do_delete && m_coradb->existsFolder(folderName)) {
- try {
- m_coradb->deleteFolder(folderName);
- }
- catch (cool::Exception& e) {
- cout << "problem deleting folder: " << e.what() << endl;
- return false;
- }
- }
-
- // create new folder or get the old one, if any
- if (!m_coradb->existsFolder(folderName)) {
- try {
- folder = m_coradb->createFolder(folderName, cfolderName,
- fkspec, payloadspec, "ForeignKey", "PrimKey", desc,
- cool::FolderVersioning::MULTI_VERSION, true);
- }
- catch (cool::Exception& e) {
- cout << "problem creating folder: " << e.what() << endl;
- return false;
- }
- } else {
- folder = m_coradb->getFolder(folderName);
- }
-
- //set the run-interval for the given foreign-key...
- cool::ChannelId chan(0);
- try {
- folder->referenceObject(vk1, vk2, FK, chan, tagname);
- }
- catch (cool::Exception& e) {
- cout << "problem when associating run-interval : " << e.what() << endl;
- return false;
- }
-
- cout << "saved runInterval (FK=" << FK << ") " << endl;
-
- return true;
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PixCalibKnowledgeDb.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PixCalibKnowledgeDb.cc
deleted file mode 100644
index e30b2e2f11415e9da883d5cd8693aa4c69540431..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/PixCalibKnowledgeDb.cc
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PixCalibKnowledgeDb.h"
-
-#include "CxxUtils/checker_macros.h"
-
-// CORAL API
-#include "CoralKernel/Context.h"
-#include "CoralBase/Attribute.h"
-#include "CoralBase/AttributeList.h"
-#include "CoralBase/AttributeListException.h"
-#include "RelationalAccess/IConnectionService.h"
-#include "RelationalAccess/IConnectionServiceConfiguration.h"
-#include "RelationalAccess/AccessMode.h"
-#include "RelationalAccess/ISessionProxy.h"
-#include "RelationalAccess/ISchema.h"
-#include "RelationalAccess/ITransaction.h"
-
-#include "RelationalAccess/ITable.h"
-#include "RelationalAccess/ITableDescription.h"
-#include "RelationalAccess/IColumn.h"
-#include "RelationalAccess/ICursor.h"
-#include "RelationalAccess/IQuery.h"
-#include "RelationalAccess/TableDescription.h"
-#include "RelationalAccess/ITableDataEditor.h"
-#include "RelationalAccess/ITableSchemaEditor.h"
-#include "RelationalAccess/IBulkOperation.h"
-#include "RelationalAccess/SchemaException.h"
-
-// std lib
-#include <fstream>
-#include <iostream>
-#include <vector>
-#include <set>
-using namespace std;
-
-//---------------------------------------------------------------------------
-/** Constructor.
- Open the default database and seal context.
- */
-PixCalibKnowledgeDb::PixCalibKnowledgeDb(const std::string& connString,
- const std::string& tableName,
- int verbose) :
- m_connString(connString), m_pixeltable(tableName),
- m_verbose(verbose), m_session(0) {}
-
-PixCalibKnowledgeDb::~PixCalibKnowledgeDb()
-{
- if (m_verbose) cout << "Disconnecting \"" << m_connString << "\"" << endl;
- delete m_session;
-}
-
-/** initialize connection
- */
-void PixCalibKnowledgeDb::init(coral::AccessMode access_mode)
-{
- if (m_verbose) cout << "Creating Connection Service to \"" << m_connString << "\"" << endl;
- coral::Context* context = &coral::Context::instance();
- coral::IHandle<coral::IConnectionService> lookSvcH = context->query<coral::IConnectionService>();
- if (!lookSvcH.isValid()) {
- context->loadComponent("CORAL/Services/ConnectionService");
- lookSvcH = context->query<coral::IConnectionService>();
- }
- if (!lookSvcH.isValid()) {
- throw runtime_error("Could not locate the connection service");
- }
-
- m_session = lookSvcH->connect(m_connString, access_mode);
- if (m_verbose) cout << "Connection established" << endl;
-}
-
-void PixCalibKnowledgeDb::saveCorrespondingConfig
-(long int UNIXTimeInSeconds, long int RunNumber, const std::string& calibtags_in_string, const std::string& idTag, const std::string& connTag, const std::string& cfgTag, const std::string& cfgModTag )
-{
-
- // create tables if needed
- createTable();
-
- // get a new unique foreign key
- long long fk = updateKey();
- if( fk == -1 ) std::cout << "failed to get unique key?!" << std::endl;
-
- transactionStartUpdate();
-
- //fill config
- transactionStartUpdate();
-
- coral::ITableDataEditor& pixel_editor = m_session->nominalSchema().tableHandle("CALIB_TAGS").dataEditor();
-
- coral::AttributeList pixel_row ATLAS_THREAD_SAFE; // Not shared, ok.
- pixel_row.extend<long int>("UNIXTimeInSeconds");
- pixel_row.extend<long int>("RunNumber");
- pixel_row.extend<std::string>("calibrationTags");
- pixel_row.extend<std::string>("idTag");
- pixel_row.extend<std::string>("connTag");
- pixel_row.extend<std::string>("cfgTag");
- pixel_row.extend<std::string>("cfgModTag");
- pixel_row.extend<long long>("FK");
-
- // string idtag = "PIXEL";
- // string conntag = "PIT-ALL-V36";
- // string cfgTag = "PIT-20C-OLD";
- // int cfgRev = 0;
- // string cfgModTag = "PIT_MOD_MIXED_3000e";
- // int cfgModRev = 0;
-
- pixel_row["UNIXTimeInSeconds"].data<long int>() = UNIXTimeInSeconds;
- pixel_row["RunNumber"].data<long int>() = RunNumber;
- pixel_row["calibrationTags"].data<std::string>() = calibtags_in_string;
- pixel_row["idTag"].data<std::string>() = idTag;
- pixel_row["connTag"].data<std::string>() = connTag;
- pixel_row["cfgTag"].data<std::string>() = cfgTag;
- pixel_row["cfgModTag"].data<std::string>() = cfgModTag;
- pixel_row["FK"].data<long long>() = fk;
-
- pixel_editor.insertRow(pixel_row);
- transactionCommit();
- std::cout << "done saving corresponding config" << std::endl;
-}
-
-//for reading back calibrationTags corresponding to a given time, not sure if this is needed
-void PixCalibKnowledgeDb::readCorrespondingCalibTag (long int Utime){
-
- transactionStartReadOnly();
- //build a query
- coral::IQuery* query = m_session->nominalSchema().tableHandle("CALIB_TAGS").newQuery();
-
- query->addToOutputList("UNIXTimeInSeconds");
- query->defineOutputType("UNIXTimeInSeconds",coral::AttributeSpecification::typeNameForType<long int>());
- query->addToOutputList("calibrationTags");
- query->defineOutputType("calibrationTags",coral::AttributeSpecification::typeNameForType<string>());
-
- coral::AttributeList pixel_knowledgeData ATLAS_THREAD_SAFE; // Not shared, ok
- string pixel_knowledge = "CALIB_TAGS.UNIXTimeInSeconds <= :Utime";
- pixel_knowledgeData.extend<long int>("Utime");
- pixel_knowledgeData[0].data<long int>() = Utime;
-
- query->setCondition( pixel_knowledge, pixel_knowledgeData);
-
- coral::ICursor& cursor = query->execute();
-
- // long long foreignkey = -1;
- string calibtags = "" ;
- long int Utime_h = -99999999;
-
- // go through list of found tables, highest Utime has the correct calibTag-set
-
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- long int UNIXTimeInSeconds = row0[0].data<long int>();
- string calibrationTags = row0[1].data<string>();
- if( Utime_h <= UNIXTimeInSeconds ){
-// cout << " UNIXTimeInSeconds = " << UNIXTimeInSeconds
-// << " calibrationTags = " << calibrationTags << endl;
- Utime_h = UNIXTimeInSeconds;
- calibtags = calibrationTags;
- }
- }
- delete query;
-
- // if( foreignkey != -1 ) calibtag = findTag(foreignkey);
-
- if( calibtags == "" ){
- cout << " corresponding calibration-tags not found!" << endl;
- }
- else {
- std::cout << "UNIXTimeInSeconds " << Utime << " corresponds to the following calibration-tags:\n" << calibtags << std::endl;
- }
- transactionCommit();
-
-}
-
-/** part of save(): create new tables
- */
-void PixCalibKnowledgeDb::createTable ()
-{
- createConfigurationTable();
- createAuxTables();
-}
-
-/** part of save(): create config-tags table
- */
-void PixCalibKnowledgeDb::createConfigurationTable()
-{
- // create header
- transactionStartUpdate();
- string PIXEL_TABLE_CFG = "CALIB_TAGS";
- if (!m_session->nominalSchema().existsTable(PIXEL_TABLE_CFG)) {
- if (m_verbose) cout << "creating " << PIXEL_TABLE_CFG << endl;
- coral::TableDescription cfg_columns( "SchemaDefinition_PIXEL_CFG" );
- cfg_columns.setName( PIXEL_TABLE_CFG );
- cfg_columns.insertColumn("UNIXTimeInSeconds", coral::AttributeSpecification::typeNameForType<long int>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- cfg_columns.insertColumn( "RunNumber", coral::AttributeSpecification::typeNameForType<long long>());
- cfg_columns.insertColumn("calibrationTags", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- cfg_columns.insertColumn("idTag", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- cfg_columns.insertColumn("connTag", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- cfg_columns.insertColumn("cfgTag", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- cfg_columns.insertColumn("cfgModTag", coral::AttributeSpecification::typeNameForType<std::string>(), /*size in BYTES = */ 1000, /*fixed_size=*/ false);
- cfg_columns.insertColumn( "FK", coral::AttributeSpecification::typeNameForType<long long>());
- m_session->nominalSchema().createTable( cfg_columns );
- }
- transactionCommit();
-}
-
-/** part of save(): create key table
- */
-void PixCalibKnowledgeDb::createAuxTables()
-{
- transactionStartUpdate();
- string FK_TABLE = "CALIB_KEYGEN";
- if (!m_session->nominalSchema().existsTable(FK_TABLE)) {
- coral::TableDescription key_columns( "SchemaDefinition_KEY" );
- key_columns.setName( FK_TABLE );
- key_columns.insertColumn( "KEY", coral::AttributeSpecification::typeNameForType<long long>());
- key_columns.createIndex ("KEY_INDEX", "KEY");
- m_session->nominalSchema().createTable( key_columns );
- // fill the first key
- coral::ITableDataEditor& keyeditor = m_session->nominalSchema().tableHandle( FK_TABLE ).dataEditor();
- coral::AttributeList rowBuffer ATLAS_THREAD_SAFE; // Not shared, ok.
- rowBuffer.extend<long long>( "KEY" );
- long long& key = rowBuffer[ "KEY" ].data<long long>();
- key = 1000;
- keyeditor.insertRow( rowBuffer );
- }
- transactionCommit();
-}
-
-/** part of save(): update the key
- */
-long long PixCalibKnowledgeDb::updateKey()
-{
- std::string FK_TABLE = "CALIB_KEYGEN";
- transactionStartUpdate();
-
- coral::ITableDataEditor& keyeditor = m_session->nominalSchema().tableHandle( FK_TABLE ).dataEditor();
- std::string updateAction = "KEY = KEY + :offset";
- coral::AttributeList updateData ATLAS_THREAD_SAFE; // Not shared, ok.
- updateData.extend<long long>("offset");
- updateData[0].data<long long>() = 1;
- keyeditor.updateRows( updateAction, "", updateData );
-
- coral::IQuery* query = m_session->nominalSchema().tableHandle(FK_TABLE).newQuery();
- query->addToOutputList("KEY");
- coral::ICursor& cursor = query->execute();
- long long key = -1;
- while ( cursor.next() ) {
- const coral::AttributeList &row0 = cursor.currentRow();
- key = row0[0].data<long long>();
- if (m_verbose) std::cout << " KEY = " << key << std::endl;
- }
- transactionCommit();
- return key;
-}
-
-/** CORAL helper to start a transaction in readonly mode
- */
-void PixCalibKnowledgeDb::transactionStartReadOnly(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(true /*ReadOnly*/);
-}
-
-/** CORAL helper to start a transaction in update mode
- */
-void PixCalibKnowledgeDb::transactionStartUpdate(){
- if (m_session->transaction().isActive()) m_session->transaction().rollback();
- m_session->transaction().start(false /*update*/);
-}
-
-/** CORAL helper to commit changes at the end of a transaction
- */
-void PixCalibKnowledgeDb::transactionCommit(){
- if (m_session->transaction().isActive()) m_session->transaction().commit();
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/SpecialPixelMap.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/SpecialPixelMap.cc
deleted file mode 100644
index 4107349e998a23158ad320349938a5d0dec396ae..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/SpecialPixelMap.cc
+++ /dev/null
@@ -1,1751 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-//****************************************************************************
-// SpecialPixelMap.cxx
-//
-// Classes to hold data about special pixels in the detector store and make it
-// accessible to athena components.
-//
-// author Christoph Ruwiedel <ruwiedel@physik.uni-bonn.de>
-// updated to be comptible with IBL and phase II: -- Wei-Ming Yao <wmyao@lbl.gov>
-
-
-#include "PixelCoralClientUtils/SpecialPixelMap.hh"
-
-#include<fstream>
-#include<sstream>
-#include<string>
-#include<iomanip>
-#include<stdint.h>
-#include<cmath>
-
-
-namespace PixelCoralClientUtils {
-
-//***** DetectorSpecialPixelMap *****//
-
-//===== Constructors, Destructor =====//
-
-DetectorSpecialPixelMap::DetectorSpecialPixelMap(){}
-
-DetectorSpecialPixelMap::DetectorSpecialPixelMap(const DetectorSpecialPixelMap& spm) :
- std::vector<ModuleSpecialPixelMap*>(){
-
- for(DetectorSpecialPixelMap::const_iterator module = spm.begin(); module != spm.end(); ++module){
-
- push_back(new ModuleSpecialPixelMap(**module));
-
- }
-}
-
-DetectorSpecialPixelMap::DetectorSpecialPixelMap(const std::vector<ModuleSpecialPixelMap*>& modules){
-
- for(std::vector<ModuleSpecialPixelMap*>::const_iterator module = modules.begin(); module != modules.end(); ++module){
-
- push_back(new ModuleSpecialPixelMap(**module));
-
- }
-}
-
-void DetectorSpecialPixelMap::clear(){
-
- for(const_iterator module = begin(); module != end(); ++module){
- delete *module;
- }
- std::vector<ModuleSpecialPixelMap*>::clear();
-}
-
-DetectorSpecialPixelMap::~DetectorSpecialPixelMap(){
- for(const_iterator module = begin(); module != end(); ++module){
- delete *module;
- }
-}
-
-
-//===== member functions =====//
-
-const ModuleSpecialPixelMap* DetectorSpecialPixelMap::module(unsigned int moduleHash) const{
- return (*this)[moduleHash];
-}
-
-
-DetectorSpecialPixelMap& DetectorSpecialPixelMap::operator=(const DetectorSpecialPixelMap& spm){
- if(&spm != this){
- for(const_iterator module = begin(); module != end(); ++module){
- delete *module;
- }
-
- resize(spm.size());
-
- for(DetectorSpecialPixelMap::const_iterator module = spm.begin(); module != spm.end(); ++module){
- (*this)[module - spm.begin()] = new ModuleSpecialPixelMap(**module);
- }
- }
- return *this;
-}
-
-DetectorSpecialPixelMap& DetectorSpecialPixelMap::operator+=(const DetectorSpecialPixelMap& spm){
- if(&spm != this){
-
- if(size() != spm.size()){
- std::cout << "Unable to merge special pixel maps: sizes do not match" << std::endl;
-
- return *this;
- }
-
- for(DetectorSpecialPixelMap::const_iterator module = spm.begin(); module != spm.end(); ++module){
- if( (*this)[module - spm.begin()] == 0 && (*module) != 0 ){
- (*this)[module - spm.begin()] = new ModuleSpecialPixelMap( **module );
- }
- else if( (*module) != 0 ){
- (*this)[module - spm.begin()]->merge(*module);
- }
- }
- }
- return *this;
-}
-
-void DetectorSpecialPixelMap::merge(const DetectorSpecialPixelMap* spm){
- (*this) += (*spm);
- return;
-}
-
-void DetectorSpecialPixelMap::markSpecialRegions(){
- for(DetectorSpecialPixelMap::iterator module = begin(); module != end(); ++module){
- (*module)->markSpecialRegions();
- }
- return;
-}
-
-void DetectorSpecialPixelMap::setNeighbourFlags(){
- for(DetectorSpecialPixelMap::iterator module = begin(); module != end(); ++module){
- (*module)->setNeighbourFlags();
- }
- return;
-}
-
-
-
-//***** ModuleSpecialPixelMap *****//
-
-//===== Constructors, Destructor =====//
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap() :
- m_chipsPerModule(0),
- m_module_status(0)
-{}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const ModuleSpecialPixelMap& mspm) :
- std::map<unsigned int, unsigned int>(mspm),
- m_chipsPerModule(mspm.m_chipsPerModule),
- m_module_status(mspm.m_module_status),
- m_chip_status(mspm.m_chip_status),
- m_column_pair_status(mspm.m_column_pair_status)
-{}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const char* filename, unsigned int mchips) :
- m_chipsPerModule(mchips),
- m_module_status(0)
-{
- std::ifstream in(filename, std::ios_base::in);
- //std::string ssink;
- //std::getline(in, ssink);
-
- while(in.good()){
- unsigned int chip, column, row, status;
- in >> chip >> column >> row >> status;
-
- if(in.good()){
- if(validPixelID(chip, column, row)){
- //do not record pixels that are listed as "unknown dead" and nothing else
- if((status & ~((15 << 25) + (1 << 16))) != 0){
- //mark pixels as "unknown dead" if they are dead but we don't know why
- if((status % 2 == 1) && ((status & (255 << 8)) == 0)){
- setPixelStatus(encodePixelID(chip, column, row, m_chipsPerModule), status |= (1 << 16));
- }
- else{
- setPixelStatus(encodePixelID(chip, column, row, m_chipsPerModule), status);
- }
- }
- }
- else{
- std::cout << "In ModuleSpecialPixelMap::ModuleSpecialPixelMap(const char*) :"
- << " Invalid pixel ID read from text file" << std::endl;
- }
- }
- }
-
- setNeighbourFlags();
-}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const std::string& clob, unsigned int mchips) :
- m_chipsPerModule(mchips),
- m_module_status(0)
-{
- bool statuscode = fill_from_string(clob);
- if( statuscode ){
- std::cout << "In ModuleSpecialPixelMap::ModuleSpecialPixelMap(const std::string&) :"
- << " Construction from clob failed" << std::endl;
- }
-}
-
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const coral::Blob& blob, unsigned int mchips) :
- m_chipsPerModule(mchips),
- m_module_status(0)
-{
- bool statuscode = fill_from_blob(blob);
- if(statuscode){
- std::cout << "In ModuleSpecialPixelMap::ModuleSpecialPixelMap(const coral::Blob&) :"
- << " Construction from blob failed" << std::endl;
- }
-}
-
-ModuleSpecialPixelMap::ModuleSpecialPixelMap(const std::map<unsigned int, unsigned int>& pixels,
- unsigned int module_status,
- const std::vector<unsigned int>& chip_status,
- const std::vector<std::vector<unsigned int> >& column_pair_status,
- unsigned int mchips) :
- std::map<unsigned int, unsigned int>(pixels),
- m_chipsPerModule(mchips),
- m_module_status(module_status),
- m_chip_status(chip_status),
- m_column_pair_status(column_pair_status)
-{
-}
-
-ModuleSpecialPixelMap::~ModuleSpecialPixelMap(){}
-
-
-//===== public member functions =====//
-
-
-ModuleSpecialPixelMap& ModuleSpecialPixelMap::operator=(const ModuleSpecialPixelMap& mspm){
- if(&mspm != this){
- std::map<unsigned int, unsigned int>::operator=(mspm);
- m_module_status = mspm.m_module_status;
- m_chip_status = mspm.m_chip_status;
- m_column_pair_status = mspm.m_column_pair_status;
- m_chipsPerModule = mspm.m_chipsPerModule;
- }
- return *this;
-}
-
-ModuleSpecialPixelMap& ModuleSpecialPixelMap::operator+=(ModuleSpecialPixelMap mspm){
-
- if(mspm.moduleStatus() != 0 || mspm.hasSpecialChips() || mspm.hasSpecialColumnPairs() || !mspm.empty()){
-
- mspm.resetSpecialRegions();
- resetSpecialRegions();
-
- for(ModuleSpecialPixelMap::const_iterator pixel = mspm.begin(); pixel != mspm.end(); ++pixel){
- (*this)[(*pixel).first] |= (*pixel).second;
- }
-
- markSpecialRegions();
- setNeighbourFlags();
- }
-
- return *this;
-}
-
-void ModuleSpecialPixelMap::merge(const ModuleSpecialPixelMap* mspm){
- (*this) += (*mspm);
- return;
-}
-
-unsigned int ModuleSpecialPixelMap::pixelStatus(unsigned int pixelID) const{
- int i = (int)chipType();
- int mch = (int)chipsPerModule();
- int mcolumns =(int)columnsPerChip();
- int mrowsrdo = (int)rowsrdoPerChip();
-
- int chip = pixelID % 16;
- int column = (i==0) ? ((pixelID / 16) % 32) : ((pixelID / 16) % 256);
- int row = (i==0) ? (pixelID / 512) : (pixelID / 4096);
-
- if(mch>2){
-
- if(m_module_status != 0){
- unsigned int status = m_module_status;
- if(column != 0 || (chip != 0 && chip != mch/2)){ // left
- status |= (1 << 27);
- }
- if(column != (mcolumns -1) || (chip != (mch/2 - 1) && chip != (mch - 1))){ // right
- status |= (1 << 28);
- }
- status |= (1 << 26); // top
- if(row != 0){ // bottom
- status |= (1 << 25);
- }
- return status;
- }
- else if(m_chip_status.size() != 0 && m_chip_status[chip] != 0){
-
- unsigned int status = m_chip_status[chip];
- ModuleSpecialPixelMap::const_iterator pixel;
-
- if(column != 0){ // left
- status |= (1 << 27);
- }
- else if(column == 0 && chip != 0 && chip != mch/2){
- pixel = find(encodePixelID(chip - 1, (mcolumns-1), row, m_chipsPerModule));
- if(m_chip_status[chip-1] != 0){
- status |= (1 << 27);
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[chip - 1].size() != 0
- && m_column_pair_status[chip - 1][mcolumns/2 - 1] != 0){
- status |= (1 << 27);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 27);
- }
- }
- }
-
- if(column != (mcolumns -1)){ // right
- status |= (1 << 28);
- }
- else if(column == (mcolumns-1) && chip != (mch/2 - 1) && chip != (mch - 1)){
- pixel = find(encodePixelID(chip + 1, 0, row, m_chipsPerModule));
- if(m_chip_status[chip + 1] != 0){
- status |= (1 << 28);
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[chip + 1].size() != 0
- && m_column_pair_status[chip + 1][0] != 0){
- status |= (1 << 28);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 28);
- }
- }
- }
-
- if(row != (mrowsrdo - 1)){ // top
- status |= (1 << 26);
- }
- else if(row == (mrowsrdo - 1)){
- pixel = find(encodePixelID(mch-1- chip, mcolumns-1- column, row, m_chipsPerModule));
- if(m_chip_status[mch-1 - chip] != 0){
- status |= (1 << 26);
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[mch - 1 - chip].size() != 0
- && m_column_pair_status[mch - 1 - chip][(mcolumns - 1 - column) / 2] != 0){
- status |= (1 << 26);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 26);
- }
- }
- }
-
- if(row != 0){ // bottom
- status |= (1 << 25);
- }
- return status;
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[chip].size() != 0
- && m_column_pair_status[chip][column / 2] != 0){
- unsigned int status = m_column_pair_status[chip][column / 2];
- ModuleSpecialPixelMap::const_iterator pixel;
-
- if(column % 2 != 0){ // left
- status |= (1 << 27);
- }
- else if(column % 2 == 0 && column != 0){
- pixel = find(encodePixelID(chip, column - 1, row, m_chipsPerModule));
- if(m_column_pair_status[chip][column / 2 - 1] != 0){
- status |= (1 << 27);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 27);
- }
- }
- }
- else if(column == 0 && chip != 0 && chip != mch/2){
- pixel = find(encodePixelID(chip - 1, mcolumns - 1, row, m_chipsPerModule));
- if(m_chip_status.size() != 0 && m_chip_status[chip - 1] != 0){
- status |= (1 << 27);
- }
- else if(m_column_pair_status[chip - 1].size() != 0
- && m_column_pair_status[chip - 1][mcolumns/2 - 1] != 0){
- status |= (1 << 27);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 27);
- }
- }
- }
-
- if(column % 2 == 0){ // right
- status |= (1 << 28);
- }
- else if(column % 2 != 0 && column != (mcolumns -1)){
- pixel = find(encodePixelID(chip, column + 1, row, m_chipsPerModule));
- if(m_column_pair_status[chip][(column / 2) + 1] != 0){
- status |= (1 << 28);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 28);
- }
- }
- }
- else if(column == (mcolumns-1) && chip != (mch/2-1) && chip != (mch-1)){
- pixel = find(encodePixelID(chip + 1, 0, row, m_chipsPerModule));
- if(m_chip_status.size() != 0 && m_chip_status[chip + 1] != 0){
- status |= (1 << 28);
- }
- else if(m_column_pair_status[chip + 1].size() != 0
- &&m_column_pair_status[chip + 1][0] != 0){
- status |= (1 << 28);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 28);
- }
- }
- }
-
- if(row != (mrowsrdo - 1)){ // top
- status |= (1 << 26);
- }
- else if(row == (mrowsrdo-1)){
- pixel = find(encodePixelID(mch-1 - chip, mcolumns-1 - column, mrowsrdo-1, m_chipsPerModule));
- if(m_chip_status.size() != 0 && m_chip_status[mch-1 - chip] != 0){
- status |= (1 << 26);
- }
- else if(m_column_pair_status[mch-1 - chip].size() != 0
- && m_column_pair_status[mch-1 - chip][(mcolumns-1 - column) / 2] != 0){
- status |= (1 << 26);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 26);
- }
- }
- }
-
- if(row != 0){ // bottom
- status |= (1 << 25);
- }
- return status;
- }
- else if(empty()){
- return 0;
- }
- else{
- const_iterator pixel = find(pixelID);
- if(pixel == end()){
- return 0;
- }
- else{
- return (*pixel).second;
- }
- }
- }
- else { // IBL modules
-
- if(m_module_status != 0){
- unsigned int status = m_module_status;
- if(column != 0 || (chip != 0)){ // left
- status |= (1 << 27);
- }
- if(column != (mcolumns-1) || (chip != 1&&mch==2)){ // right
- status |= (1 << 28);
- }
- if(row != (mrowsrdo-1))status |= (1 << 26); // top
- if(row != 0){ // bottom
- status |= (1 << 25);
- }
- return status;
- }
- else if(m_chip_status.size() != 0 && m_chip_status[chip] != 0){
-
- unsigned int status = m_chip_status[chip];
- ModuleSpecialPixelMap::const_iterator pixel;
-
- if(column != 0){ // left
- status |= (1 << 27);
- }
- else if(column == 0 && chip != 0&&mch==2){
- pixel = find(encodePixelID(chip - 1, mcolumns-1, row, m_chipsPerModule));
- if(m_chip_status[chip-1] != 0){
- status |= (1 << 27);
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[chip - 1].size() != 0
- && m_column_pair_status[chip - 1][mcolumns/2 - 1] != 0){
- status |= (1 << 27);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 27);
- }
- }
- }
-
- if(column != (mcolumns - 1) ){ // right
- status |= (1 << 28);
- }
- else if(column == (mcolumns - 1) && chip != 1 &&mch==2){
- pixel = find(encodePixelID(chip + 1, 0, row,m_chipsPerModule));
- if(m_chip_status[chip + 1] != 0){
- status |= (1 << 28);
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[chip + 1].size() != 0
- && m_column_pair_status[chip + 1][0] != 0){
- status |= (1 << 28);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 28);
- }
- }
- }
-
- if(row != (mrowsrdo-1)){ // top
- status |= (1 << 26);
- }
-
- if(row != 0){ // bottom
- status |= (1 << 25);
- }
- return status;
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[chip].size() != 0
- && m_column_pair_status[chip][column / 2] != 0){
- unsigned int status = m_column_pair_status[chip][column / 2];
- ModuleSpecialPixelMap::const_iterator pixel;
-
- if(column % 2 != 0){ // left
- status |= (1 << 27);
- }
- else if(column % 2 == 0 && column != 0){
- pixel = find(encodePixelID(chip, column - 1, row, m_chipsPerModule));
- if(m_column_pair_status[chip][(column / 2) - 1] != 0){
- status |= (1 << 27);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 27);
- }
- }
- }
- else if(column == 0 && chip != 0 && mch==2){
- pixel = find(encodePixelID(chip - 1, (mcolumns-1), row, m_chipsPerModule));
- if(m_chip_status.size() != 0 && m_chip_status[chip - 1] != 0){
- status |= (1 << 27);
- }
- else if(m_column_pair_status[chip - 1].size() != 0
- && m_column_pair_status[chip - 1][mcolumns/2-1] != 0){
- status |= (1 << 27);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 27);
- }
- }
- }
-
- if(column % 2 == 0){ // right
- status |= (1 << 28);
- }
- else if(column % 2 != 0 && column != (mcolumns-1)){
- pixel = find(encodePixelID(chip, column + 1, row, m_chipsPerModule));
- if(m_column_pair_status[chip][(column / 2) + 1] != 0){
- status |= (1 << 28);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 28);
- }
- }
- }
- else if(column == (mcolumns-1) && chip != 1 && mch==2){
- pixel = find(encodePixelID(chip + 1, 0, row, m_chipsPerModule));
- if(m_chip_status.size() != 0 && m_chip_status[chip + 1] != 0){
- status |= (1 << 28);
- }
- else if(m_column_pair_status[chip + 1].size() != 0
- &&m_column_pair_status[chip + 1][0] != 0){
- status |= (1 << 28);
- }
- else if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
- status |= (1 << 28);
- }
- }
- }
-
- if(row != (mrowsrdo-1)){ // top
- status |= (1 << 26);
- }
- if(row != 0){ // bottom
- status |= (1 << 25);
- }
- return status;
- }
- else if(empty()){
- return 0;
- }
- else{
- const_iterator pixel = find(pixelID);
- if(pixel == end()){
- return 0;
- }
- else{
- return (*pixel).second;
- }
- }
- }
-}
-
-bool ModuleSpecialPixelMap::pixelStatusBit(unsigned int pixelID, unsigned int bit) const{
- if(bit < 32){
- unsigned int status = pixelStatus(pixelID);
- return static_cast<bool>(status & (1u << bit));
- }
- else {
- std::cout << "Requested bit " << bit << " out of range ([0,31] allowed)" << std::endl;
- }
- return false;
-}
-
-std::string ModuleSpecialPixelMap::to_string() const{
-
- std::ostringstream clob(std::ios::binary);
-
- clob << m_module_status << ' ';
-
- unsigned int specialRegionsStatus = 0;
- int mch =(int)chipsPerModule();
- int mcolumns = (int)columnsPerChip()/2;
-
- for(int i = 0; i < mch; i++){
- if(m_chip_status.size() != 0 && m_chip_status[i] != 0){
- specialRegionsStatus |= (1 << i);
- }
- for(int j = 0; j < mcolumns; j++){
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0
- && m_column_pair_status[i][j] != 0){
- specialRegionsStatus |= (1 << (i+mch));
- }
- }
- }
-
- clob << specialRegionsStatus << ' ';
-
- for(int i = 0; i < mch; i++){
- if((specialRegionsStatus & (1 << i)) != 0){
- clob << m_chip_status[i] << ' ';
- }
- if((specialRegionsStatus & (1 << (i+mch))) != 0){
- for(int j = 0; j < mcolumns; j++){
- clob << m_column_pair_status[i][j] << ' ';
- }
- }
- }
-
- for(const_iterator mi = begin(); mi != end(); ++mi){
- clob << mi->first << ' ' << mi->second << ' ';
- }
- return clob.str();
-}
-
-
-coral::Blob* ModuleSpecialPixelMap::to_blob() const{
-
- unsigned int specialRegionsStatus = 0;
- unsigned int specialRegionsSize = 0;
- int mch =(int)chipsPerModule();
- int mcolumns = (int)columnsPerChip()/2;
-
- for(int i = 0; i < mch; i++){
- if(m_chip_status.size() != 0 && m_chip_status[i] != 0){
- specialRegionsStatus |= (1 << i);
- ++specialRegionsSize;
- }
- for(int j = 0; j < mcolumns; j++){
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0
- && m_column_pair_status[i][j] != 0){
-
- if( (specialRegionsStatus & (1 << (i+mch)) ) == 0){
- specialRegionsSize += mcolumns;
- }
-
- specialRegionsStatus |= (1 << (i+mch));
- }
- }
- }
-
- coral::Blob* blob = new coral::Blob( (2 + specialRegionsSize + 2 * size()) * sizeof(uint32_t) );
-
- uint32_t* p = static_cast<uint32_t*>(blob->startingAddress());
-
- *p = m_module_status;
- ++p;
- *p = specialRegionsStatus;
-
- for(int i = 0; i < mch; i++){
- if((specialRegionsStatus & (1 << i)) != 0){
- ++p;
- *p = m_chip_status[i];
- }
- if((specialRegionsStatus & (1 << (i+mch))) != 0){
- for(int j = 0; j < mcolumns; j++){
- ++p;
- *p = m_column_pair_status[i][j];
- }
- }
- }
-
- for(const_iterator mi = begin(); mi != end(); ++mi){
- ++p;
- *p = mi->first;
- ++p;
- *p = mi->second;
- }
-
- return blob;
-}
-
-void ModuleSpecialPixelMap::print(int component,
- unsigned int layer,
- unsigned int phi,
- int eta,
- bool verbosePixelID,
- bool binaryPixelStatus) const{
-
- unsigned int system, subSystem;
- system = 2;
- subSystem = 1;
-
- int itype = (int)chipType();
- int mch = (int)chipsPerModule();
- int mcolumns =(int)columnsPerChip();
-
- // check what to do with moduleID ?
- int moduleID = itype==0 ? ( ( ((component + 2) / 2) << 25 ) +
- ( layer << 23 ) + ( phi << 17 ) + ( (eta + 6) << 13 )): -1;
-
- //print header
-
- std::cout << " " << std::endl;
- if(moduleID>-1)std::cout << "ModuleSpecialPixelMap for module " << moduleID << ":" << std::endl;
- std::cout << "Offline ID [system,subsystem,endcap/barrel,layer/disk,phi,eta] : ["
- << system << ',' << subSystem << ',' << component << ',' << layer << ',' << phi << ',' << eta << ']' << std::endl;
- std::cout << "Module status: ";
- std::cout.width(10);
- std::cout << m_module_status << std::endl;
- std::cout << " " << std::endl;
-
- bool print_chip_status = false;
- bool print_column_pair_status = false;
-
- for(int i = 0; i < mch; i++){
- if(m_chip_status.size() != 0 && m_chip_status[i] != 0){
- print_chip_status = true;
- }
- for(int j = 0; j < mcolumns/2; j++){
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0
- && m_column_pair_status[i][j] != 0){
- print_chip_status = true;
- print_column_pair_status = true;
- }
- }
- }
-
- if(mch>2){
- if(print_chip_status){
- std::cout << "Chip number: ";
- for(int i = mch-1; i>mch/2-1; i--)std::cout<<i<<" ";
- std::cout<< std::endl;
- std::cout << "Chip status: ";
- for(int i = mch-1; i > mch/2-1; i--){
- std::cout.width(10);
- if(m_chip_status.size() != 0){
- std::cout << m_chip_status[i] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- std::cout << " " << std::endl;
-
- if(print_column_pair_status){
- std::cout << "Column pairs: ";
- for(int i = mch-1; i > mch/2-1; i--){
- std::cout.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- std::cout << m_column_pair_status[i][0] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- std::cout << "pairs 0 to "<<mch/2<<" ";
- for(int i = mch-1; i > mch/2-1; i--){
- std::cout.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- std::cout << m_column_pair_status[i][1] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- for(int j = 2; j < mcolumns/2; j++){
- std::cout << " ";
- for(int i = mch-1; i > mch/2-1; i--){
- std::cout.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- std::cout << m_column_pair_status[i][j] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- }
- std::cout << " " << std::endl;
-
-
- std::cout << "Column pairs: ";
- for(int i = 0; i < mch/2; i++){
- std::cout.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- std::cout << m_column_pair_status[i][0] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- std::cout << "pairs 0 to "<<mch/2<<" ";
- for(int i = 0; i < mch/2; i++){
- std::cout.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- std::cout << m_column_pair_status[i][1] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- for(int j = 2; j < mcolumns/2; j++){
- std::cout << " ";
- for(int i = 0; i < mch/2; i++){
- std::cout.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- std::cout << m_column_pair_status[i][j] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- }
- std::cout << " " << std::endl;
- }
- else{
- std::cout << "No special column pairs on this module" << std::endl;
- std::cout << " " << std::endl;
- }
-
- std::cout << "Chip status: ";
- for(int i = 0; i < mch/2; i++){
- std::cout.width(10);
- if(m_chip_status.size() != 0){
- std::cout << m_chip_status[i] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- std::cout << "Chip number: ";
- for(int i = 0; i<mch/2; ++i)std::cout<<i<<" ";
- std::cout<< std::endl;
- std::cout << " " << std::endl;
- std::cout << " " << std::endl;
- }
- else{
- std::cout << "No special chips and/or column pairs on this module" << std::endl;
- std::cout << " " << std::endl;
- }
-
- //print map
-
- for(const_iterator pixel = begin(); pixel != end(); ++pixel){
- if(verbosePixelID){
- unsigned int pixelID = pixel->first;
- unsigned int chip = pixelID % 16;
- unsigned int column = (itype==0) ? ((pixelID / 16) % 32) : ((pixelID / 16) % 256);
- unsigned int row = (itype==0) ? (pixelID / 512) : (pixelID / 4096);
- std::cout << "Pixel (chip/column/row) ";
- std::cout << ' ';
- std::cout << chip << "/";
- std::cout << ' ';
- std::cout << column << "/";
- std::cout << ' ';
- std::cout << row;
- }
- else{
- std::cout << "Pixel " << pixel->first;
- }
- if(binaryPixelStatus){
- unsigned int pixelStatus = pixel->second;
- std::cout << " status: ";
- for(int i = 31; i >= 0; i--){
- bool statusBit = pixelStatus & (1u << i);
- std::cout << statusBit;
- if(!(i%4)) std::cout << ' ';
- }
- std::cout << std::endl;
- }
- else{
- std::cout << " status: " << pixel->second << std::endl;
- }
- }
- }
- else{ // IBL FEI4 module
- //
- if(print_chip_status){
- std::cout << "Chip number: ";
- for(int i =0; i<mch; ++i)std::cout<<i<<" ";
- std::cout<< std::endl;
-
- std::cout << "Chip status: ";
- for(int i = 0; i < (int)mch; i++){
- std::cout.width(10);
- if(m_chip_status.size() != 0){
- std::cout << m_chip_status[i] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- std::cout << " " << std::endl;
-
- if(print_column_pair_status){
- std::cout << "Column pairs 0 to "<<mcolumns/2<<" ";
- std::cout << std::endl;
- for(int j = 0; j<mcolumns/2; ++j){
- for(int i = 0; i < mch; i++){
- std::cout.width(10);
- if(m_column_pair_status.size() != 0 && m_column_pair_status[i].size() != 0){
- std::cout << m_column_pair_status[i][j] << " ";
- }
- else{
- std::cout << 0 << " ";
- }
- }
- std::cout << std::endl;
- }
-
- std::cout << " " << std::endl;
-
- }
- else{
- std::cout << "No special column pairs on this module" << std::endl;
- std::cout << " " << std::endl;
- }
- }
- else{
- std::cout << "No special chips and/or column pairs on this module" << std::endl;
- std::cout << " " << std::endl;
- }
-
- //print map
-
- for(const_iterator pixel = begin(); pixel != end(); ++pixel){
- if(verbosePixelID){
- unsigned int pixelID = pixel->first;
- unsigned int chip = pixelID % 16;
- unsigned int column = (itype==0) ? ((pixelID / 16) % 32) : ((pixelID / 16) % 256);
- unsigned int row = (itype==0) ? (pixelID / 512) : (pixelID / 4096);
-
- std::cout << "Pixel (chip/column/row) ";
- std::cout <<' ';
- std::cout << chip << "/";
- std::cout <<' ';
- std::cout << column << "/";
- std::cout <<' ';
- std::cout << row;
- }
- else{
- std::cout << "Pixel " << pixel->first;
- }
- if(binaryPixelStatus){
- unsigned int pixelStatus = pixel->second;
- std::cout << " status: ";
- for(int i = 31; i >= 0; i--){
- bool statusBit = pixelStatus & (1u << i);
- std::cout << statusBit;
- if(!(i%4)) std::cout << ' ';
- }
- std::cout << std::endl;
- }
- else{
- std::cout << " status: " << pixel->second << std::endl;
- }
- }
- //
- }
- return;
-}
-
-void ModuleSpecialPixelMap::setPixelStatus(unsigned int pixelID, unsigned int status){
- if(validPixelID(pixelID)){
- condResetSpecialRegions(pixelID, status);
-
- unsigned int chip = pixelID % 16;
- unsigned int column = chipType()==0 ? ((pixelID / 16) % 32): ((pixelID / 16) % 256);
-
- if(status == 0){
- erase(pixelID);
- }
- else{
- if(m_module_status == 0 && (m_chip_status.size() == 0 || m_chip_status[chip] == 0)
- && (m_column_pair_status.size() == 0 || m_column_pair_status[chip].size() == 0
- || m_column_pair_status[chip][column/ 2] == 0)){
- (*this)[pixelID] = status;
- }
- }
- }
- else{
- std::cout << "Invalid pixel ID requested";
- }
- return;
-}
-
-void ModuleSpecialPixelMap::setPixelStatusBit(unsigned int pixelID, unsigned int bit){
- unsigned int chip = pixelID % 16;
- unsigned int column = (chipType())==0 ? ((pixelID / 16) % 32): ((pixelID / 16) % 256);
-
- if(validPixelID(pixelID)){
- if((pixelStatus(pixelID) & (1 << bit)) == 0){
- condResetSpecialRegions(pixelID, pixelStatus(pixelID) | (1 << bit));
- }
- if(bit < 32){
- if(m_module_status == 0 && (m_chip_status.size() == 0 || m_chip_status[chip] == 0)
- && (m_column_pair_status.size() == 0 || m_column_pair_status[chip].size() == 0
- || m_column_pair_status[chip][column / 2] == 0)){
- (*this)[pixelID] |= (1 << bit);
- }
- }
- else {
- std::cout << "Requested bit " << bit << " out of range ([0,31] allowed)" << std::endl;
- }
- }
- else{
- std::cout << "Invalid pixel ID requested" << std::endl;
- }
- return;
-}
-
-void ModuleSpecialPixelMap::clearPixelStatusBit(unsigned int pixelID, unsigned int bit){
- unsigned int chip = pixelID % 16;
- unsigned int column = chipType()==0 ? ((pixelID / 16) % 32): ((pixelID /16) % 256);
-
- if(validPixelID(pixelID)){
- if((pixelStatus(pixelID) & (1 << bit)) != 0){
- condResetSpecialRegions(pixelID, pixelStatus(pixelID) & ~(1 << bit));
- }
- if(bit < 32){
- if(!empty()){
- if(find(pixelID) != end()){
- if(m_module_status == 0 && (m_chip_status.size() == 0 || m_chip_status[chip] == 0)
- && (m_column_pair_status.size() == 0 || m_column_pair_status[chip].size() == 0
- || m_column_pair_status[chip][column / 2] == 0)){
- (*this)[pixelID] &= ~(1 << bit);
- if(((*this)[pixelID] & ~(15 << 25)) == 0){
- erase(pixelID);
- }
- }
- }
- }
- }
- else{
- std::cout << "Requested bit " << bit << " out of range ([0,31] allowed)" << std::endl;
- }
- }
- else {
- std::cout << "Invalid pixel ID requested" << std::endl;
- }
- return;
-}
-
-void ModuleSpecialPixelMap::condResetSpecialRegions(unsigned int pixelID, unsigned status){
-
- // reset module/chip/column pair status if necessary
- unsigned int ix = chipType();
- unsigned int mcolumns = columnsPerChip()/2;
- unsigned int mrows = rowsrdoPerChip();
- int mch = (int)chipsPerModule();
- unsigned int chip = pixelID % 16;
- unsigned int column = (ix==0) ? ((pixelID / 16) % 32): ((pixelID /16) % 256);
-
- if(m_module_status != 0 && m_module_status != (status & ~(15 << 25))){
- m_chip_status.resize(mch);
- for(int i = 0; i < mch; i++){
- m_chip_status[i] = m_module_status;
- }
- m_module_status = 0;
- }
-
- if(m_chip_status.size() != 0 && m_chip_status[chip] != 0
- && m_chip_status[chip] != (status & ~(15 << 25))){
- m_column_pair_status.resize(mch);
- m_column_pair_status[chip].resize(mcolumns);
- for(int j = 0; j < (int)mcolumns; j++){
- m_column_pair_status[chip][j] = m_chip_status[chip];
- }
- m_chip_status[chip] = 0;
- }
-
- if(m_column_pair_status.size() != 0 && m_column_pair_status[chip].size() != 0
- && m_column_pair_status[chip][column / 2] != 0
- && m_column_pair_status[chip][column / 2] != (status & ~(15 << 25))){
- for(int i = 0; i < 2; i++){
- for(int row = 0; row < (int)mrows; row++){
- (*this)[encodePixelID(chip, (column / 2) * 2 + i, row, m_chipsPerModule)]
- = m_column_pair_status[chip][column / 2];
- }
- }
- m_column_pair_status[chip][column / 2] = 0;
- setNeighbourFlags();
- }
-
- return;
-}
-
-void ModuleSpecialPixelMap::resetSpecialRegions(){
- unsigned int mcolumns = columnsPerChip()/2;
- unsigned int mrows = rowsrdoPerChip();
- int mch = (int)chipsPerModule();
-
- // reset module/chip/column pair status
-
- if(m_module_status != 0){
- m_chip_status.resize(mch);
- for(int chip = 0; chip < mch; chip++){
- m_chip_status[chip] = m_module_status;
- }
- m_module_status = 0;
- }
-
- if(m_chip_status.size() != 0){
- for(int chip = 0; chip < mch; chip++){
- if(m_chip_status[chip] != 0){
- m_column_pair_status.resize(mch);
- m_column_pair_status[chip].resize(mcolumns);
- for(int column_pair = 0; column_pair < (int)mcolumns; column_pair++){
- m_column_pair_status[chip][column_pair] = m_chip_status[chip];
- }
- }
- }
- m_chip_status.resize(0);
- }
-
- if(m_column_pair_status.size() != 0){
- for(int chip = 0; chip < mch; chip++){
- if(m_column_pair_status[chip].size() != 0){
- for(int column_pair = 0; column_pair < (int)mcolumns; column_pair++){
- if(m_column_pair_status[chip][column_pair] != 0){
- for(int i = 0; i < 2; i++){
- for(int row = 0; row < (int)mrows; row++){
- (*this)[encodePixelID(chip, 2*column_pair + i, row, m_chipsPerModule)]
- = m_column_pair_status[chip][column_pair];
- }
- }
- }
- }
- }
- }
- m_column_pair_status.resize(0);
- setNeighbourFlags();
- }
- return;
-}
-
-bool ModuleSpecialPixelMap::fill_from_string(const std::string& clob){
- unsigned int mcolumns = columnsPerChip()/2;
- int mch = (int)chipsPerModule();
- int mkey = (int)pow(2, mch) -1;
-
- unsigned int pixelID, status;
- std::istringstream input_string(clob, std::ios::binary);
- input_string >> m_module_status;
-
- unsigned int specialRegionsStatus = 0;
-
- input_string >> specialRegionsStatus;
-
- if((specialRegionsStatus & mkey) != 0){
- m_chip_status.resize(mch);
- }
- if((specialRegionsStatus & (mkey << mch)) != 0){
- m_column_pair_status.resize(mch);
- }
-
- for(int i = 0; i < mch; i++){
- if((specialRegionsStatus & (1 << i)) != 0){
- input_string >> m_chip_status[i];
- }
- if((specialRegionsStatus & (1 << (i+mch))) != 0){
- m_column_pair_status[i].resize(mcolumns);
- for(int j = 0; j < (int)mcolumns; j++){
- input_string >> m_column_pair_status[i][j];
- }
- }
- }
-
- input_string >> pixelID >> status;
- while(input_string.good()){
- setPixelStatus(pixelID, status);
- input_string >> pixelID >> status;
- }
- return false;
-}
-
-
-bool ModuleSpecialPixelMap::fill_from_blob(const coral::Blob& blob){
- unsigned int mcolumns = columnsPerChip()/2;
- int mch = (int)chipsPerModule();
- int mkey = (int)pow(2, mch) -1;
-
- unsigned int pixelID, status;
-
- const uint32_t* p = static_cast<const uint32_t*>(blob.startingAddress());
-
- m_module_status = *p;
-
- ++p;
- unsigned int specialRegionsStatus = *p;
- unsigned int integersRead = 2;
-
- if((specialRegionsStatus & mkey) != 0){
- m_chip_status.resize(mch);
- }
- if((specialRegionsStatus & (mkey << mch)) != 0){
- m_column_pair_status.resize(mch);
- }
-
- for(int i = 0; i < mch; i++){
- if((specialRegionsStatus & (1 << i)) != 0){
- ++p;
- ++integersRead;
- m_chip_status[i] = *p;
- }
- if((specialRegionsStatus & (1 << (i+mch))) != 0){
- m_column_pair_status[i].resize(mcolumns);
- for(int j = 0; j < (int)mcolumns; j++){
- ++p;
- ++integersRead;
- m_column_pair_status[i][j] = *p;
- }
- }
- }
-
- while( static_cast<int>(integersRead * sizeof(unsigned int)) < blob.size() ){
- ++p;
- ++integersRead;
- pixelID = *p;
- ++p;
- ++integersRead;
- status = *p;
- setPixelStatus(pixelID, status);
- }
-
- return false;
-}
-
-unsigned int ModuleSpecialPixelMap::pixelType(unsigned int column, unsigned int row, unsigned int mchips){
- unsigned int i = std::min(mchips%10, nmtype-1);
- int mch = (int)mchips/10;
- unsigned int mcolumns = columnsPerFEIX[i];
- unsigned int mrowsrdo = rowsRdoPerFEIX[i];
- unsigned int mrows = rowsPerFEIX[i];
- int ng = (int)(mrows - mrowsrdo);
-
- if(mch>2){
- if(column > 0 && column < mcolumns-1 && row < mrowsrdo){
- if(ng>0){
- for(int k = 0; k<ng; ++k){
- if(row==(mrowsrdo-2-2*k))return 5; // inter-ganged
- if(row==(mrowsrdo-1-2*k)) return 2; // ganged
- }
- }
- return 0; // normal
- }
- else if((column == 0 || column == mcolumns-1) && row < mrowsrdo){
- if(ng>0){
- for(int k = 0; k<ng; ++k){
- if(row==(mrowsrdo-2-2*k))return 6; // long inter-ganged
- if(row==(mrowsrdo-1-2*k)) return 3; // long ganged
- }
- }
- return 1; //long
- }
- else return 8; //invalid row/column pair
- }
- else { // IBL FEI4
- if( row<mrows&&column<mcolumns ){
- if( mch==2 && (column ==0 || column==(mcolumns-1)) ){
- return 1; //long
- }
- else{
- return 0; // normal
- }
- }
- else return 8; //invalid row/column pair
- }
-}
-
-/*
-unsigned int ModuleSpecialPixelMap::pixelType(unsigned int column, unsigned int row){
- unsigned int mchips = 16;
- return pixelType(column, row, mchips);
-}
-*/
-
-
-std::vector<unsigned int> ModuleSpecialPixelMap::decodePixelID(unsigned int pixelID, unsigned int typeFE){
-
- unsigned int chip = (pixelID & 0xF);
- pixelID >>=4;
- unsigned int column = (pixelID & 0x1F);
- (typeFE == 0) ? pixelID >>=5 : pixelID >>=8; //typeFE = 0 for FEI3 and 1 for FEI4
- unsigned int row = pixelID;
-
- std::vector<unsigned int> ChipColRow;
- ChipColRow.push_back(chip);
- ChipColRow.push_back(column);
- ChipColRow.push_back(row);
-
- return ChipColRow;
-
-}
-
-
-unsigned int ModuleSpecialPixelMap::encodePixelID(unsigned int chip, unsigned int column, unsigned int row, unsigned int mchips){
- int i = mchips%10; // type of module
- unsigned int pixelID = row;
- pixelID = (i==0) ? pixelID << 5 : pixelID << 8;
- pixelID += column;
- pixelID = pixelID << 4;
- pixelID += chip;
- return pixelID;
-}
-
-
-unsigned int ModuleSpecialPixelMap::encodePixelID(unsigned int chip, unsigned int column, unsigned int row ){
-
- unsigned int mchips = 16*10;
- return encodePixelID(chip, column, row, mchips);
-}
-
-
-unsigned int ModuleSpecialPixelMap::encodePixelID(int component, unsigned int module_phi_index,
- unsigned int pixel_eta_index, unsigned int pixel_phi_index, unsigned int mchips){
- unsigned int i = std::min(mchips%10, nmtype-1);
- int mch = (int)mchips/10;
- unsigned int mcolumns = columnsPerFEIX[i];
- unsigned int mrowsrdo = rowsRdoPerFEIX[i];
- unsigned int mrows = rowsPerFEIX[i];
- int ng = (int)(mrows - mrowsrdo);
-
- unsigned int chip = 0, column = 0, row = 0;
- //
- if(std::abs(component)!=2) { //not endcap
- if(mch>2){
- if(pixel_phi_index < mrows){
- chip = pixel_eta_index / mcolumns + mch/2;
- column = pixel_eta_index % mcolumns;
- if(pixel_phi_index < mrowsrdo)row = pixel_phi_index;
- else if(ng>0){
- for(int k=0; k<ng; ++k){
- if(pixel_phi_index ==(mrowsrdo+k))row = mrowsrdo+1 -2*(ng-k);
- }
- }
- }
- else if(pixel_phi_index >= mrows && pixel_phi_index < 2*mrows){
- chip = mch/2 - (1 + pixel_eta_index / mcolumns);
- column = mcolumns - (1+pixel_eta_index % mcolumns);
- if(pixel_phi_index > (mrows+ng-1))row = 2*mrows-1 - pixel_phi_index;
- else if(ng>0){
- for(int k = 0; k<ng; ++k){
- if(pixel_phi_index ==(mrows+k))row =mrowsrdo-1-2*k;
- }
- }
- }
- }
- else{
- row = (mrows-1) - pixel_phi_index;
- column = mcolumns-(1 + pixel_eta_index%mcolumns);
- chip = mch==1 ? 0: 1-pixel_eta_index/mcolumns;
- }
- }
- else{ //disks
- if(module_phi_index % 2 == 0){ //even modules
- if(pixel_phi_index < mrows){
- chip = mch/2 - (1+pixel_eta_index / mcolumns);
- column = mcolumns - (1+pixel_eta_index % mcolumns);
- if(pixel_phi_index < mrowsrdo)row = pixel_phi_index;
- else if(ng>0){
- for(int k=0; k<ng; ++k){
- if(pixel_phi_index ==(mrowsrdo+k)) row = mrowsrdo+1 -2*(ng-k);
- }
- }
- }
- else if(pixel_phi_index > (mrows-1) && pixel_phi_index < 2*mrows){
- chip = pixel_eta_index / mcolumns + mch/2;
- column = pixel_eta_index % mcolumns;
- if(pixel_phi_index > (mrows+ng-1))row = 2*mrows - 1 - pixel_phi_index;
- else if(ng>0){
- for(int k = 0; k<ng; ++k){
- if(pixel_phi_index ==(mrows+k))row =mrowsrdo-1-2*k;
- }
- }
- }
- }
- else if(module_phi_index % 2 == 1){ //odd modules
- if(pixel_phi_index > (mrows+ng-1) && pixel_phi_index < 2*mrows){
- chip = mch/2 -(1 + pixel_eta_index / mcolumns);
- column = mcolumns - (1 + pixel_eta_index % mcolumns);
- row = 2*mrows - 1 - pixel_phi_index;
- }
- else if(pixel_phi_index < mrows){
- chip = pixel_eta_index / mcolumns + mch/2;
- column = pixel_eta_index % mcolumns;
- if(pixel_phi_index < mrowsrdo)row = pixel_phi_index;
- else if(ng>0){
- for(int k=0; k<ng; ++k){
- if(pixel_phi_index ==(mrowsrdo+k)) row = mrowsrdo+1 -2*(ng-k);
- }
- }
- }
- }
- }
- unsigned int pixelID = row;
- pixelID = (i==0) ? pixelID << 5 : pixelID << 8;
- pixelID += column;
- pixelID = pixelID << 4;
- pixelID += chip;
-
- return pixelID;
-}
-
-/*
-unsigned int ModuleSpecialPixelMap::encodePixelID(int component, unsigned int module_phi_index,
- unsigned int pixel_eta_index, unsigned int pixel_phi_index){
- unsigned int mchips = 16;
- return encodePixelID(component, module_phi_index,
- pixel_eta_index, pixel_phi_index,mchips);
-}
-
-*/
-
-void ModuleSpecialPixelMap::markSpecialRegions(){
-
- // start with column pairs
- unsigned int mcolumns = columnsPerChip()/2;
- unsigned int mrows = rowsrdoPerChip();
-
- for(int chip = 0; chip < (int)chipsPerModule(); chip++){
- for(int column_pair = 0; column_pair < (int)mcolumns; column_pair++){
- int i = 0, row = 0;
- unsigned int column_pair_status = (pixelStatus(encodePixelID(chip, 2*column_pair, row,m_chipsPerModule)) & ~(15 << 25));
-
- if(column_pair_status != 0){
- while(i < 2 && (pixelStatus(encodePixelID(chip, 2*column_pair + i, row, m_chipsPerModule)) & ~(15 << 25)) == column_pair_status){
- row++;
- if(row == (int)mrows){
- i++;
- row = 0;
- }
- }
- if(i == 2){
- setColumnPairStatus(chip, column_pair, column_pair_status);
- }
- }
- }
- }
-
- // then mark special chips
-
- if(m_column_pair_status.size() != 0){
- for(int chip = 0; chip < (int)chipsPerModule(); chip++){
- if(m_column_pair_status[chip].size() != 0){
- unsigned int chip_status = (m_column_pair_status[chip][0] & ~(15 << 25));
- int i = 1;
- while(i < (int)mcolumns && ((m_column_pair_status[chip][i] & ~(15 << 25)) == chip_status)){
- i++;
- }
- if(i == (int)mcolumns){
- setChipStatus(chip, chip_status);
- m_column_pair_status[chip].resize(0);
- }
- else{
- setChipStatus(chip, 0);
- }
- }
- }
- int j = 0;
- while(j < (int)chipsPerModule() && m_column_pair_status[j].size() == 0){
- j++;
- }
- if(j == (int)chipsPerModule()){
- m_column_pair_status.resize(0);
- }
- }
-
- // finally see whether the whole module is special
-
- if(m_chip_status.size() != 0){
- unsigned int module_status = (m_chip_status[0] & ~(15 << 25));
- int i = 1;
- while(i < (int)chipsPerModule() && (m_chip_status[i] & ~(15 << 25)) == module_status){
- i++;
- }
- if(i == (int)chipsPerModule()){
- setModuleStatus(module_status);
- m_chip_status.resize(0);
- m_column_pair_status.resize(0);
- }
- else{
- setModuleStatus(0);
- }
- }
- return;
-}
-
-void ModuleSpecialPixelMap::setModuleStatus(unsigned int module_status){
- if(module_status != 0){
- clear();
- }
- m_module_status = (module_status & ~(15 << 25));
- return;
-}
-
-void ModuleSpecialPixelMap::setChipStatus(unsigned int chip, unsigned int chip_status){
- unsigned int mcolumns = columnsPerChip();
- unsigned int mrows = rowsrdoPerChip();
-
- if(chip_status != 0){
- for(int column = 0; column < (int)mcolumns; column++){
- for(int row = 0; row < (int)mrows; row ++){
- erase(encodePixelID(chip, column, row, m_chipsPerModule));
- }
- }
- m_chip_status.resize(chipsPerModule());
- m_chip_status[chip] = chip_status;
- }
- else if(m_chip_status.size() != 0){
- m_chip_status[chip] = (chip_status & ~(15 << 25));
- }
-
- return;
-}
-
-void ModuleSpecialPixelMap::setColumnPairStatus(unsigned int chip, unsigned int column_pair, unsigned int column_pair_status){
- unsigned int mcolumns = columnsPerChip()/2;
- unsigned int mrows = rowsrdoPerChip();
-
- if(column_pair_status != 0){
- for(int i = 0; i < 2; i++){
- for(int row = 0; row < (int)mrows; row++){
- erase(encodePixelID(chip, 2*column_pair + i, row, m_chipsPerModule));
- }
- }
- m_column_pair_status.resize(chipsPerModule());
- m_column_pair_status[chip].resize(mcolumns);
- m_column_pair_status[chip][column_pair] = (column_pair_status & ~(15 << 25));
- }
- else if(m_column_pair_status.size() != 0 && m_column_pair_status[chip].size() != 0){
- m_column_pair_status[chip][column_pair] = column_pair_status;
- }
-
- return;
-}
-
-void ModuleSpecialPixelMap::setNeighbourFlags(){
- if(empty()){
- return;
- }
- else{
- //loop
- int mch = (int)chipsPerModule();
- int mco =mch>2? mch/2:mch;
- for(int chip = 0; chip < mch; chip++){
- for(int column = 0; column < (int)columnsPerChip(); column++){
- for(int row = 0; row < (int)rowsrdoPerChip(); row++){
-
- //if this pixel is special...
- const_iterator pixel = find(encodePixelID(chip, column, row, m_chipsPerModule));
- if(pixel != end()){
- if(((*pixel).second & ~(15 << 25)) != 0){
-
- //see if left neighbour is also special
- if(column != 0 &&
- (pixelStatus(encodePixelID(chip, column-1, row, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 27);
- }
- else if(mch>2&&column == 0 && chip != 0 && chip != mco &&
- (pixelStatus(encodePixelID(chip-1, columnsPerChip()-1, row, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 27);
- }
- else if(mch==2&&column == 0 && chip != 0 &&
- (pixelStatus(encodePixelID(chip-1, columnsPerChip()-1, row, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 27);
- }
- else{
- clearPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 27);
- }
-
- //see if right neighbour is special
- if(column != (int)(columnsPerChip()-1) &&
- (pixelStatus(encodePixelID(chip, column+1, row, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 28);
- }
- else if(mch>2&&column == (int)(columnsPerChip()-1) && chip != (mco-1) && chip != (mch-1) &&
- (pixelStatus(encodePixelID(chip+1, 0, row, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 28);
- }
- else if(mch==2&&column == (int)(columnsPerChip()-1) && chip != 1 &&
- (pixelStatus(encodePixelID(chip+1, 0, row, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 28);
- }
- else{
- clearPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 28);
- }
-
- //see if top neighbour is special
- if(row != (int)(rowsrdoPerChip()-1) &&
- (pixelStatus(encodePixelID(chip, column, row+1, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 26);
- }
- else if(mch>2&&row == (int)(rowsrdoPerChip()-1) &&
- (pixelStatus(encodePixelID((mch-1-chip), (columnsPerChip()-1-column),(rowsrdoPerChip()-1), m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 26);
- }
- else{
- clearPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 26);
- }
-
- //see if bottom neighbour is special
- if(row != 0 &&
- (pixelStatus(encodePixelID(chip, column, row-1, m_chipsPerModule)) & ~(15 << 25)) != 0){
- setPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 25);
- }
- else{
- clearPixelStatusBit(encodePixelID(chip, column, row, m_chipsPerModule), 25);
- }
- }
- }
- }
- }
- }
- return;
- }
-}
-
-
-ModuleSpecialPixelMap::size_type ModuleSpecialPixelMap::size() const{
- return std::map<unsigned int, unsigned int>::size();
-}
-
-bool ModuleSpecialPixelMap::empty() const{
- return std::map<unsigned int, unsigned int>::empty();
-}
-
-ModuleSpecialPixelMap::iterator ModuleSpecialPixelMap::begin(){
- return std::map<unsigned int, unsigned int>::begin();
-}
-
-ModuleSpecialPixelMap::const_iterator ModuleSpecialPixelMap::begin() const{
- return std::map<unsigned int, unsigned int>::begin();
-}
-
-ModuleSpecialPixelMap::iterator ModuleSpecialPixelMap::end(){
- return std::map<unsigned int, unsigned int>::end();
-}
-
-ModuleSpecialPixelMap::const_iterator ModuleSpecialPixelMap::end() const{
- return std::map<unsigned int, unsigned int>::end();
-}
-
-bool ModuleSpecialPixelMap::hasSpecialChips() const{
- if(m_chip_status.size() == 0){
- return false;
- }
- else{
- for(std::vector<unsigned int>::const_iterator chip = m_chip_status.begin(); chip != m_chip_status.end(); ++chip){
- if(*chip != 0){
- return true;
- }
- }
- }
-
- return false;
-}
-
-bool ModuleSpecialPixelMap::hasSpecialColumnPairs() const{
- if(m_column_pair_status.size() == 0){
- return false;
- }
- else{
-
- for(std::vector<std::vector<unsigned int> >::const_iterator chip = m_column_pair_status.begin();
- chip != m_column_pair_status.end(); ++chip){
-
- for(std::vector<unsigned int>::const_iterator column_pair =
- m_column_pair_status[chip - m_column_pair_status.begin()].begin();
- column_pair != m_column_pair_status[chip - m_column_pair_status.begin()].end();
- ++column_pair){
-
- if((*column_pair) != 0){
- return true;
- }
- }
- }
- }
-
- return false;
-
-}
-
-bool ModuleSpecialPixelMap::hasSpecialColumnPairs(unsigned int chip) const{
-
- if(m_column_pair_status.size() == 0){
- return false;
- }
- else if(chip >= chipsPerModule()){
- std::cout << "Chip index " << chip << " out of range" << std::endl;
- return false;
- }
- else{
- for(std::vector<unsigned int>::const_iterator column_pair = m_column_pair_status[chip].begin();
- column_pair != m_column_pair_status[chip].end(); ++column_pair){
-
- if((*column_pair) != 0){
- return true;
- }
- }
- }
-
- return false;
-}
-
-} // namespace PixelCoralClientUtils
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/calibDbInterface.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/calibDbInterface.cc
deleted file mode 100644
index f060d999fdbd9ca5f0e54026b9353d23371c872e..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/calibDbInterface.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PixCalibKnowledgeDb.h"
-#include "PixelCoralClientUtils/PixCalibCoralCoolDb.h"
-
-#include "CoolKernel/ValidityKey.h"
-
-#include<iostream>
-#include<string>
-#include<cstdlib>
-#include <sys/time.h>
-
-using namespace std;
-
-int main(int argc, char **argv)
-{
- if (argc<2 || argv[1][0]!='-') {
- cout << argv[0] << ": tool to talk to pixel coral database." << endl;
- cout << "options:" << endl;
- cout << "\t-s idTag connTag cfgTag cfgModTag calibtag calibTag1 calibTag2 calibTag3 etc" << endl;
- cout << "\t store a list of calibration tags corresponding to a certain idTag connTag cfgTag cfgModTag in knowledge db"<< endl;
- cout << "\t-r UNIXTimeInSeconds" << endl;
- cout << "\t Find the list of calibration-tags valid for a certain UNIX-time in seconds" << endl;
- return 1;
- }
-
- string tableName("CALIB_DATA");
-
- string connString("sqlite_file:pcd_knowledge.db");
- char* ctmp = getenv("PIXEL_CAL_KNOWLEDGE");
- if (ctmp) connString = ctmp;
-
- int c = argv[1][1];
-
- switch (c) {
- case 's':
- {
- if(argc > 2 && c==115) {
-
- //first 5 arguments relate to run-conditions
- long int runNumber = atol(argv[2]);
- string idTag = argv[3];
- string connTag = argv[4];
- string cfgTag = argv[5];
- string cfgModTag = argv[6];
-
- string calibtags_in_string = "";
- for(int i=7;i<argc;i++){
- if(i!=7) calibtags_in_string = calibtags_in_string+","+argv[i];
- else calibtags_in_string = argv[i];
- }
-
- std::cout << "Store a reference that currently the latest calibration-tags are defined by: " << std::endl;
- std::cout << calibtags_in_string << std::endl;
-
- std::cout << "Associated to the following run-conditions: " << std::endl;
- std::cout << "runNumber " << runNumber << std::endl;
- std::cout << "idTag: " << idTag << std::endl;
- std::cout << "connTag: " << connTag << std::endl;
- std::cout << "cfgTag: " << cfgTag << std::endl;
- std::cout << "cfgModTag: " << cfgModTag << std::endl;
-
- struct timeval UNIXTime;
- gettimeofday(&UNIXTime,NULL);
- std::cout << "UNIXTime at moment of storing tags: " << UNIXTime.tv_sec << std::endl;
-
- PixCalibKnowledgeDb knowledgeDB(connString, tableName, 1);
- knowledgeDB.init(coral::Update);
- knowledgeDB.saveCorrespondingConfig(UNIXTime.tv_sec,runNumber,calibtags_in_string,idTag,connTag,cfgTag,cfgModTag);
- }
- }
- break;
- case 'r':
- {
- if(argc > 2 && argc < 4 && c==114) {
-
- long int Utime = atol(argv[2]);
-
- std::cout << "Read calibration-Tags valid for UNIXTimeInSeconds " << Utime << std::endl;
-
- PixCalibKnowledgeDb knowledgeDB(connString, tableName, 1);
- knowledgeDB.init(coral::Update);
- knowledgeDB.readCorrespondingCalibTag(Utime);
- }
- }
- break;
- default:
- cout << "unknown option " << argv[1] << endl;
- }
-
- return 0;
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/extractAnalysis.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/extractAnalysis.cc
deleted file mode 100644
index 031445abcd6ae2b619d5159ea6899e3a8ee39058..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/extractAnalysis.cc
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/CoralClient.hh"
-#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-#include<string>
-#include<cstring>
-#include<map>
-#include<set>
-#include<fstream>
-using namespace std;
-
-int main (int argc, char **argv){
-
- int iarg = 1;
- bool verbose = false;
- if (argc>iarg && strcmp(argv[iarg],"-v")==0) {
- verbose = true;
- ++iarg;
- }
-
- enum OPTION { THRESHOLDS, TIMEWALK, TOT };
-
- OPTION option = TOT;
- if (argc>iarg && strcmp(argv[iarg],"-t")==0) {
- option = THRESHOLDS;
- ++iarg;
- }
- if (argc>iarg && strcmp(argv[iarg],"-w")==0) {
- option = TIMEWALK;
- ++iarg;
- }
-
- if (iarg>=argc) {
- cout << "Usage: extractAnalysis [-v] [-t|-w] anal_id" << endl;
- return 1;
- }
-
- CAN::SerialNumber_t anal_id = atoi(argv[iarg]);
-
- cout << "--> Summary for anal_id " << anal_id << endl;
-
- //
- // load pcd from text file
- //
-
- map<unsigned int, PixelCoralClientUtils::PixelCalibData> pcdmap;
- ifstream in("pcd.dat");
- if (!in.is_open()) return 1;
-
- while (in) {
- unsigned int idmod; in >> idmod;
- if (in.eof()) break;
-
- PixelCoralClientUtils::PixelCalibData pcd;
-
- for (int i = 0; i<16; ++i) {
- char dummy; in >> dummy;
- if (dummy!='I') break;
- int idchip; in >> idchip;
- if (idchip!=i) break;
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData pcsd;
- pcsd.setChipID(idchip);
- int thres, sigma, noise, timewalk;
- in >> thres >> sigma >> noise >> timewalk;
- pcsd.setThreshold(0, thres, sigma, noise, timewalk);
- in >> thres >> sigma >> noise >> timewalk;
- pcsd.setThreshold(1, thres, sigma, noise, timewalk);
- in >> thres >> sigma >> noise >> timewalk;
- pcsd.setThreshold(2, thres, sigma, noise, timewalk);
- float A, E, C;
- in >> A >> E >> C;
- pcsd.setQ2Tot(0, A, E, C);
- in >> A >> E >> C;
- pcsd.setQ2Tot(2, A, E, C);
- float p1, p2;
- in >> p1 >> p2;
- pcsd.setTotRes(p1, p2);
- pcd.add(pcsd);
- }
-
- pcdmap.insert(make_pair(idmod,pcd));
- }
- cout << "pix cal data size: " << pcdmap.size() << endl;
-
- //
- // load module->hashid lookup table
- //
-
- map<string, unsigned int> lookup;
- ifstream in_lookup("aliases.dat");
- if (!in_lookup.is_open()) return 1;
-
- string s;
- while (getline(in_lookup, s)) {
- if (s.find("HASHID") != string::npos) {
- istringstream ss(s);
- unsigned int idmod;
- string s1, s2;
- ss >> idmod >> s1 >> s2;
- lookup.insert(make_pair(s2,idmod));
- }
- }
- cout << "lookup table size: " << lookup.size() << endl;
-
- map<string, unsigned int> lookup_errors;
-
- //
- // connect to analysis data base
- //
-
- try {
-
- // Start CORAL client
- const char* tableName = "CALIB_ANAL";
- PixCoralClient coralClient(verbose, coral::ReadOnly, tableName);
-
- // Show the structure of the master table
- if (verbose) {
- coralClient.printTableDesc(tableName);
- coralClient.printTableContent(tableName);
- }
-
- // Return a CAN::AnalysisResultList_t object
- CAN::AnalysisResultList_t a = coralClient.getAnalysisResultsFromDB(anal_id);
-
- if (option!=TOT) {
- //
- // threshold/timewalk calibration
- //
-
- // load bool parameters
- set<unsigned int> passed_idmod;
- set<unsigned int> failed_idmod;
- if (verbose) cout << "looking at bools" << endl;
- for (map<string, map<string, bool> >::const_iterator iter = a.begin<bool>();
- iter != a.end<bool>(); ++iter) {
- const string& s = iter->first;
- if (verbose) cout << s << endl;
- // figure out if we need it
- if (s != "Status") continue;
- for (map<string, bool>::const_iterator val_iter = iter->second.begin();
- val_iter != iter->second.end(); ++val_iter) {
- const string& ss = val_iter->first;
- bool value = val_iter->second;
- // convert connectivity to module id
- unsigned int idmod = lookup[ss];
- if (value) passed_idmod.insert(idmod);
- else failed_idmod.insert(idmod);
- }
- }
- cout << "good " << passed_idmod.size() << ", bad " << failed_idmod.size() << endl;
-
- // load float parameters
- // verify if the scan is good
- for (map<string, map<string, float> >::const_iterator iter = a.begin<float>();
- iter != a.end<float>(); ++iter) {
- const string& s = iter->first;
- if (s != "number of bad pixels") continue;
- for (map<string, float>::const_iterator val_iter = iter->second.begin();
- val_iter != iter->second.end(); ++val_iter) {
- const string& ss = val_iter->first;
- // convert connectivity to module id
- unsigned int idmod = lookup[ss];
- float value = val_iter->second;
- const float maxBadPixels = 20000;
- if (value>=maxBadPixels) {
- if (verbose) cout << s << "-> " << ss << " (" << idmod << "): too many bad pixels = " << value << endl;
- failed_idmod.insert(idmod);
- }
- }
- }
- // proceed with loading
- set<unsigned int> used_idmod;
- set<unsigned int> rejected_idmod;
- if (verbose) cout << "looking at floats" << endl;
- for (map<string, map<string, float> >::const_iterator iter = a.begin<float>();
- iter != a.end<float>(); ++iter) {
- const string& s = iter->first;
- if (verbose) cout << s << endl;
- // figure out if we need it
- const int nvar = 5;
- string svar[nvar] = {
- "average threshold",
- "threshold RMS",
- "average noise for normal pixel",
- "average noise for long pixel",
- "average noise for ganged pixel"
- };
- if (option==TIMEWALK) svar[0] = "Average_threshold";
- int jvar = -1;
- for (int ivar = 0; ivar<nvar; ++ivar) {
- if (s == svar[ivar]) {
- jvar = ivar;
- break;
- }
- }
- if (jvar<0) continue;
- if (option==TIMEWALK && jvar>0) continue;
- for (map<string, float>::const_iterator val_iter = iter->second.begin();
- val_iter != iter->second.end(); ++val_iter) {
- const string& ss = val_iter->first;
- // convert connectivity to module id
- unsigned int idmod = lookup[ss];
- if (verbose) cout << s << "-> " << ss << " (" << idmod << ")";
- // check whether the scans are good
- if (failed_idmod.find(idmod)!=failed_idmod.end()) {
- rejected_idmod.insert(idmod);
- if (verbose) cout << ": bad scan" << endl;
- continue;
- }
- used_idmod.insert(idmod);
- // find corresponding PixelCalibData
- map<unsigned int, PixelCoralClientUtils::PixelCalibData>::iterator ipcd = pcdmap.find(idmod);
- //if (ipcd == pcdmap.end()) throw std::runtime_error("Invalid module ID");
- if (ipcd == pcdmap.end()) {
- lookup_errors.insert(make_pair(ss, idmod));
- if (verbose) cout << ": lookup error" << endl;
- continue;
- }
- PixelCoralClientUtils::PixelCalibData& pcd = ipcd->second;
- float value = val_iter->second;
- // use the same value for all FE
- for (int idchip = 0; idchip<16; ++idchip) {
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData& pcsd = *pcd.findChipID(idchip);
- // replace the parameter in the table
- int v[12];
- for (int type = 0; type<3; ++type) {
- v[type*4 ] = pcsd.getThreshold(type);
- v[type*4+1] = pcsd.getThresholdSigma(type);
- v[type*4+2] = pcsd.getNoise(type);
- v[type*4+3] = pcsd.getTimeWalk(type);
- }
- bool verbose1 = verbose && idchip==0;
- if (verbose1) cout << svar[jvar] << "=";
- if (option==THRESHOLDS) {
- if (jvar==0) { // average threshold
- if (verbose1) cout << v[0] << "," << v[4] << "," << v[8];
- v[0] = v[4] = v[8] = (int)value;
- } else if (jvar==1) { // threshold RMS
- if (verbose1) cout << v[1] << "," << v[5] << "," << v[9];
- v[1] = v[5] = v[9] = (int)value;
- } else { // average noise
- int type = jvar-2;
- if (verbose1) cout << v[type*4+2];
- v[type*4+2] = (int)value;
- }
- } else { // timewalk, jvar is always 0
- if (verbose1) cout << v[3] << "," << v[7] << "," << v[11];
- v[3] = v[7] = v[11] = (int)value;
- }
- if (verbose1) cout << " replaced by " << value << endl;
- for (int type = 0; type<3; ++type) {
- pcsd.setThreshold(type, v[type*4], v[type*4+1], v[type*4+2], v[type*4+3]);
- }
- }
- }
- }
- cout << "modified modules: " << used_idmod.size() << endl;
- cout << "rejected modules: " << rejected_idmod.size() << endl;
-
- } else {
-
- //
- // ToT calibration
- //
-
- // load bool parameters
- set<unsigned int> passed_n_id;
- set<unsigned int> passed_g_id;
- set<unsigned int> failed_n_id;
- set<unsigned int> failed_g_id;
- if (verbose) cout << "looking at bools" << endl;
- for (map<string, map<string, bool> >::const_iterator iter = a.begin<bool>();
- iter != a.end<bool>(); ++iter) {
- const string& s = iter->first;
- if (verbose) cout << s << endl;
- // figure out if we need it
- if (s.compare(0, 6, "passed")) continue;
- // determine chip id
- int ix = s.find("FE") + 2;
- int idchip = atoi(s.substr(ix).c_str());
- // determine pixel type
- int itype = -1;
- if (s.find("non_ganged_pix") != string::npos) itype = 0;
- else if (s.find("ganged_pix") != string::npos) itype = 2;
- if (itype<0) continue;
- for (map<string, bool>::const_iterator val_iter = iter->second.begin();
- val_iter != iter->second.end(); ++val_iter) {
- const string& ss = val_iter->first;
- bool value = val_iter->second;
- // convert connectivity to module id
- unsigned int idmod = lookup[ss];
- unsigned int id = (idmod<<4) | idchip;
- if (itype==0) {
- if (value) passed_n_id.insert(id);
- else failed_n_id.insert(id);
- }
- else if (itype==2) {
- if (value) passed_g_id.insert(id);
- else failed_g_id.insert(id);
- }
- }
- }
- cout << "non_ganged_pixels: good " << passed_n_id.size() << ", bad " << failed_n_id.size() << endl;
- cout << "ganged_pixels: good " << passed_g_id.size() << ", bad " << failed_g_id.size() << endl;
-
- // load float parameters
- set<unsigned int> used_id;
- set<unsigned int> rejected_id;
- if (verbose) cout << "looking at floats" << endl;
- for (map<string, map<string, float> >::const_iterator iter = a.begin<float>();
- iter != a.end<float>(); ++iter) {
- const string& s = iter->first;
- if (verbose) cout << s << endl;
- // figure out if we need it
- const int nvar = 5;
- const string svar[nvar] = {
- "tot_p0_FE", "tot_p1_FE", "tot_p2_FE",
- "disp_p0_FE", "disp_p1_FE"
- };
- int jvar = -1;
- for (int ivar = 0; ivar<nvar; ++ivar) {
- if (s.compare(0, svar[ivar].length(), svar[ivar])==0) {
- jvar = ivar;
- break;
- }
- }
- if (jvar<0) continue;
- // determine chip id
- int ix = s.find("FE") + 2;
- int idchip = atoi(s.substr(ix).c_str());
- // determine pixel type
- int itype = -1;
- if (s.find("non_ganged_pix") != string::npos) itype = 0;
- else if (s.find("ganged_pix") != string::npos) itype = 2;
- // obsolete names, used for A5082
- //if (s.find("normal_pix") != string::npos) itype = 0;
- //else if (s.find("special-non-ganged_pix") != string::npos) itype = 1;
- //else if (s.find("ganged_pix") != string::npos) itype = 2;
- if (itype<0) continue;
- for (map<string, float>::const_iterator val_iter = iter->second.begin();
- val_iter != iter->second.end(); ++val_iter) {
- const string& ss = val_iter->first;
- // convert connectivity to module id
- unsigned int idmod = lookup[ss];
- if (verbose) cout << s << "-> " << ss << ":" << idchip << " (" << idmod << ")";
- // check whether the scans are good
- unsigned int id = (idmod<<4) | idchip;
- if (failed_n_id.find(id)!=failed_n_id.end() ||
- failed_g_id.find(id)!=failed_g_id.end()) {
- rejected_id.insert(id);
- if (verbose) cout << ": bad scan" << endl;
- continue;
- }
- used_id.insert(id);
- // find corresponding PixelCalibData
- map<unsigned int, PixelCoralClientUtils::PixelCalibData>::iterator ipcd = pcdmap.find(idmod);
- //if (ipcd == pcdmap.end()) throw std::runtime_error("Invalid module ID");
- if (ipcd == pcdmap.end()) {
- lookup_errors.insert(make_pair(ss, idmod));
- if (verbose) cout << ": lookup error" << endl;
- continue;
- }
- PixelCoralClientUtils::PixelCalibData& pcd = ipcd->second;
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData& pcsd = *pcd.findChipID(idchip);
- float value = val_iter->second;
- // replace the parameter in the table
- if (s.compare(0,5,"tot_p")==0) {
- float v[3];
- v[0] = pcsd.getQ2TotA(itype);
- v[1] = pcsd.getQ2TotE(itype);
- v[2] = pcsd.getQ2TotC(itype);
- int j = s[5]-'0'; if (j<0 || j>2) continue;
- if (verbose) {
- cout << ", ";
- if (j==0) cout << "A"; else if (j==1) cout << "E"; else cout << "C";
- cout << "=" << v[j] << " replaced by " << value << endl;
- }
- v[j] = value;
- pcsd.setQ2Tot(itype, v[0], v[1], v[2]);
- } else if (s.compare(0,6,"disp_p")==0) {
- float v[2];
- v[0] = pcsd.getTotP1();
- v[1] = pcsd.getTotP2();
- int j = s[6]-'0'; if (j<0 || j>1) continue;
- if (verbose) {
- cout << ", ";
- cout << "p" << j+1 << "=" << v[j] << " replaced by " << value << endl;
- }
- v[j] = value;
- pcsd.setTotRes(v[0], v[1]);
- } else {
- if (verbose) cout << endl;
- }
- }
- }
- cout << "modified chips: " << used_id.size() << endl;
- cout << "rejected chips: " << rejected_id.size() << endl;
- cout << "total modules: " << (used_id.size()+rejected_id.size())/16 << endl;
- }
-
- if (!lookup_errors.empty()) {
- cout << "module ids not found in the lookup table:" << endl;
- for (map<string, unsigned int>::const_iterator il = lookup_errors.begin();
- il != lookup_errors.end(); ++il) {
- cout << il->first << " " << il->second << endl;
- }
- }
-
- } catch ( exception& e ) {
- cout << "exception caught: " << e.what() << endl;
- return -1;
- }
-
- catch (...) {
- cout << "Unknown exception caught!" << endl;
- return -1;
- }
-
- //
- // save pcd back to text file
- //
-
- ofstream out("pcd.sav");
- for (map<unsigned int, PixelCoralClientUtils::PixelCalibData>::const_iterator ipcd = pcdmap.begin();
- ipcd != pcdmap.end(); ++ipcd) {
- out << ipcd->first << endl;
- const PixelCoralClientUtils::PixelCalibData& pcd = ipcd->second;
- for (int i = 0; i<16; ++i) {
- const PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData& pcsd = *pcd.getPixelChipSummaryData(i);
- out << "I" << pcsd.getChipID()
- << " " << pcsd.getThreshold(0)
- << " " << pcsd.getThresholdSigma(0)
- << " " << pcsd.getNoise(0)
- << " " << pcsd.getTimeWalk(0)
- << " " << pcsd.getThreshold(1)
- << " " << pcsd.getThresholdSigma(1)
- << " " << pcsd.getNoise(1)
- << " " << pcsd.getTimeWalk(1)
- << " " << pcsd.getThreshold(2)
- << " " << pcsd.getThresholdSigma(2)
- << " " << pcsd.getNoise(2)
- << " " << pcsd.getTimeWalk(2)
- << " " << pcsd.getQ2TotA(0)
- << " " << pcsd.getQ2TotE(0)
- << " " << pcsd.getQ2TotC(0)
- << " " << pcsd.getQ2TotA(2)
- << " " << pcsd.getQ2TotE(2)
- << " " << pcsd.getQ2TotC(2)
- << " " << pcsd.getTotP1()
- << " " << pcsd.getTotP2() << endl;
- }
- }
- out.close();
-
- return 0;
-
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/extractSPM.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/extractSPM.cc
deleted file mode 100644
index 7cae1b18478446a5c568486de0e73ee464f462a6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/extractSPM.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/CoralClient.hh"
-#include "PixelCoralClientUtils/SpecialPixelMap.hh"
-
-#include<string>
-#include<cstring>
-#include<map>
-#include<set>
-#include<fstream>
-using namespace std;
-
-int main (int argc, char **argv){
-
- int iarg = 1;
- bool verbose = false;
- if (argc>iarg && strcmp(argv[iarg],"-v")==0) {
- verbose = true;
- ++iarg;
- }
-
- if (iarg>=argc) {
- cout << "Usage: extractSPM [-v] anal_id" << endl;
- return 1;
- }
-
- CAN::SerialNumber_t anal_id = atoi(argv[iarg]);
-
- cout << "--> Summary for anal_id " << anal_id << endl;
-
- //
- // connect to analysis data base
- //
-
- try {
-
- // Start CORAL client
- const char* tableName = "CALIB_ANAL";
- PixCoralClient coralClient(verbose, coral::ReadOnly, tableName);
-
- // Show the structure of the master table
- if (verbose) {
- coralClient.printTableDesc(tableName);
- coralClient.printTableContent(tableName);
- }
-
- // Return a CAN::AnalysisResultList_t object
- CAN::AnalysisResultList_t a = coralClient.getAnalysisResultsFromDB(anal_id);
-
- // load pixel maps
- int npm = 0;
- for (map<string, map<string, PixelMap_t> >::const_iterator iter = a.begin<PixelMap_t>();
- iter != a.end<PixelMap_t>(); ++iter) {
- ++npm;
- const string& s = iter->first;
- if (verbose) cout << s << endl;
- for (map<string, PixelMap_t>::const_iterator val_iter = iter->second.begin();
- val_iter != iter->second.end(); ++val_iter) {
- const string& ss = val_iter->first;
- PixelMap_t value = val_iter->second;
- if (verbose) {
- cout << ss << endl;
- for (PixelMap_t::const_iterator pm = value.begin();
- pm != value.end(); ++pm) {
- cout << "col=" << pm->first.first << ", row=" << pm->first.second << ", status=" << pm->second << endl;
- }
- }
- }
- }
- cout << "found pixel maps: " << npm << endl;
-
- } catch ( exception& e ) {
- cout << "exception caught: " << e.what() << endl;
- return -1;
- }
-
- catch (...) {
- cout << "Unknown exception caught!" << endl;
- return -1;
- }
-
- return 0;
-
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/fixTimewalk.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/fixTimewalk.cc
deleted file mode 100644
index e7cc99d363d39b3ee9a4baf7e34b0e52e57d748d..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/fixTimewalk.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-#include<string>
-#include<map>
-#include<fstream>
-using namespace std;
-
-int load_pcd(map<unsigned int, PixelCoralClientUtils::PixelCalibData>& pcdmap,
- const char* filename)
-{
- ifstream in(filename);
- if (!in.is_open()) return 1;
-
- while (in) {
- unsigned int idmod; in >> idmod;
- if (in.eof()) break;
-
- PixelCoralClientUtils::PixelCalibData pcd;
-
- for (int i = 0; i<16; ++i) {
- char dummy; in >> dummy;
- if (dummy!='I') break;
- int idchip; in >> idchip;
- if (idchip!=i) break;
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData pcsd;
- pcsd.setChipID(idchip);
- int thres, sigma, noise, timewalk;
- in >> thres >> sigma >> noise >> timewalk;
- pcsd.setThreshold(0, thres, sigma, noise, timewalk);
- in >> thres >> sigma >> noise >> timewalk;
- pcsd.setThreshold(1, thres, sigma, noise, timewalk);
- in >> thres >> sigma >> noise >> timewalk;
- pcsd.setThreshold(2, thres, sigma, noise, timewalk);
- float A, E, C;
- in >> A >> E >> C;
- pcsd.setQ2Tot(0, A, E, C);
- in >> A >> E >> C;
- pcsd.setQ2Tot(2, A, E, C);
- float p1, p2;
- in >> p1 >> p2;
- pcsd.setTotRes(p1, p2);
- pcd.add(pcsd);
- }
-
- pcdmap.insert(make_pair(idmod,pcd));
- }
-
- return 0;
-}
-
-//int main(int argc, char **argv){
-int main(int, char **){
-
- //
- // load pcd from text file
- //
-
- map<unsigned int, PixelCoralClientUtils::PixelCalibData> pcdmap_old;
- if (load_pcd(pcdmap_old, "pcd_old.dat")) return 1;
- map<unsigned int, PixelCoralClientUtils::PixelCalibData> pcdmap;
- if (load_pcd(pcdmap, "pcd.dat")) return 1;
-
- cout << "pix cal data size: " << pcdmap_old.size() << "/" << pcdmap.size() << endl;
-
- //
- // recalculate timewalk according to the formula
- // new_timewalk = old_timewalk - old_threshold + new_threshold
- //
-
- for (map<unsigned int, PixelCoralClientUtils::PixelCalibData>::iterator ipcd = pcdmap.begin();
- ipcd != pcdmap.end(); ++ipcd) {
- PixelCoralClientUtils::PixelCalibData& pcd = ipcd->second;
- PixelCoralClientUtils::PixelCalibData& pcd_old = pcdmap_old[ipcd->first];
- for (int i = 0; i<16; ++i) {
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData& pcsd = *pcd.findChipID(i);
- PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData& pcsd_old = *pcd_old.findChipID(i);
- // replace the parameter in the table
- for (int type = 0; type<3; ++type) {
- int old_threshold = pcsd_old.getThreshold(type);
- int new_threshold = pcsd.getThreshold(type);
- int sigma = pcsd.getThresholdSigma(type);
- int noise = pcsd.getNoise(type);
- int old_timewalk = pcsd_old.getTimeWalk(type);
- int new_timewalk = old_timewalk - old_threshold + new_threshold;
- pcsd.setThreshold(type, new_threshold, sigma, noise, new_timewalk);
- }
- }
- }
-
- //
- // save pcd back to text file
- //
-
- ofstream out("pcd.sav");
- for (map<unsigned int, PixelCoralClientUtils::PixelCalibData>::const_iterator ipcd = pcdmap.begin();
- ipcd != pcdmap.end(); ++ipcd) {
- out << ipcd->first << endl;
- const PixelCoralClientUtils::PixelCalibData& pcd = ipcd->second;
- for (int i = 0; i<16; ++i) {
- const PixelCoralClientUtils::PixelCalibData::PixelChipSummaryData& pcsd = *pcd.getPixelChipSummaryData(i);
- out << "I" << pcsd.getChipID()
- << " " << pcsd.getThreshold(0)
- << " " << pcsd.getThresholdSigma(0)
- << " " << pcsd.getNoise(0)
- << " " << pcsd.getTimeWalk(0)
- << " " << pcsd.getThreshold(1)
- << " " << pcsd.getThresholdSigma(1)
- << " " << pcsd.getNoise(1)
- << " " << pcsd.getTimeWalk(1)
- << " " << pcsd.getThreshold(2)
- << " " << pcsd.getThresholdSigma(2)
- << " " << pcsd.getNoise(2)
- << " " << pcsd.getTimeWalk(2)
- << " " << pcsd.getQ2TotA(0)
- << " " << pcsd.getQ2TotE(0)
- << " " << pcsd.getQ2TotC(0)
- << " " << pcsd.getQ2TotA(2)
- << " " << pcsd.getQ2TotE(2)
- << " " << pcsd.getQ2TotC(2)
- << " " << pcsd.getTotP1()
- << " " << pcsd.getTotP2() << endl;
- }
- }
- out.close();
-
- return 0;
-
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/talkToPCDDb.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/talkToPCDDb.cc
deleted file mode 100644
index b2b75fe350fa1bec86e3bdea01943067a3923cf7..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/talkToPCDDb.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "CxxUtils/checker_macros.h"
-#include "PixelCoralClientUtils/PCDio.h"
-////#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-#include<iostream>
-#include<string>
-#include<cstdlib>
-
-using namespace std;
-
-int main (int argc, char **argv)
-{
- if (argc<3 || argv[1][0]!='-') {
- cout << argv[0] << ": tool to talk to pixel coral database." << endl;
- cout << "options:" << endl;
- cout << "\t-r tag [revision]" << endl;
- cout << "\t\tread existing table from the database to pcd.sav" << endl;
- cout << "\t-s tag revision sources" << endl;
- cout << "\t\tsave pcd.dat to the database" << endl;
- return 1;
- }
-
- string tableName("CALIB_DATA");
-
- string connString("");
- char* ctmp = getenv("CAN_CALIB_DB");
- if (ctmp) connString = ctmp;
-
- int c = argv[1][1];
- switch (c) {
- case 'r':
- {
- string tag(argv[2]);
- int revision = 0;
- if (argc>=4) revision = atoi(argv[3]);
- cout << "loading pcd from " << tableName << " at " << connString << endl;
- cout << "tag \"" << tag << "\", revision " << revision << endl;
-
- PCDio io(connString, tableName, 1);
- io.init(coral::ReadOnly);
- io.load(tag, revision);
- }
- break;
-
- case 's':
- {
- string tag(argv[2]);
- int revision(atoi(argv[3]));
- string sources(argv[4]);
- cout << "saving pcd to " << tableName << " at " << connString << endl;
- cout << "tag \"" << tag << "\", revision " << revision << endl;
-
- PCDio io(connString, tableName, 1);
- io.init(coral::Update);
- io.save(tag, revision, sources);
- }
- break;
-
- default:
- cout << "unknown option " << argv[1] << endl;
- }
-
- return 0;
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/talkToPCDkr.cc b/InnerDetector/InDetConditions/PixelCoralClientUtils/src/talkToPCDkr.cc
deleted file mode 100644
index 8e890d09b7faf62186cb526582653d7d715f5198..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/src/talkToPCDkr.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelCoralClientUtils/PCDkr.h"
-////#include "PixelCoralClientUtils/PixelCalibData.hh"
-
-#include<iostream>
-#include<string>
-#include<cstdlib>
-
-using namespace std;
-
-int main(int argc, char **argv)
-{
- if (argc<2 || argv[1][0]!='-') {
- cout << argv[0] << ": tool to talk to knowledge repository." << endl;
- cout << "options:" << endl;
- cout << "\t-s tr cid" << endl;
- cout << "\t\tcreate a new record with configuration tag/revision tr\n\t\tand calibration identifier cid" << endl;
- cout << "\t-v tr" << endl;
- cout << "\t\tvalidate configuration tag/revision tr" << endl;
- cout << "\t-r" << endl;
- cout << "\t\tdump the table" << endl;
- return 1;
- }
-
- string tableName("CALIB_KR");
-
- string connString("");
- char* ctmp = getenv("CAN_CALIB_DB");
- if (ctmp) connString = ctmp;
-
- int c = argv[1][1];
- switch (c) {
- case 'r':
- {
- cout << "dumping table " << tableName << " at " << connString << endl;
-
- PCDkr io(connString, tableName, 1);
- io.init(coral::ReadOnly);
- io.load();
- }
- break;
-
- case 's':
- {
- if (argc<3) {
- cout << "usage: " << argv[0] << " -s tag cid" << endl;
- return 1;
- }
- string tag(argv[2]);
- string cid(argv[3]);
- cout << "saving configuration to " << tableName << " at " << connString << endl;
- cout << "configuration \"" << tag << "\", cid \"" << cid << "\"" << endl;
-
- PCDkr io(connString, tableName, 1);
- io.init(coral::Update);
- io.save(tag, cid);
- }
- break;
-
- case 'v':
- {
- if (argc<2) {
- cout << "usage: " << argv[0] << " -v tag" << endl;
- return 1;
- }
- string tag(argv[2]);
- cout << "validating configuration in " << tableName << " at " << connString << endl;
- cout << "configuration \"" << tag << "\"" << endl;
-
- PCDkr io(connString, tableName, 1);
- io.init(coral::Update);
- io.validate(tag);
- }
- break;
-
- default:
- cout << "unknown option " << argv[1] << endl;
- }
-
- return 0;
-}
diff --git a/InnerDetector/InDetConditions/PixelCoralClientUtils/test/calibDbInterface_example.sh b/InnerDetector/InDetConditions/PixelCoralClientUtils/test/calibDbInterface_example.sh
deleted file mode 100755
index 72ab135f25b273b8eddba30182096671fdcd020d..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelCoralClientUtils/test/calibDbInterface_example.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-#!/bin/sh
-###############################################################################
-
-export PATH=$PATH:$PWD/../i686-slc5-gcc43-opt/calibDbInterface.exe
-
-export PIXEL_CAL_KNOWLEDGE="oracle://INTR/ATLAS_MLIMPER"
-#export PIXEL_CAL_KNOWLEDGE="oracle://DEVDB10/ATLAS_COOL_MLIMPER"
-#export PIXEL_CAL_KNOWLEDGE="sqlite_file:pcd_knowledge.db"
-
-#store the latest updated calibration strings (final argument) along with RunNumber (arg1) idTag (arg2) connTag (arg3) cfgTag (arg4) cfgModTag (arg5)
-calibDbInterface.exe -s 183905 IDTAG1 CONNTAG1 CFGTAG1 CFGMODTAG1 PixCalib-BLKP-UPD4-000-01 CalibString2 CalibString3
-
-#associate calibtag with specific run interval and tag=bla (cool is multi-tag)
-#this step should be done by PixRCDCoolAgent, just here for demonstration...
-# does not work anymore!
-#calibDbInterface -c dummycalib_0 2 3 bla
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/doc/packagedoc.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/doc/packagedoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..d82693bae2a1f2baf0ecfaf489b2e767462ebd78
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/doc/packagedoc.h
@@ -0,0 +1,202 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+@page SCT_ConditionsAlgorithms_page SCT_ConditionsAlgorithms Package
+@author Susumu.Oda@cern.ch
+
+
+@section SCT_ConditionsAlgorithms_SCT_ConditionsAlgorithms Introduction
+
+This package contains condition algorithm and test algorithms for SCT condition tools in SCT_ConditionsTools package
+
+@section SCT_ConditionsAlgorithms_SCT_ConditionsAlgorithmsOverview Class Overview
+SCT_ConditionsAlgorithms package contains the following classes.
+
+@subsection SCT_ConditionsAlgorithms_SCT_ConditionsAlgorithmsCondAlg Condition algorithms
+
+- SCT_AlignCondAlg
+ - Purpose: For SCT alignment. Followed by SCT_DetectorElementCondAlg
+ - Input condition folder: /Indet/Align or (Indet/AlignL1/ID, /Indet/AlignL2/SCT, /Indet/AlignL3)
+ - Output condition data: GeoAlignmentStore ("SCTAlignmentStore")
+
+- SCT_ConditionsParameterCondAlg
+ - Purpose: For SCT_ConditionsParameterTool
+ - Input condition folder: /SCT/DAQ/Configuration/Chip
+ - Output condition data: SCT_CondParameterData ("SCT_CondParameterData")
+
+- SCT_ConfigurationCondAlg
+ - Purpose: For SCT_ConfigurationConditionsTool
+ - Input condition folder: /SCT/DAQ/Config(uration)/{Chip(Slim),Module,MUR,RODMUR,ROD,Geog}
+ - Output condition data: SCT_ConfigurationCondData ("SCT_ConfigurationCondData")
+
+- SCT_DCSConditionsHVCondAlg
+ - Purpose: For SCT_DCSConditionsTool
+ - Input condition folder: /SCT/DCS/HV
+ - Output condition data: SCT_DCSFloatCondData ("SCT_DCSHVCondData")
+
+- SCT_DCSConditionsStatCondAlg
+ - Purpose: For SCT_DCSConditionsTool
+ - Input condition folder: /SCT/DCS/{HV,CHANSTAT}
+ - Output condition data: SCT_DCSStatCondData ("SCT_DCSStatCondData")
+
+- SCT_DCSConditionsTempCondAlg
+ - Purpose: For SCT_DCSConditionsTool
+ - Input condition folder: /SCT/DCS/MODTEMP
+ - Output condition data: SCT_DCSFloatCondData ("SCT_DCSTemp0CondData")
+
+- SCT_DetectorElementCondAlg
+ - Purpose: For SCT alignment
+ - Input condition data: GeoAlignmentStore ("SCTAlignmentStore")
+ - Output condition data: InDetDD::SiDetectorElementCollection> ("SCT_DetectorElementCollection")
+
+- SCT_LinkMaskingCondAlg
+ - Purpose: For SCT_LinkMaskingTool
+ - Input condition folder: /purple/pants (created by createLinkMaskingSQLiteFile.py)
+ - Output condition data: SCT_ModuleVetoCondData ("SCT_LinkMaskingCondData")
+
+- SCT_MajorityCondAlg
+ - Purpose: For SCT_MajorityConditionsTool
+ - Input condition folder: /SCT/DCS/MAJ
+ - Output condition data: SCT_MajorityCondData ("SCT_MajorityCondData")
+
+- SCT_ModuleVetoCondAlg
+ - Purpose: For SCT_ModuleVetoTool
+ - Input condition folder: /SCT/Manual/BadModules
+ - Output condition data: SCT_ModuleVetoCondData ("SCT_ModuleVetoCondData")
+
+- SCT_MonitorCondAlg
+ - Purpose: For SCT_MonitorConditionsTool
+ - Input condition folder: /SCT/Derived/Monitoring
+ - Output condition data: SCT_MonitorCondData ("SCT_MonitorCondData")
+
+- SCT_RODVetoCondAlg
+ - Purpose: For SCT_RODVetoToolSCT_RODVetoTool
+ - Input condition folder: None (specified by "BadRODIds" in job option)
+ - Output condition data: IdentifierSet ("BadSCTModuleIds_RODVeto")
+
+- SCT_ReadCalibChipGainCondAlg
+ - Purpose: For SCT_ReadCalibChipDataTool
+ - Input condition folder: /SCT/DAQ/Calibration/ChipGain
+ - Output condition data: SCT_GainCalibData ("SCT_GainCalibData")
+
+- SCT_ReadCalibChipNoiseCondAlg
+ - Purpose: For SCT_ReadCalibChipDataTool
+ - Input condition folder: /SCT/DAQ/Calibration/ChipNoise
+ - Output condition data: SCT_NoiseCalibData ("SCT_NoiseCalibData")
+
+- SCT_ReadCalibDataCondAlg
+ - Purpose: For SCT_ReadCalibDataTool
+ - Input condition folder: /SCT/DAQ/Calibration/{NoiseOccupancyDefects,NPtGainDefects}
+ - Output condition data: SCT_CalibDefectData ("SCT_CalibDefectNPtGain", "SCT_CalibDefectNPtNoise"), SCT_AllGoodStripInfo ("SCT_AllGoodStripInfo")
+
+- SCT_SensorsCondAlg
+ - Purpose: For SCT_SensorsTool
+ - Input condition folder: /SCT/Sensors
+ - Output condition data: SCT_SensorsCondData ("SCT_SensorsCondData")
+
+- SCT_SiliconHVCondAlg
+ - Purpose: For SCT_SiliconConditionsTool
+ - Input condition data: SCT_DCSStatCondData ("SCT_DCSStatCondData"), SCT_DCSFloatCondData ("SCT_DCSHVCondData")
+ - Output condition data: SCT_DCSFloatCondData ("SCT_SiliconBiasVoltCondData")
+
+- SCT_SiliconTempCondAlg
+ - Purpose: For SCT_SiliconConditionsTool
+ - Input condition data: SCT_DCSStatCondData ("SCT_DCSStatCondData"), SCT_DCSFloatCondData ("SCT_DCSTemp0CondData")
+ - Output condition data: SCT_DCSFloatCondData ("SCT_SiliconTempCondData")
+
+- SCT_TdaqEnabledCondAlg
+ - Purpose: For SCT_TdaqEnabledTool
+ - Input condition folder: /TDAQ/Resources/ATLAS/SCT/Robins (>=Run 2) or /TDAQ/EnabledResources/ATLAS/SCT/Robins (Run 1)
+ - Output condition data: SCT_TdaqEnabledCondData ("SCT_TdaqEnabledCondData")
+
+@subsection SCT_ConditionsAlgorithms_SCT_ConditionsAlgorithmsTestAlg Test algorithms
+
+- SCT_ByteStreamErrorsTestAlg
+ - Purpose: To test SCT_ByteStreamErrorsTool
+ - Test script: testBSError.py
+
+- SCT_ConditionsParameterTestAlg
+ - Purpose: To test SCT_ConditionsParameterTool
+ - Test script: testParameters.py
+
+- SCT_ConditionsSummaryTestAlg
+ - Purpose: To test SCT_ConditionsSummaryTool
+ - Test script: testSummary.py
+
+- SCT_ConfigurationConditionsTestAlg
+ - Purpose: To test SCT_ConfigurationConditionsTool
+ - Test script: testConfig.py
+
+- SCT_DCSConditionsTestAlg
+ - Purpose: To test SCT_DCSConditionsTool
+ - Test script: testDCSConditions.py
+
+- SCT_FlaggedConditionTestAlg
+ - Purpose: To test SCT_FlaggedConditionTool
+ - Test script: testFlagged.py
+
+- SCT_LinkMaskingTestAlg
+ - Purpse: To test SCT_LinkMaskingTool
+ - Test script: TestLinkMasking.sh
+
+- SCT_MajorityConditionsTestAlg
+ - Purpose: To test SCT_MajorityConditionsTool
+ - Test script: testMajority.py
+
+- SCT_ModuleVetoTestAlg
+ - Purpose: To test SCT_ModuleVetoTool
+ - Test script: testModuleVeto.py
+
+- SCT_MonitorConditionsTestAlg
+ - Purpose: To test SCT_MonitorConditionsTool
+ - Test script: testMonRead.py
+
+- SCT_RODVetoTestAlg
+ - Purpose: To test SCT_RODVetoTool
+ - Test script: testRodVeto.py
+
+- SCT_ReadCalibChipDataTestAlg
+ - Purpose: To test SCT_ReadCalibChipDataTool
+ - Test script: testCalibChipRead.py
+
+- SCT_ReadCalibDataTestAlg
+ - Purpose: To test SCT_ReadCalibDataTool
+ - Test script: testCalibRead.py
+
+- SCT_ReadoutTestAlg
+ - Purpose: To test SCT_ReadoutTool
+ - Test script: testReadout.py
+
+- SCT_SensorsTestAlg
+ - Purpose: To test SCT_SensorsTool
+ - Test script: testSensors.py
+
+- SCT_SiliconConditionsTestAlg
+ - Purpose: To test SCT_SiliconConditionsTool
+ - Test script: testSilicon.py
+
+- SCT_StripVetoTestAlg
+ - Purpose: To test SCT_StripVetoTool
+ - Test script: testStripVeto.py
+
+- SCT_TdaqEnabledTestAlg
+ - Purpose: To test SCT_TdaqEnabledTool
+ - Test script: testTdaqEnabled.py
+
+@section SCT_ConditionsAlgorithms_SCT_ConditionsAlgorithmsUtility Files for utilities
+
+- FillFromStringUtility.h
+ - fillArrayFromString and fillEmptyVectorFromString functions
+ - Used by SCT_ReadCalibChipGainCondAlg.cxx, SCT_ReadCalibChipNoiseCondAlg.cxx, SCT_ReadCalibDataCondAlg.cxx
+
+- SCT_ConditionsUtilities.h and SCT_ConditionsUtilities.cxx
+ - getenv function
+ - Used by SCT_ConditionsParameterTestAlg.cxx
+
+- SCT_SimpleHisto.h
+ - init, fill, asXmlString, xmlHeader, stylesheet functions
+ - Used by SCT_ConditionsParameterTestAlg.cxx
+
+**/
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsData/doc/packagedoc.h b/InnerDetector/InDetConditions/SCT_ConditionsData/doc/packagedoc.h
index f1a0fa25858cde14ce4efc1243e4226d40842e1f..41450913d6948a10e5c408f64f5cd57e73102d54 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsData/doc/packagedoc.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsData/doc/packagedoc.h
@@ -47,7 +47,7 @@ This package provides data classes used to access data in the conditions
- SCT_DCSStatCondData
@subsection Class for SCT_FlaggedConditionTool
- - SCT_FlaggedCondData
+ - SCT_FlaggedCondData: Obsolete. SCT_FlaggedConditionTool uses IDCInDetBSErrContainer now.
@subsection Class for SCT_MajorityConditionsTool, SCT_MajorityCondAlg
- SCT_MajorityCondData
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/doc/packagedoc.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/doc/packagedoc.h
index dd0fcbecaf82a98313237af9ea3daeee16afc07f..35c8c1e920c2af0e156d494f4ae4ecd703442c14 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/doc/packagedoc.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/doc/packagedoc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -27,55 +27,202 @@ SCT_ConditionsTools contains the following classes:
- ISCT_ConditionsTool: Base class for the various conditions tools, the interface provides the isGood() methods to be used by clients.
- - SCT_ReadoutTool: Interface for the SCT_ReadoutTool, used to determine which chips are read out from a module, taking bypass/redundancy configuration
- into account
-
- SCT_ByteStreamErrorsTool: Used to convey errors in the bytestream. In addition to the common interface provided by ISCT_ConditionsTool, it has methods for
retrieving error conditions for modules which display communication/datastream errors. The tool provides the 'isGood' methods to clients based on this information.
+ - Interface: ISCT_ByteStreamErrorsTool
+ - Conditions data: IDCInDetBSErrContainer ("SCT_ByteStreamErrs")
+ - Conditions folder: None
+ - Conditions algorithm: None (filled by SCT_RodDecoder and SCT_ByteStreamErrorsTool)
+ - Test algorithm: SCT_ByteStreamErrorsTestAlg
+ - Test script: testBSError.py
+ - Configuration script: SCT_ByteStreamErrorsToolSetup.py
+ - SCT_ChargeTrappingTool: Used for special digitisation with charge trapping.
+ - Interface: ISCT_ChargeTrappingTool
+ - Conditions data: SCT_ChargeTrappingCondData
+ - Conditions folder: None
+ - Conditions algorithm: None (filled by SCT_ChargeTrappingTool)
+ - Test algorithm: None
+ - Test script: None
+ - Configuration script: None
+
+ - SCT_ConditionsParameterTool: Used to give numerical parameters in standalone tests.
+ - Interface: ISCT_ConditionsParameterTool
+ - Conditions data: SCT_CondParameterData ("SCT_CondParameterData")
+ - Conditions folder: /SCT/DAQ/Configuration/Chip
+ - Conditions algorithm: SCT_ConditionsParameterCondAlg
+ - Test algorithm: SCT_ConditionsParameterTestAlg
+ - Test script: testParameters.py
+ - Configuration script: SCT_ConditionsParameterToolSetup.py
+
- SCT_ConditionsSummaryTool: This class can be configured to loop over the other tools in the package, providing an eventual status which is a summary
of the component tools. The tools to be used are decided in job options.
+ - Interface: IInDetConditionsTool
+ - Conditions data: None
+ - Conditions folder: None
+ - Conditions algorithm: None
+ - Test algorithm: SCT_ConditionsSummaryTestAlg
+ - Test script: testSummary.py
+ - Configuration script: SCT_ConditionsSummaryToolSetup.py
- SCT_ConfigurationConditionsTool: Reads the configuration data for SCT modules which are stored in the COOL database in CoraCool format, and provides module
or channel mask information to clients.
-
+ - Interface: ISCT_ConfigurationConditionsTool
+ - Conditions data: SCT_ConfigurationCondData ("SCT_ConfigurationCondData")
+ - Conditions folder: /SCT/DAQ/Config(uration)/{Chip(Slim),Module,MUR,RODMUR,ROD,Geog}
+ - Conditions algorithm: SCT_ConfigurationCondAlg
+ - Test algorithm: SCT_ConfigurationConditionsTestAlg
+ - Test script: testConfig.py
+ - Configuration script: SCT_ConfigurationConditionsToolSetup.py
+
- SCT_DCSConditionsTool: Reads DCS data such as power supply status and temperature, and decides on this basis (and some internal criteria) whether a module
is good or bad at a particular instant.
+ - Interface: ISCT_DCSConditionsTool
+ - Conditions data: SCT_DCSStatCondData ("SCT_DCSStatCondData"), SCT_DCSFloatCondData ("SCT_DCSHVCondData", "SCT_DCSTemp0CondData")
+ - Conditions folder: /SCT/DCS/{CHANSTAT,HV,MODTEMP}
+ - Conditions algorithm: SCT_DCSConditionsStatCondAlg, SCT_DCSConditionsHVCondAlg, SCT_DCSConditionsTempCondAlg
+ - Test algorithm: SCT_DCSConditionsTestAlg
+ - Test script: testDCSConditions.py
+ - Configuration script: SCT_DCSConditionsToolSetup.py
- - SCT_FlaggedConditionsTool: Used for retrieving bad wafers with more than 384 fired strips. Those bad wafers are declared by clustering algorithms/tools.
+ - SCT_ElectricFieldTool: Used for special digitisation with charge trapping.
+ - Interface: ISCT_ElectricFieldTool
+ - Conditions data: None
+ - Conditions folder: None
+ - Conditions algorithm: None
+ - Test algorithm: None
+ - Test script: None
+ - Configuration script: None
+
+ - SCT_FlaggedConditionTool: Used for retrieving bad wafers with more than 384 fired strips. Those bad wafers are declared by clustering algorithms/tools.
+ - Interface: ISCT_FlaggedConditionTool
+ - Conditions data: IDCInDetBSErrContainer ("SCT_FlaggedCondData")
+ - Conditions folder: None
+ - Conditions algorithm: None (filled by SCT_Clusterization)
+ - Test algorithm: SCT_FlaggedConditionTestAlg
+ - Test script: testFlagged.py
+ - Configuration script: SCT_FlaggedConditionToolSetup.py
+ - SCT_LinkMaskingTool: Analogous to the SCT_ModuleVetoTool, this provides a way to turn off individual Front-End links.
+ - Interface: ISCT_ConditionsTool
+ - Conditions data: SCT_ModuleVetoCondData ("SCT_LinkMaskingCondData")
+ - Conditions folder: /purple/pants (created by createLinkMaskingSQLiteFile.py)
+ - Conditions algorithm: SCT_LinkMaskingCondAlg
+ - Test algorithm: SCT_LinkMaskingTestAlg
+ - Test script: TestLinkMasking.sh
+ - Configuration script: SCT_LinkMaskingToolSetup.py
+
+ - SCT_MajorityConditionsTool: Used for retrieving majority of DCS state in Barrel, Endcap A, Endcap C.
+ - Interface: ISCT_DetectorLevelConditionsTool
+ - Conditions data: SCT_MajorityCondData ("SCT_MajorityCondData")
+ - Conditions folder: "/SCT/DCS/MAJ"
+ - Conditions algorithm: SCT_MajorityCondAlg
+ - Test algorithm: SCT_MajorityConditionsTestAlg
+ - Test script: testMajority.py
+ - Configuration script: SCT_MajorityConditionsToolSetup.py
+
- SCT_ModuleVetoTool: A class which enables one to manually veto modules, either by providing the identifiers in job options or by specifying the module identifiers
in the /SCT/Manual/BadModules folder of the Cool database.
+ - Interface: ISCT_ConditionsTool
+ - Conditions data: SCT_ModuleVetoCondData ("SCT_ModuleVetoCondData") or none
+ - Conditions folder: /SCT/Manual/BadModules or none (spcified by "BadModuleIdentifiers" in job option)
+ - Conditions algorithm: SCT_ModuleVetoCondAlg
+ - Test algorithm: SCT_ModuleVetoTestAlg
+ - Test script: testModuleVeto.py
+ - Configuration script: SCT_ModuleVetoToolSetup.py
- SCT_MonitorConditionsTool: Retrieves data from the database folder /SCT/Derived/Monitoring, which is created by monitoring jobs on the processing farm and contains
data concerning occupancy/noise during data taking.
+ - Interface: ISCT_MonitorConditionsTool
+ - Conditions data: SCT_MonitorCondData ("SCT_MonitorCondData")
+ - Conditions folder: /SCT/Derived/Monitoring
+ - Conditions algorithm: SCT_MonitorCondAlg
+ - Test algorithm: SCT_MonitorConditionsTestAlg
+ - Test script: testMonRead.py
+ - Configuration script: SCT_MonitorConditionsToolSetup.py
+ - SCT_RadDamageSummaryTool: Used for special digitisation with radiation damage.
+ - Interface: ISCT_RadDamageSummaryTool
+ - Conditions data: None
+ - Conditions folder: None
+ - Conditions algorithm: None
+ - Test algorithm: None
+ - Test script: None
+ - Configuration script: None
+
+ - SCT_ReadCalibChipDataTool: Used for retrieving chip calibration parameters.
+ - Interface: ISCT_ReadCalibChipDataTool
+ - Conditions data: SCT_GainCalibData ("SCT_GainCalibData"), SCT_NoiseCalibData ("SCT_NoiseCalibData")
+ - Conditions folder: /SCT/DAQ/Calibration/Chip{Noise,Gain}
+ - Conditions algorithm: SCT_ReadCalibChipNoiseCondAlg, SCT_ReadCalibChipGainCondAlg
+ - Test algorithm: SCT_ReadCalibChipDataTestAlg
+ - Test script: testCalibChipRead.py
+ - Configuration script: SCT_ReadCalibChipDataToolSetup.py
+
- SCT_ReadCalibDataTool: Accesses the calibration folders of the cool database, which are updated as a result of SCT calibration runs. Provides data on defects and noise
determined by calibration.
+ - Interface: ISCT_ReadCalibDataTool
+ - Conditions data: SCT_CalibDefectData ("SCT_CalibDefectNPtGain", "SCT_CalibDefectNPtNoise"), SCT_AllGoodStripInfo ("SCT_AllGoodStripInfo")
+ - Conditions folder: /SCT/DAQ/Calibration/{NoiseOccupancyDefects,NPtGainDefects}
+ - Conditions algorithm: SCT_ReadCalibDataCondAlg
+ - Test algorithm: SCT_ReadCalibDataTestAlg
+ - Test script: testCalibRead.py
+ - Configuration script: SCT_ReadCalibDataToolSetup.py
+ - SCT_ReadoutTool: Interface for the SCT_ReadoutTool, used to determine which chips are read out from a module, taking bypass/redundancy configuration
+ into account
+ - Interface: ISCT_ReadoutTool
+ - Conditions data: SCT_ReadoutData
+ - Conditions folder: None
+ - Conditions algorithm: None
+ - Test algorithm: SCT_ReadoutTestAlg
+ - Test script: testReadout.py
+ - Configuration script: None
+
+ - SCT_RODVetoTool: Analogous to the SCT_ModuleVetoTool, this provides a way to turn off individual ReadOut Drivers.
+ - Interface: ISCT_ConditionsTool
+ - Conditions data: IdentifierSet ("BadSCTModuleIds_RODVeto")
+ - Conditions folder: None (specified by "BadRODIds" in job option)
+ - Conditions algorithm: SCT_RODVetoCondAlg
+ - Test algorithm: SCT_RODVetoTestAlg
+ - Test script: testRodVeto.py
+ - Configuration script: SCT_RODVetoToolSetup.py
+
+ - SCT_SensorsTool: Provides depletion voltage, crystal orientation and manufacturer
+ - Interface: ISCT_SensorsTool
+ - Conditions data: SCT_SensorsCondData ("SCT_SensorsCondData")
+ - Conditions folder: /SCT/Sensors
+ - Conditions algorithm: SCT_SensorsCondAlg
+ - Test algorithm: SCT_SensorsTestAlg
+ - Test script: testSensors.py
+ - Configuration script: SCT_SensorsToolSetup.py
+
- SCT_SiliconConditionsTool: Inheriting from ISiliconConditionsTool (a common interface for Pixels and SCT), this gives information needed to calculate the Lorentz angle,
such as bias voltage, depletion voltage and silicon temperature. For the moment, the silicon depletion voltage is hard coded.
+ - Interface: ISiliconConditionsTool
+ - Conditions data: SCT_DCSFloatCondData ("SCT_SiliconBiasVoltCondData", "SCT_SiliconTempCondData")
+ - Conditions folder: None
+ - Conditions algorithm: SCT_SiliconHVCondAlg, SCT_SiliconTempCondAlg
+ - Test algorithm: SCT_SiliconConditionsTestAlg
+ - Test script: testSilicon.py
+ - Configuration script: SCT_SiliconConditionsToolSetup.py
- SCT_StripVetoTool: Analogous to the SCT_ModuleVetoTool, this provides a way to turn off individual strips manually via job options. Intended for testing and Monte Carlo
studies in particular.
-
- - SCT_ChargeTrappingTool: Used for special digitisation with charge trapping.
-
- - SCT_ConditionsParamterTool: Used to give numerical parameters in standalone tests.
-
- - SCT_ElectricFieldTool: Used for special digitisation with charge trapping.
-
- - SCT_LinkMaskingTool: Analogous to the SCT_ModuleVetoTool, this provides a way to turn off individual Front-End links.
-
- - SCT_MajorityConditionsTool: Used for retrieving majority of DCS state in Barrel, Endcap A, Endcap C.
-
- - SCT_RadDamageSummaryTool: Used for special digitisation with radiation damage.
-
- - SCT_ReadCalibChipDataTool: Used for retrieving chip calibration parameters.
-
- - SCT_RODVetoTool: Analogous to the SCT_ModuleVetoTool, this provides a way to turn off individual ReadOut Drivers.
-
- - SCT_SensorTool: Provides depletion voltage, crystal orientation and manufacturer
+ - Interface: ISCT_ConditionsTool
+ - Conditions data: None
+ - Conditions folder: None (spcified by "BadStripIdentifiers" in job option)
+ - Conditions algorithm: None
+ - Test algorithm: SCT_StripVetoTestAlg
+ - Test script: testStripVeto.py
+ - Configuration script: SCT_StripVetoToolSetup.py
- SCT_TdaqEnabledTool: Provides enabled RODs (only for data)
+ - Interface: ISCT_ConditionsTool
+ - Conditions data: SCT_TdaqEnabledCondData ("SCT_TdaqEnabledCondData")
+ - Conditions folder: /TDAQ/Resources/ATLAS/SCT/Robins (>=Run 2) or /TDAQ/EnabledResources/ATLAS/SCT/Robins (Run 1)
+ - Conditions algorithm: SCT_TdaqEnabledCondAlg
+ - Test algorithm: SCT_TdaqEnabledTestAlg
+ - Test script: testTdaqEnabled.py
+ - Configuration script: SCT_TdaqEnabledToolSetup.py
**/
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
index c38560ea296e3dd181b4b524658f18c88272d218..8bdca590b7b8a9c8612b7aef1e87c5955217d284 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
@@ -388,7 +388,7 @@ unsigned int SCT_ByteStreamErrorsTool::abcdErrorChips(const Identifier& moduleId
}
std::pair<StatusCode, unsigned int> SCT_ByteStreamErrorsTool::getErrorCodeWithCacheUpdate(const Identifier& moduleId, const EventContext& ctx,
- std::map<Identifier, unsigned int>& whereExected) const {
+ std::unordered_map<Identifier, unsigned int>& whereExected) const {
ATH_MSG_VERBOSE("SCT_ByteStreamErrorsTool getErrorCodeWithCacheUpdate " << moduleId);
auto it{whereExected.find(moduleId)};
if (it != whereExected.end()) return std::make_pair(StatusCode::SUCCESS, it->second);
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
index 599e245289e6c98e277839ac89ac080061fa345e..e5c3d21e235bec1bc9eb8f521ba76ae2b50133e2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
@@ -36,7 +36,7 @@
#include <array>
#include <atomic>
#include <functional>
-#include <map>
+#include <unordered_map>
#include <mutex>
#include <vector>
@@ -110,8 +110,8 @@ private:
// 0 as the value denotes no error
// error encoding is as follows: pattern for a module has length of 6 bits, side 0 is encoded in bits 0-5, side 1 in bits 6-11
// so bit 0 is for chip 0 on side 0, bit 1 is for chip 1 on side 0, ..., and bit 11 is for chip 5 on side 1
- std::map<Identifier, unsigned int> tempMaskedChips;
- std::map<Identifier, unsigned int> abcdErrorChips;
+ std::unordered_map<Identifier, unsigned int> tempMaskedChips;
+ std::unordered_map<Identifier, unsigned int> abcdErrorChips;
void reset(EventContext::ContextEvt_t evtId, const IDCInDetBSErrContainer_Cache* cache) {
eventId = evtId;
@@ -155,7 +155,7 @@ private:
* Method that returns BS Error code from the map passed @rag where-Expected
* If the information is initially missing, the cache update is triggered
**/
- std::pair<StatusCode, unsigned int> getErrorCodeWithCacheUpdate(const Identifier& id, const EventContext& ctx, std::map<Identifier, unsigned int>& whereExected) const;
+ std::pair<StatusCode, unsigned int> getErrorCodeWithCacheUpdate(const Identifier& id, const EventContext& ctx, std::unordered_map<Identifier, unsigned int>& whereExected) const;
};
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h
index 6b1909528d45d1c580153a4916ebb8f4d02d1ae3..340068382ee2e08590238575ebba409a048c2c13 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h
@@ -1,112 +1,33 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@page SiLorentzAngleTool_page SiLorentzAngleTool Package
-@authors Grant Gorfine
+@authors Grant Gorfine, Susumu.Oda@cern.ch
@section SiLorentzAngleTool_SiLorentzAngleToolIntro Introduction
-Service for providing Lorentz angle (and the corresponding shift of the measurement)
+Tool for providing Lorentz angle (and the corresponding shift of the measurement)
for each detector element.
-@section SiLorentzAngleTool_SiLorentzAngleToolUsage Usage Notes
+@section SiLorentzAngleTool_SiLorentzAngleToolOverview Class Overview
-A python module has been provided for easy setup.
-To load simply include the following in your job options.
-
-@verbatim
- from SiLorentzAngleTool.LorentzAngleSvcSetup import lorentzAngleSvc
-@endverbatim
-
-This will setup both pixel and SCT. If you only want to setup them up separately you can do
-
-@verbatim
- from SiLorentzAngleTool.PixelLorentzAngleSvcSetup import pixelLorentzAngleSvcSetup
- from SiLorentzAngleTool.SCTLorentzAngleSvcSetup import sctLorentzAngleSvcSetup
-@endverbatim
-
-
-By default it will determine whether to use DB or not from GeoModel.
-To force usage of DB (that is, use SiliconConditionsServices which should
-normally read from DB):
-
-@verbatim
- lorentzAngleSvc.forceUseDB()
-@endverbatim
-
-for both pixel and SCT or to set pixel and SCT separately do:
-
-@verbatim
- lorentzAngleSvc.pixelForceUseDB()
- lorentzAngleSvc.sctForceUseDB()
-@endverbatim
-
-If you used PixelLorentzAngleSvcSetup or SCTLorentzAngleSvcSetup do:
-
-@verbatim
- pixelLorentzAngleSvcSetup.forceUseDB()
- sctLorentzAngleSvcSetup.forceUseDB()
-@endverbatim
-
-For more configuration one can get access to the service configurable via
-members pixel and sct: Eg:
-
-@verbatim
- lorentzAngleSvc.pixel.OutputLevel = VERBOSE
- lorentzAngleSvc.sct.OutputLevel = VERBOSE
- print lorentzAngleSvc.pixel
- print lorentzAngleSvc.sct
-@endverbatim
-
-or
-
-@verbatim
- pixelLorentzAngleSvcSetup.PixelLorentzAngleSvc.OutputLevel = VERBOSE
- sctLorentzAngleSvcSetup.SCTLorentzAngleSvc.OutputLevel = VERBOSE
- print pixelLorentzAngleSvcSetup.PixelLorentzAngleSvc
- print sctLorentzAngleSvcSetup.SCTLorentzAngleSvc
-@endverbatim
-
-You can also access the pixel and sct SiliconConditionsSvc:
-
-@verbatim
- lorentzAngleSvc.PixelSiliconConditionsSvc.CheckGeoModel = False # same as forceUseDB
- lorentzAngleSvc.SCT_SiliconConditionsSvc.CheckGeoModel = False # same as forceUseDB
- print lorentzAngleSvc.PixelSiliconConditionsSvc
- print lorentzAngleSvc.SCT_SiliconConditionsSvc
-@endverbatim
-
-or
-@verbatim
- pixelLorentzAngleSvcSetup.PixelSiliconConditionsSvc.CheckGeoModel = False # same as forceUseDB
- sctLorentzAngleSvcSetup.SCT_SiliconConditionsSvc.CheckGeoModel = False # same as forceUseDB
- print pixelLorentzAngleSvcSetup.PixelSiliconConditionsSvc
- print sctLorentzAngleSvcSetup.SCT_SiliconConditionsSvc
-@endverbatim
-
-Alternatively, you can also access the services by:
-
-@verbatim
- from SiLorentzAngleTool.LorentzAngleSvcSetup import PixelLorentzAngleSvc,SCTLorentzAngleSvc
- PixelLorentzAngleSvc.OutputLevel = VERBOSE
- SCTLorentzAngleSvc.OutputLevel = VERBOSE
-@endverbatim
-
-or
-
-@verbatim
- from SiLorentzAngleTool.PixelLorentzAngleSvcSetup import PixelLorentzAngleSvc
- PixelLorentzAngleSvc.OutputLevel = VERBOSE
-
- from SiLorentzAngleTool.SCTLorentzAngleSvcSetup import SCTLorentzAngleSvc
- SCTLorentzAngleSvc.OutputLevel = VERBOSE
-@endverbatim
+- SiLorentzAngleCondData: Data class to hold Lorentz angle related data
+- SiLorentzAngleTool: The main tool. Inherit ISiLorentzAngleTool of InDetCondTools package
+- PixelSiLorentzAngleCondAlg: Condition algorithm for Pixel
+- SCTSiLorentzAngleCondAlg: Condition algorithm for SCT
+- SCTSiLorentzAngleTestAlg: Test algorithm of SiLorentzAngleTool for SCT. Can be run by testSCTLorentzAngle.py
+@section SiLorentzAngleTool_SiLorentzAngleToolConfiguration Configuration
+@subsection SiLorentzAngleTool_SiLorentzAngleToolNewJobConfig In the new job configuration
+- PixelLorentzAngleConfig.py and SCT_LorentzAngleConfig.py are used to configure SiLorentzAngleTool for Pixel and SCT, respectively.
+@subsection SiLorentzAngleTool_SiLorentzAngleToolOldJobConfig In the old job configuration
+- PixelLorentzAngleToolSetup.py and SCTLorentzAngleToolSetup.py are used to configure SiLorentzAngleTool for Pixel and SCT, respectively.
+- SiLorentzAngleToolConfig.py and SiLorentzAngleToolConfigDb.py can be used to retrieve SiLorentzAngleTool using ConfiguredFactory (https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConfiguredFactory). However, PixelLorentzAngleToolSetup.py and SCTLorentzAngleToolSetup.py are necessary to configure condition alogrithms.
*/
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py
index 00c6e6103ce87efce9ee6bdf4ead921094a9c72b..78610ad961a23228531c97057d93ac4f358695fc 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConfiguredFactory
@@ -6,12 +6,12 @@ from AthenaCommon import CfgMgr
def getSCTLorentzAngleTool(name="SCTLorentzAngleTool", **kwargs):
kwargs.setdefault("DetectorName", "SCT")
+ kwargs.setdefault("DetEleCollKey", "SCT_DetectorElementCollection")
kwargs.setdefault("SiLorentzAngleCondData", "SCTSiLorentzAngleCondData")
- from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
return CfgMgr.SiLorentzAngleTool(name, **kwargs)
def getPixelLorentzAngleTool(name="PixelLorentzAngleTool", **kwargs):
kwargs.setdefault("DetectorName", "Pixel")
- kwargs.setdefault("SiLorentzAngleCondData","PixelSiLorentzAngleCondData")
- from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
+ kwargs.setdefault("DetEleCollKey", "PixelDetectorElementCollection")
+ kwargs.setdefault("SiLorentzAngleCondData", "PixelSiLorentzAngleCondData")
return CfgMgr.SiLorentzAngleTool(name, **kwargs)
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/doc/packagedoc.h b/InnerDetector/InDetConditions/SiPropertiesTool/doc/packagedoc.h
index f7d7578fe658e71c3bb5d6ffec6601c5feda1e49..4b67e96a3505c95c9592f0b6247dcf7f6b5028aa 100644
--- a/InnerDetector/InDetConditions/SiPropertiesTool/doc/packagedoc.h
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/doc/packagedoc.h
@@ -1,22 +1,38 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@page SiPropertiesTool_page SiPropertiesTool Package
-@authors Grant Gorfine
+@authors Grant Gorfine, Susumu.Oda@cern.ch
@section SiPropertiesTool_SiPropertiesToolIntro Introduction
-Service for providing silicon properties for each detector element.
+Tool for providing silicon properties for each detector element.
The properties are available via the SiliconProperties class from
which one can obtain hall and drift mobility, diffusion constant and
number of electron hole pairs per deposited energy. Some of these
are dependent on temperature and voltages which are obtained via the
-appropriate service and updated via a call back.
+appropriate tool and updated via a condition algorithm.
+@section SiPropertiesTool_SiPropertiesToolOverview Class Overview
+- ISiPropertiesTool: Interface for SiPropertiesTool
+- SiPropertiesTool: The main tool for both Pixel and SCT
+- InDet::SiliconProperties: Data object to hold various silicon properties
+- InDet::SiliconPropertiesVector: Vector of SiliconProperties for condition algorithms and SiPropertiesTool
+- PixelSiPropertiesCondAlg: Condition algorithm for Pixel
+- SCTSiPropertiesCondAlg: Condition algorithm for SCT
+- SCTSiPropertiesTestAlg: Test algorithm for SiPropertiesTool for SCT
+
+@section SiPropertiesTool_SiPropertiesToolConfigurationTest Configuration and test scripts
+
+- PixelSiPropertiesConfig.py: Configuration script for Pixel for the new job configuration
+- PixelSiPropertiesToolSetup.py: Configuration script for Pixel for the old job configuration
+- SCT_SiPropertiesConfig.py: Configuration script for SCT for the new job configuration
+- SCT_SiPropertiesToolSetup.py: Configuration script for SCT for the old job configuration
+- testSCTProperties.py: Test script to run SCTSiPropertiesTestAlg
*/
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
index 2827547aac9c5ba4a85f8c497dfd0d9c0b6afd5f..db1c38e4a379a21a2a69f68d519dd3c7d8141081 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
@@ -19,7 +19,7 @@ TRT_StrawStatusSummaryTool::TRT_StrawStatusSummaryTool( const std::string& type,
StatusCode TRT_StrawStatusSummaryTool::initialize()
{
- ATH_MSG_INFO("TRT_StrawStatusSummaryTool initialize method called");
+ ATH_MSG_DEBUG("TRT_StrawStatusSummaryTool initialize method called");
// Get the TRT ID helper
if (StatusCode::SUCCESS!=detStore()->retrieve(m_trtId,"TRT_ID")) {
@@ -42,7 +42,7 @@ StatusCode TRT_StrawStatusSummaryTool::initialize()
}
}
- ATH_MSG_INFO("TRT_StrawStatusSummaryTool initialized successfully ");
+ ATH_MSG_DEBUG("TRT_StrawStatusSummaryTool initialized successfully ");
return StatusCode::SUCCESS;
}
@@ -51,7 +51,6 @@ StatusCode TRT_StrawStatusSummaryTool::initialize()
StatusCode TRT_StrawStatusSummaryTool::finalize()
{
- ATH_MSG_INFO(" in finalize() ");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConfig/CMakeLists.txt b/InnerDetector/InDetConfig/CMakeLists.txt
index b5c9ae719ceca86c8568c1591fffc9269087ad3a..193803d2174d22f4af3e6978d3d272d42e5d05b9 100644
--- a/InnerDetector/InDetConfig/CMakeLists.txt
+++ b/InnerDetector/InDetConfig/CMakeLists.txt
@@ -6,7 +6,7 @@
atlas_subdir( InDetConfig )
# Install files from the package:
-atlas_install_python_modules( python/*.py ${ATLAS_FLAKE8} )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
#atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
#atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/InnerDetector/InDetConfig/python/ITkConfigFlags.py b/InnerDetector/InDetConfig/python/ITkConfigFlags.py
new file mode 100644
index 0000000000000000000000000000000000000000..077bb9d58ae050f16953d79a4ee2d8a595b23991
--- /dev/null
+++ b/InnerDetector/InDetConfig/python/ITkConfigFlags.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+# TODO: clean up flags, should only contain general settings but no alg config
+# TODO : Add some exta levels?
+
+def createITkConfigFlags():
+ itkcf=AthConfigFlags()
+ itkcf.addFlag("ITk.useLocalGeometry", False) #take geometry XML files from local instance rather than Detector Database, for development
+ itkcf.addFlag("ITk.stripGeometryFilename", 'ITkStrip.gmx')
+ return itkcf
diff --git a/InnerDetector/InDetConfig/python/TRTPhaseConfig.py b/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..5ad1858931d1417d666c30667647e95a37716e57
--- /dev/null
+++ b/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
@@ -0,0 +1,176 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+def InDetTrackSummaryToolCfg(flags, name='InDetTrackSummaryTool',**kwargs) :
+ acc = ComponentAccumulator()
+
+ ISF_TrackSummaryHelperTool = CompFactory.iFatras.ISF_TrackSummaryHelperTool(name = "ISF_TrackSummaryHelperTool",
+ AssoTool = "",
+ DoSharedHits = True)
+
+ kwargs.setdefault("doSharedHits", True)
+ kwargs.setdefault("InDetSummaryHelperTool", ISF_TrackSummaryHelperTool)
+ kwargs.setdefault("AddDetailedInDetSummary", False)
+ kwargs.setdefault("doHolesInDet", False)
+ kwargs.setdefault("doHolesMuon", False)
+ kwargs.setdefault("MuonSummaryHelperTool", "")
+ kwargs.setdefault("AddDetailedMuonSummary", False)
+ kwargs.setdefault("TRT_ElectronPidTool", "")
+ kwargs.setdefault("PixelToTPIDTool", "")
+ kwargs.setdefault("PixelExists", True)
+
+ acc.setPrivateTools(CompFactory.Trk.TrackSummaryTool(name = name, **kwargs))
+ return acc
+
+def InDetCosmicsEventPhaseToolCfg(flags, name='InDetCosmicsEventPhaseTool', **kwargs) :
+ #
+ # --- load tool
+ #
+ acc = ComponentAccumulator()
+ if( not flags.Input.isMC ):
+ if flags.Beam.Type =='cosmics':
+ kwargs.setdefault("GlobalOffset", 8)
+ else:
+ kwargs.setdefault("GlobalOffset", 0)
+ else:
+ kwargs.setdefault("GlobalOffset", -3.125)
+ # CalDb tool
+ InDetTRTCalDbTool = CompFactory.TRT_CalDbTool(name = "TRT_CalDbTool")
+ kwargs.setdefault("UseNewEP", True)
+ kwargs.setdefault("TRTCalDbTool", InDetTRTCalDbTool)
+
+ acc.setPrivateTools(CompFactory.InDet.InDetCosmicsEventPhaseTool(name = name, **kwargs))
+ return acc
+
+def InDetFixedWindowTrackTimeToolCfg(flags, name='InDetFixedWindowTrackTimeTool', **kwargs) :
+ #
+ # --- load tool
+ #
+ acc = ComponentAccumulator()
+ if( not flags.Input.isMC ):
+ if flags.Beam.Type =='cosmics':
+ kwargs.setdefault("GlobalOffset", 8)
+ else:
+ kwargs.setdefault("GlobalOffset", 0)
+ else:
+ kwargs.setdefault("GlobalOffset", -3.125)
+ # CalDb tool
+ InDetTRTCalDbTool = CompFactory.TRT_CalDbTool(name = "TRT_CalDbTool")
+ cutWindowCenter = -8.5
+ cutWindowSize = 7
+ kwargs.setdefault("UseNewEP" , True)
+ kwargs.setdefault("WindowCenter" , cutWindowCenter)
+ kwargs.setdefault("WindowSize" , cutWindowSize)
+ kwargs.setdefault("TRTCalDbTool" , InDetTRTCalDbTool)
+
+
+ acc.setPrivateTools(CompFactory.InDet.InDetFixedWindowTrackTimeTool(name = name, **kwargs))
+ return acc
+
+def InDetSlidingWindowTrackTimeToolCfg(flags, name='InDetSlidingWindowTrackTimeTool', **kwargs) :
+ #
+ # --- load tool
+ #
+ acc = ComponentAccumulator()
+ if( not flags.Input.isMC ):
+ if flags.Beam.Type =='cosmics':
+ kwargs.setdefault("GlobalOffset", 8)
+ else:
+ kwargs.setdefault("GlobalOffset", 0)
+ else:
+ kwargs.setdefault("GlobalOffset", -3.125)
+ # CalDb tool
+ InDetTRTCalDbTool = CompFactory.TRT_CalDbTool(name = "TRT_CalDbTool")
+ numberIterations = 5
+ cutWindowSize = 7
+ kwargs.setdefault("UseNewEP" , True)
+ kwargs.setdefault("NumberIterations" , numberIterations)
+ kwargs.setdefault("WindowSize" , cutWindowSize)
+ kwargs.setdefault("TRTCalDbTool" , InDetTRTCalDbTool)
+
+ acc.setPrivateTools(CompFactory.InDet.InDetSlidingWindowTrackTimeTool(name = name, **kwargs))
+ return acc
+
+def InDetCosmicsEventPhaseCfg(flags, InputTrackCollections, name = 'InDetCosmicsEventPhase', **kwargs):
+ #
+ # --- load algorithm
+ #
+ acc = ComponentAccumulator()
+
+ InDetCosmicsEventPhaseTool = acc.popToolsAndMerge(InDetCosmicsEventPhaseToolCfg(flags))
+ acc.addPublicTool(InDetCosmicsEventPhaseTool)
+
+ InDetSlidingWindowTrackTimeTool = acc.popToolsAndMerge(InDetSlidingWindowTrackTimeToolCfg(flags))
+ acc.addPublicTool(InDetSlidingWindowTrackTimeTool)
+
+ InDetFixedWindowTrackTimeTool = acc.popToolsAndMerge(InDetFixedWindowTrackTimeToolCfg(flags))
+ acc.addPublicTool(InDetFixedWindowTrackTimeTool )
+
+ InDetTrackSummaryTool = acc.popToolsAndMerge(InDetTrackSummaryToolCfg(flags))
+ acc.addPublicTool(InDetTrackSummaryTool)
+
+ # CalDb tool
+ InDetTRTCalDbTool = CompFactory.TRT_CalDbTool(name = "TRT_CalDbTool")
+ kwargs.setdefault("InputTracksNames" , InputTrackCollections)
+ kwargs.setdefault("TrackSummaryTool" , InDetTrackSummaryTool)
+ kwargs.setdefault("TRTCalDbTool" , InDetTRTCalDbTool)
+ kwargs.setdefault("EventPhaseTool" , InDetSlidingWindowTrackTimeTool)
+ #kwargs.setdefault("EventPhaseTool" , InDetFixedWindowTrackTimeTool)
+
+ if flags.Beam.Type =='cosmics':
+ kwargs.setdefault("EventPhaseTool" , InDetCosmicsEventPhaseTool)
+
+ acc.addEventAlgo(CompFactory.InDet.InDetCosmicsEventPhase(name = name, **kwargs))
+ return acc
+
+# --------------------------------------------------------------------------------
+#
+# --- TRT phase calculation
+#
+# --------------------------------------------------------------------------------
+def TRTPhaseCfg(flags, self, InputTrackCollections = [], **kwargs):
+ acc = ComponentAccumulator()
+ if flags.InDet.doPRDFormation and flags.Detector.RecoTRT:
+ #
+ # --- calculation of the event phase from all 3 input collections
+ #
+ acc.merge(InDetCosmicsEventPhaseCfg(flags, InputTrackCollections, **kwargs))
+ return acc
+
+if __name__ == "__main__":
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=1
+
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
+ numThreads=1
+ ConfigFlags.Concurrency.NumThreads=numThreads
+ ConfigFlags.Concurrency.NumConcurrentEvents=numThreads # Might change this later, but good enough for the moment.
+
+ ConfigFlags.Detector.RecoTRT = True
+
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+ ConfigFlags.Input.Files = defaultTestFiles.RDO
+ ConfigFlags.lock()
+ ConfigFlags.dump()
+
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ top_acc = MainServicesCfg(ConfigFlags)
+
+ msgService = top_acc.getService('MessageSvc')
+ msgService.Format = "S:%s E:%e % F%138W%S%7W%R%T %0W%M"
+
+ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+ top_acc.merge(PoolReadCfg(ConfigFlags))
+
+ from TRT_GeoModel.TRT_GeoModelConfig import TRT_GeometryCfg
+ top_acc.merge(TRT_GeometryCfg( ConfigFlags ))
+
+ top_acc.merge(TRTPhaseCfg(ConfigFlags, ['TRTTracks_Phase', 'ExtendedTracksPhase'])) ## read from InDetKeys.TRT_Tracks_Phase, InDetKeys.ExtendedTracksPhase
+
+ iovsvc = top_acc.getService('IOVDbSvc')
+ iovsvc.OutputLevel=5
+ top_acc.printConfig()
+ top_acc.run(25)
+ top_acc.store(open("test_TRTPhaseConfig.pkl", "wb")) ##comment out to store top_acc into pkl file
\ No newline at end of file
diff --git a/InnerDetector/InDetConfig/python/TRTPreProcessing.py b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
new file mode 100644
index 0000000000000000000000000000000000000000..d5546a36f0849d3a5ad81de48a274586e96af51e
--- /dev/null
+++ b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
@@ -0,0 +1,315 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# ------------------------------------------------------------
+#
+# ----------- TRT Data-Preparation stage
+#
+# ------------------------------------------------------------
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+def InDetPRD_MultiTruthMakerTRTCfg(flags, name = "InDetTRT_PRD_MultiTruthMaker", **kwargs):
+ acc = ComponentAccumulator()
+
+ kwargs.setdefault("PixelClusterContainerName", "")
+ kwargs.setdefault("SCTClusterContainerName", "")
+ kwargs.setdefault("TRTDriftCircleContainerName", 'TRT_DriftCircles') ##read from InDetKeys.TRT_DriftCircles
+ kwargs.setdefault("SimDataMapNamePixel", "")
+ kwargs.setdefault("SimDataMapNameSCT", "")
+ kwargs.setdefault("SimDataMapNameTRT", 'TRT_SDO_Map') ##read from InDetKeys.TRT_SDOs
+ kwargs.setdefault("TruthNamePixel", "")
+ kwargs.setdefault("TruthNameSCT", "")
+ kwargs.setdefault("TruthNameTRT", 'PRD_MultiTruthTRT') ##read from InDetKeys.TRT_DriftCirclesTruth
+
+ acc.addEventAlgo(CompFactory.InDet.PRD_MultiTruthMaker(name, **kwargs))
+ return acc
+
+def InDetPRD_MultiTruthMakerTRTPUCfg(flags, name = "InDetTRT_PRD_MultiTruthMakerPU", **kwargs):
+ acc = ComponentAccumulator()
+
+ kwargs.setdefault("PixelClusterContainerName", "")
+ kwargs.setdefault("SCTClusterContainerName", "")
+ kwargs.setdefault("TRTDriftCircleContainerName", 'TRT_PU_DriftCircles') ##read from InDetKeys.TRT_PU_DriftCircles
+ kwargs.setdefault("SimDataMapNamePixel", "")
+ kwargs.setdefault("SimDataMapNameSCT", "")
+ kwargs.setdefault("SimDataMapNameTRT", 'TRT_PU_SDO_Map') ##read from InDetKeys.TRT_PU_SDOs
+ kwargs.setdefault("TruthNamePixel", "")
+ kwargs.setdefault("TruthNameSCT", "")
+ kwargs.setdefault("TruthNameTRT", 'PRD_PU_MultiTruthTRT') ##read from InDetKeys.TRT_PU_DriftCirclesTruth
+
+ acc.addEventAlgo(CompFactory.InDet.PRD_MultiTruthMaker(name, **kwargs))
+ return acc
+
+def InDetTRT_DriftFunctionToolCfg(flags, useTimeInfo, usePhase, name = "InDetTRT_DriftFunctionTool", **kwargs):
+ acc = ComponentAccumulator()
+ #
+ # --- TRT_DriftFunctionTool
+ #
+ # Calibration DB Service
+ from InDetOverlay.TRT_ConditionsConfig import TRT_CalDbToolCfg
+ InDetTRTCalDbTool = acc.popToolsAndMerge(TRT_CalDbToolCfg(flags))
+ acc.addPublicTool(InDetTRTCalDbTool)
+
+ # --- overwrite for uncalibrated DC production
+ if (not useTimeInfo) or flags.InDet.noTRTTiming:
+ kwargs.setdefault("DummyMode", True)
+ kwargs.setdefault("UniversalError", 1.15)
+
+ # --- set Data/MC flag
+ if( flags.Input.isMC ) :
+ kwargs.setdefault("IsMC", True)
+ else :
+ kwargs.setdefault("IsMC", False)
+
+ # --- overwrite for calibration of MC
+ if usePhase and flags.Beam.Type =='cosmics' and flags.Input.isMC:
+ kwargs.setdefault("AllowDigiVersionOverride", True)
+ kwargs.setdefault("ForcedDigiVersion", 9)
+
+ kwargs.setdefault("TRTCalDbTool", InDetTRTCalDbTool)
+ # --- set HT corrections
+ kwargs.setdefault("HTCorrectionBarrelXe", 1.5205)
+ kwargs.setdefault("HTCorrectionEndcapXe", 1.2712)
+ kwargs.setdefault("HTCorrectionBarrelAr", 1.5205)
+ kwargs.setdefault("HTCorrectionEndcapAr", 1.2712)
+ # --- set ToT corrections
+ kwargs.setdefault("ToTCorrectionsBarrelXe" , [0., 4.358121, 3.032195, 1.631892, 0.7408397, -0.004113, -0.613288, -0.73758, -0.623346, -0.561229,
+ -0.29828, -0.21344, -0.322892, -0.386718, -0.534751, -0.874178, -1.231799, -1.503689, -1.896464, -2.385958])
+ kwargs.setdefault("ToTCorrectionsEndcapXe" , [0., 5.514777, 3.342712, 2.056626, 1.08293693, 0.3907979, -0.082819, -0.457485, -0.599706, -0.427493,
+ -0.328962, -0.403399, -0.663656, -1.029428, -1.46008, -1.919092, -2.151582, -2.285481, -2.036822, -2.15805])
+ kwargs.setdefault("ToTCorrectionsBarrelAr" , [0., 4.358121, 3.032195, 1.631892, 0.7408397, -0.004113, -0.613288, -0.73758, -0.623346, -0.561229,
+ -0.29828, -0.21344, -0.322892, -0.386718, -0.534751, -0.874178, -1.231799, -1.503689, -1.896464, -2.385958])
+ kwargs.setdefault("ToTCorrectionsEndcapAr" , [0., 5.514777, 3.342712, 2.056626, 1.08293693, 0.3907979, -0.082819, -0.457485, -0.599706, -0.427493,
+ -0.328962, -0.403399, -0.663656, -1.029428, -1.46008, -1.919092, -2.151582, -2.285481, -2.036822, -2.15805])
+
+ # Second calibration DB Service in case pile-up and physics hits have different calibrations
+ if ConfigFlags.Detector.RecoTRT:
+ TRT_CalDbTool = CompFactory.TRT_CalDbTool
+ InDetTRTCalDbTool2 = TRT_CalDbTool( name="TRT_CalDbTool2",
+ RtFolderName="/TRT/Calib/MC/RT",
+ T0FolderName="/TRT/Calib/MC/T0")
+ acc.addPublicTool(InDetTRTCalDbTool2)
+ kwargs.setdefault("TRTCalDbTool2", InDetTRTCalDbTool2)
+ kwargs.setdefault("IsOverlay", True)
+ kwargs.setdefault("IsMC", False)
+ acc.setPrivateTools(CompFactory.TRT_DriftFunctionTool(name, **kwargs))
+ return acc
+
+def TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTRT_DriftCircleTool", **kwargs):
+ acc = ComponentAccumulator()
+ #
+ # --- TRT_DriftCircleTool
+ #
+ if usePhase:
+ TRT_DriftCircleTool = CompFactory.InDet.TRT_DriftCircleToolCosmics
+ else:
+ TRT_DriftCircleTool = CompFactory.InDet.TRT_DriftCircleTool
+
+ # set gating values for MC/DATA
+ from AthenaCommon.SystemOfUnits import ns
+
+ MinTrailingEdge = 11.0*ns
+ MaxDriftTime = 60.0*ns
+ LowGate = 14.0625*ns # 4.5*3.125 ns
+ HighGate = 42.1875*ns # LowGate + 9*3.125 ns
+ if flags.Beam.Type == 'cosmics':
+ LowGate = 19.0*ns
+ HighGate = 44.0*ns
+ if not flags.Input.isMC:
+ MinTrailingEdge = 11.0*ns
+ MaxDriftTime = 60.0*ns
+ LowGate = 14.0625*ns ## 4.5*3.125 ns
+ HighGate = 42.1875*ns ## LowGate + 9*3.125 ns
+ if flags.Beam.Type == 'cosmics':
+ LowGate = 19.0*ns
+ HighGate = 44.0*ns
+ #
+ # --- TRT_DriftFunctionTool
+ #
+ InDetTRT_DriftFunctionTool = acc.popToolsAndMerge(InDetTRT_DriftFunctionToolCfg(flags, useTimeInfo, usePhase, name = prefix + "DriftFunctionTool", **kwargs))
+ acc.addPublicTool(InDetTRT_DriftFunctionTool)
+
+ from InDetOverlay.TRT_ConditionsConfig import TRT_StrawStatusSummaryToolCfg
+ InDetTRTStrawStatusSummaryTool = acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
+ acc.addPublicTool(InDetTRTStrawStatusSummaryTool)
+
+ kwargs.setdefault("TRTDriftFunctionTool", InDetTRT_DriftFunctionTool)
+ kwargs.setdefault("ConditionsSummaryTool", InDetTRTStrawStatusSummaryTool)
+ kwargs.setdefault("UseConditionsStatus", True)
+ kwargs.setdefault("UseConditionsHTStatus", True)
+ kwargs.setdefault("SimpleOutOfTimePileupSupression", flags.Beam.Type == 'cosmics') #flags.InDet.doCosmics
+ kwargs.setdefault("RejectIfFirstBit", False)
+ kwargs.setdefault("MinTrailingEdge", MinTrailingEdge)
+ kwargs.setdefault("MaxDriftTime", MaxDriftTime)
+ kwargs.setdefault("ValidityGateSuppression", flags.Beam.Type != 'cosmics') #not flags.InDet.doCosmics
+ kwargs.setdefault("LowGate", LowGate)
+ kwargs.setdefault("HighGate", HighGate)
+ kwargs.setdefault("SimpleOutOfTimePileupSupressionArgon" , flags.Beam.Type == 'cosmics') #flags.InDet.doCosmics
+ kwargs.setdefault("RejectIfFirstBitArgon", False)
+ kwargs.setdefault("MinTrailingEdgeArgon", MinTrailingEdge)
+ kwargs.setdefault("MaxDriftTimeArgon", MaxDriftTime)
+ kwargs.setdefault("ValidityGateSuppressionArgon" , flags.Beam.Type != 'cosmics') #not flags.InDet.doCosmics
+ kwargs.setdefault("LowGateArgon", LowGate)
+ kwargs.setdefault("HighGateArgon", HighGate)
+ kwargs.setdefault("useDriftTimeHTCorrection", True)
+ kwargs.setdefault("useDriftTimeToTCorrection", True)
+
+
+ if flags.InDet.InDet25nsec and flags.Beam.Type == "collisions":
+ kwargs.setdefault("ValidityGateSuppression", True)
+ kwargs.setdefault("SimpleOutOfTimePileupSupression", False)
+
+ if flags.Beam.Type == "cosmics":
+ kwargs.setdefault("SimpleOutOfTimePileupSupression", False)
+
+ acc.setPrivateTools(TRT_DriftCircleTool(name, **kwargs))
+ return acc
+
+def TRT_LocalOccupancyCfg(flags, name = "InDet_TRT_LocalOccupancy", **kwargs):
+ acc = ComponentAccumulator()
+ # Calibration DB Service
+ from InDetOverlay.TRT_ConditionsConfig import TRT_CalDbToolCfg
+ InDetTRTCalDbTool = acc.popToolsAndMerge(TRT_CalDbToolCfg(flags))
+ acc.addPublicTool(InDetTRTCalDbTool)
+ # Straw status DB Tool
+ from InDetOverlay.TRT_ConditionsConfig import TRT_StrawStatusSummaryToolCfg
+ InDetTRTStrawStatusSummaryTool = acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
+ acc.addPublicTool(InDetTRTStrawStatusSummaryTool)
+ kwargs.setdefault("isTrigger", False)
+ kwargs.setdefault("TRTCalDbTool", InDetTRTCalDbTool)
+ kwargs.setdefault("TRTStrawStatusSummaryTool", InDetTRTStrawStatusSummaryTool)
+
+ InDetTRT_LocalOccupancy = CompFactory.TRT_LocalOccupancy(name, **kwargs)
+ acc.setPrivateTools(InDetTRT_LocalOccupancy)
+ return acc
+
+def TRTOccupancyIncludeCfg(flags, name = "InDetTRT_TRTOccupancyInclude", **kwargs):
+ acc = ComponentAccumulator()
+ # Calibration DB Service
+ from InDetOverlay.TRT_ConditionsConfig import TRT_CalDbToolCfg
+ InDetTRTCalDbTool = acc.popToolsAndMerge( TRT_CalDbToolCfg(flags) )
+ acc.addPublicTool(InDetTRTCalDbTool)
+ # Straw status DB Tool
+ from InDetOverlay.TRT_ConditionsConfig import TRT_StrawStatusSummaryToolCfg
+ InDetTRTStrawStatusSummaryTool = acc.popToolsAndMerge(TRT_StrawStatusSummaryToolCfg(flags))
+ acc.addPublicTool(InDetTRTStrawStatusSummaryTool)
+ InDetTRT_LocalOccupancy = acc.popToolsAndMerge(TRT_LocalOccupancyCfg(flags))
+ acc.addPublicTool(InDetTRT_LocalOccupancy)
+ kwargs.setdefault("isTrigger", False)
+ kwargs.setdefault("TRTCalDbTool", InDetTRTCalDbTool)
+ kwargs.setdefault("TRTStrawStatusSummaryTool", InDetTRTStrawStatusSummaryTool)
+ kwargs.setdefault("TRT_LocalOccupancyTool", InDetTRT_LocalOccupancy)
+
+ acc.addEventAlgo(CompFactory.TRTOccupancyInclude(name, **kwargs))
+ return acc
+
+def InDetTRT_RIO_MakerCfg(flags, useTimeInfo, usePhase, prefix, collection, name = "InDetTRT_RIO_Maker", **kwargs):
+ acc = ComponentAccumulator()
+ #
+ # --- TRT_DriftCircleTool
+ #
+ InDetTRT_DriftCircleTool = acc.popToolsAndMerge(TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTRT_DriftCircleTool"))
+ acc.addPublicTool(InDetTRT_DriftCircleTool)
+ #
+ # --- TRT_RIO_Maker Algorithm
+ #
+ kwargs.setdefault("TRT_DriftCircleTool", InDetTRT_DriftCircleTool)
+ kwargs.setdefault("TrtDescrManageLocation", 'TRT')
+ kwargs.setdefault("TRTRDOLocation", 'TRT_RDOs')
+ kwargs.setdefault("TRTRIOLocation", collection)
+
+ acc.addEventAlgo(CompFactory.InDet.TRT_RIO_Maker(name, **kwargs))
+ return acc
+
+def InDetTRT_RIO_MakerPUCfg(flags, useTimeInfo, usePhase, prefix, collectionPU, name = "InDetTRT_RIO_MakerPU", **kwargs):
+ acc = ComponentAccumulator()
+ #
+ # --- TRT_DriftCircleTool
+ #
+ InDetTRT_DriftCircleTool = acc.popToolsAndMerge(TRT_DriftCircleToolCfg(flags, useTimeInfo, usePhase, prefix, name = "InDetTRT_DriftCircleTool"))
+ acc.addPublicTool(InDetTRT_DriftCircleTool)
+ #
+ # --- TRT_RIO_Maker Algorithm
+ #
+ kwargs.setdefault("TRT_DriftCircleTool", InDetTRT_DriftCircleTool)
+ kwargs.setdefault("TrtDescrManageLocation", 'TRT')
+ kwargs.setdefault("TRTRDOLocation", 'TRT_PU_RDOs')
+ kwargs.setdefault("TRTRIOLocation", collectionPU)
+
+ acc.addEventAlgo(CompFactory.InDet.TRT_RIO_Maker(name, **kwargs))
+ return acc
+########################################################################################################
+########################################################################################################
+def TRTPreProcessingCfg(flags, useTimeInfo = True, usePhase = False, **kwargs):
+ acc = ComponentAccumulator()
+
+ if flags.InDet.doPRDFormation and flags.InDet.doTRT_PRDFormation:
+ #
+ # --- setup naming of tools and algs
+ #
+ if useTimeInfo:
+ prefix = "InDetTRT_"
+ collection = 'TRT_DriftCircles' ##InDetKeys.TRT_DriftCircles
+ if flags.InDet.doSplitReco:
+ collectionPU = 'TRT_PU_DriftCircles' ##read from InDetKeys.TRT_PU_DriftCircles
+ else:
+ prefix = "InDetTRT_noTime_"
+ collection = 'TRT_DriftCirclesUncalibrated' ##read from InDetKeys.TRT_DriftCirclesUncalibrated
+ if flags.InDet.doSplitReco:
+ collectionPU = 'TRT_PU_DriftCirclesUncalibrated' ##read from InDetKeys.TRT_PU_DriftCirclesUncalibrated
+ #
+ # --- TRT_RIO_Maker Algorithm
+ #
+ acc.merge(InDetTRT_RIO_MakerCfg(flags, useTimeInfo, usePhase, prefix, collection, name = prefix+"RIO_Maker"))
+ if flags.InDet.doSplitReco :
+ acc.merge(InDetTRT_RIO_MakerPUCfg(flags, useTimeInfo, usePhase, prefix, collectionPU, name = prefix+"RIO_MakerPU", **kwargs))
+ #
+ # Include alg to save the local occupancy inside xAOD::EventInfo
+ #
+ if flags.InDet.doTRTGlobalOccupancy:
+ acc.merge(TRTOccupancyIncludeCfg(flags, name = prefix +"TRTOccupancyInclude"))
+ #
+ # --- we need to do truth association if requested (not for uncalibrated hits in cosmics)
+ #
+ if flags.InDet.doTruth and useTimeInfo:
+ acc.merge(InDetPRD_MultiTruthMakerTRTCfg(flags, name = prefix + "PRD_MultiTruthMaker"))
+ if flags.InDet.doSplitReco :
+ acc.merge(InDetPRD_MultiTruthMakerTRTPUCfg(flags, name = prefix+"PRD_MultiTruthMakerPU"))
+ return acc
+
+
+if __name__ == "__main__":
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=1
+
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+ ConfigFlags.Input.Files=defaultTestFiles.RDO
+
+ ConfigFlags.Detector.RecoTRT = True
+
+ numThreads=1
+ ConfigFlags.Concurrency.NumThreads=numThreads
+ ConfigFlags.Concurrency.NumConcurrentEvents=numThreads # Might change this later, but good enough for the moment.
+
+ ConfigFlags.lock()
+ ConfigFlags.dump()
+
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ top_acc = MainServicesCfg(ConfigFlags)
+
+ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+ top_acc.merge(PoolReadCfg(ConfigFlags))
+
+ from TRT_GeoModel.TRT_GeoModelConfig import TRT_GeometryCfg
+ top_acc.merge(TRT_GeometryCfg( ConfigFlags ))
+
+ msgService = top_acc.getService('MessageSvc')
+ msgService.Format = "S:%s E:%e % F%138W%S%7W%R%T %0W%M"
+
+ if not ConfigFlags.InDet.doDBMstandalone:
+ top_acc.merge(TRTPreProcessingCfg(ConfigFlags,(not ConfigFlags.InDet.doTRTPhaseCalculation or ConfigFlags.Beam.Type =="collisions"),False))
+
+ iovsvc = top_acc.getService('IOVDbSvc')
+ iovsvc.OutputLevel=5
+ top_acc.run(25)
+ top_acc.store(open("test_TRTPrepocessing.pkl", "wb"))
\ No newline at end of file
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index b69f153bfa3f54c2f4a71ad510f941169cddbd85..1d4e35f410c176531a2f8b4ee5c9344123512d5f 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -20,7 +20,8 @@ def PixelClusterizationCfg(flags, **kwargs) :
sub_acc = PixelGangedAmbiguitiesFinderCfg(flags)
ambi_finder=sub_acc.getPrimary()
acc.merge(sub_acc)
- acc.addEventAlgo( CompFactory.InDet.PixelClusterization( name = "InDetPixelClusterization",
+
+ acc.addEventAlgo( CompFactory.InDet.PixelClusterization( name = "InDetPixelClusterization",
clusteringTool = merged_pixels_tool,
gangedAmbiguitiesFinder = ambi_finder,
DataObjectName = "PixelRDOs",
diff --git a/InnerDetector/InDetConfig/python/TrackingCutsFlags.py b/InnerDetector/InDetConfig/python/TrackingCutsFlags.py
index cfa8fe0dc8074ac7fdc6465fdb54fb8afff52039..a98f93709d0b771e3f39e9ab9b7017637685a814 100644
--- a/InnerDetector/InDetConfig/python/TrackingCutsFlags.py
+++ b/InnerDetector/InDetConfig/python/TrackingCutsFlags.py
@@ -173,21 +173,25 @@ def roadWidth_ranges( inflags ):
{'-16': 20.0,
'17-': 12.0 } )
-def keepAllConfirmedSeeds_ranges( inflags ):
+def keepAllConfirmedPixelSeeds_ranges( inflags ):
return select( inflags.InDet.cutLevel,
{'-17': False,
'18-': True } )
-def maxSeedsPerSP_ranges( inflags ):
- return select( inflags.InDet.cutLevel,
- {'-17': 5,
- '18-': 1 } )
-
def minRoIClusterEt_ranges( inflags ):
return select( inflags.InDet.cutLevel,
{'-18': 0.0,
'19-': 6000. * Units.MeV } )
+def maxSeedsPerSP_Pixels_ranges( inflags ):
+ return select( inflags.InDet.cutLevel,
+ {'-17': 5,
+ '18-': 1 } )
+
+def maxSeedsPerSP_Strips_ranges( inflags ):
+ return select( inflags.InDet.cutLevel,
+ {'-17': 5,
+ '18-': 5 } )
################################################################
## create set of tracking cut flags
@@ -199,7 +203,6 @@ def createTrackingFlags():
icf = AthConfigFlags()
icf.addFlag("extension", "" ) ### for extension
- icf.addFlag("maxSCTHoles", 0 )
icf.addFlag("minPT", minPT_ranges )
icf.addFlag("minSecondaryPt", minSecondaryPT_ranges ) #Pt cut for back tracking + segment finding for these
@@ -264,8 +267,10 @@ def createTrackingFlags():
icf.addFlag("maxTracksPerSharedPRD", 0) ## is 0 ok for default??
icf.addFlag("maxdImpactPPSSeeds", 2)
icf.addFlag("maxdImpactSSSSeeds", maxdImpactSSSSeeds_ranges)
- icf.addFlag("keepAllConfirmedSeeds", keepAllConfirmedSeeds_ranges)
- icf.addFlag("maxSeedsPerSP", maxSeedsPerSP_ranges)
+ icf.addFlag("maxSeedsPerSP_Pixels", maxSeedsPerSP_Pixels_ranges)
+ icf.addFlag("maxSeedsPerSP_Strips", maxSeedsPerSP_Strips_ranges)
+ icf.addFlag("keepAllConfirmedPixelSeeds", keepAllConfirmedPixelSeeds_ranges)
+ icf.addFlag("keepAllConfirmedStripSeeds", False)
# --- min pt cut for brem
icf.addFlag("minPTBrem", 1. * Units.GeV) # off
@@ -370,19 +375,8 @@ def createSLHCTrackingFlags():
# --- cluster cuts
icf.minClusters = 9
icf.minSiNotShared = 8
- #icf.maxShared = 3 # cut is now on number of shared modules
- #icf.maxHoles = 3
- #icf.maxPixelHoles = D2
- #icf.maxSctHoles = 2
- #icf.maxDoubleHoles = 2
# --- also tighten pattern cuts
icf.radMax = 1000. * Units.mm
- #icf.seedFilterLevel = 1
- #icf.nHolesMax = max_holes
- #icf.nHolesGapMax = max_holes
- #icf.Xi2max = 15.0
- #icf.Xi2maxNoAdd = 35.0
- #icf.nWeightedClustersMin = icf.InDet.Tracking.minClusters-1
return icf
@@ -484,8 +478,9 @@ def createR3LargeD0TrackingFlags():
icf.nWeightedClustersMin = 8
icf.maxdImpactSSSSeeds = 300.0
icf.doZBoundary = True
- icf.keepAllConfirmedSeeds = True
- icf.maxSeedsPerSP = 1
+ icf.keepAllConfirmedStripSeeds = True
+ icf.maxSeedsPerSP_Strips = 1
+ icf.keepAllConfirmedStripSeeds = True
return icf
@@ -546,19 +541,9 @@ def createSLHCConversionFindingTrackingFlags():
icf.maxZImpact = 150.0 * Units.mm
icf.minClusters = 6
icf.minSiNotShared = 4
- #icf.maxShared = 3
icf.maxHoles = 0
- #icf.maxPixelHoles = D2
- #icf.maxSctHoles = 2
- #icf.maxDoubleHoles = 2
# --- also tighten pattern cuts
icf.radMax = 1000. * Units.mm
- #icf.seedFilterLevel = 1
- #icf.nHolesMax = max_holes
- #icf.nHolesGapMax = max_holes
- #icf.Xi2max = 15.0
- #icf.Xi2maxNoAdd = 35.0
- #icf.nWeightedClustersMin = icf.InDet.Tracking.minClusters-1
# --- turn on Z Boundary seeding
icf.doZBoundary = False #
@@ -603,17 +588,6 @@ def createForwardTracksTrackingFlags():
icf.nHolesGapMax = icf.maxHoles
icf.radMax = 600. * Units.mm
icf.useTRT = False # no TRT for forward tracks
- icf.useSCTSeeding = False
- icf.minSecondaryPt = 3 * Units.GeV
- icf.maxPrimaryImpact = 5. * Units.mm
- icf.roadWidth = 12.
- icf.maxdImpactSSSSeeds = 5.0
- icf.maxSeedsPerSP = 1
- icf.keepAllConfirmedSeeds = True
- icf.SecondarynHolesMax = 2
- icf.SecondarynHolesGapMax = 2
- icf.RoISeededBackTracking = False
- icf.minRoIClusterEt = 6000. * Units.MeV
return icf
@@ -767,12 +741,12 @@ def createHeavyIonTrackingFlags():
icf.maxdImpactPPSSeeds = lambda pcf: \
1.7 if pcf.InDet.cutLevel >= 4 else True
- icf.maxHoles = lambda pcf: 2 if pcf.InDet.cutLevel >= 4 else 0
- icf.maxPixelHoles = lambda pcf: 1 if pcf.InDet.cutLevel >= 4 else 0
- icf.maxSctHoles = lambda pcf: 1 if pcf.InDet.cutLevel >= 4 else 0
+ icf.maxHoles = lambda pcf: 2 if pcf.InDet.cutLevel in [4, 5] else 0
+ icf.maxPixelHoles = lambda pcf: 1 if pcf.InDet.cutLevel in [4, 5] else 0
+ icf.maxSctHoles = lambda pcf: 1 if pcf.InDet.cutLevel in [4, 5] else 0
icf.maxDoubleHoles = 0
- icf.Xi2max = lambda pcf: 9. if pcf.InDet.cutLevel >= 4 else 6.
- icf.Xi2maxNoAdd = lambda pcf: 25. if pcf.InDet.cutLevel >= 4 else 10.
+ icf.Xi2max = lambda pcf: 9. if pcf.InDet.cutLevel in [4, 5] else 6.
+ icf.Xi2maxNoAdd = lambda pcf: 25. if pcf.InDet.cutLevel in [4, 5] else 10.
icf.radMax = 600. * Units.mm # restrict to pixels + first SCT layer
icf.useTRT = False
@@ -818,20 +792,12 @@ def createPixelTrackingFlags():
icf.nHolesGapMax = _pick( default = 1, hion = 0, cosmics = 3 )
icf.useSCT = False
icf.useTRT = False
- icf.useSCTSeeding = True
icf.minSecondaryPt = 3 * Units.GeV
icf.maxPrimaryImpact = lambda pcf: 1000. * Units.mm if pcf.Beam.Type =="cosmics" else 5. * Units.mm
icf.roadWidth = lambda pcf: 60.0 if pcf.Beam.Type =="cosmics" else 12.0
- icf.maxdImpactSSSSeeds = 5.0
- icf.maxSeedsPerSP = 1
- icf.keepAllConfirmedSeeds = True
- icf.SecondarynHolesMax = 2
- icf.SecondarynHolesGapMax = 2
- icf.RoISeededBackTracking = False
- icf.minRoIClusterEt = 6000. * Units.MeV
-
icf.maxZImpact = lambda pcf: 10000. * Units.mm if pcf.Beam.Type == "cosmics" else maxZImpact_ranges
icf.Xi2max = lambda pcf: 60.0 if pcf.Beam.Type =="cosmics" else Xi2max_ranges
+ icf.Xi2maxNoAdd = lambda pcf: 100.0 if pcf.Beam.Type =="cosmics" else Xi2maxNoAdd_ranges
icf.nWeightedClustersMin = lambda pcf: 6 if pcf.Beam.Type =="cosmics" else 6 # why change if detault is also 6!
return icf
@@ -979,11 +945,11 @@ def createDBMTrackingFlags():
#####################################################################
if __name__ == "__main__":
- #from AthenaConfiguration.AthConfigFlags import AthConfigFlags
- #from AthenaConfiguration.AllConfigFlags import ConfigFlags
- #ConfigFlags = createTrackingFlags()
- from InDetConfig.InDetConfigFlags import createInDetConfigFlags
- ConfigFlags = createInDetConfigFlags()
+
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+ ConfigFlags.Input.Files=defaultTestFiles.RAW
+
from AthenaCommon.Logging import logging
l = logging.getLogger('AthConfigFlags')
from AthenaCommon.Constants import WARNING
@@ -991,14 +957,18 @@ if __name__ == "__main__":
ConfigFlags.loadAllDynamicFlags()
assert ConfigFlags.InDet.cutLevel == 19 , "default cut level is wrong"
- assert ConfigFlags.InDet.Tracking.minRoIClusterEt == 6000.0 * Units.MeV, "wrong value {} ".format(ConfigFlags.InDet.Tracking.minRoIClusterEt)
+ assert ConfigFlags.InDet.Tracking.minRoIClusterEt == 6000.0 * Units.MeV, "wrong cut value {} ".format(ConfigFlags.InDet.Tracking.minRoIClusterEt)
ConfigFlags.InDet.cutLevel = 2
- assert ConfigFlags.InDet.Tracking.minRoIClusterEt == 0.0, "wrong value {} ".format(ConfigFlags.InDet.Tracking.minRoIClusterEt)
- assert ConfigFlags.InDet.BeamGasTracking.minRoIClusterEt == 0.0, "wrong value {}, not following cutLevel setting ".format(ConfigFlags.InDet.BeamGasTracking.minRoIClusterEt)
+ assert ConfigFlags.InDet.Tracking.minRoIClusterEt == 0.0, "wrong cut value {} ".format(ConfigFlags.InDet.Tracking.minRoIClusterEt)
+ assert ConfigFlags.InDet.BeamGasTracking.minRoIClusterEt == 0.0, "wrong cut value {}, not following cutLevel setting ".format(ConfigFlags.InDet.BeamGasTracking.minRoIClusterEt)
+
+ assert ConfigFlags.InDet.HeavyIonTracking.minSiNotShared == 7, "wrong cut value, overwrite"
+ assert ConfigFlags.InDet.HeavyIonTracking.minRoIClusterEt == 0.0, "wrong cut value, overwrite"
- assert ConfigFlags.InDet.HeavyIonTracking.minSiNotShared == 7, "wrong value, overwrite"
- assert ConfigFlags.InDet.HeavyIonTracking.minRoIClusterEt == 0.0, "wrong value, overwrite"
+ print("ConfigFlags.InDet.SCTandTRTTracking.minPT",ConfigFlags.InDet.SCTandTRTTracking.minPT)
+ print("type(ConfigFlags.InDet.SCTandTRTTracking)",type(ConfigFlags.InDet.SCTandTRTTracking))
+
#ConfigFlags.dump()
- print( "allok" )
+ print( "allok" )
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
index 1fdd7bb66e961bb48181d1afbb3b61f9daad28e7..ac581221fab90c13aad26a5f9c72bafe81701980 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/InDetRegionSelectorLUT.cxx
@@ -42,65 +42,8 @@ StatusCode InDetRegionSelectorLUT::initialize(){
// get tools
//
- msg(MSG::INFO) << "InDetRegionSelectorLUT::initialize() " << name() << "\t" << m_lutCreatorToolPixel << endmsg;
+ ATH_MSG_INFO( "InDetRegionSelectorLUT::initialize() " << name() << " no longer used" );
- // Pixel
- if (!m_lutCreatorToolPixel) {
- msg(MSG::INFO) << "Pixel LUT Creator not configured " << m_lutCreatorToolPixel << endmsg;
- } else {
- if ( m_lutCreatorToolPixel.retrieve().isFailure() ) {
- msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolPixel << endmsg;
- return StatusCode::FAILURE;
- } else {
- msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolPixel << endmsg;
- // compute LUT
- const RegSelSiLUT* pixellut = m_lutCreatorToolPixel->getLUT();
- if (!pixellut) {
- msg(MSG::ERROR) << "Pixel table missing" << endmsg;
- } else if (m_doTests) {
- msg(MSG::DEBUG) << "Test Pixel" << endmsg;
- printTable(pixellut);
- }
- }
- }
- // SCT
- if (!m_lutCreatorToolSCT) {
- msg(MSG::INFO) << "SCT LUT Creator not configured " << m_lutCreatorToolSCT << endmsg;
- } else {
- if ( m_lutCreatorToolSCT.retrieve().isFailure() ) {
- msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolSCT << endmsg;
- return StatusCode::FAILURE;
- } else {
- msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolSCT << endmsg;
- // compute LUT
- const RegSelSiLUT* sctlut = m_lutCreatorToolSCT->getLUT();
- if (!sctlut) {
- msg(MSG::ERROR) << "SCT table missing" << endmsg;
- } else if (m_doTests) {
- msg(MSG::DEBUG) << "Test SCT" << endmsg;
- printTable(sctlut);
- }
- }
- }
- // Pixel
- if (!m_lutCreatorToolTRT) {
- msg(MSG::INFO) << "TRT LUT Creator not configured " << m_lutCreatorToolTRT << endmsg;
- } else {
- if ( m_lutCreatorToolTRT.retrieve().isFailure() ) {
- msg(MSG::FATAL) << "Failed to retrieve tool " << m_lutCreatorToolSCT << endmsg;
- return StatusCode::FAILURE;
- } else {
- msg(MSG::INFO) << "Retrieved tool " << m_lutCreatorToolSCT << endmsg;
- // compute LUT
- const RegSelSiLUT* trtlut = m_lutCreatorToolTRT->getLUT();
- if (!trtlut) {
- msg(MSG::ERROR) << "TRT table missing" << endmsg;
- } else if (m_doTests) {
- msg(MSG::DEBUG) << "Test TRT" << endmsg;
- printTable(trtlut);
- }
- }
- }
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx
index e11efe88f9d186c896124d01ebf8508ba9e63400..cf62494149841bc157e071dd5d1f58defeeaceae 100644
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegSelCondAlg.cxx
@@ -81,6 +81,8 @@ StatusCode SiRegSelCondAlg::execute(const EventContext& ctx) const
std::unique_ptr<SG::ReadCondHandle<SCT_CablingData> > sctCabling;
EventIDRange id_range;
+
+ ATH_MSG_DEBUG( "RegSelCondAlg:" << name() );
if (m_managerName=="SCT") { // SCT
sctCabling = std::make_unique<SG::ReadCondHandle<SCT_CablingData> >( m_sctCablingKey, ctx );
@@ -90,13 +92,23 @@ StatusCode SiRegSelCondAlg::execute(const EventContext& ctx) const
}
}
else { // PIXEL
+
+ ATH_MSG_DEBUG( "RegSelCondAlg: " << name() << "\t" << m_pixCablingKey );
+ ATH_MSG_DEBUG( "RegSelCondAlg: " << ctx );
+ ATH_MSG_DEBUG( "RegSelCondAlg: " << id_range << "( initial range )" );
+
pixCabling = std::make_unique<SG::ReadCondHandle<PixelCablingCondData> >( m_pixCablingKey, ctx );
if( !pixCabling->range( id_range ) ) {
- ATH_MSG_ERROR("Failed to retrieve validity range for " << pixCabling->key());
+ ATH_MSG_ERROR("Failed to retrieve validity range for " << pixCabling->key() << " : " << id_range );
return StatusCode::FAILURE;
}
+ ATH_MSG_DEBUG( "RegSelCondAlg: " << id_range << "( final range )" );
+
}
+ ATH_MSG_DEBUG( "RegSelCondAlg:" << name() << " done" );
+
+
std::unique_ptr<RegSelSiLUT> rd;
if ( m_managerName=="Pixel" ) rd = std::make_unique<RegSelSiLUT>(RegSelSiLUT::PIXEL);
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
index a67fd227535c24749b5482fa32eaf6c243bccb4f..ba6d489b37855e57a413c6f5f59a07809f8bf463 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
@@ -73,18 +73,9 @@ SiRegionSelectorTable::initialize(){
if (m_managerName.empty()) {
msg(MSG::WARNING) << "Tool disabled." << endmsg;
- return StatusCode::FAILURE;
}
- ATH_CHECK(m_condCablingKey.initialize());
-
ATH_MSG_WARNING("So far, this prevents the conditions migration!! The createTable() should NOT be used in the initilization step...");
- const EventIDBase::number_type UNDEFNUM = EventIDBase::UNDEFNUM;
- const EventIDBase::event_number_t UNDEFEVT = EventIDBase::UNDEFEVT;
- EventContext ctx = Gaudi::Hive::currentContext();
- ctx.setEventID (EventIDBase (0, UNDEFEVT, UNDEFNUM, 0, 0));
- Atlas::getExtendedEventContext(ctx).setConditionsRun (0);
- ATH_CHECK(createTable (ctx));
return StatusCode::SUCCESS;
}
@@ -92,10 +83,6 @@ SiRegionSelectorTable::initialize(){
SiRegionSelectorTable::~SiRegionSelectorTable()
{
- // table is stored in storegate so nothing to delete.
-#ifndef USE_STOREGATE
- if ( m_regionLUT ) delete m_regionLUT;
-#endif
}
@@ -109,162 +96,9 @@ RegSelSiLUT* SiRegionSelectorTable::getLUT()
StatusCode
-SiRegionSelectorTable::createTable (const EventContext& ctx)
+SiRegionSelectorTable::createTable (const EventContext& /* ctx */ )
{
-
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Creating region selector table" << endmsg;
-
- StatusCode sc;
-
- // Retrieve manager
- const SiDetectorManager * manager;
- sc=detStore()->retrieve(manager, m_managerName);
-
- if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not find the Manager: "
- << m_managerName << " !" << endmsg;
- return StatusCode::FAILURE;
- } else {
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << "Manager found" << endmsg;
- }
-
- ATH_CHECK(m_sctCablingToolInc.retrieve( DisableTool{manager->isPixel()} ));
-
- // Create RegionSelectorLUT pointers for Pixel or Sct
- // RegionSelectorLUT* rslut = new RegionSelectorLUT;
-
- RegSelSiLUT* rd;
-
- if ( manager->isPixel() ) rd = new RegSelSiLUT(RegSelSiLUT::PIXEL);
- else rd = new RegSelSiLUT(RegSelSiLUT::SCT);
-
-
- SG::ReadCondHandle<PixelCablingCondData> pixCabling(m_condCablingKey, ctx);
-
- SiDetectorElementCollection::const_iterator iter;
- for (iter = manager->getDetectorElementBegin(); iter != manager->getDetectorElementEnd(); ++iter){
-
- const SiDetectorElement* element = *iter;
-
- if (element) {
-
- IdentifierHash hashId = element->identifyHash();
-
- if ( msgLvl(MSG::VERBOSE) ) msg(MSG::VERBOSE) << "Found element with HashId = " << hashId << endmsg;
-
- // new region selector detector element extent.
- double rMin, rMax, zMin, zMax, phiMin, phiMax;
-
- rMin = element->rMin();
- rMax = element->rMax();
- zMin = element->zMin();
- zMax = element->zMax();
- phiMin = element->phiMin();
- phiMax = element->phiMax();
-
-
- int barrelEC = 0;
- int layerDisk = 0;
- uint32_t robId = 0;
-
- if (element->isPixel()) {
-
- const PixelID* pixelId = dynamic_cast<const PixelID*>(element->getIdHelper());
- if ( pixelId!=0 ) {
- barrelEC = pixelId->barrel_ec(element->identify());
-
- if ( m_noDBM && std::fabs(barrelEC)>3 ) continue; // skip DBM modules
-
- layerDisk = pixelId->layer_disk(element->identify());
- robId=pixCabling->find_entry_offrob(element->identify());
- }
- else {
- msg(MSG::ERROR) << " could not get PixelID for " << element->getIdHelper() << endmsg;
- }
- } else { // Its an SCT.
-
- const SCT_ID* sctId = dynamic_cast<const SCT_ID*>(element->getIdHelper());
- if ( sctId!=0 ) {
- barrelEC = sctId->barrel_ec(element->identify());
- layerDisk = sctId->layer_disk(element->identify());
- robId=m_sctCablingToolInc->getRobIdFromOfflineId(element->identify());
- }
- else {
- msg(MSG::ERROR) << " could not get SCT_ID for " << element->getIdHelper() << endmsg;
- }
- }
-
- // write in new Region Selector Si LUT
- // create module
- RegSelModule smod(zMin,zMax,rMin,rMax,phiMin,phiMax,layerDisk,barrelEC,robId,hashId);
-
- // if ( robId ) {
- // add to the new RegionSelector map
- rd->addModule(smod);
- // }
- // else {
- // msg(MSG::WARNING) << "module with RobID=0x0 - not added to look up table " << smod << endmsg;
- // }
-
- if ( msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << smod << endmsg;
-
- if ( msgLvl(MSG::VERBOSE) ) msg(MSG::VERBOSE) << " "
- << " robId = " << robId
- << " barrelEC = " << barrelEC
- << ", layerDisk = " << layerDisk
- << ", phiMin, phiMax = " << phiMin/CLHEP::degree << " " << phiMax/CLHEP::degree
- << ", rMin = " << rMin/CLHEP::mm << " mm, rMax = " << rMax/CLHEP::mm << " mm"
- << endmsg;
-
- }
- }
-
- msg(MSG::INFO) << " initialising new map " << endmsg;
-
- rd->initialise();
-
- // write out new new LUT to a file if need be
- if ( m_printTable ) {
- if ( manager->isPixel() ) rd->write("NewPixel"+m_roiFileName);
- else rd->write("NewSCT"+m_roiFileName);
- }
-
- // std::string key;
- std::string detName;
-
- std::string newkey;
-
- if (manager->isPixel()) {
- newkey = "PixelRegSelSiLUT";
- detName = "Pixel";
- } else {
- newkey = "SCTRegSelSiLUT";
- detName = "SCT";
- }
-
-#ifndef USE_STOREGATE
- if ( m_regionLUT ) delete m_regionLUT;
-#endif
- m_regionLUT = rd;
-
-#ifdef USE_STOREGATE
- // save new map in StoreGate RegSelSiLUT
- if ( detStore()->contains< RegSelSiLUT >(newkey) ) {
- msg(MSG::FATAL) << " RegSelSiLUT " << newkey << " already exists " << endmsg;
- } else {
- // create and store LUT
- // needs to be modifiable so we can enable/disable modules
- // from the RegSelSvc
- sc = detStore()->record(rd, newkey, true);
- if ( sc.isFailure() ) {
- msg(MSG::ERROR) << " could not register " << detName << " RegSelSiLUT" << endmsg;
- return( StatusCode::FAILURE );
- } else {
- msg(MSG::INFO) << detName << " RegSelSiLUT successfully saved in detector Store" << endmsg;
- }
- }
-#endif
-
+ ATH_MSG_INFO( "SiRegionSelectorTable::createTable() - no longer in use" );
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/InDetServMatGeometryManager.h b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/InDetServMatGeometryManager.h
index 8a8be6ec4382fba4fabcd7163023816fdd4010cd..81260af058f9985274ed0b2f65171a02f9425db9 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/InDetServMatGeometryManager.h
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/InDetServMatGeometryManager.h
@@ -143,11 +143,11 @@ public:
double sctInnerSupport() const;
// Pixel support tubes dimensions: specify name from simple services table
- double SupportTubeRMin(std::string name) const;
- double SupportTubeRMax(std::string name) const;
- double SupportTubeZMin(std::string name) const;
- double SupportTubeZMax(std::string name) const;
- int SupportTubeExists(std::string name) const;
+ double SupportTubeRMin(const std::string& name) const;
+ double SupportTubeRMax(const std::string& name) const;
+ double SupportTubeZMin(const std::string& name) const;
+ double SupportTubeZMax(const std::string& name) const;
+ int SupportTubeExists(const std::string& name) const;
private:
// Record sets
@@ -188,7 +188,7 @@ private:
InDetMaterialManager * m_matMgr;
// index of named support tube in m_InDetSimpleServices table, -1 if not found. Could be cached for speed.
- int SupportTubeIndex(std::string name) const;
+ int SupportTubeIndex(const std::string& name) const;
};
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServiceMaterial.h b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServiceMaterial.h
index 3ce60a9862b0c09fc8238f02f568d75b85dfca7c..13558191a933914c1079adecdb24d6e8a93dcfe1 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServiceMaterial.h
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServiceMaterial.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ServiceMaterial_H
@@ -19,8 +19,8 @@ public:
If the weight is zero it will be taken from the material DB
*/
struct Entry {
- Entry( std::string nam, int num, bool lin) : name(nam), number(num), linear(lin), weight(1) {}
- Entry( std::string nam, int num, bool lin, double w) : name(nam), number(num), linear(lin), weight(w) {}
+ Entry( const std::string& nam, int num, bool lin) : name(nam), number(num), linear(lin), weight(1) {}
+ Entry( const std::string& nam, int num, bool lin, double w) : name(nam), number(num), linear(lin), weight(w) {}
std::string name;
int number;
@@ -55,7 +55,7 @@ public:
//ServiceMaterial operator*( double len) const {return ServiceMaterial( name(), len*linearWeight(), m_components);}
void multiply( int factor) {
- for ( std::vector< Entry>::iterator i=m_components.begin(); i!=m_components.end(); i++) {
+ for ( std::vector< Entry>::iterator i=m_components.begin(); i!=m_components.end(); ++i) {
i->number *= factor;
}
}
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServicesTracker.h b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServicesTracker.h
index 5921cf4e04db6c7fa2729d0cd98e21e525ca79ab..df278561272ff8cd5cc6c597b68af9c1ae114eae 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServicesTracker.h
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/ServicesTracker.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ServicesTracker_H
@@ -46,7 +46,7 @@ public:
const std::vector<ServiceVolume*>& serviceVolumes() const {return m_volumes;}
// Called by Routing
- void setServiceVolumes( const std::vector<ServiceVolume*> vc) {m_volumes=vc;}
+ void setServiceVolumes( const std::vector<ServiceVolume*>& vc) {m_volumes=vc;}
// methods called by Builder
void constructBarrelLayer( double radius, double zHalfLength,
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/StaveServices.h b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/StaveServices.h
index f02284511a0acd933321f6d55a6dad046f4c1b6e..9ff9794853ab95fc21dab5fef673310a01fef94d 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/StaveServices.h
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/InDetServMatGeoModel/StaveServices.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef StaveServices_H
@@ -17,7 +17,7 @@ class StaveServices {
public:
StaveServices( DetType::Type type, DetType::Part part, int layer,
- int nhv, int ndcs, int ndata, std::vector<int> lvGauge) :
+ int nhv, int ndcs, int ndata, const std::vector<int>& lvGauge) :
m_type( type), m_part(part), m_layer(layer),
m_numHV(nhv), m_numDCS( ndcs), m_numData( ndata), m_lvGauge( lvGauge) {}
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx
index 311a0fbeb142e3bb7e46f0806bb799bbea854543..2d3a9a1208ba8f2ca3acb56068f7148b6d162a49 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx
@@ -161,7 +161,7 @@ void InDetServMatBuilderToolSLHC::build()
fixMissingMaterials();
typedef std::vector<ServiceVolume*>::const_iterator iter;
- for (iter i=tracker->serviceVolumes().begin(); i!=tracker->serviceVolumes().end(); i++) {
+ for (iter i=tracker->serviceVolumes().begin(); i!=tracker->serviceVolumes().end(); ++i) {
/*
msg(MSG::INFO) << "Calling ServiceVolume->dump() for the " << n++ << "th time" << endmsg;
(**i).dump(); // for DEBUG only
@@ -219,7 +219,7 @@ void InDetServMatBuilderToolSLHC::addServiceVolume( const ServiceVolume& vol)
param->setZmax(vol.zMax());
param->setZsymm(true);
for (std::vector<ServiceMaterial>::const_iterator ism=vol.materials().begin(); ism!=vol.materials().end(); ++ism) {
- for ( ServiceMaterial::EntryIter ient= ism->components().begin(); ient!=ism->components().end(); ient++) {
+ for ( ServiceMaterial::EntryIter ient= ism->components().begin(); ient!=ism->components().end(); ++ient) {
/*
msg(MSG::INFO) << "Inside components loop, comp = " << ient->name
<< " number " << ient->number
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx
index 33ba286ac6fe13c1ca4e0364c8d4d002ca790a59..a76cac7e98ba6c2ba5f612c57145d6a50c2152cf 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx
@@ -105,7 +105,7 @@ bool InDetServMatGeometryManager::buildServices() const
return false;
}
-int InDetServMatGeometryManager::SupportTubeIndex(std::string name) const
+int InDetServMatGeometryManager::SupportTubeIndex(const std::string& name) const
{
for (unsigned int i = 0; i < db()->getTableSize(m_InDetSimpleServices); i++)
{
@@ -114,35 +114,35 @@ int InDetServMatGeometryManager::SupportTubeIndex(std::string name) const
return -1;
}
-double InDetServMatGeometryManager::SupportTubeRMin(std::string name) const
+double InDetServMatGeometryManager::SupportTubeRMin(const std::string& name) const
{
int ind = SupportTubeIndex(name);
if (ind >= 0) return db()->getDouble(m_InDetSimpleServices, "RMIN", ind);
return 0;
}
-double InDetServMatGeometryManager::SupportTubeRMax(std::string name) const
+double InDetServMatGeometryManager::SupportTubeRMax(const std::string& name) const
{
int ind = SupportTubeIndex(name);
if (ind >= 0) return db()->getDouble(m_InDetSimpleServices, "RMAX", ind);
return 0;
}
-double InDetServMatGeometryManager::SupportTubeZMin(std::string name) const
+double InDetServMatGeometryManager::SupportTubeZMin(const std::string& name) const
{
int ind = SupportTubeIndex(name);
if (ind >= 0) return db()->getDouble(m_InDetSimpleServices, "ZMIN", ind);
return 0;
}
-double InDetServMatGeometryManager::SupportTubeZMax(std::string name) const
+double InDetServMatGeometryManager::SupportTubeZMax(const std::string& name) const
{
int ind = SupportTubeIndex(name);
if (ind >= 0) return db()->getDouble(m_InDetSimpleServices, "ZMAX", ind);
return 0;
}
-int InDetServMatGeometryManager::SupportTubeExists(std::string name) const
+int InDetServMatGeometryManager::SupportTubeExists(const std::string& name) const
{
if (SupportTubeIndex(name) != -1) return 1;
return 0;
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Route.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Route.cxx
index c1845c111405b07f9f6be0c3bdde0a5758a3080c..29a3e38864260657d5432e15ce268471803f4116 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Route.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/Route.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetServMatGeoModel/Route.h"
@@ -21,7 +21,7 @@ ServiceVolume* Route::entryVolume( double pos, bool ascending, Athena::MsgStream
// else {
//should iterate to find exit volume
if ( ascending) {
- for (VolumeContainer::const_iterator i=volumes().begin(); i!=volumes().end(); i++) {
+ for (VolumeContainer::const_iterator i=volumes().begin(); i!=volumes().end(); ++i) {
msg << MSG::DEBUG << "Comparing " << pos << " and " << (**i).position() << endmsg;
@@ -57,7 +57,7 @@ ServiceVolume* Route::exitVolume( bool ascending, Athena::MsgStreamMember& msg)
// returns the volume closest to the exit point, coming from the given direction
if (volumes().empty()) return 0;
if ( ascending) {
- for (VolumeContainer::const_iterator i=volumes().begin(); i!=volumes().end(); i++) {
+ for (VolumeContainer::const_iterator i=volumes().begin(); i!=volumes().end(); ++i) {
if ((**i).contains(exit())) return *i;
else {
msg << MSG::DEBUG << "volume at pos " << (**i).radius()
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServiceVolume.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServiceVolume.cxx
index 9b96b7a7738f87e87c89b9994ef1cec715c63220..217c35c64b072309451e9ea062072fe9da4d704a 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServiceVolume.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServiceVolume.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetServMatGeoModel/ServiceVolume.h"
@@ -23,7 +23,7 @@ void ServiceVolume::dump( bool dumpMaterial) const
if ( dumpMaterial && !materials().empty()) {
for (std::vector<ServiceMaterial>::const_iterator i=materials().begin(); i!=materials().end(); ++i) {
cout << " service material " << i->name() << " has the following components" << endl;
- for ( ServiceMaterial::EntryIter ient= i->components().begin(); ient!=i->components().end(); ient++) {
+ for ( ServiceMaterial::EntryIter ient= i->components().begin(); ient!=i->components().end(); ++ient) {
cout << ient->name << " linear? " << ient->linear
<< " number " << ient->number
<< " l/w " << ient->weight
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx
index f3427457dead732568ded049e74054d8c6b7b581..f43b215dd2563de7350ab2824e10d20e9c34bfea 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/ServicesTracker.cxx
@@ -85,7 +85,7 @@ void ServicesTracker::finaliseServices()
std::map<const ServicesLayer*, ServiceMaterial> layerMaterial; // cache the layer services
typedef std::vector<ServiceVolume*>::iterator VolumeIter;
- for (VolumeIter iv=m_volumes.begin(); iv!=m_volumes.end(); iv++) {
+ for (VolumeIter iv=m_volumes.begin(); iv!=m_volumes.end(); ++iv) {
std::vector<ServiceMaterial> result; // = (**iv).materials(); // preserve already present mat. (EOS)
if ((**iv).isEOS()) addEosMaterial(**iv, result);
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingCfg.py b/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingCfg.py
index 79c28131ebd0fa7fe60da5cb0bb7f95cd4eaf6ff..d49da22cf55dfc17ccbf9dfb7bc60f767eec86c6 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingCfg.py
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/python/TestSCT_CablingCfg.py
@@ -39,7 +39,7 @@ if __name__=="__main__":
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.Input.isMC = True
- ConfigFlags.Input.RunNumber = 300000
+ ConfigFlags.Input.RunNumber = [300000]
ConfigFlags.addFlag("Input.InitialTimeStamp", 1500000000)
# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConditionsRun1RunNumbers
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-RUN12-SDR-25"
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIHelper.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIHelper.h
index f5f84c946b5859a0b874104a6b35bccc543b5c30..acf4d825afe76299324e3550e92bc8300ac8c456 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIHelper.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_FSIHelper.h
@@ -15,7 +15,7 @@ class SCT_DataBase;
class FSILocation
{
public:
- FSILocation(std::string name,
+ FSILocation(const std::string& name,
double radius,
double phi,
int side);
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx
index 3542adc65a943384634124ef6ef50a62026c6186..920652e043824e4c4a3686538c55221f8ce39f2b 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx
@@ -10,7 +10,7 @@
#include <iostream>
-FSILocation:: FSILocation(std::string name,
+FSILocation:: FSILocation(const std::string& name,
double radius,
double phi,
int side)
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSubSpine.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSubSpine.cxx
index 8a547d3e722fd3934540d92b5c7d46d73a01b32c..d1f1202db517b8e3a63be21fe012193ab2c850a5 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSubSpine.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSubSpine.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////
@@ -96,7 +96,6 @@ GeoVPhysVol * SCT_FwdSubSpine::build()
const GeoShape * subSpineMiddle = 0;
- const GeoShape * subSpineShape = 0;
// Inner sub spine
double mountPosition = parameters->fwdModuleMountPoint(m_ringType); // mount point to physics center
@@ -123,14 +122,14 @@ GeoVPhysVol * SCT_FwdSubSpine::build()
const GeoShape & spinePos3 = (*spineShape3 << GeoTrf::TranslateY3D(m_spineSide * position2) << GeoTrf::TranslateZ3D(position) );
const GeoShapeUnion & spineTmp = (spinePos1).add(spinePos3);
+ GeoLogVol * spineLog = nullptr;
if (m_ringType != 3) {
const GeoShapeUnion & spineTmp2 = spineTmp.add(*subSpineMiddle);
- subSpineShape = &spineTmp2;
+ spineLog = new GeoLogVol(getName(), &spineTmp2, m_material);
} else {
- subSpineShape = &spineTmp;
+ spineLog = new GeoLogVol(getName(), &spineTmp, m_material);
}
- GeoLogVol * spineLog = new GeoLogVol(getName(), subSpineShape, m_material);
GeoPhysVol * spine = new GeoPhysVol(spineLog);
return spine;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeometryManager.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeometryManager.cxx
index b64ebca2e32079db0693dda7066d175cb2ae8a09..53a76f005252fbac20cd32e3ca823ee4299b8624 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeometryManager.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeometryManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "SCT_GeoModel/SCT_GeometryManager.h"
@@ -18,15 +18,15 @@
SCT_GeometryManager::SCT_GeometryManager(SCT_DataBase* rdb)
: m_athenaComps{rdb->athenaComps()},
m_commonItems{nullptr},
- m_rdb{rdb}
+ m_rdb{rdb},
+ // This class uses reference counting. Should not be delete'd in destructor.
+ m_barrelParameters (std::make_unique<SCT_BarrelParameters>(m_rdb)),
+ m_barrelModuleParameters (std::make_unique<SCT_BarrelModuleParameters>(m_rdb)),
+ m_forwardParameters (std::make_unique<SCT_ForwardParameters>(m_rdb)),
+ m_forwardModuleParameters (std::make_unique<SCT_ForwardModuleParameters>(m_rdb)),
+ m_generalParameters (std::make_unique<SCT_GeneralParameters>(m_rdb)),
+ m_distortedMatManager (std::make_unique<InDetDD::DistortedMaterialManager>())
{
- // This class uses reference counting. Should not be delete'd in destructor.
- m_barrelParameters = std::make_unique<SCT_BarrelParameters>(m_rdb);
- m_barrelModuleParameters = std::make_unique<SCT_BarrelModuleParameters>(m_rdb);
- m_forwardParameters = std::make_unique<SCT_ForwardParameters>(m_rdb);
- m_forwardModuleParameters = std::make_unique<SCT_ForwardModuleParameters>(m_rdb);
- m_generalParameters = std::make_unique<SCT_GeneralParameters>(m_rdb);
- m_distortedMatManager = std::make_unique<InDetDD::DistortedMaterialManager>();
}
SCT_GeometryManager::~SCT_GeometryManager()
@@ -126,15 +126,16 @@ SCT_GeometryManager::operator=(const SCT_GeometryManager& right) {
return *this;
}
-SCT_GeometryManager::SCT_GeometryManager(const SCT_GeometryManager& right) {
- m_options = right.m_options;
- m_athenaComps = right.m_athenaComps;
- m_commonItems = right.m_commonItems;
- m_rdb = right.m_rdb;
- m_barrelParameters.reset(new SCT_BarrelParameters(m_rdb));
- m_barrelModuleParameters.reset(new SCT_BarrelModuleParameters(m_rdb));
- m_forwardParameters.reset(new SCT_ForwardParameters(m_rdb));
- m_forwardModuleParameters.reset(new SCT_ForwardModuleParameters(m_rdb));
- m_generalParameters.reset(new SCT_GeneralParameters(m_rdb));
- m_distortedMatManager.reset(new InDetDD::DistortedMaterialManager());
+SCT_GeometryManager::SCT_GeometryManager(const SCT_GeometryManager& right)
+ : m_options (right.m_options),
+ m_athenaComps (right.m_athenaComps),
+ m_commonItems (right.m_commonItems),
+ m_rdb (right.m_rdb),
+ m_barrelParameters (new SCT_BarrelParameters(m_rdb)),
+ m_barrelModuleParameters (new SCT_BarrelModuleParameters(m_rdb)),
+ m_forwardParameters (new SCT_ForwardParameters(m_rdb)),
+ m_forwardModuleParameters (new SCT_ForwardModuleParameters(m_rdb)),
+ m_generalParameters (new SCT_GeneralParameters(m_rdb)),
+ m_distortedMatManager (new InDetDD::DistortedMaterialManager())
+{
}
diff --git a/InnerDetector/InDetDetDescr/StripGeoModelXml/python/ITkStripGeoModelConfig.py b/InnerDetector/InDetDetDescr/StripGeoModelXml/python/ITkStripGeoModelConfig.py
index 642c5a5b4f3b4a9578237f97d96705ca5d9672e6..f4093350e75244bad513a29bc26787ca69abb0fc 100644
--- a/InnerDetector/InDetDetDescr/StripGeoModelXml/python/ITkStripGeoModelConfig.py
+++ b/InnerDetector/InDetDetDescr/StripGeoModelXml/python/ITkStripGeoModelConfig.py
@@ -15,6 +15,9 @@ def ITkStripGeometryCfg( flags ):
#ITkStripDetectorTool.useDynamicAlignFolders = flags.GeoModel.Align.Dynamic
ITkStripDetectorTool.Alignable = False # make this a flag? Set true as soon as decided on folder structure
ITkStripDetectorTool.DetectorName = "ITkStrip"
+ if flags.ITk.useLocalGeometry:
+ #Setting this filename triggers reading from local file rather than DB
+ ITkStripDetectorTool.GmxFilename = flags.ITk.stripGeometryFilename
geoModelSvc.DetectorTools += [ ITkStripDetectorTool ]
"""
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
index 10ea3116be71922b47d2104195eb10ef578e784f..0b930f6c744f8604faf5073fce6bf92b4c7fda69 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "Identifier/Identifier.h"
@@ -47,14 +47,14 @@ TRT_BarrelElement::TRT_BarrelElement(const GeoVFullPhysVol *volume,
TRT_BarrelElement::TRT_BarrelElement(const TRT_BarrelElement &right, const GeoAlignmentStore* geoAlignStore) :
- TRT_BaseElement(right,geoAlignStore)
-{
- m_code = right.m_code;
- m_descriptor = right.m_descriptor;
- m_nextInPhi = right.m_nextInPhi;
- m_previousInPhi = right.m_previousInPhi;
- m_nextInR = right.m_nextInR;
- m_previousInR = right.m_previousInR;
+ TRT_BaseElement(right,geoAlignStore),
+ m_code (right.m_code),
+ m_descriptor (right.m_descriptor),
+ m_nextInPhi (right.m_nextInPhi),
+ m_previousInPhi (right.m_previousInPhi),
+ m_nextInR (right.m_nextInR),
+ m_previousInR (right.m_previousInR)
+ {
}
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx
index 389a61795d232c0c1917ad690b17d790e6478db9..6c41fda5d5177d569e3d8662a47d7dab549531ae 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BaseElement.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetReadoutGeometry/SurfaceCache.h"
@@ -41,12 +41,12 @@ namespace InDetDD {
TRT_BaseElement::TRT_BaseElement(const TRT_BaseElement&right, const GeoAlignmentStore* geoAlignmentStore):
Trk::TrkDetElementBase(right.getMaterialGeom()),
- m_geoAlignStore(geoAlignmentStore)
+ m_id (right.m_id),
+ m_idHash (right.m_idHash),
+ m_idHelper (right.m_idHelper),
+ m_conditions (right.m_conditions),
+ m_geoAlignStore(geoAlignmentStore)
{
- m_id = right.m_id;
- m_idHash = right.m_idHash;
- m_idHelper = right.m_idHelper;
- m_conditions = right.m_conditions;
}
Identifier TRT_BaseElement::identify() const
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
index aea4e6c7e5e16335c11f5d5d88ff2869396058a0..05b17b2b919d03540f413ff61be5a35e9c3c7ffd 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TRT_ReadoutGeometry/TRT_EndcapElement.h"
@@ -47,12 +47,12 @@ namespace InDetDD {
}
TRT_EndcapElement::TRT_EndcapElement(const TRT_EndcapElement &right, const GeoAlignmentStore* geoAlignStore) :
- TRT_BaseElement(right,geoAlignStore)
+ TRT_BaseElement(right,geoAlignStore),
+ m_code (right.m_code),
+ m_descriptor (right.m_descriptor),
+ m_nextInZ (right.m_nextInZ),
+ m_previousInZ (right.m_previousInZ)
{
- m_code = right.m_code;
- m_descriptor = right.m_descriptor;
- m_nextInZ = right.m_nextInZ;
- m_previousInZ = right.m_previousInZ;
}
TRT_EndcapElement::~TRT_EndcapElement()
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
index 4d4e8759b29248822f57a2bd06cb826012ce1683..8aa5670788033feacd0401edf2cebb4c838aa6c5 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
@@ -41,6 +41,7 @@ def FastClusterMakerTool(name="FastClusterMakerTool", **kwargs):
# Module status #
#################
useNewChargeFormat = False
+ useNewDeadmapFormat = False
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
@@ -72,17 +73,27 @@ def FastClusterMakerTool(name="FastClusterMakerTool", **kwargs):
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_Run2.dat"
condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseDeadmapConditions=False,
- UseDCSStateConditions=False,
- UseDCSStatusConditions=False,
- UseTDAQConditions=False,
- UseCalibConditions=True,
+ ReadDeadMapKey = "",
UseCablingConditions=False,
CablingMapFileName=IdMappingDat)
+ if useNewDeadmapFormat:
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="")
+
#FIXME: at some point we should move away from being dependent on the experimentalDigi flags.
if 'doFastSCT_Digi' in digitizationFlags.experimentalDigi() and not 'doFastPixelDigi' in digitizationFlags.experimentalDigi():
- PixelConfigCondAlg.UseCalibConditions=False
+ # Set empty Folder
+ if not useNewChargeFormat:
+ if not hasattr(condSeq, 'PixelChargeCalibCondAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
+ condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="")
+ else:
+ if not hasattr(condSeq, 'PixelChargeLUTCalibCondAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeLUTCalibCondAlg
+ condSeq += PixelChargeLUTCalibCondAlg(name="PixelChargeLUTCalibCondAlg", ReadKey="")
+
else:
#####################
# Calibration Setup #
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py b/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py
index 779edc32d41ccda0b5007323115547897e0c8144..5273dfdd56ed5d0fb533462672cb62865a5ae34e 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/share/PixelDigitization_jobOptions.py
@@ -27,21 +27,33 @@ from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
if not hasattr(condSeq, 'PixelConfigCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseDeadmapConditions=False,
- ReadDeadMapKey="/PIXEL/PixMapOverlay",
- UseCalibConditions=True)
+ condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",ReadDeadMapKey="")
+
+
+useNewChargeFormat = False
+useNewDeadmapFormat = False
+
+if useNewDeadmapFormat:
+ if not hasattr(condSeq, "PixelDeadMapCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="")
#####################
# Calibration setup #
#####################
from IOVDbSvc.CondDB import conddb
-if not conddb.folderRequested("/PIXEL/PixCalib"):
- conddb.addFolder("PIXEL_OFL", "/PIXEL/PixCalib", className="CondAttrListCollection")
-
-if not hasattr(condSeq, 'PixelChargeCalibCondAlg'):
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
- condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="/PIXEL/PixCalib")
+if not useNewChargeFormat:
+ if not conddb.folderRequested("/PIXEL/PixCalib"):
+ conddb.addFolder("PIXEL_OFL", "/PIXEL/PixCalib", className="CondAttrListCollection")
+ if not hasattr(condSeq, 'PixelChargeCalibCondAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
+ condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="/PIXEL/PixCalib")
+else:
+ if not conddb.folderRequested("/PIXEL/ChargeCalibration"):
+ conddb.addFolder("PIXEL_OFL", "/PIXEL/ChargeCalibration", className="CondAttrListCollection")
+ if not hasattr(condSeq, 'PixelChargeLUTCalibCondAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeLUTCalibCondAlg
+ condSeq += PixelChargeLUTCalibCondAlg(name="PixelChargeLUTCalibCondAlg", ReadKey="/PIXEL/ChargeCalibration")
from PixelConditionsTools.PixelConditionsToolsConf import PixelRecoDbTool
ToolSvc += PixelRecoDbTool()
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index 9fda804bfb2b953a9a69d259cec5f8a134f0c7ed..3f173947ffbf5606304c88a44b11ba64023215f5 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -126,14 +126,6 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
if not hasattr(condSeq, 'PixelConfigCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
-
- PixelConfigCondAlg.UseCalibConditions=True
- PixelConfigCondAlg.UseDeadmapConditions=True
- PixelConfigCondAlg.UseDCSStateConditions=False
- PixelConfigCondAlg.UseDCSStatusConditions=False
- PixelConfigCondAlg.UseDCSHVConditions=True
- PixelConfigCondAlg.UseDCSTemperatureConditions=True
- PixelConfigCondAlg.UseTDAQConditions=False
PixelConfigCondAlg.UseCablingConditions=False
from AthenaCommon.BeamFlags import jobproperties
@@ -447,7 +439,8 @@ def BasicPixelDigitizationTool(name="PixelDigitizationTool", **kwargs):
from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
ToolSvc += SiLorentzAngleTool(name="PixelLorentzAngleTool",
DetectorName="Pixel",
- UseMagFieldCache = True,
+ DetEleCollKey="PixelDetectorElementCollection",
+ UseMagFieldCache=True,
SiLorentzAngleCondData="PixelSiLorentzAngleCondData")
############################################################################################
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
index b133d30a5f7da084f47f6119bac95b42904f8b56..d01cd5f28bc865ef19459935f6185e5e71f95132 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
@@ -149,14 +149,7 @@ def PixelDigitizationBasicToolCfg(flags, name="PixelDigitizationBasicTool", **kw
acc = PixelGeometryCfg(flags)
# module parameters
- acc.merge(PixelConfigCondAlgCfg(flags,
- UseCalibConditions=True,
- UseDeadmapConditions=True,
- UseDCSStateConditions=False,
- UseDCSStatusConditions=False,
- UseDCSHVConditions=True,
- UseDCSTemperatureConditions=True,
- UseTDAQConditions=False))
+ acc.merge(PixelConfigCondAlgCfg(flags))
# charge calibration
acc.merge(PixelChargeCalibCondAlgCfg(flags))
# NEW FOR RUN3 acc.merge(PixelChargeLUTCalibCondAlgCfg(flags))
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
index 1ad7e645715af8a941645d7fccc4f2a0fc124aac..f06f8b6ca964b96137d159bdfc483d4751374bb6 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
@@ -54,7 +54,9 @@ endif()
foreach( name
InDetSimDataCollectionCnv_p1_test
InDetSimDataCollectionCnv_p2_test
- InDetSimDataCollectionCnv_p3_test )
+ InDetSimDataCollectionCnv_p3_test
+ TRT_LoLumRawDataContainerCnv_p1_test
+ TRT_LoLumRawDataContainerCnv_p2_test )
atlas_add_test( ${name}
SOURCES test/${name}.cxx
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h
index 66f994bb243745777f4a2ded3138a48a5887faf4..8e2d4c0c7dacfe51d9e04be50ad4662c3370fe13 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/src/TRT_RDO_ContainerCnv.h
@@ -19,13 +19,10 @@
#include "TRT_LoLumRawDataContainerCnv_p2.h"
#include "TRT_LoLumRawDataContainerCnv_p3.h"
-
-// the latest persistent representation type of DataCollection:
-typedef InDetRawDataContainer_p2 TRT_RDO_Container_PERS;
-typedef TRT_LoLumRawDataContainerCnv_p2 TRT_RDO_ContainerCnv_PERS;
-// To switch to the p3 version (20% RDO size reduction), comment the two lines above and uncomment the two below.
-// typedef InDetRawDataContainer_p3 TRT_RDO_Container_PERS;
-// typedef TRT_LoLumRawDataContainerCnv_p3 TRT_RDO_ContainerCnv_PERS;
+// The latest persistent representation type of DataCollection:
+// p3 version (20% RDO size reduction)
+typedef InDetRawDataContainer_p3 TRT_RDO_Container_PERS;
+typedef TRT_LoLumRawDataContainerCnv_p3 TRT_RDO_ContainerCnv_PERS;
typedef T_AthenaPoolCustomCnv<TRT_RDO_Container, TRT_RDO_Container_PERS > TRT_RDO_ContainerCnvBase;
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_common_test.h b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_common_test.h
new file mode 100644
index 0000000000000000000000000000000000000000..b96e2f681cd3be148d33a6ee89baf8b8a9597796
--- /dev/null
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_common_test.h
@@ -0,0 +1,127 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file InDetEventAthenaPool/test/TRT_LowLumRawDataContainerCnv_common_test.h
+ * @brief Definitions of common methods for regression tests of TRT_LoLumRawDataContainerCnv_pX
+ * Based on InDetEventTPCnv/test/InDetSimDataCollectionCnv_common_test.h
+ */
+
+#undef NDEBUG
+
+#include "TestTools/initGaudi.h"
+#include "TestTools/leakcheck.h"
+
+#include "GaudiKernel/MsgStream.h"
+
+#include <cassert>
+#include <iostream>
+
+
+void compare(const TRT_LoLumRawData& p1,
+ const TRT_LoLumRawData& p2)
+{
+ assert(p1.identify() == p2.identify());
+ assert(p1.getWord() == p2.getWord());
+ assert(p1.highLevel() == p2.highLevel());
+ assert(p1.timeOverThreshold() == p2.timeOverThreshold());
+ assert(p1.driftTimeBin() == p2.driftTimeBin());
+}
+
+
+void compare(const TRT_RDO_Collection& p1,
+ const TRT_RDO_Collection& p2)
+{
+ assert(p1.size() == p2.size());
+ assert(p1.identify() == p2.identify());
+ assert(p1.identifyHash() == p2.identifyHash());
+ for (unsigned int i = 0; i < p1.size(); ++i) {
+ const TRT_LoLumRawData* chan1 = dynamic_cast<const TRT_LoLumRawData*>(p1[i]);
+ const TRT_LoLumRawData* chan2 = dynamic_cast<const TRT_LoLumRawData*>(p2[i]);
+ compare(*chan1, *chan2);
+ }
+}
+
+
+void compare(const TRT_RDO_Container& p1,
+ const TRT_RDO_Container& p2)
+{
+ assert(p1.numberOfCollections() == p2.numberOfCollections());
+ TRT_RDO_Container::const_iterator it1 = p1.begin();
+ TRT_RDO_Container::const_iterator it2 = p2.begin();
+ for (; it1 != p1.end(); ++it1, ++it2) {
+ compare(**it1, **it2);
+ }
+}
+
+
+// TCnv: TRT_LoLumRawDataContainerCnv_pX
+// T: InDetRawDataContainer_pX
+template<typename TCnv, typename T>
+void testit(const TRT_RDO_Container& trans1)
+{
+ MsgStream log(0, "test");
+ TCnv cnv;
+ T pers;
+ cnv.transToPers(&trans1, &pers, log);
+ TRT_RDO_Container trans2(trans1.numberOfCollections());
+ cnv.persToTrans(&pers, &trans2, log);
+
+ compare(trans1, trans2);
+}
+
+
+// TCnv: TRT_LoLumRawDataContainerCnv_pX
+// T: InDetRawDataContainer_pX
+template<typename TCnv, typename T>
+void test1()
+{
+ std::cout << "test1\n";
+ Athena_test::Leakcheck check;
+ // Build a TRT_RDO_Container
+ const unsigned int containerSize(19008);
+ TRT_RDO_Container trans1(containerSize);
+ // Creating collection for first example module
+ const IdentifierHash elementHash1(10026);
+ const Identifier::value_type idValue1 = 0x1612282000000000;
+ const Identifier strawID1 = Identifier(idValue1);
+ const unsigned int strawWord1(2147483696);
+ std::unique_ptr<TRT_RDO_Collection> collection1 = std::make_unique<TRT_RDO_Collection>(elementHash1);
+ //Add a TRT_LoLumRawData object
+ std::unique_ptr<TRT_LoLumRawData> rdo1 = std::make_unique<TRT_LoLumRawData>(strawID1,strawWord1);
+ collection1->push_back(rdo1.release());
+ assert(trans1.addCollection(collection1.get(),elementHash1).isSuccess());
+ collection1.release(); // Now owned by trans1
+ // Creating collection for second example module
+ const IdentifierHash elementHash2(10027);
+ const Identifier::value_type idValue2 = 0x16122ce000000000;
+ const Identifier strawID2 = Identifier(idValue2);
+ const unsigned int strawWord2(2147499712);
+ std::unique_ptr<TRT_RDO_Collection> collection2 = std::make_unique<TRT_RDO_Collection>(elementHash2);
+ //Add a TRT_LoLumRawData object
+ std::unique_ptr<TRT_LoLumRawData> rdo2 = std::make_unique<TRT_LoLumRawData>(strawID2,strawWord2);
+ collection2->push_back(rdo2.release());
+ assert(trans1.addCollection(collection2.get(),elementHash2).isSuccess());
+ collection2.release(); // Now owned by trans1
+ // Could add further modules/straws in the future, but I don't want to make this method unreadable.
+ testit<TCnv, T>(trans1);
+}
+
+
+// TCnv: TRT_LoLumRawDataContainerCnv_pX
+// T: InDetRawDataContainer_pX
+template<typename TCnv, typename T>
+int commonMain()
+{
+ // Initialize Gaudi
+ ISvcLocator* pSvcLoc = nullptr;
+ if (!Athena_test::initGaudi("InDetEventAthenaPool_test.txt", pSvcLoc)) {
+ std::cerr << "This test can not be run (initGaudi)" << std::endl;
+ return 0;
+ }
+
+ test1<TCnv, T>();
+
+ return 0;
+}
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p1_test.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p1_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..f6a27598f5ef63386e18cd085897a8c51c48a46e
--- /dev/null
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p1_test.cxx
@@ -0,0 +1,20 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p1_test.cxx
+ * @brief Regression tests.
+ */
+
+#undef NDEBUG
+
+#include "../src/TRT_LoLumRawDataContainerCnv_p1.h"
+
+#include "TRT_LoLumRawDataContainerCnv_common_test.h"
+
+
+int main()
+{
+ return commonMain<TRT_LoLumRawDataContainerCnv_p1, InDetRawDataContainer_p1>();
+}
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p2_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..47529b069057f752aefd0a2a12a10b9c14d3c95c
--- /dev/null
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p2_test.cxx
@@ -0,0 +1,20 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file InDetEventAthenaPool/test/TRT_LoLumRawDataContainerCnv_p2_test.cxx
+ * @brief Regression tests.
+ */
+
+#undef NDEBUG
+
+#include "../src/TRT_LoLumRawDataContainerCnv_p2.h"
+
+#include "TRT_LoLumRawDataContainerCnv_common_test.h"
+
+
+int main()
+{
+ return commonMain<TRT_LoLumRawDataContainerCnv_p2, InDetRawDataContainer_p2>();
+}
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
index 3988dd75e907117deebffb5dfa7b40058a17fc89..dbad7479bef12965ea0c680fc6c14e1fb0a81103 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
@@ -29,7 +29,8 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetRecTools/TRT_DriftFunctionTool
InnerDetector/InDetSimEvent
Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkTruthData
+ Tracking/TrkEvent/TrkTruthData
+ Tracking/TrkEvent/TrkEventUtils
Generators/AtlasHepMC )
# External dependencies:
@@ -41,7 +42,7 @@ atlas_add_component( InDetPrepRawDataToxAOD
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel AthenaBaseComps StoreGateLib SGtests Identifier InDetByteStreamErrors PixelConditionsData xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry TRT_ReadoutGeometry InDetRawData InDetSimData InDetPrepRawData InDetSimEvent TrkSurfaces TrkTruthData TRT_DriftFunctionToolLib PixelCablingLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel AthenaBaseComps StoreGateLib SGtests Identifier InDetByteStreamErrors PixelConditionsData xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry TRT_ReadoutGeometry InDetRawData InDetSimData InDetPrepRawData InDetSimEvent TrkSurfaces TrkTruthData TrkEventUtils TRT_DriftFunctionToolLib PixelCablingLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index 04b4239fa98cd5790604e6530578f6011760b248..baa9bbdfbcfc520083abdd123b41ca1e7ed1ad2a 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -424,10 +424,7 @@ if dumpPixInfo:
condSeq = AthSequencer("AthCondSeq")
if not hasattr(condSeq, "PixelConfigCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseDCSStateConditions=True,
- UseDCSStatusConditions=True)
-
+ condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg")
if not hasattr(condSeq, "PixelDCSCondStateAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDCSCondStateAlg
condSeq += PixelDCSCondStateAlg(name="PixelDCSCondStateAlg")
@@ -440,8 +437,11 @@ if dumpPixInfo:
from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
+ import InDetRecExample.TrackingCommon as TrackingCommon
+
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import PixelPrepDataToxAOD
- xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD")
+ xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD",
+ ClusterSplitProbabilityName = TrackingCommon.pixelClusterSplitProbName())
xAOD_PixelPrepDataToxAOD.LorentzAngleTool = ToolSvc.PixelLorentzAngleTool
xAOD_PixelPrepDataToxAOD.OutputLevel = INFO
xAOD_PixelPrepDataToxAOD.UseTruthInfo = dumpTruthInfo
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py
index 9bce9fe033d9e18cec1d8c28bbe689fb92cd2c2c..17f8c39eab1353b567e3646dfb7cb7f656ca0ccc 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/PixelxAOD.py
@@ -86,8 +86,10 @@ ToolSvc += PixelMonitoringSkimmingTool
#################
### Setup decorators tools
#################
+import InDetRecExample.TrackingCommon as TrackingCommon
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import PixelPrepDataToxAOD
-xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD")
+xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD",
+ ClusterSplitProbabilityName = TrackingCommon.pixelClusterSplitProbName())
xAOD_PixelPrepDataToxAOD.OutputLevel = INFO
xAOD_PixelPrepDataToxAOD.UseTruthInfo = dumpTruthInfo
xAOD_PixelPrepDataToxAOD.WriteRDOinformation = True
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
index 61940ed2132cd0fe6ced69c1680b238d1c397d7b..5cad7acff576d4d9f14abe3b0153729da859d953 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.cxx
@@ -104,6 +104,8 @@ StatusCode PixelPrepDataToxAOD::initialize()
m_write_offsets = m_clustercontainer_key.key() + "Offsets";
ATH_CHECK(m_write_offsets.initialize());
+ ATH_CHECK(m_clusterSplitProbContainer.initialize( !m_clusterSplitProbContainer.key().empty()));
+
return StatusCode::SUCCESS;
}
@@ -255,9 +257,10 @@ StatusCode PixelPrepDataToxAOD::execute()
AUXDATA(xprd,char,isFake) = (char)prd->isFake();
AUXDATA(xprd,char,gangedPixel) = (char)prd->gangedPixel();
- AUXDATA(xprd,int,isSplit) = (int)prd->isSplit();
- AUXDATA(xprd,float,splitProbability1) = prd->splitProbability1();
- AUXDATA(xprd,float,splitProbability2) = prd->splitProbability2();
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = getClusterSplittingProbability(prd);
+ AUXDATA(xprd,int,isSplit) = static_cast<int>(splitProb.isSplit());
+ AUXDATA(xprd,float,splitProbability1) = splitProb.splitProbability1();
+ AUXDATA(xprd,float,splitProbability2) = splitProb.splitProbability2();
// Need to add something to Add the NN splitting information
if(m_writeNNinformation) addNNInformation( xprd, prd, 7, 7);
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
index 156ead8f4353bb6fb3b828ab5eba87894a91943d..e0b68f33aa67018e5a60769fd1c9c4c4d9bc9d67 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/PixelPrepDataToxAOD.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file InDetPrepRawDataToxAOD/PixelPrepDataToxAOD.h
@@ -37,6 +37,7 @@
#include "PixelCabling/IPixelCablingSvc.h"
#include "StoreGate/ReadCondHandleKey.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
#include <string>
@@ -105,6 +106,15 @@ private:
int *rcolMin = 0,
int *rcolMax = 0 ) const;
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &getClusterSplittingProbability(const InDet::PixelCluster*pix) const {
+ if (!pix || m_clusterSplitProbContainer.key().empty()) return Trk::ClusterSplitProbabilityContainer::getNoSplitProbability();
+
+ SG::ReadHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainer(m_clusterSplitProbContainer);
+ if (!splitProbContainer.isValid()) {
+ ATH_MSG_FATAL("Failed to get cluster splitting probability container " << m_clusterSplitProbContainer);
+ }
+ return splitProbContainer->splitProbability(pix);
+ }
const PixelID *m_PixelHelper;
@@ -139,6 +149,9 @@ private:
ToolHandle<ISiLorentzAngleTool> m_lorentzAngleTool
{this, "LorentzAngleTool", "SiLorentzAngleTool", "Tool to retreive Lorentz angle"};
+ SG::ReadHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainer
+ {this, "ClusterSplitProbabilityName", "",""};
+
// -- Private members
bool m_firstEventWarnings;
bool m_need_sihits;
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCnv_p1_test.cxx b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCnv_p1_test.cxx
index ecc75766f7384d1ec0a1d41a38b73282957aad0f..7f37bfa90a12fedcb02952c17d1c32388adca7f5 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCnv_p1_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCnv_p1_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -59,17 +60,17 @@ void testit (const SiHit& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
- const HepMC::GenParticle *pGenParticle = genPartVector.at(0);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(0);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
SiHit trans1 (HepGeom::Point3D<double> (10.5, 11.5, 12.5),
HepGeom::Point3D<double> (13.5, 14.5, 15.5),
16.5,
@@ -84,7 +85,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc, genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p2_test.cxx
index 4e6fa39f52f104016cd1b9dc880a2cbe8c1f99cb..8a7d58a199be318452911e8c8f3e52231e0f57e8 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p2_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -69,12 +70,12 @@ void testit (const SiHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
SiHitCollection dum ("coll");
@@ -82,8 +83,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
SiHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
int o = i*100;
trans1.Emplace (HepGeom::Point3D<double> (10.5+o, 11.5+o, 12.5+o),
HepGeom::Point3D<double> (13.5+o, 14.5+o, 15.5+o),
@@ -101,7 +102,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc, genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p3_test.cxx b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p3_test.cxx
index d66def373f6afb9029afef1cf53a4c78fcbdb050..93ae567d15ea96b87748f97e413bc4ff65318b2a 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p3_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/SiHitCollectionCnv_p3_test.cxx
@@ -19,13 +19,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -68,12 +69,12 @@ void testit (const SiHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
SiHitCollection dum ("coll");
@@ -81,8 +82,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
SiHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
int o = i*100;
trans1.Emplace (HepGeom::Point3D<double> (10.5+o, 11.5+o, 12.5+o),
HepGeom::Point3D<double> (13.5+o, 14.5+o, 15.5+o),
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc, genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCnv_p1_test.cxx b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCnv_p1_test.cxx
index 172512e34d525988e3e71114cbb4edaf0feeff8c..d329d637d3546e3d660de02e4ef67ea9d67764e7 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCnv_p1_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCnv_p1_test.cxx
@@ -20,12 +20,13 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -64,17 +65,17 @@ void testit (const TRTUncompressedHit& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
- const HepMC::GenParticle *pGenParticle = genPartVector.at(0);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(0);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
TRTUncompressedHit trans1 (101, trkLink, pGenParticle->pdg_id(),
104.5, 105.5,
106.5, 107.5, 108.5,
@@ -88,7 +89,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc, genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p2_test.cxx b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p2_test.cxx
index 6eff0faf8819c2ed4f9111baf3d23d07765d108e..c53c6b22e72b1fc56a56712bad230c0be351f31a 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p2_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p2_test.cxx
@@ -20,12 +20,13 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -74,12 +75,12 @@ void testit (const TRTUncompressedHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
TRTUncompressedHitCollection dum ("coll");
@@ -88,8 +89,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
TRTUncompressedHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
int o = i*100;
- const HepMC::GenParticle* pGenParticle = genPartVector.at(0);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(0);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (101+o, trkLink, pGenParticle->pdg_id(),
104.5+o, 105.5+o,
(106.5+o)/1000, (107.5+o)/1000, 108.5+o,
@@ -97,8 +98,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
112.5+o);
}
// Special case for photons
- const HepMC::GenParticle* pGenParticle = genPartVector.at(10);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(10);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (131, trkLink, 22,
134.5, 135.5,
10, 3, 138.5,
@@ -112,7 +113,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc, genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p3_test.cxx b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p3_test.cxx
index 4f9b1cdff529201948c0b2f05309c404dbb5de0a..d223bd0a692576c8f63535d6fb051c6bb3fc51ac 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p3_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p3_test.cxx
@@ -22,6 +22,7 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
using Athena_test::isEqual;
using std::atan2;
@@ -31,7 +32,7 @@ void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -94,12 +95,12 @@ void testit (const TRTUncompressedHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
TRTUncompressedHitCollection dum ("coll");
@@ -108,8 +109,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
TRTUncompressedHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
int o = i*100;
- const HepMC::GenParticle* pGenParticle = genPartVector.at(0);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(0);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (101+o, trkLink, 20+o,
104.5+o, 105.5+o,
(106.5+o)/1000, (107.5+o)/1000, 108.5+o,
@@ -117,8 +118,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
112.5+o);
}
// Special case for photons
- const HepMC::GenParticle* pGenParticle = genPartVector.at(10);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(10);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (131, trkLink, 22,
134.5, 135.5,
10, 3, 138.5,
@@ -132,7 +133,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc, genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p4_test.cxx b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p4_test.cxx
index 7cd6335bba46c70f4898702628708e1162261c98..eae9cee6f0f7da9ee01bedcf66ad5759c3ce747d 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p4_test.cxx
+++ b/InnerDetector/InDetEventCnv/InDetSimEventTPCnv/test/TRT_HitCollectionCnv_p4_test.cxx
@@ -22,6 +22,7 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/Operators.h"
using Athena_test::isEqual;
using std::atan2;
@@ -31,7 +32,7 @@ void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -94,12 +95,12 @@ void testit (const TRTUncompressedHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
TRTUncompressedHitCollection dum ("coll");
@@ -108,8 +109,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
TRTUncompressedHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
int o = i*100;
- const HepMC::GenParticle* pGenParticle = genPartVector.at(0);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(0);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (101+o, trkLink, 20+o,
104.5+o, 105.5+o,
(106.5+o)/1000, (107.5+o)/1000, 108.5+o,
@@ -117,8 +118,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
112.5+o);
}
// Special case for photons
- const HepMC::GenParticle* pGenParticle = genPartVector.at(10);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(10);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (131, trkLink, 22,
134.5, 135.5,
10, 3, 138.5,
@@ -132,7 +133,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc, genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx
index d50b392fd753ce2f1e4f0acb3636b0d4bf01d574..53f53c1041a98e08555f5cbc8c692655974e1a7b 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx
@@ -115,9 +115,7 @@ StatusCode PixelRawDataProvider::execute(const EventContext& ctx) const {
for (; roi!=roiE; ++roi) {
superRoI.push_back(*roi);
}
- m_regionSelector->DetROBIDListUint( PIXEL,
- superRoI,
- listOfRobs);
+ m_regionSelector->ROBIDList( superRoI, listOfRobs );
}
std::vector<const ROBFragment*> listOfRobf;
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
index b9f4c5605c38d706c1662e3f0e6a648398ba2557..56855e0b8d88cb2faa1363d8058781c6d6a2cd00 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
@@ -24,7 +24,7 @@
#include "StoreGate/ReadCondHandleKey.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "PixelRawDataByteStreamCnv/IPixelRawDataProviderTool.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
// Forward declarations
class PixelID;
@@ -49,8 +49,8 @@ class PixelRawDataProvider : public AthReentrantAlgorithm {
private:
const PixelID* m_pixel_id { nullptr };
- ServiceHandle<IRegSelSvc> m_regionSelector { this, "RegSelSvc", "RegSelSvc", "Region selector" };
- ServiceHandle<IROBDataProviderSvc> m_robDataProvider { this, "ROBDataProvider", "ROBDataProviderSvc" };
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSelTool_Pixel" };
+ ServiceHandle<IROBDataProviderSvc> m_robDataProvider { this, "ROBDataProvider", "ROBDataProviderSvc" };
ToolHandle<IPixelRawDataProviderTool> m_rawDataTool { this, "ProviderTool", "PixelRawDataProviderTool"};
Gaudi::Property<bool> m_roiSeeded { this, "isRoI_Seeded", false, "Use RoI" }; // TODO, doubled information, empty RoIs collection name would be sufficent
SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey { this, "RoIs", "", "If RoI driven unpacking to be used, this is the key"};
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
index ecbbd1c36b37e01d554c463a276c14efcb9bb14b..03d21f9f4b36f50bebdfa80823cf21a80a0cd19a 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
@@ -122,7 +122,6 @@ sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
PixelCablingSvc = None,
- PixelModuleData = "",
PixelChargeCalibCondData = "",
PixelOfflineCalibData = '',
PixelLorentzAngleTool = None,
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTEncode.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTEncode.py
index 0afdbe2d11e357d97ea7132d3c73264f6bd99e5a..417a9c770edb2e289092c63fc39d82436e94963b 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTEncode.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTEncode.py
@@ -123,6 +123,7 @@ include("ByteStreamCnvSvc/RDP_ByteStream_jobOptions.py")
from ByteStreamCnvSvc import WriteByteStream
StreamBSFileOutput = WriteByteStream.getStream("EventStorage","StreamBSFileOutput")
StreamBSFileOutput.ItemList += [ "SCT_RDO_Container#SCT_RDOs" ]
+svcMgr.ByteStreamEventStorageOutputSvc.WriteEventlessFiles = False
# Print algorithms
if doPrint:
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.cxx
index 9c3b8cc1b79ee951777414543c416a564535902f..fdd454ead890d4409ef13b1b7d5ed9b8cdadfdef 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.cxx
@@ -14,7 +14,6 @@ using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
TRTRawDataProvider::TRTRawDataProvider(const std::string& name,
ISvcLocator* pSvcLocator) :
AthAlgorithm ( name, pSvcLocator ),
- m_regionSelector ("RegSelSvc", name),
m_robDataProvider ( "ROBDataProviderSvc", name ),
m_rawDataTool ( "TRTRawDataProviderTool",this ),
m_CablingSvc ( "TRT_CablingSvc", name ),
@@ -117,9 +116,7 @@ StatusCode TRTRawDataProvider::execute()
for (; roi!=roiE; ++roi) {
superRoI.push_back(*roi);
}
- m_regionSelector->DetROBIDListUint( TRT,
- superRoI,
- listOfRobs);
+ m_regionSelector->ROBIDList( superRoI, listOfRobs );
}
std::vector<const ROBFragment*> listOfRobf;
m_robDataProvider->getROBData( listOfRobs, listOfRobf);
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.h b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.h
index 8a4be6d46a7221f6f72b4c87572155ad40a6ee50..75e61d3dbc30ad0685c2c59cab3dbfdbcd7b10d6 100755
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.h
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRTRawDataProvider.h
@@ -17,7 +17,7 @@
#include "InDetRawData/TRT_RDO_Container.h"
#include "TRT_RawDataByteStreamCnv/ITRTRawDataProviderTool.h"
#include "TRT_Cabling/ITRT_CablingSvc.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "AthenaBaseComps/AthAlgorithm.h"
@@ -54,7 +54,8 @@ public:
private:
- ServiceHandle<IRegSelSvc> m_regionSelector;
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSelTool_TRT" }
+;
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
ToolHandle<ITRTRawDataProviderTool> m_rawDataTool;
ServiceHandle<ITRT_CablingSvc> m_CablingSvc;
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
index 0a6d159e0a47e5e5b40b49d0ecf10531c4b59cef..c6cbe58ebdfcba888e403f6506dc59b17e683303 100755
--- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
@@ -247,10 +247,7 @@ class ConfiguredNewTrackingCuts :
self.__minRoIClusterEt = 6000. * Units.MeV
self.__minSecondaryPt = 3.0 * Units.GeV # Increase pT cut used for back-tracking to match calo-RoI
- if self.__indetflags.cutLevel() >= 20:
- print('--------> FATAL ERROR, cut level undefined, abort !')
- import sys
- sys.exit()
+ assert self.__indetflags.cutLevel() < 20 , "default cut level is wrong {}.format(self.__indetflags.cutLevel())"
# --------------------------------------
# --- now the overwrites for special setups
@@ -279,23 +276,6 @@ class ConfiguredNewTrackingCuts :
self.__rejectShortExtensions = False
-# if rec.Commissioning():
-# self.__minClusters = 7 # Igor 6, was 7
-# self.__maxHoles = 5 # was 5
-# self.__maxPixelHoles = 2 # was 5
-# self.__maxSctHoles = 5 # was 5
-# self.__maxDoubleHoles = 4 # was 2
-# self.__maxPrimaryImpact = 50.0 * Units.mm # low lumi
-# self.__maxZImpact = 500.0 * Units.mm
-
-# if rec.Commissioning():
-# self.__maxSecondaryHoles = 5
-# self.__maxSecondaryPixelHoles = 5
-# self.__maxSecondarySCTHoles = 5
-# self.__maxSecondaryDoubleHoles = 2
-# self.__SecondaryXi2max = 50.0
-# self.__SecondaryXi2maxNoAdd = 100.0
-
# --- SLHC setup
if mode == "SLHC":
self.__extension = "SLHC"
@@ -307,19 +287,9 @@ class ConfiguredNewTrackingCuts :
# --- cluster cuts
self.__minClusters = 9
self.__minSiNotShared = 8
- #self.__maxShared = 3 # cut is now on number of shared modules
- #self.__maxHoles = 3
- #self.__maxPixelHoles = D2
- #self.__maxSctHoles = 2
- #self.__maxDoubleHoles = 2
+
# --- also tighten pattern cuts
self.__radMax = 1000. * Units.mm
- #self.__seedFilterLevel = 1
- #self.__nHolesMax = self.__maxHoles
- #self.__nHolesGapMax = self.__maxHoles
- #self.__Xi2max = 15.0
- #self.__Xi2maxNoAdd = 35.0
- #self.__nWeightedClustersMin = self.__minClusters-1
# --- IBL setup
if mode == "IBL" :
@@ -340,9 +310,9 @@ class ConfiguredNewTrackingCuts :
# --- mode for min bias, commissioning or doRobustReco
if mode == 'MinBias' or self.__indetflags.doRobustReco():
if self.__indetflags.doHIP300():
- self.__minPT = 0.300 * Units.GeV
+ self.__minPT = 0.300 * Units.GeV
else:
- self.__minPT = 0.100 * Units.GeV
+ self.__minPT = 0.100 * Units.GeV
self.__minClusters = 5
self.__minSecondaryPt = 0.4 * Units.GeV # Pt cut for back tracking + segment finding for these
self.__minTRTonlyPt = 0.4 * Units.GeV # Pt cut for TRT only
@@ -461,20 +431,12 @@ class ConfiguredNewTrackingCuts :
self.__maxZImpact = 150.0 * Units.mm
self.__minClusters = 6
self.__minSiNotShared = 4
- #self.__maxShared = 3
self.__maxHoles = 0
- #self.__maxPixelHoles = D2
- #self.__maxSctHoles = 2
- #self.__maxDoubleHoles = 2
+
# --- also tighten pattern cuts
self.__radMax = 1000. * Units.mm
self.__radMin = 0. * Units.mm # not turn on this cut for now
- #self.__seedFilterLevel = 1
- #self.__nHolesMax = self.__maxHoles
- #self.__nHolesGapMax = self.__maxHoles
- #self.__Xi2max = 15.0
- #self.__Xi2maxNoAdd = 35.0
- #self.__nWeightedClustersMin = self.__minClusters-1
+
# --- turn on Z Boundary seeding
self.__doZBoundary = False #
@@ -607,7 +569,7 @@ class ConfiguredNewTrackingCuts :
self.__maxSctHoles = 3
self.__maxDoubleHoles = 1
self.__minTRTonTrk = 15
- self.__minTRTOnly = 15
+ self.__minTRTonly = 15
self.__roadWidth = 60.
self.__seedFilterLevel = 3
self.__Xi2max = 60.0
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetRecExampleConfig.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetRecExampleConfig.py
index c1bf4080ffe94eac8edbef90a85f7f98f5097bb7..5a008625ea9f6d68dc3c4130f90118a0f94fa115 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetRecExampleConfig.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetRecExampleConfig.py
@@ -1,8 +1,8 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon import CfgMgr,CfgGetter
import AthenaCommon.SystemOfUnits as Units
-from InDetRecExample.TrackingCommon import setDefaults
+from InDetRecExample.TrackingCommon import setDefaults,copyArgs
def setTool(prop,tool_name,kwargs) :
if tool_name is None :
@@ -19,6 +19,12 @@ def setTool(prop,tool_name,kwargs) :
else:
kwargs.setdefault(prop, CfgGetter.getPublicTool(tool_name) )
+def stripArgs(kwargs, copy_list) :
+ dict_copy = copyArgs(kwargs,copy_list)
+ for an_arg in copy_list :
+ kwargs.pop(an_arg,None)
+ return dict_copy
+
def KalmanCompetingPixelClustersTool(name='KalmanCompetingPixelClustersTool',**kwargs):
kwargs.setdefault('WeightCutValueBarrel',5.5)
kwargs.setdefault('WeightCutValueEndCap',5.5)
@@ -104,21 +110,19 @@ def InDetKOL(name='InDetKOL',**kwargs) :
def InDetMeasRecalibST(name='InDetMeasRecalibST',**kwargs) :
from TrkKalmanFitter.TrkKalmanFitterConf import Trk__MeasRecalibSteeringTool
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
from InDetRecExample import TrackingCommon as TrackingCommon
if 'BroadPixelClusterOnTrackTool' not in kwargs :
kwargs = setDefaults(kwargs,
- BroadPixelClusterOnTrackTool = TrackingCommon.getInDetBroadPixelClusterOnTrackTool(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ BroadPixelClusterOnTrackTool = TrackingCommon.getInDetBroadPixelClusterOnTrackTool(**pix_cluster_on_track_args))
if 'BroadSCT_ClusterOnTrackTool' not in kwargs :
kwargs = setDefaults(kwargs,
BroadSCT_ClusterOnTrackTool = TrackingCommon.getInDetBroadSCT_ClusterOnTrackTool())
if 'CommonRotCreator' not in kwargs :
kwargs=setDefaults(kwargs,
- CommonRotCreator = TrackingCommon.getInDetRefitRotCreator(
- SplitClusterMapExtension = split_cluster_map_extension))
+ CommonRotCreator = TrackingCommon.getInDetRefitRotCreator(**pix_cluster_on_track_args))
return Trk__MeasRecalibSteeringTool(name,**kwargs)
@@ -126,14 +130,17 @@ def InDetKalmanTrackFitterBase(name='InDetKalmanTrackFitterBase',**kwargs) :
from InDetRecExample import TrackingCommon as TrackingCommon
from TrkKalmanFitter.TrkKalmanFitterConf import Trk__KalmanFitter
from AthenaCommon.AppMgr import ToolSvc
- split_cluster_map_extension = kwargs.get('SplitClusterMapExtension','')
+
+ nameSuffix=kwargs.pop('nameSuffix','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles'])
+ if len(pix_cluster_on_track_args)>0 and len(nameSuffix)>0 :
+ pix_cluster_on_track_args['nameSuffix']=nameSuffix
kwargs.setdefault('ExtrapolatorHandle', TrackingCommon.getInDetExtrapolator())
if 'RIO_OnTrackCreatorHandle' not in kwargs :
from InDetRecExample import TrackingCommon as TrackingCommon
kwargs=setDefaults(kwargs,
- RIO_OnTrackCreatorHandle = TrackingCommon.getInDetRefitRotCreator(
- SplitClusterMapExtension = split_cluster_map_extension))
+ RIO_OnTrackCreatorHandle = TrackingCommon.getInDetRefitRotCreator(**pix_cluster_on_track_args))
kwargs.setdefault('MeasurementUpdatorHandle', ToolSvc.InDetUpdator)
setTool('KalmanSmootherHandle', 'InDetBKS', kwargs )
@@ -141,10 +148,10 @@ def InDetKalmanTrackFitterBase(name='InDetKalmanTrackFitterBase',**kwargs) :
kwargs.setdefault('DynamicNoiseAdjustorHandle', None)
kwargs.setdefault('BrempointAnalyserHandle', None)
kwargs.setdefault('AlignableSurfaceProviderHandle',None)
- if len(split_cluster_map_extension)>0 :
+ if len(pix_cluster_on_track_args)>0 :
if 'RecalibratorHandle' not in kwargs :
the_tool_name = 'InDetMeasRecalibST'
- kwargs.setdefault('RecalibratorHandle', CfgGetter.getPublicToolClone(the_tool_name+split_cluster_map_extension,the_tool_name, SplitClusterMapExtension = split_cluster_map_extension) )
+ kwargs.setdefault('RecalibratorHandle', CfgGetter.getPublicToolClone(the_tool_name+nameSuffix,the_tool_name, **pix_cluster_on_track_args))
else :
setTool('RecalibratorHandle', 'InDetMeasRecalibST', kwargs )
# setTool('InternalDAFHandle','KalmanInternalDAF',kwargs )
@@ -187,7 +194,7 @@ def KalmanDNAFitter(name='KalmanDNAFitter',**kwargs) :
return InDetKalmanTrackFitterBase(name,**kwargs)
def DistributedKalmanFilter(name="DistributedKalmanFilter", **kwargs) :
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
from InDetRecExample.TrackingCommon import setDefaults
if 'ExtrapolatorTool' not in kwargs :
@@ -196,9 +203,7 @@ def DistributedKalmanFilter(name="DistributedKalmanFilter", **kwargs) :
from InDetRecExample import TrackingCommon as TrackingCommon
if 'ROTcreator' not in kwargs :
kwargs=setDefaults(kwargs,
- ROTcreator = TrackingCommon.getInDetRotCreator(
- nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ROTcreator = TrackingCommon.getInDetRotCreator(**pix_cluster_on_track_args))
# @TODO set sortingReferencePoint = ???
from TrkDistributedKalmanFilter.TrkDistributedKalmanFilterConf import Trk__DistributedKalmanFilter
@@ -236,22 +241,18 @@ def InDetGlobalChi2FitterBase(name='GlobalChi2FitterBase', **kwargs) :
return Trk__GlobalChi2Fitter(name, **kwargs)
def InDetGlobalChi2Fitter(name='InDetGlobalChi2Fitter', **kwargs) :
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
from InDetRecExample import TrackingCommon as TrackingCommon
if 'RotCreatorTool' not in kwargs :
kwargs=setDefaults(kwargs,
- RotCreatorTool = TrackingCommon.getInDetRotCreator(
- nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ RotCreatorTool = TrackingCommon.getInDetRotCreator(**pix_cluster_on_track_args))
from InDetRecExample.InDetJobProperties import InDetFlags
use_broad_cluster_any = InDetFlags.useBroadClusterErrors() and (not InDetFlags.doDBMstandalone())
if 'BroadRotCreatorTool' not in kwargs and not InDetFlags.doRefit():
kwargs=setDefaults(kwargs,
- BroadRotCreatorTool = TrackingCommon.getInDetBroadRotCreator(
- nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ BroadRotCreatorTool = TrackingCommon.getInDetBroadRotCreator(**pix_cluster_on_track_args))
if InDetFlags.doDBMstandalone():
kwargs=setDefaults(kwargs,
@@ -290,22 +291,18 @@ def InDetGlobalChi2Fitter(name='InDetGlobalChi2Fitter', **kwargs) :
def InDetGlobalChi2FitterLowPt(name='InDetGlobalChi2FitterLowPt', **kwargs) :
# @TODO TrackingGeometrySvc was not set but is set now
# RotCreatorTool and BroadRotCreatorTool not set
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
from InDetRecExample import TrackingCommon as TrackingCommon
if 'RotCreatorTool' not in kwargs :
kwargs=setDefaults(kwargs,
- RotCreatorTool = TrackingCommon.getInDetRotCreator(
- nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ RotCreatorTool = TrackingCommon.getInDetRotCreator(**pix_cluster_on_track_args))
from InDetRecExample.InDetJobProperties import InDetFlags
use_broad_cluster_any = InDetFlags.useBroadClusterErrors() and (not InDetFlags.doDBMstandalone())
if 'BroadRotCreatorTool' not in kwargs and not InDetFlags.doRefit():
kwargs=setDefaults(kwargs,
- BroadRotCreatorTool = TrackingCommon.getInDetBroadRotCreator(
- nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ BroadRotCreatorTool = TrackingCommon.getInDetBroadRotCreator(**pix_cluster_on_track_args))
return InDetGlobalChi2FitterBase(name, **setDefaults(kwargs,
OutlierCut = 5.0,
@@ -318,14 +315,12 @@ def InDetGlobalChi2FitterTRT(name='InDetGlobalChi2FitterTRT', **kwargs) :
'''
Global Chi2 Fitter for TRT segments with different settings
'''
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
if 'RotCreatorTool' not in kwargs :
from InDetRecExample import TrackingCommon as TrackingCommon
kwargs=setDefaults(kwargs,
- RotCreatorTool = TrackingCommon.getInDetRefitRotCreator(
- nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ RotCreatorTool = TrackingCommon.getInDetRefitRotCreator(**pix_cluster_on_track_args))
from InDetRecExample.InDetJobProperties import InDetFlags
return InDetGlobalChi2FitterBase(name, **setDefaults(
@@ -348,10 +343,10 @@ def InDetGlobalChi2FitterTRT(name='InDetGlobalChi2FitterTRT', **kwargs) :
))
def InDetGlobalChi2FitterDBM(name='InDetGlobalChi2FitterDBM', **kwargs) :
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
if 'RotCreatorTool' not in kwargs :
from InDetRecExample import TrackingCommon as TrackingCommon
- kwargs=setDefaults(kwargs, RotCreatorTool = TrackingCommon.getInDetRotCreatorDBM(SplitClusterMapExtension = split_cluster_map_extension))
+ kwargs=setDefaults(kwargs, RotCreatorTool = TrackingCommon.getInDetRotCreatorDBM(**pix_cluster_on_track_args))
return InDetGlobalChi2FitterBase(name, **setDefaults(kwargs,
BroadRotCreatorTool = None,
@@ -364,14 +359,12 @@ def InDetGlobalChi2FitterDBM(name='InDetGlobalChi2FitterDBM', **kwargs) :
Momentum = 1000.*Units.MeV))
def GaussianSumFitter(name='GaussianSumFitter', **kwargs) :
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = stripArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
from InDetRecExample import TrackingCommon as TrackingCommon
if 'ToolForROTCreation' not in kwargs :
kwargs=setDefaults(kwargs,
- ToolForROTCreation = TrackingCommon.getInDetRotCreator(
- nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolForROTCreation = TrackingCommon.getInDetRotCreator(**pix_cluster_on_track_args))
if 'ToolForExtrapolation' not in kwargs :
kwargs=setDefaults(kwargs, ToolForExtrapolation = TrackingCommon.getInDetGsfExtrapolator())
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
index f51709b523e30e1f6e0e1edb9efb9023a896a6cf..9e51a95f7036244662b70554598ab0189b48298b 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
@@ -95,7 +95,7 @@ def makePublicTool(tool_creator) :
if the_name != tool.name() :
raise Exception('Tool has not the exepected name %s but %s' % (the_name, tool.name()))
if private is False :
- log.debug ('DEBUG add to ToolSvc %s' % (tool.name()))
+ log.debug ('Add to ToolSvc %s' % (tool.name()))
ToolSvc += tool
return tool
else :
@@ -513,8 +513,12 @@ def getInDetTRT_DriftCircleOnTrackUniversalToolCosmics(name='TRT_DriftCircleOnTr
@makePublicTool
def getInDetRotCreator(name='InDetRotCreator', **kwargs) :
+ strip_args=['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix']
+ pix_cluster_on_track_args = copyArgs(kwargs,strip_args)
+ # note nameSuffix is strupped by makeName
the_name = makeName( name, kwargs)
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
+ for an_arg in strip_args:
+ kwargs.pop(an_arg,None)
from InDetRecExample.InDetJobProperties import InDetFlags
use_broad_cluster_pix = InDetFlags.useBroadPixClusterErrors() and (not InDetFlags.doDBMstandalone())
use_broad_cluster_sct = InDetFlags.useBroadSCTClusterErrors() and (not InDetFlags.doDBMstandalone())
@@ -522,12 +526,10 @@ def getInDetRotCreator(name='InDetRotCreator', **kwargs) :
if 'ToolPixelCluster' not in kwargs :
if use_broad_cluster_pix :
kwargs = setDefaults( kwargs,
- ToolPixelCluster = getInDetBroadPixelClusterOnTrackTool(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolPixelCluster = getInDetBroadPixelClusterOnTrackTool(**pix_cluster_on_track_args))
else :
kwargs = setDefaults( kwargs,
- ToolPixelCluster = getInDetPixelClusterOnTrackTool(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolPixelCluster = getInDetPixelClusterOnTrackTool(**pix_cluster_on_track_args))
if 'ToolSCT_Cluster' not in kwargs :
if use_broad_cluster_sct :
@@ -546,43 +548,38 @@ def getInDetRotCreator(name='InDetRotCreator', **kwargs) :
def getInDetRotCreatorPattern(name='InDetRotCreatorPattern', **kwargs) :
if 'ToolPixelCluster' not in kwargs :
- split_cluster_map_extension = kwargs.get('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = copyArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
kwargs = setDefaults(kwargs,
- ToolPixelCluster = getInDetPixelClusterOnTrackToolPattern(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolPixelCluster = getInDetPixelClusterOnTrackToolPattern(**pix_cluster_on_track_args))
return getInDetRotCreator(name=name, **kwargs)
def getInDetRotCreatorDBM(name='InDetRotCreatorDBM', **kwargs) :
- split_cluster_map_extension = kwargs.pop('SplitClusterMapExtension','')
if 'ToolPixelCluster' not in kwargs :
+ pix_cluster_on_track_args = copyArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
from InDetRecExample.InDetJobProperties import InDetFlags
from AthenaCommon.DetFlags import DetFlags
if InDetFlags.loadRotCreator() and DetFlags.haveRIO.pixel_on():
kwargs = setDefaults(kwargs,
- ToolPixelCluster = getInDetPixelClusterOnTrackToolDBM(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolPixelCluster = getInDetPixelClusterOnTrackToolDBM(**pix_cluster_on_track_args))
else :
kwargs = setDefaults(kwargs,
- ToolPixelCluster = getInDetPixelClusterOnTrackTool(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolPixelCluster = getInDetPixelClusterOnTrackTool(**pix_cluster_on_track_args))
return getInDetRotCreator(name=name, **kwargs)
def getInDetRotCreatorDigital(name='InDetRotCreatorDigital', **kwargs) :
if 'ToolPixelCluster' not in kwargs :
- split_cluster_map_extension = kwargs.get('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = copyArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
kwargs = setDefaults(kwargs,
- ToolPixelCluster = getInDetPixelClusterOnTrackToolDigital(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolPixelCluster = getInDetPixelClusterOnTrackToolDigital(**pix_cluster_on_track_args))
return getInDetRotCreator(name=name, **kwargs)
# @TODO rename to InDetBroadRotCreator
def getInDetBroadRotCreator(name='InDetBroadInDetRotCreator', **kwargs) :
if 'ToolPixelCluster' not in kwargs :
- split_cluster_map_extension = kwargs.get('SplitClusterMapExtension','')
+ pix_cluster_on_track_args = copyArgs(kwargs,['SplitClusterMapExtension','ClusterSplitProbabilityName','RenounceInputHandles','nameSuffix'])
kwargs = setDefaults(kwargs,
- ToolPixelCluster = getInDetBroadPixelClusterOnTrackTool(nameSuffix = split_cluster_map_extension,
- SplitClusterMapExtension = split_cluster_map_extension))
+ ToolPixelCluster = getInDetBroadPixelClusterOnTrackTool(**pix_cluster_on_track_args))
if 'ToolSCT_Cluster' not in kwargs :
kwargs = setDefaults(kwargs,
ToolSCT_Cluster = getInDetBroadSCT_ClusterOnTrackTool())
@@ -1073,11 +1070,16 @@ def getInDetSummaryHelperSharedHits(name='InDetSummaryHelperSharedHits',**kwargs
def getInDetTrackSummaryTool(name='InDetTrackSummaryTool',**kwargs) :
# makeName will remove the namePrefix in suffix from kwargs, so copyArgs has to be first
hlt_args = copyArgs(kwargs,['isHLT','namePrefix'])
+ id_helper_args = copyArgs(kwargs,['ClusterSplitProbabilityName','RenounceInputHandles','namePrefix','nameSuffix']) if 'ClusterSplitProbabilityName' in kwargs else {}
+ kwargs.pop('ClusterSplitProbabilityName',None)
+ kwargs.pop('RenounceInputHandles',None)
kwargs.pop('isHLT',None)
the_name = makeName( name, kwargs)
do_holes=kwargs.get("doHolesInDet",True)
+ if do_holes :
+ id_helper_args.update(hlt_args)
if 'InDetSummaryHelperTool' not in kwargs :
- kwargs = setDefaults( kwargs, InDetSummaryHelperTool = getInDetSummaryHelper(**hlt_args) if do_holes else getInDetSummaryHelperNoHoleSearch())
+ kwargs = setDefaults( kwargs, InDetSummaryHelperTool = getInDetSummaryHelper(**id_helper_args) if do_holes else getInDetSummaryHelperNoHoleSearch(**id_helper_args))
#
# Configurable version of TrkTrackSummaryTool: no TRT_PID tool needed here (no shared hits)
@@ -1097,7 +1099,14 @@ def getInDetTrackSummaryToolNoHoleSearch(name='InDetTrackSummaryToolNoHoleSearch
def getInDetTrackSummaryToolSharedHits(name='InDetTrackSummaryToolSharedHits',**kwargs) :
if 'InDetSummaryHelperTool' not in kwargs :
- kwargs = setDefaults( kwargs, InDetSummaryHelperTool = getInDetSummaryHelperSharedHits())
+ copy_args=['ClusterSplitProbabilityName','RenounceInputHandles','namePrefix','nameSuffix']
+ do_holes=kwargs.get("doHolesInDet",True)
+ if do_holes :
+ copy_args += ['isHLT']
+ id_helper_args = copyArgs(kwargs,copy_args) if 'ClusterSplitProbabilityName' in kwargs else {}
+ kwargs.pop('ClusterSplitProbabilityName',None)
+ kwargs.pop('RenounceInputHandles',None)
+ kwargs = setDefaults( kwargs, InDetSummaryHelperTool = getInDetSummaryHelperSharedHits(**id_helper_args))
if 'TRT_ElectronPidTool' not in kwargs :
kwargs = setDefaults( kwargs, TRT_ElectronPidTool = getInDetTRT_ElectronPidTool())
@@ -1450,3 +1459,157 @@ def getSolenoidalIntersector(name="SolenoidalIntersector", **kwargs) :
createAndAddCondAlg(getSolenoidParametrizationCondAlg, "SolenoidParametrizationCondAlg")
from TrkExSolenoidalIntersector.TrkExSolenoidalIntersectorConf import Trk__SolenoidalIntersector
return Trk__SolenoidalIntersector(the_name, **setDefaults(kwargs, SolenoidParameterizationKey = 'SolenoidParametrization'))
+
+def searchProb(prob_val) :
+ def iterateComp() :
+ from AthenaCommon.AppMgr import ToolSvc
+ from AthenaCommon.Configurable import ConfigurableAlgTool
+
+ for a_tool in ToolSvc.getChildren() :
+ yield a_tool
+ from AthenaCommon.AlgSequence import AlgSequence
+ topSequence = AlgSequence()
+ for an_alg in topSequence.getChildren() :
+ yield an_alg
+ for name,prop in an_alg.getProperties().items() :
+ if isinstance(prop,ConfigurableAlgTool) and not prop.isInToolSvc() :
+ yield prop
+
+ for a_comp in iterateComp() :
+ for name,prop in a_comp.getProperties().items() :
+ if isinstance(prop ,str) and prop == prob_val :
+ return True
+ return False
+
+def hasSplitProb(key) :
+ # @TODO find better solution than searching through a huge number of properties
+ from RecExConfig.AutoConfiguration import IsInInputFile
+ if IsInInputFile('Trk::ClusterSplitProbabilityContainer',key) :
+ return True
+
+ if searchProb(key) :
+ return True
+ return False
+
+def combinedClusterSplitProbName() :
+ # precisely mimics the configuration in InDetRec_jobOptions
+ # chaings in InDetRec_jobOptions to the ClusterSplitProbContainer also have to be implemented here
+ # To synchronise with InDetRec_jobOptions the logic can be extracted with
+ # grep "CombinedInDetClusterSplitProbContainer\|ClusterSplitProbContainer\|[[:space:]]\(el\|\)if\([[:space:]]\|(\)\|[[:space:]]else[[:space:]]*:\|ConfiguredNewTrackingCuts"
+ # InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
+ # @TODO find a better way to provide the final name of ClusterSplitProbContainer used for the combined InDetTrackParticles
+ from AthenaCommon.BeamFlags import jobproperties
+ from InDetRecExample.InDetJobProperties import InDetFlags
+ CombinedInDetClusterSplitProbContainer = ''
+ ClusterSplitProbContainer=''
+ if InDetFlags.Enabled():
+ from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts
+ if ('InDetNewTrackingCuts' not in dir()):
+ if InDetFlags.doDBMstandalone():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("DBM")
+ elif InDetFlags.doVtxLumi():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("VtxLumi")
+ elif InDetFlags.doVtxBeamSpot():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("VtxBeamSpot")
+ elif InDetFlags.doCosmics():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("Cosmics")
+ elif InDetFlags.doHeavyIon():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("HeavyIon")
+ elif InDetFlags.doSLHC():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("SLHC")
+ elif InDetFlags.doIBL():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("IBL")
+ elif InDetFlags.doHighPileup():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("HighPileup")
+ elif InDetFlags.doMinBias():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("MinBias")
+ elif InDetFlags.doDVRetracking():
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("R3LargeD0")
+ else:
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("Offline")
+ if InDetFlags.doTrackSegmentsPixel():
+ if ('InDetNewTrackingCutsPixel' not in dir()):
+ InDetNewTrackingCutsPixel = ConfiguredNewTrackingCuts("Pixel")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsPixel.extension()
+ # @TODO CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doTrackSegmentsSCT():
+ if ('InDetNewTrackingCutsSCT' not in dir()):
+ InDetNewTrackingCutsSCT = ConfiguredNewTrackingCuts("SCT")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsSCT.extension()
+ # @TODO CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doTRTPhaseCalculation() and not jobproperties.Beam.beamType()=="collisions" and InDetFlags.doNewTracking():
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCuts.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doNewTracking() and (not InDetFlags.doTRTPhaseCalculation() or jobproperties.Beam.beamType()=="collisions"):
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCuts.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doBackTracking():
+ ClusterSplitProbContainer = 'InDetTRT_SeededAmbiguityProcessorSplitProb'+InDetNewTrackingCuts.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ ClusterSplitProbContainerLargeD0=''
+ if InDetFlags.doLargeD0() or InDetFlags.doR3LargeD0() or InDetFlags.doLowPtLargeD0():
+ if ('InDetNewTrackingCutsLargeD0' not in dir()):
+ if InDetFlags.doLowPtLargeD0():
+ InDetNewTrackingCutsLargeD0 = ConfiguredNewTrackingCuts("LowPtLargeD0")
+ elif InDetFlags.doR3LargeD0():
+ InDetNewTrackingCutsLargeD0 = ConfiguredNewTrackingCuts("R3LargeD0")
+ else:
+ InDetNewTrackingCutsLargeD0 = ConfiguredNewTrackingCuts("LargeD0")
+ ClusterSplitProbContainerLargeD0 = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsLargeD0.extension()
+ if not InDetFlags.storeSeparateLargeD0Container():
+ ClusterSplitProbContainer = ClusterSplitProbContainerLargeD0
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainerLargeD0
+ if InDetFlags.doLowPt():
+ if ('InDetNewTrackingCutsLowPt' not in dir()):
+ InDetNewTrackingCutsLowPt = ConfiguredNewTrackingCuts("LowPt")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsLowPt.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doVeryLowPt():
+ if ('InDetNewTrackingCutsVeryLowPt' not in dir()):
+ InDetNewTrackingCutsVeryLowPt = ConfiguredNewTrackingCuts("VeryLowPt")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsVeryLowPt.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doTRTStandalone():
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doForwardTracks() and InDetFlags.doSLHC():
+ if InDetFlags.doSLHCVeryForward():
+ if ('InDetNewTrackingCutsForwardTracks' not in dir()):
+ InDetNewTrackingCutsForwardTracks = ConfiguredNewTrackingCuts("VeryForwardSLHCTracks")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ else:
+ if ('InDetNewTrackingCutsForwardTracks' not in dir()):
+ InDetNewTrackingCutsForwardTracks = ConfiguredNewTrackingCuts("ForwardSLHCTracks")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doSLHCConversionFinding() and InDetFlags.doSLHC():
+ if ('InDetNewTrackingCutsSLHCConversionFinding' not in dir()):
+ InDetNewTrackingCutsSLHCConversionFinding = ConfiguredNewTrackingCuts("SLHCConversionFinding")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsSLHCConversionFinding.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doBeamGas():
+ if ('InDetNewTrackingCutsBeamGas' not in dir()):
+ InDetNewTrackingCutsBeamGas = ConfiguredNewTrackingCuts("BeamGas")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsBeamGas.extension()
+ if jobproperties.Beam.beamType() == "singlebeam":
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
+ if InDetFlags.doCosmics() and InDetFlags.doNewTracking() : # @TODO should also consider: and len(InputCombinedInDetTracks) > 1:
+ CombinedInDetClusterSplitProbContainer = '' # @TODO really no split prob container ?
+ if InDetFlags.doNewTrackingPattern() or InDetFlags.doBeamHalo():
+ if InDetFlags.useExistingTracksAsInput():
+ pass # CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer # @TODO handle cluster splitting probability ?
+ if InDetFlags.doDBMstandalone():
+ CombinedInDetClusterSplitProbContainer=''
+ return CombinedInDetClusterSplitProbContainer if hasSplitProb(CombinedInDetClusterSplitProbContainer) else ''
+
+def pixelClusterSplitProbName() :
+ ClusterSplitProbContainer=combinedClusterSplitProbName()
+ from InDetRecExample.InDetJobProperties import InDetFlags
+ if InDetFlags.doTrackSegmentsDisappearing():
+ if ('InDetNewTrackingCutsDisappearing' not in dir()):
+ print ("InDetRec_jobOptions: InDetNewTrackingCutsDisappearing not set before - import them now")
+ from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts
+ InDetNewTrackingCutsDisappearing = ConfiguredNewTrackingCuts("Disappearing")
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsDisappearing.extension()
+ return ClusterSplitProbContainer if hasSplitProb(ClusterSplitProbContainer) else ''
+
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py
index 5294b6f6f01102bbc9e0f1faf09027b10ff2ca4d..a1c93a15d586d6b71e5689145a88c2fe4217476b 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredBackTracking.py
@@ -9,7 +9,7 @@ include.block ('InDetRecExample/ConfiguredBackTracking.py')
class ConfiguredBackTracking:
- def __init__(self, InputCollections = None, NewTrackingCuts = None, TrackCollectionKeys=[] , TrackCollectionTruthKeys=[]):
+ def __init__(self, InputCollections = None, NewTrackingCuts = None, TrackCollectionKeys=[] , TrackCollectionTruthKeys=[], ClusterSplitProbContainer=''):
from InDetRecExample.InDetJobProperties import InDetFlags
from InDetRecExample.InDetKeys import InDetKeys
@@ -266,6 +266,8 @@ class ConfiguredBackTracking:
AssociationTool = TrackingCommon.getInDetPRDtoTrackMapToolGangedPixels(),
TrackSummaryTool = InDetTRT_SeededSummaryTool,
SelectionTool = InDetTRT_SeededAmbiTrackSelectionTool,
+ InputClusterSplitProbabilityName = ClusterSplitProbContainer,
+ OutputClusterSplitProbabilityName = 'InDetTRT_SeededAmbiguityProcessorSplitProb'+NewTrackingCuts.extension(),
RefitPrds = not InDetFlags.refitROT(),
SuppressTrackFit = False,
SuppressHoleSearch = False,
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py
index a4289a2f4d3d8fe32565fd55634ca37775f6e43a..a18b6a4c2998f05be9c5fa3ece94ddfe9b07b608 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py
@@ -174,6 +174,11 @@ class ConfiguredInDetPreProcessingTRT:
TrtDescrManageLocation = InDetKeys.TRT_Manager(),
TRTRDOLocation = InDetKeys.TRT_RDOs(),
TRTRIOLocation = collection)
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ InDetTRT_RIO_Maker.RegSelTool = makeRegSelTool_TRT()
+
+
topSequence += InDetTRT_RIO_Maker
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetTRT_RIO_Maker)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
index 5f95152b346cf731f99c6b0d2800dbc2f9f724ee..33351b934d4b04ae35a6f6347cc730ff3e3533d7 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
@@ -10,8 +10,15 @@ include.block ('InDetRecExample/ConfiguredNewTrackingSiPattern.py')
class ConfiguredNewTrackingSiPattern:
- def __init__(self, InputCollections = None, ResolvedTrackCollectionKey = None, SiSPSeededTrackCollectionKey = None , NewTrackingCuts = None, TrackCollectionKeys=[] , TrackCollectionTruthKeys=[]):
-
+ def __init__(self,
+ InputCollections = None,
+ ResolvedTrackCollectionKey = None,
+ SiSPSeededTrackCollectionKey = None ,
+ NewTrackingCuts = None,
+ TrackCollectionKeys=[] ,
+ TrackCollectionTruthKeys=[],
+ ClusterSplitProbContainer=''):
+
from InDetRecExample.InDetJobProperties import InDetFlags
from InDetRecExample.InDetKeys import InDetKeys
@@ -483,20 +490,36 @@ class ConfiguredNewTrackingSiPattern:
#
useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "SLHC"
+ # @TODO is the cluster split probability container needed here ?
+ ambi_track_summary_tool = TrackingCommon.getInDetTrackSummaryTool(namePrefix = 'InDetAmbiguityProcessorSplitProb',
+ nameSuffix = NewTrackingCuts.extension(),
+ ClusterSplitProbabilityName= 'InDetAmbiguityProcessorSplitProb'+NewTrackingCuts.extension(),
+ RenounceInputHandles = ['InDetAmbiguityProcessorSplitProb'+NewTrackingCuts.extension()])
if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM"):
+ # DenseEnvironmentsAmbiguityScoreProcessorTool
+ from TrkAmbiguityProcessor.TrkAmbiguityProcessorConf import Trk__DenseEnvironmentsAmbiguityScoreProcessorTool as ScoreProcessorTool
+ InDetAmbiguityScoreProcessor = ScoreProcessorTool(name = 'InDetAmbiguityScoreProcessor'+NewTrackingCuts.extension(),
+ ScoringTool = InDetAmbiScoringTool,
+ SplitProbTool = NnPixelClusterSplitProbTool if InDetFlags.doPixelClusterSplitting() and 'NnPixelClusterSplitProbTool' in globals() else None,
+ AssociationTool = TrackingCommon.getInDetPRDtoTrackMapToolGangedPixels(),
+ AssociationToolNotGanged = TrackingCommon.getPRDtoTrackMapTool(),
+ AssociationMapName = 'PRDToTrackMap'+NewTrackingCuts.extension(),
+ InputClusterSplitProbabilityName = ClusterSplitProbContainer,
+ OutputClusterSplitProbabilityName = 'SplitProb'+NewTrackingCuts.extension())
+
# DenseEnvironmentsAmbiguityProcessorTool
from TrkAmbiguityProcessor.TrkAmbiguityProcessorConf import Trk__DenseEnvironmentsAmbiguityProcessorTool as ProcessorTool
use_low_pt_fitter = True if NewTrackingCuts.mode() == "LowPt" or NewTrackingCuts.mode() == "VeryLowPt" or (NewTrackingCuts.mode() == "Pixel" and InDetFlags.doMinBias()) else False
from AthenaCommon import CfgGetter
from InDetRecExample.TrackingCommon import setDefaults
- if len(NewTrackingCuts.extension()) > 0 :
- fitter_args = setDefaults({}, SplitClusterMapExtension = NewTrackingCuts.extension() )
- fitter_list=[ CfgGetter.getPublicToolClone('InDetTrackFitter'+NewTrackingCuts.extension(), 'InDetTrackFitter',**fitter_args) if not use_low_pt_fitter \
- else CfgGetter.getPublicToolClone('InDetTrackFitterLowPt'+NewTrackingCuts.extension(), 'InDetTrackFitterLowPt',**fitter_args)]
- else :
- fitter_list=[ CfgGetter.getPublicTool('InDetTrackFitter') if not use_low_pt_fitter \
- else CfgGetter.getPublicTool('InDetTrackFitterLowPt')]
+ fitter_args = setDefaults({},
+ nameSuffix = 'Ambi'+NewTrackingCuts.extension(),
+ SplitClusterMapExtension = NewTrackingCuts.extension(),
+ ClusterSplitProbabilityName = 'InDetAmbiguityProcessorSplitProb'+NewTrackingCuts.extension(),
+ RenounceInputHandles = ['InDetAmbiguityProcessorSplitProb'+NewTrackingCuts.extension()])
+ fitter_list=[ CfgGetter.getPublicToolClone('InDetTrackFitter'+'Ambi'+NewTrackingCuts.extension(), 'InDetTrackFitter',**fitter_args) if not use_low_pt_fitter \
+ else CfgGetter.getPublicToolClone('InDetTrackFitterLowPt'+NewTrackingCuts.extension(), 'InDetTrackFitterLowPt',**fitter_args)]
if InDetFlags.doRefitInvalidCov() :
from AthenaCommon import CfgGetter
@@ -508,39 +531,33 @@ class ConfiguredNewTrackingSiPattern:
fitter_list.append(CfgGetter.getPublicTool('KalmanFitter'))
fitter_list.append(CfgGetter.getPublicTool('ReferenceKalmanFitter'))
+
InDetAmbiguityProcessor = ProcessorTool(name = 'InDetAmbiguityProcessor'+NewTrackingCuts.extension(),
Fitter = fitter_list ,
AssociationTool = TrackingCommon.getInDetPRDtoTrackMapToolGangedPixels(),
AssociationMapName = 'PRDToTrackMap'+NewTrackingCuts.extension(),
- TrackSummaryTool = TrackingCommon.getInDetTrackSummaryTool(),
+ TrackSummaryTool = ambi_track_summary_tool,
ScoringTool = InDetAmbiScoringTool,
SelectionTool = InDetAmbiTrackSelectionTool,
+ InputClusterSplitProbabilityName = 'SplitProb'+NewTrackingCuts.extension(),
+ OutputClusterSplitProbabilityName = 'InDetAmbiguityProcessorSplitProb'+NewTrackingCuts.extension(),
SuppressHoleSearch = False,
tryBremFit = InDetFlags.doBremRecovery() and useBremMode and NewTrackingCuts.mode() != "DBM",
caloSeededBrem = InDetFlags.doCaloSeededBrem() and NewTrackingCuts.mode() != "DBM",
pTminBrem = NewTrackingCuts.minPTBrem(),
RefitPrds = True)
-
- # DenseEnvironmentsAmbiguityScoreProcessorTool
- from TrkAmbiguityProcessor.TrkAmbiguityProcessorConf import Trk__DenseEnvironmentsAmbiguityScoreProcessorTool as ScoreProcessorTool
- InDetAmbiguityScoreProcessor = ScoreProcessorTool(name = 'InDetAmbiguityScoreProcessor'+NewTrackingCuts.extension(),
- ScoringTool = InDetAmbiScoringTool,
- SplitProbTool = NnPixelClusterSplitProbTool if InDetFlags.doPixelClusterSplitting() and 'NnPixelClusterSplitProbTool' in globals() else None,
- AssociationTool = TrackingCommon.getInDetPRDtoTrackMapToolGangedPixels(),
- AssociationToolNotGanged = TrackingCommon.getPRDtoTrackMapTool(),
- AssociationMapName = 'PRDToTrackMap'+NewTrackingCuts.extension(),
- SelectionTool = InDetAmbiTrackSelectionTool)
- # hasScoreProcessorTool = True
else:
from AthenaCommon import CfgGetter
from TrkAmbiguityProcessor.TrkAmbiguityProcessorConf import Trk__SimpleAmbiguityProcessorTool as ProcessorTool
InDetAmbiguityProcessor = ProcessorTool(name = 'InDetAmbiguityProcessor'+NewTrackingCuts.extension(),
Fitter = CfgGetter.getPublicTool('InDetTrackFitter'),
AssociationTool = TrackingCommon.getInDetPRDtoTrackMapToolGangedPixels(),
- TrackSummaryTool = TrackingCommon.getInDetTrackSummaryTool(),
+ TrackSummaryTool = ambi_track_summary_tool,
ScoringTool = InDetAmbiScoringTool,
SelectionTool = InDetAmbiTrackSelectionTool,
+ InputClusterSplitProbabilityName = ClusterSplitProbContainer,
+ OutputClusterSplitProbabilityName = 'InDetAmbiguityProcessorSplitProb'+NewTrackingCuts.extension(),
SuppressHoleSearch = False,
tryBremFit = InDetFlags.doBremRecovery() and useBremMode and NewTrackingCuts.mode() != "DBM",
caloSeededBrem = InDetFlags.doCaloSeededBrem() and NewTrackingCuts.mode() != "DBM",
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py
index aa7b9745a8a4a15d7db4890b4a5dcc3767f9d0db..227fa738084468abe796b5f55e662ed09595b738 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetReadBS_jobOptions.py
@@ -28,7 +28,13 @@ if DetFlags.readRDOBS.pixel_on():
InDetPixelRawDataProvider = PixelRawDataProvider(name = "InDetPixelRawDataProvider",
RDOKey = InDetKeys.PixelRDOs(),
ProviderTool = InDetPixelRawDataProviderTool)
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ InDetPixelRawDataProvider.RegSelTool = makeRegSelTool_Pixel()
+
topSequence += InDetPixelRawDataProvider
+
+
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetPixelRawDataProvider)
#InDetPixelRawDataProvider.OutputLevel = VERBOSE
@@ -80,6 +86,8 @@ if DetFlags.readRDOBS.TRT_on():
from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProviderTool
InDetTRTRawDataProviderTool = TRTRawDataProviderTool(name = "InDetTRTRawDataProviderTool",
Decoder = InDetTRTRodDecoder)
+
+
#ToolSvc += InDetTRTRawDataProviderTool
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetTRTRawDataProviderTool)
@@ -90,6 +98,10 @@ if DetFlags.readRDOBS.TRT_on():
InDetTRTRawDataProvider = TRTRawDataProvider(name = "InDetTRTRawDataProvider",
RDOKey = InDetKeys.TRT_RDOs(),
ProviderTool = InDetTRTRawDataProviderTool)
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ InDetTRTRawDataProvider.RegSelTool = makeRegSelTool_TRT()
+
topSequence += InDetTRTRawDataProvider
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetTRTRawDataProvider)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 335ae6e7d84d2b6e177b8898547cfac3fb1ea86a..80ec30c3f5f9d32059dd8961f1a7149443db943b 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -105,23 +105,24 @@ if DetFlags.pixel_on():
else:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
- condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseDeadmapConditions=(not athenaCommonFlags.isOnline()),
- UseDCSStateConditions=(globalflags.DataSource=='data') and InDetFlags.usePixelDCS(),
- UseDCSStatusConditions=(globalflags.DataSource=='data') and InDetFlags.usePixelDCS(),
- UseTDAQConditions=athenaCommonFlags.isOnline(),
- UseCalibConditions=True,
- UseCablingConditions=useCablingConditions,
- CablingMapFileName=IdMappingDat)
+ alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
+ UseCablingConditions=useCablingConditions,
+ CablingMapFileName=IdMappingDat)
+ if athenaCommonFlags.isOnline():
+ alg.ReadDeadMapKey = ""
+ condSeq += alg
if useNewDeadmapFormat:
if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
if not hasattr(condSeq, "PixelDeadMapCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ if athenaCommonFlags.isOnline():
+ alg.ReadKey = ""
+ condSeq += alg
- if not athenaCommonFlags.isOnline():
+ if globalflags.DataSource=='data' and InDetFlags.usePixelDCS():
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
conddb.addFolder("DCS_OFL", "/PIXEL/DCS/FSMSTATE", className="CondAttrListCollection")
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATUS"):
@@ -228,7 +229,17 @@ if DetFlags.pixel_on():
PixeldEdxAlg.CalibrationFile="dtpar_signed_234.txt"
else:
PixeldEdxAlg.CalibrationFile="mcpar_signed_234.txt"
-
+
+ ################
+ # RUN-1 legacy #
+ ################
+ if commonGeoFlags.Run()=="RUN1" and athenaCommonFlags.isOnline():
+ if not conddb.folderRequested("/TDAQ/Resources/ATLAS/PIXEL/Modules"):
+ conddb.addFolder("TDAQ_ONL", "/TDAQ/Resources/ATLAS/PIXEL/Modules", className="CondAttrListCollection")
+ if not hasattr(condSeq, "PixelTDAQCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelTDAQCondAlg
+ condSeq += PixelTDAQCondAlg(name="PixelTDAQCondAlg", ReadKey="/TDAQ/Resources/ATLAS/PIXEL/Modules")
+
#
# --- Load SCT Conditions Services
#
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
index 0652c33afd8be2a3b09c971ac6e3750b3e74baae..098a63eb9a3f48b0f892b72522cc84ca25b858c2 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
@@ -470,6 +470,7 @@ if InDetFlags.doPattern() and InDetFlags.doCosmics():
AssociationTool = TrackingCommon.getInDetPRDtoTrackMapToolGangedPixels(),
TrackSummaryTool = TrackingCommon.getInDetTrackSummaryTool(),
SelectionTool = InDetAmbiTrackSelectionToolCosmics,
+ OutputClusterSplitProbabilityName = 'InDetAmbiguityProcessorCosmicsSplitProb',
SuppressTrackFit = True,
ForceRefit = False,
RefitPrds = False)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
index f35a14aadf0226cf45bec66200cd7445c0784325..bbe4a79c25936da63d943eb3b28e855393461094 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
@@ -153,6 +153,10 @@ if InDetFlags.doPRDFormation():
gangedAmbiguitiesFinder = InDetPixelGangedAmbiguitiesFinder,
DataObjectName = InDetKeys.PixelRDOs(),
ClustersName = InDetKeys.PixelClusters())
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ InDetPixelClusterization.RegSelTool = makeRegSelTool_Pixel()
+
topSequence += InDetPixelClusterization
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetPixelClusterization)
@@ -164,6 +168,10 @@ if InDetFlags.doPRDFormation():
DataObjectName = InDetKeys.PixelPURDOs(),
ClustersName = InDetKeys.PixelPUClusters(),
AmbiguitiesMap = "PixelClusterAmbiguitiesMapPU")
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ InDetPixelClusterizationPU.RegSelTool = makeRegSelTool_Pixel()
+
topSequence += InDetPixelClusterizationPU
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetPixelClusterizationPU)
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
index dbf37cc41ece47577e64b6245274aee2b177afe8..ef83516a4e1206bd80bddd944de86639a76a7f54 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
@@ -16,7 +16,7 @@ if not DetFlags.detdescr.ID_on():
printfunc ("InDetRec_jobOptions.py: DetFlags ID is turned off. Not including anything!")
else:
# +++++++++++++++++++++++
- # Control
+ # Control
# +++++++++++++++++++++++
#
from InDetRecExample.InDetJobProperties import InDetFlags
@@ -28,7 +28,7 @@ else:
# rec flags are needed (e.g. for commissioning steering ...)
from RecExConfig.RecFlags import rec
- # --- ensure that Calo clustering is running if we run in calo seeded mode
+ # --- ensure that Calo clustering is running if we run in calo seeded mode
if InDetFlags.doBremRecovery() and InDetFlags.doCaloSeededBrem() and not DetFlags.detdescr.Calo_allOn():
printfunc ("*************************************************************")
printfunc ("* Major FAILURE : InDet reconstruction in seeded brem mode, *")
@@ -50,11 +50,11 @@ else:
printfunc (" ------------> WARNING: Using Standard Back Tracking (not calo seeded)")
InDetFlags.doCaloSeededTRTSegments.set_Value_and_Lock(False)
-
+
# --- print setup
InDetFlags.printInfo()
- InDetFlags.print_JobProperties()
-
+ InDetFlags.print_JobProperties()
+
#
# ----------- import, lock and print InDetKeys
#
@@ -62,9 +62,9 @@ else:
InDetKeys.lockAllExceptAlias()
printfunc ("Printing InDetKeys")
InDetKeys.print_JobProperties()
-
+
#
- # --- setup of cut values for NewTracking
+ # --- setup of cut values for NewTracking
#
if ('InDetNewTrackingCuts' not in dir()):
@@ -87,9 +87,9 @@ else:
elif InDetFlags.doHighPileup():
InDetNewTrackingCuts = ConfiguredNewTrackingCuts("HighPileup")
elif InDetFlags.doMinBias():
- InDetNewTrackingCuts = ConfiguredNewTrackingCuts("MinBias")
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("MinBias")
elif InDetFlags.doDVRetracking():
- InDetNewTrackingCuts = ConfiguredNewTrackingCuts("R3LargeD0")
+ InDetNewTrackingCuts = ConfiguredNewTrackingCuts("R3LargeD0")
else:
InDetNewTrackingCuts = ConfiguredNewTrackingCuts("Offline")
InDetNewTrackingCuts.printInfo()
@@ -97,7 +97,7 @@ else:
InDetCutValues = InDetNewTrackingCuts
#
- # --- setup of cut values for Primary vertexing
+ # --- setup of cut values for Primary vertexing
#
if ('InDetPrimaryVertexingCuts' not in dir()):
printfunc ("InDetRec_jobOptions: InDetPrimaryVertexingCuts not set before - import them now")
@@ -105,29 +105,29 @@ else:
InDetPrimaryVertexingCuts = ConfiguredVertexingCuts(InDetFlags.primaryVertexCutSetup())
InDetPrimaryVertexingCuts.printInfo()
- # -----------
+ # -----------
#
# --- setup key aliases to pass to configurables
#
InDetSpSeededTracksKey = InDetKeys.SiSpSeededTracks()
- InDetResolvedTracksKey = InDetKeys.ResolvedTracks()
+ InDetResolvedTracksKey = InDetKeys.ResolvedTracks()
InDetExtendedTracksKey = InDetKeys.ExtendedTracks()
InDetExtendedTracksMapKey = InDetKeys.ExtendedTracksMap()
-
- if InDetFlags.doDBMstandalone():
- InDetSpSeededTracksKey = InDetKeys.SiSpSeededDBMTracks()
+
+ if InDetFlags.doDBMstandalone():
+ InDetSpSeededTracksKey = InDetKeys.SiSpSeededDBMTracks()
InDetResolvedTracksKey = InDetKeys.DBMTracks()
if InDetFlags.doSLHC():
- InDetSpSeededTracksKey = InDetKeys.SiSpSeededSLHCTracks()
- InDetResolvedTracksKey = InDetKeys.ResolvedSLHCTracks()
+ InDetSpSeededTracksKey = InDetKeys.SiSpSeededSLHCTracks()
+ InDetResolvedTracksKey = InDetKeys.ResolvedSLHCTracks()
InDetExtendedTracksKey = InDetKeys.ExtendedSLHCTracks()
- InDetExtendedTracksMapKey = InDetKeys.ExtendedTracksMapSLHC()
-
+ InDetExtendedTracksMapKey = InDetKeys.ExtendedTracksMapSLHC()
+
if globalflags.InputFormat() == 'bytestream':
ServiceMgr.ByteStreamCnvSvc.IsSimulation = (globalflags.DataSource() == 'geant4')
-
-
+
+
# ------------------------------------------------------------
#
# ----------- special case for Calo seeded brem recovery
@@ -139,7 +139,7 @@ else:
include ("InDetRecExample/InDetRecCaloSeededROISelection.py")
# ------------------------------------------------------------
- #
+ #
# -----------ROI seeding for SSS seeds or Ambi
#
# ------------------------------------------------------------
@@ -148,7 +148,7 @@ else:
include ("InDetRecExample/InDetRecHadCaloSeededROISelection.py")
# ------------------------------------------------------------
- #
+ #
# ----------- Configuring the conditions access
#
# ------------------------------------------------------------
@@ -156,12 +156,12 @@ else:
include ("InDetRecExample/InDetRecConditionsAccess.py")
# ------------------------------------------------------------
- #
- # ----------- Loading the Tracking Tools and Services
+ #
+ # ----------- Loading the Tracking Tools and Services
#
# ------------------------------------------------------------
-
- if not rec.doAODMerging():
+
+ if not rec.doAODMerging():
include ("InDetRecExample/InDetRecLoadTools.py")
# ------------------------------------------------------------
@@ -196,8 +196,9 @@ else:
TrackCollectionTruthKeysDBM = []
# NewTracking collection keys
+ CombinedInDetClusterSplitProbContainer = ''
InputCombinedInDetTracks = []
-
+
# ------------------------------------------------------------
#
# ----------- Subdetector pattern from New Tracking
@@ -206,7 +207,9 @@ else:
#
# --- Pixel track segment finding
#
+ ClusterSplitProbContainer=''
if InDetFlags.doTrackSegmentsPixel():
+
# --- load cuts for pixel segment finding
if ('InDetNewTrackingCutsPixel' not in dir()):
printfunc ("InDetRec_jobOptions: InDetNewTrackingCutsPixel not set before - import them now")
@@ -219,7 +222,9 @@ else:
InDetKeys.SiSpSeededPixelTracks(),
InDetNewTrackingCutsPixel,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsPixel.extension()
if InDetFlags.doTruth():
PixelTracksTruth = ConfiguredInDetTrackTruth(InDetKeys.PixelTracks(),
@@ -242,9 +247,11 @@ else:
InDetKeys.SiSpSeededSCTTracks(),
InDetNewTrackingCutsSCT,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsSCT.extension()
+
-
# ------------------------------------------------------------
#
# ----------- Cosmics Si pattern before we do the TRT phase
@@ -255,12 +262,12 @@ else:
#
if InDetFlags.doTRTPhaseCalculation() and not jobproperties.Beam.beamType()=="collisions":
#
- # We need to run the silicon tracking already at this stage together with
+ # We need to run the silicon tracking already at this stage together with
# the TRT tracking on uncalibrated PRDs to be able to calculate the phase
# input collection for TRT Phase
InDetCosmicSiTrackCollection = ""
-
+
if InDetFlags.doNewTracking():
#
# --- run NewTracking Si pattern
@@ -270,7 +277,9 @@ else:
InDetSpSeededTracksKey,
InDetNewTrackingCuts,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCuts.extension()
# set output track collection
InDetCosmicSiTrackCollection = InDetNewTrackingSiPattern.SiTrackCollection()
@@ -298,7 +307,7 @@ else:
None,
True)
- # --- making tacks out of segments
+ # --- making tacks out of segments
#include ("InDetRecExample/ConfiguredTRTStandalone.py")
#InDetRecPhaseTRTStandalone = ConfiguredTRTStandalone ("", [],
# InDetNewTrackingCuts,
@@ -353,7 +362,7 @@ else:
if InDetFlags.doNewTracking():
#
- # --- do the Si pattern if not done for the cosmic case above
+ # --- do the Si pattern if not done for the cosmic case above
#
if not InDetFlags.doTRTPhaseCalculation() or jobproperties.Beam.beamType()=="collisions":
include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py")
@@ -361,7 +370,10 @@ else:
InDetSpSeededTracksKey,
InDetNewTrackingCuts,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCuts.extension()
+
#
# --- do the TRT pattern
#
@@ -376,14 +388,16 @@ else:
TrackCollectionTruthKeys,
False)
# --- add into list for combination
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetNewTrackingTRTExtension.ForwardTrackCollection() ]
else :
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetNewTrackingSiPattern.SiTrackCollection() ]
-
+
# ------------------------------------------------------------
#
# --- Now comes Back Tracktracking
- #
+ #
# ------------------------------------------------------------
#
# --- TRT segment finding after forward tracking on remaining hits
@@ -403,17 +417,22 @@ else:
InDetRecBackTracking = ConfiguredBackTracking (InputCombinedInDetTracks,
InDetNewTrackingCuts,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetTRT_SeededAmbiguityProcessorSplitProb'+InDetNewTrackingCuts.extension()
+
# --- add into list for combination
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetRecBackTracking.BackTrackingTracks() ]
-
+
# ------------------------------------------------------------
#
- # --- Large-d0 option (FIXME: Here or should be placed
+ # --- Large-d0 option (FIXME: Here or should be placed
# after standard reconstruction...?
#
# ------------------------------------------------------------
+ ClusterSplitProbContainerLargeD0=''
if InDetFlags.doLargeD0() or InDetFlags.doR3LargeD0() or InDetFlags.doLowPtLargeD0():
#
# --- run Si pattern for high-d0
@@ -441,19 +460,21 @@ else:
InDetKeys.SiSpSeededLargeD0Tracks(),
InDetNewTrackingCutsLargeD0,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainerLargeD0 = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsLargeD0.extension()
#
# --- do the TRT pattern
#
include ("InDetRecExample/ConfiguredNewTrackingTRTExtension.py")
- InDetLargeD0TRTExtension = ConfiguredNewTrackingTRTExtension(InDetNewTrackingCutsLargeD0,
- InDetLargeD0SiPattern.SiTrackCollection(),
- InDetKeys.ExtendedLargeD0Tracks(),
- InDetKeys.ExtendedTracksMapLargeD0(),
- TrackCollectionKeys,
- TrackCollectionTruthKeys,
- False)
- # --- remove the standard tracks included some lines before (in the ESD
+ InDetLargeD0TRTExtension = ConfiguredNewTrackingTRTExtension(NewTrackingCuts = InDetNewTrackingCutsLargeD0,
+ SiTrackCollection= InDetLargeD0SiPattern.SiTrackCollection() if InDetFlags.doAmbiSolving() else None ,
+ ExtendedTrackCollection = InDetKeys.ExtendedLargeD0Tracks(),
+ ExtendedTracksMap = InDetKeys.ExtendedTracksMapLargeD0(),
+ TrackCollectionKeys=TrackCollectionKeys,
+ TrackCollectionTruthKeys=TrackCollectionTruthKeys,
+ doPhase =False)
+ # --- remove the standard tracks included some lines before (in the ESD
# processing case, those tracks are not part of the re-tracking procedure)
if InDetFlags.useExistingTracksAsInput():
_dummy = InputCombinedInDetTracks.pop()
@@ -461,9 +482,11 @@ else:
# --- add into list for combination
# Add tracks to standard track collection or a separate container?
if not InDetFlags.storeSeparateLargeD0Container():
+ ClusterSplitProbContainer = ClusterSplitProbContainerLargeD0
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainerLargeD0
InputCombinedInDetTracks += [ InDetLargeD0TRTExtension.ForwardTrackCollection()]
-
+
# ------------------------------------------------------------
#
@@ -489,7 +512,9 @@ else:
InDetKeys.SiSpSeededLowPtTracks(),
InDetNewTrackingCutsLowPt,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsLowPt.extension()
#
# --- do the TRT pattern
#
@@ -501,6 +526,7 @@ else:
TrackCollectionKeys,
TrackCollectionTruthKeys)
# --- add into list for combination
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetLowPtTRTExtension.ForwardTrackCollection() ]
# ------------------------------------------------------------
@@ -527,10 +553,13 @@ else:
InDetKeys.SiSpSeededVeryLowPtTracks(),
InDetNewTrackingCutsVeryLowPt,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsVeryLowPt.extension()
# --- add into list for combination
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetVeryLowPtSiPattern.SiTrackCollection() ]
-
+
# ------------------------------------------------------------
#
# --- TRT standalone (after LowPt)
@@ -548,6 +577,7 @@ else:
TrackCollectionKeys,
TrackCollectionTruthKeys)
# --- add into list for combination
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetRecTRTStandalone.TRTStandaloneTracks() ]
@@ -589,18 +619,19 @@ else:
#
# --- Forward Tracklets (after standard reconstruction)
#
- # ------------------------------------------------------------
+ # ------------------------------------------------------------
if InDetFlags.doForwardTracks():
# Add tracks that are not saved to the InputCombinedInDetTracks
InputForwardInDetTracks = []
InputForwardInDetTracks += InputCombinedInDetTracks
if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
+ ClusterSplitProbContainer = ClusterSplitProbContainerLargeD0
InputForwardInDetTracks +=[ InDetLargeD0TRTExtension.ForwardTrackCollection()]
if InDetFlags.doForwardTracks() and InDetFlags.doSLHC():
- if InDetFlags.doSLHCVeryForward():
- if ('InDetNewTrackingCutsForwardTracks' not in dir()):
+ if InDetFlags.doSLHCVeryForward():
+ if ('InDetNewTrackingCutsForwardTracks' not in dir()):
printfunc ("InDetRec_jobOptions: InDetNewTrackingCutsForwardTracks not set before - import them now" )
from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts
InDetNewTrackingCutsForwardTracks = ConfiguredNewTrackingCuts("VeryForwardSLHCTracks")
@@ -609,13 +640,16 @@ else:
# --- now run Si pattern for Low Pt
#
include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py")
- InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputForwardInDetTracks,
+ InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputForwardInDetTracks,
InDetKeys.ResolvedForwardTracks(),
InDetKeys.SiSpSeededForwardTracks(),
InDetNewTrackingCutsForwardTracks,
- TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionKeys,
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension()
# for ITK, forward tracks get added to the combined collection
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetForwardTracksSiPattern.SiTrackCollection() ]
@@ -634,8 +668,11 @@ else:
InDetKeys.SiSpSeededForwardTracks(),
InDetNewTrackingCutsForwardTracks,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension()
# for ITK, forward tracks get added to the combined collection
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetForwardTracksSiPattern.SiTrackCollection() ]
@@ -659,8 +696,11 @@ else:
InDetKeys.SiSpSeededForwardTracks(),
InDetNewTrackingCutsForwardTracks,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsForwardTracks.extension()
# --- do not add into list for combination
+ # CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
# InputCombinedInDetTracks += [ InDetForwardTracksSiPattern.SiTrackCollection() ]
if InDetFlags.doSLHCConversionFinding() and InDetFlags.doSLHC():
@@ -680,22 +720,25 @@ else:
InDetKeys.SiSpSeededSLHCConversionFindingTracks(),
InDetNewTrackingCutsSLHCConversionFinding,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsSLHCConversionFinding.extension()
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetKeys.ResolvedSLHCConversionFindingTracks() ]
-
+
# ------------------------------------------------------------
#
# --- Pixel Tracklets on unassociated PRDs (after standard reconstruction + forward tracking)
#
# ------------------------------------------------------------
-
+
if InDetFlags.doTrackSegmentsDisappearing():
InputPixelInDetTracks = []
InputPixelInDetTracks += InputCombinedInDetTracks
# Add tracks that are not saved to the InputCombinedInDetTracks
- if InDetFlags.doForwardTracks():
+ if InDetFlags.doForwardTracks():
InputPixelInDetTracks +=[ InDetForwardTracksSiPattern.SiTrackCollection()]
if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
InputPixelInDetTracks +=[ InDetLargeD0TRTExtension.ForwardTrackCollection()]
@@ -708,10 +751,13 @@ else:
# --- configure pixel segment finding
include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py")
InDetPixelTrackingSiPattern = ConfiguredNewTrackingSiPattern(InputPixelInDetTracks,InDetKeys.ResolvedDisappearingTracks(),
- InDetKeys.SiSpSeededPixelTracks(),
- InDetNewTrackingCutsDisappearing,
- TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ InDetKeys.SiSpSeededPixelTracks(),
+ InDetNewTrackingCutsDisappearing,
+ TrackCollectionKeys,
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsDisappearing.extension()
+ DisappearingClusterSplitProbContainer = ClusterSplitProbContainer
if InDetFlags.doTRTExtension() :
include ("InDetRecExample/ConfiguredNewTrackingTRTExtension.py")
@@ -748,7 +794,9 @@ else:
InDetKeys.SiSpSeededBeamGasTracks(),
InDetNewTrackingCutsBeamGas,
TrackCollectionKeys,
- TrackCollectionTruthKeys)
+ TrackCollectionTruthKeys,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsBeamGas.extension()
#
# --- do the TRT pattern
#
@@ -762,10 +810,11 @@ else:
# --- add into list for combination for single-beam mode (not if running after collisions)
if jobproperties.Beam.beamType() == "singlebeam":
+ CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer
InputCombinedInDetTracks += [ InDetBeamGasTRTExtension.ForwardTrackCollection() ]
- # ------------------------------------------------------------
- #
+ # ------------------------------------------------------------
+ #
# --- DBM
#
# ------------------------------------------------------------
@@ -791,13 +840,15 @@ else:
# InDetSiTrackerSpacePointFinder = InDetSiTrackerSpacePointFinderDBM
- # --- Si Pattern
+ # --- Si Pattern
include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py")
DBMTrackingSiPattern = ConfiguredNewTrackingSiPattern([],InDetKeys.DBMTracks(),
InDetKeys.SiSpSeededDBMTracks(),
InDetNewTrackingCutsDBM,
TrackCollectionKeysDBM,
- TrackCollectionTruthKeysDBM)
+ TrackCollectionTruthKeysDBM,
+ ClusterSplitProbContainer)
+ ClusterSplitProbContainer = 'InDetAmbiguityProcessorSplitProb'+InDetNewTrackingCutsDBM.extension()
# InputCombinedInDetTracks += [ DBMTrackingSiPattern.SiTrackCollection() ]
@@ -809,14 +860,15 @@ else:
# --- Ambi solve the extended (Si + TRT) and TRT standalone tracks if both run
if InDetFlags.doCosmics() and InDetFlags.doNewTracking() and len(InputCombinedInDetTracks) > 1:
+ # @TODO should the cluster splitting probability be handled here ?
InputCosmicsCombinedAmbiSolver = list(InputCombinedInDetTracks)
-
+
from TrkAmbiguitySolver.TrkAmbiguitySolverConf import Trk__TrkAmbiguityScore
InDetAmbiguityScore_combinedCosmics = Trk__TrkAmbiguityScore(name = 'InDetCombinedCosmicsAmbiguityScore',
TrackInput = InputCosmicsCombinedAmbiSolver,
TrackOutput = 'ScoredMapCosmics',
AmbiguityScoreProcessor = '' )
-
+
topSequence += InDetAmbiguityScore_combinedCosmics
from TrkAmbiguitySolver.TrkAmbiguitySolverConf import Trk__TrkAmbiguitySolver
@@ -828,16 +880,17 @@ else:
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetAmbiguitySolver_combinedCosmics)
+ CombinedInDetClusterSplitProbContainer = '' # @TODO really no split prob container ?
InputCombinedInDetTracks = [ InDetKeys.CombinedCosmicTracks() ]
-
+
# ------------------------------------------------------------
#
- # ----------- now we do the Pseudo Tracking
+ # ----------- now we do the Pseudo Tracking
#
# ------------------------------------------------------------
-
+
# if new tracking is off, pseudo tracking replaces the output collection
- # if new tracking is on, pseudo tracking simply runs alongside
+ # if new tracking is on, pseudo tracking simply runs alongside
# if split reco is on, pseudo tracking runs only on pileup and the output collections are merged
if InDetFlags.doPseudoTracking() :
# --- needed for sorting the PrepRawData properly
@@ -861,14 +914,14 @@ else:
if InDetFlags.doTrackSegmentsTRT() :
TRT_DriftCircleCont = InDetKeys.TRT_DriftCircles()
else:
- TRT_DriftCircleCont =""
+ TRT_DriftCircleCont =""
InDetPRD_Provider = InDet__InDetPRD_Provider(name = 'InDetPRD_Provider',
PixelClusterContainer = PixelClusterCont,
SCT_ClusterContainer = SCT_ClusterCont,
TRT_DriftCircleContainer = TRT_DriftCircleCont)
ToolSvc += InDetPRD_Provider
- # --- the truth track builder
+ # --- the truth track builder
from AthenaCommon import CfgGetter
from TrkTruthTrackTools.TrkTruthTrackToolsConf import Trk__TruthTrackBuilder
# @TODO should a track fitter be used which does not require a split cluster map ?
@@ -878,17 +931,17 @@ else:
RotCreatorTool = InDetRotCreator,
BroadRotCreatorTool = BroadInDetRotCreator,
MinDegreesOfFreedom = 1,
- MatEffects = InDetFlags.materialInteractionsType(),
+ MatEffects = InDetFlags.materialInteractionsType(),
MinSiHits = InDetNewTrackingCuts.minClusters() )
if InDetFlags.doForwardTracks() and InDetFlags.doSLHC():
InDetTruthTrackBuilder.MinSiHitsForward = InDetNewTrackingCutsForwardTracks.minClusters()
InDetTruthTrackBuilder.ForwardBoundary = InDetNewTrackingCutsForwardTracks.minEta()
# InDetTruthTrackBuilder.OutputLevel = VERBOSE
ToolSvc += InDetTruthTrackBuilder
-
+
# --- the truth PRD trajectory builder
-
- #
+
+ #
from TrkTruthTrackTools.TrkTruthTrackToolsConf import Trk__PRD_TruthTrajectoryBuilder
# change input collection key if taking only pileup
if InDetFlags.doSplitReco() :
@@ -912,11 +965,11 @@ else:
# --- the trajectory shared cluster hits fixer
# from InDetTruthTools.InDetTruthToolsConf import InDet__PRD_TruthTrajectorySharedFixerID
-# InDetTruthTrajectorySharedFixer = InDet__PRD_TruthTrajectorySharedFixerID(name = 'InDetTruthTrajectorySharedFixer' )
+# InDetTruthTrajectorySharedFixer = InDet__PRD_TruthTrajectorySharedFixerID(name = 'InDetTruthTrajectorySharedFixer' )
# ToolSvc += InDetTruthTrajectorySharedFixer
-
+
InDetPRD_TruthTrajectoryBuilder.PRD_TruthTrajectoryManipulators = [ InDetTruthTrajectorySorter, InDetTruthTrajectoryManipulator ]
-
+
ToolSvc+=InDetPRD_TruthTrajectoryBuilder
# InDetPRD_TruthTrajectoryBuilder.OutputLevel = VERBOSE
@@ -926,7 +979,7 @@ else:
from InDetTruthTools.InDetTruthToolsConf import InDet__PRD_TruthTrajectorySelectorID
InDetTruthTrajectorySelector = InDet__PRD_TruthTrajectorySelectorID(name='InDetTruthTrajectorySelector')
ToolSvc += InDetTruthTrajectorySelector
- PRD_TruthTrajectorySelector = [ InDetTruthTrajectorySelector ]
+ PRD_TruthTrajectorySelector = [ InDetTruthTrajectorySelector ]
# --- the truth track creation algorithm
from InDetRecExample.TrackingCommon import getInDetPRDtoTrackMapToolGangedPixels
@@ -955,7 +1008,7 @@ else:
InDetTruthToTrack = Trk__TruthToTrack(name = "InDetTruthToTrack",
Extrapolator = TrackingCommon.getInDetExtrapolator())
ToolSvc += InDetTruthToTrack
-
+
# Register the track collections for further processing - only if new tracking has not been running
if not InDetFlags.doNewTracking():
InputTrackCollection = InDetKeys.PseudoTracks()
@@ -967,8 +1020,10 @@ else:
InDetKeys.TracksTruth = InDetKeys.PseudoTracksTruth()
InDetKeys.UnslimmedTracksTruth = InDetKeys.PseudoTracksTruth()
# add as the combined ID collection
+ # CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer # @TODO handle cluster splitting probability ?
InputCombinedInDetTracks = [ InDetKeys.PseudoTracks() ]
if InDetFlags.doSplitReco() :
+ # CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer # @TODO handle cluster splitting probability ?
InputCombinedInDetTracks += [ InDetKeys.PseudoTracks() ]
@@ -992,9 +1047,10 @@ else:
InDetTracksTruth = ConfiguredInDetTrackTruth(InDetKeys.DBMTracks(),
InDetKeys.DBMDetailedTracksTruth(),
InDetKeys.DBMTracksTruth())
-
+
if InDetFlags.useExistingTracksAsInput():
- InputCombinedInDetTracks += [ InDetKeys.ProcessedESDTracks() ]
+ # CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer # @TODO handle cluster splitting probability ?
+ InputCombinedInDetTracks += [ InDetKeys.ProcessedESDTracks() ]
if InDetFlags.doDBMstandalone():
TrackCollectionKeys += [ InDetKeys.DBMTracks() ]
@@ -1002,6 +1058,9 @@ else:
else:
from TrkTrackCollectionMerger.TrkTrackCollectionMergerConf import Trk__TrackCollectionMerger
from InDetRecExample.TrackingCommon import getInDetPRDtoTrackMapToolGangedPixels
+ merger_track_summary_tool = TrackingCommon.getInDetTrackSummaryToolSharedHits(namePrefix = 'CombinedInDetSplitProb',
+ ClusterSplitProbabilityName= CombinedInDetClusterSplitProbContainer)
+ assert( TrackingCommon.combinedClusterSplitProbName() == CombinedInDetClusterSplitProbContainer)
TrkTrackCollectionMerger = Trk__TrackCollectionMerger(name = "InDetTrackCollectionMerger",
TracksLocation = InputCombinedInDetTracks,
OutputTracksLocation = InDetKeys.UnslimmedTracks(),
@@ -1009,7 +1068,7 @@ else:
AssociationMapName = "PRDtoTrackMap" + InDetKeys.UnslimmedTracks(),
UpdateSharedHitsOnly = False,
UpdateAdditionalInfo = True,
- SummaryTool = TrackingCommon.getInDetTrackSummaryToolSharedHits())
+ SummaryTool = merger_track_summary_tool)
topSequence += TrkTrackCollectionMerger
if (InDetFlags.doPrintConfigurables()):
@@ -1021,7 +1080,7 @@ else:
InDetSGDeletionAlg(key = InputCombinedInDetTracks)
else:
InDetSGDeletionAlg(key = [k for k in InputCombinedInDetTracks if not k == "ExtendedTracks"])
-
+
#
# ------------ Track truth.
@@ -1039,16 +1098,16 @@ else:
# add final output for statistics
#
TrackCollectionTruthKeys += [ InDetKeys.UnslimmedTracksTruth() ]
-
-
+
+
# Dummy Merger to fill additional info for PRD-associated pixel tracklets
if InDetFlags.doTrackSegmentsDisappearing():
DummyCollection = []
if InDetFlags.doTRTExtension() :
DummyCollection += [ InDetKeys.ExtendedTracksDisappearing()]
- else :
- DummyCollection += [ InDetKeys.ResolvedPixelPrdAssociationTracks()]
+ merger_track_summary_tool = TrackingCommon.getInDetTrackSummaryToolSharedHits(namePrefix = 'DisappearingSplitProb',
+ ClusterSplitProbabilityName= DisappearingClusterSplitProbContainer)
from InDetRecExample.TrackingCommon import getInDetPRDtoTrackMapToolGangedPixels
TrkTrackCollectionMerger_pix = Trk__TrackCollectionMerger(name = "InDetTrackCollectionMerger_pix",
TracksLocation = DummyCollection,
@@ -1056,11 +1115,11 @@ else:
AssociationTool = getInDetPRDtoTrackMapToolGangedPixels(),
UpdateSharedHitsOnly = False,
UpdateAdditionalInfo = True,
- SummaryTool = TrackingCommon.getInDetTrackSummaryToolSharedHits())
+ SummaryTool = merger_track_summary_tool)
#TrkTrackCollectionMerger_pix.OutputLevel = VERBOSE
topSequence += TrkTrackCollectionMerger_pix
-
+
if InDetFlags.doTruth():
# set up the truth info for this container
#
@@ -1068,7 +1127,7 @@ else:
InDetTracksTruth = ConfiguredInDetTrackTruth(InDetKeys.DisappearingTracks(),
InDetKeys.DisappearingDetailedTracksTruth(),
InDetKeys.DisappearingTracksTruth())
-
+
if (InDetFlags.doPrintConfigurables()):
printfunc (TrkTrackCollectionMerger_pix)
@@ -1084,10 +1143,10 @@ else:
# -- Pick one of the result collections and turn it into tracks
#
if InDetFlags.doNewTrackingPattern():
- if InDetFlags.doDBMstandalone():
- InputTrackCollection = InDetKeys.DBMTracks()
- else:
- InputTrackCollection = InDetKeys.UnslimmedTracks()
+ if InDetFlags.doDBMstandalone():
+ InputTrackCollection = InDetKeys.DBMTracks()
+ else:
+ InputTrackCollection = InDetKeys.UnslimmedTracks()
elif InDetFlags.doPseudoTracking():
InputTrackCollection = InDetKeys.PseudoTracks()
else:
@@ -1095,11 +1154,11 @@ else:
InputTrackCollection = InDetKeys.Tracks()
InputTrackCollectionTruth = InDetKeys.TracksTruth()
- # ----------------------------------------------------------------
+ # ----------------------------------------------------------------
#
# --- do we refit all tracks ?
#
- # ----------------------------------------------------------------
+ # ----------------------------------------------------------------
if InDetFlags.doRefit():
from InDetRecExample.TrackingCommon import getInDetPRDtoTrackMapToolGangedPixels
from TrkRefitAlg.TrkRefitAlgConf import Trk__ReFitTrack
@@ -1120,7 +1179,7 @@ else:
InDetReFitTrack.matEffects = InDetFlags.materialInteractionsType()
else:
InDetReFitTrack.matEffects = 0
-
+
topSequence += InDetReFitTrack
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetReFitTrack)
@@ -1130,11 +1189,11 @@ else:
InputDetailedTrackTruth = InDetKeys.RefittedDetailedTracksTruth()
InputTrackCollectionTruth = InDetKeys.RefittedTracksTruth()
- # ----------------------------------------------------------------
+ # ----------------------------------------------------------------
#
# --- slimm the tracks down before writing them ?
#
- # ----------------------------------------------------------------
+ # ----------------------------------------------------------------
from TrkTrackSlimmingTool.TrkTrackSlimmingToolConf import Trk__TrackSlimmingTool as ConfigurableTrackSlimmingTool
InDetTrkSlimmingTool = ConfigurableTrackSlimmingTool(name = "InDetTrackSlimmingTool",
KeepParameters = InDetFlags.KeepParameters(),
@@ -1161,7 +1220,7 @@ else:
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetTrkSlimmingTool)
-
+
from TrkTrackSlimmer.TrkTrackSlimmerConf import Trk__TrackSlimmer as ConfigurableTrackSlimmer
InDetTrkSlimmer = ConfigurableTrackSlimmer(name = "InDetTrackSlimmer",
TrackLocation = [ InputTrackCollection ],
@@ -1172,16 +1231,16 @@ else:
if (InDetFlags.doPrintConfigurables()):
printfunc (InDetTrkSlimmer)
- if not (InDetFlags.doMonitoringGlobal() or
+ if not (InDetFlags.doMonitoringGlobal() or
InDetFlags.doNtupleCreation() or
- (InDetFlags.doMonitoringPixel() and not InDetFlags.doTrackSegmentsPixel()) or
- (InDetFlags.doMonitoringSCT() and not InDetFlags.doTrackSegmentsSCT() ) or
+ (InDetFlags.doMonitoringPixel() and not InDetFlags.doTrackSegmentsPixel()) or
+ (InDetFlags.doMonitoringSCT() and not InDetFlags.doTrackSegmentsSCT() ) or
(InDetFlags.doMonitoringTRT() and not InDetFlags.doTrackSegmentsTRT() )):
if not InDetFlags.doSlimPoolTrack() :
# --- Delete unslimmed tracks
from InDetRecExample.ConfiguredInDetSGDeletion import InDetSGDeletionAlg
InDetSGDeletionAlg(key = InputTrackCollection)
-
+
if not InDetFlags.doSlimPoolTrack() :
# --- for output
InDetKeys.AliasToTracks = 'none'
@@ -1189,9 +1248,9 @@ else:
InputTrackCollection = InDetKeys.Tracks()
if InDetFlags.doTruth():
InputDetailedTrackTruth = InDetKeys.DetailedTracksTruth()
- InputTrackCollectionTruth = InDetKeys.TracksTruth()
- # --- [FIXME JDC: PROVISIONAL PATCH. The final collection
- # should be the one pointed by InDetKeys.Tracks()? Trying to
+ InputTrackCollectionTruth = InDetKeys.TracksTruth()
+ # --- [FIXME JDC: PROVISIONAL PATCH. The final collection
+ # should be the one pointed by InDetKeys.Tracks()? Trying to
# find a solution...
if InDetFlags.useExistingTracksAsInput():
InDetTrkSlimmer.SlimmedTrackLocation = [ "MergedTracks" ]
@@ -1201,13 +1260,13 @@ else:
InputTrackCollectionTruth = "MergedTracksTruth"
# --- [FIXME JDC: END PROVISIONAL PATCH
- # ----------------------------------------------------------------
+ # ----------------------------------------------------------------
#
# --- or just make an alias ?
#
- # ----------------------------------------------------------------
+ # ----------------------------------------------------------------
if InDetFlags.doPattern() and (not InDetFlags.doSlimming() or InDetFlags.doSlimPoolTrack()):
- if not InDetFlags.doDBMstandalone():
+ if not InDetFlags.doDBMstandalone():
#
# --- configure Algorithm to create output alias
#
@@ -1224,13 +1283,13 @@ else:
InputTrackCollection = InDetKeys.Tracks()
if InDetFlags.doTruth():
- if InDetFlags.doDBMstandalone():
- InputDetailedTrackTruth = InDetKeys.DBMDetailedTracksTruth()
- InputTrackCollectionTruth = InDetKeys.DBMTracksTruth()
- else:
+ if InDetFlags.doDBMstandalone():
+ InputDetailedTrackTruth = InDetKeys.DBMDetailedTracksTruth()
+ InputTrackCollectionTruth = InDetKeys.DBMTracksTruth()
+ else:
InputDetailedTrackTruth = InDetKeys.DetailedTracksTruth()
InputTrackCollectionTruth = InDetKeys.TracksTruth()
- # --- [FIXME JDC: PROVISIONAL PATCH. The final collection
+ # --- [FIXME JDC: PROVISIONAL PATCH. The final collection
# should be the one pointed by InDetKeys.Tracks()? Trying
# to find a soluction...
if InDetFlags.useExistingTracksAsInput():
@@ -1239,7 +1298,7 @@ else:
if InDetFlags.doTruth():
InputDetailedTrackTruth = "MergedTracksDetailedTruth"
InputTrackCollectionTruth = "MergedTracksTruth"
- # --- [FIXME JDC: PROVISIONAL PATCH. The final collection
+ # --- [FIXME JDC: PROVISIONAL PATCH. The final collection
# -----------------------------------------------------------------
@@ -1262,7 +1321,7 @@ else:
# add to keys lists for statistics
#
## ME drop this for tracks contrain # TrackCollectionTruthKeys += [ InputTrackCollectionTruth ]
-
+
# ------------------------------------------------------------
#
# ----------- now we do post-processing
@@ -1280,7 +1339,7 @@ else:
# ------------------------------------------------------------
#
- # ----------- now we do validation and
+ # ----------- now we do validation and
#
# ------------------------------------------------------------
#
@@ -1302,7 +1361,7 @@ else:
if InDetFlags.doSplitReco():
InDetValidationPU = ConfiguredInDetValidation("PU",True,InDetFlags.doTruth(),cuts,[InDetKeys.PseudoTracks()],[InDetKeys.PseudoTracksTruth()],McEventCollectionKey="TruthEvent_PU")
- # ntuple creation for validation purposes
+ # ntuple creation for validation purposes
if (InDetFlags.doNtupleCreation() or InDetFlags.doPhysValMon()):
include("InDetRecExample/InDetRecNtupleCreation.py")
@@ -1314,11 +1373,10 @@ else:
# --- Delete spacepoint collections
from InDetRecExample.ConfiguredInDetSGDeletion import InDetSGDeletionAlg
InDetSGDeletionAlg(container = "SpacePointOverlapCollection#", key = InDetKeys.OverlapSpacePoints())
-
+
# Delete Pixel and Silicon space points
from InDetRecExample.ConfiguredInDetSGDeletion import InDetSGDeletionAlg
InDetSGDeletionAlg(container = "SpacePointContainer#", key = [InDetKeys.PixelSpacePoints(), InDetKeys.SCT_SpacePoints()])
-
- # +++++++++++++++++++ end of InDetRec_jobOptions.py
- # END if InDetFlags.Enabled()
+ # +++++++++++++++++++ end of InDetRec_jobOptions.py
+ # END if InDetFlags.Enabled()
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py
index 4a5db3a4d8d666bfaab0f4e62fd6fbff53a3ea4a..bb47a23c99139cb45b71ec0df0a06928b4b15d4e 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py
@@ -35,6 +35,8 @@ elif InDetFlags.writePRDs():
InDetESDList+=["InDet::PixelGangedClusterAmbiguities#"+InDetKeys.SplitClusterAmbiguityMap()]
# Save SCT_FlaggedCondData for SCT_FlaggedConditionTool
InDetESDList+=['IDCInDetBSErrContainer#'+'SCT_FlaggedCondData']
+ from InDetRecExample import TrackingCommon
+ InDetESDList+=['Trk::ClusterSplitProbabilityContainer#'+TrackingCommon.pixelClusterSplitProbName()]
# add tracks
# ----------
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/share/postInclude.SLHC_Rec.py b/InnerDetector/InDetExample/InDetSLHC_Example/share/postInclude.SLHC_Rec.py
index 27da800e15350ddc504ae7f456ba0373baec487e..cf08dcad6818ad42a195fb2258c302dbdd918ff7 100644
--- a/InnerDetector/InDetExample/InDetSLHC_Example/share/postInclude.SLHC_Rec.py
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/share/postInclude.SLHC_Rec.py
@@ -38,10 +38,22 @@ if rec.doWriteESD() or rec.doWriteAOD() or ('doWriteESD' in dir() and doWriteESD
printfunc ('===> OVERWRITTEN TOOL SETTINGS ................')
# --- turn off cluster calibration from DB, does not exist for IBL
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- PixelConfigCondAlg.UseCalibConditions = False
- PixelConfigCondAlg.UseDeadmapConditions = False
-
+ useNewChargeFormat = False
+ if not useNewChargeFormat:
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
+ PixelChargeCalibCondAlg.ReadKey=""
+ else:
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeLUTCalibCondAlg
+ PixelChargeLUTCalibCondAlg.ReadKey=""
+
+ useNewDeadmapFormat = False
+ if not useNewDeadmapFormat:
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
+ PixelConfigCondAlg.ReadDeadMapKey = ""
+ else:
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
+ PixelDeadMapCondAlg.ReadKey = ""
+
# --- switch alignment for IBL geometry off (gives WARNING)
from PixelGeoModel.PixelGeoModelConf import PixelDetectorTool
pixelTool = PixelDetectorTool()
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index 56fda0c7da43b7aced1c9c26ae36572bc389fe37..b6b92a9c868b8d298a33da7a7cbac67bc994624c 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -126,15 +126,12 @@ class PixelConditionsServicesSetup:
else:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_344494.dat"
- condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseDeadmapConditions=self.usePixMap,
- UseDCSStateConditions=self.useDCS,
- UseDCSStatusConditions=self.useDCS,
- UseTDAQConditions=self.useTDAQ, # should be false. This is only valid in RUN-1.
- UseCalibConditions=True,
- UseCablingConditions=useCablingConditions,
- CablingMapFileName=IdMappingDat)
-
+ alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
+ UseCablingConditions=useCablingConditions,
+ CablingMapFileName=IdMappingDat)
+ if not self.usePixMap:
+ alg.ReadDeadMapKey = ""
+ condSeq += alg
#########################
# Deadmap Setup (RUN-3) #
@@ -144,7 +141,10 @@ class PixelConditionsServicesSetup:
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
if not hasattr(condSeq, "PixelDeadMapCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ if not self.usePixMap:
+ alg.ReadKey = ""
+ condSeq += alg
########################
# DCS Conditions Setup #
@@ -163,8 +163,8 @@ class PixelConditionsServicesSetup:
conddb.addFolder(PixelDBInstance, PixelHVFolder, className="CondAttrListCollection")
if not conddb.folderRequested(PixelTempFolder):
conddb.addFolder(PixelDBInstance, PixelTempFolder, className="CondAttrListCollection")
-
- if not self.onlineMode: #this is only for testing in offline like setup
+
+ if not self.onlineMode and self.useDCS: #this is only for testing in offline like setup
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
conddb.addFolder("DCS_OFL", "/PIXEL/DCS/FSMSTATE", className="CondAttrListCollection")
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATUS"):
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
index bd853408b9e6521c9ffaf1fbad7ed645abcc821c..b4b209b8d95f96abc150d3b0f5c2d2f9699a72ef 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecBackTracking.py
@@ -34,6 +34,9 @@ class TRT_TrigTrackSegmentsFinder_EF( InDet__TRT_TrigTrackSegmentsFinder ):
def __init__(self, name="InDetTrigTRT_TrackSegmentsFinder_Photon_EF", type="photon", seqType="InsideOut"):
super( InDet__TRT_TrigTrackSegmentsFinder, self ).__init__( name )
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ self.RegSelTool = makeRegSelTool_TRT()
+
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings
from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
@@ -150,6 +153,9 @@ class TRT_TrigSeededTrackFinder_EF( InDet__TRT_TrigSeededTrackFinder ):
def __init__(self, name="InDetTrigTRT_SeededTrackFinder_Photon_EF", type="photon"):
super( InDet__TRT_TrigSeededTrackFinder, self ).__init__( name )
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ self.RegSelTool = makeRegSelTool_TRT()
+
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.ConfiguredNewTrackingTrigCuts import EFIDTrackingCuts
InDetTrigCutValues = EFIDTrackingCuts
@@ -174,14 +180,14 @@ class TRT_TrigSeededTrackFinder_EF( InDet__TRT_TrigSeededTrackFinder ):
InDetTrigTRT_SeededSpacePointFinder.PRDtoTrackMap = 'InDetTrigPRDtoTrackMap_Photon_EF'
elif InDetTrigFlags.loadSimpleTRTSeededSPFinder():
- from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
- InDetTrigRegSelSvc = RegSelSvcDefault()
- InDetTrigRegSelSvc.enablePixel = DetFlags.pixel_on()
- InDetTrigRegSelSvc.enableSCT = DetFlags.SCT_on()
-
- ServiceMgr += InDetTrigRegSelSvc
- if (InDetTrigFlags.doPrintConfigurables()):
- print ( InDetTrigRegSelSvc)
+ # Old RegSelSvc configuration - leave commented until the dust has settled
+ # from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
+ # InDetTrigRegSelSvc = RegSelSvcDefault()
+ # InDetTrigRegSelSvc.enablePixel = DetFlags.pixel_on()
+ # InDetTrigRegSelSvc.enableSCT = DetFlags.SCT_on()
+ # ServiceMgr += InDetTrigRegSelSvc
+ # if (InDetTrigFlags.doPrintConfigurables()):
+ # print ( InDetTrigRegSelSvc)
from TRT_SeededSpacePointFinderTool.TRT_SeededSpacePointFinderToolConf import InDet__SimpleTRT_SeededSpacePointFinder_ATL
InDetTrigTRT_SeededSpacePointFinder = InDet__SimpleTRT_SeededSpacePointFinder_ATL(name = 'InDetTrigTRT_SeededSpFinder_'+type ,
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py
index 01712f83af5aa877b8cbf129de4f16fb584aa8d7..b9a3085f4426ed4f4800531e6335b307f03ad1fc 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecNewTracking.py
@@ -31,6 +31,13 @@ class SiTrigTrackFinder_EF( InDet__SiTrigSPSeededTrackFinder ):
def __init__(self, name="SiTrigTrackFinder_Electron_EF", type="electron", lowPt=False):
super( InDet__SiTrigSPSeededTrackFinder, self ).__init__( name )
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
+
+ self.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ self.RegSelTool_SCT = makeRegSelTool_SCT()
+
+
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPrdAssociationTool, \
InDetTrigPatternPropagator, InDetTrigPatternUpdator, \
InDetTrigRotCreator
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
index b22d5446699f20728d2dd173986d900eacdaf926..70f99a189df6cdc85fb9bf3f46848d7b0e3fd74f 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
@@ -40,6 +40,8 @@ class PixelClustering_EF( InDet__Pixel_TrgClusterization ):
def __init__(self, name="PixelClustering_Electron_EF", type="electron"):
super( InDet__Pixel_TrgClusterization, self ).__init__( name )
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ self.RegSelTool = makeRegSelTool_Pixel()
from AthenaCommon.AppMgr import ToolSvc
# configure tools used
@@ -65,6 +67,10 @@ class PixelClustering_EF( InDet__Pixel_TrgClusterization ):
InDet__TrigPixRawDataProvider(name="TrigPixRawDataProvider_EF",
RawDataProviderTool = InDetTrigPixelRawDataProviderTool,
RDOKey = EF_PixRDOKey)
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ InDetTrigPixRawDataProvider.RegSelTool = makeRegSelTool_Pixel()
+
ToolSvc += InDetTrigPixRawDataProvider
@@ -79,8 +85,8 @@ class PixelClustering_EF( InDet__Pixel_TrgClusterization ):
InDetTrigMergedPixelsTool = InDet__MergedPixelsTool( name = "InDetTrigMergedPixelsTool",
globalPosAlg = InDetTrigClusterMakerTool,
PixelConditionsSummaryTool = InDetTrigPixelConditionsSummaryTool,
- #UseSpecialPixelMap = False #simpler setup for EFID
- UseSpecialPixelMap = True)
+ #UsePixelModuleMap = False #simpler setup for EFID
+ UsePixelModuleMap = True)
# Enable duplcated RDO check for data15 because duplication mechanism was used.
from RecExConfig.RecFlags import rec
if len(rec.projectName())>=6 and rec.projectName()[:6]=="data15":
@@ -123,6 +129,9 @@ class SCTClustering_EF( InDet__SCT_TrgClusterization ):
def __init__(self, name= "SCTClustering_Electron_EF", type="electron" ):
super(InDet__SCT_TrgClusterization, self).__init__(name)
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
+ self.RegSelTool = makeRegSelTool_SCT()
+
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
@@ -143,6 +152,7 @@ class SCTClustering_EF( InDet__SCT_TrgClusterization ):
from InDetTrigRecExample.InDetTrigConditionsAccess import SCT_ConditionsSetup
InDetTrigSCTRawDataProviderTool = SCTRawDataProviderTool(name = "InDetTrigSCTRawDataProviderTool",
Decoder = InDetTrigSCTRodDecoder)
+
ToolSvc += InDetTrigSCTRawDataProviderTool
@@ -151,6 +161,12 @@ class SCTClustering_EF( InDet__SCT_TrgClusterization ):
InDet__TrigSCTRawDataProvider(name="TrigSCTRawDataProvider_EF",
RDOKey = EF_SCTRDOKey,
RawDataTool = InDetTrigSCTRawDataProviderTool)
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
+ InDetTrigSCTRawDataProvider.RegSelTool = makeRegSelTool_SCT()
+
+
+
ToolSvc += InDetTrigSCTRawDataProvider
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigClusterMakerTool
@@ -204,6 +220,10 @@ class TRTDriftCircleMaker_EF( InDet__TRT_TrgRIO_Maker ):
def __init__(self, name= "TRTDriftCircleMaker_Electron_EF", type="electron" ):
super(InDet__TRT_TrgRIO_Maker, self).__init__(name)
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ self.RegSelTool = makeRegSelTool_TRT()
+
+
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigCommonTools import InDetTrigTRTRodDecoder
@@ -221,6 +241,9 @@ class TRTDriftCircleMaker_EF( InDet__TRT_TrgRIO_Maker ):
RDOKey = EF_TRTRDOKey,
RawDataTool="TRTRawDataProviderTool/InDetTrigTRTRawDataProviderTool")
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ InDetTrigTRTRawDataProvider.RegSelTool = makeRegSelTool_TRT()
+
ToolSvc += InDetTrigTRTRawDataProvider
from InDetTrigRecExample.InDetTrigCommonTools import InDetTrigTRT_DriftFunctionTool, \
@@ -279,6 +302,11 @@ class SiTrigSpacePointFinder_EF( InDet__SiTrigSpacePointFinder ):
def __init__(self, name = "SiTrigSpacePointFinder_Electron_EF", type="electron", lowPt=False):
super (InDet__SiTrigSpacePointFinder, self).__init__(name)
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
+ self.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ self.RegSelTool_SCT = makeRegSelTool_SCT()
+
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import \
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py
index f5627a5d66ce5210d01fe6072657ede28af7daad..5f120409dab5ade8930a8133165421e4ccb28435 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/share/InDetTrigRec_jobOptions.py
@@ -59,19 +59,21 @@ if InDetTrigFlags.useConditionsClasses():
else:
include ("InDetRecExample/InDetRecConditionsAccess.py")
-#manipulate RegSelSvc settings to be aware of the inactive detelems
-from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
-RegSelSvc = RegSelSvcDefault()
-
-RegSelSvc.DisableFromConditions = False
-RegSelSvc.DisablePixelFromConditions = False
-RegSelSvc.DisableTRTFromConditions = False
-RegSelSvc.DisableSCTFromConditions = False
+# remove all the old RegSelSvc setting - leave commented
+# while we determinte whether the RegSel migration has been successful
+# manipulate RegSelSvc settings to be aware of the inactive detelems
+# from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
+# RegSelSvc = RegSelSvcDefault()
+
+# RegSelSvc.DisableFromConditions = False
+# RegSelSvc.DisablePixelFromConditions = False
+# RegSelSvc.DisableTRTFromConditions = False
+# RegSelSvc.DisableSCTFromConditions = False
from InDetTrigRecExample.InDetTrigConfigConditions import \
SCT_ConditionsSetup, TRT_ConditionsSetup
-RegSelSvc.PixConditionsSvc = "" #empty as it does not work
-RegSelSvc.SCTConditionsTool = "SCT_ConditionsSummaryTool/"+SCT_ConditionsSetup.instanceName("InDetSCT_ConditionsSummaryTool")
-RegSelSvc.TRTConditionsSvc = "TRT_ConditionsSummarySvc/"+TRT_ConditionsSetup.instanceName("InDetTRTConditionsSummaryService")
+# RegSelSvc.PixConditionsSvc = "" #empty as it does not work
+# RegSelSvc.SCTConditionsTool = "SCT_ConditionsSummaryTool/"+SCT_ConditionsSetup.instanceName("InDetSCT_ConditionsSummaryTool")
+# RegSelSvc.TRTConditionsSvc = "TRT_ConditionsSummarySvc/"+TRT_ConditionsSetup.instanceName("InDetTRTConditionsSummaryService")
#this should be our common cabling setup/
# online running data are dealt with in the TriggerJobOpts
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/ATLAS_CHECK_THREAD_SAFETY
rename to InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/ATLAS_CHECK_THREAD_SAFETY
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt
index d61850233029fbc1bad2d825a6d84d50c1285f15..d78d12aa18d665968d7632300601d7a763493fb2 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/CMakeLists.txt
@@ -5,40 +5,6 @@
# Declare the package name:
atlas_subdir( InDetGlobalMonitoringRun3Test )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaMonitoring
- DetectorDescription/AtlasDetDescr
- GaudiKernel
- InnerDetector/InDetDetDescr/PixelGeoModel
- InnerDetector/InDetRawEvent/InDetRawData
- InnerDetector/InDetRecEvent/InDetPrepRawData
- Tracking/TrkEvent/TrkTrack
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/GeoPrimitives
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTracking
- Event/EventPrimitives
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetConditions/InDetByteStreamErrors
- InnerDetector/InDetConditions/PixelConditionsTools
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelCabling
- InnerDetector/InDetRecEvent/InDetRIO_OnTrack
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- InnerDetector/InDetConditions/BeamSpotConditionsData
- Tools/LWHists
- Tools/PathResolver
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkSpacePoint
- Tracking/TrkEvent/TrkTrackSummary
- Tracking/TrkEvent/VxVertex
- Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
- Tracking/TrkTools/TrkToolInterfaces )
-
# External dependencies:
find_package( ROOT COMPONENTS Core MathCore Hist )
@@ -46,6 +12,7 @@ find_package( ROOT COMPONENTS Core MathCore Hist )
atlas_add_component( InDetGlobalMonitoringRun3Test
InDetGlobalMonitoringRun3Test/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ PRIVATE_LINK_LIBRARIES InDetConditionsSummaryService
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib AtlasDetDescr
GaudiKernel InDetRawData InDetPrepRawData TrkTrack InDetByteStreamErrors
AthenaPoolUtilities GeoPrimitives xAODEventInfo EventPrimitives InDetIdentifier
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalBeamSpotMonAlgCfg.py b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalBeamSpotMonAlgCfg.py
index 89b5e2e1f360320a206757d4c35272e1f25f338a..f0f1b0604ed188ee25bfe9c3f05ccc4d418ffee7 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalBeamSpotMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalBeamSpotMonAlgCfg.py
@@ -22,7 +22,7 @@ def InDetGlobalBeamSpotMonAlgCfg(helper, alg, **kwargs):
pathbs = '/InDetGlobal/BeamSpot'
# Histograms for track-based beam spot monitoring:
- varName = 'm_trkD0,m_trkD0Phi;trkDPhi'
+ varName = 'm_trkD0Phi,m_trkD0;trkDPhi'
bsGroup.defineHistogram(varName,type="TH2F",title="DCA vs Phi; #varphi (rad);d_{0} (#mum)", path=pathbs, xbins=100, xmin=-3.5, xmax=3.5, ybins=100, ymin=-1000, ymax=1000)
if (expert):
@@ -33,7 +33,7 @@ def InDetGlobalBeamSpotMonAlgCfg(helper, alg, **kwargs):
#Histograms of assumed beam spot position
if (m_useBeamspot):
- varName = 'm_trkD0Corr,m_trkD0PhiCorr;trkDPhiCorr'
+ varName = 'm_trkD0PhiCorr,m_trkD0Corr;trkDPhiCorr'
bsGroup.defineHistogram(varName,type="TH2F",title="DCA vs Phi wrt Beamspot;#varphi (rad);d_{0} (#mum)",path=pathbs,xbins=100, xmin=-3.5,xmax=3.5, ybins=100, ymin=-500,ymax=500)
varName = 'm_bsX;bsX'
bsGroup.defineHistogram(varName, type="TH1F", title="Beam spot position: x;x (mm)",path=pathbs,xbins=100,xmin=-10,xmax=10)
@@ -66,11 +66,11 @@ def InDetGlobalBeamSpotMonAlgCfg(helper, alg, **kwargs):
#Histograms that are independent of the useBeamSpot parameters
- varName = 'm_pvX,m_pvZ;pvXZ'
+ varName = 'm_pvZ,m_pvX;pvXZ'
bsGroup.defineHistogram(varName, type="TH2F", title="Primary vertex: x vs z;z (mm);x (mm)", path=pathbs, xbins=100, xmin=-500, xmax=500, ybins=100, ymin=-10, ymax=10)
- varName = 'm_pvY,m_pvZ;pvYZ'
+ varName = 'm_pvZ,m_pvY;pvYZ'
bsGroup.defineHistogram(varName, type="TH2F", title="Primary vertex: y vs z;z (mm);y (mm)", path=pathbs, xbins=100, xmin=-500, xmax=500, ybins=100, ymin=-10,ymax=10)
- varName = 'm_pvY,m_pvX;pvYX'
+ varName = 'm_pvX,m_pvY;pvYX'
bsGroup.defineHistogram(varName, type="TH2F", title="Primary vertex: y vs x;x (mm);y (mm)", path=pathbs, xbins=100, xmin=-10, xmax=10, ybins=100, ymin=-10, ymax=10)
varName = 'm_pvChiSqDof;pvChiSqDof'
bsGroup.defineHistogram(varName, type="TH1F", title="",path=pathbs,xbins=100,xmin=0,xmax=20)
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py
index 58807dec5e6aa53aee2fb781192e8396f6f4ae58..1e2c540f1de7d88333fb2d183dd55c2c07427a52 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/python/InDetGlobalMonitoringRun3TestConfig.py
@@ -14,6 +14,11 @@ def InDetGlobalMonitoringRun3TestConfig(flags):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = ComponentAccumulator()
+ from AthenaMonitoring import AthMonitorCfgHelper
+ helper = AthMonitorCfgHelper(flags, "InDetGlobalMonitoringRun3Test")
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+
# run on RAW only
if flags.DQ.Environment in ('online', 'tier0', 'tier0Raw'):
## from InDetRecExample.InDetKeys import InDetKeys ## not sure it works now
@@ -27,17 +32,13 @@ def InDetGlobalMonitoringRun3TestConfig(flags):
}
- from AthenaMonitoring import AthMonitorCfgHelper
- helper = AthMonitorCfgHelper(flags, "InDetGlobalMonitoringRun3Test")
-
- from AthenaConfiguration.ComponentFactory import CompFactory
- # from InDetGlobalMonitoringRun3Test.InDetGlobalMonitoringRun3TestConf import InDetGlobalTrackMonAlg
from InDetGlobalMonitoringRun3Test.InDetGlobalTrackMonAlgCfg import InDetGlobalTrackMonAlgCfg
inDetGlobalTrackMonAlg = helper.addAlgorithm(CompFactory.InDetGlobalTrackMonAlg, 'InDetGlobalTrackMonAlg')
for k, v in kwargsInDetGlobalTrackMonAlg.items():
setattr(inDetGlobalTrackMonAlg, k, v)
+ inDetGlobalTrackMonAlg.TrackSelectionTool = CompFactory.InDet.InDetTrackSelectionTool('InDetGlobalTrackMonAlg_TrackSelectionTool')
inDetGlobalTrackMonAlg.TrackSelectionTool.UseTrkTrackTools = True
inDetGlobalTrackMonAlg.TrackSelectionTool.CutLevel = "TightPrimary"
inDetGlobalTrackMonAlg.TrackSelectionTool.maxNPixelHoles = 1
@@ -45,6 +46,7 @@ def InDetGlobalMonitoringRun3TestConfig(flags):
# InDetGlobalTrackMonAlg.Baseline_TrackSelectionTool.TrackSummaryTool = InDetTrackSummaryTool
# InDetGlobalTrackMonAlg.Baseline_TrackSelectionTool.Extrapolator = InDetExtrapolator
#
+ inDetGlobalTrackMonAlg.Tight_TrackSelectionTool = CompFactory.InDet.InDetTrackSelectionTool('InDetGlobalTrackMonAlg_TightTrackSelectionTool')
inDetGlobalTrackMonAlg.Tight_TrackSelectionTool.UseTrkTrackTools = True
inDetGlobalTrackMonAlg.Tight_TrackSelectionTool.CutLevel = "TightPrimary"
inDetGlobalTrackMonAlg.Tight_TrackSelectionTool.minPt = 5000
@@ -54,20 +56,23 @@ def InDetGlobalMonitoringRun3TestConfig(flags):
# Run 3 configs - stolen from SCT
from SCT_Monitoring.TrackSummaryToolWorkaround import TrackSummaryToolWorkaround
- inDetGlobalTrackMonAlg.TrackSelectionTool.TrackSummaryTool = acc.popToolsAndMerge(TrackSummaryToolWorkaround(flags))
+ InDetTrackSummaryTool = acc.popToolsAndMerge(TrackSummaryToolWorkaround(flags))
+ inDetGlobalTrackMonAlg.TrackSummaryTool = InDetTrackSummaryTool
+ inDetGlobalTrackMonAlg.TrackSelectionTool.TrackSummaryTool = InDetTrackSummaryTool
inDetGlobalTrackMonAlg.TrackSelectionTool.Extrapolator = acc.getPublicTool("InDetExtrapolator")
- inDetGlobalTrackMonAlg.Tight_TrackSelectionTool.TrackSummaryTool = acc.popToolsAndMerge(TrackSummaryToolWorkaround(flags))
+ inDetGlobalTrackMonAlg.Tight_TrackSelectionTool.TrackSummaryTool = InDetTrackSummaryTool
inDetGlobalTrackMonAlg.Tight_TrackSelectionTool.Extrapolator = acc.getPublicTool("InDetExtrapolator")
InDetGlobalTrackMonAlgCfg(helper, inDetGlobalTrackMonAlg, **kwargsInDetGlobalTrackMonAlg)
########### here ends InDetGlobalTrackMonAlg ###########
-
+ # run on ESD
+ if flags.DQ.Environment != 'tier0Raw':
########### here begins InDetGlobalPrimaryVertexMonAlg ###########
- from InDetGlobalMonitoringRun3Test.InDetGlobalMonitoringRun3TestConf import InDetGlobalPrimaryVertexMonAlg
from InDetGlobalMonitoringRun3Test.InDetGlobalPrimaryVertexMonAlgCfg import InDetGlobalPrimaryVertexMonAlgCfg
- myInDetGlobalPrimaryVertexMonAlg = helper.addAlgorithm(InDetGlobalPrimaryVertexMonAlg, 'InDetGlobalPrimaryVertexMonAlg')
+ myInDetGlobalPrimaryVertexMonAlg = helper.addAlgorithm(CompFactory.InDetGlobalPrimaryVertexMonAlg,
+ 'InDetGlobalPrimaryVertexMonAlg')
kwargsInDetGlobalPrimaryVertexMonAlg = {
'vxContainerName' : 'PrimaryVertices', #InDetKeys.xAODVertexContainer(),
@@ -77,18 +82,20 @@ def InDetGlobalMonitoringRun3TestConfig(flags):
}
for k, v in kwargsInDetGlobalPrimaryVertexMonAlg.items():
- setattr(kwargsInDetGlobalPrimaryVertexMonAlg, k, v)
+ setattr(myInDetGlobalPrimaryVertexMonAlg, k, v)
InDetGlobalPrimaryVertexMonAlgCfg(helper, myInDetGlobalPrimaryVertexMonAlg, **kwargsInDetGlobalPrimaryVertexMonAlg)
########### here ends InDetGlobalPrimaryVertexMonAlg ###########
########### here begins InDetGlobalBeamSpotMonAlg ###########
-
- from InDetGlobalMonitoringRun3Test.InDetGlobalMonitoringRun3TestConf import InDetGlobalBeamSpotMonAlg
+ from BeamSpotConditions.BeamSpotConditionsConfig import BeamSpotCondAlgCfg
+ acc.merge(BeamSpotCondAlgCfg(flags))
+
from InDetGlobalMonitoringRun3Test.InDetGlobalBeamSpotMonAlgCfg import InDetGlobalBeamSpotMonAlgCfg
- myInDetGlobalBeamSpotMonAlg = helper.addAlgorithm(InDetGlobalBeamSpotMonAlg, 'InDetGlobalBeamSpotMonAlg')
+ myInDetGlobalBeamSpotMonAlg = helper.addAlgorithm(CompFactory.InDetGlobalBeamSpotMonAlg,
+ 'InDetGlobalBeamSpotMonAlg')
kwargsInDetGlobalBeamSpotMonAlg = {
'BeamSpotKey' : 'BeamSpotData', #InDetKeys.BeamSpotData(),
@@ -99,10 +106,11 @@ def InDetGlobalMonitoringRun3TestConfig(flags):
}
for k, v in kwargsInDetGlobalBeamSpotMonAlg.items():
- setattr(kwargsInDetGlobalBeamSpotMonAlg, k, v)
+ setattr(myInDetGlobalBeamSpotMonAlg, k, v)
InDetGlobalBeamSpotMonAlgCfg(helper, myInDetGlobalBeamSpotMonAlg, **kwargsInDetGlobalBeamSpotMonAlg)
########### here ends InDetGlobalBeamSpotMonAlg ###########
+ acc.merge(helper.result())
return acc
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalBeamSpotMonAlg.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalBeamSpotMonAlg.cxx
index e4764edc45714a05f35b1f9eff19ea98a6788932..69782a6506bb74d0f6e82004f329e02d50131b3a 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalBeamSpotMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalBeamSpotMonAlg.cxx
@@ -15,7 +15,7 @@
****************************************************************************/
//main header
-#include "InDetGlobalMonitoringRun3Test/InDetGlobalBeamSpotMonAlg.h"
+#include "InDetGlobalBeamSpotMonAlg.h"
#include "TrkEventPrimitives/ParamDefs.h"
@@ -90,11 +90,16 @@ StatusCode InDetGlobalBeamSpotMonAlg::fillHistograms( const EventContext& ctx )
const Amg::Vector3D &bpos = beamSpotHandle->beamPos();
- auto beamSpotX_m = Monitored::Scalar<float>("m_bsX", bpos.x() );
- auto beamSpotY_m = Monitored::Scalar<float>("m_bsY", bpos.y() );
- auto beamSpotZ_m = Monitored::Scalar<float>("m_bsZ", bpos.z() );
- auto beamTiltX_m = Monitored::Scalar<float>("m_bsTiltX", 1e6*beamSpotHandle->beamTilt(0) );
- auto beamTiltY_m = Monitored::Scalar<float>("m_bsTiltY", 1e6*beamSpotHandle->beamTilt(1) );
+ beamSpotX = bpos.x();
+ beamSpotY = bpos.y();
+ beamSpotZ = bpos.z();
+ auto beamSpotX_m = Monitored::Scalar<float>("m_bsX", beamSpotX );
+ auto beamSpotY_m = Monitored::Scalar<float>("m_bsY", beamSpotY );
+ auto beamSpotZ_m = Monitored::Scalar<float>("m_bsZ", beamSpotZ );
+ beamTiltX = beamSpotHandle->beamTilt(0);
+ beamTiltY = beamSpotHandle->beamTilt(1);
+ auto beamTiltX_m = Monitored::Scalar<float>("m_bsTiltX", 1e6*beamTiltX );
+ auto beamTiltY_m = Monitored::Scalar<float>("m_bsTiltY", 1e6*beamTiltY );
scaleFactor = 1000.; // Use microns for some histograms when showing distance relative to beamspot PJ not used here?!
fill(bsGroup,beamSpotX_m);
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/InDetGlobalBeamSpotMonAlg.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalBeamSpotMonAlg.h
similarity index 100%
rename from InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/InDetGlobalBeamSpotMonAlg.h
rename to InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalBeamSpotMonAlg.h
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalPrimaryVertexMonAlg.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalPrimaryVertexMonAlg.cxx
index 5c4cc7da7f88864fd46449f2b564e310d65ceba1..a160cbcac39e1a87a95ff6b43fad0b609e621b15 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalPrimaryVertexMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalPrimaryVertexMonAlg.cxx
@@ -15,7 +15,7 @@
****************************************************************************/
//main header
-#include "InDetGlobalMonitoringRun3Test/InDetGlobalPrimaryVertexMonAlg.h"
+#include "InDetGlobalPrimaryVertexMonAlg.h"
#include "TrkEventPrimitives/ParamDefs.h"
#include "xAODTracking/TrackParticleContainer.h"
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/InDetGlobalPrimaryVertexMonAlg.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalPrimaryVertexMonAlg.h
similarity index 100%
rename from InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/InDetGlobalPrimaryVertexMonAlg.h
rename to InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalPrimaryVertexMonAlg.h
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalTrackMonAlg.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalTrackMonAlg.cxx
index 31b21a47d9605aa8664d4eb5f7fa3cc49a4408e4..b9a1e564c2a92a32ffaea0711836936c48f23d1b 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalTrackMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalTrackMonAlg.cxx
@@ -15,7 +15,7 @@
****************************************************************************/
//main header
-#include "InDetGlobalMonitoringRun3Test/InDetGlobalTrackMonAlg.h"
+#include "InDetGlobalTrackMonAlg.h"
//Standard c++
#include <vector>
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/InDetGlobalTrackMonAlg.h b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalTrackMonAlg.h
similarity index 100%
rename from InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/InDetGlobalMonitoringRun3Test/InDetGlobalTrackMonAlg.h
rename to InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/InDetGlobalTrackMonAlg.h
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/components/InDetGlobalMonitoringRun3Test_entries.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/components/InDetGlobalMonitoringRun3Test_entries.cxx
index b778c8ca79d5cc438b5d6dd9a1fa38018f18be91..f471a85c112a37e5bbf04fd7c91db4069288d18c 100644
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/components/InDetGlobalMonitoringRun3Test_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoringRun3Test/src/components/InDetGlobalMonitoringRun3Test_entries.cxx
@@ -1,6 +1,6 @@
-#include "InDetGlobalMonitoringRun3Test/InDetGlobalTrackMonAlg.h"
-#include "InDetGlobalMonitoringRun3Test/InDetGlobalPrimaryVertexMonAlg.h"
-#include "InDetGlobalMonitoringRun3Test/InDetGlobalBeamSpotMonAlg.h"
+#include "../InDetGlobalTrackMonAlg.h"
+#include "../InDetGlobalPrimaryVertexMonAlg.h"
+#include "../InDetGlobalBeamSpotMonAlg.h"
DECLARE_COMPONENT( InDetGlobalTrackMonAlg )
DECLARE_COMPONENT( InDetGlobalPrimaryVertexMonAlg )
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/packagedoc.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/packagedoc.h
index d78de4c4f6f1d0304c366d4fd1e1a605bcb722ca..42a92f2463088cf69c1d3f4b083e474327d5eb4d 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/packagedoc.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/doc/packagedoc.h
@@ -1,59 +1,66 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@page SCT_Monitoring_page SCT_MonitoringPackage
-@author Martin White, Helen Hayward, Shaun Roe
+@author Martin White, Helen Hayward, Shaun Roe, Susumu.Oda@cern.ch
@section SCT_Monitoring_SCT_MonitoringIntro Introduction
-This package does data monitoring at the event filter level, providing a tool which can give occupancies and efficiencies for the SCT detector.
-The histograms are published and may be used in the Online Histogram Presenter (OHP).
+This package does data monitoring providing algorithms and tools which can give bytestream errors, efficiencies, noises, occupancies, Lorentz angles, tracking quantities for the SCT detector for both online and offline.
+The histograms are published and used in the Online Histogram Presenter (OHP).
@section SCT_Monitoring_SCT_MonitoringOverview Class Overview
-All of the classes used directly for monitoring inherit directly from the ManagedMonitorToolBase to enable histogram registration and use in the Online Presenter.
-Some of the classes in this package are only intended to be compiled when integrating into the online environment, look out for the 'ifdef ONLINE' preprocessor directive.
-
-Here are the active Monitoring Tools:
-
- - SCTTracksMonTool
-
- - SCTHitEffMonTool
-
- - SCTHitsNoiseMonTool
-
- - SCTErrMonTool
-
- - SCTInitialiseTool
-
- - SCTHitEfficiencyTool
-
- - SCTEffMonTool
-
-The following are only used in the online environment:
- - SCTListener
-
- - Martin.hh (automatically generated for online code integration)
-
-The following are utility classes used in the package:
- - FSCTtoolbox
-
- - PairBuilder : Builds all possible pairs of given sets of values for x and y, used for correlation plotting
-
-The following <i>may</i> be used in other classes but should probably be deprecated:
- - SCT_ModuleStatistics
- - SCT_PlanePosition
- - SCT_ClusterStruct
- - SCT_StatisticsData
-
-These should definitely be deprecated and removed as soon as possible:
- - StatusCodeAction
- - SCT2004MonTool
- - SCTCosmicHisto
- - SCTCosmicMonTool
- - ParsedSCT_RDO
- - SCTHistoTest
-
-
+In the new data quality motitoring framework for Run 3, algorithms inherited directly from AthMonitorAlgorithm are used.
+
+In the old data quality monitoring framework up to Run 2, tools inherited directly from ManagedMonitorToolBase are used.
+Tools will be removed at some point.
+
+Here are the active monitoring algorithms / tools:
+
+ - SCTErrMonAlg / SCTErrMonTool : bytestream errors
+ - SCTHitEffMonAlg / SCTHitEffMonTool : efficiencies
+ - SCTHitsNoiseMonAlg / SCTHitsNoiseMonTool : noises, occupancies
+ - SCTLorentzMonAlg / SCTLorentzMonTool : Lorentz angles
+ - SCTTracksMonAlg / SCTTracksMonTool : tracking quantities
+
+@section SCT_Monitoring_SCT_MonitoringConfiguration Configuration
+@subsection SCT_Monitoring_SCT_MonitoringConfigurationNewNew Configuration in the new DQ framework and the new job configuration framework
+
+InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTMonitoringConfig.py is the main configuration script.
+Only SCTLorentzMonAlg and SCTTracksMonAlg are configured in the script using SCTLorentzMonAlg.py and SCTTracksMonAlg.py because the Inner Dector configuration is not fully ready in the new job configuration framework as of October, 2020.
+
+When the Reco_tf.py command is used, the chain is the following:
+- Reconstruction/RecJobTransforms/scripts/Reco_tf.py
+- Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py / Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py
+- Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+- Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+- Control/AthenaMonitoring/python/AthenaMonitoringCfg.py
+- InnerDetector/InDetMonitoring/SCT_Monitoring/python/SCTMonitoringConfig.py
+
+Individual algorithms can be run using the configuration scripts like:
+
+\verbatim
+python -m SCT_Monitoring.SCTLorentzMonAlg
+\endverbatim
+
+@subsection SCT_Monitoring_SCT_MonitoringConfigurationNewOld Configuration in the new DQ framework and the old job configuration framework
+
+InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py is the main configuration script.
+To use the new DQ framework, the useNewAlgs flag in the script has to be set True.
+The default value is True.
+
+When the Reco_tf.py command is used, the chain is the same as above up to DataQualitySteering_jobOptions.py. The following chain is:
+- Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+- InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoring.py
+- InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py
+
+@subsection SCT_Monitoring_SCT_MonitoringConfigurationOldOld Configuration in the old DQ framework and the old job configuration framework
+
+InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py is the main configuration script too.
+To use the new DQ framework, the useNewAlgs flag in the script has to be set False.
+The default value is True.
+The chain is the same as above.
+
*/
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py
index a66b8c0877b0c46476221270b46496095b0eae9d..94ec785dcd39a027db823c8d24c85b5cd9f7c37c 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py
@@ -17,14 +17,7 @@ def TrackSummaryToolWorkaround(flags):
# Taken from InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
from PixelConditionsAlgorithms.PixelConditionsConfig import PixelConfigCondAlgCfg
- result.merge(PixelConfigCondAlgCfg(flags,
- UseCalibConditions=True,
- UseDeadmapConditions=True,
- UseDCSStateConditions=(not flags.Input.isMC and flags.InDet.usePixelDCS),
- UseDCSStatusConditions=(not flags.Input.isMC and flags.InDet.usePixelDCS),
- UseDCSHVConditions=True,
- UseDCSTemperatureConditions=True,
- UseTDAQConditions=False))
+ result.merge(PixelConfigCondAlgCfg(flags))
from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
InDetPixelConditionsSummaryTool = result.popToolsAndMerge(PixelConditionsSummaryCfg(flags))
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorRec_jobOptions.py alias b/InnerDetector/InDetMonitoring/SCT_Monitoring/run/CosmicMonitorRec_jobOptions.py alias
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py
index 9893bb893701206cd2843679531eab76066ff5c0..8e01402e827cd10bdfca9b9651080555414e709b 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/strippedDown.py
@@ -62,9 +62,6 @@ elif globalflags.InputFormat() == 'bytestream':
#--------------------------------------------------------------
# include SCT Clusterization
#--------------------------------------------------------------
-from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
-PixelConfigCondAlg.UseCalibConditions = False
-
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool")
ToolSvc += InDetClusterMakerTool
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
index c8782e93c6d42e220638ee563123d2660f188958..0a9c0ae2892e8fb87c22f208a90c11e1101ddd76 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/python/TRTMonitoringRun3ESD_Alg.py
@@ -27,6 +27,10 @@ def TRTMonitoringRun3ESD_AlgConfig(inputFlags):
algTRTMonitoringRun3ESD = helper.addAlgorithm(CompFactory.TRTMonitoringRun3ESD_Alg,
'AlgTRTMonitoringRun3')
+ # trigger flag
+ if not inputFlags.DQ.triggerDataAvailable:
+ algTRTMonitoringRun3ESD.TrigDecisionObjectName = ''
+
from AtlasGeoModel.AtlasGeoModelConfig import AtlasGeometryCfg
result.merge(AtlasGeometryCfg(inputFlags))
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
index 3a45c7ae8d3332f1b3076666aad178a6892a1bb8..52264c55fa7621a4d2a5b87595ce755aa2ebcc7b 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/src/TRTMonitoringRun3ESD_Alg.cxx
@@ -208,7 +208,7 @@ StatusCode TRTMonitoringRun3ESD_Alg::initialize() {
ATH_CHECK( m_xAODEventInfoKey.initialize() );
ATH_CHECK( m_TRT_BCIDCollectionKey.initialize() );
ATH_CHECK( m_comTimeObjectKey.initialize() );
- ATH_CHECK( m_trigDecisionKey.initialize() );
+ ATH_CHECK( m_trigDecisionKey.initialize(SG::AllowEmpty) );
return StatusCode::SUCCESS;
}
@@ -1333,8 +1333,8 @@ StatusCode TRTMonitoringRun3ESD_Alg::fillHistograms( const EventContext& ctx ) c
SG::ReadHandle<xAOD::EventInfo> xAODEventInfo(m_xAODEventInfoKey, ctx);
SG::ReadHandle<InDetTimeCollection> trtBCIDCollection(m_TRT_BCIDCollectionKey, ctx);
SG::ReadHandle<ComTime> comTimeObject(m_comTimeObjectKey, ctx);
- SG::ReadHandle<xAOD::TrigDecision> trigDecision(m_trigDecisionKey, ctx);
-
+ const xAOD::TrigDecision* trigDecision = nullptr;
+
if (!xAODEventInfo.isValid()) {
ATH_MSG_ERROR("Could not find event info object " << m_xAODEventInfoKey.key() <<
" in store");
@@ -1347,16 +1347,19 @@ StatusCode TRTMonitoringRun3ESD_Alg::fillHistograms( const EventContext& ctx ) c
" in store");
return StatusCode::FAILURE;
}
- if (!trigDecision.isValid()) {
- ATH_MSG_INFO("Could not find trigger decision object " << m_trigDecisionKey.key() <<
- " in store");
+ if (! m_trigDecisionKey.empty()) {
+ trigDecision = SG::get(m_trigDecisionKey, ctx);
+ if (!trigDecision) {
+ ATH_MSG_INFO("Could not find trigger decision object " << m_trigDecisionKey.key() <<
+ " in store");
+ }
}
// NOTE: failing to retrieve ComTime from store for some reason
if (!comTimeObject.isValid()) {
ATH_MSG_INFO("Could not find com time object " << m_comTimeObjectKey.key() <<
" in store");
}
- ATH_CHECK( fillTRTTracks(*trackCollection, trigDecision.cptr(), comTimeObject.cptr()) );
+ ATH_CHECK( fillTRTTracks(*trackCollection, trigDecision, comTimeObject.cptr()) );
}
if (!m_doTracksMon) {
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
index 76a29520ee30bb260b9bbbcd91f85f608646b5ee..c9de5b8a2e917f9f63d72f49e1fec7141d6c27d3 100644
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/TRTOverlay_test.cxx
@@ -35,7 +35,6 @@
#include "AthenaBaseComps/AthService.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IAppMgrUI.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/SmartIF.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "GaudiKernel/PhysicalConstants.h"
@@ -73,11 +72,11 @@ namespace OverlayTesting {
// dummy methods implementing in pure virtual interface methods (to make class non-abstract)
/** Return the local occupancy for the sectors crossed by a given track */
- virtual float LocalOccupancy( const Trk::Track& ) const { return 1.0; }; // not used - dummy implementation
- virtual float LocalOccupancy(const double, const double) const { return 1.0; }; // not used - dummy implementation
+ virtual float LocalOccupancy( const Trk::Track& ) const override { return 1.0; }; // not used - dummy implementation
+ virtual float LocalOccupancy(const double, const double) const override{ return 1.0; }; // not used - dummy implementation
/** Return the global occupancy of the event*/
- virtual std::vector<float> GlobalOccupancy( ) const { std::vector<float> dummyVect{}; return dummyVect; }; // not used - dummy implementation
+ virtual std::vector<float> GlobalOccupancy( ) const override { std::vector<float> dummyVect{}; return dummyVect; }; // not used - dummy implementation
};
DECLARE_COMPONENT( MockTRT_LocalOccupancy )
@@ -102,18 +101,18 @@ namespace OverlayTesting {
return StatusCode::SUCCESS;
};
- virtual int getStatus(const Identifier ) const { return 1; }; // not used - dummy implementation
- virtual int getStatusPermanent(const Identifier) const { return 1; }; // not used - dummy implementation
+ virtual int getStatus(const Identifier ) const override { return 1; }; // not used - dummy implementation
+ virtual int getStatusPermanent(const Identifier) const override { return 1; }; // not used - dummy implementation
MOCK_CONST_METHOD1(getStatusHT, int(const Identifier)); // This is the only method that we actually need! <--------------
- virtual bool get_status(const Identifier) const { return false; }; // not used - dummy implementation
- virtual bool get_statusHT(const Identifier) const { return false; }; // not used - dummy implementation
- virtual const StrawStatusContainer* getStrawStatusHTContainer() const {return nullptr;}; // not used - dummy implementation
+ virtual bool get_status(const Identifier) const override { return false; }; // not used - dummy implementation
+ virtual bool get_statusHT(const Identifier) const override { return false; }; // not used - dummy implementation
+ virtual const StrawStatusContainer* getStrawStatusHTContainer() const override {return nullptr;}; // not used - dummy implementation
- virtual int getStatus(const Identifier, const EventContext& ) const { return 1; }; // not used - dummy implementation
- virtual int getStatusPermanent(const Identifier, const EventContext& ) const { return 1; }; // not used - dummy implementation
- virtual int getStatusHT(const Identifier, const EventContext& ) const { return 1; }; // not used - dummy implementation
- virtual bool get_status(const Identifier, const EventContext& ) const { return false; }; // not used - dummy implementation
- virtual bool get_statusHT(const Identifier, const EventContext& ) const { return false; }; // not used - dummy implementation
+ virtual int getStatus(const Identifier, const EventContext& ) const override { return 1; }; // not used - dummy implementation
+ virtual int getStatusPermanent(const Identifier, const EventContext& ) const override { return 1; }; // not used - dummy implementation
+ virtual int getStatusHT(const Identifier, const EventContext& ) const override { return 1; }; // not used - dummy implementation
+ virtual bool get_status(const Identifier, const EventContext& ) const override { return false; }; // not used - dummy implementation
+ virtual bool get_statusHT(const Identifier, const EventContext& ) const override { return false; }; // not used - dummy implementation
};
@@ -154,9 +153,6 @@ namespace OverlayTesting {
ASSERT_TRUE( m_appMgr->configure().isSuccess() );
ASSERT_TRUE( m_appMgr->initialize().isSuccess() );
-
- m_jobOptionsSvc = m_svcLoc->service("JobOptionsSvc");
- ASSERT_TRUE( m_jobOptionsSvc.isValid() );
}
void TearDownGaudi() {
@@ -172,7 +168,6 @@ namespace OverlayTesting {
IAppMgrUI* m_appMgr = nullptr;
SmartIF<ISvcLocator> m_svcLoc;
SmartIF<ISvcManager> m_svcMgr;
- SmartIF<IJobOptionsSvc> m_jobOptionsSvc;
SmartIF<IToolSvc> m_toolSvc;
SmartIF<IProperty> m_propMgr;
};
diff --git a/InnerDetector/InDetRawEvent/InDetRawData/doc/packagedoc.h b/InnerDetector/InDetRawEvent/InDetRawData/doc/packagedoc.h
index 3dc252d5777fda5a003c7d70d9084ca8b03032cd..59b79b82a4a14802d743fd9b2d737834f2b03c2b 100644
--- a/InnerDetector/InDetRawEvent/InDetRawData/doc/packagedoc.h
+++ b/InnerDetector/InDetRawEvent/InDetRawData/doc/packagedoc.h
@@ -1,17 +1,17 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@page InDetRawData_page InDetRawData Package
-@author David Candlin, Veronique Boisvert, Maria.Jose.Costa@cern.ch
+@author David Candlin, Veronique Boisvert, Maria.Jose.Costa@cern.ch, Susumu.Oda@cern.ch
@section InDetRawData_InDetRawDataIntro Introduction
This package is meant to contain the classes defining the Inner Detector
RawDataObjects, their collections and containers. There are different
-classes for DC1/DC2 and combined test beam RawDataObjects (all of them
-deriving from the same base class).
+classes for LHC, DC1/DC2 and combined test beam RawDataObjects (all of them
+deriving from the same base class, InDetRawData).
@section InDetRawData_InDetRawDataOverview Class Overview
The InDetRawData package contains the following classes:
@@ -24,19 +24,23 @@ deriving from the same base class).
- InDetRawDataContainer: Container for Raw Data Objects collections for
Pixel, SCT and TRT
- - PixelRDORawData: Class to implement RawData for Pixel
+ - PixelRDORawData: Abstract class to implement RawData for Pixel
- Pixel1RawData: Class to implement DC1/DC2 RawData for Pixel
- PixelTB04RawData: Class to implement test beam 2004 RawData for Pixel
- - SCT_RDORawData: Class to implement RawData for SCT
+ - SCT_RDORawData: Abstract class to implement RawData for SCT
- SCT1_RawData: Class to implement DC1/DC2 RawData for SCT
+ - SCT3_RawData: Class to implement LHC (Run 1, Run 2, Run 3) RawData for SCT
+
+ - SCT_TB03_RawData: Class to implement test beam 2003 RawData for SCT
+
- SCT_TB04_RawData: Class to implement test beam 2004 RawData for SCT
- - TRT_RDORawData: Class to implement RawData for TRT
+ - TRT_RDORawData: Abstract class to implement RawData for TRT
- TRT_LoLumRawData: Class to implement DC1/DC2 RawData for TRT
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
index 969b27bb8bbd938fa47005483d29a868696d7825..0dc0a7b5ce4dbd5bea7dfe7b49574b60c2cab923 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
@@ -30,7 +30,7 @@
#include "InDetRawData/InDetRawDataCollection.h"
#include "InDetRawData/PixelRDO_Container.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "SiClusterizationTool/IPixelClusteringTool.h"
@@ -78,7 +78,7 @@ private:
ToolHandle< PixelGangedAmbiguitiesFinder > m_gangedAmbiguitiesFinder;
SG::ReadHandleKey<PixelRDO_Container> m_rdoContainerKey;
SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey;
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSelTool_Pixel" }; //!< region selector tool
bool m_roiSeeded;
const PixelID* m_idHelper;
SG::WriteHandleKey<PixelClusterContainer> m_clusterContainerKey;
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
index 87d61f41bedcfe0a3a8e2b523e575d63b927d4d4..ca76abb53594eea242eb0aabc8c150b67becd75d 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
@@ -27,7 +27,7 @@
#include "InDetPrepRawData/TRT_DriftCircleContainer.h"
#include "InDetRawData/TRT_RDO_Container.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
//fwd declarations
class StatusCode;
class ISvcLocator;
@@ -72,7 +72,7 @@ namespace InDet{
SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey{this, "RoIs", "", "RoIs to read in"};
BooleanProperty m_roiSeeded{this, "isRoI_Seeded", false, "Use RoI"};
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSelTool_TRT" }; //!< region selector tool
SG::UpdateHandleKey<InDet::TRT_DriftCircleContainerCache> m_rioContainerCacheKey;
};
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
index bf694c1e3ed653d2e7fb9c9036426575935eb41e..7f3c93be1474251708d202429e26fc653cd0a0c9 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
@@ -35,7 +35,6 @@ namespace InDet{
m_gangedAmbiguitiesFinder("InDet::PixelGangedAmbiguitiesFinder", this), //made private
m_rdoContainerKey(""),
m_roiCollectionKey(""),
- m_regionSelector("RegSelSvc", name),
m_roiSeeded(false),
m_idHelper(nullptr),
m_clusterContainerKey(""),
@@ -163,7 +162,7 @@ namespace InDet{
for (; roi!=roiE; ++roi) {
listOfPixIds.clear();//Prevents needless memory reallocations
- m_regionSelector->DetHashIDList( PIXEL, **roi, listOfPixIds);
+ m_regionSelector->HashIDList( **roi, listOfPixIds);
ATH_MSG_VERBOSE(**roi);
ATH_MSG_VERBOSE( "REGTEST: Pixel : Roi contains "
<< listOfPixIds.size() << " det. Elements" );
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
index 0008dcf25499700fa4a942159bcbb53a2a6ebe8a..4f1628039ecf0ad9e9c6ef9f759ef40c3f62f720 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
@@ -34,7 +34,6 @@ namespace InDet {
m_rioContainerKey("TRT_DriftCircles"),
m_mode_rio_production(0),
m_trtBadChannels(0),
- m_regionSelector("RegSelSvc", name),
m_rioContainerCacheKey("")
{
// Read TRT_RIO_Maker steering parameters
@@ -110,7 +109,7 @@ namespace InDet {
for(const TrigRoiDescriptor* roi : *roiCollection){
listOfTRTIds.clear(); //Prevents needless memory reallocations
- m_regionSelector->DetHashIDList( TRT, *roi, listOfTRTIds);
+ m_regionSelector->HashIDList( *roi, listOfTRTIds);
#ifndef NDEBUG
ATH_MSG_VERBOSE(*roi);
ATH_MSG_VERBOSE( "REGTEST: SCT : Roi contains "
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index 3698aa44f90d365982a22940b96cbaf37268599d..052398a15851ff4d48bffc91b8189f81f12932c9 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -247,24 +247,24 @@ if doPixel:
else:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseDeadmapConditions=(not athenaCommonFlags.isOnline()),
- UseDCSStateConditions=(globalflags.DataSource=='data') and InDetFlags.usePixelDCS(),
- UseDCSStatusConditions=(globalflags.DataSource=='data') and InDetFlags.usePixelDCS(),
- UseTDAQConditions=athenaCommonFlags.isOnline(),
- ReadDeadMapKey="/PIXEL/PixMapOverlay",
- UseCalibConditions=True,
- UseCablingConditions=useCablingConditions,
- CablingMapFileName=IdMappingDat)
+ alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
+ UseCablingConditions=useCablingConditions,
+ CablingMapFileName=IdMappingDat)
+ if athenaCommonFlags.isOnline():
+ alg.ReadDeadMapKey = ''
+ condSeq += alg
if useNewDeadmapFormat:
if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
if not hasattr(condSeq, "PixelDeadMapCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg",ReadKey="/PIXEL/PixelModuleFeMask")
+ if athenaCommonFlags.isOnline():
+ alg.ReadKey = ''
+ condSeq += alg
- if not athenaCommonFlags.isOnline():
+ if globalflags.DataSource=='data' and InDetFlags.usePixelDCS():
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
conddb.addFolder("DCS_OFL", "/PIXEL/DCS/FSMSTATE", className="CondAttrListCollection")
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATUS"):
@@ -442,7 +442,6 @@ if doPixel:
InDetClusterMakerTool.PixelLorentzAngleTool = ToolSvc.PixelLorentzAngleTool
else:
InDetClusterMakerTool.PixelCablingSvc = None
- InDetClusterMakerTool.PixelModuleData = ""
InDetClusterMakerTool.PixelChargeCalibCondData = ""
InDetClusterMakerTool.PixelLorentzAngleTool = None
InDetClusterMakerTool.PixelOfflineCalibData = ""
@@ -499,6 +498,10 @@ if doPixel:
gangedAmbiguitiesFinder = InDetPixelGangedAmbiguitiesFinder,
DataObjectName = InDetKeys.PixelRDOs(),
ClustersName = InDetKeys.PixelClusters())
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ InDetPixelClusterization.RegSelTool = makeRegSelTool_Pixel()
+
topSequence += InDetPixelClusterization
# For SCT
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
index aa539246a6de766792890951d626971dda797c03..a09c78c4d7d1e05a2e20c1eb5cb83daa7989716e 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
@@ -234,24 +234,24 @@ if doPixel:
else:
IdMappingDat="PixelCabling/Pixels_Atlas_IdMapping_May08.dat"
- condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg",
- UseDeadmapConditions=(not athenaCommonFlags.isOnline()),
- UseDCSStateConditions=(globalflags.DataSource=='data') and InDetFlags.usePixelDCS(),
- UseDCSStatusConditions=(globalflags.DataSource=='data') and InDetFlags.usePixelDCS(),
- UseTDAQConditions=athenaCommonFlags.isOnline(),
- ReadDeadMapKey="/PIXEL/PixMapOverlay",
- UseCalibConditions=True,
- UseCablingConditions=useCablingConditions,
- CablingMapFileName=IdMappingDat)
+ alg = PixelConfigCondAlg(name="PixelConfigCondAlg",
+ UseCablingConditions=useCablingConditions,
+ CablingMapFileName=IdMappingDat)
+ if athenaCommonFlags.isOnline():
+ alg.ReadDeadMapKey = ""
+ condSeq += alg
if useNewDeadmapFormat:
if not conddb.folderRequested("/PIXEL/PixelModuleFeMask"):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixelModuleFeMask", className="CondAttrListCollection")
if not hasattr(condSeq, "PixelDeadMapCondAlg"):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDeadMapCondAlg
- condSeq += PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ alg = PixelDeadMapCondAlg(name="PixelDeadMapCondAlg")
+ if athenaCommonFlags.isOnline():
+ alg.ReadKey = ""
+ condSeq += alg
- if not athenaCommonFlags.isOnline():
+ if globalflags.DataSource=='data' and InDetFlags.usePixelDCS():
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATE"):
conddb.addFolder("DCS_OFL", "/PIXEL/DCS/FSMSTATE", className="CondAttrListCollection")
if not conddb.folderRequested("/PIXEL/DCS/FSMSTATUS"):
@@ -415,6 +415,7 @@ if doPixel:
ToolSvc += NeuralNetworkToHistoTool
from SiClusterizationTool.SiClusterizationToolConf import InDet__NnClusterizationFactory
NnClusterizationFactory = InDet__NnClusterizationFactory(name = "NnClusterizationFactory",
+ NnCollectionJSONReadKey = "",
PixelLorentzAngleTool = ToolSvc.PixelLorentzAngleTool,
useToT = InDetFlags.doNNToTCalibration(),
NnCollectionReadKey = "PixelClusterNN",
diff --git a/InnerDetector/InDetRecEvent/SiSpacePoint/doc/packagedoc.h b/InnerDetector/InDetRecEvent/SiSpacePoint/doc/packagedoc.h
index f5c76f3bfdf7dd0748d099afa684dbf08627eede..fef1a36bb4c7c5e91a4b260c315c372474b348cd 100644
--- a/InnerDetector/InDetRecEvent/SiSpacePoint/doc/packagedoc.h
+++ b/InnerDetector/InDetRecEvent/SiSpacePoint/doc/packagedoc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -9,19 +9,16 @@
@section SiSpacePoint_SiSpacePointIntro Introduction
This package contains the definition and implementation for the
-classes SCT_SpacePoint and PixelSpacePoint. Both classes are derived from
-TrkSpacePoint.
+InDet::PixelSpacePoint and InDet::SCT_SpacePoint classes. Both classes are derived from
+Trk::TrkSpacePoint.
@section SiSpacePoint_SiSpacePoint Class Overview
The SiSpacePoint package contains the following classes:
- - PixelSpacePoint: The SpacePoints for the PixelDetector.
- Most information is taken from PrepRawData, which is
- given to the constructor. Local errors are set
- (assumed constant for the time being) and global errors
- are derived from them. Local errors are
- assumed constant for the time being. They are only initialized when
- inquired and buffered after that.
+ - InDet::PixelSpacePoint: The SpacePoints for the PixelDetector.
+ Most information including local errors is taken from PrepRawData, which is
+ given to the constructor.
+ Global errors are derived from them local errors.
- SCT_SpacePoint: The SpacePoints for the SCT. Most
information is derived from the GlobalPosition, which
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h
index 4e6fbbe456a5b3049cb06a52bd3e6ffe924e62b1..fbfed48bbd10928bdcfc9bcca09f6b2f1a799e68 100755
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h
@@ -57,8 +57,10 @@ namespace InDet
/** standard Athena-Algorithm method */
virtual StatusCode finalize() override;
- virtual std::tuple<Trk::Track*,bool> getCleanedOutTrack ATLAS_NOT_THREAD_SAFE
- (const Trk::Track *track, const Trk::TrackScore score, Trk::PRDtoTrackMap &prd_to_track_map) const override;
+ virtual std::tuple<Trk::Track*,bool> getCleanedOutTrack(const Trk::Track *track,
+ const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
+ Trk::PRDtoTrackMap &prd_to_track_map) const override;
private:
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h
index 062edc8c302d69cb1fbb2ffb94549edd2c47fa65..652827d17ed1080b7651bdcd28f0142bbcb21a79 100755
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h
@@ -28,8 +28,6 @@
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
-#include "CxxUtils/checker_macros.h"
-
#include "GaudiKernel/ToolHandle.h"
#include <cmath> //for std::fabs in implementation of structs in this header
@@ -71,10 +69,10 @@ namespace InDet
/** standard Athena-Algorithm method */
virtual StatusCode finalize() override;
- virtual std::tuple<Trk::Track*,bool> getCleanedOutTrack ATLAS_NOT_THREAD_SAFE
- (const Trk::Track*,
- const Trk::TrackScore score,
- Trk::PRDtoTrackMap &prd_to_track_map) const override;
+ virtual std::tuple<Trk::Track*,bool> getCleanedOutTrack(const Trk::Track *track,
+ const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
+ Trk::PRDtoTrackMap &prd_to_track_map) const override;
private:
@@ -275,6 +273,7 @@ namespace InDet
/** Fill the two structs TrackHitDetails & TSoS_Details full of information*/
void fillTrackDetails(const Trk::Track* ptrTrack,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
const Trk::PRDtoTrackMap &prd_to_track_map,
TrackHitDetails& trackHitDetails,
TSoS_Details& tsosDetails ) const;
@@ -282,6 +281,7 @@ namespace InDet
/** Determine which hits to keep on this track*/
bool decideWhichHitsToKeep(const Trk::Track*,
const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map,
TrackHitDetails& trackHitDetails,
TSoS_Details& tsosDetails,
@@ -289,7 +289,8 @@ namespace InDet
CacheEntry* ent) const;
/** Update the pixel clusters split information*/
- void updatePixelClusterInformation ATLAS_NOT_THREAD_SAFE (TSoS_Details& tsosDetails) const;
+ void setPixelClusterSplitInformation(TSoS_Details& tsosDetails,
+ Trk::ClusterSplitProbabilityContainer &clusterSplitProbMap) const;
/** Check if the cluster is compatible with a hadronic cluster*/
bool isHadCaloCompatible(const Trk::TrackParameters& Tp, CacheEntry* ent) const;
@@ -307,6 +308,7 @@ namespace InDet
*/
int checkOtherTracksValidity(const Trk::RIO_OnTrack*,
bool isSplitable,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map,
int& maxiShared,
int& maxothernpixel,
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetAmbiTrackSelectionTool.cxx b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetAmbiTrackSelectionTool.cxx
index ebf8b5cb80815ea438f6aabf278a3e0dd4ecc38b..98b1c95276a507ca14dea7a55e6011d7dd3c9e05 100755
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetAmbiTrackSelectionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetAmbiTrackSelectionTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -22,6 +22,7 @@
#include "TrkTrack/TrackInfo.h"
#include "TrkTrackSummary/TrackSummary.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
//================ Constructor =================================================
@@ -68,6 +69,7 @@ StatusCode InDet::InDetAmbiTrackSelectionTool::finalize()
//============================================================================================
std::tuple<Trk::Track*,bool> InDet::InDetAmbiTrackSelectionTool::getCleanedOutTrack(const Trk::Track *ptrTrack,
const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map) const
{
// flag if the track is ok (true) or needs cleaning (false)
@@ -285,7 +287,8 @@ std::tuple<Trk::Track*,bool> InDet::InDetAmbiTrackSelectionTool::getCleanedOutTr
} else {
// split clusters are not allowed to be shared at all, unless
- if ( clus->isSplit() ) {
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = splitProbContainer.splitProbability(clus);
+ if ( splitProb.isSplit() ) {
ATH_MSG_VERBOSE ("-----> Pixel cluster is split, reject shared hit !!!");
tsosType[index] = RejectedHit;
// mark track as bad !
@@ -296,9 +299,9 @@ std::tuple<Trk::Track*,bool> InDet::InDetAmbiTrackSelectionTool::getCleanedOutTr
// is cluster compatible with being a shared cluster ?
// A.S.: also a hack for the max size: allows large clusters that are exluded from the splitter to be shared
// needs isExcluded() flag in the future
- if (clus->splitProbability1() < m_sharedProbCut && clus->rdoList().size() <= size_t(m_maxSplitSize) ) {
+ if (splitProb.splitProbability1() < m_sharedProbCut && clus->rdoList().size() <= size_t(m_maxSplitSize) ) {
ATH_MSG_VERBOSE ("-----> Pixel cluster is not compatible with being shared (splitProb = "
- << clus->splitProbability1() << ") , reject shared hit !!!");
+ << splitProb.splitProbability1() << ") , reject shared hit !!!");
tsosType[index] = RejectedHit;
// mark track as bad !
TrkCouldBeAccepted = false; // we have to remove at least one PRD
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetDenseEnvAmbiTrackSelectionTool.cxx b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetDenseEnvAmbiTrackSelectionTool.cxx
index 55692118baf2ce9019d9cbd58216c281102dcafd..01664c47c1f3d934c22c27711a7c620f3b0786cc 100755
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetDenseEnvAmbiTrackSelectionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/InDetDenseEnvAmbiTrackSelectionTool.cxx
@@ -25,6 +25,7 @@
#include "TrkTrack/TrackInfo.h"
#include "TrkTrack/TrackStateOnSurface.h"
#include "TrkTrackSummary/TrackSummary.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
#include "TString.h"
@@ -117,9 +118,9 @@ void InDet::InDetDenseEnvAmbiTrackSelectionTool::newEvent(CacheEntry* ent) const
}
//============================================================================================
-std::tuple<Trk::Track*,bool> InDet::InDetDenseEnvAmbiTrackSelectionTool::getCleanedOutTrack ATLAS_NOT_THREAD_SAFE // This method uses thread unsafe updatePixelClusterInformation method and is not thread safe.
- (const Trk::Track* ptrTrack,
+std::tuple<Trk::Track*,bool> InDet::InDetDenseEnvAmbiTrackSelectionTool::getCleanedOutTrack(const Trk::Track *ptrTrack,
const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map) const
{
const EventContext& ctx{Gaudi::Hive::currentContext()};
@@ -165,11 +166,11 @@ std::tuple<Trk::Track*,bool> InDet::InDetDenseEnvAmbiTrackSelectionTool::getClea
TSoS_Details tsosDetails(tsos->size());
// Fill structs will information
- fillTrackDetails( ptrTrack, prd_to_track_map, trackHitDetails, tsosDetails );
+ fillTrackDetails( ptrTrack, splitProbContainer, prd_to_track_map, trackHitDetails, tsosDetails);
//Decide which hits to keep
ATH_MSG_DEBUG ("DecideWhichHitsToKeep");
- bool TrkCouldBeAccepted = decideWhichHitsToKeep( ptrTrack, score, prd_to_track_map, trackHitDetails, tsosDetails, nCutTRT, ent );
+ bool TrkCouldBeAccepted = decideWhichHitsToKeep( ptrTrack, score, splitProbContainer, prd_to_track_map, trackHitDetails, tsosDetails, nCutTRT, ent );
ATH_MSG_DEBUG ("DecidedWhichHitsToKeep " << TrkCouldBeAccepted );
@@ -235,7 +236,7 @@ std::tuple<Trk::Track*,bool> InDet::InDetDenseEnvAmbiTrackSelectionTool::getClea
// Change pixel hits property for shared hits as this track will be accepted into the final track colection
if (!trackHitDetails.isPatternTrack){
- updatePixelClusterInformation( tsosDetails );
+ setPixelClusterSplitInformation( tsosDetails, splitProbContainer );
}
return std::make_tuple(static_cast<Trk::Track *>(nullptr),true); // keep input track
@@ -310,7 +311,7 @@ std::tuple<Trk::Track*,bool> InDet::InDetDenseEnvAmbiTrackSelectionTool::getClea
bool isSplitable = tsosDetails.splitProb1[index] >= m_sharedProbCut || tsosDetails.splitProb2[index] >= m_sharedProbCut2;
- int numberOfTracksWithThisPrd = checkOtherTracksValidity( rot, isSplitable, prd_to_track_map, maxiShared, maxothernpixel, maxotherhasblayer, otherfailsMinUniqueHits, ent);
+ int numberOfTracksWithThisPrd = checkOtherTracksValidity( rot, isSplitable, splitProbContainer, prd_to_track_map, maxiShared, maxothernpixel, maxotherhasblayer, otherfailsMinUniqueHits, ent);
// now decide what to do, can we keep the shared hit
@@ -365,7 +366,7 @@ std::tuple<Trk::Track*,bool> InDet::InDetDenseEnvAmbiTrackSelectionTool::getClea
// Change pixel hits property for shared hits as this is track will be accepeted into the final track colection
if (!trackHitDetails.isPatternTrack){
- updatePixelClusterInformation( tsosDetails );
+ setPixelClusterSplitInformation( tsosDetails, splitProbContainer );
}
ATH_MSG_DEBUG ("reject track; maybe track was mark as rejected, but we recoverd it so no rejection");
return std::make_tuple(static_cast<Trk::Track *>(nullptr),true); // keep input track
@@ -397,6 +398,7 @@ std::tuple<Trk::Track*,bool> InDet::InDetDenseEnvAmbiTrackSelectionTool::getClea
int InDet::InDetDenseEnvAmbiTrackSelectionTool::checkOtherTracksValidity(const Trk::RIO_OnTrack* rot,
const bool isSplitable,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map,
int& maxiShared,
int& maxothernpixel,
@@ -449,7 +451,8 @@ int InDet::InDetDenseEnvAmbiTrackSelectionTool::checkOtherTracksValidity(const
isPixel = true;
const InDet::PixelCluster* constPixelCluster = dynamic_cast<const InDet::PixelCluster*> ( prdToCheck );
if (constPixelCluster){
- if ( constPixelCluster->isSplit() ) {
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = splitProbContainer.splitProbability(constPixelCluster);
+ if ( splitProb.isSplit() ) {
isSplitPixel = true;
}
}
@@ -497,9 +500,10 @@ int InDet::InDetDenseEnvAmbiTrackSelectionTool::checkOtherTracksValidity(const
void InDet::InDetDenseEnvAmbiTrackSelectionTool::fillTrackDetails(const Trk::Track* ptrTrack,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
const Trk::PRDtoTrackMap &prd_to_track_map,
TrackHitDetails& trackHitDetails,
- TSoS_Details& tsosDetails ) const
+ TSoS_Details& tsosDetails) const
{
ATH_MSG_DEBUG ("filltrackdetails just got called "); //WPM
@@ -596,12 +600,13 @@ void InDet::InDetDenseEnvAmbiTrackSelectionTool::fillTrackDetails(const Trk::Tra
tsosDetails.type[index] = RejectedHit;
continue;
} else {
- if ( !clus->tooBigToBeSplit() ) {
- tsosDetails.splitProb1[index] = clus->splitProbability1();
- tsosDetails.splitProb2[index] = clus->splitProbability2();
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = splitProbContainer.splitProbability(clus);
+ if ( !splitProb.isTooBigToBeSplit() ) {
+ tsosDetails.splitProb1[index] = splitProb.splitProbability1();
+ tsosDetails.splitProb2[index] = splitProb.splitProbability2();
} else {
tsosDetails.splitProb1[index] = 0.51;
- tsosDetails.splitProb2[index] = 0.51;
+ tsosDetails.splitProb2[index] = 0.51;
}
}
}
@@ -717,6 +722,7 @@ void InDet::InDetDenseEnvAmbiTrackSelectionTool::fillTrackDetails(const Trk::Tra
bool InDet::InDetDenseEnvAmbiTrackSelectionTool::decideWhichHitsToKeep(const Trk::Track* ptrTrack,
const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map,
TrackHitDetails& trackHitDetails,
TSoS_Details& tsosDetails,
@@ -1198,7 +1204,15 @@ bool InDet::InDetDenseEnvAmbiTrackSelectionTool::decideWhichHitsToKeep(const Trk
bool maxotherhasblayer = false;
bool otherfailsMinUniqueHits = false;
bool isSplitable = tsosDetails.splitProb1[index] >= m_sharedProbCut || tsosDetails.splitProb2[index] >= m_sharedProbCut2;
- int numberOfTracksWithThisPrd = checkOtherTracksValidity( tsosDetails.RIO[index], isSplitable, prd_to_track_map, maxiShared, maxothernpixel, maxotherhasblayer, otherfailsMinUniqueHits, ent);
+ int numberOfTracksWithThisPrd = checkOtherTracksValidity( tsosDetails.RIO[index],
+ isSplitable,
+ splitProbContainer,
+ prd_to_track_map,
+ maxiShared,
+ maxothernpixel,
+ maxotherhasblayer,
+ otherfailsMinUniqueHits,
+ ent);
if (numberOfTracksWithThisPrd > 0 && ( otherfailsMinUniqueHits || maxiShared >= ent->m_maxShared )){
TrkCouldBeAccepted = false;
@@ -1254,9 +1268,9 @@ Trk::Track* InDet::InDetDenseEnvAmbiTrackSelectionTool::createSubTrack( const st
}
-
//==========================================================================================
-void InDet::InDetDenseEnvAmbiTrackSelectionTool::updatePixelClusterInformation ATLAS_NOT_THREAD_SAFE (TSoS_Details& tsosDetails) const // This method uses const_cast and is not thread safe.
+void InDet::InDetDenseEnvAmbiTrackSelectionTool::setPixelClusterSplitInformation(TSoS_Details& tsosDetails,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer) const
{
for (unsigned int index(0); index < tsosDetails.nTSoS; ++index ){
@@ -1266,13 +1280,14 @@ void InDet::InDetDenseEnvAmbiTrackSelectionTool::updatePixelClusterInformation A
// And the hit is a pixel hit
if (tsosDetails.detType[index]%10 == 1){
- const InDet::PixelCluster* constPixelCluster = dynamic_cast<const InDet::PixelCluster*> ( tsosDetails.RIO[index]->prepRawData() );
- if (constPixelCluster){
- InDet::PixelCluster* pixelCluster = const_cast<InDet::PixelCluster*> ( constPixelCluster );
- if ( !pixelCluster->isSplit() ) {
- pixelCluster->packSplitInformation( true, pixelCluster->splitProbability1(), pixelCluster->splitProbability2() );
+ const InDet::PixelCluster* pixelCluster = dynamic_cast<const InDet::PixelCluster*> ( tsosDetails.RIO[index]->prepRawData() );
+ if (pixelCluster){
+ Trk::ClusterSplitProbabilityContainer::ProbabilityInfo *splitProb = splitProbContainer.getSplitProbability(pixelCluster);
+ if (!splitProb) {
+ splitProb = &(splitProbContainer.setSplitInformation(pixelCluster,0.f,0.f));
}
- } else {
+ splitProb->setSplit(true);
+ } else {
ATH_MSG_WARNING("Cast of a pixel cluster failed????");
}
}
diff --git a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
index a3b3397bbd884b629098d5c84505103a2273a5d0..6c296201f49c1d1ff8d546cbf27d9156526d1ea1 100644
--- a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
+++ b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
@@ -9,8 +9,9 @@
#ifndef INDETSECVTXTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
#define INDETSECVTXTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
-#include "AsgTools/StatusCode.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgTools/IAsgTool.h"
#include "xAODTracking/TrackingPrimitives.h"
#include "xAODTracking/TrackParticle.h"
diff --git a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackSelectionTool.cxx b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackSelectionTool.cxx
index 5bdef6ccb254833296a7e862ba80682e72cc2b12..7f2829fade8c68d2fdf8e09eff87c0f52310938b 100644
--- a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackSelectionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackSelectionTool.cxx
@@ -6,7 +6,7 @@
#include "InDetSecVtxTrackSelectionTool/InDetSecVtxTrackSelectionTool.h"
#include "InDetSecVtxTrackCut.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "xAODTracking/TrackingPrimitives.h"
#ifndef XAOD_ANALYSIS
#include "TrkTrack/Track.h"
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt
index 9d4d98545fb63a70db7649e120aa116a1e0952ba..2c0ff13b1f580cccdf8bf3804b9f47ee8387a539 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/CMakeLists.txt
@@ -6,35 +6,6 @@
atlas_subdir( InDetSecVxFinderTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- InnerDetector/InDetRecTools/InDetRecToolInterfaces
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkTrackLink
- PRIVATE
- Event/EventPrimitives
- Event/xAOD/xAODTracking
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkLinks
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/VxJetVertex
- Tracking/TrkEvent/VxSecVertex
- Tracking/TrkEvent/VxVertex
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkTools/TrkToolInterfaces
- Tracking/TrkVertexFitter/TrkJetVxFitter
- Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
- Tracking/TrkVertexFitter/TrkVertexFitters
- Tracking/TrkVertexFitter/TrkVertexSeedFinderTools
- Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils
- Tracking/TrkVertexFitter/TrkVxEdmCnv )
-
# External dependencies:
find_package( CLHEP )
find_package( Eigen )
@@ -48,10 +19,10 @@ atlas_add_library( InDetSecVxFinderToolLib
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel InDetRecToolInterfaces TrkParameters TrkParticleBase TrkJetVxFitterLib TrkVertexFittersLib TrkVxEdmCnvLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventPrimitives xAODTracking TrkSurfaces TrkEventPrimitives TrkLinks TrkNeutralParameters TrkTrack VxJetVertex VxSecVertex VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventPrimitives xAODTracking TrkSurfaces TrkEventPrimitives TrkLinks TrkNeutralParameters TrkTrack VxJetVertex VxSecVertex VxVertex TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib TrkVertexSeedFinderToolsLib )
atlas_add_component( InDetSecVxFinderTool
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel InDetRecToolInterfaces TrkParameters TrkParticleBase EventPrimitives xAODTracking TrkSurfaces TrkEventPrimitives TrkLinks TrkNeutralParameters TrkTrack VxJetVertex VxSecVertex VxVertex TrkExInterfaces TrkToolInterfaces TrkJetVxFitterLib TrkVertexFitterInterfaces TrkVertexFittersLib TrkVxEdmCnvLib InDetSecVxFinderToolLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel InDetRecToolInterfaces TrkParameters TrkParticleBase EventPrimitives xAODTracking TrkSurfaces TrkEventPrimitives TrkLinks TrkNeutralParameters TrkTrack VxJetVertex VxSecVertex VxVertex TrkExInterfaces TrkToolInterfaces TrkJetVxFitterLib TrkVertexFitterInterfaces TrkVertexFittersLib TrkVxEdmCnvLib InDetSecVxFinderToolLib TrkVertexSeedFinderToolsLib )
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
index da8aa4ff8e46730155227c84f84c1d9d55322821..ecc984ff3cc74672a0e04ccbb3afaa66204c1e69 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h
@@ -14,6 +14,8 @@
christian.weiser@cern.ch
changes: second version in January 2008!
+ 2008 (c) Atlas Detector Software
+
This class implements the finder functionality for using
the JetFitter algorithm. It uses as input a ParticleJet and
then gives the VxJetCandidate out after having performed the
@@ -36,25 +38,18 @@
#include "TrkTrackLink/ITrackLink.h"
namespace Trk {
- class IVertexFitter;
class TrackParticleBase;
class VxSecVertexInfo;
class VxJetCandidate;
class RecVertex;
- class JetFitterInitializationHelper;
- class JetFitterHelper;
- class JetFitterRoutines;
- class ITrackSelectorTool;
- class IExtrapolator;
- class IVertexSeedFinder;
- class IMode3dFinder;
- class INeutralParticleParameterCalculator;
- class IVxCandidateXAODVertex;
}
-namespace InDet
-{
- class InDetJetFitterUtils;
+// Hackathon: add any new package here
+namespace InDet {
+ class JetFitterTrackSelectorTool;
+ class JetFitterTwoTrackVtxFinderTool;
+ class JetFitterV0FinderTool;
+ class JetFitterMultiStageFit;
}
namespace xAOD
@@ -64,17 +59,11 @@ namespace xAOD
namespace InDet {
- // static const InterfaceID IID_InDetImprovedJetFitterVxFinder("InDetImprovedJetFitterVxFinder", 1, 0);
-
class InDetImprovedJetFitterVxFinder : public AthAlgTool, public ISecVertexInJetFinder
{
-
+
public:
-
- //static const InterfaceID& interfaceID() {
- //return IID_InDetImprovedJetFitterVxFinder;
- //}
-
+
StatusCode initialize();
StatusCode finalize();
@@ -84,20 +73,13 @@ namespace InDet {
~InDetImprovedJetFitterVxFinder();
- Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & primaryVertex,
- const TLorentzVector & jetMomentum,
- const std::vector<const xAOD::IParticle*> & inputTracks) const;
-
- Trk::VxSecVertexInfo* findSecVertex(const Trk::RecVertex & primaryVertex,
- const TLorentzVector & jetMomentum,
- const std::vector<const Trk::TrackParticleBase*> & inputTracks) const;
+ virtual Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & primaryVertex,
+ const TLorentzVector & jetMomentum,
+ const std::vector<const xAOD::IParticle*> & inputTracks) const;
private:
-
- Trk::VxSecVertexInfo* doTheFinding(const xAOD::Vertex & primaryVertex, //const Trk::RecVertex & primaryVertex ,
- const TLorentzVector & jetMomentum,
- const std::vector<const Trk::ITrackLink*> & myTracks) const;
-
+
+ void sortTrackCollectionByPt( std::vector< const Trk::ITrackLink* >& ) const;
Trk::VxJetCandidate* findSecVertex(const Trk::RecVertex & primaryVertex,
const TLorentzVector & jetMomentum,
@@ -109,115 +91,12 @@ namespace InDet {
void doTheFit(Trk::VxJetCandidate* myJetCandidate,
bool performClustering=true) const;
-
- ToolHandle<Trk::JetFitterInitializationHelper> m_initializationHelper;
- ToolHandle<Trk::JetFitterHelper> m_helper;
- ToolHandle<Trk::JetFitterRoutines> m_routines;
- ToolHandle<Trk::ITrackSelectorTool> m_trkFilter;
- ToolHandle<Trk::IExtrapolator> m_extrapolator;
- ToolHandle<InDet::InDetJetFitterUtils> m_jetFitterUtils;
- ToolHandle<Trk::IVertexSeedFinder> m_CrossDistancesSeedFinder;
- ToolHandle<Trk::IMode3dFinder> m_mode3dfinder;
- ToolHandle<Trk::IVertexFitter> m_SequentialVertexFitter;
- //ToolHandle<Trk::INeutralParticleParameterCalculator> m_convUtils;
- ToolHandle< Trk::IVxCandidateXAODVertex > m_VertexEdmFactory;
-
-
- int m_maxNumDeleteIterations;
- double m_vertexProbCut;
- int m_maxClusteringIterations;
- double m_vertexClusteringProbabilityCut;
- double m_vertexClusteringProbabilityCutWithMass;
- double m_vertexClusteringProbabilityCutWithMass0010;
- double m_vertexClusteringProbabilityCutWithMass1015;
- double m_vertexClusteringProbabilityCutWithMass1520;
- double m_vertexClusteringProbabilityCutWithMass2025;
- double m_vertexClusteringProbabilityCutWithMass2530;
- double m_vertexClusteringProbabilityCutWithMass3040;
- double m_vertexClusteringProbabilityCutWithMass4050;
- double m_vertexClusteringProbabilityCutWithMass5060;
- double m_vertexClusteringProbabilityCutWithMass6070;
- double m_vertexClusteringTwoVtxMassForProbCut;
-
- bool m_useFastClustering;
-
- double m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks;
- double m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks;
- double m_twoVertexProbabilityCut;
- double m_cutDeltaMKs;
- double m_cutDeltaMLambda;
- double m_cutDeltaMGamma;
- double m_cutCompatibilityPrimaryVertexSingleTrackForKsAndLambda;
- double m_cutCompatibilityPrimaryVertexBothTracksForKsAndLambda;
- double m_cutTwoTrkVtxLifetimeSignificanceForKs;
- double m_cutTwoTrkVtxLifetimeSignificanceForLambda;
- double m_cutIPD0BothTracksCriteriumOneForKsAndLambda;
- double m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
- double m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda;
- double m_cutCompatibilityChi2ToPrimaryNeutralTrackFromConversion;
- double m_cutCompatibilityChi2ToPrimaryNeutralTrackFromKs;
- double m_cutCompatibilityChi2ToPrimaryNeutralTrackFromLambda;
- double m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection;
- double m_cutCompatibilityPrimaryVertexBothTracksForBFirstSelection;
- double m_cutIPD0BothTracksForBFirstSelection;
- double m_cutIPZ0BothTracksForBFirstSelection;
- double m_cutPtBothTracksForBFirstSelection;
- double m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium;
- double m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium;
- double m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium;
- double m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium;
-//material interaction removal... (is it usefull at all???)
- double m_firstBeam_min;
- double m_firstBeam_max;
- double m_secondBeam_min;
- double m_secondBeam_max;
- double m_firstLayer_min;
- double m_firstLayer_max;
- double m_secondLayer_min;
- double m_secondLayer_max;
- double m_cutCompatibilityToPrimarySingleTrackForMatInteractions;
- double m_cutCompatibilityToPrimaryBothTracksForMatInteractions;
-//cuts for additional tracks (SecondSelection)
- double m_cutIPD0SingleTrackForBSecondSelection;
- double m_cutIPZ0SingleTrackForBSecondSelection;
- double m_cutPtSingleTrackForBSecondSelection;
- double m_cutIPD0SigBoxSingleTrackForBSecondSelection; //box cut for PU rejection in 1-t vtx
- double m_cutIPZ0SigBoxSingleTrackForBSecondSelection; //box cut for PU rejection in 1-t vtx
- double m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection;
- double m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection;
-//don't use the primary vertex finder information to estimate the compatibility!
- double m_doNotUsePrimaryVertexCombatibilityInfo;
-//invert the cuts for estimating the negative tags!
- bool m_revertFromPositiveToNegativeTags;
-
- /*
- * Avoid vertex to be initialize outside ID envelope given bu m_maxR and m_maxZ
- */
-
- double m_maxR;
- double m_maxZ;
-
- std::string m_VxContainerName;
-
+ private:
+ ToolHandle< JetFitterTrackSelectorTool > m_theTrackSelector {this,"JetFitterTrackSelectorTool","JetFitterTrackSelectorTool/JetFitterTrackSelectorTool",""}; //Hackathon addition
+ ToolHandle< JetFitterTwoTrackVtxFinderTool > m_theTwoTrackVtxFinderTool {this,"JetFitterTwoTrackVtxFinderTool","JetFitterV0FinderTool/JetFitterTwoTrackVtxFinderTool",""}; //Hackathon addition
+ ToolHandle< JetFitterV0FinderTool > m_theV0FinderTool {this,"JetFitterV0FinderTool","JetFitterV0FinderTool/JetFitterV0FinderTool",""}; //Hackathon addition
+ ToolHandle< JetFitterMultiStageFit > m_multiStageFitter {this,"JetFitterMultiStageFit","JetFitterMultiStageFit/JetFitterMultiStageFit",""}; //Hackathon addition
- /*
- * Number of tracks above which do not perform detailed clustering
- * (to avoid explosion of combinatorics)
- */
-
- int m_maxTracksForDetailedClustering;
-
- /*
- * sum pT dependent cuts on track pT
- * pT(track)< pTMinOffset + pTsum * m_pTMinSlope
- * OR pTsum
- */
- bool m_usepTDepTrackSel;
- double m_pTMinOffset;
- double m_pTMinSlope;
- double m_pTMax;
-
-
};//end class declaration
}//end namespace Rec
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
index a85555615768d0a94c29016519d23626a2c78231..5079e999341f034f4ac44bcb828ea57bf3ce5d48 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterUtils.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -27,16 +27,20 @@
#include "CLHEP/Matrix/SymMatrix.h"
#include "CLHEP/Matrix/Matrix.h"
#include "CLHEP/Vector/LorentzVector.h"
-
+//#include "TrkParticleBase/LinkToTrackParticleBase.h"
+//#include "TrkParticleBase/TrackParticleBaseCollection.h"
+//#include "TrkParticleBase/TrackParticleBase.h"
+//#include "TrkNeutralParameters/NeutralParameters.h"
#include "TrkParameters/TrackParameters.h"
#include "xAODTracking/Vertex.h"
+#include "TrkExInterfaces/IExtrapolator.h"
+#include "TrkVertexFitterInterfaces/IVertexLinearizedTrackFactory.h"
+
namespace Trk {
class VxCandidate;
class LinearizedTrack;
- class IVertexLinearizedTrackFactory;
class RecVertex;
- class IExtrapolator;
class Vertex;
class LinkToTrackParticleBase;
class ITrackLink;
@@ -132,11 +136,9 @@ namespace InDet {
const AmgSymMatrix(3) & vrt_weight) const;
-
-
- ToolHandle<Trk::IVertexLinearizedTrackFactory> m_LinearizedTrackFactory;
- ToolHandle<Trk::IExtrapolator> m_extrapolator;
+ ToolHandle<Trk::IVertexLinearizedTrackFactory> m_LinearizedTrackFactory {this,"LinearizedTrackFactory","Trk::FullLinearizedTrackFactory/FullLinearizedTrackFactory",""};
+ ToolHandle<Trk::IExtrapolator> m_extrapolator {this,"Extrapolator","Trk::Extrapolator/InDetExtrapolator",""};
bool m_extrapolatorIsAvailable;
bool m_linearizedTrackFactoryIsAvailable;
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
index 9679b9e6fce85731b66af3a1f4f5e1d36105b489..c35aea272bb75610fe1f6438d0b95a8d34b9afef 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/InDetJetFitterVxFinder.h
@@ -33,7 +33,6 @@
#include "TrkParticleBase/TrackParticleBase.h"
namespace Trk {
- //class TrackParticleBase;
class VxSecVertexInfo;
class VxJetCandidate;
class RecVertex;
@@ -65,19 +64,18 @@ namespace InDet {
~InDetJetFitterVxFinder();
Trk::VxSecVertexInfo* findSecVertex(const xAOD::Vertex & /*primaryVertex*/,
- const TLorentzVector & /*jetMomentum*/,
- const std::vector<const xAOD::IParticle*> & /*inputTracks*/) const
- {
- /* not implemented */
- return 0;
- }
+ const TLorentzVector & /*jetMomentum*/,
+ const std::vector<const xAOD::IParticle*> & /*inputTracks*/ ) const
+ {
+ /* not implemented */
+ return 0;
+ }
-
- Trk::VxSecVertexInfo* findSecVertex(const Trk::RecVertex & primaryVertex,
+ const Trk::VxSecVertexInfo* findSecVertex(const Trk::RecVertex & primaryVertex,
const TLorentzVector & jetMomentum,
const std::vector<const Trk::TrackParticleBase*> & inputTracks) const;
- Trk::VxSecVertexInfo* findSecVertex(const Trk::RecVertex & primaryVertex,
+ const Trk::VxSecVertexInfo* findSecVertex(const Trk::RecVertex & primaryVertex,
const TLorentzVector & jetMomentum,
const std::vector<const Trk::TrackParticleBase*> & firstInputTracks,
const std::vector<const Trk::TrackParticleBase*> & secondInputTracks,
@@ -88,20 +86,19 @@ namespace InDet {
void doTheFit(Trk::VxJetCandidate* myJetCandidate,
bool performClustering=true) const;
-
- ToolHandle<Trk::JetFitterInitializationHelper> m_initializationHelper;
- ToolHandle<Trk::JetFitterHelper> m_helper;
- ToolHandle<Trk::JetFitterRoutines> m_routines;
- ToolHandle<Trk::ITrackSelectorTool> m_trkFilter;
+ ToolHandle< Trk::JetFitterInitializationHelper > m_initializationHelper {this,"JetFitterInitializationHelper","Trk::JetFitterInitializationHelper",""};
+ ToolHandle< Trk::JetFitterHelper > m_helper {this,"JetFitterHelper","Trk::JetFitterHelper",""};
+ ToolHandle< Trk::JetFitterRoutines > m_routines {this,"JetFitterRoutines","Trk::JetFitterRoutines",""};
+ ToolHandle< Trk::ITrackSelectorTool > m_trkFilter {this,"TrackSelector","InDet::InDetDetailedTrackSelectorTool",""};
- int m_maxNumDeleteIterations;
- float m_vertexProbCut;
- int m_maxClusteringIterations;
- float m_vertexClusteringProbabilityCut;
- bool m_useFastClustering;
+ Gaudi::Property< int > m_maxNumDeleteIterations {this,"MaxNumDeleteIterations",30,""};
+ Gaudi::Property< float > m_vertexProbCut {this,"VertexProbCut",0.01,""};
+ Gaudi::Property< int > m_maxClusteringIterations {this,"MaxClusteringIterations",30,""};
+ Gaudi::Property< float > m_vertexClusteringProbabilityCut {this,"VertexClusteringProbabilityCut",0.01,""};
+ Gaudi::Property< bool > m_useFastClustering {this,"UseFastClustering",false,""};
- int m_maxTracksToFitAtOnce;
+ Gaudi::Property< int > m_maxTracksToFitAtOnce {this,"MaxTracksToFitAtOnce",15,""};
};//end class declaration
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
new file mode 100644
index 0000000000000000000000000000000000000000..f5308e779b83e947d7a5101b87053893359fe4e7
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterMultiStageFit.h
@@ -0,0 +1,92 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*
+ * This tooltakes the tracks divided into those for a first fit, and additional tracks for a second
+ * It initializes a jet candidate, which consists of vertices with tracks fitted to them
+ * It runs the full JetFitter fitting algorithm, that is the merge cluster and kalman fit
+ * It returns the JetFitter output info
+ */
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "TrkTrackLink/ITrackLink.h"
+#include "TLorentzVector.h"
+
+#include "TrkJetVxFitter/JetFitterRoutines.h"
+#include "TrkJetVxFitter/JetFitterHelper.h"
+#include "TrkJetVxFitter/JetFitterInitializationHelper.h"
+#include "InDetSecVxFinderTool/InDetJetFitterUtils.h"
+
+namespace Trk {
+ class VxJetCandidate;
+ class RecVertex;
+}
+
+namespace InDet {
+
+
+static const InterfaceID IID_JetFitterMultiStageFit("JetFitterMultiStageFit", 1, 0);
+
+class JetFitterMultiStageFit : public AthAlgTool {
+public:
+
+ static const InterfaceID &interfaceID() {
+ return IID_JetFitterMultiStageFit;
+ }
+
+ StatusCode initialize();
+
+ StatusCode finalize();
+
+ JetFitterMultiStageFit(const std::string &t, const std::string &n, const IInterface *p);
+
+ ~JetFitterMultiStageFit();
+
+ /*
+ * Method for performing the two stage fit
+ */
+ Trk::VxJetCandidate* doTwoStageFit( const Trk::RecVertex & primaryVertex,
+ const TLorentzVector & jetMomentum,
+ const std::vector<const Trk::ITrackLink*> & firstInputTracks,
+ const std::vector<const Trk::ITrackLink*> & secondInputTracks,
+ const Amg::Vector3D & vtxSeedDirection) const;
+
+
+private:
+ /*
+ * Method which runs the merge procedure, at each cycle using the kalman filter
+ */
+ void doTheFit(Trk::VxJetCandidate* myJetCandidate,
+ bool performClustering=true) const;
+
+ ToolHandle< Trk::JetFitterInitializationHelper > m_initializationHelper {this,"JetFitterInitializationHelper","Trk::JetFitterInitializationHelper",""};
+ ToolHandle< Trk::JetFitterHelper > m_helper {this,"JetFitterHelper","Trk::JetFitterHelper",""};
+ ToolHandle< Trk::JetFitterRoutines > m_routines {this,"JetFitterRoutines","Trk::JetFitterRoutines",""};
+ ToolHandle< InDet::InDetJetFitterUtils > m_jetFitterUtils {this,"InDetJetFitterUtils","InDet::InDetJetFitterUtils/InDetJetFitterUtils",""};
+
+ Gaudi::Property< int > m_maxNumDeleteIterations {this,"MaxNumDeleteIterations",30,""};
+ Gaudi::Property< double > m_vertexProbCut {this,"VertexProbCut",0.001,""};
+ Gaudi::Property< int > m_maxClusteringIterations {this,"MaxClusteringIterations",30,""};
+
+ Gaudi::Property< bool > m_useFastClustering {this,"UseFastClustering",false,""};
+
+ // to avoid combinatoric slow down, limit on max tracks for detailed clustering
+ Gaudi::Property< int > m_maxTracksForDetailedClustering {this,"maxTracksForDetailedClustering",25,""};
+
+ Gaudi::Property< double > m_vertexClusteringProbabilityCut {this,"VertexClusteringProbabilityCut",0.005,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass {this,"VertexClusteringProbabilityCutWithMass",0.05,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass0010 {this,"VertexClusteringProbabilityCutWithMass0010",0.002,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass1015 {this,"VertexClusteringProbabilityCutWithMass1015",0.002,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass1520 {this,"VertexClusteringProbabilityCutWithMass1520",0.050,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass2025 {this,"VertexClusteringProbabilityCutWithMass2025",0.100,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass2530 {this,"VertexClusteringProbabilityCutWithMass2530",0.200,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass3040 {this,"VertexClusteringProbabilityCutWithMass3040",0.500,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass4050 {this,"VertexClusteringProbabilityCutWithMass4050",0.700,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass5060 {this,"VertexClusteringProbabilityCutWithMass5060",0.900,""};
+ Gaudi::Property< double > m_vertexClusteringProbabilityCutWithMass6070 {this,"VertexClusteringProbabilityCutWithMass6070",0.900,""};
+
+};
+
+}
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..e8d4d1a1eaa101ecddb5c6554fe2f5740fdb1e29
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTrackSelectorTool.h
@@ -0,0 +1,73 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*
+ * This tooltakes the input track collection of a jet candidate
+ * It runs a filter on track quality
+ * And separates tracks into primary vertex and secondary vertex tracks
+ * By computing their compatibility with the primary vertex
+ */
+
+#ifndef JETFITTER_TRACKSELECTOR_TOOL_H
+#define JETFITTER_TRACKSELECTOR_TOOL_H 1
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+
+#include "VxJetVertex/SelectedTracksInJet.h"
+#include "xAODTracking/Vertex.h"
+
+#include "TrkExInterfaces/IExtrapolator.h"
+#include "InDetSecVxFinderTool/InDetJetFitterUtils.h"
+#include "TrkToolInterfaces/ITrackSelectorTool.h"
+#include "xAODTracking/TrackParticleContainer.h"
+
+#include "TrkLinks/LinkToXAODTrackParticle.h"
+#include "TrkTrackLink/ITrackLink.h"
+
+#include "VxVertex/RecVertex.h"
+
+namespace InDet {
+
+ static const InterfaceID IID_JetFitterTrackSelectorTool("JetFitterTrackSelectorTool", 1, 0);
+
+ class JetFitterTrackSelectorTool : public AthAlgTool {
+ public:
+
+ static const InterfaceID& interfaceID() {
+ return IID_JetFitterTrackSelectorTool;
+ }
+
+ StatusCode initialize();
+ StatusCode finalize();
+
+ JetFitterTrackSelectorTool(const std::string &t, const std::string &n, const IInterface *p);
+ ~JetFitterTrackSelectorTool();
+
+ /*
+ * method for performing track selection
+ */
+ const Trk::SelectedTracksInJet* doTrackSelection(const xAOD::Vertex &primaryVertex,
+ const TLorentzVector &jetMomentum,
+ const std::vector<const xAOD::IParticle *> &inputTracks) const;
+
+ private:
+ int computeTrackCompatibility( const xAOD::Vertex &primaryVertex,
+ const TLorentzVector &jetMomentum,
+ const xAOD::TrackParticle &trk_iter ) const;
+
+ private:
+ ToolHandle< Trk::IExtrapolator > m_extrapolator {this,"Extrapolator","Trk::Extrapolator/InDetExtrapolator",""};
+ ToolHandle< InDet::InDetJetFitterUtils > m_jetFitterUtils {this,"InDetJetFitterUtils","InDet::InDetJetFitterUtils/InDetJetFitterUtils",""};
+ ToolHandle< Trk::ITrackSelectorTool > m_trkFilter {this,"TrackSelector","InDet::InDetDetailedTrackSelectorTool",""};
+
+ private:
+ Gaudi::Property< bool > m_revertFromPositiveToNegativeTags {this,"revertFromPositiveToNegativeTags",false,""};
+ Gaudi::Property< double > m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks {this,"cutCompPrimaryVertexForPosLifetimeTracks",1e-1,""};
+ Gaudi::Property< double > m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks {this,"cutCompPrimaryVertexForNegLifetimeTracks",5e-2,""};
+ };
+
+}
+
+#endif
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTwoTrackVtxFinderTool.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTwoTrackVtxFinderTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..31f881c669a8310aea33660685e5636c333a43e9
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterTwoTrackVtxFinderTool.h
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef JETFITTER_TWOTRACKVTX_FINDER_TOOL_H
+#define JETFITTER_TWOTRACKVTX_FINDER_TOOL_H 1
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+
+#include "VxJetVertex/TwoTrackVerticesInJet.h"
+#include "TrkVertexFitterInterfaces/IVertexSeedFinder.h"
+#include "TrkVertexFitterInterfaces/IVertexFitter.h"
+
+namespace InDet {
+
+ static const InterfaceID IID_JetFitterTwoTrackVtxFinderTool("JetFitterTwoTrackVtxFinderTool", 1, 0);
+
+ class JetFitterTwoTrackVtxFinderTool : public AthAlgTool {
+ public:
+
+ static const InterfaceID& interfaceID() {
+ return IID_JetFitterTwoTrackVtxFinderTool;
+ }
+
+ JetFitterTwoTrackVtxFinderTool(const std::string &t, const std::string &n, const IInterface *p);
+ ~JetFitterTwoTrackVtxFinderTool();
+
+ StatusCode initialize();
+ StatusCode finalize();
+
+ const Trk::TwoTrackVerticesInJet* doVertexFinding( const xAOD::Vertex&,
+ const TLorentzVector&,
+ std::vector< const Trk::ITrackLink* >& ) const;
+
+
+ private:
+ xAOD::Vertex* computeVtxcandidate( const xAOD::Vertex&,
+ const TLorentzVector&,
+ const Trk::ITrackLink* trackA,
+ const Trk::ITrackLink* trackB ) const;
+
+ private:
+ ToolHandle< Trk::IVertexSeedFinder > m_CrossDistancesSeedFinder {this,"CrossDistancesSeedFinder","Trk::CrossDistancesSeedFinder/CrossDistancesSeedFinder",""};
+ ToolHandle< Trk::IVertexFitter > m_SequentialVertexFitter {this,"SequentialVertexFitter","Trk::SequentialVertexFitter/SequentialVertexFitter",""};
+
+ SG::AuxElement::Decorator< std::vector< const Trk::ITrackLink* > > m_tracksDecorator;
+
+ Gaudi::Property< double > m_maxR {this,"ID_maxR",1150.,""};
+ Gaudi::Property< double > m_maxZ {this,"ID_maxZ",2727.,""};
+ Gaudi::Property< double > m_twoVertexProbabilityCut {this,"twoVertexProbabilityCut",3.4e-2,""};
+ Gaudi::Property< bool > m_revertFromPositiveToNegativeTags {this,"revertFromPositiveToNegativeTags",false,""};
+ };
+
+}
+
+#endif
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterV0FinderTool.h b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterV0FinderTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..28a09ed32f2e2686f7a054a980be6373cf12ce74
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/InDetSecVxFinderTool/JetFitterV0FinderTool.h
@@ -0,0 +1,106 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef JETFITTER_V0FINDER_TOOL_H
+#define JETFITTER_V0FINDER_TOOL_H 1
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+
+#include "VxJetVertex/TwoTrackVerticesInJet.h"
+#include "TrkVertexFitterInterfaces/IVertexSeedFinder.h"
+#include "TrkVertexFitterInterfaces/IVertexFitter.h"
+#include "InDetSecVxFinderTool/InDetJetFitterUtils.h"
+#include "TrkVertexSeedFinderUtils/IMode3dFinder.h"
+
+namespace InDet {
+
+ static const InterfaceID IID_JetFitterV0FinderTool("JetFitterV0FinderTool", 1, 0);
+
+ class JetFitterV0FinderTool : public AthAlgTool {
+ public:
+
+ static const InterfaceID& interfaceID() {
+ return IID_JetFitterV0FinderTool;
+ }
+
+ StatusCode initialize();
+ StatusCode finalize();
+
+ JetFitterV0FinderTool(const std::string &t, const std::string &n, const IInterface *p);
+ ~JetFitterV0FinderTool();
+
+ const Trk::TwoTrackVerticesInJet* doV0Finding( const xAOD::Vertex&,
+ const TLorentzVector&,
+ std::vector< const Trk::ITrackLink* >&,
+ const std::vector< const xAOD::Vertex* >&,
+ std::vector< const Trk::ITrackLink* >&,
+ std::vector< const Trk::ITrackLink* >&,
+ Amg::Vector3D& ) const;
+
+ private:
+ std::vector< const xAOD::Vertex* > findV0candidates( const xAOD::Vertex&,
+ const TLorentzVector&,
+ std::vector< const Trk::ITrackLink* >&,
+ const std::vector< const xAOD::Vertex* >& ) const;
+
+ bool checkCriteriaFirstFit( const xAOD::Vertex&,
+ const TLorentzVector&,
+ const xAOD::Vertex& ) const;
+
+ bool checkCriteriaSecondFit( const xAOD::Vertex&,
+ const Trk::ITrackLink* ) const;
+
+ Amg::Vector3D computeSeedDirection( const xAOD::Vertex&,
+ const TLorentzVector&,
+ const std::vector< Trk::PositionAndWeight >& ) const;
+
+ private:
+ ToolHandle< InDet::InDetJetFitterUtils > m_jetFitterUtils {this,"InDetJetFitterUtils","InDet::InDetJetFitterUtils/InDetJetFitterUtils",""};
+ ToolHandle< Trk::IMode3dFinder > m_mode3dfinder {this,"Mode3dFinder","Trk::Mode3dTo1dFinder/Mode3dTo1dFinder",""};
+
+ private:
+ SG::AuxElement::Accessor< float > m_compatibilityAccessor;
+ SG::AuxElement::Accessor< std::vector< const Trk::ITrackLink* > > m_tracksAccessor;
+
+ private:
+ // @brief
+ Gaudi::Property< bool > m_revertFromPositiveToNegativeTags {this,"revertFromPositiveToNegativeTags",false,""};
+
+ Gaudi::Property< double > m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium {this,"cutTwoTrkVtxVtxProbForBFirstSelectCriteriumA",0.05,""};
+ Gaudi::Property< double > m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium {this,"cutTwoTrkVtxVtxProbForBFirstSelectCriteriumB",0.034,""};
+
+ Gaudi::Property< double > m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection {this,"cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection",1e-1,""};
+ Gaudi::Property< double > m_cutCompatibilityPrimaryVertexBothTracksForBFirstSelection {this,"cutCompatibilityPrimaryVertexBothTracksForBFirstSelection",1e-2,""};
+ Gaudi::Property< double > m_cutIPD0BothTracksForBFirstSelection {this,"cutIPD0BothTracksForBFirstSelection",3.5,""};
+ Gaudi::Property< double > m_cutIPZ0BothTracksForBFirstSelection {this,"cutIPZ0BothTracksForBFirstSelection",5.,""};
+ Gaudi::Property< double > m_cutPtBothTracksForBFirstSelection {this,"cutPtBothTracksForBFirstSelection",500.,""};
+
+ Gaudi::Property< double > m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium {this,"cutTwoTrkVtxLifeSignForBFirstSelectCriteriumA",1.,""};
+ Gaudi::Property< double > m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium {this,"cutTwoTrkVtxLifeSignForBFirstSelectCriteriumB",1.5,""};
+ Gaudi::Property< double > m_cutCompatibilityToPrimarySingleTrackForMatInteractions {this,"cutCompToPrimarySingleTrackForMatInterac",1e-4,""};
+ Gaudi::Property< double > m_cutCompatibilityToPrimaryBothTracksForMatInteractions {this,"cutCompToPrimaryBothTracksForMatInterac",1e-6,""};
+
+ Gaudi::Property< double > m_firstBeam_min {this,"firstBeam_min",23,""};
+ Gaudi::Property< double > m_firstBeam_max {this,"firstBeam_max",25,""};
+ Gaudi::Property< double > m_secondBeam_min {this,"secondBeam_min",23,""};
+ Gaudi::Property< double > m_secondBeam_max {this,"secondBeam_max",25,""};
+ Gaudi::Property< double > m_firstLayer_min {this,"firstLayer_min",34.0-2.5,""};
+ Gaudi::Property< double > m_firstLayer_max {this,"firstLayer_max",34.0+2.5,""};
+ Gaudi::Property< double > m_secondLayer_min {this,"secondLayer_min",51.5-3,""};
+ Gaudi::Property< double > m_secondLayer_max {this,"secondLayer_max",51.5+3,""};
+
+ Gaudi::Property< double > m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection {this,"cutCompPVSinglePosLifeTrackForBSecondSelect",5e-2,""};
+ Gaudi::Property< double > m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection {this,"cutCompPVSingleNegLifeTrackForBSecondSelect",1e-2,""};
+ Gaudi::Property< double > m_cutIPD0SigBoxSingleTrackForBSecondSelection {this,"cutIPD0SigBoxSingleTrackForBSecondSelection",2.,""};
+ Gaudi::Property< double > m_cutIPZ0SigBoxSingleTrackForBSecondSelection {this,"cutIPZ0SigBoxSingleTrackForBSecondSelection",5.,""};
+
+ Gaudi::Property< double > m_cutIPD0SingleTrackForBSecondSelection {this,"cutIPD0SingleTrackForBSecondSelection",1.5,""};
+ Gaudi::Property< double > m_cutIPZ0SingleTrackForBSecondSelection {this,"cutIPZ0SingleTrackForBSecondSelection",3.,""};
+ Gaudi::Property< double > m_cutPtSingleTrackForBSecondSelection {this,"cutPtSingleTrackForBSecondSelection",750,""};
+ };
+
+}
+
+#endif
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
index 65fec3770c00b215de4a24de7219f88b4ebf3be7..6c1a49d750a893da03a28bfd11dc4c9326118dd9 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetImprovedJetFitterVxFinder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -11,19 +11,19 @@
email : nicola.giacinto.piacquadio@cern.ch
changes: new version in January 2008!
+
+ 2008 (c) Atlas Detector Software
Look at the header file for more information.
***************************************************************************/
+
#include "InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h"
#include "VxJetVertex/VxJetCandidate.h"
#include "VxJetVertex/PairOfVxVertexOnJetAxis.h"
#include "VxJetVertex/VxVertexOnJetAxis.h"
#include "VxJetVertex/VxClusteringTable.h"
-#include "TrkJetVxFitter/JetFitterHelper.h"
-#include "TrkJetVxFitter/JetFitterInitializationHelper.h"
-#include "TrkJetVxFitter/JetFitterRoutines.h"
#include "VxSecVertex/VxJetFitterVertexInfo.h"
#include <TMath.h>
#include "TrkEventPrimitives/FitQuality.h"
@@ -31,15 +31,9 @@
#include "VxVertex/RecVertex.h"
#include "TrkTrack/Track.h"
#include "TrkTrack/LinkToTrack.h"
-#include "TrkToolInterfaces/ITrackSelectorTool.h"
-#include "TrkExInterfaces/IExtrapolator.h"
-#include "TrkVertexSeedFinderUtils/IMode3dFinder.h"
-#include "TrkVertexFitters/SequentialVertexFitter.h"
#include "TrkEventPrimitives/VertexType.h"
#include "TrkSurfaces/PerigeeSurface.h"
-#include "InDetSecVxFinderTool/InDetJetFitterUtils.h"
#include "TrkNeutralParameters/NeutralParameters.h"
-#include "TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h"
#include "TrkVertexSeedFinderUtils/SeedFinderParamDefs.h"
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Vector/ThreeVector.h"
@@ -56,7 +50,13 @@
//17.5.2015 This is for the EDM migration
#include "TrkLinks/LinkToXAODTrackParticle.h"
-#include "TrkVxEdmCnv/IVxCandidateXAODVertex.h"
+
+// Hackathon includes
+#include "InDetSecVxFinderTool/JetFitterTrackSelectorTool.h"
+#include "InDetSecVxFinderTool/JetFitterTwoTrackVtxFinderTool.h"
+#include "InDetSecVxFinderTool/JetFitterV0FinderTool.h"
+#include "InDetSecVxFinderTool/JetFitterMultiStageFit.h"
+
#define InDetImprovedJetFitterVxFinder_DEBUGAddOns
@@ -84,188 +84,10 @@ namespace InDet
};
InDetImprovedJetFitterVxFinder::InDetImprovedJetFitterVxFinder(const std::string& t, const std::string& n, const IInterface* p) :
- AthAlgTool(t,n,p),
- m_initializationHelper("Trk::JetFitterInitializationHelper",this),
- m_helper("Trk::JetFitterHelper",this),
- m_routines("Trk::JetFitterRoutines",this),
- m_trkFilter("InDet::InDetDetailedTrackSelectorTool",this),
- m_extrapolator("Trk::Extrapolator/InDetExtrapolator",this),
- m_jetFitterUtils("InDet::InDetJetFitterUtils/InDetJetFitterUtils",this),
- m_CrossDistancesSeedFinder("Trk::CrossDistancesSeedFinder/CrossDistancesSeedFinder",this),
- m_mode3dfinder("Trk::Mode3dTo1dFinder/Mode3dTo1dFinder",this),
- m_SequentialVertexFitter("Trk::SequentialVertexFitter/SequentialVertexFitter",this),
- //m_convUtils("Trk::NeutralParticleParameterCalculator"),
- m_VertexEdmFactory("Trk::VertexInternalEdmFactory",this),
- m_maxNumDeleteIterations(30),
- m_vertexProbCut(0.001),
- m_maxClusteringIterations(30),
- m_vertexClusteringProbabilityCut(0.005),//GP 11/6/16: changed to default in job option file
- m_vertexClusteringProbabilityCutWithMass(0.05),//GP 11/7/16: keep default to not active
- m_vertexClusteringProbabilityCutWithMass0010(0.002),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass1015(0.002),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass1520(0.050),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass2025(0.100),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass2530(0.200),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass3040(0.500),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass4050(0.700),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass5060(0.900),//MB Mass dependent cut
- m_vertexClusteringProbabilityCutWithMass6070(0.900),//MB Mass dependent cut
- m_vertexClusteringTwoVtxMassForProbCut(2000),
- m_useFastClustering(false),
- m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks(1e-1),
- m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks(5e-2),
- m_twoVertexProbabilityCut(3.4e-2),
- m_cutDeltaMKs(18.),
- m_cutDeltaMLambda(7.),
- m_cutDeltaMGamma(30.),
- m_cutCompatibilityPrimaryVertexSingleTrackForKsAndLambda(1e-3),
- m_cutCompatibilityPrimaryVertexBothTracksForKsAndLambda(1e-4),
- m_cutTwoTrkVtxLifetimeSignificanceForKs(4.5),
- m_cutTwoTrkVtxLifetimeSignificanceForLambda(4.5),
- m_cutIPD0BothTracksCriteriumOneForKsAndLambda(1.),
- m_cutIPZ0BothTracksCriteriumOneForKsAndLambda(2.),
- m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda(20.),
- m_cutCompatibilityChi2ToPrimaryNeutralTrackFromConversion(36),
- m_cutCompatibilityChi2ToPrimaryNeutralTrackFromKs(36),
- m_cutCompatibilityChi2ToPrimaryNeutralTrackFromLambda(36),
- m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection(1e-1),
- m_cutCompatibilityPrimaryVertexBothTracksForBFirstSelection(1e-2),
- m_cutIPD0BothTracksForBFirstSelection(3.5),
- m_cutIPZ0BothTracksForBFirstSelection(5.),
- m_cutPtBothTracksForBFirstSelection(500.),
- m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium(1.),
- m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium(0.05),
- m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium(1.5),
- m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium(0.034),
- m_firstBeam_min(23), //29.35-1.5*0.68),
- m_firstBeam_max(25), //35+1.5*0.68),
- m_secondBeam_min(23), //34.18-1.5*0.65),
- m_secondBeam_max(25), //34.18+1.5*0.65),
- m_firstLayer_min(34.0-2.5), //57.5)
- m_firstLayer_max(34.0+2.5), //46.5),
- m_secondLayer_min(51.5-3), //70.5-1.5*2.1),
- m_secondLayer_max(51.5+3), //70.5+1.5*2.1),
- m_cutCompatibilityToPrimarySingleTrackForMatInteractions(1e-4),
- m_cutCompatibilityToPrimaryBothTracksForMatInteractions(1e-6),
- m_cutIPD0SingleTrackForBSecondSelection(1.5),
- m_cutIPZ0SingleTrackForBSecondSelection(3.),
- m_cutPtSingleTrackForBSecondSelection(750.),
- m_cutIPD0SigBoxSingleTrackForBSecondSelection(2.), //0 effectively disables the cut
- m_cutIPZ0SigBoxSingleTrackForBSecondSelection(5.),
- m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection(5e-2),
- m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection(1e-2),
- m_doNotUsePrimaryVertexCombatibilityInfo(false),
- m_revertFromPositiveToNegativeTags(false),
- m_maxR(1150.),//max R of ID
- m_maxZ(2727.),//max Z of ID
- m_VxContainerName("PrimaryVertices"),
- m_maxTracksForDetailedClustering(25),
- m_usepTDepTrackSel(false),
- m_pTMinOffset(800),//MeV
- m_pTMinSlope(0.01),//MeV(track cut)/MeV(sum of track pT)
- m_pTMax(600e3)//MeV--> stop at 600 GeV sum of track pT
+ AthAlgTool(t,n,p)
{
- //JetFitter tools
- declareProperty("JetFitterHelper",m_helper);
- declareProperty("JetFitterInitializationHelper",m_initializationHelper);
- declareProperty("JetFitterRoutines",m_routines);
-
- //JetFinder tools
- declareProperty("InDetJetFitterUtils",m_jetFitterUtils);
-
- //Tracking tools
- declareProperty("Extrapolator",m_extrapolator);
- declareProperty("TrackSelector",m_trkFilter);
-
- //Vertexing tools
- declareProperty("CrossDistancesSeedFinder",m_CrossDistancesSeedFinder);
- declareProperty("Mode3dFinder",m_mode3dfinder);
- declareProperty("SequentialVertexFitter",m_SequentialVertexFitter);
-
- //Name of primary vertex container
- declareProperty("VxPrimaryContainer", m_VxContainerName);
-
- //Properties which steer the JetFitter clustering operations
- declareProperty("MaxNumDeleteIterations",m_maxNumDeleteIterations);
- declareProperty("VertexProbCut",m_vertexProbCut);
- declareProperty("MaxClusteringIterations",m_maxClusteringIterations);
- declareProperty("VertexClusteringProbabilityCut",m_vertexClusteringProbabilityCut);
- declareProperty("VertexClusteringProbabilityCutWithMass",m_vertexClusteringProbabilityCutWithMass);
- declareProperty("vertexClusteringTwoVtxMassForProbCut",m_vertexClusteringTwoVtxMassForProbCut);
- declareProperty("UseFastClustering",m_useFastClustering);
-
- declareProperty("VertexClusteringProbabilityCutWithMass0010",m_vertexClusteringProbabilityCutWithMass0010);
- declareProperty("VertexClusteringProbabilityCutWithMass1015",m_vertexClusteringProbabilityCutWithMass1015);
- declareProperty("VertexClusteringProbabilityCutWithMass1520",m_vertexClusteringProbabilityCutWithMass1520);
- declareProperty("VertexClusteringProbabilityCutWithMass2025",m_vertexClusteringProbabilityCutWithMass2025);
- declareProperty("VertexClusteringProbabilityCutWithMass2530",m_vertexClusteringProbabilityCutWithMass2530);
- declareProperty("VertexClusteringProbabilityCutWithMass3040",m_vertexClusteringProbabilityCutWithMass3040);
- declareProperty("VertexClusteringProbabilityCutWithMass4050",m_vertexClusteringProbabilityCutWithMass4050);
- declareProperty("VertexClusteringProbabilityCutWithMass5060",m_vertexClusteringProbabilityCutWithMass5060);
- declareProperty("VertexClusteringProbabilityCutWithMass6070",m_vertexClusteringProbabilityCutWithMass6070);
-
- //Cuts which steer the finding in the seeding phase before JetFitter (yes, so many!!!)
- declareProperty("cutCompPrimaryVertexForPosLifetimeTracks",m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks);
- declareProperty("cutCompPrimaryVertexForNegLifetimeTracks",m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks);
- declareProperty("twoVertexProbabilityCut",m_twoVertexProbabilityCut);
- declareProperty("cutDeltaMKs",m_cutDeltaMKs);
- declareProperty("cutDeltaMLambda",m_cutDeltaMLambda);
- declareProperty("cutDeltaMGamma",m_cutDeltaMGamma);
- declareProperty("cutCompPrimaryVertexSingleTrackForKsAndLambda",m_cutCompatibilityPrimaryVertexSingleTrackForKsAndLambda);
- declareProperty("cutCompPrimaryVertexBothTracksForKsAndLambda",m_cutCompatibilityPrimaryVertexBothTracksForKsAndLambda);
- declareProperty("cutTwoTrkVtxLifetimeSignificanceForKs",m_cutTwoTrkVtxLifetimeSignificanceForKs);
- declareProperty("cutTwoTrkVtxLifetimeSignificanceForLambda",m_cutTwoTrkVtxLifetimeSignificanceForLambda);
- declareProperty("cutIPD0BothTracksCriteriumAForKsAndLambda",m_cutIPD0BothTracksCriteriumOneForKsAndLambda);
- declareProperty("cutIPZ0BothTracksCriteriumAForKsAndLambda",m_cutIPZ0BothTracksCriteriumOneForKsAndLambda);
- declareProperty("cutTransvTwoTrkVtxDistCriteriumBForKsAndLambda",m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda);
- declareProperty("cutCompChi2ToPrimaryNeutTrkFromConversion",m_cutCompatibilityChi2ToPrimaryNeutralTrackFromConversion);
- declareProperty("cutCompChi2ToPrimaryNeutTrkFromKs",m_cutCompatibilityChi2ToPrimaryNeutralTrackFromKs);
- declareProperty("cutCompChi2ToPrimaryNeutTrkFromLambda",m_cutCompatibilityChi2ToPrimaryNeutralTrackFromLambda);
- declareProperty("cutCompPrimaryVertexSingleTrackForBFirstSelect",m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection);
- declareProperty("cutCompPrimaryVertexBothTracksForBFirstSelect",m_cutCompatibilityPrimaryVertexBothTracksForBFirstSelection);
- declareProperty("cutIPD0BothTracksForBFirstSelection",m_cutIPD0BothTracksForBFirstSelection);
- declareProperty("cutIPZ0BothTracksForBFirstSelection",m_cutIPZ0BothTracksForBFirstSelection);
- declareProperty("cutPtBothTracksForBFirstSelection",m_cutPtBothTracksForBFirstSelection);
- declareProperty("cutIPD0SigBoxSingleTrackForBSecondSelection",m_cutIPD0SigBoxSingleTrackForBSecondSelection);
- declareProperty("cutIPZ0SigBoxSingleTrackForBSecondSelection",m_cutIPZ0SigBoxSingleTrackForBSecondSelection);
- declareProperty("cutTwoTrkVtxLifeSignForBFirstSelectCriteriumA",m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium);
- declareProperty("cutTwoTrkVtxVtxProbForBFirstSelectCriteriumA",m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium);
- declareProperty("cutTwoTrkVtxLifeSignForBFirstSelectCriteriumB",m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium);
- declareProperty("cutTwoTrkVtxVtxProbForBFirstSelectCriteriumB",m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium);
- declareProperty("firstBeam_min",m_firstBeam_min);
- declareProperty("secondBeam_min",m_secondBeam_min);
- declareProperty("secondBeam_max",m_secondBeam_max);
- declareProperty("firstLayer_min",m_firstLayer_min);
- declareProperty("firstLayer_max",m_firstLayer_max);
- declareProperty("secondLayer_min",m_secondLayer_min);
- declareProperty("secondLayer_max",m_secondLayer_max);
- declareProperty("cutCompToPrimarySingleTrackForMatInterac",m_cutCompatibilityToPrimarySingleTrackForMatInteractions);
- declareProperty("cutCompToPrimaryBothTracksForMatInterac",m_cutCompatibilityToPrimaryBothTracksForMatInteractions);
- declareProperty("cutIPD0SingleTrackForBSecondSelection",m_cutIPD0SingleTrackForBSecondSelection);
- declareProperty("cutIPZ0SingleTrackForBSecondSelection",m_cutIPZ0SingleTrackForBSecondSelection);
- declareProperty("cutPtSingleTrackForBSecondSelection",m_cutPtSingleTrackForBSecondSelection);
- declareProperty("cutCompPVSinglePosLifeTrackForBSecondSelect",m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection);
- declareProperty("cutCompPVSingleNegLifeTrackForBSecondSelect",m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection);
- declareProperty("doNotUsePVCombInfo",m_doNotUsePrimaryVertexCombatibilityInfo);
- declareProperty("ID_maxR",m_maxR);
- declareProperty("ID_maxZ",m_maxZ);
-
- declareProperty("revertFromPositiveToNegativeTags",m_revertFromPositiveToNegativeTags);
-
- declareProperty("maxTracksForDetailedClustering",m_maxTracksForDetailedClustering);
-
- //declareProperty("ConversionUtils", m_convUtils,"Name of conversion utility");
-
- declareProperty("VertexEdmFactory", m_VertexEdmFactory);
-
- declareProperty("usepTDepTrackSel",m_usepTDepTrackSel);
- declareProperty("pTMinOffset",m_pTMinOffset);
- declareProperty("pTMinSlope",m_pTMinSlope);
- declareProperty("pTMax",m_pTMax);
-
-
+ // new package for hackathon
declareInterface< ISecVertexInJetFinder >(this) ;
-
}
@@ -274,80 +96,31 @@ namespace InDet
StatusCode InDetImprovedJetFitterVxFinder::initialize() {
-
StatusCode sc = AlgTool::initialize();
- if(sc.isFailure())
- {
- msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
- return sc;
- }
-
- //retrieving the udator itself
- sc = m_helper.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_helper<<endmsg;
- return StatusCode::FAILURE;
- }else msg(MSG::INFO) << "JetFitter Helper retrieved"<<endmsg;
-
-
- sc = m_initializationHelper.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_initializationHelper<<endmsg;
- return StatusCode::FAILURE;
- }else msg(MSG::INFO) << "JetFitter Initialization Helper retrieved"<<endmsg;
-
- sc = m_routines.retrieve();
- if(sc.isFailure())
- {
- msg(MSG::ERROR) << " Unable to retrieve the JetFitter routines"<<m_routines<<endmsg;
- return StatusCode::FAILURE;
+ if(sc.isFailure()) {
+ msg(MSG::ERROR)<<" Unable to initialize the AlgTool"<<endmsg;
+ return sc;
}
- else msg(MSG::INFO) << "JetFitter Routines class retrieved"<<endmsg;
- if(m_trkFilter.retrieve().isFailure())
- {
- msg(MSG::ERROR) << " Unable to retrieve "<<m_trkFilter<<endmsg;
+ if (m_theTrackSelector.retrieve().isFailure()) {
+ msg(MSG::ERROR) << "Could not find TrackSelector tool." << endmsg;
return StatusCode::FAILURE;
- }
- else msg(MSG::INFO) << "Track filter retrieved"<<endmsg;
-
+ } else msg(MSG::INFO) << " JetFitterTrackSelector retrieved" << endmsg;
- if (m_jetFitterUtils.retrieve().isFailure())
- {
- msg(MSG::ERROR) << "Could not find JetFitterUtils tool." << endmsg;
+ if (m_theTwoTrackVtxFinderTool.retrieve().isFailure()) {
+ msg(MSG::ERROR) << "Could not find TwoTrackVtxFinder tool." << endmsg;
return StatusCode::FAILURE;
- }
- else msg(MSG::INFO) << " JetFitterUtils retrieved" << endmsg;
+ } else msg(MSG::INFO) << " JetFitterTwoTrackVtxFinder retrieved" << endmsg;
- if (m_CrossDistancesSeedFinder.retrieve().isFailure())
- {
- msg(MSG::ERROR) << "Could not find CrossDistancesSeedFinder tool." << endmsg;
+ if (m_theV0FinderTool.retrieve().isFailure()) {
+ msg(MSG::ERROR) << "Could not find V0Finder tool." << endmsg;
return StatusCode::FAILURE;
- } else msg(MSG::INFO) << " CrossDistancesSeedFinder tool retrieved" << endmsg;
-
- if (m_mode3dfinder.retrieve().isFailure())
- {
- msg(MSG::ERROR) << "Could not find mode3dfinder tool." << endmsg;
- return StatusCode::FAILURE;
- } else msg(MSG::INFO) << " Mode3DFinder tool retrieved" << endmsg;
+ } else msg(MSG::INFO) << " JetFitterV0Finder retrieved" << endmsg;
- if (m_SequentialVertexFitter.retrieve().isFailure())
- {
- msg(MSG::ERROR) << "Could not get the sequential vertex fitter tool."<<endmsg;
+ if (m_multiStageFitter.retrieve().isFailure()) {
+ msg(MSG::ERROR) << "Could not find JetFitterMultiStageFit tool." << endmsg;
return StatusCode::FAILURE;
- } else msg(MSG::INFO) << " Sequential vertex fitter retrieved " << endmsg;
-
- if (m_extrapolator.retrieve().isFailure())
- {
- msg(MSG::ERROR) << "Could not find extrapolator tool." << endmsg;
- return StatusCode::FAILURE;
- } else msg(MSG::INFO) << " Extrapolator retrieved " << endmsg;
-
- sc = m_VertexEdmFactory.retrieve();
- if(sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to retrieve" << m_VertexEdmFactory <<endmsg;
- return StatusCode::FAILURE;
- } else msg(MSG::INFO) << " xAOD vertex converter retrieved " <<endmsg;
+ } else msg(MSG::INFO) << " JetFitterMultiStageFit retrieved" << endmsg;
msg(MSG::INFO) << "Initialize successful" << endmsg;
return StatusCode::SUCCESS;
@@ -361,1894 +134,132 @@ namespace InDet
}
- Trk::VxSecVertexInfo*
- InDetImprovedJetFitterVxFinder::findSecVertex(const xAOD::Vertex & primaryVertex,
- const TLorentzVector & jetMomentum,
- const std::vector<const xAOD::IParticle*> & inputTracks) const{
-
- std::vector<const Trk::ITrackLink*> selectedTracks;
- std::vector<const xAOD::IParticle*>::const_iterator trk_iter;
- double sumpT=0;
- for (trk_iter= inputTracks.begin(); trk_iter != inputTracks.end(); ++trk_iter){
- const xAOD::TrackParticle * tmp=dynamic_cast<const xAOD::TrackParticle *> ((*trk_iter));
- if (!tmp or !m_trkFilter->decision(*tmp,&primaryVertex)){
- continue;
- }
- if (!m_usepTDepTrackSel){
- ElementLink<xAOD::TrackParticleContainer> linkTP;
- linkTP.setElement(const_cast<xAOD::TrackParticle*>(tmp));
- Trk::LinkToXAODTrackParticle* link= new Trk::LinkToXAODTrackParticle(linkTP);
- selectedTracks.push_back(link);
- }else{
- sumpT+=tmp->pt();
- }
- }
- if (m_usepTDepTrackSel){
- for (trk_iter= inputTracks.begin(); trk_iter != inputTracks.end(); ++trk_iter){
- const xAOD::TrackParticle * tmp=dynamic_cast<const xAOD::TrackParticle *> ((*trk_iter));
- if (!tmp or !m_trkFilter->decision(*tmp,&primaryVertex)){
- continue;
- }
- if (!((tmp->pt()>m_pTMinOffset + sumpT * m_pTMinSlope)
- ||
- (sumpT > m_pTMax && tmp->pt()>m_pTMinOffset+m_pTMax* m_pTMinSlope))){
- continue;
- }
- ElementLink<xAOD::TrackParticleContainer> linkTP;
- linkTP.setElement(const_cast<xAOD::TrackParticle*>(tmp));
- Trk::LinkToXAODTrackParticle* link= new Trk::LinkToXAODTrackParticle(linkTP);
- selectedTracks.push_back(link);
- }
- }
- Trk::RecVertex dummy;
- Trk::VxSecVertexInfo* secVxInfo=doTheFinding(primaryVertex,
- jetMomentum,
- selectedTracks);
-
- return secVxInfo;
- }
-
-
- Trk::VxSecVertexInfo* InDetImprovedJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
- const TLorentzVector & jetMomentum,
- const std::vector<const Trk::TrackParticleBase*> & myTracks) const {
- if (msgLvl(MSG::VERBOSE)) msg() << " Starting findSecVertex " << endmsg;
-
- std::vector<const Trk::ITrackLink*> selectedTracks;
-
- std::vector<const Trk::TrackParticleBase*>::const_iterator tracksBegin=myTracks.begin();
- std::vector<const Trk::TrackParticleBase*>::const_iterator tracksEnd=myTracks.end();
- for (std::vector<const Trk::TrackParticleBase*>::const_iterator tracksIter=tracksBegin;
- tracksIter!=tracksEnd;++tracksIter) {
- if (m_trkFilter->decision(**tracksIter,&primaryVertex)==true) {
-
- if (msgLvl(MSG::VERBOSE)) msg() << " Adding new ElementLink " << endmsg;
-
- ElementLink<Trk::TrackParticleBaseCollection> link;
- link.setElement(const_cast<Trk::TrackParticleBase*>(*tracksIter));
- Trk::LinkToTrackParticleBase * linkTT = new Trk::LinkToTrackParticleBase(link);
-// linkTT->setStorableObject(*trackTES);
- selectedTracks.push_back(linkTT);
- }
- }
-
- xAOD::Vertex dummy;
- return doTheFinding(dummy,
- jetMomentum,
- selectedTracks);
- }
-
-
-
- Trk::VxSecVertexInfo* InDetImprovedJetFitterVxFinder::doTheFinding(const xAOD::Vertex & primaryVertex, //const Trk::RecVertex & /* primaryVertex */,
- const TLorentzVector & jetMomentum,
- const std::vector<const Trk::ITrackLink*> & myTracks) const
+ Trk::VxSecVertexInfo* InDetImprovedJetFitterVxFinder::findSecVertex(const xAOD::Vertex & primaryVertex,
+ const TLorentzVector & jetMomentum,
+ const std::vector<const xAOD::IParticle*> & inputTracks) const
{
-
- if (msgLvl(MSG::VERBOSE)) msg() << " doTheFinding called " << endmsg;
-
- //some fundamental masses
- //I know they are hard coded here...
- //sorry for this!!
- const double s_masspion=139.57018;
- const double s_masselectron=0.511;
- const double s_massproton=938.272;
- const double s_massks=497.648;
- const double s_masslambda=1115.683;
-
- StatusCode sc;
+ // This function when called performs JetFitter secondary vertex finding
+ // It returns the JetFitter Vertex Info, VxJetFitterVertexInfo:
+ // The VxJetCandidate, the TwoTrackVerticesInJet (V0s and neutrals), the selected tracks (primary and secondary)
+ // So we need to do track selection, v0 finding, and then the fit with JetFitter.
-// //get the primary vertex information
-// const xAOD::VertexContainer* myVxContainer(0);
-// StatusCode sc = evtStore()->retrieve(myVxContainer,m_VxContainerName);
-// if (sc.isFailure()) {
-// msg(MSG::ERROR) << m_VxContainerName << " not found in StoreGate." << endmsg;
-// return 0;
-// }
//
-// xAOD::Vertex* xAODprimaryVertex(0);
-//
-// xAOD::VertexContainer::const_iterator fz_end=myVxContainer->end();
-// for (xAOD::VertexContainer::const_iterator fz = myVxContainer->begin(); fz != fz_end; ++fz)
-// {
-// if ((*fz)->vertexType() == xAOD::VxType::PriVtx)
-// {
-// xAODprimaryVertex = *fz;
-// break;
-// }
-// }
-//
-// if (!xAODprimaryVertex)
-// {
-// if (myVxContainer->size() > 0)
-// {
-// xAODprimaryVertex = *myVxContainer->begin();
-// }
-// }
-
-// xAOD::Vertex xAODprimaryVertex(primaryVertex);
-
-
- Trk::VxCandidate* signalVertex=0;
- sc = m_VertexEdmFactory->createVxCandidate(primaryVertex, signalVertex);
- if (sc.isFailure()) {
- msg(MSG::ERROR) << m_VertexEdmFactory << " fail to createVxCandidate." << endmsg;
- return 0;
- }
+// // Initial track selection, track filter applied, separate primary and secondary tracks
+ const Trk::SelectedTracksInJet* mySelectedTracksInJet = m_theTrackSelector->doTrackSelection( primaryVertex, jetMomentum, inputTracks );
+ ATH_MSG_DEBUG( "the selected tracks now are " << mySelectedTracksInJet );
+ std::vector< const Trk::ITrackLink* > primaryTracks = mySelectedTracksInJet->getPrimaryTrackLinks();
+ std::vector< const Trk::ITrackLink* > secondaryTracks = mySelectedTracksInJet->getSecondaryTrackLinks();
- if (signalVertex==0)
- {
- if (msgLvl(MSG::WARNING)) msg() << " No primary vertex in collection for jetfitter... No secondary vertices fit can be performed" << endmsg;
- }
- const Trk::RecVertex& primaryVertexRecVertex = signalVertex->recVertex();
-
- //create a Vector where you will store the compatibilites to the tracks in myTracks
- std::map<const Trk::ITrackLink*,double> compatibilityOfTrack;
-
- //create other variables for later: primary tracks and secondary tracks
- std::vector<const Trk::ITrackLink*> primaryTracks;
- std::vector<const Trk::ITrackLink*> secondaryTracks;
+ // Two track vertex candidates
+ const Trk::TwoTrackVerticesInJet* twoTrackVertexCandidates = m_theTwoTrackVtxFinderTool->doVertexFinding( primaryVertex, jetMomentum, secondaryTracks );
+ const std::vector< const xAOD::Vertex* > vertexCandidates = twoTrackVertexCandidates->getTwoTrackVertice();
- //here all the V0candidates will be stored
- std::vector<const xAOD::Vertex*> V0candidates;
- std::map<const Trk::ITrackLink*,const Trk::ITrackLink*> fromLinkInV0CandidateToOriginalLink;
-
- //here the Neutral Tracks to store as TrackParticleBase
- //(identified conversions,Lambdas and Ks)
- //std::vector<const Trk::TrackParticleBase*> neutralTracks;
- std::vector<const Trk::LinkToTrackParticleBase*> neutralTracks;
-
- //one further information you absolutely need is:
- //the mass information... (horrible map again)
- std::map<const Trk::TrackParticleBase*,double> massOfNeutralTrack;
-
- //here the tracks for the first fit (higher purity) and for the second fit will be stored
- std::vector<const Trk::ITrackLink*> tracksToUseInFirstFit;
- std::vector<const Trk::ITrackLink*> tracksToUseInSecondFit;
-
- //positionAndWeight for the vertices which will be used as
- //a first estimate of the B-flight direction to increase
- //the fit reliability (JetFitter's linearization is strongly
- //affected by the direction of the B-hardon flight axis)
- std::vector<Trk::PositionAndWeight> positionsOfSeedingVertices;
-
- //store the number of found material interactions
- int numberFirstBeamInteractions=0;
- int numberSecondBeamInteractions=0;
- int numberFirstLayerInteractions=0;
- int numberSecondLayerInteractions=0;
-
+// // V0 finding AND further track selection, these could even be further separated
+// // neutral identification, material interactions, ..., a lot is done here
+ std::vector< const Trk::ITrackLink* > tracksToUseInFirstFit;
+ std::vector< const Trk::ITrackLink* > tracksToUseInSecondFit;
+ Amg::Vector3D JFseedDirection;
- //now you have the list of tracks...
- //that's already something!
- //now you need to get the compatibility of the tracks
- //(you want to use the primary vertex chi2 if this is NEEDED)
+ const Trk::TwoTrackVerticesInJet* myTwoTrackVerticesInJet = m_theV0FinderTool->doV0Finding( primaryVertex, jetMomentum, secondaryTracks, vertexCandidates,
+ tracksToUseInFirstFit, tracksToUseInSecondFit, JFseedDirection );
- if (msgLvl(MSG::VERBOSE)) msg() << " JetFitterFinding phase 1: getting the compatibilities of all tracks to the primary vertex... " << endmsg;
+ // Sort track collection by pT
+ ATH_MSG_DEBUG( "Sorting track collection (tracksToUseInFirstFit) by pT..." );
+ sortTrackCollectionByPt( tracksToUseInFirstFit );
+ ATH_MSG_DEBUG( "Sorting track collection (tracksToUseInSecondFit) by pT..." );
+ sortTrackCollectionByPt( tracksToUseInSecondFit );
- std::vector<Trk::VxTrackAtVertex*>::const_iterator trkBegin=signalVertex->vxTrackAtVertex()->begin();
- std::vector<Trk::VxTrackAtVertex*>::const_iterator trkEnd=signalVertex->vxTrackAtVertex()->end();
-
- std::vector<const Trk::ITrackLink*>::const_iterator qualitytracksBegin=myTracks.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator qualitytracksEnd=myTracks.end();
-
- int countDebug=0;
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator qualitytracksIter=qualitytracksBegin;
- qualitytracksIter!=qualitytracksEnd;++qualitytracksIter)
- {
-
- bool matched=false;
-
- const Trk::ITrackLink * trkTrackLink=*qualitytracksIter;
-
- const Trk::LinkToTrackParticleBase * trkCastedLinkTPBase=
- dynamic_cast<const Trk::LinkToTrackParticleBase *>(trkTrackLink);
-
-// const Trk::LinkToTrack * trkCastedLinkT=
-// dynamic_cast<const Trk::LinkToTrack *>(trkTrackLink);
-
- const Trk::LinkToXAODTrackParticle* trkCastedLinkTPxAOD=
- dynamic_cast<const Trk::LinkToXAODTrackParticle *>(trkTrackLink);
-
- if (!trkCastedLinkTPxAOD && !trkCastedLinkTPBase)
- {
- if (msgLvl(MSG::WARNING)) msg() << " One track among the selected ones is neither an xAOD::TrackParticle nor a TrackParticle. Skipping track..." << endmsg;
- continue;
- }
-
- //obtain the wanted perigee now
-
- //needed for extrapolation (later to get the IP 3d sign)
- Trk::PerigeeSurface mySurface(primaryVertexRecVertex.position());
-
- //const Trk::Perigee* myMeasuredPerigee=0;
-
- if (msgLvl(MSG::VERBOSE)) msg() << "PV position " << primaryVertexRecVertex.position().x() << " " << primaryVertexRecVertex.position().y() << " " << primaryVertexRecVertex.position().z() << endmsg;
-
- const Trk::TrackParameters* myMeasuredPerigee=nullptr;
-
- if (trkCastedLinkTPBase)
- {
-
- const Trk::TrackParticleBase & myTrackParticleBase=***trkCastedLinkTPBase;
-
- const Trk::TrackParameters * definingParameters=&(myTrackParticleBase.definingParameters());
- //const Trk::Perigee* perigeeBeforeExtrapolation= definingParameters.perigee();
-
-
- //if (perigeeBeforeExtrapolation==0)
- //{
- // if (msgLvl(MSG::WARNING)) msg() << "No Perigee at TrackParticleBase: this is a problem!" << endmsg;
- // continue;
- //}
-
-// myMeasuredPerigee=dynamic_cast<const Trk::MeasuredPerigee*>(m_extrapolator->extrapolate(myTrackParticleBase,
-// mySurface));
-
- myMeasuredPerigee = m_extrapolator->extrapolateDirectly(*definingParameters,mySurface);
-
-
- }
-
- if (trkCastedLinkTPxAOD)
- {
- const xAOD::TrackParticle & myTrack=***trkCastedLinkTPxAOD;
- myMeasuredPerigee=m_extrapolator->extrapolate(myTrack,mySurface);
- }
-
- if (!myMeasuredPerigee)
- {
- msg(MSG::WARNING) << " Extrapolation to primary vertex failed. Skipping track " << endmsg;
- continue;
- }
-
- if (!m_doNotUsePrimaryVertexCombatibilityInfo)
- {
-
- for (std::vector<Trk::VxTrackAtVertex*>::const_iterator trkIter=trkBegin;trkIter!=trkEnd;++trkIter)
- {
-
- const Trk::ITrackLink * vtxTrackLink=(*trkIter)->trackOrParticleLink();
-
-
- const Trk::LinkToTrackParticleBase * vtxCastedLinkTPBase=
- dynamic_cast<const Trk::LinkToTrackParticleBase *>(vtxTrackLink);
-
-
- const Trk::LinkToXAODTrackParticle* vtxCastedLinkTPxAOD=
- dynamic_cast<const Trk::LinkToXAODTrackParticle *>(vtxTrackLink);
-
-
- bool case11=vtxCastedLinkTPBase&&trkCastedLinkTPBase&&
- &(***vtxCastedLinkTPBase)==&(***trkCastedLinkTPBase);
-
-
- bool case22=trkCastedLinkTPxAOD&&vtxCastedLinkTPxAOD&&
- &(***vtxCastedLinkTPxAOD)==&(***trkCastedLinkTPxAOD);
-
-
- if (!case11 && !case22)
- {
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
- if ((trkCastedLinkTPBase&&vtxCastedLinkTPxAOD)||(trkCastedLinkTPxAOD&&vtxCastedLinkTPBase))
- {
- if (countDebug%500==0)
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Jet Fitter Vertex Finding is done on TrackParticleBase, primary vertex information is stored based on xAOD::TrackParticleBase or viceversa." << endmsg;
- if (msgLvl(MSG::DEBUG)) msg() << " Cannot use the fit of primary vertex for estimating the compatibility to the primary vertex. No correlation between primary vertex fit and track will be considered. Please activate PV REFITTING on AOD..." << endmsg;
- }
- countDebug+=1;
- }
-#endif
- continue;
- }
-
- if (case11&&case22)
- {
- msg(MSG::WARNING) << " Throwing exception " << endmsg;
- throw std::string("Internal algorithmic error in InDetImprovedJetFitterVxFinder");
- }
-
-
- const Trk::FitQuality & fitQuality=(*trkIter)->trackQuality();
- double withoutSign=fitQuality.chiSquared();
-
-
- if (fitQuality.chiSquared()==0.)
- {
- withoutSign=m_jetFitterUtils->compatibility(*myMeasuredPerigee,primaryVertexRecVertex).first;
- }
-
-
-
- //now assign a sign to the found track (respect to the jet momentum direction)
- Amg::Vector3D jetMomSpatial(jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z());
- withoutSign=fabs(withoutSign)*m_jetFitterUtils->get3DLifetimeSignOfTrack(*myMeasuredPerigee,
- jetMomSpatial,
- primaryVertexRecVertex);
-
- compatibilityOfTrack[*qualitytracksIter]=withoutSign;
-
- //temporary: to check that everything is fine, notice if the result without considering
- //that the track was part in the fit is consistent/similar to the correct onw...
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
+ delete twoTrackVertexCandidates;
+//
+// // One last complication, primaryVertex needs to be a different object (old edm)
+// // see lines 524-537 in old code and create primaryVertexRecVertex using the vertex edm factory
- if (fitQuality.chiSquared()>0.)
- {
- double WouldBe=m_jetFitterUtils->compatibility(*myMeasuredPerigee,primaryVertexRecVertex).first;
+ Trk::RecVertex primaryVertexRecVertex( primaryVertex.position(),
+ primaryVertex.covariancePosition(),
+ primaryVertex.numberDoF(),
+ primaryVertex.chiSquared());
- if (fabs(WouldBe/fitQuality.chiSquared()-1)>0.02)
- {
- if (msgLvl(MSG::VERBOSE)) msg() << " Probability mismatch: 1st vertex chi2 is: " << fitQuality.chiSquared() <<
- " while a posteriori chi2 is: " << WouldBe << endmsg;
-
- if (msgLvl(MSG::VERBOSE)) msg() << "d0/s(d0)" << myMeasuredPerigee->parameters()[Trk::d0]/Amg::error(*myMeasuredPerigee->covariance(),Trk::d0)
- << "z0/s(z0)" << myMeasuredPerigee->parameters()[Trk::z0]/Amg::error(*myMeasuredPerigee->covariance(),Trk::z0) << endmsg;
-
- }
- }
- // else
- // {
- // if (msgLvl(MSG::VERBOSE)) msg() << " Probability match: 1st vertex chi2 is: " << fitQuality.chiSquared() <<
- // " while a posteriori chi2 is: " << WouldBe << endmsg;
- // }
-
-#endif
- matched=true;
- }
-
- }
- else
- {
- if (msgLvl(MSG::VERBOSE)) msg() << " Not using any primary vertex information for track compatibilities." << endmsg;
- }
-
- if (!matched)
- {
- double actualcomp=m_jetFitterUtils->compatibility(*myMeasuredPerigee,
- primaryVertexRecVertex).first;
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
-
- if (msgLvl(MSG::DEBUG)) msg() << " the compatibility which will be stored for a non primary vtx track is: " <<
- actualcomp << endmsg;
- if (msgLvl(MSG::VERBOSE))
- {
- //Amg::Vector3D trackParameters = myMeasuredPerigee->parameters();
-
- msg(MSG::VERBOSE) << "d0/s(d0)" << myMeasuredPerigee->parameters()[Trk::d0]/Amg::error(*myMeasuredPerigee->covariance(),Trk::d0)
- << "z0/s(z0)" << myMeasuredPerigee->parameters()[Trk::z0]/Amg::error(*myMeasuredPerigee->covariance(),Trk::z0) << endmsg;
- }
-#endif
-
- //get the sign (abs not needed but...)
- Amg::Vector3D jetMomSpatial(jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z());
- actualcomp=fabs(actualcomp)*m_jetFitterUtils->get3DLifetimeSignOfTrack(*myMeasuredPerigee,
- jetMomSpatial,
- primaryVertexRecVertex);
-
- compatibilityOfTrack[*qualitytracksIter]=actualcomp;
-
- }
+ // Refactoring: Instead at this point use JetFitterMultiStageFit:
+ Trk::VxJetCandidate* myJetCandidate= m_multiStageFitter->doTwoStageFit(primaryVertexRecVertex,
+ jetMomentum,
+ tracksToUseInFirstFit,
+ tracksToUseInSecondFit,
+ JFseedDirection);
- delete myMeasuredPerigee;
- myMeasuredPerigee=0;
+ if (myJetCandidate == 0) {
+ ATH_MSG_DEBUG( "JetFitter multi stage fit returned 0" );
+ return 0;
}
-
- //so now you have the following inputs:
- //1) primary vertex: --> signalVertex (VxCandidate*) --> primaryVertexRecVertex (const RecVertex&)
- //2) jetMomentum (const CLHEP::HepLorentzVector &)
- //3) myTracks (const std::vector<const Trk::ITrackLink*>)
- //4) compatibilityOfTrack (std::map<const Trk::ITrackLink*,double>)
-
- if (msgLvl(MSG::VERBOSE)) msg() << " JetFitterFinding phase 2: distinguish between primary and secondary tracks " << endmsg;
-
- //now distinguish between primary and secondary tracks
-
- std::vector<const Trk::ITrackLink*>::const_iterator myTracksBegin=myTracks.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator myTracksEnd=myTracks.end();
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator myTracksIter=myTracksBegin;
- myTracksIter!=myTracksEnd;++myTracksIter)
- {
-
- double compatibilityOfActualTrack=compatibilityOfTrack[*myTracksIter];
-
- double cutCompatibilityPVforNegTracks=m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks;
- double cutCompatibilityPVforPosTracks=m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks;
-
- if (m_revertFromPositiveToNegativeTags)//revert cuts if needed
- {
- cutCompatibilityPVforNegTracks=m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks;
- cutCompatibilityPVforPosTracks=m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks;
- }
-
- if ( ( compatibilityOfActualTrack<0 && TMath::Prob(fabs(compatibilityOfActualTrack),2)< cutCompatibilityPVforNegTracks) ||
- ( compatibilityOfActualTrack>=0 && TMath::Prob(fabs(compatibilityOfActualTrack),2)< cutCompatibilityPVforPosTracks) )
- {
- secondaryTracks.push_back(*myTracksIter);
- }
- else
- {
- primaryTracks.push_back(*myTracksIter);
- }
+ else {
+ ATH_MSG_DEBUG( "USING JetFitterMultiStageFit return" );
}
- //now you also have primaryTracks and secondaryTracks
-
- if (msgLvl(MSG::VERBOSE)) msg() << " JetFitterFinding phase 3: finding all two track vertices combinations " << endmsg;
-
- //iterate only on the secondaryTracks and go through all the 2-tracks combinations
-
- //temporary vector used to accumulate the parameters to fit...
- //std::vector<const Trk::ParametersBase*> perigeeToFit(0);
- //const Trk::ParametersBase* firstPerigee(0);
- //const Trk::ParametersBase* secondPerigee(0);
-
- std::vector<const Trk::TrackParameters*> perigeeToFit(0);
- const Trk::TrackParameters* firstPerigee(0);
- const Trk::TrackParameters* secondPerigee(0);
-
-
- std::vector<const Trk::ITrackLink*>::const_iterator secondaryTracksBegin=secondaryTracks.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator secondaryTracksEnd=secondaryTracks.end();
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator secondaryTracksIter=secondaryTracksBegin;
- secondaryTracksIter!=secondaryTracksEnd;++secondaryTracksIter)
- {
-
- //this is independent of the kind of track: Kirill and Andi did this --> well done!
- firstPerigee=(*secondaryTracksIter)->parameters();
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator secondaryTracksIter2=secondaryTracksBegin;
- secondaryTracksIter2!=secondaryTracksIter;
- ++secondaryTracksIter2) {
-
- perigeeToFit.clear();
- secondPerigee=(*secondaryTracksIter2)->parameters();
- perigeeToFit.push_back(firstPerigee);
- perigeeToFit.push_back(secondPerigee);
-
- //MU Trk::Vertex seedVertex;
- Amg::Vector3D seedVertex;
- try {
- seedVertex=m_CrossDistancesSeedFinder->findSeed(perigeeToFit);
-
- //MU Amg::Vector3D seedVertexPos=seedVertex.position();
-
- //MU if (seedVertex.position().perp()>m_maxR || fabs(seedVertex.position().z())>m_maxZ)
- if (seedVertex.perp()>m_maxR || fabs(seedVertex.z())>m_maxZ)
- {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Vertex seed outside ID. R=" << seedVertex.perp() << " Z=" << seedVertex.z() << endmsg;
- seedVertex[0] = (primaryVertexRecVertex.position().x());
- seedVertex[1] = (primaryVertexRecVertex.position().y());
- seedVertex[2] = (primaryVertexRecVertex.position().z());
- }
- } catch (...) {
- if (msgLvl(MSG::WARNING)) msg() << "Seed finding failed. Using primary vertex as seed... (clearly not optimal)" << endmsg;
- seedVertex=Amg::Vector3D(primaryVertexRecVertex.position());
- }
-
- //N*(N-1) combinations are considered (this is why a cut on primary tracks is done)
- //MU m_SequentialVertexFitter->fit(perigeeToFit, seedVertex);
- xAOD::Vertex* myCandidate(m_SequentialVertexFitter->fit(perigeeToFit,
- seedVertex));
- //MU );
- //MU Trk::VxCandidate* myCandidate(m_SequentialVertexFitter->fit(perigeeToFit,
- //MU seedVertex));
- if (myCandidate==0) {
- if (msgLvl(MSG::DEBUG)) msg() << " Sequential fit failed. shouldn't happen... Skipping V0 candidate... " << endmsg;
- continue;
- }
+// // Lastly create the jetfitter info, ('save' our results)
+ std::vector<Trk::VxJetCandidate*> myCandidates;
+ // This push_back is problematic for the migration to xAOD::Vertex, it works simply because VxJetCandidate inherits from VxCandidate
+ myCandidates.push_back(myJetCandidate);
- //now you are cloning the ITrackLink*
- //so you need to update the map of the compatibilities
- //(not great programming style, but this class is C not C++ :-)
- Trk::ITrackLink* newLinkTrack1=(*secondaryTracksIter)->clone();
- Trk::ITrackLink* newLinkTrack2=(*secondaryTracksIter2)->clone();
+ Trk::VxJetFitterVertexInfo* myOutputInfo=new Trk::VxJetFitterVertexInfo(myCandidates,
+ myTwoTrackVerticesInJet,
+ mySelectedTracksInJet);
-// compatibilityOfTrack[newLinkTrack1]=compatibilityOfTrack[*secondaryTracksIter];
-// compatibilityOfTrack[newLinkTrack2]=compatibilityOfTrack[*secondaryTracksIter2];
-
- ((myCandidate->vxTrackAtVertex()))[0].setOrigTrack ( newLinkTrack1 );
- ((myCandidate->vxTrackAtVertex()))[1].setOrigTrack ( newLinkTrack2 );
-
- if (myCandidate->chiSquared()<0 ||
- myCandidate->numberDoF()<0)
- {
- msg(MSG::DEBUG) << " Fit for V0 candidate failed: chi2 or ndf negative. Deleting candidate..." << endmsg;
- delete myCandidate;
- myCandidate=0;
- continue;
- }
-
-
- if (TMath::Prob(myCandidate->chiSquared(),
- myCandidate->numberDoF())>m_twoVertexProbabilityCut)
- {
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
- if (msgLvl(MSG::DEBUG)) msg() << " passed probability vertex: " << TMath::Prob(myCandidate->chiSquared(),
- myCandidate->numberDoF()) << endmsg;
-#endif
- V0candidates.push_back(myCandidate);
- fromLinkInV0CandidateToOriginalLink[newLinkTrack1]=*secondaryTracksIter;
- fromLinkInV0CandidateToOriginalLink[newLinkTrack2]=*secondaryTracksIter2;
- }
- else
- {
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
- if (msgLvl(MSG::DEBUG)) msg() << " didn't pass probability cut for 2-tr vtx: " <<
- std::setprecision(10) <<
- TMath::Prob(myCandidate->chiSquared(),
- myCandidate->numberDoF()) <<
- endmsg;
-#endif
- delete myCandidate;
- myCandidate=0;
- }
- }
- }
+ myOutputInfo->setSVOwnership(true);
+ return myOutputInfo;
+ }
+
- //now the two track vertices were found
- if (msgLvl(MSG::VERBOSE)) msg() << " JetFitterFinding phase 4: create neutral tracks out of recognized conversions, KS and Lambdas " << endmsg;
+ Trk::VxJetCandidate* InDetImprovedJetFitterVxFinder::findSecVertex(const Trk::RecVertex & /*primaryVertex*/,
+ const TLorentzVector & /*jetMomentum*/,
+ const std::vector<const Trk::ITrackLink*> & /*firstInputTracks*/,
+ const std::vector<const Trk::ITrackLink*> & /*secondInputTracks*/,
+ const Amg::Vector3D & /*vtxSeedDirection*/ ) const
+ {
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
- if (msgLvl(MSG::DEBUG)) msg() << "Found " << V0candidates.size() << " V0 candidates. " << endmsg;
-#endif
+ // The overload is legacy. This is where we interface to JetFitter proper
+ // m_jetFitterMultiStageFit->performTwoStageFit(const Trk::RecVertex & primaryVertex,
+ // const TLorentzVector & jetMomentum,
+ // const std::vector<const Trk::ITrackLink*> & firstInputTracks,
+ // const std::vector<const Trk::ITrackLink*> & secondInputTracks,
+ // const Amg::Vector3D & vtxSeedDirection
- //now iterate over all the two track vertices and realize if neutral tracks can be created from these...
-
- std::vector<const xAOD::Vertex*>::const_iterator v0candBegin=V0candidates.begin();
- std::vector<const xAOD::Vertex*>::const_iterator v0candEnd=V0candidates.end();
+ // return myOutputInfo
+ return 0;
- for (std::vector<const xAOD::Vertex*>::const_iterator v0candIter=v0candBegin;v0candIter!=v0candEnd;++v0candIter)
- {
-
- const xAOD::Vertex * fittedVertex = *v0candIter;
-
- double radius=fittedVertex->position().perp();
-
- if (msgLvl(MSG::VERBOSE)) msg() << " radius of 2-tr vertex is: " << radius;
-
-// double vertexprob=
-// (fittedVertex.fitQuality().chiSquared()>0&&fittedVertex.fitQuality().numberDoF()>0) ?
-// TMath::Prob(fittedVertex.fitQuality().chiSquared(),fittedVertex.fitQuality().numberDoF()) : -1;
-
- //now obtain the daughters of the two vertex
- std::vector<Trk::VxTrackAtVertex>::const_iterator vtxIter = fittedVertex->vxTrackAtVertex().begin();
- //obtain first track
- auto const & firstTrack = *vtxIter;
- //obtain second track
- ++vtxIter;
- auto const & secondTrack = *vtxIter;
-
- int charge=m_jetFitterUtils->getTwoTrackVtxCharge(**v0candIter);
-
- if (msgLvl(MSG::VERBOSE)) msg() << " charge " << charge;
-
- double massee=m_jetFitterUtils->getTwoTrackVtxMass(**v0candIter,
- s_masselectron,
- s_masselectron);
-
- if (msgLvl(MSG::VERBOSE)) msg() << " massee " << massee;
-
- double masspipi=m_jetFitterUtils->getTwoTrackVtxMass(**v0candIter,
- s_masspion,
- s_masspion);
-
- if (msgLvl(MSG::VERBOSE)) msg() << " masspipi " << masspipi;
-
- double massprpi=m_jetFitterUtils->getTwoTrackVtxMass(**v0candIter,
- s_massproton,
- s_masspion);
-
- if (msgLvl(MSG::VERBOSE)) msg() << " massprpi " << massprpi << endmsg;
-
- std::pair<double,double> distanceAndError=
- m_jetFitterUtils->getDistanceAndErrorBetweenTwoVertices(*fittedVertex,primaryVertexRecVertex);
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" distance " << distanceAndError.first << " error " << distanceAndError.second << endmsg;
-
- //now assign a sign to the distance (decay in front or behind the primary vertex)
- double signeddistance=distanceAndError.first;
-
- Amg::Vector3D jetMomSpatial(jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z());
- double sign=(fittedVertex->position() - primaryVertexRecVertex.position()).dot(jetMomSpatial);
- if (sign<0)
- {
- signeddistance*=-1.;
- }
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" signed distance " << signeddistance << endmsg;
-
- //now to understand if the 2-track vertex can represent a neutral track (conversion,Ks,Lambda)
- bool isKs=fabs(masspipi-s_massks)<m_cutDeltaMKs;
- bool isLambda=fabs(massprpi-s_masslambda)<m_cutDeltaMLambda;
- bool isPhoton=fabs(massee)<m_cutDeltaMGamma;
-
- const Trk::ITrackLink* originalTrackLink1=fromLinkInV0CandidateToOriginalLink[firstTrack.trackOrParticleLink()];
- const Trk::ITrackLink* originalTrackLink2=fromLinkInV0CandidateToOriginalLink[secondTrack.trackOrParticleLink()];
-
- double compatibilityTrack1=compatibilityOfTrack[originalTrackLink1];
- double compatibilityTrack2=compatibilityOfTrack[originalTrackLink2];
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" compatibility of track 1 " << compatibilityTrack1 << " compatibility of track 2 " << compatibilityTrack2 << endmsg;
-
- bool flightSignificance=
- TMath::Prob(fabs(compatibilityTrack1),2)<m_cutCompatibilityPrimaryVertexSingleTrackForKsAndLambda&&
- TMath::Prob(fabs(compatibilityTrack2),2)<m_cutCompatibilityPrimaryVertexSingleTrackForKsAndLambda&&
- TMath::Prob(fabs(compatibilityTrack1)+
- fabs(compatibilityTrack2),4)<m_cutCompatibilityPrimaryVertexBothTracksForKsAndLambda;
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" flightSignificance " << flightSignificance << endmsg;
-
- const Trk::TrackParameters* initialPerigee1=firstTrack.initialPerigee();
- const Trk::TrackParameters* initialPerigee2=secondTrack.initialPerigee();
-
- if (!initialPerigee1 || !initialPerigee2)
- {
- msg(MSG::WARNING) << "No refitted parameters available for fitted v0 candidate. Discarding candidate..." << endmsg;
- continue;
- }
-
- std::pair<double,double> track1_IPd0z0=m_jetFitterUtils->getD0andZ0IP(*initialPerigee1,
- primaryVertexRecVertex);
-
- std::pair<double,double> track2_IPd0z0=m_jetFitterUtils->getD0andZ0IP(*initialPerigee2,
- primaryVertexRecVertex);
-
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" tr 1 d0ip " << track1_IPd0z0.first << " z0 ip " << track1_IPd0z0.second << endmsg;
- if (msgLvl(MSG::VERBOSE)) msg() <<" tr 2 d0ip " << track2_IPd0z0.first << " z0 ip " << track2_IPd0z0.second << endmsg;
-
- bool tightIPcut1=fabs(track1_IPd0z0.first)<m_cutIPD0BothTracksCriteriumOneForKsAndLambda&&fabs(track1_IPd0z0.second)<m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
- bool tightIPcut2=fabs(track2_IPd0z0.first)<m_cutIPD0BothTracksCriteriumOneForKsAndLambda&&fabs(track2_IPd0z0.second)<m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
-
- bool atLeastOneLoose=( !tightIPcut1 ) || ( !tightIPcut2 );
-
- bool requirementForKs=
- isKs&&charge==0&&
- signeddistance/distanceAndError.second>m_cutTwoTrkVtxLifetimeSignificanceForKs&&
- flightSignificance&&
- ((radius>m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda&&(!atLeastOneLoose))
- ||(atLeastOneLoose));
-
- if (m_revertFromPositiveToNegativeTags)
- {
- requirementForKs=
- isKs&&charge==0&&
- signeddistance/distanceAndError.second<-m_cutTwoTrkVtxLifetimeSignificanceForKs&&
- flightSignificance&&
- ((radius>m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda&&(!atLeastOneLoose))
- ||(atLeastOneLoose));
- }
-
-
- bool requirementForLambda=
- isLambda&&charge==0&&
- signeddistance/distanceAndError.second>m_cutTwoTrkVtxLifetimeSignificanceForLambda&&
- flightSignificance&&
- ((radius>m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda&&(!atLeastOneLoose))
- ||(atLeastOneLoose));
-
- if (m_revertFromPositiveToNegativeTags)
- {
- requirementForLambda=
- isLambda&&charge==0&&
- signeddistance/distanceAndError.second<-m_cutTwoTrkVtxLifetimeSignificanceForLambda&&
- flightSignificance&&
- ((radius>m_cutTransverseTwoTrkVtxDistanceCriteriumTwoForKsAndLambda&&(!atLeastOneLoose))
- ||(atLeastOneLoose));
- }
-
-
- bool requirementForConversion=
- isPhoton&&
- signeddistance>0&&
- charge==0;
-
- if (m_revertFromPositiveToNegativeTags)
- {
- requirementForConversion=
- isPhoton&&
- signeddistance<0&&
- charge==0;
- }
-
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" is Ks " << (requirementForKs?"yes":"no")<< " is conversion " << (requirementForConversion?"yes":"no")<<
- " is Lambda " << (requirementForLambda?"yes":"no") << endmsg;
+ }
- if (requirementForKs||requirementForLambda||requirementForConversion)
- {
-
- //const Trk::NeutralPerigee* neutralParticle= m_convUtils->createNeutralTrackFromVertex(**v0candIter);
- //const Trk::ParametersBase* myParametersBase = neutralParticle; NeutralPerigee is already just a typedef to Trk::ParametersBase<5,Trk::Neutral>, doesn't make sense to convert it again...
- //const Trk::FitQuality* myFitQuality=new Trk::FitQuality( (*v0candIter)->recVertex().fitQuality() );
- //const Trk::TrackSummary* myTrackSummary=0;//new Trk::TrackSummary();
- //const Trk::VxCandidate* myVxCand=*v0candIter;
- //const Trk::Track* myTrack=0;
+ void InDetImprovedJetFitterVxFinder::doTheFit(Trk::VxJetCandidate* /*myJetCandidate*/,
+ bool /*performClustering*/ ) const {
- std::vector<const Trk::TrackParameters*> myDummyVector;
- if (msgLvl(MSG::DEBUG)) msg() << "creating new neutral track particle base" << endmsg;
-
- ///THIS WILL NOT WORK IN NEW EDM! NEEDS A FIX!!!
- /*
- const Trk::TrackParticleBase* myTrackParticleBase=new Trk::TrackParticleBase(myTrack,
- Trk::NoVtx,
- myVxCand,
- myTrackSummary,//summary
- myDummyVector,
- myParametersBase,
- myFitQuality);
+ }
-
- ElementLink<Trk::TrackParticleBaseCollection> link;
- link.setElement(const_cast<Trk::TrackParticleBase*>(myTrackParticleBase));
- Trk::LinkToTrackParticleBase * myNeutralTrackLink = new Trk::LinkToTrackParticleBase(link);
- neutralTracks.push_back(myNeutralTrackLink);
+ void InDetImprovedJetFitterVxFinder::sortTrackCollectionByPt( std::vector< const Trk::ITrackLink* >& trackCollection ) const {
- if (requirementForKs)
- {
- massOfNeutralTrack[myTrackParticleBase]=masspipi;
- }
- else if (requirementForConversion)
- {
- massOfNeutralTrack[myTrackParticleBase]=massee;
- }
- else if (requirementForLambda)
- {
- massOfNeutralTrack[myTrackParticleBase]=massprpi;
- }
- else
- {
- msg(MSG::WARNING) << " Internal error. Neutral candidate is discarded. " << endmsg;
- continue;
- }
- */
- }
- }
-
+ if ( trackCollection.empty() ) return;
- if (msgLvl(MSG::VERBOSE)) msg() <<" JetFitterFinding phase 5: try to further analyze conversions,Ks and Lambda and do some sort of overlap removal" << endmsg;
-
- //now you have the following things
- //as before
- //1) primary vertex: --> signalVertex (VxCandidate*) --> primaryVertexRecVertex (const RecVertex&)
- //2) jetMomentum (const CLHEP::HepLorentzVector &)
- //3) myTracks (const std::vector<const Trk::ITrackLink*>)
- //4) compatibilityOfTrack (std::map<const Trk::ITrackLink*,double>)
- //
- //5)primaryTracks,secondaryTracks
- //6)V0candidates
- //7)neutralTracks + masses (massOfNeutralTrack)
+ ATH_MSG_DEBUG("re-order the tracks by pT: " <<
+ ( trackCollection.front()->parameters() )->pT() <<
+ " -- " <<
+ ( trackCollection.back()->parameters() )->pT() );
- std::vector<const Trk::ITrackLink*> tracksToVeto;
- std::vector<const xAOD::Vertex*> candidatesToVeto;
- std::vector<const Trk::LinkToTrackParticleBase*> selectedNeutralTracks;
- std::vector<const Trk::LinkToTrackParticleBase*> selectedNeutralTracksForIP;
+ std::sort( trackCollection.begin(),
+ trackCollection.end(),
+ //Lambda func to sort by pt
+ [](const Trk::ITrackLink* TL1, const Trk::ITrackLink* TL2) {
+ return ( (TL1->parameters())->pT() < (TL2->parameters())->pT() );
+ } );
+ ATH_MSG_DEBUG("after re-order the tracks by pT: " <<
+ ( trackCollection.front()->parameters() )->pT() <<
+ " -- " <<
+ ( trackCollection.back()->parameters() )->pT() );
-
- //v0candBegin
- //v0candIter
-
- //first iteration to understand if there are conversions
- for (std::vector<const xAOD::Vertex*>::const_iterator v0candIter=v0candBegin;v0candIter!=v0candEnd;++v0candIter)
- {
- const xAOD::Vertex* v0candPtr=*v0candIter;
-
- if (msgLvl(MSG::DEBUG)) msg() << " Analyzing new neutral candidate for conversion " << endmsg;
-
- if (v0candPtr==0)
- {
- msg(MSG::WARNING) << " Pointer for V0 is null pointer. Skipping V0 candidate..." << endmsg;
- continue;
- }
-
- //is there a neutral particle associated to this? Iterate over neutrals to understand this
- //reurning 0 for the moment anyway, this is broken in new EDM. Needs Fixing!
- const Trk::LinkToTrackParticleBase* correspondingNeutralLink=
- m_jetFitterUtils->findNeutralTrackParticleBase(neutralTracks,
- **v0candIter);
-
- if (!correspondingNeutralLink)
- {
- continue;
- }
-
- const Trk::TrackParticleBase * correspondingNeutral=**correspondingNeutralLink;
-
-
- //Can't get a neutral from a link to TrackParticleBase anymore...dynamic_cast to get this to compile, but this will not do anthing sensible. FIX ME!
- const Trk::NeutralPerigee& myMeasuredNeutralPerigee=dynamic_cast<const Trk::NeutralPerigee&>(correspondingNeutral->definingParameters());
-
- if (fabs(massOfNeutralTrack[correspondingNeutral])>m_cutDeltaMGamma)
- {
- continue;
- }
-
- double compatibilityToPrimaryOfNeutralTrack=
- m_jetFitterUtils->compatibility(myMeasuredNeutralPerigee,primaryVertexRecVertex).first;
-
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
- if (msgLvl(MSG::DEBUG)) msg() << " The compatibility of the conversion is: " << compatibilityToPrimaryOfNeutralTrack << endmsg;
-#endif
-
- selectedNeutralTracksForIP.push_back(correspondingNeutralLink);
-
- if (fabs(compatibilityToPrimaryOfNeutralTrack)<m_cutCompatibilityChi2ToPrimaryNeutralTrackFromConversion)
- {
- tracksToVeto.push_back(fromLinkInV0CandidateToOriginalLink[((v0candPtr->vxTrackAtVertex()))[0].trackOrParticleLink()]);
- tracksToVeto.push_back(fromLinkInV0CandidateToOriginalLink[((v0candPtr->vxTrackAtVertex()))[1].trackOrParticleLink()]);
- }
- }
-
- //now do the same but trying to find out KSs
- for (std::vector<const xAOD::Vertex*>::const_iterator v0candIter=v0candBegin;v0candIter!=v0candEnd;++v0candIter)
- {
-
- const xAOD::Vertex * v0candPtr=*v0candIter;
-
- if (msgLvl(MSG::DEBUG)) msg() << " Analyzing new neutral candidate for KS " << endmsg;
-
- if (v0candPtr==0)
- {
- msg(MSG::WARNING) << " Pointer for V0 is null pointer. Skipping KS candidate..." << endmsg;
- continue;
- }
-
- //is there a neutral particle associated to this? Iterate over neutrals to understand this
- //reurning 0 for the moment anyway, this is broken in new EDM. Needs Fixing!
- const Trk::LinkToTrackParticleBase* correspondingNeutralLink=
- m_jetFitterUtils->findNeutralTrackParticleBase(neutralTracks,
- **v0candIter);
- if (!correspondingNeutralLink)
- {
- continue;
- }
-
- const Trk::TrackParticleBase * correspondingNeutral=**correspondingNeutralLink;
-
- //See above... FIX ME!
- const Trk::NeutralPerigee& myMeasuredNeutralPerigee=
- dynamic_cast<const Trk::NeutralPerigee&>(correspondingNeutral->definingParameters());
-
- if (fabs(massOfNeutralTrack[correspondingNeutral]-s_massks)>m_cutDeltaMKs)
- {
- continue;
- }
-
- double compatibilityToPrimaryOfNeutralTrack=
- m_jetFitterUtils->compatibility(myMeasuredNeutralPerigee,primaryVertexRecVertex).first;
-
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
- if (msgLvl(MSG::DEBUG)) msg() << " The compatibility of the KS is: " << compatibilityToPrimaryOfNeutralTrack << endmsg;
-#endif
-
- auto const & firstTrack = v0candPtr->vxTrackAtVertex()[0];
- auto const & secondTrack = v0candPtr->vxTrackAtVertex()[1];
-
- if (firstTrack==0 || secondTrack ==0)
- {
- msg(MSG::WARNING) << " Zero pointer (VxTrackAtVertex): skipping Ks candidate " << endmsg;
- continue;
- }
-
-
- const Trk::ITrackLink* trackLink1=firstTrack.trackOrParticleLink();
- const Trk::ITrackLink* trackLink2=secondTrack.trackOrParticleLink();
-
- if (trackLink1==0 || trackLink2==0)
- {
- msg(MSG::WARNING) << " Zero pointer (ITrackLink): skipping Ks candidate " << endmsg;
- continue;
- }
-
- //check if the candidate was vetoed
- if (m_jetFitterUtils->checkIfVxCandidateIsInVector(v0candPtr,candidatesToVeto))
- continue;
-
- const Trk::ITrackLink* originalTrackLink1=fromLinkInV0CandidateToOriginalLink[trackLink1];
- const Trk::ITrackLink* originalTrackLink2=fromLinkInV0CandidateToOriginalLink[trackLink2];
-
-
- //check if the tracks were already vetoed (by conversions)
- if (m_jetFitterUtils->checkIfTrackIsInVector(originalTrackLink1,tracksToVeto))
- continue;
- if (m_jetFitterUtils->checkIfTrackIsInVector(originalTrackLink2,tracksToVeto))
- continue;
-
- if (fabs(compatibilityToPrimaryOfNeutralTrack)<m_cutCompatibilityChi2ToPrimaryNeutralTrackFromKs)
- {
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" Add neutral to the candidates to veto " << endmsg;
-
- //add neutral to the candidates to veto
- candidatesToVeto.push_back(v0candPtr);
- selectedNeutralTracksForIP.push_back(correspondingNeutralLink);
- }
- else
- {
-
-
- const Trk::TrackParameters * trackPerigee1=firstTrack.initialPerigee();
- const Trk::TrackParameters * trackPerigee2=secondTrack.initialPerigee();
-
- if (trackPerigee1==0||trackPerigee2==0)
- {
- msg(MSG::WARNING) << " Null Pointer in Perigee returned. Skipping KS candidate... " << endmsg;
- continue;
- }
-
-
- std::pair<double,double> track1IPd0z0=
- m_jetFitterUtils->getD0andZ0IP(*trackPerigee1,primaryVertexRecVertex);
-
- std::pair<double,double> track2IPd0z0=
- m_jetFitterUtils->getD0andZ0IP(*trackPerigee2,primaryVertexRecVertex);
-
- bool tightIPcut1=fabs(track1IPd0z0.first)<m_cutIPD0BothTracksCriteriumOneForKsAndLambda&&fabs(track1IPd0z0.second)<m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
- bool tightIPcut2=fabs(track2IPd0z0.first)<m_cutIPD0BothTracksCriteriumOneForKsAndLambda&&fabs(track2IPd0z0.second)<m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
-
- if (msgLvl(MSG::VERBOSE)) msg() << " tightIPcut1 " << (tightIPcut1?"yes":"no") << " tightIPcut2: " << (tightIPcut2?"yes":"no") << endmsg;
-
- bool atLeastOneLoose=( !tightIPcut1 ) || ( !tightIPcut2 );
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" at least one loose " << (atLeastOneLoose?"yes":"no") << endmsg;
-
- if (atLeastOneLoose)
- {
-
- //////////////////////
-
- bool hasTrackInPreviousNeutral=false;
-
-// const Trk::ITrackLink* originalTrackLink1=fromLinkInV0CandidateToOriginalLink[trackLink1];
-// const Trk::ITrackLink* originalTrackLink2=fromLinkInV0CandidateToOriginalLink[trackLink2];
-// already calculated!
-
- //go from original ITrackLink to all other possible ITrackLink
- std::vector<const Trk::ITrackLink*> vectorOfV0ITrackLink;
-
- std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkBegin=fromLinkInV0CandidateToOriginalLink.begin();
- std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkEnd=fromLinkInV0CandidateToOriginalLink.end();
-
- for (std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkIter=fromLinkInV0CandidateToOriginalLinkBegin;
- fromLinkInV0CandidateToOriginalLinkIter!=fromLinkInV0CandidateToOriginalLinkEnd;
- ++fromLinkInV0CandidateToOriginalLinkIter)
- {
- if ((*fromLinkInV0CandidateToOriginalLinkIter).second==originalTrackLink1||
- (*fromLinkInV0CandidateToOriginalLinkIter).second==originalTrackLink2)
- {
- if (msgLvl(MSG::VERBOSE)) msg() <<" Found one of the original ITrackLink " << endmsg;
- vectorOfV0ITrackLink.push_back((*fromLinkInV0CandidateToOriginalLinkIter).first);
- }
- }
-
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLinkBegin=vectorOfV0ITrackLink.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLinkEnd=vectorOfV0ITrackLink.end();
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLinkIter=vectorOfV0ITrackLinkBegin;
- vectorOfV0ITrackLinkIter!=vectorOfV0ITrackLinkEnd;
- ++vectorOfV0ITrackLinkIter)
- {
-
- if (m_jetFitterUtils->checkIfTrackIsInNeutralTrackVector(*vectorOfV0ITrackLinkIter,neutralTracks))
- {
- hasTrackInPreviousNeutral=true;
- if (msgLvl(MSG::DEBUG)) msg() << " Found track in previous neutral. Skipping new neutral candidate... " << endmsg;
- break;
- }
- }
-
- if (hasTrackInPreviousNeutral)
- continue;
-
- //check if the tracks are already in one neutral track (previous found KS)
- //THIS CANNOT WORK... (tracks in different V0 candidates have different links)
- //if (m_jetFitterUtils->checkIfTrackIsInNeutralTrackVector(trackLink1,neutralTracks))
- //continue;
- //THIS CANNOT WORK...
- //if (m_jetFitterUtils->checkIfTrackIsInNeutralTrackVector(trackLink2,neutralTracks))
- // continue;
-
- //PLEASE NOTE: when adding to tracksToUseInFirstFit, you need
- //ALWAYS
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" Add to the tracks to use in the first fit...! " << endmsg;
-
- tracksToUseInFirstFit.push_back(correspondingNeutralLink);
- selectedNeutralTracks.push_back(correspondingNeutralLink);
- selectedNeutralTracksForIP.push_back(correspondingNeutralLink);
- }
- // if not at Least One Loose, then it's probably a two track vertex which
- // comes directly from the B continous...
- }
- }
-
- //now do the same but trying to find out Lambdas
- for (std::vector<const xAOD::Vertex*>::const_iterator v0candIter=v0candBegin;v0candIter!=v0candEnd;++v0candIter)
- {
-
- const xAOD::Vertex* v0candPtr=*v0candIter;
-
- if (msgLvl(MSG::DEBUG)) msg() << " Analyzing new neutral candidate for Lambdas " << endmsg;
-
- if (v0candPtr==0)
- {
- msg(MSG::WARNING) << " Pointer for V0 is null pointer. Skipping Lambdas candidate..." << endmsg;
- continue;
- }
-
- //is there a neutral particle associated to this? Iterate over neutrals to understand this
- //reurning 0 for the moment anyway, this is broken in new EDM. Needs Fixing!
- const Trk::LinkToTrackParticleBase* correspondingNeutralLink=
- m_jetFitterUtils->findNeutralTrackParticleBase(neutralTracks,
- **v0candIter);
-
- if (!correspondingNeutralLink)
- {
- continue;
- }
-
- const Trk::TrackParticleBase * correspondingNeutral=**correspondingNeutralLink;
-
- //See comments above... FIX ME!
- const Trk::NeutralPerigee& myMeasuredNeutralPerigee=
- dynamic_cast<const Trk::NeutralPerigee&>(correspondingNeutral->definingParameters());
-
- if (fabs(massOfNeutralTrack[correspondingNeutral]-s_masslambda)>m_cutDeltaMLambda)
- {
- continue;
- }
-
- double compatibilityToPrimaryOfNeutralTrack=
- m_jetFitterUtils->compatibility(myMeasuredNeutralPerigee,primaryVertexRecVertex).first;
-
-#ifdef InDetImprovedJetFitterVxFinder_DEBUGAddOns
- if (msgLvl(MSG::DEBUG)) msg() << " The compatibility of the Lambda is: " << compatibilityToPrimaryOfNeutralTrack << endmsg;
-#endif
-
- auto const & firstTrack = v0candPtr->vxTrackAtVertex()[0];
- auto const & secondTrack = v0candPtr->vxTrackAtVertex()[1];
-
- if (firstTrack==0 || secondTrack ==0)
- {
- msg(MSG::WARNING) << " Zero pointer (VxTrackAtVertex): skipping Lambda candidate " << endmsg;
- continue;
- }
-
-
- const Trk::ITrackLink* trackLink1=firstTrack.trackOrParticleLink();
- const Trk::ITrackLink* trackLink2=secondTrack.trackOrParticleLink();
-
- if (trackLink1==0 || trackLink2==0)
- {
- msg(MSG::WARNING) << " Zero pointer (ITrackLink): skipping Lambda candidate " << endmsg;
- continue;
- }
-
- //check if the candidate was vetoed
- if (m_jetFitterUtils->checkIfVxCandidateIsInVector(v0candPtr,candidatesToVeto))
- {
- if (msgLvl(MSG::VERBOSE)) msg() <<" candidate has to be vetoed " << endmsg;
- continue;
- }
-
-
- //check if the tracks were already vetoed (by conversions or KS)
- if (m_jetFitterUtils->checkIfTrackIsInVector(fromLinkInV0CandidateToOriginalLink[trackLink1],tracksToVeto))
- continue;
- if (m_jetFitterUtils->checkIfTrackIsInVector(fromLinkInV0CandidateToOriginalLink[trackLink2],tracksToVeto))
- continue;
-
- const Trk::TrackParameters * trackPerigee1=firstTrack.initialPerigee();
- const Trk::TrackParameters * trackPerigee2=secondTrack.initialPerigee();
-
- if (trackPerigee1==0||trackPerigee2==0)
- {
- msg(MSG::WARNING) << " Null Pointer in Perigee returned. Skipping Lambda candidate... " << endmsg;
- continue;
- }
-
- std::pair<double,double> track1IPd0z0=
- m_jetFitterUtils->getD0andZ0IP(*trackPerigee1,primaryVertexRecVertex);
-
- std::pair<double,double> track2IPd0z0=
- m_jetFitterUtils->getD0andZ0IP(*trackPerigee2,primaryVertexRecVertex);
-
- bool tightIPcut1=fabs(track1IPd0z0.first)<m_cutIPD0BothTracksCriteriumOneForKsAndLambda&&fabs(track1IPd0z0.second)<m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
- bool tightIPcut2=fabs(track2IPd0z0.first)<m_cutIPD0BothTracksCriteriumOneForKsAndLambda&&fabs(track2IPd0z0.second)<m_cutIPZ0BothTracksCriteriumOneForKsAndLambda;
-
- bool atLeastOneLoose=( !tightIPcut1 ) || ( !tightIPcut2 );
-
-
- if (fabs(compatibilityToPrimaryOfNeutralTrack)<m_cutCompatibilityChi2ToPrimaryNeutralTrackFromLambda)
- {
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" Adding Lambda to candidates to veto or veto the tracks directly " << endmsg;
-
- //add neutral to the candidates to veto
- candidatesToVeto.push_back(v0candPtr);
-
- selectedNeutralTracksForIP.push_back(correspondingNeutralLink);
-
- if (atLeastOneLoose)
- {
- tracksToVeto.push_back(fromLinkInV0CandidateToOriginalLink[((v0candPtr->vxTrackAtVertex()))[0].trackOrParticleLink()]);
- tracksToVeto.push_back(fromLinkInV0CandidateToOriginalLink[((v0candPtr->vxTrackAtVertex()))[1].trackOrParticleLink()]);
- }
- else
- {
- candidatesToVeto.push_back(v0candPtr);
- }
- }
- else
- {
- if (atLeastOneLoose)
- {
- selectedNeutralTracksForIP.push_back(correspondingNeutralLink);
- }
- }
- }
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" JetFitterFinding phase 6: use two-track vertices as a first seed for JetFitter " << endmsg;
-
- //now you can add the tracks from the two-track vertices for a first fit with
- //only the "best tracks"
- for (std::vector<const xAOD::Vertex*>::const_iterator v0candIter=v0candBegin;v0candIter!=v0candEnd;++v0candIter)
- {
-
- const xAOD::Vertex * v0candPtr = *v0candIter;
-
- if (msgLvl(MSG::DEBUG)) msg() << " Analyzing two track vertices to select the best tracks" << endmsg;
-
- if (v0candPtr==0)
- {
- msg(MSG::WARNING) << " Pointer for V0 is null pointer. Skipping V0 candidate..." << endmsg;
- continue;
- }
-
- if (m_jetFitterUtils->checkIfVxCandidateIsInVector(v0candPtr,candidatesToVeto))
- continue;
-
- auto const & firstTrack = v0candPtr->vxTrackAtVertex()[0];
- auto const & secondTrack = v0candPtr->vxTrackAtVertex()[1];
-
- if (firstTrack==0 || secondTrack ==0)
- {
- msg(MSG::WARNING) << " Zero pointer (VxTrackAtVertex): skipping 2-track candidate " << endmsg;
- continue;
- }
-
- const Trk::ITrackLink* trackLink1=firstTrack.trackOrParticleLink();
- const Trk::ITrackLink* trackLink2=secondTrack.trackOrParticleLink();
-
- if (trackLink1==0 || trackLink2==0)
- {
- msg(MSG::WARNING) << " Zero pointer (ITrackLink): skipping 2-track candidate " << endmsg;
- continue;
- }
-
- bool hasTrack1HardVetoed=m_jetFitterUtils->checkIfTrackIsInVector(fromLinkInV0CandidateToOriginalLink[trackLink1],
- tracksToVeto);
-
- bool hasTrack2HardVetoed=m_jetFitterUtils->checkIfTrackIsInVector(fromLinkInV0CandidateToOriginalLink[trackLink2],
- tracksToVeto);
-
- if (hasTrack1HardVetoed || hasTrack2HardVetoed)
- continue;
-
- //MU const Trk::FitQuality & vertexQuality= v0candPtr->fitQuality();
-
- double vertexProb=TMath::Prob(v0candPtr->chiSquared(),v0candPtr->numberDoF());
-
- if (vertexProb<m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium &&
- vertexProb<m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium)
- continue;
-
- const Trk::ITrackLink* originalTrackLink1=fromLinkInV0CandidateToOriginalLink[trackLink1];
- const Trk::ITrackLink* originalTrackLink2=fromLinkInV0CandidateToOriginalLink[trackLink2];
-
- double compatibilityTrack1=compatibilityOfTrack[originalTrackLink1];
- double compatibilityTrack2=compatibilityOfTrack[originalTrackLink2];
-
- bool flightSignificance=
- TMath::Prob(fabs(compatibilityTrack1),2)<m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection&&
- TMath::Prob(fabs(compatibilityTrack2),2)<m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection&&
- TMath::Prob(fabs(compatibilityTrack1)+
- fabs(compatibilityTrack2),4)<m_cutCompatibilityPrimaryVertexBothTracksForBFirstSelection;
-
- if (!flightSignificance)
- continue;
-
- const Trk::TrackParameters* initialPerigee1=firstTrack.initialPerigee();
- const Trk::TrackParameters* initialPerigee2=secondTrack.initialPerigee();
-
- if (!initialPerigee1 || !initialPerigee2)
- {
- msg(MSG::WARNING) << "No refitted parameters available for 2-track vertex. Candidate not accepted..." << endmsg;
- continue;
- }
-
- std::pair<double,double> track1_IPd0z0=m_jetFitterUtils->getD0andZ0IP(*initialPerigee1,
- primaryVertexRecVertex);
-
- std::pair<double,double> track2_IPd0z0=m_jetFitterUtils->getD0andZ0IP(*initialPerigee2,
- primaryVertexRecVertex);
-
- bool goodQUALITYcut1=fabs(track1_IPd0z0.first)<m_cutIPD0BothTracksForBFirstSelection&&fabs(track1_IPd0z0.second)<m_cutIPZ0BothTracksForBFirstSelection&&initialPerigee1->momentum().perp()>m_cutPtBothTracksForBFirstSelection;
- bool goodQUALITYcut2=fabs(track2_IPd0z0.first)<m_cutIPD0BothTracksForBFirstSelection&&fabs(track2_IPd0z0.second)<m_cutIPZ0BothTracksForBFirstSelection&&initialPerigee2->momentum().perp()>m_cutPtBothTracksForBFirstSelection;
-
- bool bothGoodQUALITY=goodQUALITYcut1&&goodQUALITYcut2;
-
- if (!bothGoodQUALITY)
- continue;
-
- const xAOD::Vertex * fittedVertex = *v0candIter;
-
- std::pair<double,double> distanceAndError=
- m_jetFitterUtils->getDistanceAndErrorBetweenTwoVertices(*fittedVertex,primaryVertexRecVertex);
-
- //now assign a sign to the distance (decay in front or behind the primary vertex)
- double signeddistance=distanceAndError.first;
- Amg::Vector3D jetMomSpatial(jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z());
- double sign=(fittedVertex->position()-primaryVertexRecVertex.position()).dot(jetMomSpatial);
-
- if (sign<0)
- {
- signeddistance*=-1.;
- }
-
- if (!m_revertFromPositiveToNegativeTags)
- {
- if (!((vertexProb>m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium &&
- signeddistance/distanceAndError.second>m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium)
- ||
- (vertexProb>m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium &&
- signeddistance/distanceAndError.second>m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium)))
- continue;
- }
- else
- {
- if (!((vertexProb>m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium &&
- signeddistance/distanceAndError.second<-m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium)
- ||
- (vertexProb>m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium &&
- signeddistance/distanceAndError.second<-m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium)))
- continue;
- }
-
-
- double radius=fittedVertex->position().perp();
- int interactiontype=-1;
-
- if (radius>m_firstBeam_min && radius<m_firstBeam_max)
- {
- interactiontype=0;
- numberFirstBeamInteractions+=1;
- }
- else if (radius>m_secondBeam_min && radius<m_secondBeam_max)
- {
- interactiontype=1;
- numberSecondBeamInteractions+=1;
- }
- else if (radius>m_firstLayer_min && radius<m_firstLayer_max)
- {
- interactiontype=2;
- numberFirstLayerInteractions+=1;
- }
- else if (radius>m_secondLayer_min && radius<m_secondLayer_max)
- {
- interactiontype=3;
- numberSecondLayerInteractions+=1;
- }
-
- if (interactiontype==2 || interactiontype==3)
- {
- bool signifCutTight=
- TMath::Prob(fabs(compatibilityTrack1),2)<m_cutCompatibilityToPrimarySingleTrackForMatInteractions&&
- TMath::Prob(fabs(compatibilityTrack2),2)<m_cutCompatibilityToPrimarySingleTrackForMatInteractions&&
- TMath::Prob(fabs(compatibilityTrack1)+
- fabs(compatibilityTrack2),4)<m_cutCompatibilityToPrimaryBothTracksForMatInteractions;
- if (signifCutTight)
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Material interaction in layer... Skipping candidate..." << endmsg;
- continue;
- }
- }
-
-///////////////////////
-
- //problem: you need to iterate over all V0 vertices in order to get all possible "names" (new clones)
- //of the original ITrackLinks
-
- bool hasTrack2InCommonWithNeutral=false;
- bool hasTrack1InCommonWithNeutral=false;
-
-
- //go from original ITrackLink to all other possible ITrackLink
- std::vector<const Trk::ITrackLink*> vectorOfV0ITrackLink1;
- std::vector<const Trk::ITrackLink*> vectorOfV0ITrackLink2;
-
- std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkBegin=fromLinkInV0CandidateToOriginalLink.begin();
- std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkEnd=fromLinkInV0CandidateToOriginalLink.end();
-
- for (std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkIter=fromLinkInV0CandidateToOriginalLinkBegin;
- fromLinkInV0CandidateToOriginalLinkIter!=fromLinkInV0CandidateToOriginalLinkEnd;
- ++fromLinkInV0CandidateToOriginalLinkIter)
- {
- if ((*fromLinkInV0CandidateToOriginalLinkIter).second==originalTrackLink1)
- {
- if (msgLvl(MSG::VERBOSE)) msg() <<" Found one of the original ITrackLink " << endmsg;
- vectorOfV0ITrackLink1.push_back((*fromLinkInV0CandidateToOriginalLinkIter).first);
- }
- if ((*fromLinkInV0CandidateToOriginalLinkIter).second==originalTrackLink2)
- {
- if (msgLvl(MSG::VERBOSE)) msg() <<" Found one of the original ITrackLink " << endmsg;
- vectorOfV0ITrackLink2.push_back((*fromLinkInV0CandidateToOriginalLinkIter).first);
- }
- }
-
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLink1Begin=vectorOfV0ITrackLink1.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLink1End=vectorOfV0ITrackLink1.end();
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLink1Iter=vectorOfV0ITrackLink1Begin;
- vectorOfV0ITrackLink1Iter!=vectorOfV0ITrackLink1End;
- ++vectorOfV0ITrackLink1Iter)
- {
-
- if (m_jetFitterUtils->checkIfTrackIsInNeutralTrackVector(*vectorOfV0ITrackLink1Iter,selectedNeutralTracks))
- {
- hasTrack1InCommonWithNeutral=true;
- break;
- }
-
- }
-
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLink2Begin=vectorOfV0ITrackLink2.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLink2End=vectorOfV0ITrackLink2.end();
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLink2Iter=vectorOfV0ITrackLink2Begin;
- vectorOfV0ITrackLink2Iter!=vectorOfV0ITrackLink2End;
- ++vectorOfV0ITrackLink2Iter)
- {
- if (m_jetFitterUtils->checkIfTrackIsInNeutralTrackVector(*vectorOfV0ITrackLink2Iter,selectedNeutralTracks))
- {
- hasTrack2InCommonWithNeutral=true;
- continue;
- }
- }
-
-
-///////////////////////
-
- //THIS AGAIN CANNOT WORK!
-// bool hasTrack2InCommonWithNeutral=m_jetFitterUtils->checkIfTrackIsInNeutralTrackVector(trackLink1,selectedNeutralTracks);
-// bool hasTrack1InCommonWithNeutral=m_jetFitterUtils->checkIfTrackIsInNeutralTrackVector(trackLink2,selectedNeutralTracks);
-
- if (hasTrack2InCommonWithNeutral && hasTrack1InCommonWithNeutral )
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Both tracks in common with neutral " << endmsg;
- continue;
- }
- else if (hasTrack1InCommonWithNeutral)
- {
- const Trk::ITrackLink* trackLink2Original=fromLinkInV0CandidateToOriginalLink[trackLink2];
- if (!m_jetFitterUtils->checkIfTrackIsInVector(trackLink2Original,
- tracksToUseInFirstFit))
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Track 1 in common with neutrals. Adding track 2... " << endmsg;
- tracksToUseInFirstFit.push_back(trackLink2Original);
- }
- else
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Track 1 in common with neutrals.BUT NOT Adding track 2 because already there... " << endmsg;
- }
- positionsOfSeedingVertices.push_back(Trk::PositionAndWeight(v0candPtr->position(),1));
- }
- else if (hasTrack2InCommonWithNeutral)
- {
- const Trk::ITrackLink* trackLink1Original=fromLinkInV0CandidateToOriginalLink[trackLink1];
- if (!m_jetFitterUtils->checkIfTrackIsInVector(trackLink1Original,
- tracksToUseInFirstFit))
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Track 2 in common with neutrals. Adding track 1... " << endmsg;
- tracksToUseInFirstFit.push_back(trackLink1Original);
- }
- else
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Track 2 in common with neutrals.BUT NOT Adding track 1 because already there... " << endmsg;
- }
-
- positionsOfSeedingVertices.push_back(Trk::PositionAndWeight(v0candPtr->position(),1));
- }
- else //no tracks in common with neutrals
- {
-
- const Trk::ITrackLink* trackLink2Original=fromLinkInV0CandidateToOriginalLink[trackLink2];
- const Trk::ITrackLink* trackLink1Original=fromLinkInV0CandidateToOriginalLink[trackLink1];
-
- if (msgLvl(MSG::DEBUG)) msg() << " No track in common with neutrals. Considering adding both of them... " << endmsg;
-
- if (!m_jetFitterUtils->checkIfTrackIsInVector(trackLink2Original,
- tracksToUseInFirstFit))
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Adding track 2... " << endmsg;
- tracksToUseInFirstFit.push_back(trackLink2Original);
- }
-
- if (!m_jetFitterUtils->checkIfTrackIsInVector(trackLink1Original,
- tracksToUseInFirstFit))
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Adding track 1... " << endmsg;
- tracksToUseInFirstFit.push_back(trackLink1Original);
- }
- positionsOfSeedingVertices.push_back(Trk::PositionAndWeight(v0candPtr->position(),1));
- }
- }
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" JetFitterFinding phase 7: determine single good tracks to add in the fit in a second step " << endmsg;
-
- //now the tracksToUseInFirstFit are filled, what is missing are the single tracks to be used
- //in a further step of the fit
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator secondaryTracksIter=secondaryTracksBegin;
- secondaryTracksIter!=secondaryTracksEnd;++secondaryTracksIter)
- {
-
- double compatibilityOfActualTrack=compatibilityOfTrack[*secondaryTracksIter];
-
- const Trk::TrackParameters* perigee=(*secondaryTracksIter)->parameters();
-
- const AmgSymMatrix(5)* measPerigee=perigee->covariance();
-
- if (measPerigee==0)
- {
- msg(MSG::WARNING) << " Track parameters have no covariance. skipping single track candidate... " << endmsg;
- continue;
- }
-
- std::pair<double,double> track_IPd0z0=m_jetFitterUtils->getD0andZ0IP(*perigee,
- primaryVertexRecVertex);
- std::pair<double,double> track_IPd0z0Sig=m_jetFitterUtils->getD0andZ0IPSig(*perigee,
- primaryVertexRecVertex);
-
- const double & IPd0=track_IPd0z0.first;
- const double & IPz0=track_IPd0z0.second;
- const double & IPd0Sig=track_IPd0z0Sig.first;
- const double & IPz0Sig=track_IPd0z0Sig.second;
- const double pT=perigee->momentum().perp();
-
- double cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection=m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection;
- double cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection=m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection;
-
- if (m_revertFromPositiveToNegativeTags)
- {
- cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection=m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection;
- cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection=m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection;
- }
-
- bool passBoxCut=( fabs(IPd0Sig)<m_cutIPD0SigBoxSingleTrackForBSecondSelection && fabs(IPz0Sig)>m_cutIPZ0SigBoxSingleTrackForBSecondSelection);
-
- if (fabs(IPd0)>m_cutIPD0SingleTrackForBSecondSelection||
- fabs(IPz0)>m_cutIPZ0SingleTrackForBSecondSelection||
- ( compatibilityOfActualTrack>=0 && TMath::Prob(fabs(compatibilityOfActualTrack),2)>cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection) ||
- ( compatibilityOfActualTrack<0 && TMath::Prob(fabs(compatibilityOfActualTrack),2)>cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection) ||
- pT< m_cutPtSingleTrackForBSecondSelection || passBoxCut)
- {
- if (msgLvl(MSG::DEBUG)) msg() << " Candidate didn't pass one of the selection cuts " << endmsg;
- continue;
- }
-
- bool alreadyUsed=m_jetFitterUtils->checkIfTrackIsInVector(*secondaryTracksIter,
- tracksToUseInFirstFit);
-
- if (alreadyUsed)
- {
- if (msgLvl(MSG::VERBOSE)) msg() <<" Track was already used " << endmsg;
- continue;
- }
-
- bool isVetoed=m_jetFitterUtils->checkIfTrackIsInVector(*secondaryTracksIter,
- tracksToVeto);
-
- if (isVetoed)
- {
- if (msgLvl(MSG::VERBOSE)) msg() <<" Track was vetoed " << endmsg;
- continue;
- }
-
- bool isInVetoedCandidate=false;
-
- //go from original ITrackLink to all other possible ITrackLink
- std::vector<const Trk::ITrackLink*> vectorOfV0ITrackLink;
-
- std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkBegin=fromLinkInV0CandidateToOriginalLink.begin();
- std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkEnd=fromLinkInV0CandidateToOriginalLink.end();
-
- for (std::map<const Trk::ITrackLink*,const Trk::ITrackLink*>::const_iterator fromLinkInV0CandidateToOriginalLinkIter=fromLinkInV0CandidateToOriginalLinkBegin;
- fromLinkInV0CandidateToOriginalLinkIter!=fromLinkInV0CandidateToOriginalLinkEnd;
- ++fromLinkInV0CandidateToOriginalLinkIter)
- {
- if ((*fromLinkInV0CandidateToOriginalLinkIter).second==*secondaryTracksIter)
- {
- if (msgLvl(MSG::VERBOSE)) msg() <<" Found one of the original ITrackLink " << endmsg;
- vectorOfV0ITrackLink.push_back((*fromLinkInV0CandidateToOriginalLinkIter).first);
- }
- }
-
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLinkBegin=vectorOfV0ITrackLink.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLinkEnd=vectorOfV0ITrackLink.end();
-
- for (std::vector<const Trk::ITrackLink*>::const_iterator vectorOfV0ITrackLinkIter=vectorOfV0ITrackLinkBegin;
- vectorOfV0ITrackLinkIter!=vectorOfV0ITrackLinkEnd;
- ++vectorOfV0ITrackLinkIter)
- {
-
- isInVetoedCandidate=isInVetoedCandidate||
- m_jetFitterUtils->checkIfTrackIsInV0CandidatesVector(*vectorOfV0ITrackLinkIter,
- candidatesToVeto);
- if (isInVetoedCandidate)
- {
- break;
- }
- }
-
- //now isInVetoedCandidate has the correct answer...
-
- if (isInVetoedCandidate)
- {
- if (msgLvl(MSG::DEBUG)) msg() << " vetoed by existing V0 candidate veto " << endmsg;
- continue;
- }
-
-
- bool alreadyUsedSecondFit=m_jetFitterUtils->checkIfTrackIsInVector(*secondaryTracksIter,
- tracksToUseInSecondFit);
-
- if (alreadyUsedSecondFit)
- {
- msg(MSG::WARNING) << " Already used in second fit. Should this be really possible??? " << endmsg;
- continue;
- }
-
- tracksToUseInSecondFit.push_back(*secondaryTracksIter);
- }
-
- int firstFitTracksNum=tracksToUseInFirstFit.size();
- int secondFitTracksNum=tracksToUseInSecondFit.size();
-
- if (msgLvl(MSG::DEBUG)) msg() << " First fit with : " << firstFitTracksNum <<
- " tracks. Second fit with : " << secondFitTracksNum << endmsg;
-
- //now take the positionsOfSeedingVertices and try to obtain a good seed direction...
- Amg::Vector3D JFseedDirection(jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z());
- JFseedDirection.normalize();
- if (msgLvl(MSG::VERBOSE)) msg() <<" Jet Direction would be: " << JFseedDirection << endmsg;
-
- if (positionsOfSeedingVertices.size()!=0)
- {
- Amg::Vector3D theSeedVertex=m_mode3dfinder->getMode(0, 0, positionsOfSeedingVertices);
- if (m_revertFromPositiveToNegativeTags==false)
- {
- if ((theSeedVertex-primaryVertexRecVertex.position()).dot(JFseedDirection)>0)
- {
- JFseedDirection=(theSeedVertex-primaryVertexRecVertex.position()).unit();
- if (msgLvl(MSG::DEBUG)) msg() << " Using twotrkvtx direction for start: " << JFseedDirection << endmsg;
- }
- else
- {
- msg(MSG::WARNING) << " NORMAL SEEDING: Seed vertex is on negative side... Using Jet Direction!" << endmsg;
- }
- }
- else
- {
- if ((theSeedVertex-primaryVertexRecVertex.position()).dot(JFseedDirection)<0)
- {
- JFseedDirection=-(theSeedVertex-primaryVertexRecVertex.position()).unit();
- if (msgLvl(MSG::DEBUG)) msg() << " Using twotrkvtx direction for start: " << JFseedDirection << endmsg;
- }
- else
- {
- msg(MSG::WARNING) << " REVERSE SEEDING: Seed vertex is on positive side... Using Jet Direction!" << endmsg;
- }
- }
- }
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" JetFitterFinding phase 8: do the real finding with JetFitter " << endmsg;
-
- Trk::VxJetCandidate* myJetCandidate=findSecVertex(primaryVertexRecVertex,
- jetMomentum,
- tracksToUseInFirstFit,
- tracksToUseInSecondFit,
- JFseedDirection);
-
- if (msgLvl(MSG::VERBOSE)) msg() <<" JetFitterFinding phase 9: store the results " << endmsg;
-
-
- //now in principle you just need to store the RESULT...
-
-
- //create new neutral tracks (the one you want to store...)
- std::vector<const Trk::TrackParticleBase*> selectedNeutralTracksToStore;
-
- std::vector<const Trk::LinkToTrackParticleBase*>::iterator selectedNeutralTracksBegin=selectedNeutralTracksForIP.begin();
- std::vector<const Trk::LinkToTrackParticleBase*>::iterator selectedNeutralTracksEnd=selectedNeutralTracksForIP.end();
-
- for (std::vector<const Trk::LinkToTrackParticleBase*>::iterator selectedNeutralTracksIter=selectedNeutralTracksBegin;
- selectedNeutralTracksIter!=selectedNeutralTracksEnd;++selectedNeutralTracksIter)
- {
- selectedNeutralTracksToStore.push_back(new Trk::TrackParticleBase(****selectedNeutralTracksIter));
- }
-
- //create the auxiliary objects...
- const Trk::TwoTrackVerticesInJet* myTwoTrackVerticesInJet=new
- Trk::TwoTrackVerticesInJet(V0candidates,
- selectedNeutralTracksToStore);
-
- const Trk::SelectedTracksInJet* mySelectedTracksInJet=new
- Trk::SelectedTracksInJet(primaryTracks,
- secondaryTracks);
-
- //delete the old objects.. pay some attention here!
-
- //delete the neutralTracks that you didn't use...
- std::vector<const Trk::LinkToTrackParticleBase*>::iterator neutralTracksBegin=neutralTracks.begin();
- std::vector<const Trk::LinkToTrackParticleBase*>::iterator neutralTracksEnd=neutralTracks.end();
-
- for (std::vector<const Trk::LinkToTrackParticleBase*>::iterator neutralTracksIter=neutralTracksBegin;
- neutralTracksIter!=neutralTracksEnd;++neutralTracksIter)
- {
- //if (!m_jetFitterUtils->checkIfTrackIsInVector(*neutralTracksIter,selectedNeutralTracks))
- //{
- delete ***neutralTracksIter;
- //}
- delete *neutralTracksIter;
- *neutralTracksIter=0;
- }
-
-
- std::vector<Trk::VxJetCandidate*> myCandidates;
- // This push_back is problematic for the migration to xAOD::Vertex, it works simply because VxJetCandidate inherits from VxCandidate
- myCandidates.push_back(myJetCandidate);
-
-
-
- Trk::VxJetFitterVertexInfo* myOutputInfo=new Trk::VxJetFitterVertexInfo(myCandidates,
- myTwoTrackVerticesInJet,
- mySelectedTracksInJet);
-
- myOutputInfo->setSVOwnership(true);
-
-
- delete signalVertex;
- signalVertex=0;
-
- return myOutputInfo;
}
-
- Trk::VxJetCandidate*
- InDetImprovedJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
- const TLorentzVector & jetMomentum,
- const std::vector<const Trk::ITrackLink*> & firstInputTracks,
- const std::vector<const Trk::ITrackLink*> & secondInputTracks,
- const Amg::Vector3D & vtxSeedDirection) const {
- ATH_MSG_VERBOSE( " entered findSecVertex(). Applying JetFitter finding to the found sets of tracks and performing clustering (pattern recognition) " );
- Amg::Vector3D myDirection(jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z());
- std::vector<std::vector<const Trk::ITrackLink*> > bunchesOfTracks;
- std::vector<const Trk::ITrackLink*> tracksToAdd;
- std::vector<const Trk::ITrackLink*>::const_iterator tracks2Begin=firstInputTracks.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator tracks2End=firstInputTracks.end();
- for (std::vector<const Trk::ITrackLink*>::const_iterator tracks2Iter=tracks2Begin;
- tracks2Iter!=tracks2End;++tracks2Iter) {
- ATH_MSG_VERBOSE(" adding track to fit " );
- tracksToAdd.push_back(*tracks2Iter);
- }
- bunchesOfTracks.push_back(tracksToAdd);
- tracksToAdd.clear();
- std::vector<const Trk::ITrackLink*>::const_iterator tracks3Begin=secondInputTracks.begin();
- std::vector<const Trk::ITrackLink*>::const_iterator tracks3End=secondInputTracks.end();
- for (std::vector<const Trk::ITrackLink*>::const_iterator tracks3Iter=tracks3Begin;
- tracks3Iter!=tracks3End;++tracks3Iter) {
- ATH_MSG_VERBOSE(" adding track to fit ");
- tracksToAdd.push_back(*tracks3Iter);
- }
- if (not tracksToAdd.empty()) {
- bunchesOfTracks.push_back(tracksToAdd);
- }
- tracksToAdd.clear();
- //now it just uses these bunches...
- //now I have just to make sure that no clustering is done at first iteration
- //while it needs to be done at second iteration (there will be only two iterations)
- std::vector<std::vector<const Trk::ITrackLink*> >::const_iterator BunchesBegin=bunchesOfTracks.begin();
- std::vector<std::vector<const Trk::ITrackLink*> >::const_iterator BunchesEnd=bunchesOfTracks.end();
- std::vector<const Trk::ITrackLink*>::const_iterator tracksToAddBegin;
- std::vector<const Trk::ITrackLink*>::const_iterator tracksToAddEnd;
- std::vector<const Trk::ITrackLink*>::const_iterator tracksToAddIter;
- Trk::VxJetCandidate* myJetCandidate=nullptr;
- for (std::vector<std::vector<const Trk::ITrackLink*> >::const_iterator BunchesIter=BunchesBegin;
- BunchesIter!=BunchesEnd;++BunchesIter) {
- if (BunchesIter==BunchesBegin) {
- ATH_MSG_VERBOSE(" initial fit with " << (*BunchesIter).size() << " tracks " );
- myJetCandidate=m_initializationHelper->initializeJetCandidate(*BunchesIter,&primaryVertex,&myDirection,&vtxSeedDirection);
- if (not myJetCandidate) continue;
- m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
- if (not BunchesIter->empty()){
- doTheFit(myJetCandidate,true);
- }
- } else {
- if (not myJetCandidate) continue;
- ATH_MSG_VERBOSE(" other fit with " << (*BunchesIter).size() << " tracks " );
- std::vector<Trk::VxVertexOnJetAxis*> setOfVertices=myJetCandidate->getVerticesOnJetAxis();
- std::vector<Trk::VxTrackAtVertex*>* setOfTracks=myJetCandidate->vxTrackAtVertex();
- tracksToAddBegin=(*BunchesIter).begin();
- tracksToAddEnd=(*BunchesIter).end();
- for (tracksToAddIter=tracksToAddBegin;tracksToAddIter!=tracksToAddEnd;++tracksToAddIter) {
- std::vector<Trk::VxTrackAtVertex*> temp_vector_tracksAtVertex;
- Trk::VxTrackAtVertex* newVxTrack=new Trk::VxTrackAtVertex((*tracksToAddIter)->clone());
- temp_vector_tracksAtVertex.push_back(newVxTrack);
- setOfTracks->push_back(newVxTrack);
- setOfVertices.push_back(new Trk::VxVertexOnJetAxis(temp_vector_tracksAtVertex));
- }
- ATH_MSG_VERBOSE(" new overall number of tracks to fit : " << setOfVertices.size() );
- myJetCandidate->setVerticesOnJetAxis(setOfVertices);
- m_initializationHelper->updateTrackNumbering(myJetCandidate);
- //question: should this be done???
- m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
- doTheFit(myJetCandidate);
- }
- }
- return myJetCandidate;
- }
- void
- InDetImprovedJetFitterVxFinder::doTheFit(Trk::VxJetCandidate* myJetCandidate,
- bool performClustering) const {
- int numClusteringLoops=0;
- bool noMoreVerticesToCluster(false);
- do {//reguards clustering
- ATH_MSG_VERBOSE("InDetImprovedJetFitterVxFinder: ------>>>> new cycle of fit" );
- int numLoops=0;
- bool noMoreTracksToDelete(false);
- do {//reguards eliminating incompatible tracks...
- m_routines->performTheFit(myJetCandidate,15,false,30,0.001);
- const std::vector<Trk::VxVertexOnJetAxis*> & vertices=myJetCandidate->getVerticesOnJetAxis();
- std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesBegin=vertices.begin();
- std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesEnd=vertices.end();
- //delete incompatible tracks...
- float max_prob(1.);
- Trk::VxVertexOnJetAxis* worseVertex(nullptr);
- for (std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesIter=verticesBegin;
- verticesIter!=verticesEnd;++verticesIter) {
- if (*verticesIter==0) {
- ATH_MSG_WARNING( "One vertex is empy. Problem when trying to delete incompatible vertices. No further vertices deleted.");
- } else {
- const Trk::FitQuality & fitQuality=(*verticesIter)->fitQuality();
- if (TMath::Prob(fitQuality.chiSquared(),(int)std::floor(fitQuality.numberDoF()+0.5))<max_prob) {
- max_prob=TMath::Prob(fitQuality.chiSquared(),(int)std::floor(fitQuality.numberDoF()+0.5));
- worseVertex=*verticesIter;
- }
- }
- }
- if (worseVertex and (max_prob<m_vertexProbCut)) {
- ATH_MSG_DEBUG( "Deleted vertex " << worseVertex->getNumVertex() << " with probability " << max_prob );
- if (worseVertex==myJetCandidate->getPrimaryVertex()) {
- ATH_MSG_VERBOSE( " It's the primary" );
- }
- m_routines->deleteVertexFromJetCandidate(worseVertex,myJetCandidate);
- } else {
- noMoreTracksToDelete=true;
- ATH_MSG_VERBOSE("No tracks to delete: maximum probability is " << max_prob );
- }
- numLoops+=1;
- } while (numLoops<m_maxNumDeleteIterations&&!(noMoreTracksToDelete));
- if (!performClustering) break;
- if (!m_useFastClustering && (int)myJetCandidate->getVerticesOnJetAxis().size()<m_maxTracksForDetailedClustering) {
- m_routines->fillTableWithFullProbOfMerging(myJetCandidate,8,false,10,0.01);
- } else {
- m_routines->fillTableWithFastProbOfMerging(myJetCandidate);
- }
- const Trk::VxClusteringTable* clusteringTablePtr(myJetCandidate->getClusteringTable());
- if (not clusteringTablePtr) {
- ATH_MSG_WARNING( " No Clustering Table while it should have been calculated... no more clustering performed during vertexing " );
- noMoreVerticesToCluster=true;
- } else {
- ATH_MSG_VERBOSE(" clustering table is " << *clusteringTablePtr );
- //now iterate over the full map and decide wether you want to do the clustering OR not...
- float probVertex(0.);
- Trk::PairOfVxVertexOnJetAxis pairOfVxVertexOnJetAxis=clusteringTablePtr->getMostCompatibleVertices(probVertex);
- //a PairOfVxVertexOnJetAxis is a std::pair<VxVertexOnJetAxis*,VxVertexOnJetAxis*>
- float probVertexExcludingPrimary(0.);
- Trk::PairOfVxVertexOnJetAxis pairOfVxVertexOnJetAxisExcludingPrimary=clusteringTablePtr->getMostCompatibleVerticesExcludingPrimary(probVertexExcludingPrimary);
- bool firstProbIsWithPrimary= ( std::fabs(probVertex-probVertexExcludingPrimary)>1e-6 );
- if (probVertex>0.&&probVertex>m_vertexClusteringProbabilityCut&&firstProbIsWithPrimary) {
- ATH_MSG_VERBOSE(" merging vtx number " << (*pairOfVxVertexOnJetAxis.first).getNumVertex() <<
- " and " << (*pairOfVxVertexOnJetAxis.second).getNumVertex() << " (should be PV)." );
- m_helper->mergeVerticesInJetCandidate(*pairOfVxVertexOnJetAxis.first,
- *pairOfVxVertexOnJetAxis.second,
- *myJetCandidate);
- //now you need to update the numbering scheme
- m_initializationHelper->updateTrackNumbering(myJetCandidate);//maybe this should be moved to a lower level...
- continue;
- }
- if (probVertexExcludingPrimary>0.){
- //GP suggested by Marco Battaglia, use vertex mass in order to decide wether to split or not, so derive vertex masses first
- const Trk::VxVertexOnJetAxis* firstVertex=pairOfVxVertexOnJetAxisExcludingPrimary.first;
- const Trk::VxVertexOnJetAxis* secondVertex=pairOfVxVertexOnJetAxisExcludingPrimary.second;
- CLHEP::HepLorentzVector massVector1=m_jetFitterUtils->fourMomentumAtVertex(*firstVertex);//MeV
- CLHEP::HepLorentzVector massVector2=m_jetFitterUtils->fourMomentumAtVertex(*secondVertex);//MeV
- CLHEP::HepLorentzVector sumMassVector=massVector1+massVector2;
- double massTwoVertex=sumMassVector.mag();//MeV
- bool doMerge(false);
- double vertexClusteringProbabilityCutWithMass;
- if(massTwoVertex< 1000.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass0010;
- }else if(massTwoVertex< 1500.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass1015;
- }else if(massTwoVertex< 2000.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass1520;
- }else if(massTwoVertex< 2500.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass2025;
- }else if(massTwoVertex< 3000.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass2530;
- }else if(massTwoVertex< 4000.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass3040;
- }else if(massTwoVertex< 5000.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass4050;
- }else if(massTwoVertex< 6000.){
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass5060;
- }else{
- vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass6070;
- }
- if (probVertexExcludingPrimary>vertexClusteringProbabilityCutWithMass) {
- doMerge=true;
- }
- if (doMerge){
- ATH_MSG_VERBOSE(" merging vtx number " << (*pairOfVxVertexOnJetAxis.first).getNumVertex() <<
- " and " << (*pairOfVxVertexOnJetAxis.second).getNumVertex() << " mass merged vertex: " << massTwoVertex );
- m_helper->mergeVerticesInJetCandidate(*pairOfVxVertexOnJetAxisExcludingPrimary.first,
- *pairOfVxVertexOnJetAxisExcludingPrimary.second,
- *myJetCandidate);
- m_initializationHelper->updateTrackNumbering(myJetCandidate);//maybe this should be moved to a lower level...
- continue;//go to next cycle, after a succesful merging
- }
- }
- noMoreVerticesToCluster=true;
- }
- numClusteringLoops+=1;
- } while (numClusteringLoops<m_maxClusteringIterations&&!(noMoreVerticesToCluster));
-
- //now a section should follow where the "complicate" VxJetCandidate is transformed in a conventional "VxCandidate"
- //so that it can be used also by the normal B-Tagging algorithms...
- //TO BE COMPLETED
- }
}//end namespace Rec
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
index 1500c3290703028a5dd266e1353099fb4e084a39..8e0704beb5a2c1c08af6eac2141b08ef8b761e14 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterUtils.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -29,9 +29,9 @@
#include "TrkEventPrimitives/ParamDefs.h"
#include <TMath.h>
-#include "TrkExInterfaces/IExtrapolator.h"
+//#include "TrkExInterfaces/IExtrapolator.h"
-#include "TrkVertexFitterInterfaces/IVertexLinearizedTrackFactory.h"
+//#include "TrkVertexFitterInterfaces/IVertexLinearizedTrackFactory.h"
#include "CLHEP/Vector/ThreeVector.h"
#include "TrkParticleBase/LinkToTrackParticleBase.h"
#include "TrkParticleBase/TrackParticleBase.h"
@@ -68,15 +68,10 @@ namespace InDet
InDetJetFitterUtils::InDetJetFitterUtils(const std::string& t, const std::string& n, const IInterface* p) :
AthAlgTool(t,n,p),
- m_LinearizedTrackFactory("Trk::FullLinearizedTrackFactory/FullLinearizedTrackFactory", this),
- m_extrapolator("Trk::Extrapolator/InDetExtrapolator", this),
m_extrapolatorIsAvailable(false),
m_linearizedTrackFactoryIsAvailable(false)
{
- declareProperty("LinearizedTrackFactory",m_LinearizedTrackFactory);
- declareProperty("Extrapolator",m_extrapolator);
-
declareInterface< InDetJetFitterUtils >(this) ;
}
@@ -526,7 +521,7 @@ namespace InDet
if (m_linearizedTrackFactoryIsAvailable==false)
{
- msg(MSG::ERROR) << "Cannot perform requested extrapolation. No extrapolator defined...Returning 0 compatibility..." << endmsg;
+ ATH_MSG_ERROR( "Cannot perform requested extrapolation. No extrapolator defined...Returning 0 compatibility..." );
return std::pair<double,double>(0,0);
}
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
index 3561075b59fe091a06adbe11270219ef147722f7..d9c0440d058030846b819648752d4a84ebc79c8d 100755
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/InDetJetFitterVxFinder.cxx
@@ -61,31 +61,9 @@ namespace InDet
};
InDetJetFitterVxFinder::InDetJetFitterVxFinder(const std::string& t, const std::string& n, const IInterface* p) :
- AthAlgTool(t,n,p),
- m_initializationHelper("Trk::JetFitterInitializationHelper"),
- m_helper("Trk::JetFitterHelper"),
- m_routines("Trk::JetFitterRoutines"),
- m_trkFilter("InDet::InDetDetailedTrackSelectorTool"),
- m_maxNumDeleteIterations(30),
- m_vertexProbCut(0.01),
- m_maxClusteringIterations(30),
- m_vertexClusteringProbabilityCut(0.01),
- m_useFastClustering(false),
- m_maxTracksToFitAtOnce(15)
+ AthAlgTool(t,n,p)
{
- declareProperty("JetFitterHelper",m_helper);
- declareProperty("JetFitterInitializationHelper",m_initializationHelper);
- declareProperty("JetFitterRoutines",m_routines);
- declareProperty("TrackSelector",m_trkFilter);
-
- declareProperty("MaxNumDeleteIterations",m_maxNumDeleteIterations);
- declareProperty("VertexProbCut",m_vertexProbCut);
- declareProperty("MaxClusteringIterations",m_maxClusteringIterations);
- declareProperty("VertexClusteringProbabilityCut",m_vertexClusteringProbabilityCut);
- declareProperty("UseFastClustering",m_useFastClustering);
- declareProperty("MaxTracksToFitAtOnce",m_maxTracksToFitAtOnce);
declareInterface< ISecVertexInJetFinder >(this) ;
-
}
@@ -93,96 +71,140 @@ namespace InDet
StatusCode InDetJetFitterVxFinder::initialize() {
+
+
+ StatusCode sc = AthAlgTool::initialize();
+ if(sc.isFailure())
+ {
+ msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
+ return sc;
+ }
+
//retrieving the udator itself
- ATH_CHECK(m_helper.retrieve());
- ATH_CHECK(m_initializationHelper.retrieve());
- ATH_CHECK(m_routines.retrieve());
- ATH_CHECK(m_trkFilter.retrieve());
+ sc = m_helper.retrieve();
+ if(sc.isFailure()) {
+ msg(MSG::ERROR) << " Unable to retrieve "<<m_helper<<endmsg;
+ return StatusCode::FAILURE;
+ }else msg(MSG::INFO) << "JetFitter Helper retrieved"<<endmsg;
+
+
+ sc = m_initializationHelper.retrieve();
+ if(sc.isFailure()) {
+ msg(MSG::ERROR) << " Unable to retrieve "<<m_initializationHelper<<endmsg;
+ return StatusCode::FAILURE;
+ }else msg(MSG::INFO) << "JetFitter Initialization Helper retrieved"<<endmsg;
+
+ sc = m_routines.retrieve();
+ if(sc.isFailure()) {
+ msg(MSG::ERROR) << " Unable to retrieve the JetFitter routines"<<m_routines<<endmsg;
+ return StatusCode::FAILURE;
+ }else msg(MSG::INFO) << "JetFitter Routines class retrieved"<<endmsg;
+
+ if(m_trkFilter.retrieve().isFailure()) {
+ msg(MSG::ERROR) << " Unable to retrieve "<<m_trkFilter<<endmsg;
+ return StatusCode::FAILURE;
+ } else msg(MSG::INFO) << "Track filter retrieved"<<endmsg;
+
+ msg(MSG::INFO) << "Initialize successful" << endmsg;
return StatusCode::SUCCESS;
}
StatusCode InDetJetFitterVxFinder::finalize() {
- ATH_MSG_DEBUG("Finalize ok");
- return StatusCode::SUCCESS;
+
+ msg(MSG::INFO) << "Finalize successful" << endmsg;
+ return StatusCode::SUCCESS;
+
}
- Trk::VxSecVertexInfo*
- InDetJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
- const TLorentzVector & jetMomentum,
- const std::vector<const Trk::TrackParticleBase*> & myTracks) const {
-
+ const Trk::VxSecVertexInfo* InDetJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
+ const TLorentzVector & jetMomentum,
+ const std::vector<const Trk::TrackParticleBase*> & myTracks) const {
Amg::Vector3D myDirection(jetMomentum.Vect().X(),jetMomentum.Vect().Y(),jetMomentum.Vect().Z());
+
std::vector<TrackParticle_pair> tracks;
+
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksBegin=myTracks.begin();
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksEnd=myTracks.end();
for (std::vector<const Trk::TrackParticleBase*>::const_iterator tracksIter=tracksBegin;
- tracksIter!=tracksEnd;++tracksIter) {
+ tracksIter!=tracksEnd;++tracksIter) {
if (m_trkFilter->decision(**tracksIter,&primaryVertex)==true) {
- tracks.push_back(TrackParticle_pair((*tracksIter)->perigee()->momentum().perp(),*tracksIter));
+ tracks.push_back(TrackParticle_pair((*tracksIter)->perigee()->momentum().perp(),*tracksIter));
}
}
+
std::vector<std::vector<const Trk::TrackParticleBase*> > bunchesOfTracks;
+
std::sort(tracks.begin(),tracks.end());
+
std::vector<const Trk::TrackParticleBase*> tracksToAdd;
+
std::vector<TrackParticle_pair>::const_iterator tracks2Begin=tracks.begin();
std::vector<TrackParticle_pair>::const_iterator tracks2End=tracks.end();
for (std::vector<TrackParticle_pair>::const_iterator tracks2Iter=tracks2Begin;
- tracks2Iter!=tracks2End;++tracks2Iter) {
- ATH_MSG_VERBOSE( " track: " << (*tracks2Iter).first << " and : " << (*tracks2Iter).second );
+ tracks2Iter!=tracks2End;++tracks2Iter) {
+ if (msgLvl(MSG::VERBOSE)) msg() << " track: " << (*tracks2Iter).first << " and : " << (*tracks2Iter).second << endmsg;
+
tracksToAdd.push_back((*tracks2Iter).second);
if (tracksToAdd.size() % m_maxTracksToFitAtOnce == 0) {
- ATH_MSG_VERBOSE( " new bunch " );
- bunchesOfTracks.push_back(tracksToAdd);
- tracksToAdd.clear();
+ if (msgLvl(MSG::VERBOSE)) msg() << " new bunch " << endmsg;
+ bunchesOfTracks.push_back(tracksToAdd);
+ tracksToAdd.clear();
}
}
+
bunchesOfTracks.push_back(tracksToAdd);
+
std::vector<std::vector<const Trk::TrackParticleBase*> >::const_iterator BunchesBegin=bunchesOfTracks.begin();
std::vector<std::vector<const Trk::TrackParticleBase*> >::const_iterator BunchesEnd=bunchesOfTracks.end();
+
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksToAddBegin;
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksToAddEnd;
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksToAddIter;
- Trk::VxJetCandidate* myJetCandidate=nullptr;
+
+
+ Trk::VxJetCandidate* myJetCandidate=0;
+
for (std::vector<std::vector<const Trk::TrackParticleBase*> >::const_iterator BunchesIter=BunchesBegin;
- BunchesIter!=BunchesEnd;++BunchesIter) {
+ BunchesIter!=BunchesEnd;++BunchesIter) {
+
if (BunchesIter==BunchesBegin) {
- if (not myJetCandidate) continue;
- ATH_MSG_VERBOSE( " initial fit with " << (*BunchesIter).size() << " tracks " );
- myJetCandidate=m_initializationHelper->initializeJetCandidate(*BunchesIter,&primaryVertex,&myDirection);
- m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
- doTheFit(myJetCandidate);
+ if (msgLvl(MSG::VERBOSE)) msg() << " initial fit with " << (*BunchesIter).size() << " tracks " << endmsg;
+ myJetCandidate=m_initializationHelper->initializeJetCandidate(*BunchesIter,&primaryVertex,&myDirection);
+ m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
+ doTheFit(myJetCandidate);
} else {
- if (not myJetCandidate) continue;
- ATH_MSG_VERBOSE(" other fit with " << (*BunchesIter).size() << " tracks " );
- std::vector<Trk::VxVertexOnJetAxis*> setOfVertices=myJetCandidate->getVerticesOnJetAxis();
- std::vector<Trk::VxTrackAtVertex*>* setOfTracks=myJetCandidate->vxTrackAtVertex();
- tracksToAddBegin=(*BunchesIter).begin();
- tracksToAddEnd=(*BunchesIter).end();
- for (tracksToAddIter=tracksToAddBegin;tracksToAddIter!=tracksToAddEnd;++tracksToAddIter) {
- std::vector<Trk::VxTrackAtVertex*> temp_vector_tracksAtVertex;
- ElementLink<Trk::TrackParticleBaseCollection> link;
- link.setElement(const_cast<Trk::TrackParticleBase*>(*tracksToAddIter));
- Trk::LinkToTrackParticleBase * linkTT = new Trk::LinkToTrackParticleBase(link);
- Trk::VxTrackAtVertex* newVxTrack=new Trk::VxTrackAtVertex(linkTT);
- temp_vector_tracksAtVertex.push_back(newVxTrack);
- setOfTracks->push_back(newVxTrack);
- setOfVertices.push_back(new Trk::VxVertexOnJetAxis(temp_vector_tracksAtVertex));
- }
- ATH_MSG_VERBOSE( " new overall number of tracks to fit : " << setOfVertices.size() );
- myJetCandidate->setVerticesOnJetAxis(setOfVertices);
- m_initializationHelper->updateTrackNumbering(myJetCandidate);
- doTheFit(myJetCandidate);
+ if (msgLvl(MSG::VERBOSE)) msg() << " other fit with " << (*BunchesIter).size() << " tracks " << endmsg;
+ std::vector<Trk::VxVertexOnJetAxis*> setOfVertices=myJetCandidate->getVerticesOnJetAxis();
+ std::vector<Trk::VxTrackAtVertex*>* setOfTracks=myJetCandidate->vxTrackAtVertex();
+ tracksToAddBegin=(*BunchesIter).begin();
+ tracksToAddEnd=(*BunchesIter).end();
+ for (tracksToAddIter=tracksToAddBegin;tracksToAddIter!=tracksToAddEnd;++tracksToAddIter) {
+ std::vector<Trk::VxTrackAtVertex*> temp_vector_tracksAtVertex;
+ ElementLink<Trk::TrackParticleBaseCollection> link;
+ link.setElement(const_cast<Trk::TrackParticleBase*>(*tracksToAddIter));
+ Trk::LinkToTrackParticleBase * linkTT = new Trk::LinkToTrackParticleBase(link);
+ Trk::VxTrackAtVertex* newVxTrack=new Trk::VxTrackAtVertex(linkTT);
+ temp_vector_tracksAtVertex.push_back(newVxTrack);
+ setOfTracks->push_back(newVxTrack);
+ setOfVertices.push_back(new Trk::VxVertexOnJetAxis(temp_vector_tracksAtVertex));
+ }
+ if (msgLvl(MSG::VERBOSE)) msg() << " new overall number of tracks to fit : " << setOfVertices.size() << endmsg;
+ myJetCandidate->setVerticesOnJetAxis(setOfVertices);
+ m_initializationHelper->updateTrackNumbering(myJetCandidate);
+ doTheFit(myJetCandidate);
}
}
+
std::vector<Trk::VxCandidate*> myCandidates;
myCandidates.push_back(myJetCandidate);
+
+// return new Trk::VxSecVertexInfo(myCandidates);//ownership of the single objects is taken over!
return 0;
}
- Trk::VxSecVertexInfo*
- InDetJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
+ const Trk::VxSecVertexInfo* InDetJetFitterVxFinder::findSecVertex(const Trk::RecVertex & primaryVertex,
const TLorentzVector & jetMomentum,
const std::vector<const Trk::TrackParticleBase*> & firstInputTracks,
const std::vector<const Trk::TrackParticleBase*> & secondInputTracks,
@@ -190,149 +212,191 @@ namespace InDet
{
Amg::Vector3D myDirection(jetMomentum.Vect().X(),jetMomentum.Vect().Y(),jetMomentum.Vect().Z());
+
std::vector<std::vector<const Trk::TrackParticleBase*> > bunchesOfTracks;
+
std::vector<const Trk::TrackParticleBase*> tracksToAdd;
+
std::vector<const Trk::TrackParticleBase*>::const_iterator tracks2Begin=firstInputTracks.begin();
std::vector<const Trk::TrackParticleBase*>::const_iterator tracks2End=firstInputTracks.end();
for (std::vector<const Trk::TrackParticleBase*>::const_iterator tracks2Iter=tracks2Begin;
- tracks2Iter!=tracks2End;++tracks2Iter) {
- ATH_MSG_VERBOSE( " adding track to fit " );
+ tracks2Iter!=tracks2End;++tracks2Iter) {
+ if (msgLvl(MSG::VERBOSE)) msg() << " adding track to fit " << endmsg;
tracksToAdd.push_back(*tracks2Iter);
}
+
bunchesOfTracks.push_back(tracksToAdd);
tracksToAdd.clear();
+
std::vector<const Trk::TrackParticleBase*>::const_iterator tracks3Begin=secondInputTracks.begin();
std::vector<const Trk::TrackParticleBase*>::const_iterator tracks3End=secondInputTracks.end();
for (std::vector<const Trk::TrackParticleBase*>::const_iterator tracks3Iter=tracks3Begin;
- tracks3Iter!=tracks3End;++tracks3Iter) {
- ATH_MSG_VERBOSE( " adding track to fit " );
+ tracks3Iter!=tracks3End;++tracks3Iter) {
+ if (msgLvl(MSG::VERBOSE)) msg() << " adding track to fit " << endmsg;
tracksToAdd.push_back(*tracks3Iter);
}
- if (not tracksToAdd.empty()) {
+
+ if (tracksToAdd.size()!=0)
+ {
bunchesOfTracks.push_back(tracksToAdd);
}
tracksToAdd.clear();
+
+
//now it just uses these bunches...
//now I have just to make sure that no clustering is done at first iteration
//while it needs to be done at second iteration (there will be only two iterations)
+
+
std::vector<std::vector<const Trk::TrackParticleBase*> >::const_iterator BunchesBegin=bunchesOfTracks.begin();
std::vector<std::vector<const Trk::TrackParticleBase*> >::const_iterator BunchesEnd=bunchesOfTracks.end();
+
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksToAddBegin;
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksToAddEnd;
std::vector<const Trk::TrackParticleBase*>::const_iterator tracksToAddIter;
+
+
Trk::VxJetCandidate* myJetCandidate=0;
+
for (std::vector<std::vector<const Trk::TrackParticleBase*> >::const_iterator BunchesIter=BunchesBegin;
- BunchesIter!=BunchesEnd;++BunchesIter) {
+ BunchesIter!=BunchesEnd;++BunchesIter) {
+
if (BunchesIter==BunchesBegin) {
- ATH_MSG_VERBOSE( " initial fit with " << (*BunchesIter).size() << " tracks " );
- myJetCandidate=m_initializationHelper->initializeJetCandidate(*BunchesIter,&primaryVertex,&myDirection,&vtxSeedDirection);
- if (not myJetCandidate) continue;
- m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
- if (not BunchesIter->empty()) {
+ if (msgLvl(MSG::VERBOSE)) msg() << " initial fit with " << (*BunchesIter).size() << " tracks " << endmsg;
+ myJetCandidate=m_initializationHelper->initializeJetCandidate(*BunchesIter,&primaryVertex,&myDirection,&vtxSeedDirection);
+ m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
+ if ((*BunchesIter).size()>0)
+ {
doTheFit(myJetCandidate,true);
}
} else {
- if (not myJetCandidate) continue;
- ATH_MSG_VERBOSE( " other fit with " << BunchesIter->size() << " tracks " );
- std::vector<Trk::VxVertexOnJetAxis*> setOfVertices=myJetCandidate->getVerticesOnJetAxis();
- std::vector<Trk::VxTrackAtVertex*>* setOfTracks=myJetCandidate->vxTrackAtVertex();
- tracksToAddBegin=(*BunchesIter).begin();
- tracksToAddEnd=(*BunchesIter).end();
- for (tracksToAddIter=tracksToAddBegin;tracksToAddIter!=tracksToAddEnd;++tracksToAddIter) {
- std::vector<Trk::VxTrackAtVertex*> temp_vector_tracksAtVertex;
- ElementLink<Trk::TrackParticleBaseCollection> link;
- link.setElement(const_cast<Trk::TrackParticleBase*>(*tracksToAddIter));
- Trk::LinkToTrackParticleBase * linkTT = new Trk::LinkToTrackParticleBase(link);
- Trk::VxTrackAtVertex* newVxTrack=new Trk::VxTrackAtVertex(linkTT);
- temp_vector_tracksAtVertex.push_back(newVxTrack);
- setOfTracks->push_back(newVxTrack);
- setOfVertices.push_back(new Trk::VxVertexOnJetAxis(temp_vector_tracksAtVertex));
- }
- ATH_MSG_VERBOSE( " new overall number of tracks to fit : " << setOfVertices.size() );
- myJetCandidate->setVerticesOnJetAxis(setOfVertices);
- m_initializationHelper->updateTrackNumbering(myJetCandidate);
- m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
- doTheFit(myJetCandidate);
+ if (msgLvl(MSG::VERBOSE)) msg() << " other fit with " << (*BunchesIter).size() << " tracks " << endmsg;
+ std::vector<Trk::VxVertexOnJetAxis*> setOfVertices=myJetCandidate->getVerticesOnJetAxis();
+ std::vector<Trk::VxTrackAtVertex*>* setOfTracks=myJetCandidate->vxTrackAtVertex();
+ tracksToAddBegin=(*BunchesIter).begin();
+ tracksToAddEnd=(*BunchesIter).end();
+ for (tracksToAddIter=tracksToAddBegin;tracksToAddIter!=tracksToAddEnd;++tracksToAddIter) {
+ std::vector<Trk::VxTrackAtVertex*> temp_vector_tracksAtVertex;
+ ElementLink<Trk::TrackParticleBaseCollection> link;
+ link.setElement(const_cast<Trk::TrackParticleBase*>(*tracksToAddIter));
+ Trk::LinkToTrackParticleBase * linkTT = new Trk::LinkToTrackParticleBase(link);
+ Trk::VxTrackAtVertex* newVxTrack=new Trk::VxTrackAtVertex(linkTT);
+ temp_vector_tracksAtVertex.push_back(newVxTrack);
+ setOfTracks->push_back(newVxTrack);
+ setOfVertices.push_back(new Trk::VxVertexOnJetAxis(temp_vector_tracksAtVertex));
+ }
+ if (msgLvl(MSG::VERBOSE)) msg() << " new overall number of tracks to fit : " << setOfVertices.size() << endmsg;
+ myJetCandidate->setVerticesOnJetAxis(setOfVertices);
+ m_initializationHelper->updateTrackNumbering(myJetCandidate);
+ m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
+ doTheFit(myJetCandidate);
}
}
+
std::vector<Trk::VxCandidate*> myCandidates;
myCandidates.push_back(myJetCandidate);
+
+// return new Trk::VxSecVertexInfo(myCandidates);//ownership of the single objects is taken over!
return 0;
}
- void
- InDetJetFitterVxFinder::doTheFit(Trk::VxJetCandidate* myJetCandidate,
- bool performClustering) const {
+ void InDetJetFitterVxFinder::doTheFit(Trk::VxJetCandidate* myJetCandidate,
+ bool performClustering) const {
+
int numClusteringLoops=0;
bool noMoreVerticesToCluster(false);
+
do {//reguards clustering
- ATH_MSG_VERBOSE( "InDetJetFitterVxFinder: ------>>>> new cycle of fit" );
+
+ if (msgLvl(MSG::VERBOSE)) msg() << "InDetJetFitterVxFinder: ------>>>> new cycle of fit" << endmsg;
+
int numLoops=0;
bool noMoreTracksToDelete(false);
do {//reguards eliminating incompatible tracks...
- m_routines->performTheFit(myJetCandidate,10,false,30,0.001);
- const std::vector<Trk::VxVertexOnJetAxis*> & vertices=myJetCandidate->getVerticesOnJetAxis();
- std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesBegin=vertices.begin();
- std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesEnd=vertices.end();
- //delete incompatible tracks...
- float max_prob(1.);
- Trk::VxVertexOnJetAxis* worseVertex(0);
- for (std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesIter=verticesBegin;
- verticesIter!=verticesEnd;++verticesIter) {
- if (*verticesIter==0) {
- ATH_MSG_WARNING( "One vertex is empy. Problem when trying to delete incompatible vertices. No further vertices deleted." );
- } else {
- const Trk::FitQuality & fitQuality=(*verticesIter)->fitQuality();
- if (TMath::Prob(fitQuality.chiSquared(),(int)std::floor(fitQuality.numberDoF()+0.5))<max_prob) {
- max_prob=TMath::Prob(fitQuality.chiSquared(),(int)std::floor(fitQuality.numberDoF()+0.5));
- worseVertex=*verticesIter;
- }
- }
- }
- if (worseVertex and (max_prob<m_vertexProbCut)) {
- ATH_MSG_DEBUG( "Deleted vertex " << worseVertex->getNumVertex() << " with probability " << max_prob );
- if (worseVertex==myJetCandidate->getPrimaryVertex()) {
- ATH_MSG_INFO( " The most incompatible vertex is the primary vertex. Please check..." );
- }
- m_routines->deleteVertexFromJetCandidate(worseVertex,myJetCandidate);
- } else {
- noMoreTracksToDelete=true;
- ATH_MSG_VERBOSE( "No tracks to delete: maximum probability is " << max_prob );
- }
- numLoops+=1;
+
+ m_routines->performTheFit(myJetCandidate,10,false,30,0.001);
+
+ const std::vector<Trk::VxVertexOnJetAxis*> & vertices=myJetCandidate->getVerticesOnJetAxis();
+
+ std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesBegin=vertices.begin();
+ std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesEnd=vertices.end();
+
+
+ //delete incompatible tracks...
+ float max_prob(1.);
+ Trk::VxVertexOnJetAxis* worseVertex(0);
+ for (std::vector<Trk::VxVertexOnJetAxis*>::const_iterator verticesIter=verticesBegin;
+ verticesIter!=verticesEnd;++verticesIter) {
+ if (*verticesIter==0) {
+ if (msgLvl(MSG::WARNING)) msg() << "One vertex is empy. Problem when trying to delete incompatible vertices. No further vertices deleted." << endmsg;
+ } else {
+ const Trk::FitQuality & fitQuality=(*verticesIter)->fitQuality();
+ if (TMath::Prob(fitQuality.chiSquared(),(int)std::floor(fitQuality.numberDoF()+0.5))<max_prob) {
+ max_prob=TMath::Prob(fitQuality.chiSquared(),(int)std::floor(fitQuality.numberDoF()+0.5));
+ worseVertex=*verticesIter;
+ }
+ }
+ }
+ if (max_prob<m_vertexProbCut) {
+ if (msgLvl(MSG::DEBUG)) msg() << "Deleted vertex " << worseVertex->getNumVertex() << " with probability " << max_prob << endmsg;
+ // std::cout << "Deleted vertex " << worseVertex->getNumVertex() << " with probability " << max_prob << std::endl;
+ if (worseVertex==myJetCandidate->getPrimaryVertex()) {
+ if (msgLvl(MSG::INFO)) msg() << " The most incompatible vertex is the primary vertex. Please check..." << endmsg;
+ }
+
+ m_routines->deleteVertexFromJetCandidate(worseVertex,myJetCandidate);
+
+ } else {
+ noMoreTracksToDelete=true;
+ if (msgLvl(MSG::VERBOSE)) msg() << "No tracks to delete: maximum probability is " << max_prob << endmsg;
+ }
+
+ numLoops+=1;
} while (numLoops<m_maxNumDeleteIterations&&!(noMoreTracksToDelete));
+
if (!performClustering) break;
+
if (!m_useFastClustering) {
- m_routines->fillTableWithFullProbOfMerging(myJetCandidate,5,false,10,0.01);
+ m_routines->fillTableWithFullProbOfMerging(myJetCandidate,5,false,10,0.01);
} else {
- m_routines->fillTableWithFastProbOfMerging(myJetCandidate);
+ m_routines->fillTableWithFastProbOfMerging(myJetCandidate);
}
const Trk::VxClusteringTable* clusteringTablePtr(myJetCandidate->getClusteringTable());
+
+
+
+
if (clusteringTablePtr==0) {
- ATH_MSG_WARNING( " No Clustering Table while it should have been calculated... no more clustering performed during vertexing " );
- noMoreVerticesToCluster=true;
+ if (msgLvl(MSG::WARNING)) msg() << " No Clustering Table while it should have been calculated... no more clustering performed during vertexing " << endmsg;
+ noMoreVerticesToCluster=true;
} else {
- ATH_MSG_VERBOSE( " clustering table is " << *clusteringTablePtr );
- //now iterate over the full map and decide wether you want to do the clustering OR not...
- float probVertex(0.);
- Trk::PairOfVxVertexOnJetAxis pairOfVxVertexOnJetAxis=clusteringTablePtr->getMostCompatibleVertices(probVertex);
- //a PairOfVxVertexOnJetAxis is a std::pair<VxVertexOnJetAxis*,VxVertexOnJetAxis*>
- if (probVertex>0.&&probVertex>m_vertexClusteringProbabilityCut) {
- ATH_MSG_VERBOSE( " merging vtx number " << (*pairOfVxVertexOnJetAxis.first).getNumVertex() <<
- " and " << (*pairOfVxVertexOnJetAxis.second).getNumVertex() );
- m_helper->mergeVerticesInJetCandidate(*pairOfVxVertexOnJetAxis.first,
- *pairOfVxVertexOnJetAxis.second,
- *myJetCandidate);
- //now you need to update the numbering scheme
- m_initializationHelper->updateTrackNumbering(myJetCandidate);//maybe this should be moved to a lower level...
- } else {
- noMoreVerticesToCluster=true;
- }
+
+ if (msgLvl(MSG::VERBOSE)) msg() << " clustering table is " << *clusteringTablePtr << endmsg;
+
+ //now iterate over the full map and decide wether you want to do the clustering OR not...
+ float probVertex(0.);
+ Trk::PairOfVxVertexOnJetAxis pairOfVxVertexOnJetAxis=clusteringTablePtr->getMostCompatibleVertices(probVertex);
+ //a PairOfVxVertexOnJetAxis is a std::pair<VxVertexOnJetAxis*,VxVertexOnJetAxis*>
+
+ if (probVertex>0.&&probVertex>m_vertexClusteringProbabilityCut) {
+ if (msgLvl(MSG::VERBOSE)) msg() << " merging vtx number " << (*pairOfVxVertexOnJetAxis.first).getNumVertex() <<
+ " and " << (*pairOfVxVertexOnJetAxis.second).getNumVertex() << endmsg;
+ // const Trk::VxVertexOnJetAxis & mergedVertex=
+ m_helper->mergeVerticesInJetCandidate(*pairOfVxVertexOnJetAxis.first,
+ *pairOfVxVertexOnJetAxis.second,
+ *myJetCandidate);
+ //now you need to update the numbering scheme
+ m_initializationHelper->updateTrackNumbering(myJetCandidate);//maybe this should be moved to a lower level...
+
+ } else {
+ noMoreVerticesToCluster=true;
+ }
}
numClusteringLoops+=1;
} while (numClusteringLoops<m_maxClusteringIterations&&!(noMoreVerticesToCluster));
+
//now a section should follow where the "complicate" VxJetCandidate is transformed in a conventional "VxCandidate"
//so that it can be used also by the normal B-Tagging algorithms...
//TO BE COMPLETED
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..5a100fc739f8b185f0b454c013ed45a61dd4aa71
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterMultiStageFit.cxx
@@ -0,0 +1,359 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ */
+
+#include "InDetSecVxFinderTool/JetFitterMultiStageFit.h"
+
+#include "VxJetVertex/VxJetCandidate.h"
+#include "VxJetVertex/VxVertexOnJetAxis.h"
+#include "VxJetVertex/VxClusteringTable.h"
+#include "VxJetVertex/PairOfVxVertexOnJetAxis.h"
+#include "VxVertex/VxTrackAtVertex.h"
+
+
+using namespace InDet;
+
+/*
+ * For the Hackathon, an example of a new algorithm tool
+ */
+
+
+JetFitterMultiStageFit::JetFitterMultiStageFit(const std::string &t, const std::string &n, const IInterface *p)
+ : AthAlgTool(t, n, p)
+{
+ // constructor, declare all necessary things
+ declareInterface< JetFitterMultiStageFit >(this);
+}
+
+
+JetFitterMultiStageFit::~JetFitterMultiStageFit() {}
+
+StatusCode JetFitterMultiStageFit::initialize() {
+
+ StatusCode sc = AlgTool::initialize();
+ if (sc.isFailure()) {
+ msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
+ return sc;
+ }
+
+ sc = m_helper.retrieve();
+ if(sc.isFailure()) {
+ msg(MSG::ERROR) << " Unable to retrieve "<<m_helper<<endmsg;
+ return StatusCode::FAILURE;
+ }else msg(MSG::INFO) << "JetFitter Helper retrieved"<<endmsg;
+
+ sc = m_initializationHelper.retrieve();
+ if(sc.isFailure()) {
+ msg(MSG::ERROR) << " Unable to retrieve "<<m_initializationHelper<<endmsg;
+ return StatusCode::FAILURE;
+ }else msg(MSG::INFO) << "JetFitter Initialization Helper retrieved"<<endmsg;
+
+ sc = m_routines.retrieve();
+ if(sc.isFailure())
+ {
+ msg(MSG::ERROR) << " Unable to retrieve the JetFitter routines"<<m_routines<<endmsg;
+ return StatusCode::FAILURE;
+ }
+ else msg(MSG::INFO) << "JetFitter Routines class retrieved"<<endmsg;
+
+ if (m_jetFitterUtils.retrieve().isFailure())
+ {
+ msg(MSG::ERROR) << "Could not find JetFitterUtils tool." << endmsg;
+ return StatusCode::FAILURE;
+ }
+ else msg(MSG::INFO) << " JetFitterUtils retrieved" << endmsg;
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode JetFitterMultiStageFit::finalize() {
+ msg(MSG::INFO) << "Finalize successful" << endmsg;
+ return StatusCode::SUCCESS;
+}
+
+Trk::VxJetCandidate* JetFitterMultiStageFit::doTwoStageFit(const Trk::RecVertex & primaryVertex,
+ const TLorentzVector & jetMomentum,
+ const std::vector<const Trk::ITrackLink*> & firstInputTracks,
+ const std::vector<const Trk::ITrackLink*> & secondInputTracks,
+ const Amg::Vector3D & vtxSeedDirection) const {
+
+ msg(MSG::VERBOSE) << " entered findSecVertex(). Applying JetFitter finding to the found sets of tracks and performing clustering (pattern recognition) " << endmsg;
+
+ Amg::Vector3D myDirection(jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z());
+
+ std::vector<std::vector<const Trk::ITrackLink*> > bunchesOfTracks; // vector of vector of tracks
+
+ std::vector<const Trk::ITrackLink*> tracksToAdd;
+
+ std::vector<const Trk::ITrackLink*>::const_iterator tracks2Begin=firstInputTracks.begin();
+ std::vector<const Trk::ITrackLink*>::const_iterator tracks2End=firstInputTracks.end();
+ for (std::vector<const Trk::ITrackLink*>::const_iterator tracks2Iter=tracks2Begin;
+ tracks2Iter!=tracks2End;++tracks2Iter) {
+ //msg(MSG::VERBOSE) <<" adding track to fit " << endmsg;
+ tracksToAdd.push_back(*tracks2Iter);
+ }
+
+ bunchesOfTracks.push_back(tracksToAdd);
+ tracksToAdd.clear();
+
+ std::vector<const Trk::ITrackLink*>::const_iterator tracks3Begin=secondInputTracks.begin();
+ std::vector<const Trk::ITrackLink*>::const_iterator tracks3End=secondInputTracks.end();
+ for (std::vector<const Trk::ITrackLink*>::const_iterator tracks3Iter=tracks3Begin;
+ tracks3Iter!=tracks3End;++tracks3Iter) {
+ if (msgLvl(MSG::VERBOSE)) msg() <<" adding track to fit " << endmsg;
+ tracksToAdd.push_back(*tracks3Iter);
+ }
+
+ if (tracksToAdd.size()!=0)
+ {
+ bunchesOfTracks.push_back(tracksToAdd);
+ }
+ tracksToAdd.clear();
+
+ //now it just uses these bunches...
+ //now I have just to make sure that no clustering is done at first iteration
+ //while it needs to be done at second iteration (there will be only two iterations)
+
+
+ std::vector<std::vector<const Trk::ITrackLink*> >::const_iterator BunchesBegin=bunchesOfTracks.begin();
+ std::vector<std::vector<const Trk::ITrackLink*> >::const_iterator BunchesEnd=bunchesOfTracks.end();
+
+ std::vector<const Trk::ITrackLink*>::const_iterator tracksToAddBegin;
+ std::vector<const Trk::ITrackLink*>::const_iterator tracksToAddEnd;
+ std::vector<const Trk::ITrackLink*>::const_iterator tracksToAddIter;
+
+
+ Trk::VxJetCandidate* myJetCandidate=0;
+
+ for (std::vector<std::vector<const Trk::ITrackLink*> >::const_iterator BunchesIter=BunchesBegin;
+ BunchesIter!=BunchesEnd;++BunchesIter) {
+
+ if (BunchesIter == BunchesBegin) { // this simply means we are only using tracksToUseInFirstFit
+ msg(MSG::VERBOSE) << " initial fit with " << (*BunchesIter).size() << " tracks " << endmsg;
+ myJetCandidate = m_initializationHelper->initializeJetCandidate(*BunchesIter, &primaryVertex, &myDirection,
+ &vtxSeedDirection);
+ m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
+ if ((*BunchesIter).size() > 0) {
+ doTheFit(myJetCandidate, true);
+ // Im confused, didnt the comment above say no clustering done in first iteration?
+ // yet performClustering = true in the call above??
+ }
+ }
+
+ // second stage using all tracks, why is it done this way with an if-else in a for loop...
+ else {
+ msg(MSG::VERBOSE) <<" other fit with " << (*BunchesIter).size() << " tracks " << endmsg;
+ std::vector<Trk::VxVertexOnJetAxis*> setOfVertices=myJetCandidate->getVerticesOnJetAxis();
+ std::vector<Trk::VxTrackAtVertex*>* setOfTracks=myJetCandidate->vxTrackAtVertex();
+ tracksToAddBegin=(*BunchesIter).begin();
+ tracksToAddEnd=(*BunchesIter).end();
+
+ for (tracksToAddIter=tracksToAddBegin;tracksToAddIter!=tracksToAddEnd;++tracksToAddIter) {
+ std::vector<Trk::VxTrackAtVertex*> temp_vector_tracksAtVertex;
+ Trk::VxTrackAtVertex* newVxTrack=new Trk::VxTrackAtVertex((*tracksToAddIter)->clone());
+ temp_vector_tracksAtVertex.push_back(newVxTrack);
+ setOfTracks->push_back(newVxTrack);
+ //add the new tracks to the candidate's track collection
+ setOfVertices.push_back(new Trk::VxVertexOnJetAxis(temp_vector_tracksAtVertex));
+ //add new vertex with all the *BunchesIter tracks attached to it
+ }
+
+ msg(MSG::VERBOSE) <<" new overall number of tracks (vertices?) to fit : " << setOfVertices.size() << endmsg;
+ myJetCandidate->setVerticesOnJetAxis(setOfVertices);
+ m_initializationHelper->updateTrackNumbering(myJetCandidate);
+ //question: should this be done???
+ m_routines->initializeToMinDistancesToJetAxis(myJetCandidate);
+ // we re-initialize, is this wise? We've merged vertices in the previous iteration...
+ doTheFit(myJetCandidate);
+ }
+ }
+
+
+
+ ATH_MSG_DEBUG(" returning jet candidate");
+ return myJetCandidate;
+}
+
+
+void JetFitterMultiStageFit::doTheFit(Trk::VxJetCandidate* myJetCandidate,
+ bool performClustering) const {
+
+ int numClusteringLoops=0;
+ bool noMoreVerticesToCluster(false);
+
+ do {//regards clustering
+
+ if (msgLvl(MSG::VERBOSE))
+ msg() << "InDetImprovedJetFitterVxFinder: ------>>>> new cycle of fit" << endmsg;
+
+ int numLoops = 0;
+ bool noMoreTracksToDelete(false);
+ do {//regards eliminating incompatible tracks...
+
+ m_routines->performTheFit(myJetCandidate, 15, false, 30, 0.001);
+
+ const std::vector<Trk::VxVertexOnJetAxis *> &vertices = myJetCandidate->getVerticesOnJetAxis();
+
+ std::vector<Trk::VxVertexOnJetAxis *>::const_iterator verticesBegin = vertices.begin();
+ std::vector<Trk::VxVertexOnJetAxis *>::const_iterator verticesEnd = vertices.end();
+
+
+ //delete incompatible tracks...
+ float max_prob(1.);
+ Trk::VxVertexOnJetAxis *worseVertex(0);
+ for (std::vector<Trk::VxVertexOnJetAxis *>::const_iterator verticesIter = verticesBegin;
+ verticesIter != verticesEnd; ++verticesIter) {
+ if (*verticesIter == 0) {
+ msg(MSG::WARNING)
+ << "One vertex is empy. Problem when trying to delete incompatible vertices. No further vertices deleted."
+ << endmsg;
+ } else {
+ const Trk::FitQuality &fitQuality = (*verticesIter)->fitQuality();
+ if (TMath::Prob(fitQuality.chiSquared(), (int) std::floor(fitQuality.numberDoF() + 0.5)) <
+ max_prob) {
+ max_prob = TMath::Prob(fitQuality.chiSquared(), (int) std::floor(fitQuality.numberDoF() + 0.5));
+ worseVertex = *verticesIter;
+ }
+ }
+ }
+ if (max_prob < m_vertexProbCut) {
+ if (msgLvl(MSG::DEBUG))
+ msg() << "Deleted vertex " << worseVertex->getNumVertex() << " with probability " << max_prob
+ << endmsg;
+ // std::cout << "Deleted vertex " << worseVertex->getNumVertex() << " with probability " << max_prob << std::endl;
+ if (worseVertex == myJetCandidate->getPrimaryVertex()) {
+ if (msgLvl(MSG::VERBOSE)) msg() << " It's the primary" << endmsg;
+ }
+
+ m_routines->deleteVertexFromJetCandidate(worseVertex, myJetCandidate);
+
+ }
+ else {
+ noMoreTracksToDelete = true;
+ if (msgLvl(MSG::VERBOSE)) msg() << "No tracks to delete: maximum probability is " << max_prob << endmsg;
+ }
+
+ numLoops += 1;
+ } while (numLoops < m_maxNumDeleteIterations && !(noMoreTracksToDelete));
+
+ if (!performClustering) break;
+
+ // m_useFastClustering is false, so possibly can be removed ??
+ if (!m_useFastClustering && (int)myJetCandidate->getVerticesOnJetAxis().size()<m_maxTracksForDetailedClustering) {
+ m_routines->fillTableWithFullProbOfMerging(myJetCandidate,8,false,10,0.01);
+ }
+
+ else {
+ m_routines->fillTableWithFastProbOfMerging(myJetCandidate);
+ }
+ const Trk::VxClusteringTable* clusteringTablePtr(myJetCandidate->getClusteringTable());
+ msg(MSG::VERBOSE) << "clustering table retrieved" << endmsg;
+
+
+ if (clusteringTablePtr==0) {
+ msg(MSG::WARNING) << " No Clustering Table while it should have been calculated... no more clustering performed during vertexing " << endmsg;
+ noMoreVerticesToCluster=true;
+ }
+ // why else here? why not just continue in if above?
+ else {
+ msg(MSG::VERBOSE) <<" clustering table is " << *clusteringTablePtr << endmsg; //suppress this?
+
+ //now iterate over the full map and decide wether you want to do the clustering OR not...
+ float probVertex(0.);
+
+ // probVertex is passed by reference, below function modifies it...
+ Trk::PairOfVxVertexOnJetAxis pairOfVxVertexOnJetAxis=clusteringTablePtr->getMostCompatibleVertices(probVertex);
+ //a PairOfVxVertexOnJetAxis is a std::pair<VxVertexOnJetAxis*,VxVertexOnJetAxis*>
+
+ float probVertexExcludingPrimary(0.);
+ Trk::PairOfVxVertexOnJetAxis pairOfVxVertexOnJetAxisExcludingPrimary=clusteringTablePtr->getMostCompatibleVerticesExcludingPrimary(probVertexExcludingPrimary);
+
+ // essentially below ask if the two vals are the same, to a tolerance of 1e-6 ...
+ bool firstProbIsWithPrimary= ( fabs(probVertex-probVertexExcludingPrimary)>1e-6 );
+ // is there a better way of establishing this?
+
+ // merging vertex with primary (if cond satisfied
+ if (probVertex>0.&&probVertex>m_vertexClusteringProbabilityCut&&firstProbIsWithPrimary) {
+ msg(MSG::VERBOSE) <<" merging vtx number " << (*pairOfVxVertexOnJetAxis.first).getNumVertex() <<
+ " and " << (*pairOfVxVertexOnJetAxis.second).getNumVertex() << " (should be PV)." << endmsg; // what do these numVertex mean? e.g. -10, 0, 1, ...?
+
+ m_helper->mergeVerticesInJetCandidate(*pairOfVxVertexOnJetAxis.first,
+ *pairOfVxVertexOnJetAxis.second,
+ *myJetCandidate);
+
+ //now you need to update the numbering scheme
+ m_initializationHelper->updateTrackNumbering(myJetCandidate);//maybe this should be moved to a lower level...
+ continue;
+ }
+
+ // determine whether to merge vertices that are compatible, where neither are the primary
+ if (probVertexExcludingPrimary>0.) {
+
+ //GP suggested by Marco Battaglia, use vertex mass in order to decide wether to split or not, so derive vertex masses first
+ const Trk::VxVertexOnJetAxis *firstVertex = pairOfVxVertexOnJetAxisExcludingPrimary.first;
+ const Trk::VxVertexOnJetAxis *secondVertex = pairOfVxVertexOnJetAxisExcludingPrimary.second;
+
+ CLHEP::HepLorentzVector massVector1 = m_jetFitterUtils->fourMomentumAtVertex(*firstVertex);//MeV
+ CLHEP::HepLorentzVector massVector2 = m_jetFitterUtils->fourMomentumAtVertex(*secondVertex);//MeV
+
+ CLHEP::HepLorentzVector sumMassVector = massVector1 + massVector2;
+
+ double massTwoVertex = sumMassVector.mag();//MeV
+
+ bool doMerge(false);
+
+ double vertexClusteringProbabilityCutWithMass;
+
+ // surely a better way than below...
+ if (massTwoVertex < 1000.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass0010;
+ } else if (massTwoVertex < 1500.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass1015;
+ } else if (massTwoVertex < 2000.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass1520;
+ } else if (massTwoVertex < 2500.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass2025;
+ } else if (massTwoVertex < 3000.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass2530;
+ } else if (massTwoVertex < 4000.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass3040;
+ } else if (massTwoVertex < 5000.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass4050;
+ } else if (massTwoVertex < 6000.) {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass5060;
+ } else {
+ vertexClusteringProbabilityCutWithMass = m_vertexClusteringProbabilityCutWithMass6070;
+ }
+
+ if (probVertexExcludingPrimary > vertexClusteringProbabilityCutWithMass) {
+ doMerge = true; // why not just have doMerge = probVertexExcludingPrimary > vertexClusteringProbabilityCutWithMass ?
+ }
+
+ if (doMerge)
+ {
+
+ msg(MSG::VERBOSE) <<" merging vtx number " << (*pairOfVxVertexOnJetAxis.first).getNumVertex() <<
+ " and " << (*pairOfVxVertexOnJetAxis.second).getNumVertex() << " mass merged vertex: " << massTwoVertex << endmsg;
+
+ m_helper->mergeVerticesInJetCandidate(*pairOfVxVertexOnJetAxisExcludingPrimary.first,
+ *pairOfVxVertexOnJetAxisExcludingPrimary.second,
+ *myJetCandidate);
+
+ m_initializationHelper->updateTrackNumbering(myJetCandidate);//maybe this should be moved to a lower level...
+ continue;//go to next cycle, after a succesful merging
+ }
+ }
+
+ noMoreVerticesToCluster=true;
+
+ }
+
+ numClusteringLoops+=1; // when will this ever be greater than 1?
+ // noMoreVerticesToCluster has been set to true by the time this line is reached
+ // so numClusteringLoops will equal 1 and thats the end of the while loop (see below)...
+
+ } while (numClusteringLoops<m_maxClusteringIterations&&!(noMoreVerticesToCluster));
+
+
+
+}
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..d47542a6635ed213e5c9c5e33560789ff1de111b
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTrackSelectorTool.cxx
@@ -0,0 +1,158 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "InDetSecVxFinderTool/JetFitterTrackSelectorTool.h"
+
+using namespace InDet;
+
+ JetFitterTrackSelectorTool::JetFitterTrackSelectorTool(const std::string &t, const std::string &n, const IInterface *p)
+ : AthAlgTool(t, n, p)
+ {
+ declareInterface< JetFitterTrackSelectorTool >(this);
+ }
+
+ JetFitterTrackSelectorTool::~JetFitterTrackSelectorTool() {}
+
+ StatusCode JetFitterTrackSelectorTool::initialize() {
+
+ if ( AlgTool::initialize().isFailure() ) {
+ msg(MSG::ERROR) << " Unable to initialize the AlgTool" << endmsg;
+ return StatusCode::FAILURE;
+ }
+
+ if ( m_trkFilter.retrieve().isFailure() ) {
+ msg(MSG::ERROR) << " Unable to retrieve InDet::InDetDetailedTrackSelectorTool" << endmsg;
+ return StatusCode::FAILURE;
+ }
+
+ if ( m_jetFitterUtils.retrieve().isFailure() ) {
+ msg(MSG::ERROR) << " Unable to retrieve InDet::InDetJetFitterUtils/InDetJetFitterUtils" << endmsg;
+ return StatusCode::FAILURE;
+ }
+
+ if ( m_extrapolator.retrieve().isFailure() ) {
+ msg(MSG::ERROR) << " Unable to retrieve Trk::Extrapolator/InDetExtrapolator" << endmsg;
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode JetFitterTrackSelectorTool::finalize() {
+ msg(MSG::INFO) << "Finalize successful" << endmsg;
+ return StatusCode::SUCCESS;
+ }
+
+ const Trk::SelectedTracksInJet* JetFitterTrackSelectorTool::doTrackSelection( const xAOD::Vertex &primaryVertex,
+ const TLorentzVector &jetMomentum,
+ const std::vector<const xAOD::IParticle *> &inputTracks) const {
+ // perform the track selection
+ // step 1, apply a track filter like "InDet::InDetDetailedTrackSelectorTool"
+ // step 2, calculate the compatibility of filtered tracks with primary vertex
+ // use this to deduce primaryTracks and secondaryTracks
+
+ ATH_MSG_DEBUG( "Doing track selection on " << inputTracks.size() << " tracks ... " );
+
+ // We need to use normal pointers instead of smart pointers since the code breaks.
+ // We have to fix this issue in the future
+ // if ( m_selectedTracks != nullptr ) delete m_selectedTracks; // May this break the code?
+ Trk::SelectedTracksInJet *selectedTracks = new Trk::SelectedTracksInJet();
+
+ // Vectors of Trk::ITrackLink to be given to m_selectedTracks once we understand if they are primary of secondary tracks
+ std::vector< const Trk::ITrackLink* > primaryTrackLinks;
+ std::vector< const Trk::ITrackLink* > secondaryTrackLinks;
+
+ // Running on input tracks
+ std::vector<const xAOD::IParticle *>::const_iterator trk_iter = inputTracks.begin();
+ std::vector<const xAOD::IParticle*>::const_iterator trk_end = inputTracks.end();
+
+ int counter = 0;
+ for ( ; trk_iter != trk_end; trk_iter++ ) {
+ // Convert xAOD::IParticle to xAOD::TrackParticle
+ const xAOD::TrackParticle * tmp = dynamic_cast< const xAOD::TrackParticle* > ( *trk_iter );
+
+ // Apply track filter
+ if ( m_trkFilter->decision( *tmp,&primaryVertex ) == false ) continue;
+
+ // Compute compatibility and understand track type
+ // 0: extrapolation of MeasuredPerigee failed
+ // 1: primary
+ // 2: secondary
+ int type = computeTrackCompatibility( primaryVertex,jetMomentum,*tmp );
+
+ // Create Trk::ITrackLink collections to be given to selected tracks
+ ElementLink< xAOD::TrackParticleContainer > linkTP;
+ linkTP.setElement( tmp );
+
+ Trk::LinkToXAODTrackParticle* link= new Trk::LinkToXAODTrackParticle( linkTP );
+
+ if ( type == 1) primaryTrackLinks.push_back( link );
+ else if ( type == 2 ) secondaryTrackLinks.push_back( link );
+ else continue;
+
+ // How many tracks we are selecting
+ counter++;
+ }
+
+ ATH_MSG_DEBUG( " Total of selected tracks: "<< counter );
+
+ selectedTracks->setPrimaryTrackLinks( primaryTrackLinks );
+ selectedTracks->setSecondaryTrackLinks( secondaryTrackLinks );
+ return selectedTracks;
+ }
+
+ int JetFitterTrackSelectorTool::computeTrackCompatibility( const xAOD::Vertex &primaryVertex,
+ const TLorentzVector &jetMomentum,
+ const xAOD::TrackParticle &track ) const {
+
+ // Decorators for tracks
+ SG::AuxElement::Decorator< float > compatibilityDecorator( "TrackCompatibility" );
+
+ // Recomputing Perigee w.r.t PV
+ Trk::PerigeeSurface mySurface( primaryVertex.position() );
+ std::unique_ptr<const Trk::TrackParameters> myMeasuredPerigee(m_extrapolator->extrapolate( track,mySurface ));
+ if ( !myMeasuredPerigee) {
+ ATH_MSG_DEBUG( " Extrapolation to primary vertex failed. Skipping track " );
+ compatibilityDecorator ( track ) = 0.;
+ return 0;
+ }
+
+
+ // Prepare for using jetFitterUtils (for the computation of the compatibility)
+ // Is this conrvertion really necessary?
+ Trk::RecVertex primaryVertexRecVertex( primaryVertex.position(),
+ primaryVertex.covariancePosition(),
+ primaryVertex.numberDoF(),
+ primaryVertex.chiSquared());
+
+ Amg::Vector3D jetMomSpatial( jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z() );
+ double compatibilityValue = m_jetFitterUtils->compatibility( *myMeasuredPerigee,primaryVertexRecVertex ).first;
+ compatibilityValue = fabs( compatibilityValue ) * m_jetFitterUtils->get3DLifetimeSignOfTrack( *myMeasuredPerigee,
+ jetMomSpatial,
+ primaryVertexRecVertex );
+
+ // Decorate
+ ATH_MSG_DEBUG( "compatibilityValue = " << compatibilityValue );
+ compatibilityDecorator ( track ) = compatibilityValue;
+
+ // Understand if primary or secondary track particle
+ double cutCompatibilityPVforPosTracks = m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks;
+ double cutCompatibilityPVforNegTracks = m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks;
+
+ if ( m_revertFromPositiveToNegativeTags ) {
+ cutCompatibilityPVforNegTracks = m_cutCompatibilityPrimaryVertexForPositiveLifetimeTracks;
+ cutCompatibilityPVforPosTracks = m_cutCompatibilityPrimaryVertexForNegativeLifetimeTracks;
+ }
+
+ if ( ( compatibilityValue < 0 &&
+ TMath::Prob( fabs( compatibilityValue ),2 ) < cutCompatibilityPVforNegTracks) ||
+ ( compatibilityValue >= 0 &&
+ TMath::Prob( fabs( compatibilityValue ),2 ) < cutCompatibilityPVforPosTracks ) )
+ return 2;
+ else return 1;
+
+ }
+
+
+
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTwoTrackVtxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTwoTrackVtxFinderTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..4f9e9b8602b73070055e328c59a504e14db91a87
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterTwoTrackVtxFinderTool.cxx
@@ -0,0 +1,155 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "InDetSecVxFinderTool/JetFitterTwoTrackVtxFinderTool.h"
+
+#include "TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h"
+#include "TrkVertexFitters/SequentialVertexFitter.h"
+
+#include "xAODTracking/TrackParticleContainer.h"
+#include "xAODTracking/TrackParticleAuxContainer.h"
+#include "TrkParticleBase/LinkToTrackParticleBase.h"
+#include "TrkLinks/LinkToXAODTrackParticle.h"
+
+using namespace InDet;
+
+JetFitterTwoTrackVtxFinderTool::JetFitterTwoTrackVtxFinderTool(const std::string &t, const std::string &n, const IInterface *p)
+ : AthAlgTool(t, n, p),
+ m_tracksDecorator( "VxTrackAtVertex" )
+{
+ declareInterface< JetFitterTwoTrackVtxFinderTool >(this);
+}
+
+JetFitterTwoTrackVtxFinderTool::~JetFitterTwoTrackVtxFinderTool() {}
+
+
+StatusCode JetFitterTwoTrackVtxFinderTool::initialize() {
+
+ if ( m_CrossDistancesSeedFinder.retrieve().isFailure() ) {
+ ATH_MSG_ERROR( "Cannot retrieve Trk::CrossDistancesSeedFinder/CrossDistancesSeedFinder" );
+ return StatusCode::FAILURE;
+ }
+
+ if ( m_SequentialVertexFitter.retrieve().isFailure() ) {
+ ATH_MSG_ERROR( "Cannot retrieve Trk::SequentialVertexFitter/SequentialVertexFitter" );
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode JetFitterTwoTrackVtxFinderTool::finalize() {
+ return StatusCode::SUCCESS;
+}
+
+
+const Trk::TwoTrackVerticesInJet* JetFitterTwoTrackVtxFinderTool::doVertexFinding( const xAOD::Vertex& primaryVertex,
+ const TLorentzVector& jetMomentum,
+ std::vector< const Trk::ITrackLink* >& inputTracks) const {
+
+ std::vector< const xAOD::Vertex* > VtxCandidates;
+
+ ATH_MSG_DEBUG( "Looping over " << inputTracks.size() << " input tracks... " );
+
+ // Loop over all the combinations
+ for ( unsigned int indexA(0); indexA<inputTracks.size(); indexA++ ) {
+ const Trk::ITrackLink* trackA = inputTracks.at( indexA );
+
+ for ( unsigned int indexB(0); indexB<indexA; indexB++ ) {
+ const Trk::ITrackLink* trackB = inputTracks.at( indexB );
+
+ // Computing the Vertex candidate
+ xAOD::Vertex *myCandidate = computeVtxcandidate( primaryVertex,jetMomentum,trackA,trackB );
+ if ( myCandidate == nullptr ) continue;
+
+ // Attaching tracks to vertex candidate
+ std::vector< const Trk::ITrackLink* > associatedTracksAtVertex;
+ associatedTracksAtVertex.push_back( trackA );
+ associatedTracksAtVertex.push_back( trackB );
+ m_tracksDecorator ( *myCandidate ) = associatedTracksAtVertex;
+
+ VtxCandidates.push_back( myCandidate );
+ }
+ }
+
+
+ ATH_MSG_DEBUG( "Found " << VtxCandidates.size() <<" 2-trk vertex candidates!" );
+
+ const Trk::TwoTrackVerticesInJet *twoTrackVerticesInJet = new Trk::TwoTrackVerticesInJet ( VtxCandidates,
+ std::vector< const Trk::TrackParticleBase* >() );
+ return twoTrackVerticesInJet;
+}
+
+xAOD::Vertex* JetFitterTwoTrackVtxFinderTool::computeVtxcandidate( const xAOD::Vertex& primaryVertex,
+ const TLorentzVector& jetMomentum,
+ const Trk::ITrackLink* trackA,
+ const Trk::ITrackLink* trackB ) const {
+
+ const Trk::TrackParameters* perigeeTrackA = trackA->parameters();
+ const Trk::TrackParameters* perigeeTrackB = trackB->parameters();
+
+ std::vector< const Trk::TrackParameters* > perigeeToFit;
+ perigeeToFit.push_back( perigeeTrackA );
+ perigeeToFit.push_back( perigeeTrackB );
+
+ Amg::Vector3D seedVertex;
+ try {
+ seedVertex = m_CrossDistancesSeedFinder->findSeed( perigeeToFit );
+
+ if ( seedVertex.perp() > m_maxR ||
+ fabs( seedVertex.z() ) > m_maxZ ) {
+ ATH_MSG_DEBUG( "Vertex seed outside ID. R=" << seedVertex.perp() << " Z=" << seedVertex.z() );
+ seedVertex = primaryVertex.position();
+ }
+
+ } catch (...) {
+ ATH_MSG_DEBUG( "Seed finding failed. Using primary vertex as seed... (clearly not optimal)" );
+ seedVertex = Amg::Vector3D( primaryVertex.position() );
+ }
+
+ ATH_MSG_DEBUG( "Seed: x=" << seedVertex.x() <<
+ " y=" << seedVertex.y() <<
+ " z=" << seedVertex.z() );
+
+
+ // Compute V0 candidate
+ std::unique_ptr< xAOD::Vertex > myCandidate( m_SequentialVertexFitter->fit(perigeeToFit,seedVertex) );
+
+ // Check fit completed with success
+ if ( myCandidate == nullptr ) {
+ ATH_MSG_DEBUG( " Sequential fit failed. shouldn't happen... Skipping V0 candidate... " );
+ return nullptr;
+ }
+
+ // Check ChiSquared and nDof
+ if ( myCandidate->chiSquared() < 0 ||
+ myCandidate->numberDoF() < 0 ) {
+ ATH_MSG_DEBUG( " Fit for V0 candidate failed: chi2 or ndf negative. Deleting candidate..." );
+ return nullptr;
+ }
+
+ // Check two-vertex probability
+ if ( TMath::Prob( myCandidate->chiSquared(),myCandidate->numberDoF() ) <= m_twoVertexProbabilityCut ) {
+ ATH_MSG_DEBUG( " Candidate not satisfying two-vertex probability " );
+ return nullptr;
+ }
+
+ // Check sign and revertFromPositiveToNegativeTags
+ Amg::Vector3D jetMomSpatial( jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z() );
+ Amg::Vector3D twoTrkVtxPos( myCandidate->position() );
+ double sign = ( twoTrkVtxPos-primaryVertex.position() ).dot( jetMomSpatial );
+
+ if ( sign >= 0 && m_revertFromPositiveToNegativeTags ) {
+ ATH_MSG_DEBUG( "Not satisfying sign and revertFromPositiveToNegativeTags requirements" );
+ return nullptr;
+ }
+
+ ATH_MSG_DEBUG( " Candidate: x=" << myCandidate->x() <<
+ " y=" << myCandidate->y() <<
+ " z=" << myCandidate->z() );
+
+ return myCandidate.release();
+}
+
+
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterV0FinderTool.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterV0FinderTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..f23871503b4af6da55f2790afe0a53b0eb327209
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/JetFitterV0FinderTool.cxx
@@ -0,0 +1,412 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "InDetSecVxFinderTool/JetFitterV0FinderTool.h"
+
+#include "xAODTracking/TrackParticleContainer.h"
+#include "xAODTracking/TrackParticleAuxContainer.h"
+#include "TrkParticleBase/LinkToTrackParticleBase.h"
+#include "TrkLinks/LinkToXAODTrackParticle.h"
+
+using namespace InDet;
+
+JetFitterV0FinderTool::JetFitterV0FinderTool(const std::string &t, const std::string &n, const IInterface *p)
+ : AthAlgTool(t, n, p),
+ m_compatibilityAccessor( "TrackCompatibility" ),
+ m_tracksAccessor( "VxTrackAtVertex" )
+{
+ declareInterface< JetFitterV0FinderTool >(this);
+}
+
+JetFitterV0FinderTool::~JetFitterV0FinderTool() {}
+
+
+StatusCode JetFitterV0FinderTool::initialize() {
+
+ if ( m_jetFitterUtils.retrieve().isFailure() ) {
+ ATH_MSG_ERROR( "Cannot retrieve InDet::InDetJetFitterUtils/InDetJetFitterUtils" );
+ return StatusCode::FAILURE;
+ }
+
+ if ( m_mode3dfinder.retrieve().isFailure() ) {
+ ATH_MSG_ERROR( "Cannot retrieve Trk::Mode3dTo1dFinder/Mode3dTo1dFinder" );
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode JetFitterV0FinderTool::finalize() {
+ return StatusCode::SUCCESS;
+}
+
+
+
+const Trk::TwoTrackVerticesInJet* JetFitterV0FinderTool::doV0Finding( const xAOD::Vertex& primaryVertex,
+ const TLorentzVector& jetMomentum,
+ std::vector< const Trk::ITrackLink* >& inputTracks,
+ const std::vector< const xAOD::Vertex* >& vertexCandidates,
+ std::vector< const Trk::ITrackLink* >& tracksToUseInFirstFit,
+ std::vector< const Trk::ITrackLink* >& tracksToUseInSecondFit,
+ Amg::Vector3D& JFseedDirection ) const {
+
+ // Vector of seeding vertices.
+ std::vector< Trk::PositionAndWeight > positionsOfSeedingVertices;
+
+ // Using a function here, may become tool in the future!
+ // Phase 3, 4 and 5: find and select v0 candidates
+ std::vector< const xAOD::Vertex* > v0candidates = findV0candidates( primaryVertex,jetMomentum,inputTracks, vertexCandidates );
+ ATH_MSG_DEBUG( "Found " << v0candidates.size() <<" V0 candidates!" );
+
+ // Phase 6
+ // Select tracks for first fit using only the "best tracks" from the two-track vertices
+ ATH_MSG_DEBUG( "Analyzing two track vertices to select the best tracks" );
+ for ( const xAOD::Vertex* v0candidate : v0candidates ) {
+
+ // Check quality for first fit
+ bool satisfyCriteriaFirstFitQuality = checkCriteriaFirstFit( primaryVertex,jetMomentum,*v0candidate );
+ if ( not satisfyCriteriaFirstFitQuality ) {
+ ATH_MSG_DEBUG( "Quality criteria for first fit not satisfied! skipping ... " );
+ continue;
+ }
+
+ // The v0 candidate satisfy the selection criteria
+ // Filling the vector of tracks to be used in the first fit
+ std::vector< const Trk::ITrackLink* > vxTrackAtVertex = m_tracksAccessor( *v0candidate );
+ const Trk::ITrackLink *firstTrack = vxTrackAtVertex.at(0);
+ const Trk::ITrackLink *secondTrack = vxTrackAtVertex.at(1);
+
+ // Second track added first, legacy from old jetfitter
+ bool secondTrackAlreadyStored = m_jetFitterUtils->checkIfTrackIsInVector( secondTrack,tracksToUseInFirstFit );
+ if ( not secondTrackAlreadyStored )
+ tracksToUseInFirstFit.push_back( secondTrack );
+
+ // First track
+ bool firstTrackAlreadyStored = m_jetFitterUtils->checkIfTrackIsInVector( firstTrack,tracksToUseInFirstFit );
+ if ( not firstTrackAlreadyStored )
+ tracksToUseInFirstFit.push_back( firstTrack );
+
+ positionsOfSeedingVertices.push_back( Trk::PositionAndWeight( v0candidate->position(),1 ) );
+ }
+
+
+ // Phase 7
+ ATH_MSG_DEBUG( "Determine single good tracks to add in the fit in a second step" );
+ for ( const Trk::ITrackLink *trackLink : inputTracks ) {
+
+ bool satisfyCriteriaSecondFitQuality = checkCriteriaSecondFit( primaryVertex,trackLink );
+ if ( not satisfyCriteriaSecondFitQuality ) {
+ ATH_MSG_DEBUG( "Quality criteria for second fit not satisfied! skipping ... " );
+ continue;
+ }
+
+ bool alreadyUsed = m_jetFitterUtils->checkIfTrackIsInVector( trackLink,tracksToUseInFirstFit );
+ if ( alreadyUsed ) {
+ ATH_MSG_VERBOSE( "Track was already used" );
+ continue;
+ }
+
+ bool trackAlreadyStored = m_jetFitterUtils->checkIfTrackIsInVector( trackLink,tracksToUseInSecondFit );
+ if ( not trackAlreadyStored )
+ tracksToUseInSecondFit.push_back( trackLink );
+ }
+
+
+ // Compute JFseedDirection
+ JFseedDirection = computeSeedDirection( primaryVertex,jetMomentum,positionsOfSeedingVertices );
+
+ // First argument is the list of vertex candidates
+ // Second argument is the list of Selected Neutral Tracks To Store
+ // The Trk::TwoTrackVerticesInJet takes over the ownership
+
+ // We need to use normal pointers instead of smart pointers since the code breaks.
+ // We have to fix this issue in the future
+ const Trk::TwoTrackVerticesInJet *twoTrackVerticesInJet = new Trk::TwoTrackVerticesInJet( v0candidates,
+ std::vector< const Trk::TrackParticleBase* >() );
+ return twoTrackVerticesInJet;
+}
+
+std::vector< const xAOD::Vertex* > JetFitterV0FinderTool::findV0candidates( const xAOD::Vertex& /*primaryVertex*/,
+ const TLorentzVector& /*jetMomentum*/,
+ std::vector< const Trk::ITrackLink* >& /*inputTracks*/,
+ const std::vector< const xAOD::Vertex* >& vertexCandidates ) const {
+
+ std::vector< const xAOD::Vertex* > v0candidates;
+ ATH_MSG_DEBUG( "Looping over " << vertexCandidates.size() <<" input candidates" );
+
+ for ( unsigned int indexA(0); indexA<vertexCandidates.size(); indexA++ ) {
+ const xAOD::Vertex* myCandidate = vertexCandidates.at( indexA );
+
+ // Here a shortlist of candidates will be applied
+
+ // Phase 4 and 5 (not called in old code)!
+ // Check for photon convertion, Ks and Lambda
+ // Veto candidates and tracks
+
+ // Make a copy of the input candidate
+ // This way of creating a copy creates a discrepancy w.r.t. the code in rel21, which is propagated to Jet Fitter variables.
+ // However, this assures that the vertex positions retrieved via position().x() and x() are consistent
+ xAOD::Vertex* toAdd = new xAOD::Vertex();
+ v0candidates.push_back( toAdd );
+ *toAdd = *myCandidate;
+ }
+
+ return v0candidates;
+}
+
+bool JetFitterV0FinderTool::checkCriteriaFirstFit( const xAOD::Vertex& primaryVertex,
+ const TLorentzVector& jetMomentum,
+ const xAOD::Vertex& v0candidate ) const {
+
+
+ // Check vertex probability
+ double vertexProb = TMath::Prob( v0candidate.chiSquared(),
+ v0candidate.numberDoF() );
+
+ if ( ( vertexProb < m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium ) &&
+ ( vertexProb < m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium ) ) {
+ ATH_MSG_DEBUG( "V0 candidate does not satisfy the vertex prob criteria!" );
+ return false;
+ }
+
+
+
+ // Retrieve and prepare objects
+ const std::vector< const Trk::ITrackLink* > vxTrackAtVertex = m_tracksAccessor( v0candidate );
+ const Trk::ITrackLink* trackLink1 = vxTrackAtVertex.at( 0 );
+ const Trk::ITrackLink* trackLink2 = vxTrackAtVertex.at( 1 );
+
+ if ( trackLink1 == nullptr || trackLink2 == nullptr ) {
+ ATH_MSG_DEBUG( "Zero pointer (ITrackLink): skipping 2-track candidate" );
+ return false;
+ }
+
+ const Trk::LinkToXAODTrackParticle* linkTrackA = dynamic_cast< const Trk::LinkToXAODTrackParticle* >( trackLink1 );
+ const Trk::LinkToXAODTrackParticle* linkTrackB = dynamic_cast< const Trk::LinkToXAODTrackParticle* >( trackLink2 );
+
+ if ( !linkTrackA || !linkTrackB ) {
+ ATH_MSG_DEBUG( "Zero pointer (LinkToXAODTrackParticle): skipping 2-track candidate" );
+ return false;
+ }
+
+
+ // TO-DO
+ // remove track candidates that are supposed to be voted !
+
+
+
+
+ // Take track compatibility and compute flight significance
+ // compatibility is attached to tracks, so we need to retrieve xAOD::TrackParticles objects
+ float compatibiltyTrackA = m_compatibilityAccessor( ***linkTrackA );
+ float compatibiltyTrackB = m_compatibilityAccessor( ***linkTrackB );
+
+ if ( TMath::Prob( fabs(compatibiltyTrackA),2 ) >= m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection ) return false;
+ if ( TMath::Prob( fabs(compatibiltyTrackB),2 ) >= m_cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection ) return false;
+ if ( TMath::Prob( fabs(compatibiltyTrackA) + fabs(compatibiltyTrackB),4 ) >= m_cutCompatibilityPrimaryVertexBothTracksForBFirstSelection ) return false;
+
+
+ // Criteria on D0 and Z0 of the tracks w.r.t. primary vertex
+ const Trk::TrackParameters* initialPerigee1 = linkTrackA->parameters();
+ const Trk::TrackParameters* initialPerigee2 = linkTrackB->parameters();
+
+ if ( !initialPerigee1 || !initialPerigee2 ) {
+ ATH_MSG_DEBUG( "No refitted parameters available for 2-track vertex. Candidate not accepted..." );
+ return false;
+ }
+
+ if ( initialPerigee1->momentum().perp() <= m_cutPtBothTracksForBFirstSelection ) return false;
+ if ( initialPerigee2->momentum().perp() <= m_cutPtBothTracksForBFirstSelection ) return false;
+
+
+
+
+ // Need to create Trk::RecVertex object. Is this really necessary?
+ Trk::RecVertex primaryVertexRecVertex( primaryVertex.position(),
+ primaryVertex.covariancePosition(),
+ primaryVertex.numberDoF(),
+ primaryVertex.chiSquared());
+
+ std::pair<double,double> track1_IPd0z0 = m_jetFitterUtils->getD0andZ0IP( *initialPerigee1,
+ primaryVertexRecVertex );
+
+ std::pair<double,double> track2_IPd0z0 = m_jetFitterUtils->getD0andZ0IP(*initialPerigee2,
+ primaryVertexRecVertex);
+
+
+
+ ATH_MSG_DEBUG( "Checking good quality for track A..." );
+ if ( fabs( track1_IPd0z0.first ) >= m_cutIPD0BothTracksForBFirstSelection ) return false;
+ if ( fabs( track1_IPd0z0.second ) >= m_cutIPZ0BothTracksForBFirstSelection ) return false;
+
+ ATH_MSG_DEBUG( "Checking good quality for track B..." );
+ if ( fabs( track2_IPd0z0.first ) >= m_cutIPD0BothTracksForBFirstSelection ) return false;
+ if ( fabs( track2_IPd0z0.second ) >= m_cutIPZ0BothTracksForBFirstSelection ) return false;
+
+
+
+
+
+ ATH_MSG_DEBUG( "Checking distance and error between two vertices..." );
+ std::pair<double,double> distanceAndError = m_jetFitterUtils->getDistanceAndErrorBetweenTwoVertices( v0candidate,primaryVertexRecVertex );
+
+ Amg::Vector3D jetMomSpatial( jetMomentum.X(), jetMomentum.Y(), jetMomentum.Z() );
+ double sign = ( v0candidate.position() - primaryVertexRecVertex.position() ).dot( jetMomSpatial );
+
+ double signedDistance = distanceAndError.first;
+ if ( sign < 0 ) signedDistance = -signedDistance;
+ double significance = signedDistance/distanceAndError.second;
+
+ double FirstSelectionFirstCriterium = m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionFirstCriterium;
+ double FirstSelectionSecondCriterium = m_cutTwoTrkVtxLifetimeSignificanceForBFirstSelectionSecondCriterium;
+
+ if ( m_revertFromPositiveToNegativeTags ) {
+ FirstSelectionFirstCriterium = -FirstSelectionFirstCriterium;
+ FirstSelectionSecondCriterium = -FirstSelectionSecondCriterium;
+ }
+
+ bool firstCriterium = ( vertexProb > m_cutTwoTrkVtxVertexProbForBFirstSelectionFirstCriterium ) &&
+ ( significance > FirstSelectionFirstCriterium );
+ bool secondCriterium = ( vertexProb > m_cutTwoTrkVtxVertexProbForBFirstSelectionSecondCriterium ) &&
+ ( significance > FirstSelectionSecondCriterium );
+
+ if ( not ( firstCriterium || secondCriterium ) )
+ return false;
+
+
+
+
+ ATH_MSG_DEBUG( "Checking material interaction in layer..." );
+ double radius = v0candidate.position().perp();
+ int interactiontype=-1;
+
+ if ( (radius > m_firstBeam_min ) &&
+ (radius < m_firstBeam_max) ) {
+ interactiontype=0;
+ } else if ( (radius > m_secondBeam_min ) &&
+ ( radius < m_secondBeam_max ) ) {
+ interactiontype=1;
+ } else if ( ( radius > m_firstLayer_min ) &&
+ ( radius < m_firstLayer_max ) ) {
+ interactiontype=2;
+ } else if ( (radius > m_secondLayer_min ) &&
+ ( radius < m_secondLayer_max ) ) {
+ interactiontype=3;
+ }
+
+
+
+ if ( interactiontype == 2 || interactiontype == 3 ) {
+ bool signifCutTight = ( TMath::Prob( fabs( compatibiltyTrackA ),2 ) < m_cutCompatibilityToPrimarySingleTrackForMatInteractions ) &&
+ ( TMath::Prob( fabs( compatibiltyTrackB ),2 ) < m_cutCompatibilityToPrimarySingleTrackForMatInteractions ) &&
+ ( TMath::Prob( fabs( compatibiltyTrackA ) + fabs( compatibiltyTrackB ),4 ) < m_cutCompatibilityToPrimaryBothTracksForMatInteractions );
+
+ if ( signifCutTight ) return false;
+ }
+
+
+
+ // TO-DO
+ // Remove candidates with track overlaps
+
+
+
+ return true;
+}
+
+
+bool JetFitterV0FinderTool::checkCriteriaSecondFit( const xAOD::Vertex& primaryVertex,
+ const Trk::ITrackLink *trackLink ) const {
+
+ const Trk::LinkToXAODTrackParticle* linkTrack = dynamic_cast< const Trk::LinkToXAODTrackParticle* >( trackLink );
+ if ( linkTrack == nullptr ) {
+ ATH_MSG_DEBUG( "Zero pointer (LinkToXAODTrackParticle): skipping 2-track candidate" );
+ return false;
+ }
+
+ float compatibilityTrack = m_compatibilityAccessor( ***linkTrack );
+
+
+ const Trk::TrackParameters* perigee = trackLink->parameters();
+ const AmgSymMatrix(5) *measPerigee = perigee->covariance();
+
+ if ( measPerigee == nullptr ) {
+ ATH_MSG_DEBUG( "Track parameters have no covariance. skipping single track candidate..." );
+ return false;
+ }
+
+ // Need to create Trk::RecVertex object. Is this really necessary?
+ Trk::RecVertex primaryVertexRecVertex( primaryVertex.position(),
+ primaryVertex.covariancePosition(),
+ primaryVertex.numberDoF(),
+ primaryVertex.chiSquared());
+
+ std::pair<double,double> track_IPd0z0 = m_jetFitterUtils->getD0andZ0IP( *perigee,
+ primaryVertexRecVertex );
+ std::pair<double,double> track_IPd0z0Sig = m_jetFitterUtils->getD0andZ0IPSig( *perigee,
+ primaryVertexRecVertex );
+
+ const double IPd0 = track_IPd0z0.first;
+ const double IPz0 = track_IPd0z0.second;
+ const double IPd0Sig = track_IPd0z0Sig.first;
+ const double IPz0Sig = track_IPd0z0Sig.second;
+ const double pT = perigee->momentum().perp();
+
+ double cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection = m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection;
+ double cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection = m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection;
+
+ if ( m_revertFromPositiveToNegativeTags ) {
+ cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection = m_cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection;
+ cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection = m_cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection;
+ }
+
+ bool passBoxCut = ( fabs(IPd0Sig) < m_cutIPD0SigBoxSingleTrackForBSecondSelection ) &&
+ ( fabs(IPz0Sig) > m_cutIPZ0SigBoxSingleTrackForBSecondSelection );
+
+
+ if ( fabs(IPd0) > m_cutIPD0SingleTrackForBSecondSelection ||
+ fabs(IPz0) > m_cutIPZ0SingleTrackForBSecondSelection ||
+ ( compatibilityTrack >= 0 && TMath::Prob( fabs(compatibilityTrack),2) > cutCompatibilityPrimaryVertexSinglePositiveLifetimeTrackForBSecondSelection ) ||
+ ( compatibilityTrack < 0 && TMath::Prob( fabs(compatibilityTrack),2) > cutCompatibilityPrimaryVertexSingleNegativeLifetimeTrackForBSecondSelection ) ||
+ pT < m_cutPtSingleTrackForBSecondSelection || passBoxCut )
+ {
+ ATH_MSG_DEBUG( "Candidate didn't pass one of the selection cuts" );
+ return false;
+ }
+
+ return true;
+}
+
+Amg::Vector3D JetFitterV0FinderTool::computeSeedDirection( const xAOD::Vertex& primaryVertex,
+ const TLorentzVector& jetMomentum,
+ const std::vector< Trk::PositionAndWeight >& positionsOfSeedingVertices ) const {
+
+ Amg::Vector3D JFseedDirection( jetMomentum.X(),jetMomentum.Y(),jetMomentum.Z() );
+ JFseedDirection.normalize();
+ ATH_MSG_VERBOSE( "Jet Direction would be: " << JFseedDirection );
+
+ if ( positionsOfSeedingVertices.size() == 0 )
+ return JFseedDirection;
+
+ Amg::Vector3D theSeedVertex = m_mode3dfinder->getMode( primaryVertex.x(),primaryVertex.y(),positionsOfSeedingVertices );
+ double sign = ( theSeedVertex - primaryVertex.position() ).dot( JFseedDirection );
+
+ if ( m_revertFromPositiveToNegativeTags == false ) {
+
+ if ( sign > 0 ) {
+ JFseedDirection = ( theSeedVertex - primaryVertex.position() ).unit();
+ ATH_MSG_DEBUG( "Using twotrkvtx direction for start: " << JFseedDirection );
+ } else ATH_MSG_DEBUG( "NORMAL SEEDING: Seed vertex is on negative side... Using Jet Direction!" );
+
+ } else {
+
+ if ( sign < 0 ) {
+ JFseedDirection = -( theSeedVertex - primaryVertex.position() ).unit();
+ ATH_MSG_DEBUG( "Using twotrkvtx direction for start: " << JFseedDirection );
+ } else ATH_MSG_DEBUG( "REVERSE SEEDING: Seed vertex is on positive side... Using Jet Direction!" );
+
+ }
+
+ return JFseedDirection;
+}
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
index b44277cf605fd64baf30851eaf869ee6d3da6feb..ac350c85b8e6de9a161cdbae604b6fcdc550a7fe 100644
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
@@ -1,10 +1,17 @@
+
#include "InDetSecVxFinderTool/InDetJetFitterVxFinder.h"
#include "InDetSecVxFinderTool/InDetJetFitterUtils.h"
#include "InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h"
+#include "InDetSecVxFinderTool/JetFitterTrackSelectorTool.h"
+#include "InDetSecVxFinderTool/JetFitterTwoTrackVtxFinderTool.h"
+#include "InDetSecVxFinderTool/JetFitterV0FinderTool.h"
+#include "InDetSecVxFinderTool/JetFitterMultiStageFit.h"
-using namespace InDet;
-
-DECLARE_COMPONENT( InDetJetFitterVxFinder )
-DECLARE_COMPONENT( InDetJetFitterUtils )
-DECLARE_COMPONENT( InDetImprovedJetFitterVxFinder )
+DECLARE_COMPONENT( InDet::InDetJetFitterUtils )
+DECLARE_COMPONENT( InDet::JetFitterTrackSelectorTool )
+DECLARE_COMPONENT( InDet::JetFitterTwoTrackVtxFinderTool )
+DECLARE_COMPONENT( InDet::JetFitterV0FinderTool )
+DECLARE_COMPONENT( InDet::InDetJetFitterVxFinder )
+DECLARE_COMPONENT( InDet::JetFitterMultiStageFit )
+DECLARE_COMPONENT( InDet::InDetImprovedJetFitterVxFinder )
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..860b56e4f556369158e3a0830d77b9bb439ec8a3
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
@@ -0,0 +1,3 @@
+#include "GaudiKernel/LoadFactoryEntries.h"
+
+LOAD_FACTORY_ENTRIES( InDetSecVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h
index 4b4c7a4ea00a17361833a82da287e476636096c8..bd5fe28c503092b6e219cfb304a2b6a4c56f6e2e 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h
@@ -11,11 +11,10 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/EventContext.h"
#include "TrkToolInterfaces/ITrackHoleSearchTool.h"
#include "TrkToolInterfaces/IBoundaryCheckTool.h"
#include "TrkEventPrimitives/ParticleHypothesis.h"
-#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "TrkParameters/TrackParameters.h"
#include <atomic>
#include <vector>
@@ -136,18 +135,22 @@ namespace InDet
Return value: True if filling was successful, false otherwise
This method distills the relevant hits out of a given track
*/
- bool getMapOfHits(const Trk::Track& track ,
- const Trk::ParticleHypothesis partHyp,
- std::map<const Identifier, const Trk::TrackStateOnSurface*>& mapOfHits,
- std::map<const Identifier, std::pair<const Trk::TrackParameters*,const bool> >& mapOfPredictions) const;
-
- /** This method searches for holes in a track. It receives a list of detector responses sorted along the
- track. The TSOS in the list of hits should contain TrackParameters or at least MeasurementOnTrack.
- The method extrapolates along the tracks, using the hit information to update the extrapolation procedure.
- Surface without detector responses, which are crossed by the extrapolation are counted as holes. The
- number of holes found is returned through the information array.
- Input: mapOfHits,mapOfPredicitons
- Output: Changes in information,listOfHoles
+ bool getMapOfHits(
+ const EventContext& ctx,
+ const Trk::Track& track,
+ const Trk::ParticleHypothesis partHyp,
+ std::map<const Identifier, const Trk::TrackStateOnSurface*>& mapOfHits,
+ std::map<const Identifier,std::pair<const Trk::TrackParameters*, const bool>>&
+ mapOfPredictions) const;
+
+ /** This method searches for holes in a track. It receives a list of
+ detector responses sorted along the track. The TSOS in the list of hits
+ should contain TrackParameters or at least MeasurementOnTrack. The
+ method extrapolates along the tracks, using the hit information to
+ update the extrapolation procedure. Surface without detector responses,
+ which are crossed by the extrapolation are counted as holes. The number
+ of holes found is returned through the information array. Input:
+ mapOfHits,mapOfPredicitons Output: Changes in information,listOfHoles
*/
void performHoleSearchStepWise(std::map<const Identifier, const Trk::TrackStateOnSurface*>& mapOfHits,
std::map<const Identifier, std::pair<const Trk::TrackParameters*,const bool> >& mapOfPredictions,
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx
index 53257116bfae807b505a38b6bffd821403a8f84a..28af03bc232f254108f68de885bfc73adf42c6f9 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx
@@ -43,8 +43,8 @@ InDet::InDetTrackHoleSearchTool::InDetTrackHoleSearchTool(const std::string& t,
declareProperty("Extrapolator" , m_extrapolator);
declareProperty("ExtendedListOfHoles" , m_extendedListOfHoles = false);
declareProperty("Cosmics" , m_cosmic);
- declareProperty("minSiHits" , m_minSiHits = 3);
- declareProperty("CountDeadModulesAfterLastHit", m_countDeadModulesAfterLastHit = true);
+ declareProperty("minSiHits" , m_minSiHits = 3);
+ declareProperty("CountDeadModulesAfterLastHit", m_countDeadModulesAfterLastHit = true);
}
//================ Destructor =================================================
@@ -53,7 +53,7 @@ InDet::InDetTrackHoleSearchTool::~InDetTrackHoleSearchTool() {
//================ Initialisation =================================================
StatusCode InDet::InDetTrackHoleSearchTool::initialize() {
-
+
StatusCode sc = AlgTool::initialize();
if (sc.isFailure()) return sc;
@@ -76,7 +76,7 @@ StatusCode InDet::InDetTrackHoleSearchTool::finalize() {
}
//============================================================================================
-void InDet::InDetTrackHoleSearchTool::countHoles(const Trk::Track& track,
+void InDet::InDetTrackHoleSearchTool::countHoles(const Trk::Track& track,
std::vector<int>& information,
const Trk::ParticleHypothesis partHyp) const {
std::vector<const Trk::TrackStateOnSurface*>* listOfHoles = nullptr;
@@ -87,14 +87,14 @@ void InDet::InDetTrackHoleSearchTool::countHoles(const Trk::Track& track,
it != listOfHoles->end(); ++it) {
delete (*it);
}
- delete listOfHoles;
+ delete listOfHoles;
listOfHoles = nullptr;
}
return;
}
//============================================================================================
-const DataVector<const Trk::TrackStateOnSurface>* InDet::InDetTrackHoleSearchTool::getHolesOnTrack(const Trk::Track& track,
+const DataVector<const Trk::TrackStateOnSurface>* InDet::InDetTrackHoleSearchTool::getHolesOnTrack(const Trk::Track& track,
const Trk::ParticleHypothesis partHyp) const {
std::vector<const Trk::TrackStateOnSurface*>* listOfHoles = new std::vector<const Trk::TrackStateOnSurface*>;
searchForHoles(track, 0, listOfHoles,partHyp);
@@ -111,7 +111,7 @@ const DataVector<const Trk::TrackStateOnSurface>* InDet::InDetTrackHoleSearchToo
}
//============================================================================================
-const Trk::Track* InDet::InDetTrackHoleSearchTool::getTrackWithHoles(const Trk::Track& track,
+const Trk::Track* InDet::InDetTrackHoleSearchTool::getTrackWithHoles(const Trk::Track& track,
const Trk::ParticleHypothesis partHyp) const {
std::vector<const Trk::TrackStateOnSurface*>* listOfHoles = new std::vector<const Trk::TrackStateOnSurface*>;
searchForHoles(track, 0, listOfHoles,partHyp);
@@ -122,7 +122,7 @@ const Trk::Track* InDet::InDetTrackHoleSearchTool::getTrackWithHoles(const Trk:
}
//============================================================================================
-const Trk::Track* InDet::InDetTrackHoleSearchTool::getTrackWithHolesAndOutliers(const Trk::Track& track,
+const Trk::Track* InDet::InDetTrackHoleSearchTool::getTrackWithHolesAndOutliers(const Trk::Track& track,
const Trk::ParticleHypothesis partHyp) const {
return getTrackWithHoles(track,partHyp);
}
@@ -130,7 +130,7 @@ const Trk::Track* InDet::InDetTrackHoleSearchTool::getTrackWithHolesAndOutliers(
//============================================================================================
-void InDet::InDetTrackHoleSearchTool::searchForHoles(const Trk::Track& track,
+void InDet::InDetTrackHoleSearchTool::searchForHoles(const Trk::Track& track,
std::vector<int>* information,
std::vector<const Trk::TrackStateOnSurface*>* listOfHoles,
const Trk::ParticleHypothesis partHyp) const {
@@ -146,13 +146,13 @@ void InDet::InDetTrackHoleSearchTool::searchForHoles(const Trk::Track& track,
(*information)[Trk::numberOfTRTDeadStraws] = -1;
}
-
+
std::map<const Identifier, const Trk::TrackStateOnSurface*> mapOfHits;
// JEF: fix of [bug #44382] Poor Tracking Software Performance without SCT
// the mapOfPrediction needs the knowledge weather a holesearch should be carried out
// on this identifier or just the search for dead modules
- // therefore: if the boolean is set to true, a holesearch will be caarried out, otherwise just
+ // therefore: if the boolean is set to true, a holesearch will be caarried out, otherwise just
// the search for dead modules
// for identifiers BEFORE the last measurement (and after the first): holesearch will be carried out always
// for identifiers AFTER the last measurement (or before the first), we have to distiguish two different scenarios:
@@ -161,7 +161,8 @@ void InDet::InDetTrackHoleSearchTool::searchForHoles(const Trk::Track& track,
// measurement, but no holes
std::map<const Identifier, std::pair<const Trk::TrackParameters*,const bool> > mapOfPredictions;
- bool listOk = getMapOfHits(track,partHyp,mapOfHits,mapOfPredictions);
+ bool listOk = getMapOfHits(
+ Gaudi::Hive::currentContext(), track, partHyp, mapOfHits, mapOfPredictions);
if (listOk) {
ATH_MSG_DEBUG("Perform stepwise hole search");
@@ -180,7 +181,8 @@ void InDet::InDetTrackHoleSearchTool::searchForHoles(const Trk::Track& track,
}
// ====================================================================================================================
-bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
+bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const EventContext& ctx,
+ const Trk::Track& track,
const Trk::ParticleHypothesis partHyp,
std::map<const Identifier, const Trk::TrackStateOnSurface*>& mapOfHits,
std::map<const Identifier, std::pair<const Trk::TrackParameters*,const bool> >& mapOfPredictions) const {
@@ -194,9 +196,9 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
//std::cout << "track: " << track << std::endl;
int imeas = 0;
const Trk::TrackParameters* firstsipar = nullptr;
-
+
for (DataVector<const Trk::TrackStateOnSurface>::const_iterator iterTSOS = track.trackStateOnSurfaces()->begin();
- iterTSOS!=track.trackStateOnSurfaces()->end();++iterTSOS) {
+ iterTSOS!=track.trackStateOnSurfaces()->end();++iterTSOS) {
// type of state is measurement, hole or outlier ?
if ((*iterTSOS)->type(Trk::TrackStateOnSurface::Measurement) ||
(*iterTSOS)->type(Trk::TrackStateOnSurface::Outlier)) {
@@ -204,18 +206,18 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
bool hasID = false;
if ((*iterTSOS)->measurementOnTrack() != nullptr
&& (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement() != nullptr
- && (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement()->identify() != 0) {
+ && (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement()->identify() != 0) {
id = (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement()->identify();
hasID = true;
} else if ((*iterTSOS)->trackParameters() != nullptr
&& (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement() != nullptr
- && (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement()->identify() != 0) {
+ && (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement()->identify() != 0) {
id = (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement()->identify();
hasID = true;
}
// copy all Si track states, including the holes and outliers
if (hasID && (m_atlasId->is_pixel(id) || m_atlasId->is_sct(id))) {
- // sort the state according to the id
+ // sort the state according to the id
mapOfHits.insert(std::pair<const Identifier, const Trk::TrackStateOnSurface*>(id,*iterTSOS));
if (!(*iterTSOS)->type(Trk::TrackStateOnSurface::Outlier)) {
++imeas;
@@ -227,18 +229,18 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
}
}
// for cosmics: remember parameters of first SI TSOS
- if (m_cosmic && !firstsipar && (*iterTSOS)->trackParameters()) firstsipar=(*iterTSOS)->trackParameters();
+ if (m_cosmic && !firstsipar && (*iterTSOS)->trackParameters()) firstsipar=(*iterTSOS)->trackParameters();
if ((*iterTSOS)->trackParameters()) {
- ATH_MSG_VERBOSE("TSOS pos: " << (*iterTSOS)->trackParameters()->position()
+ ATH_MSG_VERBOSE("TSOS pos: " << (*iterTSOS)->trackParameters()->position()
<< " r: " << sqrt(pow((*iterTSOS)->trackParameters()->position().x(),2)
+pow((*iterTSOS)->trackParameters()->position().y(),2))
<< " Si measurement");
}
} else {
if ((*iterTSOS)->trackParameters()) {
- ATH_MSG_VERBOSE("TSOS pos: " << (*iterTSOS)->trackParameters()->position()
+ ATH_MSG_VERBOSE("TSOS pos: " << (*iterTSOS)->trackParameters()->position()
<< " r: " << sqrt(pow((*iterTSOS)->trackParameters()->position().x(),2)
- +pow((*iterTSOS)->trackParameters()->position().y(),2))
+ +pow((*iterTSOS)->trackParameters()->position().y(),2))
<< " TRT measurement");
}
}
@@ -259,10 +261,10 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
if (m_cosmic) {
// retrieve surface, from which hole search should start
- // retrieve tracking geometry
+ // retrieve tracking geometry
const Trk::TrackingGeometry* trackingGeometry = m_extrapolator->trackingGeometry();
// get sct volume
- const Trk::TrackingVolume* sctVolume = trackingGeometry->trackingVolume("InDet::Detectors::SCT::Barrel");
+ const Trk::TrackingVolume* sctVolume = trackingGeometry->trackingVolume("InDet::Detectors::SCT::Barrel");
//get BoundarySurface for cylinder between sct and trt
const Trk::CylinderSurface* sctCylinder = nullptr;
const Trk::Surface* sctSurface= &(sctVolume->boundarySurfaces()[Trk::tubeOuterCover].get()->surfaceRepresentation());
@@ -277,15 +279,16 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
if (firstsipar) {
//std::cout << "firstsipar: " << *firstsipar << " pos: " << firstsipar->position() << std::endl;
- startParameters.reset(m_extrapolator->extrapolate(*firstsipar,
+ startParameters.reset(m_extrapolator->extrapolate(ctx,
+ *firstsipar,
*sctCylinder,
Trk::oppositeMomentum,
true,
partHyp));
}
-
+
// if track can't be extrapolated to this cylinder (EC track!), extrapolate to disc outside TRT/SCT EC
- if (!startParameters) {
+ if (!startParameters) {
ATH_MSG_DEBUG("no start parameters on SCT cylinder, try TRT ec disc");
// get BoundarySurface for disk which encloses TRT ECs
// depending on track origin use neg or pos EC
@@ -298,7 +301,7 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
trtDisc = static_cast<const Trk::DiscSurface*> (trtSurface);
}
} else {
- const Trk::TrackingVolume* trtVolume = trackingGeometry->trackingVolume("InDet::Detectors::TRT::PositiveEndcap");
+ const Trk::TrackingVolume* trtVolume = trackingGeometry->trackingVolume("InDet::Detectors::TRT::PositiveEndcap");
const Trk::Surface* trtSurface = &(trtVolume->boundarySurfaces()[Trk::positiveFaceXY].get()->surfaceRepresentation());
if(trtSurface->type()==Trk::Surface::Disc){
trtDisc = static_cast<const Trk::DiscSurface*> (trtSurface);
@@ -307,7 +310,8 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
if (trtDisc) {
// extrapolate track to disk
- startParameters.reset(m_extrapolator->extrapolate(*firstsipar,
+ startParameters.reset(m_extrapolator->extrapolate(ctx,
+ *firstsipar,
*trtDisc,
Trk::oppositeMomentum,
true,
@@ -315,13 +319,14 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
}
}
} else { // no cosmics
-
+
if (track.perigeeParameters()) {
startParameters.reset( track.perigeeParameters()->clone());
} else if (track.trackParameters()->front()) {
ATH_MSG_DEBUG("No perigee, extrapolate to 0,0,0");
// go back to perigee
- startParameters.reset( m_extrapolator->extrapolate(*(track.trackParameters()->front()),
+ startParameters.reset( m_extrapolator->extrapolate(ctx,
+ *(track.trackParameters()->front()),
Trk::PerigeeSurface(),
Trk::anyDirection,
false, partHyp));
@@ -341,11 +346,11 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
ATH_MSG_DEBUG("We are looking for an extended list of holes, so add eventual holes before first hits");
foundFirst = true;
}
-
+
Identifier id(0);
const Trk::Surface* surf = nullptr;
bool hasID = false;
-
+
// 2nd iteration to find predictions
DataVector<const Trk::TrackStateOnSurface>::const_iterator iterTSOS = track.trackStateOnSurfaces()->begin();
@@ -359,10 +364,10 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
}
}
- ATH_MSG_VERBOSE("start position: " << startParameters->position()
+ ATH_MSG_VERBOSE("start position: " << startParameters->position()
<< " r: " << sqrt(pow(startParameters->position().x(),2)
+pow(startParameters->position().y(),2)));
-
+
int measno=0;
int nmeas=(int)track.measurementsOnTrack()->size();
for (; iterTSOS!=track.trackStateOnSurfaces()->end();++iterTSOS) {
@@ -381,13 +386,13 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
}
if ((*iterTSOS)->measurementOnTrack() != nullptr
&& (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement() != nullptr
- && (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement()->identify() != 0) {
+ && (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement()->identify() != 0) {
id = (*iterTSOS)->measurementOnTrack()->associatedSurface().associatedDetectorElement()->identify();
surf = &(*iterTSOS)->measurementOnTrack()->associatedSurface();
hasID = true;
} else if ((*iterTSOS)->trackParameters() != nullptr
&& (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement() != nullptr
- && (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement()->identify() != 0) {
+ && (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement()->identify() != 0) {
id = (*iterTSOS)->trackParameters()->associatedSurface().associatedDetectorElement()->identify();
surf = &((*iterTSOS)->trackParameters()->associatedSurface());
hasID = true;
@@ -397,13 +402,14 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
// see if this is an Si state !
if ((m_cosmic && per) || (hasID && (m_atlasId->is_pixel(id) || m_atlasId->is_sct(id) || m_atlasId->is_trt(id)))) {
-
+
if (m_atlasId->is_trt(id)) ATH_MSG_VERBOSE("Target is TRT, see if we can add something");
-
+
// extrapolate stepwise to this parameter (be careful, sorting might be wrong)
std::vector<std::unique_ptr<const Trk::TrackParameters> > paramList =
- m_extrapolator->extrapolateStepwise(*startParameters,
+ m_extrapolator->extrapolateStepwise(ctx,
+ *startParameters,
*surf,
Trk::alongMomentum,
false, partHyp);
@@ -414,12 +420,12 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
}
ATH_MSG_VERBOSE("Number of parameters in this step: " << paramList.size());
-
+
// loop over the predictons and analyze them
for (std::unique_ptr<const Trk::TrackParameters>& thisParameters : paramList) {
- ATH_MSG_VERBOSE("extrapolated pos: " << thisParameters->position() << " r: " <<
+ ATH_MSG_VERBOSE("extrapolated pos: " << thisParameters->position() << " r: " <<
sqrt(pow(thisParameters->position().x(),2)+pow(thisParameters->position().y(),2)));
-
+
// check if surface has identifer !
Identifier id2;
if ((thisParameters->associatedSurface()).associatedDetectorElement() != nullptr &&
@@ -444,22 +450,22 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
if (m_cosmic) continue;
else break;
}
-
+
// see if this surface is in the list
std::map<const Identifier, const Trk::TrackStateOnSurface*>::iterator iTSOS = mapOfHits.find(id2);
-
+
if (iTSOS == mapOfHits.end() && !foundFirst) {
ATH_MSG_VERBOSE("Si surface before first Si measurement, skip it and continue");
continue;
}
-
+
// this is a measurement on the track ?
if (iTSOS != mapOfHits.end()) {
if (!foundFirst && !(*iterTSOS)->type(Trk::TrackStateOnSurface::Outlier)) {
ATH_MSG_VERBOSE("Found first Si measurement !");
foundFirst = true;
}
-
+
// is this a surface which might have a better prediction ?
if (iTSOS->second->trackParameters()) {
ATH_MSG_VERBOSE("Found track parameter on Si surface, take it");
@@ -469,7 +475,7 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
startParameters.reset(thisParameters->clone());
}
}
-
+
// add surface, test insert !
std::pair<const Trk::TrackParameters*,const bool> trackparampair (thisParameters.release(),true);
if (mapOfPredictions.insert(std::pair<const Identifier, std::pair<const Trk::TrackParameters*,const bool> >(id2,trackparampair)).second) {
@@ -485,7 +491,7 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
ATH_MSG_VERBOSE("Target was no longer an Si element, break loop");
break;
}
-
+
}
}
if ((*iterTSOS)->type(Trk::TrackStateOnSurface::Measurement) && !(*iterTSOS)->type(Trk::TrackStateOnSurface::Outlier)) measno++;
@@ -499,22 +505,23 @@ bool InDet::InDetTrackHoleSearchTool::getMapOfHits(const Trk::Track& track,
if (!m_atlasId->is_trt(id) && (m_countDeadModulesAfterLastHit || m_extendedListOfHoles || m_cosmic)) {
ATH_MSG_DEBUG("Search for dead modules after the last Si measurement");
if (m_extendedListOfHoles || m_cosmic) ATH_MSG_DEBUG("Search for extended list of holes");
-
- Trk::CylinderVolumeBounds* cylinderBounds = new Trk::CylinderVolumeBounds(560, 2750);
+
+ Trk::CylinderVolumeBounds* cylinderBounds = new Trk::CylinderVolumeBounds(560, 2750);
// don't delete the cylinderBounds -> it's taken care of by Trk::VOlume (see Trk::SharedObject)
- Trk::Volume* boundaryVol = new Trk::Volume(0, cylinderBounds);
+ Trk::Volume* boundaryVol = new Trk::Volume(0, cylinderBounds);
// extrapolate this parameter blindly to search for more Si hits (not very fast, I know)
std::vector<std::unique_ptr<const Trk::TrackParameters> > paramList =
- m_extrapolator->extrapolateBlindly(*startParameters,
+ m_extrapolator->extrapolateBlindly(ctx,
+ *startParameters,
Trk::alongMomentum,
false, partHyp,
boundaryVol);
if (paramList.empty()) {
ATH_MSG_VERBOSE("--> Did not manage to extrapolate to another surface, break loop");
- } else {
+ } else {
ATH_MSG_VERBOSE("Number of parameters in this step: " << paramList.size());
-
+
// loop over the predictions and analyze them
for (std::unique_ptr<const Trk::TrackParameters>& thisParameter : paramList) {
// check if surface has identifer !
@@ -522,13 +529,13 @@ if (paramList.empty()) {
if (thisParameter->associatedSurface().associatedDetectorElement() != nullptr &&
thisParameter->associatedSurface().associatedDetectorElement()->identify() != 0) {
id2 = thisParameter->associatedSurface().associatedDetectorElement()->identify();
-
+
// check if it is Si or Pixel
if (!(m_atlasId->is_pixel(id2) || m_atlasId->is_sct(id2))) {
ATH_MSG_VERBOSE("Surface is not Pixel or SCT, stop loop over parameters in this step");
break;
}
-
+
// JEF: bool parameter in trackparampair: flag weather this hit should be considered as hole; if not, just cound dead modules
std::pair<const Trk::TrackParameters*,const bool> trackparampair (thisParameter.release(),m_extendedListOfHoles || m_cosmic);
if (mapOfPredictions.insert(std::pair<const Identifier, std::pair<const Trk::TrackParameters*,const bool> >(id2,trackparampair)).second) {
@@ -552,10 +559,10 @@ if (paramList.empty()) {
boundaryVol = nullptr;
//delete cylinderBounds; cylinderBounds = 0; // Till : don't delete this guy, it's deleted already when the boundaryVol gets deleted !
}
-
+
ATH_MSG_DEBUG("Number of Predictions found: " << mapOfPredictions.size());
return true;
-
+
}
//=================================================================================================================
@@ -565,33 +572,33 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
std::vector<const Trk::TrackStateOnSurface*>* listOfHoles) const {
/** This function looks for holes in a given set of TrackStateOnSurface (TSOS) within the Si-detectors.
In order to do so, an extrapolation is performed from detector element to the next and compared to the ones in the TSOS.
- If surfaces other than the ones in the track are crossed, these are possible holes or dead modules. Checks for sensitivity of
+ If surfaces other than the ones in the track are crossed, these are possible holes or dead modules. Checks for sensitivity of
struck material are performed.
-
+
The function requires the TSOS to have either TrackParameters (should have) or a MeasurementBase (must have). The startPoint
of an extrapolation is required to be a TP. In case only a MB is present, the extrapolation Startpoint is set by the
result TP of the last extrapolation, if possible.
*/
-
+
// counters to steer first/last Si hit logic
unsigned int foundTSOS = 0;
int PixelHoles = 0, SctHoles = 0, SctDoubleHoles = 0, PixelDead=0, SctDead=0;
std::set<Identifier> SctHoleIds;
-
+
ATH_MSG_DEBUG("Start iteration");
ATH_MSG_DEBUG("Number of hits+outliers: " << mapOfHits.size() << " and predicted parameters:" << mapOfPredictions.size());
-
+
for (std::map<const Identifier,std::pair<const Trk::TrackParameters*,const bool> >::const_iterator it = mapOfPredictions.begin();
it != mapOfPredictions.end(); ++it) {
-
+
const Trk::TrackParameters* nextParameters = (it->second).first;
-
+
Identifier id = nextParameters->associatedSurface().associatedDetectorElement()->identify();
-
+
// search for this ID in the list
std::map<const Identifier, const Trk::TrackStateOnSurface*>::iterator iTSOS = mapOfHits.find(id);
-
- if (iTSOS == mapOfHits.end()) {
+
+ if (iTSOS == mapOfHits.end()) {
switch (m_boundaryCheckTool->boundaryCheck(*nextParameters)) {
case Trk::BoundaryCheckResult::DeadElement:
if (m_atlasId->is_pixel(id)) {
@@ -608,8 +615,8 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
continue;
case Trk::BoundaryCheckResult::Candidate:
break;
- }
-
+ }
+
// increment tmp counters only if this detElement should be considered for a proper holesearch
// this info is the boolean in the (mapOfPredictions->second).second
if (((it->second).second)) {
@@ -619,16 +626,16 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
} else if (m_atlasId->is_sct(id)) {
ATH_MSG_VERBOSE("Found element is a SCT hole, add it to the list and continue");
++SctHoles;
-
- // check double sct
+
+ // check double sct
// obtain backside of SCT module
- const InDetDD::SiDetectorElement* thisElement =
+ const InDetDD::SiDetectorElement* thisElement =
dynamic_cast<const InDetDD::SiDetectorElement *> (nextParameters->associatedSurface().associatedDetectorElement());
if (!thisElement) {
ATH_MSG_ERROR ("cast to SiDetectorElement failed, should never happen !");
continue;
}
-
+
const Identifier otherId = thisElement->otherSide()->identify();
// loop over holes and look for the other one
if (SctHoleIds.find(otherId) != SctHoleIds.end()) {
@@ -637,7 +644,7 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
}
// keep this id for double side check
SctHoleIds.insert(id);
-
+
}
// add to tmp list of holes
if (listOfHoles) listOfHoles->push_back(createHoleTSOS(nextParameters));
@@ -646,7 +653,7 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
continue;
}
} // end (iTSOS == mapOfHits.end())
-
+
if (iTSOS->second->type(Trk::TrackStateOnSurface::Outlier)) {
++foundTSOS;
ATH_MSG_VERBOSE("Found TSOS is an outlier, not a hole, skip it and continue");
@@ -654,7 +661,7 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
mapOfHits.erase(iTSOS);
continue;
}
-
+
if (iTSOS->second->type(Trk::TrackStateOnSurface::Measurement)) {
++foundTSOS;
ATH_MSG_VERBOSE("Found TSOS is a measurement, continue");
@@ -663,17 +670,17 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
continue;
}
} // end of loop
-
- ATH_MSG_DEBUG("==> Total number of holes found: "
+
+ ATH_MSG_DEBUG("==> Total number of holes found: "
<< PixelHoles << " Pixel holes, "
<< SctHoles << " Sct holes, "
<< SctDoubleHoles << " Double holes");
-
+
if (listOfHoles) ATH_MSG_DEBUG("==> Size of listOfHoles: " << listOfHoles->size());
-
+
if (mapOfHits.size() != 0) {
int ioutliers = 0, imeasurements = 0;
- for (std::map<const Identifier, const Trk::TrackStateOnSurface*>::const_iterator iter = mapOfHits.begin();
+ for (std::map<const Identifier, const Trk::TrackStateOnSurface*>::const_iterator iter = mapOfHits.begin();
iter != mapOfHits.end(); ++iter) {
if (iter->second->type(Trk::TrackStateOnSurface::Outlier)) ++ioutliers;
else if (iter->second->type(Trk::TrackStateOnSurface::Measurement)) ++imeasurements;
@@ -684,7 +691,7 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
if (PixelHoles+SctHoles+SctDoubleHoles > 0) {
ATH_MSG_DEBUG("Not all measurements found, but holes. Left measurements: "
<< imeasurements << " outliers: " << ioutliers << " found: " << foundTSOS
- << " Pixel holes: " << PixelHoles << " Sct holes: " << SctHoles
+ << " Pixel holes: " << PixelHoles << " Sct holes: " << SctHoles
<< " Double holes: " << SctDoubleHoles);
} else {
ATH_MSG_DEBUG("Problem ? Not all measurements found. Left measurements: "
@@ -692,7 +699,7 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
}
}
}
-
+
// update information and return
if (information) {
(*information)[Trk::numberOfPixelHoles] = PixelHoles;
@@ -701,7 +708,7 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
(*information)[Trk::numberOfPixelDeadSensors] = PixelDead;
(*information)[Trk::numberOfSCTDeadSensors] = SctDead;
}
-
+
return;
}
@@ -714,11 +721,11 @@ const Trk::TrackStateOnSurface* InDet::InDetTrackHoleSearchTool::createHoleTSOS(
}
// ====================================================================================================================
-const Trk::Track* InDet::InDetTrackHoleSearchTool::addHolesToTrack(const Trk::Track& oldTrack,
+const Trk::Track* InDet::InDetTrackHoleSearchTool::addHolesToTrack(const Trk::Track& oldTrack,
std::vector<const Trk::TrackStateOnSurface*>* listOfHoles) const {
DataVector<const Trk::TrackStateOnSurface>* trackTSOS = new DataVector<const Trk::TrackStateOnSurface>;
- // get states from track
+ // get states from track
for (DataVector<const Trk::TrackStateOnSurface>::const_iterator it = oldTrack.trackStateOnSurfaces()->begin();
it != oldTrack.trackStateOnSurfaces()->end(); ++it) {
// veto old holes
@@ -746,10 +753,10 @@ const Trk::Track* InDet::InDetTrackHoleSearchTool::addHolesToTrack(const Trk::T
if (perigee) {
Trk::TrackStateOnSurfaceComparisonFunction CompFunc(perigee->momentum());
-
- // we always have to sort holes in
+
+ // we always have to sort holes in
// if (!is_sorted(trackTSOS->begin(),trackTSOS->end(), CompFunc)) {
-
+
if (fabs(perigee->parameters()[Trk::qOverP]) > 0.002) {
/* invest n*(logN)**2 sorting time for lowPt, coping with a possibly
not 100% transitive comparison functor.
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx
index 30f3751afefa87ebc3455db20081898d360cd0c4..bac83c331e9aa9e202278ad42b44f06cba6df7d1 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx
@@ -10,6 +10,7 @@
#include "InDetTrackAccessor.h"
#include "InDetTrackSelectionTool/InDetTrackSelectionTool.h"
+#include "AsgTools/IAsgTool.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/Vertex.h"
#ifndef XAOD_ANALYSIS
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
index c8f62399b85a327253ed5c818e82ffde8e65f34c..f7891ef01b044c40af86917c6bda1db1d2d1236b 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
@@ -10,8 +10,9 @@
#ifndef INDETTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
#define INDETTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
-#include "AsgTools/StatusCode.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgTools/IAsgTool.h"
#include "xAODTracking/TrackingPrimitives.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/Vertex.h"
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
index 09a128d3552b722920cb0903a065acaeb5cb6f8e..e482501e8ecadc2bcc29cc2f99663e36fe1fd9dd 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
@@ -5,7 +5,7 @@
#include "InDetTrackSelectionTool/InDetTrackSelectionTool.h"
#include "InDetTrackCut.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "xAODTracking/TrackingPrimitives.h"
#ifndef XAOD_ANALYSIS
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt
index 10381ef7f69c3dca629ccb54065b8e320d9ed17b..a768f3b0d44a1ce9ac0ee03dfbd0960d0684ef6c 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/CMakeLists.txt
@@ -5,31 +5,6 @@
# Declare the package name:
atlas_subdir( InDetTrackSelectorTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Event/xAOD/xAODTracking
- GaudiKernel
- InnerDetector/InDetRecTools/InDetRecToolInterfaces
- InnerDetector/InDetConditions/BeamSpotConditionsData
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkTools/TrkToolInterfaces
- PRIVATE
- Control/AthContainers
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- InnerDetector/InDetConditions/TRT_ConditionsServices
- InnerDetector/InDetRecEvent/InDetRIO_OnTrack
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTrackSummary
- Tracking/TrkEvent/VxVertex
- Tracking/TrkExtrapolation/TrkExInterfaces
- MagneticField/MagFieldElements
- MagneticField/MagFieldConditions )
# External dependencies:
find_package( CLHEP )
@@ -41,7 +16,7 @@ atlas_add_component( InDetTrackSelectorTool
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces AthContainers GeoPrimitives EventPrimitives TRT_ConditionsServicesLib InDetRIO_OnTrack TrkSurfaces TrkParticleBase TrkRIO_OnTrack TrkTrack TrkTrackSummary VxVertex TrkExInterfaces MagFieldElements MagFieldConditions )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkToolInterfaces AthContainers GeoPrimitives EventPrimitives TRT_ConditionsServicesLib InDetRIO_OnTrack TrkSurfaces TrkParticleBase TrkRIO_OnTrack TrkTrack TrkTrackSummary VxVertex TrkExInterfaces MagFieldElements MagFieldConditions BeamSpotConditionsData )
# Install files from the package:
atlas_install_headers( InDetTrackSelectorTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool.h b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool.h
index 1b200392d0f81bf8c8542ed07c984e7c25f17771..d16e40b8d40bd89c2a0fee4e982ac123f4e0f927 100755
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef INDETTRACKSUMMARYHELPERTOOL_H
@@ -18,6 +18,9 @@
#include "TrkTrackSummary/TrackSummary.h" // defines the Trk::numberOfDetectorTypes enum
#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
+#include "InDetPrepRawData/PixelCluster.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
+
#include "GaudiKernel/ToolHandle.h"
#include <bitset>
@@ -117,6 +120,15 @@ namespace InDet {
private:
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &getClusterSplittingProbability(const InDet::PixelCluster*pix) const {
+ if (!pix || m_clusterSplitProbContainer.key().empty()) return Trk::ClusterSplitProbabilityContainer::getNoSplitProbability();
+
+ SG::ReadHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainer(m_clusterSplitProbContainer);
+ if (!splitProbContainer.isValid()) {
+ ATH_MSG_FATAL("Failed to get cluster splitting probability container " << m_clusterSplitProbContainer);
+ }
+ return splitProbContainer->splitProbability(pix);
+ }
/**ID pixel helper*/
const PixelID* m_pixelId{nullptr};
@@ -151,6 +163,12 @@ namespace InDet {
"The ConditionsSummaryTool"
};
+ SG::ReadHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainer
+ {this, "ClusterSplitProbabilityName", "",""};
+
+ Gaudi::Property<std::vector<std::string> > m_renounce
+ {this, "RenounceInputHandles", {},""};
+
BooleanProperty m_usePixel{this, "usePixel", true};
BooleanProperty m_useSCT{this, "useSCT", true};
BooleanProperty m_useTRT{this, "useTRT", true};
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx
index 99cf280d05372cacc0e53da8e298dbb2ce204850..aaf99fd5f1e07b0c48e1876cdd85e3d7da4f0538 100755
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx
@@ -14,7 +14,6 @@
#include "TrkEventUtils/PRDtoTrackMap.h"
// normal includes
#include "Identifier/Identifier.h"
-#include "InDetPrepRawData/PixelCluster.h"
#include "InDetRIO_OnTrack/PixelClusterOnTrack.h"
#include "InDetRIO_OnTrack/SCT_ClusterOnTrack.h"
#include "InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h"
@@ -34,6 +33,13 @@ InDet::InDetTrackSummaryHelperTool::InDetTrackSummaryHelperTool(const std::strin
}
//==========================================================================
+namespace {
+ std::string_view stripStoreName(const std::string &name) {
+ std::string::size_type pos = name.find("+");
+ pos = (pos!=std::string::npos ? pos + 1 : 0);
+ return std::string_view( &(name.c_str()[pos]),name.size()-pos);
+ }
+}
StatusCode InDet::InDetTrackSummaryHelperTool::initialize()
{
@@ -59,36 +65,23 @@ StatusCode InDet::InDetTrackSummaryHelperTool::initialize()
}
ATH_CHECK( m_assoTool.retrieve( DisableTool{!m_doSharedHits || m_assoTool.empty()} ));
-
- if ( not m_pixeldedxtool.empty() and m_pixeldedxtool.retrieve().isFailure() ) {
- ATH_MSG_ERROR("Failed to retrieve pixel dEdx tool " << m_pixeldedxtool);
- ATH_MSG_ERROR("configure as 'None' to avoid its loading.");
- return StatusCode::FAILURE;
- } else {
- if (not m_pixeldedxtool.empty()) ATH_MSG_INFO("Retrieved tool " << m_pixeldedxtool);
- }
-
- if ( not m_holeSearchTool.empty() && m_holeSearchTool.retrieve().isFailure() ) {
- ATH_MSG_FATAL("Failed to retrieve tool " << m_holeSearchTool);
- return StatusCode::FAILURE;
- } else {
- ATH_MSG_INFO("Retrieved tool " << m_holeSearchTool);
- }
-
- if (not m_testBLayerTool.empty() and m_testBLayerTool.retrieve().isFailure() ) {
- ATH_MSG_ERROR("Failed to retrieve Test B Layer tool " << m_testBLayerTool);
- ATH_MSG_ERROR("configure as 'None' to avoid its loading.");
- return StatusCode::FAILURE;
- } else {
- if (not m_testBLayerTool.empty()) ATH_MSG_INFO("Retrieved tool " << m_testBLayerTool);
- }
-
- if (m_useTRT and not m_TRTStrawSummaryTool.empty() and m_TRTStrawSummaryTool.retrieve().isFailure()) {
- ATH_MSG_ERROR("Failed to retrieve StrawStatus Summary " << m_TRTStrawSummaryTool);
- ATH_MSG_ERROR("configure as 'None' to avoid its loading.");
- return StatusCode::FAILURE;
- } else {
- if (not m_TRTStrawSummaryTool.empty()) ATH_MSG_INFO("Retrieved tool " << m_TRTStrawSummaryTool);
+ ATH_CHECK( m_pixeldedxtool.retrieve( DisableTool{m_pixeldedxtool.empty() }));
+ ATH_CHECK( m_holeSearchTool.retrieve( DisableTool{m_holeSearchTool.empty() }));
+ ATH_CHECK( m_testBLayerTool.retrieve( DisableTool{m_testBLayerTool.empty() }));
+ ATH_CHECK( m_TRTStrawSummaryTool.retrieve( DisableTool{not m_useTRT or m_TRTStrawSummaryTool.empty() }));
+
+ ATH_CHECK(m_clusterSplitProbContainer.initialize( !m_clusterSplitProbContainer.key().empty()));
+
+ if (!m_renounce.empty()) {
+ for (Gaudi::DataHandle* input_handle : inputHandles()) {
+ std::string_view base_name(stripStoreName(input_handle->objKey()));
+ for (const std::string &renounce_input : m_renounce) {
+ if (base_name==renounce_input) {
+ renounce(*input_handle);
+ ATH_MSG_INFO("Renounce : " << name() << " . " << input_handle->objKey() );
+ }
+ }
+ }
}
ATH_MSG_INFO("initialize() successful in " << name());
@@ -158,12 +151,13 @@ void InDet::InDetTrackSummaryHelperTool::analyse(const Trk::Track& track,
ATH_MSG_ERROR("Could not cast pixel RoT to PixelClusterOnTrack!");
} else {
const InDet::PixelCluster* pixPrd = pix->prepRawData();
- if ( pixPrd and pixPrd->isSplit() ) { information[Trk::numberOfPixelSplitHits]++; hitIsSplit=true; }
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = getClusterSplittingProbability(pixPrd);
+ if ( pixPrd and splitProb.isSplit() ) { information[Trk::numberOfPixelSplitHits]++; hitIsSplit=true; }
if (pixPrd and m_pixelId->is_barrel(id) and
- m_pixelId->layer_disk(id) == 0 and pixPrd->isSplit())
+ m_pixelId->layer_disk(id) == 0 and splitProb.isSplit())
information[Trk::numberOfInnermostLayerSplitHits]++;
if (pixPrd and m_pixelId->is_barrel(id) and
- m_pixelId->layer_disk(id) == 1 and pixPrd->isSplit())
+ m_pixelId->layer_disk(id) == 1 and splitProb.isSplit())
information[Trk::numberOfNextToInnermostLayerSplitHits]++;
if ( pix->isBroadCluster() ) information[Trk::numberOfPixelSpoiltHits]++;
if ( pix->hasClusterAmbiguity() ) {
@@ -402,7 +396,8 @@ void InDet::InDetTrackSummaryHelperTool::updateSharedHitCount(const Trk::Track &
}
if (pix) {
const InDet::PixelCluster* pixPrd = pix->prepRawData();
- if (pixPrd and pixPrd->isSplit()) {
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = getClusterSplittingProbability(pixPrd);
+ if (pixPrd and splitProb.isSplit()) {
summary.m_information[Trk::numberOfPixelSplitHits]++;
hitIsSplit=true;
if ( m_pixelId->is_barrel(id) and m_pixelId->layer_disk(id)==0) summary.m_information[Trk::numberOfInnermostLayerSplitHits]++;
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
index 961ff0106c745b859eb1bc5174f4aee5ee36a0ec..c4c645b4ee8e596997c9e35babbcaa0b81a26398 100644
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/CMakeLists.txt
@@ -18,6 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkParameters
Tracking/TrkTools/TrkToolInterfaces
Tracking/TrkEvent/TrkRIO_OnTrack
+ Tracking/TrkEvent/TrkEventUtils
Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils
Control/StoreGate
PRIVATE
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
index b583ff3dea5490131103f68297a13bca6731544c..b0a7c8cd837a6c34bae49478f319e9ddf30fad85 100755
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/SiClusterOnTrackTool/PixelClusterOnTrackTool.h
@@ -27,6 +27,8 @@
#include "PixelGeoModel/IIBLParameterSvc.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
+
#include <atomic>
#include <mutex>
@@ -92,23 +94,29 @@ protected:
const InDet::PixelClusterOnTrack* correctDefault(const Trk::PrepRawData&,
const Trk::TrackParameters&) const;
- virtual const InDet::PixelClusterOnTrack* correctNN(const Trk::PrepRawData&, const Trk::TrackParameters&) const;
- virtual bool getErrorsDefaultAmbi( const InDet::PixelCluster*, const Trk::TrackParameters&,
- Amg::Vector2D&, Amg::MatrixX&) const;
+ const InDet::PixelClusterOnTrack* correctNN(const Trk::PrepRawData&, const Trk::TrackParameters&) const;
+
+ bool getErrorsDefaultAmbi( const InDet::PixelCluster*, const Trk::TrackParameters&,
+ Amg::Vector2D&, Amg::MatrixX&) const;
- virtual bool getErrorsTIDE_Ambi( const InDet::PixelCluster*, const Trk::TrackParameters&,
+ bool getErrorsTIDE_Ambi( const InDet::PixelCluster*, const Trk::TrackParameters&,
Amg::Vector2D&, Amg::MatrixX&) const;
- virtual const InDet::PixelClusterOnTrack* correct
- (const Trk::PrepRawData&, const Trk::TrackParameters&,
+ const InDet::PixelClusterOnTrack* correct
+ (const Trk::PrepRawData&, const Trk::TrackParameters&,
const InDet::PixelClusterStrategy) const;
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &getClusterSplittingProbability(const InDet::PixelCluster*pix) const {
+ if (!pix || m_clusterSplitProbContainer.key().empty()) return Trk::ClusterSplitProbabilityContainer::getNoSplitProbability();
- ///////////////////////////////////////////////////////////////////
- // Private methods:
- ///////////////////////////////////////////////////////////////////
-
- private:
+ SG::ReadHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainer(m_clusterSplitProbContainer);
+ if (!splitProbContainer.isValid()) {
+ ATH_MSG_FATAL("Failed to get cluster splitting probability container " << m_clusterSplitProbContainer);
+ }
+ return splitProbContainer->splitProbability(pix);
+ }
+
+private:
///////////////////////////////////////////////////////////////////
// Private data:
@@ -165,6 +173,11 @@ protected:
bool m_usingTIDE_Ambi;
SG::ReadHandleKey<InDet::PixelGangedClusterAmbiguities> m_splitClusterMapKey;
+ SG::ReadHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainer
+ {this, "ClusterSplitProbabilityName", "",""};
+ Gaudi::Property<std::vector<std::string> > m_renounce
+ {this, "RenounceInputHandles", {},""};
+
//moved from static to member variable
static constexpr int s_nbinphi=9;
static constexpr int s_nbineta=6;
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx
index 1339a792da2d501a8f9b9491da276e600815859a..766eb9d703670a0faef0016982ae9187ef0b2d68 100755
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/PixelClusterOnTrackTool.cxx
@@ -91,6 +91,13 @@ InDet::PixelClusterOnTrackTool::~PixelClusterOnTrackTool() {
///////////////////////////////////////////////////////////////////
// Initialisation
///////////////////////////////////////////////////////////////////
+namespace {
+ std::string_view stripStoreName(const std::string &name) {
+ std::string::size_type pos = name.find("+");
+ pos = (pos!=std::string::npos ? pos + 1 : 0);
+ return std::string_view( &(name.c_str()[pos]),name.size()-pos);
+ }
+}
StatusCode
InDet::PixelClusterOnTrackTool::initialize() {
@@ -111,6 +118,7 @@ InDet::PixelClusterOnTrackTool::initialize() {
m_applyNNcorrection = m_applyNNcorrectionProperty;
ATH_CHECK(m_clusterErrorKey.initialize());
+ ATH_CHECK(m_clusterSplitProbContainer.initialize( !m_clusterSplitProbContainer.key().empty()));
// get the error scaling tool
if (!m_pixelErrorScalingKey.key().empty()) {
@@ -146,7 +154,18 @@ InDet::PixelClusterOnTrackTool::initialize() {
///
ATH_CHECK(m_lorentzAngleTool.retrieve());
-
+
+ if (!m_renounce.empty()) {
+ for (Gaudi::DataHandle* input_handle : inputHandles()) {
+ std::string_view base_name(stripStoreName(input_handle->objKey()));
+ for (const std::string &renounce_input : m_renounce) {
+ if (base_name==renounce_input) {
+ renounce(*input_handle);
+ ATH_MSG_INFO("Renounce : " << name() << " . " << input_handle->objKey() );
+ }
+ }
+ }
+ }
return StatusCode::SUCCESS;
}
@@ -184,7 +203,8 @@ InDet::PixelClusterOnTrackTool::correct
if (!pix) {
return 0;
}
- if (pix->isSplit()) {
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = getClusterSplittingProbability(pix);
+ if (splitProb.isSplit()) {
return correctNN(rio, trackPar);
} else {
return correctDefault(rio, trackPar);
@@ -578,7 +598,8 @@ InDet::PixelClusterOnTrackTool::correct
// GP: NEW correct() method in case of NN based calibration */
const InDet::PixelClusterOnTrack *
InDet::PixelClusterOnTrackTool::correctNN
- (const Trk::PrepRawData &rio, const Trk::TrackParameters &trackPar) const {
+ (const Trk::PrepRawData &rio,
+ const Trk::TrackParameters &trackPar) const {
const InDet::PixelCluster *pixelPrepCluster = dynamic_cast<const InDet::PixelCluster *>(&rio);
if (pixelPrepCluster == 0) {
@@ -837,16 +858,17 @@ InDet::PixelClusterOnTrackTool::getErrorsTIDE_Ambi(const InDet::PixelCluster *pi
const Trk::TrackParameters &trackPar,
Amg::Vector2D &finalposition,
Amg::MatrixX &finalerrormatrix) const {
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProb = getClusterSplittingProbability(pixelPrepCluster);
std::vector<Amg::Vector2D> vectorOfPositions;
int numberOfSubclusters = 1;
if(m_applyNNcorrection){
SG::ReadHandle<InDet::PixelGangedClusterAmbiguities> splitClusterMap(m_splitClusterMapKey);
numberOfSubclusters = 1 + splitClusterMap->count(pixelPrepCluster);
- if (splitClusterMap->count(pixelPrepCluster) == 0 && pixelPrepCluster->isSplit()) {
+ if (splitClusterMap->count(pixelPrepCluster) == 0 && splitProb.isSplit()) {
numberOfSubclusters = 2;
}
- if (splitClusterMap->count(pixelPrepCluster) != 0 && !pixelPrepCluster->isSplit()) {
+ if (splitClusterMap->count(pixelPrepCluster) != 0 && !splitProb.isSplit()) {
numberOfSubclusters = 1;
}
}
@@ -871,7 +893,7 @@ InDet::PixelClusterOnTrackTool::getErrorsTIDE_Ambi(const InDet::PixelCluster *pi
if (allLocalPositions.empty()) {
ATH_MSG_DEBUG(
" Cluster cannot be treated by NN. Giving back to default clusterization, too big: " <<
- pixelPrepCluster->tooBigToBeSplit());
+ splitProb.isTooBigToBeSplit());
return false;
}
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
index 28e8514b8c07756dd5550076753ada6f61453844..3ab17002adacff39d96a8183f0266dbb1180493f 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/ClusterMakerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -23,7 +23,6 @@
#include "GeoPrimitives/GeoPrimitives.h"
#include "InDetCondTools/ISiLorentzAngleTool.h"
#include "PixelCabling/IPixelCablingSvc.h"
-#include "PixelConditionsData/PixelModuleData.h"
#include "PixelConditionsData/PixelChargeCalibCondData.h"
#include "PixelConditionsData/PixelOfflineCalibData.h"
#include "StoreGate/ReadCondHandleKey.h"
@@ -146,9 +145,6 @@ private:
ServiceHandle<IPixelCablingSvc> m_pixelCabling
{this, "PixelCablingSvc", "PixelCablingSvc", "Pixel cabling service"};
- SG::ReadCondHandleKey<PixelModuleData> m_moduleDataKey
- {this, "PixelModuleData", "PixelModuleData", "Pixel module data"};
-
SG::ReadCondHandleKey<PixelChargeCalibCondData> m_chargeDataKey
{this, "PixelChargeCalibCondData", "PixelChargeCalibCondData", "Pixel charge calibration data"};
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
index 01039990556ad36cd7d109f2c81b47e038c8c773..2a84f885ef5f658a3da0cc6bbf41f31a2a62c812 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/NnClusterizationFactory.h
@@ -134,11 +134,20 @@ namespace InDet {
// Handling lwtnn inputs
typedef std::map<std::string, std::map<std::string, double> > InputMap;
+ /* Estimate number of particles for both with and w/o tracks */
+ /* Method 1: using older TTrainedNetworks */
+ std::vector<double> estimateNumberOfParticlesTTN(const TTrainedNetworkCollection &nn_collection,
+ std::vector<double> inputData) const;
+
+ /* Estimate number of particles for both with and w/o tracks */
+ /* Method 2: using lwtnn for more flexible interfacing */
+ std::vector<double> estimateNumberOfParticlesLWTNN(NnClusterizationFactory::InputMap & input) const;
+
/* Estimate position for both with and w/o tracks */
/* Method 1: using older TTrainedNetworks */
std::vector<Amg::Vector2D> estimatePositionsTTN(
const TTrainedNetworkCollection &nn_collection,
- std::vector<double> inputData,
+ const std::vector<double>& inputData,
const NNinput& input,
const InDet::PixelCluster& pCluster,
int sizeX,
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelClusteringToolBase.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelClusteringToolBase.h
index e573c219c093ab5ea783316aee3763f5ae2af18a..9de15c22262c9b2b97b4e292e25d1425b07fa685 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelClusteringToolBase.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelClusteringToolBase.h
@@ -68,7 +68,6 @@ protected:
IntegerProperty m_splitClusters{this, "splitClusters", 0};
ToolHandle<IInDetConditionsTool> m_summaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
BooleanProperty m_useModuleMap{this, "UsePixelModuleMap", true, "Use bad modules map"};
- BooleanProperty m_usePixelMap{this, "UseSpecialPixelMap", true, "Use bad pixel map"};
};
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
index e08afbcac13274388492338131d4cbb3235d2915..8b3d9b2588351098284025f3f2cc908ed6e54c9b 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx
@@ -60,12 +60,7 @@ StatusCode ClusterMakerTool::initialize(){
if (not m_pixelCabling.empty()) {
ATH_CHECK(m_pixelCabling.retrieve());
}
- if (not m_moduleDataKey.empty()) {
- ATH_CHECK(m_moduleDataKey.initialize());
- }
- if (not m_chargeDataKey.empty()) {
- ATH_CHECK(m_chargeDataKey.initialize());
- }
+ ATH_CHECK(m_chargeDataKey.initialize(SG::AllowEmpty));
if (not m_pixelLorentzAngleTool.empty()) {
ATH_CHECK(m_pixelLorentzAngleTool.retrieve());
@@ -136,13 +131,11 @@ PixelCluster* ClusterMakerTool::pixelCluster(
return nullptr;
}
- SG::ReadCondHandle<PixelModuleData> moduleData(m_moduleDataKey);
- SG::ReadCondHandle<PixelChargeCalibCondData> calibData(m_chargeDataKey);
-
if ( errorStrategy==2 && m_forceErrorStrategy1A ) errorStrategy=1;
// Fill vector of charges
std::vector<float> chargeList;
- if (moduleData->getUseCalibConditions()) {
+ if (!m_chargeDataKey.empty()) {
+ SG::ReadCondHandle<PixelChargeCalibCondData> calibData(m_chargeDataKey);
int nRDO=rdoList.size();
chargeList.reserve(nRDO);
for (int i=0; i<nRDO; i++) {
@@ -283,9 +276,6 @@ PixelCluster* ClusterMakerTool::pixelCluster(
}
if ( errorStrategy==2 && m_forceErrorStrategy1B ) errorStrategy=1;
- SG::ReadCondHandle<PixelModuleData> moduleData(m_moduleDataKey);
- SG::ReadCondHandle<PixelChargeCalibCondData> calibData(m_chargeDataKey);
-
// Fill vector of charges and compute charge balance
const InDetDD::PixelModuleDesign* design = (dynamic_cast<const InDetDD::PixelModuleDesign*>(&element->design()));
if (not design){
@@ -300,51 +290,60 @@ PixelCluster* ClusterMakerTool::pixelCluster(
float qColMin = 0; float qColMax = 0;
std::vector<float> chargeList;
int nRDO=rdoList.size();
- if (moduleData->getUseCalibConditions()) { chargeList.reserve(nRDO); }
+ if (!m_chargeDataKey.empty()) {
+ chargeList.reserve(nRDO);
+ SG::ReadCondHandle<PixelChargeCalibCondData> calibData(m_chargeDataKey);
+ for (int i=0; i<nRDO; i++) {
+ Identifier pixid=rdoList[i];
+ int ToT=totList[i];
+
+ float charge = ToT;
+ Identifier moduleID = pixelID.wafer_id(pixid);
+ IdentifierHash moduleHash = pixelID.wafer_hash(moduleID); // wafer hash
+ int circ = m_pixelCabling->getFE(&pixid,moduleID);
+ int type = m_pixelCabling->getPixelType(pixid);
+ charge = calibData->getCharge((int)moduleHash, circ, type, 1.0*ToT);
+ if (moduleHash<12 || moduleHash>2035) {
+ charge = ToT/8.0*(8000.0-1200.0)+1200.0;
+ }
+ chargeList.push_back(charge);
+ }
+ }
+
for (int i=0; i<nRDO; i++) {
- Identifier pixid=rdoList[i];
- int ToT=totList[i];
-
- float charge = ToT;
- if (moduleData->getUseCalibConditions()) {
-
- Identifier moduleID = pixelID.wafer_id(pixid);
- IdentifierHash moduleHash = pixelID.wafer_hash(moduleID); // wafer hash
- int circ = m_pixelCabling->getFE(&pixid,moduleID);
- int type = m_pixelCabling->getPixelType(pixid);
- charge = calibData->getCharge((int)moduleHash, circ, type, 1.0*ToT);
- if (moduleHash<12 || moduleHash>2035) {
- charge = ToT/8.0*(8000.0-1200.0)+1200.0;
- }
-
- chargeList.push_back(charge);
- }
- // std::cout << "tot, charge = " << ToT << " " << charge << std::endl;
- int row = pixelID.phi_index(pixid);
- int col = pixelID.eta_index(pixid);
- if (row == rowMin) qRowMin += charge;
- if (row < rowMin){
- rowMin = row;
- qRowMin = charge;
- }
-
- if (row == rowMax) qRowMax += charge;
- if (row > rowMax){
- rowMax = row;
- qRowMax = charge;
- }
- if (col == colMin) qColMin += charge;
- if (col < colMin){
- colMin = col;
- qColMin = charge;
- }
-
- if (col == colMax) qColMax += charge;
- if (col > colMax){
- colMax = col;
- qColMax = charge;
- }
+ Identifier pixid=rdoList[i];
+ int ToT=totList[i];
+
+ float charge = ToT;
+ if (!m_chargeDataKey.empty()) { charge=chargeList[i]; }
+
+ // std::cout << "tot, charge = " << ToT << " " << charge << std::endl;
+ int row = pixelID.phi_index(pixid);
+ int col = pixelID.eta_index(pixid);
+ if (row == rowMin) qRowMin += charge;
+ if (row < rowMin){
+ rowMin = row;
+ qRowMin = charge;
+ }
+
+ if (row == rowMax) qRowMax += charge;
+ if (row > rowMax){
+ rowMax = row;
+ qRowMax = charge;
+ }
+ if (col == colMin) qColMin += charge;
+ if (col < colMin){
+ colMin = col;
+ qColMin = charge;
+ }
+
+ if (col == colMax) qColMax += charge;
+ if (col > colMax){
+ colMax = col;
+ qColMax = charge;
+ }
}
+
Identifier newClusterID = pixelID.pixel_id(pixelID.wafer_id(clusterID),rowMin,colMin);
// Compute omega for charge interpolation correction (if required)
// Two pixels may have charge=0 (very rarely, hopefully)
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.cxx
index 0a733ff61e79d3c64db91b08bd7bc25b4514ac8b..994403f4fc4d075d43080eeb1edb4a3bb4f05100 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.cxx
@@ -54,7 +54,7 @@ namespace InDet {
}
StatusCode LWTNNCondAlg::configureLwtnn(std::unique_ptr<lwt::LightweightGraph> & thisNN,
- std::string thisJson) {
+ const std::string& thisJson) {
// Read DNN weights from input json config
lwt::GraphConfig config;
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.h b/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.h
index 23a94d535fa2610d5b6512d1441b74e9bda146db..2678f02c10395a614100d4c96eeac5aca60d08d4 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/LWTNNCondAlg.h
@@ -49,7 +49,7 @@ class LWTNNCondAlg : public AthAlgorithm {
ToolHandle<Trk::NeuralNetworkToHistoTool> m_networkToHistoTool
{this,"NetworkToHistoTool", "Trk::NeuralNetworkToHistoTool/NeuralNetworkToHistoTool", "Tool to create a neural network from a set of histograms." };
*/
- StatusCode configureLwtnn(std::unique_ptr<lwt::LightweightGraph> & thisNN, std::string thisJson);
+ StatusCode configureLwtnn(std::unique_ptr<lwt::LightweightGraph> & thisNN, const std::string& thisJson);
SG::ReadCondHandleKey<CondAttrListCollection> m_readKey
{this, "ReadKey", "/PIXEL/PixelClustering/PixelNNCalibJSON", "Cool folder name for the cluster NN input histogram file."};
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx
index 0f0d077f69929b926511302b1472d18b397a3d36..c9f25be80436f54b5da7fbf584fda5e29cc7baf9 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/MergedPixelsTool.cxx
@@ -341,7 +341,7 @@ namespace InDet {
std::unordered_set<Identifier> setOfIdentifiers{};
for(const auto & rdo : collection) {
const Identifier rdoID= rdo->identify();
- if (m_usePixelMap and !(m_summaryTool->isGood(idHash,rdoID))) continue;
+ if (m_useModuleMap and !(m_summaryTool->isGood(idHash,rdoID))) continue;
//check for duplication:
//add to set of existing identifiers. If it fails (.second = false) then skip it.
if (not setOfIdentifiers.insert(rdoID).second) continue;
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx
index 28feb5fa6854f19666b0c1e0261130cade50a654..716f562270135c53d979161dfe6a907a3e56bf0c 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/NnClusterizationFactory.cxx
@@ -22,9 +22,6 @@
#include "GaudiKernel/ServiceHandle.h"
#include <TMath.h>
-#include <TH1.h>
-#include <TH1F.h>
-#include <TH2F.h>
#include "TrkNeuralNetworkUtils/TTrainedNetwork.h"
#include "SiClusterizationTool/NnClusterizationFactory.h"
#include "SiClusterizationTool/NnNormalization.h"
@@ -97,9 +94,9 @@ namespace InDet {
else {
if (m_nParticleGroup[network_i]>0) {
if (m_nParticleGroup[network_i]>=match_result.size()) {
- std::stringstream msg; msg << "Regex and match group of particle multiplicity do not coincide (groups=" << match_result.size() << " n particle group=" << m_nParticleGroup[network_i]
- << "; type=" << network_i << ")";
- throw std::logic_error(msg.str());
+ ATH_MSG_ERROR("Regex and match group of particle multiplicity do not coincide (groups=" << match_result.size()
+ << " n particle group=" << m_nParticleGroup[network_i]
+ << "; type=" << network_i << ")");
}
int n_particles=atoi( match_result[m_nParticleGroup[network_i]].str().c_str());
if (n_particles<=0 || static_cast<unsigned int>(n_particles)>m_maxSubClusters) {
@@ -302,11 +299,6 @@ namespace InDet {
double tanl=0;
- SG::ReadCondHandle<TTrainedNetworkCollection> nn_collection( m_readKeyWithoutTrack );
- if (!nn_collection.isValid()) {
- std::stringstream msg; msg << "Failed to get trained network collection with key " << m_readKeyWithoutTrack.key();
- throw std::runtime_error(msg.str() );
- }
NNinput input( createInput(pCluster,
beamSpotPosition,
tanl,
@@ -320,14 +312,21 @@ namespace InDet {
std::vector<double> inputData=(this->*m_assembleInput)(input,sizeX,sizeY);
- // dereference unique_ptr<TTrainedNetwork> then call calculateOutput :
- std::vector<double> resultNN_NoTrack( ((*(nn_collection->at(m_nParticleNNId))).*m_calculateOutput)(inputData) );
- ATH_MSG_VERBOSE(" NOTRACK Prob of n. particles (1): " << resultNN_NoTrack[0] <<
- " (2): " << resultNN_NoTrack[1] <<
- " (3): " << resultNN_NoTrack[2]);
+ // If using old TTrainedNetworks, fetch correct ones for the
+ // without-track situation and call them now.
+ if (m_useTTrainedNetworks) {
+ SG::ReadCondHandle<TTrainedNetworkCollection> nn_collection( m_readKeyWithoutTrack );
+ if (!nn_collection.isValid()) {
+ ATH_MSG_ERROR( "Failed to get trained network collection with key " << m_readKeyWithoutTrack.key() );
+ }
+ return estimateNumberOfParticlesTTN(**nn_collection, inputData);
+ }
+
+ // Otherwise, prepare lwtnn input map and use new networks.
+ NnClusterizationFactory::InputMap nnInputData = flattenInput(input);
+ return estimateNumberOfParticlesLWTNN(nnInputData);
- return resultNN_NoTrack;
}
std::vector<double> NnClusterizationFactory::estimateNumberOfParticles(const InDet::PixelCluster& pCluster,
@@ -337,12 +336,6 @@ namespace InDet {
int sizeY) const
{
- SG::ReadCondHandle<TTrainedNetworkCollection> nn_collection( m_readKeyWithTrack );
- if (!nn_collection.isValid()) {
- std::stringstream msg; msg << "Failed to get trained network collection with key " << m_readKeyWithTrack.key();
- throw std::runtime_error(msg.str() );
- }
-
Amg::Vector3D dummyBS(0,0,0);
double tanl=0;
@@ -361,12 +354,60 @@ namespace InDet {
addTrackInfoToInput(input,pixelSurface,trackParsAtSurface,tanl);
std::vector<double> inputData=(this->*m_assembleInput)(input,sizeX,sizeY);
+
+ // If using old TTrainedNetworks, fetch correct ones for the
+ // with-track situation and call them now.
+ if (m_useTTrainedNetworks) {
+ SG::ReadCondHandle<TTrainedNetworkCollection> nn_collection( m_readKeyWithTrack );
+ if (!nn_collection.isValid()) {
+ ATH_MSG_ERROR( "Failed to get trained network collection with key " << m_readKeyWithoutTrack.key() );
+ }
+ return estimateNumberOfParticlesTTN(**nn_collection, inputData);
+ }
+
+ // Otherwise, prepare lwtnn input map and use new networks.
+ NnClusterizationFactory::InputMap nnInputData = flattenInput(input);
+ return estimateNumberOfParticlesLWTNN(nnInputData);
+
+ }
+
+ std::vector<double> NnClusterizationFactory::estimateNumberOfParticlesTTN(const TTrainedNetworkCollection &nn_collection,
+ std::vector<double> inputData) const
+ {
+ ATH_MSG_DEBUG("Using TTN number network");
// dereference unique_ptr<TTrainedNetwork> then call calculateOutput :
- std::vector<double> resultNN( ( ( *(nn_collection->at(m_nParticleNNId))).*m_calculateOutput)(inputData) );
+ std::vector<double> resultNN_TTN( ((*(nn_collection.at(m_nParticleNNId))).*m_calculateOutput)(inputData) );
- ATH_MSG_VERBOSE(" Prob of n. particles (1): " << resultNN[0] << " (2): " << resultNN[1] << " (3): " << resultNN[2]);
+ ATH_MSG_VERBOSE(" TTN Prob of n. particles (1): " << resultNN_TTN[0] <<
+ " (2): " << resultNN_TTN[1] <<
+ " (3): " << resultNN_TTN[2]);
- return resultNN;
+ return resultNN_TTN;
+ }
+
+ std::vector<double> NnClusterizationFactory::estimateNumberOfParticlesLWTNN(NnClusterizationFactory::InputMap & input) const
+ {
+ SG::ReadCondHandle<LWTNNCollection> lwtnn_collection(m_readKeyJSON) ;
+ if (!lwtnn_collection.isValid()) {
+ ATH_MSG_ERROR( "Failed to get LWTNN network collection with key " << m_readKeyJSON.key() );
+ }
+ ATH_MSG_DEBUG("Using lwtnn number network");
+ // Evaluate the number network once per cluster
+ lwt::ValueMap discriminant = lwtnn_collection->at(0)->compute(input);
+ double num0 = discriminant["output_number0"];
+ double num1 = discriminant["output_number1"];
+ double num2 = discriminant["output_number2"];
+ // Get normalized predictions
+ double prob1 = num0/(num0+num1+num2);
+ double prob2 = num1/(num0+num1+num2);
+ double prob3 = num2/(num0+num1+num2);
+ std::vector<double> number_probabilities{prob1, prob2, prob3};
+
+ ATH_MSG_VERBOSE(" LWTNN Prob of n. particles (1): " << number_probabilities[0] <<
+ " (2): " << number_probabilities[1] <<
+ " (3): " << number_probabilities[2]);
+
+ return number_probabilities;
}
std::vector<Amg::Vector2D> NnClusterizationFactory::estimatePositions(const InDet::PixelCluster& pCluster,
@@ -399,8 +440,7 @@ namespace InDet {
if (m_useTTrainedNetworks) {
SG::ReadCondHandle<TTrainedNetworkCollection> nn_collection( m_readKeyWithoutTrack );
if (!nn_collection.isValid()) {
- std::stringstream msg; msg << "Failed to get trained network collection with key " << m_readKeyWithoutTrack.key();
- throw std::runtime_error( msg.str() );
+ ATH_MSG_ERROR( "Failed to get trained network collection with key " << m_readKeyWithoutTrack.key() );
}
// *(ReadCondHandle<>) returns a pointer rather than a reference ...
return estimatePositionsTTN(**nn_collection, inputData,input,pCluster,sizeX,sizeY,numberSubClusters,errors);
@@ -448,8 +488,7 @@ namespace InDet {
if (m_useTTrainedNetworks) {
SG::ReadCondHandle<TTrainedNetworkCollection> nn_collection( m_readKeyWithTrack );
if (!nn_collection.isValid()) {
- std::stringstream msg; msg << "Failed to get trained network collection with key " << m_readKeyWithTrack.key();
- throw std::runtime_error( msg.str() );
+ ATH_MSG_ERROR( "Failed to get trained network collection with key " << m_readKeyWithTrack.key() );
}
return estimatePositionsTTN(**nn_collection, inputData,input,pCluster,sizeX,sizeY,numberSubClusters,errors);
@@ -463,7 +502,7 @@ namespace InDet {
std::vector<Amg::Vector2D> NnClusterizationFactory::estimatePositionsTTN(
const TTrainedNetworkCollection &nn_collection,
- std::vector<double> inputData,
+ const std::vector<double>& inputData,
const NNinput& input,
const InDet::PixelCluster& pCluster,
int sizeX,
@@ -524,28 +563,28 @@ namespace InDet {
SG::ReadCondHandle<LWTNNCollection> lwtnn_collection(m_readKeyJSON) ;
if (!lwtnn_collection.isValid()) {
- std::stringstream msg; msg << "Failed to get LWTNN network collection with key " << m_readKeyJSON.key();
- throw std::runtime_error( msg.str() );
+ ATH_MSG_ERROR( "Failed to get LWTNN network collection with key " << m_readKeyJSON.key() );
}
// Need to evaluate the correct network once per cluster we're interested in.
// Save the output
std::vector<double> positionValues;
std::vector<Amg::MatrixX> errorMatrices;
+ errorMatrices.reserve(numberSubClusters);
+ positionValues.reserve(numberSubClusters * 2);
for (int cluster = 1; cluster < numberSubClusters+1; cluster++) {
// Check that the network is defined.
// If not, we are outside an IOV and should fail
if (not lwtnn_collection->at(numberSubClusters)) {
- std::stringstream msg; msg << "No lwtnn network configured for this run! If you are outside the valid range for lwtnn-based configuration, plesae run with useNNTTrainedNetworks instead." << m_readKeyJSON.key();
- throw std::runtime_error( msg.str() );
+ ATH_MSG_ERROR( "No lwtnn network configured for this run! If you are outside the valid range for lwtnn-based configuration, plesae run with useNNTTrainedNetworks instead." << m_readKeyJSON.key() );
}
std::string outNodeName = "merge_"+std::to_string(cluster);
std::map<std::string, double> position = lwtnn_collection->at(numberSubClusters)->compute(input, {},outNodeName);
ATH_MSG_DEBUG("Testing for numberSubClusters " << numberSubClusters << " and cluster " << cluster);
- for (auto item : position) {
+ for (const auto& item : position) {
ATH_MSG_DEBUG(item.first << ": " << item.second);
}
positionValues.push_back(position["mean_x"]);
@@ -1050,22 +1089,12 @@ namespace InDet {
return input;
}
- std::vector<std::vector<float> > matrixOfToT;
- std::vector<float> vectorOfPitchesY;
-
+ input.matrixOfToT.reserve(sizeX);
for (int a=0;a<sizeX;a++)
{
- std::vector<float> Yvector;
- for (int b=0;b<sizeY;b++)
- {
- Yvector.push_back(0);
- }
- input.matrixOfToT.push_back(Yvector);
- }
- for (int b=0;b<sizeY;b++)
- {
- input.vectorOfPitchesY.push_back(0.4);
+ input.matrixOfToT.emplace_back(sizeY, 0.0);
}
+ input.vectorOfPitchesY.assign(sizeY, 0.4);
rdosBegin = rdos.begin();
//charge = chList.size() ? chList.begin() : chListRecreated.begin();
@@ -1162,9 +1191,9 @@ namespace InDet {
Amg::Vector3D globalPos = element->globalPosition(centroid);
Amg::Vector3D my_track = globalPos-beamSpotPosition;
- Amg::Vector3D my_normal = element->normal();
- Amg::Vector3D my_phiax = element->phiAxis();
- Amg::Vector3D my_etaax = element->etaAxis();
+ const Amg::Vector3D &my_normal = element->normal();
+ const Amg::Vector3D &my_phiax = element->phiAxis();
+ const Amg::Vector3D &my_etaax = element->etaAxis();
float trkphicomp = my_track.dot(my_phiax);
float trketacomp = my_track.dot(my_etaax);
float trknormcomp = my_track.dot(my_normal);
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelClusteringToolBase.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelClusteringToolBase.cxx
index 557000877301a6d82ea1d2fdb29231a3fe309e22..3a1462a88e672d43365bbfaac3346cc4b3b3685d 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelClusteringToolBase.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelClusteringToolBase.cxx
@@ -39,7 +39,7 @@ namespace InDet
StatusCode sc = m_summaryTool.retrieve();
if (sc.isFailure() || !m_summaryTool) {
ATH_MSG_WARNING(m_summaryTool.type() << " not found! ");
- if ( m_usePixelMap || m_useModuleMap ) {
+ if (m_useModuleMap ) {
ATH_MSG_FATAL(m_summaryTool.type() << " is compulsory with this tool configuration");
return StatusCode::FAILURE;
}
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx
index 4325c10991557b6de2e2fa3a8571b1fdc3a4e762..11c0b32e78b0311e77e4a59d0f6766861552856e 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TotPixelClusterSplitter.cxx
@@ -196,7 +196,7 @@ std::vector<InDet::PixelClusterParts> InDet::TotPixelClusterSplitter::splitClust
std::vector<int> Totgroups[2];
std::vector<int> Lvl1groups[2];
- const std::vector<int> OrigTots = OrigCluster.totList();
+ const std::vector<int>& OrigTots = OrigCluster.totList();
const int Lvl1a = OrigCluster.LVL1A();
const AtlasDetectorID* aid = Element->getIdHelper();
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx
index 95126f93a58867fb12f74290bb99f6e6a38763aa..2587b31385b0f8a0d4377d33a96907b2dc884696 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx
@@ -84,7 +84,7 @@ namespace InDet {
// get the SimData and count the individual contributions
auto simData = (simDataIter->second);
//auto simDataDeposits = simData.getdeposits();
- for( auto deposit : simData.getdeposits() ){
+ for( const auto& deposit : simData.getdeposits() ){
//If deposit exists
if (deposit.first){
//Now iterate over all barcodes
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementLink_xk.h b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementLink_xk.h
index 400e3a9617ddfe9ba1f0a3ee541d8208aaa28092..379a7d3b06f1d7e9d26208868162f4898cbf91d0 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementLink_xk.h
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementLink_xk.h
@@ -40,20 +40,25 @@ namespace InDet{
bool m_used;
};
- class ElementWay : public std::pair<const InDet::SiDetElementLink_xk*, float> {
+ class ElementWay {
public:
- ElementWay(const InDet::SiDetElementLink_xk*link, float way)
- : std::pair<const InDet::SiDetElementLink_xk*, float>(link,way) {}
-
- const InDet::SiDetElementLink_xk* link() const { return this->first; }
- float way() const { return this->second; }
+ ElementWay(const InDet::SiDetElementLink_xk*link, float way, float distance)
+ : m_link(link), m_way(way), m_distance(distance) {}
+
+ const InDet::SiDetElementLink_xk* link() const { return m_link; }
+ float way() const { return m_way; }
+ float distance() const { return m_distance; }
+ private:
+ const InDet::SiDetElementLink_xk* m_link;
+ float m_way;
+ float m_distance;
};
SiDetElementLink_xk();
SiDetElementLink_xk(const InDetDD::SiDetectorElement*,const double*);
- SiDetElementLink_xk(const SiDetElementLink_xk&);
- ~SiDetElementLink_xk();
- SiDetElementLink_xk& operator = (const SiDetElementLink_xk&);
+ SiDetElementLink_xk(const SiDetElementLink_xk&) = default;
+ ~SiDetElementLink_xk() = default;
+ SiDetElementLink_xk& operator = (const SiDetElementLink_xk&) = default;
///////////////////////////////////////////////////////////////////
// Main methods
@@ -92,27 +97,6 @@ namespace InDet{
m_phi = 0. ;
}
- inline SiDetElementLink_xk::SiDetElementLink_xk(const SiDetElementLink_xk& L): m_detelement(L.m_detelement)
- {
- *this = L;
- }
-
- inline SiDetElementLink_xk& SiDetElementLink_xk::operator =
- (const SiDetElementLink_xk& L)
- {
- if(&L!=this) {
-
- m_detelement = L.m_detelement;
- m_phi = L.m_phi ;
- for(int i=0; i!=6; ++i) m_geo [i] = L.m_geo [i];
- for(int i=0; i!=2; ++i) m_center[i] = L.m_center[i];
- for(int i=0; i!=4; ++i) {
- for(int j=0; j!=3; ++j) {m_bound[i][j]=L.m_bound[i][j];}
- }
- }
- return(*this);
- }
-
inline InDet::SiDetElementLink_xk::SiDetElementLink_xk
(const InDetDD::SiDetectorElement* el,const double* P)
@@ -120,7 +104,6 @@ namespace InDet{
m_detelement = el; set(P);
}
- inline SiDetElementLink_xk::~SiDetElementLink_xk() {}
} // end of name space
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsComparison.h b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsComparison.h
index f5d52b8ba0d5deeb536cdcc8816eb2e5de35f464..ac15b175dcee78ea2783b3ba535d073f8c12ae47 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsComparison.h
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsComparison.h
@@ -18,7 +18,7 @@ namespace InDet{
public:
bool operator () (const InDetDD::SiDetectorElement* e1,
- const InDetDD::SiDetectorElement* e2)
+ const InDetDD::SiDetectorElement* e2) const
{
Amg::Vector3D p1 = e1->center();
@@ -39,7 +39,7 @@ namespace InDet{
public:
bool operator () (const InDetDD::SiDetectorElement* e1,
- const InDetDD::SiDetectorElement* e2)
+ const InDetDD::SiDetectorElement* e2) const
{
Amg::Vector3D p1 = e1->center();
@@ -64,7 +64,7 @@ namespace InDet{
public:
bool operator () (const InDetDD::SiDetectorElement* e1,
- const InDetDD::SiDetectorElement* e2)
+ const InDetDD::SiDetectorElement* e2) const
{
Amg::Vector3D p1 = e1->center();
@@ -87,6 +87,18 @@ namespace InDet{
}
};
+ class compDetElementWays{
+ public:
+ bool operator() (const SiDetElementLink_xk::ElementWay& l1, const SiDetElementLink_xk::ElementWay & l2) const{
+ /// in case of equality, use the sorting logic in the layer vectors
+ if (l1.way() == l2.way()){
+ return l1.distance() < l2.distance();
+ }
+ /// otherwise compare by distance
+ else return l1.way() < l2.way();
+ }
+ };
+
///////////////////////////////////////////////////////////////////
// Object function for ordering InDet::SiDetElementLink_xk
// in azimuthal angle order
@@ -97,7 +109,7 @@ namespace InDet{
public:
bool operator () (const InDet::SiDetElementLink_xk& l1,
- const InDet::SiDetElementLink_xk& l2)
+ const InDet::SiDetElementLink_xk& l2) const
{
return (l1.phi() < l2.phi());
}
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsLayer_xk.h b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsLayer_xk.h
index 630b54ccb67b03ac6b558d6c84a9fe3b38ebe555..c6d5e839b0ccc47394a2e82df7e8ed04dd62cdfc 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsLayer_xk.h
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsLayer_xk.h
@@ -39,8 +39,10 @@ namespace InDet{
SiDetElementsLayer_xk(double,double,double,double,double);
SiDetElementsLayer_xk(const SiDetElementsLayer_xk&) = default;
+ SiDetElementsLayer_xk(SiDetElementsLayer_xk&&) = default;
~SiDetElementsLayer_xk() = default;
SiDetElementsLayer_xk& operator = (const SiDetElementsLayer_xk&) = default;
+ SiDetElementsLayer_xk& operator = (SiDetElementsLayer_xk&&) = default;
///////////////////////////////////////////////////////////////////
// Main methods
@@ -57,14 +59,32 @@ namespace InDet{
void set(double,double,double,double,double);
void add(const SiDetElementLink_xk&);
int nElements() const;
+
+
+ ////////////////////////////////////////////////////////////////////
+ /// Get barrel detector elements
+ /// Input parameters: startPoint[0] - X searchDirection[0] - Ax
+ /// startPoint[1] - Y searchDirection[1] - Ay
+ /// startPoint[2] - Z searchDirection[2] - Az
+ /// startPoint[3] - R
+ /// startPoint[4] - width
+ /// startPoint[5] - step
+ /// Will populate 'lDE' and update 'used' with the detector elements
+ /// compatible with a crossing by a straight trajectory starting
+ /// at 'startPoint' and moving in direction 'searchDirection'.
+ /// The two additional elements of startPoint are the
+ /// road width used as tolerance in the crossing test (in mm)
+ /// and the step (distance to travel to the module).
+ ////////////////////////////////////////////////////////////////////
void getBarrelDetElements
- (float*,
- float*,
+ (const std::array<float,6> & startingPoint,
+ const std::array<float,3> & searchDirection,
std::vector<InDet::SiDetElementLink_xk::ElementWay> &lDE,
std::vector<InDet::SiDetElementLink_xk::UsedFlag> &used) const;
+
void getEndcapDetElements
- (float*,
- float*,
+ (const std::array<float,6> & startingPoint,
+ const std::array<float,3> & searchDirection,
std::vector<InDet::SiDetElementLink_xk::ElementWay> &lDE,
std::vector<InDet::SiDetElementLink_xk::UsedFlag> &used) const;
@@ -83,13 +103,15 @@ namespace InDet{
float m_dfe ; // max azimuthal width of de
std::vector<SiDetElementLink_xk> m_elements; // detector elements
- ///////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////
- void getDetElements(float*,
- float*,
- float,
- float,
+ /// internal helper which resolves the phi-multiplicity of elements
+ /// within a layer. Same logic as above. Extra args:
+ /// 'phiCrossing' is the phi coordinate of the layer crossing
+ /// and 'reducedRoadWidth' is a phi tolerance obtained by
+ /// dividing the search road width by the radius of the layer
+ void getDetElements(const std::array<float,6> & startingPoint,
+ const std::array<float,3> & searchDirection,
+ float phiCrossing,
+ float reducedRoadWidth,
std::vector<InDet::SiDetElementLink_xk::ElementWay> &lDE,
std::vector<InDet::SiDetElementLink_xk::UsedFlag> &used) const;
};
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h
index db202a814f5079e939cd52eb6f6fa9373f164024..fff1588f5b08231d5c6567d30e4caf40c218bfdb 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h
@@ -43,10 +43,14 @@ class MsgStream;
namespace InDet{
/**
@class SiDetElementsRoadMaker_xk
- InDet::SiDetElementsRoadMaker_xk is algorithm which produce list of
- InDetDD::SiDetectorElement* sorted in propagation order according
- global positions of the trajectory between perigee point and max radius
- for direction along momentum.
+ InDet::SiDetElementsRoadMaker_xk is a tool which produces a list of
+ InDetDD::SiDetectorElement* sorted in propagation order expected to be crossed
+ by a trajectory.
+ The elements are found by locally linearising the trajectory between
+ pairs of space points obtained by propagating the track parameters between
+ the perigee point and max radius for direction along momentum, and
+ testing the intersection of each local trajectory element with the layers
+ /// of the detector.
@author Igor.Gavrilenko@cern.ch
*/
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementLink_xk.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementLink_xk.cxx
index c5904a5dbcd0a77b6af99335c6dae25e1fe29511..26bff64385682252c5f9d00e698108ffef5010e8 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementLink_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementLink_xk.cxx
@@ -60,7 +60,6 @@ void InDet::SiDetElementLink_xk::intersect
(const float* r ,const float* a,float* O) const
{
const float* g = &m_geo[0];
-
float s[3] = {g[3]*g[4],g[2]*g[4],g[5]} ;
float S = a[0]*s[0]+a[1]*s[1]+a[2]*s[2] ;
if(S!=0.) S = (g[0]-(r[0]*s[0]+r[1]*s[1]+r[2]*s[2]))/S ;
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsLayer_xk.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsLayer_xk.cxx
index 6636827221c4c0d59382ec3836a3ab6ee20116d5..e5e9b5505d243f9535bdbf277230abdfcb41a295 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsLayer_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsLayer_xk.cxx
@@ -12,125 +12,207 @@
// Version 1.0 21/04/2004 I.Gavrilenko
///////////////////////////////////////////////////////////////////
+#include <cmath>
+
#include "SiDetElementsRoadTool_xk/SiDetElementsComparison.h"
#include "SiDetElementsRoadTool_xk/SiDetElementsLayer_xk.h"
///////////////////////////////////////////////////////////////////
// Get barrel detector elements
-// Input parameters: P[0] - X A[0] - Ax
-// P[1] - Y A[1] - Ay
-// P[2] - Z A[2] - Az
-// P[3] - R
-// P[4] - width
-// P[5] - step
+// Input parameters: startPoint[0] - X searchDirection[0] - Ax
+// startPoint[1] - Y searchDirection[1] - Ay
+// startPoint[2] - Z searchDirection[2] - Az
+// startPoint[3] - R
+// startPoint[4] - width
+// startPoint[5] - step
///////////////////////////////////////////////////////////////////
void InDet::SiDetElementsLayer_xk::getBarrelDetElements
-(float* P ,float* A,
+(const std::array<float,6> & startingPoint,
+ const std::array<float,3> & searchDirection,
std::vector<InDet::SiDetElementLink_xk::ElementWay> &lDE,
std::vector<InDet::SiDetElementLink_xk::UsedFlag> &used) const
{
- float a = (A[0]*P[0]+A[1]*P[1])*2.;
- float d = (m_r-P[0]-P[1])*(m_r+P[0]+P[1])+2.*P[0]*P[1];
- float b = 2.*(A[0]*A[0]+A[1]*A[1]); if(b == 0.) return;
- float sq = a*a+2.*d*b; sq>0. ? sq=sqrt(sq) : sq=0.;
- float s1 =-(a+sq)/b;
- float s2 =-(a-sq)/b;
+
+ /// In the following, identify where we cross the layer in r
+ /// by solving the quadratic equation
+ /// ( startingPoint_xy + s * searchDirection_xy )² = r_layer²
+ float minusB =2*( searchDirection[0]*startingPoint[0]
+ +searchDirection[1]*startingPoint[1]);
+ float C = (m_r-startingPoint[0]-startingPoint[1])
+ *(m_r+startingPoint[0]+startingPoint[1])
+ +2.*startingPoint[0]*startingPoint[1];
+ float twoA = 2.*( searchDirection[0]*searchDirection[0]
+ +searchDirection[1]*searchDirection[1]);
+ if(twoA == 0.) return;
+ float sq = minusB*minusB+2.*C*twoA;
+ if (sq > 0){
+ sq=std::sqrt(sq);
+ }
+ else {
+ sq=0.;
+ }
+ /// solutions of our equation
+ float s1 =-(minusB+sq)/twoA;
+ float s2 =-(minusB-sq)/twoA;
float s;
- if((s1*s2) > 0.) {fabs(s1) < fabs(s2) ? s = s1 : s = s2;}
- else { s1 > 0. ? s = s1 : s = s2;}
- float zc = P[2]+A[2]*s;
- float At = sqrt(1.-A[2]*A[2]);
- if(At != 0. && fabs(zc-m_z) > (m_dz+(m_dr*fabs(A[2])+P[4])/At)) return;
- float fc = atan2(P[1]+A[1]*s,P[0]+A[0]*s);
- float dw = P[4]/m_r;
- getDetElements(P,A,fc,dw,lDE,used);
+ /// pick one:
+ /// if both solution occur for the same direction,
+ /// we pick the crossing that occurs first
+ if((s1*s2) > 0.) {
+ s = (std::abs(s1) < std::abs(s2) ? s1 : s2);
+ }
+ /// otherwise, pick the one in the positive direction
+ else{
+ s = (s1 > 0. ? s1 : s2);
+ }
+ /// Z-coordinate of the layer crossing
+ float zc = startingPoint[2]+searchDirection[2]*s;
+ /// radial component of the search direction
+ float At = std::sqrt(1.-searchDirection[2]*searchDirection[2]);
+
+ /// Check if we miss the layer completely:
+ /// If the distance of our crossing point to the layer centre along z exceeds the half width
+ /// in z of the layer by more than a tolerance obtained as
+ /// the z movement expected when traversing along the layer radial half-width (dr_half / tan(theta_searchDirection))
+ /// plus the road width divided by sin(theta)
+ if(At != 0. && std::abs(zc-m_z) > (m_dz+(m_dr*std::abs(searchDirection[2])+startingPoint[4])/At)) return;
+ /// Phi coordinate of the crossing
+ float phiCrossing = std::atan2(startingPoint[1]+searchDirection[1]*s,startingPoint[0]+searchDirection[0]*s);
+ /// road width divided by the radius of the layer
+ float reducedRoadWidth = startingPoint[4]/m_r;
+ getDetElements(startingPoint,searchDirection,phiCrossing,reducedRoadWidth,lDE,used);
+
}
///////////////////////////////////////////////////////////////////
// Get endcap detector elements
-// Input parameters: P[0] - X A[0] - Ax
-// P[1] - Y A[1] - Ay
-// P[2] - Z A[2] - Az
-// P[3] - R
-// P[4] - width
-// P[5] - step
+// Input parameters: startingPoint[0] - X searchDirection[0] - Ax
+// startingPoint[1] - Y searchDirection[1] - Ay
+// startingPoint[2] - Z searchDirection[2] - Az
+// startingPoint[3] - R
+// startingPoint[4] - width
+// startingPoint[5] - step
///////////////////////////////////////////////////////////////////
void InDet::SiDetElementsLayer_xk::getEndcapDetElements
-(float* P ,
- float* A,
+(const std::array<float,6> & startingPoint,
+ const std::array<float,3> & searchDirection,
std::vector<InDet::SiDetElementLink_xk::ElementWay> &lDE,
std::vector<InDet::SiDetElementLink_xk::UsedFlag> &used) const
{
- float s =(m_z-P[2])/A[2];
- float xc = P[0]+A[0]*s;
- float yc = P[1]+A[1]*s;
- float rc = sqrt(xc*xc+yc*yc);
- float A23 = A[2]*P[3];
- if(A23 != 0. && fabs(rc-m_r) > m_dr+fabs(2.*(P[0]*A[0]+P[1]*A[1])*m_dz/A23)+P[4]) return;
- float fc = atan2(yc,xc);
- float dw = P[4]/rc;
- getDetElements(P,A,fc,dw,lDE,used);
+ /// solve the linear equation
+ /// z_layer = z_startingPont + s * z_searchDirection
+ float s =(m_z-startingPoint[2])/searchDirection[2];
+ /// obtain x,y,r coordinates of the layer crossing in z
+ float xc = startingPoint[0]+searchDirection[0]*s;
+ float yc = startingPoint[1]+searchDirection[1]*s;
+ float rc = std::sqrt(xc*xc+yc*yc);
+ /// search direction z (== cos(theta_search)) * radius of starting point
+ float A23 = searchDirection[2]*startingPoint[3];
+ /// Kick out cases where we do not expect to cross the layer at all.
+ /// Do this by checking if the distance of the radial location of the z-crossing
+ /// from the layer centre in r exceeds the r-half-width by more than
+ /// the r-movement expected when traversing the half-width in z + the search road width
+ if(A23 != 0. && std::abs(rc-m_r) > m_dr+std::abs(2.*(startingPoint[0]*searchDirection[0]+startingPoint[1]*searchDirection[1])*m_dz/A23)+startingPoint[4]) return;
+ float phiCrossing = std::atan2(yc,xc);
+ float reducedRoadWidth = startingPoint[4]/rc;
+ getDetElements(startingPoint,searchDirection,phiCrossing,reducedRoadWidth,lDE,used);
+
}
///////////////////////////////////////////////////////////////////
// Get detector elements
-// Input parameters: P[0] - X A[0] - Ax
-// P[1] - Y A[1] - Ay
-// P[2] - Z A[2] - Az
-// P[3] - R
-// P[4] - width
-// P[5] - step
+// Input parameters: startingPoint[0] - X searchDirection[0] - Ax
+// startingPoint[1] - Y searchDirection[1] - Ay
+// startingPoint[2] - Z searchDirection[2] - Az
+// startingPoint[3] - R
+// startingPoint[4] - width
+// startingPoint[5] - step
///////////////////////////////////////////////////////////////////
void InDet::SiDetElementsLayer_xk::getDetElements
-(float* P,
- float* A,
- float Fc,
- float dW,
+(const std::array<float,6> & startingPoint,
+ const std::array<float,3> & searchDirection,
+ float phiCrossing,
+ float reducedRoadWidth,
std::vector<InDet::SiDetElementLink_xk::ElementWay> &lDE,
std::vector<InDet::SiDetElementLink_xk::UsedFlag> &used) const
{
- const float pi = M_PI, pi2 = 2.*pi;
- int im = int(m_elements.size())-1; if(im<0) return;
- int i0 = 0, i1 = im;
-
- if (Fc> m_elements[i0].phi() && Fc< m_elements[i1].phi()) {
- while((i1-i0)>1) {int i = ((i0+i1)>>1); m_elements[i].phi() > Fc ? i1=i : i0=i;}
+ constexpr float pi = M_PI;
+ constexpr float pi2 = 2.*pi;
+ int im = int(m_elements.size())-1;
+ if(im<0) return;
+ int i0 = 0;
+ int i1 = im;
+
+ /// iteratively search for the index of the crossing by splitting the remaining search region in half
+ if (phiCrossing> m_elements[i0].phi() && phiCrossing< m_elements[i1].phi()) {
+ while((i1-i0)>1) {
+ int i = (i0+i1)/2;
+ if (m_elements[i].phi() > phiCrossing){
+ i1=i;
+ }
+ else{
+ i0=i;
+ }
+ }
i0 = i1;
}
- float O[3];
+ //
+ std::array<float,3> intersectionOutcome;
int i = i0;
+ /// first, rotate in the positive phi direction
while(1) {
-
assert( static_cast<unsigned int>(i)<m_elements.size() );
+ /// if detector element i on this layer is not already used for this road
if(!used[i].used()) {
-
- float dF =fabs(m_elements[i].phi()-Fc); if(dF>pi) dF=fabs(dF-pi2);
- if((dF-dW)>m_dfe) break;
- m_elements[i].intersect(P,A,O);
-
- if((O[0]-P[4])<=0 && (O[1]-P[4])<=0.) {
- lDE.push_back(InDet::SiDetElementLink_xk::ElementWay(&m_elements[i],P[5]+O[2])); used[i].setUsed();
+ ///
+ float dPhi =std::abs(m_elements[i].phi()-phiCrossing);
+ if(dPhi>pi) dPhi=std::abs(dPhi-pi2); /// project delta phi into -pi..pi
+
+ /// dPhi must be compatible with the phi half-width within a tolerance
+ /// specified by the road width divided by the radius
+ if((dPhi-reducedRoadWidth)>m_dfe) break;
+
+ /// intersect our projection with the detector element.
+ /// Output: intersectionOutcome[0] - close distance in azimuthal direction
+ /// intersectionOutcome[1] - close distance in r or z direction
+ /// intersectionOutcome[2] - step to detector element
+ m_elements[i].intersect(&(startingPoint[0]),&(searchDirection[0]),&(intersectionOutcome[0]));
+
+ /// closest distance in both directions has to be compatible within the road width
+ if ( intersectionOutcome[0]<=startingPoint[4]
+ && (intersectionOutcome[1]<=startingPoint[4])
+ ) {
+ /// we found a compatible detector element - add to our list
+ lDE.push_back(InDet::SiDetElementLink_xk::ElementWay(&m_elements[i],startingPoint[5]+intersectionOutcome[2],std::max(intersectionOutcome[0],intersectionOutcome[1])));
+ used[i].setUsed();
}
}
- ++i; if(i>im) i=0; if(i==i0) return;
+ ++i;
+ if(i>im) i=0; /// loop around if we have to
+ if(i==i0) return; /// stop when we have tried all detector elements
}
+ /// we get here by triggering the 'break' clause in the positive-direction loop above
i1 = i; i = i0;
while(1) {
-
- --i; if(i<0) i=im; if(i==i1) return;
-
+ /// now rotate in the negative phi direction
+ --i;
+ /// loop around at zero
+ if(i<0) i=im;
+ /// stop at full circle
+ if(i==i1) return;
assert( static_cast<unsigned int>(i)<m_elements.size() );
if(!used[i].used()) {
-
- float dF =fabs(m_elements[i].phi()-Fc); if(dF>pi) dF=fabs(dF-pi2);
- if((dF-dW)>m_dfe) return;
- m_elements[i].intersect(P,A,O);
-
- if((O[0]-P[4])<=0 && (O[1]-P[4])<=0.) {
- lDE.push_back(InDet::SiDetElementLink_xk::ElementWay(&m_elements[i],P[5]+O[2])); used[i].setUsed();
+ float dPhi =std::abs(m_elements[i].phi()-phiCrossing);
+ if(dPhi>pi) dPhi=std::abs(dPhi-pi2);
+ if((dPhi-reducedRoadWidth)>m_dfe) return;
+ m_elements[i].intersect(&(startingPoint[0]),&(searchDirection[0]),&(intersectionOutcome[0]));
+
+ if((intersectionOutcome[0]-startingPoint[4])<=0 && (intersectionOutcome[1]-startingPoint[4])<=0.) {
+ lDE.push_back(InDet::SiDetElementLink_xk::ElementWay(&m_elements[i],startingPoint[5]+intersectionOutcome[2],std::max(intersectionOutcome[0],intersectionOutcome[1])));
+ used[i].setUsed();
}
}
}
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
index 570c835f62711c807dfb1356e70744a7dc0c4a2f..899bea403176e626d65ae3d9b9db536858b44dae 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
@@ -41,6 +41,16 @@ InDet::SiDetElementsRoadMaker_xk::SiDetElementsRoadMaker_xk
StatusCode InDet::SiDetElementsRoadMaker_xk::initialize()
{
+ //Class optimization checks
+ static_assert(std::is_trivially_copyable<SiDetElementLink_xk::UsedFlag>::value);
+ static_assert(std::is_trivially_destructible<SiDetElementLink_xk::UsedFlag>::value);
+ static_assert(std::is_trivially_copyable<SiDetElementLink_xk::ElementWay>::value);
+ static_assert(std::is_trivially_destructible<SiDetElementLink_xk::ElementWay>::value);
+ static_assert(std::is_trivially_copyable<SiDetElementLink_xk>::value);
+ static_assert(std::is_trivially_destructible<SiDetElementLink_xk>::value);
+ static_assert(std::is_nothrow_move_constructible<SiDetElementsLayer_xk>::value);
+
+
if (!m_usePIX && !m_useSCT) {
ATH_MSG_FATAL("Please don't call this tool if usePixel and useSCT are false");
return StatusCode::FAILURE;
@@ -293,157 +303,203 @@ std::ostream& InDet::operator <<
void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
(std::list<Amg::Vector3D>& GP,
std::list<const InDetDD::SiDetectorElement*>& Road,
- bool test) const
+ bool testDirection) const
{
if (!m_usePIX && !m_useSCT) return;
+ /// this is a vector of vectors of detector elements
+ /// prepared by the SiDetElementsRoadCondAlg.
+ /// The outer vector has 3 elements:
+ /// 0 --> left endcap
+ /// 1 --> barrel
+ /// 2 --> right endcap
+ /// Each of the inner vectors is internally sorted.
+ /// For the endcaps, sorting is first in z, then for same Z in r, then
+ /// for same r in phi.
+ /// For the barrel, we first sort in R, then for same R in phi, then for same
+ /// phi in Z.
const SiDetElementsLayerVectors_xk &layer = *getLayers();
- std::list<Amg::Vector3D>::iterator g=GP.begin(), ge=GP.end();
- float Po[6] = {static_cast<float>((*g).x()), static_cast<float>((*g).y()), static_cast<float>((*g).z()),
- static_cast<float>(sqrt((*g).x()*(*g).x()+(*g).y()*(*g).y())), m_width, 0.};
+ /// iterators over the positions to consider
+ std::list<Amg::Vector3D>::iterator currentPosition=GP.begin(), endPositions=GP.end();
+
+ /// fill an array with the reference point (start with the first one), the road width and a placeholder
+ /// for the step length
+ std::array<float,6> par_startingPoint{static_cast<float>((*currentPosition).x()), // x of first position
+ static_cast<float>((*currentPosition).y()), // y of first position
+ static_cast<float>((*currentPosition).z()), // Z of first position
+ static_cast<float>(sqrt((*currentPosition).x()*(*currentPosition).x()+(*currentPosition).y()*(*currentPosition).y())), // r of first position
+ m_width, // road width
+ 0.};
+
+ /// check the left endcap layers
+ /// increment n0 until we are at the layer closest to
+ /// the first position from the left side
int n0 = 0;
for (; n0!=static_cast<int>(layer[0].size()); ++n0) {
- if (Po[2] > layer[0].at(n0).z()) break;
+ if (par_startingPoint[2] > layer[0].at(n0).z()) break;
}
+
+ /// check the barrel layers
+ /// increment n1 until we are at the layer closest to
+ /// the first position in the radial direction
int n1 = 0;
for (; n1!=static_cast<int>(layer[1].size()); ++n1) {
- if (Po[3] < layer[1].at(n1).r()) break;
+ if (par_startingPoint[3] < layer[1].at(n1).r()) break;
}
+ /// and finally, the left endcap.
+ /// this time, look for the layer closest on the right side.
int n2 = 0;
for (; n2!=static_cast<int>(layer[2].size()); ++n2) {
- if (Po[2] < layer[2].at(n2).z()) break;
+ if (par_startingPoint[2] < layer[2].at(n2).z()) break;
}
+
std::vector<InDet::SiDetElementLink_xk::ElementWay> lDE;
+ /// book an impressively nested structure to keep track of which detector elements we use
std::array<std::vector<std::vector<InDet::SiDetElementLink_xk::UsedFlag> >,3> used;
+
+ /// module_i: iterate over the detector side
for ( unsigned int module_i=0; module_i<3; ++module_i) {
- used[module_i].resize( layer[module_i].size() );
+ used[module_i].resize( layer[module_i].size() ); /// for each side, book the number of layers we expect to see
for (unsigned int layer_i=0; layer_i < layer[module_i].size(); ++layer_i) {
+ /// for each layer, book one slot for each detector element on the layer
used[module_i][layer_i].resize( layer[module_i][layer_i].nElements() );
}
}
- ++g;
- while (g!=ge) {
- float Pn[4] = {static_cast<float>((*g).x()), static_cast<float>((*g).y()), static_cast<float>((*g).z()),
- static_cast<float>(sqrt((*g).x()*(*g).x()+(*g).y()*(*g).y()))};
-
- float dx = Pn[0]-Po[0];
- float dy = Pn[1]-Po[1];
- float dz = Pn[2]-Po[2];
- float st = sqrt(dx*dx+dy*dy+dz*dz);
- if (st <=0.) {
- ++g;
+ /// done with the first probed position. Now we can start to move along the trajectory
+ ++currentPosition;
+ while (currentPosition!=endPositions) {
+ /// store the point we are aiming towards
+ std::array<float,4> par_targetPoint{static_cast<float>((*currentPosition).x()), /// x of the current position
+ static_cast<float>((*currentPosition).y()), /// y of the current position
+ static_cast<float>((*currentPosition).z()), /// z of the current position
+ static_cast<float>(sqrt((*currentPosition).x()*(*currentPosition).x()+(*currentPosition).y()*(*currentPosition).y())) /// r of the current position
+ };
+
+ /// perform linearisation
+ float dx = par_targetPoint[0]-par_startingPoint[0]; /// dx between the current and the first position
+ float dy = par_targetPoint[1]-par_startingPoint[1]; /// dy between the current and the first position
+ float dz = par_targetPoint[2]-par_startingPoint[2]; /// dz between the current and the first position
+ float dist3D = sqrt(dx*dx+dy*dy+dz*dz); /// 3D distance between the current and the first position
+ if (dist3D <=0.) { /// if geometry breaks down or two points are duplicates,
+ ++currentPosition; /// we whistle innocently and make a point of looking somewhere else
continue;
}
- float ds = 1./st;
- float A[3]= {dx*ds, dy*ds, dz*ds};
-
- // Min. radius test between this two points
- //
- float at = A[0]*A[0]+A[1]*A[1];
- float dr = 0. ;
- if (at!=0.) {
- float sm = -(A[0]*Po[0]+A[1]*Po[1])/at;
- if (sm > 1. && sm < st) {
- Pn[0] = Po[0]+A[0]*sm;
- Pn[1] = Po[1]+A[1]*sm;
- Pn[2] = Po[2]+A[2]*sm;
- Pn[3] = sqrt(Pn[0]*Pn[0]+Pn[1]*Pn[1]);
- dr = 20.;
+ float inverseDistance = 1./dist3D; /// inverse distance to the first position
+ /// now we can book the linearised search direction
+ std::array<float,3> searchDirection{dx*inverseDistance, dy*inverseDistance, dz*inverseDistance};
+
+ /// Having found the search direction, we are ready to look for detector elements and iterate.
+ /// Before doing so, we add an additional test to ensure we probe the perigee point
+ /// if we cross it on the way.
+ float unitSepTransverseComp = searchDirection[0]*searchDirection[0]+searchDirection[1]*searchDirection[1]; /// transverse component of the separation vector
+ float dr = 0. ;
+ if (unitSepTransverseComp!=0.) {
+ /// *negative* component of the global location of the previous position into the direction connecting our positions in the x-y plane
+ /// corresponds to the path length opposite to the linearised direction to reach the perigee
+ float sm = -( searchDirection[0]*par_startingPoint[0] +
+ searchDirection[1]*par_startingPoint[1])
+ /unitSepTransverseComp;
+
+ /// a positive value of SM means the closest approach to the beamline is between the two positions we are considering.
+ /// In this case, we do not want to iterate to the next point, but instead insert an additional step where we use the
+ /// perigee point as our reference. We do this by setting the target point to the perigee, which will be made the
+ /// reference point when repeating the loop.
+ /// Since the perigee is estimated using the linearised direction, this direction stays valid and does not need to be updated.
+ if (sm > 1. && sm < dist3D) { /// only add the perigee point if the next point is beyond the perigee, and if we are not too close anyway
+ par_targetPoint[0] = par_startingPoint[0]+searchDirection[0]*sm;
+ par_targetPoint[1] = par_startingPoint[1]+searchDirection[1]*sm;
+ par_targetPoint[2] = par_startingPoint[2]+searchDirection[2]*sm;
+ par_targetPoint[3] = sqrt(par_targetPoint[0]*par_targetPoint[0]+par_targetPoint[1]*par_targetPoint[1]);
+ /// now, the target point is the perigee estimate, while
+ /// the reference point for this round stays unchanged.
+ dr = 20.; /// allow 2cm on top of the perigee location when extrapolating inward.
} else {
- ++g;
+ ++currentPosition;
}
} else {
- ++g;
+ ++currentPosition;
}
- // Barrel
- //
- if (Pn[3]>Po[3]) {
+ /// Start collecting detector elements traversed by our linearised path.
+
+ /// First, barrel elements
+
+ /// if we are moving outwards in r:
+ if (par_targetPoint[3]>par_startingPoint[3]) {
+ /// loop over all barrel layers (starting with the closest one previously identified)
for (; n1<static_cast<int>(layer[1].size()); ++n1) {
- if (Pn[3] < layer[1].at(n1).r()) break;
+ /// stop if we moved past the targer point in R
+ if (par_targetPoint[3] < layer[1].at(n1).r()) break;
assert( used.at(1).size() > static_cast<unsigned int>(n1) );
- layer[1].at(n1).getBarrelDetElements(Po, A, lDE, used[1][n1]);
+ /// collect all compatible detector elements from the current layer
+ layer[1].at(n1).getBarrelDetElements(par_startingPoint, searchDirection, lDE, used[1][n1]);
}
+ /// if we are moving inward in R, iterate the other way for the barrel
} else {
for (--n1; n1>=0; --n1) {
- if (Pn[3] > layer[1].at(n1).r()+dr) break;
+ /// stop if we moved past the test point in R
+ if (par_targetPoint[3] > layer[1].at(n1).r()+dr) break;
assert( used.at(1).size() > static_cast<unsigned int>(n1) );
- layer[1].at(n1).getBarrelDetElements(Po, A, lDE, used[1][n1]);
+ /// collect all compatible detector elements
+ layer[1].at(n1).getBarrelDetElements(par_startingPoint, searchDirection, lDE, used[1][n1]);
}
++n1;
}
- // Positive endcap
- //
- if (Pn[2]>Po[2]) {
+ /// Positive endcap
+ /// again check if we are moving forward or back in z
+ if (par_targetPoint[2]>par_startingPoint[2]) {
for (; n2<static_cast<int>(layer[2].size()); ++n2) {
- if (Pn[2] < layer[2].at(n2).z()) break;
+ if (par_targetPoint[2] < layer[2].at(n2).z()) break;
assert( used.at(2).size() > static_cast<unsigned int>(n2) );
- layer[2].at(n2).getEndcapDetElements(Po, A, lDE,used[2][n2]);
+ /// collect all compatible detector elements
+ layer[2].at(n2).getEndcapDetElements(par_startingPoint, searchDirection, lDE,used[2][n2]);
}
} else {
for (--n2; n2>=0; --n2) {
- if (Pn[2] > layer[2].at(n2).z()) break;
+ if (par_targetPoint[2] > layer[2].at(n2).z()) break;
assert( used.at(2).size() > static_cast<unsigned int>(n2) );
- layer[2].at(n2).getEndcapDetElements(Po, A, lDE, used[2][n2]);
+ /// collect all compatible detector elements
+ layer[2].at(n2).getEndcapDetElements(par_startingPoint, searchDirection, lDE, used[2][n2]);
}
++n2;
}
- // Negative endcap
- //
- if (Pn[2]<Po[2]) {
+ /// Negative endcap
+ /// same game as above
+ if (par_targetPoint[2]<par_startingPoint[2]) {
for (; n0<static_cast<int>(layer[0].size()); ++n0) {
- if (Pn[2] > layer[0].at(n0).z()) break;
+ if (par_targetPoint[2] > layer[0].at(n0).z()) break;
assert( used.at(0).size() > static_cast<unsigned int>(n0) );
- layer[0].at(n0).getEndcapDetElements(Po, A, lDE,used[0][n0]);
+ /// collect all compatible detector elements
+ layer[0].at(n0).getEndcapDetElements(par_startingPoint, searchDirection, lDE,used[0][n0]);
}
} else {
for (--n0; n0>=0; --n0) {
- if (Pn[2] < layer[0].at(n0).z()) break;
+ if (par_targetPoint[2] < layer[0].at(n0).z()) break;
assert( used.at(0).size() > static_cast<unsigned int>(n0) );
- layer[0].at(n0).getEndcapDetElements(Po, A, lDE,used[0][n0]);
+ /// collect all compatible detector elements
+ layer[0].at(n0).getEndcapDetElements(par_startingPoint, searchDirection, lDE,used[0][n0]);
}
++n0;
}
-
- Po[0] = Pn[0];
- Po[1] = Pn[1];
- Po[2] = Pn[2];
- Po[3] = Pn[3];
- Po[5]+= st;
- }
-
- // Sort list in propogation order
- //
- std::vector<InDet::SiDetElementLink_xk::ElementWay>::iterator l=lDE.begin(), le=lDE.end(), n, m;
- if (l==le) return;
-
- bool nc =true;
- while (nc) {
- nc =false; m=l; n=l;
- for (++n; n!=le; ++n) {
- if (m->way() > n->way()) {
- InDet::SiDetElementLink_xk::ElementWay d=(*m);
- (*m)=(*n);
- (*n)=d;
- nc=true;
- }
- ++m;
- }
+ /// update the starting point to be the current target point
+ par_startingPoint[0] = par_targetPoint[0];
+ par_startingPoint[1] = par_targetPoint[1];
+ par_startingPoint[2] = par_targetPoint[2];
+ par_startingPoint[3] = par_targetPoint[3];
+ /// and increment the total propagation distance
+ par_startingPoint[5]+= dist3D;
}
-
+ auto vec2 = lDE;
+ std::sort(lDE.begin(),lDE.end(),InDet::compDetElementWays());
// Fill list pointers to detector elements
- //
- for (l=lDE.begin(); l!=le; ++l) {
- if (test) {
- if (l->way() >= 0.) Road.push_back(l->link()->detElement());
- } else {
- Road.push_back(l->link()->detElement());
- }
+ for (auto & d : lDE){
+ if (testDirection && d.way() < 0) continue;
+ Road.push_back(d.link()->detElement());
}
}
@@ -459,15 +515,18 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
std::list<const InDetDD::SiDetectorElement*>& R) const
{
if (!m_usePIX && !m_useSCT) return;
-
+ /// 500 MeV / pT
double qp = fabs(500.*Tp.parameters()[4]);
+ /// truncate at huge pt
if (qp < 1.e-10) qp = 1.e-10;
- double S = m_step/qp ;
+ /// step size - scaled by pt / 500 MeV
+ double S = m_step/qp;
+ /// upper limit to step size: 1000 ;
if (S > 1000. ) S = 1000. ;
- bool test = true;
+ bool testDirection = true;
if (D<0) {
- test = false;
+ testDirection = false;
S=-S;
}
@@ -478,28 +537,35 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
// Note: could also give fieldCache directly to propagator if it would be more efficient - would
// need to add interface RDS 2020/03
std::list<Amg::Vector3D> G;
+
+ /// get a list of global positions for the road search by starting from the first surface
+ /// and walking along the trajectory using the RK propagator
m_proptool->globalPositions(ctx, G, Tp, fieldprop,getBound(fieldCache, Tp), S, Trk::pion);
+ /// should find at least 2 positions to sample
if (G.size()<2) return;
+ /// if we are extrapolating along them momentum direction,
+ /// we pick out the part ascending in R
if (D > 0) {
- std::list<Amg::Vector3D>::iterator g=G.begin(), gn, ge=G.end();
- float r0 = (*g).x()*(*g).x()+(*g).y()*(*g).y();
+ std::list<Amg::Vector3D>::iterator currentPosition=G.begin(), nextPosition, endPositions=G.end();
+ float r0 = (*currentPosition).x()*(*currentPosition).x()+(*currentPosition).y()*(*currentPosition).y();
- while (g!=ge) {
- gn = g;
- if (++gn == ge) break;
-
- float r = (*gn).x()*(*gn).x()+(*gn).y()*(*gn).y();
+ while (currentPosition!=endPositions) {
+ nextPosition = currentPosition;
+ if (++nextPosition == endPositions) break;
+ float r = (*nextPosition).x()*(*nextPosition).x()+(*nextPosition).y()*(*nextPosition).y();
+ /// if the next point is at lower r than the previous point, remove the previous one
if (r < r0) {
r0 = r;
- G.erase(g++);
+ G.erase(currentPosition++);
} else {
break;
}
}
}
- detElementsRoad(G, R,test);
+ /// now perform the road building using our set of positions
+ detElementsRoad(G, R,testDirection);
}
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/ITRT_ToT_dEdx.h b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/ITRT_ToT_dEdx.h
index 403eabcb4fd17c0b029fd7b5548d434ed9d97185..834e4dd8610e647498f6c7e0e29f303898a9bf48 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/ITRT_ToT_dEdx.h
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/TRT_ElectronPidTools/ITRT_ToT_dEdx.h
@@ -8,6 +8,7 @@
// Gaudi
#include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/EventContext.h"
#include "TrkParameters/TrackParameters.h" // typedef
namespace Trk { class Track ; }
@@ -29,22 +30,35 @@ public:
/**
* @brief function to calculate sum ToT normalised to number of used hits
+ * @param Event context ctx
* @param track pointer to track
* @param useHitsHT decide if HT hits should be used in the estimate
* @return dEdx value
*/
- virtual double dEdx(const Trk::Track* track, bool useHitsHT=true) const = 0;
-
+ virtual double dEdx(const EventContext& ctx,
+ const Trk::Track* track,
+ bool useHitsHT = true) const = 0;
+
+ virtual double dEdx(const Trk::Track* track, bool useHitsHT = true) const ;
+
/**
* @brief function to calculate number of used hits
+ * @param Event context ctx
* @param track pointer
* @param useHitsHT decide if HT hits should be used in the estimate
* @return nHits
*/
- virtual double usedHits(const Trk::Track* track, bool useHitsHT=true) const = 0;
+ virtual double usedHits(const EventContext& ctx,
+ const Trk::Track* track,
+ bool useHitsHT = true) const = 0;
+
+ virtual double usedHits(const Trk::Track* track,
+ bool useHitsHT = true) const;
+
/**
* @brief function to calculate likelihood ratio test
+ * @param Event context ctx
* @param observed dEdx
* @param track parameter
* @param particle hypothesis
@@ -52,7 +66,47 @@ public:
* @param number of used hits
* @return test value between 0 and 1
*/
- virtual double getTest(const double dEdx_obs, const double pTrk, Trk::ParticleHypothesis hypothesis, Trk::ParticleHypothesis antihypothesis, int nUsedHits) const = 0;
+ virtual double getTest(const EventContext& ctx,
+ const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ Trk::ParticleHypothesis antihypothesis,
+ int nUsedHits) const = 0;
+
+ virtual double getTest(const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ Trk::ParticleHypothesis antihypothesis,
+ int nUsedHits) const;
};
+// implement the non ctx aware methods in terms of the ctx
+// aware ones
+inline double
+ITRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
+{
+ return dEdx(Gaudi::Hive::currentContext(), track, useHitsHT);
+}
+
+inline double
+ITRT_ToT_dEdx::usedHits(const Trk::Track* track, bool useHitsHT) const
+{
+ return usedHits(Gaudi::Hive::currentContext(), track, useHitsHT);
+}
+
+inline double
+ITRT_ToT_dEdx::getTest(const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ Trk::ParticleHypothesis antihypothesis,
+ int nUsedHits) const
+{
+ return getTest(Gaudi::Hive::currentContext(),
+ dEdx_obs,
+ pTrk,
+ hypothesis,
+ antihypothesis,
+ nUsedHits);
+}
+
#endif // ITRT_TOT_DEDX_H
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidToolRun2.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidToolRun2.cxx
index 85e533993268e85f40b413902e084ce52e7e4cf0..3c7bd26656f4edaaa934a4f21638f7fa5dceb3eb 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidToolRun2.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ElectronPidToolRun2.cxx
@@ -138,7 +138,8 @@ std::vector<float>
InDet::TRT_ElectronPidToolRun2::electronProbability(const Trk::Track& track) const {
// Get the probability calculator
- SG::ReadCondHandle<HTcalculator> readHandle{m_HTReadKey};
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ SG::ReadCondHandle<HTcalculator> readHandle{m_HTReadKey,ctx};
const HTcalculator* HTcalc = (*readHandle);
// make sure some calibration is available
if(HTcalc==nullptr) {
@@ -189,7 +190,7 @@ InDet::TRT_ElectronPidToolRun2::electronProbability(const Trk::Track& track) con
ATH_MSG_DEBUG ("check---------------------------------------------------------------------------------------");
ATH_MSG_DEBUG ("check Got track: pT: " << pT << " eta: " << eta << " phi: " << phi);
ATH_MSG_DEBUG ("check---------------------------------------------------------------------------------------");
-
+
// For calculation of HT probability:
double pHTel_prod = 1.0;
double pHTpi_prod = 1.0;
@@ -228,7 +229,7 @@ InDet::TRT_ElectronPidToolRun2::electronProbability(const Trk::Track& track) con
driftcircle = static_cast<const InDet::TRT_DriftCircleOnTrack*>(tmpRio);
}
}
-
+
if (!driftcircle) continue;
// From now (May 2015) onwards, we ONLY USE MIDDLE HT BIT:
@@ -316,7 +317,7 @@ InDet::TRT_ElectronPidToolRun2::electronProbability(const Trk::Track& track) con
// Our representation of 'GasType' is 0:Xenon, 1:Argon, 2:Krypton
int GasType=0; // Xenon is default
if (!m_TRTStrawSummaryTool.empty()) {
- int stat = m_TRTStrawSummaryTool->getStatusHT(DCid);
+ int stat = m_TRTStrawSummaryTool->getStatusHT(DCid,ctx);
if ( stat==2 || stat==3 ) { GasType = 0; } // Xe
else if ( stat==1 || stat==4 ) { GasType = 1; } // Ar
else if ( stat==5 ) { GasType = 1; } // Kr -- ESTIMATED AS AR UNTIL PID IS TUNED TO HANDLE KR
@@ -377,11 +378,11 @@ InDet::TRT_ElectronPidToolRun2::electronProbability(const Trk::Track& track) con
if (isHTMB) {pHTel_prod *= pHTel; pHTpi_prod *= pHTpi;}
else {pHTel_prod *= 1.0-pHTel; pHTpi_prod *= 1.0-pHTpi;}
ATH_MSG_DEBUG ("check pHT(el): " << pHTel << " pHT(pi): " << pHTpi );
-
- // Jared - Development Output...
-
+
+ // Jared - Development Output...
+
//std::cout << "check pHT(el): " << pHTel << " pHT(pi): " << pHTpi << std::endl;
-
+
}//of loop over hits
@@ -399,24 +400,24 @@ InDet::TRT_ElectronPidToolRun2::electronProbability(const Trk::Track& track) con
ATH_MSG_DEBUG ("check---------------------------------------------------------------------------------------");
ATH_MSG_DEBUG ("");
ATH_MSG_DEBUG ("");
-
+
// Jared - ToT Implementation
- dEdx = m_TRTdEdxTool->dEdx(&track, false); // Divide by L, exclude HT hits
- double usedHits = m_TRTdEdxTool->usedHits(&track, false);
- prob_El_ToT = m_TRTdEdxTool->getTest(dEdx, pTrk, Trk::electron, Trk::pion, usedHits);
-
+ dEdx = m_TRTdEdxTool->dEdx(ctx,&track, false); // Divide by L, exclude HT hits
+ double usedHits = m_TRTdEdxTool->usedHits(ctx,&track, false);
+ prob_El_ToT = m_TRTdEdxTool->getTest(ctx,dEdx, pTrk, Trk::electron, Trk::pion, usedHits);
+
// Limit the probability values the upper and lower limits that are given/trusted for each part:
- double limProbHT = HTcalc->Limit(prob_El_HT);
- double limProbToT = HTcalc->Limit(prob_El_ToT);
-
+ double limProbHT = HTcalc->Limit(prob_El_HT);
+ double limProbToT = HTcalc->Limit(prob_El_ToT);
+
// Calculate the combined probability, assuming no correlations (none are expected).
prob_El_Comb = (limProbHT * limProbToT ) / ( (limProbHT * limProbToT) + ( (1.0-limProbHT) * (1.0-limProbToT)) );
-
+
// Troels: VERY NASTY NAMING, BUT AGREED UPON FOR NOW (for debugging, 27. NOV. 2014):
- prob_El_Brem = pHTel_prod; // decorates electron LH to el brem for now... (still used?)
-
+ prob_El_Brem = pHTel_prod; // decorates electron LH to el brem for now... (still used?)
+
//std::cout << "Prob_HT = " << prob_El_HT << " Prob_ToT = " << prob_El_ToT << " Prob_Comb = " << prob_El_Comb << std::endl;
-
+
return PIDvalues;
}
@@ -442,9 +443,9 @@ bool InDet::TRT_ElectronPidToolRun2::CheckGeometry(int BEC, int Layer, int Straw
ATH_MSG_ERROR("Found a negative TRT Layer");
return false; //must be positive
}
-
+
static const int nlayers[2]={3,14};
-
+
if( not ( Layer < nlayers[part] ) ){
ATH_MSG_ERROR("Found TRT Layer index "<<Layer<<" in part "<<BEC<<" but part only has "<<nlayers[part]<<" layers.");
return false;
@@ -455,15 +456,15 @@ bool InDet::TRT_ElectronPidToolRun2::CheckGeometry(int BEC, int Layer, int Straw
ATH_MSG_ERROR("Found a negative TRT StrawLayer");
return false; //must be positive
}
-
+
static const int strawsPerBEC[2][14]={{19,24,30, 0, 0, 0,0,0,0,0,0,0,0,0},
{16,16,16,16,16,16,8,8,8,8,8,8,8,8}};
-
+
if(not(StrawLayer < strawsPerBEC[part][Layer])){
ATH_MSG_ERROR("TRT part "<<BEC<<" Layer "<<Layer<<" only has "<<strawsPerBEC[part][Layer]<<" straws. Found index "<<StrawLayer);
return false;
}
-
+
return true;
}
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.cxx
index ff829d32ab1ecc5d16b84172ade775b8cc23c441..b6fc721127e2d53676394836b855f3626623f793 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.cxx
@@ -47,7 +47,7 @@ TRT_ToT_dEdx::TRT_ToT_dEdx(const std::string& t, const std::string& n, const IIn
declareProperty("TRTStrawSummaryTool", m_TRTStrawSummaryTool);
declareProperty("AssociationTool", m_assoTool);
declareProperty("TRT_LocalOccupancyTool", m_localOccTool);
-
+
setDefaultConfiguration();
m_timingProfile = nullptr;
@@ -98,13 +98,13 @@ TRT_ToT_dEdx::~TRT_ToT_dEdx() = default;
// initialize
-StatusCode TRT_ToT_dEdx::initialize()
+StatusCode TRT_ToT_dEdx::initialize()
{
MsgStream log(msgSvc(), name());
-
+
// retrieve TRT-ID helper
-
+
StatusCode sc = detStore()->retrieve(m_trtId, "TRT_ID");
if (sc.isFailure()){
ATH_MSG_ERROR ( "Could not get TRT_ID helper !" );
@@ -116,7 +116,7 @@ StatusCode TRT_ToT_dEdx::initialize()
if ( sc.isFailure() || nullptr == m_timingProfile) {
ATH_MSG_DEBUG ("Can not find ChronoStatSvc name="<<m_timingProfile );
}
-
+
// Initialize ReadHandleKey and ReadCondHandleKey
ATH_CHECK(m_rdhkEvtInfo.initialize());
ATH_CHECK(m_ReadKey.initialize());
@@ -130,27 +130,27 @@ StatusCode TRT_ToT_dEdx::initialize()
ATH_MSG_ERROR ("Failed to retrieve StrawStatus Summary " << m_TRTStrawSummaryTool);
ATH_MSG_ERROR ("configure as 'None' to avoid its loading.");
return sc;
- }
- if ( !m_TRTStrawSummaryTool.empty() )
+ }
+ if ( !m_TRTStrawSummaryTool.empty() )
ATH_MSG_INFO ( "Retrieved tool " << m_TRTStrawSummaryTool );
-
- if (m_useTrackPartWithGasType > EGasType::kUnset ||
+
+ if (m_useTrackPartWithGasType > EGasType::kUnset ||
m_useTrackPartWithGasType < EGasType::kXenon) {
ATH_MSG_ERROR("Property TRT_dEdx_useTrackPartWithGasType has an invalid "
<< "value: " << m_useTrackPartWithGasType);
return StatusCode::FAILURE;
}
-
+
showDEDXSetup();
- ATH_MSG_INFO ( name() << " initialize() successful" );
+ ATH_MSG_INFO ( name() << " initialize() successful" );
return StatusCode::SUCCESS;
}
-StatusCode TRT_ToT_dEdx::finalize()
+StatusCode TRT_ToT_dEdx::finalize()
{
MsgStream log(msgSvc(), name());
ATH_MSG_DEBUG ( "... in finalize() ..." );
@@ -158,7 +158,11 @@ StatusCode TRT_ToT_dEdx::finalize()
return StatusCode::SUCCESS;
}
-bool TRT_ToT_dEdx::isGoodHit(const Trk::TrackStateOnSurface* trackState, bool useHitsHT, double& length) const
+bool
+TRT_ToT_dEdx::isGoodHit(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* trackState,
+ bool useHitsHT,
+ double& length) const
{
const Trk::MeasurementBase* trkM = trackState->measurementOnTrack();
if (!trkM) {
@@ -181,7 +185,7 @@ bool TRT_ToT_dEdx::isGoodHit(const Trk::TrackStateOnSurface* trackState, bool us
}
const Trk::TrackParameters* trkP = trackState->trackParameters();
- if(trkP==nullptr)return false;
+ if(trkP==nullptr)return false;
double Trt_Rtrack = std::abs(trkP->parameters()[Trk::locR]);
double Trt_RHit = std::abs(driftcircle->localParameters()[Trk::driftRadius]);
@@ -197,25 +201,28 @@ bool TRT_ToT_dEdx::isGoodHit(const Trk::TrackStateOnSurface* trackState, bool us
if (!useHitsHT) {
int TrtHl = driftcircle->highLevel();
- if (TrtHl==1) return false;
+ if (TrtHl==1) return false;
}
if (m_useTrackPartWithGasType != kUnset) { // don't preselect hits
- if(m_useTrackPartWithGasType != gasTypeInStraw(trackState)) return false;
+ if(m_useTrackPartWithGasType != gasTypeInStraw(ctx,trackState)) return false;
}
if (driftcircle->prepRawData()->timeOverThreshold()==0.) return false; // If ToT for this hit equal 0, skip it.
-
+
return true;
}
-double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
-{
+double
+TRT_ToT_dEdx::dEdx(const EventContext& ctx,
+ const Trk::Track* track,
+ bool useHitsHT) const
+{
ATH_MSG_DEBUG("dEdx()");
double nVtx=-1.;
// Event information
- SG::ReadDecorHandle<xAOD::EventInfo,float> eventInfoDecor(m_rdhkEvtInfo);
+ SG::ReadDecorHandle<xAOD::EventInfo,float> eventInfoDecor(m_rdhkEvtInfo,ctx);
if(!eventInfoDecor.isPresent()) {
REPORT_MESSAGE(MSG::FATAL) << "EventInfo decoration not available!";
return 0;
@@ -234,33 +241,33 @@ double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
if (!track) {
return 0;
}
- const DataVector<const Trk::TrackStateOnSurface>* vtsos = track->trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* vtsos = track->trackStateOnSurfaces();
if (!vtsos) {
return 0;
}
-
+
EGasType gasType;
DataVector<const Trk::TrackStateOnSurface>::const_iterator itr = vtsos->begin();
- DataVector<const Trk::TrackStateOnSurface>::const_iterator itre = vtsos->end();
+ DataVector<const Trk::TrackStateOnSurface>::const_iterator itre = vtsos->end();
double correctionFactor = 1.;
-
+
if (m_toolScenario==kAlgStandard) {
std::vector<double> vecToT;
double ToTsum = 0;
for ( ; itr!=itre ; ++itr) {
double length = 0;
- if ( isGoodHit((*itr), useHitsHT, length)) {
- double ToT_correct = correctToT_corrRZ(*itr, length);
+ if ( isGoodHit(ctx,(*itr), useHitsHT, length)) {
+ double ToT_correct = correctToT_corrRZ(ctx,*itr, length);
if (m_correctionType == kHitBased){
correctionFactor = hitOccupancyCorrection(*itr);
ToT_correct*=correctionFactor;
}
vecToT.push_back(ToT_correct);
}
- }
-
+ }
+
sort(vecToT.begin(), vecToT.end());
size_t nhits = vecToT.size();
@@ -275,26 +282,30 @@ double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
if (m_correctionType == kTrackBased) {
correctionFactor=trackOccupancyCorrection(track, useHitsHT);
} else {
- correctionFactor=correctNormalization(nVtx);
+ correctionFactor=correctNormalization(ctx,nVtx);
}
ToTsum*=correctionFactor;
return ToTsum/nhits;
}
-
+
if(m_toolScenario==kAlgReweight || m_toolScenario==kAlgReweightTrunkOne) {
std::vector<double> vecToT_Xe;
std::vector<double> vecToT_Ar;
std::vector<double> vecToT_Kr;
if(m_useTrackPartWithGasType!=kUnset) {
- ATH_MSG_WARNING("dEdX_Estimator():: Using m_toolScenario="<<m_toolScenario<<" scenario m_useTrackPartWithGasType is set to"<<m_useTrackPartWithGasType<<", but kUnset is requiered. Check you tool configuration.");
+ ATH_MSG_WARNING(
+ "dEdX_Estimator():: Using m_toolScenario="
+ << m_toolScenario << " scenario m_useTrackPartWithGasType is set to"
+ << m_useTrackPartWithGasType
+ << ", but kUnset is requiered. Check you tool configuration.");
}
for ( ; itr!=itre ; ++itr) {
double length=0;
- if (isGoodHit((*itr), useHitsHT, length)) {
- gasType=gasTypeInStraw(*itr);
- double ToT_correct = correctToT_corrRZ(*itr, length);
+ if (isGoodHit(ctx,(*itr), useHitsHT, length)) {
+ gasType=gasTypeInStraw(ctx,*itr);
+ double ToT_correct = correctToT_corrRZ(ctx,*itr, length);
if (m_correctionType == kHitBased) {
correctionFactor = hitOccupancyCorrection(*itr);
}
@@ -309,7 +320,7 @@ double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
ATH_MSG_ERROR("dEdX_Estimator():: During scenario kAlgReweight variable gasTypeInStraw got value kUnset.");
}
}
- }
+ }
sort(vecToT_Xe.begin(), vecToT_Xe.end());
sort(vecToT_Ar.begin(), vecToT_Ar.end());
@@ -348,7 +359,7 @@ double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
}
}
}
-
+
// Boost speed.
size_t nhits = nhitsXe + nhitsAr + nhitsKr;
if(nhits<1) return 0.0;
@@ -361,10 +372,10 @@ double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
}
for (size_t i = 0; i < nhitsAr;i++) {
ToTsumAr+=vecToT_Ar.at(i);
- }
+ }
for (size_t i = 0; i < nhitsKr;i++) {
ToTsumKr+=vecToT_Kr.at(i);
- }
+ }
ToTsumXe = (nhitsXe>0) ? ToTsumXe/nhitsXe : 0;
ToTsumAr = (nhitsAr>0) ? ToTsumAr/nhitsAr : 0;
@@ -374,7 +385,7 @@ double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
if (m_correctionType == kTrackBased) {
correctionFactor = trackOccupancyCorrection(track, useHitsHT);
} else {
- correctionFactor = correctNormalization(nVtx);
+ correctionFactor = correctNormalization(ctx,nVtx);
}
ToTsum *= correctionFactor;
@@ -385,7 +396,10 @@ double TRT_ToT_dEdx::dEdx(const Trk::Track* track, bool useHitsHT) const
return 0.;
}
-double TRT_ToT_dEdx::usedHits(const Trk::Track* track, bool useHitsHT) const
+double
+TRT_ToT_dEdx::usedHits(const EventContext& ctx,
+ const Trk::Track* track,
+ bool useHitsHT) const
{
ATH_MSG_DEBUG("usedHits()");
EGasType gasType = kUnset;
@@ -393,23 +407,23 @@ double TRT_ToT_dEdx::usedHits(const Trk::Track* track, bool useHitsHT) const
if (!track) {
return 0;
}
- const DataVector<const Trk::TrackStateOnSurface>* vtsos = track->trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* vtsos = track->trackStateOnSurfaces();
if (!vtsos) {
return 0;
}
DataVector<const Trk::TrackStateOnSurface>::const_iterator itr = vtsos->begin();
- DataVector<const Trk::TrackStateOnSurface>::const_iterator itre = vtsos->end();
-
+ DataVector<const Trk::TrackStateOnSurface>::const_iterator itre = vtsos->end();
+
if (m_toolScenario==kAlgStandard) {
int nhits =0;
for ( ; itr!=itre ; ++itr) {
double length=0;
- if (isGoodHit((*itr), useHitsHT, length)) {
+ if (isGoodHit(ctx,(*itr), useHitsHT, length)) {
nhits++;
}
- }
+ }
if (m_divideByL) nhits -= m_nTrunkateHits;
return nhits;
} else if (m_toolScenario==kAlgReweight || m_toolScenario==kAlgReweightTrunkOne) {
@@ -419,13 +433,17 @@ double TRT_ToT_dEdx::usedHits(const Trk::Track* track, bool useHitsHT) const
int nhitsKr = 0;
if(m_useTrackPartWithGasType!=kUnset) {
- ATH_MSG_WARNING("usedHits_Estimator():: Using m_toolScenario="<<m_toolScenario<<" scenario m_useTrackPartWithGasType is set to "<<m_useTrackPartWithGasType<<", but kUnset is required. Check you tool configuration.");
+ ATH_MSG_WARNING(
+ "usedHits_Estimator():: Using m_toolScenario="
+ << m_toolScenario << " scenario m_useTrackPartWithGasType is set to "
+ << m_useTrackPartWithGasType
+ << ", but kUnset is required. Check you tool configuration.");
}
for ( ; itr!=itre ; ++itr) {
double length=0;
- if ( isGoodHit((*itr), useHitsHT, length)) {
- gasType=gasTypeInStraw(*itr);
+ if ( isGoodHit(ctx,(*itr), useHitsHT, length)) {
+ gasType=gasTypeInStraw(ctx,*itr);
if (gasType==kXenon) {
nhitsXe++;
} else if (gasType==kArgon) {
@@ -457,17 +475,29 @@ double TRT_ToT_dEdx::usedHits(const Trk::Track* track, bool useHitsHT) const
return 0;
}
-double TRT_ToT_dEdx::getProb(const Trk::TrackStateOnSurface *itr, const double dEdx_obs, const double pTrk, Trk::ParticleHypothesis hypothesis, int nUsedHits) const
+double
+TRT_ToT_dEdx::getProb(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ int nUsedHits) const
{
- EGasType gasType = gasTypeInStraw(itr);
- return getProb(gasType, dEdx_obs, pTrk, hypothesis, nUsedHits);
+ EGasType gasType = gasTypeInStraw(ctx, itr);
+ return getProb(ctx,gasType, dEdx_obs, pTrk, hypothesis, nUsedHits);
}
-double TRT_ToT_dEdx::getProb(EGasType gasType, const double dEdx_obs, const double pTrk, Trk::ParticleHypothesis hypothesis, int nUsedHits) const
-{
+double
+TRT_ToT_dEdx::getProb(const EventContext& ctx,
+ EGasType gasType,
+ const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ int nUsedHits) const
+{
ATH_MSG_DEBUG("getProb():: gasTypeInStraw = "<<gasType<<"");
- SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
+ SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey,ctx};
const TRTDedxcorrection* dEdxCorrection{*readHandle};
if (dEdxCorrection==nullptr) {
ATH_MSG_ERROR(" getProb: Could not find any dEdxCorrection in CondStore. Return zero.");
@@ -480,7 +510,7 @@ double TRT_ToT_dEdx::getProb(EGasType gasType, const double dEdx_obs, const doub
gasType = kXenon;
}
- double dEdx_pred = predictdEdx(gasType, pTrk, hypothesis);
+ double dEdx_pred = predictdEdx(ctx,gasType, pTrk, hypothesis);
if (dEdx_pred==0) return 0.0;
if (hypothesis==Trk::electron) {
// correction for pTrk in [MeV]
@@ -489,28 +519,45 @@ double TRT_ToT_dEdx::getProb(EGasType gasType, const double dEdx_obs, const doub
dEdx_pred= dEdx_pred/correct;
}
- double Resolution = dEdxCorrection->resolution[gasType][0]+dEdxCorrection->resolution[gasType][1]*(nUsedHits+0.5)+dEdxCorrection->resolution[gasType][2]*(nUsedHits+0.5)*(nUsedHits+0.5)+dEdxCorrection->resolution[gasType][3]*(nUsedHits+0.5)*(nUsedHits+0.5)*(nUsedHits+0.5);
- if(hypothesis==Trk::electron){
- Resolution = dEdxCorrection->resolutionElectron[gasType][0]+dEdxCorrection->resolutionElectron[gasType][1]*(nUsedHits+0.5)+dEdxCorrection->resolutionElectron[gasType][2]*(nUsedHits+0.5)*(nUsedHits+0.5)+dEdxCorrection->resolutionElectron[gasType][3]*(nUsedHits+0.5)*(nUsedHits+0.5)*(nUsedHits+0.5);
+ double Resolution =
+ dEdxCorrection->resolution[gasType][0] +
+ dEdxCorrection->resolution[gasType][1] * (nUsedHits + 0.5) +
+ dEdxCorrection->resolution[gasType][2] * (nUsedHits + 0.5) *
+ (nUsedHits + 0.5) +
+ dEdxCorrection->resolution[gasType][3] * (nUsedHits + 0.5) *
+ (nUsedHits + 0.5) * (nUsedHits + 0.5);
+ if (hypothesis == Trk::electron) {
+ Resolution =
+ dEdxCorrection->resolutionElectron[gasType][0] +
+ dEdxCorrection->resolutionElectron[gasType][1] * (nUsedHits + 0.5) +
+ dEdxCorrection->resolutionElectron[gasType][2] * (nUsedHits + 0.5) *
+ (nUsedHits + 0.5) +
+ dEdxCorrection->resolutionElectron[gasType][3] * (nUsedHits + 0.5) *
+ (nUsedHits + 0.5) * (nUsedHits + 0.5);
}
- double prob = std::exp( -0.5 * ( ( ( dEdx_obs - dEdx_pred ) / (Resolution*dEdx_pred) ) *
- ( ( dEdx_obs - dEdx_pred ) / (Resolution*dEdx_pred) ) )) ;
+ double prob = std::exp( -0.5 * ( ( ( dEdx_obs - dEdx_pred ) / (Resolution*dEdx_pred) ) *
+ ( ( dEdx_obs - dEdx_pred ) / (Resolution*dEdx_pred) ) )) ;
ATH_MSG_DEBUG("getProb():: return "<<prob<<"");
return prob;
}
-
-double TRT_ToT_dEdx::getTest(const double dEdx_obs, const double pTrk, Trk::ParticleHypothesis hypothesis, Trk::ParticleHypothesis antihypothesis, int nUsedHits) const
+double
+TRT_ToT_dEdx::getTest(const EventContext& ctx,
+ const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ Trk::ParticleHypothesis antihypothesis,
+ int nUsedHits) const
{
ATH_MSG_DEBUG("getTest()");
EGasType gasType = kUnset;
if ( dEdx_obs<=0. || pTrk<=0. || nUsedHits<=0 ) return 0.5;
-
- double Pone = getProb(gasType, dEdx_obs,pTrk,hypothesis,nUsedHits);
- double Ptwo = getProb(gasType, dEdx_obs,pTrk,antihypothesis,nUsedHits);
+
+ double Pone = getProb(ctx,gasType, dEdx_obs,pTrk,hypothesis,nUsedHits);
+ double Ptwo = getProb(ctx,gasType, dEdx_obs,pTrk,antihypothesis,nUsedHits);
if ((Pone+Ptwo) != 0) {
ATH_MSG_DEBUG("getTest():: return "<<Pone/(Pone+Ptwo)<<"");
return Pone/(Pone+Ptwo);
@@ -519,60 +566,97 @@ double TRT_ToT_dEdx::getTest(const double dEdx_obs, const double pTrk, Trk::Part
}
}
-double TRT_ToT_dEdx::predictdEdx(const Trk::TrackStateOnSurface *itr, const double pTrk, Trk::ParticleHypothesis hypothesis) const
+double
+TRT_ToT_dEdx::predictdEdx(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis) const
{
- EGasType gasType = gasTypeInStraw(itr);
- return predictdEdx(gasType, pTrk, hypothesis);
+ EGasType gasType = gasTypeInStraw(ctx, itr);
+ return predictdEdx(ctx,gasType, pTrk, hypothesis);
}
-double TRT_ToT_dEdx::predictdEdx(EGasType gasType, const double pTrk, Trk::ParticleHypothesis hypothesis) const
+double
+TRT_ToT_dEdx::predictdEdx(const EventContext& ctx,
+ EGasType gasType,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis) const
{
- ATH_MSG_DEBUG("predictdEdx(): gasTypeInStraw = "<<gasType<<"");
+ ATH_MSG_DEBUG("predictdEdx(): gasTypeInStraw = " << gasType << "");
- SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
- const TRTDedxcorrection* dEdxCorrection{*readHandle};
- if(dEdxCorrection==nullptr)
- {
- ATH_MSG_ERROR(" predictdEdx: Could not find any dEdxCorrection in CondStore. Return zero.");
- return 0;
- }
+ SG::ReadCondHandle<TRTDedxcorrection> readHandle{ m_ReadKey,ctx };
+ const TRTDedxcorrection* dEdxCorrection{ *readHandle };
+ if (dEdxCorrection == nullptr) {
+ ATH_MSG_ERROR(" predictdEdx: Could not find any dEdxCorrection in "
+ "CondStore. Return zero.");
+ return 0;
+ }
- if(gasType==kUnset)
- {
- ATH_MSG_DEBUG("predictdEdx():: gasTypeInStraw set kUnset that is not allowed! Use gasTypeInStraw(*itr) to get gas type info for that hit first!");
- ATH_MSG_DEBUG("predictdEdx():: Now gasTypeInStraw sets to kXenon.");
- gasType = kXenon;
- }
+ if (gasType == kUnset) {
+ ATH_MSG_DEBUG(
+ "predictdEdx():: gasTypeInStraw set kUnset that is not allowed! Use "
+ "gasTypeInStraw(*itr) to get gas type info for that hit first!");
+ ATH_MSG_DEBUG("predictdEdx():: Now gasTypeInStraw sets to kXenon.");
+ gasType = kXenon;
+ }
double mass = m_particlemasses.mass[hypothesis];
double betaGamma = pTrk/mass;
/** @todo why is it possible that a 20 MeV particle reaches this point? (see Savannah bug 94644) */
- // low momentum particle can create floating point error
+ // low momentum particle can create floating point error
// do we need the check in the log parameter in addition? will create CPU increase
// do we want to throw an assertion here?
- if(pTrk<100)return 0;
- if(m_divideByL){
- if(dEdxCorrection->paraDivideByLengthDedxP3[gasType]+1./( std::pow( betaGamma, dEdxCorrection->paraDivideByLengthDedxP5[gasType]))<=0) return 0;
- return dEdxCorrection->paraDivideByLengthDedxP1[gasType]/std::pow( std::sqrt( (betaGamma*betaGamma)/(1.+(betaGamma*betaGamma)) ), dEdxCorrection->paraDivideByLengthDedxP4[gasType]) *
- (dEdxCorrection->paraDivideByLengthDedxP2[gasType] - std::pow( std::sqrt( (betaGamma*betaGamma)/(1.+(betaGamma*betaGamma)) ), dEdxCorrection->paraDivideByLengthDedxP4[gasType] )
- - log(dEdxCorrection->paraDivideByLengthDedxP3[gasType]+1./( std::pow( betaGamma, dEdxCorrection->paraDivideByLengthDedxP5[gasType]) ) ) );
- }
- if(dEdxCorrection->paraDedxP3[gasType]+1./( std::pow( betaGamma, dEdxCorrection->paraDedxP5[gasType]) )<=0)return 0;
- return dEdxCorrection->paraDedxP1[gasType]/std::pow( std::sqrt( (betaGamma*betaGamma)/(1.+(betaGamma*betaGamma)) ), dEdxCorrection->paraDedxP4[gasType]) *
- (dEdxCorrection->paraDedxP2[gasType] - std::pow( std::sqrt( (betaGamma*betaGamma)/(1.+(betaGamma*betaGamma)) ), dEdxCorrection->paraDedxP4[gasType] )
- - log(dEdxCorrection->paraDedxP3[gasType]+1./( std::pow( betaGamma, dEdxCorrection->paraDedxP5[gasType]) ) ) );
-
- //return 0;
+ if (pTrk < 100)
+ return 0;
+ if (m_divideByL) {
+ if (dEdxCorrection->paraDivideByLengthDedxP3[gasType] +
+ 1. / (std::pow(betaGamma,
+ dEdxCorrection->paraDivideByLengthDedxP5[gasType])) <=
+ 0)
+ return 0;
+ return dEdxCorrection->paraDivideByLengthDedxP1[gasType] /
+ std::pow(std::sqrt((betaGamma * betaGamma) /
+ (1. + (betaGamma * betaGamma))),
+ dEdxCorrection->paraDivideByLengthDedxP4[gasType]) *
+ (dEdxCorrection->paraDivideByLengthDedxP2[gasType] -
+ std::pow(std::sqrt((betaGamma * betaGamma) /
+ (1. + (betaGamma * betaGamma))),
+ dEdxCorrection->paraDivideByLengthDedxP4[gasType]) -
+ log(dEdxCorrection->paraDivideByLengthDedxP3[gasType] +
+ 1. / (std::pow(
+ betaGamma,
+ dEdxCorrection->paraDivideByLengthDedxP5[gasType]))));
+ }
+ if (dEdxCorrection->paraDedxP3[gasType] +
+ 1. / (std::pow(betaGamma, dEdxCorrection->paraDedxP5[gasType])) <=
+ 0)
+ return 0;
+ return dEdxCorrection->paraDedxP1[gasType] /
+ std::pow(
+ std::sqrt((betaGamma * betaGamma) / (1. + (betaGamma * betaGamma))),
+ dEdxCorrection->paraDedxP4[gasType]) *
+ (dEdxCorrection->paraDedxP2[gasType] -
+ std::pow(
+ std::sqrt((betaGamma * betaGamma) / (1. + (betaGamma * betaGamma))),
+ dEdxCorrection->paraDedxP4[gasType]) -
+ log(dEdxCorrection->paraDedxP3[gasType] +
+ 1. / (std::pow(betaGamma, dEdxCorrection->paraDedxP5[gasType]))));
+
+ //return 0;
}
-double TRT_ToT_dEdx::mass(const Trk::TrackStateOnSurface *itr, const double pTrk, double dEdx ) const
+double
+TRT_ToT_dEdx::mass(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ const double pTrk,
+ double dEdx) const
{
- EGasType gasType = gasTypeInStraw(itr);
+ EGasType gasType = gasTypeInStraw(ctx,itr);
ATH_MSG_DEBUG("mass(): gasTypeInStraw = "<<gasType<<"");
- SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
+ SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey,ctx};
const TRTDedxcorrection* dEdxCorrection{*readHandle};
if(dEdxCorrection==nullptr)
{
@@ -592,9 +676,11 @@ double TRT_ToT_dEdx::mass(const Trk::TrackStateOnSurface *itr, const double pTrk
/** @todo make failsafe */
static const double bg_min = 0.001;
static const double bg_max = 3; // maximal allowed bg
-
- static const std::string blumRolandiFunction = "( [0]/sqrt( (x*x/([5]*[5]))/(1.+(x*x/([5]*[5]))) )^[3] ) * ([1] - sqrt( (x*x/([5]*[5]))/(1.+(x*x/([5]*[5]))) )^[3] - log([2]+1./((x/[5])^[4]) ) )";
-
+
+ static const std::string blumRolandiFunction =
+ "( [0]/sqrt( (x*x/([5]*[5]))/(1.+(x*x/([5]*[5]))) )^[3] ) * ([1] - sqrt( "
+ "(x*x/([5]*[5]))/(1.+(x*x/([5]*[5]))) )^[3] - log([2]+1./((x/[5])^[4]) ) )";
+
TF1 blumRolandi( "BR", blumRolandiFunction.c_str(), 0.7, 100000);
blumRolandi.SetParameters(dEdxCorrection->paraDedxP1[gasType],
@@ -604,24 +690,25 @@ double TRT_ToT_dEdx::mass(const Trk::TrackStateOnSurface *itr, const double pTrk
dEdxCorrection->paraDedxP5[gasType],
1.);
//blumRolandi.SetParameters(&dEdxCorrection->para_dEdx_BB);
- double betaGamma = blumRolandi.GetX(dEdx, bg_min, bg_max);
-
+ double betaGamma = blumRolandi.GetX(dEdx, bg_min, bg_max);
+
ATH_MSG_DEBUG("mass():: return "<<pTrk/betaGamma<<"");
-
+
return pTrk/betaGamma;
}
/* returns gas type for given straw */
// TODO: move this functionality to TRT_StrawStatusSummaryTool.
-TRT_ToT_dEdx::EGasType TRT_ToT_dEdx::gasTypeInStraw(const Trk::TrackStateOnSurface *itr) const
+TRT_ToT_dEdx::EGasType TRT_ToT_dEdx::gasTypeInStraw(const EventContext& ctx,
+ const Trk::TrackStateOnSurface *itr) const
{
const Trk::MeasurementBase* trkM = itr->measurementOnTrack();
if (!trkM) {
- return kUnset;
+ return kUnset;
}
// Check if this is RIO on track
- //annd if yes check if is TRT Drift Circle
+ //annd if yes check if is TRT Drift Circle
//then set the ptr
const InDet::TRT_DriftCircleOnTrack* driftcircle = nullptr;
if (trkM->type(Trk::MeasurementBaseType::RIO_OnTrack)) {
@@ -635,24 +722,33 @@ TRT_ToT_dEdx::EGasType TRT_ToT_dEdx::gasTypeInStraw(const Trk::TrackStateOnSurfa
return kUnset;
}
- return gasTypeInStraw(driftcircle);
+ return gasTypeInStraw(ctx,driftcircle);
}
-TRT_ToT_dEdx::EGasType TRT_ToT_dEdx::gasTypeInStraw(const InDet::TRT_DriftCircleOnTrack *driftcircle) const
+TRT_ToT_dEdx::EGasType
+TRT_ToT_dEdx::gasTypeInStraw(
+ const EventContext& ctx,
+ const InDet::TRT_DriftCircleOnTrack* driftcircle) const
{
- Identifier DCid = driftcircle->identify();
-
+ Identifier DCid = driftcircle->identify();
+
// getStatusHT returns enum {Undefined, Dead, Good, Xenon, Argon, Krypton, EmulatedArgon, EmulatedKrypton}.
// Our representation of 'GasType' is 0:Xenon, 1:Argon, 2:Krypton
EGasType GasType=kUnset; // kUnset is default
if (!m_TRTStrawSummaryTool.empty()) {
- int stat = m_TRTStrawSummaryTool->getStatusHT(DCid);
+ int stat = m_TRTStrawSummaryTool->getStatusHT(DCid,ctx);
if ( stat==2 || stat==3 ) { GasType = kXenon; } // Xe
else if ( stat==1 || stat==4 ) { GasType = kArgon; } // Ar
else if ( stat==5 ) { GasType = kKrypton; } // Kr
else if ( stat==6 ) { GasType = kArgon; } // Emulated Ar
- else if ( stat==7 ) { GasType = kKrypton; } // Emulated Kr
- else { ATH_MSG_FATAL ("getStatusHT = " << stat << ", must be 'Good(2)||Xenon(3)' or 'Dead(1)||Argon(4)' or 'Krypton(5)' or 'EmulatedArgon(6)' or 'EmulatedKr(7)'!");
+ else if ( stat==7 ) { GasType = kKrypton;
+ } // Emulated Kr
+ else {
+ ATH_MSG_FATAL(
+ "getStatusHT = "
+ << stat
+ << ", must be 'Good(2)||Xenon(3)' or 'Dead(1)||Argon(4)' or "
+ "'Krypton(5)' or 'EmulatedArgon(6)' or 'EmulatedKr(7)'!");
throw std::exception();
}
}
@@ -664,9 +760,10 @@ TRT_ToT_dEdx::EGasType TRT_ToT_dEdx::gasTypeInStraw(const InDet::TRT_DriftCircle
// Corrections
/////////////////////////////////
-double TRT_ToT_dEdx::correctNormalization(double nVtx) const
+double
+TRT_ToT_dEdx::correctNormalization(const EventContext& ctx, double nVtx) const
{
- SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
+ SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey,ctx};
const TRTDedxcorrection* dEdxCorrection{*readHandle};
if(dEdxCorrection==nullptr) {
ATH_MSG_ERROR(" correctNormalization: Could not find any dEdxCorrection in CondStore. Return zero.");
@@ -687,7 +784,10 @@ double TRT_ToT_dEdx::correctNormalization(double nVtx) const
return (slope*dEdxCorrection->normNzero[gasType]+offset)/(slope*nVtx+offset+shift);
}
-double TRT_ToT_dEdx::correctToT_corrRZ(const Trk::TrackStateOnSurface* itr, double length) const
+double
+TRT_ToT_dEdx::correctToT_corrRZ(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ double length) const
{
const Trk::MeasurementBase* trkM = itr->measurementOnTrack();
const Trk::TrackParameters* trkP = itr->trackParameters();
@@ -702,7 +802,7 @@ double TRT_ToT_dEdx::correctToT_corrRZ(const Trk::TrackStateOnSurface* itr, doub
driftcircle = static_cast<const InDet::TRT_DriftCircleOnTrack*>(tmpRio);
}
}
-
+
if (!driftcircle) {
return 0;
}
@@ -720,36 +820,36 @@ double TRT_ToT_dEdx::correctToT_corrRZ(const Trk::TrackStateOnSurface* itr, doub
int StrawLayer = m_trtId->straw_layer(DCId);
int Layer = m_trtId->layer_or_wheel(DCId);
double hitRtrack = std::abs(trkP->parameters()[Trk::locR]);
- EGasType gasType = gasTypeInStraw(itr);
+ EGasType gasType = gasTypeInStraw(ctx,itr);
if(gasType==kUnset) {
ATH_MSG_ERROR("correctToT_corrRZ(const Trk::TrackStateOnSurface *itr):: Gas type in straw is kUnset! Return ToT = 0");
return 0;
}
-
+
if(m_divideByL && length>0) timeOverThreshold = timeOverThreshold/length;
if(!m_corrected) return timeOverThreshold;
/* else correct */
-
+
double hitZ = driftcircle->globalPosition().z();
double trackx = driftcircle->globalPosition().x();
double tracky = driftcircle->globalPosition().y();
double hitPosR = std::sqrt(trackx*trackx+tracky*tracky);
-
- /** @todo implement possiblity to set the scaling factor run-by-run from database,
+
+ /** @todo implement possiblity to set the scaling factor run-by-run from database,
should probably be done later on track- level */
double ToTmip = 1;
double valToT = 0;
if(m_divideByL){
if (abs(hitPart)==1) // Barrel
- valToT = fitFuncBarrel_corrRZL(gasType, hitRtrack, hitZ, Layer, StrawLayer);
+ valToT = fitFuncBarrel_corrRZL(ctx,gasType, hitRtrack, hitZ, Layer, StrawLayer);
else // End-cap
- valToT = fitFuncEndcap_corrRZL(gasType, hitRtrack, hitPosR, Layer, hitZ>0?1:(hitZ<0?-1:0));
+ valToT = fitFuncEndcap_corrRZL(ctx,gasType, hitRtrack, hitPosR, Layer, hitZ>0?1:(hitZ<0?-1:0));
}else{
if (abs(hitPart)==1) // Barrel
valToT = fitFuncBarrel_corrRZ(gasType, hitRtrack, hitZ, Layer, StrawLayer);
else // End-cap
valToT = fitFuncEndcap_corrRZ(gasType, hitRtrack, hitPosR, Layer, hitZ>0?1:(hitZ<0?-1:0));
- }
+ }
if (std::isinf(valToT)) return 0.;
if (valToT!=0) return ToTmip*timeOverThreshold/valToT;
return 0.;
@@ -763,7 +863,7 @@ double TRT_ToT_dEdx::fitFuncBarrel_corrRZ(EGasType gasType, double driftRadius,d
return fitFuncBarrelLong_corrRZ(gasType, driftRadius, zPosition, Layer, StrawLayer);
}
-double TRT_ToT_dEdx::fitFuncEndcap_corrRZ(EGasType gasType, double driftRadius,double radialPosition, int Layer, int sign) const
+double TRT_ToT_dEdx::fitFuncEndcap_corrRZ(EGasType gasType, double driftRadius,double radialPosition, int Layer, int sign) const
{
/**
* T(r,R) = T0(r)+ a(r)*R
@@ -779,7 +879,7 @@ double TRT_ToT_dEdx::fitFuncBarrelLong_corrRZ(EGasType gasType, double driftRadi
* |z| /|z| - l \
* T(r,z) = T0(r) + --- exp|----------|
* v(r) \ s(r) /
- */
+ */
double z = std::abs(zPosition);
int sign=1;
if(zPosition<0)sign=-1;
@@ -807,7 +907,7 @@ double TRT_ToT_dEdx::fitFuncBarrelShort_corrRZ(EGasType gasType, double driftRad
if(zPosition<0)sign=-1;
double T0 = fitFuncPol_corrRZ(gasType, 0,driftRadius,0,StrawLayer,sign,1);
double b = fitFuncPol_corrRZ(gasType, 1,driftRadius,0,StrawLayer,sign,1);
- return T0+b*z;
+ return T0+b*z;
}
@@ -820,7 +920,7 @@ double TRT_ToT_dEdx::fitFuncPol_corrRZ(EGasType gasType, int parameter, double d
ATH_MSG_ERROR(" fitFuncPol_corrRZ: Could not find any dEdxCorrection in CondStore. Return zero.");
return 0;
}
-
+
double a = 0;
double b = 0;
double c = 0;
@@ -837,7 +937,7 @@ double TRT_ToT_dEdx::fitFuncPol_corrRZ(EGasType gasType, int parameter, double d
d = dEdxCorrection->paraLongCorrRZ[gasType][(6*parameter+3)*30*3+Layer*30+Strawlayer+offset];
e = dEdxCorrection->paraLongCorrRZ[gasType][(6*parameter+4)*30*3+Layer*30+Strawlayer+offset];
f = dEdxCorrection->paraLongCorrRZ[gasType][(6*parameter+5)*30*3+Layer*30+Strawlayer+offset];
-
+
}else if (set ==1) { // short straws in barrel
if(sign > 0) offset+=108;
a = dEdxCorrection->paraShortCorrRZ[gasType][(6*parameter+0)*9+Layer+offset];
@@ -880,18 +980,24 @@ double TRT_ToT_dEdx::fitFuncPol_corrRZ(EGasType gasType, int parameter, double d
d = dEdxCorrection->paraEndCorrRZMC[gasType][(6*parameter+3)*28+Layer];
e = dEdxCorrection->paraEndCorrRZMC[gasType][(6*parameter+4)*28+Layer];
f = dEdxCorrection->paraEndCorrRZMC[gasType][(6*parameter+5)*28+Layer];
- }
+ }
}
return a+b*r+c*r*r+d*r*r*r+e*r*r*r*r+f*r*r*r*r*r;
}
-double TRT_ToT_dEdx::fitFuncEndcap_corrRZL(EGasType gasType, double driftRadius,double radialPosition, int Layer, int sign) const
+double
+TRT_ToT_dEdx::fitFuncEndcap_corrRZL(const EventContext& ctx,
+ EGasType gasType,
+ double driftRadius,
+ double radialPosition,
+ int Layer,
+ int sign) const
{
/*
* T(r,R) = T0(r)+ a(r)*R
*/
- SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
+ SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey,ctx};
const TRTDedxcorrection* dEdxCorrection{*readHandle};
if(dEdxCorrection==nullptr) {
ATH_MSG_ERROR(" fitFuncEndcap_corrRZL: Could not find any dEdxCorrection in CondStore. Return zero.");
@@ -899,7 +1005,7 @@ double TRT_ToT_dEdx::fitFuncEndcap_corrRZL(EGasType gasType, double driftRadius,
}
double r = std::abs(driftRadius);
- double a,b,c,d,e,f,g,h,i;
+ double a,b,c,d,e,f,g,h,i;
if(sign >0) Layer+=14;
if(m_isData){
a = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(0)*28+Layer];
@@ -907,42 +1013,48 @@ double TRT_ToT_dEdx::fitFuncEndcap_corrRZL(EGasType gasType, double driftRadius,
c = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(2)*28+Layer];
d = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(3)*28+Layer];
e = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(4)*28+Layer];
- f = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(5)*28+Layer];
- g = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(6)*28+Layer];
- h = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(7)*28+Layer];
- i = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(8)*28+Layer];
+ f = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(5)*28+Layer];
+ g = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(6)*28+Layer];
+ h = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(7)*28+Layer];
+ i = dEdxCorrection->paraEndCorrRZDivideByLengthDATA[gasType][(8)*28+Layer];
}else{
a = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(0)*28+Layer];
b = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(1)*28+Layer];
c = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(2)*28+Layer];
d = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(3)*28+Layer];
e = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(4)*28+Layer];
- f = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(5)*28+Layer];
- g = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(6)*28+Layer];
- h = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(7)*28+Layer];
- i = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(8)*28+Layer];
- }
+ f = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(5)*28+Layer];
+ g = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(6)*28+Layer];
+ h = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(7)*28+Layer];
+ i = dEdxCorrection->paraEndCorrRZDivideByLengthMC[gasType][(8)*28+Layer];
+ }
double T1 = b*r+c*r*r+d*r*r*r+e*r*r*r*r+f*r*r*r*r*r;
double slope = g+h*r+i*r*r;
double T0 = a;
-
+
return T0+T1+slope*radialPosition;
}
-double TRT_ToT_dEdx::fitFuncBarrel_corrRZL(EGasType gasType, double driftRadius,double zPosition, int Layer, int Strawlayer) const
+double
+TRT_ToT_dEdx::fitFuncBarrel_corrRZL(const EventContext& ctx,
+ EGasType gasType,
+ double driftRadius,
+ double zPosition,
+ int Layer,
+ int Strawlayer) const
{
/*
- * T(r,z) = T0(r)+ b(r)*z*z
+ * T(r,z) = T0(r)+ b(r)*z*z
*/
- SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
+ SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey,ctx};
const TRTDedxcorrection* dEdxCorrection{*readHandle};
if(dEdxCorrection==nullptr) {
ATH_MSG_ERROR(" fitFuncBarrel_corrRZL: Could not find any dEdxCorrection in CondStore. Return zero.");
return 0;
}
- double a,b,c,d,e,f,g;
+ double a,b,c,d,e,f,g;
if (Layer==0 && Strawlayer<9) { // short straws
if (m_isData){
a = dEdxCorrection->paraShortCorrRZDivideByLengthDATA[gasType][(0)*9+Strawlayer];
@@ -983,9 +1095,9 @@ double TRT_ToT_dEdx::fitFuncBarrel_corrRZL(EGasType gasType, double driftRadius,
double z = std::abs(zPosition);
double r = std::abs(driftRadius);
double T0neg=a;
- double T0pos=b;
+ double T0pos=b;
double T1 = std::exp(-c*r*r)+d*r;
- double slope = e*r+f*r*r+g*r*r*r;
+ double slope = e*r+f*r*r+g*r*r*r;
double result;
result = T0neg+T1+slope*z;
if (zPosition>0) result = T0pos+T1+slope*z;
@@ -997,7 +1109,7 @@ double TRT_ToT_dEdx::hitOccupancyCorrection(const Trk::TrackStateOnSurface *itr)
{
SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
const TRTDedxcorrection* dEdxCorrection{*readHandle};
-
+
const Trk::MeasurementBase* trkM = itr->measurementOnTrack();
// Check if this is RIO on track
@@ -1029,11 +1141,11 @@ double TRT_ToT_dEdx::hitOccupancyCorrection(const Trk::TrackStateOnSurface *itr)
int HitPart = m_trtId->barrel_ec(DCId);
double Trt_HitTheta = trkP->parameters()[Trk::theta];
double trackEta = -log(tan(Trt_HitTheta/2.0));
-
+
double localOccupancy = m_localOccTool->LocalOccupancy(trackEta, phimodule);
double ToTmip = 1;
double valToT = 1.;
-
+
double p0=0., p1=0., p2=0., p0_flat=0.;
//the calibration array is structured as follows (hence the non intuitive numbers)
@@ -1073,7 +1185,7 @@ double TRT_ToT_dEdx::hitOccupancyCorrection(const Trk::TrackStateOnSurface *itr)
//Hence the tot value is divided by the value of the function
//multiplied to the non-shared intercept
valToT = p0_flat/(p0+p1*localOccupancy+p2*localOccupancy*localOccupancy);
-
+
return ToTmip*valToT;
}
@@ -1081,7 +1193,7 @@ double TRT_ToT_dEdx::trackOccupancyCorrection(const Trk::Track* track, bool use
{
SG::ReadCondHandle<TRTDedxcorrection> readHandle{m_ReadKey};
const TRTDedxcorrection* dEdxCorrection{*readHandle};
-
+
double corr=-999.;
double trackOcc = m_localOccTool->LocalOccupancy(*track);
const Trk::TrackParameters* perigee = track->perigeeParameters();
@@ -1106,7 +1218,7 @@ double TRT_ToT_dEdx::trackOccupancyCorrection(const Trk::Track* track, bool use
double TRT_ToT_dEdx::calculateTrackLengthInStraw(const Trk::TrackStateOnSurface* trackState, const TRT_ID* identifier) {
if (trackState->type(Trk::TrackStateOnSurface::Outlier)) return 0.; //Outliers
-
+
const Trk::MeasurementBase* trkM = trackState->measurementOnTrack();
if (!trkM) {
return 0.;
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.h b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.h
index 0c948b006ba7bca027c701112561ebe3cb23ace1..09902e5c1c75d08289235d6279f9af03c3928bc6 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.h
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_ToT_dEdx.h
@@ -112,9 +112,9 @@ public:
/** Virtual destructor*/
virtual ~TRT_ToT_dEdx();
/** AlgTool initailize method.*/
- StatusCode initialize();
+ virtual StatusCode initialize() override;
/** AlgTool finalize method */
- StatusCode finalize();
+ virtual StatusCode finalize() override;
/**
* @brief function to calculate sum ToT normalised to number of used hits
@@ -122,7 +122,12 @@ public:
* @param useHitsHT decide if HT hits should be used in the estimate
* @return dEdx value
*/
- double dEdx(const Trk::Track* track, bool useHThits=true) const;
+ using ITRT_ToT_dEdx::dEdx;
+ using ITRT_ToT_dEdx::usedHits;
+ using ITRT_ToT_dEdx::getTest;
+ virtual double dEdx(const EventContext& ctx,
+ const Trk::Track* track,
+ bool useHThits = true) const override final;
/**
* @brief function to calculate number of used hits
@@ -130,7 +135,24 @@ public:
* @param useHitsHT decide if HT hits should be used in the estimate
* @return nHits
*/
- double usedHits(const Trk::Track* track, bool useHThits=true) const;
+ virtual double usedHits(const EventContext& ctx,
+ const Trk::Track* track,
+ bool useHThits = true) const override final;
+ /**
+ * @brief function to calculate likelihood ratio test
+ * @param observed dEdx
+ * @param track parameter
+ * @param particle hypothesis
+ * @param antihypothesis
+ * @param number of used hits
+ * @return test value between 0 and 1
+ */
+ virtual double getTest(const EventContext& ctx,
+ const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ Trk::ParticleHypothesis antihypothesis,
+ int nUsedHits) const override final;
protected:
/**
@@ -141,16 +163,18 @@ protected:
* @param length length in straw
* @return decision
*/
- bool isGoodHit(const Trk::TrackStateOnSurface* trackState, bool useHitsHT, double& length) const;
+ bool isGoodHit(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* trackState,
+ bool useHitsHT,
+ double& length) const;
/**
* @brief correct overall dEdx normalization on track level
* @param number of primary vertices per event
* @return scaling variable
*/
- double correctNormalization(double nVtx=-1) const;
+ double correctNormalization(const EventContext& ctx, double nVtx = -1) const;
-public:
/**
* @brief function to calculate likelihood from prediction and resolution
* @param observed dEdx
@@ -159,30 +183,34 @@ public:
* @param number of used hits
* @return brobability value between 0 and 1
*/
- double getProb(const Trk::TrackStateOnSurface *itr, const double dEdx_obs, const double pTrk, Trk::ParticleHypothesis hypothesis, int nUsedHits) const;
- double getProb(EGasType gasType, const double dEdx_obs, const double pTrk, Trk::ParticleHypothesis hypothesis, int nUsedHits) const;
+ double getProb(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ int nUsedHits) const;
+ double getProb(const EventContext& ctx,
+ EGasType gasType,
+ const double dEdx_obs,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis,
+ int nUsedHits) const;
- /**
- * @brief function to calculate likelihood ratio test
- * @param observed dEdx
- * @param track parameter
- * @param particle hypothesis
- * @param antihypothesis
- * @param number of used hits
- * @return test value between 0 and 1
- */
- double getTest(const double dEdx_obs, const double pTrk, Trk::ParticleHypothesis hypothesis, Trk::ParticleHypothesis antihypothesis, int nUsedHits) const;
/**
* @brief function to calculate expectation value for dEdx using BB fit
* @param track momentum
* @param hypothesis
* @return dEdx_pred
*/
- double predictdEdx(const Trk::TrackStateOnSurface *itr, const double pTrk, Trk::ParticleHypothesis hypothesis) const;
-
- double predictdEdx(EGasType gasType, const double pTrk, Trk::ParticleHypothesis hypothesis) const;
-
+ double predictdEdx(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis) const;
+ double predictdEdx(const EventContext& ctx,
+ EGasType gasType,
+ const double pTrk,
+ Trk::ParticleHypothesis hypothesis) const;
/**
* @brief function to extract most likely mass in bg [0,3]
@@ -190,9 +218,11 @@ public:
* @param measured dEdx
* @return mass
*/
- double mass(const Trk::TrackStateOnSurface *itr, const double pTrk, double dEdx ) const;
+ double mass(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ const double pTrk,
+ double dEdx) const;
-protected:
/**
* @brief main function to correct ToT values on hit level as a function of track radius and z-position
* @param track on surface object
@@ -202,16 +232,21 @@ protected:
* @param bool variable whether mimic ToT to other gas hits shoule be used
* @return corrected value for ToT
*/
- double correctToT_corrRZ(const Trk::TrackStateOnSurface *itr, double length) const;
-
+ double correctToT_corrRZ(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr,
+ double length) const;
+
/**
* @brief return gas type for that hit
* @param track on surface object
* @return gasType
*/
- EGasType gasTypeInStraw(const Trk::TrackStateOnSurface *itr) const;
- EGasType gasTypeInStraw(const InDet::TRT_DriftCircleOnTrack *driftcircle) const;
-
+ EGasType gasTypeInStraw(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* itr) const;
+ EGasType gasTypeInStraw(
+ const EventContext& ctx,
+ const InDet::TRT_DriftCircleOnTrack* driftcircle) const;
+
private:
SG::ReadCondHandleKey<TRTDedxcorrection> m_ReadKey{this,"Dedxcorrection","Dedxcorrection","Dedx constants in-key"};
@@ -261,8 +296,13 @@ private:
* @param bool variable to specify whether data or MC correction
* @return correction
*/
- double fitFuncEndcap_corrRZL(EGasType gasType, double driftRadius,double radialPosition, int Layer, int sign) const;
-
+ double fitFuncEndcap_corrRZL(const EventContext& ctx,
+ EGasType gasType,
+ double driftRadius,
+ double radialPosition,
+ int Layer,
+ int sign) const;
+
/**
* @brief function to compute correction factor in barrel region
* @param driftradius
@@ -273,7 +313,12 @@ private:
* @param bool variable to specify whether data or MC correction
* @return correction
*/
- double fitFuncBarrel_corrRZL(EGasType gasType, double driftRadius,double zPosition, int Layer, int StrawLayer) const;
+ double fitFuncBarrel_corrRZL(const EventContext& ctx,
+ EGasType gasType,
+ double driftRadius,
+ double zPosition,
+ int Layer,
+ int StrawLayer) const;
/* Calibration functions for occupancy corrections */
double hitOccupancyCorrection(const Trk::TrackStateOnSurface *itr) const;
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/TRT_SeededSpacePointFinderTool/SimpleTRT_SeededSpacePointFinder_ATL.h b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/TRT_SeededSpacePointFinderTool/SimpleTRT_SeededSpacePointFinder_ATL.h
index 400fd153c4b1bdfb0df6462406a16e16e1f4c2e2..46de857d44fa6336aaaee854252f4d38b58e4819 100755
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/TRT_SeededSpacePointFinderTool/SimpleTRT_SeededSpacePointFinder_ATL.h
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/TRT_SeededSpacePointFinderTool/SimpleTRT_SeededSpacePointFinder_ATL.h
@@ -26,7 +26,7 @@
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
class MsgStream;
@@ -122,7 +122,7 @@ namespace InDet{
/** Region Selector */
- ServiceHandle<IRegSelSvc> m_pRegionSelector;
+ ToolHandle<IRegSelTool> m_pRegionSelector{ this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" };
/**ID SCT helper*/
const SCT_ID* m_sctId;
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/SimpleTRT_SeededSpacePointFinder_ATL.cxx b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/SimpleTRT_SeededSpacePointFinder_ATL.cxx
index a18b2f4fd4fac731aac06fea503b703cf13f3afa..d73412d429559dd4ce9e15cfc1ebe454ac1ecf3e 100755
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/SimpleTRT_SeededSpacePointFinder_ATL.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/SimpleTRT_SeededSpacePointFinder_ATL.cxx
@@ -40,7 +40,6 @@ InDet::SimpleTRT_SeededSpacePointFinder_ATL::SimpleTRT_SeededSpacePointFinder_AT
m_directionEtaCut(0.5),
m_positionPhiCut(5.),
m_positionZ_Cut(250.),
- m_pRegionSelector("RegSelSvc",n),
m_sctId(nullptr),
m_trtId(nullptr)
{
@@ -243,7 +242,7 @@ void InDet::SimpleTRT_SeededSpacePointFinder_ATL::getHashesInROI(const Trk::Trac
//// AAAARGH!!! No checking that you are within the correct phi range???
RoiDescriptor roi( eta-deltaEta, eta+deltaEta, phi-deltaPhi, phi+deltaPhi);
- m_pRegionSelector->DetHashIDList(SCT, roi, listOfSCT_Hashes);
+ m_pRegionSelector->HashIDList( roi, listOfSCT_Hashes );
// copy Hashes into Set to be able to search them
for (std::vector<IdentifierHash>::const_iterator it = listOfSCT_Hashes.begin();
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVAInputEvaluator.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVAInputEvaluator.cxx
index a2742eb20f70228b3cb280b6948ad79efc20ed17..55c81e9c2849e162afa3be205f2df594d9d4f516 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVAInputEvaluator.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVAInputEvaluator.cxx
@@ -19,182 +19,182 @@ namespace {
using MiniEvaluator = CP::MVAInputEvaluator::MiniEvaluator;
-class Pt: public MiniEvaluator {
+class Pt final : public MiniEvaluator {
public:
Pt() {};
~Pt() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.pt();
}
};
-class Eta: public MiniEvaluator {
+class Eta final: public MiniEvaluator {
public:
Eta() {};
~Eta() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.eta();
}
};
-class M: public MiniEvaluator {
+class M final: public MiniEvaluator {
public:
M() {};
~M() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.m();
}
};
-class D0: public MiniEvaluator {
+class D0 final: public MiniEvaluator {
public:
D0() {};
~D0() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.d0();
}
};
-class ErrD0: public MiniEvaluator {
+class ErrD0 final: public MiniEvaluator {
public:
ErrD0() {};
~ErrD0() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(trk.definingParametersCovMatrix()(0, 0));
}
};
-class Z0: public MiniEvaluator {
+class Z0 final : public MiniEvaluator {
public:
Z0() {};
~Z0() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.z0();
}
};
-class ErrZ0: public MiniEvaluator {
+class ErrZ0 final : public MiniEvaluator {
public:
ErrZ0() {};
~ErrZ0() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(trk.definingParametersCovMatrix()(1, 1));
}
};
-class Phi: public MiniEvaluator {
+class Phi final : public MiniEvaluator {
public:
Phi() {};
~Phi() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.phi();
}
};
-class ErrPhi: public MiniEvaluator {
+class ErrPhi final : public MiniEvaluator {
public:
ErrPhi() {};
~ErrPhi() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(trk.definingParametersCovMatrix()(2, 2));
}
};
-class Theta: public MiniEvaluator {
+class Theta final : public MiniEvaluator {
public:
Theta() {};
~Theta() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.theta();
}
};
-class ErrTheta: public MiniEvaluator {
+class ErrTheta final : public MiniEvaluator {
public:
ErrTheta() {};
~ErrTheta() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(trk.definingParametersCovMatrix()(3, 3));
}
};
-class QOverP: public MiniEvaluator {
+class QOverP final : public MiniEvaluator {
public:
QOverP() {};
~QOverP() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.qOverP();
}
};
-class ErrQOverP: public MiniEvaluator {
+class ErrQOverP final : public MiniEvaluator {
public:
ErrQOverP() {};
~ErrQOverP() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(trk.definingParametersCovMatrix()(4, 4));
}
};
-class ChiSq: public MiniEvaluator {
+class ChiSq final : public MiniEvaluator {
public:
ChiSq() {};
~ChiSq() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return trk.chiSquared();
}
};
-class RedChiSq: public MiniEvaluator {
+class RedChiSq final : public MiniEvaluator {
public:
RedChiSq() {};
~RedChiSq() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& /*evt*/) const override final {
return (trk.chiSquared() / trk.numberDoF());
}
};
-class D0Sig: public MiniEvaluator {
+class D0Sig final : public MiniEvaluator {
public:
D0Sig() {};
~D0Sig() override final {};
- float eval(const xAOD::TrackParticle& trk, __attribute__((unused)) const xAOD::Vertex& vx, const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& /*vx*/, const xAOD::EventInfo& evt) const override final {
return xAOD::TrackingHelpers::d0significance(&trk, evt.beamPosSigmaX(), evt.beamPosSigmaY(), evt.beamPosSigmaXY());
}
};
-class DZ: public MiniEvaluator {
+class DZ final : public MiniEvaluator {
public:
DZ() {};
~DZ() override final {};
- float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return (trk.z0() + trk.vz() - vx.z());
}
};
-class ErrDZ: public MiniEvaluator {
+class ErrDZ final : public MiniEvaluator {
public:
ErrDZ() {};
~ErrDZ() override final {};
- float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(trk.definingParametersCovMatrix()(1, 1) + vx.covariancePosition()(2, 2));
}
};
-class DZSinTheta: public MiniEvaluator {
+class DZSinTheta final : public MiniEvaluator {
public:
DZSinTheta() {};
~DZSinTheta() override final {};
- float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return (trk.z0() + trk.vz() - vx.z()) * std::sin(trk.theta());
}
};
-class ErrDZSinTheta: public MiniEvaluator {
+class ErrDZSinTheta final : public MiniEvaluator {
public:
ErrDZSinTheta() {};
~ErrDZSinTheta() override final {};
- float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
float dz = (trk.z0() + trk.vz() - vx.z());
float sinTheta = std::sin(trk.theta());
float cosTheta = std::cos(trk.theta());
@@ -226,11 +226,11 @@ int inVector(const xAOD::TrackParticle* trk, const std::vector<const xAOD::Track
return -1;
}
-class FitWeight: public MiniEvaluator {
+class FitWeight final : public MiniEvaluator {
public:
FitWeight() {};
~FitWeight() override final {};
- float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
std::vector<const xAOD::TrackParticle*> fitTrks = toVector(vx.trackParticleLinks());
float weight = 0.0;
int pos = inVector(&trk, fitTrks);
@@ -241,56 +241,56 @@ public:
}
};
-class VxX: public MiniEvaluator {
+class VxX final : public MiniEvaluator {
public:
VxX() {};
~VxX() override final {};
- float eval(__attribute__((unused)) const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& /*trk*/, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return vx.x();
}
};
-class ErrVxX: public MiniEvaluator {
+class ErrVxX final : public MiniEvaluator {
public:
ErrVxX() {};
~ErrVxX() override final {};
- float eval(__attribute__((unused)) const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& /*trk*/, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(vx.covariancePosition()(0, 0));
}
};
-class VxY: public MiniEvaluator {
+class VxY final : public MiniEvaluator {
public:
VxY() {};
~VxY() override final {};
- float eval(__attribute__((unused)) const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& /*trk*/, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return vx.y();
}
};
-class ErrVxY: public MiniEvaluator {
+class ErrVxY final : public MiniEvaluator {
public:
ErrVxY() {};
~ErrVxY() override final {};
- float eval(__attribute__((unused)) const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& /*trk*/, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(vx.covariancePosition()(1, 1));
}
};
-class VxZ: public MiniEvaluator {
+class VxZ final : public MiniEvaluator {
public:
VxZ() {};
~VxZ() override final {};
- float eval(__attribute__((unused)) const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& /*trk*/, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return vx.z();
}
};
-class ErrVxZ: public MiniEvaluator {
+class ErrVxZ final : public MiniEvaluator {
public:
ErrVxZ() {};
~ErrVxZ() override final {};
- float eval(__attribute__((unused)) const xAOD::TrackParticle& trk, const xAOD::Vertex& vx, __attribute__((unused)) const xAOD::EventInfo& evt) const override final {
+ virtual float eval(const xAOD::TrackParticle& /*trk*/, const xAOD::Vertex& vx, const xAOD::EventInfo& /*evt*/) const override final {
return std::sqrt(vx.covariancePosition()(2, 2));
}
};
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVATrackVertexAssociationTool.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVATrackVertexAssociationTool.cxx
index 3c7563ab8dce30872b895fbdeccb1b1cb38b3324..16b2c4b3315d2a06520e1324d759c5c75089b1c4 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVATrackVertexAssociationTool.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/MVATrackVertexAssociationTool.cxx
@@ -241,7 +241,7 @@ StatusCode MVATrackVertexAssociationTool::initializeNetwork() {
// For sequential:
if (m_isSequential) {
lwt::JSONConfig netDef = lwt::parse_json(netFile);
- m_network = std::move(std::unique_ptr<lwt::LightweightNeuralNetwork>(new lwt::LightweightNeuralNetwork(netDef.inputs, netDef.layers, netDef.outputs)));
+ m_network = std::unique_ptr<lwt::LightweightNeuralNetwork>(new lwt::LightweightNeuralNetwork(netDef.inputs, netDef.layers, netDef.outputs));
}
// For functional:
else {
@@ -251,7 +251,7 @@ StatusCode MVATrackVertexAssociationTool::initializeNetwork() {
return StatusCode::FAILURE;
}
m_inputNodeName = netDef.inputs[0].name;
- m_graph = std::move(std::unique_ptr<lwt::LightweightGraph>(new lwt::LightweightGraph(netDef)));
+ m_graph = std::unique_ptr<lwt::LightweightGraph>(new lwt::LightweightGraph(netDef));
}
return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx
index b7e7ebf7557d7e81bf5dc1640e01974c00844bac..2ce4b611ac9b329d0c453449ddcc90c5f7af8060 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx
@@ -22,7 +22,7 @@
# include "xAODRootAccess/tools/ReturnCheck.h"
#endif
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
// EDM include(s):
#include "xAODTracking/TrackParticle.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h
index 69320dc0d480d05afe6e8f9ae2a56e49667635f2..745a9ae5d8cd28b7ec73911c57a5f10402b50afb 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h
@@ -44,8 +44,9 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "IRegionSelector/IRegSelTool.h"
+
-class IRegSelSvc;
class TrigTimer;
class PixelID;
class IROBDataProviderSvc;
@@ -116,7 +117,7 @@ namespace InDet {
const PixelID* m_idHelper{};
PixelClusterContainer* m_clusterContainer{};
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector{ this, "RegSelTool", "RegSelTool/RegSelTool_Pixel" }; //!< region selector service
bool m_doFullScan; //!< support for FullScan mode
double m_etaHalfWidth; //!< ROI half-width in eta
double m_phiHalfWidth; //!< ROI half-width in phi
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h
index 72e2844ccfc40925e094d1f392a646938072a7e4..971401aefd8845f167e10a6972350eb7abe44776 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h
@@ -37,7 +37,7 @@
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "Identifier/IdentifierHash.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "SiClusterizationTool/ISCT_ClusteringTool.h"
#include "InDetTrigToolInterfaces/ITrigRawDataProviderTool.h"
@@ -110,7 +110,7 @@ namespace InDet {
SCT_ClusterContainer* m_clusterContainer;
// !< Trigger part
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector{ this, "RegSelTool", "RegSelTool/RegSelTool_SCT" }; //!< region selector service
bool m_doFullScan; //!< support for FullScan mode
double m_etaHalfWidth; //!< ROI half-width in eta.
double m_phiHalfWidth; //!< ROI half-width in phi.
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h
index 78f85d6397de79f6c8bcb9779c0ef28ad695c44d..22c1d61f8dbd784f6aa22f8762ad53f1bfde4073 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h
@@ -33,7 +33,8 @@
//typedef - cannot be declared forward
#include "InDetPrepRawData/TRT_DriftCircleContainer.h"
-class IRegSelSvc;
+#include "IRegionSelector/IRegSelTool.h"
+
class TrigTimer;
class ITRT_ByteStream_ConditionsSvc;
class IROBDataProviderSvc;
@@ -84,7 +85,7 @@ namespace InDet{
InDet::TRT_DriftCircleContainer* m_riocontainer ;
int m_mode_rio_production;
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSelTool_TRT" }; //!< region selector service
ServiceHandle<ITRT_ByteStream_ConditionsSvc> m_bsErrorSvc;
ServiceHandle<IROBDataProviderSvc> m_robDataProvider; //!< ROB Data Provide Service
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/packagedoc.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/packagedoc.h
index 861903ddfae9d3347691be6cdd330b2127bbd62a..d034ff42b65c1984ceb1c28afd1941b3f6e4c155 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/packagedoc.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/doc/packagedoc.h
@@ -69,7 +69,7 @@ ErrorStrategy
Trigger-specific parameters are:
<ul>
-<li>RegionSelectorToolName = "RegSelSvc" name of the RegionSelector tool, </li>
+<li>RegSelToolName = "RegSelTool/RegSelTool_TRT" name of the RegSel tool, </li>
<li>EtaHalfWidth - RoI half-width in eta </li>
<li>PhiHalfWidth - RoI half-width in phi </li>
</ul>
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
index f3ff3c4f81df9497af46625f26a26e5aa8e4f1c7..1dd2cb7184bf8102200e8bc968acac9886f708ee 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
@@ -31,7 +31,7 @@
// Trigger
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "IRegionSelector/IRoiDescriptor.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
@@ -57,7 +57,6 @@ namespace InDet{
m_pixelRDOContainerName("PixelRDOs"), // RDO container
m_clustersName("PixelTrigClusters"),
m_ambiguitiesMapName("TrigPixelClusterAmbiguitiesMap"),
- m_regionSelector("RegSelSvc", name),
m_doFullScan(false),
m_etaHalfWidth(0.1),
m_phiHalfWidth(0.1),
@@ -71,7 +70,6 @@ namespace InDet{
declareProperty("ClustersName", m_clustersName);
declareProperty("AmbiguitiesMapName", m_ambiguitiesMapName);
- declareProperty("RegionSelectorTool", m_regionSelector);
declareProperty("doFullScan", m_doFullScan);
declareProperty("EtaHalfWidth", m_etaHalfWidth);
declareProperty("PhiHalfWidth", m_phiHalfWidth);
@@ -361,7 +359,7 @@ namespace InDet{
if (!(roi->isFullscan())){
if(doTiming()) m_timerRegSel->start();
- m_regionSelector->DetHashIDList( PIXEL, *roi, m_listOfPixIds);
+ m_regionSelector->HashIDList( *roi, m_listOfPixIds);
m_numPixIds = m_listOfPixIds.size();
ATH_MSG_DEBUG( "REGTEST: Pixel : Roi contains "
<< m_numPixIds << " det. Elements" );
@@ -619,12 +617,8 @@ namespace InDet{
<< " located at phi = " << roi->phi()
<< ", eta = " << roi->eta() );
-
- //const TrigRoiDescriptor fs(true);
-
std::vector<unsigned int> uIntListOfRobs;
- m_regionSelector->DetROBIDListUint( PIXEL, *roi, uIntListOfRobs );
- //m_regionSelector->DetROBIDListUint( PIXEL, fs, uIntListOfRobs );
+ m_regionSelector->ROBIDList( *roi, uIntListOfRobs );
ATH_MSG_DEBUG( "list of pre-registered ROB ID in PIX: " );
for(uint i_lid(0); i_lid<uIntListOfRobs.size(); i_lid++)
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
index dd13ab00bd9248fb3d72a1302289a9c4e1ca6b2d..7f629e254a4abfe769d7febf864e771a961df768 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
@@ -31,7 +31,7 @@
//Trigger
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "IRegionSelector/IRoiDescriptor.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
@@ -58,7 +58,6 @@ namespace InDet{
m_flaggedCondDataName("SCT_FlaggedCondData_TRIG"),
m_idHelper(0),
m_clusterContainer(nullptr),
- m_regionSelector("RegSelSvc", name),
m_doFullScan(false),
m_etaHalfWidth(0.1),
m_phiHalfWidth(0.1),
@@ -77,7 +76,6 @@ namespace InDet{
declareProperty("clusteringTool", m_clusteringTool);
declareProperty("ClustersName", m_clustersName);
declareProperty("FlaggedCondDataName", m_flaggedCondDataName);
- declareProperty("RegionSelectorTool", m_regionSelector );
declareProperty("doFullScan", m_doFullScan );
declareProperty("EtaHalfWidth", m_etaHalfWidth);
@@ -366,7 +364,7 @@ namespace InDet{
if (!(roi->isFullscan())){
if(doTiming()) m_timerRegSel->start();
- m_regionSelector->DetHashIDList(SCT, *roi, m_listOfSctIds );
+ m_regionSelector->HashIDList( *roi, m_listOfSctIds );
if(doTiming()) m_timerRegSel->stop();
m_numSctIds = m_listOfSctIds.size();
@@ -620,11 +618,8 @@ namespace InDet{
ATH_MSG_DEBUG( "REGTEST prepareROBs / event"
<< *roi);
- //const TrigRoiDescriptor fs(true);
-
std::vector<unsigned int> uIntListOfRobs;
- m_regionSelector->DetROBIDListUint( SCT, *roi, uIntListOfRobs );
- //m_regionSelector->DetROBIDListUint( SCT, fs, uIntListOfRobs );
+ m_regionSelector->ROBIDList( *roi, uIntListOfRobs );
ATH_MSG_DEBUG( "list of pre-registered ROB ID in SCT: " );
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
index 6b41fc716d9088e23a5076f756d66106caac1715..5dc99d7ae9b84de12b3fb845e5bd9d287070d672 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
@@ -22,7 +22,7 @@
//Trigger
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "IRegionSelector/IRoiDescriptor.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
@@ -43,7 +43,6 @@ namespace InDet{
m_driftcircle_tool("InDet::TRT_DriftCircleTool"),
m_riocontainer(0),
m_mode_rio_production(0),
- m_regionSelector("RegSelSvc", name),
m_bsErrorSvc("TRT_ByteStream_ConditionsSvc",name),
m_robDataProvider("ROBDataProviderSvc", name),
m_doFullScan(false),
@@ -293,7 +292,7 @@ namespace InDet{
if(doTiming()) m_timerRegSel->start();
- m_regionSelector->DetHashIDList( TRT, *roi, m_listOfTrtIds);
+ m_regionSelector->HashIDList( *roi, m_listOfTrtIds);
m_numTrtIds = m_listOfTrtIds.size();
if(doTiming()) m_timerRegSel->stop();
@@ -499,7 +498,7 @@ namespace InDet{
ATH_MSG_DEBUG( "REGTEST prepareROBs / event RoI " << *roi);
std::vector<unsigned int> uIntListOfRobs;
- m_regionSelector->DetROBIDListUint( TRT, *roi, uIntListOfRobs );
+ m_regionSelector->ROBIDList( *roi, uIntListOfRobs );
ATH_MSG_DEBUG( "list of pre-registered ROB ID in TRT: ");
for(auto i : uIntListOfRobs)
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigPixRawDataProvider.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigPixRawDataProvider.h
index 0c6feddca7897b7275f1f66bb4f5b6e30dc63285..ce5a4ef5be914491bafdcb794903062eebfa8435 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigPixRawDataProvider.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigPixRawDataProvider.h
@@ -26,12 +26,14 @@
#include "InDetRawData/PixelRDO_Container.h"
#include "InDetByteStreamErrors/IDCInDetBSErrContainer.h"
+#include "IRegionSelector/IRegSelTool.h"
+
#include <string>
class IRoiDescriptor;
class PixelID;
class IROBDataProviderSvc;
-class IRegSelSvc;
+
class IPixelRawDataProviderTool;
namespace InDet {
@@ -55,7 +57,9 @@ namespace InDet {
private:
- ServiceHandle<IRegSelSvc> m_regionSelector;
+
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSelTool_Pixel" };
+
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
ToolHandle<IPixelRawDataProviderTool> m_rawDataTool;
const PixelID* m_id;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigSCTRawDataProvider.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigSCTRawDataProvider.h
index 6b9091979554117c971a67a0e68881ab6e55c466..681f4fe663c3aae64f1529392c23e6a3eaefbf3b 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigSCTRawDataProvider.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigSCTRawDataProvider.h
@@ -28,11 +28,12 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IIncidentListener.h"
+#include "IRegionSelector/IRegSelTool.h"
+
#include <string>
class TrigRoiDescriptor;
class SCT_ID;
-class IRegSelSvc;
class IROBDataProviderSvc;
class MsgStream;
class IRoiDescriptor;
@@ -62,7 +63,7 @@ namespace InDet {
StatusCode initContainer();
private:
- ServiceHandle<IRegSelSvc> m_regionSelector;
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSelTool_SCT" };
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
ToolHandle<ISCTRawDataProviderTool> m_rawDataTool{this, "RawDataTool", "SCTRawDataProviderTool"};
ToolHandle<ISCT_CablingTool> m_cablingTool{this, "SCT_CablingTool", "SCT_CablingTool", "Tool to retrieve SCT Cabling"};
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigTRTRawDataProvider.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigTRTRawDataProvider.h
index fe0b3816a02cb49d1b29a255264046d3d83c92c9..bb51dd9f3c23f6fcf7a895ff11958683b7316a17 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigTRTRawDataProvider.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/InDetTrigRawDataProvider/TrigTRTRawDataProvider.h
@@ -25,13 +25,14 @@
#include "InDetRawData/TRT_RDO_Container.h"
#include "TRT_ConditionsServices/ITRT_ByteStream_ConditionsSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
+
#include <string>
class IRoiDescriptor;
class TRT_ID;
class ITRT_CablingSvc;
class IROBDataProviderSvc;
-class IRegSelSvc;
class ITRTRawDataProviderTool;
@@ -57,7 +58,7 @@ namespace InDet {
StatusCode initContainer();
private:
- ServiceHandle<IRegSelSvc> m_regionSelector;
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSetTool/RegSelTool_TRT" };
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
ToolHandle<ITRTRawDataProviderTool> m_rawDataTool;
ServiceHandle<ITRT_CablingSvc> m_IdMapping;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx
index 313b6bd8f45d254c0386912629815f5dd39970f4..0b29139012399b60dee918b25b0a25c4c672c9c2 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx
@@ -7,7 +7,7 @@
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "AthenaKernel/getMessageSvc.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "PixelRawDataByteStreamCnv/IPixelRawDataProviderTool.h"
@@ -26,7 +26,6 @@ namespace InDet {
const std::string& name,
const IInterface* parent) :
AthAlgTool(type,name,parent),
- m_regionSelector ("RegSelSvc", name),
m_robDataProvider ("ROBDataProviderSvc", name),
m_rawDataTool ("PixelRawDataProviderTool"),
m_id(0),
@@ -133,9 +132,8 @@ namespace InDet {
ATH_MSG_DEBUG ( "REGTEST:" << *roi );
//double zmax = 168;
- m_regionSelector->DetROBIDListUint( PIXEL,
- *roi,
- robIDlist);
+ m_regionSelector->ROBIDList( *roi, robIDlist );
+
} else {
msg(MSG::ERROR) << name() << " invoked without an RoI data " << endmsg;
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
index 40d1eda7c57cca80807dbcbece29df37ba4a5052..aeac885a8d55445875a6c43506b91d752290fa24 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
@@ -10,7 +10,7 @@
//#include "InDetRawData/InDetRawDataCLASS_DEF.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
@@ -25,7 +25,6 @@ namespace InDet {
const std::string& name,
const IInterface* parent) :
AthAlgTool(type,name,parent),
- m_regionSelector ("RegSelSvc", name),
m_robDataProvider ("ROBDataProviderSvc", name),
m_id(nullptr),
m_container(nullptr),
@@ -159,10 +158,7 @@ namespace InDet {
ATH_MSG_DEBUG( "REGTEST:" << *roi);
// double zmax = 168;
- m_regionSelector->DetROBIDListUint( SCT,
- *roi,
- robIDlist);
-
+ m_regionSelector->ROBIDList( *roi, robIDlist );
} else {
m_cablingTool->getAllRods(robIDlist);
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx
index b32400654e2f2e3bb520297bd24e54cb2373b5a6..17c65c76cf1ee8069460404d3cee0bdc4a8ea6f4 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigTRTRawDataProvider.cxx
@@ -8,7 +8,7 @@
#include "AthenaKernel/getMessageSvc.h"
#include "TRT_Cabling/ITRT_CablingSvc.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "TRT_RawDataByteStreamCnv/ITRTRawDataProviderTool.h"
#include "InDetByteStreamErrors/TRT_BSErrContainer.h"
@@ -24,7 +24,6 @@ namespace InDet {
const std::string& name,
const IInterface* parent) :
AthAlgTool(type,name,parent),
- m_regionSelector ("RegSelSvc", name),
m_robDataProvider ("ROBDataProviderSvc", name),
m_rawDataTool ("TRTRawDataProviderTool/InDetTrigTRTRawDataProviderTool"),
m_IdMapping ("TRT_CablingSvc",name),
@@ -132,10 +131,8 @@ namespace InDet {
// Get RoiDescriptor
ATH_MSG_DEBUG( "REGTEST:" << *roi );
- //double zmax = 168;
- m_regionSelector->DetROBIDListUint( TRT,
- *roi,
- robIDlist);
+ m_regionSelector->ROBIDList( *roi, robIDlist );
+
} else {
robIDlist = m_IdMapping->getAllRods();
}
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
index a41f07122facdde3ae898ba58cb8eb87e3fbde2b..2ce82cb6394b6bf7a947c7ac00d731ac482befcf 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
@@ -29,6 +29,8 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "IRegionSelector/IRegSelTool.h"
+
//!< Trigger specific stuff
#include "TrigInterfaces/FexAlgo.h"
@@ -36,7 +38,6 @@
//forward declarations
class TrigTimer;
-class IRegSelSvc;
namespace InDet {
class ISiSpacePointsSeedMaker;
@@ -113,7 +114,8 @@ namespace InDet {
ToolHandle< ISiTrackMaker > m_trackmaker; // Track maker
//!< Trigger part
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector_pixel { this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel" }; //!< pixel region selector tool
+ ToolHandle<IRegSelTool> m_regionSelector_sct { this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" }; //!< sct region selector tool
StringProperty m_prdToTrackMap
{this,"PRDtoTrackMap",""}; //!< optional map between PRDs and tracks to identify shared hits.
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
index 846f87dbca67697a91c03f99238fbf5ac6add9de..1ebedf8ca820b3f301ca52ce27de99aded402731 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
@@ -17,7 +17,7 @@
//Trigger stuff
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "IRegionSelector/IRoiDescriptor.h"
//tools
@@ -61,7 +61,6 @@ InDet::SiTrigSPSeededTrackFinder::SiTrigSPSeededTrackFinder
m_seedsmaker("InDet::SiSpacePointsSeedMaker_ATLxk/InDetTrigSiSpacePointsSeedMaker"),
m_zvertexmaker("InDet::SiZvertexMaker_xk/InDetTrigZvertexMaker"),
m_trackmaker("InDet::SiTrackMaker_xk/InDetTrigSiTrackMaker"),
- m_regionSelector("RegSelSvc", name),
m_etaHalfWidth(0.1),
m_phiHalfWidth(0.1),
m_doFullScan(false),
@@ -75,7 +74,6 @@ InDet::SiTrigSPSeededTrackFinder::SiTrigSPSeededTrackFinder
declareProperty("useZvertexTool",m_useZvertexTool);
declareProperty("useSeedMaker",m_useSeedMaker);
- declareProperty("RegionSelectorTool",m_regionSelector);
declareProperty("EtaHalfWidth", m_etaHalfWidth);
declareProperty("PhiHalfWidth", m_phiHalfWidth);
declareProperty("doFullScan", m_doFullScan);
@@ -167,10 +165,16 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltInitialize() {
if(!m_doFullScan){
// Retrieving Region Selector Tool
- if ( m_regionSelector.retrieve().isFailure() ) {
+ if ( m_regionSelector_pixel.retrieve().isFailure() ) {
msg() << MSG::FATAL
<< "Unable to retrieve RegionSelector tool "
- << m_regionSelector.type() << endmsg;
+ << m_regionSelector_pixel.type() << endmsg;
+ return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
+ }
+ if ( m_regionSelector_sct.retrieve().isFailure() ) {
+ msg() << MSG::FATAL
+ << "Unable to retrieve RegionSelector tool "
+ << m_regionSelector_sct.type() << endmsg;
return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
}
}
@@ -264,12 +268,12 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
m_timerRegSel->start();
// SCT hash id's:
- m_regionSelector->DetHashIDList(SCT, *roi, listOfSCTIds );
+ m_regionSelector_sct->HashIDList( *roi, listOfSCTIds );
m_nDetElSCT = listOfSCTIds.size();
// pixels hash id's:
- m_regionSelector->DetHashIDList( PIXEL, *roi, listOfPixIds);
+ m_regionSelector_pixel->HashIDList( *roi, listOfPixIds);
m_nDetElPixel = listOfPixIds.size();
if(doTiming())
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h
index c99b4b3470425bf96a0f3e611433ae9e281b76b8..ef36ccdb5280c02626e4d67f1db8f109794ae58b 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h
@@ -41,6 +41,8 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "IRegionSelector/IRegSelTool.h"
+
#include <string>
#include <vector>
@@ -49,7 +51,7 @@
class SpacePointCollection;
class SpacePointContainer;
class SpacePointOverlapCollection;
-class IRegSelSvc;
+
class TrigTimer;
namespace InDet{
@@ -98,7 +100,9 @@ namespace InDet{
ToolHandle< ITrigSCT_SpacePointTool > m_trigSpacePointTool;
ToolHandle< SiSpacePointMakerTool > m_SiSpacePointMakerTool;
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector_pixel { this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel" }; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector_sct { this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" }; //!< region selector service
+
bool m_doFullScan; //!< skip RegionSelector and indefFind for FullScan
double m_etaHalfWidth; //!< ROI half-width in eta
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx
index b3c30d1609c2f8cc1df278b7375b1506a866c4b1..e6c6919f1ce277d23c4c3f8dfc0dc482a0bd543f 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx
@@ -29,7 +29,7 @@ ATLAS Collaboration
// Trigger
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "TrigTimeAlgs/TrigTimer.h"
#include "GaudiKernel/ITHistSvc.h"
@@ -60,7 +60,6 @@ namespace InDet{
m_spOverlapColl(0),
m_trigSpacePointTool ("InDet::SCT_TrigSpacePointTool"),
m_SiSpacePointMakerTool ("InDet::SiSpacePointMakerTool"),
- m_regionSelector("RegSelSvc", name),
m_doFullScan(false),
m_etaHalfWidth(0.1),
m_phiHalfWidth(0.1)
@@ -80,7 +79,6 @@ namespace InDet{
declareProperty("ProcessOverlaps", m_overlap);
declareProperty("OverlapSPName", m_spOverlapName);
- declareProperty("RegionSelectorTool", m_regionSelector);
declareProperty("doFullScan", m_doFullScan);
declareProperty("EtaHalfWidth", m_etaHalfWidth );
declareProperty("PhiHalfWidth", m_phiHalfWidth );
@@ -138,14 +136,19 @@ namespace InDet{
if(!m_doFullScan){
// Retrieving Region Selector Tool:
- if ( m_regionSelector.retrieve().isFailure() ) {
- ATH_MSG_FATAL( "Unable to retrieve RegionSelector tool "
- << m_regionSelector.type() );
+ if ( m_regionSelector_pixel.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( "Unable to retrieve Pixel RegionSelector tool "
+ << m_regionSelector_pixel.type() );
+ return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
+ }
+ if ( m_regionSelector_sct.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( "Unable to retrieve SCT RegionSelector tool "
+ << m_regionSelector_sct.type() );
return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
}
}
else{
- ATH_MSG_INFO( "RegionSelector is not needed for FullScan " );
+ ATH_MSG_INFO( "RegionSelector is not needed for FullScan (not strictly true - we can use fullscan RoiDescriptors" );
}
// Get an Identifier helper object
@@ -440,10 +443,7 @@ namespace InDet{
if(!m_doFullScan){
// Get the SCT RDO's:
if(doTiming()) m_timerRegSel->resume();
-
- m_regionSelector->DetHashIDList(SCT,
- *roi,
- m_listOfSctIds );
+ m_regionSelector_sct->HashIDList( *roi, m_listOfSctIds );
if(doTiming()) m_timerRegSel->pause();
}
@@ -619,12 +619,8 @@ namespace InDet{
if(!m_doFullScan){
if(doTiming()) m_timerRegSel->resume();
-
- m_regionSelector->DetHashIDList( PIXEL,
- *roi,
- m_listOfPixIds);
-
- if(doTiming()) m_timerRegSel->pause();
+ m_regionSelector_pixel->HashIDList( *roi, m_listOfPixIds );
+ if(doTiming()) m_timerRegSel->pause();
}
m_nPix=0;
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder.h b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder.h
index f447b291a87883422c7a1ef89881bf7e67af83b0..13b5b6332002a8d5c1f1c3e56221247efafb9ed2 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder.h
@@ -36,10 +36,9 @@
//!< Trigger specific stuff
#include "TrigTimeAlgs/TrigTimerSvc.h"
#include "TrigInterfaces/FexAlgo.h"
+#include "IRegionSelector/IRegSelTool.h"
-class IRegSelSvc;
-
namespace InDet {
@@ -78,7 +77,7 @@ namespace InDet {
std::ostream& dump (std::ostream& out) const;
protected:
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector{ this, "RegSelTool", "RegSelTool/RegSelTool_TRT" }; //!< region selector service
double m_etaHalfWidth{}; //!< ROI half-width in eta.
double m_phiHalfWidth{}; //!< ROI half-width in phi.
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
index 23c9070448ccd1eba8cc415d09e832428d485c8f..1ccc01ce4b08b924b2858a91b77536f255b7a8a2 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
@@ -18,7 +18,7 @@
#include "TrkEventPrimitives/FitQuality.h"
#include "TrkTrack/TrackCollection.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
@@ -36,7 +36,6 @@ using namespace std;
InDet::TRT_TrigSeededTrackFinder::TRT_TrigSeededTrackFinder (const std::string& name, ISvcLocator* pSvcLocator)
: HLT::FexAlgo(name, pSvcLocator),
- m_regionSelector("RegSelSvc", name),
m_etaHalfWidth(0.1),
m_phiHalfWidth(0.1),
m_doFullScan(false),
@@ -49,7 +48,6 @@ InDet::TRT_TrigSeededTrackFinder::TRT_TrigSeededTrackFinder (const std::string&
m_doExtension = false ; //Find the track TRT extension
m_saveTRT = true ; //Save stand-alone TRT segments
- declareProperty("RegionSelectorTool" ,m_regionSelector ); //RegionSelector tool
declareProperty("EtaHalfWidth" ,m_etaHalfWidth ); //Eta half-width of RoI
declareProperty("PhiHalfWidth" ,m_phiHalfWidth ); //Phi half-width of RoI
declareProperty("doFullScan" ,m_doFullScan ); // Enables full scan mode
@@ -218,17 +216,15 @@ HLT::ErrorCode InDet::TRT_TrigSeededTrackFinder::hltExecute(const HLT::TriggerEl
// const double zmax= 168;
// SCT hash id's:
- m_regionSelector->DetHashIDList(SCT,
- *roi,
- listOfSCTIds );
+ m_regionSelector->HashIDList( *roi, listOfSCTIds );
m_nDetElSCT = listOfSCTIds.size();
if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << "Number of SCT detector elements:" << m_nDetElSCT << endmsg;
// pixels hash id's:
- m_regionSelector->DetHashIDList( PIXEL,
- *roi,
- listOfPixIds);
+ m_regionSelector->HashIDList( *roi, listOfPixIds );
+
+
m_nDetElPixel = listOfPixIds.size();
if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << "Number of Pixel detector elements:" << m_nDetElPixel << endmsg;
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h
index f2c1c03ecff5c715f89a8984de8807d778f77778..a73d01ac009e2600895d73a9eb6942062a067e11 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h
@@ -11,9 +11,12 @@
//!< Trigger specific stuff
#include "TrigInterfaces/FexAlgo.h"
+
+#include "IRegionSelector/IRegSelTool.h"
+
#include <iosfwd>
-class IRegSelSvc;
+
class TrigTimer;
namespace InDet {
@@ -72,7 +75,7 @@ namespace InDet {
MsgStream& dumpevent(MsgStream& out) const;
//!< Trigger part
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector{ this, "RegSelTool", "RegSelTool/RegSelTool_TRT" }; //!< region selector service
double m_etaHalfWidth{}; //!< ROI half-width in eta.
double m_phiHalfWidth{}; //!< ROI half-width in phi.
bool m_doFullScan{}; //!< supports FullScan mode
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
index c106ba7b5f4ec23d6c5a53b264857340394ab6aa..3990768571a4ff5e41ec057ef3042a81aa62d6a9 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
@@ -21,7 +21,7 @@
//Trigger stuff
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include <ostream>
@@ -33,13 +33,11 @@ InDet::TRT_TrigTrackSegmentsFinder::TRT_TrigTrackSegmentsFinder
(const std::string& name,ISvcLocator* pSvcLocator):
HLT::FexAlgo(name, pSvcLocator),
m_segmentsMakerTool("InDet::TRT_TrackSegmentsMaker_ATLxk/InDetTrigTRT_TrackSegmentsMaker"),
- m_regionSelector("RegSelSvc", name),
m_etaHalfWidth(0.1),
m_phiHalfWidth(0.1),
m_doFullScan(false)
{
declareProperty("SegmentsMakerTool", m_segmentsMakerTool);
- declareProperty("RegionSelector", m_regionSelector);
declareProperty("EtaHalfWidth", m_etaHalfWidth);
declareProperty("PhiHalfWidth", m_phiHalfWidth);
declareProperty("doFullScan", m_doFullScan);
@@ -131,9 +129,8 @@ HLT::ErrorCode InDet::TRT_TrigTrackSegmentsFinder::hltExecute(const HLT::Trigger
// TRT hash id's:
if(doTiming()) m_timerRegSel->start();
std::vector<IdentifierHash> listOfTRTIds;
- m_regionSelector->DetHashIDList(TRT,
- *roi,
- listOfTRTIds );
+ m_regionSelector->HashIDList( *roi,listOfTRTIds );
+
if(doTiming()) m_timerRegSel->stop();
if(doTiming()) m_timerSegMaker->resume();
diff --git a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py
index 771d5e3bb8dcc941e57ff2b313aa83a9b0e8e33e..0cd2a14338cfec574a0003943af9c97b0639a228 100755
--- a/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py
+++ b/InnerDetector/InDetValidation/InDetExperimentalReco/share/jobOptions_RecExCommon_masking.py
@@ -208,9 +208,6 @@ from IOVDbSvc.CondDB import conddb
conddb.addOverride ('/SCT/Manual/BadModules', 'SCTManualBadModules-000-00')
-ServiceMgr.SpecialPixelMapSvc.MaskLayers = True
-ServiceMgr.SpecialPixelMapSvc.LayersToMask = [0]
-
#ServiceMgr.InDetSCT_ModuleVetoSvc.MaskLayers = True
#ServiceMgr.InDetSCT_ModuleVetoSvc.MaskSide = -1
#ServiceMgr.InDetSCT_ModuleVetoSvc.DisksToMask = [-9]
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py
index 33cc4495a373d9863ed9aaaa441b681842bb7632..e3fd7b6337bc6331741f3f02ba2f4affe01fa0fb 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
-## purpose Python module to hold common flags to configure the InDetPhysValMonitoring
+## purpose Python module to hold common flags to configure the InDetPhysValMonitoring
##
from __future__ import print_function
@@ -44,6 +44,11 @@ class InDetPhysValFlagsJobProperty(JobProperty):
else:
return self.StoredValue
+class doValidateLargeD0Tracks(InDetPhysValFlagsJobProperty):
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+
class doValidateDBMTracks(InDetPhysValFlagsJobProperty):
statusOn = True
allowedTypes = ['bool']
@@ -138,7 +143,7 @@ class InDetPhysValJobProperties(JobPropertyContainer):
if hasattr(InDetFlags,'doDBM') and not InDetFlags.doDBM() :
self.checkThenSet(self.doValidateDBMTracks, False)
print (self)
-
+
def printInfo(self) :
pass
@@ -150,7 +155,7 @@ jobproperties.add_Container(InDetPhysValJobProperties)
_list_InDetPhysValJobProperties = [
Enabled,
doValidateDBMTracks,
- doValidateGSFTracks,
+ doValidateGSFTracks,
doValidateLooseTracks,
doValidateTightPrimaryTracks,
doValidateTracksInJets,
@@ -158,7 +163,8 @@ _list_InDetPhysValJobProperties = [
validateExtraTrackCollections,
doPhysValOutput,
doExpertOutput,
- setTruthStrategy
+ setTruthStrategy,
+ doValidateLargeD0Tracks
]
for j in _list_InDetPhysValJobProperties:
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py
index 667585ac116c59a8ecba534b31e4c1e8e53b9a45..a89451e96e6e039982b3dc75d3a804261be269fd 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
from InDetPhysValMonitoring.ConfigUtils import serviceFactory,toolFactory
@@ -61,13 +61,13 @@ def getInDetPhysValMonitoringTool(**kwargs) :
kwargs=setDefaults(kwargs,
JetContainerName ='' ,
FillTrackInJetPlots = False)
-
+
#adding the VeretxTruthMatchingTool
from InDetTruthVertexValidation.InDetTruthVertexValidationConf import InDetVertexTruthMatchTool
- kwargs=setDefaults(kwargs,
+ kwargs=setDefaults(kwargs,
useVertexTruthMatchTool = True,
VertexTruthMatchTool = toolFactory(InDetVertexTruthMatchTool) )
-
+
#Options for Truth Strategy : Requires full pile-up truth containers for some
if InDetPhysValFlags.setTruthStrategy() == 'All' or InDetPhysValFlags.setTruthStrategy() == 'PileUp' :
from RecExConfig.AutoConfiguration import IsInInputFile
@@ -78,9 +78,9 @@ def getInDetPhysValMonitoringTool(**kwargs) :
print ('WARNING Truth Strategy for InDetPhysValMonitoring set to %s but TruthPileupEvents are missing in the input; resetting to HardScatter only' % (InDetPhysValFlags.setTruthStrategy()))
elif InDetPhysValFlags.setTruthStrategy() != 'HardScatter' :
print ('WARNING Truth Strategy for for InDetPhysValMonitoring set to invalid option %s; valid flags are ["HardScatter", "All", "PileUp"]' % (InDetPhysValFlags.setTruthStrategy()))
-
-
+
+
else :
@@ -165,3 +165,14 @@ def getInDetPhysValMonitoringToolDBM(**kwargs) :
useTrackSelection = True)
return getInDetPhysValMonitoringTool(**kwargs)
+
+def getInDetLargeD0PhysValMonitoringTool(**kwargs) :
+ from InDetRecExample.InDetJobProperties import InDetFlags
+ from InDetRecExample.InDetKeys import InDetKeys
+ kwargs=setDefaults(kwargs,
+ name = 'InDetPhysValMonitoringToolLargeD0',
+ SubFolder = 'LargeD0/',
+ TrackParticleContainerName = InDetKeys.xAODLargeD0TrackParticleContainer() if InDetFlags.storeSeparateLargeD0Container() else InDetKeys.xAODTrackParticleContainer(),
+ useTrackSelection = True)
+
+ return getInDetPhysValMonitoringTool(**kwargs)
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
index 72aa64a3a8fd7522965b25b80df70910fe9509d0..301f6400d608b5d66d412d9c7ec65ab33232b141 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
@@ -376,7 +376,7 @@
<y title="Entries"/>
</h>
<h id="residualx_pixel_barrel" type="TH1F" title="Residual: Pixel Barrel X">
- <x title="x residual(#mum)" n="100" lo="-100.0" hi="100.0"/>
+ <x title="x residual(#mum)" n="100" lo="-100.0" hi="100.0"/>
<y title="Entries"/>
</h>
<h id="residualx_pixel_barrel_1hit" type="TH1F" title="Residual: Pixel Barrel X 1 hit">
@@ -388,7 +388,7 @@
<y title="Entries"/>
</h>
<h id="residualx_sct_barrel" type="TH1F" title="Residual: SCT Barrel X">
- <x title="x residual(#mum)" n="1200" lo="-600" hi="600"/>
+ <x title="x residual(#mum)" n="1200" lo="-600" hi="600"/>
<y title="Entries"/>
</h>
<h id="residualx_sct_barrel_1hit" type="TH1F" title="Residual: SCT Barrel X 1 hit">
@@ -401,7 +401,7 @@
</h>
<!-- endcaps -->
<h id="residualx_pixel_endcap" type="TH1F" title="Residual: Pixel Endcap X">
- <x title="x residual(#mum)" n="100" lo="-100.0" hi="100.0"/>
+ <x title="x residual(#mum)" n="100" lo="-100.0" hi="100.0"/>
<y title="Entries"/>
</h>
<h id="residualx_pixel_endcap_1hit" type="TH1F" title="Residual: Pixel Endcap X 1 hit">
@@ -413,7 +413,7 @@
<y title="Entries"/>
</h>
<h id="residualx_sct_endcap" type="TH1F" title="Residual: SCT Endcap X">
- <x title="x residual(#mum)" n="1200" lo="-600" hi="600"/>
+ <x title="x residual(#mum)" n="1200" lo="-600" hi="600"/>
<y title="Entries"/>
</h>
<h id="residualx_sct_endcap_1hit" type="TH1F" title="Residual: SCT Endcap X 1 hit">
@@ -439,7 +439,7 @@
<y title="Entries"/>
</h>
<h id="residualy_pixel_barrel" type="TH1F" title="Residual: Pixel Barrel Y">
- <x title="y residual(#mum)" n="100" lo="-1000.0" hi="1000.0"/>
+ <x title="y residual(#mum)" n="100" lo="-1000.0" hi="1000.0"/>
<y title="Entries"/>
</h>
<h id="residualy_pixel_barrel_1hit" type="TH1F" title="Residual: Pixel Barrel Y 1 hit">
@@ -464,7 +464,7 @@
</h>
<!-- endcaps -->
<h id="residualy_pixel_endcap" type="TH1F" title="Residual: Pixel Endcap Y">
- <x title="y residual(#mum)" n="100" lo="-1000.0" hi="1000.0"/>
+ <x title="y residual(#mum)" n="100" lo="-1000.0" hi="1000.0"/>
<y title="Entries"/>
</h>
<h id="residualy_pixel_endcap_1hit" type="TH1F" title="Residual: Pixel Endcap Y 1 hit">
@@ -625,7 +625,7 @@
<h id="efficiency_vs_eta" type="TEfficiency" title="Fraction of reco-matched truth track">
<x title="#eta" n="20" lo="-&ETA;" hi="&ETA;"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
-</h>
+</h>
<h id="efficiency_vs_pt" type="TEfficiency" title="Fraction of reco-matched truth track">
<x title="p_{T} [GeV]" n="25" lo="0" hi="50"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
@@ -674,7 +674,7 @@
<h id="fakerate_vs_eta" type="TEfficiency" title="Fractions of reco-tracks with matching probability < 50%">
<x title="#eta" n="20" lo="-&ETA;" hi="&ETA;"/>
<y title="Fake Rate" lo="0.0" hi="2.0"/>
-</h>
+</h>
<h id="fakerate_vs_pt" type="TEfficiency" title="Fractions of reco-tracks with matching probability < 50%">
<x title="p_{T} [GeV]" n="100" lo="0" hi="50.0"/>
<y title="Fake Rate" lo="0.0" hi="2.0"/>
@@ -945,7 +945,7 @@
<x title="reco_{z_{0} #times sin} - truth_{z_{0} #times sin}" n="100" lo="-&Z0SINRES;" hi="&Z0SINRES;"/>
<y title="Number of Entries"/>
</h>
-
+
<h id="sigma_d0" type="TH1F" title="#sigma(d_{0})">
<x title="#sigma(d_{0}) [mm]" n="100" lo="0" hi="&D0RES;"/>
<y title="Number of Entries"/>
@@ -1059,7 +1059,7 @@
<x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
<y title="reco_{z_{0} #times sin} - truth_{z_{0} #times sin} [mm]" n="1000" lo="-&Z0SINRES;" hi="&Z0SINRES;"/>
</h>
-
+
<h id="pullHelper_eta_d0" type="TH2F" title="pull vs #eta for d_{0}">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
@@ -1471,82 +1471,82 @@
<h id="sigma_vs_eta_d0" type="TProfile" title="#sigma(d_{0}) vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="#sigma(d_{0}) [mm}" lo="-1.5" hi="1.5"/>
-</h>
+</h>
<h id="sigma_vs_eta_z0" type="TProfile" title="#sigma(z_{0}) vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="#sigma(z_{0}) [mm]" lo="-10.0" hi="10.0"/>
-</h>
+</h>
<h id="sigma_vs_eta_qoverp" type="TProfile" title="#sigma_{qoverp} vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="#sigma_{qoverp}" lo="-2.5e-5" hi="2.5e-5"/>
-</h>
+</h>
<h id="sigma_vs_eta_ptqopt" type="TProfile" title="p_{T} #times #sigma(q/p_{T}) vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="p_{T} #times #sigma(q/p_{T})" lo="-15.0" hi="15.0"/>
-</h>
+</h>
<h id="sigma_vs_eta_pt" type="TProfile" title="#sigma_{pt} vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="#sigma_{pt}" lo="0.0" hi="100"/>
-</h>
+</h>
<h id="sigma_vs_eta_theta" type="TProfile" title="#sigma(#theta) vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="#sigma(#theta)" lo="-0.01" hi="0.01"/>
-</h>
+</h>
<h id="sigma_vs_eta_phi" type="TProfile" title="#sigma(#phi) vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="#sigma(#phi) [rads]" lo="-0.01" hi="0.01"/>
-</h>
+</h>
<h id="sigma_vs_eta_z0sin" type="TProfile" title="#sigma(z_{0} #times sin) vs #eta">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="#sigma(z_{0} #times sin)" lo="-0.2" hi="0.2"/>
-</h>
+</h>
<h id="sigma_vs_pt_d0" type="TProfile" title="#sigma(d_{0}) vs p_{T}">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="#sigma(d_{0}) [mm]" lo="-1.5" hi="1.5"/>
-</h>
+</h>
<h id="sigma_vs_pt_z0" type="TProfile" title="#sigma(z_{0}) vs p_{T}">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="#sigma(z_{0}) [mm]" lo="-10.0" hi="10.0"/>
-</h>
+</h>
<h id="sigma_vs_pt_qoverp" type="TProfile" title="#sigma_{qoverp} vs pT">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="#sigma_{qoverp}" lo="-2.5e-5" hi="2.5e-5"/>
-</h>
+</h>
<h id="sigma_vs_pt_ptqopt" type="TProfile" title="p_{T} #times #sigma(q/p_{T}} vs p_{T}">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="p_{T} #times #sigma(q/p_{T})" lo="-15.0" hi="15.0"/>
-</h>
+</h>
<h id="sigma_vs_pt_pt" type="TProfile" title="#sigma_{pt} vs pT">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="#sigma_{pt}" lo="-100.0" hi="100.0"/>
-</h>
+</h>
<h id="sigma_vs_pt_theta" type="TProfile" title="#sigma(#theta) vs p_{T}">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="#sigma(#theta) [rads]" lo="-0.01" hi="0.01" />
-</h>
+</h>
<h id="sigma_vs_pt_phi" type="TProfile" title="#sigma(phi) vs p_{T}">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="#sigma(#phi) [rads]" lo="-0.01" hi="0.01"/>
-</h>
+</h>
<h id="sigma_vs_pt_z0sin" type="TProfile" title="#sigma(z_{0} #times sin) vs p_{T}">
<x title="p_{T} [GeV]" n="&NETA;" lo="0.0" hi="100"/>
<y title="#sigma(z_{0} #times sin)" lo="-0.2" hi="0.2"/>
-</h>
+</h>
<!-- End of standard resolution plots-->
@@ -1606,7 +1606,7 @@
<x title="reco_{#chi^2/ndof}" n="100" lo="0.0" hi="5.0"/>
<y title="Number of Entries"/>
</h>
-
+
<h id="reco_author" type="TH1F" title="reco_{author}">
<x title="reco_{author}" n="52" lo="0" hi="52"/>
<y title="Number of Entries"/>
@@ -1621,6 +1621,16 @@
<y title="reco_{#eta}" n="100" lo="-&ETA;" hi="&ETA;"/>
</h>
+<h id="reco_d0_vs_z0" type="TH2F" title="reco d_{T} vs z_{0}">
+ <x title="reco_{d_0}" n="100" lo="-20" hi="20"/>
+ <y title="reco_{z_{0}}" n="100" lo="-250" hi="250"/>
+</h>
+
+<h id="reco_d0_vs_z0sin" type="TH2F" title="reco d_{T} vs z_{0} sin #theta">
+ <x title="reco_{d_0}" n="100" lo="-20" hi="20"/>
+ <y title="reco_{z_{0} sin #theta}" n="100" lo="-10" hi="10"/>
+</h>
+
<h id="truth_d0" type="TH1F" title="truth_{d_{0}}">
<x title="truth_{d0} [mm]" n="100" lo="-&D0PARA;" hi="&D0PARA;"/>
<y title="Number of Entries"/>
@@ -1870,7 +1880,7 @@
<h id="efficiency_vs_dR" type="TEfficiency" title="Fraction of reco-matched truth track versus #DeltaR">
<x title="#DeltaR" n="40" lo="0.0" hi="&DRMAX;"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
-</h>
+</h>
<h id="efficiency_vs_smalldR" type="TEfficiency" title="Fraction of reco-matched truth track versus #DeltaR">
<x title="#DeltaR" n="40" lo="0.0" hi="&SMALLDRMAX;"/>
@@ -1886,7 +1896,7 @@
<h id="fakerate_vs_dR" type="TEfficiency" title="Fake rate versus #DeltaR">
<x title="#DeltaR" n="40" lo="0.0" hi="&DRMAX;"/>
<y title="Fake Rate" lo="0.0" hi="2.0"/>
-</h>
+</h>
<h id="fakerate_vs_smalldR" type="TEfficiency" title="Fake rate versus #DeltaR">
<x title="#DeltaR" n="40" lo="0.0" hi="&SMALLDRMAX;"/>
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPhysValMonitoring_topOptions.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPhysValMonitoring_topOptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..e6162297b276e2a167c6eb1370510b647bcaeb21
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPhysValMonitoring_topOptions.py
@@ -0,0 +1,59 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# Define a few configuration arguments that can be passed by the user via the command line.
+# Avoid the need of hacking the job option file
+def GetCustomAthArgs():
+ from AthenaCommon.AthArgumentParser import AthArgumentParser
+ IDPVMparser = AthArgumentParser(description='Parser for IDPVM configuration')
+ IDPVMparser.add_argument("--doTightPrimary", help='also run tight-primary plots', action='store_true', default=False)
+ IDPVMparser.add_argument("--doTracksInJets", help='also run tracks in jets', action='store_true', default=False)
+ IDPVMparser.add_argument("--doTracksInBJets", help='also run tracks in jets', action='store_true', default=False)
+ IDPVMparser.add_argument("--doExpertPlots", help='run additional expert-level plots', action='store_true', default=False)
+ IDPVMparser.add_argument("--outputFile", help='Name of output file',default="M_output.root")
+ IDPVMparser.add_argument("--HSFlag", help='Hard-scatter flag - decides what is used for truth matching', choices=['HardScatter', 'All', 'PileUp'],default="HardScatter")
+ return IDPVMparser.parse_args()
+
+# Parse the arguments
+MyArgs = GetCustomAthArgs()
+
+# Forward the args into the InDetPhysValFlags used to steer our job
+from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags
+InDetPhysValFlags.setTruthStrategy.set_Value_and_Lock(MyArgs.HSFlag)
+InDetPhysValFlags.doExpertOutput.set_Value_and_Lock(MyArgs.doExpertPlots)
+InDetPhysValFlags.doPhysValOutput.set_Value_and_Lock(not MyArgs.doExpertPlots)
+InDetPhysValFlags.doValidateTracksInBJets.set_Value_and_Lock(MyArgs.doTracksInBJets)
+InDetPhysValFlags.doValidateTracksInJets.set_Value_and_Lock(MyArgs.doTracksInJets)
+InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(MyArgs.doTightPrimary)
+
+# Print the configuration
+print(" ==== Final Phys Val flags to run === ")
+print(InDetPhysValFlags)
+
+# Set up the I/O and the RecExCommon infrastructure
+from InDetRecExample.InDetJobProperties import InDetFlags
+InDetFlags.doSlimming.set_Value_and_Lock(False)
+rec.doTrigger.set_Value_and_Lock(False)
+include( "AthenaPython/iread_file.py" )
+
+# Add our monitoring manager to the topSequence
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
+monMan = AthenaMonManager( "PhysValMonManager",
+ FileKey = "M_output",
+ Environment = "altprod",
+ ManualDataTypeSetup = True,
+ DataType = "monteCarlo",
+ ManualRunLBSetup = True,
+ Run = 1,
+ LumiBlock = 1 )
+topSequence += monMan
+
+# Now we can attach our IDPVM tool instances
+# To do this, we leverage the existing job options from PhysValMonitoring
+include ("PhysValMonitoring/PhysValInDet_jobOptions.py")
+
+# finally, set up the infrastructure for writing our output
+from GaudiSvc.GaudiSvcConf import THistSvc
+ServiceMgr += THistSvc()
+svcMgr.THistSvc.Output += ["M_output DATAFILE='"+MyArgs.outputFile+"' OPT='RECREATE'"]
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.cxx
index 3220f56896f6f0fcb97249abd97df64445f4cc98..104e72335cfd3d13b4d58700bdf4e436b92abe2a 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.cxx
@@ -45,6 +45,10 @@ InDetPerfPlot_TrackParameters::InDetPerfPlot_TrackParameters(InDetPlotBase* pPar
m_reco_pt_vs_eta{},
m_reco_phi_vs_eta{},
+ m_reco_d0_z0{},
+ m_reco_d0_z0sin{},
+
+
m_truth_pt_vs_eta{},
m_truth_phi_vs_eta{} {
}
@@ -76,11 +80,14 @@ InDetPerfPlot_TrackParameters::initializePlots() {
book(m_truth_pt, "truth_pt");
book(m_truth_lowpt, "truth_lowpt");
book(m_truth_prodR, "truth_prodR");
- book(m_truth_prodZ, "truth_prodZ");
+ book(m_truth_prodZ, "truth_prodZ");
book(m_reco_pt_vs_eta, "reco_pt_vs_eta");
book(m_reco_phi_vs_eta, "reco_phi_vs_eta");
+ book(m_reco_d0_z0, "reco_d0_vs_z0");
+ book(m_reco_d0_z0sin, "reco_d0_vs_z0sin");
+
book(m_truth_pt_vs_eta, "truth_pt_vs_eta");
book(m_truth_phi_vs_eta, "truth_phi_vs_eta");
@@ -92,7 +99,7 @@ InDetPerfPlot_TrackParameters::fill(const xAOD::TruthParticle& particle) {
// quantities with xAOD::TruthParticle accessors:
float eta = particle.eta();
float pt = particle.pt() / Gaudi::Units::GeV;
-
+
float d0 = (particle.isAvailable<float>("d0")) ? particle.auxdata<float>("d0") : -9999.;
float z0 = (particle.isAvailable<float>("z0")) ? particle.auxdata<float>("z0") : -9999.;
float theta = (particle.isAvailable<float>("theta")) ? particle.auxdata<float>("theta") : -9999.;
@@ -110,7 +117,7 @@ InDetPerfPlot_TrackParameters::fill(const xAOD::TruthParticle& particle) {
if(qOverP > -9000.) fillHisto(m_truth_qoverp, qOverP);
if(prodR > -9000.) fillHisto(m_truth_prodR, prodR);
if(prodZ > -9000.) fillHisto(m_truth_prodZ, prodZ);
-
+
fillHisto(m_truth_eta, eta);
fillHisto(m_truth_pt, pt);
fillHisto(m_truth_lowpt, pt);
@@ -126,15 +133,15 @@ InDetPerfPlot_TrackParameters::fill(const xAOD::TrackParticle& particle) {
float pt = particle.pt() / Gaudi::Units::GeV;
float eta = particle.eta();
float phi = particle.phi0();
-
+
float chi2 = particle.chiSquared();
float ndof = particle.numberDoF();
float chi2Overndof = ndof > 0 ? chi2 / ndof : 0;
-
+
fillHisto(m_reco_d0, particle.d0());
fillHisto(m_reco_z0, particle.z0());
- fillHisto(m_reco_z0sin, particle.z0()* particle.theta());
+ fillHisto(m_reco_z0sin, particle.z0()* std::sin(particle.theta()));
fillHisto(m_reco_phi, phi);
fillHisto(m_reco_theta, particle.theta());
@@ -146,13 +153,16 @@ InDetPerfPlot_TrackParameters::fill(const xAOD::TrackParticle& particle) {
fillHisto(m_reco_pt_vs_eta, pt, eta);
fillHisto(m_reco_phi_vs_eta, phi, eta);
+ fillHisto(m_reco_d0_z0, particle.d0(), particle.z0());
+ fillHisto(m_reco_d0_z0sin, particle.d0(), particle.z0()*std::sin(particle.theta()));
+
fillHisto(m_reco_chi2, chi2);
fillHisto(m_reco_ndof, ndof);
fillHisto(m_reco_chi2Overndof, chi2Overndof);
std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = particle.patternRecoInfo();
for(unsigned int i = 0; i < xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo; i++){
- if(patternInfo.test(i)) fillHisto(m_reco_author, i);
+ if(patternInfo.test(i)) fillHisto(m_reco_author, i);
}
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.h
index ce9a73c043086ed5d6f78cb501d9dfac1149bb35..126192b1ebc7d3d5ae85e6cc92ceb1f081c4886f 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrackParameters.h
@@ -56,6 +56,9 @@ private:
TH2* m_reco_pt_vs_eta;
TH2* m_reco_phi_vs_eta;
+ TH2* m_reco_d0_z0;
+ TH2* m_reco_d0_z0sin;
+
TH2* m_truth_pt_vs_eta;
TH2* m_truth_phi_vs_eta;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx
index 97747e432fab52c1c20993c774836b2db0504434..22fc13f0e0462fa19f3143b194c9351508d5621d 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx
@@ -19,7 +19,7 @@
using namespace IDPVM;
-InDetPerfPlot_TrkInJet::InDetPerfPlot_TrkInJet(InDetPlotBase* pParent, std::string sDir) :
+InDetPerfPlot_TrkInJet::InDetPerfPlot_TrkInJet(InDetPlotBase* pParent, std::string sDir, bool bookFakeAndEff) :
InDetPlotBase(pParent, sDir),
m_nInnerMostPixelHits_vs_dR{},
@@ -68,7 +68,8 @@ InDetPerfPlot_TrkInJet::InDetPerfPlot_TrkInJet(InDetPlotBase* pParent, std::stri
m_fakerate_vs_dR{},
m_fakerate_vs_smalldR{},
- m_fakerate_vs_jetpT{} {
+ m_fakerate_vs_jetpT{},
+ m_doFakeAndEff(bookFakeAndEff) {
//nop
@@ -119,14 +120,15 @@ InDetPerfPlot_TrkInJet::initializePlots() {
book(m_reco_lowpt_vs_dR, "reco_lowpt_vs_dR");
book(m_reco_chi2Overndof_vs_dR, "reco_chi2Overndof_vs_dR");
-
- book(m_efficiency_vs_dR, "efficiency_vs_dR");
- book(m_efficiency_vs_smalldR, "efficiency_vs_smalldR");
- book(m_efficiency_vs_jetpT, "efficiency_vs_jetpT");
-
- book(m_fakerate_vs_dR, "fakerate_vs_dR");
- book(m_fakerate_vs_smalldR, "fakerate_vs_smalldR");
- book(m_fakerate_vs_jetpT, "fakerate_vs_jetpT");
+ if (m_doFakeAndEff){
+ book(m_efficiency_vs_dR, "efficiency_vs_dR");
+ book(m_efficiency_vs_smalldR, "efficiency_vs_smalldR");
+ book(m_efficiency_vs_jetpT, "efficiency_vs_jetpT");
+
+ book(m_fakerate_vs_dR, "fakerate_vs_dR");
+ book(m_fakerate_vs_smalldR, "fakerate_vs_smalldR");
+ book(m_fakerate_vs_jetpT, "fakerate_vs_jetpT");
+ }
}
@@ -252,7 +254,7 @@ InDetPerfPlot_TrkInJet::fill(const xAOD::TrackParticle& trk, const xAOD::Jet& je
void
InDetPerfPlot_TrkInJet::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::Jet& jet, const bool isGood) {
-
+ if (!m_doFakeAndEff) return;
float dR = jet.p4().DeltaR(truth.p4());
float jetpT = jet.pt() / Gaudi::Units::GeV;
fillHisto(m_efficiency_vs_dR, dR, isGood);
@@ -263,6 +265,7 @@ InDetPerfPlot_TrkInJet::fillEfficiency(const xAOD::TruthParticle& truth, const x
void
InDetPerfPlot_TrkInJet::fillFakeRate(const xAOD::TrackParticle& trk, const xAOD::Jet& jet, const bool isFake) {
+ if (!m_doFakeAndEff) return;
float dR = jet.p4().DeltaR(trk.p4());
float jetpT = jet.pt() / Gaudi::Units::GeV;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.h
index d4d082013d21d5ac1c5ac91533cf737227729acb..c509b8a391709f063dc21f7dee24a62ee4f00124 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.h
@@ -14,7 +14,7 @@
class InDetPerfPlot_TrkInJet: public InDetPlotBase {
public:
- InDetPerfPlot_TrkInJet(InDetPlotBase* pParent, std::string sDir);
+ InDetPerfPlot_TrkInJet(InDetPlotBase* pParent, std::string sDir, bool bookFakeAndEff=true);
void fill(const xAOD::TrackParticle& trk, const xAOD::Jet& jet);
void fillEfficiency(const xAOD::TruthParticle& trk, const xAOD::Jet& jet, const bool isEfficient);
@@ -72,6 +72,8 @@ private:
TEfficiency* m_fakerate_vs_smalldR;
TEfficiency* m_fakerate_vs_jetpT;
+ bool m_doFakeAndEff;
+
};
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_VertexTruthMatching.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_VertexTruthMatching.cxx
index c4745c4f26265ddd1194dbe1198538e6bfe0cc60..62f5a53a690ee847c4eb935ed5c4f3b5ad0bc621 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_VertexTruthMatching.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_VertexTruthMatching.cxx
@@ -271,6 +271,10 @@ void InDetPerfPlot_VertexTruthMatching::fill(const xAOD::VertexContainer& vertex
// Did we correctly select the best reco HS vertex using sumpt2?
truthVtx = getTruthVertex(bestRecoHSVtx_sumpt2);
+ if (!truthVtx){
+ ATH_MSG_INFO("No truth HS - not filling vertex truth matching.");
+ return;
+ }
localPUDensity = getLocalPUDensity(truthVtx, truthHSVertices, truthPUVertices);
fillHisto(m_vx_hs_sel_eff, localPUDensity, (bestRecoHSVtx_sumpt2 == bestRecoHSVtx_truth));
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
index d68b26f4c418b2917822aad7d233b37e77f30de0..847a361f5f68845d1a2342fb5ca5b371d5ad4b3c 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
@@ -452,7 +452,6 @@ InDetPhysValMonitoringTool::fillHistograms() {
}
}
for (auto thisTrack: *tracks) { // The beginning of the track loop
- bool isFakeJet = false;
if (m_useTrackSelection and not (m_trackSelectionTool->accept(*thisTrack, primaryvertex))) {
continue;
}
@@ -461,15 +460,13 @@ InDetPhysValMonitoringTool::fillHistograms() {
}
float prob = getMatchingProbability(*thisTrack);
if(std::isnan(prob)) prob = 0.0;
- m_monPlots->fill(*thisTrack, *thisJet,isBjet);
const xAOD::TruthParticle* associatedTruth = getAsTruth.getTruth(thisTrack);
-
+ const bool unlinked = (associatedTruth==nullptr);
+ const bool isFake = (associatedTruth && prob < m_lowProb);
+ m_monPlots->fill(*thisTrack, *thisJet,isBjet,isFake,unlinked);
if (associatedTruth){
- if(m_truthSelectionTool->accept(associatedTruth) and prob < m_lowProb ) {
- isFakeJet = true;
- }
- m_monPlots->fillFakeRate(*thisTrack, *thisJet, isFakeJet,isBjet);
+ m_monPlots->fillFakeRate(*thisTrack, *thisJet, isFake,isBjet);
}
}
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
index 90c0762ab9b02812de3762ddafcb78b5901f3301..371722d08458c3aaa6de50c7ad5200bc521b6ed8 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
@@ -42,6 +42,8 @@ InDetRttPlots::InDetRttPlots(InDetPlotBase* pParent, const std::string& sDir, co
if(m_iDetailLevel >= 200){
m_resolutionPlotSecd = std::make_unique<InDetPerfPlot_Resolution>(this, "Tracks/Matched/Resolutions/Secondary");
m_hitsMatchedTracksPlots = std::make_unique<InDetPerfPlot_Hits>(this, "Tracks/Matched/HitsOnTracks");
+ m_hitsFakeTracksPlots = std::make_unique<InDetPerfPlot_Hits>(this, "Tracks/Fakes/HitsOnTracks");
+ m_hitsUnlinkedTracksPlots = std::make_unique<InDetPerfPlot_Hits>(this, "Tracks/Unlinked/HitsOnTracks");
m_vertexTruthMatchingPlots = std::make_unique<InDetPerfPlot_VertexTruthMatching>(this, "Vertices/AllPrimaryVertices", m_iDetailLevel);
//Split by track author
@@ -74,8 +76,18 @@ InDetRttPlots::InDetRttPlots(InDetPlotBase* pParent, const std::string& sDir, co
//A lot of Jets... do we need these at all???
if(m_doTrackInJetPlots){
m_trkInJetPlots = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInJets/Tracks");
+ if (m_iDetailLevel >= 200){
+ m_trkInJetPlots_matched = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInJets/Matched",false);
+ m_trkInJetPlots_fake = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInJets/Fakes",false);
+ m_trkInJetPlots_unlinked = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInJets/Unlinked",false);
+ }
if(m_doTrackInBJetPlots){
m_trkInJetPlots_bjets = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInBJets/Tracks");
+ if (m_iDetailLevel >= 200){
+ m_trkInJetPlots_matched_bjets = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInBJets/Matched",false);
+ m_trkInJetPlots_fake_bjets = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInBJets/Fakes",false);
+ m_trkInJetPlots_unlinked_bjets = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInBJets/Unlinked",false);
+ }
}
}
}
@@ -230,7 +242,10 @@ InDetRttPlots::fillFakeRate(const xAOD::TrackParticle& track, const bool isFake,
m_missingTruthFakePlots.fill(track, !isAssociatedTruth);
m_anTrackingPlots.fillUnlinked(track, !isAssociatedTruth, mu, nVtx);
-
+ if(m_iDetailLevel >= 200){
+ if (!isAssociatedTruth) m_hitsUnlinkedTracksPlots->fill(track);
+ else m_hitsFakeTracksPlots->fill(track);
+ }
if(isAssociatedTruth) {
m_fakePlots.fill(track, isFake);
m_anTrackingPlots.fillFakeRate(track, isFake, mu, nVtx);
@@ -298,9 +313,33 @@ InDetRttPlots::fillCounter(const unsigned int freq, const InDetPerfPlot_nTracks:
//Track in Jet Plots
void
-InDetRttPlots::fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isBjet){
+InDetRttPlots::fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isBjet, bool isFake, bool isUnlinked){
m_trkInJetPlots->fill(track, jet);
- if(isBjet) m_trkInJetPlots_bjets->fill(track, jet);
+ if (m_iDetailLevel >= 200){
+ if (isFake){
+ m_trkInJetPlots_fake->fill(track,jet);
+ }
+ else if (isUnlinked){
+ m_trkInJetPlots_unlinked->fill(track,jet);
+ }
+ else {
+ m_trkInJetPlots_matched->fill(track,jet);
+ }
+ }
+ if(isBjet){
+ m_trkInJetPlots_bjets->fill(track, jet);
+ if (m_iDetailLevel >= 200){
+ if (isFake){
+ m_trkInJetPlots_fake_bjets->fill(track,jet);
+ }
+ else if (isUnlinked){
+ m_trkInJetPlots_unlinked_bjets->fill(track,jet);
+ }
+ else {
+ m_trkInJetPlots_matched_bjets->fill(track,jet);
+ }
+ }
+ }
}
void
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
index db3d1a80769c427b834bf61626b90c6334e4ba14..5c10e024d408cd97101106ba783885805a8861af 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
@@ -67,7 +67,7 @@ public:
///fill reco-vertex related plots that need EventInfo
void fill(const xAOD::VertexContainer& vertexContainer, const unsigned int nPU);
- void fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isBjet=false);
+ void fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isBjet=false, bool isFake=false, bool isUnlinked=false);
void fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::Jet& jet, const bool isGood, bool isBjet=false);
void fillFakeRate(const xAOD::TrackParticle& track, const xAOD::Jet& jet, const bool isFake, bool isBjet=false);
@@ -96,11 +96,19 @@ private:
InDetPerfPlot_ANTracking m_anTrackingPlots;
std::unique_ptr<InDetPerfPlot_Resolution> m_resolutionPlotSecd;
std::unique_ptr<InDetPerfPlot_Hits> m_hitsMatchedTracksPlots;
+ std::unique_ptr<InDetPerfPlot_Hits> m_hitsFakeTracksPlots{nullptr};
+ std::unique_ptr<InDetPerfPlot_Hits> m_hitsUnlinkedTracksPlots{nullptr};
std::unique_ptr<InDetPerfPlot_VertexTruthMatching> m_vertexTruthMatchingPlots;
bool m_doTrackInJetPlots;
bool m_doTrackInBJetPlots;
std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots;
std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_bjets;
+ std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_matched;
+ std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_matched_bjets;
+ std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_fake;
+ std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_fake_bjets;
+ std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_unlinked;
+ std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_unlinked_bjets;
//By track authors
std::unique_ptr<InDetPerfPlot_Efficiency> m_effSiSPSeededFinderPlots;
diff --git a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py
index aa582e882bc6b5aef485740a31bd22e620629bf2..68822f76a63279cfa0379eee1fad9d538ed0c9af 100644
--- a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py
+++ b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py
@@ -109,9 +109,18 @@ if not hasattr(condSeq, 'PixelOfflineCalibCondAlg'):
PixelOfflineCalibCondAlg.InputSource = 2
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__PixelClusterization
-job += InDet__PixelClusterization("PixelClusterization")
+
+pixelClusterization = InDet__PixelClusterization("PixelClusterization")
+
+from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+pixelClusterization.RegSelTool = makeRegSelTool_Pixel()
+
+job += pixelClusterization
+
print job.PixelClusterization
+
+
from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiTrackerSpacePointFinder
job += InDet__SiTrackerSpacePointFinder("PixelSpacePoints",
ProcessSCTs = False)
diff --git a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py
index 38406bcda0f81d67e94d1f148f5c50cbfa1ab1d8..f671cb84298c18d4e57529edc44ecf25548a591c 100644
--- a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py
+++ b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py
@@ -178,9 +178,13 @@ if not hasattr(condSeq, 'PixelOfflineCalibCondAlg'):
PixelOfflineCalibCondAlg.InputSource = 2
from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__PixelClusterization
-job += InDet__PixelClusterization("PixelClusterization")
+pixelClusterization = InDet__PixelClusterization("PixelClusterization")
+from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+pixelClusterization.RegSelTool = makeRegSelTool_Pixel()
+job += pixelClusterization
print job.PixelClusterization
+
from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiTrackerSpacePointFinder
job += InDet__SiTrackerSpacePointFinder("PixelSpacePoints",
ProcessSCTs = False)
diff --git a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py
index 44ff1145650a2bf9441dcb75e3178dab7ca96bf2..8963b7a358e2d8819c08eceb40d167cfd6becefc 100644
--- a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py
+++ b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py
@@ -11,7 +11,10 @@ def LArBadChannelCfg(configFlags, tag=None):
result=LArOnOffIdMappingCfg(configFlags)
rekey="/LAR/BadChannels/BadChannels"
- if configFlags.Input.isMC:
+ if configFlags.Overlay.DataOverlay:
+ # TODO: move this in a better location
+ result.merge(addFolders(configFlags, "/LAR/BadChannels/BadChannels", "LAR_OFL", className="CondAttrListCollection", tag="LARBadChannelsBadChannels-HECAQ3Missing", db="OFLP200"))
+ elif configFlags.Input.isMC:
result.merge(addFolders(configFlags,"/LAR/BadChannels/BadChannels","LAR_OFL",tag=tag,
className="CondAttrListCollection"))
else:
@@ -27,7 +30,10 @@ def LArBadFebCfg(configFlags, tag=None):
result=ComponentAccumulator()
rekey="/LAR/BadChannels/MissingFEBs"
- if configFlags.Input.isMC:
+ if configFlags.Overlay.DataOverlay:
+ # TODO: move this in a better location
+ result.merge(addFolders(configFlags, "/LAR/BadChannels/MissingFEBs", "LAR_OFL", className="AthenaAttributeList", tag="LArBadChannelsMissingFEBs-IOVDEP-04", db="OFLP200"))
+ elif configFlags.Input.isMC:
result.merge(addFolders(configFlags,"/LAR/BadChannels/MissingFEBs","LAR_OFL",tag=tag,
className="AthenaAttributeList"))
else:
diff --git a/LArCalorimeter/LArCellRec/CMakeLists.txt b/LArCalorimeter/LArCellRec/CMakeLists.txt
index 669544d781c6e57f961a01a3df063b0678b1ace1..2adcbe8fc7a27a1302e13dca7bda2c494829b8b5 100644
--- a/LArCalorimeter/LArCellRec/CMakeLists.txt
+++ b/LArCalorimeter/LArCellRec/CMakeLists.txt
@@ -70,6 +70,6 @@ atlas_install_joboptions( share/*.py )
atlas_add_test( LArCellDeadOTXCorr_test
SCRIPT test/LArCellDeadOTXCorr_test.sh
PROPERTIES TIMEOUT 600
- LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|Cache alignment|object with key|recorded new|into Conditions" )
+ LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|Cache alignment|object with key|recorded new|into Conditions|IOVDbSvc +INFO" )
diff --git a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
index 528b6b3e0f9b96276f8fb70771b9ff1469920c33..67f208ab6657eca7765dd622313b6a70419eeb02 100644
--- a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
+++ b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
@@ -1,16 +1,16 @@
-Wed Aug 12 22:07:02 CEST 2020
+Tue Oct 6 19:48:02 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.17] [x86_64-centos7-gcc8-opt] [atlas-work3/ed2484eb9f5] -- built on [2020-08-12T1632]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "LArCellRec/LArCellDeadOTXCorr_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5547 configurables from 32 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.17
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
@@ -26,22 +26,21 @@ Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/FebRodMap with
Py:Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus770.cern.ch on Wed Aug 12 22:07:13 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:48:14 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3589 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus770.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -52,7 +51,6 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -62,12 +60,12 @@ IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag w
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 25 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1488 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200
@@ -95,9 +93,9 @@ IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/Shape
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/fSampl
IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/uA2MeV
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2436 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2511 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 39 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -188,7 +186,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 3602 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3621 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -197,12 +195,12 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24348Kb Time = 0.58S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25380Kb Time = 0.68S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 5546 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 608 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2989 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5651 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 618 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3030 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/BadChannels/MissingFEBs' ) ->
@@ -256,7 +254,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'LAruA2MeVMC' , 'ConditionStore+LAruA2MeV' )
PyComponentMgr INFO Initializing PyComponentMgr...
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 1123 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1042 CLIDRegistry entries for module ALL
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
@@ -265,15 +263,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
@@ -291,21 +289,21 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
-ClassIDSvc INFO getRegistryEntries: read 301 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 306 CLIDRegistry entries for module ALL
LArOnlineIDDetD... INFO in createObj: creating a LArOnlineID helper object in the detector store
LArOnlineID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1454 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1473 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Initializing LArCellDeadOTXCorr
ToolSvc.tool1 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32.
ToolSvc.CaloTri... INFO => CaloTriggerTowerService::initialize()
@@ -315,9 +313,9 @@ LArIdMgrDetDesc... INFO Set LArHVLineID helper in LArIdMgr
LArIdMgrDetDesc... INFO Set LArElectrodeID helper in LArIdMgr
LArIdMgrDetDesc... INFO Set CaloCell_ID helper in LArIdMgr
LArIdMgrDetDesc... INFO Initializing LArIdMgr from values in LArIdMgrDetDescrCnv
-ClassIDSvc INFO getRegistryEntries: read 59 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
-IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingLegacyService[0x3230e000]+7f214a4ac2b0 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap]
+ClassIDSvc INFO getRegistryEntries: read 60 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingLegacyService[0x343e3a00]+7f8339c5f400 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap]
ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/OnOffIdMap
ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/CalibIdMap
ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/FebRodMap
@@ -326,7 +324,7 @@ ToolSvc.CaloTri... INFO ====> ...CaloTriggerTowerService::init() OK
ToolSvc.tool2 INFO Initializing LArCellDeadOTXCorr
ToolSvc.tool2 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32.
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 131 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 133 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/BadChannels/MissingFEBs'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/CalibIdMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/FebRodMap'
@@ -349,7 +347,6 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArBadChannelsBadChannels-IOVDEP-06 for folder /LAR/BadChannels/BadChannels
@@ -370,6 +367,7 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARIdentifier
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARElecCalibMCfSampl-G496-19213-FTFP_BERT_BIRK for folder /LAR/ElecCalibMC/fSampl
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARuA2MeV-Feb2011 for folder /LAR/ElecCalibMC/uA2MeV
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Opening COOL connection for COOLOFL_CALO/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTOnAttrIdMapAtlas-0001 for folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTOnOffIdMapAtlas-0002 for folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas
@@ -482,8 +480,8 @@ LArBadFebCondAl... INFO Read a total of 0 problematic febs from database
LArBadFebCondAl... INFO Recorded LArBadFebCont object with GoodFebs with EventRange {[0,l:0] - [4294967294,l:4294967294]} into Conditions Store
LArBadFebCondAl... INFO Read a total of 3 problematic febs from database
LArBadFebCondAl... INFO Recorded LArBadFebCont object with BadFebs with EventRange {[0,l:0] - [4294967294,l:4294967294]} into Conditions Store
-ClassIDSvc INFO getRegistryEntries: read 1123 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 130 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1157 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 138 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
LArTTCellMapCnv INFO initialize()
@@ -512,8 +510,6 @@ AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events pr
/cvmfs/atlas-co... INFO Database being retired...
/cvmfs/atlas-co... INFO Database being retired...
/cvmfs/atlas-co... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EC2448FE-EFE2-DD11-80D3-000423D98B8C
-/cvmfs/atlas-co... INFO Database being retired...
/cvmfs/atlas-co... INFO Database being retired...
/cvmfs/atlas-co... INFO Database being retired...
/cvmfs/atlas-co... INFO Database being retired...
@@ -524,6 +520,8 @@ Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EC2448F
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] CE5211E9-F51F-DC11-87A7-000423D6460E
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] B2E3B2B6-B76C-DF11-A505-000423D5ADDA
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EC2448FE-EFE2-DD11-80D3-000423D98B8C
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
IncidentProcAlg1 INFO Finalize
@@ -532,43 +530,43 @@ testalg1 INFO Finalizing testalg1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/BadChannels/BadChannels (AttrListColl) db-read 1/1 objs/chan/bytes 0/8/0 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/BadChannels/MissingFEBs (AttrList) db-read 1/1 objs/chan/bytes 1/1/16 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/1520148 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.25 ))s
+IOVDbFolder INFO Folder /LAR/BadChannels/BadChannels (AttrListColl) db-read 1/1 objs/chan/bytes 0/8/0 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/BadChannels/MissingFEBs (AttrList) db-read 1/1 objs/chan/bytes 1/1/16 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/1520148 (( 0.02 ))s
IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/6100 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/780292 (( 0.02 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/183 (( 0.03 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.02 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/AutoCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/486 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/780292 (( 0.03 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/183 (( 0.05 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.03 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/AutoCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/486 (( 0.01 ))s
IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
IOVDbFolder INFO Folder /LAR/ElecCalibMC/DAC2uA (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/HVScaleCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 12/12/1980 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/HVScaleCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 12/12/1980 (( 0.02 ))s
IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBias (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/174 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBiasAverage (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBiasAverage (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.02 ))s
IOVDbFolder INFO Folder /LAR/ElecCalibMC/MphysOverMcal (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.02 ))s
IOVDbFolder INFO Folder /LAR/ElecCalibMC/Noise (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.02 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Pedestal (PoolRef) db-read 1/1 objs/chan/bytes 1/1/167 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Pedestal (PoolRef) db-read 1/1 objs/chan/bytes 1/1/167 (( 0.02 ))s
IOVDbFolder INFO Folder /LAR/ElecCalibMC/Ramp (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/489 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Shape (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/477 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Shape (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/477 (( 0.02 ))s
IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/173 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/fSampl (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/194 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/fSampl (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/194 (( 0.22 ))s
IOVDbFolder INFO Folder /LAR/ElecCalibMC/uA2MeV (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/165 (( 0.02 ))s
-IOVDbSvc INFO bytes in (( 0.38 ))s
+IOVDbSvc INFO bytes in (( 0.92 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 21 ReadTime: (( 0.32 ))s
-IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.07 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 21 ReadTime: (( 0.81 ))s
+IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.11 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.CaloTri... INFO => CaloTriggerTowerService::finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 0.53 [s] Ave/Min/Max= 0.0139(+- 0.064)/ 0/ 0.4 [s] #= 38
-cObj_ALL INFO Time User : Tot= 0.76 [s] Ave/Min/Max= 0.0317(+- 0.0842)/ 0/ 0.41 [s] #= 24
-ChronoStatSvc INFO Time User : Tot= 49 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.68 [s] Ave/Min/Max= 0.0179(+- 0.0833)/ 0/ 0.52 [s] #= 38
+cObj_ALL INFO Time User : Tot= 0.94 [s] Ave/Min/Max= 0.0392(+- 0.113)/ 0/ 0.55 [s] #= 24
+ChronoStatSvc INFO Time User : Tot= 54.7 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.icc b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.icc
index 2f4b3472faa91b6b9ccc06433d0c41151d491f50..0995b390c8261588c168e53f9398d07c9d76c916 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.icc
+++ b/LArCalorimeter/LArCnv/LArByteStream/LArByteStream/LArRawDataContByteStreamTool.icc
@@ -47,7 +47,13 @@ StatusCode LArRawDataContByteStreamTool::convert(const RawEvent* re, COLLECTION*
try {
OFFLINE_FRAGMENTS_NAMESPACE::PointerType p;
OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment robFrag(*rob_add);
+ uint32_t fragSourceID = robFrag.rod_source_id();
+ if( fragSourceID & 0x1000 ){
+ ATH_MSG_DEBUG(" skip Latome fragment with source ID "<< std::hex << fragSourceID);
+ continue;
+ }
+
if (!m_decoder->check_valid (&robFrag, msg())) {
ATH_MSG_WARNING ( "Error reading bytestream event: "
<< "Invalid ROB fragment for source ID " << robFrag.rod_source_id() );
diff --git a/LArCalorimeter/LArCnv/LArTPCnv/share/LArLATOMEHeaderContainerCnv_p1_test.ref b/LArCalorimeter/LArCnv/LArTPCnv/share/LArLATOMEHeaderContainerCnv_p1_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..a5bce3fd2565d8f458555a0c6f42d0504a848bd5
--- /dev/null
+++ b/LArCalorimeter/LArCnv/LArTPCnv/share/LArLATOMEHeaderContainerCnv_p1_test.ref
@@ -0,0 +1 @@
+test1
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArHitEMap.h b/LArCalorimeter/LArDigitization/LArDigitization/LArHitEMap.h
index 8c9ba224013e220c83045aecefb21d84786a5c23..428a802fdfb2f69754ccb62d18bcdfad1e2c762c 100644
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArHitEMap.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArHitEMap.h
@@ -1,6 +1,6 @@
//Dear emcas this is -*-c++-*--
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARDIGITIZATION_LARHITEMAP_H
@@ -16,6 +16,9 @@
#include "AthenaKernel/CLASS_DEF.h"
+class McEventCollection;
+
+
class LArHitEMap
{
@@ -42,7 +45,8 @@ public:
~LArHitEMap(void);
bool AddEnergy(const IdentifierHash index, const float energy, const float time);
bool AddEnergy(const Identifier cellid, const float energy, const float time);
- bool BuildWindows(float deta, float dphi, float ptmin);
+ bool BuildWindows(const McEventCollection* mcCollptr,
+ float deta, float dphi, float ptmin);
int GetNbCells(void) const;
inline const LArHitList& GetCell(const unsigned int index) const {return m_emap[index];} ;
inline const std::vector<std::pair<float,float> >& GetTimeE(const IdentifierHash index) const { return m_emap[index].getData();}
diff --git a/LArCalorimeter/LArDigitization/src/LArHitEMap.cxx b/LArCalorimeter/LArDigitization/src/LArHitEMap.cxx
index 50c707e6b56d2f624840a5cc150a4d57903e99d4..ad87463246f1f3501641daf0c0c8157b76563ec5 100644
--- a/LArCalorimeter/LArDigitization/src/LArHitEMap.cxx
+++ b/LArCalorimeter/LArDigitization/src/LArHitEMap.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include <iostream>
@@ -15,7 +15,6 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IService.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "GeneratorObjects/McEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
@@ -73,7 +72,8 @@ int LArHitEMap::GetNbCells(void) const
return m_emap.size() ;
}
-bool LArHitEMap::BuildWindows(float deta,float dphi, float ptmin)
+bool LArHitEMap::BuildWindows(const McEventCollection* mcCollptr,
+ float deta,float dphi, float ptmin)
{
// get list of particles
std::vector<double> phiPart;
@@ -82,16 +82,11 @@ bool LArHitEMap::BuildWindows(float deta,float dphi, float ptmin)
// std::cout << " in BuildWindows " << deta << dphi << ptmin << std::endl;
etaPart.clear();
phiPart.clear();
- //get pointer of MC collection
- StoreGateSvc* SgSvc = StoreGate::pointer();
- const McEventCollection* mcCollptr = nullptr;
- if ( SgSvc->retrieve(mcCollptr,"").isFailure() ) {
- MsgStream log(Athena::getMessageSvc(), "LArHitEMap");
- log << MSG::WARNING
- << "LArHitEMap:cannot retrieve McEventCollection (keyless)"
- << endmsg;
- return false;
+
+ if (!mcCollptr) {
+ return false;
}
+
McEventCollection::const_iterator itr;
// std::cout << " start loop over particles " << std::endl;
for (itr = mcCollptr->begin(); itr!=mcCollptr->end(); ++itr) {
diff --git a/LArCalorimeter/LArDigitization/src/LArPileUpTool.cxx b/LArCalorimeter/LArDigitization/src/LArPileUpTool.cxx
index 776959abc397bf877a6d19eb1b6d0fd8a67ff228..2ae44ac2ca4420d8b2cfcabcac2895ec6154a86d 100755
--- a/LArCalorimeter/LArDigitization/src/LArPileUpTool.cxx
+++ b/LArCalorimeter/LArDigitization/src/LArPileUpTool.cxx
@@ -26,6 +26,7 @@
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloIdentifier/CaloIdManager.h"
#include "EventInfoUtils/EventIDFromStore.h"
+#include "GeneratorObjects/McEventCollection.h"
#include "AthenaKernel/RNGWrapper.h"
#include "CLHEP/Random/RandomEngine.h"
@@ -292,10 +293,19 @@ StatusCode LArPileUpTool::prepareEvent(const EventContext& ctx, unsigned int /*n
if (m_Windows) {
ATH_MSG_DEBUG(" redefine windows list ");
- m_hitmap->BuildWindows(m_WindowsEtaSize,m_WindowsPhiSize,
- m_WindowsPtCut);
+
+ // FIXME: Use a ReadHandle.
+ const McEventCollection* mcCollptr = nullptr;
+ if ( evtStore()->retrieve(mcCollptr).isFailure() ) {
+ ATH_MSG_WARNING ("LArHitEMap:cannot retrieve McEventCollection (keyless)");
+ }
+
+ m_hitmap->BuildWindows(mcCollptr,
+ m_WindowsEtaSize,m_WindowsPhiSize,
+ m_WindowsPtCut);
if(m_doDigiTruth) {
- m_hitmap_DigiHSTruth->BuildWindows(m_WindowsEtaSize,m_WindowsPhiSize, m_WindowsPtCut);
+ m_hitmap_DigiHSTruth->BuildWindows(mcCollptr,
+ m_WindowsEtaSize,m_WindowsPhiSize, m_WindowsPtCut);
}
}
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py
index 112370304eb403aa704163e7f22e871a1641c972..f677055139d9f8cd3e074f9070269b4d78b64cdb 100644
--- a/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/python/LArCellConditionsAlg.py
@@ -16,9 +16,9 @@ __doc__ = " An athena-like algorithm to interactivly convert LAr Identifiers and
from AthenaPython.PyAthena import StatusCode
import AthenaPython.PyAthena as PyAthena
-import cppyy
+import ROOT,cppyy
-from ROOT import HWIdentifier, Identifier, Identifier32, IdentifierHash, LArBadChannel
+from ROOT import HWIdentifier, Identifier, Identifier32, IdentifierHash, LArBadChannel, LArBadChanBitPacking
from ROOT import CaloDetDescrManager
from ctypes import c_uint
@@ -62,6 +62,12 @@ class LArCellConditionsAlg(PyAthena.Alg):
if self._detStore is None:
self.msg.error("Failed to get DetectorStore")
return StatusCode.Failure
+
+ self._condStore = StoreGate.pointer("ConditionStore")
+ if (self._condStore is None):
+ self.msg.error("Failed to get ConditionStore")
+ return StatusCode.Failure
+
# Get LArOnlineID helper class
self.onlineID=self._detStore.retrieve("LArOnlineID","LArOnlineID")
if self.onlineID is None:
@@ -86,8 +92,7 @@ class LArCellConditionsAlg(PyAthena.Alg):
- self.class_larBCBitPacking=cppyy.makeClass("LArBadChanBitPacking")
- self.bc_packing=self.class_larBCBitPacking()
+ self.bc_packing=LArBadChanBitPacking()
self.noisepattern=0
for n in ("lowNoiseHG","highNoiseHG","unstableNoiseHG","lowNoiseMG","highNoiseMG","unstableNoiseMG","lowNoiseLG","highNoiseLG","unstableNoiseLG","sporadicBurstNoise"):
@@ -126,13 +131,16 @@ class LArCellConditionsAlg(PyAthena.Alg):
self.msg.info('running execute...')
#for some obscure reason, we need run dump before we can retrieve the flat objects using their abstract interface
- garbagedump = open(os.devnull, 'w')
- self._detStore.dump(garbagedump)
+ garbagedump = open("sgdump.txt", 'w')
+ self._condStore.dump(garbagedump)
garbagedump.close()
+ eid=ROOT.Gaudi.Hive.currentContext().eventID()
+
if self.includeConditions:
try:
- self.larPedestal=self._detStore.retrieve("ILArPedestal","Pedestal")
+ condCont=self._condStore.retrieve("CondCont<ILArPedestal>","LArPedestal")
+ self.larPedestal=condCont.find(eid)
except Exception:
print ("WARNING: Failed to retrieve Pedestal from DetStore")
import traceback
@@ -140,7 +148,8 @@ class LArCellConditionsAlg(PyAthena.Alg):
self.larPedestal=None
try:
- self.larMphysOverMcal=self._detStore.retrieve("ILArMphysOverMcal","LArMphysOverMcal")
+ condCont=self._condStore.retrieve("CondCont<ILArMphysOverMcal>","LArMphysOverMcal")
+ self.larMphysOverMcal=condCont.find(eid)
except Exception:
print ("WARNING: Failed to retrieve MphysOverMcal from DetStore")
import traceback
@@ -148,7 +157,8 @@ class LArCellConditionsAlg(PyAthena.Alg):
self.larMphysOverMcal=None
try:
- self.larRamp=self._detStore.retrieve("ILArRamp","LArRamp")
+ condCont=self._condStore.retrieve("CondCont<ILArRamp>","LArRamp")
+ self.larRamp=condCont.find(eid)
except Exception:
print ("WARNING: Failed to retrieve LArRamp from DetStore")
import traceback
@@ -156,7 +166,8 @@ class LArCellConditionsAlg(PyAthena.Alg):
self.larRamp=None
try:
- self.larDAC2uA=self._detStore.retrieve("ILArDAC2uA","LArDAC2uA")
+ condCont=self._condStore.retrieve("CondCont<ILArDAC2uA>","LArDAC2uA")
+ self.larDAC2uA=condCont.find(eid)
except Exception:
print ("WARNING: Failed to retrieve LArDAC2uA from DetStore")
import traceback
@@ -164,7 +175,8 @@ class LArCellConditionsAlg(PyAthena.Alg):
self.larDAC2uA=None
try:
- self.laruA2MeV=self._detStore.retrieve("ILAruA2MeV","LAruA2MeV")
+ condCont=self._condStore.retrieve("CondCont<ILAruA2MeV>","LAruA2MeV")
+ self.laruA2MeV=condCont.find(eid)
except Exception:
print ("WARNING: Failed to retrieve LAruA2MeV from DetStore")
import traceback
@@ -172,7 +184,8 @@ class LArCellConditionsAlg(PyAthena.Alg):
self.laruA2MeV=None
try:
- self.larhvScaleCorr=self._detStore.retrieve("ILArHVScaleCorr","LArHVScaleCorr")
+ condCont=self._condStore.retrieve("CondCont<ILArHVScaleCorr>","LArHVScaleCorr")
+ self.larhvScaleCorr=condCont.find(eid)
except Exception:
print ("WARNING: Failed to retrieve LArHVScaleCorr from DetStore")
import traceback
@@ -202,7 +215,6 @@ class LArCellConditionsAlg(PyAthena.Alg):
id=None
chid=None
rep_in=self.readInput() #"Enter Id >").upper().strip()
- #print ("User Input...")
#rep_in="EMBA 0 0 60 2"
rep=rep_in.upper()
@@ -283,7 +295,7 @@ class LArCellConditionsAlg(PyAthena.Alg):
return StatusCode.Success
def printChannelInfo(self,id,chid):
-
+ print(self.IdentifiersToString(chid,id))
if id!=self.noid: #Don't try to show anything more for disconnected channels
if self.includeLocation:
try:
@@ -347,7 +359,6 @@ class LArCellConditionsAlg(PyAthena.Alg):
print("DSP Thresholds: None")
-
def finalize(self):
self.msg.info('finalizing...')
return StatusCode.Success
@@ -358,7 +369,7 @@ class LArCellConditionsAlg(PyAthena.Alg):
print(out)
self.nLinesPrinted=self.nLinesPrinted+1
if self.nLinesPrinted%40 is 0:
- c=raw_input("Press 'q' to quit, 'a' for all ...")
+ c=input("Press 'q' to quit, 'a' for all ...")
if c.upper().startswith("Q"):
return True
if c.upper().startswith("A"):
@@ -369,7 +380,7 @@ class LArCellConditionsAlg(PyAthena.Alg):
def readInput(self):
self.nLinesPrinted=0
try:
- rep=raw_input("Enter Id >")
+ rep=input("Enter Id >")
except:
return ""
@@ -480,7 +491,7 @@ class LArCellConditionsAlg(PyAthena.Alg):
return None
else: #given as expanded ID
- tbl=maketrans(",:;/\#"," ");
+ tbl=str.maketrans(",:;/\#"," ");
fields=[]
for f in upInput.translate(tbl).split():
if len(f):
@@ -619,7 +630,7 @@ class LArCellConditionsAlg(PyAthena.Alg):
return None
else: #given as expanded ID
- tbl=maketrans(",:;/\#"," ");
+ tbl=str.maketrans(",:;/\#"," ");
fields=[]
for f in upInput.translate(tbl).split():
if len(f):
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
index 08b36ecbb1b6dbb09fa50ed972573d2e07a2a931..657f176031c7aa1aea1c896bdf5084e2066a2c58 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
@@ -17,24 +17,24 @@ fhistory = os.path.expanduser("~/.LArCellConditionsHist")
def usage():
- print sys.argv[0]+": Convert and expand LAr Identifiers, print some database content"
- print "Options:"
- print "-c Print also (some) electronic calibration constants"
- print "-s Use SingleVersion folders (default)"
- print "-m Use MultiVersion folders (the opposite of -s)"
- print "-g Include geometrical position (true eta/phi)"
- print "-d Include DSP thresholds"
- print "-r <run> Specify a run number"
- print "-t <tag> Specify global tag"
- print "--detdescr <DetDescrVersion>"
- print "--sqlite <sqlitefile>"
- print "-h Print this help text and exit"
+ print(sys.argv[0]+": Convert and expand LAr Identifiers, print some database content")
+ print("Options:")
+ print("-c Print also (some) electronic calibration constants")
+ print("-s Use SingleVersion folders (default)")
+ print("-m Use MultiVersion folders (the opposite of -s)")
+ print("-g Include geometrical position (true eta/phi)")
+ print("-d Include DSP thresholds")
+ print("-r <run> Specify a run number")
+ print("-t <tag> Specify global tag")
+ print("--detdescr <DetDescrVersion>")
+ print("--sqlite <sqlitefile>")
+ print("-h Print this help text and exit")
try:
opts,args=getopt.getopt(sys.argv[1:],"csmgdhr:t:",["help","detdescr=","sqlite="])
-except Exception,e:
+except Exception as e:
usage()
- print e
+ print(e)
sys.exit(-1)
@@ -70,15 +70,15 @@ try:
if run is None:
defRun=0x7fffffff
prompt= "Enter run number [%i]:" % defRun
- runIn=raw_input(prompt).strip()
+ runIn=input(prompt).strip()
if runIn=="":
run=defRun
else:
if runIn.isdigit():
- run=long(runIn)
+ run=int(runIn)
else:
usage()
- print "Expect numerical parameter for run, got",runIn
+ print("Expect numerical parameter for run, got",runIn)
sys.exit(0)
pass
pass
@@ -91,7 +91,7 @@ try:
defTag="COMCOND-BLKPA-RUN1-06"
pass
prompt= "Enter conditions tag [%s]:" % defTag
- tagIn=raw_input(prompt).strip()
+ tagIn=input(prompt).strip()
if tagIn=="":
tag=defTag
else:
@@ -100,12 +100,12 @@ try:
if geo and not detdescrset:
prompt="Enter DetectorDescripton tag [%s]:" % detdescrtag
- detdescrtagIn=raw_input(prompt).strip()
+ detdescrtagIn=input(prompt).strip()
if detdescrtagIn != "":
detdescrtag=detdescrtagIn
except:
- print "Failed to get run number and/or conditions tag"
+ print("Failed to get run number and/or conditions tag")
sys.exit(0)
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCommon_comm_jobOptions.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCommon_comm_jobOptions.py
index 3d4060768e14143c94b5844379ebcf6ccd62f768..aa56af2711a8a0e880f3ece821ae0951a4a7ba49 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCommon_comm_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArConditionsCommon_comm_jobOptions.py
@@ -284,6 +284,7 @@ if larCondFlags.LoadElecCalib():
#special case for overlay jobs: We need LArfSampl
+from AthenaCommon.DetFlags import DetFlags
if DetFlags.overlay.LAr_on() and larCondFlags.LArfSamplTag()!="":
printfunc ("Tag=%s" % larCondFlags.LArfSamplTag())
conddb.addFolderWithTag("LAR_OFL","/LAR/ElecCalibMC/fSampl",larCondFlags.LArfSamplTag(),force=True,forceMC=True,className="LArfSamplMC")
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx
index 0678534f6ba3df99d681a4d7d64808f7b31f9025..e60ec1590a2b16fde5b302e5397a7a67984b62da 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.cxx
@@ -339,7 +339,8 @@ HepMC::GenEvent * LArFastShower::GetGenEvent(const G4FastTrack &fastTrack)
if (pdgcode < 0) pdgcode = -pdgcode; // hack for positrons. let it be electrons.
// new event. Signal processing = 0, event number "next"
- HepMC::GenEvent* ge = new HepMC::GenEvent( 0, ++m_eventNum);
+ HepMC::GenEvent* ge = new HepMC::GenEvent();
+ ge->set_event_number(++m_eventNum);
// vertex. Position of the shower, time = 0
HepMC::GenVertexPtr gv = HepMC::newGenVertexPtr(
HepMC::FourVector(showerPos.x(), showerPos.y(), showerPos.z(), 0) );
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.h b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.h
index f8d4a87abcd3cd5916df8a3331b2dab9cd992c65..dddb5629e259f33029ba9ec3bc626b656363a885 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/LArFastShower.h
@@ -17,7 +17,7 @@
// Forward declarations
#include "AtlasHepMC/GenEvent_fwd.h"
-#include "AtlasHepMC/IO_GenEvent_fwd.h"
+#include "AtlasHepMC/IO_GenEvent.h"
class IFastSimDedicatedSD;
class ILArG4ShowerLibSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/packagedoc.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/packagedoc.h
index 5a305a276041c35a3890d66d8969293dad034a06..60ee1f1b0ef5ed70b338c198aae02d1a856596c3 100644
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/packagedoc.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/doc/packagedoc.h
@@ -30,8 +30,7 @@ following access pattern:
<pre>
const EMBDetectorManager * manager=NULL;
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
- detStore->retrieve(manager);
+ ATH_CHECK( detStore()->retrieve(manager) );
if (manager) {
}
</pre>
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBDetectorManager.cxx
index 42e1339344837ba71902f4f1ea9f30e9d4d752d8..cbfe87f0a0f9562b9ab0dc48f0ac5fb2eb9a18ea 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBDetectorManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBDetectorManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/MsgStream.h"
@@ -16,7 +16,6 @@
#include "LArReadoutGeometry/EMBDetectorManager.h"
#include "LArHV/LArHVManager.h"
-#include "StoreGate/StoreGate.h"
class OrderBySampling {
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx
index c25f0991baa8c50139a53093733905d8d09cf576..814772c20604bcd95e6c66cc0ab4750784284627 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALDetectorManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/Bootstrap.h"
@@ -8,7 +8,6 @@
#include "LArReadoutGeometry/FCALDetectorManager.h"
#include "LArReadoutGeometry/FCAL_ChannelMap.h"
#include "LArHV/LArHVManager.h"
-#include "StoreGate/StoreGate.h"
FCALDetectorManager::FCALDetectorManager (const FCALHVManager* hvManager)
: GeoVDetectorManager()
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALTile.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALTile.cxx
index 1fd2702b74e666417aecf22cc18ea44691470594..34c3717d95c9206d98478124fde2d8e0aad9a53f 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALTile.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCALTile.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArReadoutGeometry/FCALTile.h"
@@ -11,7 +11,6 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
FCALTile::FCALTile(const FCALTile &right)
:m_module(right.m_module),m_tile(right.m_tile)
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx
index acaf30b356c274446b2397a59fba5c78a832ba65..a62161e8d07b3895d9377fda0ff2727e9f030738 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArReadoutGeometry/HECDetDescr.h"
@@ -15,7 +15,6 @@
#include "GeoModelUtilities/DecodeVersionKey.h"
#include "LArReadoutGeometry/HECDetectorManager.h"
#include "LArHV/LArHVManager.h"
-#include "StoreGate/StoreGate.h"
// Class HECDetectorManager
diff --git a/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
index c5049af4a844d7566c471a131e3f6b330e24be3d..a0203ef6865ee8d0a0d64000b015243139873369 100644
--- a/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArNoisyROMonAlg.py
@@ -106,7 +106,7 @@ def LArNoisyROMonConfigCore(helper,algoinstance,inputFlags,
]
doTrigger=False
if isRun3Cfg():
- if inputFlags.Trigger.doHLT or LArNoisyROMonForceTrigger:
+ if inputFlags.DQ.useTrigger or LArNoisyROMonForceTrigger:
doTrigger=True
else:
if inputFlags.doHLTMon or LArNoisyROMonForceTrigger:
diff --git a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx
index d932d56433ab028e2b65d249b14863f5dba2b2f6..d49ff569bba77ff06e5bbb36b84139aca7b22f15 100644
--- a/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx
+++ b/LArCalorimeter/LArMonitoring/src/LArAffectedRegionsAlg.cxx
@@ -432,7 +432,7 @@ LArAffectedRegionsAlg::fillHistograms( const EventContext& ctx ) const
}
// FCAL
- ATH_MSG_INFO("layermin=" << layermin << " layermin-21=" << layermin-21);
+ ATH_MSG_DEBUG("layermin=" << layermin << " layermin-21=" << layermin-21);
if(layermin>=21 && layermin<=23){
//set the group to fill(only depends on layer)
std::string fcal_layer_name=m_MonGroupName;
diff --git a/LArCalorimeter/LArROD/LArROD/LArCalibDigitsAccumulator.h b/LArCalorimeter/LArROD/LArROD/LArCalibDigitsAccumulator.h
index 20291f0ff284465347bf0fc69c4461dd3430aa81..7a5ac6b233d7e6f93f748c25b503d0807bc1e525 100644
--- a/LArCalorimeter/LArROD/LArROD/LArCalibDigitsAccumulator.h
+++ b/LArCalorimeter/LArROD/LArROD/LArCalibDigitsAccumulator.h
@@ -104,6 +104,13 @@ private:
* */
unsigned int m_event_counter;
+ // Information to remove certain readings if needed
+ std::map<std::string, std::map<int,std::vector<int>*>*> m_readingsMap;
+ std::map<std::string, std::map<int,std::vector<int>*>*>::iterator m_readingsMap_it;
+ std::map<int, std::vector<int>*>::iterator m_channelMap_it;
+
+
+ int m_sampleShift;
};
#endif
diff --git a/LArCalorimeter/LArROD/src/LArCalibDigitsAccumulator.cxx b/LArCalorimeter/LArROD/src/LArCalibDigitsAccumulator.cxx
index cdf9a1abbc4e09c6e4ed239898bcca6feb4e3a95..a5b53859c826201dcc2743429683c44f5d0bd3bd 100644
--- a/LArCalorimeter/LArROD/src/LArCalibDigitsAccumulator.cxx
+++ b/LArCalorimeter/LArROD/src/LArCalibDigitsAccumulator.cxx
@@ -14,7 +14,8 @@ using CLHEP::ns;
LArCalibDigitsAccumulator::LArCalibDigitsAccumulator (const std::string& name, ISvcLocator* pSvcLocator):
AthAlgorithm(name, pSvcLocator),
- m_onlineHelper(0)
+ m_onlineHelper(0),
+ m_sampleShift(0)
{
declareProperty("LArAccuCalibDigitContainerName",m_calibAccuDigitContainerName, "LArAccumulatedCalibDigits");
declareProperty("KeyList",m_keylist);
@@ -22,6 +23,7 @@ LArCalibDigitsAccumulator::LArCalibDigitsAccumulator (const std::string& name, I
declareProperty("DelayScale",m_delayScale=1*ns);
declareProperty("KeepOnlyPulsed",m_keepPulsed=false);
declareProperty("isSC",m_isSC=false);
+ declareProperty("SampleShift",m_sampleShift=0);
m_delay=-1;
m_event_counter=0;
}
@@ -57,6 +59,14 @@ StatusCode LArCalibDigitsAccumulator::initialize(){
m_Accumulated.resize(m_onlineHelper->channelHashMax());
+ std::vector<std::string>::const_iterator key_it=m_keylist.begin();
+ std::vector<std::string>::const_iterator key_it_e=m_keylist.end();
+ for (;key_it!=key_it_e;key_it++) {
+ std::map<int,std::vector<int>*>* map_forKey = new std::map<int,std::vector<int>*>();
+ m_readingsMap[*key_it] = map_forKey;
+ }
+
+
return StatusCode::SUCCESS;
}
@@ -98,7 +108,16 @@ StatusCode LArCalibDigitsAccumulator::execute()
//Loop over all containers that are to be processed (e.g. different gains)
for (;key_it!=key_it_e;key_it++) {
-
+
+ std::map<int,std::vector<int>*>* readingsMap_pointer = 0;
+ m_readingsMap_it = m_readingsMap.find(*key_it);
+ if (m_readingsMap_it == m_readingsMap.end()) {
+ ATH_MSG_INFO("Did not find corresponding map for key " << *key_it);
+ } else {
+ readingsMap_pointer = m_readingsMap_it->second;
+ }
+
+
sc=evtStore()->retrieve(calibDigitContainer,*key_it);
if(sc.isFailure()) {
ATH_MSG_ERROR( "Can't retrieve LArCalibDigitContainer with key " << *key_it << "from StoreGate." );
@@ -144,6 +163,19 @@ StatusCode LArCalibDigitsAccumulator::execute()
const IdentifierHash febhash = m_onlineHelper->feb_Hash(febid);
const IdentifierHash hashid = m_onlineHelper->channel_Hash(chid);
+
+ m_channelMap_it = readingsMap_pointer->find(chid.get_identifier32().get_compact());
+ std::vector<int>* cellStorage;
+ if (m_channelMap_it == readingsMap_pointer->end()) {
+ std::vector<int>* cellVector = new std::vector<int>();
+ (*readingsMap_pointer)[chid.get_identifier32().get_compact()] = cellVector;
+
+ cellStorage = cellVector;
+ } else {
+ cellStorage = m_channelMap_it->second;
+ }
+
+
// BELOW: DIRTY HACK BECAUSE THERE SEEMS TO BE A BUG IN THE CABLINGSVC CONCERNING THE CALIBLINES.
// get calibration settings
@@ -172,22 +204,21 @@ StatusCode LArCalibDigitsAccumulator::execute()
ATH_MSG_DEBUG( "Delay is changing to " << (*it)->delay() << " from " << m_delay << ": book a new LArAccumulatedCalibDigitContainer" );
m_delay=(*it)->delay();
}
-
+
CaloGain::CaloGain gain=(*it)->gain();
if (gain<0 || gain>CaloGain::LARNGAIN)
{ATH_MSG_ERROR( "Found not-matching gain number ("<< (int)gain <<")" );
delete larAccuCalibDigitContainer;
return StatusCode::FAILURE;
}
-
+
// object to be filled for each cell
LArAccumulated& cellAccumulated = m_Accumulated[hashid];
// trigger counter for each cell
cellAccumulated.m_ntrigger++;
-
- ATH_MSG_DEBUG( "chid = " << chid << ", trigger = " << cellAccumulated.m_ntrigger << ", DAC = " << (*it)->DAC() );
-
+ ATH_MSG_INFO( "chid = " << chid << ", trigger = " << cellAccumulated.m_ntrigger << ", DAC = " << (*it)->DAC() );
+
// at first trigger, initialize vectors
unsigned int sizeSamples = (*it)->samples().size();
ATH_MSG_DEBUG( "sizeSteps = " << sizeSteps << ", # of samples = " << sizeSamples );
@@ -215,6 +246,7 @@ StatusCode LArCalibDigitsAccumulator::execute()
for(unsigned int j=0;j<sizeSamples;j++){
+ cellStorage->push_back((*it)->samples()[j]);
cellAccumulated.m_sum[j] += (*it)->samples()[j];
cellAccumulated.m_sum2[j] += (*it)->samples()[j]*(*it)->samples()[j];
}
@@ -227,12 +259,36 @@ StatusCode LArCalibDigitsAccumulator::execute()
if(cellAccumulated.m_ntrigger==nTriggerPerStep[febhash]){
ATH_MSG_DEBUG( "filling LArAccumulatedCalibDigit " );
ATH_MSG_DEBUG( "chid = " << chid << ", gain = " << gain << ", DAC = " << (*it)->DAC() << ", isPulsed = " << isPulsed << ", delay = " << m_delay << ", trigPerStep = " << nTriggerPerStep[febhash] << ", istep = " << iStepTrigger[febhash] );
+
+
+
+ if ( m_sampleShift != 0 ){
+ int half_sam = (int)((sizeSamples-m_sampleShift)/2.);
+
+ // First loop to find "allGood" samplings and their mean values
+ for (unsigned int sample = 0; sample < sizeSamples; ++sample) {
+ std::vector<int> sampleVector;
+
+ for (unsigned int trig = 0; trig < nTriggerPerStep[febhash]; ++trig) {
+ sampleVector.push_back(cellStorage->at(trig*(sizeSamples-m_sampleShift)+sample));
+ }
+ sort(sampleVector.begin(), sampleVector.end());
+
+ uint32_t sum = 0;
+ uint32_t sum2 = 0;
+
+ for (unsigned int trig = 0; trig < nTriggerPerStep[febhash]; ++trig) {
+ if (std::abs(sampleVector.at(trig) - sampleVector.at(half_sam)) < 10) {
+ sum += sampleVector.at(trig);
+ sum2 += sampleVector.at(trig) * sampleVector.at(trig);
+ }
+ }
+ }
+ }
accuCalibDigit->setAddSubStep(cellAccumulated.m_sum,cellAccumulated.m_sum2,nTriggerPerStep[febhash]);
iStepTrigger[febhash]++;
- // std::cout << "DAC after = " << accuCalibDigit->DAC() << std::endl;
-
std::vector<float> mean = accuCalibDigit->mean();
std::vector<float> RMS = accuCalibDigit->RMS();
@@ -245,6 +301,9 @@ StatusCode LArCalibDigitsAccumulator::execute()
cellAccumulated.m_ntrigger = 0;
+ delete cellStorage;
+ (*readingsMap_pointer).erase(chid.get_identifier32().get_compact());
+
}
}// loop over cells in container
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawEventDict.h b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawEventDict.h
index 66d925be54e003283e6b6b9959ec633372cc6593..f9c99d8b82841b48c186990796382e101529bbef 100755
--- a/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawEventDict.h
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawEventDict.h
@@ -11,3 +11,7 @@
#include "LArRawEvent/LArFebErrorSummary.h"
#include "LArRawEvent/LArLATOMEHeaderContainer.h"
//#include "LArRawEvent/LArRawChannelContainer.h"
+#include "LArRawEvent/LArSCDigit.h"
+#include "LArRawEvent/LArSCDigitContainer.h"
+#include "LArRawEvent/LArRawSC.h"
+#include "LArRawEvent/LArRawSCContainer.h"
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSC.h b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSC.h
new file mode 100755
index 0000000000000000000000000000000000000000..94f115f85c62e536778485415add7f84b4f72372
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSC.h
@@ -0,0 +1,105 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef LARRAWSC_H
+#define LARRAWSC_H
+#include <vector>
+
+#include "Identifier/HWIdentifier.h"
+
+/**
+ @class LArRawSC
+ @brief Liquid Argon SuperCell raw data
+
+ represents the output of the LATOME
+*/
+
+class LArRawSC {
+
+ private:
+
+ /** @brief Online Identifier */
+ HWIdentifier m_hardwareID;
+
+ /** @brief Latome channel */
+ short m_chan;
+
+ /** @brief LATOME source Id*/
+ unsigned int m_sourceId;
+
+ /** @brief vector of energies */
+ std::vector < int > m_energies;
+
+ /** @brief vector of bcids */
+ std::vector < unsigned short > m_BCId;
+
+ /** @brief vector of saturation flags */
+ std::vector < bool > m_satur;
+
+ public:
+ /** @brief constructor
+ @param[in] channel_value Online identifier
+ @param[in] gain_value Gain
+ @param[in] sample_value Reference of vector with ADC samples
+ */
+ LArRawSC(const HWIdentifier & channel_value, const short chan, const unsigned int sourceId, const std::vector < int > & energies, const std::vector<unsigned short> bcids, std::vector<bool> satur):
+ m_hardwareID(channel_value), m_chan(chan),m_sourceId(sourceId), m_energies(energies), m_BCId(bcids), m_satur(satur) {}
+
+ LArRawSC(const HWIdentifier & channel_value,
+ const short chan,
+ const unsigned int sourceId,
+ std::vector < int > && energies,
+ std::vector < unsigned short > && bcids,
+ std::vector < bool > && satur)
+ : m_hardwareID(channel_value),
+ m_chan(chan),
+ m_sourceId(sourceId),
+ m_energies(std::move(energies)),
+ m_BCId(std::move(bcids)),
+ m_satur(std::move(satur))
+ {}
+
+ /** @return HWIdentifier */
+ const HWIdentifier & hardwareID() const {return m_hardwareID; }
+
+ /** @return channel */
+ short chan() const { return m_chan; }
+
+ /** @return source Id value */
+ unsigned int SourceId() const {return m_sourceId;}
+
+ /** @return number of samples */
+ int nsamples() const { return m_energies.size(); }
+
+ /** @return a reference to a stl vector containing the energies values */
+ const std::vector < int > & energies() const { return m_energies; }
+
+ /** @return a reference to a stl vector containing the bcid values */
+ const std::vector < unsigned short > & bcids() const { return m_BCId; }
+
+ /** @return a reference to a stl vector containing the saturation flags */
+ const std::vector < bool > & satur() const { return m_satur; }
+
+ /** @brief Conversion operator to a std::string <br> Can be used in a cast operation : (std::string) digit <br> */
+ virtual operator std::string() const;
+
+ /** @brief Set energies .
+ @param[in] samples vector of energies
+ */
+ void setEnergies( std::vector < int > energies);
+
+ /** @brief Set bcids.
+ @param[in] samples vector of bcids
+ */
+ void setBCIds( std::vector < unsigned short > bcids);
+
+ /** @brief Destructor */
+ virtual ~LArRawSC() { }
+
+ /** @brief default constructor for persistency */
+ LArRawSC();
+};
+
+#endif //LArRawSC_H
+
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSCContainer.h b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSCContainer.h
new file mode 100755
index 0000000000000000000000000000000000000000..07d8e04311e5f2f50f666c7e0f486ca81f8c8637
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/LArRawSCContainer.h
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef LARRAWSCCONTAINER_H
+#define LARRAWSCCONTAINER_H
+
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/BaseInfo.h"
+#include "LArRawEvent/LArRawSC.h"
+
+/**
+ @class LArRawSCContainer
+ @brief Container class for LArRawSC */
+
+class LArRawSCContainer : public DataVector<LArRawSC> {
+
+ public :
+
+ /** @brief Constructor */
+ LArRawSCContainer() : DataVector<LArRawSC>() { }
+
+ /** @brief Alternative Construction with ownership policy*/
+ LArRawSCContainer(SG::OwnershipPolicy ownPolicy) : DataVector<LArRawSC>(ownPolicy) { }
+
+/**
+ * Conversion operator to a std::string <br><br>
+ * Can be used in a cast operation : (std::string) digit_container
+ */
+
+ virtual operator std::string() const;
+
+/**
+ * destructor
+ */
+ virtual ~LArRawSCContainer() { }
+private:
+
+} ;
+
+
+CLASS_DEF(LArRawSCContainer, 1169658673, 1)
+SG_BASE(LArRawSCContainer, DataVector<LArRawSC> );
+
+#endif
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/LArSCDigit.h b/LArCalorimeter/LArRawEvent/LArRawEvent/LArSCDigit.h
new file mode 100755
index 0000000000000000000000000000000000000000..6d76280a46455a4c9fe60f7432551701c2eef965
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/LArSCDigit.h
@@ -0,0 +1,59 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef LARSCDIGIT_H
+#define LARSCDIGIT_H
+#include "LArDigit.h"
+
+/**
+
+@class LArSCDigit
+@brief Base class for LArDigits taken by LATOME
+
+Additional data members to LArDigits are the LATOME channel number and the vector of BCIDs
+
+@author Pavol Strizenec
+*/
+
+class LArSCDigit : public LArDigit {
+
+private:
+
+ /** @brief LATOME channel*/
+ uint16_t m_chan;
+
+ /** @brief LATOME source Id*/
+ uint32_t m_sourceId;
+
+ /** @brief vector of BCID*/
+ std::vector<uint16_t> m_BCId;
+
+public:
+
+ LArSCDigit(const HWIdentifier & channel_value, short channel, unsigned int sourceId,
+ const std::vector<short> & sample_values,
+ const std::vector<unsigned short> & bcids) :
+ LArDigit(channel_value, CaloGain::LARHIGHGAIN, sample_values),
+ m_chan(channel), m_sourceId(sourceId), m_BCId(std::move(bcids))
+ {};
+
+ /** @return channel value */
+ short Channel() const {return static_cast<short>(m_chan);}
+
+ /** @return source Id value */
+ unsigned int SourceId() const {return static_cast<unsigned int>(m_sourceId);}
+
+ /** @return bcids */
+ const std::vector<unsigned short> &BCId() const {return m_BCId;}
+
+ /** @brief Destructor */
+ virtual ~LArSCDigit();
+
+ /** @brief default constructor for persistency */
+ LArSCDigit();
+
+};
+
+#endif //LARDIGIT_H
+
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/LArSCDigitContainer.h b/LArCalorimeter/LArRawEvent/LArRawEvent/LArSCDigitContainer.h
new file mode 100755
index 0000000000000000000000000000000000000000..eabcddfbb3c84e1cd5902928bb6157352f09f5e2
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/LArSCDigitContainer.h
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef LARSCDIGITCONTAINER_H
+#define LARSCDIGITCONTAINER_H
+
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "LArRawEvent/LArSCDigit.h"
+
+/**
+@class LArSCDigitContainer
+@brief Container class for LArSCDigit
+@author Pavol Strizenec
+*/
+
+class LArSCDigitContainer : public DataVector<LArSCDigit> {
+
+ public :
+ /**
+ @brief constructor
+ */
+ LArSCDigitContainer() : DataVector<LArSCDigit>() { }
+
+/**
+ @brief destructor
+ */
+ virtual ~LArSCDigitContainer();
+} ;
+
+
+CLASS_DEF(LArSCDigitContainer,1153794060,0)
+
+#endif
diff --git a/LArCalorimeter/LArRawEvent/LArRawEvent/selection.xml b/LArCalorimeter/LArRawEvent/LArRawEvent/selection.xml
index 785c3bd61501d6a64b386530e227230136e900c1..485ed267612af2d47a5dd4042dc7317cb907aab5 100755
--- a/LArCalorimeter/LArRawEvent/LArRawEvent/selection.xml
+++ b/LArCalorimeter/LArRawEvent/LArRawEvent/selection.xml
@@ -15,6 +15,10 @@
<class name="LArDigitContainer" id="B15FFDA0-206D-4062-8B5F-582A1ECD5502" />
<class name="DataVector<LArDigit>" />
<class name="std::vector<LArDigit*>" />
+ <class name="LArSCDigit" />
+ <class name="LArSCDigitContainer" id="A9F35100-49CB-4A1B-AA25-5FCF1737BBE5" />
+ <class name="LArRawSC" />
+ <class name="LArRawSCContainer" id="CEBA32C8-FA00-4FCB-97DC-37F7F7C841BD" />
<!-- <class name="std::vector<float>" /> -->
<class name="LArTTL1Container" id="38FAECC7-D0C5-4DD8-8FAE-8D35F0542ECD" />
diff --git a/LArCalorimeter/LArRawEvent/src/LArRawSC.cxx b/LArCalorimeter/LArRawEvent/src/LArRawSC.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..f09c03c9ce75829f65a09ee5d8cd42bbbd2b43f9
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/src/LArRawSC.cxx
@@ -0,0 +1,48 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <typeinfo>
+
+#include "LArRawEvent/LArRawSC.h"
+
+
+// default constructor
+LArRawSC::LArRawSC() {}
+
+LArRawSC::operator std::string() const{
+
+ char * stSamples = new char[20] ;
+ char * stNumberOfSamples = new char[30] ;
+ char * classNameOfDigit = new char[48] ;
+
+ const char * stname = typeid( *this ).name() ;
+ int lname ;
+ sscanf( stname , "%80d%47s" , &lname , classNameOfDigit ) ;
+
+
+ sprintf( stNumberOfSamples , "# of samples = %d " , this->nsamples() ) ;
+
+
+ std::string digitString = classNameOfDigit ;
+ delete[] stSamples ;
+ delete[] classNameOfDigit ;
+ delete[] stNumberOfSamples ;
+
+ return digitString ;
+
+
+}
+
+// set method
+void LArRawSC::setEnergies(std::vector<int> energies)
+{
+ m_energies.clear();
+ m_energies = energies;
+}
+
+void LArRawSC::setBCIds(std::vector<unsigned short> bcids)
+{
+ m_BCId.clear();
+ m_BCId = bcids;
+}
diff --git a/LArCalorimeter/LArRawEvent/src/LArRawSCContainer.cxx b/LArCalorimeter/LArRawEvent/src/LArRawSCContainer.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..1117287a7662d62350d5c1ba27f5b237ac425e6f
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/src/LArRawSCContainer.cxx
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "LArRawEvent/LArRawSCContainer.h"
+#include "AthenaKernel/BaseInfo.h"
+#include <typeinfo>
+
+
+
+LArRawSCContainer::operator std::string () const {
+
+ char * stCounter = new char[48] ;
+ char * nameOfContainer = new char[48] ;
+
+ const char * stname = typeid( *this ).name() ;
+ int lname ;
+ sscanf( stname , "%80d%47s" , &lname , nameOfContainer ) ;
+
+ std::string newline( "\n" ) ;
+ std::string digitContainerString = nameOfContainer ;
+ digitContainerString += ": content " ;
+ digitContainerString += newline ;
+
+ LArRawSCContainer::const_iterator it ;
+ int counter = 0 ;
+ const LArRawSC * digit ;
+
+ for(it = this->begin() ; it != this->end() ; it++ ){ // Loop over Hits
+
+ digit = *it ;
+
+ sprintf( stCounter , "%d" , counter ) ;
+
+ digitContainerString += "LArRawSC[" ;
+ digitContainerString += stCounter ;
+ digitContainerString += "] = " ;
+ digitContainerString += (std::string) (*digit) ;
+ digitContainerString += newline ;
+
+ counter ++ ;
+
+ }
+
+ sprintf( stCounter , "%d" , counter ) ;
+ digitContainerString += newline ;
+ digitContainerString += "Number of Digits in this container : " ;
+ digitContainerString += stCounter ;
+
+
+ delete[] stCounter ;
+ delete[] nameOfContainer ;
+
+ return digitContainerString ;
+
+}
+
+SG_ADD_BASE (LArRawSCContainer, DataVector<LArRawSC> );
diff --git a/LArCalorimeter/LArRawEvent/src/LArSCDigit.cxx b/LArCalorimeter/LArRawEvent/src/LArSCDigit.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..4c105b612bad5633d697cf108bbdf65e66558166
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/src/LArSCDigit.cxx
@@ -0,0 +1,15 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "LArRawEvent/LArSCDigit.h"
+
+/** Destructor */
+LArSCDigit::~LArSCDigit()
+{}
+
+/** default constructor for persistency */
+LArSCDigit::LArSCDigit()
+ : LArDigit(),
+ m_chan(0),m_sourceId(0)
+{}
diff --git a/LArCalorimeter/LArRawEvent/src/LArSCDigitContainer.cxx b/LArCalorimeter/LArRawEvent/src/LArSCDigitContainer.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..c8916bd8eb1292cc527c9638dadcbfac9a39c4b4
--- /dev/null
+++ b/LArCalorimeter/LArRawEvent/src/LArSCDigitContainer.cxx
@@ -0,0 +1,8 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "LArRawEvent/LArSCDigitContainer.h"
+
+LArSCDigitContainer::~LArSCDigitContainer()
+{}
diff --git a/LArCalorimeter/LArRecUtils/CMakeLists.txt b/LArCalorimeter/LArRecUtils/CMakeLists.txt
index e670a84e222883a62e52af6573028746eef79528..1f2fb686f8774cf687f8934b9476131ac395b061 100644
--- a/LArCalorimeter/LArRecUtils/CMakeLists.txt
+++ b/LArCalorimeter/LArRecUtils/CMakeLists.txt
@@ -69,7 +69,7 @@ atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ign
atlas_add_test( LArFCalTowerBuilderTool
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/LArFCalTowerBuilderTool_test.sh
- LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment"
+ LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment|IOVDbSvc +INFO"
PROPERTIES TIMEOUT 600 )
atlas_add_test( LArRecUtilsConfig_test
diff --git a/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h b/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h
index 26998706c33066b43a850f0b7c51aba48179444e..77623a28e022fdbea290d1768d9ab031064e8a23 100755
--- a/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h
+++ b/LArCalorimeter/LArRecUtils/LArRecUtils/LArOFPeakRecoTool.h
@@ -8,15 +8,15 @@
#define LARCALIBUTILS_LAROFPEAKRECOTOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
-#include "StoreGate/DataHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
#include "LArElecCalib/ILArOFC.h"
#include "LArElecCalib/ILArShape.h"
#include "CaloIdentifier/CaloGain.h"
#include "LArRawEvent/LArOFIterResults.h"
+#include "StoreGate/ReadCondHandleKey.h"
-class LArOnlineID;
+class LArOnlineID_Base;
/**
@brief Given a set of multiple samples, this class finds a peak using OFC.
@@ -77,17 +77,15 @@ class LArOFPeakRecoTool: public AthAlgTool
private:
bool m_iterate;
- const DataHandle<ILArOFC> m_dd_ofc;
- const DataHandle<ILArShape> m_dd_shape;
- std::string m_keyOFC ;
- std::string m_keyShape ;
+ SG::ReadCondHandleKey<ILArOFC> m_keyOFC {this, "OFCKey", "LArOFC", "SG key for OFC object"};
+ SG::ReadCondHandleKey<ILArShape> m_keyShape {this, "ShapeKey", "LArShape", "SG key for Shape object"};
bool m_useShape;
bool m_useShapeDer;
int m_delayShift;
float m_samplingPeriod;
bool m_forceHighGain;
-
- const LArOnlineID* m_lar_on_id;
+ bool m_isSC;
+ const LArOnlineID_Base* m_lar_on_id;
};
diff --git a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
index 21955d2c176f78cd4efd179292c5a354995bb8e2..60fcbe73332a4108dff23cb71eac4bc1725fca02 100644
--- a/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
+++ b/LArCalorimeter/LArRecUtils/share/LArFCalTowerBuilderTool.ref
@@ -1,16 +1,16 @@
-Tue Aug 6 20:57:27 CEST 2019
+Tue Oct 6 19:49:20 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.3] [x86_64-centos7-gcc8-opt] [atlas-work3/da00b53be39] -- built on [2019-08-06T2037]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "LArRecUtils/LArFCalTowerBuilderTool_test.py"
-SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5520 configurables from 75 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.3
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
@@ -18,28 +18,23 @@ Py:Athena INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobO
Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOptions.py"
Py:Athena INFO including file "TileIdCnv/TileIdCnv_jobOptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r0)
- running on lxplus724.cern.ch on Tue Aug 6 20:57:37 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:49:32 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3542 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus724.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -49,13 +44,14 @@ PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-SDR-BS14T-IBL-06 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 7 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -69,9 +65,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 2165 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 17 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 287 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 243 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -106,8 +102,6 @@ DetDescrCnvSvc INFO filling address for MDTIDHELPER with CLID 4170 and st
DetDescrCnvSvc INFO filling address for CSCIDHELPER with CLID 4171 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for RPCIDHELPER with CLID 4172 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for TGCIDHELPER with CLID 4173 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for STGCIDHELPER with CLID 4174 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for MMIDHELPER with CLID 4175 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for CaloLVL1_ID with CLID 108133391 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for CaloCell_SuperCell_ID with CLID 128365736 and storage type 68 to detector store
@@ -158,7 +152,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 5934 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6007 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -176,7 +170,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -188,39 +182,38 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
-ClassIDSvc INFO getRegistryEntries: read 6852 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7305 CLIDRegistry entries for module ALL
ToolSvc.LArFCal... INFO CaloTowerBuilder for the FCal initiated
-HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 109 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARAlign-mc11-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix2 for folder /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 195 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -237,12 +230,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -6663,25 +6656,25 @@ IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
IncidentProcAlg2 INFO Finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.13 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.02 ))s
IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.02 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 0.17 ))s
+IOVDbSvc INFO bytes in (( 0.07 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.17 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.07 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 330 [ms] Ave/Min/Max= 165(+- 155)/ 10/ 320 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 390 [ms] Ave/Min/Max= 195(+- 175)/ 20/ 370 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 2.41 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.5 [s] Ave/Min/Max= 0.25(+- 0.25)/ 0/ 0.5 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.275(+- 0.265)/ 0.01/ 0.54 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 2.55 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx b/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx
index 2b80865ae40c3aa422051e5a052b1a609cbecb0c..e03488903ac58dd4736b4714467575821eb2067f 100644
--- a/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArOFPeakRecoTool.cxx
@@ -7,6 +7,7 @@
#include "CLHEP/Matrix/Vector.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "LArIdentifier/LArOnlineID.h"
+#include "LArIdentifier/LArOnline_SuperCellID.h"
#include <algorithm>
#include <cmath>
@@ -23,10 +24,9 @@ LArOFPeakRecoTool::LArOFPeakRecoTool(const std::string& type, const std::string&
//m_nSamples(0xFFFFFFFF) //shall compare false to any possible number of samples
{
declareProperty("Iterate",m_iterate=false) ;
- declareProperty("KeyOFC",m_keyOFC="LArOFC") ;
- declareProperty("KeyShape",m_keyShape="LArShape") ;
declareProperty("UseShape",m_useShape=false,"Use the LArShape to compute quality factor");
declareProperty("UseShapeDer",m_useShapeDer=true,"Use the shape derivative in the quality factor computation");
+ declareProperty("isSuperCell",m_isSC=false,"switch to use SuperCells");
// DelayShift = different with delay run in 25/24 ns units
// 23 is the ad-hoc value for run 5640-5641
declareProperty("DelayShift",m_delayShift=23);
@@ -43,20 +43,30 @@ LArOFPeakRecoTool::~LArOFPeakRecoTool() {
StatusCode LArOFPeakRecoTool::initialize() {
ATH_MSG_DEBUG("initializing LArOFPeakRecoTool...");
-// call back for OFC
-
- ATH_CHECK( detStore()->regHandle(m_dd_ofc,m_keyOFC) );
- ATH_MSG_INFO( " register callback for OFC " );
+ ATH_CHECK( m_keyOFC.initialize() );
if (m_useShape) {
- ATH_CHECK( detStore()->regHandle(m_dd_shape,m_keyShape) );
+ ATH_CHECK( m_keyShape.initialize() );
}
else {
ATH_MSG_WARNING( "jobOption 'UseShape' set to false. Will work without shape" );
}
- ATH_CHECK( detStore()->retrieve(m_lar_on_id,"LArOnlineID") );
-
+ if(!m_isSC) {
+ const LArOnlineID* laron;
+ StatusCode sc = detStore()->retrieve(laron,"LArOnlineID");
+ if (sc.isFailure()) {
+ ATH_MSG_ERROR("Unable to retrieve LArOnlineID from DetectorStore");
+ return StatusCode::FAILURE;
+ } else m_lar_on_id = (LArOnlineID_Base*) laron;
+ } else {
+ const LArOnline_SuperCellID* laron;
+ StatusCode sc = detStore()->retrieve(laron,"LArOnline_SuperCellID");
+ if (sc.isFailure()) {
+ ATH_MSG_ERROR("Unable to retrieve LArOnlineID from DetectorStore");
+ return StatusCode::FAILURE;
+ } else m_lar_on_id = (LArOnlineID_Base*) laron;
+ }
return StatusCode::SUCCESS;
}
@@ -131,9 +141,16 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
else usedGain = CaloGain::LARHIGHGAIN;
}
+ const ILArOFC* dd_ofc=nullptr;
+ StatusCode sc=detStore()->retrieve(dd_ofc);
+ if (sc.isFailure()){
+ ATH_MSG_ERROR("Failed to retrieve LArOFC object " );
+ return result;
+ }
+
// Quantities depending on this cell
- const unsigned nOFCPhase=m_dd_ofc->nTimeBins(chID,usedGain);
- float timeOffset = m_dd_ofc->timeOffset(chID,usedGain);
+ const unsigned nOFCPhase=dd_ofc->nTimeBins(chID,usedGain);
+ float timeOffset = dd_ofc->timeOffset(chID,usedGain);
// convert delay to internal OFC delay (from 0 to Nphases*timeBinWidth)
delay = delay-timeOffset;
@@ -145,7 +162,7 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
timeBinWidth=25.; //ns
timeMax=(nOFCPhase-1)*timeBinWidth;
} else { //Have more than one OFC bin
- timeBinWidth=m_dd_ofc->timeBinWidth(chID,usedGain);
+ timeBinWidth=dd_ofc->timeBinWidth(chID,usedGain);
timeMax = (nOFCPhase-1)*timeBinWidth;
if (timeBinWidth==0.) {
ATH_MSG_ERROR( "timeBinWidth is zero for channel " << m_lar_on_id->channel_name(chID) );
@@ -161,8 +178,8 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
//std::cout << "Timebinwidth=" << timeBinWidth << " nOFCPhase=" << nOFCPhase << std::endl;
//std::cout << "Delay= " << delay << " Index=" << delayIdx << std::endl;
//Get first set of OFC's
- ILArOFC::OFCRef_t this_OFC_a = m_dd_ofc->OFC_a(chID,(int)usedGain,delayIdx);
- ILArOFC::OFCRef_t this_OFC_b = m_dd_ofc->OFC_b(chID,(int)usedGain,delayIdx);
+ ILArOFC::OFCRef_t this_OFC_a = dd_ofc->OFC_a(chID,(int)usedGain,delayIdx);
+ ILArOFC::OFCRef_t this_OFC_b = dd_ofc->OFC_b(chID,(int)usedGain,delayIdx);
const unsigned ofcSize=this_OFC_a.size(); //Assumed to be the same of all delay-indices
//std::cout << " got OFC " << this_OFC_a.size() << " " << this_OFC_b.size() << std::endl;
@@ -332,8 +349,8 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
if (delayIdx>=nOFCPhase) delayIdx = nOFCPhase-1;
//std::cout << " new kMax, delay,delayIdx " << kMax << " " << delay << " " << delayIdx << std::endl;
//Get next set of OFC's
- this_OFC_a = m_dd_ofc->OFC_a(chID,(int)usedGain,delayIdx);
- this_OFC_b = m_dd_ofc->OFC_b(chID,(int)usedGain,delayIdx);
+ this_OFC_a = dd_ofc->OFC_a(chID,(int)usedGain,delayIdx);
+ this_OFC_b = dd_ofc->OFC_b(chID,(int)usedGain,delayIdx);
}
while(1); // end for iteration loop
@@ -343,10 +360,16 @@ LArOFIterResults LArOFPeakRecoTool::peak(const std::vector<float>& samples, // r
//std::cout << "Done! A= " << result.m_amplitude << " ; tau= " << result.m_tau << " kIter=" << kIter << " nIter=" << nIter << std::endl;
// get shape
if (m_useShape){
+ const ILArShape* dd_shape=nullptr;
+ StatusCode sc=detStore()->retrieve(dd_shape);
+ if (sc.isFailure()){
+ ATH_MSG_ERROR("Failed to retrieve LArShape object with " );
+ return result;
+ }
q = 0.;
- ILArShape::ShapeRef_t thisShape = m_dd_shape->Shape(chID,(int)usedGain,delayIdx) ;
+ ILArShape::ShapeRef_t thisShape = dd_shape->Shape(chID,(int)usedGain,delayIdx) ;
ILArShape::ShapeRef_t thisShapeDer;
- if (m_useShapeDer) thisShapeDer = m_dd_shape->ShapeDer(chID,(int)usedGain,delayIdx) ;
+ if (m_useShapeDer) thisShapeDer = dd_shape->ShapeDer(chID,(int)usedGain,delayIdx) ;
if( thisShape.size() >= ofcSize ) {
for ( unsigned k=0 ; k<ofcSize ; k++ ) {
const float& this_sample = samples[kMax-2+k];
diff --git a/LArCalorimeter/LArRegionSelector/src/RegSelCondAlg_LAr.cxx b/LArCalorimeter/LArRegionSelector/src/RegSelCondAlg_LAr.cxx
index 80f83619e658deb9343b7a72c5aede94a9df5b3d..755a015b96b154ee93a46eccac6744fe0b1e6f6e 100644
--- a/LArCalorimeter/LArRegionSelector/src/RegSelCondAlg_LAr.cxx
+++ b/LArCalorimeter/LArRegionSelector/src/RegSelCondAlg_LAr.cxx
@@ -56,9 +56,9 @@ StatusCode RegSelCondAlg_LAr::initialize() {
StatusCode RegSelCondAlg_LAr::execute(const EventContext& ctx) const {
- ATH_MSG_DEBUG("RegSelCondAlg_LAr::execute() -- enter -- ");
-
- /// do stuff here ...
+ ATH_MSG_INFO( "RegSelConfAlg_LAr:execute() " << name() );
+
+ /// do stuff here ...
ATH_MSG_DEBUG( "Creating region selector table " << m_tableKey );
SG::WriteCondHandle<IRegSelLUTCondData> lutCondData( m_tableKey, ctx );
@@ -72,7 +72,7 @@ StatusCode RegSelCondAlg_LAr::execute(const EventContext& ctx) const {
return StatusCode::SUCCESS;
}
-
+
/// annoyingly take the pixel cabling to determine whether to build this
/// calorimeter table using the EventIDRange.
/// Once the calorimeter has it own conditions data cabling, then we can
@@ -87,7 +87,8 @@ StatusCode RegSelCondAlg_LAr::execute(const EventContext& ctx) const {
return StatusCode::FAILURE;
}
-
+ ATH_MSG_DEBUG( "RegSelConfAlg_LAr: " << name() << " found range: " << id_range );
+
ATH_MSG_INFO( "creating new LAr table" );
/// create the new lookup table
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index 0bdbf862d930cc701f4ada3989d89f9e032fa2b5..1b62213e33d9866783aef639e939e1562cb889a2 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -55,7 +55,7 @@ function (larconditions_run_test testName)
SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/larconditions_${testName}.sh
ENVIRONMENT ATLAS_REFERENCE_TAG=LArConditionsTest/LArConditionsTest-01-00-12
PROPERTIES TIMEOUT 1200
- LOG_IGNORE_PATTERN "Data source lookup|Resolved path|Failed to connect to service|Release number|Sorting algorithm|Failed to connect|Failure while attempting to connect|Reading file|^CORAL/|being retired|^Domain|INFO GeoModelSvc|locate catalog|Cache alignment|COOL_DISABLE|Failed to get ContainerHandle|^RalSessionMgr Info|^RelationalDatabase Info|Bootstrap.py|MetaDataSvc|xAODMaker|Opening COOL connection|Disconnecting from"
+ LOG_IGNORE_PATTERN "Data source lookup|Resolved path|Failed to connect to service|Release number|Sorting algorithm|Failed to connect|Failure while attempting to connect|Reading file|^CORAL/|being retired|^Domain|INFO GeoModelSvc|locate catalog|Cache alignment|COOL_DISABLE|Failed to get ContainerHandle|^RalSessionMgr Info|^RelationalDatabase Info|Bootstrap.py|MetaDataSvc|xAODMaker|Opening COOL connection|Disconnecting from|IOVDbSvc +INFO"
)
if( ARG_DEPENDS )
set_tests_properties( LArConditionsTest_${testName}_ctest
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
index 6cf04029d418293ea66fe7448f7f537284cd231c..9dc169f72014522133b592f688f28989a0c26a15 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
@@ -1,7 +1,7 @@
-Fri Jun 19 19:05:25 CEST 2020
+Tue Oct 6 19:50:02 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
@@ -11,9 +11,9 @@ Py:Athena INFO including file "AtlasGeoModel/SetGeometryVersion.py"
AtlasGeoModel/SetGeometryVersion.py is OBSOLETE
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py"
Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py"
@@ -30,26 +30,22 @@ Py:Athena INFO including file "CaloDetMgrDetDescrCnv/CaloDetMgrDetDes
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on aibuild20-040.cern.ch on Fri Jun 19 19:05:48 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:50:13 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3634 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild20-040.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -60,7 +56,6 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-CSC-00-01-00 set from joboptions
@@ -70,7 +65,7 @@ IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag w
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 10 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1429 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -87,9 +82,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 239 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 243 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -177,7 +172,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 6055 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6117 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -195,7 +190,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -207,17 +202,17 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 7140 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7305 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) ->
@@ -227,9 +222,9 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' )
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 468 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 473 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
@@ -259,12 +254,12 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARAlign_CSC_01 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix for folder /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
@@ -272,7 +267,7 @@ Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/r
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root File version:51304
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 196 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 200 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -289,12 +284,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -6904,28 +6899,28 @@ CondInputLoader INFO Finalizing CondInputLoader...
IncidentProcAlg2 INFO Finalize
EventSelector INFO finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 11.11 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 7.42 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 6.24 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 20.03 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 0.12 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 0.06 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.08 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 2.01 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 5.96 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.04 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 52.77 ))s
+IOVDbSvc INFO bytes in (( 0.35 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 52.77 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 0.35 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 480 [ms] Ave/Min/Max= 240(+- 220)/ 20/ 460 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max=0.112(+-0.205)/ 0/ 0.52 [s] #= 5
-ChronoStatSvc INFO Time User : Tot= 3.22 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 245(+- 225)/ 20/ 470 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max= 0.112(+- 0.209)/ 0/ 0.53 [s] #= 5
+ChronoStatSvc INFO Time User : Tot= 3.49 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
index 5fdc0c5dc44b2b22668794ad4a645a55a1790b46..09f0b67af92836afa2b220de879c2afe286a840d 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
@@ -1,7 +1,7 @@
-Fri Jun 19 19:12:26 CEST 2020
+Tue Oct 6 19:51:07 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
@@ -11,9 +11,9 @@ Py:Athena INFO including file "AtlasGeoModel/SetGeometryVersion.py"
AtlasGeoModel/SetGeometryVersion.py is OBSOLETE
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py"
Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py"
@@ -32,26 +32,22 @@ Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_jo
Py:Athena INFO including file "AthenaPoolServices/AthenaRootStreamerSvc_jobOptions.py"
Py:Athena INFO including file "AthenaPoolCnvSvc/AthenaPool_jobOptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on aibuild20-040.cern.ch on Fri Jun 19 19:12:42 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:51:17 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3634 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild20-040.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -62,7 +58,6 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-CSC-00-01-00 set from joboptions
@@ -73,10 +68,29 @@ IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 10 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
CondProxyProvider INFO Initializing CondProxyProvider - package version EventSelectorAthenaPool-00-00-00
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A
+PoolSvc INFO File is not in Catalog! Attempt to open it anyway.
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
+Domain[ROOT_All] INFO LarCondTestNoReg.root
+RootDatabase.open INFO LarCondTestNoReg.root File version:62200
+LarCondTestNoRe... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+PoolSvc INFO File is not in Catalog! Attempt to open it anyway.
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
Domain[ROOT_All] INFO LarCondTestNoReg.root
-RootDatabase.open INFO LarCondTestNoReg.root File version:62002
-ClassIDSvc INFO getRegistryEntries: read 4078 CLIDRegistry entries for module ALL
+RootDatabase.open INFO LarCondTestNoReg.root File version:62200
+LarCondTestNoRe... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 99993A5D-2110-B45C-8015-27A23799B9A5
+Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
+DbSession INFO Open DbSession
+Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] AD51FB41-BEBD-D549-A173-BDBAE85C2199
+Domain[ROOT_All] INFO LarCondTestNoReg.root
+RootDatabase.open INFO LarCondTestNoReg.root File version:62200
+ClassIDSvc INFO getRegistryEntries: read 4365 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -94,9 +108,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPp
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
LarCondTestNoRe... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] AD51FB41-BEBD-D549-A173-BDBAE85C2199
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:McCnvSvc
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
@@ -141,12 +155,12 @@ EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] AD51FB41-BEBD-D549-A173-BDBAE85C2199
Domain[ROOT_All] INFO LarCondTestNoReg.root
-RootDatabase.open INFO LarCondTestNoReg.root File version:62002
-ClassIDSvc INFO getRegistryEntries: read 161 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
+RootDatabase.open INFO LarCondTestNoReg.root File version:62200
+ClassIDSvc INFO getRegistryEntries: read 163 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 39 CLIDRegistry entries for module ALL
GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
@@ -193,7 +207,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 5545 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5595 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -211,7 +225,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -223,17 +237,17 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 5548 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5651 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) ->
@@ -243,9 +257,9 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' )
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 468 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 473 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
@@ -274,12 +288,12 @@ CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'Condit
ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARAlign_CSC_01 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix for folder /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
@@ -287,7 +301,7 @@ Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/r
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root File version:51304
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 196 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 200 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -304,12 +318,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -6251,7 +6265,7 @@ LArConditionsTe... DEBUG Total number of correction objects 20
LArConditionsTe... DEBUG End of testCondObjects
AthenaEventLoopMgr INFO ===>>> done processing event #0, run #0 1 events processed so far <<<===
LarCondTestNoRe... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] AD51FB41-BEBD-D549-A173-BDBAE85C2199
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
/cvmfs/atlas-co... INFO Database being retired...
@@ -6263,28 +6277,28 @@ CondInputLoader INFO Finalizing CondInputLoader...
IncidentProcAlg2 INFO Finalize
EventSelector INFO finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 1.33 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 1.31 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.17 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.76 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 0.15 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 0.08 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.11 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.22 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.04 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.25 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 3.82 ))s
+IOVDbSvc INFO bytes in (( 0.65 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 3.82 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 0.65 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 300 [ms] Ave/Min/Max= 1.17(+- 18.1)/ 0/ 290 [ms] #=257
-cObj_ALL INFO Time User : Tot= 400 [ms] Ave/Min/Max= 44.4(+- 102)/ 0/ 330 [ms] #= 9
-ChronoStatSvc INFO Time User : Tot= 3.2 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 370 [ms] Ave/Min/Max= 1.44(+- 23)/ 0/ 370 [ms] #=257
+cObj_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.0578(+- 0.133)/ 0/ 0.43 [s] #= 9
+ChronoStatSvc INFO Time User : Tot= 4.04 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
index a039b90935464802efc0dd897bd726cf9ff7aa4c..9b5e40c3428fbaeacdb12de069724d9c6b93865b 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
@@ -1,7 +1,7 @@
-Fri Jun 19 19:10:37 CEST 2020
+Tue Oct 6 19:50:22 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [master/b9ffea6f446] -- built on [2020-06-18T1816]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
@@ -11,9 +11,9 @@ Py:Athena INFO including file "AtlasGeoModel/SetGeometryVersion.py"
AtlasGeoModel/SetGeometryVersion.py is OBSOLETE
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5534 configurables from 58 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "LArRawConditions/LArIdMap_ATLAS_jobOptions.py"
Py:Athena INFO including file "LArConditionsCommon/LArIdMap_MC_jobOptions.py"
@@ -31,26 +31,22 @@ Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_jo
Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py"
Py:Athena INFO including file "LArCondAthenaPool/LArCondAthenaPool_joboptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on aibuild20-040.cern.ch on Fri Jun 19 19:10:55 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:50:33 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3634 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3586 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild20-040.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -61,7 +57,6 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-CSC-00-01-00 set from joboptions
@@ -71,7 +66,7 @@ IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag w
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 10 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1429 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -88,9 +83,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 239 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 243 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -178,7 +173,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 6055 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6117 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -196,7 +191,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -208,17 +203,17 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 7140 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7305 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' ) ->
@@ -228,9 +223,9 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/CalibIdMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/FebRodMap' )
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/Identifier/OnOffIdMap' )
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 798 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 809 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
@@ -261,12 +256,12 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 0 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARAlign_CSC_01 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbFolder INFO HVS tag OFLCOND-CSC-00-01-00 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix for folder /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] E01BD448-BF95-DB11-983E-0015C5098AA3
@@ -274,7 +269,7 @@ Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/r
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0058.pool.root File version:51304
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 196 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 200 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -291,12 +286,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-06-18T2139/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -6906,10 +6901,10 @@ CondInputLoader INFO Finalizing CondInputLoader...
OutputCondition... INFO Finalize: preparing to write conditions objects
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain UPDATE [ROOT_All]
-Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A
+Domain[ROOT_All] INFO -> Access DbDatabase CREATE [ROOT_All] AD51FB41-BEBD-D549-A173-BDBAE85C2199
Domain[ROOT_All] INFO LarCondTestNoReg.root
-RootDatabase.open INFO LarCondTestNoReg.root File version:62002
-ClassIDSvc INFO getRegistryEntries: read 33 CLIDRegistry entries for module ALL
+RootDatabase.open INFO LarCondTestNoReg.root File version:62200
+ClassIDSvc INFO getRegistryEntries: read 34 CLIDRegistry entries for module ALL
OutputCondition... INFO Identified a total of 3 objects to write out:
OutputCondition... INFO 0: LArRampMC#/LArCalorimeter/LArTests/LArRampsSingleGroup#/LArCalorimeter/LArTests/LArRampsSingleGroup
OutputCondition... INFO 1: LArRampMC#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping
@@ -6925,44 +6920,46 @@ StorageSvc INFO DataHeaderForm_p6 [7BE56CEF-C866-4BEE-9348-A5F34B5F1DA
OutputCondition... INFO Written 3 objects to output stream
OutputCondition... INFO Register objects in IOV database, interval of validity [run,LB] from [0,0] to [2147483647,4294967295]
OutputCondition... INFO Register object LArRampMC#/LArCalorimeter/LArTests/LArRampsSingleGroup in IOV database folder /LArCalorimeter/LArTests/LArRampsSingleGroup without tagging
-ClassIDSvc INFO getRegistryEntries: read 861 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 892 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for sqlite://;schema=mycool.db;dbname=OFLP200
+IOVDbSvc INFO *** COOL exception caught: The database does not exist
+IOVDbSvc INFO Create a new conditions database: sqlite://;schema=mycool.db;dbname=OFLP200
OutputCondition... INFO Register object LArRampMC#/LArCalorimeter/LArTests/LArRampsSubDetectorGrouping in IOV database folder /LArCalorimeter/LArTests/LArRampsSubDetectorGrouping without tagging
OutputCondition... INFO Register object LArRampMC#/LArCalorimeter/LArTests/LArRampsFeedThroughGrouping in IOV database folder /LArCalorimeter/LArTests/LArRampsFeedThroughGrouping without tagging
OutputCondition... INFO Registered 3 objects in IOV database
IncidentProcAlg2 INFO Finalize
EventSelector INFO finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 9.49 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 1.37 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 1.73 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 4.75 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 5/1 objs/chan/bytes 5/1/840 (( 0.10 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/7600740 (( 0.05 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/30500 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 5/1 objs/chan/bytes 5/1/3901460 (( 0.07 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.13 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.48 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 2/1 objs/chan/bytes 2/1/390 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 5/0 objs/chan/bytes 5/1/865 (( 0.04 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 17.95 ))s
+IOVDbSvc INFO bytes in (( 0.31 ))s
IOVDbSvc INFO Disconnecting from sqlite://;schema=mycool.db;dbname=OFLP200
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 1 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 17.95 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 6 nFolders: 6 ReadTime: (( 0.31 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
LarCondTestNoRe... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] A6B968DB-9C78-4148-9C5C-A41979AF763A
+Domain[ROOT_All] INFO -> Deaccess DbDatabase CREATE [ROOT_All] AD51FB41-BEBD-D549-A173-BDBAE85C2199
Domain[ROOT_All] INFO > Deaccess DbDomain UPDATE [ROOT_All]
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-fRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 4
-commitOutput INFO Time User : Tot= 10 [ms] #= 1
-cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max=0.0784(+-0.882)/ 0/ 10 [ms] #=255
-cRep_ALL INFO Time User : Tot= 100 [ms] Ave/Min/Max= 25(+- 37.7)/ 0/ 90 [ms] #= 4
-cObjR_ALL INFO Time User : Tot= 400 [ms] Ave/Min/Max= 200(+- 190)/ 10/ 390 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 460 [ms] Ave/Min/Max= 92(+- 174)/ 0/ 440 [ms] #= 5
-ChronoStatSvc INFO Time User : Tot= 3.55 [s] #= 1
+commitOutput INFO Time User : Tot= 0 [us] #= 1
+fRep_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 2.5(+- 4.33)/ 0/ 10 [ms] #= 4
+cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0392(+- 0.625)/ 0/ 10 [ms] #=255
+cRep_ALL INFO Time User : Tot= 120 [ms] Ave/Min/Max= 30(+- 46.4)/ 0/ 110 [ms] #= 4
+cObjR_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 245(+- 235)/ 10/ 480 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.11(+- 0.21)/ 0/ 0.53 [s] #= 5
+ChronoStatSvc INFO Time User : Tot= 4.8 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgConfig.py
index 1ec4df0ac0995d633face79d6638d87e95a1d316..42674515bcb927ddb6c3f238e65e6bf4f2008046 100644
--- a/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgConfig.py
+++ b/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgConfig.py
@@ -18,7 +18,7 @@ def BunchCrossingCondAlgCfg(configFlags):
result.merge(addFolders(configFlags,folder,None,className="AthenaAttributeList"))
else: #data case
folder = '/TDAQ/OLC/LHC/FILLPARAMS'
- result.merge(addFolders(configFlags,folder,'TDAQ',className = 'AthenaAttributeList'))
+ result.merge(addFolders(configFlags,folder,'TDAQ',className = 'AthenaAttributeList',tag='HEAD'))
alg = BunchCrossingCondAlg(Run1=run1,
diff --git a/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgTest.py b/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgTest.py
index 7889e9d039c6daf26f7bbe18cb83df1d83063cc8..9fd8e749c5f0bd413567b28d6d0950f2542ba87b 100644
--- a/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgTest.py
+++ b/LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgTest.py
@@ -92,6 +92,7 @@ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
ConfigFlags.IOVDb.DatabaseInstance="CONDBR2"
ConfigFlags.Input.isMC=False
ConfigFlags.IOVDb.GlobalTag="CONDBR2-BLKPA-2017-05"
+ConfigFlags.GeoModel.AtlasVersion="ATLAS-R2-2016-01-00-01"
ConfigFlags.lock()
result=MainServicesCfg(ConfigFlags)
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromAmdc.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromAmdc.cxx
index 89285e9eacf0a8ec599a5c87830e9f26ced76eda..0db7b7f9184ee6e2b1a1ece6ce8924ffe1d3f7da 100755
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromAmdc.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/AmdcDbSvcMakerFromAmdc.cxx
@@ -7,6 +7,9 @@
#include "AmdcDb/AmdcDbSvc.h"
#include "AmdcDb/AmdcDbRecordset.h"
#include "AmdcDb/AmdcDbRecord.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include <cmath>
AmdcDbSvcMakerFromAmdc::AmdcDbSvcMakerFromAmdc(){
@@ -1339,7 +1342,30 @@ if ((StationNameHEAD[0] != 'T'
DbVar = "VERS" ; DbVarComment="VERSION" ; iDbVal = m_version ; pAmdcDbRecord->addInt(DbVar,DbVarComment,iDbVal);
DbVar = "DX" ; DbVarComment="X RELATIVE POSITION OF THE SUB-CUT" ; dDbVal = pAmdcsimrec->Cutdx (pAmdcsimrec->INOCUT(DB_JTYP,DB_INDX,DB_ICUT),KounterCutLines)/ 10. ; pAmdcDbRecord->addDouble(DbVar,DbVarComment,dDbVal,LocalEpsLengthCM);
- DbVar = "DY" ; DbVarComment="Y RELATIVE POSITION OF THE SUB-CUT" ; dDbVal = pAmdcsimrec->Cutdy (pAmdcsimrec->INOCUT(DB_JTYP,DB_INDX,DB_ICUT),KounterCutLines)/ 10. ;
+ DbVar = "DY";
+ DbVarComment="Y RELATIVE POSITION OF THE SUB-CUT";
+ int theDbIdx = DB_INDX;
+ // when amdb is mirroring chambers from the Aside to the Cside, it increments the station numbers, e.g. BIS7 becomes BIS17 etc.
+ // however, something inside the INOCUT function (https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/Amdcsimrec/AmdcStand/src/readmdb.F90#0611)
+ // cannot translate these larger station numbers to the correct amdb numbers needed by the amdb Cut_dy function
+ // (https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/Amdcsimrec/AmdcStand/src/readmdb.F90#0971)
+ // this Cut_dy function only returns the correct H Line dy values in case the original amdb station number is given.
+ // This only happens for BI upgrades, BIS78 and BI1-6
+ if (TheStationName.find("BI")!=std::string::npos) {
+ if (DB_INDX>16) {
+ MsgStream log(Athena::getMessageSvc(),"AmdcDbSvcMakerFromAmdc::ALIN");
+ log<<MSG::WARNING<<"ATTENTION: Adjusting DB_INDX value for H Line Cutdy method call. This should only be done for BI upgrade chambers."<<endmsg;
+ }
+ if (DB_INDX==17) theDbIdx=7;
+ else if (DB_INDX==18) theDbIdx=13;
+ else if (DB_INDX==19) theDbIdx=9;
+ else if (DB_INDX==20) theDbIdx=10;
+ else if (DB_INDX==21) theDbIdx=8;
+ else if (DB_INDX==24) theDbIdx=11;
+ else if (DB_INDX==25) theDbIdx=12;
+ else if (DB_INDX==26) theDbIdx=14;
+ }
+ dDbVal = pAmdcsimrec->Cutdy(pAmdcsimrec->INOCUT(DB_JTYP,theDbIdx,DB_ICUT),KounterCutLines)/10.;
// JFL Thu Apr 3 14:47:44 CEST 2008:
// found by Stefania Spagnolo: When computed for the -Z part there are rounding errors which giving non nul value to Dy while it should be null
// patch: put it a 0. if too small
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx
index fcedd0f04ee2ec6e58b2ed89ad2ceaf11007fb92..71c7c01dba5746ab9af28e794c64c147a38e150e 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx
@@ -1064,11 +1064,11 @@ namespace Muon {
//core algorithm for endcap vertex reconstruction
Amg::Vector3D MSVertexRecoTool::VxMinQuad(const std::vector<Tracklet> &tracks) const {
- float s(0.),sx(0.),sy(0.),sxy(0.),sxx(0.),d(0.);
- float sigma = 1.;
+ double s(0.),sx(0.),sy(0.),sxy(0.),sxx(0.),d(0.);
+ double sigma = 1.;
for(unsigned int i=0; i<tracks.size(); ++i) {
- float TrkSlope = std::tan(tracks.at(i).getML1seg().alpha());
- float TrkInter = tracks.at(i).getML1seg().globalPosition().perp() - tracks.at(i).getML1seg().globalPosition().z()*TrkSlope;
+ double TrkSlope = std::tan(tracks.at(i).getML1seg().alpha());
+ double TrkInter = tracks.at(i).getML1seg().globalPosition().perp() - tracks.at(i).getML1seg().globalPosition().z()*TrkSlope;
s += 1./(sq(sigma));
sx += TrkSlope/(sq(sigma));
sxx += sq(TrkSlope)/sq(sigma);
@@ -1081,9 +1081,9 @@ namespace Muon {
return MyVx;
}
- float Rpos = (sxx*sy - sx*sxy)/d;
- float Zpos = (sx*sy - s*sxy)/d;
-
+ double Rpos = (sxx*sy - sx*sxy)/d;
+ double Zpos = (sx*sy - s*sxy)/d;
+
Amg::Vector3D MyVx(Rpos,0,Zpos);
return MyVx;
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MdtDigitToMdtRDO.cxx b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MdtDigitToMdtRDO.cxx
index 2e69f7421a4a86d179d64c11f39cb1c56a69cce3..689dfbe4ed13bbc0e31f9b9f28ed442974023c77 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MdtDigitToMdtRDO.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MdtDigitToMdtRDO.cxx
@@ -123,7 +123,7 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata(const EventContext& ctx) const {
ATH_MSG_ERROR( name << " "
<< eta << " " << phi << " "
<< "and dummy multilayer=1, layer=1, tube=1 ." );
- std::abort();
+ return StatusCode::FAILURE;
}
Identifier chid1, chid2;
@@ -173,7 +173,7 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata(const EventContext& ctx) const {
ATH_MSG_ERROR( name << " "
<< eta << " " << phi << " "
<< " and dummy multilayer=1, layer=1, tube=1 ." );
- std::abort();
+ return StatusCode::FAILURE;
}
mdtCsm_2nd = new MdtCsm(chid2, elementHash_2nd, subsystem_2ndcsm, mrod_2ndcsm, link_2ndcsm);
@@ -200,13 +200,21 @@ StatusCode MdtDigitToMdtRDO::fill_MDTdata(const EventContext& ctx) const {
subsystem, mrod, link,
tdc, channel);
- if (!cabling) {
- ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " );
- ATH_MSG_ERROR( name << " "
- << eta << " " << phi << " "
- << multilayer << " " << layer << " " << tube );
- std::abort();
- }
+ if (!cabling) {
+ // as long as there is no BIS78 cabling, to avoid a hard crash, replace the tubeNumber
+ // of tubes not covered in the cabling by 1
+ if (m_idHelperSvc->mdtIdHelper().stationName(channelId)==1
+ && std::abs(m_idHelperSvc->mdtIdHelper().stationEta(channelId))>6
+ && m_idHelperSvc->issMdt(channelId)) {
+ ATH_MSG_WARNING("Found BIS78 sMDT with tubeLayer="<<layer<<" and tubeNumber="<<tube<<". Setting to 1,1 for now...");
+ cabling = readCdo->getOnlineId(name, eta, phi, multilayer, 1, 1,subsystem, mrod, link, tdc, channel);
+ }
+ if (!cabling) {
+ ATH_MSG_ERROR( "MDTcabling can't return an online ID for the channel : " );
+ ATH_MSG_ERROR( name << " " << eta << " " << phi << " " << multilayer << " " << layer << " " << tube );
+ return StatusCode::FAILURE;
+ }
+ }
bool masked = mdtDigit->is_masked();
// Create the new AMT hit
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx
index e2a81339732e975d0485d5f96e07b718b86f5476..c3902c58c34ce1a4d9eeeecfb3aafefe04ad460f 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscDigitToCscRDOTool.cxx
@@ -213,7 +213,7 @@ StatusCode CscDigitToCscRDOTool::fill_CSCdata()
((neutron & 1) << 23) |
((calAmplitude & 0x3f)<<24) |
((enableCal & 1) << 30) |
- ((m_samplingRate==20?0:1)<<31);
+ ((m_samplingRate==20?0u:1u)<<31);
cscRdoCollection->set_eventType( eventType );
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.cxx
index 3f4415bb193ceb4420446515273a756ae34b02c7..0e68539d0e18f471e3fb89b33539e27d55fe3c49 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.cxx
@@ -70,7 +70,7 @@ CscRODReadOut::CscRODReadOut(double startTime, uint16_t samplingTime,
}
-void CscRODReadOut::encodeFragments(const std::vector<uint16_t> amplitude,
+void CscRODReadOut::encodeFragments(const std::vector<uint16_t>& amplitude,
std::vector<uint32_t>& v) const {
int numberOfFragments = amplitude.size();
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.h b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.h
index efebb1b38ab14b5f836e61aa4fd774dbc8986feb..5f5a603aae594179e69122beb584bbacb15d6864 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.h
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOut.h
@@ -52,7 +52,7 @@ public:
// encoding
uint32_t getSourceID(uint16_t side, uint16_t rodId);
- void encodeFragments(const std::vector<uint16_t> amplitude,
+ void encodeFragments(const std::vector<uint16_t>& amplitude,
std::vector<uint32_t>& v) const;
// initialize helper
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.cxx
index 8565ff75e77a0b7b6b9ec36c694bbffa5ce161ff..9e5f46ca4d83e6c96696be85ab1ddfa8283c9d0d 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "CscRODReadOutV1.h"
@@ -74,7 +74,7 @@ CscRODReadOutV1::CscRODReadOutV1(double startTime, uint16_t samplingTime,
CscRODReadOutV1::~CscRODReadOutV1()
{}
-void CscRODReadOutV1::encodeFragments(const std::vector<uint16_t> amplitude,
+void CscRODReadOutV1::encodeFragments(const std::vector<uint16_t>& amplitude,
std::vector<uint32_t>& v) const {
int numberOfFragments = amplitude.size();
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.h b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.h
index 1c306d1cb7125432d4656d7fbc36fa54e749bc30..fabc685f8e8984702de083daf6a9c3fd7c74dd0d 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.h
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRODReadOutV1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONCSC_CNVTOOL_CSCRODREADOUTV1_H
@@ -50,7 +50,7 @@ public:
// encoding
uint32_t getSourceID(uint16_t side, uint16_t rodId);
- void encodeFragments(const std::vector<uint16_t> amplitude,
+ void encodeFragments(const std::vector<uint16_t>& amplitude,
std::vector<uint32_t>& v) const;
// initialize helper
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Encoder.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Encoder.cxx
index 0b7ab38f01bd657227c7dda06159c95287da8b82..922359b9fc1e02aed5f4783cf3eef3b624897b97 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Encoder.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Encoder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// Implementation of CscROD_Encoder class
@@ -73,16 +73,13 @@ StatusCode CscROD_Encoder::fillROD(std::vector<uint32_t>& v, MsgStream& mLog)
uint8_t firstBitSummary = m_cscRdo->firstBitSummary();
/** encode strip data fragments :: ROD body */
- std::map<uint16_t,rpu>::iterator rpuBegin = mapRPU.begin();
- std::map<uint16_t,rpu>::iterator rpuEnd = mapRPU.end();
-
mLog << MSG::DEBUG << "Number of RPU in this ROD = " << mapRPU.size() << endmsg;
unsigned int rpuIndex = 0;
- for (; rpuBegin != rpuEnd; rpuBegin++) {
+ for (std::pair<const uint16_t, rpu>& rpuPair : mapRPU) {
/** this RPU identifier */
- uint16_t rpuID = (*rpuBegin).first;
+ uint16_t rpuID = rpuPair.first;
mLog << MSG::DEBUG << "CscROD_Encoder : RPU id " << rpuID << endmsg;
/** RPU size from simulation - assume no ghost words:
@@ -96,12 +93,10 @@ StatusCode CscROD_Encoder::fillROD(std::vector<uint32_t>& v, MsgStream& mLog)
where one sample = 12-bit ADC. The 2 words at the start of the cluster describe
the cluster size and location. The %2 accounts for the old number of samples */
uint32_t spuSize[] = {0, 0, 0, 0, 0};
- std::vector<const CscRawData*>::const_iterator it = (*rpuBegin).second.begin();
- std::vector<const CscRawData*>::const_iterator it_end = (*rpuBegin).second.end();
uint16_t numberOfDataWords = 0;
uint32_t sampleDataWords = 0;
- for (; it != it_end; ++it) {
- uint16_t spuID = (*it)->rpuID();
+ for (const CscRawData* rawData : rpuPair.second) {
+ uint16_t spuID = rawData->rpuID();
mLog << MSG::DEBUG << "CscROD_Encoder : The SPU ID " << spuID << endmsg;
unsigned int i = 0x800;
if ( spuID < 4 ) i=spuID;
@@ -111,7 +106,7 @@ StatusCode CscROD_Encoder::fillROD(std::vector<uint32_t>& v, MsgStream& mLog)
mLog << MSG::ERROR << "CscROD_Encoder : SPU ID out of range - " << spuID << " Stop and fix it " << endmsg;
} else {
mLog << MSG::DEBUG << "CscROD_Encoder : SPU ID and Index = " << spuID << " " << i << endmsg;
- uint16_t size = ((*it)->samples()).size();
+ uint16_t size = (rawData->samples()).size();
uint16_t unitSize = size/2 + size%2;
spuSize[i] += 1;
numberOfDataWords += 2 + unitSize;
@@ -174,16 +169,11 @@ StatusCode CscROD_Encoder::fillROD(std::vector<uint32_t>& v, MsgStream& mLog)
(0xFF & spuSize[4] ) << 24;
v.push_back( secondClusterWord );
- /** reset the iterators */
- it = (*rpuBegin).second.begin();
- it_end = (*rpuBegin).second.end();
-
/** strip addresses and ADC samples - the first 2 words contain the
address and the width+time+timeFlag, following the ADC samplings */
unsigned int check = 0;
- for (; it != it_end; ++it) {
+ for (const CscRawData* rawData : rpuPair.second) {
- const CscRawData * rawData = (*it);
uint32_t address = rawData->address();
uint16_t time = rawData->time();
uint16_t width = rawData->width();
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoToCscPrepDataToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoToCscPrepDataToolCore.cxx
index 7e93f54ce8f56b697c583757aee3bf646a39dd56..da290c2b09b6eb18c99ac6540bdb03083f32b8f2 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoToCscPrepDataToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRdoToCscPrepDataToolCore.cxx
@@ -66,7 +66,7 @@ StatusCode CscRdoToCscPrepDataToolCore::decode(std::vector<IdentifierHash>&, std
//*****************************************
//************** Process for the givenId EF Filter case...
/// This decode function is for single-thread running only
-StatusCode CscRdoToCscPrepDataToolCore::decode ATLAS_NOT_THREAD_SAFE (const CscRawDataContainer* rdoContainer, IdentifierHash givenHashId, std::vector<IdentifierHash>& decodedIdhs) {
+StatusCode CscRdoToCscPrepDataToolCore::decode(const CscRawDataContainer* rdoContainer, IdentifierHash givenHashId, std::vector<IdentifierHash>& decodedIdhs) {
IdContext cscContext = m_idHelperSvc->cscIdHelper().module_context();
SG::ReadCondHandle<MuonGM::MuonDetectorManager> muDetMgrHandle{m_muDetMgrKey};
@@ -151,22 +151,16 @@ StatusCode CscRdoToCscPrepDataToolCore::decode ATLAS_NOT_THREAD_SAFE (const CscR
}
if (oldId != stationId) {
- auto it_coll = m_outputCollection->indexFindPtr(cscHashId);
- if (nullptr == it_coll) {
- CscStripPrepDataCollection * newCollection = new CscStripPrepDataCollection(cscHashId);
- newCollection->setIdentifier(stationId);
- collection = newCollection;
- if ( m_outputCollection->addCollection(newCollection, cscHashId).isFailure() )
- ATH_MSG_WARNING ("Couldn't record CscStripPrepdataCollection with key="
- << (unsigned int) cscHashId << " in StoreGate!" );
- decodedIdhs.push_back(cscHashId); //Record that this collection contains data
- } else { // It won't be needed because we already skipped decoded one (should be checked it's true)
-
-//Hack for transition to athenaMT classes
- CscStripPrepDataCollection * oldCollection = const_cast<CscStripPrepDataCollection*>( it_coll );
- collection = oldCollection;
- cscHashId = collection->identifyHash();
+ auto newCollection = std::make_unique<CscStripPrepDataCollection>(cscHashId);
+ newCollection->setIdentifier(stationId);
+ collection = newCollection.get();
+ if ( m_outputCollection->addCollection(newCollection.release(), cscHashId).isFailure() )
+ {
+ ATH_MSG_ERROR ("Couldn't add CscStripPrepdataCollection with key="
+ << (unsigned int) cscHashId << " to container!" );
+ return StatusCode::FAILURE;
}
+ decodedIdhs.push_back(cscHashId); //Record that this collection contains data
oldId = stationId;
}
@@ -255,7 +249,7 @@ StatusCode CscRdoToCscPrepDataToolCore::decode ATLAS_NOT_THREAD_SAFE (const CscR
//************** Process for all in case of Offline
/// This decode function is for single-thread running only
-StatusCode CscRdoToCscPrepDataToolCore::decode ATLAS_NOT_THREAD_SAFE (const CscRawDataContainer* rdoContainer, std::vector<IdentifierHash>& decodedIdhs)
+StatusCode CscRdoToCscPrepDataToolCore::decode(const CscRawDataContainer* rdoContainer, std::vector<IdentifierHash>& decodedIdhs)
{
typedef CscRawDataContainer::const_iterator collection_iterator;
@@ -320,24 +314,17 @@ StatusCode CscRdoToCscPrepDataToolCore::decode ATLAS_NOT_THREAD_SAFE (const CscR
}
if (oldId != stationId) {
- auto it_coll = m_outputCollection->indexFindPtr(cscHashId);
- if (nullptr == it_coll) {
- CscStripPrepDataCollection * newCollection = new CscStripPrepDataCollection(cscHashId);
- newCollection->setIdentifier(stationId);
- collection = newCollection;
- if ( m_outputCollection->addCollection(newCollection, cscHashId).isFailure() )
- ATH_MSG_WARNING( "Couldn't record CscStripPrepdataCollection with key=" << (unsigned int) cscHashId
- << " in StoreGate!" );
- decodedIdhs.push_back(cscHashId); //Record that this collection contains data
-
- } else {
-//Hack for transition to athenaMT classes
- CscStripPrepDataCollection * oldCollection = const_cast<CscStripPrepDataCollection*>( it_coll );
-
- collection = oldCollection;
- cscHashId = collection->identifyHash();
+ auto newCollection = std::make_unique<CscStripPrepDataCollection>(cscHashId);
+ newCollection->setIdentifier(stationId);
+ collection = newCollection.get();
+ if ( m_outputCollection->addCollection(newCollection.release(), cscHashId).isFailure() )
+ {
+ ATH_MSG_ERROR( "Couldn't add CscStripPrepdataCollection with key=" << (unsigned int) cscHashId
+ << " to container!" );
+ return StatusCode::FAILURE;
+ }
+ decodedIdhs.push_back(cscHashId); //Record that this collection contains data
- }
oldId = stationId;
}
diff --git a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py
index 814a3631c739622005bdb5d5f64a29b5edd50ae7..94608b056c31c27d82957381cc97ed5ba395d377 100644
--- a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py
+++ b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py
@@ -205,3 +205,220 @@ def setupMdtCondDB():
MdtCalibrationDbTool.CreateWireSagFunctions = mdtCalibFlags.correctMdtRtWireSag()
MdtCalibrationDbTool.CreateSlewingFunctions = mdtCalibFlags.correctMdtRtForTimeSlewing()
+
+# return a list of dictionaires containing the calib config info (keys etc)
+def getCalibConfigs():
+ global muonRecFlags,rec
+ configs = []
+ if muonRecFlags.calibMuonStandalone and (muonRecFlags.doStandalone or rec.readESD):
+# try:
+ configs.append( muonRec.getConfig("MuonStandalone").getCalibConfig() )
+# except KeyError:
+# logMuon.warning("Could not get calibration config for MuonStandAlone - not adding MuonStandAlone info to calibration")
+# muonRecFlags.calibMuonStandalone = False
+ else:
+ muonRecFlags.calibMuonStandalone = False
+
+ return configs
+
+
+
+## Setup MuonSegmenToCalibSegment algorithm.
+# @param[in] segmentKeys list of segment keys to use or single segments key (string)
+def getMuonSegmentToCalibSegment():
+ global topSequence,muonRecFlags
+ try:
+ return topSequence.MuonSegmentToCalibSegment
+ except AttributeError:
+
+ from MuonCalibPatRec.MuonCalibPatRecConf import MuonCalib__MuonSegmentToCalibSegment
+ MuonSegmentToCalibSegment = MuonCalib__MuonSegmentToCalibSegment("MuonSegmentToCalibSegment")
+ # set consistent time-of-flight correction with MdtDriftCircleOnTrackCreator
+ mdtCreator = getPublicTool("MdtDriftCircleOnTrackCreator")
+ MuonSegmentToCalibSegment.DoTOF = getProperty(mdtCreator,"DoTofCorrection")
+ # when doing segment fits with floating t0's
+ MuonSegmentToCalibSegment.UpdateForT0Shift = type(MuonSegmentToCalibSegment.getDefaultProperty("UpdateForT0Shift")) (muonRecFlags.doSegmentT0Fit())
+ MuonSegmentToCalibSegment.UseCscSegments = False
+ MuonSegmentToCalibSegment.SegmentLocations = [ "MuonSegments" ]
+ MuonSegmentToCalibSegment.SegmentAuthors = [ 4,8 ]
+ MuonSegmentToCalibSegment.ReadSegments = True # rather than SegmentCombinations
+
+ from MuonCnvExample import MuonCalibConfig
+ MuonCalibConfig.setupMdtCondDB()
+
+ MuonSegmentToCalibSegment.CalibrationTool = MuonCalibConfig.MdtCalibrationTool()
+
+ # finally add it to topSequence
+ topSequence += MuonSegmentToCalibSegment
+
+ return topSequence.MuonSegmentToCalibSegment
+
+
+## Setup the basic MuonCalibAlg algorithm. Needs further configuration after this call
+# depending on the use-case.
+# @param[in] evenTag The event tag written to file
+def getMuonCalibAlg(eventTag):
+ global topSequence,beamFlags
+ try:
+ return topSequence.MuonCalibAlg
+ except AttributeError:
+ from MuonCalibAlgs.MuonCalibAlgsConf import MuonCalib__MuonCalibAlg
+ MuonCalibAlg = MuonCalib__MuonCalibAlg("MuonCalibAlg",
+ doMDTs = muonRecFlags.doMDTs(),
+ doCSCs = muonRecFlags.doCSCs(),
+ doRPCs = muonRecFlags.doRPCs(),
+ doTGCs = (muonRecFlags.doTGCs() and muonRecFlags.calibNtupleRawTGC()),
+ doTGCCoinData = (muonRecFlags.doTGCs() and muonRecFlags.calibNtupleRawTGC()),
+ doTruth = rec.doTruth(),
+ DoPrdSelect = muonRecFlags.doPrdSelect(), # optional cutting away of PRD hits to simulate dead channels
+ NtupleName = muonRecFlags.calibNtupleOutput(), # set the name of the output calibration ntuple
+ EventTag = eventTag )
+
+ if beamFlags.beamType == 'singlebeam' or beamFlags.beamType == 'cosmics':
+ MuonCalibAlg.addTriggerTag = False
+ else:
+ MuonCalibAlg.addTriggerTag = rec.doTrigger()
+ MuonCalibAlg.doTruth=rec.doTruth()
+ topSequence += MuonCalibAlg
+ return topSequence.MuonCalibAlg
+
+
+def setupMuonCalibNtuple():
+ global topSequence,muonRecFlags,beamFlags,ToolSvc,rec,DetFlags
+ if not rec.doMuon() or not DetFlags.Muon_on():
+ logMuon.warning("Not setting up requested Muon Calibration Ntuple because Muons are off")
+ return
+
+ logMuon.info("Setting up Muon Calibration Ntuple")
+ try:
+ configs = getCalibConfigs()
+ # MuonSegmentToCalibSegment is only needed if we want segments
+ if muonRecFlags.calibNtupleSegments and muonRecFlags.calibMuonStandalone:
+ MuonSegmentToCalibSegment = getMuonSegmentToCalibSegment()
+
+ # MuonCalibAlg is always needed
+ eventTag="UNKNOWN"
+ if (muonRecFlags.calibNtupleSegments or muonRecFlags.calibNtupleTracks) and muonRecFlags.calibMuonStandalone:
+ if len(configs) >= 1:
+ eventTag = configs[0]["eventTag"]
+ elif muonRecFlags.calibNtupleTrigger:
+ eventTag = "TRIG"
+ else:
+ eventTag = "HITS"
+
+ MuonCalibAlg = getMuonCalibAlg(eventTag)
+ # configure for writing ntuple
+ from MuonCalibTools.MuonCalibToolsConf import MuonCalib__PatternNtupleMaker
+ MuonCalibTool = MuonCalib__PatternNtupleMaker("MuonCalibPatternNtupleMaker")
+ MuonCalibTool.FillTruth = rec.doTruth()
+ MuonCalibTool.DoRawTGC = (muonRecFlags.doTGCs() and muonRecFlags.calibNtupleRawTGC())
+ ToolSvc += MuonCalibTool
+ MuonCalibAlg.MuonCalibTool = MuonCalibTool
+
+ # MuonCalibExtraTree only if we want to write tracks
+ if muonRecFlags.calibNtupleTracks:
+ MuonCalibTool.DelayFinish = True
+ from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__MuonCalibExtraTreeAlg
+ MuonCalibExtraTreeAlg = MuonCalib__MuonCalibExtraTreeAlg("MuonCalibExtraTreeAlg",
+ NtupleName = "PatternNtupleMaker",
+ )
+ segmentOnTrackSelector=None
+ if hasattr(topSequence, "MuonSegmentToCalibSegment"):
+ from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__SegmentOnTrackSelector
+ segmentOnTrackSelector=MuonCalib__SegmentOnTrackSelector()
+ segmentOnTrackSelector.PattternLocation = "PatternsForCalibration"
+ ToolSvc+=segmentOnTrackSelector
+ MuonCalibExtraTreeAlg.SegmentOnTrackSelector= segmentOnTrackSelector
+ if not rec.doMuonCombined():
+ tool_nr=0
+ from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__ExtraTreeTrackFillerTool
+ resPullCalc=getPublicTool("ResidualPullCalculator")
+ for config in configs:
+ trackDumpTool = MuonCalib__ExtraTreeTrackFillerTool("ExtraTreeTrackFillerTool" + str(tool_nr))
+ trackDumpTool.TrackCollectionKey = config['tracksKey']
+ trackDumpTool.SegmentAuthors = [config['segmentAuthor']]
+ trackDumpTool.TrackAuthor = config['trackAuthor']
+ trackDumpTool.PullCalculator = resPullCalc
+ ToolSvc+=trackDumpTool
+ MuonCalibExtraTreeAlg.TrackFillerTools.append(trackDumpTool)
+ tool_nr+=1
+ # configure needed tools
+
+
+ # add to topSequence
+ topSequence += MuonCalibExtraTreeAlg
+
+
+ # MuonCalibExtraTreeTriggerAlg only if trigger is available
+ if muonRecFlags.calibNtupleTrigger: # and DetFlags.detdescr.LVL1_on() and DetFlags.haveRDO.LVL1_on():
+ # protect against running without AtlasTrigger project
+ doMuCTPI = True
+ if doMuCTPI:
+ try:
+ from TrigT1RPCRecRoiSvc import TrigT1RPCRecRoiConfig
+ from TrigT1TGCRecRoiSvc import TrigT1TGCRecRoiConfig
+ except ImportError:
+ logMuon.warning("MuonCalibExtraTreeTriggerAlg.doMuCTPI = False because AtlasTrigger is not available")
+ doMuCTPI = False
+
+ # delay writing of MuonCalibAlg
+ MuonCalibTool.DelayFinish = True
+ # also delay MuonCalibExtraTreeAlg if it is running
+ try:
+ topSequence.MuonCalibExtraTreeAlg.DelayFinish = True
+ except AttributeError:
+ pass
+
+ from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__MuonCalibExtraTreeTriggerAlg
+ topSequence += MuonCalib__MuonCalibExtraTreeTriggerAlg( 'MuonCalibExtraTreeTriggerAlg',
+ doMuCTPI = doMuCTPI,
+ doLVL1Calo = rec.doTile() or rec.doLArg() or DetFlags.haveRDO.Calo_on(),
+ doMBTS = rec.doTile() or DetFlags.haveRDO.Tile_on() )
+
+
+ except:
+ from AthenaCommon.Resilience import treatException
+ treatException("Problem in MuonCalib - Muon Calibration Ntuple configuration probably incomplete")
+
+
+
+def setupMuonCalib():
+ global topSequence,ToolSvc
+ if not rec.doMuon() or not DetFlags.Muon_on():
+ logMuon.warning("Not setting up requested Muon Calibration because Muons are off")
+ return
+
+ logMuon.info("Setting up Muon Calibration")
+ try:
+ from MuonCnvExample.MuonCalibFlags import muonCalibFlags
+ muonCalibFlags.setDefaults()
+
+ configs = getCalibConfigs()
+ #
+ # MuonSegmentToCalibSegment
+ #
+ calibConfig = muonRec.allConfigs()[0].getCalibConfig() #muonRec.getConfig(muonCalibFlags.EventTag()).getCalibConfig()
+ MuonSegmentToCalibSegment = getMuonSegmentToCalibSegment()
+ #
+ # MuonCalibAlg
+ #
+ MuonCalibAlg = getMuonCalibAlg(muonCalibFlags.EventTag())
+
+ from MdtCalibTools.MdtCalibToolsConf import MuonCalib__MdtCalibTool
+ MuonCalibTool = MuonCalib__MdtCalibTool()
+ calibMode = muonCalibFlags.Mode()
+ if calibMode == 'regionNtuple':
+ from MdtCalibTools.MdtCalibToolsConf import MuonCalib__MdtCalibNtupleMakerTool
+ MdtCalibTool = MuonCalib__MdtCalibNtupleMakerTool()
+ else:
+ raise RuntimeError( "Unknown Muon Calibration Mode: %r" % calibMode )
+
+ ToolSvc += MdtCalibTool
+ MuonCalibTool.MdtCalibTool = MdtCalibTool
+
+ ToolSvc += MuonCalibTool
+ MuonCalibAlg.MuonCalibTool = MuonCalibTool
+
+ except:
+ from AthenaCommon.Resilience import treatException
+ treatException("Problem in MuonCalib - Muon Calibration configuration probably incomplete")
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p1_test.cxx
index 870a33a2998fcf5b5ce5a3bdc4e2b07413148586..c999fc30af90c22ad17d56fee076dff123c9b358 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p1_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const CscSimData& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -99,7 +100,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p2_test.cxx
index b5ce72e597d9bbb057262c5bf2f62c1d308e1010..16c750c3e1dc68d6db4fda3cdb705c7a32567a33 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCnv_p2_test.cxx
@@ -21,13 +21,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -73,12 +74,12 @@ void testit (const CscSimData& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p1_test.cxx
index 5198de86e1ad459f58d748510aa3850ea9a6e807..fe92f5d541682cbb91acb50f8db76509b81e40ce 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p1_test.cxx
@@ -21,13 +21,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -86,12 +87,12 @@ void testit (const CscSimDataCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -116,7 +117,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p2_test.cxx
index 67e4810d18a965ef533dab479b29c1ac3a011380..7b4a6f5ff7c5f115a76e3736d55a924732d6cf08 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/CscSimDataCollectionCnv_p2_test.cxx
@@ -21,13 +21,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -86,12 +87,12 @@ void testit (const CscSimDataCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -116,7 +117,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p1_test.cxx
index 2906f2f7cb7d28453e7085c43ce247116fe86f85..d187fa5584b2c17e641c2e63a23bcb969851e801 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p1_test.cxx
@@ -21,13 +21,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const MuonSimData& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -97,7 +98,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p2_test.cxx
index f5d5414379f823210e9ef1439124a03556026172..f7aecbe23ed9503009c3dced46b4b7abc72d67b5 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCnv_p2_test.cxx
@@ -21,13 +21,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const MuonSimData& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -97,7 +98,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p1_test.cxx
index 0322e37738cf2129ba5f66ab2ad29bee7bee933d..934c930b845e34082d24a594449723b41d77324e 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p1_test.cxx
@@ -21,13 +21,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -85,12 +86,12 @@ void testit (const MuonSimDataCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -113,7 +114,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p2_test.cxx
index 254f3d286e67292f5847725815b8d465ec3b4e19..8fe08f09c68551ff0d88e84d6a1c015c5f539dd3 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSimDataCollectionCnv_p2_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -84,12 +85,12 @@ void testit (const MuonSimDataCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
Athena_test::Leakcheck check;
@@ -112,7 +113,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h
index ee6302337ed2a36e4ed501164237ea1c6c6ae19f..a23afd654652b521bfa439f3ffe934e116e4cf0b 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONMDTCNVTOOLS_MUONMDTRAWDATAPROVIDERTOOL_H
@@ -39,7 +39,7 @@ class ATLAS_NOT_THREAD_SAFE MDT_RawDataProviderTool : virtual public IMuonRawDat
virtual StatusCode finalize ();
/** Convert method - declared in Muon::IMuonRdoToPrepDataTool*/
- virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs);
+ virtual StatusCode convert ATLAS_NOT_THREAD_SAFE ( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs);
virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, const std::vector<IdentifierHash>&);
/** the new ones */
virtual StatusCode convert(); //!< for the entire event
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx
index 68f35f99e780c6858d08f6a1c2bd9be3370b1c6f..f9161b42b6d4ab2dd4d4f50a0d9fe213c832b45c 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx
@@ -48,17 +48,15 @@ StatusCode Muon::MDT_RawDataProviderToolCore::convertIntoContainer( const std::v
{
ATH_MSG_VERBOSE("convert(): " << vecRobs.size()<<" ROBFragments.");
- std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>::const_iterator itFrag;
-
- for (itFrag = vecRobs.begin(); itFrag != vecRobs.end(); itFrag++)
+ for (const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment* frag : vecRobs)
{
//convert only if data payload is delivered
- if ( (**itFrag).rod_ndata()!=0 )
+ if ( frag->rod_ndata()!=0 )
{
//std::vector<IdentifierHash> coll =
- // to_be_converted(**itFrag,collections);
+ // to_be_converted(*frag,collections);
- if (m_decoder->fillCollections(**itFrag, mdtContainer).isFailure())
+ if (m_decoder->fillCollections(*frag, mdtContainer).isFailure())
{
// store the error conditions into the StatusCode and continue
}
@@ -67,7 +65,7 @@ StatusCode Muon::MDT_RawDataProviderToolCore::convertIntoContainer( const std::v
{
if(msgLvl(MSG::DEBUG))
{
- uint32_t sourceId= (**itFrag).source_id();
+ uint32_t sourceId= frag->source_id();
msg(MSG::DEBUG) << " ROB " << MSG::hex << sourceId
<< " is delivered with an empty payload" << MSG::dec;
}
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
index 1c11ae58838e5bd6ec8088a563610350ad2a6800..0506b43b1a26af45529ddc09188a0fc425e6e298 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.cxx
@@ -21,7 +21,7 @@ StatusCode Muon::MdtRdoToPrepDataTool::initialize()
return StatusCode::SUCCESS;
}
-Muon::MdtRdoToPrepDataTool::SetupMdtPrepDataContainerStatus Muon::MdtRdoToPrepDataTool::setupMdtPrepDataContainer ATLAS_NOT_THREAD_SAFE()
+Muon::MdtRdoToPrepDataTool::SetupMdtPrepDataContainerStatus Muon::MdtRdoToPrepDataTool::setupMdtPrepDataContainer()
{
if(!evtStore()->contains<Muon::MdtPrepDataContainer>(m_mdtPrepDataContainerKey.key())){
m_fullEventDone=false;
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h
index 1ea69192d30d15b768039d8daf7a2c2822630e1c..9b0a3fc60de81f8add488c9d773095432c582348 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataTool.h
@@ -6,6 +6,7 @@
#define MUONMdtRdoToPrepDataTool_H
#include "MdtRdoToPrepDataToolCore.h"
+#include "CxxUtils/checker_macros.h"
namespace Muon
{
@@ -21,7 +22,7 @@ namespace Muon
@author Edward Moyse <Edward.Moyse@cern.ch>
*/
- class MdtRdoToPrepDataTool : virtual public MdtRdoToPrepDataToolCore
+ class ATLAS_NOT_THREAD_SAFE MdtRdoToPrepDataTool : virtual public MdtRdoToPrepDataToolCore
{
public:
MdtRdoToPrepDataTool(const std::string&,const std::string&,const IInterface*);
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx
index fd346bf9618ddc1ae960f21772a72fbb94cd5810..1d432258d6acb65fd0de6704f4a59165bbc20aa3 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx
@@ -404,13 +404,12 @@ void Muon::MdtRdoToPrepDataToolCore::printPrepData( )
if ( mdtColl->size() > 0 )
{
ATH_MSG_DEBUG("PrepData Collection ID "<<m_idHelperSvc->toString(mdtColl->identify()));
- MdtPrepDataCollection::const_iterator it_mdtPrepData;
- for (it_mdtPrepData=mdtColl->begin(); it_mdtPrepData != mdtColl->end(); it_mdtPrepData++) {
+ for (const MdtPrepData* prepData : *mdtColl) {
nhitcoll++;
nhits++;
ATH_MSG_DEBUG(" in this coll. "<<nhitcoll<<" prepData id = "
- <<m_idHelperSvc->toString((*it_mdtPrepData)->identify())
- <<" tdc/adc ="<<(*it_mdtPrepData)->tdc()<<"/"<< (*it_mdtPrepData)->adc());
+ <<m_idHelperSvc->toString(prepData->identify())
+ <<" tdc/adc ="<<prepData->tdc()<<"/"<< prepData->adc());
}
ncoll++;
ATH_MSG_DEBUG("*** Collection "<<ncoll<<" Summary: N. hits = "<<nhitcoll);
@@ -552,7 +551,7 @@ StatusCode Muon::MdtRdoToPrepDataToolCore::processCsm(const MdtCsm* rdoColl, std
ATH_MSG_WARNING("Found issue MDT RDO decoder for subdetId/mrodId/csmId "
<<subdetId<<"/"<<mrodId<<"/"<<csmId<<" amtHit channelId/tdcId ="
<<amtHit->channelId()<<"/"<<amtHit->tdcId());
- itD++;
+ ++itD;
continue;
}
@@ -565,7 +564,7 @@ StatusCode Muon::MdtRdoToPrepDataToolCore::processCsm(const MdtCsm* rdoColl, std
if( std::find( (myIt->second).begin(), (myIt->second).end(), channelId) != (myIt->second).end() ) {
ATH_MSG_DEBUG("processCsm : Deleting BMG digit with identifier" << m_idHelperSvc->mdtIdHelper().show_to_string(channelId) );
delete newDigit;
- itD++;
+ ++itD;
continue;
}
}
@@ -637,7 +636,7 @@ StatusCode Muon::MdtRdoToPrepDataToolCore::processCsm(const MdtCsm* rdoColl, std
ATH_MSG_WARNING("Detector Element not found for Identifier from the cabling service <"
<<m_idHelperSvc->toString(channelId)<<"> =>>ignore this hit");
delete newDigit;
- itD++;
+ ++itD;
continue;
}
if (!descriptor->containsId(channelId)) {
@@ -645,7 +644,7 @@ StatusCode Muon::MdtRdoToPrepDataToolCore::processCsm(const MdtCsm* rdoColl, std
<<" does not contains candidate prd Identifier <"
<<m_idHelperSvc->toString(channelId)<<"> =>>ignore this hit");
delete newDigit;
- itD++;
+ ++itD;
continue;
}
@@ -893,15 +892,12 @@ StatusCode Muon::MdtRdoToPrepDataToolCore::processCsmTwin(const MdtCsm* rdoColl,
}
}// end for-loop over rdoColl
- // make iterator over mdtDigitColl map
- std::map<int, std::pair<MdtDigit*, MdtDigit*> >::iterator iter_map;
-
//iterate over mdtDigitColl
- for( iter_map = mdtDigitColl.begin(); iter_map != mdtDigitColl.end(); iter_map++ ) {
+ for (const std::pair<const int, std::pair<MdtDigit*, MdtDigit*> >& digitPair : mdtDigitColl) {
// get the twin hits from mdtDigitColl
- MdtDigit* digit = iter_map->second.first;
- MdtDigit* second_digit = iter_map->second.second;
+ MdtDigit* digit = digitPair.second.first;
+ MdtDigit* second_digit = digitPair.second.second;
if (!digit) {
ATH_MSG_FATAL("nullptr to a digit ");
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p1_test.cxx
index 74581857e190053df5061eea0e70514030ab43d1..129a44e60f44bbd1e12249b185dfd1ccf5f8da2a 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p1_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -79,12 +80,12 @@ int lundCode(int pdgid) {
return -1;
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
CSCSimHitCollection dum ("coll");
@@ -92,8 +93,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
CSCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (15.5, 16.5, 17.5),
@@ -108,7 +109,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p2_test.cxx
index d34e3181f178c75b87c5304534462371c7762684..e7a6ac7cf931c9c37f8cd3934aff1394a277d96c 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p2_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -79,12 +80,12 @@ int lundCode(int pdgid) {
return -1;
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
CSCSimHitCollection dum ("coll");
@@ -92,8 +93,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
CSCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (15.5, 16.5, 17.5),
@@ -108,7 +109,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p3_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p3_test.cxx
index d51aceac5cbb8f8c94e0666b252f1b1978d874c6..da252fd2cb808277e9e8f05f99995a2768e00d69 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p3_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/CSCSimHitCollectionCnv_p3_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -79,12 +80,12 @@ int lundCode(int pdgid) {
return -1;
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
CSCSimHitCollection dum ("coll");
@@ -92,8 +93,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
CSCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (15.5, 16.5, 17.5),
@@ -108,7 +109,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p1_test.cxx
index b589febcc606cd79c74f1b8438f5c985c5db0690..c2c3f8c620194a9be9de779e6741aaef3299a888 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p1_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -76,12 +77,12 @@ void testit (const GenericMuonSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
GenericMuonSimHitCollection dum ("coll");
@@ -89,8 +90,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
GenericMuonSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (15.5, 16.5, 17.5),
@@ -109,7 +110,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p2_test.cxx
index bdbc5fea4a4178471cfce0d7d422c229265cb1db..88878550f96a397ad1507f298e646964d36aa983 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/GenericMuonSimHitCollectionCnv_p2_test.cxx
@@ -20,12 +20,13 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -75,20 +76,20 @@ void testit (const GenericMuonSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
GenericMuonSimHitCollection dum ("coll");
GenericMuonSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (15.5, 16.5, 17.5),
@@ -107,7 +108,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p1_test.cxx
index 6974a3d2d7690a5b7d19f41ba3a76e2b69cc97c9..0b1b34bbf3bcf87b73f5e4405787a9da9dd893ae 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p1_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const MDTSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
MDTSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
MDTSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
trkLink, 19.5, 20.5, pGenParticle->pdg_id(), 22.5
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p2_test.cxx
index 707804a41465c8c30bc50b4e40be22fe20b03181..8de459f98c50bd380dd1b769bde50509f8a9937f 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p2_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const MDTSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
MDTSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
MDTSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
trkLink, 19.5, 20.5, pGenParticle->pdg_id(), 22.5
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p3_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p3_test.cxx
index f950056fef192bdbb3a701178bd1480ddd5dc584..ee49e801a60972a56f5529f88ab1a761cd13d445 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p3_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MDTSimHitCollectionCnv_p3_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const MDTSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
MDTSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
MDTSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5, 11.5,
Amg::Vector3D (12.5, 13.5, 14.5),
trkLink, 19.5, 20.5, pGenParticle->pdg_id(), 22.5
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx
index e603cdd6dac158af75be82fc9328658bde27dd32..ad0bd4da5199ea88a3d14e5397dd930af9cdf202 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p1_test.cxx
@@ -11,13 +11,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.cptr() == p2.cptr() );
assert ( p1 == p2 );
@@ -61,20 +62,20 @@ void testit (const MMSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
MMSimHitCollection dum ("coll");
MMSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
pGenParticle->pdg_id(), 25.5,
@@ -90,7 +91,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx
index 61e692d54997052c6f0278dd0ef61768bc61d7d0..f8a1928911ed0966c286b5258f9cd5eda23f97f5 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/MMSimHitCollectionCnv_p2_test.cxx
@@ -11,12 +11,13 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.cptr() == p2.cptr() );
assert ( p1 == p2 );
@@ -60,20 +61,20 @@ void testit (const MMSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
MMSimHitCollection dum ("coll");
MMSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
pGenParticle->pdg_id(), 25.5,
@@ -89,7 +90,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p1_test.cxx
index 75bff7a15b74d7ad237c54218e4143eccf5ef86a..bb6dd64cf098010ae789fdaa0490173eaf201822 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p1_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const RPCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
RPCSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
RPCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
trkLink,
@@ -101,7 +102,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p2_test.cxx
index c6405032b2ada47e60c034dc1a18870f3695330e..065f1c92f68d4e1ad4ebd746482590ccf0c3d9c7 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p2_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const RPCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
RPCSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
RPCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
trkLink,
@@ -101,7 +102,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p3_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p3_test.cxx
index d29f0905b5de2a765de6745ded524be328c864a5..144a75018a451269c421d13b26a29924cacbdc7f 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p3_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/RPCSimHitCollectionCnv_p3_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const RPCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
RPCSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
RPCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
trkLink,
@@ -101,7 +102,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p1_test.cxx
index ca1b9ed7cb6b9dc5fc95b0e9de50145c3c9eb41b..8fbce420da76ff2ac3473228e3f2d718198ae172 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p1_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const TGCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
TGCSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
TGCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (16.5, 17.5, 18.5),
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p2_test.cxx
index 8e14145a1e51e67da76df430f6a89f372a0b53bd..4140e9e5448d67d7189a736eb9657f413895a115 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p2_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const TGCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
TGCSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
TGCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (16.5, 17.5, 18.5),
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p3_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p3_test.cxx
index 5193bd46e0472a481d2dd1cb67b2d93f8268608e..96e47b0a1aa8e1a2925a5f30e49a15eba2df51ac 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p3_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p3_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const TGCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*>& genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr>& genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
TGCSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
TGCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (16.5, 17.5, 18.5),
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*>& genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p4_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p4_test.cxx
index 3e4d844d365aaa02301e7e8644b5e6450e28c78c..94f58958a5a045063a9d331b843fac3bfcc9e8ae 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p4_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/TGCSimHitCollectionCnv_p4_test.cxx
@@ -20,13 +20,14 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -72,12 +73,12 @@ void testit (const TGCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
TGCSimHitCollection dum ("coll");
@@ -85,8 +86,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
TGCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
Amg::Vector3D (16.5, 17.5, 18.5),
@@ -100,7 +101,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p1_test.cxx
index cf56cf2bdaf04b0b7e2e6caa006aed4b66625ff8..e3d9c38e1ed3d4345a75f0b823d8f336485c1f8e 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p1_test.cxx
@@ -20,12 +20,13 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -69,12 +70,12 @@ void testit (const sTGCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
sTGCSimHitCollection dum ("coll");
@@ -82,8 +83,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
sTGCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
pGenParticle->pdg_id(),
@@ -99,7 +100,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p2_test.cxx
index b72c98bad9e32963ddd72969ab09d3b74fce15b9..c8a390cfc75e6c2834cd198b6bfc260d6dbc3a14 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventTPCnv/test/sTGCSimHitCollectionCnv_p2_test.cxx
@@ -28,12 +28,13 @@
#include "GeneratorObjectsTPCnv/initMcEventCollection.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
void compare (const HepMcParticleLink& p1,
const HepMcParticleLink& p2)
{
assert ( p1.isValid() == p2.isValid() );
- assert ( p1.barcode() == p2.barcode() );
+ assert ( HepMC::barcode(p1) == HepMC::barcode(p2) );
assert ( p1.eventIndex() == p2.eventIndex() );
assert ( p1.getEventCollectionAsChar() == p2.getEventCollectionAsChar() );
assert ( p1.cptr() == p2.cptr() );
@@ -78,12 +79,12 @@ void testit (const sTGCSimHitCollection& trans1)
}
-void test1(std::vector<HepMC::GenParticle*> genPartVector)
+void test1(std::vector<HepMC::GenParticlePtr> genPartVector)
{
std::cout << "test1\n";
- const HepMC::GenParticle *particle = genPartVector.at(0);
+ auto particle = genPartVector.at(0);
// Create HepMcParticleLink outside of leak check.
- HepMcParticleLink dummyHMPL(particle->barcode(),particle->parent_event()->event_number());
+ HepMcParticleLink dummyHMPL(HepMC::barcode(particle),particle->parent_event()->event_number());
assert(dummyHMPL.cptr()==particle);
// Create DVL info outside of leak check.
sTGCSimHitCollection dum ("coll");
@@ -91,8 +92,8 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
sTGCSimHitCollection trans1 ("coll");
for (int i=0; i < 10; i++) {
- const HepMC::GenParticle* pGenParticle = genPartVector.at(i);
- HepMcParticleLink trkLink(pGenParticle->barcode(),pGenParticle->parent_event()->event_number());
+ auto pGenParticle = genPartVector.at(i);
+ HepMcParticleLink trkLink(HepMC::barcode(pGenParticle),pGenParticle->parent_event()->event_number());
trans1.Emplace (123, 10.5,
Amg::Vector3D (12.5, 13.5, 14.5),
pGenParticle->pdg_id(),
@@ -108,7 +109,7 @@ void test1(std::vector<HepMC::GenParticle*> genPartVector)
int main()
{
ISvcLocator* pSvcLoc = nullptr;
- std::vector<HepMC::GenParticle*> genPartVector;
+ std::vector<HepMC::GenParticlePtr> genPartVector;
if (!Athena_test::initMcEventCollection(pSvcLoc,genPartVector)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataTool.cxx b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataTool.cxx
index 864fe64509875f83897ed3a6e1bce8abbd092ad0..f932c97545ee76a48b1bf4b81c764a30b370d6b1 100644
--- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataTool.cxx
@@ -199,7 +199,19 @@ StatusCode Muon::TgcRdoToPrepDataTool::decode(std::vector<IdentifierHash>& reque
TgcRdo::const_iterator itD = (*iRdo)->begin();
TgcRdo::const_iterator itD_e = (*iRdo)->end();
for(; itD!=itD_e; itD++) {
- selectDecoder(itD, (*iRdo));
+ //Since OnlineIds are not unique, need some additional filtering on offline hashId
+ //to avoid decoding RDO outside of an RoI
+ Identifier offlineId;
+ IdentifierHash tgcHashId;
+ IdContext tgcContext = m_idHelperSvc->tgcIdHelper().module_context();
+
+ if(m_tgcCabling->getElementIDfromReadoutID(offlineId, (*itD)->subDetectorId(), (*itD)->rodId(), (*itD)->sswId(), (*itD)->slbId(), (*itD)->bitpos())){
+ if(m_idHelperSvc->tgcIdHelper().get_hash(offlineId, tgcHashId, &tgcContext)){
+ if(std::find(requestedIdHashVect.begin(), requestedIdHashVect.end(), tgcHashId) != requestedIdHashVect.end()){
+ selectDecoder(itD, (*iRdo));
+ }
+ }
+ }
}
m_decodedRdoCollVec.push_back(*iRdo);
}
diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataToolMT.cxx b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataToolMT.cxx
index b36db087959922e7080f1f1217bf688bf04cdffc..cc5156af280a2f6cfb8f3bc9d35f7e3357c2801b 100644
--- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataToolMT.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TgcRdoToPrepDataToolMT.cxx
@@ -161,7 +161,19 @@ StatusCode Muon::TgcRdoToPrepDataToolMT::decode(std::vector<IdentifierHash>& req
TgcRdo::const_iterator itD = (*iRdo)->begin();
TgcRdo::const_iterator itD_e = (*iRdo)->end();
for(; itD!=itD_e; itD++) {
- selectDecoder(itD, (*iRdo));
+ //Since OnlineIds are not unique, need some additional filtering on offline hashId
+ //to avoid decoding RDO outside of an RoI
+ Identifier offlineId;
+ IdentifierHash tgcHashId;
+ IdContext tgcContext = m_idHelperSvc->tgcIdHelper().module_context();
+
+ if(m_tgcCabling->getElementIDfromReadoutID(offlineId, (*itD)->subDetectorId(), (*itD)->rodId(), (*itD)->sswId(), (*itD)->slbId(), (*itD)->bitpos())){
+ if(m_idHelperSvc->tgcIdHelper().get_hash(offlineId, tgcHashId, &tgcContext)){
+ if(std::find(requestedIdHashVect.begin(), requestedIdHashVect.end(), tgcHashId) != requestedIdHashVect.end()){
+ selectDecoder(itD, (*iRdo));
+ }
+ }
+ }
}
m_decodedRdoCollVec.push_back(*iRdo);
}
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
index 2845ef680bb07b5ae42f37b52c14bd530332aa77..8365ca781ac42ca938b49a9e41b16f28dff03c39 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
@@ -883,8 +883,16 @@ StatusCode MdtCalibDbAlg::loadTube(const MuonGM::MuonDetectorManager* muDetMgr){
int size = nml*nlayers*ntubesLay;
if(size!=ntubes) {
- ATH_MSG_ERROR( "Pre-existing MdtTubeCalibContainer for chamber ID " <<chId<< " size does not match the one found in DB ");
- return StatusCode::FAILURE;
+ // currently there is no calibration DB for Run3 or Run4, i.e. nothing for the new
+ // sMDT chambers in the inner barrel layers (BI), so skip them for now until a DB is in place
+ if (m_idHelperSvc->issMdt(chId) && name.find("BI")!=std::string::npos) {
+ ATH_MSG_WARNING("Currently no entry for "<<name<<" sMDT chambers (eta="<<ieta<<") in database, skipping...");
+ return StatusCode::SUCCESS;
+ }
+ else {
+ ATH_MSG_ERROR( "Pre-existing MdtTubeCalibContainer for chamber ID " <<chId<< " size ("<<size<<") does not match the one found in DB ("<<ntubes<<")");
+ return StatusCode::FAILURE;
+ }
}
//Extract T0, ADCcal, valid flag for each tube from payload.
diff --git a/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py
index f215ecb6bd306db366c41f2ca05a76aed6cf111e..92fd9b5d65879f5ab09aeb6672bcba95aa7cc108 100644
--- a/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py
@@ -48,7 +48,7 @@ def CSC_DigitizationToolCommonCfg(flags, name="CscDigitizationTool", **kwargs):
kwargs.setdefault("DriftVelocity", 39)
kwargs.setdefault("ElectronEnergy", 66) # eV
- from MuonConfig.MuonCalibConfig import CscCalibToolCfg
+ from MuonConfig.MuonCalibrationConfig import CscCalibToolCfg
kwargs.setdefault("cscCalibTool", acc.popToolsAndMerge(CscCalibToolCfg(flags)))
CscDigitizationTool = CompFactory.CscDigitizationTool
diff --git a/MuonSpectrometer/MuonConfig/python/CscOverlayConfig.py b/MuonSpectrometer/MuonConfig/python/CscOverlayConfig.py
index c55be0e1047e60857cf9ba32a7ce9ddeb0bc2683..da666beb011d959a6b7984a26966d2058c660092 100644
--- a/MuonSpectrometer/MuonConfig/python/CscOverlayConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/CscOverlayConfig.py
@@ -21,7 +21,7 @@ def CSCDataOverlayExtraCfg(flags, **kwargs):
def CscOverlayAlgCfg(flags, name="CscOverlay", **kwargs):
"""Return a ComponentAccumulator for CSCOverlay algorithm"""
- from MuonConfig.MuonCalibConfig import CscCalibToolCfg
+ from MuonConfig.MuonCalibrationConfig import CscCalibToolCfg
acc = CscCalibToolCfg(flags)
kwargs.setdefault("CalibTool", acc.popPrivateTools())
diff --git a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
index 94ed7f1ad3ce7f1656dd70477cb713557c178c3d..7a0f4acff0a177174452cada2cc367c77398c41d 100644
--- a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
@@ -8,7 +8,7 @@ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
from MuonConfig.MuonByteStreamCnvTestConfig import MdtDigitToMdtRDOCfg
from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
-from MuonConfig.MuonCalibConfig import MdtCalibrationDbToolCfg
+from MuonConfig.MuonCalibrationConfig import MdtCalibrationDbToolCfg
from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
from Digitization.PileUpToolsConfig import PileUpToolsCfg
from Digitization.PileUpMergeSvcConfigNew import PileUpMergeSvcCfg, PileUpXingFolderCfg
diff --git a/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py b/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
index fdf5f1f4f73818f6810aaf5159a2f484324baa87..a6dd3c76d15b7ce2d4605e20fa5fbcf697c02da6 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
@@ -117,7 +117,7 @@ def CscDigitToCscRDOCfg(flags, name="CscDigitToCscRDO", **kwargs):
"""Return ComponentAccumulator with configured CscDigitToCscRDO algorithm"""
# for Csc, configuration is in the tool CscDigitToCscRDOTool
# configure dependency
- from MuonConfig.MuonCalibConfig import CscCalibToolCfg
+ from MuonConfig.MuonCalibrationConfig import CscCalibToolCfg
acc = CscCalibToolCfg(flags)
CscCalibTool = acc.popPrivateTools()
# configure basic parameters
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCSC_CnvToolsConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCSC_CnvToolsConfig.py
index 0f8ac22f29c03d29042cb62a355ac96d70050eef..cf82a67f48c0ef3fd7184609769548844a1878fe 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCSC_CnvToolsConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCSC_CnvToolsConfig.py
@@ -4,7 +4,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
def MuonCscRDODecoderCfg(flags, **kwargs):
- from MuonConfig.MuonCalibConfig import CscCalibToolCfg
+ from MuonConfig.MuonCalibrationConfig import CscCalibToolCfg
acc = CscCalibToolCfg(flags)
kwargs.setdefault("cscCalibTool", acc.popPrivateTools())
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
similarity index 100%
rename from MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py
rename to MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRIO_OnTrackCreatorConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRIO_OnTrackCreatorConfig.py
index 7d0875b35d8a28c247b03c20ab22e1711f6ae4d4..94d30a541ef272c766d8901b052cce5d54d09a82 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRIO_OnTrackCreatorConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRIO_OnTrackCreatorConfig.py
@@ -2,7 +2,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from MuonConfig.MuonCalibConfig import MdtCalibrationToolCfg, MdtCalibrationDbToolCfg
+from MuonConfig.MuonCalibrationConfig import MdtCalibrationToolCfg, MdtCalibrationDbToolCfg
Muon__MdtDriftCircleOnTrackCreator=CompFactory.Muon.MdtDriftCircleOnTrackCreator
Muon__CscClusterOnTrackCreator=CompFactory.Muon.CscClusterOnTrackCreator
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index a482c0f9b7cf3c32b0e9502433df1fcf5b0297b0..b78e56be7379f7e95648f8db7e6fc5a449192615 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -126,7 +126,7 @@ def MdtRDODecodeCfg(flags, forTrigger=False):
from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
acc.merge( MDTCablingConfigCfg(flags) )
- from MuonConfig.MuonCalibConfig import MdtCalibDbAlgCfg
+ from MuonConfig.MuonCalibrationConfig import MdtCalibDbAlgCfg
acc.merge (MdtCalibDbAlgCfg(flags))
# Make sure muon geometry is configured
diff --git a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
index b19192958cfaa943518d384d708ff3e6a93a93a3..01f3e59429904c8ccfc0b3dbbaf0483700bd5da6 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
@@ -23,7 +23,7 @@ Muon__MuonSegmentSelectionTool=CompFactory.getComp("Muon::MuonSegmentSelectionTo
Muon__MuonClusterSegmentFinder=CompFactory.getComp("Muon::MuonClusterSegmentFinder")
#Local
-from MuonConfig.MuonCalibConfig import MdtCalibDbAlgCfg
+from MuonConfig.MuonCalibrationConfig import MdtCalibDbAlgCfg
from MuonConfig.MuonRecToolsConfig import MCTBFitterCfg, MuonAmbiProcessorCfg, MuonStationIntersectSvcCfg, MuonTrackCleanerCfg, MuonTrackSummaryToolCfg, MuonEDMPrinterTool
from MuonConfig.MuonRIO_OnTrackCreatorConfig import MdtCalibWindowNumber
@@ -405,7 +405,7 @@ def QratCscClusterFitterCfg(flags, **kwargs):
def CalibCscStripFitterCfg(flags, name = "CalibCscStripFitter",**kwargs):
CalibCscStripFitter=CompFactory.CalibCscStripFitter
- from MuonConfig.MuonCalibConfig import CscCalibToolCfg
+ from MuonConfig.MuonCalibrationConfig import CscCalibToolCfg
result = CscCalibToolCfg(flags)
kwargs.setdefault("cscCalibTool", result.popPrivateTools() )
result.setPrivateTools(CalibCscStripFitter(name=name,**kwargs))
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/share/NSWAGDD_BlobProduction.py b/MuonSpectrometer/MuonDetDescr/MuonAGDD/share/NSWAGDD_BlobProduction.py
index fe429325a2c26880c1ed9cd790f8870bbec2bcf0..3b525ada886af0f7e7919092b5efc40622b9e42b 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/share/NSWAGDD_BlobProduction.py
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/share/NSWAGDD_BlobProduction.py
@@ -1,11 +1,23 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+try:
+ if muonLayout:
+ from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ GeoModelSvc = GeoModelSvc()
+ GeoModelSvc.MuonVersionOverride=muonLayout
+except NameError:
+ pass
+
from MuonAGDD.MuonAGDDConfig import NSWAGDDTool
NSWAGDDDumper = NSWAGDDTool(name="NSWAGDDDumper")
NSWAGDDDumper.WriteAGDDFile=True # creates Out.AmdcOracle.AM.AGDDtemp.data and Out.AmdcOracle.AM.AGDD.PREsql
NSWAGDDDumper.Locked=False
-NSWAGDDDumper.ReadAGDD=False # turn off reading from data base (true means read from DB)
-NSWAGDDDumper.XMLFiles=[input_nsw_xml]
+try:
+ if input_nsw_xml:
+ NSWAGDDDumper.ReadAGDD = False # turn off reading from data base (true means read from DB)
+ NSWAGDDDumper.XMLFiles=[input_nsw_xml]
+except NameError:
+ pass
NSWAGDDDumper.Volumes=["NewSmallWheel"] # for the NSWAGDDTool volumes must always be given ("NewSmallWheel" usually includes everything)
NSWAGDDDumper.DefaultDetector="Muon"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/MMDetectorHelper.h b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/MMDetectorHelper.h
index 64a6f043540cad7cef70f15cda164252c21a7a65..28eea16397456e1e1dc9f26a2452f085379e0102 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/MMDetectorHelper.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/MMDetectorHelper.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MMDetectorHelper_H
@@ -12,6 +12,7 @@ class MMDetectorDescription;
class AGDDDetectorPositioner;
typedef std::map<std::string,MMDetectorDescription*> MicromegasMap;
+typedef std::map<std::string,MMDetectorDescription*> MicromegasMapSubType;
typedef std::map<std::string,MMDetectorDescription*>::const_iterator MicromegasIterator;
typedef std::pair<MMDetectorDescription*,AGDDDetectorPositioner*> AGDDPositionedDetector;
@@ -22,12 +23,14 @@ public:
MicromegasIterator MM_begin() {return m_MicromegasList.begin();}
MicromegasIterator MM_end() {return m_MicromegasList.end();}
- MMDetectorDescription* Get_MMDetectorType(std::string type);
+ MMDetectorDescription* Get_MMDetectorType(const std::string& type);
+ MMDetectorDescription* Get_MMDetectorSubType(const std::string& type);
MMDetectorDescription* Get_MMDetector(char type,int ieta,int iphi,int layer=1,char side='A');
AGDDPositionedDetector Get_MMPositionedDetector(char type,int ieta,int iphi,int layer=1,char side='A');
private:
MicromegasMap m_MicromegasList;
+ MicromegasMapSubType m_MicromegasListSubType;
};
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/sTGCDetectorHelper.h b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/sTGCDetectorHelper.h
index af50614a8a56c5f9789d1deafad6e971e15fcc12..e03fb9b9e304d951b994740ad2301dffd84e2006 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/sTGCDetectorHelper.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/MuonAGDDDescription/sTGCDetectorHelper.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef sTGCDetectorHelper_H
@@ -12,6 +12,7 @@ class sTGCDetectorDescription;
class AGDDDetectorPositioner;
typedef std::map<std::string,sTGCDetectorDescription*> sTGCMap;
+typedef std::map<std::string,sTGCDetectorDescription*> sTGCMapSubType;
typedef std::map<std::string,sTGCDetectorDescription*>::const_iterator sTGCIterator;
typedef std::pair<sTGCDetectorDescription*,AGDDDetectorPositioner*> AGDDPositionedDetector;
@@ -23,11 +24,13 @@ public:
sTGCIterator sTGC_end() {return m_sTGCList.end();}
sTGCDetectorDescription* Get_sTGCDetector(char type,int ieta,int iphi,int layer=1,char side='A');
- sTGCDetectorDescription* Get_sTGCDetectorType(std::string type);
+ sTGCDetectorDescription* Get_sTGCDetectorType(const std::string& type);
+ sTGCDetectorDescription* Get_sTGCDetectorSubType(const std::string& type);
AGDDPositionedDetector Get_sTGCPositionedDetector(char type,int ieta,int iphi,int layer=1,char side='A');
private:
sTGCMap m_sTGCList;
+ sTGCMapSubType m_sTGCListSubType;
};
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/MMDetectorHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/MMDetectorHelper.cxx
index 83da1fede83f0f864824b16867b93f7af023a894..3596e70d6ad691c801320dc86436fc413e2ee3b8 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/MMDetectorHelper.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/MMDetectorHelper.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonAGDDDescription/MMDetectorHelper.h"
@@ -18,8 +18,10 @@ MMDetectorHelper::MMDetectorHelper()
for ( auto vl_iter: vl)
{
MMDetectorDescription* st=dynamic_cast<MMDetectorDescription*>(vl_iter.second);
- if (st)
+ if (st) {
m_MicromegasList[vl_iter.first]=st;
+ m_MicromegasListSubType[vl_iter.second->subType()]=st;
+ }
}
}
@@ -96,8 +98,15 @@ AGDDPositionedDetector MMDetectorHelper::Get_MMPositionedDetector(char type,int
return p_mm;
}
-MMDetectorDescription* MMDetectorHelper::Get_MMDetectorType(std::string type)
+MMDetectorDescription* MMDetectorHelper::Get_MMDetectorType(const std::string& type)
{
if (m_MicromegasList.find(type) != m_MicromegasList.end()) return m_MicromegasList[type];
return nullptr;
}
+
+MMDetectorDescription* MMDetectorHelper::Get_MMDetectorSubType(const std::string& type)
+{
+ if (m_MicromegasListSubType.find(type) != m_MicromegasListSubType.end()) return m_MicromegasListSubType[type];
+ return nullptr;
+}
+
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/sTGCDetectorHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/sTGCDetectorHelper.cxx
index 6be96f08d3f06841a1edb1e0cb8999a7d8d50f42..5e51b3499bce8a0ff527823d236a44a4c3426510 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/sTGCDetectorHelper.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/src/sTGCDetectorHelper.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonAGDDDescription/sTGCDetectorHelper.h"
@@ -18,9 +18,10 @@ sTGCDetectorHelper::sTGCDetectorHelper()
for ( auto vl_iter: vl)
{
sTGCDetectorDescription* st=dynamic_cast<sTGCDetectorDescription*>(vl_iter.second);
- //AGDDMicromegas* st1=dynamic_cast<AGDDMicromegas*>(st);
- if (st)
+ if (st) {
m_sTGCList[vl_iter.first]=st;
+ m_sTGCListSubType[vl_iter.second->subType()]=st;
+ }
}
}
@@ -97,8 +98,15 @@ AGDDPositionedDetector sTGCDetectorHelper::Get_sTGCPositionedDetector(char type,
return p_sTGC;
}
-sTGCDetectorDescription* sTGCDetectorHelper::Get_sTGCDetectorType(std::string type)
+sTGCDetectorDescription* sTGCDetectorHelper::Get_sTGCDetectorType(const std::string& type)
{
if (m_sTGCList.find(type) != m_sTGCList.end()) return m_sTGCList[type];
return nullptr;
}
+
+sTGCDetectorDescription* sTGCDetectorHelper::Get_sTGCDetectorSubType(const std::string& type)
+{
+ if (m_sTGCListSubType.find(type) != m_sTGCListSubType.end()) return m_sTGCListSubType[type];
+ return nullptr;
+}
+
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
index 90f2f19df3ae02864a15283ae4fb8c3ba829e892..3f33043c2b9bd88062782344fe98610c43b8d8f8 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
@@ -138,6 +138,7 @@ namespace MuonGM {
double m_halfX; // 0.5*radial_size
double m_minHalfY; // 0.5*bottom length (active area)
double m_maxHalfY; // 0.5*top length (active area)
+ double m_offset;
double m_rots;
double m_rotz;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
index a64d221ae21739e5c3b96d5200198870ac90bd57..d611d4f9f0722d46029071ef4c2b2e576fa20979 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonChannelDesign.h
@@ -38,7 +38,6 @@ namespace MuonGM {
double deadO; //this param is not used for MM
double deadS; //this param is not used for MM
double signY;
- //Amg::Vector2D firstChannelPos;
double firstPos; //the position of the first active strip
double firstPitch; // Pitch of 1st strip or number of wires in 1st group
double groupWidth; // Number of Wires per group
@@ -64,9 +63,6 @@ namespace MuonGM {
double dlStereoTop; // length between the first eta and stereo
double dlStereoBottom;
int totalStrips; //total strips per MM module
-
- /** channel transform */
- //HepGeom::Transform3D channelTransform( int channel ) const;
/** distance to readout */
double distanceToReadout( const Amg::Vector2D& pos ) const;
@@ -100,7 +96,7 @@ namespace MuonGM {
int chNum = channelNumber( pos );
- if (chNum <0 ) return -1.;
+ if (chNum <1 ) return -1.;
Amg::Vector2D chPos;
if (!channelPosition( chNum, chPos) ) return -1.;
@@ -123,7 +119,7 @@ namespace MuonGM {
// if channel number is out of bounds, get the nearest channel ( mostly for validation purposes )
bool validMode = false;
if (type==MuonChannelDesign::etaStrip && detType==MuonChannelDesign::DetType::MM) {
- if( chNum < 0 || chNum > totalStrips ){
+ if( chNum < 1 || chNum > totalStrips ){
chNum = channelNumber(pos);
validMode = true;
}
@@ -396,7 +392,7 @@ namespace MuonGM {
else if (detType==MuonChannelDesign::DetType::MM)
{
- if( (st >= nMissedBottomEta) || (st < (totalStrips-nMissedTopEta))){
+ if( (st > nMissedBottomEta) || (st < (totalStrips-nMissedTopEta))){
stLen = inputLength + 2*(0.5*(maxYSize-minYSize)*(st-nMissedBottomEta)*inputPitch/xSize);
return stLen;
@@ -415,16 +411,16 @@ namespace MuonGM {
- if( st >= nMissedBottomStereo && st < (nMissedBottomStereo+nRoutedBottom) )
+ if( st > nMissedBottomStereo && st < (nMissedBottomStereo+nRoutedBottom) )
stLen = (minYPhiR + (st-nMissedBottomStereo)*inputPitch)/sin(sAngle);
- if(st >= (nMissedBottomStereo+nRoutedBottom) )
+ if(st > (nMissedBottomStereo+nRoutedBottom) )
stLen = (inputLength + 2*(0.5*(maxYSize-minYSize)*(st-nMissedBottomEta)*inputPitch/xSize) )/cos(sAngle);
return stLen;
}
//length for routed strips is not defined
- else if(st>=(totalStrips-(nMissedTopStereo+nRoutedTop)) && st < (totalStrips-nMissedTopStereo))
+ else if(st>(totalStrips-(nMissedTopStereo+nRoutedTop)) && st < (totalStrips-nMissedTopStereo))
{
stLen = ( maxYPhi + (totalStrips-nMissedTopStereo-(st+1))*inputPitch)/sin(sAngle);
return stLen;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
index 12e869bd182564926bc47e9ef66f2d66689fb106..f1dfc00daa68171bcfe03787e5dfe0a8757308c1 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
@@ -62,6 +62,8 @@ namespace MuonGM {
If the strip number is outside the range of valid strips, the function will return false */
virtual bool stripPosition( const Identifier& id, Amg::Vector2D& pos ) const override;
+ bool stripGlobalPosition( const Identifier& id, Amg::Vector3D& gpos ) const;
+
/** pad number corresponding to local position */
int padNumber( const Amg::Vector2D& pos, const Identifier& id) const;
@@ -164,6 +166,7 @@ namespace MuonGM {
int m_nlayers;
int m_ml;
+ double m_offset;
int m_sTGC_type;
@@ -221,14 +224,9 @@ namespace MuonGM {
}
inline int sTgcReadoutElement::layerHash( const Identifier& id ) const {
- //return layerHash(manager()->stgcIdHelper()->gasGap(id));
return surfaceHash(id); // don't have a choice here : rewrite MuonClusterReadoutElement first
}
- //inline int sTgcReadoutElement::layerHash( int gasGap ) const {
- // return gasGap-1;
- //}
-
inline int sTgcReadoutElement::boundaryHash( const Identifier& id ) const {
int iphi = manager()->stgcIdHelper()->channelType(id)!=1 ? 1:0 ; // wires and pads have locX oriented along phi
if (std::abs(getStationEta())<3) iphi += 2*(manager()->stgcIdHelper()->gasGap(id)-1);
@@ -293,6 +291,13 @@ namespace MuonGM {
}
+ inline bool sTgcReadoutElement::stripGlobalPosition( const Identifier& id, Amg::Vector3D& gpos ) const {
+ Amg::Vector2D lpos(0., 0.);
+ if (!stripPosition(id, lpos)) return false;
+ surface(id).localToGlobal(lpos, Amg::Vector3D(0., 0., 0.), gpos);
+ return true;
+ }
+
inline bool sTgcReadoutElement::padPosition( const Identifier& id, Amg::Vector2D& pos ) const {
const MuonPadDesign* design = getPadDesign(id);
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
index 9bc2b1a9c4c478a7e0b6ce4c2e4bea0745bc70af..a715cfbd843ef3ad382d4d4740de2252c686e850 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
@@ -35,6 +35,7 @@ namespace MuonGM {
m_rots = 0.;
m_rotz = 0.;
m_rott = 0.;
+ m_offset = 0.;
m_hasALines = false;
m_hasBLines = false;
@@ -168,6 +169,8 @@ namespace MuonGM {
MMDetectorDescription* mm = aHelper.Get_MMDetector(sector_l, std::abs(getStationEta()), getStationPhi(), m_ml, side);
MMReadoutParameters roParam = mm->GetReadoutParameters();
+ double ylFrame = mm->ylFrame();
+ double ysFrame = mm->ysFrame();
m_halfX = roParam.activeH/2; //0.5*radial length (active area)
m_minHalfY = roParam.activeBottomLength/2; //0.5*bottom length (active area)
@@ -199,6 +202,9 @@ namespace MuonGM {
m_etaDesign[il].maxYPhi = roParam.maxYPhi;
m_etaDesign[il].totalStrips = roParam.tStrips;
m_etaDesign[il].sAngle = (roParam.stereoAngle).at(il);
+ m_etaDesign[il].ylFrame = ylFrame;
+ m_etaDesign[il].ysFrame = ysFrame;
+ m_offset = -0.5*(m_etaDesign[il].ylFrame - m_etaDesign[il].ysFrame);
if (m_ml < 1 || m_ml > 2) {
MsgStream log(Athena::getMessageSvc(),"MMReadoutElement");
log << MSG::WARNING <<"MMReadoutElement -- Unexpected Multilayer: m_ml= " << m_ml <<endmsg;
@@ -208,7 +214,7 @@ namespace MuonGM {
m_etaDesign[il].firstPos = -0.5*m_etaDesign[il].xSize + pitch;
m_etaDesign[il].signY = 1 ;
- m_etaDesign[il].nch = ((int) std::round( (m_etaDesign[il].xSize/pitch))) + 1; // Total number of active strips
+ m_etaDesign[il].nch = ((int) std::round( (m_etaDesign[il].xSize/pitch))); // Total number of active strips
} else { // stereo layers
@@ -229,7 +235,7 @@ namespace MuonGM {
double fPos = -0.5*m_etaDesign[il].xSize - low_swift + lm1_swift;
double lPos = 0.5*m_etaDesign[il].xSize + up_swift;
- m_etaDesign[il].nch = ((int)std::round( (lPos - fPos)/pitch )) + 1;
+ m_etaDesign[il].nch = ((int)std::round( (lPos - fPos)/pitch ));
m_etaDesign[il].firstPos = ( -0.5*m_etaDesign[il].xSize + (m_etaDesign[il].nMissedBottomStereo - m_etaDesign[il].nMissedBottomEta)*pitch) + pitch;
}
@@ -263,7 +269,7 @@ namespace MuonGM {
// keep the tracking surface at the center of the gap
// need to operate switch x<->z because of GeoTrd definition
m_surfaceData->m_layerSurfaces.push_back( new Trk::PlaneSurface(*this, id) );
- m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
+ m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*Amg::Translation3D(0.,0.,m_offset)*
Amg::AngleAxis3D(-90.*CLHEP::deg,Amg::Vector3D(0.,1.,0.)) );
// surface info (center, normal)
@@ -298,8 +304,7 @@ namespace MuonGM {
{
int gg = manager()->mmIdHelper()->gasGap(id);
- // Amg::Vector3D locP = (m_Xlg[gg-1].inverse())*locPos;
- Amg::Vector3D locP = (m_Xlg[gg-1])*locPos;
+ Amg::Vector3D locP = (m_Xlg[gg-1])*Amg::Translation3D(0.,0.,m_offset)*locPos;
#ifndef NDEBUG
MsgStream log(Athena::getMessageSvc(),"MMReadoutElement");
if (log.level()<=MSG::DEBUG) {
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx
index 9eb83dc2a66a5bba90235af0f5258a8c7823c073..c49edf66f2a0138c12b4f47a74781fa7d9ed11eb 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx
@@ -44,6 +44,7 @@ namespace MuonGM {
m_hasALines = false;
m_hasBLines = false;
m_delta = Amg::Transform3D::Identity();
+ m_offset = 0.;
m_ml = mL;
// get the setting of the caching flag from the manager
@@ -240,6 +241,9 @@ namespace MuonGM {
m_etaDesign[il].inputPitch = stgc->stripPitch();
m_etaDesign[il].inputLength = m_etaDesign[il].minYSize;
m_etaDesign[il].inputWidth = stgc->stripWidth();
+ // If the top and bottom frames are not the same widths, the active geometry is incorrectly positionned by half the difference
+ m_offset = 0.5*(m_etaDesign[il].ylFrame-m_etaDesign[il].ysFrame);
+
if (!tech){
throw std::runtime_error(Form("File: %s, Line: %d\nsTgcReadoutElement::initDesign() - Failed To get Technology for stgc element: %s", __FILE__, __LINE__, stgc->GetName().c_str()));
}
@@ -396,9 +400,6 @@ namespace MuonGM {
m_surfaceData->m_surfBounds.push_back( new Trk::RotatedTrapezoidBounds( m_halfX[layer], m_minHalfY[layer], m_maxHalfY[layer])); // strips
m_surfaceData->m_surfBounds.push_back( new Trk::TrapezoidBounds( m_PadminHalfY[layer], m_PadmaxHalfY[layer], m_PadhalfX[layer]));
}
-
- // If the top and bottom frames are not the same widths, the active geometry is incorrectly positionned by half the difference
- double offset = 0.5*(m_etaDesign[layer].ylFrame-m_etaDesign[layer].ysFrame);
// identifier of the first channel - wire plane - locX along phi, locY max->min R
Identifier id = manager()->stgcIdHelper()->channelID(getStationName(),getStationEta(),getStationPhi(),m_ml, layer+1, 2, 1);
@@ -407,12 +408,12 @@ namespace MuonGM {
m_surfaceData->m_layerSurfaces.push_back( new Trk::PlaneSurface(*this, id) );
if (m_sTGC_type == 1 || m_sTGC_type == 2)
m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
- Amg::Translation3D(0,0.,-offset)*
+ Amg::Translation3D(0,0.,-m_offset)*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.))*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,0.,1.)) );
else if (m_sTGC_type == 3) // if QL3, diamond. have to shift geometry to account for origin not being in center
m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
- Amg::Translation3D(0,0.,-offset + m_PadhalfX[layer] - m_padDesign[layer].yCutout)*
+ Amg::Translation3D(0,0.,-m_offset + m_PadhalfX[layer] - m_padDesign[layer].yCutout)*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.))*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,0.,1.)) );
else throw std::runtime_error(Form("File: %s, Line: %d\nsTgcReadoutElement::fillCache() - sTGC_type %d is not valid! Wire Geometry not Created!", __FILE__, __LINE__, m_sTGC_type));
@@ -436,12 +437,12 @@ namespace MuonGM {
if (m_sTGC_type == 1 || m_sTGC_type == 2)
m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
- Amg::Translation3D(shift,0.,-offset)*
+ Amg::Translation3D(shift,0.,-m_offset)*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.)));
else if (m_sTGC_type == 3) // if QL3, diamond. have to shift geometry to account for origin not being in center
m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
- Amg::Translation3D(shift,0.,-offset + m_halfX[layer] - m_etaDesign[layer].yCutout)*
+ Amg::Translation3D(shift,0.,-m_offset + m_halfX[layer] - m_etaDesign[layer].yCutout)*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.)) );
else std::runtime_error(Form("File: %s, Line: %d\nsTgcReadoutElement::fillCache() - sTGC_type %d is not valid! Strip Geometry not Created!", __FILE__, __LINE__, m_sTGC_type));
@@ -456,12 +457,12 @@ namespace MuonGM {
m_surfaceData->m_layerSurfaces.push_back( new Trk::PlaneSurface(*this, id) );
if (m_sTGC_type == 1 || m_sTGC_type == 2)
m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
- Amg::Translation3D(-shift,0.,-offset)*
+ Amg::Translation3D(-shift,0.,-m_offset)*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.))*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,0.,1.)) );
else if (m_sTGC_type == 3) // if QL3, diamond. have to shift geometry to account for origin not being in center
m_surfaceData->m_layerTransforms.push_back(absTransform()*m_Xlg[layer]*
- Amg::Translation3D(-shift,0.,-offset + m_PadhalfX[layer] - m_padDesign[layer].yCutout)*
+ Amg::Translation3D(-shift,0.,-m_offset + m_PadhalfX[layer] - m_padDesign[layer].yCutout)*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,1.,0.))*
Amg::AngleAxis3D(-90*CLHEP::deg,Amg::Vector3D(0.,0.,1.)) );
else std::runtime_error(Form("File: %s, Line: %d\nsTgcReadoutElement::fillCache() - sTGC_type %d is not valid! Pad Geometry not Created!", __FILE__, __LINE__, m_sTGC_type));
@@ -500,7 +501,34 @@ namespace MuonGM {
Amg::Vector3D sTgcReadoutElement::localToGlobalCoords(Amg::Vector3D locPos, Identifier id) const
{
int gg = manager()->stgcIdHelper()->gasGap(id);
- Amg::Vector3D locP = m_Xlg[gg-1]*locPos;
+ int channelType = manager()->stgcIdHelper()->channelType(id);
+
+ Amg::Vector3D locP(0,0,0);
+ // strip plane moved along normal, pad plane in the opposite direction
+ // We no longer want the readout elements to be seperated by the gas gas volume
+ // We place all 3 readouts at the center of the gas gap in z, with a 10 micron offset to seperate them
+ double shift = 0.01;
+ if((gg-1)%2) shift = -shift;
+
+ if(channelType == 0){ //if pad plane
+ if(m_sTGC_type == 1 || m_sTGC_type == 2)
+ locP = m_Xlg[gg-1]*Amg::Translation3D(-shift,0.,-m_offset)*locPos;
+ else if(m_sTGC_type == 3)
+ locP = m_Xlg[gg-1]*Amg::Translation3D(-shift,0.,-m_offset + m_PadhalfX[gg-1] - m_padDesign[gg-1].yCutout)*locPos;
+ }
+ else if( channelType == 1 ){ //if strip plane
+ if(m_sTGC_type == 1 || m_sTGC_type == 2)
+ locP = m_Xlg[gg-1]*Amg::Translation3D(shift,0.,-m_offset)*locPos;
+ else if(m_sTGC_type == 3)
+ locP = m_Xlg[gg-1]*Amg::Translation3D(shift,0.,-m_offset + m_halfX[gg-1] - m_etaDesign[gg-1].yCutout)*locPos;
+ }
+ else if(channelType == 2){ //if wire plane
+ if(m_sTGC_type == 1 || m_sTGC_type == 2)
+ locP = m_Xlg[gg-1]*Amg::Translation3D(0,0.,-m_offset)*locPos;
+ else if(m_sTGC_type == 3)
+ locP = m_Xlg[gg-1]*Amg::Translation3D(0,0.,-m_offset + m_PadhalfX[gg-1] - m_padDesign[gg-1].yCutout)*locPos;
+ }
+
#ifndef NDEBUG
MsgStream log(Athena::getMessageSvc(),"sTgcReadoutElement");
if (log.level()<=MSG::DEBUG) {
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
index 829113ce61266ce698e9d916353d0ce1d399611b..3102d20636f672449a7cefc1f9dd0790f0cc43ec 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
@@ -272,7 +272,7 @@ const std::vector<const Trk::DetachedTrackingVolume*>* Muon::MuonStationBuilder:
if (isLargeSector) sectorL.push_back(layer);
else sectorS.push_back(layer);
if(isLargeSector) ATH_MSG_INFO( "new NSW prototype build for Large sector: " << protoName <<", "<<vols[ish].second.size() << " x0 " << mat.fullMaterial(layTransf.translation())->x0() << " thickness " << (mat.fullMaterial(layTransf.translation()))->thickness() );
- if(!isLargeSector) ATH_MSG_INFO( "new NSW prototype build for Large sector: " << protoName <<", "<<vols[ish].second.size() << " x0 " << mat.fullMaterial(layTransf.translation())->x0()<< " thickness " << (mat.fullMaterial(layTransf.translation()))->thickness() );
+ if(!isLargeSector) ATH_MSG_INFO( "new NSW prototype build for Small sector: " << protoName <<", "<<vols[ish].second.size() << " x0 " << mat.fullMaterial(layTransf.translation())->x0()<< " thickness " << (mat.fullMaterial(layTransf.translation()))->thickness() );
} else {
ATH_MSG_DEBUG( " NO layer build for: " << protoName);
}
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h
index 11b1235138e2e7613e24cb1b935faae30737525e..b59aec11c52743f18d0adb24ba36246446a62c52 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator.h
@@ -20,10 +20,6 @@ to the third digit of decimal number of the pdgid.
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/MuonSimData.h"
-
-#include "MuonIdHelpers/MdtIdHelper.h"
-#include "MuonSimEvent/MdtHitIdHelper.h"
-
#include "StoreGate/StoreGateSvc.h"
#include "PileUpTools/PileUpMergeSvc.h"
#include "PathResolver/PathResolver.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h
index 3bb032a48041ce6010ec7eba1b0aa016404b8f55..482a7de958bf9db3ec7968939837a097c8a79121 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/chargeCalculator_PileUp.h
@@ -20,11 +20,6 @@ to the third digit of decimal number of the pdgid.
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/MuonSimData.h"
-#include "GaudiKernel/MsgStream.h"
-
-#include "MuonIdHelpers/MdtIdHelper.h"
-#include "MuonSimEvent/MdtHitIdHelper.h"
-
#include "StoreGate/StoreGateSvc.h"
#include "PileUpTools/PileUpMergeSvc.h"
#include "PathResolver/PathResolver.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h
index bbca95f9fbfaa03fc7359909ddb3725e66418fa7..54a1f2c0cc6c7ebcf889e0d426b6722860062728 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma.h
@@ -15,10 +15,6 @@ Function particleGamma returns the value of gamma factor for Qball particle.
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/MuonSimData.h"
-
-#include "MuonIdHelpers/MdtIdHelper.h"
-#include "MuonSimEvent/MdtHitIdHelper.h"
-
#include "StoreGate/StoreGateSvc.h"
#include "PileUpTools/PileUpMergeSvc.h"
#include "PathResolver/PathResolver.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h
index 9a5690fc5b61e262e3d7c7c02a77eac650a77e7a..fa3a8cee83a145d7bbdb7ca2b628148c46b4cb79 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/MDT_Digitization/particleGamma_PileUp.h
@@ -15,10 +15,6 @@ Function particleGamma returns the value of gamma factor for Qball particle.
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/MuonSimData.h"
-
-#include "MuonIdHelpers/MdtIdHelper.h"
-#include "MuonSimEvent/MdtHitIdHelper.h"
-
#include "StoreGate/StoreGateSvc.h"
#include "PileUpTools/PileUpMergeSvc.h"
#include "PathResolver/PathResolver.h"
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx
index deff99b51f64ff4cbfe74903c2103dadd6d0800b..0630af53b2ce83340a9ab86773eb281f0c03eee6 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/MdtDigitizationTool.cxx
@@ -140,7 +140,7 @@ StatusCode MdtDigitizationTool::initialize() {
ATH_MSG_DEBUG ( "Output Digits: '" << m_outputObjectKey.key() << "'" );
//simulation identifier helper
- m_muonHelper = MdtHitIdHelper::GetHelper();
+ m_muonHelper = MdtHitIdHelper::GetHelper(m_idHelperSvc->mdtIdHelper().tubeMax());
//get the r->t conversion tool
ATH_CHECK(m_digiTool.retrieve());
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
index a1af25ef29a67d0b0df18c42f7610c37e1c2033d..663d14296df1f387d1f25e142f3a714ccbc70066 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
@@ -107,7 +107,7 @@ void MM_StripResponse::calculateSummaries(float chargeThreshold) {
// Last active strip numbrer is maxStripID-1
if (stripVal < m_minstripID || stripVal > m_maxstripID-1) continue;
// remove PCB gap strips
- if (stripVal == 1023 || stripVal == 1024 || stripVal == 2047 || stripVal == 2048 || stripVal == 3071 || stripVal == 3072 || stripVal == 4095 || stripVal == 4096) continue;
+ if (stripVal == 1024 || stripVal == 1025 || stripVal == 2048 || stripVal == 2049 || stripVal == 3072 || stripVal == 3073 || stripVal == 4096 || stripVal == 4097) continue;
float stripChargeVal = stripCharge.second;
if(stripChargeVal < chargeThreshold) continue;
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx
index 2db59976e68639cabc410b672d4c4997991c3de9..9bce3813df2ab0778d5d5d0ecbb48ceff19a057d 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx
@@ -608,7 +608,14 @@ StatusCode RpcDigitizationTool::doDigitization(const EventContext& ctx, RpcDigit
const HepMcParticleLink::PositionFlag idxFlag = (phit.eventId()==0) ? HepMcParticleLink::IS_POSITION: HepMcParticleLink::IS_INDEX;
const HepMcParticleLink particleLink(phit->trackNumber(),phit.eventId(),evColl,idxFlag);
- ATH_CHECK(DetectionEfficiency(ctx, &atlasRpcIdeta,&atlasRpcIdphi, undefPhiStripStat, rndmEngine, particleLink));
+ // as long there is no proper implementation of the BIS78 cabling and digitisation,
+ // skip this method to avoid hard crash of digitisation
+ if (stationName.find("BIS")!=std::string::npos && std::abs(stationEta)>6) {
+ ATH_MSG_WARNING("skipping DetectionEfficiency for BIS78");
+ } else {
+ ATH_CHECK(DetectionEfficiency(ctx, &atlasRpcIdeta,&atlasRpcIdphi, undefPhiStripStat, rndmEngine, particleLink));
+ }
+
ATH_MSG_DEBUG ( "SetPhiOn " << m_SetPhiOn << " SetEtaOn " << m_SetEtaOn );
for( int imeasphi=0 ; imeasphi!=2; ++imeasphi){
@@ -2092,7 +2099,7 @@ int RpcDigitizationTool::ClusterSizeEvaluation(const EventContext& ctx, const Id
index += m_FracClusterSize1_A.size()/2*measuresPhi ;
if( index>m_FracClusterSize1_A.size() || index>m_FracClusterSize2_A.size() ||
index>m_FracClusterSizeTail_A.size() || index>m_MeanClusterSizeTail_A.size() ) {
- ATH_MSG_ERROR ( "Index out of array in ClusterSizeEvaluation SideA " << index <<" statName "<<stationName) ;
+ ATH_MSG_WARNING ( "Index out of array in ClusterSizeEvaluation SideA " << index <<" statName "<<stationName) ;
return 1;
}
FracClusterSize1 = m_FracClusterSize1_A [index];
@@ -2104,7 +2111,7 @@ int RpcDigitizationTool::ClusterSizeEvaluation(const EventContext& ctx, const Id
index += m_FracClusterSize1_C.size()/2*measuresPhi - m_FracClusterSize1_A.size()/2*measuresPhi ;
if( index>m_FracClusterSize1_C.size() || index>m_FracClusterSize2_C.size() ||
index>m_FracClusterSizeTail_C.size() || index>m_MeanClusterSizeTail_C.size() ) {
- ATH_MSG_ERROR ( "Index out of array in ClusterSizeEvaluation SideC " << index <<" statName "<<stationName) ;
+ ATH_MSG_WARNING ( "Index out of array in ClusterSizeEvaluation SideC " << index <<" statName "<<stationName) ;
return 1;
}
@@ -2145,7 +2152,7 @@ int RpcDigitizationTool::ClusterSizeEvaluation(const EventContext& ctx, const Id
index += m_FracClusterSize1_A.size()/2*measuresPhi ;
if( index>m_FracClusterSize1_A.size() || index>m_FracClusterSize2_A.size() ||
index>m_FracClusterSizeTail_A.size() || index>m_MeanClusterSizeTail_A.size() ) {
- ATH_MSG_ERROR ( "Index out of array in ClusterSizeEvaluation SideA " << index << " statName "<<stationName) ;
+ ATH_MSG_WARNING ( "Index out of array in ClusterSizeEvaluation SideA " << index << " statName "<<stationName) ;
return 1;
}
FracClusterSize1 = m_FracClusterSize1_A [index];
@@ -2157,7 +2164,7 @@ int RpcDigitizationTool::ClusterSizeEvaluation(const EventContext& ctx, const Id
index += m_FracClusterSize1_C.size()/2*measuresPhi - m_FracClusterSize1_A.size()/2*measuresPhi ;
if( index>m_FracClusterSize1_C.size() || index>m_FracClusterSize2_C.size() ||
index>m_FracClusterSizeTail_C.size() || index>m_MeanClusterSizeTail_C.size() ) {
- ATH_MSG_ERROR ( "Index out of array in ClusterSizeEvaluation SideC " << index << " statName "<<stationName ) ;
+ ATH_MSG_WARNING ( "Index out of array in ClusterSizeEvaluation SideC " << index << " statName "<<stationName ) ;
return 1;
}
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.cxx
index 7fdd79823312848b1714387bdd26efe288bb1f37..b23950a27e25a74163b3eaa1696f7b1b2034028d 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.cxx
@@ -14,14 +14,14 @@
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
// construction/destruction
-MDTSensitiveDetector::MDTSensitiveDetector(const std::string& name, const std::string& hitCollectionName)
+MDTSensitiveDetector::MDTSensitiveDetector(const std::string& name, const std::string& hitCollectionName, const unsigned int nTubesMax)
: G4VSensitiveDetector( name )
, m_MDTHitColl( hitCollectionName )
, m_driftRadius(0.)
, m_globalTime(0.)
, m_DEFAULT_TUBE_RADIUS( std::numeric_limits<double>::max() )
{
- m_muonHelper = MdtHitIdHelper::GetHelper();
+ m_muonHelper = MdtHitIdHelper::GetHelper(nTubesMax);
}
// Implemenation of memebr functions
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.h b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.h
index 253bfe1efc12614407428f50d9557f1522ed0634..b08f6e90769da1b36e5e5409ab1494a4f3160736 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.h
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetector.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** @class MDTSensitiveDetector
@@ -88,8 +88,8 @@ FRIEND_TEST( MDTSensitiveDetectortest, GetIdentifier );
public:
/** construction/destruction */
- MDTSensitiveDetector(const std::string& name, const std::string& hitCollectionName);
- ~MDTSensitiveDetector() {}
+ MDTSensitiveDetector(const std::string& name, const std::string& hitCollectionName, const unsigned int nTubesMax);
+ ~MDTSensitiveDetector()=default;
/** member functions */
void Initialize(G4HCofThisEvent* HCE) override final;
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.cxx
index 2b1cebf437fda49ac7903fcdaf31ea3ccc9f5c1d..b44478a00a941e806b7946ba59cbd7d0f2f45e7c 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.cxx
@@ -17,7 +17,7 @@
typedef std::istringstream my_isstream;
// construction/destruction
-MDTSensitiveDetectorCosmics::MDTSensitiveDetectorCosmics(const std::string& name, const std::string& hitCollectionName)
+MDTSensitiveDetectorCosmics::MDTSensitiveDetectorCosmics(const std::string& name, const std::string& hitCollectionName, const unsigned int nTubesMax)
: G4VSensitiveDetector( name )
, m_momMag(0.)
, m_MDTHitColl( hitCollectionName )
@@ -25,7 +25,7 @@ MDTSensitiveDetectorCosmics::MDTSensitiveDetectorCosmics(const std::string& name
, m_globalTime(0.)
, m_DEFAULT_TUBE_RADIUS( std::numeric_limits<double>::max() )
{
- m_muonHelper = MdtHitIdHelper::GetHelper();
+ m_muonHelper = MdtHitIdHelper::GetHelper(nTubesMax);
}
// Implemenation of member functions
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.h b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.h
index 625516cb683fbf792dd94e832a8c9cee2df0c93e..ee45b2e14ab408e51fe6490d611dbfa8143e373b 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.h
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmics.h
@@ -93,8 +93,8 @@ FRIEND_TEST( MDTSensitiveDetectorCosmicstest, GetIdentifier );
public:
/** construction/destruction */
- MDTSensitiveDetectorCosmics(const std::string& name, const std::string& hitCollectionName);
- ~MDTSensitiveDetectorCosmics() {}
+ MDTSensitiveDetectorCosmics(const std::string& name, const std::string& hitCollectionName, const unsigned int nTubesMax);
+ ~MDTSensitiveDetectorCosmics()=default;
/** member functions */
void Initialize(G4HCofThisEvent* HCE) override final;
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.cxx
index e82255f9890d4d2940aa3c4c3b72aff791e4e2b7..d5df98ee5eaf65b4dbdd350559958170f47749f1 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.cxx
@@ -1,9 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MDTSensitiveDetectorCosmicsTool.h"
#include "MDTSensitiveDetectorCosmics.h"
+#include <TString.h> // for Form
MDTSensitiveDetectorCosmicsTool::MDTSensitiveDetectorCosmicsTool(const std::string& type, const std::string& name, const IInterface* parent)
: SensitiveDetectorBase( type , name , parent )
@@ -13,5 +14,7 @@ MDTSensitiveDetectorCosmicsTool::MDTSensitiveDetectorCosmicsTool(const std::stri
G4VSensitiveDetector* MDTSensitiveDetectorCosmicsTool::makeSD() const
{
ATH_MSG_DEBUG( "Initializing SD" );
- return new MDTSensitiveDetectorCosmics(name(), m_outputCollectionNames[0]);
+ StatusCode sc = m_idHelperSvc.retrieve();
+ if (sc.isFailure()) throw std::runtime_error(Form("File: %s, Line: %d\nMDTSensitiveDetectorCosmicsTool::makeSD() - could not retrieve MuonIdHelperSvc", __FILE__, __LINE__));
+ return new MDTSensitiveDetectorCosmics(name(), m_outputCollectionNames[0], m_idHelperSvc->mdtIdHelper().tubeMax());
}
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.h b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.h
index 2e28d88c6f2637d4969743dd641813ff1bf319f1..2b6bbe28992554e8ada14ca85650e89699967cb9 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.h
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorCosmicsTool.h
@@ -1,19 +1,23 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MDTSensitiveDetectorCosmicsTool_H
#define MDTSensitiveDetectorCosmicsTool_H
#include "G4AtlasTools/SensitiveDetectorBase.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
class MDTSensitiveDetectorCosmicsTool : public SensitiveDetectorBase {
public:
MDTSensitiveDetectorCosmicsTool(const std::string& type, const std::string& name, const IInterface *parent);
- ~MDTSensitiveDetectorCosmicsTool() {}
+ ~MDTSensitiveDetectorCosmicsTool()=default;
protected:
G4VSensitiveDetector* makeSD() const override final;
+private:
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
};
#endif
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.cxx
index 00e4b67b58a298cdbcbfcff4babaf9cb757a2bed..989244d88e06eee962e90269d2dc7335662f343e 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.cxx
@@ -1,9 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MDTSensitiveDetectorTool.h"
#include "MDTSensitiveDetector.h"
+#include <TString.h> // for Form
MDTSensitiveDetectorTool::MDTSensitiveDetectorTool(const std::string& type, const std::string& name, const IInterface* parent)
: SensitiveDetectorBase( type , name , parent )
@@ -13,5 +14,7 @@ MDTSensitiveDetectorTool::MDTSensitiveDetectorTool(const std::string& type, cons
G4VSensitiveDetector* MDTSensitiveDetectorTool::makeSD() const
{
ATH_MSG_DEBUG( "Initializing SD" );
- return new MDTSensitiveDetector(name(), m_outputCollectionNames[0]);
+ StatusCode sc = m_idHelperSvc.retrieve();
+ if (sc.isFailure()) throw std::runtime_error(Form("File: %s, Line: %d\nMDTSensitiveDetectorTool::makeSD() - could not retrieve MuonIdHelperSvc", __FILE__, __LINE__));
+ return new MDTSensitiveDetector(name(), m_outputCollectionNames[0], m_idHelperSvc->mdtIdHelper().tubeMax());
}
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.h b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.h
index bfb8bf61d6fb22067a46703208d1dcd5690b24c5..4734fcbdcd1106865ba4dda175f3d90c34e374a5 100755
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.h
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/MDTSensitiveDetectorTool.h
@@ -1,19 +1,23 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MDTSENSITIVEDETECTORTOOL_H
#define MDTSENSITIVEDETECTORTOOL_H
#include "G4AtlasTools/SensitiveDetectorBase.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
class MDTSensitiveDetectorTool : public SensitiveDetectorBase {
public:
MDTSensitiveDetectorTool(const std::string& type, const std::string& name, const IInterface *parent);
- ~MDTSensitiveDetectorTool() {}
+ ~MDTSensitiveDetectorTool()=default;
protected:
G4VSensitiveDetector* makeSD() const override final;
+private:
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
};
#endif
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx
index 4ba3740ea73c3c62eaabe7360e48033be3915cae..42c16521e124e1d0a339286a7a0c1f80fa4a2a82 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetectorCosmics_gtest.cxx
@@ -49,7 +49,7 @@ class MDTSensitiveDetectorCosmicstest : public ::testing::Test {
TEST_F ( MDTSensitiveDetectorCosmicstest, Initialize )
{
G4HCofThisEvent hce;
- MDTSensitiveDetectorCosmics sd1("name1", "name1" );
+ MDTSensitiveDetectorCosmics sd1("name1", "name1", 78); // all MDT/sMDT chambers used in Run1/2 have maximum 78 tubes
sd1.Initialize( &hce );
ASSERT_TRUE(sd1.m_MDTHitColl.isValid()); //check if initialization of m_MDTHitColl is successful
}
@@ -208,7 +208,7 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, ProcessHits )
sp.SetTrack(track);
- MDTSensitiveDetectorCosmics sd2("name2", "name2");
+ MDTSensitiveDetectorCosmics sd2("name2", "name2", 78); // all MDT/sMDT chambers used in Run1/2 have maximum 78 tubes
sd2.Initialize( &hce );
sd2.ProcessHits(&sp, &th );//invoke the memberfunction that is being tested
@@ -254,7 +254,7 @@ TEST_F ( MDTSensitiveDetectorCosmicstest, GetIdentifier )
navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
G4TouchableHistory* touchableHistory = new G4TouchableHistory(*navigationHistory);
- MDTSensitiveDetectorCosmics sd3("name3", "name3");
+ MDTSensitiveDetectorCosmics sd3("name3", "name3", 78); // all MDT/sMDT chambers used in Run1/2 have maximum 78 tubes
sd3.Initialize( &hce );
int theID = sd3.GetIdentifier(touchableHistory);
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx
index 50ea955f9bb61174d4b9d121462ab29277c349ce..453fe6805ffcd2e98d942f69f3e9813a94a5343d 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/test/MDTSensitiveDetector_gtest.cxx
@@ -49,7 +49,7 @@ class MDTSensitiveDetectortest : public ::testing::Test {
TEST_F ( MDTSensitiveDetectortest, Initialize )
{
G4HCofThisEvent hce;
- MDTSensitiveDetector sd1("name1", "name1" );
+ MDTSensitiveDetector sd1("name1", "name1", 78); // all MDT/sMDT chambers used in Run1/2 have maximum 78 tubes
sd1.Initialize( &hce );
ASSERT_TRUE(sd1.m_MDTHitColl.isValid()); //check if initialization of m_MDTHitColl is successful
@@ -208,7 +208,7 @@ TEST_F ( MDTSensitiveDetectortest, ProcessHits )
sp.SetTrack(track);
//end
- MDTSensitiveDetector sd2("name2", "name2");
+ MDTSensitiveDetector sd2("name2", "name2", 78); // all MDT/sMDT chambers used in Run1/2 have maximum 78 tubes
sd2.Initialize( &hce );
sd2.ProcessHits(&sp, &th );
@@ -254,7 +254,7 @@ TEST_F ( MDTSensitiveDetectortest, GetIdentifier )
navigationHistory->NewLevel(physicalVolume, kNormal, nReplica);
G4TouchableHistory* touchableHistory = new G4TouchableHistory(*navigationHistory);
- MDTSensitiveDetector sd3("name3", "name3");
+ MDTSensitiveDetector sd3("name3", "name3", 78); // all MDT/sMDT chambers used in Run1/2 have maximum 78 tubes
sd3.Initialize( &hce );
int theID = sd3.GetIdentifier(touchableHistory);
diff --git a/MuonSpectrometer/MuonG4/MuonPassiveMaterials/README.md b/MuonSpectrometer/MuonG4/MuonPassiveMaterials/README.md
index 102f72d1ece3dfeeeada5c600d306c907b0870e4..1ad1cc7703cc097e0c436b09ca03509f410a7c27 100644
--- a/MuonSpectrometer/MuonG4/MuonPassiveMaterials/README.md
+++ b/MuonSpectrometer/MuonG4/MuonPassiveMaterials/README.md
@@ -10,3 +10,7 @@ Content
`passiveMat_r.08.02.xml`: file used to create `MuonSpectrometer-R.08.02` layout: Run 2 detector geometry, based on AGDD xml block of `amdb_simrec.r.08.01`, fixes of JFSH and JTSH, fixed floor position, updated HFTruck description, updated description of flexible chain in sectors 9, 11 and 15, updated description of ATLAS feet
+`passiveMat_r.09.02.xml`: file used to create `MuonSpectrometer-R.09.02` layout: Run 3 detector geometry (symmetric NSW & BIS7/8), based on `passiveMat_r.08.02.xml`, added `JDSH_Shield_NSW` on both sides, removed Run 2 `JDSH_Shield`
+
+`passiveMat_r.09.02.Asym.xml`: file used to create `MuonSpectrometer-R.09.02.Asym` layout: Run 3 detector geometry (NSW & BIS7/8 on Aside only), based on `passiveMat_r.08.02.xml`, added `JDSH_Shield_NSW` on Aside replacing Run 2 `JDSH_Shield`
+
diff --git a/MuonSpectrometer/MuonG4/MuonPassiveMaterials/data/passiveMat_r.09.02.Asym.xml b/MuonSpectrometer/MuonG4/MuonPassiveMaterials/data/passiveMat_r.09.02.Asym.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d53290fbc378b31955f6537ec16bb936d7de261d
--- /dev/null
+++ b/MuonSpectrometer/MuonG4/MuonPassiveMaterials/data/passiveMat_r.09.02.Asym.xml
@@ -0,0 +1,10248 @@
+<?xml version="1.0"?>
+
+<AGDD>
+
+<section name = "General Variables"
+ version = "7.0"
+ date = "17 January 2005"
+ author = "Serguei Baranov, Daniel Pomarede"
+ top_volume = "useless">
+
+<!-- name = Constants of general use section name = "Constante" -->
+
+<var name="GENV_Pi" value="2. * asin(1)" />
+<var name="GENV_Eps" value="0.1" />
+<var name="GENV_PiS180" value="GENV_Pi/180." />
+
+<var name="GENV_Si5" value="sin( 5.0*GENV_PiS180)"/>
+<var name="GENV_Co5" value="cos( 5.0*GENV_PiS180)"/>
+
+<var name="GENV_Ta15" value="tan(15.0*GENV_PiS180)"/>
+
+<var name="GENV_Ta20" value="tan(20.0*GENV_PiS180)"/>
+
+<var name="GENV_Si225" value="sin(22.5*GENV_PiS180)"/>
+<var name="GENV_Co225" value="cos(22.5*GENV_PiS180)"/>
+<var name="GENV_Ta225" value="tan(22.5*GENV_PiS180)"/>
+
+<var name="GENV_Ta375" value="tan(37.5*GENV_PiS180)"/>
+
+<var name="GENV_Si45" value="sin(45.0*GENV_PiS180)"/>
+<var name="GENV_Co45" value="cos(45.0*GENV_PiS180)"/>
+<var name="GENV_Ta45" value="tan(45.0*GENV_PiS180)"/>
+
+<var name="GENV_Si525" value="sin(52.5*GENV_PiS180)"/>
+<var name="GENV_Co525" value="cos(52.5*GENV_PiS180)"/>
+
+<var name="GENV_Ta55" value="tan(55.0*GENV_PiS180)"/>
+
+<var name="GENV_Si675" value="sin(67.5*GENV_PiS180)"/>
+<var name="GENV_Co675" value="cos(67.5*GENV_PiS180)"/>
+<var name="GENV_Ta675" value="tan(67.5*GENV_PiS180)"/>
+
+<var name="GENV_Ta77" value="tan(77.0*GENV_PiS180)"/>
+<var name="Zero" value=" 0"/>
+
+<var name="PiOver2" value="90." />
+<var name="PiOver4" value="45." />
+
+</section>
+<section name = "Atlas ECT Toroidal Magnets"
+ version = "8.0"
+ date = "01-01-10, 28 November 2002 -> Summer 2011"
+ author = "Laurent Chevalier, Marc Virchaux, Daniel Pomarede -> review Jochen Meyer"
+ top_volume = "ECT_Toroids">
+
+<!-- name = Atlas ECT Toroidal Magnets section name = "Magnets" -->
+
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** Atlas End-Cap Toroids (ECT) ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+<var name="AECT_Toroid_ZPosition" value=" 10406. "/> <!-- confirmed atczte__0002-vAB -->
+
+
+<!-- cold mass parameters -->
+
+<!-- conductor surrounding mass from atltecc_0012-v0 and atltecc_0013-v0 -->
+
+<var name="AECT_CMZwid_ColdMassZwidth" value=" 4490.7 "/> <!-- warm: 4510. -->
+<var name="AECT_CMRwid_ColdMassRadwidth" value=" 3942.0 "/> <!-- warm: 3959. -->
+<var name="AECT_CMPwid_ColdMassPhiwidth" value=" 270.8 "/> <!-- warm: 272. -->
+<var name="AECT_CMHrad_ColdMassHolerad" value=" 250. "/> <!-- warm value kept, may be increased due to shrinking of surrounding material -->
+<var name="AECT_CMEOff_ColdMassEdgeOff" value=" 612.4 "/> <!-- warm: 615. cold: 612.4 -->
+<var name="AECT_CMHRp1_ColdMassHoleRpo1" value=" 1702.7 "/> <!-- warm: 1710. -->
+<var name="AECT_CMHRp2_ColdMassHoleRpo2" value=" 995.7 "/> <!-- warm: 1000. -->
+
+<var name="AECT_CMIWba_ColdMassInWebbase" value=" 402.3 "/> <!-- from atltecc_0011-v0, warm: 202. for the half of it-->
+<var name="AECT_CMIWed_ColdMassInWebedge" value=" 199.1 "/> <!-- from atltecc_0011-v0, warm: 200. -->
+<!-- following value does not agree to atltecc_0011-v0, it's from consistency calculation, seems smaller in blueprints -->
+<!-- if one wants to decrease the outer radius of the coil this value has to be reduced in the same way! -->
+<var name="AECT_CMIWhi_ColdMassInWebhigh" value=" 90.1 "/>
+<var name="AECT_CMgodi_ColdMassgloboutdi" value=" 10164.1 "/> <!-- from 10014054-07, warm: 10238. -->
+<var name="AECT_CMgira_ColdMassglobinrad" value=" 1045. "/> <!-- from atltec__0001-v0, warm 1050. -->
+
+<!-- keystone box from atltecc_0008-v0 -->
+
+<var name="AECT_KSthic_KeyStonethickness" value=" 39.8 "/> <!-- warm: 40. -->
+<var name="AECT_KSlthi_KeyStonelowthick" value=" 59.7 "/> <!-- warm: 60. -->
+<var name="AECT_KSHrad_KeyStoneHolerad" value=" 570. "/> <!-- warm value kept, may be increased due to shrinking of surrounding material -->
+<var name="AECT_KSHRpo_KeyStoneHoleRpos" value=" 2041.2 "/> <!-- warm: 2050. -->
+<var name="AECT_KSZwid_KeyStoneZwidth" value=" 3265.9 "/> <!-- warm: 3280. -->
+<var name="AECT_KStRwi_KeyStonetotRwidth" value=" 2837.8 "/> <!-- warm: 2850. -->
+<var name="AECT_KSmRwi_KeyStonemidRwidth" value=" 507.8 "/> <!-- warm: 510. -->
+<var name="AECT_KSlRwi_KeyStonelowRwidth" value=" 199.1 "/> <!-- warm: 200. -->
+<var name="AECT_KStPwi_KeyStonetopPhiwid" value=" 2816.4 "/> <!-- warm: 2828.5 -->
+<var name="AECT_KSlPwi_KeyStonelowPhiwid" value=" 428.1 "/> <!-- warm: 430. -->
+<var name="AECT_KSlPof_KeyStonelowPhioff" value=" 214.1 "/> <!-- warm: 215. -->
+<var name="AECT_KSBRwi_KeyStoneBoxRwidth" value=" 492.9 "/> <!-- warm: 495. -->
+<var name="AECT_KSFPRo_KeyStoneFootPROff" value=" 291.7 "/> <!-- warm: 293. -->
+
+<box name="ECT_CM_ConductorFrame_basic" material="Aluminium" X_Y_Z="AECT_CMZwid_ColdMassZwidth ; AECT_CMRwid_ColdMassRadwidth; AECT_CMPwid_ColdMassPhiwidth" />
+<box name="ECT_CM_ConductorFrame_edge" material="Aluminium" X_Y_Z="AECT_CMEOff_ColdMassEdgeOff; AECT_CMEOff_ColdMassEdgeOff; 2.*AECT_CMPwid_ColdMassPhiwidth" />
+<tubs name="ECT_CM_ConductorFrame_Hole" material="Aluminium" Rio_Z="0.; AECT_CMHrad_ColdMassHolerad; 2.*AECT_CMPwid_ColdMassPhiwidth" nbPhi="20" />
+
+<subtraction name="ECT_CM_ConductorFrame" >
+ <posXYZ volume="ECT_CM_ConductorFrame_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" AECT_CMZwid_ColdMassZwidth/2.; AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" -AECT_CMZwid_ColdMassZwidth/2.; AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" AECT_CMZwid_ColdMassZwidth/2.; -AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" -AECT_CMZwid_ColdMassZwidth/2.; -AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_Hole" X_Y_Z=" 0.; AECT_CMRwid_ColdMassRadwidth/2. - AECT_CMHRp1_ColdMassHoleRpo1 ; 0." />
+ <posXYZ volume="ECT_CM_ConductorFrame_Hole" X_Y_Z=" 0.; AECT_CMRwid_ColdMassRadwidth/2. - AECT_CMHRp1_ColdMassHoleRpo1 - AECT_CMHRp2_ColdMassHoleRpo2 ; 0." />
+</subtraction>
+
+<gvxysx name="ECT_CM_ConductorInnerWeb" material="Aluminium" dZ="AECT_KSZwid_KeyStoneZwidth">
+ <gvxy_point X_Y="AECT_CMIWba_ColdMassInWebbase/2. - GENV_Eps; 0."/>
+ <gvxy_point X_Y="GENV_Si225*AECT_CMIWed_ColdMassInWebedge + AECT_CMIWba_ColdMassInWebbase/2.-GENV_Eps; GENV_Co225*AECT_CMIWed_ColdMassInWebedge"/>
+ <gvxy_point X_Y="AECT_CMPwid_ColdMassPhiwidth/2. + 2.*GENV_Eps; GENV_Co225*AECT_CMIWed_ColdMassInWebedge"/>
+ <gvxy_point X_Y="AECT_CMPwid_ColdMassPhiwidth/2. + 2.*GENV_Eps ; AECT_CMIWhi_ColdMassInWebhigh - GENV_Eps"/>
+</gvxysx>
+
+<trd name="ECT_CM_KeyStoneTop" material="Aluminium" Xmp_Ymp_Z=" AECT_KStPwi_KeyStonetopPhiwid; AECT_KStPwi_KeyStonetopPhiwid - 2.*GENV_Ta225*AECT_KSthic_KeyStonethickness; AECT_KSZwid_KeyStoneZwidth; AECT_KSZwid_KeyStoneZwidth; AECT_KSthic_KeyStonethickness" />
+
+<box name="ECT_CM_KeyStoneMid_basic" material="Aluminium" X_Y_Z="AECT_KStPwi_KeyStonetopPhiwid - GENV_Ta225 * AECT_KSthic_KeyStonethickness * 2. ; AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth ; AECT_KSthic_KeyStonethickness" />
+<box name="ECT_CM_KeyStoneMid_CutBox" material="Aluminium" X_Y_Z="AECT_KStPwi_KeyStonetopPhiwid; AECT_KSZwid_KeyStoneZwidth ; 2.*AECT_KSthic_KeyStonethickness" />
+<tubs name="ECT_CM_KeyStoneMid_Hole" material="Aluminium" Rio_Z="0.; AECT_KSHrad_KeyStoneHolerad; 2.*AECT_KSthic_KeyStonethickness" nbPhi="20" />
+
+<subtraction name="ECT_CM_KeyStoneMid" >
+ <posXYZ volume="ECT_CM_KeyStoneMid_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneMid_Hole" X_Y_Z=" 0.; AECT_KSHRpo_KeyStoneHoleRpos - AECT_KSmRwi_KeyStonemidRwidth/2. - AECT_KStRwi_KeyStonetotRwidth/2.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneMid_CutBox" X_Y_Z=" (AECT_KStPwi_KeyStonetopPhiwid * (1.+GENV_Co225) - AECT_KSZwid_KeyStoneZwidth*GENV_Si225 - GENV_Ta225 * AECT_KSthic_KeyStonethickness*2.)/2. + GENV_Eps; (-AECT_KSZwid_KeyStoneZwidth*GENV_Co225 - AECT_KStPwi_KeyStonetopPhiwid * GENV_Si225)/2. + (AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps * GENV_Ta225 ; 0." rot=" 0.; 0.; -22.5 "/>
+ <posXYZ volume="ECT_CM_KeyStoneMid_CutBox" X_Y_Z="-(AECT_KStPwi_KeyStonetopPhiwid * (1.+GENV_Co225) - AECT_KSZwid_KeyStoneZwidth*GENV_Si225 - GENV_Ta225 * AECT_KSthic_KeyStonethickness*2.)/2. - GENV_Eps; (-AECT_KSZwid_KeyStoneZwidth*GENV_Co225 - AECT_KStPwi_KeyStonetopPhiwid * GENV_Si225)/2. + (AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps * GENV_Ta225 ; 0." rot=" 0.; 0.; 22.5 "/>
+</subtraction>
+
+<gvxysx name="ECT_CM_KeyStoneLow" material="Aluminium" dZ="AECT_KSthic_KeyStonethickness">
+ <gvxy_point X_Y=" AECT_KStPwi_KeyStonetopPhiwid/2. - (AECT_KStRwi_KeyStonetotRwidth - AECT_KSmRwi_KeyStonemidRwidth) * GENV_Ta225 ; AECT_KSmRwi_KeyStonemidRwidth"/>
+ <gvxy_point X_Y=" AECT_KSlPof_KeyStonelowPhioff ; AECT_KSlRwi_KeyStonelowRwidth"/>
+ <gvxy_point X_Y=" AECT_KSlPof_KeyStonelowPhioff - AECT_KSlthi_KeyStonelowthick; AECT_KSlRwi_KeyStonelowRwidth"/>
+ <gvxy_point X_Y=" AECT_KSlPof_KeyStonelowPhioff - AECT_KSlthi_KeyStonelowthick; AECT_KSlthi_KeyStonelowthick"/>
+</gvxysx>
+
+<box name="ECT_CM_KeyStoneInnerWeb_Box1" material="Aluminium" X_Y_Z=" AECT_KSlthi_KeyStonelowthick - GENV_Eps/2.; AECT_KSlRwi_KeyStonelowRwidth - AECT_KSlthi_KeyStonelowthick; AECT_KSZwid_KeyStoneZwidth" />
+<box name="ECT_CM_KeyStoneInnerWeb_Box2" material="Aluminium" X_Y_Z=" AECT_KSlPwi_KeyStonelowPhiwid - GENV_Eps/2.; AECT_KSlthi_KeyStonelowthick - GENV_Eps; AECT_KSZwid_KeyStoneZwidth" />
+<box name="ECT_CM_KeyStoneFootPlate" material="Aluminium" X_Y_Z=" AECT_KSthic_KeyStonethickness; AECT_KSBRwi_KeyStoneBoxRwidth; AECT_KSZwid_KeyStoneZwidth" />
+
+<composition name="ECT_CM_KeyStone" >
+ <posXYZ volume="ECT_CM_KeyStoneTop" X_Y_Z=" 0.; AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness/2. + 1.5*GENV_Eps*GENV_Co225; -1.5*GENV_Eps*GENV_Si225" rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_CM_KeyStoneMid" X_Y_Z=" 0.; AECT_KStRwi_KeyStonetotRwidth - (AECT_KStRwi_KeyStonetotRwidth + AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps*GENV_Co225; AECT_KSZwid_KeyStoneZwidth/2. - AECT_KSthic_KeyStonethickness/2.-GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneMid" X_Y_Z=" 0.; AECT_KStRwi_KeyStonetotRwidth - (AECT_KStRwi_KeyStonetotRwidth + AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps*GENV_Co225; -AECT_KSZwid_KeyStoneZwidth/2. + AECT_KSthic_KeyStonethickness/2.-GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneLow" X_Y_Z=" 0.; 0.5*GENV_Eps*GENV_Co225; AECT_KSZwid_KeyStoneZwidth/2. - AECT_KSthic_KeyStonethickness/2.-0.5*GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneLow" X_Y_Z=" 0.; 0.5*GENV_Eps*GENV_Co225; -AECT_KSZwid_KeyStoneZwidth/2. + AECT_KSthic_KeyStonethickness/2.-0.5*GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneInnerWeb_Box1" X_Y_Z=" (AECT_KSlPwi_KeyStonelowPhiwid - AECT_KSlthi_KeyStonelowthick)/2.; (AECT_KSlthi_KeyStonelowthick + AECT_KSlRwi_KeyStonelowRwidth)/2.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneInnerWeb_Box1" X_Y_Z="-(AECT_KSlPwi_KeyStonelowPhiwid - AECT_KSlthi_KeyStonelowthick)/2.; (AECT_KSlthi_KeyStonelowthick + AECT_KSlRwi_KeyStonelowRwidth)/2.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneInnerWeb_Box2" X_Y_Z=" 0.; AECT_KSlthi_KeyStonelowthick/2.; 0" />
+ <posXYZ volume="ECT_CM_KeyStoneFootPlate" X_Y_Z=" (AECT_KSthic_KeyStonethickness*(GENV_Co225 - 2.*GENV_Si225) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Si225 + AECT_KStPwi_KeyStonetopPhiwid)/2. - GENV_Si225*AECT_KSFPRo_KeyStoneFootPROff; (AECT_KSthic_KeyStonethickness*(-GENV_Si225 - 2) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Co225)/2. + AECT_KStRwi_KeyStonetotRwidth - GENV_Co225*AECT_KSFPRo_KeyStoneFootPROff; 0" rot=" 0.; 0.; -22.5 "/>
+ <posXYZ volume="ECT_CM_KeyStoneFootPlate" X_Y_Z="-(AECT_KSthic_KeyStonethickness*(GENV_Co225 - 2.*GENV_Si225) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Si225 + AECT_KStPwi_KeyStonetopPhiwid)/2. + GENV_Si225*AECT_KSFPRo_KeyStoneFootPROff; (AECT_KSthic_KeyStonethickness*(-GENV_Si225 - 2) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Co225)/2. + AECT_KStRwi_KeyStonetotRwidth - GENV_Co225*AECT_KSFPRo_KeyStoneFootPROff; 0" rot=" 0.; 0.; 22.5 "/>
+</composition>
+
+<var name="AECT_KSRahi_KeyStoneradihight" value="2.*GENV_Si225*(AECT_KSBRwi_KeyStoneBoxRwidth-AECT_KSFPRo_KeyStoneFootPROff-AECT_KSthic_KeyStonethickness)+2.*GENV_Co225*AECT_KSthic_KeyStonethickness+AECT_KStPwi_KeyStonetopPhiwid" />
+<var name="AECT_KSRpwi_KeyStonephiwidth" value="AECT_KStRwi_KeyStonetotRwidth + GENV_Co225*(AECT_KSBRwi_KeyStoneBoxRwidth - AECT_KSFPRo_KeyStoneFootPROff) - AECT_KSthic_KeyStonethickness "/>
+
+<composition name="ECT_ColdMass" >
+ <posXYZ volume="ECT_CM_ConductorFrame" X_Y_Z=" 0.; AECT_CMgodi_ColdMassgloboutdi/2. - AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="ECT_CM_ConductorInnerWeb" X_Y_Z=" 0.; AECT_CMgira_ColdMassglobinrad; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="ECT_CM_KeyStone" X_Y_Z=" -AECT_CMgira_ColdMassglobinrad*GENV_Si225; AECT_CMgira_ColdMassglobinrad*GENV_Co225; 0." rot=" 0.; 0.; 22.5"/>
+</composition>
+
+<!-- thermal radiation shielding - Coil Cover - atlteyr_0288-v0 and atlteyr_0289-v0 -->
+<var name="AECT_CCZwid_CoilCoverZwidth" value=" 348. "/>
+<var name="AECT_CCPwid_CoilCoverPhiwidth" value=" 700. "/>
+<var name="AECT_CCfRwi_CoilCoverfullRwid" value=" 3601. "/>
+<var name="AECT_CCthic_CoilCoverthicknes" value=" 10. "/>
+<var name="AECT_CCRaof_CoilCoverRadoff" value=" 52. "/>
+
+<trd name="ECT_CC_CoilCoverSide" material="Aluminium" Xmp_Ymp_Z="AECT_CCfRwi_CoilCoverfullRwid-AECT_CCRaof_CoilCoverRadoff+2.*(AECT_CCthic_CoilCoverthicknes/GENV_Si45 + AECT_CCthic_CoilCoverthicknes); AECT_CCfRwi_CoilCoverfullRwid-AECT_CCRaof_CoilCoverRadoff - 2.*(AECT_CCZwid_CoilCoverZwidth-AECT_CCthic_CoilCoverthicknes/GENV_Si45); AECT_CCthic_CoilCoverthicknes; AECT_CCthic_CoilCoverthicknes; AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes"/>
+
+<gvxysx name="ECT_CC_CoilCoverTop" material="Aluminium" dZ="AECT_CCPwid_CoilCoverPhiwidth">
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes/GENV_Si45 ; AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes "/>
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. + AECT_CCthic_CoilCoverthicknes/GENV_Si45 + AECT_CCthic_CoilCoverthicknes; 0"/>
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. + AECT_CCthic_CoilCoverthicknes ; 0"/>
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCZwid_CoilCoverZwidth - AECT_CCthic_CoilCoverthicknes*GENV_Ta225 + AECT_CCthic_CoilCoverthicknes/GENV_Si45; AECT_CCZwid_CoilCoverZwidth - AECT_CCthic_CoilCoverthicknes + AECT_CCthic_CoilCoverthicknes"/>
+</gvxysx>
+
+<!-- thermal radiation shielding - EndPlate - atlteyr_0068-v0, atlteyr_0077-v0, atlteyr_0078-v0 and atlteyr_0110-v0 -->
+<var name="AECT_EPthic_EndPlatethickness" value=" 20. "/>
+<var name="AECT_EPHoPo_EndPlateHolepos" value=" 1720. "/>
+<var name="AECT_EPHoDi_EndPlateHolediame" value=" 830. "/>
+<var name="AECT_EPfuhi_EndPlatefullhight" value=" 3467. "/>
+<var name="AECT_EPmihi_EndPlateminihight" value=" 2740. "/>
+<var name="AECT_EPfuwi_EndPlatefullwidth" value=" 1959. "/>
+<var name="AECT_EPmiwi_EndPlatemidwidth" value=" 1200.5 "/>
+<var name="AECT_EPhiwi_EndPlatehighwidth" value=" 775. "/>
+<var name="AECT_EPlowi_EndPlatelowwidth" value=" 182. "/>
+<var name="AECT_EPEfuw_EndPlateExtfullwi" value=" 530. "/>
+<var name="AECT_EPEmiw_EndPlateExtminiwi" value=" 275. "/>
+<var name="AECT_EPEhig_EndPlateExthight" value=" 240. "/>
+<var name="AECT_EPBBhi_EndPlateBackBoxwi" value=" 1230. "/>
+<var name="AECT_EPBBwi_EndPlateBackBoxhi" value=" 145. "/>
+<var name="AECT_EPFBhi_EndPlateFrontBoxw" value=" 410. "/>
+<var name="AECT_EPFBwi_EndPlateFrontBoxh" value=" 125. "/>
+
+<!-- derived variable to get second last point via cot(22.5)*(x-a)= -tan(22.5)*(x-b) + c -->
+<var name="AECT_EPAuVX_EndPlateAuxVarX" value="GENV_Co225*GENV_Si225*(AECT_EPfuhi_EndPlatefullhight-GENV_Si225*AECT_EPEmiw_EndPlateExtminiwi-(AECT_EPEhig_EndPlateExthight)*GENV_Co225)+GENV_Co225*GENV_Co225* AECT_EPlowi_EndPlatelowwidth+GENV_Si225*GENV_Si225*(AECT_EPfuwi_EndPlatefullwidth-(AECT_EPEhig_EndPlateExthight)*GENV_Si225) "/>
+
+<gvxysx name="ECT_EP_EndPlate_basic" material="Aluminium" dZ="AECT_EPthic_EndPlatethickness">
+ <gvxy_point X_Y=" AECT_EPhiwi_EndPlatehighwidth; AECT_EPmihi_EndPlateminihight "/>
+ <gvxy_point X_Y=" AECT_EPmiwi_EndPlatemidwidth; AECT_EPmihi_EndPlateminihight + (AECT_EPmiwi_EndPlatemidwidth - AECT_EPhiwi_EndPlatehighwidth)*GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth - AECT_EPEfuw_EndPlateExtfullwi/GENV_Co225; AECT_EPmihi_EndPlateminihight + (AECT_EPmiwi_EndPlatemidwidth - AECT_EPhiwi_EndPlatehighwidth)*GENV_Ta225 + (AECT_EPfuwi_EndPlatefullwidth - AECT_EPmiwi_EndPlatemidwidth - AECT_EPEfuw_EndPlateExtfullwi/GENV_Co225)/GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth - AECT_EPEmiw_EndPlateExtminiwi*GENV_Co225; AECT_EPfuhi_EndPlatefullhight "/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth; AECT_EPfuhi_EndPlatefullhight - AECT_EPEmiw_EndPlateExtminiwi*GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth - (AECT_EPEhig_EndPlateExthight )*GENV_Si225; AECT_EPfuhi_EndPlatefullhight - AECT_EPEmiw_EndPlateExtminiwi*GENV_Si225 - (AECT_EPEhig_EndPlateExthight )*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EPAuVX_EndPlateAuxVarX; (AECT_EPAuVX_EndPlateAuxVarX-AECT_EPlowi_EndPlatelowwidth)/GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_EPlowi_EndPlatelowwidth; 0. "/>
+</gvxysx>
+
+<box name="ECT_EP_EndPlate_BackBox" material="Aluminium" X_Y_Z="AECT_EPBBhi_EndPlateBackBoxwi; 2.*AECT_EPBBwi_EndPlateBackBoxhi; 2.*AECT_EPthic_EndPlatethickness" />
+<box name="ECT_EP_EndPlate_FrontBox" material="Aluminium" X_Y_Z="AECT_EPFBhi_EndPlateFrontBoxw; 2.*AECT_EPFBwi_EndPlateFrontBoxh; 2.*AECT_EPthic_EndPlatethickness" />
+<tubs name="ECT_EP_EndPlate_Hole" material="Aluminium" Rio_Z="0.; AECT_EPHoDi_EndPlateHolediame/2.; 2.*AECT_EPthic_EndPlatethickness" nbPhi="20" />
+
+<subtraction name="ECT_EP_EndPlate_front" >
+ <posXYZ volume="ECT_EP_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_Hole" X_Y_Z=" 0.; AECT_EPHoPo_EndPlateHolepos; 0." />
+</subtraction>
+
+<subtraction name="ECT_EP_EndPlate_back" >
+ <posXYZ volume="ECT_EP_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_Hole" X_Y_Z=" 0.; AECT_EPHoPo_EndPlateHolepos; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_BackBox" X_Y_Z=" 0.; AECT_EPmihi_EndPlateminihight; 0." />
+</subtraction>
+
+<subtraction name="ECT_EP_EndPlate_special" >
+ <posXYZ volume="ECT_EP_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_Hole" X_Y_Z=" 0.; AECT_EPHoPo_EndPlateHolepos; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_FrontBox" X_Y_Z=" 0.; AECT_EPmihi_EndPlateminihight; 0." />
+</subtraction>
+
+<!-- thermal radiation shielding - Shell - atlteyr_0280-v0 and atlteyr_0070-v0 -->
+<var name="AECT_OSCCZd_ShellCCZdimension" value=" 3940. "/>
+<var name="AECT_OSCCRw_ShellCCRadwidth" value=" 400. "/>
+<var name="AECT_OSCCmw_ShellCCminiwidth" value=" 372. "/>
+<var name="AECT_OSCCmw_ShellCCedgelength" value=" 451. "/>
+<var name="AECT_OSCCth_ShellCCthickness" value=" 10. "/>
+
+<var name="AECT_OSCCmw_ShellCClongwidth" value=" 423. "/>
+<var name="AECT_OSCCmw_ShellCCshortwidth" value=" 107. "/>
+<var name="AECT_OSCCtc_ShellCCthickconn" value=" 20. "/>
+
+<var name="AECT_OSCCOv_ShellCCoverlap" value=" 60. "/>
+
+<var name="AECT_OSJPiw_ShellJPinnerwidth" value=" 1912. "/>
+<var name="AECT_OSJPew_ShellJPedgewidth" value=" 238. "/>
+<var name="AECT_OSJPtc_ShellJPZlength" value=" 2815. "/>
+<var name="AECT_OSAFBt_ShellAFBthickness" value=" 15. "/>
+<var name="AECT_OSAFBh_ShellAFBhight" value=" 215. "/>
+<var name="AECT_OSFSBh_ShellFSBhight" value=" 190. "/>
+
+<var name="AECT_STaidi_StayTubeAlignindi" value=" 910. "/>
+<var name="AECT_STaodi_StayTubeAlignoutd" value=" 930. "/>
+<var name="AECT_STaflt_StayTubeAlignFlth" value=" 20. "/>
+
+<gvxysx name="ECT_TS_ShellCoilCover" material="Aluminium" dZ="AECT_OSCCZd_ShellCCZdimension">
+ <gvxy_point X_Y=" - AECT_OSCCmw_ShellCCminiwidth/2. ; AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCOv_ShellCCoverlap - AECT_OSCCth_ShellCCthickness"/>
+ <gvxy_point X_Y=" - (AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCOv_ShellCCoverlap - AECT_OSCCmw_ShellCCedgelength*GENV_Si45"/>
+ <gvxy_point X_Y=" - (AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth - AECT_OSCCOv_ShellCCoverlap"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth - AECT_OSCCOv_ShellCCoverlap"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 - AECT_OSCCtc_ShellCCthickconn*GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.) ; 0 "/>
+ <gvxy_point X_Y=" - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.) ; AECT_OSCCtc_ShellCCthickconn*GENV_Si45 "/>
+ <gvxy_point X_Y=" - (AECT_OSCCtc_ShellCCthickconn + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45"/>
+ <gvxy_point X_Y=" - (AECT_OSCCtc_ShellCCthickconn + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCth_ShellCCthickness*(GENV_Ta225-1)- AECT_OSCCmw_ShellCCedgelength*GENV_Si45 - AECT_OSCCOv_ShellCCoverlap"/>
+ <gvxy_point X_Y=" - AECT_OSCCth_ShellCCthickness*GENV_Ta225 - AECT_OSCCmw_ShellCCminiwidth/2.; AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCOv_ShellCCoverlap"/>
+</gvxysx>
+
+<gvxysx name="ECT_TS_JointPlate" material="Aluminium" dZ="AECT_OSJPtc_ShellJPZlength">
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSCCtc_ShellCCthickconn*tan(11.25*GENV_PiS180) ; -(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225+AECT_OSCCtc_ShellCCthickconn*GENV_Si225 ; AECT_OSCCtc_ShellCCthickconn*(1-GENV_Co225)+AECT_OSJPew_ShellJPedgewidth*GENV_Si225-(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225 ; AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225-(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.; AECT_OSCCtc_ShellCCthickconn-(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+</gvxysx>
+
+<gvxysx name="ECT_TS_AxialForceBox" material="Aluminium" dZ="AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength">
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.+AECT_OSAFBt_ShellAFBthickness ; -(AECT_OSAFBh_ShellAFBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.+AECT_OSAFBt_ShellAFBthickness ; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSAFBt_ShellAFBthickness-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSAFBt_ShellAFBthickness*tan(11.25*GENV_PiS180) ; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSAFBt_ShellAFBthickness-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225+AECT_OSAFBt_ShellAFBthickness*GENV_Si225 ; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSAFBt_ShellAFBthickness*GENV_Co225+AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225 ; (AECT_OSAFBh_ShellAFBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.; AECT_OSAFBt_ShellAFBthickness-(AECT_OSAFBh_ShellAFBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+</gvxysx>
+
+<gvxysx name="ECT_TS_FrontSpecialBox" material="Aluminium" dZ="AECT_OSJPtc_ShellJPZlength">
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.+AECT_OSCCtc_ShellCCthickconn ; -(AECT_OSFSBh_ShellFSBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.+AECT_OSCCtc_ShellCCthickconn ; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSCCtc_ShellCCthickconn-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSCCtc_ShellCCthickconn*tan(11.25*GENV_PiS180) ; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSCCtc_ShellCCthickconn-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225+AECT_OSCCtc_ShellCCthickconn*GENV_Si225 ; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSCCtc_ShellCCthickconn*GENV_Co225+AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225 ; (AECT_OSFSBh_ShellFSBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.; AECT_OSCCtc_ShellCCthickconn-(AECT_OSFSBh_ShellFSBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+</gvxysx>
+
+<tubs name="ECT_ST_StayTube_Tube" material="Aluminium" Rio_Z="AECT_STaidi_StayTubeAlignindi/2.; AECT_STaodi_StayTubeAlignoutd/2.; AECT_OSCCZd_ShellCCZdimension" nbPhi="20" />
+<tubs name="ECT_ST_StayTube_Flange" material="Aluminium" Rio_Z="AECT_EPHoDi_EndPlateHolediame/2.; AECT_STaodi_StayTubeAlignoutd/2.; AECT_STaflt_StayTubeAlignFlth" nbPhi="20" />
+
+<var name="AECT_SCCXwi_ShellCCfullXwidth" value="(AECT_OSJPiw_ShellJPinnerwidth/2. + AECT_OSJPew_ShellJPedgewidth*GENV_Co225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225)" />
+<var name="AECT_SCCYwi_ShellCCfullYwidth" value="(AECT_OSCCtc_ShellCCthickconn + AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2." />
+<var name="AECT_SAFBXw_ShellAFBfullXwidt" value="(AECT_OSJPiw_ShellJPinnerwidth/2. + AECT_OSJPew_ShellJPedgewidth*GENV_Co225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225)" />
+<var name="AECT_SAFBYw_ShellAFBfullYwidt" value="(AECT_OSAFBh_ShellAFBhight + AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2." />
+<var name="AECT_SFSBYw_ShellFSBfullYwidt" value="(AECT_OSFSBh_ShellFSBhight + AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2." />
+
+<!-- Radius for ThermalRadiationShield Endplate (TRSEPr) and Shell (TRSShr), last term is responsible for the gap in between -> needed safety factor -> see also the photos -->
+<var name="AECT_TRSEPr_EndplateRadPos" value="AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 - (AECT_EPfuhi_EndPlatefullhight - AECT_EPEmiw_EndPlateExtminiwi*GENV_Si225)/GENV_Co225 - AECT_EPlowi_EndPlatelowwidth*GENV_Si225 - (AECT_EPfuwi_EndPlatefullwidth - AECT_EPAuVX_EndPlateAuxVarX - (AECT_EPEhig_EndPlateExthight)*GENV_Si225)*GENV_Ta225/GENV_Co225 + AECT_EPthic_EndPlatethickness*1.5" />
+<var name="AECT_CCSPYp_CoilCoverSideYpos" value="AECT_EPfuwi_EndPlatefullwidth/GENV_Si225+AECT_EPthic_EndPlatethickness*1.5-AECT_EPEhig_EndPlateExthight-(AECT_CCfRwi_CoilCoverfullRwid-AECT_CCRaof_CoilCoverRadoff)/2.-AECT_CCthic_CoilCoverthicknes/GENV_Si45-AECT_CCthic_CoilCoverthicknes" />
+<var name="AECT_TRSShr_ShellRadPos" value="(-(AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.)))/GENV_Ta225 + (AECT_OSJPiw_ShellJPinnerwidth/2.) * (GENV_Si225+GENV_Co225/GENV_Ta225) + ((AECT_OSJPew_ShellJPedgewidth-AECT_OSCCOv_ShellCCoverlap)*GENV_Co45 )*(1+1/GENV_Ta225)" />
+<var name="AECT_SCCXpo_ShellCCXpos" value=" - AECT_SCCXwi_ShellCCfullXwidth*GENV_Co225 + AECT_SCCYwi_ShellCCfullYwidth*GENV_Si225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Co225 + (AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.))+AECT_OSCCOv_ShellCCoverlap*GENV_Si45" />
+<var name="AECT_SFSBXp_ShellFSBXpos" value=" - AECT_SCCXwi_ShellCCfullXwidth*GENV_Co225 + AECT_SFSBYw_ShellFSBfullYwidt*GENV_Si225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Co225 + (AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.))+AECT_OSCCOv_ShellCCoverlap*GENV_Si45" />
+<var name="AECT_SAFBXp_ShellAFBXpos" value=" - AECT_SAFBXw_ShellAFBfullXwidt*GENV_Co225 + AECT_SAFBYw_ShellAFBfullYwidt*GENV_Si225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225*GENV_Co225 + (AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.))+AECT_OSCCOv_ShellCCoverlap*GENV_Si45" />
+
+<composition name="ECT_TS_ThermalShield_default_tmp" >
+ <posXYZ volume="ECT_EP_EndPlate_front" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; AECT_OSCCZd_ShellCCZdimension/2. + 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_EP_EndPlate_back" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; -AECT_OSCCZd_ShellCCZdimension/2. - 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; AECT_OSCCZd_ShellCCZdimension/2. + 2.25*AECT_EPthic_EndPlatethickness + GENV_Eps" rot=" 90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; -AECT_OSCCZd_ShellCCZdimension/2. - 2.25*AECT_EPthic_EndPlatethickness - GENV_Eps" rot=" -90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_TS_ShellCoilCover" X_Y_Z=" 0.; AECT_TRSShr_ShellRadPos + GENV_Eps; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_TS_JointPlate" X_Y_Z=" AECT_SCCXpo_ShellCCXpos; -AECT_SCCXwi_ShellCCfullXwidth*GENV_Si225 - AECT_SCCYwi_ShellCCfullYwidth*GENV_Co225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45 ; (AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength)/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_TS_AxialForceBox" X_Y_Z=" AECT_SAFBXp_ShellAFBXpos + GENV_Eps; -AECT_SAFBXw_ShellAFBfullXwidt*GENV_Si225 - AECT_SAFBYw_ShellAFBfullYwidt*GENV_Co225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45 ; -(AECT_OSCCZd_ShellCCZdimension-(AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength))/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Tube" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; AECT_OSCCZd_ShellCCZdimension/2.+AECT_STaflt_StayTubeAlignFlth/2. + GENV_Eps" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225;-AECT_OSCCZd_ShellCCZdimension/2.-AECT_STaflt_StayTubeAlignFlth/2. - GENV_Eps" rot=" 0.; 0.; 22.5" />
+</composition>
+
+<composition name="ECT_TS_ThermalShield_default" >
+ <posXYZ volume="ECT_TS_ThermalShield_default_tmp" rot=" 0.; 0.; -90." />
+</composition>
+
+<composition name="ECT_TS_ThermalShield_special" >
+ <posXYZ volume="ECT_EP_EndPlate_special" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; AECT_OSCCZd_ShellCCZdimension/2. + 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_EP_EndPlate_back" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; -AECT_OSCCZd_ShellCCZdimension/2. - 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; AECT_OSCCZd_ShellCCZdimension/2. + 2.25*AECT_EPthic_EndPlatethickness + GENV_Eps" rot=" 90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; -AECT_OSCCZd_ShellCCZdimension/2. - 2.25*AECT_EPthic_EndPlatethickness - GENV_Eps" rot=" -90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_TS_ShellCoilCover" X_Y_Z=" 0.; AECT_TRSShr_ShellRadPos + GENV_Eps; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_TS_FrontSpecialBox" X_Y_Z=" AECT_SFSBXp_ShellFSBXpos; -AECT_SCCXwi_ShellCCfullXwidth*GENV_Si225 - AECT_SFSBYw_ShellFSBfullYwidt*GENV_Co225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45; (AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength)/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_TS_AxialForceBox" X_Y_Z=" AECT_SAFBXp_ShellAFBXpos + GENV_Eps; -AECT_SAFBXw_ShellAFBfullXwidt*GENV_Si225 - AECT_SAFBYw_ShellAFBfullYwidt*GENV_Co225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45 ; -(AECT_OSCCZd_ShellCCZdimension-(AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength))/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Tube" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; AECT_OSCCZd_ShellCCZdimension/2.+AECT_STaflt_StayTubeAlignFlth/2. + GENV_Eps" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225;-AECT_OSCCZd_ShellCCZdimension/2.-AECT_STaflt_StayTubeAlignFlth/2. - GENV_Eps" rot=" 0.; 0.; 22.5" />
+</composition>
+
+<!-- main envelope surrounding coldmass and thermal shield - atlteyv_0012, atlteyv_0014, atlteyv_0015, atlteyv_0025, atlteyv_0027 and atlteyv_0076 -->
+<var name="AECT_EVEPRI_EVEndPlateRadiInne" value=" 670. "/>
+<var name="AECT_EVEPRT_EVEndPlateRadiTurr" value=" 930. "/>
+<var name="AECT_EVEPth_EVEndPlatethicknes" value=" 75. "/>
+<var name="AECT_EVEPid_EVEndPlateindist" value=" 4320. "/>
+<var name="AECT_EVEPod_EVEndPlateoutdist" value=" 5345. "/>
+<var name="AECT_EVEPli_EVEndPlatelowinter" value=" 1212. "/>
+<var name="AECT_EVEPui_EVEndPlateupinter" value=" 1238. "/>
+<var name="AECT_EVEPHd_EVEndPlateHolediam" value=" 160. "/>
+<var name="AECT_EVEPHr_EVEndPlateHolerad" value=" 3100. "/>
+<var name="AECT_EVEPHa_EVEndPlateHoleang" value=" 3.6 "/>
+<var name="AECT_EVEPSl_EVEndPlatespeclen" value=" 303. "/>
+<var name="AECT_EVEPSa_EVEndPlatespecang" value=" 127.5 "/>
+<var name="AECT_EVEPSr_EVEndPlatespecrad" value=" 3985. "/>
+
+<var name="AECT_EVAFod_EVAlignFlangeoutdi" value=" 450. "/>
+<var name="AECT_EVAFzw_EVAlignFlangezwidt" value=" 70. "/>
+<var name="AECT_EVATid_EVAlignTubeinndiam" value=" 262. "/>
+<var name="AECT_EVATww_EVAlignTuberwallwi" value=" 20. "/>
+
+<var name="AECT_EVOShZ_EVOutShellholeZwid" value=" 4800. "/>
+
+<var name="AECT_EVOSio_EVOutShellinneroff" value=" 15. "/>
+<var name="AECT_EVOSso_EVOutShellspecioff" value=" 50. "/>
+<var name="AECT_EVOSit_EVOutShellinnthick" value=" 40. "/>
+<var name="AECT_EVOSCZ_EVOutShellConnZwid" value=" 120. "/>
+
+<var name="AECT_EVOSCR_EVOutShellConnlowR" value=" 140. "/>
+<var name="AECT_EVOSCR_EVOutShellConnbigR" value=" 220. "/>
+<var name="AECT_EVOSCR_EVOutShellConnspeR" value=" 360. "/>
+
+<var name="AECT_EVSSAh_EVSideSupporthight" value=" 225. "/>
+<var name="AECT_EVSSAw_EVSideSupportwidth" value=" 250. "/>
+<var name="AECT_EVTSAh_EVTopSupporthight" value=" 150. "/>
+<var name="AECT_EVTSRa_EVTopSupportRadius" value=" 1230. "/>
+<var name="AECT_EVTSAl_EVTopSupportlength" value=" 2913. "/>
+<var name="AECT_EVTSCo_EVTopSupportCutoff" value=" 95. "/>
+<var name="AECT_EVTSCw_EVTopSupportCutwid" value=" 103. "/>
+
+<var name="AECT_EVSSan_EVSideSupportangle" value="atan((AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225 - AECT_EVEPid_EVEndPlateindist)/(AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPli_EVEndPlatelowinter/2. - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225 ))"/>
+<var name="AECT_EVEPSt_EVEndPlatespectana" value="tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)"/>
+
+<tubs name="ECT_EV_InnerTube" material="Aluminium" Rio_Z="0.; AECT_EVEPRI_EVEndPlateRadiInne; 2.*AECT_EVEPth_EVEndPlatethicknes" nbPhi="20" />
+<tubs name="ECT_EV_TurretTube" material="Aluminium" Rio_Z="0.; AECT_EVEPRT_EVEndPlateRadiTurr; 2.*AECT_EVEPth_EVEndPlatethicknes" nbPhi="20" />
+<tubs name="ECT_EV_AlignHole" material="Aluminium" Rio_Z="0.; AECT_EVEPHd_EVEndPlateHolediam/2.; 2.*AECT_EVEPth_EVEndPlatethicknes" nbPhi="20" />
+
+<gvxy name="ECT_EV_EndPlate_basic" material="Aluminium" dZ="AECT_EVEPth_EVEndPlatethicknes">
+ <gvxy_point X_Y=" 0. ; 0. "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+</gvxy>
+
+<var name="AECT_EVEPpx_EVEndPlateS_Point6_X" value="(AECT_EVEPid_EVEndPlateindist+(1./AECT_EVEPSt_EVEndPlatespectana)*(-AECT_EVEPli_EVEndPlatelowinter/2.)-(AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225)-GENV_Ta225*(-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225))/(1./AECT_EVEPSt_EVEndPlatespectana-GENV_Ta225)"/>
+<var name="AECT_EVEPpy_EVEndPlateS_Point6_Y" value="(-AECT_EVEPpx_EVEndPlateS_Point6_X+(-AECT_EVEPli_EVEndPlatelowinter/2.))/AECT_EVEPSt_EVEndPlatespectana+AECT_EVEPid_EVEndPlateindist"/>
+
+<gvxy name="ECT_EV_EndPlate_special" material="Aluminium" dZ="AECT_EVEPth_EVEndPlatethicknes">
+ <gvxy_point X_Y=" 0. ; 0. "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y=" AECT_EVEPpx_EVEndPlateS_Point6_X; AECT_EVEPpy_EVEndPlateS_Point6_Y"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 "/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+</gvxy>
+
+<subtraction name="ECT_EV_EndPlate_Inner_default" >
+ <posXYZ volume="ECT_EV_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_InnerTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Turret_default" >
+ <posXYZ volume="ECT_EV_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_TurretTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Inner_special_Sector6" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="ECT_EV_InnerTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Turret_special_Sector6" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="ECT_EV_TurretTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Inner_special_Sector7" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_InnerTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Turret_special_Sector7" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_TurretTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<var name="AECT_EVOSfo_EVOutShellfulloff" value="AECT_EVOSio_EVOutShellinneroff + AECT_EVOSit_EVOutShellinnthick"/>
+<var name="AECT_EVOSpx_OutShell_Point2_X" value="((AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)/GENV_Co225 + tan(AECT_EVSSan_EVSideSupportangle)*(AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.))- (AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff))/(tan(AECT_EVSSan_EVSideSupportangle) + GENV_Ta225)"/>
+<var name="AECT_EVOSpx_OutShell_Point5_X" value="((AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)/GENV_Co225 + tan(AECT_EVSSan_EVSideSupportangle)*(AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.))- (AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/(tan(AECT_EVSSan_EVSideSupportangle) + GENV_Ta225)"/>
+
+<gvxysx name="ECT_EV_OutShell_default" material="Aluminium" dZ="AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point2_X; (AECT_EVOSpx_OutShell_Point2_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Co225"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point5_X; (AECT_EVOSpx_OutShell_Point5_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+</gvxysx>
+
+<var name="AECT_EVOSpx_OutShellS_Point7_X" value="-AECT_EVEPli_EVEndPlatelowinter/2. - AECT_EVOSio_EVOutShellinneroff*(1./cos((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180) - tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))"/>
+<var name="AECT_EVOSpy_OutShellS_Point7_Y" value="AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+<var name="AECT_EVOSpx_OutShellS_Point9_X" value="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 - (AECT_EVOSso_EVOutShellspecioff-AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Si225)"/>
+<var name="AECT_EVOSpy_OutShellS_Point9_Y" value="AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 - (AECT_EVOSso_EVOutShellspecioff+AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Co225)"/>
+
+<var name="AECT_EVOSpx_OutShellS_Point8_X" value="(AECT_EVOSpy_OutShellS_Point7_Y + (1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))*AECT_EVOSpx_OutShellS_Point7_X - GENV_Ta225*AECT_EVOSpx_OutShellS_Point9_X - AECT_EVOSpy_OutShellS_Point9_Y )/((1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)) - GENV_Ta225)"/>
+
+<var name="AECT_EVOSpx_OutShellS_Point12_X" value="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 - (AECT_EVOSso_EVOutShellspecioff-AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Si225)"/>
+<var name="AECT_EVOSpy_OutShellS_Point12_Y" value="AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 - (AECT_EVOSso_EVOutShellspecioff+AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Co225) - AECT_EVOSit_EVOutShellinnthick/GENV_Co225"/>
+<var name="AECT_EVOSpx_OutShellS_Point14_X" value="-AECT_EVEPli_EVEndPlatelowinter/2. - (AECT_EVOSio_EVOutShellinneroff + AECT_EVOSit_EVOutShellinnthick)*(1./cos((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180) - tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))"/>
+<var name="AECT_EVOSpy_OutShellS_Point14_Y" value="AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff - AECT_EVOSit_EVOutShellinnthick"/>
+
+<var name="AECT_EVOSpx_OutShellS_Point13_X" value="(AECT_EVOSpy_OutShellS_Point14_Y + (1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))*AECT_EVOSpx_OutShellS_Point14_X - GENV_Ta225*AECT_EVOSpx_OutShellS_Point12_X - AECT_EVOSpy_OutShellS_Point12_Y )/((1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)) - GENV_Ta225)"/>
+
+<gvxy name="ECT_EV_OutShell_special" material="Aluminium" dZ="AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point2_X; (AECT_EVOSpx_OutShell_Point2_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Co225"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point5_X; (AECT_EVOSpx_OutShell_Point5_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point7_X ; AECT_EVOSpy_OutShellS_Point7_Y"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point8_X ; AECT_EVOSpy_OutShellS_Point7_Y - tan((180.-AECT_EVEPSa_EVEndPlatespecang)*GENV_PiS180)*(AECT_EVOSpx_OutShellS_Point8_X - AECT_EVOSpx_OutShellS_Point7_X)"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point9_X ; AECT_EVOSpy_OutShellS_Point9_Y"/>
+ <gvxy_point X_Y=" -(AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Co225"/>
+ <gvxy_point X_Y=" -(AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point12_X ; AECT_EVOSpy_OutShellS_Point12_Y"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point13_X; AECT_EVOSpy_OutShellS_Point14_Y - tan((180-AECT_EVEPSa_EVEndPlatespecang)*GENV_PiS180)*(AECT_EVOSpx_OutShellS_Point13_X - AECT_EVOSpx_OutShellS_Point14_X)"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point14_X ; AECT_EVOSpy_OutShellS_Point14_Y"/>
+</gvxy>
+
+<!-- introduced becaused used for calculation-->
+<var name="AECT_EVOSpx_OutConnector_Point6_X" value="AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSCR_EVOutShellConnbigR*sin(AECT_EVSSan_EVSideSupportangle) - (AECT_EVOSCR_EVOutShellConnlowR - AECT_EVOSCR_EVOutShellConnbigR*cos(AECT_EVSSan_EVSideSupportangle))/tan(AECT_EVSSan_EVSideSupportangle)"/>
+<!-- derived variable for fifth point via the formula tan(suppangle)*(x-point6_x)+point6_y = -tan(22.5)*(x-point4_x)+point4_y for x coordinate, y simple trigonometry -->
+<var name="AECT_EVOSpx_OutConnector_Point5_X" value="((AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVOSCR_EVOutShellConnlowR*GENV_Si225)*GENV_Ta225+tan(AECT_EVSSan_EVSideSupportangle)*AECT_EVOSpx_OutConnector_Point6_X+(AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 - AECT_EVOSCR_EVOutShellConnlowR*GENV_Co225) - (AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR))/(GENV_Ta225+tan(AECT_EVSSan_EVSideSupportangle))"/>
+
+<gvxysx name="ECT_EV_OutShellConnector_default" material="Aluminium" dZ="AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Si225 ; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnector_Point5_X ; (AECT_EVOSpx_OutConnector_Point5_X-AECT_EVOSpx_OutConnector_Point6_X)*tan(AECT_EVSSan_EVSideSupportangle)+AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSCR_EVOutShellConnbigR*sin(AECT_EVSSan_EVSideSupportangle) - (AECT_EVOSCR_EVOutShellConnlowR - AECT_EVOSCR_EVOutShellConnbigR*cos(AECT_EVSSan_EVSideSupportangle))/tan(AECT_EVSSan_EVSideSupportangle); AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+</gvxysx>
+
+<var name="AECT_EVOSpx_OutConnectorS_Point14_X" value="-AECT_EVEPli_EVEndPlatelowinter/2. - AECT_EVOSCR_EVOutShellConnspeR*(1./cos((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)) + AECT_EVOSCR_EVOutShellConnlowR*AECT_EVEPSt_EVEndPlatespectana"/>
+<var name="AECT_EVOSpx_OutConnectorS_Point13_X" value="(AECT_EVEPid_EVEndPlateindist-AECT_EVOSCR_EVOutShellConnlowR+(1./AECT_EVEPSt_EVEndPlatespectana)*AECT_EVOSpx_OutConnectorS_Point14_X+GENV_Ta225*(AECT_EVEPod_EVEndPlateoutdist*GENV_Si225-AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225)-AECT_EVEPod_EVEndPlateoutdist*GENV_Co225-AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225+AECT_EVOSCR_EVOutShellConnlowR/GENV_Co225)/(1./AECT_EVEPSt_EVEndPlatespectana-GENV_Ta225)"/>
+
+<gvxy name="ECT_EV_OutShellConnector_special" material="Aluminium" dZ="AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSCR_EVOutShellConnbigR*sin(AECT_EVSSan_EVSideSupportangle) - (AECT_EVOSCR_EVOutShellConnlowR - AECT_EVOSCR_EVOutShellConnbigR*cos(AECT_EVSSan_EVSideSupportangle))/tan(AECT_EVSSan_EVSideSupportangle); AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnector_Point5_X ; (AECT_EVOSpx_OutConnector_Point5_X-AECT_EVOSpx_OutConnector_Point6_X)*tan(AECT_EVSSan_EVSideSupportangle)+AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Si225 ; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y=" AECT_EVEPpx_EVEndPlateS_Point6_X; AECT_EVEPpy_EVEndPlateS_Point6_Y"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 "/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+ <gvxy_point X_Y="(-AECT_EVEPod_EVEndPlateoutdist+AECT_EVOSCR_EVOutShellConnlowR)*GENV_Si225 ; (AECT_EVEPod_EVEndPlateoutdist-AECT_EVOSCR_EVOutShellConnlowR)*GENV_Co225 "/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 - AECT_EVOSCR_EVOutShellConnlowR/GENV_Co225 "/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnectorS_Point13_X; AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR - tan((180.-AECT_EVEPSa_EVEndPlatespecang)*GENV_PiS180)*(AECT_EVOSpx_OutConnectorS_Point13_X - AECT_EVOSpx_OutConnectorS_Point14_X)"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnectorS_Point14_X; AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+</gvxy>
+
+<composition name="ECT_EV_Envelop_default" >
+ <posXYZ volume="ECT_EV_EndPlate_Inner_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVEPth_EVEndPlatethicknes/2. + GENV_Eps" rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_EndPlate_Turret_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVEPth_EVEndPlatethicknes/2. - GENV_Eps" rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_OutShell_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; 0." rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVOSCZ_EVOutShellConnZwid/2. + GENV_Eps/2." rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid/2. - GENV_Eps/2." rot=" 0.; 0.; -67.5"/>
+</composition>
+
+<composition name="ECT_EV_Envelop_special_Sector6" >
+ <posXYZ volume="ECT_EV_EndPlate_Inner_special_Sector6" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVEPth_EVEndPlatethicknes/2. + GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_EndPlate_Turret_special_Sector6" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVEPth_EVEndPlatethicknes/2. - GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShell_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; 0." rot=" 0.; 180.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVOSCZ_EVOutShellConnZwid/2. + GENV_Eps/2." rot=" 0.; 180.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid/2. - GENV_Eps/2." rot=" 0.; 180.; 22.5"/>
+</composition>
+
+<composition name="ECT_EV_Envelop_special_Sector7" >
+ <posXYZ volume="ECT_EV_EndPlate_Inner_special_Sector7" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVEPth_EVEndPlatethicknes/2. + GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_EndPlate_Turret_special_Sector7" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVEPth_EVEndPlatethicknes/2. - GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShell_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; 0." rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVOSCZ_EVOutShellConnZwid/2. + GENV_Eps/2." rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid/2. - GENV_Eps/2." rot=" 0.; 0.; 22.5"/>
+</composition>
+
+<box name="ECT_EV_SideAttachment" material="Aluminium" X_Y_Z="AECT_EVSSAh_EVSideSupporthight - AECT_EVOSit_EVOutShellinnthick - AECT_EVOSio_EVOutShellinneroff; AECT_EVSSAw_EVSideSupportwidth; AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid" />
+<box name="ECT_EV_Attachment_basic" material="Aluminium" X_Y_Z="AECT_EVTSAl_EVTopSupportlength; 2.*AECT_EVTSAh_EVTopSupporthight; AECT_EVTSAh_EVTopSupporthight" />
+<box name="ECT_EV_Attachment_CutBox" material="Aluminium" X_Y_Z="2.*AECT_EVTSCw_EVTopSupportCutwid; 4.*AECT_EVTSAh_EVTopSupporthight; AECT_EVTSAh_EVTopSupporthight" />
+<tubs name="ECT_EV_Attachment_CutTube" material="Aluminium" Rio_Z="0.; AECT_EVEPHd_EVEndPlateHolediam/2.; 2.*AECT_EVTSAh_EVTopSupporthight" nbPhi="20" />
+
+<tubs name="ECT_EV_AlignFlange_default_pre" material="Aluminium" Rio_Z="AECT_EVEPHd_EVEndPlateHolediam/2.; AECT_EVAFod_EVAlignFlangeoutdi/2.; AECT_EVAFzw_EVAlignFlangezwidt" nbPhi="20" />
+<tubs name="ECT_EV_AlignFlange_special_base" material="Aluminium" Rio_Z="0.; AECT_EVAFod_EVAlignFlangeoutdi/2.; AECT_EVTSAh_EVTopSupporthight" nbPhi="20" />
+<box name="ECT_EV_AlignFlange_special_cut" material="Aluminium" X_Y_Z="2.*AECT_EVAFod_EVAlignFlangeoutdi; 2.*AECT_EVTSAh_EVTopSupporthight; 2.*AECT_EVTSAh_EVTopSupporthight" />
+<tubs name="ECT_EV_AlignTube_default_pre" material="Aluminium" Rio_Z="AECT_EVATid_EVAlignTubeinndiam/2.; AECT_EVATid_EVAlignTubeinndiam/2.+AECT_EVATww_EVAlignTuberwallwi; AECT_EVOShZ_EVOutShellholeZwid-2.*AECT_EVAFzw_EVAlignFlangezwidt - GENV_Eps" nbPhi="20" />
+<tubs name="ECT_EV_AlignTube_special_pre" material="Aluminium" Rio_Z="AECT_EVATid_EVAlignTubeinndiam/2.; AECT_EVATid_EVAlignTubeinndiam/2.+AECT_EVATww_EVAlignTuberwallwi; AECT_EVOShZ_EVOutShellholeZwid-2.*AECT_EVTSAh_EVTopSupporthight - GENV_Eps" nbPhi="20" />
+
+<subtraction name="ECT_EV_FrontAttachment" >
+ <posXYZ volume="ECT_EV_Attachment_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_Attachment_CutBox" X_Y_Z=" AECT_EVTSAl_EVTopSupportlength/2.; 0.; -AECT_EVTSCo_EVTopSupportCutoff" />
+ <posXYZ volume="ECT_EV_Attachment_CutTube" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180) - AECT_EVTSRa_EVTopSupportRadius - AECT_EVTSAl_EVTopSupportlength/2.; -AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_BackAttachment" >
+ <posXYZ volume="ECT_EV_Attachment_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_Attachment_CutBox" X_Y_Z=" AECT_EVTSAl_EVTopSupportlength/2.; 0.; AECT_EVTSCo_EVTopSupportCutoff" />
+ <posXYZ volume="ECT_EV_Attachment_CutTube" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180) - AECT_EVTSRa_EVTopSupportRadius - AECT_EVTSAl_EVTopSupportlength/2.; -AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<composition name="ECT_EV_AlignTube_default">
+ <posRPhiZ volume="ECT_EV_AlignTube_default_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; 22.5 - AECT_EVEPHa_EVEndPlateHoleang; 0. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_default_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; 22.5 - AECT_EVEPHa_EVEndPlateHoleang; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVAFzw_EVAlignFlangezwidt/2. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_default_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; 22.5 - AECT_EVEPHa_EVEndPlateHoleang;-AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVAFzw_EVAlignFlangezwidt/2. " />
+</composition>
+
+<subtraction name="ECT_EV_AlignFlange_special_pre" >
+ <posXYZ volume="ECT_EV_AlignFlange_special_base" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180);-AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+ <posXYZ volume="ECT_EV_AlignFlange_special_cut" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180);-GENV_Eps; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_Attachment_CutTube" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180);-AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<composition name="ECT_EV_AlignTube_special">
+ <posRPhiZ volume="ECT_EV_AlignTube_special_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; -AECT_EVEPHa_EVEndPlateHoleang; 0. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_special_pre" R_Phi_Z=" 0. ; 0.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVTSAh_EVTopSupporthight/2. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_special_pre" R_Phi_Z=" 0. ; 0.;-AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVTSAh_EVTopSupporthight/2. " />
+</composition>
+
+<!-- radiation shielding mounted inside main envelope towards IP - atljt___0023, atljt___0026, atljt___0029 and atljt___0031 -->
+<var name="AECT_JTVSth_JTVShieldthicknes" value=" 80. "/>
+<var name="AECT_JTVSlw_JTVShieldlowwidth" value=" 321. "/>
+<var name="AECT_JTVSuw_JTVShieldupwidth" value=" 1854. "/>
+<var name="AECT_JTVSth_JTVShieldtothight" value=" 1975. "/>
+<var name="AECT_JTVSmh_JTVShieldmidhight" value=" 1850. "/>
+<var name="AECT_JTVShd_JTVShieldholediam" value=" 650. "/>
+<var name="AECT_JTVSpx_JTVShieldholeposX" value=" 195. "/>
+<var name="AECT_JTVSpy_JTVShieldholeposY" value=" 1569. "/>
+<var name="AECT_JTVSpr_JTVShieldposR" value=" 1470. "/>
+<var name="AECT_JTVSpp_JTVShieldpophioff" value=" 435. "/>
+
+<var name="AECT_JTVSth_JTVSpecial2tothig" value=" 1713. "/>
+<var name="AECT_JTVSth_JTVSpecial1tothig" value=" 1690. "/>
+<var name="AECT_JTVSlh_JTVSpecial1lowhig" value=" 931. "/>
+<var name="AECT_JTVSmh_JTVSpecial1midhig" value=" 691. "/>
+<var name="AECT_JTVSlh_JTVSpecial1phioff" value=" 170. "/>
+
+<var name="AECT_JTVSpr_JTVSpecial2posR" value=" 1522. "/>
+<var name="AECT_JTVSpr_JTVSpecial1posR" value=" 1717. "/>
+
+<gvxy name="ECT_JTV_Shielding_basic" material="PolyBoronB4C" dZ="AECT_JTVSth_JTVShieldthicknes">
+ <gvxy_point X_Y=" AECT_JTVSlw_JTVShieldlowwidth/2.; 0."/>
+ <gvxy_point X_Y=" AECT_JTVSuw_JTVShieldupwidth/2.; AECT_JTVSmh_JTVShieldmidhight"/>
+ <gvxy_point X_Y=" 0.; AECT_JTVSth_JTVShieldtothight"/>
+ <gvxy_point X_Y="-AECT_JTVSuw_JTVShieldupwidth/2.; AECT_JTVSmh_JTVShieldmidhight"/>
+ <gvxy_point X_Y="-AECT_JTVSlw_JTVShieldlowwidth/2.; 0."/>
+</gvxy>
+
+<tubs name="ECT_JTV_AlignHole" material="PolyBoronB4C" Rio_Z="0.; AECT_JTVShd_JTVShieldholediam/2.; 2.*AECT_JTVSth_JTVShieldthicknes" nbPhi="20" />
+
+<subtraction name="ECT_JTV_Shielding_default_tmp" >
+ <posXYZ volume="ECT_JTV_Shielding_basic" X_Y_Z=" AECT_JTVSlw_JTVShieldlowwidth/2.*GENV_Co225+AECT_JTVSpp_JTVShieldpophioff; AECT_JTVSpr_JTVShieldposR-AECT_JTVSlw_JTVShieldlowwidth/2.*GENV_Si225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2." rot=" 0.; 0.; -22.5"/>
+ <posXYZ volume="ECT_JTV_AlignHole" X_Y_Z=" AECT_JTVSpp_JTVShieldpophioff+(AECT_JTVSlw_JTVShieldlowwidth/2.+AECT_JTVSpx_JTVShieldholeposX)*GENV_Co225+AECT_JTVSpy_JTVShieldholeposY*GENV_Si225; AECT_JTVSpr_JTVShieldposR-(AECT_JTVSlw_JTVShieldlowwidth/2.+AECT_JTVSpx_JTVShieldholeposX)*GENV_Si225+AECT_JTVSpy_JTVShieldholeposY*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2."/>
+</subtraction>
+
+<composition name="ECT_JTV_Shielding_default" >
+ <posXYZ volume="ECT_JTV_Shielding_default_tmp" rot=" 0.; 0.; -45."/>
+</composition>
+
+<gvxy name="ECT_JTV_Shielding_special1" material="PolyBoronB4C" dZ="AECT_JTVSth_JTVShieldthicknes">
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" 0.; AECT_JTVSlh_JTVSpecial1lowhig"/>
+ <gvxy_point X_Y=" AECT_JTVSlh_JTVSpecial1phioff; AECT_JTVSlh_JTVSpecial1lowhig"/>
+ <gvxy_point X_Y=" AECT_JTVSlh_JTVSpecial1phioff; AECT_JTVSth_JTVSpecial1tothig"/>
+ <gvxy_point X_Y=" (AECT_JTVSlh_JTVSpecial1lowhig+AECT_JTVSmh_JTVSpecial1midhig)*GENV_Ta225; AECT_JTVSlh_JTVSpecial1lowhig+AECT_JTVSmh_JTVSpecial1midhig"/>
+</gvxy>
+
+<gvxy name="ECT_JTV_Shielding_special2" material="PolyBoronB4C" dZ="AECT_JTVSth_JTVShieldthicknes">
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" 0.; AECT_JTVSth_JTVSpecial1tothig"/>
+ <gvxy_point X_Y=" -AECT_JTVSth_JTVSpecial2tothig*GENV_Si225; AECT_JTVSth_JTVSpecial2tothig*GENV_Co225"/>
+</gvxy>
+
+<composition name="ECT_JTV_Shielding_special" >
+ <posXYZ volume="ECT_JTV_Shielding_special1" X_Y_Z=" -AECT_JTVSpp_JTVShieldpophioff; AECT_JTVSpr_JTVSpecial1posR; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2." rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_JTV_Shielding_special2" X_Y_Z=" -AECT_JTVSpp_JTVShieldpophioff - (AECT_JTVSpr_JTVSpecial1posR-AECT_JTVSpr_JTVSpecial2posR)/GENV_Ta225; AECT_JTVSpr_JTVSpecial2posR; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2." rot=" 0.; 0.; 22.5" />
+</composition>
+
+<!-- central tube surrounding beampipe - atlteyv_0017 -->
+<var name="AECT_CTIcle_CentTubeIncomplen" value=" 4953. - 14. "/>
+<var name="AECT_CTIpo1_CentTubeInposoff1" value=" 70. "/>
+<var name="AECT_CTIpo2_CentTubeInposoff2" value=" 565. "/>
+<var name="AECT_CTIpo3_CentTubeInposoff3" value=" 500. "/>
+<var name="AECT_CTIdi1_CentTubeInDiainn1" value=" 1220. "/>
+<var name="AECT_CTIdi3_CentTubeInDiainn3" value=" 1650. "/>
+<var name="AECT_CTIdi4_CentTubeInDiainn4" value=" 1730. "/>
+<var name="AECT_CTIdo1_CentTubeInDiaout1" value=" 1339. "/>
+<var name="AECT_CTIdo2_CentTubeInDiaout2" value=" 1859. "/>
+<var name="AECT_CTIdo3_CentTubeInDiaout3" value=" 2400. "/>
+<var name="AECT_CTIno2_CentTubeInnegoff2" value=" 185. "/>
+<var name="AECT_CTIdit_CentTubeInDiaintu" value=" 1740. "/>
+<var name="AECT_CTIdot_CentTubeInDiaoutu" value=" 1780. "/>
+<var name="AECT_CTIpfo_CentTubeInpofuoff" value=" 750. "/>
+
+<pcon name="ECT_EV_CentralTube" material="ShieldSteel" nbPhi="20" >
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo1_CentTubeInDiaout1/2.; AECT_CTIcle_CentTubeIncomplen/2." />
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo1_CentTubeInDiaout1/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo2_CentTubeInposoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi3_CentTubeInDiainn3/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo2_CentTubeInposoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi3_CentTubeInDiainn3/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo3_CentTubeInposoff3" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo3_CentTubeInposoff3" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2.-AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo3_CentTubeInposoff3" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2.-AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdit_CentTubeInDiaintu/2.; AECT_CTIdot_CentTubeInDiaoutu/2.; AECT_CTIcle_CentTubeIncomplen/2.-AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdit_CentTubeInDiaintu/2.; AECT_CTIdot_CentTubeInDiaoutu/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo3_CentTubeInDiaout3/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo3_CentTubeInDiaout3/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2." />
+</pcon>
+
+<!-- JTV surrounding central tube IP - atljt___0037-vAD -->
+<var name="AECT_JTVFRi_FrontRingInnerRad" value=" 1305. "/>
+<var name="AECT_JTVFDo_FrontRingOuterDia" value=" 2840. "/>
+<var name="AECT_JTVFMr_FrontRingMostInRa" value=" 930. "/>
+<var name="AECT_JTVFZw_FrontRingZwidth" value=" 160. "/>
+<var name="AECT_JTVFZp_FrontRingZposition" value=" 220. "/> <!-- relative pos - from drilling hole position + combination with atlteyv_0076 -->
+<!-- JTV surrounding central tube non IP - atljt___0039-vAC -->
+<var name="AECT_JTVBRi_BackRingInnerRad" value=" 1245. "/>
+<var name="AECT_JTVBDm_BackRingMediumDia" value=" 2400. "/>
+<var name="AECT_JTVBDo_BackRingOuterDia" value=" 2690. "/>
+<var name="AECT_JTVBMr_BackRingMostInRa" value=" 965. "/>
+<var name="AECT_JTVBZw_BackRingZwidth" value=" 140. "/>
+<var name="AECT_JTVBZo_BackRingZoffset" value=" 80. "/>
+
+<pcon name="ECT_JTV_FrontRing" material="PolyBoronB4C" nbPhi="20" >
+ <polyplane Rio_Z=" AECT_JTVFMr_FrontRingMostInRa; AECT_JTVFRi_FrontRingInnerRad; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1 - AECT_JTVFZp_FrontRingZposition" />
+ <polyplane Rio_Z=" AECT_JTVFMr_FrontRingMostInRa; AECT_JTVFDo_FrontRingOuterDia/2.; AECT_JTVFDo_FrontRingOuterDia/2. - AECT_JTVFRi_FrontRingInnerRad + AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1 - AECT_JTVFZp_FrontRingZposition" />
+ <polyplane Rio_Z=" AECT_JTVFMr_FrontRingMostInRa; AECT_JTVFDo_FrontRingOuterDia/2.; AECT_JTVFZw_FrontRingZwidth + AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1 - AECT_JTVFZp_FrontRingZposition" />
+</pcon>
+
+<pcon name="ECT_JTV_BackRing" material="PolyBoronB4C" nbPhi="20" >
+ <polyplane Rio_Z=" AECT_JTVBDm_BackRingMediumDia/2. + GENV_Eps; AECT_JTVBDo_BackRingOuterDia/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 - AECT_JTVBZw_BackRingZwidth + AECT_JTVBZo_BackRingZoffset" />
+ <polyplane Rio_Z=" AECT_JTVBDm_BackRingMediumDia/2. + GENV_Eps; AECT_JTVBDo_BackRingOuterDia/2.; - AECT_JTVBDo_BackRingOuterDia/2. + AECT_JTVBRi_BackRingInnerRad -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 + AECT_JTVBZo_BackRingZoffset" />
+ <polyplane Rio_Z=" AECT_JTVBDm_BackRingMediumDia/2. + GENV_Eps; AECT_JTVBRi_BackRingInnerRad + AECT_JTVBZo_BackRingZoffset; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 " />
+ <polyplane Rio_Z=" AECT_JTVBMr_BackRingMostInRa; AECT_JTVBRi_BackRingInnerRad + AECT_JTVBZo_BackRingZoffset; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 " />
+ <polyplane Rio_Z=" AECT_JTVBMr_BackRingMostInRa; AECT_JTVBRi_BackRingInnerRad; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 + AECT_JTVBZo_BackRingZoffset " />
+</pcon>
+
+<!-- yoke positioned at the ends of central tube - atlteyv_0076, atlteys_0007 and atlteys_0013 -->
+<var name="AECT_CTYpoZ_CentTubeYokeposZ" value=" 1932 "/>
+<var name="AECT_CTYthi_CentTubeYokethick" value=" 60. "/>
+<var name="AECT_CTYwid_CentTubeYokewidth" value=" 125. "/>
+<var name="AECT_CTYlen_CentTubeYokelengt" value=" 1500. "/>
+<var name="AECT_CTYidi_CentTubeYokeindia" value=" 130. "/>
+<var name="AECT_CTYodi_CentTubeYokeoudia" value=" 300. "/>
+<var name="AECT_CTYpdi_CentTubeYokeposdi" value=" 1860. "/>
+<var name="AECT_CTYst1_CentTubeYokesupt1" value=" 30. "/>
+<var name="AECT_CTYst2_CentTubeYokesupt2" value=" 40. "/>
+<var name="AECT_CTYSan_CentTubeYokesupa" value="atan(AECT_CTYodi_CentTubeYokeoudia/AECT_CTYpdi_CentTubeYokeposdi)/GENV_PiS180"/>
+
+<tubs name="ECT_EV_Yoke_Connector" material="Iron" Rio_Z="0.; AECT_CTYodi_CentTubeYokeoudia/2.; AECT_CTYthi_CentTubeYokethick + AECT_CTYst1_CentTubeYokesupt1 + AECT_CTYst2_CentTubeYokesupt2" nbPhi="20" />
+<tubs name="ECT_EV_Yoke_End" material="Iron" Rio_Z="AECT_CTYidi_CentTubeYokeindia/2.; AECT_CTYodi_CentTubeYokeoudia/2.; AECT_CTYthi_CentTubeYokethick + GENV_Eps" nbPhi="20" />
+<box name="ECT_EV_Yoke_Box" material="Iron" X_Y_Z="AECT_CTYlen_CentTubeYokelengt+AECT_CTYodi_CentTubeYokeoudia/2.; AECT_CTYthi_CentTubeYokethick; AECT_CTYwid_CentTubeYokewidth" />
+
+<union name="ECT_EV_Yoke_basic">
+ <posXYZ volume="ECT_EV_Yoke_Box" X_Y_Z=" AECT_CTYthi_CentTubeYokethick/2.+AECT_CTYst2_CentTubeYokesupt2; -(AECT_CTYlen_CentTubeYokelengt+AECT_CTYodi_CentTubeYokeoudia)/2.; 0." rot=" 0.; 0.; 90. "/>
+ <posXYZ volume="ECT_EV_Yoke_Connector" X_Y_Z=" (AECT_CTYthi_CentTubeYokethick + AECT_CTYst1_CentTubeYokesupt1 + AECT_CTYst2_CentTubeYokesupt2)/2.; 0.; 0." rot=" 0.; 90.; 0. " />
+ <posXYZ volume="ECT_EV_Yoke_End" X_Y_Z=" AECT_CTYthi_CentTubeYokethick/2.+AECT_CTYst2_CentTubeYokesupt2; -(AECT_CTYlen_CentTubeYokelengt+AECT_CTYodi_CentTubeYokeoudia); 0." rot=" 0.; 90.; 0. "/>
+</union>
+
+<tubs name="ECT_EV_Yoke_InnerSupport" material="Iron" Rio_Z="AECT_CTYpdi_CentTubeYokeposdi/2.; AECT_CTYpdi_CentTubeYokeposdi/2.+AECT_CTYst2_CentTubeYokesupt2; AECT_CTYodi_CentTubeYokeoudia + AECT_CTYst2_CentTubeYokesupt2" profile="22.5+AECT_CTYSan_CentTubeYokesupa;135.-2.*AECT_CTYSan_CentTubeYokesupa" nbPhi="20" />
+<tubs name="ECT_EV_Yoke_OuterSupport" material="Iron" Rio_Z="AECT_CTYpdi_CentTubeYokeposdi/2. + AECT_CTYst2_CentTubeYokesupt2 + AECT_CTYthi_CentTubeYokethick ; AECT_CTYpdi_CentTubeYokeposdi/2. + AECT_CTYst2_CentTubeYokesupt2 + AECT_CTYthi_CentTubeYokethick + AECT_CTYst1_CentTubeYokesupt1; AECT_CTYodi_CentTubeYokeoudia/2." profile="22.5+AECT_CTYSan_CentTubeYokesupa;135.-2.*AECT_CTYSan_CentTubeYokesupa" nbPhi="20" />
+
+<composition name="ECT_EV_Yoke">
+ <posRPhiZ volume="ECT_EV_Yoke_InnerSupport" R_Phi_Z=" GENV_Eps/2. ; 0.; 0. "/>
+ <posRPhiZ volume="ECT_EV_Yoke_OuterSupport" R_Phi_Z=" GENV_Eps/2 ; 0.; 0. "/>
+ <posRPhiZ volume="ECT_EV_Yoke_basic" R_Phi_Z=" AECT_CTYpdi_CentTubeYokeposdi/2.+GENV_Eps/2 ; 22.5; 0. " />
+ <posRPhiZ volume="ECT_EV_Yoke_basic" R_Phi_Z="-AECT_CTYpdi_CentTubeYokeposdi/2.-GENV_Eps/2 ; -22.5; 0. " rot=" 0.; 180.; 0. "/>
+</composition>
+
+<!-- thermal shielding surrounding central tube - atlteyr_0349 and atlteyr_0310 -->
+<var name="AECT_CTTSid_CentTubeTSInnDia" value=" 1965. "/>
+<var name="AECT_CTTSil_CentTubeTSinnlen" value=" 3400. "/>
+<var name="AECT_CTTSFi_CentTubeTSFIDia1" value=" 2100. "/>
+<var name="AECT_CTTSFi_CentTubeTSFIDia2" value=" 2610. "/>
+<var name="AECT_CTTSFl_CentTubeTSFlength" value=" 260. "/>
+<var name="AECT_CTTSth_CentTubeTSthickne" value=" 10. "/>
+
+<tubs name="ECT_TS_CentralTube_inner" material="Aluminium" Rio_Z="AECT_CTTSid_CentTubeTSInnDia/2.; AECT_CTTSid_CentTubeTSInnDia/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen " nbPhi="20" />
+<tubs name="ECT_TS_CentralTube_middle" material="Aluminium" Rio_Z="AECT_CTTSid_CentTubeTSInnDia/2.; AECT_CTTSFi_CentTubeTSFIDia1/2. + AECT_CTTSth_CentTubeTSthickne; 3.*AECT_CTTSth_CentTubeTSthickne" nbPhi="20" />
+<pcon name="ECT_TS_CentralTube_top" material="Aluminium" nbPhi="20" profile=" -7.; 194.">
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia2/2.; AECT_CTTSFi_CentTubeTSFIDia2/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne + AECT_CTTSFl_CentTubeTSFlength" />
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia1/2.; AECT_CTTSFi_CentTubeTSFIDia1/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne " />
+</pcon>
+<pcon name="ECT_TS_CentralTube_low" material="Aluminium" nbPhi="20" profile=" 200.; 140.">
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia2/2.; AECT_CTTSFi_CentTubeTSFIDia2/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne + AECT_CTTSFl_CentTubeTSFlength" />
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia1/2.; AECT_CTTSFi_CentTubeTSFIDia1/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne " />
+</pcon>
+
+<composition name="ECT_TS_CentralTube">
+ <posXYZ volume="ECT_TS_CentralTube_inner"/>
+ <posXYZ volume="ECT_TS_CentralTube_middle" X_Y_Z="0. ; 0.; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne/2. + GENV_Eps/2."/>
+ <posXYZ volume="ECT_TS_CentralTube_middle" X_Y_Z="0. ; 0.;-(AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne/2. + GENV_Eps/2.)"/>
+ <posXYZ volume="ECT_TS_CentralTube_top" X_Y_Z=" 0. ; 0.; GENV_Eps"/>
+ <posXYZ volume="ECT_TS_CentralTube_top" X_Y_Z=" 0. ; 0.;-GENV_Eps" rot=" 0.; 180.; 0. "/>
+ <posXYZ volume="ECT_TS_CentralTube_low" X_Y_Z=" 0. ; 0.; GENV_Eps"/>
+ <posXYZ volume="ECT_TS_CentralTube_low" X_Y_Z=" 0. ; 0.;-GENV_Eps" rot=" 0.; 180.; 0. "/>
+</composition>
+
+<!-- tie rod and corresponding mounting points attached to main envelope - atlteyv_0026, atlteyv_0027, atlte___0009, atlteys_0001 and derived calculations-->
+<var name="AECT_CryStOL0_CryStoutLength0" value=" 545." />
+<var name="AECT_CryStOL1_CryStoutLength1" value=" 400." />
+<var name="AECT_CryStOW0_CryStoutpWidth0" value=" 1080." />
+<var name="AECT_CryStOW1_CryStoutpWidth1" value=" 770." />
+<var name="AECT_CryStOH1_CryStoutRadius" value=" 4530." />
+<var name="AECT_CryStOPZ_CryStoutPosiZ" value=" 50." />
+<var name="AECT_CryStIwi_CryStinnZwidth" value=" 400." />
+<var name="AECT_CryStIhi_CryStinnhight" value=" 250." />
+<var name="AECT_CryStIos_CryStinnoffset" value=" 50." />
+<var name="AECT_CryoStTh_CryoStopThickness" value=" 40." />
+<var name="AECT_TieRodZl_TieRodZlength" value=" 3660." />
+<var name="AECT_TieRodDi_TieRodDiameter" value=" 56." />
+<var name="AECT_TieRodPo_TieRodPhioffset" value=" 71." />
+<var name="AECT_TieRodZo_TieRodZoffset" value=" 135." />
+<var name="AECT_TieRodRo_TieRodRoffset" value=" 75." />
+
+<box name="ECT_CryoStop1" material="Aluminium" X_Y_Z=" AECT_CryStOW0_CryStoutpWidth0; AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff); AECT_CryStOL0_CryStoutLength0" />
+<box name="ECT_CryoStop2" material="Aluminium" X_Y_Z=" AECT_CryStOW0_CryStoutpWidth0-2.*AECT_CryoStTh_CryoStopThickness ; AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff) ; AECT_CryStOL0_CryStoutLength0+GENV_Eps " />
+<trd name="ECT_CryoStop3" material="Aluminium"
+ Xmp_Ymp_Z=" AECT_CryStOW0_CryStoutpWidth0+GENV_Eps ; AECT_CryStOW0_CryStoutpWidth0+GENV_Eps ;
+ 2.*AECT_CryoStTh_CryoStopThickness ; 2.*(AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff)); AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff) - AECT_CryoStTh_CryoStopThickness" />
+<box name="ECT_CryoStop4" material="Aluminium" X_Y_Z=" AECT_CryStOW1_CryStoutpWidth1; AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff)+GENV_Eps ; AECT_CryStOL0_CryStoutLength0+GENV_Eps " />
+<subtraction name="ECT_EV_CryoStop_outside_basic" >
+ <posXYZ volume="ECT_CryoStop1" />
+ <posXYZ volume="ECT_CryoStop2" X_Y_Z=" 0. ; -AECT_CryoStTh_CryoStopThickness ; 0. " />
+ <posXYZ volume="ECT_CryoStop3" X_Y_Z=" 0. ; (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2. ; -AECT_CryStOL0_CryStoutLength0/2. + AECT_CryStOL1_CryStoutLength1 +(AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff) - AECT_CryoStTh_CryoStopThickness)/2. " />
+ <posXYZ volume="ECT_CryoStop4" />
+</subtraction>
+
+<composition name="ECT_EV_CryoStop_outside_tmp" >
+ <posXYZ volume="ECT_EV_CryoStop_outside_basic" rot=" 0.; 0.; -90. "/>
+</composition>
+
+<var name="AFT_ECTBrkt_Thickness" value=" 20. " />
+<var name="AFT_ECTBrkt_LowPlateThickness" value=" 30. " />
+<var name="AFT_ECTBrkt_CtrSpacerGap" value=" 360. " />
+<var name="AFT_ECTBrkt_MidSpacerGap" value=" 720. " />
+<var name="AFT_ECTBrkt_SmallXWidth" value="1080. " />
+<var name="AFT_ECTBrkt_TotalXWidth" value="1120. " />
+<var name="AFT_ECTBrkt_TotalYWidth" value=" 230. " />
+
+<var name="AFT_ECTBrkt_TopPlate_ZWidth" value=" 115. " />
+<var name="AFT_ECTBrkt_DownPlate_ZWidth" value=" 200. " />
+<var name="AFT_ECTBrkt_SidePlate_ZWidth" value=" 510. " />
+<var name="AFT_ECTBrkt_ZOffset" value=" 165. " />
+<var name="AFT_ECTBrkt_PlateZOffset" value=" 25. " />
+<var name="AFT_ECTBrkt_PlateSmallYOffset" value=" 55. " />
+<var name="AFT_ECTBrkt_PlateBigYOffset" value=" 119.5" />
+<var name="AFT_ECTBrkt_SpacerYOffset" value=" 110. " />
+
+<box name="AFT_ECTBrkt_CtrSpacer" material="Iron" X_Y_Z=" AFT_ECTBrkt_CtrSpacerGap; AFT_ECTBrkt_Thickness; AFT_ECTBrkt_TopPlate_ZWidth" />
+<box name="AFT_ECTBrkt_MidSpacer" material="Iron" X_Y_Z=" (AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/2.-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_Thickness; AFT_ECTBrkt_TopPlate_ZWidth" />
+<box name="AFT_ECTBrkt_LowCtrPlate" material="Iron" X_Y_Z=" AFT_ECTBrkt_SmallXWidth; AFT_ECTBrkt_Thickness; AFT_ECTBrkt_DownPlate_ZWidth-AFT_ECTBrkt_Thickness" />
+<box name="AFT_ECTBrkt_LowSidePlate" material="Iron" X_Y_Z=" (AFT_ECTBrkt_TotalXWidth-AFT_ECTBrkt_MidSpacerGap)/2.+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth" />
+<box name="AFT_ECTBrkt_CrossPlate" material="Iron" X_Y_Z=" AFT_ECTBrkt_SmallXWidth; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_Thickness" />
+
+<gvxy name="AFT_ECTBrkt_FrontPlate" material="Iron" dZ="AFT_ECTBrkt_Thickness" >
+ <gvxy_point X_Y=" 0.; 0. " />
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+ <gvxy_point X_Y=" AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+ <gvxy_point X_Y=" AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_PlateZOffset" />
+ <gvxy_point X_Y=" AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_PlateZOffset; 0. " />
+</gvxy>
+
+<gvxy name="AFT_ECTBrkt_SidePlate" material="Iron" dZ="AFT_ECTBrkt_Thickness" >
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-AFT_ECTBrkt_Thickness; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset; AFT_ECTBrkt_PlateSmallYOffset " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+</gvxy>
+
+<gvxy name="AFT_ECTBrkt_MiddlePlate" material="Iron" dZ="AFT_ECTBrkt_Thickness" >
+ <gvxy_point X_Y=" 0.; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-2.*AFT_ECTBrkt_Thickness; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-2.*AFT_ECTBrkt_Thickness; AFT_ECTBrkt_PlateBigYOffset-AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-2.*AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-2.*AFT_ECTBrkt_Thickness " />
+</gvxy>
+
+<box name="AFT_ECTBrkt_GapCloser" material="Iron" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.; 122." /> <!-- z dimension adjusted from construction -->
+<box name="AFT_ECTBrkt_GapCloserRub" material="Carbon" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/1.5; (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2.; 70." />
+
+<composition name="AFT_ECTBrkt_tmp" >
+ <posXYZ volume="AFT_ECTBrkt_LowSidePlate" X_Y_Z=" ((AFT_ECTBrkt_TotalXWidth-AFT_ECTBrkt_MidSpacerGap)/2.+AFT_ECTBrkt_Thickness)/2.+AFT_ECTBrkt_MidSpacerGap/2.-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness/2.; AFT_ECTBrkt_SidePlate_ZWidth/2. " />
+ <posXYZ volume="AFT_ECTBrkt_LowSidePlate" X_Y_Z="-((AFT_ECTBrkt_TotalXWidth-AFT_ECTBrkt_MidSpacerGap)/2.+AFT_ECTBrkt_Thickness)/2.-AFT_ECTBrkt_MidSpacerGap/2.+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness/2.; AFT_ECTBrkt_SidePlate_ZWidth/2. " />
+ <posXYZ volume="AFT_ECTBrkt_LowCtrPlate" X_Y_Z=" 0.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-(AFT_ECTBrkt_DownPlate_ZWidth+AFT_ECTBrkt_Thickness)/2." />
+ <posXYZ volume="AFT_ECTBrkt_CrossPlate" X_Y_Z=" 0.; AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness)/2.; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness/2. " />
+ <posXYZ volume="AFT_ECTBrkt_FrontPlate" X_Y_Z=" AFT_ECTBrkt_TotalXWidth/2.-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset " rot="0.; -90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_FrontPlate" X_Y_Z="-AFT_ECTBrkt_TotalXWidth/2.+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset " rot="0.; -90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z=" AFT_ECTBrkt_SmallXWidth/2.-AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0." />
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z=" AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_MidSpacerGap/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z="-AFT_ECTBrkt_SmallXWidth/2.+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z="-AFT_ECTBrkt_Thickness/2.-AFT_ECTBrkt_MidSpacerGap/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_MiddlePlate" X_Y_Z=" AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_MiddlePlate" X_Y_Z="-AFT_ECTBrkt_CtrSpacerGap/2.-AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_CtrSpacer" X_Y_Z=" 0.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_SpacerYOffset; -AFT_ECTBrkt_TopPlate_ZWidth/2.+AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness" />
+ <posXYZ volume="AFT_ECTBrkt_MidSpacer" X_Y_Z=" (AFT_ECTBrkt_MidSpacerGap+AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_SpacerYOffset; -AFT_ECTBrkt_TopPlate_ZWidth/2.+AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness" />
+ <posXYZ volume="AFT_ECTBrkt_MidSpacer" X_Y_Z="-(AFT_ECTBrkt_MidSpacerGap+AFT_ECTBrkt_CtrSpacerGap)/4.-AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_SpacerYOffset; -AFT_ECTBrkt_TopPlate_ZWidth/2.+AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness" />
+ <posXYZ volume="AFT_ECTBrkt_GapCloser" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.; (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+123./2."/>
+ <posXYZ volume="AFT_ECTBrkt_GapCloser" X_Y_Z="-((AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.); (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+123./2."/>
+ <posXYZ volume="AFT_ECTBrkt_GapCloserRub" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.; (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+124.+70./2."/>
+ <posXYZ volume="AFT_ECTBrkt_GapCloserRub" X_Y_Z="-((AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.); (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+124.+70./2."/>
+</composition>
+
+<composition name="AFT_ECTBrkt" >
+ <posXYZ volume="AFT_ECTBrkt_tmp" X_Y_Z=" (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2.; 0.; -AECT_CryStOL0_CryStoutLength0/2." rot=" 0.; 0.; -90. "/>
+</composition>
+
+<composition name="ECT_EV_CryoStop_outside" >
+ <posRPhiZ volume="ECT_EV_CryoStop_outside_tmp" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff + (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2.; 22.5; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid +AECT_CryStOL0_CryStoutLength0/2.+AECT_CryStOPZ_CryStoutPosiZ "/>
+ <posRPhiZ volume="AFT_ECTBrkt" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff + (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2.; 22.5; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid +AECT_CryStOL0_CryStoutLength0/2.+AECT_CryStOPZ_CryStoutPosiZ " />
+</composition>
+
+<gvxy name="ECT_CryoStop_inside_basic" material="Aluminium" dZ="AECT_CryoStTh_CryoStopThickness">
+ <gvxy_point X_Y=" -AECT_CryStIos_CryStinnoffset; 0."/>
+ <gvxy_point X_Y=" -AECT_CryStIwi_CryStinnZwidth; 0."/>
+ <gvxy_point X_Y=" -AECT_CryStIwi_CryStinnZwidth; -AECT_CryStIos_CryStinnoffset"/>
+ <gvxy_point X_Y=" -(AECT_CryStIhi_CryStinnhight-AECT_CryStIos_CryStinnoffset)*GENV_Si45; -AECT_CryStIhi_CryStinnhight"/>
+ <gvxy_point X_Y=" 0.; -AECT_CryStIhi_CryStinnhight"/>
+ <gvxy_point X_Y=" 0.; -AECT_CryStIos_CryStinnoffset"/>
+</gvxy>
+
+<tubs name="ECT_TieRod" material="Iron" Rio_Z="0.; AECT_TieRodDi_TieRodDiameter/2.; AECT_TieRodZl_TieRodZlength" nbPhi="20" />
+
+<composition name="ECT_EV_CryoStop_inside_basic">
+ <posXYZ volume="ECT_CryoStop_inside_basic" X_Y_Z=" (AECT_CryStOW0_CryStoutpWidth0 - AECT_CryoStTh_CryoStopThickness)/2. ; 0.; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="ECT_CryoStop_inside_basic" X_Y_Z="-(AECT_CryStOW0_CryStoutpWidth0 - AECT_CryoStTh_CryoStopThickness)/2. ; 0.; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="ECT_TieRod" X_Y_Z=" (AECT_CryStOW0_CryStoutpWidth0)/2. - AECT_CryoStTh_CryoStopThickness - AECT_TieRodPo_TieRodPhioffset; -AECT_CryStIhi_CryStinnhight + AECT_TieRodRo_TieRodRoffset; AECT_TieRodZo_TieRodZoffset + AECT_TieRodZl_TieRodZlength/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="ECT_TieRod" X_Y_Z="-(AECT_CryStOW0_CryStoutpWidth0)/2. + AECT_CryoStTh_CryoStopThickness + AECT_TieRodPo_TieRodPhioffset; -AECT_CryStIhi_CryStinnhight + AECT_TieRodRo_TieRodRoffset; AECT_TieRodZo_TieRodZoffset + AECT_TieRodZl_TieRodZlength/2." rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="ECT_EV_CryoStop_inside_tmp" >
+ <posXYZ volume="ECT_EV_CryoStop_inside_basic" rot=" 0.; 0.; -90. "/>
+</composition>
+
+<composition name="ECT_EV_CryoStop_inside" >
+ <posRPhiZ volume="ECT_EV_CryoStop_inside_tmp" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff - AECT_EVOSit_EVOutShellinnthick; 22.5; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid "/>
+</composition>
+
+<!-- Atlas End-Cap toroid Service Turret - whole construction approximated -->
+<var name="AECT_SrvTu1Dz_ServTur1Dz" value=" 830." />
+<var name="AECT_SrvTu1He_ServTur1Height" value=" 2350." /> <!-- original value 2000, modified due to overlap with new ECT-ServiceTower -->
+<var name="AECT_SrvTu1oW_ServTur1OutWidth" value=" 1100." />
+<var name="AECT_SrvTu1iW_ServTur1InnWidth" value=" 1000." />
+<var name="AECT_SrvTu1Ed_ServTur1Edge" value=" 120." />
+<var name="AECT_SrvTu2Dz_ServTur2Dz" value=" 900." />
+<var name="AECT_SrvTu2He_ServTur2Height" value=" 1000." />
+<var name="AECT_SrvTu2oR_ServTur2OutRad" value=" 150." />
+<var name="AECT_SrvTu2iR_ServTur2InnRad" value=" 140." />
+<var name="AECT_SrvTu3Dz_ServTur3Dz" value=" 260." />
+<var name="AECT_SrvTu3He_ServTur3Height" value=" 3650." /> <!-- original value 4000, modified due to overlap with new ECT-ServiceTower -->
+<var name="AECT_ServTuZoff_ServTurZoffset" value=" 834." />
+
+
+<!-- Description of the Atlas End-cap Toroid Service Turret -->
+
+<gvxysxy name="ECT_ServTur1" material="Aluminium" dZ="AECT_SrvTu1He_ServTur1Height" >
+ <gvxy_point X_Y=" AECT_SrvTu1oW_ServTur1OutWidth/2. ; AECT_SrvTu1oW_ServTur1OutWidth/2.-AECT_SrvTu1Ed_ServTur1Edge " />
+ <gvxy_point X_Y=" AECT_SrvTu1oW_ServTur1OutWidth/2.-AECT_SrvTu1Ed_ServTur1Edge ; AECT_SrvTu1oW_ServTur1OutWidth/2. " />
+</gvxysxy>
+<gvxysxy name="ECT_ServTur0" material="Aluminium" dZ="AECT_SrvTu1He_ServTur1Height" >
+ <gvxy_point X_Y=" AECT_SrvTu1iW_ServTur1InnWidth/2. ; AECT_SrvTu1iW_ServTur1InnWidth/2.-AECT_SrvTu1Ed_ServTur1Edge*AECT_SrvTu1iW_ServTur1InnWidth/AECT_SrvTu1oW_ServTur1OutWidth " />
+ <gvxy_point X_Y=" AECT_SrvTu1iW_ServTur1InnWidth/2.-AECT_SrvTu1Ed_ServTur1Edge*AECT_SrvTu1iW_ServTur1InnWidth/AECT_SrvTu1oW_ServTur1OutWidth ; AECT_SrvTu1iW_ServTur1InnWidth/2. " />
+</gvxysxy>
+<subtraction name="ECT_ServTurA" >
+ <posXYZ volume="ECT_ServTur1" rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTur0" X_Y_Z=" 0. ; -AECT_SrvTu1oW_ServTur1OutWidth+AECT_SrvTu1iW_ServTur1InnWidth ; 0. " rot=" 90.; 0.; 0. "/>
+</subtraction>
+<tubs name="ECT_ServTurB1_base" material="Aluminium" Rio_Z="AECT_SrvTu2iR_ServTur2InnRad; AECT_SrvTu2oR_ServTur2OutRad; AECT_SrvTu2He_ServTur2Height + AECT_SrvTu2oR_ServTur2OutRad - GENV_Eps" nbPhi="20" />
+<tubs name="ECT_ServTurB2_base" material="Aluminium" Rio_Z="AECT_SrvTu2iR_ServTur2InnRad; AECT_SrvTu2oR_ServTur2OutRad; AECT_SrvTu2Dz_ServTur2Dz - AECT_SrvTu3Dz_ServTur3Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad" nbPhi="20" />
+<tubs name="ECT_ServTurB3_base" material="Aluminium" Rio_Z="AECT_SrvTu2iR_ServTur2InnRad; AECT_SrvTu2oR_ServTur2OutRad; AECT_SrvTu3He_ServTur3Height + AECT_SrvTu2oR_ServTur2OutRad" nbPhi="20" />
+<box name="ECT_ServTurB_CutBox" material="Aluminium" X_Y_Z="4.*AECT_SrvTu2oR_ServTur2OutRad/GENV_Co45; 4.*AECT_SrvTu2oR_ServTur2OutRad/GENV_Co45; 4.*AECT_SrvTu2oR_ServTur2OutRad/GENV_Co45" />
+<subtraction name="ECT_ServTurB1" >
+ <posXYZ volume="ECT_ServTurB1_base" X_Y_Z=" 0. ; (AECT_SrvTu2He_ServTur2Height + AECT_SrvTu2oR_ServTur2OutRad + GENV_Eps)/2. + AECT_SrvTu1He_ServTur1Height/2. ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz " rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height + 2.*AECT_SrvTu2oR_ServTur2OutRad + AECT_SrvTu1He_ServTur1Height/2.; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz - 2.*AECT_SrvTu2oR_ServTur2OutRad " rot=" 45.; 0.; 0. "/>
+</subtraction>
+<subtraction name="ECT_ServTurB2" >
+ <posXYZ volume="ECT_ServTurB2_base" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz- (AECT_SrvTu2Dz_ServTur2Dz - AECT_SrvTu3Dz_ServTur3Dz)/2." rot=" 0.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. - 2.*AECT_SrvTu2oR_ServTur2OutRad ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad - GENV_Eps/2." rot=" 45.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. + 2.*AECT_SrvTu2oR_ServTur2OutRad ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz - (AECT_SrvTu2Dz_ServTur2Dz - AECT_SrvTu3Dz_ServTur3Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad) + GENV_Eps/2." rot=" 45.; 0.; 0. "/>
+</subtraction>
+<subtraction name="ECT_ServTurB3" >
+ <posXYZ volume="ECT_ServTurB3_base" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. + (AECT_SrvTu3He_ServTur3Height - AECT_SrvTu2oR_ServTur2OutRad)/2. ; AECT_SrvTu3Dz_ServTur3Dz-AECT_SrvTu1Dz_ServTur1Dz " rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. - 2.*AECT_SrvTu2oR_ServTur2OutRad ; AECT_SrvTu3Dz_ServTur3Dz-AECT_SrvTu1Dz_ServTur1Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad " rot=" 45.; 0.; 0. "/>
+</subtraction>
+<composition name="ECT_ServTur" >
+ <posXYZ volume="ECT_ServTurA" />
+ <posXYZ volume="ECT_ServTurB1" />
+ <posXYZ volume="ECT_ServTurB2" />
+ <posXYZ volume="ECT_ServTurB3" />
+</composition>
+
+<!-- new Description of the Atlas End-cap Toroid Service Tower -->
+<!-- Right and Left Leg variables -->
+<var name="ECST_zwid" value=" 100.0" /> <!-- atltept_0009-v0.pdf --> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_ywid" value=" 6000.0" /> <!-- atltept_0009-v0.pdf --> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_RL_xwid" value=" 200. " /> <!-- atltept_0009-v0.pdf -->
+<var name="ECST_LL_xwid" value=" 100. " /> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_RL_inner_distanceZ" value=" 270. " /> <!-- atltept_0009-v0.pdf -->
+<var name="ECST_LL_inner_distanceX" value=" 240. " /> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_LL_inner_distanceZ" value=" 270. " /> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_RL_ywid" value="ECST_ywid" />
+<var name="ECST_RL_zwid" value="ECST_zwid" />
+<var name="ECST_LL_ywid" value="ECST_ywid" />
+<var name="ECST_LL_zwid" value="ECST_zwid" />
+<var name="ECST_RightLeftLeg_InnerDistanceX" value="1665.+40." /> <!-- atltept_0014-vAA.pdf (added 40 to match) -->
+
+<!-- Front Arm variables -->
+<var name="ECST_Front_Bracket23_topwidth" value=" 77.5" /> <!-- approximate 77.5=(440-130)/4 see altept_0014vAA.pdf -->
+<var name="ECST_Front_Hand_width" value=" 10.0"/>
+<var name="ECST_Front_Hand_pointAX" value=" 0. "/> <!-- atltept_0033-v0.pdf lower right point-->
+<var name="ECST_Front_Hand_pointAY" value=" 0. "/> <!-- atltept_0033-v0.pdf lower right point-->
+<var name="ECST_Front_Hand_Gap" value=" 10. "/> <!-- atltept_0033-v0.pdf lower right point-->
+<var name="ECST_Front_Bracket_Distance_From_Bottom_Leg" value="2342.5+155+20"/> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_Front_Bracket_Distance_From_Leg" value="100"/> <!-- approximate, not calculated -->
+<var name="ECST_Front_Bracket_width" value="10.0"/>
+<var name="ECST_Front_Bracket_Connector_to_LLRod_ywid" value="195"/> <!-- atlept_0018-v0.pdf-->
+<var name="ECST_Front_Hand_pointBX" value="ECST_Front_Hand_pointAX-120.0"/>
+<var name="ECST_Front_Hand_pointBY" value="ECST_Front_Hand_pointAY"/>
+<var name="ECST_Front_Hand_pointCX" value="ECST_Front_Hand_pointAX-195.0"/>
+<var name="ECST_Front_Hand_pointCY" value="ECST_Front_Hand_pointAY+287.0"/>
+<var name="ECST_Front_Hand_pointDX" value="ECST_Front_Hand_pointAX-76.1"/>
+<var name="ECST_Front_Hand_pointDY" value="ECST_Front_Hand_pointAY+394.1"/>
+<var name="ECST_Front_Hand_pointEX" value="ECST_Front_Hand_pointAX"/>
+<var name="ECST_Front_Hand_pointEY" value="ECST_Front_Hand_pointAY+220.0"/>
+
+<!-- Front bar variables -->
+<var name="ECST_Front_Bar1_xwid" value=" 200." />
+<var name="ECST_Front_Bar2_xwid" value="1840." />
+<var name="ECST_Front_Bar3_xwid" value=" 130." />
+<var name="ECST_Front_Bar_ywid" value=" 200." />
+<var name="ECST_Front_Bar_zwid" value=" 100." />
+<var name="ECST_Front_Bar_starty" value="1107.5" /><!-- atltept_0014-vAA.pdf 1107.5=6977.5-(5807.5+62.5) with respect to the bottom of the right (or) left leg bar-->
+<var name="ECST_Front_Bar_startz" value="1192.5" /><!-- atltept_0014-vAA.pdf 1192.5=12373.5-11181 with respect to the right (or)left leg bar (outer surface-->
+<var name="ECST_Front_Bar_xwid" value="ECST_Front_Bar1_xwid+ECST_Front_Bar2_xwid+ECST_Front_Bar3_xwid+2*ECST_Front_Hand_width"/>
+
+<var name="ECST_vecx_CD" value="ECST_Front_Hand_pointDX-ECST_Front_Hand_pointCX"/>
+<var name="ECST_vecy_CD" value="ECST_Front_Hand_pointDY-ECST_Front_Hand_pointCY"/>
+<var name="ECST_unit_perp_CDx" value="(-ECST_vecy_CD/ECST_vecx_CD)/sqrt((-ECST_vecy_CD/ECST_vecx_CD)**2+1)"/>
+<var name="ECST_unit_perp_CDy" value="(1.)/sqrt((-ECST_vecy_CD/ECST_vecx_CD)**2+1)"/>
+
+<var name="ECST_Front_Bracket_pointCX" value="ECST_Front_Hand_pointCX+GENV_Eps*ECST_unit_perp_CDx"/>
+<var name="ECST_Front_Bracket_pointCY" value="ECST_Front_Hand_pointCY+GENV_Eps*ECST_unit_perp_CDy"/>
+<var name="ECST_Front_Bracket_pointDX" value="ECST_Front_Hand_pointDX+GENV_Eps*ECST_unit_perp_CDx"/>
+<var name="ECST_Front_Bracket_pointDY" value="ECST_Front_Hand_pointDY+GENV_Eps*ECST_unit_perp_CDy"/>
+
+<var name="ECST_Front_Bracket_pointFX" value="ECST_Front_Hand_pointAX-(ECST_Front_Bar_startz+ECST_Front_Hand_Gap)+ECST_Front_Bracket_Distance_From_Leg"/>
+<var name="ECST_Front_Bracket_pointFY" value="ECST_Front_Hand_pointAY+ECST_Front_Bracket_Distance_From_Bottom_Leg-(ECST_Front_Bar_starty-ECST_Front_Hand_Gap)"/> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_Front_Bracket_pointGX" value="ECST_Front_Bracket_pointFX"/>
+<var name="ECST_Front_Bracket_pointGY" value="ECST_Front_Bracket_pointFY+ECST_Front_Bracket_Connector_to_LLRod_ywid"/>
+
+<var name="ECST_Front_Bracket_pointD1X" value="ECST_Front_Bracket_pointDX+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointCX-ECST_Front_Bracket_pointDX)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+<var name="ECST_Front_Bracket_pointD1Y" value="ECST_Front_Bracket_pointDY+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointCY-ECST_Front_Bracket_pointDY)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+<var name="ECST_Front_Bracket_pointC1X" value="ECST_Front_Bracket_pointCX+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+<var name="ECST_Front_Bracket_pointC1Y" value="ECST_Front_Bracket_pointCY+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+
+<var name="ECST_Front_Bracket_pointF1X" value="ECST_Front_Bracket_pointFX"/>
+<var name="ECST_Front_Bracket_pointF1Y" value="ECST_Front_Bracket_pointFY+ECST_Front_Bracket_width"/>
+<var name="ECST_Front_Bracket_pointG1X" value="ECST_Front_Bracket_pointGX"/>
+<var name="ECST_Front_Bracket_pointG1Y" value="ECST_Front_Bracket_pointGY-ECST_Front_Bracket_width"/>
+<var name="ECST_vecx_GD" value="ECST_Front_Bracket_pointGX-ECST_Front_Bracket_pointDX"/>
+<var name="ECST_vecy_GD" value="ECST_Front_Bracket_pointGY-ECST_Front_Bracket_pointCY"/>
+<var name="ECST_unit_perp_GDx" value="(-ECST_vecy_GD/ECST_vecx_GD)/sqrt((-ECST_vecy_GD/ECST_vecx_GD)**2+1)"/>
+<var name="ECST_unit_perp_GDy" value="(1.)/sqrt((-ECST_vecy_GD/ECST_vecx_GD)**2+1)"/>
+
+<var name="ECST_Front_Arm1_widthx" value="ECST_Front_Hand_pointAX-ECST_Front_Bracket_pointGX"/>
+<var name="ECST_Front_Arm1_widthy" value="-ECST_Front_Hand_pointAY+ECST_Front_Bracket_pointGY"/>
+<var name="ECST_Front_Arm1_widthz" value="ECST_Front_Bracket23_topwidth"/>
+<var name="ECST_Front_Arm2_widthx" value="ECST_Front_Hand_pointAX-ECST_Front_Bracket_pointGX"/>
+<var name="ECST_Front_Arm2_widthy" value="-ECST_Front_Hand_pointAY+ECST_Front_Bracket_pointGY"/>
+<var name="ECST_Front_Arm2_widthz" value="ECST_Front_Bracket23_topwidth"/>
+
+<var name="ECST_Bar_Length" value="sqrt((ECST_Front_Bracket_pointG1X-ECST_Front_Bracket_pointD1X)**2+(ECST_Front_Bracket_pointG1Y-ECST_Front_Bracket_pointD1Y)**2)"/>
+
+<!-- Left Leg cover variables -->
+<var name="ECST_cover_thickness" value="20."/>
+<var name="ECST_cover_dist_rod" value="30."/>
+<var name="ECST_Left_Leg_HoleBracket_ypos" value="ECST_Front_Bracket_pointF1Y-ECST_ywid/2+ECST_Front_Bar_starty-ECST_Front_Hand_Gap+80"/>
+
+<!-- Left Leg Support Frames variables -->
+<var name="ECST_SupportFrame_dist_rod" value="30."/>
+<var name="ECST_SupportFrame_Thickness" value="20."/>
+
+<!-- Right Leg Variables -->
+<var name="ECST_SupportFrameA_Height" value="370."/> <!-- altept_0009, altept_0012, altept_0018 -->
+<var name="ECST_SupportFrameB_Height" value="360."/>
+<var name="ECST_SupportFrameC_Height" value="360."/>
+<var name="ECST_SupportFrameD_Height" value="150."/>
+
+<var name="ECST_SupportFrameA_Ypos" value="ECST_ywid/2-ECST_SupportFrameA_Height/2"/>
+<var name="ECST_SupportFrameA_Ypos_abs" value="ECST_ywid-ECST_SupportFrameA_Height"/> <!-- starting y -->
+<var name="ECST_SupportFrameB_Ypos_abs" value="4060."/> <!-- starting y -->
+<var name="ECST_SupportFrameB_Ypos" value="ECST_SupportFrameB_Ypos_abs-ECST_ywid/2+ECST_SupportFrameB_Height/2"/>
+<var name="ECST_SupportFrameC_Ypos_abs" value="2343."/> <!-- starting y 2343-->
+<var name="ECST_SupportFrameC_Ypos" value="ECST_SupportFrameC_Ypos_abs-ECST_ywid/2+ECST_SupportFrameC_Height/2"/>
+<var name="ECST_SupportFrameD_Ypos_abs" value="1108."/> <!-- starting y -->
+<var name="ECST_SupportFrameD_Ypos" value="ECST_SupportFrameD_Ypos_abs-ECST_ywid/2+ECST_SupportFrameD_Height/2"/>
+
+<!-- Middle Pieces Variables -->
+<var name="ECST_MiddleBarA_ywid" value=" 160."/> <!-- altept_0022, altept_0023, altept_0024 -->
+<var name="ECST_MiddleBarA_width" value=" 20."/>
+<var name="ECST_MiddleBarA1_ywid" value="ECST_MiddleBarA_ywid-2*ECST_MiddleBarA_width"/>
+<var name="ECST_MiddleBarA1_zwid" value="ECST_MiddleBarA_width"/>
+<var name="ECST_MiddleBarA2_xwid" value="1400."/>
+<var name="ECST_MiddleBarA2_ywid" value="ECST_MiddleBarA_width"/>
+<var name="ECST_MiddleBarA2_zwid" value=" 50."/>
+<var name="ECST_MiddleBarA1Back_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA1Back_ypos" value=" 0."/>
+<var name="ECST_MiddleBarA1Back_zpos" value="ECST_MiddleBarA1_zwid/2."/>
+<var name="ECST_MiddleBarA2Back_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA2Back_ypos" value="(ECST_MiddleBarA1_ywid+ECST_MiddleBarA2_ywid)/2.+GENV_Eps"/>
+<var name="ECST_MiddleBarA2Back_zpos" value="(ECST_MiddleBarA2_zwid)/2."/>
+<var name="ECST_MiddleBarA1Front_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA1Front_ypos" value=" 0."/>
+<var name="ECST_MiddleBarA1Front_zpos" value="ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2-ECST_MiddleBarA1_zwid/2."/>
+<var name="ECST_MiddleBarA2Front_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA2Front_ypos" value="(ECST_MiddleBarA1_ywid+ECST_MiddleBarA2_ywid)/2+GENV_Eps"/>
+<var name="ECST_MiddleBarA2Front_zpos" value="ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2-ECST_MiddleBarA2_zwid/2"/>
+<var name="ECST_MiddleBarAFront_ypos" value="ECST_SupportFrameA_Ypos_abs+ECST_SupportFrameA_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps"/>
+<var name="ECST_MiddleBarABack_ypos" value="ECST_SupportFrameA_Ypos_abs+ECST_SupportFrameA_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps"/>
+<var name="ECST_MiddleBarALow_ypos" value="ECST_SupportFrameA_Ypos_abs+ECST_MiddleBarA_ywid/2.+GENV_Eps"/>
+<var name="ECST_MiddleBarB2_xwid" value="1424."/>
+<var name="ECST_MiddleBarB_ypos" value="ECST_SupportFrameB_Ypos_abs+ECST_SupportFrameB_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps" />
+<var name="ECST_MiddleBarC2_xwid" value="1420."/>
+<var name="ECST_MiddleBarC_ypos" value="ECST_SupportFrameC_Ypos_abs+ECST_SupportFrameC_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps" />
+<var name="ECST_MiddleBarD2_xwid" value="1420."/>
+<var name="ECST_MiddleBarD_ypos" value="ECST_SupportFrameD_Ypos_abs+ECST_SupportFrameD_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps" />
+
+<var name="ECST_InclinedBar_width" value="20."/>
+<var name="ECST_InclinedBar_zwid" value="50."/>
+<var name="ECST_InclinedBar_ywid" value="210."/>
+<var name="ECST_InclinedBar_ystart" value="ECST_SupportFrameC_Ypos_abs+ECST_SupportFrameC_Height"/>
+<var name="ECST_InclinedBar_xstart" value="-(ECST_RightLeftLeg_InnerDistanceX-ECST_SupportFrame_Thickness-ECST_SupportFrame_dist_rod-ECST_cover_dist_rod-ECST_cover_thickness)/2.+GENV_Eps"/>
+<var name="ECST_InclinedBar1_p1x" value="ECST_InclinedBar_xstart"/>
+<var name="ECST_InclinedBar1_p1y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_width+GENV_Eps"/>
+<var name="ECST_InclinedBar1_p2x" value="ECST_InclinedBar1_p1x"/>
+<var name="ECST_InclinedBar1_p2y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_ywid-ECST_InclinedBar_width-GENV_Eps"/>
+<var name="ECST_InclinedBar1_p3x" value="ECST_InclinedBar_xstart+ECST_RightLeftLeg_InnerDistanceX-(ECST_SupportFrame_dist_rod+ECST_SupportFrame_Thickness)-ECST_cover_thickness-ECST_cover_dist_rod-2.*GENV_Eps"/>
+<var name="ECST_InclinedBar1_p3y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_ywid-ECST_InclinedBar_width-GENV_Eps"/>
+<var name="ECST_InclinedBar1_p4x" value="ECST_InclinedBar_xstart+ECST_RightLeftLeg_InnerDistanceX-(ECST_SupportFrame_dist_rod+ECST_SupportFrame_Thickness)-ECST_cover_thickness-ECST_cover_dist_rod-2.*GENV_Eps"/>
+<var name="ECST_InclinedBar1_p4y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_width+GENV_Eps"/>
+
+<var name="ECST_InclinedBar2_p1x" value="ECST_InclinedBar1_p1x"/>
+<var name="ECST_InclinedBar2_p1y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_ywid-ECST_InclinedBar_width"/>
+<var name="ECST_InclinedBar2_p2x" value="ECST_InclinedBar1_p2x"/>
+<var name="ECST_InclinedBar2_p2y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_ywid"/>
+<var name="ECST_InclinedBar2_p3x" value="ECST_InclinedBar1_p3x"/>
+<var name="ECST_InclinedBar2_p3y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_ywid"/>
+<var name="ECST_InclinedBar2_p4x" value="ECST_InclinedBar1_p4x"/>
+<var name="ECST_InclinedBar2_p4y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_ywid-ECST_InclinedBar_width"/>
+
+<var name="ECST_InclinedBar3_p1x" value="ECST_InclinedBar1_p1x"/>
+<var name="ECST_InclinedBar3_p1y" value="ECST_InclinedBar_ystart"/>
+<var name="ECST_InclinedBar3_p2x" value="ECST_InclinedBar1_p2x"/>
+<var name="ECST_InclinedBar3_p2y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_width"/>
+<var name="ECST_InclinedBar3_p3x" value="ECST_InclinedBar1_p3x"/>
+<var name="ECST_InclinedBar3_p3y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_width"/>
+<var name="ECST_InclinedBar3_p4x" value="ECST_InclinedBar1_p4x"/>
+<var name="ECST_InclinedBar3_p4y" value="ECST_SupportFrameB_Ypos_abs"/>
+
+<!-- Front Structure Variables --> <!-- values approximated from photos -->
+<var name="ECST_Front_Frame_ywid" value="ECST_Bar_Length*0.92"/>
+<var name="ECST_Front_Frame_zwid" value="ECST_Bar_Length*0.624"/>
+<var name="ECST_Front_Frame_width" value="26."/>
+<var name="ECST_Front_Frame_xwid" value="0.5*ECST_LL_inner_distanceX+ECST_LL_xwid+ECST_RightLeftLeg_InnerDistanceX+ECST_RL_xwid*0.5+2*ECST_Front_Frame_width"/>
+<var name="ECST_Front_Frame_xpos" value="0.5*(-0.5*ECST_LL_inner_distanceX-ECST_LL_xwid+ECST_RL_xwid*0.5)"/>
+<var name="ECST_Front_Frame_ypos" value="ECST_Front_Bar_starty+ECST_Front_Bar_ywid/2+0.504*ECST_Bar_Length+ECST_Front_Frame_zwid*0.5"/>
+<var name="ECST_Front_Frame_zpos" value="ECST_LL_inner_distanceZ+2*ECST_LL_zwid+2*ECST_cover_dist_rod+2*ECST_cover_thickness+ECST_Front_Frame_zwid*0.5+GENV_Eps"/>
+<var name="ECST_Front_Glass_xwid" value="ECST_Front_Frame_xwid-200."/>
+<var name="ECST_Front_Glass_ywid" value="ECST_Front_Frame_ywid-200."/>
+<var name="ECST_Front_Glass_zwid" value="20."/>
+<var name="ECST_Front_Frame_UpperPart_ywid" value="5."/>
+
+<var name="ECST_movez" value="ECST_RL_inner_distanceZ/2+ECST_zwid+ECST_cover_thickness+ECST_cover_dist_rod"/>
+<var name="ECST_movey" value="ECST_ywid/2"/>
+
+
+<!-- Right Leg Construction -->
+<box name="ECST_Right_Leg_SupportFrameAOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameA_Height; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameAInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameA_Height+20.0 ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+<box name="ECST_Right_Leg_SupportFrameBOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameB_Height ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameBInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameB_Height+20.0 ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+<box name="ECST_Right_Leg_HoleBracket" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; 300.; 200." />
+<box name="ECST_Right_Leg_SupportFrameCOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameC_Height ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameCInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameC_Height+20. ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+<box name="ECST_Right_Leg_SupportFrameDOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameD_Height; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameDInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameD_Height+20.0 ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+
+<subtraction name="ECST_Right_Leg_SupportFrameA" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameAOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameAInner" />
+</subtraction>
+<subtraction name="ECST_Right_Leg_SupportFrameB" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameBOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameBInner" />
+</subtraction>
+<subtraction name="ECST_Right_Leg_SupportFrameC" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameCOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameCInner" />
+ <posXYZ volume="ECST_Right_Leg_HoleBracket" X_Y_Z=" 0.; 50.;(ECST_LL_inner_distanceZ/2+ECST_LL_zwid+ECST_cover_dist_rod+ECST_cover_thickness/2) " />
+</subtraction>
+<subtraction name="ECST_Right_Leg_SupportFrameD" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameDOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameDInner" />
+</subtraction>
+
+<box name="ECST_Right_Leg_Rod" material="Aluminium" X_Y_Z="ECST_RL_xwid; ECST_RL_ywid ; ECST_RL_zwid" />
+<composition name="ECST_Right_Leg" >
+ <posXYZ volume="ECST_Right_Leg_Rod" X_Y_Z="0. ; 0. ; ECST_RL_zwid/2+ECST_RL_inner_distanceZ/2" />
+ <posXYZ volume="ECST_Right_Leg_Rod" X_Y_Z="0. ; 0. ; -ECST_RL_zwid/2-ECST_RL_inner_distanceZ/2" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameA" X_Y_Z="0.;ECST_SupportFrameA_Ypos; 0." />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameB" X_Y_Z="0.;ECST_SupportFrameB_Ypos; 0." />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameC" X_Y_Z="0.;ECST_SupportFrameC_Ypos; 0." />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameD" X_Y_Z="0.;ECST_SupportFrameD_Ypos; 0." />
+</composition>
+
+<!-- Left Leg Construction -->
+<box name="ECST_Left_Leg_Rod" material="Aluminium" X_Y_Z="ECST_LL_xwid; ECST_LL_ywid ; ECST_LL_zwid" />
+<box name="ECST_Left_Leg_coverouter" material="Aluminium" X_Y_Z="ECST_LL_inner_distanceX+2*ECST_LL_xwid+ECST_cover_dist_rod*2+ECST_cover_thickness*2; ECST_ywid ; ECST_LL_inner_distanceZ+2*ECST_LL_zwid+ECST_cover_dist_rod*2+ECST_cover_thickness*2" />
+<box name="ECST_Left_Leg_coverinner" material="Aluminium" X_Y_Z="ECST_LL_inner_distanceX+2*ECST_LL_xwid+ECST_cover_dist_rod*2; ECST_ywid + 2.*GENV_Eps; ECST_LL_inner_distanceZ+2*ECST_LL_zwid+ECST_cover_dist_rod*2" />
+<box name="ECST_Left_Leg_HoleBracket" material="Aluminium" X_Y_Z="300.; 300.; 200." />
+
+<subtraction name="ECST_Left_Leg_cover" >
+ <posXYZ volume="ECST_Left_Leg_coverouter" />
+ <posXYZ volume="ECST_Left_Leg_coverinner" />
+ <posXYZ volume="ECST_Left_Leg_HoleBracket" X_Y_Z=" 0.; ECST_Left_Leg_HoleBracket_ypos;(ECST_LL_inner_distanceZ/2+ECST_LL_zwid+ECST_cover_dist_rod+ECST_cover_thickness/2) " />
+</subtraction>
+<composition name="ECST_Left_Leg" >
+ <posXYZ volume="ECST_Left_Leg_cover" />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="-ECST_LL_xwid/2.-ECST_LL_inner_distanceX/2.; 0.; ECST_LL_zwid/2.+ECST_LL_inner_distanceZ/2." />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="-ECST_LL_xwid/2.-ECST_LL_inner_distanceX/2.; 0.; -ECST_LL_zwid/2.-ECST_LL_inner_distanceZ/2." />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="ECST_LL_xwid/2.+ECST_LL_inner_distanceX/2.; 0.; -ECST_LL_zwid/2.-ECST_LL_inner_distanceZ/2." />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="ECST_LL_xwid/2.+ECST_LL_inner_distanceX/2.; 0.; ECST_LL_zwid/2.+ECST_LL_inner_distanceZ/2." />
+</composition>
+
+<!-- Middle Pieces Construction -->
+<box name="ECST_MiddleBarA1" material="Aluminium" X_Y_Z="ECST_RightLeftLeg_InnerDistanceX-(ECST_SupportFrame_dist_rod+ECST_SupportFrame_Thickness)-ECST_cover_thickness-ECST_cover_dist_rod-2*GENV_Eps;ECST_MiddleBarA1_ywid-2.*GENV_Eps ; ECST_MiddleBarA1_zwid" />
+<box name="ECST_MiddleBarA2" material="Aluminium" X_Y_Z="ECST_MiddleBarA2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+<box name="ECST_MiddleBarB2" material="Aluminium" X_Y_Z="ECST_MiddleBarB2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+<box name="ECST_MiddleBarC2" material="Aluminium" X_Y_Z="ECST_MiddleBarC2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+<box name="ECST_MiddleBarD2" material="Aluminium" X_Y_Z="ECST_MiddleBarD2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+
+<composition name="ECST_MiddleBars" >
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Front_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA1Front_ypos;ECST_MiddleBarA1Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarAFront_ypos-ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarAFront_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Front_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA1Front_ypos;ECST_MiddleBarA1Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarB_ypos-ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarB_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Front_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA1Front_ypos;ECST_MiddleBarA1Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarC_ypos-ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarC_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarD_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarD2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarD_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarD2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarD_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+</composition>
+
+<gvxy name="ECST_InclinedBar1" material="Aluminium" dZ="ECST_InclinedBar_width" >
+ <gvxy_point X_Y="ECST_InclinedBar1_p1x;ECST_InclinedBar1_p1y" />
+ <gvxy_point X_Y="ECST_InclinedBar1_p2x;ECST_InclinedBar1_p2y" />
+ <gvxy_point X_Y="ECST_InclinedBar1_p3x;ECST_InclinedBar1_p3y" />
+ <gvxy_point X_Y="ECST_InclinedBar1_p4x;ECST_InclinedBar1_p4y" />
+</gvxy>
+<gvxy name="ECST_InclinedBar2" material="Aluminium" dZ="ECST_InclinedBar_zwid" >
+ <gvxy_point X_Y="ECST_InclinedBar2_p1x;ECST_InclinedBar2_p1y" />
+ <gvxy_point X_Y="ECST_InclinedBar2_p2x;ECST_InclinedBar2_p2y" />
+ <gvxy_point X_Y="ECST_InclinedBar2_p3x;ECST_InclinedBar2_p3y" />
+ <gvxy_point X_Y="ECST_InclinedBar2_p4x;ECST_InclinedBar2_p4y" />
+</gvxy>
+<gvxy name="ECST_InclinedBar3" material="Aluminium" dZ="ECST_InclinedBar_zwid" >
+ <gvxy_point X_Y="ECST_InclinedBar3_p1x;ECST_InclinedBar3_p1y" />
+ <gvxy_point X_Y="ECST_InclinedBar3_p2x;ECST_InclinedBar3_p2y" />
+ <gvxy_point X_Y="ECST_InclinedBar3_p3x;ECST_InclinedBar3_p3y" />
+ <gvxy_point X_Y="ECST_InclinedBar3_p4x;ECST_InclinedBar3_p4y" />
+</gvxy>
+<composition name="ECST_InclinedBar" >
+ <posXYZ volume="ECST_InclinedBar1" X_Y_Z="0. ; 0. ; ECST_InclinedBar_width/2." />
+ <posXYZ volume="ECST_InclinedBar2" X_Y_Z="0. ; 0. ; ECST_InclinedBar_zwid/2." />
+ <posXYZ volume="ECST_InclinedBar3" X_Y_Z="0. ; 0. ; ECST_InclinedBar_zwid/2." />
+ <posXYZ volume="ECST_InclinedBar1" X_Y_Z="0. ; 0. ; 2*ECST_movez-ECST_InclinedBar_width/2." />
+ <posXYZ volume="ECST_InclinedBar2" X_Y_Z="0. ; 0. ; 2*ECST_movez-ECST_InclinedBar_zwid/2." />
+ <posXYZ volume="ECST_InclinedBar3" X_Y_Z="0. ; 0. ; 2*ECST_movez-ECST_InclinedBar_zwid/2." />
+</composition>
+
+<!-- Front frame Construction (from photos) -->
+<box name="ECST_Front_Frame_Outer" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid; ECST_Front_Frame_ywid ; ECST_Front_Frame_zwid" />
+<box name="ECST_Front_Frame_Inner4" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid-2*ECST_Front_Frame_width; ECST_Front_Frame_ywid/2. ; ECST_Front_Frame_zwid/2." />
+<box name="ECST_Front_Frame_Inner1" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid-2*ECST_Front_Frame_width; ECST_Front_Frame_ywid-2*ECST_Front_Frame_width ; ECST_Front_Frame_zwid+200" />
+<box name="ECST_Front_Frame_Inner2" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid+200; ECST_Front_Frame_ywid-2*ECST_Front_Frame_width ; ECST_Front_Frame_zwid-2*ECST_Front_Frame_width" />
+<box name="ECST_Front_Frame_Inner3" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid-2*ECST_Front_Frame_width; ECST_Front_Frame_ywid; ECST_Front_Frame_zwid-2*ECST_Front_Frame_width" />
+<subtraction name="ECST_Front_Structure" >
+ <posXYZ volume="ECST_Front_Frame_Outer" />
+ <posXYZ volume="ECST_Front_Frame_Inner1" />
+ <posXYZ volume="ECST_Front_Frame_Inner2" />
+ <posXYZ volume="ECST_Front_Frame_Inner3" X_Y_Z="0.;-ECST_Front_Frame_UpperPart_ywid;0." />
+ <posXYZ volume="ECST_Front_Frame_Inner4" X_Y_Z="0.;- ECST_Front_Frame_ywid/2.;- ECST_Front_Frame_zwid/2." />
+</subtraction>
+
+<box name="ECST_Front_Glass_Outer" material="std::Polyethylene" X_Y_Z="ECST_Front_Glass_xwid; ECST_Front_Glass_ywid ; ECST_Front_Glass_zwid" />
+<composition name="ECST_Front_Glass" >
+ <posXYZ volume="ECST_Front_Structure" X_Y_Z="0.; 0.; -2.*GENV_Eps " />
+ <posXYZ volume="ECST_Front_Glass_Outer" X_Y_Z="0.;0.;0.5*ECST_Front_Frame_zwid+20." />
+</composition>
+
+
+<!-- Front Bar Construction from atltept_0033-v0.pdf -->
+<box name="ECST_Front_Bar1" material="Aluminium" X_Y_Z="ECST_Front_Bar1_xwid-GENV_Eps; ECST_Front_Bar_ywid ; ECST_Front_Bar_zwid" />
+<box name="ECST_Front_Bar2" material="Aluminium" X_Y_Z="ECST_Front_Bar2_xwid-GENV_Eps; ECST_Front_Bar_ywid ; ECST_Front_Bar_zwid" />
+<box name="ECST_Front_Bar3" material="Aluminium" X_Y_Z="ECST_Front_Bar3_xwid-GENV_Eps; ECST_Front_Bar_ywid ; ECST_Front_Bar_zwid" />
+<composition name="ECST_Front_Bar" >
+ <posXYZ volume="ECST_Front_Bar1" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid/2;0.;0." />
+ <posXYZ volume="ECST_Front_Bar2" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid-ECST_Front_Hand_width-ECST_Front_Bar2_xwid/2;0.;0." />
+ <posXYZ volume="ECST_Front_Bar3" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid-2*ECST_Front_Hand_width-ECST_Front_Bar2_xwid-ECST_Front_Bar3_xwid/2;0.;0." />
+</composition>
+<!-- Arm Construction -->
+<!-- ECST_Front_Hand -->
+<gvxy name="ECST_Front_Hand" material="Aluminium" dZ="ECST_Front_Hand_width" >
+ <gvxy_point X_Y="ECST_Front_Hand_pointAX ; ECST_Front_Hand_pointAY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointBX ; ECST_Front_Hand_pointBY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointCX ; ECST_Front_Hand_pointCY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointDX ; ECST_Front_Hand_pointDY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointEX ; ECST_Front_Hand_pointEY " />
+</gvxy>
+<!-- ECST_Front_Bracket -->
+<gvxy name="ECST_Front_Bracket1" material="Aluminium" dZ="ECST_Front_Bracket_width" >
+ <gvxy_point X_Y="ECST_Front_Bracket_pointD1X ; ECST_Front_Bracket_pointD1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointC1X ; ECST_Front_Bracket_pointC1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointF1X ; ECST_Front_Bracket_pointF1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointF1X-ECST_Front_Bracket_Distance_From_Leg+GENV_Eps ; ECST_Front_Bracket_pointF1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointG1X-ECST_Front_Bracket_Distance_From_Leg+GENV_Eps ; ECST_Front_Bracket_pointG1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointG1X ; ECST_Front_Bracket_pointG1Y " />
+</gvxy>
+<gvxy name="ECST_Front_Bracket2" material="Aluminium" dZ="ECST_Front_Bracket23_topwidth" >
+ <gvxy_point X_Y="ECST_Front_Bracket_pointDX+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointDY+GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointD1X+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointD1Y+GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointG1X+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointG1Y+GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointGX+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointGY+GENV_Eps*ECST_unit_perp_GDy " />
+</gvxy>
+<gvxy name="ECST_Front_Bracket3" material="Aluminium" dZ="ECST_Front_Bracket23_topwidth" >
+ <gvxy_point X_Y="ECST_Front_Bracket_pointC1X-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointC1Y-GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointCX-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointCY-GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointFX-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointFY-GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointF1X-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointF1Y-GENV_Eps*ECST_unit_perp_GDy " />
+</gvxy>
+<!-- ECST_Front_Arm -->
+<composition name="ECST_Front_Arm1">
+ <posXYZ volume="ECST_Front_Hand" />
+ <posXYZ volume="ECST_Front_Bracket1" />
+ <posXYZ volume="ECST_Front_Bracket2" X_Y_Z="0.;0.;ECST_Front_Bracket23_topwidth/2" />
+ <posXYZ volume="ECST_Front_Bracket3" X_Y_Z="0.;0.;ECST_Front_Bracket23_topwidth/2" />
+</composition>
+<composition name="ECST_Front_Arm2">
+ <posXYZ volume="ECST_Front_Hand" />
+ <posXYZ volume="ECST_Front_Bracket1" />
+ <posXYZ volume="ECST_Front_Bracket2" X_Y_Z="0.;0.;-ECST_Front_Bracket23_topwidth/2" />
+ <posXYZ volume="ECST_Front_Bracket3" X_Y_Z="0.;0.;-ECST_Front_Bracket23_topwidth/2" />
+</composition>
+<!-- ECST_Front -->
+<composition name="ECST_Front">
+ <posXYZ volume="ECST_Front_Bar" />
+ <posXYZ volume="ECST_Front_Arm1" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid-ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+ <posXYZ volume="ECST_Front_Arm1" X_Y_Z="-ECST_Front_Bar_xwid/2-ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+ <posXYZ volume="ECST_Front_Arm2" X_Y_Z="ECST_Front_Bar_xwid/2+ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+ <posXYZ volume="ECST_Front_Arm2" X_Y_Z="-ECST_Front_Bar_xwid/2+ECST_Front_Bar3_xwid+ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+</composition>
+
+<composition name="ECT_ServiceTower" >
+ <posXYZ volume="ECST_Right_Leg" X_Y_Z="ECST_RL_xwid/2.+ECST_RightLeftLeg_InnerDistanceX/2.; ECST_movey; ECST_movez" />
+ <posXYZ volume="ECST_Left_Leg" X_Y_Z="-ECST_LL_inner_distanceX/2-ECST_LL_xwid-ECST_RightLeftLeg_InnerDistanceX/2.; ECST_movey; ECST_movez" />
+ <posXYZ volume="ECST_MiddleBars" />
+ <posXYZ volume="ECST_InclinedBar" />
+ <posXYZ volume="ECST_Front" X_Y_Z="ECST_RightLeftLeg_InnerDistanceX/2+ECST_RL_xwid-ECST_Front_Bar_xwid/2; ECST_Front_Bar_starty-ECST_ywid/2+ECST_Front_Bar_ywid/2+ECST_movey; ECST_Front_Bar_startz+ECST_zwid+ECST_RL_inner_distanceZ/2-ECST_Front_Bar_zwid/2+ECST_movez" />
+ <posXYZ volume="ECST_Front_Glass" X_Y_Z="ECST_Front_Frame_xpos;ECST_Front_Frame_ypos;ECST_Front_Frame_zpos" />
+</composition>
+
+<var name="ECST_SToDzBot" value="1650." /> <!-- atczte__0002-vAB 14-JUL-2006 -->
+<var name="ECST_SToThic2" value=" 50."/>
+<var name="ECST_SToYpos" value="5800." /> <!-- atczte__0002-vAB 14-JUL-2006 -->
+
+<var name="AECT_SupInnWheel_Thickness" value=" 20. "/>
+<var name="AECT_SupInnWheel_Distance" value=" 390. "/>
+<var name="AECT_SupInnWheel_SideDY" value=" 160. "/>
+<var name="AECT_SupInnWheel_SideDZ" value=" 3010. "/>
+<var name="AECT_SupInnWheel_PlateDZ" value=" 160. "/>
+<var name="AECT_SupInnWheel_Yoff" value=" 88. "/>
+
+<var name="AECT_SupOutWheel_Thickness" value=" 71. "/>
+<var name="AECT_SupOutWheel_DY" value=" 446. "/>
+<var name="AECT_SupOutWheel_XPosInn" value=" 2575. "/>
+<var name="AECT_SupOutWheel_XPosOut" value=" 3434. "/>
+
+<var name="AECT_SupWheel_AirPadSup_addDY" value=" 150. "/>
+<var name="AECT_SupWheel_AirPadSup_relZ" value=" 1330. "/>
+
+<var name="AECT_SupWheel_AirPad_Rad" value=" 350. "/>
+<var name="AECT_SupWheel_AirPad_Hight" value=" 125. "/>
+
+<var name="AECT_SupWheel_dxJackBox_DX" value=" 555. "/>
+<var name="AECT_SupWheel_dyJackBox_DY" value=" 110. "/>
+<var name="AECT_SupWheel_dzJackBox_DZ" value=" 275. "/>
+<var name="AECT_SupWheel_Jack_AbsXPos" value=" 3045. "/>
+<var name="AECT_SupWheel_Jack_DiffXPos" value=" 230. "/>
+<var name="AECT_SupWheel_Jack_Radius" value=" 80. "/>
+<var name="AECT_SupWheel_Jack_Hight" value=" 280. "/>
+<var name="AECT_SupWheel_SpecBox_DZ" value=" 2500. "/>
+
+<var name="AECT_SupWheel_YPos" value="-3945. "/>
+
+<array name="AECT_SupInnWheel_PlatePos" values=" 350. ; 852. ; 1425. ; 1998. " />
+
+<box name="ECT_SupInnWheel_Side" material="Aluminium" X_Y_Z=" AECT_SupInnWheel_Thickness ; AECT_SupInnWheel_SideDY ; AECT_SupInnWheel_SideDZ " />
+<box name="ECT_SupInnWheel_Plate" material="Aluminium" X_Y_Z=" AECT_SupInnWheel_Distance - 2.*AECT_SupInnWheel_Thickness ; AECT_SupInnWheel_Thickness ; AECT_SupInnWheel_PlateDZ " />
+<box name="ECT_SupOutWheel" material="Aluminium" X_Y_Z=" AECT_SupOutWheel_Thickness ; AECT_SupOutWheel_DY ; AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid " />
+<box name="ECT_SupWheel_AirPadSup" material="Iron" X_Y_Z=" AECT_SupInnWheel_Distance - 2.*AECT_SupInnWheel_Thickness; AECT_SupInnWheel_SideDY+AECT_SupWheel_AirPadSup_addDY; 2.*(AECT_SupWheel_AirPadSup_relZ-AECT_SupInnWheel_SideDZ/2+AECT_SupInnWheel_PlatePos[0])"/>
+<tubs name="ECT_SupWheel_AirPad" material="Iron" Rio_Z=" 0. ; AECT_SupWheel_AirPad_Rad ; AECT_SupWheel_AirPad_Hight"/>
+<box name="ECT_SupWheel_JackBox" material="Iron" X_Y_Z="AECT_SupWheel_dxJackBox_DX; AECT_SupWheel_dyJackBox_DY; AECT_SupWheel_dzJackBox_DZ"/>
+<tubs name="ECT_SupWheel_Jack" material="Iron" Rio_Z=" 0. ; AECT_SupWheel_Jack_Radius ; AECT_SupWheel_Jack_Hight"/>
+<box name="ECT_SupWheel_SpecBox" material="Aluminium" X_Y_Z="AECT_SupInnWheel_SideDY; AECT_SupInnWheel_SideDY; AECT_SupWheel_SpecBox_DZ"/>
+
+<composition name="ECT_SupWheel_basic">
+ <posXYZ volume="ECT_SupOutWheel" X_Y_Z=" (AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn+AECT_SupOutWheel_Thickness)/2.; -AECT_SupOutWheel_DY/2. ; 0. " />
+ <posXYZ volume="ECT_SupOutWheel" X_Y_Z="-(AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn+AECT_SupOutWheel_Thickness)/2.; -AECT_SupOutWheel_DY/2. ; 0. " />
+ <posXYZ volume="ECT_SupInnWheel_Side" X_Y_Z=" (AECT_SupInnWheel_Distance-AECT_SupInnWheel_Thickness)/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff ; 0. " />
+ <posXYZ volume="ECT_SupInnWheel_Side" X_Y_Z="-(AECT_SupInnWheel_Distance-AECT_SupInnWheel_Thickness)/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff ; 0. " />
+ <foreach index="Irib" begin="1" loops="3" >
+ <posXYZ volume="ECT_SupInnWheel_Plate" X_Y_Z=" 0.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; -(AECT_SupInnWheel_SideDZ-AECT_SupInnWheel_PlateDZ)/2.+AECT_SupInnWheel_PlatePos[Irib]" />
+ </foreach>
+ <posXYZ volume="ECT_SupInnWheel_Plate" X_Y_Z="0.; (AECT_SupInnWheel_SideDY-AECT_SupInnWheel_Thickness)/2.-AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; -(AECT_SupInnWheel_SideDZ-AECT_SupInnWheel_PlateDZ)/2.+AECT_SupInnWheel_PlatePos[0] " />
+ <posXYZ volume="ECT_SupInnWheel_Plate" X_Y_Z="0.; (AECT_SupInnWheel_SideDY-AECT_SupInnWheel_Thickness)/2.-AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; (AECT_SupInnWheel_SideDZ-AECT_SupInnWheel_PlateDZ)/2.-AECT_SupInnWheel_PlatePos[0] " />
+ <posXYZ volume="ECT_SupWheel_AirPadSup" X_Y_Z="0.; -(AECT_SupInnWheel_SideDY+AECT_SupWheel_AirPadSup_addDY)/2.; AECT_SupWheel_AirPadSup_relZ" />
+ <posXYZ volume="ECT_SupWheel_AirPadSup" X_Y_Z="0.; -(AECT_SupInnWheel_SideDY+AECT_SupWheel_AirPadSup_addDY)/2.; -AECT_SupWheel_AirPadSup_relZ" />
+ <posXYZ volume="ECT_SupWheel_AirPad" X_Y_Z="0.; -AECT_SupInnWheel_SideDY-AECT_SupWheel_AirPadSup_addDY-AECT_SupWheel_AirPad_Hight/2.; AECT_SupWheel_AirPadSup_relZ " rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_AirPad" X_Y_Z="0.; -AECT_SupInnWheel_SideDY-AECT_SupWheel_AirPadSup_addDY-AECT_SupWheel_AirPad_Hight/2.; -AECT_SupWheel_AirPadSup_relZ " rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_JackBox" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos/2.; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY/2.; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVOSCZ_EVOutShellConnZwid" />
+ <posXYZ volume="ECT_SupWheel_JackBox" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos/2.; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY/2.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVOSCZ_EVOutShellConnZwid" />
+</composition>
+
+<composition name="ECT_SupWheel_Right">
+ <posXYZ volume="ECT_SupWheel_basic" X_Y_Z=" (AECT_SupOutWheel_XPosOut+AECT_SupOutWheel_XPosInn)/2.; 0.; 0." />
+ <posXYZ volume="ECT_SupWheel_SpecBox" X_Y_Z=" AECT_SupOutWheel_XPosOut-AECT_SupInnWheel_SideDY/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; AECT_SupWheel_SpecBox_DZ/2." />
+</composition>
+
+<composition name="ECT_SupWheel_Left">
+ <posXYZ volume="ECT_SupWheel_basic" X_Y_Z=" -(AECT_SupOutWheel_XPosOut+AECT_SupOutWheel_XPosInn)/2.; 0.; 0." rot="0.; 180.; 0."/>
+ <posXYZ volume="ECT_SupWheel_SpecBox" X_Y_Z=" -AECT_SupOutWheel_XPosOut+AECT_SupInnWheel_SideDY/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; AECT_SupWheel_SpecBox_DZ/2." />
+</composition>
+
+<composition name="ECT_SuppoWheels" >
+ <posXYZ volume="ECT_SupWheel_Right" X_Y_Z=" 0. ; AECT_SupWheel_YPos ; 0. " />
+ <posXYZ volume="ECT_SupWheel_Left" X_Y_Z=" 0. ; AECT_SupWheel_YPos ; 0. " />
+</composition>
+
+<composition name="ECT_Toroid_single" >
+ <mposPhi volume="ECT_ColdMass" ncopy="8" />
+ <mposWedge volume="ECT_TS_ThermalShield_default" wedge_number="8" sectors=" 0; 1; 1; 1; 0; 1; 1; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_TS_ThermalShield_special" R_Phi_Z=" 0. ; -90. ; 0. " >
+ <sector value="1" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_TS_ThermalShield_special" R_Phi_Z=" 0. ;-270. ; 0. " >
+ <sector value="5" />
+ </posRPhiZ>
+ <posXYZ volume="ECT_TS_CentralTube"/>
+ <mposWedge volume="ECT_JTV_Shielding_default" wedge_number="8" sectors=" 0; 1; 1; 1; 0; 1; 1; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_JTV_Shielding_special" R_Phi_Z=" 0. ; -90. ; 0. " >
+ <sector value="1" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_JTV_Shielding_special" R_Phi_Z=" 0. ;-270. ; 0. " >
+ <sector value="5" />
+ </posRPhiZ>
+ <mposWedge volume="ECT_EV_Envelop_default" wedge_number="8" sectors=" 1; 1; 1; 1; 1; 0; 0; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_EV_Envelop_special_Sector6" R_Phi_Z=" 0. ; 135. ; 0. " >
+ <sector value="6" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_EV_Envelop_special_Sector7" R_Phi_Z=" 0. ; 180. ; 0. " >
+ <sector value="7" />
+ </posRPhiZ>
+ <mposWedge volume="ECT_EV_AlignTube_default" wedge_number="8" sectors=" 0; 1; 1; 1; 0; 1; 1; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_EV_AlignTube_special" R_Phi_Z=" 0. ; 22.5 ; 0. " >
+ <sector value="1" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_EV_AlignTube_special" R_Phi_Z=" 0. ;202.5 ; 0. " >
+ <sector value="5" />
+ </posRPhiZ>
+ <posXYZ volume="ECT_EV_CentralTube"/>
+ <posXYZ volume="ECT_JTV_FrontRing" />
+ <posXYZ volume="ECT_JTV_BackRing" X_Y_Z=" 0.; 0.; GENV_Eps"/>
+ <posXYZ volume="ECT_EV_Yoke" X_Y_Z=" 0.; 0.; AECT_CTYpoZ_CentTubeYokeposZ"/>
+ <posXYZ volume="ECT_EV_Yoke" X_Y_Z=" 0.; 0.; -AECT_CTYpoZ_CentTubeYokeposZ"/>
+ <posRPhiZ volume="ECT_EV_SideAttachment" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - (AECT_EVSSAh_EVSideSupporthight + AECT_EVOSit_EVOutShellinnthick + AECT_EVOSio_EVOutShellinneroff)/2. ; 22.5 ; 0. " />
+ <posRPhiZ volume="ECT_EV_SideAttachment" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - (AECT_EVSSAh_EVSideSupporthight + AECT_EVOSit_EVOutShellinnthick + AECT_EVOSio_EVOutShellinneroff)/2. ; 202.5 ; 0. " />
+ <posRPhiZ volume="ECT_EV_FrontAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 22.5 ; (AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <posRPhiZ volume="ECT_EV_FrontAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 202.5 ; (AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <posRPhiZ volume="ECT_EV_BackAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 22.5 ; -(AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <posRPhiZ volume="ECT_EV_BackAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 202.5 ; -(AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <mposPhi volume="ECT_EV_CryoStop_outside" ncopy="8" />
+ <mposPhi volume="ECT_EV_CryoStop_inside" ncopy="8" />
+ <posXYZ volume="ECT_ServTur" X_Y_Z=" 0. ; AECT_SrvTu1He_ServTur1Height/2. + AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_ServTuZoff_ServTurZoffset" />
+ <posXYZ volume="ECT_ServiceTower" X_Y_Z=" 0. ; ECST_SToYpos ; -ECST_SToThic2 - AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_ServTuZoff_ServTurZoffset - ECST_SToDzBot/2. " rot="0. ; 0. ; 0. " />
+ <posXYZ volume="ECT_SuppoWheels" />
+</composition>
+
+<composition name="ECT_ToroidN" >
+ <posXYZ volume="ECT_Toroid_single" X_Y_Z=" 0. ; 0. ; -AECT_Toroid_ZPosition" >
+ <ring value="-1" />
+ </posXYZ>
+</composition>
+
+<composition name="ECT_ToroidP" >
+ <posXYZ volume="ECT_Toroid_single" X_Y_Z=" 0. ; 0. ; AECT_Toroid_ZPosition" rot="0. ; 180. ; 0. ">
+ <ring value=" 1" />
+ </posXYZ>
+</composition>
+
+<composition name="ECT_Toroids" >
+ <posXYZ volume="ECT_ToroidN" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="ECT_ToroidP" X_Y_Z=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- gvxy status 10/25 are converted to subtractions -->
+
+</section>
+
+
+<section name = "Atlas Barrel Toroidal Magnets"
+ version = "7.0"
+ date = "01-01-10, 28 November 2002"
+ author = "Jochen Meyer, Laurent Chevalier, Marc Virchaux, Daniel Pomarede"
+ top_volume = "BAR_Toroid">
+
+<!-- name = Atlas Barrel Toroidal Magnets section name = "Magnets" -->
+
+<!-- reviewed/corrected in March 2010 by Jochen Meyer
+ comment: * blueprint references are available on the twiki Pages
+ * still some details are missing -->
+
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** Atlas Barrel Toroid (BAR) ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+<!-- Atlas Barrel toroid Cryostat -->
+
+<var name="ABRT_CryoRmin" value=" 4720." /> <!-- atltbw__0002-vAD 4745. -->
+<var name="ABRT_CryoRmax" value=" 10030." /> <!-- atltbw__0002-vAD 10065. -->
+<var name="ABRT_CryoZmax" value=" 12630." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryoRcur" value=" 821." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryoRadi_Radius" value=" 550." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryoRadT_RadThick" value=" 15." /> <!-- not confirmed -->
+
+<!-- Cryostat Attachment -->
+
+<!-- BEGIN confirmation with atltbyv_0010-vAB (if no other comment) -->
+<var name="ABRT_CryAttD0_CryoAttDiam0" value=" 550." />
+<var name="ABRT_CryAttD1_CryoAttDiam1" value=" 439." />
+<var name="ABRT_CryAttAl_CryoAttAlfa" value=" 8." /> <!-- atltbwv_0029-vAB -->
+<var name="ABRT_CryAttXh_CryoAttXhigh" value=" 1490." />
+<var name="ABRT_CryAttTh_CryoAttThick" value=" 10." />
+<var name="ABRT_CryAttRx_CryoAttRmax" value=" ABRT_CryoRmin + ABRT_CryoRadi_Radius" />
+<var name="ABRT_CryAttSe_CryoAttSlimend" value=" 557." />
+<!-- END confirmation with atltbyv_0010-vAB -->
+
+<!-- BEGIN confirmation with atltbyv_0007-vAC (if no other comment) -->
+<var name="ABRT_CryAtWiY_CryoAttWingY" value=" 600." />
+<var name="ABRT_CryAtWXp_CryoAttWingXp" value=" 590." />
+<var name="ABRT_CryAtWXn_CryoAttWingXn" value=" -41." />
+<var name="ABRT_CryAtWBo_CryoAttWingBoss" value=" 40." />
+<var name="ABRT_CryAtWTh_CryoAttWingThick" value=" 20." /> <!-- atltbyv_0004-vAC -->
+<var name="ABRT_CryAtWZe_CryoAttWingZesp" value=" 590." /> <!-- atltbyv_0003-vAE --> <!-- atltbyv_0004-vAC -->
+<var name="ABRT_CryAtWRa_CryoAttWingRad" value=" 570." />
+<var name="ABRT_CryAtWYc_CryoAttWingYcut" value=" 150." />
+<!-- END confirmation with atltbyv_0007-vAC -->
+
+<!-- Cryostat Ribs -->
+
+<!-- BEGIN confirmation with atltbyv_0004-vAC (if no other comment) -->
+<var name="ABRT_CryRibYw_CryoRibYwid" value=" 500." />
+<var name="ABRT_CryRibZl_CryoRibZlen" value=" 290." /> <!-- approx. since length is varying for each rib -->
+<var name="ABRT_CryRibTh_CryoRibThick" value=" 10." />
+<var name="ABRT_CryRiWYp_CryoRibWingYp" value=" 436." />
+<var name="ABRT_CryRiWYn_CryoRibWingYn" value=" 1100." />
+<var name="ABRT_CryRiWXp_CryoRibWingXp" value=" 430." />
+<var name="ABRT_CryRiWTh_CryoRibWingThick" value=" 10." />
+<var name="ABRT_CryRiWXc_CryoRibWingXncut" value=" 75." />
+<var name="ABRT_CryRiWAn_CryoRibWingAngle" value=" 62." />
+<var name="ABRT_CryRiWXn_CryoRibWingXn" value=" -tan(ABRT_CryRiWAn_CryoRibWingAngle*GENV_PiS180)*(ABRT_CryRiWYn_CryoRibWingYn - ABRT_CryRiWYp_CryoRibWingYp)/2. + ABRT_CryRiWXp_CryoRibWingXp " />
+<!-- END confirmation with atltbyv_0004-vAC -->
+
+<!-- Cryostat Ring -->
+
+<var name="ABRT_CryRngRm_CryoRingRmed" value=" 8790." /> <!-- atltbw__0002-vAD-->
+<var name="ABRT_CryRngZm_CryoRingZmed" value=" -1030." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryRngRa_CryoRingRadius" value=" 340." /> <!-- atltbyv_0004-vAC -->
+
+
+<!-- Struts -->
+<!-- BEGIN confirmation with atltbws_0023-vAA (if no other comment) -->
+<var name="ABRT_StrtYlen" value=" 5690." />
+<var name="ABRT_StrtZwid_StrutZwidth" value=" 500." />
+<var name="ABRT_StrtRthi_StrutRthick" value=" 50." />
+<var name="ABRT_StrtPoff_StrutPlateoff" value=" 50." />
+<var name="ABRT_StrtPthi_StrutPlatethick" value=" 50." />
+<var name="ABRT_StrtZthi_StrutZthick" value=" 40." />
+<!-- END confirmation with atltbws_0023-vAA -->
+
+<var name="ABRT_StrWRmax_StrutWingRmax" value="ABRT_CryoRmax" /> <!-- has to be true, otherwise everything will break down-->
+
+<!-- BEGIN confirmation with atltbyv_0006-vAB (if no other comment) -->
+<var name="ABRT_StrWYmax_StrutWingYmax" value=" 390." />
+<var name="ABRT_StrWYmed_StrutWingYmedi" value=" 791." />
+<var name="ABRT_StrWYRli_StrutWingYRlink" value=" 732." />
+<var name="ABRT_StrWRwid_StrutWingRwidth" value=" 1250." />
+<var name="ABRT_StrWYmin_StrutWingYmin" value=" 245." />
+<var name="ABRT_StrWZthi_StrutWingZthick" value=" 20." />
+<var name="ABRT_StrWYthi_StrutWingYthick" value=" 50." />
+<var name="ABRT_StrWZlen_StrutWingZlen" value=" 430." />
+<var name="ABRT_StrWYucu_StrutWingYupcut" value=" 150." />
+<var name="ABRT_StrWSPth_StrutWingSmallPlatethick" value=" 500." />
+<var name="ABRT_StrWBPth_StrutWingBigPlatethick" value=" 520." />
+<var name="ABRT_StrWBPhi_StrutWingBigPlateheight" value=" 700." />
+<!-- END confirmation with atltbyv_0006-vAB -->
+
+<array name="ABRT_Zvouss" values=" -10845. ; -8245. ; -5137.5 ; -1712.5 ; 1712.5 ; 5137.5 ; 8245. ; 10845. " /> <!-- atltbyv_0003-vAE -->
+<array name="ABRT_Zrib" values=" -9540. ; -6760. ; -3490. ; 0. ; 3490. ; 6760. ; 9540. " /> <!-- atltbyv_0003-vAE -->
+
+
+
+<!-- Derived variables -->
+
+<var name="ABRT_CryRiXhi_CryoRibXhigh" value="(ABRT_CryoRmax+ABRT_CryoRmin)/2. - ABRT_CryoRmin - ABRT_CryoRadi_Radius" />
+<var name="ABRT_CryAttXs_CryoAttXsec" value="(ABRT_CryAttD0_CryoAttDiam0 - 2.*ABRT_CryAttTh_CryoAttThick - ABRT_CryAttD1_CryoAttDiam1)/2./tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180)" />
+<var name="ABRT_StrWRmed_StrutWingRmedi" value="(ABRT_StrtYlen + 2.* ( ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick)) / 2. / GENV_Si225" />
+<var name="ABRT_StrWRmin_StrutWingRmin" value="ABRT_StrWRmax_StrutWingRmax - ABRT_StrWRwid_StrutWingRwidth" />
+<var name="ABRT_StrWYlow_StrutWingYlower" value="(ABRT_StrWRmin_StrutWingRmin - ABRT_StrWYmin_StrutWingYmin * GENV_Ta20 - ABRT_StrWRmed_StrutWingRmedi + ABRT_StrWYmed_StrutWingYmedi / GENV_Ta225 ) / (GENV_Ta675 - GENV_Ta20)" />
+<var name="ABRT_StrWRlow_StrutWingRlower" value="GENV_Ta675 * ABRT_StrWYlow_StrutWingYlower + ABRT_StrWRmed_StrutWingRmedi - ABRT_StrWYmed_StrutWingYmedi / GENV_Ta225 " />
+<var name="ABRT_StrWAlow_StrutWingAlower" value="atan((ABRT_StrWRlow_StrutWingRlower-ABRT_StrWRmax_StrutWingRmax + ABRT_StrWRwid_StrutWingRwidth)/(ABRT_StrWYlow_StrutWingYlower-ABRT_StrWYmin_StrutWingYmin))" />
+<var name="ABRT_StrWAupp_StrutWingAupper" value="atan((ABRT_StrWRmax_StrutWingRmax-ABRT_StrWRmed_StrutWingRmedi)/(ABRT_StrWYmed_StrutWingYmedi-ABRT_StrWYmax_StrutWingYmax))" />
+
+<!-- Description of an Atlas Barrel Cold Mass -->
+
+<!-- BEGIN confirmation with atltbcc_0002-v0 (if no other comment) -->
+<var name="ABRT_CoMaRmin_ColdMassRmin" value=" 4851.1" /> <!-- not confirmed, old GUESS 4857.5 -->
+<var name="ABRT_CoMaRmax_ColdMassRmax" value=" 9924.3" /> <!-- not confirmed, old GUESS 9952.5 -->
+<var name="ABRT_CoMaZmax_ColdMassZmax" value="12478.8" /> <!-- warm: 12532.5 -->
+<var name="ABRT_CoMaRcuI_ColdMassRcurv" value=" 1449.8" /> <!-- warm: 1456. -->
+<var name="ABRT_CoMaRThi_ColdMassRThick" value=" 791.6" /> <!-- warm: 795. -->
+<var name="ABRT_CoMaYThi_ColdMassYThick" value=" 288. " /> <!-- warm: 288. (here warm value used because of ABRT_BielAtTh_BiellAttThick=288. too) -->
+<var name="ABRT_CoMaRibZ_ColdMassRibZ" value=" 99.6" /> <!-- warm: 100. -->
+<var name="ABRT_CoMaRanL_ColdMassRanglen" value=" 385.6" /> <!-- warm: 387.2 -->
+<!-- END confirmation with atltbcc_0002-v0 -->
+
+<box name="BAR_ColdMassAlongZ" material="Aluminium8" X_Y_Z="ABRT_CoMaRThi_ColdMassRThick; ABRT_CoMaYThi_ColdMassYThick; 2.*(ABRT_CoMaZmax_ColdMassZmax - ABRT_CoMaRcuI_ColdMassRcurv) - GENV_Eps" />
+<box name="BAR_ColdMassAlongR" material="Aluminium8" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRmin_ColdMassRmin - 2.*ABRT_CoMaRcuI_ColdMassRcurv - GENV_Eps; ABRT_CoMaYThi_ColdMassYThick; ABRT_CoMaRThi_ColdMassRThick " />
+
+<gvxy name="BAR_CornerAngled_Cut" material="Aluminium8" dZ="ABRT_CoMaYThi_ColdMassYThick + GENV_Eps" >
+ <gvxy_point X_Y=" ABRT_CoMaRThi_ColdMassRThick; -GENV_Eps " />
+ <gvxy_point X_Y=" ABRT_CoMaRThi_ColdMassRThick; ABRT_CoMaRcuI_ColdMassRcurv - ABRT_CoMaRThi_ColdMassRThick - ABRT_CoMaRanL_ColdMassRanglen" />
+ <gvxy_point X_Y=" ABRT_CoMaRThi_ColdMassRThick + ABRT_CoMaRanL_ColdMassRanglen; ABRT_CoMaRcuI_ColdMassRcurv - ABRT_CoMaRThi_ColdMassRThick" />
+ <gvxy_point X_Y=" ABRT_CoMaRcuI_ColdMassRcurv + GENV_Eps; ABRT_CoMaRcuI_ColdMassRcurv - ABRT_CoMaRThi_ColdMassRThick" />
+ <gvxy_point X_Y=" ABRT_CoMaRcuI_ColdMassRcurv + GENV_Eps; -GENV_Eps " />
+</gvxy>
+<tubs name="BAR_CornerRound" material="Aluminium8" Rio_Z=" 0. ; ABRT_CoMaRcuI_ColdMassRcurv ; ABRT_CoMaYThi_ColdMassYThick" profile="90.; 90." nbPhi="8" />
+<subtraction name="BAR_Corner" >
+ <posXYZ volume="BAR_CornerRound" X_Y_Z=" ABRT_CoMaRcuI_ColdMassRcurv; 0. ; 0. " rot=" 90. ; 0. ; 0. "/>
+ <posXYZ volume="BAR_CornerAngled_Cut" X_Y_Z=" 0. ; 0. ; 0. " rot=" 90. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="BAR_ColdMassRib" material="Aluminium8" X_Y_Z=" ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRmin_ColdMassRmin - 2.*ABRT_CoMaRThi_ColdMassRThick - GENV_Eps; ABRT_CoMaYThi_ColdMassYThick; ABRT_CoMaRibZ_ColdMassRibZ" />
+
+<composition name="BAR_ColdMassCoil" >
+ <posXYZ volume="BAR_ColdMassAlongZ" X_Y_Z="ABRT_CoMaRmin_ColdMassRmin + ABRT_CoMaRThi_ColdMassRThick/2. ; 0; 0." />
+ <posXYZ volume="BAR_ColdMassAlongZ" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRThi_ColdMassRThick/2. ; 0; 0." />
+ <posXYZ volume="BAR_ColdMassAlongR" X_Y_Z="(ABRT_CoMaRmax_ColdMassRmax+ABRT_CoMaRmin_ColdMassRmin)/2.; 0; ABRT_CoMaZmax_ColdMassZmax - ABRT_CoMaRThi_ColdMassRThick/2." />
+ <posXYZ volume="BAR_ColdMassAlongR" X_Y_Z="(ABRT_CoMaRmax_ColdMassRmax+ABRT_CoMaRmin_ColdMassRmin)/2.; 0; -ABRT_CoMaZmax_ColdMassZmax + ABRT_CoMaRThi_ColdMassRThick/2." />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmin_ColdMassRmin ; 0.; ABRT_CoMaZmax_ColdMassZmax - ABRT_CoMaRcuI_ColdMassRcurv" rot=" 0. ; 0. ; 0. " />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmin_ColdMassRmin + ABRT_CoMaRcuI_ColdMassRcurv ; 0.; -ABRT_CoMaZmax_ColdMassZmax" rot=" 0. ; 270. ; 0. " />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax ; 0.; -ABRT_CoMaZmax_ColdMassZmax + ABRT_CoMaRcuI_ColdMassRcurv" rot=" 0. ; 180. ; 0. " />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRcuI_ColdMassRcurv; 0.; ABRT_CoMaZmax_ColdMassZmax" rot=" 0. ; 90. ; 0. " />
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_ColdMassRib" X_Y_Z=" (ABRT_CoMaRmax_ColdMassRmax+ABRT_CoMaRmin_ColdMassRmin)/2.; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</composition>
+
+
+<!-- Description of an Atlas Barrel toroid Biellette -->
+
+<!-- BEGIN confirmation with atltbys_0002-v0 (if no other comment) -->
+<var name="ABRT_BielYhei_BiellYheight" value= "1099." /> <!-- approx., explanation see twikipage -->
+<var name="ABRT_BielYso1_BiellYsole1" value= " 27." /> <!-- approx., explanation see twikipage -->
+<var name="ABRT_BielXsol_BiellXsole" value= " 130." />
+<var name="ABRT_BielXth1_BiellXthick1" value= " 20." />
+<var name="ABRT_BielXth2_BiellXthick2" value= " 30." />
+<var name="ABRT_BielZth1_BiellZthick1" value= " 240." />
+<var name="ABRT_BielRHol_BiellRadHole" value= " 62." />
+<var name="ABRT_BielYcHo_BiellYcenHole" value= " 120." />
+<var name="ABRT_BielElen_BiellEdgeLen" value= " 120." />
+<var name="ABRT_BielYki1_BiellYKink1" value= " 484." />
+<var name="ABRT_BielAki1_BiellAngKink1" value= " 10." />
+<var name="ABRT_BielAppr_BiellApprox" value= " 21." /> <!-- approx., explanation see twikipage -->
+<!-- END confirmation with atltbys_0002-v0 -->
+
+<var name="ABRT_BielYso2_BiellYsole2" value= " GENV_Ta15 * (ABRT_BielXsol_BiellXsole - ABRT_BielXth1_BiellXthick1)/2. + ABRT_BielYso1_BiellYsole1" />
+<var name="ABRT_BielYXHo_BiellXYHole" value= " ABRT_BielElen_BiellEdgeLen * ( -1 + 2.*GENV_Si45 )" />
+
+<!-- Aluminium7 to be replaced by Titanium7 !!!! -->
+<gvxysx name="BAR_Biellette_1" material="Aluminium7" dZ="ABRT_BielZth1_BiellZthick1" >
+ <gvxy_point X_Y=" ABRT_BielYXHo_BiellXYHole ; 0. " />
+ <gvxy_point X_Y=" ABRT_BielElen_BiellEdgeLen ; ABRT_BielElen_BiellEdgeLen - ABRT_BielYXHo_BiellXYHole " />
+ <gvxy_point X_Y=" ABRT_BielElen_BiellEdgeLen ; ABRT_BielElen_BiellEdgeLen + 49.7 " />
+ <gvxy_point X_Y=" ABRT_BielXth2_BiellXthick2/2. ; ABRT_BielElen_BiellEdgeLen + 49.7 + (ABRT_BielZth1_BiellZthick1 - ABRT_BielXth2_BiellXthick2)/(2. * tan(40.0*GENV_PiS180)) " />
+ <gvxy_point X_Y=" ABRT_BielXth2_BiellXthick2/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYki1_BiellYKink1 + ABRT_BielAppr_BiellApprox - (ABRT_BielXth2_BiellXthick2 - ABRT_BielXth1_BiellXthick1)/tan(ABRT_BielAki1_BiellAngKink1*GENV_PiS180) " />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYki1_BiellYKink1 + ABRT_BielAppr_BiellApprox" />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYso2_BiellYsole2 " />
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYso1_BiellYsole1 " />
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole/2. ; ABRT_BielYhei_BiellYheight " />
+</gvxysx>
+<tubs name="BAR_Biellette_2" material="Aluminium7" Rio_Z="0.; ABRT_BielRHol_BiellRadHole; 300." nbPhi="16" />
+<gvxy name="BAR_Biellette_3" material="Aluminium7" dZ="500." >
+ <gvxy_point X_Y=" 70. ; -GENV_Eps " />
+ <gvxy_point X_Y=" 70. ; 246. " />
+ <gvxy_point X_Y=" ABRT_BielZth1_BiellZthick1/2. + GENV_Eps ; 358. " />
+ <gvxy_point X_Y=" ABRT_BielZth1_BiellZthick1/2. + GENV_Eps ; -GENV_Eps " />
+</gvxy>
+<subtraction name="BAR_Biellette" >
+ <posXYZ volume="BAR_Biellette_1" />
+ <posXYZ volume="BAR_Biellette_2" X_Y_Z=" 0. ; ABRT_BielYcHo_BiellYcenHole ; 0. " />
+ <posXYZ volume="BAR_Biellette_3" rot=" 0. ; 90. ; 0. " />
+ <posXYZ volume="BAR_Biellette_3" rot=" 0. ; -90. ; 0. " />
+</subtraction>
+
+
+<!-- BEGIN confirmation with atltbcc_0006-v0 (if no other comment) -->
+<var name="ABRT_BielAtL1_BiellAttLeng1" value= " 575. " />
+<var name="ABRT_BielAtL2_BiellAttLeng2" value= " 280. " />
+<var name="ABRT_BielAtTh_BiellAttThick" value= " 288. " />
+<var name="ABRT_BielAtHe_BiellAttHeight" value= " 147.5" />
+<!-- END confirmation with atltbcc_0006-v0 -->
+
+<trd name="BAR_BiellAttFull" material="Aluminium8" Xmp_Ymp_Z=" ABRT_BielAtL1_BiellAttLeng1 ; ABRT_BielAtL2_BiellAttLeng2 ; ABRT_BielAtTh_BiellAttThick ; ABRT_BielAtTh_BiellAttThick ; ABRT_BielAtHe_BiellAttHeight " />
+<gvxysx name="BAR_BiellAttHol" material="Aluminium8" dZ="2.*ABRT_BielAtTh_BiellAttThick" >
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole*0.6 ; -GENV_Eps " />
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole*0.6 ; ABRT_BielYso1_BiellYsole1 " />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1*0.7 ; ABRT_BielYso2_BiellYsole2+GENV_Eps " />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1*0.7 ; ABRT_BielAtHe_BiellAttHeight+GENV_Eps " />
+</gvxysx>
+<subtraction name="BAR_BiellAtt" >
+ <posXYZ volume="BAR_BiellAttFull" X_Y_Z=" ABRT_BielAtHe_BiellAttHeight/2. ; 0. ; 0. " rot=" 0. ; 90. ; 0. " />
+ <posXYZ volume="BAR_BiellAttHol" rot=" 90. ; 90. ; 0. " />
+</subtraction>
+
+<composition name="BAR_ColdMass_Sector" >
+ <posXYZ volume="BAR_ColdMassCoil" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. " />
+ <foreach index="Ivouss" begin="0" loops="8" >
+ <posXYZ volume="BAR_Biellette" X_Y_Z=" ABRT_CoMaRmin_ColdMassRmin+ABRT_CoMaRThi_ColdMassRThick+ABRT_BielYhei_BiellYheight+GENV_Eps ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 90. " />
+ <posXYZ volume="BAR_BiellAtt" X_Y_Z=" ABRT_CoMaRmin_ColdMassRmin+ABRT_CoMaRThi_ColdMassRThick+GENV_Eps ; 0. ; ABRT_Zvouss[Ivouss] " />
+ </foreach>
+</composition>
+
+
+
+
+<!-- Description of the Atlas Barrel toroid Cryostat -->
+
+<!-- basic CryoTube volumes, uncut -->
+<tubs name="BAR_CryoTubAlongZBase" material="Iron1" Rio_Z="ABRT_CryoRadi_Radius - ABRT_CryoRadT_RadThick; ABRT_CryoRadi_Radius; 2.*ABRT_CryoZmax - 2.*ABRT_CryoRadi_Radius - ABRT_CryoRcur*sqrt(2.) + 2.*GENV_Ta225*ABRT_CryoRadi_Radius" nbPhi="25" />
+<tubs name="BAR_CryoTubAlongRBase" material="Iron1" Rio_Z="ABRT_CryoRadi_Radius - ABRT_CryoRadT_RadThick; ABRT_CryoRadi_Radius; ABRT_CryoRmax - ABRT_CryoRmin - 2.*ABRT_CryoRadi_Radius - ABRT_CryoRcur*sqrt(2.) + 2.*GENV_Ta225*ABRT_CryoRadi_Radius" nbPhi="32" />
+<tubs name="BAR_CryoTubCornerBase" material="Iron1" Rio_Z="ABRT_CryoRadi_Radius - ABRT_CryoRadT_RadThick; ABRT_CryoRadi_Radius; ABRT_CryoRcur + 2.*GENV_Ta225*ABRT_CryoRadi_Radius" nbPhi="32" />
+
+<!-- basic CryoRib volumes, uncut -->
+<box name="BAR_CryoRibOut" material="Iron1" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRmin - 2.* ABRT_CryoRadi_Radius ; ABRT_CryRibYw_CryoRibYwid ; ABRT_CryRibZl_CryoRibZlen " />
+<box name="BAR_CryoRibIn" material="Iron6" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRmin - 2.* ABRT_CryoRadi_Radius + 2.*GENV_Eps ; ABRT_CryRibYw_CryoRibYwid-2.*ABRT_CryRibTh_CryoRibThick ; ABRT_CryRibZl_CryoRibZlen-2.*ABRT_CryRibTh_CryoRibThick " />
+
+<!-- basic CryoAtt volumes, uncut -->
+<pcon name="BAR_CryoAttOut" material="Iron1" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. ; 0. " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttXs_CryoAttXsec - ABRT_CryAttSe_CryoAttSlimend" />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2.+ABRT_CryAttTh_CryoAttThick ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttSe_CryoAttSlimend" />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2.+ABRT_CryAttTh_CryoAttThick ; ABRT_CryAttXh_CryoAttXhigh " />
+</pcon>
+<pcon name="BAR_CryoAttIn" material="Iron6" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2.-ABRT_CryAttTh_CryoAttThick ; -GENV_Eps " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2.-ABRT_CryAttTh_CryoAttThick ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttXs_CryoAttXsec - ABRT_CryAttSe_CryoAttSlimend - ABRT_CryAttTh_CryoAttThick*tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180/2.) " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2. ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttSe_CryoAttSlimend-ABRT_CryAttTh_CryoAttThick*tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180/2.) " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2. ; ABRT_CryAttXh_CryoAttXhigh + GENV_Eps " />
+</pcon>
+
+<!-- CryoTube cut volumes -->
+<box name="BAR_CryoTubCutBox" material="Iron1" X_Y_Z="2.*ABRT_CryoRadi_Radius/GENV_Co225; 2.*ABRT_CryoRadi_Radius/GENV_Co225; 2.*ABRT_CryoRadi_Radius/GENV_Co225 " />
+<tubs name="BAR_CryoTubCut" material="Iron1" Rio_Z=" 0. ; ABRT_CryoRadi_Radius+10.*GENV_Eps ; 2.*ABRT_CryRngRa_CryoRingRadius+2.*ABRT_CryRibZl_CryoRibZlen+ABRT_StrWZlen_StrutWingZlen " nbPhi="32" />
+
+<!-- Begin of CryoRibWing -->
+<gvxysx name="BAR_CryoRibWingA" material="Iron4" dZ=" ABRT_CryRibZl_CryoRibZlen+2.*ABRT_CryRiWTh_CryoRibWingThick+2.*GENV_Eps" >
+ <gvxy_point X_Y=" ABRT_CryRiWYp_CryoRibWingYp/2. ; ABRT_CryRiWXp_CryoRibWingXp " />
+ <gvxy_point X_Y=" ABRT_CryRiWYn_CryoRibWingYn/2. ; ABRT_CryRiWXn_CryoRibWingXn " />
+ <gvxy_point X_Y=" ABRT_CryRiWYn_CryoRibWingYn/2. ; -ABRT_CryoRadi_Radius+ABRT_CryRiWXc_CryoRibWingXncut " />
+</gvxysx>
+<box name="BAR_CryoRibWingB" material="Iron1" X_Y_Z=" 4.*ABRT_CryoRadi_Radius ; 4.*ABRT_CryoRadi_Radius ; ABRT_CryRibZl_CryoRibZlen+2.*GENV_Eps " />
+<subtraction name="BAR_CryoRibWing" >
+ <posXYZ volume="BAR_CryoRibWingA" />
+ <posXYZ volume="BAR_CryoRibWingB" />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" 0. ; -ABRT_CryoRadi_Radius - 5.*GENV_Eps ; 0. " />
+</subtraction>
+<!-- End of CryoRibWing -->
+
+<!-- Begin of CryoAttWing -->
+<gvxysx name="BAR_CryoAttWingA" material="Iron4" dZ=" ABRT_CryAtWZe_CryoAttWingZesp+2.*ABRT_CryAtWTh_CryoAttWingThick" >
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY-ABRT_CryAtWBo_CryoAttWingBoss ; ABRT_CryAtWXp_CryoAttWingXp " />
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY ; ABRT_CryAtWXp_CryoAttWingXp-ABRT_CryAtWBo_CryoAttWingBoss " />
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY ; ABRT_CryAtWXn_CryoAttWingXn " />
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY-(2*ABRT_CryoRadi_Radius+ABRT_CryAtWXn_CryoAttWingXn)*GENV_Ta225 ;-2.*ABRT_CryoRadi_Radius " />
+</gvxysx>
+<box name="BAR_CryoAttWingB" material="Iron1" X_Y_Z=" 4.*ABRT_CryoRadi_Radius ; 6.*ABRT_CryoRadi_Radius ; ABRT_CryAtWZe_CryoAttWingZesp " />
+<tubs name="BAR_CryoAttWingC" material="Iron4" Rio_Z=" ABRT_CryAtWRa_CryoAttWingRad ; 2.*ABRT_CryAtWRa_CryoAttWingRad ; 2.*ABRT_CryAtWZe_CryoAttWingZesp " profile=" 202.5 ; 135. " nbPhi="16" />
+<box name="BAR_CryoAttWingD" material="Iron1" X_Y_Z=" 2.*ABRT_CryAtWYc_CryoAttWingYcut ; 2.*ABRT_CryoRadi_Radius ; 3.*ABRT_CryAtWZe_CryoAttWingZesp " />
+<subtraction name="BAR_CryoAttWing" >
+ <posXYZ volume="BAR_CryoAttWingA" />
+ <posXYZ volume="BAR_CryoAttWingB" />
+ <posXYZ volume="BAR_CryoAttWingC" />
+ <posXYZ volume="BAR_CryoTubCut" />
+ <posXYZ volume="BAR_CryoAttWingD" X_Y_Z=" 0. ; -ABRT_CryoRadi_Radius ; 0. " />
+</subtraction>
+<!-- End of CryoAttWing -->
+<!-- laurent -->
+<!-- Begin of CryoTube volumes including cuts -->
+<subtraction name="BAR_CryoTubAlongZ_Down" >
+ <posXYZ volume="BAR_CryoTubAlongZBase" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius ; 0. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps " rot=" 0. ; 22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; -(ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps)" rot=" 0. ; -22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="0" loops="8" >
+ <posXYZ volume="BAR_CryoAttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_CryoTubAlongZ_Up" >
+ <posXYZ volume="BAR_CryoTubAlongZBase" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius; 0. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps " rot=" 0. ; -22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; -(ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps)" rot=" 0. ; 22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_CryoTubAlongR_Plus" >
+ <posXYZ volume="BAR_CryoTubAlongRBase" X_Y_Z=" (ABRT_CryoRmin + ABRT_CryoRmax)/2.; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius" rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRcur/sqrt(2.) + GENV_Eps; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 " rot=" 0. ; -22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 " rot=" 0. ; 22.5 ; 0. "/>
+</subtraction>
+
+<subtraction name="BAR_CryoTubCorner" >
+ <posXYZ volume="BAR_CryoTubCornerBase" X_Y_Z=" (ABRT_CryoRcur + 2.*GENV_Ta225*ABRT_CryoRadi_Radius)/(2.*sqrt(2.)) + ABRT_CryoRadi_Radius/sqrt(2.) + ABRT_CryoRmin; 0. ; (ABRT_CryoRcur + 2.*GENV_Ta225*ABRT_CryoRadi_Radius)/(2.*sqrt(2.)) - ABRT_CryoRadi_Radius/sqrt(2.) + ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRcur/sqrt(2.) + GENV_Ta225*ABRT_CryoRadi_Radius" rot=" 0. ; 45. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius - GENV_Ta225*ABRT_CryoRadi_Radius; 0. ; ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - 2.*ABRT_CryoRadi_Radius" rot=" 0. ; 22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + 2.*ABRT_CryoRadi_Radius + ABRT_CryoRcur/sqrt(2.) ; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius + ABRT_CryoRadi_Radius*GENV_Ta225" rot=" 0. ; -22.5 ; 0. "/>
+</subtraction>
+<!-- End of CryoTube with cuts -->
+
+<!-- Begin of barrel toroid thermal shielding between CryoTub and Coldmass -->
+<var name="BAR_ThermShield_OuterAngle" value=" 35. " />
+<var name="BAR_ThermShield_InnerAngle" value=" 30. " />
+
+<var name="BAR_ThermShield_Thickness" value=" 5. " />
+<var name="BAR_ThermShield_YHight" value=" 656. " />
+<var name="BAR_ThermShield_OuterXLenght" value=" 152. " />
+<var name="BAR_ThermShield_InnerXLenght" value=" 121. " />
+<var name="BAR_ThermShield_TopXLenght" value=" 657. " />
+<var name="BAR_ThermShield_XOverlap" value=" 35. " />
+
+<!-- <var name="BAR_ThermShield_TotalZLength" value=" 25105. " /> replaced by Zmax of coldmass to be consistent, arbitrary value added to resolve overlap, difference after adding arbitrary value of 80 is 67.4 mm -->
+<var name="BAR_ThermShield_TotalZLength" value=" 2.*ABRT_CoMaZmax_ColdMassZmax + 80. " />
+<!-- <var name="BAR_ThermShield_TotalXLength" value=" 5135. " /> replaced by radius diff of coldmass to be consistent, difference 61.8 mm, adding arbitrary value to resolve overlap, afterwards only 11.8mm diff -->
+<var name="BAR_ThermShield_RadiusMin" value="ABRT_CoMaRmin_ColdMassRmin - 25. " />
+<var name="BAR_ThermShield_RadiusMax" value="ABRT_CoMaRmax_ColdMassRmax + 25. " />
+<var name="BAR_ThermShield_TotalXLength" value="BAR_ThermShield_RadiusMax - BAR_ThermShield_RadiusMin" />
+<var name="BAR_ThermShield_OuterEdgeLen" value=" 1217.4 " />
+
+<var name="BAR_ThermShield_XLenght" value="BAR_ThermShield_TopXLenght+BAR_ThermShield_InnerXLenght+BAR_ThermShield_OuterXLenght-2.*BAR_ThermShield_XOverlap" />
+
+<gvxysx name="BAR_ThermShield_AlongZOuter" material="Aluminium1" dZ="(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5.-GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) ; BAR_ThermShield_XLenght/2." />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2.+ BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) ; -BAR_ThermShield_XLenght/2." />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_AlongZInner" material="Aluminium1" dZ="(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5.-GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_InnerAngle/2.*GENV_PiS180); BAR_ThermShield_XLenght/2. - BAR_ThermShield_Thickness" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap - BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_InnerAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap + BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_OuterAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_OuterAngle/2.*GENV_PiS180); -BAR_ThermShield_XLenght/2. + BAR_ThermShield_Thickness" />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_AlongROuter" material="Aluminium1" dZ="BAR_ThermShield_TotalXLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45 - GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) ; BAR_ThermShield_XLenght/2." />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2.+ BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) ; -BAR_ThermShield_XLenght/2." />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_AlongRInner" material="Aluminium1" dZ="BAR_ThermShield_TotalXLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45 - GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_InnerAngle/2.*GENV_PiS180); BAR_ThermShield_XLenght/2. - BAR_ThermShield_Thickness" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap - BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_InnerAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap + BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_OuterAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_OuterAngle/2.*GENV_PiS180); -BAR_ThermShield_XLenght/2. + BAR_ThermShield_Thickness" />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_CornerOuter" material="Aluminium1" dZ="BAR_ThermShield_OuterEdgeLen">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) ; BAR_ThermShield_XLenght/2." />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2.+ BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) ; -BAR_ThermShield_XLenght/2." />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_CornerInner" material="Aluminium1" dZ="BAR_ThermShield_OuterEdgeLen">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_InnerAngle/2.*GENV_PiS180); BAR_ThermShield_XLenght/2. - BAR_ThermShield_Thickness" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap - BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_InnerAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap + BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_OuterAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_OuterAngle/2.*GENV_PiS180); -BAR_ThermShield_XLenght/2. + BAR_ThermShield_Thickness" />
+</gvxysx>
+
+<box name="BAR_ThermShield_CutBox" material="Aluminium1" X_Y_Z="BAR_ThermShield_XLenght/GENV_Co225; BAR_ThermShield_XLenght/GENV_Co225; BAR_ThermShield_XLenght/GENV_Co225" />
+
+<pcon name="BAR_ThermShield_AttIn" material="Aluminium1" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. + 20. ; -GENV_Eps " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. + 20. ; ABRT_CryAttXh_CryoAttXhigh + GENV_Eps " />
+</pcon>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part1" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. + BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps " rot=" 0. ; 22.5 ; 0. "/>
+ <foreach index="Irib" begin="6" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="6" loops="2" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part2" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <foreach index="Irib" begin="4" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="5" loops="1" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part3" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; -90. "/>
+ <foreach index="Irib" begin="3" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="3" loops="2" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part4" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <foreach index="Irib" begin="1" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="2" loops="1" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part5" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. + BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; -(BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps)" rot=" 0. ; -22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="0" loops="2" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part1" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps " rot=" 0. ; -22.5 ; 0. "/>
+ <foreach index="Irib" begin="6" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part2" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <foreach index="Irib" begin="4" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part3" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; 90. "/>
+ <foreach index="Irib" begin="3" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part4" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <foreach index="Irib" begin="1" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part5" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; -(BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps)" rot=" 0. ; 22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongR" >
+ <posXYZ volume="BAR_ThermShield_AlongROuter" X_Y_Z=" (BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax)/2.; 0. ; (BAR_ThermShield_TotalZLength - BAR_ThermShield_XLenght)/2. " rot=" -90. ; 0. ; -90. " />
+ <posXYZ volume="BAR_ThermShield_AlongRInner" X_Y_Z=" (BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax)/2.; 0. ; (BAR_ThermShield_TotalZLength - BAR_ThermShield_XLenght)/2. " rot=" -90. ; 0. ; -90. " />
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) + GENV_Eps; 0. ; BAR_ThermShield_TotalZLength/2. - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 " rot=" 0. ; -22.5 ; 0. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMax - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps; 0. ; BAR_ThermShield_TotalZLength/2. - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 " rot=" 0. ; 22.5 ; 0. "/>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_Corner" >
+ <posXYZ volume="BAR_ThermShield_CornerOuter" X_Y_Z=" (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + BAR_ThermShield_XLenght/2./sqrt(2.) + BAR_ThermShield_RadiusMin; 0. ; - (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + (2.+sqrt(2.))*BAR_ThermShield_XLenght*GENV_Ta225/(2.*sqrt(2.)) - (1.+sqrt(2.))*BAR_ThermShield_XLenght/(2.*sqrt(2.)) + BAR_ThermShield_TotalZLength/2." rot=" -45. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CornerInner" X_Y_Z=" (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + BAR_ThermShield_XLenght/2./sqrt(2.) + BAR_ThermShield_RadiusMin; 0. ; - (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + (2.+sqrt(2.))*BAR_ThermShield_XLenght*GENV_Ta225/(2.*sqrt(2.)) - (1.+sqrt(2.))*BAR_ThermShield_XLenght/(2.*sqrt(2.)) + BAR_ThermShield_TotalZLength/2." rot=" -45. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + (1. - GENV_Ta225)*BAR_ThermShield_XLenght/2.; 0. ; BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - BAR_ThermShield_XLenght" rot=" 0. ; 22.5 ; 0. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght + (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) ; 0. ; BAR_ThermShield_TotalZLength/2. - BAR_ThermShield_XLenght/2.*(1. -GENV_Ta225)" rot=" 0. ; -22.5 ; 0. "/>
+</subtraction>
+
+<composition name="BAR_ThermShield_Sector" >
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part1" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part2" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part3" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part4" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part5" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part1" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part2" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part3" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part4" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part5" />
+ <posXYZ volume="BAR_ThermShield_AlongR" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_ThermShield_AlongR" X_Y_Z=" 0.; 0.; 0." rot=" 0. ; 180. ; 180. "/>
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" 0.; 0.; 0." rot=" 0. ; 180. ; 180. "/>
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax; 0.; 0." rot=" 0. ; 180. ; 0. "/>
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax; 0.; 0." rot=" 0. ; 0. ; 180. "/>
+</composition>
+
+<!-- End of barrel toroid thermal shielding -->
+
+<var name="AFT_BTBrktInf_BackPlate_XLong" value="1080. " />
+<var name="AFT_BTBrktInf_BackPlate_XOff" value=" 140. " />
+<var name="AFT_BTBrktInf_BackPlate_XGap" value=" 190. " />
+
+<var name="AFT_BTBrktInf_BackPlate_YLong" value=" 305. " />
+<var name="AFT_BTBrktInf_BackPlate_YAngle" value=" 22. " />
+<var name="AFT_BTBrktInf_BackPlate_YOff" value=" 150. " />
+<var name="AFT_BTBrktInf_BackPlate_YGap" value=" 40. " />
+
+<var name="AFT_BTBrktInf_BackPlate_Thickness" value=" 20. " />
+
+<gvxysx name="AFT_BTBrktInf_BackPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff-AFT_BTBrktInf_BackPlate_XGap; 0."/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff-AFT_BTBrktInf_BackPlate_XGap; AFT_BTBrktInf_BackPlate_YGap"/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff; AFT_BTBrktInf_BackPlate_YGap"/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff; 0."/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.; 0."/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.; AFT_BTBrktInf_BackPlate_YOff"/>
+ <gvxy_point X_Y="(AFT_BTBrktInf_BackPlate_XLong/2.)-((AFT_BTBrktInf_BackPlate_YLong-AFT_BTBrktInf_BackPlate_YOff)*tan(AFT_BTBrktInf_BackPlate_YAngle*GENV_PiS180)); AFT_BTBrktInf_BackPlate_YLong"/>
+</gvxysx>
+
+<var name="AFT_BTBrktInf_ZLength" value=" 280. " />
+<var name="AFT_BTBrktInf_TopCentralXLong" value=" 590. " />
+<var name="AFT_BTBrktInf_CentralSpacerYLong" value=" 80. " />
+<var name="AFT_BTBrktInf_YSpacerTotal" value=" 168. " />
+
+<var name="AFT_BTBrktInf_CentralSpacerOffsetX" value=" 407. " />
+<var name="AFT_BTBrktInf_SideSpacerOffsetX" value=" 42.5" />
+
+<box name="AFT_BTBrktInf_LowCenterLongX" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_XLong-2.*(AFT_BTBrktInf_BackPlate_XOff+AFT_BTBrktInf_BackPlate_XGap); AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_LowSideLongX" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_XOff; AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_TopCenterLongX" material="Iron" X_Y_Z="AFT_BTBrktInf_TopCentralXLong; 2.+AFT_BTBrktInf_BackPlate_Thickness*2.; AFT_BTBrktInf_ZLength" />
+
+<box name="AFT_BTBrktInf_CtrSpacerPlate" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_CentralSpacerYLong; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_MidSpacerPlate" material="Iron" X_Y_Z="2.*AFT_BTBrktInf_BackPlate_Thickness+2.; AFT_BTBrktInf_YSpacerTotal-2.-2.*AFT_BTBrktInf_BackPlate_Thickness-AFT_BTBrktInf_CentralSpacerYLong; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_SideSpacerPlate" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_YSpacerTotal; AFT_BTBrktInf_ZLength" />
+
+<composition name="AFT_BTBrktInf">
+ <posXYZ volume="AFT_BTBrktInf_BackPlate" X_Y_Z=" 0.; 0.; AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrktInf_ZLength" />
+ <posXYZ volume="AFT_BTBrktInf_LowCenterLongX" X_Y_Z=" 0.; AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_LowSideLongX" X_Y_Z=" (AFT_BTBrktInf_BackPlate_XLong-AFT_BTBrktInf_BackPlate_XOff)/2.; AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_LowSideLongX" X_Y_Z=" -(AFT_BTBrktInf_BackPlate_XLong-AFT_BTBrktInf_BackPlate_XOff)/2.; AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_TopCenterLongX" X_Y_Z=" 0.; AFT_BTBrktInf_CentralSpacerYLong+2.*AFT_BTBrktInf_BackPlate_Thickness+1.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_CtrSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_CentralSpacerOffsetX+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_CentralSpacerYLong/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_CtrSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_CentralSpacerYLong/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_MidSpacerPlate" X_Y_Z="-AFT_BTBrktInf_TopCentralXLong/2.+AFT_BTBrktInf_BackPlate_Thickness+1.; (AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_CentralSpacerYLong)/2.+2.*AFT_BTBrktInf_BackPlate_Thickness+1.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_MidSpacerPlate" X_Y_Z=" AFT_BTBrktInf_TopCentralXLong/2.-AFT_BTBrktInf_BackPlate_Thickness-1.; (AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_CentralSpacerYLong)/2.+2.*AFT_BTBrktInf_BackPlate_Thickness+1.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_BackPlate_XOff-AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_SideSpacerOffsetX; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_SideSpacerOffsetX; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+</composition>
+
+<var name="AFT_BTBrkt_BackPlate_XLong" value=" 955. " />
+<var name="AFT_BTBrkt_BackPlate_XShort" value=" 545. " />
+<var name="AFT_BTBrkt_BackPlate_YLong" value=" 183. " />
+<var name="AFT_BTBrkt_BackPlate_YShort" value=" 86. " />
+
+<gvxysx name="AFT_BTBrkt_BackPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XShort/2.; 0."/>
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XShort/2.; AFT_BTBrkt_BackPlate_YShort-AFT_BTBrktInf_BackPlate_Thickness"/>
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XLong/2.+(AFT_BTBrkt_BackPlate_YLong-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness)*tan(AFT_BTBrktInf_BackPlate_YAngle*GENV_PiS180); AFT_BTBrkt_BackPlate_YShort-AFT_BTBrktInf_BackPlate_Thickness"/>
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XLong/2.; AFT_BTBrkt_BackPlate_YLong"/>
+</gvxysx>
+
+<var name="AFT_BTBrkt_SidePlateXLength" value=" 235. " />
+<var name="AFT_BTBrkt_CentralPlateXLength" value=" 546. " />
+<var name="AFT_BTBrkt_ZLength" value=" 260. " />
+
+<box name="AFT_BTBrkt_SideLongX" material="Iron" X_Y_Z="AFT_BTBrkt_SidePlateXLength+AFT_BTBrktInf_BackPlate_Thickness; 2.*AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength"/>
+
+<var name="AFT_BTBrkt_CtrSpacerPlate_XShort" value=" 10. " />
+<var name="AFT_BTBrkt_CtrSpacerPlate_YLong" value=" 308. " />
+
+<var name="AFT_BTBrkt_MidSpacerPlate_XShort" value=" 9. " />
+<var name="AFT_BTBrkt_MidSpacerPlate_YLong" value=" 378. " />
+
+<var name="AFT_BTBrkt_SideSpacerPlate_XShort" value=" 15.5" />
+<var name="AFT_BTBrkt_SideSpacerPlate_XLong" value=" 820. " />
+<var name="AFT_BTBrkt_SideSpacerPlate_YShort" value=" 125. " />
+<var name="AFT_BTBrkt_SideSpacerPlate_YLong" value=" 530. " />
+<var name="AFT_BTBrkt_SideSpacerPlate_XDist" value=" 457. " />
+
+<gvxy name="AFT_BTBrkt_CtrSpacerPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; AFT_BTBrkt_CtrSpacerPlate_YLong-AFT_BTBrkt_ZLength+AFT_BTBrkt_CtrSpacerPlate_XShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_CtrSpacerPlate_XShort; AFT_BTBrkt_CtrSpacerPlate_YLong"/>
+ <gvxy_point X_Y=" 0.; AFT_BTBrkt_CtrSpacerPlate_YLong"/>
+</gvxy>
+
+<gvxy name="AFT_BTBrkt_MidSpacerPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y=" 0.; AFT_BTBrktInf_YSpacerTotal-2.-AFT_BTBrktInf_CentralSpacerYLong"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; AFT_BTBrktInf_YSpacerTotal-2.-AFT_BTBrktInf_CentralSpacerYLong"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; AFT_BTBrkt_MidSpacerPlate_YLong-AFT_BTBrkt_ZLength+AFT_BTBrkt_MidSpacerPlate_XShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_MidSpacerPlate_XShort; AFT_BTBrkt_MidSpacerPlate_YLong"/>
+ <gvxy_point X_Y=" 0.; AFT_BTBrkt_MidSpacerPlate_YLong"/>
+</gvxy>
+
+<gvxy name="AFT_BTBrkt_SideSpacerPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XLong; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XLong; AFT_BTBrkt_SideSpacerPlate_YShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XShort+AFT_BTBrkt_SideSpacerPlate_YLong-AFT_BTBrkt_SideSpacerPlate_YShort; AFT_BTBrkt_SideSpacerPlate_YShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XShort; AFT_BTBrkt_SideSpacerPlate_YLong"/>
+ <gvxy_point X_Y=" 0.; AFT_BTBrkt_SideSpacerPlate_YLong"/>
+</gvxy>
+
+<var name="AFT_BTBrkt_FrontTube_StartAngle" value=" 195. " />
+<var name="AFT_BTBrkt_FrontTube_Angle" value=" 70. " />
+<var name="AFT_BTBrkt_FrontTube_Radius" value=" 550. " />
+<var name="AFT_BTBrkt_FrontTube_ZLength" value=" 250. " />
+<var name="AFT_BTBrkt_FrontTube_YOffset" value=" 558. " />
+<var name="AFT_BTBrkt_BackTube_ZLength" value=" 700. " />
+<var name="AFT_BTBrkt_BackTube_StartAngle" value=" 190. " />
+<var name="AFT_BTBrkt_BackTube_YOffset" value=" 226. " />
+
+<tubs name="AFT_BTBrkt_FrontTube" material="Iron" Rio_Z="AFT_BTBrkt_FrontTube_Radius; AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2. ; AFT_BTBrkt_FrontTube_ZLength" profile="AFT_BTBrkt_FrontTube_StartAngle; AFT_BTBrkt_FrontTube_Angle" nbPhi="20" />
+<tubs name="AFT_BTBrkt_BackTube" material="Iron" Rio_Z="AFT_BTBrkt_FrontTube_Radius; AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2. ; AFT_BTBrkt_BackTube_ZLength" profile="AFT_BTBrkt_BackTube_StartAngle; AFT_BTBrkt_FrontTube_Angle" nbPhi="20" />
+
+<var name="AFT_BTBrkt_BackTube_PosOff" value=" (AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2.)*cos(asin((AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness)/(AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2.)))*GENV_Si45"/>
+
+<var name="AFT_BTBrkt_FrontPlate_ZOffset" value=" 10. " />
+<var name="AFT_BTBrkt_FrontPlate_ZGap" value=" 190. " />
+<var name="AFT_BTBrkt_FrontPlate_XWidth" value=" 115. " />
+<var name="AFT_BTBrkt_FrontPlate_YHight" value=" 120. " />
+
+<tubs name="AFT_BTBrkt_FrontPlate_SubTube" material="Iron" Rio_Z="0.; AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2.+GENV_Eps ; AFT_BTBrkt_BackTube_ZLength" profile=" 300.; 70." nbPhi="50" />
+<box name="AFT_BTBrkt_FrontPlate_Full" material="Iron" X_Y_Z="AFT_BTBrkt_FrontPlate_XWidth; AFT_BTBrkt_FrontPlate_YHight; AFT_BTBrktInf_BackPlate_Thickness" />
+
+<subtraction name="AFT_BTBrkt_FrontPlate">
+ <posXYZ volume="AFT_BTBrkt_FrontPlate_Full" X_Y_Z=" AFT_BTBrkt_SideSpacerPlate_XDist-AFT_BTBrkt_FrontPlate_XWidth/2.; AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrkt_FrontPlate_YHight/2.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_FrontPlate_SubTube" X_Y_Z=" 0.; AFT_BTBrkt_FrontTube_YOffset; 0." />
+</subtraction>
+
+<composition name="AFT_BTBrkt">
+ <!-- the following "AFT_BTBrkt_BackPlate" volume creates clashes with other barrel toroid volumes. A quick check showed that
+ removing this volume makes the barrel toroid description clash free, so this should be investigated -->
+ <posXYZ volume="AFT_BTBrkt_BackPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength+AFT_BTBrktInf_BackPlate_Thickness/2."/>
+ <posXYZ volume="AFT_BTBrkt_SideLongX" X_Y_Z="-(AFT_BTBrkt_CentralPlateXLength+AFT_BTBrkt_SidePlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 1.5*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrkt_ZLength/2."/>
+ <posXYZ volume="AFT_BTBrkt_SideLongX" X_Y_Z=" (AFT_BTBrkt_CentralPlateXLength+AFT_BTBrkt_SidePlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 1.5*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrkt_ZLength/2."/>
+ <posXYZ volume="AFT_BTBrkt_CtrSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_CentralSpacerOffsetX+AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_CtrSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_MidSpacerPlate" X_Y_Z="-(AFT_BTBrkt_CentralPlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_MidSpacerPlate" X_Y_Z=" (AFT_BTBrkt_CentralPlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_SideSpacerPlate" X_Y_Z="-AFT_BTBrkt_SideSpacerPlate_XDist-AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_SideSpacerPlate" X_Y_Z=" AFT_BTBrkt_SideSpacerPlate_XDist+AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_FrontTube" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_FrontTube_YOffset; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrkt_FrontTube_ZLength/2." />
+ <posXYZ volume="AFT_BTBrkt_FrontTube" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_FrontTube_YOffset; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrkt_FrontTube_ZLength/2." rot=" 0.; 0.; 80."/>
+ <posXYZ volume="AFT_BTBrkt_BackTube" X_Y_Z=" 0.; 3.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_CtrSpacerPlate_YLong+AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45; AFT_BTBrkt_ZLength-AFT_BTBrkt_CtrSpacerPlate_XShort-AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45" rot=" -45.; 0.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_BackTube" X_Y_Z=" 0.; 3.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_CtrSpacerPlate_YLong+AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45; AFT_BTBrkt_ZLength-AFT_BTBrkt_CtrSpacerPlate_XShort-AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45" rot=" 0.; 45.; 90."/>
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset" />
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset+AFT_BTBrkt_FrontPlate_ZGap+AFT_BTBrktInf_BackPlate_Thickness" />
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset" rot=" 0.; 180.; 0." />
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset+AFT_BTBrkt_FrontPlate_ZGap+AFT_BTBrktInf_BackPlate_Thickness" rot=" 0.; 180.; 0." />
+</composition>
+
+<var name="AFT_BTBrkt_Cryotubethickness" value="AFT_BTBrkt_FrontTube_YOffset+2.-AFT_BTBrkt_FrontTube_Radius" />
+<var name="AFT_BTBrkt_CryotubeouterRadius" value="AFT_BTBrkt_FrontTube_YOffset+2." />
+<var name="AFT_BTBrkt_CtrSpacerXOffset" value="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness" />
+
+<var name="AFT_BTBrkt_PositioningParameter" value="(AFT_BTBrktInf_BackPlate_Thickness-AFT_BTBrkt_Cryotubethickness+2.-AFT_BTBrkt_ZLength+AFT_BTBrkt_CtrSpacerPlate_YLong+AFT_BTBrkt_Cryotubethickness)*GENV_Si45-(AFT_BTBrkt_CryotubeouterRadius-sqrt(AFT_BTBrkt_CryotubeouterRadius*AFT_BTBrkt_CryotubeouterRadius-AFT_BTBrkt_CtrSpacerXOffset*AFT_BTBrkt_CtrSpacerXOffset))+AFT_BTBrkt_Cryotubethickness" />
+
+<composition name="AFT_BTBrkt_final" >
+ <posXYZ volume="AFT_BTBrkt" X_Y_Z=" 0.; -(AFT_BTBrktInf_CentralSpacerYLong+2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrkt_Cryotubethickness); 2.*GENV_Si45*AFT_BTBrkt_PositioningParameter" />
+ <posXYZ volume="AFT_BTBrktInf" X_Y_Z=" 0.; -(AFT_BTBrktInf_CentralSpacerYLong+2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrkt_Cryotubethickness); 2.*GENV_Si45*AFT_BTBrkt_PositioningParameter" />
+</composition>
+
+<composition name="BAR_CryoTubCorner_AFT" >
+ <posXYZ volume="BAR_CryoTubCorner" X_Y_Z=" 0.; 0. ; 0." />
+ <posXYZ volume="AFT_BTBrkt_final" X_Y_Z=" ABRT_CryoRmin - 10.*GENV_Eps; 0.; ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRcur/sqrt(2.) + GENV_Ta225*ABRT_CryoRadi_Radius + 10.*GENV_Eps" rot=" 0. ; 0. ; -90. "/>
+</composition>
+
+<!-- CryoRib with cuts -->
+<subtraction name="BAR_CryoRib" >
+ <posXYZ volume="BAR_CryoRibOut" X_Y_Z=" (ABRT_CryoRmax + ABRT_CryoRmin)/2. ; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax + ABRT_CryoRmin)/2. ; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius - 10.*GENV_Eps; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + 10.*GENV_Eps; 0. ; 0. " />
+</subtraction>
+
+<!-- CryoAtt with cuts -->
+<subtraction name="BAR_CryoAtt" >
+ <posXYZ volume="BAR_CryoAttOut" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; 0. " rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoAttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; 0. " rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + 10.*GENV_Eps; 0. ; 0. " />
+</subtraction>
+
+<!-- CryoRing with cuts -->
+<tubs name="BAR_CryoRingA" material="Iron1" Rio_Z=" ABRT_CryRngRa_CryoRingRadius-ABRT_CryoRadT_RadThick ; ABRT_CryRngRa_CryoRingRadius ; 2.*ABRT_CryRngRm_CryoRingRmed*GENV_Ta225 " nbPhi="20" />
+<subtraction name="BAR_CryoRing" >
+ <posXYZ volume="BAR_CryoRingA" />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" (ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Co225-ABRT_CryRngRm_CryoRingRmed ; 0. ; (ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Si225 " rot=" 90. ; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" (ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Co225-ABRT_CryRngRm_CryoRingRmed ; 0. ; -(ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Si225 " rot=" 90. ; 0. ; 0. " />
+</subtraction>
+
+<composition name="BAR_CryoTub_Sector" >
+ <posXYZ volume="BAR_CryoTubAlongZ_Down" />
+ <posXYZ volume="BAR_CryoTubAlongZ_Up" />
+ <posXYZ volume="BAR_CryoTubAlongR_Plus" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_CryoTubAlongR_Plus" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRmax; 0.; 0." rot=" 0. ; 180. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCorner_AFT" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_CryoTubCorner_AFT" X_Y_Z=" 0.; 0.; 0." rot=" 0. ; 180. ; 180. "/>
+ <posXYZ volume="BAR_CryoTubCorner" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRmax; 0.; 0." rot=" 0. ; 180. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCorner" X_Y_Z="-GENV_Ta225*ABRT_CryoRadi_Radius*(1.+sqrt(2.)) + ABRT_CryoRmax - ABRT_CryoZmax + ABRT_CryoRadi_Radius; 0.; GENV_Ta225*ABRT_CryoRadi_Radius*(1.+sqrt(2.)) + ABRT_CryoRmin + ABRT_CryoZmax - ABRT_CryoRadi_Radius" rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoRing" X_Y_Z=" ABRT_CryRngRm_CryoRingRmed*GENV_Co225 ; -ABRT_CryRngRm_CryoRingRmed*GENV_Si225 ; ABRT_CryRngZm_CryoRingZmed " rot=" 90. ; 0. ; -22.5 " />
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_CryoRibWing" X_Y_Z=" ABRT_CryoRmin+2.*ABRT_CryoRadi_Radius ; 0. ; ABRT_Zrib[Irib] " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_CryoRibWing" X_Y_Z=" ABRT_CryoRmax-2.*ABRT_CryoRadi_Radius ; 0. ; ABRT_Zrib[Irib] " rot=" 0. ; 0. ; 90. " />
+ <posXYZ volume="BAR_CryoRib" X_Y_Z=" 0.; 0.; ABRT_Zrib[Irib]" rot=" 0. ; 0. ; 0. " />
+ </foreach>
+ <foreach index="Ivouss" begin="0" loops="8" >
+ <posXYZ volume="BAR_CryoAttWing" X_Y_Z=" ABRT_CryoRmin+ABRT_CryoRadi_Radius ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_CryoAtt" X_Y_Z=" 0.; 0.; ABRT_Zvouss[Ivouss]" rot=" 0. ; 0. ; 0. " />
+ </foreach>
+</composition>
+
+
+<!-- Description of an Atlas Barrel toroid Strut -->
+
+<gvxysx name="BAR_StrutWingFull" material="Iron4" dZ="ABRT_StrWZthi_StrutWingZthick" >
+ <gvxy_point X_Y=" ABRT_StrWYmax_StrutWingYmax ; ABRT_StrWRmax_StrutWingRmax " />
+ <gvxy_point X_Y=" ABRT_StrWYmed_StrutWingYmedi; ABRT_StrWRmed_StrutWingRmedi " />
+ <gvxy_point X_Y=" ABRT_StrWYlow_StrutWingYlower; ABRT_StrWRlow_StrutWingRlower " />
+ <gvxy_point X_Y=" ABRT_StrWYmin_StrutWingYmin ; ABRT_StrWRmin_StrutWingRmin " />
+</gvxysx>
+<box name="BAR_StrutWingUpCut" material="Aluminium1" X_Y_Z=" 2*ABRT_StrWYucu_StrutWingYupcut; ABRT_StrWYucu_StrutWingYupcut; ABRT_StrWYucu_StrutWingYupcut" />
+<subtraction name="BAR_StrutWing" >
+ <posXYZ volume="BAR_StrutWingFull" />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" 0. ; ABRT_CryoRmax - ABRT_CryoRadi_Radius - 5.*GENV_Eps ; 0. " />
+ <posXYZ volume="BAR_StrutWingUpCut" X_Y_Z=" 0. ; ABRT_CryoRmax ; 0. "/>
+</subtraction>
+<box name="BAR_StrutWingBigSidePlate" material="Iron1" X_Y_Z=" ABRT_StrWYthi_StrutWingYthick ; ABRT_StrWBPhi_StrutWingBigPlateheight ; ABRT_StrWBPth_StrutWingBigPlatethick " />
+<box name="BAR_StrutWingTopPlate" material="Iron1" X_Y_Z=" 2. * ABRT_StrWYmax_StrutWingYmax; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<box name="BAR_StrutWingBottomPlate" material="Iron1" X_Y_Z=" 2. * ABRT_StrWYmin_StrutWingYmin; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<box name="BAR_StrutWingUpperSidePlate" material="Iron1" X_Y_Z=" (ABRT_StrWYmed_StrutWingYmedi-ABRT_StrWYmax_StrutWingYmax)/(cos(ABRT_StrWAupp_StrutWingAupper ))- ABRT_StrWZthi_StrutWingZthick; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<box name="BAR_StrutWingLowerSidePlate" material="Iron1" X_Y_Z=" (ABRT_StrWYlow_StrutWingYlower-ABRT_StrWYmin_StrutWingYmin)/(cos(ABRT_StrWAlow_StrutWingAlower )) - ABRT_StrWZthi_StrutWingZthick; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<union name="BAR_StrutWingBox" >
+ <posXYZ volume="BAR_StrutWing" X_Y_Z=" 0. ; 0. ; -ABRT_StrWZlen_StrutWingZlen/2. " />
+ <posXYZ volume="BAR_StrutWing" X_Y_Z=" 0. ; 0. ; +ABRT_StrWZlen_StrutWingZlen/2. " />
+ <posXYZ volume="BAR_StrutWingBigSidePlate" X_Y_Z=" (ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick/2. )*GENV_Co225; ABRT_StrWRmax_StrutWingRmax-ABRT_CryoRadi_Radius-(ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick/2.)*GENV_Si225; 0. " rot=" 0. ; 0. ; -22.5" />
+ <posXYZ volume="BAR_StrutWingBigSidePlate" X_Y_Z=" (- ABRT_StrWYRli_StrutWingYRlink - ABRT_StrWYthi_StrutWingYthick/2. )*GENV_Co225; ABRT_StrWRmax_StrutWingRmax-ABRT_CryoRadi_Radius-(ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick/2.)*GENV_Si225; 0. " rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="BAR_StrutWingTopPlate" X_Y_Z=" 0. ; ABRT_StrWRmax_StrutWingRmax+ABRT_StrWZthi_StrutWingZthick/2.+GENV_Eps ; 0. " />
+ <posXYZ volume="BAR_StrutWingBottomPlate" X_Y_Z=" 0. ;ABRT_StrWRmin_StrutWingRmin-ABRT_StrWZthi_StrutWingZthick/2. ; 0. " />
+ <posXYZ volume="BAR_StrutWingUpperSidePlate" X_Y_Z=" (-ABRT_StrWYmed_StrutWingYmedi - ABRT_StrWYmax_StrutWingYmax - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) - cos(ABRT_StrWAupp_StrutWingAupper)))/2.; (ABRT_StrWRmax_StrutWingRmax + ABRT_StrWRmed_StrutWingRmedi + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) + cos(ABRT_StrWAupp_StrutWingAupper)))/2.; 0. " rot=" 0. ; 0. ; ABRT_StrWAupp_StrutWingAupper/GENV_PiS180" />
+ <posXYZ volume="BAR_StrutWingUpperSidePlate" X_Y_Z=" ( ABRT_StrWYmed_StrutWingYmedi + ABRT_StrWYmax_StrutWingYmax + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) - cos(ABRT_StrWAupp_StrutWingAupper)))/2.; (ABRT_StrWRmax_StrutWingRmax + ABRT_StrWRmed_StrutWingRmedi + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) + cos(ABRT_StrWAupp_StrutWingAupper)))/2.; 0. " rot=" 0. ; 0. ; -ABRT_StrWAupp_StrutWingAupper/GENV_PiS180" />
+ <posXYZ volume="BAR_StrutWingLowerSidePlate" X_Y_Z=" ( ABRT_StrWYlow_StrutWingYlower + ABRT_StrWYmin_StrutWingYmin + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) - cos(ABRT_StrWAlow_StrutWingAlower)))/2.; (ABRT_StrWRlow_StrutWingRlower+ABRT_StrWRmin_StrutWingRmin - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) + cos(ABRT_StrWAlow_StrutWingAlower)))/2. ; 0. " rot=" 0. ; 0. ; ABRT_StrWAlow_StrutWingAlower/GENV_PiS180" />
+ <posXYZ volume="BAR_StrutWingLowerSidePlate" X_Y_Z=" (-ABRT_StrWYlow_StrutWingYlower - ABRT_StrWYmin_StrutWingYmin - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) - cos(ABRT_StrWAlow_StrutWingAlower)))/2.; (ABRT_StrWRlow_StrutWingRlower+ABRT_StrWRmin_StrutWingRmin - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) + cos(ABRT_StrWAlow_StrutWingAlower)))/2. ; 0. " rot=" 0. ; 0. ; -ABRT_StrWAlow_StrutWingAlower/GENV_PiS180" />
+</union>
+
+<box name="BAR_StrutFull" material="Aluminium4" X_Y_Z=" ABRT_StrtYlen- 2.* ABRT_StrtPthi_StrutPlatethick ; ABRT_StrWBPhi_StrutWingBigPlateheight - 2.*ABRT_StrtPoff_StrutPlateoff ; ABRT_StrtZwid_StrutZwidth - 2.*ABRT_StrtPoff_StrutPlateoff " />
+<box name="BAR_StrutHole" material="Aluminium1" X_Y_Z=" ABRT_StrtYlen- 2.* ABRT_StrtPthi_StrutPlatethick + 10.*GENV_Eps; ABRT_StrWBPhi_StrutWingBigPlateheight - 2.*ABRT_StrtPoff_StrutPlateoff-2.*ABRT_StrtRthi_StrutRthick ; ABRT_StrtZwid_StrutZwidth - 2.*ABRT_StrtPoff_StrutPlateoff " />
+<box name="BAR_StrutPlate" material="Aluminium4" X_Y_Z=" ABRT_StrtPthi_StrutPlatethick; ABRT_StrWBPhi_StrutWingBigPlateheight ; ABRT_StrtZwid_StrutZwidth " />
+<subtraction name="BAR_StrutBarr" >
+ <posXYZ volume="BAR_StrutFull" />
+ <posXYZ volume="BAR_StrutHole" X_Y_Z=" 0. ; 0. ; -(ABRT_StrtZwid_StrutZwidth - 2.* ABRT_StrtPoff_StrutPlateoff)/2. -ABRT_StrtZthi_StrutZthick/2. " />
+ <posXYZ volume="BAR_StrutHole" X_Y_Z=" 0. ; 0. ; (ABRT_StrtZwid_StrutZwidth - 2.* ABRT_StrtPoff_StrutPlateoff)/2. +ABRT_StrtZthi_StrutZthick/2. " />
+</subtraction>
+<!-- ABRT_StrtXpos_Strut_Xposition is done by calculation => should be taken from blueprint atltbw__0002-vAD BUT ONLY in combination with update of ABRT_CryoRmin and ABRT_CryoRmax -->
+<var name="ABRT_StrtXpos_Strut_Xposition" value="ABRT_StrWRmax_StrutWingRmax-ABRT_CryoRadi_Radius-ABRT_StrtYlen/2.*GENV_Si225-(ABRT_StrWBPhi_StrutWingBigPlateheight/2. - ABRT_StrtPoff_StrutPlateoff)" />
+<composition name="BAR_Strut_Sector" >
+ <posXYZ volume="BAR_StrutWingBox" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_StrutBarr" X_Y_Z=" ABRT_StrtXpos_Strut_Xposition; -ABRT_StrtXpos_Strut_Xposition*GENV_Ta225; 0. " rot=" 0. ; 0. ; -112.5" />
+ <posXYZ volume="BAR_StrutPlate" X_Y_Z=" ABRT_StrtXpos_Strut_Xposition-ABRT_StrtYlen/2.*GENV_Si225+ABRT_StrtPthi_StrutPlatethick/2.*GENV_Si225 ; -ABRT_StrtXpos_Strut_Xposition*GENV_Ta225-ABRT_StrtYlen/2.*GENV_Co225+ABRT_StrtPthi_StrutPlatethick/2.*GENV_Co225; 0." rot=" 0. ; 0. ; -112.5" />
+ <posXYZ volume="BAR_StrutPlate" X_Y_Z=" ABRT_StrtXpos_Strut_Xposition+ABRT_StrtYlen/2.*GENV_Si225-ABRT_StrtPthi_StrutPlatethick/2.*GENV_Si225 ; -ABRT_StrtXpos_Strut_Xposition*GENV_Ta225+ABRT_StrtYlen/2.*GENV_Co225-ABRT_StrtPthi_StrutPlatethick/2.*GENV_Co225; 0." rot=" 0. ; 0. ; -112.5" />
+</composition>
+
+
+
+
+<!-- Description of an Atlas Barrel toroid voussoir and voussoir head -->
+
+<!-- BEGIN confirmation with atltbwv_0028-vAA (if no other comment) -->
+<var name="ABRT_VousBlXh_VoussBlockXheight" value= "850." />
+<var name="ABRT_VousPliX_VoussPlateInnerXwid" value= "120." />
+<var name="ABRT_VousPloX_VoussPlateOuterXwid" value= "80." />
+<var name="ABRT_VousBlYw_VoussBlockYwid" value="2850." />
+<var name="ABRT_VouBlYwS_VoussBlockYwidSub" value= "120." />
+<var name="ABRT_VouRCYwi_VoussRectCutYwid" value= "815." />
+<var name="ABRT_VouRPYwi_VoussReinforcePlatYwid" value= "50." />
+<var name="ABRT_VouBlZle_VoussBlockZlen" value= "500." />
+<var name="ABRT_VouBlZlS_VoussBlockZlenSub" value= "50." />
+<var name="ABRT_VouBZWTh_VoussBlockZWallTh" value= "50." />
+<var name="ABRT_VouCutZe_VoussCutZExt" value=" 500." /> <!-- no confirmation since arbitrary cut parameter -->
+<var name="ABRT_VouRCutR_VoussRoundCutRad" value= "300." />
+<var name="ABRT_VouReCsl_VoussRectCutXYslant" value= "30." /> <!-- no confirmation since approx. for rounded corners -->
+<!-- END confirmation with atltbwv_0028-vAA -->
+
+<!-- BEGIN confirmation with atltbwv_0029-vAB (if no other comment) -->
+<var name="ABRT_CnbCoYex_ConboxCoreYextension" value= " 880." />
+<var name="ABRT_CnbCoXex_ConboxCoreXextension" value= "2367." />
+<var name="ABRT_CnbCoXsu_ConboxCoreXsup" value= " 834." />
+<var name="ABRT_CnbCoXin_ConboxCoreXinf" value= " 640.7"/>
+<var name="ABRT_CnbEaHei_ConboxEarHeight" value= " 850." />
+<var name="ABRT_CnbEaCxi_ConboxEarCutXin" value= " 350." />
+<var name="ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut" value= " 120." />
+<var name="ABRT_CnbEaCtu_ConboxEarCutPlateThickUp" value= " 80." />
+<var name="ABRT_CnbEaCzw_ConboxEarCutZwall" value= " 50." />
+<var name="ABRT_CnbEaCze_ConboxEarCutZextr" value= " 135." />
+<var name="ABRT_CnbEaCPl_ConboxInnerEarCutPlate" value= " 60." /> <!-- atltbwv_0052-vAA -->
+<var name="ABRT_CnbCaDma_ConboxCavityDmax" value= " 528." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaDme_ConboxCavityDmedium" value= " 478." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaDmi_ConboxCavityDmin" value= " 468." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaZin_ConboxCavityZinter2" value= " 50." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaZex_ConboxCavityZext" value= " 790." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnboxZex_ConboxZextension" value= " 550." />
+
+<var name="ABRT_VousMBRa_VoussoirMainBlockRadius" value= "5723." /> <!-- atltbw__0002-vAD -->
+<var name="ABRT_CnbxMBRa_ConboxMainBlockRadius" value= "6942." /> <!-- atltbw__0002-vAD -->
+<!-- END confirmation with atltbwv_0029-vAB -->
+
+
+<!-- Constants and derived variables -->
+
+<var name="ABRT_VouCRCYr_VoussCentrRectCutYreach" value=" ABRT_VousBlYw_VoussBlockYwid/2.-ABRT_VouBlYwS_VoussBlockYwidSub-ABRT_VouRCYwi_VoussRectCutYwid-ABRT_VouRPYwi_VoussReinforcePlatYwid" />
+<var name="ABRT_VousRCXw_VoussRectCutXwid" value=" ABRT_VousBlXh_VoussBlockXheight-ABRT_VousPliX_VoussPlateInnerXwid-ABRT_VousPloX_VoussPlateOuterXwid" />
+<var name="ABRT_VousCXof_VoussCutXoffset" value="(ABRT_VousPliX_VoussPlateInnerXwid-ABRT_VousPloX_VoussPlateOuterXwid)/2." />
+<var name="ABRT_VousCYpo_VoussoirCutYpos" value=" ABRT_VousBlYw_VoussBlockYwid/2.-ABRT_VouBlYwS_VoussBlockYwidSub-ABRT_VouRCYwi_VoussRectCutYwid/2." />
+<var name="ABRT_VousCZpo_VoussoirCutZpos" value=" ABRT_VouCutZe_VoussCutZExt/2.+ABRT_VouBZWTh_VoussBlockZWallTh/2." />
+<var name="ABRT_CnbEaXtp_ConboxEarXtop" value=" ABRT_CnbCoXex_ConboxCoreXextension/2. " />
+<var name="ABRT_CnbEaYtp_ConboxEarYtop" value=" ABRT_CnbCoYex_ConboxCoreYextension - GENV_Ta225 *(ABRT_CnbCoXex_ConboxCoreXextension-ABRT_CnbCoXsu_ConboxCoreXsup)/2." />
+<var name="ABRT_CnbEaXbt_ConboxEarXbot" value=" ABRT_CnbEaXtp_ConboxEarXtop - ABRT_CnbEaHei_ConboxEarHeight*GENV_Si225 " />
+<var name="ABRT_CnbEaYbt_ConboxEarYbot" value=" ABRT_CnbEaYtp_ConboxEarYtop - ABRT_CnbEaHei_ConboxEarHeight*GENV_Co225 " />
+<var name="ABRT_CnbECXol_ConboxEarCutXoutlow" value=" ABRT_CnbEaXbt_ConboxEarXbot - ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut*sqrt(2.)*GENV_Si225" />
+<var name="ABRT_CnbECYol_ConboxEarCutYoutlow" value=" ABRT_CnbEaYbt_ConboxEarYbot + ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut*sqrt(2.)*GENV_Co225" />
+<var name="ABRT_CnbECYil_ConboxEarCutYinlow" value=" ABRT_CnbECYol_ConboxEarCutYoutlow + (ABRT_CnbECXol_ConboxEarCutXoutlow-ABRT_CnbEaCxi_ConboxEarCutXin)*GENV_Ta225 " />
+<var name="ABRT_CnbECoHe_ConboxEarCutOutHeight" value=" ABRT_CnbEaHei_ConboxEarHeight- ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut-ABRT_CnbEaCtu_ConboxEarCutPlateThickUp" />
+<var name="ABRT_CnbECXou_ConboxEarCutXoutup" value=" ABRT_CnbECXol_ConboxEarCutXoutlow + ABRT_CnbECoHe_ConboxEarCutOutHeight*GENV_Si225" />
+<var name="ABRT_CnbECYou_ConboxEarCutYoutup" value=" ABRT_CnbECYol_ConboxEarCutYoutlow + ABRT_CnbECoHe_ConboxEarCutOutHeight*GENV_Co225" />
+<var name="ABRT_CnbECYiu_ConboxEarCutYinup" value=" ABRT_CnbECYou_ConboxEarCutYoutup + (ABRT_CnbECXou_ConboxEarCutXoutup-ABRT_CnbEaCxi_ConboxEarCutXin)*GENV_Ta225" />
+<var name="ABRT_CnbECZpo_ConboxEarCutZpos" value=" ABRT_CnboxZex_ConboxZextension/2. + ABRT_CnbEaCze_ConboxEarCutZextr " />
+<var name="ABRT_CnbIECZp_ConboxInnerEarCutZpos" value=" ABRT_CnboxZex_ConboxZextension/2. + ABRT_CnbEaCzw_ConboxEarCutZwall/2. " />
+<var name="ABRT_CnbCaZin_ConboxCavityZinter" value="(ABRT_CnbCaDma_ConboxCavityDmax - ABRT_CnbCaDme_ConboxCavityDmedium)/2. / tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180)" />
+<var name="ABRT_VoussRad_VoussoirRadius" value=" ABRT_VousMBRa_VoussoirMainBlockRadius + ABRT_VousBlXh_VoussBlockXheight/2." />
+<var name="ABRT_CnboxRad_ConboxRadius" value=" ABRT_CnbxMBRa_ConboxMainBlockRadius - ABRT_CnbCoYex_ConboxCoreYextension" />
+
+
+
+<!-- Description of the voussoir head (connexion box) -->
+
+<gvxysx name="BAR_ConboxMainBlock" material="Aluminium4" dZ="ABRT_CnboxZex_ConboxZextension" >
+ <gvxy_point X_Y=" ABRT_CnbCoXin_ConboxCoreXinf/2. ; 0. " />
+ <gvxy_point X_Y=" ABRT_CnbEaXbt_ConboxEarXbot ; ABRT_CnbEaYbt_ConboxEarYbot " />
+ <gvxy_point X_Y=" ABRT_CnbEaXtp_ConboxEarXtop ; ABRT_CnbEaYtp_ConboxEarYtop " />
+ <gvxy_point X_Y=" ABRT_CnbCoXsu_ConboxCoreXsup/2. ; ABRT_CnbCoYex_ConboxCoreYextension " />
+</gvxysx>
+<gvxy name="BAR_ConboxEarCut" material="Aluminium1" dZ="ABRT_CnboxZex_ConboxZextension" >
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin ; ABRT_CnbECYil_ConboxEarCutYinlow " />
+ <gvxy_point X_Y=" ABRT_CnbECXol_ConboxEarCutXoutlow ; ABRT_CnbECYol_ConboxEarCutYoutlow " />
+ <gvxy_point X_Y=" ABRT_CnbECXou_ConboxEarCutXoutup ; ABRT_CnbECYou_ConboxEarCutYoutup " />
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin ; ABRT_CnbECYiu_ConboxEarCutYinup " />
+</gvxy>
+<gvxy name="BAR_ConboxInnerEarCut" material="Aluminium1" dZ="ABRT_CnboxZex_ConboxZextension" >
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin + ABRT_CnbEaCPl_ConboxInnerEarCutPlate ; ABRT_CnbECYil_ConboxEarCutYinlow - ABRT_CnbEaCPl_ConboxInnerEarCutPlate * GENV_Ta225 " />
+ <gvxy_point X_Y=" ABRT_CnbECXol_ConboxEarCutXoutlow ; ABRT_CnbECYol_ConboxEarCutYoutlow " />
+ <gvxy_point X_Y=" ABRT_CnbECXou_ConboxEarCutXoutup ; ABRT_CnbECYou_ConboxEarCutYoutup " />
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin + ABRT_CnbEaCPl_ConboxInnerEarCutPlate ; ABRT_CnbECYiu_ConboxEarCutYinup - ABRT_CnbEaCPl_ConboxInnerEarCutPlate * GENV_Ta225 " />
+</gvxy>
+<pcon name="BAR_ConboxCavity" material="Aluminium1" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDma_ConboxCavityDmax/2. ; 0. " />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDme_ConboxCavityDmedium/2. ; ABRT_CnbCaZin_ConboxCavityZinter" />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDme_ConboxCavityDmedium/2. ; ABRT_CnbCaZex_ConboxCavityZext - ABRT_CnbCaZin_ConboxCavityZinter2 " />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDmi_ConboxCavityDmin/2. ; ABRT_CnbCaZex_ConboxCavityZext - ABRT_CnbCaZin_ConboxCavityZinter2 " />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDmi_ConboxCavityDmin/2. ; ABRT_CnbCaZex_ConboxCavityZext " />
+</pcon>
+<tubs name="BAR_ConboxShaft" material="Aluminium4" Rio_Z=" 0. ; ABRT_BielRHol_BiellRadHole-3.*GENV_Eps ; 0.95*ABRT_CryAttD1_CryoAttDiam1 " nbPhi="16" />
+<!--<tubs name="BAR_ConboxShaftB" material="Aluminium1" Rio_Z=" 0. ; ABRT_CryAttD1_CryoAttDiam1/2.-3.*GENV_Eps ; 4.*ABRT_BielRHol_BiellRadHole " nbPhi="20" />
+<intersection name="BAR_ConboxShaft" >
+ <posXYZ volume="BAR_ConboxShaftA" />
+ <posXYZ volume="BAR_ConboxShaftB" rot=" 0. ; 90. ; 0. "/>
+</intersection>-->
+
+
+<!-- Description of the voussoir -->
+
+<gvxysxy name="BAR_VoussoirMainBlock" material="Aluminium4" dZ="ABRT_VousBlXh_VoussBlockXheight" >
+ <gvxy_point X_Y=" ABRT_VouBlZle_VoussBlockZlen/2. - ABRT_VouBlZlS_VoussBlockZlenSub ; ABRT_VousBlYw_VoussBlockYwid/2. - ABRT_VouBlYwS_VoussBlockYwidSub -ABRT_VouBlZlS_VoussBlockZlenSub/GENV_Ta15 " />
+ <gvxy_point X_Y=" ABRT_VouBlZle_VoussBlockZlen/2. ; ABRT_VousBlYw_VoussBlockYwid/2. - ABRT_VouBlYwS_VoussBlockYwidSub " />
+ <gvxy_point X_Y=" ABRT_VouBlZle_VoussBlockZlen/2. ; ABRT_VousBlYw_VoussBlockYwid/2. " />
+</gvxysxy>
+<gvxysxy name="BAR_VoussoirRectCut" material="Aluminium1" dZ="ABRT_VouCutZe_VoussCutZExt" >
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2. ; ABRT_VouRCYwi_VoussRectCutYwid/2.-ABRT_VouReCsl_VoussRectCutXYslant" />
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2.-ABRT_VouReCsl_VoussRectCutXYslant ; ABRT_VouRCYwi_VoussRectCutYwid/2." />
+</gvxysxy>
+<gvxysxy name="BAR_VoussoirCentralRectCut" material="Aluminium1" dZ="ABRT_VouCutZe_VoussCutZExt" >
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2. ; ABRT_VouCRCYr_VoussCentrRectCutYreach-ABRT_VouReCsl_VoussRectCutXYslant" />
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2.-ABRT_VouReCsl_VoussRectCutXYslant ; ABRT_VouCRCYr_VoussCentrRectCutYreach" />
+</gvxysxy>
+<tubs name="BAR_VoussoirRoundCut" material="Aluminium1" Rio_Z=" 0 ; ABRT_VouRCutR_VoussRoundCutRad ; ABRT_VouCutZe_VoussCutZExt" nbPhi="18" />
+
+<union name="BAR_VoussoirCut" >
+ <posXYZ volume="BAR_VoussoirRoundCut" X_Y_Z=" 0. ; ABRT_VousCYpo_VoussoirCutYpos ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRoundCut" X_Y_Z=" 0. ; -ABRT_VousCYpo_VoussoirCutYpos ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; ABRT_VousCYpo_VoussoirCutYpos ; ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; -ABRT_VousCYpo_VoussoirCutYpos ; ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; ABRT_VousCYpo_VoussoirCutYpos ;-ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; -ABRT_VousCYpo_VoussoirCutYpos ;-ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirCentralRectCut" X_Y_Z=" GENV_Eps ; 0. ; ABRT_VousCZpo_VoussoirCutZpos+GENV_Eps" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirCentralRectCut" X_Y_Z="-GENV_Eps ; 0. ;-ABRT_VousCZpo_VoussoirCutZpos-GENV_Eps" rot=" 0. ; 0. ; 0." />
+</union>
+<subtraction name="BAR_Voussoir" >
+ <posXYZ volume="BAR_VoussoirMainBlock" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 90. ; 0." />
+ <posXYZ volume="BAR_VoussoirCut" X_Y_Z=" ABRT_VousCXof_VoussCutXoffset ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<union name="BAR_ConboxTheCut" >
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxCavity" X_Y_Z=" 0. ; 0. ; 0. " rot=" -90. ; 0. ; 0." />
+</union>
+<subtraction name="BAR_ConnectingBox" >
+ <posXYZ volume="BAR_ConboxMainBlock" />
+ <posXYZ volume="BAR_ConboxTheCut" />
+</subtraction>
+
+<composition name="BAR_Voussoir_Sector" >
+ <posXYZ volume="BAR_ConnectingBox" X_Y_Z=" ABRT_CnboxRad_ConboxRadius ; 0. ; 0. " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_ConboxShaft" X_Y_Z=" ABRT_CoMaRmin_ColdMassRmin+ABRT_CoMaRThi_ColdMassRThick+ABRT_BielYhei_BiellYheight-ABRT_BielYcHo_BiellYcenHole ; 0. ; 0. " rot=" 90. ; 0. ; 0. " />
+ <posXYZ volume="BAR_Voussoir" X_Y_Z=" GENV_Co225*ABRT_VoussRad_VoussoirRadius ; -GENV_Si225*ABRT_VoussRad_VoussoirRadius ; 0. " rot=" 0. ; 0. ; -22.5" />
+</composition>
+
+
+
+
+
+<composition name="BAR_Toroid_Sector" >
+ <posXYZ volume="BAR_CryoTub_Sector" />
+ <posXYZ volume="BAR_ThermShield_Sector" />
+ <foreach index="Ivouss" begin="0" loops="4" >
+ <posXYZ volume="BAR_Strut_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="-4+Ivouss" />
+ </posXYZ>
+ <posXYZ volume="BAR_Voussoir_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="-4+Ivouss" />
+ </posXYZ>
+ </foreach>
+ <foreach index="Ivouss" begin="4" loops="4" >
+ <posXYZ volume="BAR_Strut_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="Ivouss-3" />
+ </posXYZ>
+ <posXYZ volume="BAR_Voussoir_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="Ivouss-3" />
+ </posXYZ>
+ </foreach>
+ <posXYZ volume="BAR_ColdMass_Sector" />
+</composition>
+
+<!--
+<composition name="BAR_Toroid" >
+ <mposPhi volume="BAR_Toroid_Sector" Phi0="22.5" ncopy="8" >
+ <sector value="1" step="1" />
+ </mposPhi>
+</composition>
+-->
+<composition name="BAR_sector02" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ; 22.5" />
+</composition>
+<composition name="BAR_sector04" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ; 67.5" />
+</composition>
+<composition name="BAR_sector06" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;112.5" />
+</composition>
+<composition name="BAR_sector08" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;157.5" />
+</composition>
+<composition name="BAR_sector10" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;202.5" />
+</composition>
+<composition name="BAR_sector12" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;247.5" />
+</composition>
+<composition name="BAR_sector14" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;292.5" />
+</composition>
+<composition name="BAR_sector16" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;337.5" />
+</composition>
+<composition name="BAR_Toroid" >
+ <posXYZ volume="BAR_sector02"/>
+ <posXYZ volume="BAR_sector04"/>
+ <posXYZ volume="BAR_sector06"/>
+ <posXYZ volume="BAR_sector08"/>
+ <posXYZ volume="BAR_sector10"/>
+ <posXYZ volume="BAR_sector12"/>
+ <posXYZ volume="BAR_sector14"/>
+ <posXYZ volume="BAR_sector16"/>
+</composition>
+
+</section>
+
+<section name = "Solenoid"
+ version = "1.1"
+ date = "22 11 1962"
+ author = "laurent"
+ top_volume = "Solenoid">
+<!-- name = Solenoid section name = "Magnets" -->
+<!--
+ **************************************************************
+ *** ****
+ *** Solenoid ****
+ *** ****
+ **************************************************************
+-->
+
+<tubs name="tubs_hole" material="Aluminium" Rio_Z="1210;1267;5300" />
+<composition name="Solenoid">
+ <posXYZ volume="tubs_hole" X_Y_Z=" 0 ; 0 ; 0" />
+</composition>
+</section>
+
+
+<section name = "ATLAS Feet"
+ version = "0.0"
+ date = "29-05-2019"
+ author = "Niko Tsutskiridze"
+ top_volume = "Feet">
+
+<!-- name = Feet only section name = "Feet" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Feet ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+<!-- Basic parameters extracted from drawing ATLHBFB_0003 -->
+
+<gvxysx name="Standard_Bottom_Plate" material="ShieldSteel" dZ="1198.">
+ <gvxy_point X_Y="-820.5; 15.8"/>
+ <gvxy_point X_Y="-820.5;-75."/>
+ <gvxy_point X_Y="-914.;-75."/>
+ <gvxy_point X_Y="-914.;75."/>
+</gvxysx>
+
+<gvxy name="Standard_MineSide_Plate" material="ShieldSteel" dZ="81.5">
+ <gvxy_point X_Y="-1274.71; -2610."/>
+ <gvxy_point X_Y="-1274.71; -1004.21"/>
+ <gvxy_point X_Y="-1224.78; -883.67"/>
+ <gvxy_point X_Y="-956.89; -994.63"/>
+ <gvxy_point X_Y="-930.12; -930."/>
+ <gvxy_point X_Y="-634.5; -1052.5"/>
+ <gvxy_point X_Y="-406.96; -1052.5"/>
+ <gvxy_point X_Y="27.91; -2.63"/>
+ <gvxy_point X_Y="-615.13; 640.42"/>
+ <gvxy_point X_Y="-40.29; 2028.2"/>
+ <gvxy_point X_Y="-40.29; 2630."/>
+ <gvxy_point X_Y="559.49; 2630"/>
+ <gvxy_point X_Y="559.49; 2610."/>
+ <gvxy_point X_Y="1274.71; 2610."/>
+ <gvxy_point X_Y="1274.71; 1820."/>
+ <gvxy_point X_Y="906.15; 223.58"/>
+ <gvxy_point X_Y="524.76; -697.17"/>
+ <gvxy_point X_Y="524.76; -2610."/>
+</gvxy>
+
+<tubs name="Standard_MineSide_Plate_CutTube" material="ShieldSteel" Rio_Z="0.; 615.; 85." nbPhi="32"/>
+<subtraction name="Standard_MineSide_PlateSub" >
+ <posXYZ volume="Standard_MineSide_Plate" />
+ <posXYZ volume="Standard_MineSide_Plate_CutTube" X_Y_Z="-406.956; -437.5; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<box name="Standard_Midd_Plate" material="ShieldSteel" X_Y_Z="297.; 153.6; 1100."/>
+
+<box name="Standard_Back_Top_Plate" material="ShieldSteel" X_Y_Z="59.3; 790.; 1040."/>
+
+<box name="Standard_Back_Plate" material="ShieldSteel" X_Y_Z="76.56; 1969.5; 896.8"/>
+
+<gvxysx name="Standard_Inner_Back_Plate" material="ShieldSteel" dZ="44.">
+ <gvxy_point X_Y="-375.; -365."/>
+ <gvxy_point X_Y="-375.; 315."/>
+ <gvxy_point X_Y="-325.; 365."/>
+</gvxysx>
+
+<box name="Standard_Inner_Middle_plate" material="ShieldSteel" X_Y_Z="157.32; 680.; 630."/>
+
+<tubs name="Standard_Innert_Tub" material="ShieldSteel" Rio_Z="562.5; 605.5; 800." profile="213.; 134.8" nbPhi="32"/>
+
+<composition name="Standard_Inner_Parts" >
+ <posXYZ volume="Standard_Inner_Back_Plate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="Standard_Inner_Middle_plate" X_Y_Z=" -335.3 ; -30.35 ; 0." rot=" 0.; 0.; -50." />
+ <posXYZ volume="Standard_Innert_Tub" X_Y_Z=" -754.18 ; 568.54 ; 0." />
+</composition>
+
+<gvxysx name="Standard_Front_Cover" material="ShieldSteel" dZ="80.6">
+ <gvxy_point X_Y="-550.; -1505."/>
+ <gvxy_point X_Y="-550.; -465."/>
+ <gvxy_point X_Y="-535.; -450."/>
+ <gvxy_point X_Y="-535.; 1505."/>
+</gvxysx>
+
+<box name="Standard_Front_CoverCutBox" material="ShieldSteel" X_Y_Z="270.; 1450.; 20."/>
+
+<subtraction name="Standard_Front_CoverCut" >
+ <posXYZ volume="Standard_Front_Cover" />
+ <posXYZ volume="Standard_Front_CoverCutBox" X_Y_Z="535.; 790.; 40.3" rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Standard_Front_CoverCutBox" X_Y_Z="-535.; 790.; 40.3" rot=" 0.; 0.; 0."/>
+</subtraction>
+
+<composition name="Standard_Feet" >
+ <posXYZ volume="Standard_Bottom_Plate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_MineSide_PlateSub" X_Y_Z=" 374.97 ; 2685.1 ; 489.25" />
+ <posXYZ volume="Standard_MineSide_PlateSub" X_Y_Z=" 374.97 ; 2685.1 ; -489.25" />
+ <posXYZ volume="Standard_Midd_Plate" X_Y_Z=" -691.06 ; 1818.81 ; 0." rot=" 0.; 0.; -22.5" />
+ <posXYZ volume="Standard_Back_Top_Plate" X_Y_Z=" 1679.34 ; 4900. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Back_Plate" X_Y_Z=" 782.25 ; 2122.5 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Inner_Parts" X_Y_Z=" 721.955 ; 1680. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Front_CoverCut" X_Y_Z=" -320.4 ; 3211.01 ; 0." rot=" 0.; 90.; -22.5" />
+</composition>
+ <!-- End Standard Feet -->
+
+
+ <!-- Extremity Feet -->
+<gvxysx name="Extremity_Bottom_Plate" material="ShieldSteel" dZ="1660.4">
+ <gvxy_point X_Y="-820.5; 10."/>
+ <gvxy_point X_Y="-820.5; -80."/>
+ <gvxy_point X_Y="-905.25; -80."/>
+ <gvxy_point X_Y="-905.25; 70."/>
+</gvxysx>
+
+<gvxy name="Extremity_MineSide_Plate" material="ShieldSteel" dZ="82.6">
+ <gvxy_point X_Y="-1335.33; -2760.58"/>
+ <gvxy_point X_Y="-1335.33; -1154.7"/>
+ <gvxy_point X_Y="-1285.36; -1034.06"/>
+ <gvxy_point X_Y="-1017.44; -1145.04"/>
+ <gvxy_point X_Y="-990.65; -1080.37"/>
+ <gvxy_point X_Y="-694.43; -1203.06"/>
+ <gvxy_point X_Y="-467.05; -1203.06"/>
+ <gvxy_point X_Y="147.95; -587.13"/>
+ <gvxy_point X_Y="147.7; -423.3"/>
+ <gvxy_point X_Y="91.24; 222.13"/>
+ <gvxy_point X_Y="-574.73; 733.15"/>
+ <gvxy_point X_Y="-140.51; 1781.5"/>
+ <gvxy_point X_Y="-158.99; 1789.16"/>
+ <gvxy_point X_Y="-100.4; 1930.6"/>
+ <gvxy_point X_Y="-100.4; 2599.44"/>
+ <gvxy_point X_Y="521.14; 2599.44"/>
+ <gvxy_point X_Y="521.14; 2506.22"/>
+ <gvxy_point X_Y="924.48; 2359.42"/>
+ <gvxy_point X_Y="1024.48; 2359.42"/>
+ <gvxy_point X_Y="1065.9; 2459.42"/>
+ <gvxy_point X_Y="1534.62; 2459.42"/>
+ <gvxy_point X_Y="1534.62; 1659.41"/>
+ <gvxy_point X_Y="1212.31; 1659.43"/>
+ <gvxy_point X_Y="846.05; 72.99"/>
+ <gvxy_point X_Y="464.66; -847.76"/>
+ <gvxy_point X_Y="464.66; -2760.58"/>
+</gvxy>
+
+<tubs name="Extremity_MineSide_Plate_CutTube" material="ShieldSteel" Rio_Z="0.; 615.; 85." nbPhi="32"/>
+
+<subtraction name="Extremity_MineSide_PlateSub" >
+ <posXYZ volume="Extremity_MineSide_Plate" />
+ <posXYZ volume="Extremity_MineSide_Plate_CutTube" X_Y_Z="-467.04; -588.06; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<box name="Extremity_Midd_Plate" material="ShieldSteel" X_Y_Z="299.; 151.2; 1480."/>
+
+<box name="Extremity_Back_Top_Plate" material="ShieldSteel" X_Y_Z="69.95; 800.; 1624."/>
+
+<box name="Extremity_AlMid_Plate" material="ShieldSteel" X_Y_Z="101.04; 400.; 1275."/>
+
+<gvxy name="Extremity_Back_Plate" material="ShieldSteel" dZ="1274.8">
+ <gvxy_point X_Y="-40.; -1003."/>
+ <gvxy_point X_Y="-40.; 585."/>
+ <gvxy_point X_Y="160.41; 1081.04"/>
+ <gvxy_point X_Y="234.5; 1051.11"/>
+ <gvxy_point X_Y="40.; 569.22"/>
+ <gvxy_point X_Y="40.; -1003."/>
+</gvxy>
+
+<gvxysx name="Extremity_Back_PlateCutArb" material="ShieldSteel" dZ="300.">
+ <gvxy_point X_Y="-225.; -175."/>
+ <gvxy_point X_Y="-225.; -18."/>
+ <gvxy_point X_Y="-415.21; 175."/>
+</gvxysx>
+
+<subtraction name="Extremity_Back_PlateCut" >
+ <posXYZ volume="Extremity_Back_Plate" />
+ <posXYZ volume="Extremity_Back_PlateCutArb" X_Y_Z="136.77; 915.87; 0." rot=" 0.; 90.; -22."/>
+</subtraction>
+
+<box name="Extremity_Front_Cover" material="ShieldSteel" X_Y_Z="80.34; 3015.; 1450."/>
+
+<tubs name="Extremity_Front_Cover_CutTube" material="ShieldSteel" Rio_Z="0.; 225.; 100." nbPhi="32"/>
+
+<box name="Extremity_Front_CoverCutBox" material="ShieldSteel" X_Y_Z="20.; 1210.; 250."/>
+
+<subtraction name="Extremity_Front_CoverCut" >
+ <posXYZ volume="Extremity_Front_Cover" />
+ <posXYZ volume="Extremity_Front_Cover_CutTube" X_Y_Z="0.; 332.5; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="Extremity_Front_CoverCutBox" X_Y_Z="40.17; 912.5; 725." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Front_CoverCutBox" X_Y_Z="40.17; 912.5; -725." rot=" 0.; 0.; 0."/>
+</subtraction>
+
+<composition name="Extremiy_Feet" >
+ <posXYZ volume="Extremity_Bottom_Plate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_MineSide_PlateSub" X_Y_Z=" 435.33 ; 2830.59 ; 678.9" />
+ <posXYZ volume="Extremity_MineSide_PlateSub" X_Y_Z=" 435.33 ; 2830.59 ; -678.9" />
+ <posXYZ volume="Extremity_Midd_Plate" X_Y_Z=" -691.23 ; 1812.79 ; 0." rot=" 0.; 0.; -22.5" />
+ <posXYZ volume="Extremity_Back_Top_Plate" X_Y_Z=" 2004.954 ; 4890. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_AlMid_Plate" X_Y_Z=" 1243.8 ; 3636.8 ; 0." rot=" 0.; 0.; -22.5" />
+ <posXYZ volume="Extremity_Back_PlateCut" X_Y_Z=" 840.5 ; 2070. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Front_CoverCut" X_Y_Z=" -321.16 ; 3203.82 ; 0." rot=" 0.; 0.; -22.5" />
+</composition>
+ <!-- End Extremity Feet -->
+
+
+ <!-- Standard Main Strut -->
+<gvxysx name="Sta_Main_Strut" material="Aluminium" dZ="3440.">
+ <gvxy_point X_Y="-200.; -300."/>
+ <gvxy_point X_Y="-200.; -250."/>
+ <gvxy_point X_Y="-20.; -218.3"/>
+ <gvxy_point X_Y="-20.; 218.3"/>
+ <gvxy_point X_Y="-200.; 250."/>
+ <gvxy_point X_Y="-200.; 300."/>
+</gvxysx>
+
+<tubs name="Standard_Main_StrutCutTube" material="Aluminium" Rio_Z="0.; 210.; 50." nbPhi="32"/>
+
+<subtraction name="Standard_Main_StrutCut" >
+ <posXYZ volume="Sta_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Main_StrutCutTube" X_Y_Z="897.5 ; 0. ; 0." />
+ <posXYZ volume="Standard_Main_StrutCutTube" X_Y_Z="-897.5 ; 0. ; 0." />
+</subtraction>
+
+<box name="Standard_Main_Strut_Plate1" material="Aluminium" X_Y_Z="69.99; 690.; 500."/>
+
+<box name="Standard_Main_Strut_Plate2" material="Aluminium" X_Y_Z="109.99; 790.; 975."/>
+
+<composition name="Standard_Main_Strut" >
+ <posXYZ volume="Standard_Main_StrutCut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate1" X_Y_Z=" 1755. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate1" X_Y_Z=" -1755. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate2" X_Y_Z=" 1844.99 ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate2" X_Y_Z=" -1844.99 ; 0. ; 0." rot=" 0.; 0.;0." />
+</composition>
+ <!-- End Standard Main Strut -->
+
+
+ <!-- Extremity Main Strut -->
+<gvxysx name="Extr_Main_Strut" material="Aluminium" dZ="2780.">
+ <gvxy_point X_Y="-200.; -300."/>
+ <gvxy_point X_Y="-200.; -250."/>
+ <gvxy_point X_Y="-20.; -218.3"/>
+ <gvxy_point X_Y="-20.; 218.3"/>
+ <gvxy_point X_Y="-200.; 250."/>
+ <gvxy_point X_Y="-200.; 300."/>
+</gvxysx>
+
+<tubs name="Extremity_Main_StrutCutTube" material="Aluminium" Rio_Z="0.; 210.; 50." nbPhi="32"/>
+
+<subtraction name="Extremity_Main_StrutCut" >
+ <posXYZ volume="Extr_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Extremity_Main_StrutCutTube" X_Y_Z="897.5 ; 0. ; 0." />
+ <posXYZ volume="Extremity_Main_StrutCutTube" X_Y_Z="-897.5 ; 0. ; 0." />
+</subtraction>
+
+<box name="Extremity_Main_Strut_Plate1" material="Aluminium" X_Y_Z="69.99; 690.; 500."/>
+
+<box name="Extremity_Main_Strut_Plate2" material="Aluminium" X_Y_Z="109.99; 740.; 1344."/>
+
+<composition name="Extremity_Main_Strut" >
+ <posXYZ volume="Extremity_Main_StrutCut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate1" X_Y_Z=" 1425 ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate1" X_Y_Z=" -1425 ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate2" X_Y_Z=" 1515. ; 25. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate2" X_Y_Z=" -1515. ; 25. ; 0." rot=" 0.; 0.;0." />
+</composition>
+ <!-- End Extremity Main Strut -->
+
+
+ <!-- Girder 1 -->
+<box name="Standard_Girder1_Plate1" material="ShieldSteel" X_Y_Z="640.; 40.; 1527.3"/>
+
+<gvxysx name="Standard_Girder1_Plate2" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-670.; -465."/>
+ <gvxy_point X_Y="-670.; -345."/>
+ <gvxy_point X_Y="-763.65; -345."/>
+ <gvxy_point X_Y="-763.65; -20.05"/>
+</gvxysx>
+
+<gvxy name="Standard_Girder1_2_3_Plate3" material="ShieldSteel" dZ="76.35">
+ <gvxy_point X_Y="353.5; -410."/>
+ <gvxy_point X_Y="353.5; -120."/>
+ <gvxy_point X_Y="246.; -120."/>
+ <gvxy_point X_Y="246.; 120."/>
+ <gvxy_point X_Y="600.; 120."/>
+ <gvxy_point X_Y="600.; 410."/>
+ <gvxy_point X_Y="241.; 410."/>
+ <gvxy_point X_Y="241.; 305."/>
+ <gvxy_point X_Y="-389.; 305."/>
+ <gvxy_point X_Y="-389.; 410."/>
+ <gvxy_point X_Y="-600.; 410."/>
+ <gvxy_point X_Y="-600.; 120."/>
+ <gvxy_point X_Y="-389.; 120."/>
+ <gvxy_point X_Y="-389.; -120."/>
+ <gvxy_point X_Y="-496.5; -120."/>
+ <gvxy_point X_Y="-496.5; -320."/>
+ <gvxy_point X_Y="-296.5; -410."/>
+</gvxy>
+
+<box name="Standard_Girder1_2_3_Plate3CutBox" material="ShieldSteel" X_Y_Z="460.; 260.; 40."/>
+
+<subtraction name="Standard_Girder1_2_3_Plate3Cut_Side1" >
+ <posXYZ volume="Standard_Girder1_2_3_Plate3" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3CutBox" X_Y_Z="-71.5 ; 95. ; -23.175" />
+</subtraction>
+
+<subtraction name="Standard_Girder1_2_3_Plate3Cut_Side2" >
+ <posXYZ volume="Standard_Girder1_2_3_Plate3" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3CutBox" X_Y_Z="-71.5 ; 95. ; 23.175" />
+</subtraction>
+
+<box name="Standard_Girder1-2-3_Plate4" material="ShieldSteel" X_Y_Z="460.; 375.; 30."/>
+
+<gvxysx name="Standard_Girder1_Plate5" material="ShieldSteel" dZ="460.">
+ <gvxy_point X_Y="-450.; -435.05"/>
+ <gvxy_point X_Y="-713.35; -320.05"/>
+ <gvxy_point X_Y="-763.65; -320.05"/>
+ <gvxy_point X_Y="-763.65; -280.05"/>
+ <gvxy_point X_Y="-705.; -280.05"/>
+ <gvxy_point X_Y="-441.65; -395.05"/>
+</gvxysx>
+
+<composition name="Standard_Girder1" >
+ <posXYZ volume="Standard_Girder1_Plate1" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_Plate2" X_Y_Z=" 250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_Plate2" X_Y_Z=" -250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side1" X_Y_Z=" 71.5 ; -254.2 ; -801.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side2" X_Y_Z=" 71.5 ; -254.2 ; 801.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -405." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -70." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_Plate5" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+</composition>
+ <!-- End Girder 1 -->
+
+
+ <!-- Girder 2 -->
+<box name="Standard_Girder2_Plate1" material="ShieldSteel" X_Y_Z="640.; 40.; 1982.3"/>
+
+<gvxysx name="Standard_Girder2_Plate2" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-897.5; -465."/>
+ <gvxy_point X_Y="-897.5; -345."/>
+ <gvxy_point X_Y="-991.15; -345."/>
+ <gvxy_point X_Y="-991.15; -20.05"/>
+</gvxysx>
+
+<gvxysx name="Standard_Girder2_Plate5" material="ShieldSteel" dZ="460.">
+ <gvxy_point X_Y="-677.5; -435.05"/>
+ <gvxy_point X_Y="-940.85; -320.05"/>
+ <gvxy_point X_Y="-991.15; -320.05"/>
+ <gvxy_point X_Y="-991.15; -280.05"/>
+ <gvxy_point X_Y="-932.5; -280.05"/>
+ <gvxy_point X_Y="-669.15; -395.05"/>
+</gvxysx>
+
+<composition name="Standard_Girder2" >
+ <posXYZ volume="Standard_Girder2_Plate1" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2_Plate2" X_Y_Z=" 250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder2_Plate2" X_Y_Z=" -250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side1" X_Y_Z=" 71.5 ; -254.2 ; -1029.4" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side2" X_Y_Z=" 71.5 ; -254.2 ; 1029.4" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -277.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; 27.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2_Plate5" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+</composition>
+ <!-- End Girder 2 -->
+
+
+ <!-- Girder 3 -->
+<box name="Standard_Girder3_Plate1" material="ShieldSteel" X_Y_Z="640.; 40.; 2203.3"/>
+
+<gvxysx name="Standard_Girder3_Plate2" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-1007.5; -465."/>
+ <gvxy_point X_Y="-1007.5; -345."/>
+ <gvxy_point X_Y="-1101.65; -345."/>
+ <gvxy_point X_Y="-1101.65; -20.05"/>
+</gvxysx>
+
+<gvxysx name="Standard_Girder3_Plate5" material="ShieldSteel" dZ="460.">
+ <gvxy_point X_Y="-788.; -435.05"/>
+ <gvxy_point X_Y="-1051.35; -320.05"/>
+ <gvxy_point X_Y="-1101.65; -320.05"/>
+ <gvxy_point X_Y="-1101.65; -280.05"/>
+ <gvxy_point X_Y="-1043.; -280.05"/>
+ <gvxy_point X_Y="-779.65; -395.05"/>
+</gvxysx>
+
+<composition name="Standard_Girder3" >
+ <posXYZ volume="Standard_Girder3_Plate1" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3_Plate2" X_Y_Z=" 250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder3_Plate2" X_Y_Z=" -250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side1" X_Y_Z=" 71.5 ; -254.2 ; -1139.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side2" X_Y_Z=" 71.5 ; -254.2 ; 1139.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -168." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; 167." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3_Plate5" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+</composition>
+
+<composition name="Standard_Girder1-2-3" >
+ <posXYZ volume="Standard_Girder1" X_Y_Z=" 0. ; 0. ; 8005.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1" X_Y_Z=" 0. ; 0. ; -8005.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2" X_Y_Z=" 0. ; 0. ; 5027.52" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2" X_Y_Z=" 0. ; 0. ; -5027.52" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3" X_Y_Z=" 0. ; 0. ; 1712.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3" X_Y_Z=" 0. ; 0. ; -1712.5" rot=" 0.; 0.;0." />
+</composition>
+
+ <!-- End Girder 3 -->
+
+
+ <!-- Extremity Girder -->
+<box name="Extremity_Girder_Plate1" material="ShieldSteel" X_Y_Z="859.; 1100.; 75."/>
+<box name="Extremity_Girder_Plate1CutBox" material="ShieldSteel" X_Y_Z="459.; 700.; 80."/>
+
+<subtraction name="Extremity_Girder_Plate1Cut" >
+ <posXYZ volume="Extremity_Girder_Plate1" />
+ <posXYZ volume="Extremity_Girder_Plate1CutBox" />
+</subtraction>
+
+<gvxysx name="Extremity_Girder_Plate2" material="ShieldSteel" dZ="75.">
+ <gvxy_point X_Y="-325.; -370."/>
+ <gvxy_point X_Y="-325.; 230."/>
+ <gvxy_point X_Y="-425.; 324."/>
+ <gvxy_point X_Y="-425.; 370."/>
+</gvxysx>
+
+<gvxy name="Extremity_Girder_Plate3" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-362.; 175.5"/>
+ <gvxy_point X_Y="-362.; 428.5"/>
+ <gvxy_point X_Y="362.; 428.5"/>
+ <gvxy_point X_Y="362.; -428.5"/>
+</gvxy>
+
+<box name="Extremity_Girder_Plate4" material="ShieldSteel" X_Y_Z="389.; 383.; 40."/>
+
+<gvxysx name="Extremity_Girder_Plate5" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-394.5; -400."/>
+ <gvxy_point X_Y="-253.5; 400."/>
+</gvxysx>
+
+<composition name="Extremity_Girder" >
+ <posXYZ volume="Extremity_Girder_Plate1Cut" X_Y_Z=" 0. ; 0. ; -0.05" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Girder_Plate2" X_Y_Z=" 0. ; 442.5 ; 407.51" rot=" -90.; 0.; 0." />
+ <posXYZ volume="Extremity_Girder_Plate3" X_Y_Z=" 251.21 ; -23.55 ; 397.53" rot=" 0.; 80.;0." />
+ <posXYZ volume="Extremity_Girder_Plate3" X_Y_Z=" -251.21 ; -23.55 ; 397.53" rot=" 0.; 100.;0." />
+ <posXYZ volume="Extremity_Girder_Plate4" X_Y_Z=" 0. ; 213.45 ; 580." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Girder_Plate5" X_Y_Z=" 0. ; -209.5 ; 362.7" rot=" 49.7; 0.;0." />
+</composition>
+ <!-- End Extremity Girder -->
+
+
+ <!-- Rail_Support -->
+<gvxysx name="Standard_Rail_Support" material="ShieldSteel" dZ="525.">
+ <gvxy_point X_Y="-350.; -452.1"/>
+ <gvxy_point X_Y="-350.; -437.1"/>
+ <gvxy_point X_Y="-550.; -437.1"/>
+ <gvxy_point X_Y="-550.; -342.1"/>
+ <gvxy_point X_Y="-540.; -342.1"/>
+ <gvxy_point X_Y="-540.; 318.5"/>
+ <gvxy_point X_Y="-597.5; 318.5"/>
+ <gvxy_point X_Y="-597.5; 452.1"/>
+</gvxysx>
+
+<box name="Standard_Rail_SupportCutBox1" material="ShieldSteel" X_Y_Z="920.; 290.6; 425."/>
+<box name="Standard_Rail_SupportCutBox2" material="ShieldSteel" X_Y_Z="920.; 290.; 425."/>
+
+<subtraction name="Standard_Rail_SupportCut" >
+ <posXYZ volume="Standard_Rail_Support" />
+ <posXYZ volume="Standard_Rail_SupportCutBox1" X_Y_Z=" 0 ; 173.2 ; 262.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Rail_SupportCutBox1" X_Y_Z=" 0 ; 173.2 ; -262.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Rail_SupportCutBox2" X_Y_Z=" 0 ; -197.1 ; 262.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Rail_SupportCutBox2" X_Y_Z=" 0 ; -197.1 ; -262.5" rot=" 0.; 0.;0." />
+</subtraction>
+ <!-- End Rail_Support -->
+
+
+ <!-- Extremity Rail_Support -->
+<gvxysx name="Extremity_Rail_Support_Plate1" material="ShieldSteel" dZ="1820.">
+ <gvxy_point X_Y="-40.; -678.8"/>
+ <gvxy_point X_Y="-40.; -127.7"/>
+ <gvxy_point X_Y="-262.5; -127.7"/>
+ <gvxy_point X_Y="-262.5; 0."/>
+</gvxysx>
+
+<box name="Extremity_Rail_Support_Plate1Cut" material="ShieldSteel" X_Y_Z="100.; 1102.2; 40."/>
+
+<subtraction name="Extremity_Rail_SupportCut" >
+ <posXYZ volume="Extremity_Rail_Support_Plate1" />
+ <posXYZ volume="Extremity_Rail_Support_Plate1Cut" X_Y_Z=" 0 ; -678.8 ; -910." rot=" 0.; 0.;0." />
+</subtraction>
+
+<gvxy name="Extremity_Rail_Support_Plate2" material="ShieldSteel" dZ="80.">
+ <gvxy_point X_Y="179.5; -113."/>
+ <gvxy_point X_Y="284.; -262.5"/>
+ <gvxy_point X_Y="490.; -262.5"/>
+ <gvxy_point X_Y="490.; 262.5"/>
+ <gvxy_point X_Y="-715.; 262.5"/>
+ <gvxy_point X_Y="-715.; -262.5"/>
+ <gvxy_point X_Y="-575.; -262.5"/>
+ <gvxy_point X_Y="-470.5; -113."/>
+</gvxy>
+
+<box name="Extremity_Rail_Support_Plate3-4" material="ShieldSteel" X_Y_Z="525.; 551.1; 80."/>
+
+<union name="Extremity_Rail_SupportUni1" >
+ <posXYZ volume="Extremity_Rail_SupportCut" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate2" X_Y_Z=" 0.; -423.8; 0. " rot=" 90.; -90.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; 530." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; -755." rot=" 0.; 0.; 0."/>
+</union>
+
+<gvxy name="Extremity_Rail_Support_Plate5" material="ShieldSteel" dZ="110.">
+ <gvxy_point X_Y="-645.; -45."/>
+ <gvxy_point X_Y="-645.; -262.5"/>
+ <gvxy_point X_Y="-890.; -262.5"/>
+ <gvxy_point X_Y="-890.; 262.5"/>
+ <gvxy_point X_Y="910.; 262.5"/>
+ <gvxy_point X_Y="910.; -262.5"/>
+ <gvxy_point X_Y="305.; -262.5"/>
+ <gvxy_point X_Y="305.; -45."/>
+</gvxy>
+
+<box name="Extremity_Rail_Support_Plate5CutBox" material="ShieldSteel" X_Y_Z="210.; 550.; 40."/>
+
+<subtraction name="Extremity_Rail_Support_Plate5Cut1" >
+ <posXYZ volume="Extremity_Rail_Support_Plate5" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" 485. ; 0. ; 55." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" -815. ; 0. ; 55." rot=" 0.; 0.;0." />
+</subtraction>
+
+
+<composition name="Extremity_Rail_Support1" >
+ <posXYZ volume="Extremity_Rail_SupportUni1" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5Cut1" X_Y_Z=" 0 ; -733.85 ; 0." rot=" 0.; -90.; 90." />
+</composition>
+
+<subtraction name="Extremity_Rail_Support_Plate5Cut2" >
+ <posXYZ volume="Extremity_Rail_Support_Plate5" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" 485. ; 0. ; -55." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" -815. ; 0. ; -55." rot=" 0.; 0.;0." />
+</subtraction>
+
+<union name="Extremity_Rail_SupportUni2" >
+ <posXYZ volume="Extremity_Rail_SupportCut" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate2" X_Y_Z=" 0.; -423.8; 0." rot=" -90.; -90.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; 530." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; -755." rot=" 0.; 0.; 0."/>
+</union>
+
+<composition name="Extremity_Rail_Support2" >
+ <posXYZ volume="Extremity_Rail_SupportUni2" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5Cut2" X_Y_Z=" 0 ; -733.85 ; 0." rot=" 0.; -90.; -90." />
+</composition>
+ <!-- End Extremity Rail_Support -->
+
+
+ <!-- assembly of Standard feet, Standard rail support and Standard strut -->
+<composition name="Standard_Feet_Comp" >
+ <posXYZ volume="Standard_Feet" X_Y_Z=" -3609.69 ; -4899.96 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet" X_Y_Z=" 3609.69 ; -4899.96 ; 0." rot=" 0.; 180.;0." />
+ <posXYZ volume="Standard_Rail_SupportCut" X_Y_Z=" -2982.592 ; 852.63 ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Rail_SupportCut" X_Y_Z=" 2982.592 ; 852.63 ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+</composition>
+
+<composition name="Extremity_Feet_Comp" >
+ <posXYZ volume="Extremiy_Feet" X_Y_Z=" -3609.95 ; -4895. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremiy_Feet" X_Y_Z=" 3609.95 ; -4895. ; 0." rot=" 0.; 180.;0." />
+ <posXYZ volume="Extremity_Rail_Support1" X_Y_Z=" -2982.641; 1304.32 ; 165.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Rail_Support2" X_Y_Z=" 2982.641; 1304.32 ; 165.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Girder" X_Y_Z=" 2735.53 ; -969.96 ; -758.8" rot=" 0.; 180.; 0." />
+ <posXYZ volume="Extremity_Girder" X_Y_Z=" -2735.53 ; -969.96 ; -757.8" rot=" 0.; 180.; 0." />
+</composition>
+ <!-- End assembly of Standard feet, Standard rail support and Standard strut -->
+
+
+<composition name="Feet" >
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 3425.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 6630.036" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 9380.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -3425.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -6630.036" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -9380.034" rot=" 0.; 0.;0." />
+
+ <posXYZ volume="Extremity_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 12080.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -12080.034" rot=" 0.; 180.;0." />
+
+ <posXYZ volume="Standard_Girder1-2-3" X_Y_Z=" -2735.5 ; -6613.91 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3" X_Y_Z=" 2735.5 ; -6613.91 ; 0." rot=" 0.; 180.;0." />
+</composition>
+
+</section>
+
+
+<section name = "ATLAS Rail"
+ version = "7.0"
+ date = "10 December 2003"
+ author = "Jochen Meyer, Laurent Chevalier, Daniel Pomarede"
+ top_volume = "RailAssembly">
+
+
+
+<!-- Basic parameters -->
+
+<!-- Rails Main section -->
+<!-- BEGIN confirmation with atlhbrb_0001-vAH (if no other comment) -->
+<var name="RAIL_CeRzleng_CentralRail_Zlength" value="6850." />
+<var name="RAIL_ExRzleng_ExtremityRail_Zlength" value="9784." />
+<var name="RAIL_CeRwidt1_CentralRail_Width1" value=" 450." />
+<var name="RAIL_CeRwidt2_CentralRail_Width2" value=" 120." />
+<var name="RAIL_CeRwid3o_CentralRail_Width3outer" value=" 380." />
+<var name="RAIL_CeRwid3i_CentralRail_Width3inner" value=" 350." />
+
+<var name="RAIL_CeRthic1_CentralRail_Thick1" value=" 100." />
+<var name="RAIL_CeRthic2_CentralRail_Thick2" value=" 200." />
+
+<!-- Reinforcement Plates -->
+
+<var name="RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength" value=" 50." />
+<var name="RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength" value=" 40." />
+<var name="RAIL_CeRRPIx1_CentralRailReinforcementPlateInner_Xdist1" value="260." />
+<var name="RAIL_CeRRPOx1_CentralRailReinforcementPlateOuter_Xdist1" value="290." />
+
+<!-- CentralRailReinforcementPlate_std_Zpos -->
+<array name="RAIL_CeRRPSzp" values="490.;1090.;1687.5;2285.;2885.;3400.;3915.;4515.;5112.5;5710.;6310. " />
+<!-- ExtremityRailReinforcementPlate_std_Zpos -->
+<array name="RAIL_ExRRPSzp" values="540;1085;1627.5;2170;2715;3230;3745;4315;4895;5465;5980;6495;7017.5;7540;8062.5;8720;9375" />
+
+<!-- Global position -->
+<var name="RAIL_Xpos" value=" 2985." /> <!-- confirmed atcnh___0005-vAG -->
+<var name="RAIL_Ypos_above" value="-4390." /> <!-- confirmed atcnh___0005-vAG -->
+
+<!-- Derived variables -->
+
+<var name="RAIL_totHeight" value="RAIL_CeRthic2_CentralRail_Thick2+2.*RAIL_CeRthic1_CentralRail_Thick1" />
+
+
+
+<!-- Feet Modelization -->
+
+<!-- Rail Main section -->
+
+<var name="RAIL_CeRy" value="0." />
+
+<var name="RAIL_CeRxb" value="RAIL_CeRwidt1_CentralRail_Width1/2." />
+<var name="RAIL_CeRyb" value="0." />
+
+<var name="RAIL_CeRxc" value="RAIL_CeRxb" />
+<var name="RAIL_CeRyc" value="RAIL_CeRthic1_CentralRail_Thick1" />
+
+<var name="RAIL_CeRxd" value="RAIL_CeRwidt2_CentralRail_Width2/2." />
+<var name="RAIL_CeRyd" value="RAIL_CeRyc" />
+
+<var name="RAIL_CeRxe" value="RAIL_CeRxd" />
+<var name="RAIL_CeRye" value="RAIL_CeRyd+RAIL_CeRthic2_CentralRail_Thick2" />
+
+<var name="RAIL_CeRxf" value="RAIL_CeRwid3i_CentralRail_Width3inner" />
+<var name="RAIL_CeRyf" value="RAIL_CeRye" />
+
+<var name="RAIL_CeRxg" value="RAIL_CeRxf" />
+<var name="RAIL_CeRyg" value="RAIL_CeRyf+RAIL_CeRthic1_CentralRail_Thick1" />
+
+<var name="RAIL_CeRxh" value="-RAIL_CeRwid3o_CentralRail_Width3outer" />
+<var name="RAIL_CeRyh" value="RAIL_CeRyg" />
+
+<var name="RAIL_CeRxi" value="RAIL_CeRxh" />
+<var name="RAIL_CeRyi" value="RAIL_CeRye" />
+
+<var name="RAIL_CeRxj" value="-RAIL_CeRwidt2_CentralRail_Width2/2." />
+<var name="RAIL_CeRyj" value="RAIL_CeRyi" />
+
+<var name="RAIL_CeRxk" value="RAIL_CeRxj" />
+<var name="RAIL_CeRyk" value="RAIL_CeRyc" />
+
+<var name="RAIL_CeRxl" value="-RAIL_CeRwidt1_CentralRail_Width1/2." />
+<var name="RAIL_CeRyl" value="RAIL_CeRyk" />
+
+<var name="RAIL_CeRxm" value="RAIL_CeRxl" />
+<var name="RAIL_CeRym" value="RAIL_CeRy " />
+
+<!-- gvxy name="CentralRail" material="Iron" dZ="RAIL_CeRzleng_CentralRail_Zlength" >
+ <gvxy_point X_Y="-RAIL_CeRxb;RAIL_CeRyb"/>
+ <gvxy_point X_Y="-RAIL_CeRxc;RAIL_CeRyc"/>
+ <gvxy_point X_Y="-RAIL_CeRxd;RAIL_CeRyd"/>
+ <gvxy_point X_Y="-RAIL_CeRxe;RAIL_CeRye"/>
+ <gvxy_point X_Y="-RAIL_CeRxf;RAIL_CeRyf"/>
+ <gvxy_point X_Y="-RAIL_CeRxg;RAIL_CeRyg"/>
+ <gvxy_point X_Y="-RAIL_CeRxh;RAIL_CeRyh"/>
+ <gvxy_point X_Y="-RAIL_CeRxi;RAIL_CeRyi"/>
+ <gvxy_point X_Y="-RAIL_CeRxj;RAIL_CeRyj"/>
+ <gvxy_point X_Y="-RAIL_CeRxk;RAIL_CeRyk"/>
+ <gvxy_point X_Y="-RAIL_CeRxl;RAIL_CeRyl"/>
+ <gvxy_point X_Y="-RAIL_CeRxm;RAIL_CeRym"/>
+</gvxy -->
+
+<var name="Rail_temp1" value="RAIL_CeRyg/2.-(RAIL_CeRyg-RAIL_CeRyf)/2." />
+<var name="Rail_temp2" value="-RAIL_CeRyg/2.+(RAIL_CeRyc-RAIL_CeRyb)/2." />
+<var name="Rail_temp3" value="(RAIL_CeRxg+RAIL_CeRxh)/2." />
+
+<box name="ExtremityRail_a" material="Iron" X_Y_Z="RAIL_CeRxd*2.;RAIL_CeRyg;RAIL_ExRzleng_ExtremityRail_Zlength - GENV_Eps" />
+<box name="ExtremityRail_b" material="Iron" X_Y_Z="(RAIL_CeRxg-RAIL_CeRxh);(RAIL_CeRyg-RAIL_CeRyf);RAIL_ExRzleng_ExtremityRail_Zlength" />
+<box name="ExtremityRail_c" material="Iron" X_Y_Z="-2.*RAIL_CeRxl;(RAIL_CeRyc-RAIL_CeRyb);RAIL_ExRzleng_ExtremityRail_Zlength" />
+<union name="ExtremityRail_d" >
+ <posXYZ volume="ExtremityRail_a" />
+ <posXYZ volume="ExtremityRail_b" X_Y_Z="-Rail_temp3;Rail_temp1;0"/>
+ <posXYZ volume="ExtremityRail_c" X_Y_Z="0.;Rail_temp2;0"/>
+</union>
+
+<composition name="ExtremityRail_plus_new" >
+ <posXYZ volume="ExtremityRail_d" X_Y_Z="0.;RAIL_CeRyg/2.;0." />
+</composition>
+
+<box name="CentralRail_a" material="Iron" X_Y_Z="RAIL_CeRxd*2.;RAIL_CeRyg;RAIL_CeRzleng_CentralRail_Zlength - GENV_Eps" />
+<box name="CentralRail_b" material="Iron" X_Y_Z="(RAIL_CeRxg-RAIL_CeRxh);(RAIL_CeRyg-RAIL_CeRyf);RAIL_CeRzleng_CentralRail_Zlength" />
+<box name="CentralRail_c" material="Iron" X_Y_Z="-2.*RAIL_CeRxl;(RAIL_CeRyc-RAIL_CeRyb);RAIL_CeRzleng_CentralRail_Zlength" />
+<union name="CentralRail_d" >
+ <posXYZ volume="CentralRail_a" />
+ <posXYZ volume="CentralRail_b" X_Y_Z="-Rail_temp3;Rail_temp1;0"/>
+ <posXYZ volume="CentralRail_c" X_Y_Z="0.;Rail_temp2;0"/>
+</union>
+
+<composition name="CentralRail_new" >
+ <posXYZ volume="CentralRail_d" X_Y_Z="0.;RAIL_CeRyg/2.;0." />
+</composition>
+
+<!--gvxy name="ExtremityRail_plus" material="Iron" dZ="RAIL_ExRzleng_ExtremityRail_Zlength" >
+ <gvxy_point X_Y=" -RAIL_CeRxb ; RAIL_CeRyb " />
+ <gvxy_point X_Y=" -RAIL_CeRxc ; RAIL_CeRyc " />
+ <gvxy_point X_Y=" -RAIL_CeRxd ; RAIL_CeRyd " />
+ <gvxy_point X_Y=" -RAIL_CeRxe ; RAIL_CeRye " />
+ <gvxy_point X_Y=" -RAIL_CeRxf ; RAIL_CeRyf " />
+ <gvxy_point X_Y=" -RAIL_CeRxg ; RAIL_CeRyg " />
+ <gvxy_point X_Y=" -RAIL_CeRxh ; RAIL_CeRyh " />
+ <gvxy_point X_Y=" -RAIL_CeRxi ; RAIL_CeRyi " />
+ <gvxy_point X_Y=" -RAIL_CeRxj ; RAIL_CeRyj " />
+ <gvxy_point X_Y=" -RAIL_CeRxk ; RAIL_CeRyk " />
+ <gvxy_point X_Y=" -RAIL_CeRxl ; RAIL_CeRyl " />
+ <gvxy_point X_Y=" -RAIL_CeRxm ; RAIL_CeRym " />
+</gvxy -->
+
+<composition name="ExtremityRail_minus" >
+ <posXYZ volume="ExtremityRail_plus_new" rot=" 0.; 180.; 0. " />
+</composition>
+
+
+
+<!-- Reinforcement Plates -->
+
+<var name="RAIL_CeRRPIy2_CentralRailReinforcementPlateInner_Ydist2" value="(RAIL_CeRRPIx1_CentralRailReinforcementPlateInner_Xdist1 + RAIL_CeRwidt2_CentralRail_Width2/2. - RAIL_CeRxc) * GENV_Ta55" />
+
+<var name="RAIL_CeRRPIxa" value="RAIL_CeRxd" />
+<var name="RAIL_CeRRPIya" value="RAIL_CeRyd" />
+<var name="RAIL_CeRRPIxb" value="RAIL_CeRxc" />
+<var name="RAIL_CeRRPIyb" value="RAIL_CeRyc" />
+<var name="RAIL_CeRRPIxc" value="RAIL_CeRxd + RAIL_CeRRPIx1_CentralRailReinforcementPlateInner_Xdist1" />
+<var name="RAIL_CeRRPIyc" value="RAIL_CeRyc + RAIL_CeRRPIy2_CentralRailReinforcementPlateInner_Ydist2" />
+<var name="RAIL_CeRRPIxd" value="RAIL_CeRRPIxc" />
+<var name="RAIL_CeRRPIyd" value="RAIL_CeRye" />
+<var name="RAIL_CeRRPIxe" value="RAIL_CeRRPIxa" />
+<var name="RAIL_CeRRPIye" value="RAIL_CeRRPIyd" />
+
+<gvxy name="CentralRailReinforcementPlateInner_extremity" material="Iron" dZ="RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength" >
+ <gvxy_point X_Y=" -RAIL_CeRRPIxa ; RAIL_CeRRPIya " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxb ; RAIL_CeRRPIyb " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxc ; RAIL_CeRRPIyc " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxd ; RAIL_CeRRPIyd " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxe ; RAIL_CeRRPIye " />
+</gvxy>
+
+
+<var name="RAIL_CeRRPOxa" value="-RAIL_CeRxd" />
+<var name="RAIL_CeRRPOya" value=" RAIL_CeRyd" />
+<var name="RAIL_CeRRPOxb" value="-RAIL_CeRxc" />
+<var name="RAIL_CeRRPOyb" value=" RAIL_CeRyc" />
+<var name="RAIL_CeRRPOxc" value="-RAIL_CeRxd - RAIL_CeRRPOx1_CentralRailReinforcementPlateOuter_Xdist1" />
+<var name="RAIL_CeRRPOyc" value=" RAIL_CeRyc + RAIL_CeRRPIy2_CentralRailReinforcementPlateInner_Ydist2" />
+<var name="RAIL_CeRRPOxd" value=" RAIL_CeRRPOxc" />
+<var name="RAIL_CeRRPOyd" value=" RAIL_CeRye" />
+<var name="RAIL_CeRRPOxe" value=" RAIL_CeRRPOxa" />
+<var name="RAIL_CeRRPOye" value=" RAIL_CeRRPOyd" />
+
+<gvxy name="CentralRailReinforcementPlateOuter_extremity" material="Iron" dZ="RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength" >
+ <gvxy_point X_Y=" RAIL_CeRRPOxa ; RAIL_CeRRPOya " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxb ; RAIL_CeRRPOyb " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxc ; RAIL_CeRRPOyc " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxd ; RAIL_CeRRPOyd " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxe ; RAIL_CeRRPOye " />
+</gvxy>
+
+<var name="RAIL_CeRRPe1z_CentralRailReinforcementPlate_extremity1_Zpos" value="-RAIL_CeRzleng_CentralRail_Zlength/2. + RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength/2. " />
+<var name="RAIL_CeRRPe2z_CentralRailReinforcementPlate_extremity2_Zpos" value="-RAIL_CeRRPe1z_CentralRailReinforcementPlate_extremity1_Zpos" />
+<var name="RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" value="-RAIL_ExRzleng_ExtremityRail_Zlength/2. + RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength/2. " />
+<var name="RAIL_ExRRPe2z_ExtremityRailReinforcementPlate_extremity2_Zpos" value="-RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" />
+
+<gvxy name="CentralRailReinforcementPlateInner_std" material="Iron" dZ="RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength" >
+ <gvxy_point X_Y=" -RAIL_CeRRPIxa ; RAIL_CeRRPIya " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxb ; RAIL_CeRRPIyb " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxc ; RAIL_CeRRPIyc " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxd ; RAIL_CeRRPIyd " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxe ; RAIL_CeRRPIye " />
+</gvxy>
+<gvxy name="CentralRailReinforcementPlateOuter_std" material="Iron" dZ="RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength" >
+ <gvxy_point X_Y=" RAIL_CeRRPOxa ; RAIL_CeRRPOya " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxb ; RAIL_CeRRPOyb " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxc ; RAIL_CeRRPOyc " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxd ; RAIL_CeRRPOyd " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxe ; RAIL_CeRRPOye " />
+</gvxy>
+
+
+
+<composition name="CentralRailReinforcementPlate_extremity_minus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_extremity" rot="0.;180.;0." />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_extremity" />
+</composition>
+<composition name="CentralRailReinforcementPlate_extremity_plus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_extremity" />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_extremity" rot="0.;180.;0." />
+</composition>
+
+<composition name="CentralRailReinforcementPlate_std_minus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_std" rot="0.;180.;0." />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_std" />
+</composition>
+<composition name="CentralRailReinforcementPlate_std_plus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_std" />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_std" rot="0.;180.;0." />
+</composition>
+
+
+
+<!-- Feet Assembly -->
+
+<composition name="CentralRailAssembly" >
+ <!-- posXYZ volume="CentralRail" rot="0.;180.;0." /-->
+ <posXYZ volume="CentralRail_new" rot="0.;180.;0." />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z=" 0.;0.; RAIL_CeRRPe1z_CentralRailReinforcementPlate_extremity1_Zpos" />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z=" 0.;0.; RAIL_CeRRPe2z_CentralRailReinforcementPlate_extremity2_Zpos" />
+ <foreach index="I" begin="0" loops="11" >
+ <posXYZ volume="CentralRailReinforcementPlate_std_minus" X_Y_Z=" 0.;0.;-RAIL_CeRzleng_CentralRail_Zlength/2. + RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength/2. + RAIL_CeRRPSzp[I]" />
+ </foreach>
+</composition>
+
+
+<var name="RAIL_Ypos" value="RAIL_Ypos_above - RAIL_totHeight" /> <!-- ATTENTION THIS VARIABLE IS ALSO USED IN SHIELDING AND HFTRUCK SECTIONS -->
+<var name="RAIL_ExtrZpos" value="RAIL_CeRzleng_CentralRail_Zlength/2.+RAIL_ExRzleng_ExtremityRail_Zlength/2." />
+
+
+<composition name="ExtremityRailAssembly" >
+ <posXYZ volume="ExtremityRail_minus" X_Y_Z=" -RAIL_Xpos;0.; 0." />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z="-RAIL_Xpos;0.; RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z="-RAIL_Xpos;0.; RAIL_ExRRPe2z_ExtremityRailReinforcementPlate_extremity2_Zpos" />
+
+ <foreach index="I" begin="0" loops="17" >
+ <posXYZ volume="CentralRailReinforcementPlate_std_minus" X_Y_Z=" -RAIL_Xpos;0.;-RAIL_ExRzleng_ExtremityRail_Zlength/2. - RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength/2. + RAIL_ExRRPSzp[I]" />
+ </foreach>
+
+ <!--posXYZ volume="ExtremityRail_plus" X_Y_Z=" RAIL_Xpos;0.; 0." /-->
+ <posXYZ volume="ExtremityRail_plus_new" X_Y_Z=" RAIL_Xpos;0.; 0." />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_plus" X_Y_Z=" RAIL_Xpos;0.; RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_plus" X_Y_Z=" RAIL_Xpos;0.; RAIL_ExRRPe2z_ExtremityRailReinforcementPlate_extremity2_Zpos" />
+
+ <foreach index="I" begin="0" loops="17" >
+ <posXYZ volume="CentralRailReinforcementPlate_std_plus" X_Y_Z=" RAIL_Xpos;0.;-RAIL_ExRzleng_ExtremityRail_Zlength/2. - RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength/2. + RAIL_ExRRPSzp[I]" />
+ </foreach>
+</composition>
+
+<composition name="RailAssembly" >
+ <posXYZ volume="CentralRailAssembly" X_Y_Z="-RAIL_Xpos;RAIL_Ypos; 0." rot="0.; 0.;0." />
+ <posXYZ volume="CentralRailAssembly" X_Y_Z=" RAIL_Xpos;RAIL_Ypos; 0." rot="0.;180.;0." />
+ <posXYZ volume="ExtremityRailAssembly" X_Y_Z=" 0.;RAIL_Ypos; RAIL_ExtrZpos" rot="0.; 0.;0." />
+ <posXYZ volume="ExtremityRailAssembly" X_Y_Z=" 0.;RAIL_Ypos;-RAIL_ExtrZpos" rot="0.;180.;0." />
+</composition>
+
+</section>
+
+
+
+
+
+<section name = "ATLAS Shielding"
+ version = "8.0"
+ date = "10 January 2011"
+ author = "Daniel Pomarede, reviewed by Jochen"
+ top_volume = "useless">
+
+
+<!-- name = A Frame Welded Assembly section name = "Shielding" -->
+
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Shields ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+
+<!-- JF Shielding -->
+
+<!-- "A" Frame Welded Assembly -->
+
+
+
+<!-- Useful variables -->
+
+<var name="JFSH_XYZref" value=" 0." /> <!-- NO CONFIRMATION NEEDED -->
+<var name="JFSH_rot180" value=" 180." /> <!-- NO CONFIRMATION NEEDED -->
+
+<!-- Primary variables -->
+
+<!-- BEGIN confirmation with atljf___0087-vAC (if no other comment) -->
+<var name="JFSH_AFBBleng_AFrame_BottomBar_length" value="5498." />
+<var name="JFSH_AFBheigh_AFrame_Bar_height" value=" 250." />
+<var name="JFSH_AFrwidth_AFrame_width" value=" 250." />
+<var name="JFSH_AFBthic1_AFrame_Bar_thickness1" value=" 9." />
+<var name="JFSH_AFBthic2_AFrame_Bar_thickness2" value=" 14." />
+<var name="JFSH_AFLangle_AFrame_Leg_angle" value=" 42." />
+
+<var name="JFSH_AFSlengt_AFrame_Spacer_length" value=" 140." />
+<var name="JFSH_AFSheigh_AFrame_Spacer_height" value=" 290." />
+
+<var name="JFSH_AFWEBBx1_AFrame_Web_element_BottomBar_X1" value=" 0." /> <!-- NO CONFIRMATION NEEDED -->
+<var name="JFSH_AFWEBBx2_AFrame_Web_element_BottomBar_X2" value="1306." /> <!-- confirmed atljf___0028-vAD -->
+<var name="JFSH_AFWEleng_AFrame_Web_element_length" value=" 30." />
+<var name="JFSH_AFWEBLx1_AFrame_Web_element_Leg_DX1" value="1090.+8." /> <!-- temporarily sum to avoid overlap, second Flange needs to be introduced, confirmed atljf___0028-vAD-->
+<var name="JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2" value=" 965." /> <!-- confirmed atljf___0028-vAD -->
+
+<var name="JFSH_AFFthick_AFrame_Flange_thickness" value=" 15." />
+<var name="JFSH_AFFlengt_AFrame_Flange_length" value=" 935." />
+
+<var name="JFSH_AFTPleng_AFrame_TopPlate_length" value=" 300." />
+<var name="JFSH_AFTPheig_AFrame_TopPlate_height" value=" 50." />
+
+<var name="JFSH_AFWheigh_AFrame_Wedge_height" value=" 149.2"/>
+<var name="JFSH_AFWexten_AFrame_Wedge_extension" value=" 200." />
+<var name="JFSH_AFWthick_AFrame_Wedge_thickness" value=" 50." />
+<var name="JFSH_AFWzoffs_AFrame_Wedge_zoffset" value=" 20." /> <!-- confirmed atljf___0028-vAD -->
+
+<var name="JFSH_AFFEElen_AFrame_Feet_length" value=" 830."/>
+<var name="JFSH_AFFEEthi_AFrame_Feet_thickness" value=" 50."/>
+<var name="JFSH_AFFEEsle_AFrame_Feet_shortlength" value=" 100. - 20."/> <!-- reduced value to avoid clash with rail -->
+<var name="JFSH_AFFEEhei_AFrame_Feet_height" value=" 225."/>
+<var name="JFSH_AFFEEext_AFrame_Feet_X_extension" value=" 6830."/> <!-- confirmed atljf___0028-vAD -->
+
+<var name="JFSH_AFtothei_AFrame_Total_height" value=" 2740."/> <!-- confirmed atljf___0028-vAD -->
+<var name="JFSH_AFECTcle_Clearance_ECT_AFrame" value=" 25."/> <!-- confirmed atljf___0010-vAC -->
+
+<var name="JFSH_ECTnomiz_ECT_Nominal_zpos" value="12914."/> <!-- confirmed atljf___0010-vAC -->
+<!-- END confirmation with atljf___0087-vAC -->
+
+<!-- Derived variables TEMPORAY already declare in RAIL Section laurent 05-05-10 ********* -->
+<var name="RAIL_CeRthic1_CentralRail_Thick1JFSH" value=" 100." /> <!-- confirmed atlhbrb_0001-vAH -->
+<var name="RAIL_CeRthic2_CentralRail_Thick2JFSH" value=" 200." /> <!-- confirmed atlhbrb_0001-vAH -->
+<var name="RAIL_Ypos_aboveJFSH" value="-4390." /> <!-- confirmed atcnh___0005-vAG -->
+<var name="RAIL_totHeightJFSH" value="RAIL_CeRthic2_CentralRail_Thick2JFSH+2.*RAIL_CeRthic1_CentralRail_Thick1JFSH" />
+<var name="RAIL_YposJFSH" value="RAIL_Ypos_aboveJFSH - RAIL_totHeightJFSH" />
+<var name="JFSH_AFyposit_AFrame_Ypos" value="RAIL_YposJFSH+RAIL_totHeightJFSH+JFSH_AFFEEthi_AFrame_Feet_thickness" />
+<var name="JFSH_AFzposit_AFrame_Zpos" value="JFSH_XYZref + JFSH_AFECTcle_Clearance_ECT_AFrame +JFSH_AFrwidth_AFrame_width/2." />
+<var name="JFSH_AFASposy_AFrame_Assembly_Y" value=" JFSH_AFyposit_AFrame_Ypos" />
+<var name="JFSH_AFASposz_AFrame_Assembly_Z" value=" JFSH_AFzposit_AFrame_Zpos" />
+<!-- Derived variables TEMPORAY already declare in RAIL Section ********* -->
+
+
+<!-- "A" Frame Welded Assembly Bottom Bar Lower Horizontal Plate -->
+<var name="JFSH_AFBLHPxa" value="JFSH_AFBBleng_AFrame_BottomBar_length/2." />
+<var name="JFSH_AFBLHPya" value="JFSH_XYZref" />
+<var name="JFSH_AFBLHPyb" value="JFSH_AFBLHPya+JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFBLHPxb" value="JFSH_AFBLHPxa - (JFSH_AFBLHPyb-JFSH_AFBLHPya)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<trd name="JFSH_AFrame_BottomBar_LowerHorizontalPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFBLHPxb; 2.*JFSH_AFBLHPxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFBLHPyb-JFSH_AFBLHPya" />
+
+
+<!-- "A" Frame Welded Assembly Bottom Bar Vertical Plate -->
+
+<var name="JFSH_AFBBVPxa" value="JFSH_AFBLHPxb" />
+<var name="JFSH_AFBBVPya" value="JFSH_AFBthic2_AFrame_Bar_thickness2" />
+<var name="JFSH_AFBBVPyb" value="JFSH_AFBheigh_AFrame_Bar_height - JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFBBVPxb" value="JFSH_AFBBVPxa - (JFSH_AFBBVPyb-JFSH_AFBBVPya)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<trd name="JFSH_AFrame_BottomBar_VerticalPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFBBVPxb; 2.*JFSH_AFBBVPxa; JFSH_AFBthic1_AFrame_Bar_thickness1; JFSH_AFBthic1_AFrame_Bar_thickness1; JFSH_AFBBVPyb-JFSH_AFBBVPya" />
+
+<!-- "A" Frame Welded Assembly Bottom Bar Upper Horizontal Plate -->
+
+<var name="JFSH_AFBUHPxa" value="JFSH_AFBBVPxb" />
+<var name="JFSH_AFBUHPya" value="JFSH_AFBBVPyb" />
+<var name="JFSH_AFBUHPyb" value="JFSH_AFBUHPya + JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFBUHPxb" value="JFSH_AFBUHPxa - (JFSH_AFBUHPyb-JFSH_AFBUHPya)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<trd name="JFSH_AFrame_BottomBar_UpperHorizontalPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFBUHPxb; 2.*JFSH_AFBUHPxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFBUHPyb-JFSH_AFBUHPya" />
+
+
+<!-- "A" Frame Welded Assembly Leg Lower Horizontal Plate -->
+
+<var name="JFSH_AFLLHPxa" value="JFSH_AFBLHPxa" />
+<var name="JFSH_AFLLHPya" value="JFSH_AFBLHPya" />
+
+<var name="JFSH_AFLLHPxb" value="JFSH_AFSlengt_AFrame_Spacer_length/2." />
+<var name="JFSH_AFLLHPyb" value="(JFSH_AFLLHPxa-JFSH_AFLLHPxb)*tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180) " />
+
+<var name="JFSH_AFLLHPxc" value="JFSH_AFLLHPxb" />
+<var name="JFSH_AFLLHPyc" value="JFSH_AFLLHPyb + JFSH_AFBthic2_AFrame_Bar_thickness2/cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<var name="JFSH_AFLLHPxd" value="JFSH_AFLLHPxa + JFSH_AFBthic2_AFrame_Bar_thickness2/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLLHPyd" value="JFSH_AFBLHPya" />
+
+<box name="JFSH_AFrame_Leg_LowerHorizontalPlate_basic" material="ShieldSteel" X_Y_Z="JFSH_AFBthic2_AFrame_Bar_thickness2; JFSH_AFLLHPyc/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Leg_LowerHorizontalPlate_cut1" material="ShieldSteel" X_Y_Z="2.*JFSH_AFLLHPxb; JFSH_AFrwidth_AFrame_width; 2.*JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Leg_LowerHorizontalPlate_cut2" material="ShieldSteel" X_Y_Z="JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; 2.*JFSH_AFrwidth_AFrame_width" />
+
+<subtraction name="JFSH_AFrame_Leg_LowerHorizontalPlate">
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate_basic" X_Y_Z="(JFSH_AFLLHPxd+JFSH_AFLLHPxb)/2.-JFSH_AFBthic2_AFrame_Bar_thickness2*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2.; JFSH_AFLLHPyc/2.-JFSH_AFBthic2_AFrame_Bar_thickness2*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2.; 0. " rot=" 0.; 0.; 90-JFSH_AFLangle_AFrame_Leg_angle"/>
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate_cut1" X_Y_Z="0.; JFSH_AFLLHPyc; 0."/>
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate_cut2" X_Y_Z="JFSH_AFLLHPxd; -JFSH_AFrwidth_AFrame_width/2.; 0."/>
+</subtraction>
+
+<!-- "A" Frame Welded Assembly Leg Vertical Plate -->
+
+<var name="JFSH_AFLVPxa" value="JFSH_AFLLHPxd" />
+<var name="JFSH_AFLVPya" value="JFSH_AFLLHPyd" />
+
+<var name="JFSH_AFLVPxb" value="JFSH_AFLLHPxc" />
+<var name="JFSH_AFLVPyb" value="JFSH_AFLLHPyc" />
+
+<var name="JFSH_AFLVPxc" value="JFSH_AFLVPxb" />
+<var name="JFSH_AFLVPyc" value="JFSH_AFtothei_AFrame_Total_height - JFSH_AFTPheig_AFrame_TopPlate_height" />
+
+<var name="JFSH_AFLVPxe" value="JFSH_AFLVPxa + (JFSH_AFBheigh_AFrame_Bar_height-2*JFSH_AFBthic2_AFrame_Bar_thickness2)/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLVPye" value="JFSH_AFBLHPya" />
+
+<var name="JFSH_AFLVPyd" value="JFSH_AFLVPyc" />
+<var name="JFSH_AFLVPxd" value="JFSH_AFLVPxe - (JFSH_AFLVPyd)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<box name="JFSH_AFrame_Leg_VerticalPlate_basic" material="ShieldSteel" X_Y_Z="-(JFSH_AFLVPxa-JFSH_AFLVPxe)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); (JFSH_AFLVPxe-JFSH_AFLVPxb)/cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); JFSH_AFBthic1_AFrame_Bar_thickness1" />
+<box name="JFSH_AFrame_Leg_VerticalPlate_cut1" material="ShieldSteel" X_Y_Z="JFSH_AFLVPxa; JFSH_AFLVPxa; JFSH_AFLVPxa"/>
+<box name="JFSH_AFrame_Leg_VerticalPlate_cut2" material="ShieldSteel" X_Y_Z="JFSH_AFLVPxa; JFSH_AFLVPxa; JFSH_AFLVPxa"/>
+<box name="JFSH_AFrame_Leg_VerticalPlate_cut3" material="ShieldSteel" X_Y_Z="JFSH_AFLVPxa; JFSH_AFLVPxa; JFSH_AFLVPxa"/>
+
+<subtraction name="JFSH_AFrame_Leg_VerticalPlate">
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_basic" X_Y_Z="(JFSH_AFLVPxe+JFSH_AFLVPxc)/2.+(JFSH_AFLVPxa-JFSH_AFLVPxe)*(1-cos(2.*JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180))/4.; (JFSH_AFLVPxe-JFSH_AFLVPxb)*tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2.+(JFSH_AFLVPxa-JFSH_AFLVPxe)*sin(2.*JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/4.; 0" rot=" 0.; 0.; 90-JFSH_AFLangle_AFrame_Leg_angle"/>
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_cut1" X_Y_Z="JFSH_AFLVPxa; -JFSH_AFLVPxa/2.; 0"/>
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_cut2" X_Y_Z="-JFSH_AFLVPxa/2.+JFSH_AFLVPxb; JFSH_AFLVPyb; 0"/>
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_cut3" X_Y_Z="0.; JFSH_AFLVPyc+JFSH_AFLVPxa/2.; 0"/>
+</subtraction>
+
+<!-- "A" Frame Welded Assembly Leg Upper Horizontal Plate -->
+
+<var name="JFSH_AFLUHPxa" value="JFSH_AFLVPxe" />
+<var name="JFSH_AFLUHPya" value="JFSH_AFLVPye" />
+
+<var name="JFSH_AFLUHPxb" value="JFSH_AFLVPxd" />
+<var name="JFSH_AFLUHPyb" value="JFSH_AFLVPyd" />
+
+<var name="JFSH_AFLUHPxc" value="JFSH_AFLUHPxb + JFSH_AFBthic2_AFrame_Bar_thickness2/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLUHPyc" value="JFSH_AFLVPyc" />
+
+<var name="JFSH_AFLUHPxd" value="JFSH_AFLUHPxa + JFSH_AFBthic2_AFrame_Bar_thickness2/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLUHPyd" value="JFSH_AFLUHPya" />
+
+<var name="JFSH_AFrame_Leg_Angle" value="atan(JFSH_AFLUHPyb / (JFSH_AFLUHPxb - JFSH_AFLUHPxa))"/>
+<box name="JFSH_AFrame_Leg_UpperHorizontalPlate_basic" material="ShieldSteel" X_Y_Z="(JFSH_AFLUHPxa - JFSH_AFLUHPxb)/cos(JFSH_AFrame_Leg_Angle) + cos(JFSH_AFrame_Leg_Angle)*(JFSH_AFLUHPxd - JFSH_AFLUHPxa); -sin(JFSH_AFrame_Leg_Angle)*(JFSH_AFLUHPxd - JFSH_AFLUHPxa);JFSH_AFrwidth_AFrame_width"/>
+<box name="JFSH_AFrame_Leg_UpperHorizontalPlate_cut" material="ShieldSteel" X_Y_Z="(JFSH_AFLUHPxd-JFSH_AFLUHPxa)*4.;(JFSH_AFLUHPxd-JFSH_AFLUHPxa)*4.;JFSH_AFrwidth_AFrame_width*2."/>
+
+<subtraction name="JFSH_AFrame_Leg_UpperHorizontalPlate">
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate_basic" X_Y_Z="JFSH_AFLUHPxb + (JFSH_AFLUHPxd - JFSH_AFLUHPxb)/2.; JFSH_AFLUHPyb/2.; 0." rot="0.;0.;JFSH_AFrame_Leg_Angle/GENV_Pi*180." />
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate_cut" X_Y_Z="JFSH_AFLUHPxd; -2.*(JFSH_AFLUHPxd - JFSH_AFLUHPxa); 0."/>
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate_cut" X_Y_Z="JFSH_AFLUHPxc; JFSH_AFLUHPyc + 2.*(JFSH_AFLUHPxd - JFSH_AFLUHPxa); 0."/>
+</subtraction>
+
+<!-- "A" Frame Welded Assembly Top Plate -->
+
+<var name="JFSH_AFTPLAxa" value="JFSH_AFTPleng_AFrame_TopPlate_length/2." />
+<var name="JFSH_AFTPLAya" value="JFSH_AFtothei_AFrame_Total_height-JFSH_AFTPheig_AFrame_TopPlate_height" />
+
+<var name="JFSH_AFTPLAxb" value="JFSH_AFTPLAxa " />
+<var name="JFSH_AFTPLAyb" value="JFSH_AFtothei_AFrame_Total_height" />
+
+<trd name="JFSH_AFrame_TopPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFTPLAxb; 2.*JFSH_AFTPLAxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFTPLAyb-JFSH_AFTPLAya" />
+
+<!-- "A" Frame Welded Assembly Spacer -->
+
+<var name="JFSH_AFSPACxa" value="JFSH_AFSlengt_AFrame_Spacer_length/2." />
+<var name="JFSH_AFSPACya" value="JFSH_AFTPLAya-JFSH_AFSheigh_AFrame_Spacer_height" />
+
+<var name="JFSH_AFSPACxb" value="JFSH_AFSPACxa " />
+<var name="JFSH_AFSPACyb" value="JFSH_AFTPLAya" />
+
+<trd name="JFSH_AFrame_Spacer" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFSPACxb; 2.*JFSH_AFSPACxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFSPACyb-JFSH_AFSPACya" />
+
+
+<!-- "A" Frame Welded Assembly Web -->
+
+<var name="JFSH_AFWEBwid_AFrame_Web_element_width" value="(JFSH_AFrwidth_AFrame_width-JFSH_AFBthic1_AFrame_Bar_thickness1)/2." />
+<var name="JFSH_AFWEBhei_AFrame_Web_element_height" value="JFSH_AFBheigh_AFrame_Bar_height-2.*JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y" value="JFSH_AFBthic2_AFrame_Bar_thickness2+JFSH_AFWEBhei_AFrame_Web_element_height/2" />
+<var name="JFSH_AFWEBzpo_AFrame_Web_element_Z" value="JFSH_AFBthic1_AFrame_Bar_thickness1/2. + JFSH_AFWEBwid_AFrame_Web_element_width/2." />
+
+<box name="JFSH_AFrame_Web_element" material="ShieldSteel" X_Y_Z="JFSH_AFWEleng_AFrame_Web_element_length;JFSH_AFWEBhei_AFrame_Web_element_height;JFSH_AFWEBwid_AFrame_Web_element_width" />
+
+<composition name="JFSH_AFrame_Web_composite_element" >
+ <posXYZ volume="JFSH_AFrame_Web_element" X_Y_Z="0.;0.; JFSH_AFWEBzpo_AFrame_Web_element_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_element" X_Y_Z="0.;0.;-JFSH_AFWEBzpo_AFrame_Web_element_Z" rot="0.;0.;0." />
+</composition>
+
+<!-- "A" Frame Welded Assembly Web element leg -->
+
+<var name="JFSH_AFWELxi1" value="JFSH_AFLUHPxd - JFSH_AFWEBLx1_AFrame_Web_element_Leg_DX1*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyi1" value="JFSH_AFWEBLx1_AFrame_Web_element_Leg_DX1*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELxp1" value="JFSH_AFWELxi1-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyp1" value="JFSH_AFWELyi1-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<var name="JFSH_AFWELxi2" value="JFSH_AFWELxi1 - JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyi2" value="JFSH_AFWELyi1 + JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELxp2" value="JFSH_AFWELxi2-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyp2" value="JFSH_AFWELyi2-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<var name="JFSH_AFWELxi3" value="JFSH_AFWELxi2 - JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyi3" value="JFSH_AFWELyi2 + JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELxp3" value="JFSH_AFWELxi3-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyp3" value="JFSH_AFWELyi3-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<!-- "A" Frame Welded Assembly Flanges -->
+
+<var name="JFSH_AFFwidth_AFrame_Flange_width" value="JFSH_AFWEBwid_AFrame_Web_element_width" />
+<var name="JFSH_AFFzposi_AFrame_Flange_Z" value="JFSH_AFWEBzpo_AFrame_Web_element_Z" />
+
+<box name="JFSH_AFrame_Flange" material="ShieldSteel" X_Y_Z="JFSH_AFFlengt_AFrame_Flange_length;JFSH_AFFthick_AFrame_Flange_thickness;JFSH_AFFwidth_AFrame_Flange_width" />
+<composition name="JFSH_AFrame_Flange_composite" >
+ <posXYZ volume="JFSH_AFrame_Flange" X_Y_Z="0.;0.; JFSH_AFFzposi_AFrame_Flange_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Flange" X_Y_Z="0.;0.;-JFSH_AFFzposi_AFrame_Flange_Z" rot="0.;0.;0." />
+</composition>
+
+<var name="JFSH_AFFposx1_AFrame_Flange_X1" value="JFSH_AFWELxp1+(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+<var name="JFSH_AFFposy1_AFrame_Flange_Y1" value="JFSH_AFWELyp1-(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+
+<var name="JFSH_AFFposx2_AFrame_Flange_X2" value="JFSH_AFWELxp2+(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+<var name="JFSH_AFFposy2_AFrame_Flange_Y2" value="JFSH_AFWELyp2-(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+
+<!-- "A" Frame Welded Assembly Wedges -->
+
+<var name="JFSH_AFWposxa_AFrame_Wedge_XA" value="JFSH_XYZref" />
+<var name="JFSH_AFWposya_AFrame_Wedge_YA" value="JFSH_XYZref" />
+<var name="JFSH_AFWposxb_AFrame_Wedge_XB" value="JFSH_AFWheigh_AFrame_Wedge_height*tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposyb_AFrame_Wedge_YB" value="JFSH_AFWheigh_AFrame_Wedge_height" />
+<var name="JFSH_AFWposxc_AFrame_Wedge_XC" value="JFSH_AFWposxb_AFrame_Wedge_XB+JFSH_AFWexten_AFrame_Wedge_extension*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposyc_AFrame_Wedge_YC" value="JFSH_AFWposyb_AFrame_Wedge_YB-JFSH_AFWexten_AFrame_Wedge_extension*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposxd_AFrame_Wedge_XD" value="JFSH_AFWposxc_AFrame_Wedge_XC- JFSH_AFWposyc_AFrame_Wedge_YC * tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposyd_AFrame_Wedge_YD" value="JFSH_AFWposya_AFrame_Wedge_YA" />
+
+<var name="JFSH_AFWposx0_AFrame_Wedge_X0" value="JFSH_AFWposxb_AFrame_Wedge_XB + JFSH_AFWposyb_AFrame_Wedge_YB / tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposy0_AFrame_Wedge_Y0" value="JFSH_AFWposxa_AFrame_Wedge_XA" />
+
+<box name="JFSH_AFrame_Wedge_basic" material="ShieldSteel" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; JFSH_AFWposyb_AFrame_Wedge_YB; JFSH_AFWthick_AFrame_Wedge_thickness"/>
+<box name="JFSH_AFrame_Wedge_cut1" material="ShieldSteel" X_Y_Z="2.*(JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxb_AFrame_Wedge_XB)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); JFSH_AFWposxc_AFrame_Wedge_XC; 2.*JFSH_AFWthick_AFrame_Wedge_thickness"/>
+<box name="JFSH_AFrame_Wedge_cut2" material="ShieldSteel" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; 2.*JFSH_AFWposxb_AFrame_Wedge_XB*cos(atan(JFSH_AFWposxb_AFrame_Wedge_XB/JFSH_AFWposyb_AFrame_Wedge_YB)); 2.*JFSH_AFWthick_AFrame_Wedge_thickness"/>
+<box name="JFSH_AFrame_Wedge_cut3" material="ShieldSteel" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; 2.*(JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxd_AFrame_Wedge_XD)*cos(atan((JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxd_AFrame_Wedge_XD)/JFSH_AFWposyc_AFrame_Wedge_YC)); 2.*JFSH_AFWthick_AFrame_Wedge_thickness"/>
+
+<subtraction name="JFSH_AFrame_Wedge">
+ <posXYZ volume="JFSH_AFrame_Wedge_basic" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC/2.; JFSH_AFWposyb_AFrame_Wedge_YB/2.; 0." />
+ <posXYZ volume="JFSH_AFrame_Wedge_cut1" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; JFSH_AFWposyb_AFrame_Wedge_YB; 0." rot=" 0.; 0.; 90-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Wedge_cut2" X_Y_Z="0.; JFSH_AFWposyb_AFrame_Wedge_YB; 0." rot=" 0.; 0.; 90-atan(JFSH_AFWposxb_AFrame_Wedge_XB/JFSH_AFWposyb_AFrame_Wedge_YB)/GENV_PiS180" />
+ <posXYZ volume="JFSH_AFrame_Wedge_cut3" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; 0.; 0." rot=" 0.; 0.; 90-atan((JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxd_AFrame_Wedge_XD)/JFSH_AFWposyc_AFrame_Wedge_YC)/GENV_PiS180" />
+</subtraction>
+
+<var name="JFSH_AFWposix_AFrame_Wedge_X" value=" JFSH_AFBUHPxb - JFSH_AFWposx0_AFrame_Wedge_X0" />
+<var name="JFSH_AFWposiy_AFrame_Wedge_Y" value=" JFSH_AFBUHPyb - JFSH_AFWposy0_AFrame_Wedge_Y0" />
+<var name="JFSH_AFWposiz_AFrame_Wedge_Z" value=" JFSH_AFrwidth_AFrame_width/2. - JFSH_AFWzoffs_AFrame_Wedge_zoffset - JFSH_AFWthick_AFrame_Wedge_thickness/2." />
+
+<!-- "A" Frame Welded Assembly Feet -->
+
+<var name="JFSH_AFFeetxa_AFrame_Feet_XA" value="JFSH_AFFEElen_AFrame_Feet_length/2." />
+<var name="JFSH_AFFeetya_AFrame_Feet_YA" value="JFSH_XYZref" />
+<var name="JFSH_AFFeetxb_AFrame_Feet_XB" value="JFSH_AFFeetxa_AFrame_Feet_XA" />
+<var name="JFSH_AFFeetyb_AFrame_Feet_YB" value="JFSH_AFFeetya_AFrame_Feet_YA - JFSH_AFFEEhei_AFrame_Feet_height" />
+<var name="JFSH_AFFeetxc_AFrame_Feet_XC" value="JFSH_AFFeetxb_AFrame_Feet_XB - JFSH_AFFEEsle_AFrame_Feet_shortlength" />
+<var name="JFSH_AFFeetyc_AFrame_Feet_YC" value="JFSH_AFFeetyb_AFrame_Feet_YB" />
+<var name="JFSH_AFFeetxd_AFrame_Feet_XD" value="JFSH_AFFeetxc_AFrame_Feet_XC" />
+<var name="JFSH_AFFeetyd_AFrame_Feet_YD" value="JFSH_AFFeetyb_AFrame_Feet_YB+JFSH_AFFEEthi_AFrame_Feet_thickness" />
+<var name="JFSH_AFFeetxe_AFrame_Feet_XE" value="JFSH_AFFeetxc_AFrame_Feet_XC+JFSH_AFFEEsle_AFrame_Feet_shortlength-JFSH_AFFEEthi_AFrame_Feet_thickness" />
+<var name="JFSH_AFFeetye_AFrame_Feet_YE" value="JFSH_AFFeetyd_AFrame_Feet_YD" />
+<var name="JFSH_AFFeetxf_AFrame_Feet_XF" value="JFSH_AFFeetxe_AFrame_Feet_XE" />
+<var name="JFSH_AFFeetyf_AFrame_Feet_YF" value="JFSH_AFFeetya_AFrame_Feet_YA-JFSH_AFFEEthi_AFrame_Feet_thickness" />
+
+<var name="JFSH_AFFeetpx_AFrame_Feet_X" value=" JFSH_AFFEEext_AFrame_Feet_X_extension/2. - JFSH_AFFEElen_AFrame_Feet_length/2." />
+
+<box name="JFSH_AFrame_Feet_basic" material="ShieldSteel" X_Y_Z="2.*JFSH_AFFeetxa_AFrame_Feet_XA; -JFSH_AFFeetyb_AFrame_Feet_YB; JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Feet_cut1" material="ShieldSteel" X_Y_Z="2.*JFSH_AFFeetxe_AFrame_Feet_XE; JFSH_AFFeetyf_AFrame_Feet_YF-JFSH_AFFeetye_AFrame_Feet_YE; 2.*JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Feet_cut2" material="ShieldSteel" X_Y_Z="2.*JFSH_AFFeetxc_AFrame_Feet_XC; JFSH_AFFeetyf_AFrame_Feet_YF-JFSH_AFFeetye_AFrame_Feet_YE; 2.*JFSH_AFrwidth_AFrame_width" />
+
+<subtraction name="JFSH_AFrame_Feet">
+ <posXYZ volume="JFSH_AFrame_Feet_basic" X_Y_Z="0.; JFSH_AFFeetyb_AFrame_Feet_YB/2.; 0."/>
+ <posXYZ volume="JFSH_AFrame_Feet_cut1" X_Y_Z="0.; (JFSH_AFFeetye_AFrame_Feet_YE-JFSH_AFFeetyf_AFrame_Feet_YF)/2.+JFSH_AFFeetyf_AFrame_Feet_YF; 0."/>
+ <posXYZ volume="JFSH_AFrame_Feet_cut2" X_Y_Z="0.; JFSH_AFFeetyc_AFrame_Feet_YC; 0."/>
+</subtraction>
+
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- "A" Frame Welded Assembly Composition of volumes -->
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<composition name="JFSH_AFrame_BottomBar" >
+ <posXYZ volume="JFSH_AFrame_BottomBar_LowerHorizontalPlate" X_Y_Z="0.;(JFSH_AFBLHPyb-JFSH_AFBLHPya)/2.; 0." rot="90.;0.;0."/>
+ <posXYZ volume="JFSH_AFrame_BottomBar_VerticalPlate" X_Y_Z="0.;(JFSH_AFBBVPyb-JFSH_AFBBVPya)/2.+JFSH_AFBLHPyb-JFSH_AFBLHPya; 0." rot="90.;0.;0."/>
+ <posXYZ volume="JFSH_AFrame_BottomBar_UpperHorizontalPlate" X_Y_Z="0.;(JFSH_AFBUHPyb-JFSH_AFBUHPya)/2.+JFSH_AFBBVPyb-JFSH_AFBBVPya+JFSH_AFBLHPyb-JFSH_AFBLHPya; 0." rot="90.;0.;0."/>
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWEBBx1_AFrame_Web_element_BottomBar_X1;JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y;0. " rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWEBBx2_AFrame_Web_element_BottomBar_X2;JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y;0. " rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z="-JFSH_AFWEBBx2_AFrame_Web_element_BottomBar_X2;JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y;0. " rot="0.;0.;0." />
+</composition>
+
+<composition name="JFSH_AFrame_Leg" >
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWELxp1;JFSH_AFWELyp1;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWELxp2;JFSH_AFWELyp2;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWELxp3;JFSH_AFWELyp3;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Flange_composite" X_Y_Z=" JFSH_AFFposx1_AFrame_Flange_X1;JFSH_AFFposy1_AFrame_Flange_Y1;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Flange_composite" X_Y_Z=" JFSH_AFFposx2_AFrame_Flange_X2;JFSH_AFFposy2_AFrame_Flange_Y2;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+</composition>
+
+<composition name="JFSH_AFrame_Assembly" >
+ <posXYZ volume="JFSH_AFrame_TopPlate" X_Y_Z="0.;JFSH_AFTPLAyb-(JFSH_AFTPLAyb-JFSH_AFTPLAya)/2.; 0." rot="90.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Spacer" X_Y_Z="0.;JFSH_AFSPACyb-(JFSH_AFSPACyb-JFSH_AFSPACya)/2.; 0." rot="90.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_BottomBar" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg" X_Y_Z="0.;0.; 0." rot="0.;JFSH_rot180;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z=" JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y; JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z=" JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y;-JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z="-JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y; JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;JFSH_rot180;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z="-JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y;-JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;JFSH_rot180;0." />
+ <posXYZ volume="JFSH_AFrame_Feet" X_Y_Z=" JFSH_AFFeetpx_AFrame_Feet_X;0.;0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Feet" X_Y_Z="-JFSH_AFFeetpx_AFrame_Feet_X;0.;0." rot="0.;0.;0." />
+</composition>
+
+<!-- name = JF Shielding section name = "Shielding" -->
+<!-- Simple modelization -->
+
+
+<!-- Primary variables -->
+
+<!-- BEGIN confirmation with atljf___0010-vAC (if no other comment) -->
+<!-- Main Cylinder -->
+<var name="JFSH_JFCMClen_JFCMainCylinder_length" value=" 5041." />
+<var name="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1" value=" 282." /> <!-- NO CONFIRMATION POSSIBLE; changed by Sven.Menke@CERN.CH Jul 2020 from 304 to 282 according to http://atlas.web.cern.ch/Atlas/GROUPS/Shielding/shielding.htm -->
+<var name="JFSH_JFCMCouR_JFCMainCylinder_outerRadius" value=" 1550." />
+<var name="JFSH_JFCMChSl_JFCMainCylinder_HoleSLope" value=" 1.1"/> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JFSH_JFCMChSl_JFCMainCylinder_HoleSLope_zoffset" value=" 1630." /> <!-- this length plus plug is straight; introduced by Sven.Menke@CERN.CH Jul 2020 according to https://edms.cern.ch/ui/file/322317/AC/atljf___0003-vAC.pdf -->
+<var name="JFSH_JFCMChSl_JFCMainCylinder_OctoZoverlap" value=" 520." /> <!-- this is the z-portion of JFC3 that is modeled here as Oct; introduced by Sven.Menke@CERN.CH Jul 2020 -->
+<var name="JFSH_JFCMCzof_JFCMainCylinder_zoffset" value=" 45." />
+<var name="JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff" value=" 30." /> <!-- confirmed atljf___0031-vAE -->
+<var name="JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff" value=" 50." /> <!-- confirmed atljf___0030-vAD -->
+
+<!-- PLUG -->
+<var name="JFSH_PLUGleng_Plug_length" value=" 250." />
+<var name="JFSH_PLUGinRa_Plug_innerRadius" value=" 280." /> <!-- confirmed atljf___0006-vAE -->
+<var name="JFSH_PLUGouRa_Plug_outerRadius" value=" 520." /> <!-- confirmed atljf___0006-vAE -->
+
+<!-- JFS Octogon -->
+<var name="JFSH_JFSOCmRa_JFSOctogon_mainRadius" value=" 2100." />
+<var name="JFSH_JFSOClen_JFSOctogon_length" value=" 3000." />
+<var name="JFSH_JFSOCzof_JFSOctogon_zoffset" value=" 5086." />
+<var name="JFSH_JFSOCrso_JFSOctogon_rolledsteeloff" value=" 30." /> <!-- confirmed atljf___0029-vAG -->
+<var name="JFSH_JFSOCpoo_JFSOctogon_polybaronoff" value=" 80." /> <!-- confirmed atljf___0024-vAD -->
+
+<!-- END confirmation with atljf___0010-vAC -->
+
+<!-- A-Frame to JFS Octogon connection -->
+<var name="JFSH_AFOconle_AFrame_to_JFSOctogon_connection_length" value=" 230." /> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JFSH_AFOconwi_AFrame_to_JFSOctogon_connection_width" value=" 200." /> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JFSH_AFOconhe_AFrame_to_JFSOctogon_connection_height" value=" 67." /> <!-- NO CONFIRMATION POSSIBLE -->
+
+<!-- Derived variables -->
+
+<var name="JFSH_JFCMCir2_JFCMainCylinder_innerRadius2" value="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1+(JFSH_JFCMClen_JFCMainCylinder_length-JFSH_JFCMChSl_JFCMainCylinder_HoleSLope_zoffset)*tan(JFSH_JFCMChSl_JFCMainCylinder_HoleSLope*GENV_PiS180)"/> <!-- changed by SvenMenke@CERN.CH Jul 2020 -->
+<var name="JFSH_JFCMCir3_JFCMainCylinder_innerRadius3" value="JFSH_JFCMCir2_JFCMainCylinder_innerRadius2+JFSH_JFCMChSl_JFCMainCylinder_OctoZoverlap*tan(JFSH_JFCMChSl_JFCMainCylinder_HoleSLope*GENV_PiS180)"/> <!-- added by SvenMenke@CERN.CH Jul 2020 -->
+<var name="JFSH_JFCMCzpo_JFCMainCylinder_Z" value="JFSH_XYZref+JFSH_JFCMCzof_JFCMainCylinder_zoffset" />
+<var name="JFSH_JFSOCzpo_JFSOctogon_Z" value="JFSH_XYZref+JFSH_JFSOCzof_JFSOctogon_zoffset+JFSH_JFSOClen_JFSOctogon_length/2." />
+<var name="JFSH_PLUGzpos_Plug_posz" value="JFSH_XYZref-JFSH_PLUGleng_Plug_length"/>
+
+<!-- JFC Cylinder -->
+<pcon name="JFSH_JFCMainCylinder_core" material="ShieldIron" >
+ <polyplane Rio_Z="JFSH_PLUGinRa_Plug_innerRadius;JFSH_PLUGouRa_Plug_outerRadius;JFSH_PLUGzpos_Plug_posz" />
+ <polyplane Rio_Z="JFSH_PLUGinRa_Plug_innerRadius;JFSH_PLUGouRa_Plug_outerRadius;0." />
+ <polyplane Rio_Z="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps;0." />
+ <polyplane Rio_Z="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps;JFSH_JFCMChSl_JFCMainCylinder_HoleSLope_zoffset" /> <!-- added plane by Sven.Menke@CERN.CH Jul 2020 since JFC2 is first straight and then with 1.1 degrees like JFC3 -->
+ <polyplane Rio_Z="JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps;JFSH_JFCMClen_JFCMainCylinder_length" />
+</pcon>
+
+<tubs name="JFSH_JFCMainCylinder_steelroll" material="ShieldSteel" Rio_Z=" JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff+GENV_Eps; JFSH_JFCMCouR_JFCMainCylinder_outerRadius; JFSH_JFCMClen_JFCMainCylinder_length"/>
+<tubs name="JFSH_JFCMainCylinder_polyroll" material="PolyBoronH3B03" Rio_Z=" JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff; JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff; JFSH_JFCMClen_JFCMainCylinder_length"/>
+
+<!-- A Frame to JFC Cylinder connection -->
+
+<box name="JFSH_AFrame_to_JFCMainCylinder_connection" material="ShieldSteel" X_Y_Z="JFSH_AFOconwi_AFrame_to_JFSOctogon_connection_width;JFSH_AFOconhe_AFrame_to_JFSOctogon_connection_height;JFSH_AFOconle_AFrame_to_JFSOctogon_connection_length" />
+
+<var name="JFSH_AFMCcony_AFrame_to_JFCMainCylinder_connection_Y" value="JFSH_AFASposy_AFrame_Assembly_Y + JFSH_AFtothei_AFrame_Total_height + JFSH_AFOconhe_AFrame_to_JFSOctogon_connection_height/2." />
+<var name="JFSH_AFMCconz_AFrame_to_JFCMainCylinder_connection_Z" value="JFSH_AFOconle_AFrame_to_JFSOctogon_connection_length/2.+GENV_Eps" />
+<var name="JFSH_AFconnexion2" value="15." /> <!-- former value 290. -->
+<union name="JFSH_JFCMainCylinder_compsteel" >
+ <posXYZ volume="JFSH_JFCMainCylinder_steelroll" X_Y_Z=" 0. ; 0. ; JFSH_JFCMClen_JFCMainCylinder_length/2. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_AFrame_to_JFCMainCylinder_connection" X_Y_Z=" 0. ; JFSH_AFMCcony_AFrame_to_JFCMainCylinder_connection_Y ; JFSH_AFMCconz_AFrame_to_JFCMainCylinder_connection_Z+JFSH_AFconnexion2" rot=" 0. ; 0. ; 0." />
+</union>
+
+<composition name="JFSH_JFCCylinder" >
+ <posXYZ volume="JFSH_JFCMainCylinder_core" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFCMainCylinder_compsteel" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFCMainCylinder_polyroll" X_Y_Z=" 0. ; 0. ; JFSH_JFCMClen_JFCMainCylinder_length/2. " rot=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- JFS Octogon -->
+
+<var name="JFSH_JFSOctxa_JFSOctogon_XA" value="JFSH_JFSOCmRa_JFSOctogon_mainRadius-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-JFSH_JFSOCpoo_JFSOctogon_polybaronoff-GENV_Eps" />
+<var name="JFSH_JFSOctya_JFSOctogon_YA" value="JFSH_JFSOctxa_JFSOctogon_XA*GENV_Ta225" />
+<var name="JFSH_JFSOctxb_JFSOctogon_XB" value="JFSH_JFSOctya_JFSOctogon_YA" />
+<var name="JFSH_JFSOctyb_JFSOctogon_YB" value="JFSH_JFSOctxa_JFSOctogon_XA" />
+
+<gvxysxy name="JFSH_JFSOctogon_Coreedge" material="ShieldIron" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-JFSH_JFSOCpoo_JFSOctogon_polybaronoff-GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA ; JFSH_JFSOctya_JFSOctogon_YA " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB ; JFSH_JFSOctyb_JFSOctogon_YB " />
+</gvxysxy>
+
+<tubs name="JFSH_JFSOctogon_Coreround" material="ShieldIron" Rio_Z=" 0. ;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps"/>
+
+<union name="JFSH_JFSOctogon_Core" >
+ <posXYZ volume="JFSH_JFSOctogon_Coreedge" X_Y_Z=" 0.; 0.; (JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)/2. "/>
+ <posXYZ volume="JFSH_JFSOctogon_Coreround" X_Y_Z=" 0.; 0.;-(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-JFSH_JFSOCpoo_JFSOctogon_polybaronoff)/2.+GENV_Eps" />
+</union>
+
+<pcon name="JFSH_JFSOctogon_Hole" material="ShieldIron" > <!-- changed from tubs to pcon by Sven.Menke@CERN.CH Jul 2020 since inner bore of JFC3 has 1.1 degree angle -->
+ <polyplane Rio_Z="0.;JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;-0.6*JFSH_JFSOClen_JFSOctogon_length"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;-0.5*JFSH_JFSOClen_JFSOctogon_length"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;-0.5*JFSH_JFSOClen_JFSOctogon_length"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir3_JFCMainCylinder_innerRadius3;-0.5*JFSH_JFSOClen_JFSOctogon_length+JFSH_JFCMChSl_JFCMainCylinder_OctoZoverlap"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir3_JFCMainCylinder_innerRadius3; 0.6*JFSH_JFSOClen_JFSOctogon_length"/>
+</pcon>
+<var name="JFSH_JFSOctHBPzo_JFSOctogon_HoleBPzoffset" value=" 600." /> <!-- confirmed atljf___0010-vAC -->
+<var name="JFSH_JFSOctHBPoR_JFSOctogon_HoleBPoutRad" value=" 436. + 1." /> <!-- value of MuonSys mother volume -->
+<tubs name="JFSH_JFSOctogon_HoleBP" material="ShieldIron" Rio_Z=" 0. ;JFSH_JFSOctHBPoR_JFSOctogon_HoleBPoutRad; JFSH_JFSOClen_JFSOctogon_length"/>
+<subtraction name="JFSH_JFSOctogon_main" >
+ <posXYZ volume="JFSH_JFSOctogon_Core" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Hole" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_HoleBP" X_Y_Z=" 0. ; 0. ; JFSH_JFSOctHBPzo_JFSOctogon_HoleBPzoffset " rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<gvxysxy name="JFSH_JFSOctogon_Polyedge_baseside" material="PolyBoronH3B03" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff - JFSH_JFSOCpoo_JFSOctogon_polybaronoff - GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps " />
+</gvxysxy>
+
+<gvxysxy name="JFSH_JFSOctogon_Polyedge_subblock" material="PolyBoronH3B03" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCpoo_JFSOctogon_polybaronoff-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+GENV_Eps ; JFSH_JFSOctya_JFSOctogon_YA+GENV_Eps*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+GENV_Eps*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+GENV_Eps " />
+</gvxysxy>
+
+<subtraction name="JFSH_JFSOctogon_Polyedge_side">
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_baseside" X_Y_Z=" 0. ; 0. ; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff/2. + JFSH_JFSOCpoo_JFSOctogon_polybaronoff/2." />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_subblock" X_Y_Z=" 0. ; 0. ; (JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-GENV_Eps)/2.+GENV_Eps" />
+</subtraction>
+
+<gvxysxy name="JFSH_JFSOctogon_Polyedge_basefront" material="PolyBoronB2O3" dZ="JFSH_JFSOCpoo_JFSOctogon_polybaronoff" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps " />
+</gvxysxy>
+
+<tubs name="JFSH_JFSOctogon_Polyedge_subtube" material="PolyBoronB2O3" Rio_Z=" 0. ;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff+GENV_Eps; JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps"/>
+
+<subtraction name="JFSH_JFSOctogon_Polyedge_front">
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_basefront" X_Y_Z=" 0. ; 0. ; -(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCpoo_JFSOctogon_polybaronoff)/2.+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff" />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_subtube" X_Y_Z=" 0. ; 0. ; -(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCpoo_JFSOctogon_polybaronoff)/2.+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff" />
+</subtraction>
+
+<gvxysxy name="JFSH_JFSOctogon_Steeledge_base" material="ShieldSteel" dZ="JFSH_JFSOClen_JFSOctogon_length" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps) ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps) " />
+</gvxysxy>
+
+<gvxysxy name="JFSH_JFSOctogon_Steeledge_subblock" material="ShieldSteel" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+2.*GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps) ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps) " />
+</gvxysxy>
+<tubs name="JFSH_JFSOctogon_Steeledge_subtube" material="ShieldSteel" Rio_Z=" 0. ;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff+GENV_Eps; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+2.*GENV_Eps"/>
+
+<subtraction name="JFSH_JFSOctogon_Steeledge_main">
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_base" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_subblock" X_Y_Z=" 0. ; 0. ; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff/2." />
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_subtube" X_Y_Z=" 0. ; 0. ; -(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff)/2." />
+</subtraction>
+
+<composition name="JFSH_JFSOctogon">
+ <posXYZ volume="JFSH_JFSOctogon_main" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_side" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_front" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_main" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- JN Nose Shielding -->
+
+<!-- TX1STM Elements -->
+<var name="JNSH_TX1e1oRa" value=" 1480." /> <!-- JFSH_tx1stm_element1_outerRadius -->
+<var name="JNSH_TX1e1iRa" value=" 1285." /> <!-- JFSH_tx1stm_element1_innerRadius -->
+<var name="JNSH_TX1e1iLe" value=" 1045." /> <!-- JFSH_tx1stm_element1_length -->
+<var name="JNSH_TX1e2iRa" value=" 1085." /> <!-- JFSH_tx1stm_element2_innerRadius -->
+<var name="JNSH_TX1e2iLe" value=" 1100." /> <!-- JFSH_tx1stm_element2_length -->
+<var name="JNSH_TX1e3iLe" value=" 2900." /> <!-- JFSH_tx1stm_element3_length -->
+
+<var name="JNSH_TX1SO1iRa" value=" 1550." />
+<var name="JNSH_TX1SO1oRa" value=" 2620." />
+<var name="JNSH_TX1SO1iLe" value=" 1800." /> <!-- to adjust for cavern asymmetry and wall-position -->
+<var name="JNSH_TX1SO6oRa" value=" 2075." />
+<var name="JNSH_TX1SO6iLe" value=" 200." />
+
+<var name="JNSH_TX1STzof" value=" JFSH_JFSOClen_JFSOctogon_length + JFSH_JFSOCzof_JFSOctogon_zoffset" />
+
+<var name="JNSH_TX1e1zpo_tx1stm_element1_Z" value="JFSH_XYZref+JNSH_TX1STzof+JNSH_TX1e1iLe/2." />
+<var name="JNSH_TX1e2zpo_tx1stm_element2_Z" value="JNSH_TX1e1zpo_tx1stm_element1_Z+JNSH_TX1e1iLe/2.+JNSH_TX1e2iLe/2."/>
+<var name="JNSH_TX1e3zpo_tx1stm_element3_Z" value="JNSH_TX1e2zpo_tx1stm_element2_Z+JNSH_TX1e2iLe/2.+JNSH_TX1e3iLe/2."/>
+
+<var name="JNSH_TX1SO6zpo_tx1som_element6_Z" value="JFSH_XYZref+JNSH_TX1STzof+JNSH_TX1SO6iLe/2."/>
+<var name="JNSH_TX1SO1zpo_tx1som_element1_Z" value="JNSH_TX1SO6zpo_tx1som_element6_Z+JNSH_TX1SO6iLe/2.+JNSH_TX1SO1iLe/2."/>
+
+<!-- JFS TX1STM -->
+<tubs name="JNSH_tx1stm_element1" material="ShieldIron" Rio_Z="JNSH_TX1e1iRa ; JNSH_TX1e1oRa ; JNSH_TX1e1iLe"/>
+<tubs name="JNSH_tx1stm_element2" material="ShieldIron" Rio_Z="JNSH_TX1e2iRa ; JNSH_TX1e1oRa ; JNSH_TX1e2iLe"/>
+<tubs name="JNSH_tx1stm_element3" material="ShieldIron" Rio_Z="JNSH_TX1e1iRa ; JNSH_TX1e1oRa ; JNSH_TX1e3iLe"/>
+
+<var name="JNSH_tx1som_e1_XA" value="JNSH_TX1SO1oRa * tan(11.25 * GENV_PiS180)" />
+<var name="JNSH_tx1som_e1_YA" value="JNSH_TX1SO1oRa" />
+<var name="JNSH_tx1som_e1_XB" value="JNSH_tx1som_e1_XA * (1. + 2.*GENV_Co225)" />
+<var name="JNSH_tx1som_e1_YB" value="JNSH_tx1som_e1_YA - 2.*JNSH_tx1som_e1_XA*GENV_Si225" />
+<var name="JNSH_tx1som_e1_XC" value="JNSH_tx1som_e1_YB" />
+<var name="JNSH_tx1som_e1_YC" value="JNSH_tx1som_e1_XB" />
+<var name="JNSH_tx1som_e1_XD" value="JNSH_tx1som_e1_YA" />
+<var name="JNSH_tx1som_e1_YD" value="JNSH_tx1som_e1_XA" />
+
+<gvxysxy name="JNSH_tx1som_element1_basic" material="ShieldIron" dZ="JNSH_TX1SO1iLe" >
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XD ; JNSH_tx1som_e1_YD " />
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XC ; JNSH_tx1som_e1_YC " />
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XB ; JNSH_tx1som_e1_YB " />
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XA ; JNSH_tx1som_e1_YA " />
+</gvxysxy>
+<tubs name="JNSH_tx1som_element6_cutout" material="ShieldIron" Rio_Z="0. ; JNSH_TX1SO1iRa ; 2.*JNSH_TX1SO1iLe"/>
+<subtraction name="JNSH_tx1som_element1" >
+ <posXYZ volume="JNSH_tx1som_element1_basic" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JNSH_tx1som_element6_cutout" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<tubs name="JNSH_tx1som_element6" material="ShieldIron" Rio_Z="JNSH_TX1SO1iRa ; JNSH_TX1SO6oRa ; JNSH_TX1SO6iLe"/>
+
+
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- JF and JN Shield Composition of volumes -->
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<composition name="JFSH_ShieldElements" >
+ <posXYZ volume="JFSH_JFCCylinder" X_Y_Z="0.;0.;JFSH_JFCMCzpo_JFCMainCylinder_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Assembly" X_Y_Z="0.;-4340; JFSH_JFCMCzpo_JFCMainCylinder_Z+JFSH_AFconnexion2+110." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_JFSOctogon" X_Y_Z="0.;0.;JFSH_JFSOCzpo_JFSOctogon_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1stm_element1" X_Y_Z="0.;0.;JNSH_TX1e1zpo_tx1stm_element1_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1stm_element2" X_Y_Z="0.;0.;JNSH_TX1e2zpo_tx1stm_element2_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1stm_element3" X_Y_Z="0.;0.;JNSH_TX1e3zpo_tx1stm_element3_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1som_element6" X_Y_Z="0.;0.;JNSH_TX1SO6zpo_tx1som_element6_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1som_element1" X_Y_Z="0.;0.;JNSH_TX1SO1zpo_tx1som_element1_Z" rot="0.;0.;0." />
+</composition>
+
+
+<composition name="JFSH_Shield" >
+ <posXYZ volume="JFSH_ShieldElements" X_Y_Z="0.;0.; JFSH_ECTnomiz_ECT_Nominal_zpos" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_ShieldElements" X_Y_Z="0.;0.;-JFSH_ECTnomiz_ECT_Nominal_zpos" rot="0.;JFSH_rot180;0." />
+</composition>
+
+<!-- JD Disk Shielding -->
+
+<!-- Useful variables -->
+
+<var name="JDSH_XYZrefpt_XYZReferencePoint" value=" 0." /> <!-- NO CONFIRMATION NEEDED -->
+<var name="JDSH_rota180d_180degRotation" value=" 180." /> <!-- NO CONFIRMATION NEEDED -->
+
+<!-- Primary variables -->
+
+<!-- data from ATCZ____0005 -->
+<var name="JDSH_NomiZpos_Nominal_zpos" value=" 6784." /> <!-- ATL-MH-ER-0024 -->
+<!-- <var name="JDSH_NomiZpos_Nominal_zpos" value=" 6650." /> -->
+
+<!-- Front Disk and Back Disk -->
+
+<!-- BEGIN confirmation with atljd___0046-vAE (if no other comment) -->
+<var name="JDSH_FDinnRad_FrontDisk_innerRadius" value=" 750." />
+<var name="JDSH_FDoutRad_FrontDisk_outerRadius" value=" 2700." />
+<var name="JDSH_FDthickn_FrontDisk_thickness" value=" 50." />
+<!-- END confirmation with atljd___0046-vAE -->
+<var name="JDSH_BDinnRad_BackDisk_innerRadius" value=" 540." /> <!-- NO CONFIRMATION POSSIBLE -->
+
+<!-- BEGIN confirmation with atljd___0100-vAD (if no other comment) -->
+<var name="JDSH_BDhatohi_BackDisk_halftotalhight" value=" 4360. " />
+<var name="JDSH_BDlophhi_BackDisk_lowparthalfhight" value=" 1325.5 " />
+<var name="JDSH_BDcutdia_BackDisk_cutoutdiameter" value=" 400. " /> <!-- confirmed atljd___0103-vAD -->
+<var name="JDSH_BDtbyoff_BackDisk_totbottomyoffset" value=" 432. " />
+<var name="JDSH_BDpbyoff_BackDisk_partbottomyoffset" value=" 223. " />
+<var name="JDSH_BDhedlen_BackDisk_halfedgelength" value=" 867. " />
+<var name="JDSH_BDloedle_BackDisk_loweredgelength" value=" 1830. " />
+<var name="JDSH_BDfeyend_BackDisk_feetyend" value=" 3370. " />
+<var name="JDSH_BDcuxoff_BackDisk_cutxoffset" value=" 1400. " /> <!-- confirmed atljd___0103-vAD -->
+<var name="JDSH_BDcuyoff_BackDisk_cutyoffsetfromtop" value=" 930. " /> <!-- confirmed atljd___0103-vAD -->
+<var name="JDSH_BDfecaxo_BackDisk_feetcavityxoffset" value=" 108. " />
+<var name="JDSH_BDfeplhi_BackDisk_feetplatehight" value=" 50. " />
+<var name="JDSH_BackDisk_angle" value=" 32. " />
+<!-- END confirmation with atljd___0100-vAD -->
+
+<!-- BEGIN confirmation with atljd___0028-vAC (if no other comment) -->
+<var name="JDSH_BDRRouRa_RetrunRing_outerRadius" value=" 4220." />
+<var name="JDSH_BDthickn_BackDisk_thickness" value=" 80." />
+
+
+<!-- Cone Assembly -->
+
+<var name="JDSH_CABCinRa_BrassCone_innerRadius" value=" 530." />
+<var name="JDSH_CABCouRa_BrassCone_outerRadius" value=" 1600." />
+<!-- END confirmation with atljd___0028-vAC -->
+
+<!-- BEGIN confirmation with atljd___0063-vAE (if no other comment) -->
+<var name="JDSH_CABCthi1_BrassCone_thickness_inter1" value=" 5." />
+<var name="JDSH_CABCthic_BrassCone_thickness" value=" 260." />
+<var name="JDSH_CABCslAn_BrassCone_slopeAngle" value=" 10." />
+<var name="JDSH_CABCslLe_BrassCone_slopeLength" value=" 900." />
+<!-- END confirmation with atljd___0063-vAE -->
+
+<!-- BEGIN confirmation with atljd___0069-vAC (if no other comment) -->
+<var name="JDSH_CALCthic_LeadCone_thickness" value=" 30." />
+<var name="JDSH_CALCleng_LeadCone_length" value=" 888." />
+<var name="JDSH_CALCwidt_LeadCone_width" value=" 629." />
+<!-- END confirmation with atljd___0069-vAC -->
+
+<!-- BEGIN confirmation with atljd___0066-vAA (if no other comment) -->
+<var name="JDSH_CAPCthic_PolyCone_thickness" value=" 70." />
+<var name="JDSH_CAPCleng_PolyCone_length" value=" 900." />
+<var name="JDSH_CAPCwidt_PolyCone_width" value=" 634." />
+<var name="JDSH_CACOprAn_Cone_projectiveAngle" value=" 11.25" />
+<array name="JDSH_CACOangz" values="-90.;-67.5;-45.;-22.5;0.;22.5;45.;67.5;90.;112.5;135.;157.5;180.;-157.5;-135.;-112.5"/> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JDSH_CACOangx_ConeAssembly_angx" value="-10." />
+<!-- END confirmation with atljd___0066-vAA -->
+
+<!-- BEGIN confirmation with atljd___0081-vAI (if no other comment) -->
+<var name="JDSH_TUBEinRa_Tube_innerRadius" value=" 430." /> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JDSH_TUBEOuR1_Tube_OuterRadius1" value=" 730." />
+<var name="JDSH_TUBEOuR2_Tube_OuterRadius2" value=" 530." />
+<var name="JDSH_TUBEslen_Tube_shortlength" value=" 49." />
+<var name="JDSH_TUBEleng_Tube_length" value=" 2105." />
+<!-- END confirmation with atljd___0081-vAI -->
+
+<!-- data from ATLJT___0036 -->
+<var name="JDSH_PLUGinR1_Plug_innerRadius1" value=" 129. " /> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JDSH_PLUGouRa_Plug_OuterRadius" value=" 428. " /> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JDSH_PLUGleng_Plug_length" value=" 2105. " /> <!-- confirmed atljd___0081-vAI -->
+<var name="JDSH_PLUGtiAn_Plug_tiltAngle" value=" 1.1" /> <!-- NO CONFIRMATION POSSIBLE -->
+
+<!-- BEGIN confirmation with atljd___0035-vAK (if no other comment) -->
+<var name="JDSH_SWHinnRa_SmallWheelHub_innerRadius" value=" 540. " />
+<var name="JDSH_SWHoutR1_SmallWheelHub_outerRadius1" value=" 764. " />
+<var name="JDSH_SWHoutR2_SmallWheelHub_outerRadius2" value=" 850. " />
+<var name="JDSH_SWHlengt_SmallWheelHub_length" value=" 700. " />
+<!-- END confirmation with atljd___0035-vAK -->
+
+<var name="JDSH_SWHPthic_SmallWheelHub_Polythickness" value=" 50. " /> <!-- confirmed atljd___0112 -->
+<var name="JDSH_SWHLthic_SmallWheelHub_Leadthickness" value=" 30. " /> <!-- confirmed atljd___0113 -->
+
+<!-- BEGIN confirmation with atljd___0031-vAD (if no other comment) -->
+<var name="JDSH_MaRiFefxl_MainRibFeet_feetxlength" value=" 358. " />
+<var name="JDSH_MaRiFefyo_MainRibFeet_feetyoffset" value=" 100. " />
+<var name="JDSH_MaRiFelol_MainRibFeet_lowerlength" value=" 2737. " />
+<var name="JDSH_MaRiFeupl_MainRibFeet_upperlength" value=" 2923. " />
+<var name="JDSH_MaRiFuxle_MainRibFull_xlength" value=" 3185. " />
+<var name="JDSH_MaRiFuyle_MainRibFull_ylength" value=" 3950. " />
+<var name="JDSH_MaRiFeaxy_MainRibFeet_anglexyplane" value=" 58. " />
+<var name="JDSH_MaRiFeayz_MainRibFeet_angleyzplane" value=" -6. " />
+<var name="JDSH_MaRiFeata_MainRibFeet_attribangle" value=" 30. " />
+<var name="JDSH_MaRiFemad_MainRibFeet_mainwidth" value=" 250. " />
+<var name="JDSH_MaRiFewzw_MainRibFeet_wholezwidth" value=" 517. " />
+<var name="JDSH_MaRiFeozw_MainRibFeet_offsetzwidth" value=" 180. " />
+<var name="JDSH_MaRiFeazo_MainRibFeet_attribzoffset" value=" 40. " />
+<var name="JDSH_MaRiFeazw_MainRibFeet_attribzwidth" value=" 150. " />
+<var name="JDSH_MaRiFerao_MainRibFeet_radialoffset" value=" 1000. + 10. " /> <!-- sum to avoid overlap, reasonalbe due to many approx. in this region -->
+<var name="JDSH_MaRiFeatw_MainRibFeet_attribwidth" value=" 830. " />
+<var name="JDSH_MaRiFearw_MainRibFeet_attredwidth" value=" 605. " /> <!-- confirmed atljd___0065-vAA -->
+<var name="JDSH_MainRibFeet_PosX" value=" 3185. " />
+<var name="JDSH_MainRibFeet_PosY" value="-3950. " />
+<!-- END confirmation with atljd___0031-vAD -->
+
+<!-- Derived variables -->
+
+<var name="JDSH_FDzposit_FrontDisk_Z" value="JDSH_XYZrefpt_XYZReferencePoint + JDSH_FDthickn_FrontDisk_thickness/2. " />
+<var name="JDSH_BDzposit_BackDisk_Z" value="JDSH_FDzposit_FrontDisk_Z + JDSH_FDthickn_FrontDisk_thickness/2. + JDSH_BDthickn_BackDisk_thickness/2. " />
+<var name="JDSH_CAzposit_ConeAssembly_Z" value="JDSH_BDzposit_BackDisk_Z + JDSH_BDthickn_BackDisk_thickness/2. " />
+<var name="JDSH_TUBEzpos_Tube_Z" value="JDSH_XYZrefpt_XYZReferencePoint" />
+<var name="JDSH_PLUGzpos_Plug_Z" value="JDSH_XYZrefpt_XYZReferencePoint" />
+<var name="JDSH_SWHzposi_SmallWheelHub_Z" value="JDSH_CAzposit_ConeAssembly_Z + JDSH_CABCthic_BrassCone_thickness" />
+
+<var name="JDSH_CABCouR1_BrassCone_outerRadius1" value="JDSH_CABCouRa_BrassCone_outerRadius - JDSH_CABCslLe_BrassCone_slopeLength * cos(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180)" />
+<var name="JDSH_CABCthi2_BrassCone_thickness2" value="JDSH_CABCthi1_BrassCone_thickness_inter1 + JDSH_CABCslLe_BrassCone_slopeLength * sin(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180)" />
+<var name="JDSH_CABCouR2_BrassCone_outerRadius2" value="JDSH_CABCouR1_BrassCone_outerRadius1 + (JDSH_CABCthic_BrassCone_thickness-JDSH_CABCthi2_BrassCone_thickness2) * tan(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180)" />
+
+<var name="JDSH_LCAxbpos_LeadConeAssembly_XB" value=" JDSH_CALCwidt_LeadCone_width/2." />
+<var name="JDSH_LCAybpos_LeadConeAssembly_YB" value=" JDSH_CALCleng_LeadCone_length" />
+<var name="JDSH_LCAxapos_LeadConeAssembly_XA" value=" JDSH_LCAxbpos_LeadConeAssembly_XB - JDSH_CALCleng_LeadCone_length*tan(JDSH_CACOprAn_Cone_projectiveAngle*GENV_PiS180) " />
+<var name="JDSH_LCAyapos_LeadConeAssembly_YA" value=" 0." />
+
+<var name="JDSH_PCAxbpos_PolyConeAssembly_XB" value=" JDSH_CAPCwidt_PolyCone_width/2." />
+<var name="JDSH_PCAybpos_PolyConeAssembly_YB" value=" JDSH_CAPCleng_PolyCone_length" />
+<var name="JDSH_PCAxapos_PolyConeAssembly_XA" value=" JDSH_PCAxbpos_PolyConeAssembly_XB - JDSH_CAPCleng_PolyCone_length*tan(JDSH_CACOprAn_Cone_projectiveAngle*GENV_PiS180) " />
+<var name="JDSH_PCAyapos_PolyConeAssembly_YA" value=" 0." />
+
+<var name="JDSH_CALCradi_LeadCone_Radius" value="JDSH_CABCouR2_BrassCone_outerRadius2 - (JDSH_CALCthic_LeadCone_thickness/2.)*sin(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180) " />
+<var name="JDSH_CALCposz_LeadCone_posz" value="JDSH_CABCthic_BrassCone_thickness - (JDSH_CALCthic_LeadCone_thickness/2.)*cos(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180) - cos((JDSH_CACOangx_ConeAssembly_angx+90.)*GENV_PiS180) * (JDSH_LCAybpos_LeadConeAssembly_YB-JDSH_LCAyapos_LeadConeAssembly_YA)/2." />
+
+<var name="JDSH_CAPCradi_PolyCone_Radius" value="JDSH_CABCouR2_BrassCone_outerRadius2 - (JDSH_CALCthic_LeadCone_thickness+JDSH_CAPCthic_PolyCone_thickness/2.)*sin(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180) " />
+<var name="JDSH_CAPCposz_PolyCone_posz" value="JDSH_CABCthic_BrassCone_thickness - (JDSH_CALCthic_LeadCone_thickness+JDSH_CAPCthic_PolyCone_thickness/2.)*cos(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180) - cos((JDSH_CACOangx_ConeAssembly_angx+90.)*GENV_PiS180) * (JDSH_PCAybpos_PolyConeAssembly_YB-JDSH_PCAyapos_PolyConeAssembly_YA)/2. " />
+
+<var name="JDSH_i1" value="JDSH_CALCradi_LeadCone_Radius+(JDSH_LCAybpos_LeadConeAssembly_YB-JDSH_LCAyapos_LeadConeAssembly_YA)/2.*cos(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180)" />
+<array name="JDSH_LCApx" values="JDSH_i1;JDSH_i1*GENV_Co225;JDSH_i1*GENV_Co45;JDSH_i1*GENV_Si225;0.;-JDSH_i1*GENV_Si225;-JDSH_i1*GENV_Co45;-JDSH_i1*GENV_Co225;-JDSH_i1;-JDSH_i1*GENV_Co225;-JDSH_i1*GENV_Co45;-JDSH_i1*GENV_Si225;0.;JDSH_i1*GENV_Si225;JDSH_i1*GENV_Co45;JDSH_i1*GENV_Co225"/>
+<array name="JDSH_LCApy" values="0.;JDSH_i1*GENV_Si225;JDSH_i1*GENV_Si45;JDSH_i1*GENV_Co225;JDSH_i1;JDSH_i1*GENV_Co225;JDSH_i1*GENV_Si45;JDSH_i1*GENV_Si225;0;-JDSH_i1*GENV_Si225;-JDSH_i1*GENV_Si45;-JDSH_i1*GENV_Co225;-JDSH_i1;-JDSH_i1*GENV_Co225;-JDSH_i1*GENV_Si45;-JDSH_i1*GENV_Si225"/>
+
+<var name="JDSH_i2" value="JDSH_CAPCradi_PolyCone_Radius+(JDSH_PCAybpos_PolyConeAssembly_YB-JDSH_PCAyapos_PolyConeAssembly_YA)/2.*cos(JDSH_CABCslAn_BrassCone_slopeAngle*GENV_PiS180)" />
+<array name="JDSH_PCApx" values="JDSH_i2;JDSH_i2*GENV_Co225;JDSH_i2*GENV_Co45;JDSH_i2*GENV_Si225;0.;-JDSH_i2*GENV_Si225;-JDSH_i2*GENV_Co45;-JDSH_i2*GENV_Co225;-JDSH_i2;-JDSH_i2*GENV_Co225;-JDSH_i2*GENV_Co45;-JDSH_i2*GENV_Si225;0.;JDSH_i2*GENV_Si225;JDSH_i2*GENV_Co45;JDSH_i2*GENV_Co225"/>
+<array name="JDSH_PCApy" values="0.;JDSH_i2*GENV_Si225;JDSH_i2*GENV_Si45;JDSH_i2*GENV_Co225;JDSH_i2;JDSH_i2*GENV_Co225;JDSH_i2*GENV_Si45;JDSH_i2*GENV_Si225;0.;-JDSH_i2*GENV_Si225;-JDSH_i2*GENV_Si45;-JDSH_i2*GENV_Co225;-JDSH_i2;-JDSH_i2*GENV_Co225;-JDSH_i2*GENV_Si45;-JDSH_i2*GENV_Si225"/>
+
+<var name="JDSH_PLUGinR2_Plug_innerRadius2" value=" JDSH_PLUGinR1_Plug_innerRadius1 + JDSH_PLUGleng_Plug_length *tan(JDSH_PLUGtiAn_Plug_tiltAngle*GENV_PiS180)" />
+
+<!-- Modelization of Volumes -->
+
+<!-- Modelization of Front and Back disks -->
+<tubs name="JDSH_FrontDisk" material="ShieldSteel" Rio_Z="JDSH_FDinnRad_FrontDisk_innerRadius; JDSH_FDoutRad_FrontDisk_outerRadius; JDSH_FDthickn_FrontDisk_thickness" />
+
+<box name="JDSH_BackDisk_CutBox1" material="ShieldSteel" X_Y_Z=" 2.*JDSH_BDlophhi_BackDisk_lowparthalfhight ; JDSH_BDcutdia_BackDisk_cutoutdiameter ; 2.*JDSH_BDthickn_BackDisk_thickness" />
+<tubs name="JDSH_BackDisk_InnerTube" material="ShieldSteel" Rio_Z=" 0. ; JDSH_BDinnRad_BackDisk_innerRadius ; 2*JDSH_BDthickn_BackDisk_thickness" />
+<tubs name="JDSH_BackDisk_CutTube" material="ShieldSteel" Rio_Z=" 0. ; JDSH_BDcutdia_BackDisk_cutoutdiameter/2. ; 2.*JDSH_BDthickn_BackDisk_thickness" />
+
+<var name="JDSH_BD_GVXYPOS_posX3" value="GENV_Co225 * JDSH_BDloedle_BackDisk_loweredgelength + JDSH_BDhedlen_BackDisk_halfedgelength + GENV_Ta225 * ( GENV_Si225*JDSH_BDloedle_BackDisk_loweredgelength - (JDSH_BDhatohi_BackDisk_halftotalhight - (JDSH_BDhedlen_BackDisk_halfedgelength + 2.*JDSH_BDlophhi_BackDisk_lowparthalfhight + JDSH_BDtbyoff_BackDisk_totbottomyoffset) ) )"/>
+
+<gvxysx name="JDSH_BackDisk_tmp" material="ShieldSteel" dZ="JDSH_BDthickn_BackDisk_thickness">
+ <gvxy_point X_Y="JDSH_BDhedlen_BackDisk_halfedgelength; -JDSH_BDhatohi_BackDisk_halftotalhight " />
+ <gvxy_point X_Y="GENV_Co225 * JDSH_BDloedle_BackDisk_loweredgelength + JDSH_BDhedlen_BackDisk_halfedgelength; GENV_Si225*JDSH_BDloedle_BackDisk_loweredgelength-JDSH_BDhatohi_BackDisk_halftotalhight " />
+ <gvxy_point X_Y="JDSH_BD_GVXYPOS_posX3; - JDSH_BDhedlen_BackDisk_halfedgelength - 2.*JDSH_BDlophhi_BackDisk_lowparthalfhight - JDSH_BDtbyoff_BackDisk_totbottomyoffset " />
+ <gvxy_point X_Y="JDSH_BDfeyend_BackDisk_feetyend; - JDSH_BDhedlen_BackDisk_halfedgelength - 2.*JDSH_BDlophhi_BackDisk_lowparthalfhight - JDSH_BDtbyoff_BackDisk_totbottomyoffset " />
+ <gvxy_point X_Y="JDSH_BDfeyend_BackDisk_feetyend; -JDSH_BDhedlen_BackDisk_halfedgelength - 2.*JDSH_BDlophhi_BackDisk_lowparthalfhight - JDSH_BDtbyoff_BackDisk_totbottomyoffset + JDSH_BDfeplhi_BackDisk_feetplatehight " />
+ <gvxy_point X_Y="JDSH_BDfeyend_BackDisk_feetyend-JDSH_BDfecaxo_BackDisk_feetcavityxoffset; -JDSH_BDhedlen_BackDisk_halfedgelength - 2.*JDSH_BDlophhi_BackDisk_lowparthalfhight - JDSH_BDtbyoff_BackDisk_totbottomyoffset + JDSH_BDpbyoff_BackDisk_partbottomyoffset " />
+ <gvxy_point X_Y="JDSH_BDfeyend_BackDisk_feetyend-JDSH_BDfecaxo_BackDisk_feetcavityxoffset; -JDSH_BDhedlen_BackDisk_halfedgelength - 2.*JDSH_BDlophhi_BackDisk_lowparthalfhight " />
+ <gvxy_point X_Y="JDSH_BDhatohi_BackDisk_halftotalhight; -JDSH_BDhedlen_BackDisk_halfedgelength " />
+ <gvxy_point X_Y="JDSH_BDhatohi_BackDisk_halftotalhight; JDSH_BDhedlen_BackDisk_halfedgelength " />
+ <gvxy_point X_Y="JDSH_BDhatohi_BackDisk_halftotalhight-GENV_Si225*(2.*JDSH_BDhedlen_BackDisk_halfedgelength); JDSH_BDhedlen_BackDisk_halfedgelength + GENV_Co225*(2.*JDSH_BDhedlen_BackDisk_halfedgelength) " />
+ <gvxy_point X_Y="JDSH_BDhedlen_BackDisk_halfedgelength + GENV_Co225*(2.*JDSH_BDhedlen_BackDisk_halfedgelength); JDSH_BDhatohi_BackDisk_halftotalhight - GENV_Si225*(2.*JDSH_BDhedlen_BackDisk_halfedgelength) " />
+ <gvxy_point X_Y="JDSH_BDhedlen_BackDisk_halfedgelength; JDSH_BDhatohi_BackDisk_halftotalhight " />
+</gvxysx>
+
+<subtraction name="JDSH_BackDisk">
+ <posXYZ volume="JDSH_BackDisk_tmp" X_Y_Z="0. ; 0. ; 0." />
+ <posXYZ volume="JDSH_BackDisk_InnerTube" X_Y_Z="0. ; 0. ; 0." />
+ <posXYZ volume="JDSH_BackDisk_CutBox1" X_Y_Z=" JDSH_BDcuxoff_BackDisk_cutxoffset + JDSH_BDlophhi_BackDisk_lowparthalfhight ; JDSH_BDhatohi_BackDisk_halftotalhight-JDSH_BDcuyoff_BackDisk_cutyoffsetfromtop ; 0. " />
+ <posXYZ volume="JDSH_BackDisk_CutTube" X_Y_Z=" JDSH_BDcuxoff_BackDisk_cutxoffset ; JDSH_BDhatohi_BackDisk_halftotalhight-JDSH_BDcuyoff_BackDisk_cutyoffsetfromtop ; 0. " />
+</subtraction>
+
+<!-- Modelization of Brass Cone Assembly -->
+<pcon name="JDSH_BrassConeAssembly" material="ShieldBrass" >
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouRa_BrassCone_outerRadius ; 0." />
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouRa_BrassCone_outerRadius ; JDSH_CABCthi1_BrassCone_thickness_inter1" />
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouR1_BrassCone_outerRadius1 ; JDSH_CABCthi2_BrassCone_thickness2 " />
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouR2_BrassCone_outerRadius2 ; JDSH_CABCthic_BrassCone_thickness " />
+</pcon>
+
+<pcon name="JDSH_BrassConeAssembly_NSW" material="ShieldBrass" >
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouRa_BrassCone_outerRadius - 30. ; 0." />
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouRa_BrassCone_outerRadius - 30. ; JDSH_CABCthi1_BrassCone_thickness_inter1 + 10." />
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouR2_BrassCone_outerRadius2 ; JDSH_CABCthi1_BrassCone_thickness_inter1 + 10." />
+ <polyplane Rio_Z="JDSH_CABCinRa_BrassCone_innerRadius; JDSH_CABCouR2_BrassCone_outerRadius2 ; JDSH_CABCthic_BrassCone_thickness " />
+</pcon>
+
+<!-- Modelization of Lead Cone Element -->
+<trd name="JDSH_LeadConeAssembly" material="Lead" Xmp_Ymp_Z="2.*JDSH_LCAxbpos_LeadConeAssembly_XB; 2.*JDSH_LCAxapos_LeadConeAssembly_XA; JDSH_CALCthic_LeadCone_thickness; JDSH_CALCthic_LeadCone_thickness; JDSH_LCAybpos_LeadConeAssembly_YB-JDSH_LCAyapos_LeadConeAssembly_YA" />
+
+<pcon name="JDSH_LeadConeAssembly_NSW" material="Lead" >
+ <polyplane Rio_Z="JDSH_CABCouRa_BrassCone_outerRadius - 30. + GENV_Eps ; JDSH_CABCouRa_BrassCone_outerRadius + 5. ; 0." />
+ <polyplane Rio_Z="JDSH_CABCouRa_BrassCone_outerRadius - 30. + GENV_Eps ; JDSH_CABCouRa_BrassCone_outerRadius + 5. ; JDSH_CAPCthic_PolyCone_thickness-40. + GENV_Eps + JDSH_CABCthi1_BrassCone_thickness_inter1 + 10. + GENV_Eps" />
+ <polyplane Rio_Z="JDSH_CABCouR2_BrassCone_outerRadius2 + 2.*GENV_Eps + 23.; JDSH_CABCouRa_BrassCone_outerRadius + 5. ; JDSH_CAPCthic_PolyCone_thickness-40. + GENV_Eps + JDSH_CABCthi1_BrassCone_thickness_inter1 + 10. + GENV_Eps" />
+ <polyplane Rio_Z="JDSH_CABCouR2_BrassCone_outerRadius2 + 2.*GENV_Eps + 23.; JDSH_CABCouRa_BrassCone_outerRadius + 5. ; JDSH_CAPCthic_PolyCone_thickness-40. + GENV_Eps + JDSH_CALCthic_LeadCone_thickness + JDSH_CABCthi1_BrassCone_thickness_inter1 + 10. + GENV_Eps - 17." />
+ <polyplane Rio_Z="JDSH_CABCouR2_BrassCone_outerRadius2 + 2.*GENV_Eps + 23.; JDSH_SWHoutR1_SmallWheelHub_outerRadius1; JDSH_CAPCthic_PolyCone_thickness-40. + GENV_Eps + JDSH_CALCthic_LeadCone_thickness + JDSH_CABCthi1_BrassCone_thickness_inter1 + 10. + GENV_Eps - 17." />
+ <polyplane Rio_Z="JDSH_CABCouR2_BrassCone_outerRadius2 + 2.*GENV_Eps + 23.; JDSH_SWHoutR1_SmallWheelHub_outerRadius1; JDSH_CABCthic_BrassCone_thickness " />
+</pcon>
+
+<!-- Modelization of Poly Cone Element -->
+<trd name="JDSH_PolyConeAssembly" material="PolyBoronB2O3" Xmp_Ymp_Z="2.*JDSH_PCAxbpos_PolyConeAssembly_XB; 2.*JDSH_PCAxapos_PolyConeAssembly_XA; JDSH_CAPCthic_PolyCone_thickness; JDSH_CAPCthic_PolyCone_thickness; JDSH_PCAybpos_PolyConeAssembly_YB-JDSH_PCAyapos_PolyConeAssembly_YA" />
+
+<pcon name="JDSH_PolyConeAssembly_NSW" material="PolyBoronB2O3" >
+ <polyplane Rio_Z=" JDSH_CABCouR2_BrassCone_outerRadius2+GENV_Eps; JDSH_CABCouRa_BrassCone_outerRadius - 30.; JDSH_CABCthi1_BrassCone_thickness_inter1 + 10. + GENV_Eps" />
+ <polyplane Rio_Z=" JDSH_CABCouR2_BrassCone_outerRadius2+GENV_Eps; JDSH_CABCouRa_BrassCone_outerRadius - 30.; JDSH_CABCthi1_BrassCone_thickness_inter1 + 10. + GENV_Eps + JDSH_CAPCthic_PolyCone_thickness-40." />
+ <polyplane Rio_Z=" JDSH_CABCouR2_BrassCone_outerRadius2+GENV_Eps; JDSH_CABCouR2_BrassCone_outerRadius2 + GENV_Eps + 23.; JDSH_CABCthi1_BrassCone_thickness_inter1 + 10. + GENV_Eps + JDSH_CAPCthic_PolyCone_thickness-40." />
+ <polyplane Rio_Z=" JDSH_CABCouR2_BrassCone_outerRadius2+GENV_Eps; JDSH_CABCouR2_BrassCone_outerRadius2 + GENV_Eps + 23.; JDSH_CABCthic_BrassCone_thickness" />
+</pcon>
+
+<!-- Composition of JD Cone Assembly -->
+<composition name="JDSH_ConeAssembly" >
+ <posXYZ volume="JDSH_BrassConeAssembly" X_Y_Z="0.;0.;0." rot="0.;0.;0." />
+ <foreach index="I" begin="0" loops="16" >
+ <posXYZ volume="JDSH_LeadConeAssembly" X_Y_Z=" JDSH_LCApx[I];JDSH_LCApy[I];JDSH_CALCposz_LeadCone_posz" rot="JDSH_CACOangx_ConeAssembly_angx+90.;0.;JDSH_CACOangz[I]" />
+ <posXYZ volume="JDSH_PolyConeAssembly" X_Y_Z=" JDSH_PCApx[I];JDSH_PCApy[I];JDSH_CAPCposz_PolyCone_posz" rot="JDSH_CACOangx_ConeAssembly_angx+90.;0.;JDSH_CACOangz[I]" />
+ </foreach>
+</composition>
+
+<composition name="JDSH_ConeAssembly_NSW" >
+ <posXYZ volume="JDSH_BrassConeAssembly_NSW" X_Y_Z=" 0.; 0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JDSH_LeadConeAssembly_NSW" X_Y_Z=" 0.; 0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JDSH_PolyConeAssembly_NSW" X_Y_Z=" 0.; 0.; 0." rot="0.;0.;0." />
+</composition>
+
+<!-- Modelization of JD Tube -->
+<pcon name="JDSH_Tube" material="ShieldSteel" >
+ <polyplane Rio_Z="JDSH_TUBEinRa_Tube_innerRadius;JDSH_TUBEOuR1_Tube_OuterRadius1;0." />
+ <polyplane Rio_Z="JDSH_TUBEinRa_Tube_innerRadius;JDSH_TUBEOuR1_Tube_OuterRadius1;JDSH_TUBEslen_Tube_shortlength" />
+ <polyplane Rio_Z="JDSH_TUBEinRa_Tube_innerRadius;JDSH_TUBEOuR2_Tube_OuterRadius2;JDSH_TUBEslen_Tube_shortlength+1." />
+ <polyplane Rio_Z="JDSH_TUBEinRa_Tube_innerRadius;JDSH_TUBEOuR2_Tube_OuterRadius2;JDSH_TUBEleng_Tube_length" />
+</pcon>
+<pcon name="JDSH_Plug" material="ShieldBrass" >
+ <polyplane Rio_Z="JDSH_PLUGinR2_Plug_innerRadius2;JDSH_PLUGouRa_Plug_OuterRadius;0." />
+ <polyplane Rio_Z="JDSH_PLUGinR1_Plug_innerRadius1;JDSH_PLUGouRa_Plug_OuterRadius;JDSH_PLUGleng_Plug_length" />
+</pcon>
+<pcon name="JDSH_SmallWheelHub" material="ShieldBrass" >
+ <polyplane Rio_Z="JDSH_SWHinnRa_SmallWheelHub_innerRadius;JDSH_SWHoutR1_SmallWheelHub_outerRadius1;0." />
+ <polyplane Rio_Z="JDSH_SWHinnRa_SmallWheelHub_innerRadius;JDSH_SWHoutR2_SmallWheelHub_outerRadius2;JDSH_SWHlengt_SmallWheelHub_length" />
+</pcon>
+
+<tubs name="JDSH_SmallWheelHub_NSW" material="ShieldBrass" Rio_Z="JDSH_SWHinnRa_SmallWheelHub_innerRadius ; JDSH_SWHoutR1_SmallWheelHub_outerRadius1 - JDSH_SWHPthic_SmallWheelHub_Polythickness - JDSH_SWHLthic_SmallWheelHub_Leadthickness ; JDSH_SWHlengt_SmallWheelHub_length"/>
+
+<pcon name="JDSH_SmallWheelHubPoly" material="PolyBoronB2O3" >
+ <polyplane Rio_Z="JDSH_SWHoutR1_SmallWheelHub_outerRadius1 + GENV_Eps; JDSH_SWHoutR1_SmallWheelHub_outerRadius1 + JDSH_SWHPthic_SmallWheelHub_Polythickness; 0." />
+ <polyplane Rio_Z="JDSH_SWHoutR2_SmallWheelHub_outerRadius2 + GENV_Eps; JDSH_SWHoutR2_SmallWheelHub_outerRadius2 + JDSH_SWHPthic_SmallWheelHub_Polythickness; JDSH_SWHlengt_SmallWheelHub_length" />
+</pcon>
+
+<tubs name="JDSH_SmallWheelHubPoly_NSW" material="PolyBoronB2O3" Rio_Z="JDSH_SWHoutR1_SmallWheelHub_outerRadius1 - JDSH_SWHPthic_SmallWheelHub_Polythickness - JDSH_SWHLthic_SmallWheelHub_Leadthickness + GENV_Eps ; JDSH_SWHoutR1_SmallWheelHub_outerRadius1 - JDSH_SWHLthic_SmallWheelHub_Leadthickness ; JDSH_SWHlengt_SmallWheelHub_length"/>
+
+<pcon name="JDSH_SmallWheelHubLead" material="Lead" >
+ <polyplane Rio_Z="JDSH_SWHoutR1_SmallWheelHub_outerRadius1 + JDSH_SWHPthic_SmallWheelHub_Polythickness + GENV_Eps; JDSH_SWHoutR1_SmallWheelHub_outerRadius1 + JDSH_SWHPthic_SmallWheelHub_Polythickness + JDSH_SWHLthic_SmallWheelHub_Leadthickness; 0." />
+ <polyplane Rio_Z="JDSH_SWHoutR2_SmallWheelHub_outerRadius2 + JDSH_SWHPthic_SmallWheelHub_Polythickness + GENV_Eps; JDSH_SWHoutR2_SmallWheelHub_outerRadius2 + JDSH_SWHPthic_SmallWheelHub_Polythickness + JDSH_SWHLthic_SmallWheelHub_Leadthickness; JDSH_SWHlengt_SmallWheelHub_length" />
+</pcon>
+
+<tubs name="JDSH_SmallWheelHubLead_NSW" material="Lead" Rio_Z="JDSH_SWHoutR1_SmallWheelHub_outerRadius1 - JDSH_SWHLthic_SmallWheelHub_Leadthickness + GENV_Eps ; JDSH_SWHoutR1_SmallWheelHub_outerRadius1 ; JDSH_SWHlengt_SmallWheelHub_length"/>
+
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- JD Shield Feet -->
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<var name="JDSH_MaRiFefxo_MainRibFeet_feetxoffset" value="JDSH_MaRiFefxl_MainRibFeet_feetxlength - JDSH_MaRiFemad_MainRibFeet_mainwidth/sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)" />
+<var name="JDSH_MaRiFeulp_MainRibFeet_upplenpro" value="JDSH_MaRiFeupl_MainRibFeet_upperlength*sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)" />
+<var name="JDSH_MaRiFellp_MainRibFeet_lowlenpro" value="JDSH_MaRiFelol_MainRibFeet_lowerlength*cos(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)" />
+<var name="JDSH_MaRiFeulp_MainRibFeet_upplenpro2" value="JDSH_MaRiFeupl_MainRibFeet_upperlength*cos(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)" />
+<var name="JDSH_MaRiFellp_MainRibFeet_lowlenpro2" value="JDSH_MaRiFelol_MainRibFeet_lowerlength*sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)" />
+<var name="JDSH_MaRiFetca_MainRibFeet_topcutangel" value="(asin((cos(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180) * JDSH_MaRiFeupl_MainRibFeet_upperlength -JDSH_MaRiFellp_MainRibFeet_lowlenpro - JDSH_MaRiFemad_MainRibFeet_mainwidth / sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)) / JDSH_MaRiFemad_MainRibFeet_mainwidth))" />
+
+<!-- arbitrary parameters for cutting boxes -->
+<var name="JDSH_MaRiCB1xw_MainCutBox1_xwidth" value=" 200. " />
+<var name="JDSH_MaRiCB1yw_MainCutBox1_ywidth" value=" 120. " />
+<var name="JDSH_MaRiCuBzw_MainCutBox_zwidth" value=" 600. " />
+<var name="JDSH_MaRiCB2xw_MainCutBox2_xwidth" value=" 2000. " />
+<var name="JDSH_MaRiCB2yw_MainCutBox2_ywidth" value=" JDSH_MaRiFuyle_MainRibFull_ylength " />
+<var name="JDSH_MaRiCB3yw_MainCutBox3_ywidth" value=" JDSH_MaRiFelol_MainRibFeet_lowerlength" />
+<var name="JDSH_MaRiCB3xw_MainCutBox3_xwidth" value=" 3000. " />
+<var name="JDSH_MaRiCB4yw_MainCutBox4_ywidth" value=" 4000. " />
+
+<box name="JDSH_MainRib_basis" material="ShieldIron" X_Y_Z="JDSH_MaRiFuxle_MainRibFull_xlength; JDSH_MaRiFuyle_MainRibFull_ylength; JDSH_MaRiFewzw_MainRibFeet_wholezwidth" />
+
+<box name="JDSH_MainRib_cutbox1" material="ShieldIron" X_Y_Z="JDSH_MaRiCB1xw_MainCutBox1_xwidth; JDSH_MaRiCB1yw_MainCutBox1_ywidth; JDSH_MaRiCuBzw_MainCutBox_zwidth" />
+<box name="JDSH_MainRib_cutbox2" material="ShieldIron" X_Y_Z="JDSH_MaRiCB2xw_MainCutBox2_xwidth; JDSH_MaRiCB2yw_MainCutBox2_ywidth; JDSH_MaRiFewzw_MainRibFeet_wholezwidth" />
+<box name="JDSH_MainRib_cutbox3" material="ShieldIron" X_Y_Z="JDSH_MaRiCB3xw_MainCutBox3_xwidth; JDSH_MaRiCB3yw_MainCutBox3_ywidth; JDSH_MaRiCuBzw_MainCutBox_zwidth" />
+<box name="JDSH_MainRib_cutbox4" material="ShieldIron" X_Y_Z="JDSH_MaRiCB3xw_MainCutBox3_xwidth; JDSH_MaRiCB4yw_MainCutBox4_ywidth; JDSH_MaRiCuBzw_MainCutBox_zwidth" />
+<box name="JDSH_MainRib_cutbox5" material="ShieldIron" X_Y_Z="JDSH_MaRiCB2xw_MainCutBox2_xwidth; JDSH_MaRiCB2yw_MainCutBox2_ywidth; JDSH_MaRiCuBzw_MainCutBox_zwidth" />
+
+<var name="JDSH_MainRib_basis_PosX" value="(JDSH_MaRiFuxle_MainRibFull_xlength)/2." />
+<var name="JDSH_MainRib_basis_PosY" value="(JDSH_MaRiFuyle_MainRibFull_ylength)/2." />
+<var name="JDSH_MainRib_basis_PosZ" value="JDSH_MaRiFewzw_MainRibFeet_wholezwidth/2." />
+
+<var name="JDSH_MainRib_cb1_PosX1" value="JDSH_MaRiFefxo_MainRibFeet_feetxoffset - JDSH_MaRiCB1xw_MainCutBox1_xwidth/2. " />
+<var name="JDSH_MainRib_cb1_PosY1" value="JDSH_MaRiFefyo_MainRibFeet_feetyoffset + JDSH_MaRiCB1yw_MainCutBox1_ywidth/2." />
+
+<var name="JDSH_MainRib_cb1_PosX2" value="JDSH_MaRiFefxl_MainRibFeet_feetxlength + JDSH_MaRiCB1xw_MainCutBox1_xwidth/2." />
+<var name="JDSH_MainRib_cb1_PosY2" value="JDSH_MaRiFefyo_MainRibFeet_feetyoffset - JDSH_MaRiCB1yw_MainCutBox1_ywidth/2." />
+
+<var name="JDSH_MainRib_cb2_PosX1" value="JDSH_MaRiCB2xw_MainCutBox2_xwidth/2. " />
+<var name="JDSH_MainRib_cb2_PosY1" value="(JDSH_MaRiCB2yw_MainCutBox2_ywidth*cos(-JDSH_MaRiFeayz_MainRibFeet_angleyzplane*GENV_PiS180)+JDSH_MaRiFewzw_MainRibFeet_wholezwidth*sin(-JDSH_MaRiFeayz_MainRibFeet_angleyzplane*GENV_PiS180))/2." />
+<var name="JDSH_MainRib_cb2_PosZ1" value="JDSH_MaRiFewzw_MainRibFeet_wholezwidth+(-JDSH_MaRiCB2yw_MainCutBox2_ywidth*sin(-JDSH_MaRiFeayz_MainRibFeet_angleyzplane*GENV_PiS180)+JDSH_MaRiFewzw_MainRibFeet_wholezwidth*cos(-JDSH_MaRiFeayz_MainRibFeet_angleyzplane*GENV_PiS180))/2." />
+
+<var name="JDSH_MainRib_cb2_PosX2" value="JDSH_MaRiFuxle_MainRibFull_xlength+(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Co45)/2.-(JDSH_MaRiFerao_MainRibFeet_radialoffset+JDSH_MaRiFearw_MainRibFeet_attredwidth)*GENV_Si45 " />
+<var name="JDSH_MainRib_cb2_PosY2" value="JDSH_MaRiFuyle_MainRibFull_ylength+(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Si45)/2.-(JDSH_MaRiFerao_MainRibFeet_radialoffset+JDSH_MaRiFearw_MainRibFeet_attredwidth)*GENV_Co45 " />
+
+<var name="JDSH_MainRib_cb2_PosX3" value="JDSH_MaRiFuxle_MainRibFull_xlength+(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Co45)/2.-(JDSH_MaRiFerao_MainRibFeet_radialoffset+JDSH_MaRiFeatw_MainRibFeet_attribwidth)*GENV_Si45 " />
+<var name="JDSH_MainRib_cb2_PosY3" value="JDSH_MaRiFuyle_MainRibFull_ylength+(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Si45)/2.-(JDSH_MaRiFerao_MainRibFeet_radialoffset+JDSH_MaRiFeatw_MainRibFeet_attribwidth)*GENV_Co45 " />
+<var name="JDSH_MainRib_cb2_PosZ3" value="JDSH_MaRiFewzw_MainRibFeet_wholezwidth/2.+JDSH_MaRiFeazw_MainRibFeet_attribzwidth " />
+
+<var name="JDSH_MainRib_cb2_PosX4" value="JDSH_MaRiFuxle_MainRibFull_xlength-(JDSH_MaRiCB2xw_MainCutBox2_xwidth*cos(JDSH_MaRiFeata_MainRibFeet_attribangle*GENV_PiS180)*GENV_Co45)/2.-(JDSH_MaRiFerao_MainRibFeet_radialoffset+JDSH_MaRiFeatw_MainRibFeet_attribwidth)*GENV_Si45+JDSH_MaRiFewzw_MainRibFeet_wholezwidth*sin(JDSH_MaRiFeata_MainRibFeet_attribangle*GENV_PiS180)*GENV_Si45/2. " />
+<var name="JDSH_MainRib_cb2_PosY4" value="JDSH_MaRiFuyle_MainRibFull_ylength-(JDSH_MaRiCB2xw_MainCutBox2_xwidth*cos(JDSH_MaRiFeata_MainRibFeet_attribangle*GENV_PiS180)*GENV_Si45)/2.-(JDSH_MaRiFerao_MainRibFeet_radialoffset+JDSH_MaRiFeatw_MainRibFeet_attribwidth)*GENV_Co45+JDSH_MaRiFewzw_MainRibFeet_wholezwidth*sin(JDSH_MaRiFeata_MainRibFeet_attribangle*GENV_PiS180)*GENV_Co45/2. " />
+<var name="JDSH_MainRib_cb2_PosZ4" value="(JDSH_MaRiCB2xw_MainCutBox2_xwidth*sin(JDSH_MaRiFeata_MainRibFeet_attribangle*GENV_PiS180)+JDSH_MaRiFewzw_MainRibFeet_wholezwidth*cos(JDSH_MaRiFeata_MainRibFeet_attribangle*GENV_PiS180))/2.+JDSH_MaRiFeazw_MainRibFeet_attribzwidth+JDSH_MaRiFeazo_MainRibFeet_attribzoffset " />
+
+<var name="JDSH_MainRib_cb3_PosX" value="(JDSH_MaRiCB3xw_MainCutBox3_xwidth*sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)+JDSH_MaRiCB3yw_MainCutBox3_ywidth*cos(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180))/2. + JDSH_MaRiFefxl_MainRibFeet_feetxlength" />
+<var name="JDSH_MainRib_cb3_PosY" value="JDSH_MaRiFefyo_MainRibFeet_feetyoffset+(-JDSH_MaRiCB3xw_MainCutBox3_xwidth*cos(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)+JDSH_MaRiCB3yw_MainCutBox3_ywidth*sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180))/2." />
+
+<var name="JDSH_MainRib_cb4_PosX1" value="(-JDSH_MaRiCB3xw_MainCutBox3_xwidth*sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)+JDSH_MaRiCB4yw_MainCutBox4_ywidth*cos(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180))/2. + JDSH_MaRiFefxo_MainRibFeet_feetxoffset " />
+<var name="JDSH_MainRib_cb4_PosY1" value="JDSH_MaRiFefyo_MainRibFeet_feetyoffset + (JDSH_MaRiCB3xw_MainCutBox3_xwidth*cos(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180)+JDSH_MaRiCB4yw_MainCutBox4_ywidth*sin(JDSH_MaRiFeaxy_MainRibFeet_anglexyplane*GENV_PiS180))/2." />
+
+<var name="JDSH_MainRib_cb4_PosX2" value="(-JDSH_MaRiCB3xw_MainCutBox3_xwidth*GENV_Si45+JDSH_MaRiCB4yw_MainCutBox4_ywidth*GENV_Co45)/2.+JDSH_MaRiFefxl_MainRibFeet_feetxlength+JDSH_MaRiFellp_MainRibFeet_lowlenpro-JDSH_MaRiCB4yw_MainCutBox4_ywidth/2." />
+<var name="JDSH_MainRib_cb4_PosY2" value="-(JDSH_MaRiCB3xw_MainCutBox3_xwidth*GENV_Co45+JDSH_MaRiCB4yw_MainCutBox4_ywidth*GENV_Si45)/2.+JDSH_MaRiFefyo_MainRibFeet_feetyoffset+JDSH_MaRiFellp_MainRibFeet_lowlenpro2+JDSH_MaRiCB4yw_MainCutBox4_ywidth/2." />
+<var name="JDSH_MainRib_cb4_PosZ2" value="-JDSH_MaRiCuBzw_MainCutBox_zwidth/2.+JDSH_MaRiFeozw_MainRibFeet_offsetzwidth" />
+
+<var name="JDSH_MainRib_cb5_PosX1" value="(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Co45-JDSH_MaRiCB2yw_MainCutBox2_ywidth*GENV_Si45)/2.+JDSH_MaRiFefxo_MainRibFeet_feetxoffset+JDSH_MaRiFeulp_MainRibFeet_upplenpro2 " />
+<var name="JDSH_MainRib_cb5_PosY1" value="(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Si45+JDSH_MaRiCB2yw_MainCutBox2_ywidth*GENV_Co45)/2.+JDSH_MaRiFefyo_MainRibFeet_feetyoffset+JDSH_MaRiFellp_MainRibFeet_lowlenpro2+JDSH_MaRiFemad_MainRibFeet_mainwidth*cos(JDSH_MaRiFetca_MainRibFeet_topcutangel)" />
+
+<var name="JDSH_MainRib_cb5_PosX2" value="(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Co45+JDSH_MaRiCB2yw_MainCutBox2_ywidth*GENV_Si45)/2.+JDSH_MaRiFefxl_MainRibFeet_feetxlength+JDSH_MaRiFellp_MainRibFeet_lowlenpro " />
+<var name="JDSH_MainRib_cb5_PosY2" value="(JDSH_MaRiCB2xw_MainCutBox2_xwidth*GENV_Si45-JDSH_MaRiCB2yw_MainCutBox2_ywidth*GENV_Co45)/2.+JDSH_MaRiFellp_MainRibFeet_lowlenpro2+JDSH_MaRiFefyo_MainRibFeet_feetyoffset" />
+
+<subtraction name="JDSH_MainRib_Left">
+ <posXYZ volume="JDSH_MainRib_basis" X_Y_Z="JDSH_MainRib_basis_PosX; JDSH_MainRib_basis_PosY; JDSH_MainRib_basis_PosZ" />
+ <posXYZ volume="JDSH_MainRib_cutbox1" X_Y_Z="JDSH_MainRib_cb1_PosX1 ; JDSH_MainRib_cb1_PosY1 ; JDSH_MainRib_basis_PosZ " />
+ <posXYZ volume="JDSH_MainRib_cutbox1" X_Y_Z="JDSH_MainRib_cb1_PosX2 ; JDSH_MainRib_cb1_PosY2 ; JDSH_MainRib_basis_PosZ " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="JDSH_MainRib_cb2_PosX1 ; JDSH_MainRib_cb2_PosY1 ; JDSH_MainRib_cb2_PosZ1 " rot=" JDSH_MaRiFeayz_MainRibFeet_angleyzplane ; 0. ; 0. " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="JDSH_MainRib_cb2_PosX2 ; JDSH_MainRib_cb2_PosY2 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; 45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="JDSH_MainRib_cb2_PosX3 ; JDSH_MainRib_cb2_PosY3 ; JDSH_MainRib_cb2_PosZ3 " rot=" 0. ; 0. ; 45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="JDSH_MainRib_cb2_PosX4 ; JDSH_MainRib_cb2_PosY4 ; JDSH_MainRib_cb2_PosZ4 " rot=" 0. ; JDSH_MaRiFeata_MainRibFeet_attribangle ; 45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox3" X_Y_Z="JDSH_MainRib_cb3_PosX ; JDSH_MainRib_cb3_PosY ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; JDSH_MaRiFeaxy_MainRibFeet_anglexyplane-90. " />
+ <posXYZ volume="JDSH_MainRib_cutbox4" X_Y_Z="JDSH_MainRib_cb4_PosX1 ; JDSH_MainRib_cb4_PosY1 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; JDSH_MaRiFeaxy_MainRibFeet_anglexyplane-90. " />
+ <posXYZ volume="JDSH_MainRib_cutbox4" X_Y_Z="JDSH_MainRib_cb4_PosX2 ; JDSH_MainRib_cb4_PosY2 ; JDSH_MainRib_cb4_PosZ2 " rot=" 0. ; 0. ; 45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox5" X_Y_Z="JDSH_MainRib_cb5_PosX1 ; JDSH_MainRib_cb5_PosY1 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; 45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox5" X_Y_Z="JDSH_MainRib_cb5_PosX2 ; JDSH_MainRib_cb5_PosY2 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; 45. " />
+</subtraction>
+
+<subtraction name="JDSH_MainRib_Right">
+ <posXYZ volume="JDSH_MainRib_basis" X_Y_Z="-JDSH_MainRib_basis_PosX; JDSH_MainRib_basis_PosY; JDSH_MainRib_basis_PosZ" />
+ <posXYZ volume="JDSH_MainRib_cutbox1" X_Y_Z="-JDSH_MainRib_cb1_PosX1 ; JDSH_MainRib_cb1_PosY1 ; JDSH_MainRib_basis_PosZ " />
+ <posXYZ volume="JDSH_MainRib_cutbox1" X_Y_Z="-JDSH_MainRib_cb1_PosX2 ; JDSH_MainRib_cb1_PosY2 ; JDSH_MainRib_basis_PosZ " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="-JDSH_MainRib_cb2_PosX1 ; JDSH_MainRib_cb2_PosY1 ; JDSH_MainRib_cb2_PosZ1 " rot=" JDSH_MaRiFeayz_MainRibFeet_angleyzplane ; 0. ; 0. " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="-JDSH_MainRib_cb2_PosX2 ; JDSH_MainRib_cb2_PosY2 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; -45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="-JDSH_MainRib_cb2_PosX3 ; JDSH_MainRib_cb2_PosY3 ; JDSH_MainRib_cb2_PosZ3 " rot=" 0. ; 0. ; -45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox2" X_Y_Z="-JDSH_MainRib_cb2_PosX4 ; JDSH_MainRib_cb2_PosY4 ; JDSH_MainRib_cb2_PosZ4 " rot=" 0. ; -JDSH_MaRiFeata_MainRibFeet_attribangle ; -45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox3" X_Y_Z="-JDSH_MainRib_cb3_PosX ; JDSH_MainRib_cb3_PosY ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; -JDSH_MaRiFeaxy_MainRibFeet_anglexyplane-90. " />
+ <posXYZ volume="JDSH_MainRib_cutbox4" X_Y_Z="-JDSH_MainRib_cb4_PosX1 ; JDSH_MainRib_cb4_PosY1 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; -JDSH_MaRiFeaxy_MainRibFeet_anglexyplane-90. " />
+ <posXYZ volume="JDSH_MainRib_cutbox4" X_Y_Z="-JDSH_MainRib_cb4_PosX2 ; JDSH_MainRib_cb4_PosY2 ; JDSH_MainRib_cb4_PosZ2 " rot=" 0. ; 0. ; -45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox5" X_Y_Z="-JDSH_MainRib_cb5_PosX1 ; JDSH_MainRib_cb5_PosY1 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; -45. " />
+ <posXYZ volume="JDSH_MainRib_cutbox5" X_Y_Z="-JDSH_MainRib_cb5_PosX2 ; JDSH_MainRib_cb5_PosY2 ; JDSH_MainRib_basis_PosZ " rot=" 0. ; 0. ; -45. " />
+</subtraction>
+
+<!-- BEGIN confirmation with atljd___0042-vAC (if no other comment) -->
+<var name="JDSH_MaRiTPthi_MainRibTP_thickness" value=" 50. " />
+<var name="JDSH_MaRiTPful_MainRibTP_fulllength" value=" 1295. " />
+<var name="JDSH_MaRiTPblo_MainRibTP_biglenoff" value=" 985. " />
+<var name="JDSH_MaRiTPslo_MainRibTP_smalllenoff" value=" 229. " />
+<var name="JDSH_MaRiTPfuw_MainRibTP_fullwidth" value=" 855. " />
+<var name="JDSH_MaRiTPwof_MainRibTP_widthoffset" value=" 46. " />
+<var name="JDSH_MaRiTPrew_MainRibTP_reducedwidth" value=" 730. " />
+<var name="JDSH_MaRiBSPof_MainRibBS_loweroffset" value=" 588. " />
+<var name="JDSH_MainRib_Support_PosX" value=" 2640. " /> <!-- confirmed atljd___0028-vAC -->
+<var name="JDSH_MainRib_Support_PosZoffset" value=" 905. " />
+<!-- END confirmation with atljd___0042-vAC -->
+
+<!-- BEGIN confirmation with atljd___0126-v0 (if no other comment) -->
+<var name="JDSH_MaRiSPthi_MainRibSP_thickness" value=" 35. " />
+<var name="JDSH_MaRiSPfii_MainRibSP_firstincline" value=" 175. " />
+<var name="JDSH_MaRiSPsei_MainRibSP_secondincline" value=" 1346. " />
+<var name="JDSH_MaRiBPfhi_MainRibBP_fullheight" value=" 253. " />
+<var name="JDSH_MaRiBPmhi_MainRibBP_middleheight" value=" 180. " />
+<var name="JDSH_MaRiBPrhi_MainRibBP_reducedheight" value=" 100. " />
+<var name="JDSH_MaRiBPhbo_MainRibBP_heightbigoff" value=" 85. " />
+<var name="JDSH_MaRiBPhso_MainRibBP_heightsmalloff" value=" 40. " />
+<var name="JDSH_MaRiBPihs_MainRibBP_interheight1" value=" 160. " />
+<var name="JDSH_MaRiBPihb_MainRibBP_interheight2" value=" 166. " />
+<var name="JDSH_MaRiBPfii_MainRibBP_firstincline" value=" 149. " />
+<var name="JDSH_MaRiBPbso_MainRibBP_beginstepone" value=" 379. " />
+<var name="JDSH_MaRiBPeso_MainRibBP_endstepone" value=" 524. " />
+<var name="JDSH_MaRiBPbst_MainRibBP_beginsteptwo" value=" 1011.5 " />
+<var name="JDSH_MaRiBPest_MainRibBP_endsteptwo" value=" 1156.5 " />
+<var name="JDSH_MaRiBPsei_MainRibBP_secondincline" value=" 1386.5 " />
+<var name="JDSH_MaRiBPful_MainRibBP_fulllength" value=" 1536. " />
+<var name="JDSH_MaRiBSPid_MainRibBS_interdistance" value=" 356. " />
+<var name="JDSH_MaRiIPOle_MainRibIP_length" value=" 325. " />
+<!-- END confirmation with atljd___0126-v0 -->
+
+<var name="JDSH_RiAPRadi_RibAirPad_Radius" value=" 350. "/> <!-- equivalent to AECT_SupWheel_AirPad_Rad -->
+<var name="JDSH_RiAPHigh_RibAirPad_Hight" value=" 125. "/> <!-- equivalent to AECT_SupWheel_AirPad_Hight -->
+<var name="JDSH_RiAPFuDi_RibAirPad_FullDist" value=" 1880. "/>
+<var name="JDSH_RiAPSupZ_RibAirPad_SuppDZ" value=" 290." />
+
+<var name="JDSH_RiAPSupY_RibAirPad_SuppDY" value="-RAIL_Ypos_aboveJFSH + JDSH_MainRibFeet_PosY - 2.*JDSH_MaRiTPthi_MainRibTP_thickness - JDSH_RiAPHigh_RibAirPad_Hight "/>
+
+<box name="JDSH_MainRib_InterPlateOne" material="ShieldIron" X_Y_Z="JDSH_MaRiBSPid_MainRibBS_interdistance; JDSH_MaRiTPthi_MainRibTP_thickness; JDSH_MaRiIPOle_MainRibIP_length"/>
+<box name="JDSH_MainRib_InterPlateTwo" material="ShieldIron" X_Y_Z="JDSH_MaRiBSPid_MainRibBS_interdistance; JDSH_MaRiTPthi_MainRibTP_thickness; JDSH_MaRiIPOle_MainRibIP_length-JDSH_MaRiBPful_MainRibBP_fulllength+JDSH_MaRiTPful_MainRibTP_fulllength"/>
+<box name="JDSH_MainRib_InterPlateThree" material="ShieldIron" X_Y_Z="JDSH_MaRiBSPid_MainRibBS_interdistance; JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBPhso_MainRibBP_heightsmalloff; JDSH_MaRiBPful_MainRibBP_fulllength-JDSH_MaRiTPful_MainRibTP_fulllength"/>
+
+<box name="JDSH_MainRibSP_APSupp" material="ShieldIron" X_Y_Z=" JDSH_MaRiBSPid_MainRibBS_interdistance ; JDSH_RiAPSupY_RibAirPad_SuppDY ; JDSH_RiAPSupZ_RibAirPad_SuppDZ" />
+<tubs name="JDSH_MainRibAP_AirPad" material="ShieldIron" Rio_Z=" 0. ; JDSH_RiAPRadi_RibAirPad_Radius ; JDSH_RiAPHigh_RibAirPad_Hight" />
+
+<gvxy name="JDSH_MainRib_TopPlate" material="ShieldIron" dZ="JDSH_MaRiTPthi_MainRibTP_thickness" >
+ <gvxy_point X_Y=" 0. ; 0. " />
+ <gvxy_point X_Y=" 0. ; JDSH_MaRiTPblo_MainRibTP_biglenoff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPwof_MainRibTP_widthoffset ; JDSH_MaRiTPblo_MainRibTP_biglenoff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPwof_MainRibTP_widthoffset ; JDSH_MaRiTPful_MainRibTP_fulllength " />
+ <gvxy_point X_Y=" JDSH_MaRiTPrew_MainRibTP_reducedwidth ; JDSH_MaRiTPful_MainRibTP_fulllength " />
+ <gvxy_point X_Y=" JDSH_MaRiTPrew_MainRibTP_reducedwidth ; JDSH_MaRiTPslo_MainRibTP_smalllenoff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPfuw_MainRibTP_fullwidth ; JDSH_MaRiTPslo_MainRibTP_smalllenoff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPfuw_MainRibTP_fullwidth ; 0. " />
+</gvxy>
+
+<gvxy name="JDSH_MainRib_LargeSidePlate" material="ShieldIron" dZ="JDSH_MaRiTPthi_MainRibTP_thickness" >
+ <gvxy_point X_Y=" 0. ; 0. " />
+ <gvxy_point X_Y=" 0. ; JDSH_MaRiBPhbo_MainRibBP_heightbigoff " />
+ <gvxy_point X_Y=" JDSH_MaRiBPfii_MainRibBP_firstincline ; JDSH_MaRiBPihb_MainRibBP_interheight2 " />
+ <gvxy_point X_Y=" JDSH_MaRiBPfii_MainRibBP_firstincline ; JDSH_MaRiBPfhi_MainRibBP_fullheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbso_MainRibBP_beginstepone ; JDSH_MaRiBPfhi_MainRibBP_fullheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbso_MainRibBP_beginstepone ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPeso_MainRibBP_endstepone ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPeso_MainRibBP_endstepone ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbst_MainRibBP_beginsteptwo ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbst_MainRibBP_beginsteptwo ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPest_MainRibBP_endsteptwo ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPest_MainRibBP_endsteptwo ; JDSH_MaRiBPfhi_MainRibBP_fullheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPsei_MainRibBP_secondincline ; JDSH_MaRiBPfhi_MainRibBP_fullheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPsei_MainRibBP_secondincline ; JDSH_MaRiBPihs_MainRibBP_interheight1 " />
+ <gvxy_point X_Y=" JDSH_MaRiBPful_MainRibBP_fulllength ; JDSH_MaRiBPhbo_MainRibBP_heightbigoff " />
+ <gvxy_point X_Y=" JDSH_MaRiBPful_MainRibBP_fulllength ; JDSH_MaRiBPhso_MainRibBP_heightsmalloff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPful_MainRibTP_fulllength ; JDSH_MaRiBPhso_MainRibBP_heightsmalloff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPful_MainRibTP_fulllength ; 0. " />
+</gvxy>
+
+<gvxy name="JDSH_MainRib_SmallSidePlate" material="ShieldIron" dZ="JDSH_MaRiSPthi_MainRibSP_thickness" >
+ <gvxy_point X_Y=" 0. ; 0. " />
+ <gvxy_point X_Y=" 0. ; JDSH_MaRiBPhbo_MainRibBP_heightbigoff " />
+ <gvxy_point X_Y=" JDSH_MaRiSPfii_MainRibSP_firstincline ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbso_MainRibBP_beginstepone ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbso_MainRibBP_beginstepone ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPeso_MainRibBP_endstepone ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPeso_MainRibBP_endstepone ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbst_MainRibBP_beginsteptwo ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPbst_MainRibBP_beginsteptwo ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPest_MainRibBP_endsteptwo ; JDSH_MaRiBPrhi_MainRibBP_reducedheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPest_MainRibBP_endsteptwo ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiSPsei_MainRibSP_secondincline ; JDSH_MaRiBPmhi_MainRibBP_middleheight " />
+ <gvxy_point X_Y=" JDSH_MaRiBPful_MainRibBP_fulllength ; JDSH_MaRiBPhbo_MainRibBP_heightbigoff " />
+ <gvxy_point X_Y=" JDSH_MaRiBPful_MainRibBP_fulllength ; JDSH_MaRiBPhso_MainRibBP_heightsmalloff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPful_MainRibTP_fulllength ; JDSH_MaRiBPhso_MainRibBP_heightsmalloff " />
+ <gvxy_point X_Y=" JDSH_MaRiTPful_MainRibTP_fulllength ; 0. " />
+</gvxy>
+
+<composition name="JDSH_MainRib_Support_Right">
+ <posXYZ volume="JDSH_MainRib_TopPlate" X_Y_Z="0 ; JDSH_MaRiTPthi_MainRibTP_thickness/2. ; 0" rot=" -90. ; 0. ; 0. " />
+ <posXYZ volume="JDSH_MainRib_InterPlateOne" X_Y_Z="JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness/2.; -JDSH_MaRiIPOle_MainRibIP_length/2."/>
+ <posXYZ volume="JDSH_MainRib_InterPlateTwo" X_Y_Z="JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness/2.; (JDSH_MaRiIPOle_MainRibIP_length-JDSH_MaRiBPful_MainRibBP_fulllength-JDSH_MaRiTPful_MainRibTP_fulllength)/2."/>
+ <posXYZ volume="JDSH_MainRib_InterPlateThree" X_Y_Z="JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBSPid_MainRibBS_interdistance/2.; (-JDSH_MaRiBPhso_MainRibBP_heightsmalloff-JDSH_MaRiTPthi_MainRibTP_thickness)/2.; -(JDSH_MaRiBPful_MainRibBP_fulllength+JDSH_MaRiTPful_MainRibTP_fulllength)/2."/>
+ <posXYZ volume="JDSH_MainRib_LargeSidePlate" X_Y_Z="JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness/2. ; 0 ; 0" rot=" 180. ; 90. ; 0. " />
+ <posXYZ volume="JDSH_MainRib_SmallSidePlate" X_Y_Z="JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiBSPid_MainRibBS_interdistance-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiSPthi_MainRibSP_thickness/2. ; 0 ; 0" rot=" 180. ; 90. ; 0. " />
+ <posXYZ volume="JDSH_MainRibSP_APSupp" X_Y_Z=" JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. + JDSH_RiAPFuDi_RibAirPad_FullDist/2.-JDSH_RiAPRadi_RibAirPad_Radius "/>
+ <posXYZ volume="JDSH_MainRibSP_APSupp" X_Y_Z=" JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. - JDSH_RiAPFuDi_RibAirPad_FullDist/2.+JDSH_RiAPRadi_RibAirPad_Radius "/>
+ <posXYZ volume="JDSH_MainRibAP_AirPad" X_Y_Z=" JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY-JDSH_RiAPHigh_RibAirPad_Hight/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. + JDSH_RiAPFuDi_RibAirPad_FullDist/2.-JDSH_RiAPRadi_RibAirPad_Radius" rot=" 90. ; 0. ; 0. "/>
+ <posXYZ volume="JDSH_MainRibAP_AirPad" X_Y_Z=" JDSH_MaRiBSPof_MainRibBS_loweroffset-JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY-JDSH_RiAPHigh_RibAirPad_Hight/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. - JDSH_RiAPFuDi_RibAirPad_FullDist/2.+JDSH_RiAPRadi_RibAirPad_Radius" rot=" 90. ; 0. ; 0. "/>
+</composition>
+
+<composition name="JDSH_MainRib_Support_Left">
+ <posXYZ volume="JDSH_MainRib_TopPlate" X_Y_Z="0 ; JDSH_MaRiTPthi_MainRibTP_thickness/2. ; 0" rot=" -90. ; 0. ; 180. " />
+ <posXYZ volume="JDSH_MainRib_InterPlateOne" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness/2.; -JDSH_MaRiIPOle_MainRibIP_length/2."/>
+ <posXYZ volume="JDSH_MainRib_InterPlateTwo" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness/2.; (JDSH_MaRiIPOle_MainRibIP_length-JDSH_MaRiBPful_MainRibBP_fulllength-JDSH_MaRiTPful_MainRibTP_fulllength)/2."/>
+ <posXYZ volume="JDSH_MainRib_InterPlateThree" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiBSPid_MainRibBS_interdistance/2.; (-JDSH_MaRiBPhso_MainRibBP_heightsmalloff-JDSH_MaRiTPthi_MainRibTP_thickness)/2.; -(JDSH_MaRiBPful_MainRibBP_fulllength+JDSH_MaRiTPful_MainRibTP_fulllength)/2."/>
+ <posXYZ volume="JDSH_MainRib_LargeSidePlate" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness/2. ; 0 ; 0" rot=" 180. ; 90. ; 0. " />
+ <posXYZ volume="JDSH_MainRib_SmallSidePlate" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiBSPid_MainRibBS_interdistance+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiSPthi_MainRibSP_thickness/2. ; 0 ; 0" rot=" 180. ; 90. ; 0. " />
+ <posXYZ volume="JDSH_MainRibSP_APSupp" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. + JDSH_RiAPFuDi_RibAirPad_FullDist/2.-JDSH_RiAPRadi_RibAirPad_Radius "/>
+ <posXYZ volume="JDSH_MainRibSP_APSupp" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. - JDSH_RiAPFuDi_RibAirPad_FullDist/2.+JDSH_RiAPRadi_RibAirPad_Radius "/>
+ <posXYZ volume="JDSH_MainRibAP_AirPad" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY-JDSH_RiAPHigh_RibAirPad_Hight/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. + JDSH_RiAPFuDi_RibAirPad_FullDist/2.-JDSH_RiAPRadi_RibAirPad_Radius" rot=" 90. ; 0. ; 0. "/>
+ <posXYZ volume="JDSH_MainRibAP_AirPad" X_Y_Z="-JDSH_MaRiBSPof_MainRibBS_loweroffset+JDSH_MaRiTPthi_MainRibTP_thickness+JDSH_MaRiBSPid_MainRibBS_interdistance/2.; -JDSH_MaRiTPthi_MainRibTP_thickness-JDSH_RiAPSupY_RibAirPad_SuppDY-JDSH_RiAPHigh_RibAirPad_Hight/2.; -JDSH_MaRiBPful_MainRibBP_fulllength/2. - JDSH_RiAPFuDi_RibAirPad_FullDist/2.+JDSH_RiAPRadi_RibAirPad_Radius" rot=" 90. ; 0. ; 0. "/>
+</composition>
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Additional Shielding installed winter shutdown 2011/2012 -->
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<!-- BEGIN confirmation with ATL-MH-ER-0024 (if no other comment) -->
+<var name="JDSH_AddShield_OutRing_Lead_innerRad" value=" 730. " />
+<var name="JDSH_AddShield_OutRing_Lead_outerRad" value=" 749.5" />
+<var name="JDSH_AddShield_OutRing_Poly_innerRad" value=" 630. " />
+<var name="JDSH_AddShield_OutRing_Iron_innerRad" value=" 445. " />
+<var name="JDSH_AddShield_Zwidth" value=" 46. " />
+<!-- END confirmation with ATL-MH-ER-0024 -->
+
+<tubs name="JDSH_AddShield_Lead" material="Lead" Rio_Z=" JDSH_AddShield_OutRing_Lead_innerRad ; JDSH_AddShield_OutRing_Lead_outerRad ; JDSH_AddShield_Zwidth" />
+<tubs name="JDSH_AddShield_Poly" material="PolyBoronB4C" Rio_Z=" JDSH_AddShield_OutRing_Poly_innerRad ; JDSH_AddShield_OutRing_Lead_innerRad - GENV_Eps ; JDSH_AddShield_Zwidth" />
+<tubs name="JDSH_AddShield_Iron" material="ShieldIron" Rio_Z=" JDSH_AddShield_OutRing_Iron_innerRad ; JDSH_AddShield_OutRing_Poly_innerRad - GENV_Eps ; JDSH_AddShield_Zwidth" />
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Additional Shielding installed for run 2 -->
+<!-- ++++++++++++++++++++++++++++++++++++++++++ -->
+
+<!-- for documentation also see https://indico.cern.ch/event/299435/session/0/contribution/11/material/slides/1.pdf -->
+<var name="JDSH_Run2_FrtInnRing_Poly_innerRad" value=" 850. " /> <!-- atujd___0003-v0 -->
+<var name="JDSH_Run2_FrtInnRing_Poly_outerRad" value=" 950. " /> <!-- atujd___0003-v0 -->
+<var name="JDSH_Run2_FrtInnRing_Poly_Zwidth" value=" 35. " /> <!-- sum of atujd___0003-v0 and atujd___0012-v0 (merge of 2 rings) -->
+<var name="JDSH_Run2_FrtOutRing_Lead_Radthick" value=" 10. " /> <!-- atujd___0004-v0 -->
+<var name="JDSH_Run2_FrtOutRing_Lead_Zwidth" value=" 34. " /> <!-- atujd___0004-v0 -->
+<var name="JDSH_Run2_FrtCoverRg_Iron_Radthick" value=" 1. " /> <!-- atujd___0010-v0 -->
+<var name="JDSH_Run2_FrtCoverRg_Iron_TotRadtk" value=" 25. " /> <!-- atujd___0010-v0 -->
+<var name="JDSH_Run2_FrtZposition" value=" 47.9" /> <!-- presentation above says 53. however adjusted to calo in sim -->
+
+<tubs name="JDSH_Run2_FrtLeadRing" material="Lead" Rio_Z=" JDSH_Run2_FrtInnRing_Poly_outerRad+GENV_Eps ; JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick ; JDSH_Run2_FrtOutRing_Lead_Zwidth" />
+<tubs name="JDSH_Run2_FrtPolyRing" material="PolyBoron207HD5" Rio_Z=" JDSH_Run2_FrtInnRing_Poly_innerRad ; JDSH_Run2_FrtInnRing_Poly_outerRad ; JDSH_Run2_FrtInnRing_Poly_Zwidth" />
+<pcon name="JDSH_Run2_FrtIronRingCover" material="ShieldIron" >
+ <polyplane Rio_Z="JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+JDSH_Run2_FrtCoverRg_Iron_Radthick+GENV_Eps-JDSH_Run2_FrtCoverRg_Iron_TotRadtk; JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+JDSH_Run2_FrtCoverRg_Iron_Radthick+GENV_Eps; 0." />
+ <polyplane Rio_Z="JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+JDSH_Run2_FrtCoverRg_Iron_Radthick+GENV_Eps-JDSH_Run2_FrtCoverRg_Iron_TotRadtk; JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+JDSH_Run2_FrtCoverRg_Iron_Radthick+GENV_Eps; -JDSH_Run2_FrtCoverRg_Iron_Radthick + GENV_Eps" />
+ <polyplane Rio_Z="JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+GENV_Eps; JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+JDSH_Run2_FrtCoverRg_Iron_Radthick+GENV_Eps; - JDSH_Run2_FrtCoverRg_Iron_Radthick + GENV_Eps" />
+ <polyplane Rio_Z="JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+GENV_Eps; JDSH_Run2_FrtInnRing_Poly_outerRad+JDSH_Run2_FrtOutRing_Lead_Radthick+JDSH_Run2_FrtCoverRg_Iron_Radthick+GENV_Eps; -JDSH_Run2_FrtOutRing_Lead_Zwidth - JDSH_Run2_FrtCoverRg_Iron_Radthick" />
+</pcon>
+
+<var name="JDSH_Run2_BckBckRing_Poly_innerRad" value=" 532.5" /> <!-- atujd___0023-v0 -->
+<var name="JDSH_Run2_BckBckRing_Poly_outerRad" value=" 582.5" /> <!-- atujd___0023-v0 -->
+<var name="JDSH_Run2_BckBckRing_Poly_Zwidth" value=" 200. " /> <!-- atujd___0023-v0 , 8*25 see presentation -->
+
+<var name="JDSH_Run2_BckFrtRing_Poly_innerRad" value=" 532.5" /> <!-- atujd___0022-v0 -->
+<var name="JDSH_Run2_BckFrtRing_Poly_outerRad" value=" 800. " /> <!-- atujd___0022-v0 -->
+<var name="JDSH_Run2_BckFrtRing_Poly_Zwidth" value=" 40. " /> <!-- sum atujd___0022-v0 and atujd___0021-v0 -->
+
+<tubs name="JDSH_Run2_BckBckRing" material="PolyBoron207HD5" Rio_Z=" JDSH_Run2_BckBckRing_Poly_innerRad ; JDSH_Run2_BckBckRing_Poly_outerRad ; JDSH_Run2_BckBckRing_Poly_Zwidth" />
+<tubs name="JDSH_Run2_BckFrtRing" material="PolyBoron207HD5" Rio_Z=" JDSH_Run2_BckFrtRing_Poly_innerRad ; JDSH_Run2_BckFrtRing_Poly_outerRad ; JDSH_Run2_BckFrtRing_Poly_Zwidth" />
+
+<!-- name = JD Return Ring section name = "Shielding" -->
+
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- JD Return Ring -->
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<!-- BEGIN confirmation with atljd___0146-vAA (if no other comment) -->
+<var name="JDReturnH" value="220. " />
+<var name="JDReturnL" value="385. " />
+<var name="JDReturnW" value=" 25. " />
+<var name="JDReturnT" value="680. " />
+<var name="JDReturnS" value="604.5" />
+<var name="JDReturnD" value="310. " />
+<!-- END confirmation with atljd___0146-vAA -->
+<var name="JDReturnO" value="114. " /> <!-- confirmed atljd___0147-vAA -->
+
+
+<box name="JDReturnTra" material="ShieldIron" X_Y_Z="JDReturnL;2.*JDReturnW;JDReturnH" />
+<trd name="JDReturntop" material="ShieldIron" Xmp_Ymp_Z="JDReturnT ; JDReturnS ; JDReturnW ; JDReturnW ; JDReturnL " />
+<box name="JDReturnSubBox" material="ShieldIron" X_Y_Z="JDReturnT;JDReturnT; JDReturnT" />
+
+<composition name="JDReturnR1">
+ <posXYZ volume="JDReturnTra" X_Y_Z=" JDReturnD/2.;Zero;Zero " rot=" 0.; 90; 90"/>
+ <posXYZ volume="JDReturnTra" X_Y_Z="-JDReturnD/2.;Zero;Zero " rot=" 0.; 90; 90"/>
+</composition>
+<composition name="JDReturnRing1">
+ <posXYZ volume="JDReturntop" X_Y_Z="Zero; JDReturnH/2.+JDReturnW/2.;Zero" rot=" 0.;270.; 0." />
+ <posXYZ volume="JDReturntop" X_Y_Z="Zero;-JDReturnH/2.-JDReturnW/2.;Zero" rot=" 0.;270.; 0." />
+ <posXYZ volume="JDReturnR1" X_Y_Z="Zero;Zero;Zero" rot=" 0.; 270.;0."/>
+</composition>
+<composition name="JDReturnRing0">
+ <posXYZ volume="JDReturnRing1" X_Y_Z="JDSH_BDRRouRa_RetrunRing_outerRadius-JDReturnL/2. ; 0 ; -(JDReturnH+2.*JDReturnW)/2. " rot=" 90.; 0.; 0."/>
+</composition>
+
+<subtraction name="JDReturntopS" >
+ <posXYZ volume="JDReturntop" X_Y_Z="0 ; 0. ; 0" rot=" 0. ; 0. ; 0. " />
+ <posXYZ volume="JDReturnSubBox" X_Y_Z="JDReturnT*(GENV_Si225+GENV_Co225)/2.-JDReturnT/2.+JDReturnO ; 0. ; JDReturnT*(-GENV_Si225+GENV_Co225)/2.+JDReturnL/2. " rot=" 0. ; 22.5 ; 0. " />
+</subtraction>
+<subtraction name="JDReturnR1S1">
+ <posXYZ volume="JDReturnTra" X_Y_Z="JDReturnD/2.;Zero; Zero" rot=" 0.; 90; 90."/>
+ <posXYZ volume="JDReturnSubBox" X_Y_Z="JDReturnT*(GENV_Si225+GENV_Co225)/2.-JDReturnT/2.+JDReturnO ; 0. ; JDReturnT*(-GENV_Si225+GENV_Co225)/2.+JDReturnL/2. " rot=" 0. ; 22.5 ; 0. " />
+</subtraction>
+<subtraction name="JDReturnR1S2">
+ <posXYZ volume="JDReturnTra" X_Y_Z="-JDReturnD/2.;Zero; Zero" rot=" 0.; 90; 90."/>
+ <posXYZ volume="JDReturnSubBox" X_Y_Z="JDReturnT*(GENV_Si225+GENV_Co225)/2.-JDReturnT/2.+JDReturnO ; 0. ; JDReturnT*(-GENV_Si225+GENV_Co225)/2.+JDReturnL/2. " rot=" 0. ; 22.5 ; 0. " />
+</subtraction>
+<composition name="JDReturnRing1S">
+ <posXYZ volume="JDReturntopS" X_Y_Z="Zero; JDReturnH/2.+JDReturnW/2.;Zero" rot=" 0.;270.; 0."/>
+ <posXYZ volume="JDReturntopS" X_Y_Z="Zero;-JDReturnH/2.-JDReturnW/2.;Zero" rot=" 0.;270.; 0."/>
+ <posXYZ volume="JDReturnR1S1" X_Y_Z="Zero;Zero;Zero" rot=" 0.;270.; 0."/>
+ <posXYZ volume="JDReturnR1S2" X_Y_Z="Zero;Zero;Zero" rot=" 0.;270.; 0."/>
+</composition>
+<composition name="JDReturnRing0S">
+ <posXYZ volume="JDReturnRing1S" X_Y_Z="JDSH_BDRRouRa_RetrunRing_outerRadius-JDReturnL/2. ; 0 ; -(JDReturnH+2.*JDReturnW)/2. " rot=" 90.; 0.; 0."/>
+</composition>
+
+<composition name="JDReturnRing">
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 0. "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 11.25"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 22.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 33.75"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="JDReturnRing0S" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 67.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 78.75"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 90. "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 101.25"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 112.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 123.75"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 135. "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 146.25"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 157.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 168.75"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 180. "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 191.25"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 202.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 213.75"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 225. "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 236.25"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 247.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 258.75"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 270. "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 281.25"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 292.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 303.75"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 315. "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 326.25"/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 337.5 "/>
+ <posXYZ volume="JDReturnRing0" X_Y_Z=" 0.; 0.;0" rot=" 0.; 0.; 348.75"/>
+</composition>
+
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- JD Shield Composition of volumes -->
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<composition name="JDSH_ShieldAssembly_ASide_Base" >
+ <posXYZ volume="JDSH_FrontDisk" X_Y_Z="0.;0.;JDSH_FDzposit_FrontDisk_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_BackDisk" X_Y_Z="0.;0.;JDSH_BDzposit_BackDisk_Z" rot="0.;180.;0." />
+ <posXYZ volume="JDSH_Tube" X_Y_Z="0.;0.;JDSH_TUBEzpos_Tube_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_Plug" X_Y_Z="0.;0.;JDSH_PLUGzpos_Plug_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDReturnRing" X_Y_Z="0.;0.;JDSH_BDzposit_BackDisk_Z-JDSH_BDthickn_BackDisk_thickness/2.-2.*JDReturnW-JDReturnH" rot="0.;180.;0." />
+ <posXYZ volume="JDSH_MainRib_Support_Left" X_Y_Z=" -JDSH_MainRib_Support_PosX ; JDSH_MainRibFeet_PosY-JDSH_MaRiTPthi_MainRibTP_thickness ; JDSH_CAzposit_ConeAssembly_Z+JDSH_MainRib_Support_PosZoffset " />
+ <posXYZ volume="JDSH_MainRib_Support_Right" X_Y_Z=" JDSH_MainRib_Support_PosX ; JDSH_MainRibFeet_PosY-JDSH_MaRiTPthi_MainRibTP_thickness ; JDSH_CAzposit_ConeAssembly_Z+JDSH_MainRib_Support_PosZoffset " />
+</composition>
+
+<composition name="JDSH_ShieldAssembly_ASide_2011" >
+ <posXYZ volume="JDSH_MainRib_Left" X_Y_Z=" -JDSH_MainRibFeet_PosX ; JDSH_MainRibFeet_PosY ; JDSH_CAzposit_ConeAssembly_Z " />
+ <posXYZ volume="JDSH_MainRib_Right" X_Y_Z=" JDSH_MainRibFeet_PosX ; JDSH_MainRibFeet_PosY ; JDSH_CAzposit_ConeAssembly_Z " />
+ <posXYZ volume="JDSH_ConeAssembly" X_Y_Z="0.;0.;JDSH_CAzposit_ConeAssembly_Z" />
+ <posXYZ volume="JDSH_SmallWheelHub" X_Y_Z="0.;0.;JDSH_SWHzposi_SmallWheelHub_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_SmallWheelHubPoly" X_Y_Z="0.;0.;JDSH_SWHzposi_SmallWheelHub_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_SmallWheelHubLead" X_Y_Z="0.;0.;JDSH_SWHzposi_SmallWheelHub_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_ShieldAssembly_ASide_Base" X_Y_Z="0.;0.; 0." />
+</composition>
+
+<composition name="JDSH_ShieldAssembly_ASide_2012" >
+ <posXYZ volume="JDSH_AddShield_Lead" X_Y_Z="0.;0.; - JDSH_AddShield_Zwidth/2. - GENV_Eps" />
+ <posXYZ volume="JDSH_AddShield_Poly" X_Y_Z="0.;0.; - JDSH_AddShield_Zwidth/2. - GENV_Eps" />
+ <posXYZ volume="JDSH_AddShield_Iron" X_Y_Z="0.;0.; - JDSH_AddShield_Zwidth/2. - GENV_Eps" />
+ <posXYZ volume="JDSH_ShieldAssembly_ASide_2011" X_Y_Z="0.;0.; 0." />
+</composition>
+
+<composition name="JDSH_ShieldAssembly_ASide" >
+ <posXYZ volume="JDSH_Run2_BckFrtRing" X_Y_Z="0.; 0.; JDSH_SWHzposi_SmallWheelHub_Z + JDSH_SWHlengt_SmallWheelHub_length + JDSH_Run2_BckFrtRing_Poly_Zwidth/2. + GENV_Eps" />
+ <posXYZ volume="JDSH_Run2_BckBckRing" X_Y_Z="0.; 0.; JDSH_SWHzposi_SmallWheelHub_Z + JDSH_SWHlengt_SmallWheelHub_length + JDSH_Run2_BckFrtRing_Poly_Zwidth + JDSH_Run2_BckBckRing_Poly_Zwidth/2. + 2.*GENV_Eps" />
+ <posXYZ volume="JDSH_Run2_FrtIronRingCover" X_Y_Z="0.;0.; -JDSH_Run2_FrtZposition+JDSH_Run2_FrtOutRing_Lead_Zwidth + 2.*JDSH_Run2_FrtCoverRg_Iron_Radthick" />
+ <posXYZ volume="JDSH_Run2_FrtPolyRing" X_Y_Z="0.;0.; -JDSH_Run2_FrtZposition+JDSH_Run2_FrtInnRing_Poly_Zwidth/2." />
+ <posXYZ volume="JDSH_Run2_FrtLeadRing" X_Y_Z="0.;0.; -JDSH_Run2_FrtZposition-JDSH_Run2_FrtOutRing_Lead_Zwidth/2.+JDSH_Run2_FrtInnRing_Poly_Zwidth" />
+ <posXYZ volume="JDSH_ShieldAssembly_ASide_2012" X_Y_Z="0.;0.; 0." />
+</composition>
+
+<composition name="JDSH_ShieldAssembly_CSide_Base" >
+ <posXYZ volume="JDSH_FrontDisk" X_Y_Z="0.;0.;JDSH_FDzposit_FrontDisk_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_BackDisk" X_Y_Z="0.;0.;JDSH_BDzposit_BackDisk_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_Tube" X_Y_Z="0.;0.;JDSH_TUBEzpos_Tube_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_Plug" X_Y_Z="0.;0.;JDSH_PLUGzpos_Plug_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDReturnRing" X_Y_Z="0.;0.;JDSH_BDzposit_BackDisk_Z-JDSH_BDthickn_BackDisk_thickness/2." rot="0.;0.;0." />
+ <posXYZ volume="JDSH_MainRib_Support_Left" X_Y_Z=" -JDSH_MainRib_Support_PosX ; JDSH_MainRibFeet_PosY-JDSH_MaRiTPthi_MainRibTP_thickness ; JDSH_CAzposit_ConeAssembly_Z+JDSH_MainRib_Support_PosZoffset " />
+ <posXYZ volume="JDSH_MainRib_Support_Right" X_Y_Z=" JDSH_MainRib_Support_PosX ; JDSH_MainRibFeet_PosY-JDSH_MaRiTPthi_MainRibTP_thickness ; JDSH_CAzposit_ConeAssembly_Z+JDSH_MainRib_Support_PosZoffset " />
+</composition>
+
+<composition name="JDSH_ShieldAssembly_CSide_2011" >
+ <posXYZ volume="JDSH_MainRib_Left" X_Y_Z=" -JDSH_MainRibFeet_PosX ; JDSH_MainRibFeet_PosY ; JDSH_CAzposit_ConeAssembly_Z " />
+ <posXYZ volume="JDSH_MainRib_Right" X_Y_Z=" JDSH_MainRibFeet_PosX ; JDSH_MainRibFeet_PosY ; JDSH_CAzposit_ConeAssembly_Z " />
+ <posXYZ volume="JDSH_ConeAssembly" X_Y_Z="0.;0.;JDSH_CAzposit_ConeAssembly_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_SmallWheelHub" X_Y_Z="0.;0.;JDSH_SWHzposi_SmallWheelHub_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_SmallWheelHubPoly" X_Y_Z="0.;0.;JDSH_SWHzposi_SmallWheelHub_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_SmallWheelHubLead" X_Y_Z="0.;0.;JDSH_SWHzposi_SmallWheelHub_Z" rot="0.;0.;0." />
+ <posXYZ volume="JDSH_ShieldAssembly_CSide_Base" X_Y_Z="0.;0.; 0." />
+</composition>
+
+<composition name="JDSH_ShieldAssembly_CSide_2012" >
+ <posXYZ volume="JDSH_AddShield_Lead" X_Y_Z="0.;0.; - JDSH_AddShield_Zwidth/2. - GENV_Eps" />
+ <posXYZ volume="JDSH_AddShield_Poly" X_Y_Z="0.;0.; - JDSH_AddShield_Zwidth/2. - GENV_Eps" />
+ <posXYZ volume="JDSH_AddShield_Iron" X_Y_Z="0.;0.; - JDSH_AddShield_Zwidth/2. - GENV_Eps" />
+ <posXYZ volume="JDSH_ShieldAssembly_CSide_2011" X_Y_Z="0.;0.; 0." />
+</composition>
+
+<composition name="JDSH_ShieldAssembly_CSide" >
+ <posXYZ volume="JDSH_Run2_BckFrtRing" X_Y_Z="0.; 0.; JDSH_SWHzposi_SmallWheelHub_Z + JDSH_SWHlengt_SmallWheelHub_length + JDSH_Run2_BckFrtRing_Poly_Zwidth/2. + GENV_Eps" />
+ <posXYZ volume="JDSH_Run2_BckBckRing" X_Y_Z="0.; 0.; JDSH_SWHzposi_SmallWheelHub_Z + JDSH_SWHlengt_SmallWheelHub_length + JDSH_Run2_BckFrtRing_Poly_Zwidth + JDSH_Run2_BckBckRing_Poly_Zwidth/2. + 2.*GENV_Eps" />
+ <posXYZ volume="JDSH_Run2_FrtIronRingCover" X_Y_Z="0.;0.; -JDSH_Run2_FrtZposition+JDSH_Run2_FrtOutRing_Lead_Zwidth + 2.*JDSH_Run2_FrtCoverRg_Iron_Radthick" />
+ <posXYZ volume="JDSH_Run2_FrtPolyRing" X_Y_Z="0.;0.; -JDSH_Run2_FrtZposition+JDSH_Run2_FrtInnRing_Poly_Zwidth/2." />
+ <posXYZ volume="JDSH_Run2_FrtLeadRing" X_Y_Z="0.;0.; -JDSH_Run2_FrtZposition-JDSH_Run2_FrtOutRing_Lead_Zwidth/2.+JDSH_Run2_FrtInnRing_Poly_Zwidth" />
+ <posXYZ volume="JDSH_ShieldAssembly_CSide_2012" X_Y_Z="0.;0.; 0." />
+</composition>
+
+<composition name="JDSH_Shield" >
+ <posXYZ volume="JDSH_ShieldAssembly_CSide" X_Y_Z="0.;0.;-JDSH_NomiZpos_Nominal_zpos" rot="0.;JDSH_rota180d_180degRotation;0." />
+</composition>
+
+<!-- name = JT Toroid Shielding section name = "Shielding" -->
+<!-- Primary variables -->
+<var name="JTSH_OPlength_OuterPlugs_length" value=" 4736. " /> <!-- confirmed atljt___0055-vAC -->
+<!-- BEGIN confirmation with atljt___0059-vAB (if no other comment) -->
+<var name="JTSH_OPinnRad_OuterPlugs_innerRadius" value=" 600. " />
+<var name="JTSH_OPinnRad_OuterPlugs_innerRadiusSmall" value=" 562.5" /> <!-- confirmed atljt___0056-vAC -->
+<var name="JTSH_OPoutRad_OuterPlugs_outerRadius" value=" 802. " />
+<var name="JTSH_IPlength_InnerPlugs_length" value=" 3686. " /> <!-- confirmed atljt___0055-vAC -->
+<var name="JTSH_IPinnRa1_InnerPlugs_innerRadius1" value=" 170.8" />
+<var name="JTSH_IPtiltAn_InnerPlugs_tiltAngle" value=" 1.1" />
+<var name="JTSH_IPzoffse_InnerPlugs_zoffset" value=" 1000. " />
+<var name="JTSH_PRlenoff_PolyRings_lengthoffset" value=" 67. " /> <!-- confirmed atljt___0055-vAC -->
+<!-- END confirmation with atljt___0059-vAB -->
+<!-- BEGIN confirmation with atljt___0052-vAA (if no other comment) -->
+<var name="JTSH_PRinnRad_PolyRings_innerRadius" value=" 802. " />
+<var name="JTSH_PRinRaof_PolyRings_innerRadoff" value=" 15. " />
+<var name="JTSH_PRoutRad_PolyRings_outerRadius" value=" 857. " />
+<var name="JTSH_PRexttAn_PolyRings_extension_tiltAngle" value=" 18. " />
+<!-- END confirmation with atljt___0052-vAA -->
+<var name="JTSH_PRipexle_PolyRings_IPextension_length" value=" 205. " /> <!-- confirmed atljt___0059-vAB -->
+<var name="JTSH_zpositio_Shield_Z" value=" 7917. " /> <!-- atljt___0055-vAC says 7941. , TC says wrong by 3cm -->
+<var name="JTSH_yrotatio_Shield_rotY" value=" 180. " /> <!-- NO CONFIRMATION NEEDED -->
+
+<var name="JTSH_IPinnRa2_InnerPlugs_innerRadius2" value="JTSH_IPinnRa1_InnerPlugs_innerRadius1 + JTSH_IPlength_InnerPlugs_length *tan(JTSH_IPtiltAn_InnerPlugs_tiltAngle*GENV_PiS180)"/> <!-- changed by Sven.Menke@CERN.CH Jul 2020 from JTSH_OPlength_OuterPlugs_length to JTSH_IPlength_InnerPlugs_length -->
+<var name="JTSH_PRextzpo_PolyRings_extension_z" value="(JTSH_PRoutRad_PolyRings_outerRadius-JTSH_PRinnRad_PolyRings_innerRadius-JTSH_PRinRaof_PolyRings_innerRadoff)/tan(JTSH_PRexttAn_PolyRings_extension_tiltAngle*GENV_PiS180)"/>
+
+<var name="JTSH_OPzposi1_OuterPlugs_z1" value="JTSH_PRipexle_PolyRings_IPextension_length" />
+<var name="JTSH_OPzposi2_OuterPlugs_z2" value="JTSH_OPzposi1_OuterPlugs_z1+JTSH_OPlength_OuterPlugs_length" />
+
+<var name="JTSH_IPzposi1_InnerPlugs_z1" value="JTSH_IPzoffse_InnerPlugs_zoffset" />
+<var name="JTSH_IPzposi2_InnerPlugs_z2" value="JTSH_IPzposi1_InnerPlugs_z1+JTSH_IPlength_InnerPlugs_length" />
+
+<var name="JTSH_PRzposi1_PolyRings_z1" value="JTSH_OPzposi2_OuterPlugs_z2-JTSH_OPlength_OuterPlugs_length+JTSH_PRlenoff_PolyRings_lengthoffset" />
+<var name="JTSH_PRzposi2_PolyRings_z2" value="JTSH_OPzposi2_OuterPlugs_z2-JTSH_OPlength_OuterPlugs_length+JTSH_PRlenoff_PolyRings_lengthoffset+JTSH_PRextzpo_PolyRings_extension_z" />
+<var name="JTSH_PRzposi3_PolyRings_z3" value="JTSH_OPzposi2_OuterPlugs_z2" />
+
+<!-- Modelization of JT Plugs (outer and inner combined) -->
+<pcon name="JTSH_Plugs" material="ShieldIron" >
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadius;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_OPzposi1_OuterPlugs_z1" />
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadius;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi1_InnerPlugs_z1" />
+ <polyplane Rio_Z="JTSH_IPinnRa1_InnerPlugs_innerRadius1;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi1_InnerPlugs_z1" />
+ <polyplane Rio_Z="JTSH_IPinnRa2_InnerPlugs_innerRadius2;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi2_InnerPlugs_z2" />
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadiusSmall;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi2_InnerPlugs_z2" />
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadiusSmall;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_OPzposi2_OuterPlugs_z2" />
+</pcon>
+
+<pcon name="JTSH_PolyRings" material="PolyBoronB2O3" >
+ <polyplane Rio_Z="JTSH_PRinnRad_PolyRings_innerRadius;JTSH_PRinnRad_PolyRings_innerRadius+JTSH_PRinRaof_PolyRings_innerRadoff;JTSH_PRzposi1_PolyRings_z1" />
+ <polyplane Rio_Z="JTSH_PRinnRad_PolyRings_innerRadius;JTSH_PRoutRad_PolyRings_outerRadius;JTSH_PRzposi2_PolyRings_z2" />
+ <polyplane Rio_Z="JTSH_PRinnRad_PolyRings_innerRadius;JTSH_PRoutRad_PolyRings_outerRadius;JTSH_PRzposi3_PolyRings_z3" />
+</pcon>
+
+<!-- **************************************************************
+ *** Installed for Run2 ****
+ ************************************************************** -->
+
+<var name="JTC_JTCC_JTCCommonAngle" value=" 66. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomRadYOffset" value=" 177. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomCenterCutX" value=" 300. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomCenterCutY" value="JTC_JTCB_JTCBottomCenterCutX" /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomSideCutY" value=" 400. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomBigRad" value=" 1500. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomBigX" value=" 1220. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomBigZ" value=" 25. + 13. " /> <!-- atujt___0020-v0 , adjustments discussed with TC-->
+<var name="JTC_JTCB_JTCBottomSmallRad" value=" 864.9" /> <!-- atujt___0022-v0 says 865. but overlaps with ECT_EV_CentralTube -->
+<var name="JTC_JTCB_JTCBottomSmallX" value=" 610. " /> <!-- atujt___0022-v0 -->
+<var name="JTC_JTCB_JTCBottomSmallZ" value=" 36. - 13. " /> <!-- atujt___0022-v0 , TC says distance to JF is 4cm, it's mounted on ECT -->
+
+<var name="JTC_JTCT_JTCTopInnerRad" value=" 522.5" /> <!-- atujt___0018-v0 -->
+<var name="JTC_JTCT_JTCTopMediumRad" value=" 1050. " /> <!-- atujt___0029-v0 -->
+<var name="JTC_JTCT_JTCTopOuterRad" value=" 1500. " /> <!-- atujt___0018-v0 -->
+<var name="JTC_JTCT_JTCTopFullZ" value=" 65. + 10. " /> <!-- atujt___0018-v0 , adding 1cm to close gap to ECT, agreed with TC -->
+<var name="JTC_JTCT_JTCTopThickZ" value=" 45. + 5. " /> <!-- atujt___0018-v0 , adding 5mm just to be a bit closer, agreed with TC-->
+<var name="JTC_JTCT_JTCTopCenterXCut" value=" 374. " /> <!-- atujt___0026-v0 -->
+<var name="JTC_JTCT_JTCTopSideCutY" value=" 395. " /> <!-- atujt___0026-v0 -->
+<var name="JTC_JTCT_JTCTopRadYOff" value=" 161. " /> <!-- atujt___0026-v0 -->
+
+<var name="JTC_JTCB_BottomTiltedXOffset" value="tan(JTC_JTCC_JTCCommonAngle*GENV_PiS180)*(JTC_JTCB_JTCBottomSideCutY-JTC_JTCB_JTCBottomRadYOffset)"/>
+<var name="JTC_JTCT_TopTiltedXOffset" value="tan(JTC_JTCC_JTCCommonAngle*GENV_PiS180)*(JTC_JTCT_JTCTopSideCutY-JTC_JTCT_JTCTopRadYOff)"/>
+
+<tubs name="JTC_JTCB_BottomBigTubeBase" material="PolyBoron207HD5" Rio_Z=" 0.; JTC_JTCB_JTCBottomBigRad; JTC_JTCB_JTCBottomBigZ" nbPhi="20" profile="180.; 180."/>
+<tubs name="JTC_JTCB_BottomSmallTubeBase" material="PolyBoron207HD5" Rio_Z=" 0.; JTC_JTCB_JTCBottomSmallRad; JTC_JTCB_JTCBottomSmallZ" nbPhi="20" profile="180.; 180."/>
+<tubs name="JTC_JTCB_BottomAuxCutTube" material="PolyBoron207HD5" Rio_Z=" 0.; JFSH_PLUGouRa_Plug_outerRadius+GENV_Eps; JTC_JTCT_JTCTopFullZ" />
+
+<!-- not required since approximations in JFSH
+box name="JTC_JTCB_BottomCentralCut" material="PolyBoron207HD5" X_Y_Z=" 2.*(JTC_JTCB_JTCBottomCenterCutX+GENV_Eps); JTC_JTCB_JTCBottomCenterCutY+2.*GENV_Eps; JTC_JTCB_JTCBottomBigZ+2.*GENV_Eps"/>
+-->
+<box name="JTC_JTCB_SideCut" material="PolyBoron207HD5" X_Y_Z=" 2.*JTC_JTCB_JTCBottomCenterCutX; JTC_JTCB_JTCBottomSideCutY+2.*GENV_Eps; JTC_JTCB_JTCBottomBigZ+4.*GENV_Eps"/>
+<box name="JTC_JTCB_EndCut" material="PolyBoron207HD5" X_Y_Z=" JTC_JTCB_JTCBottomBigX; JTC_JTCB_JTCBottomBigRad+2.*GENV_Eps; JTC_JTCB_JTCBottomBigZ+6.*GENV_Eps"/>
+<box name="JTC_JTCB_TiltCut" material="PolyBoron207HD5" X_Y_Z=" JTC_JTCB_JTCBottomBigRad; JTC_JTCB_JTCBottomBigRad; JTC_JTCT_JTCTopFullZ+8.*GENV_Eps"/>
+
+<subtraction name="JTC_JTCB_BottomBigTube">
+ <posXYZ volume="JTC_JTCB_BottomBigTubeBase" X_Y_Z=" 0.; 0.; 0. " />
+ <posXYZ volume="JTC_JTCB_BottomAuxCutTube" X_Y_Z=" 0.; 0.; 0. " />
+<!-- <posXYZ volume="JTC_JTCB_BottomCentralCut" X_Y_Z=" 0.; -JTC_JTCB_JTCBottomCenterCutY/2.+GENV_Eps; 0." /> -->
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" 2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" -2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" 1.5*JTC_JTCB_JTCBottomBigX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" -1.5*JTC_JTCB_JTCBottomBigX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" -JTC_JTCB_BottomTiltedXOffset-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; 90.-JTC_JTCC_JTCCommonAngle"/>
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" JTC_JTCB_BottomTiltedXOffset+cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; -90.+JTC_JTCC_JTCCommonAngle"/>
+</subtraction>
+
+<subtraction name="JTC_JTCB_BottomSmallTube">
+ <posXYZ volume="JTC_JTCB_BottomSmallTubeBase" X_Y_Z=" 0.; 0.; 0. " />
+ <posXYZ volume="JTC_JTCB_BottomAuxCutTube" X_Y_Z=" 0.; 0.; 0. " />
+<!-- <posXYZ volume="JTC_JTCB_BottomCentralCut" X_Y_Z=" 0.; -JTC_JTCB_JTCBottomCenterCutY/2.+GENV_Eps; 0." /> -->
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" 2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" -2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" 0.5*JTC_JTCB_JTCBottomBigX+JTC_JTCB_JTCBottomSmallX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" -0.5*JTC_JTCB_JTCBottomBigX-JTC_JTCB_JTCBottomSmallX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" -JTC_JTCB_BottomTiltedXOffset-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; 90.-JTC_JTCC_JTCCommonAngle"/>
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" JTC_JTCB_BottomTiltedXOffset+cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; -90.+JTC_JTCC_JTCCommonAngle"/>
+</subtraction>
+
+<tubs name="JTC_JTCT_TopTubeBase" material="PolyBoron207HD5" Rio_Z=" JTC_JTCT_JTCTopInnerRad; JTC_JTCT_JTCTopOuterRad; JTC_JTCT_JTCTopFullZ" nbPhi="25" />
+<tubs name="JTC_JTCT_TopCutTube" material="PolyBoron207HD5" Rio_Z=" 0.; JTC_JTCT_JTCTopMediumRad; JTC_JTCT_JTCTopFullZ-JTC_JTCT_JTCTopThickZ+GENV_Eps" nbPhi="25"/>
+
+<box name="JTC_JTCT_TopCentralCut" material="PolyBoron207HD5" X_Y_Z=" 2.*JTC_JTCT_JTCTopCenterXCut; JTC_JTCT_JTCTopOuterRad+2.*GENV_Eps; JTC_JTCT_JTCTopFullZ+4.*GENV_Eps"/>
+<box name="JTC_JTCT_SideCut" material="PolyBoron207HD5" X_Y_Z=" 2.*JTC_JTCT_TopTiltedXOffset; JTC_JTCT_JTCTopOuterRad; JTC_JTCT_JTCTopFullZ+6.*GENV_Eps"/>
+
+<subtraction name="JTC_JTCT_TopTube">
+ <posXYZ volume="JTC_JTCT_TopTubeBase" X_Y_Z=" 0.; 0.; 0. " />
+ <posXYZ volume="JTC_JTCT_TopCutTube" X_Y_Z=" 0.; 0.; JTC_JTCT_JTCTopThickZ/2.+GENV_Eps" />
+ <posXYZ volume="JTC_JTCT_TopCentralCut" X_Y_Z=" 0.; -JTC_JTCT_JTCTopOuterRad/2.-GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCT_SideCut" X_Y_Z=" 0.; -JTC_JTCT_JTCTopOuterRad/2.-JTC_JTCT_JTCTopSideCutY; 0." />
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" JTC_JTCT_TopTiltedXOffset+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCT_JTCTopSideCutY-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; JTC_JTCC_JTCCommonAngle"/>
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" -JTC_JTCT_TopTiltedXOffset-sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCT_JTCTopSideCutY-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; -JTC_JTCC_JTCCommonAngle"/>
+</subtraction>
+
+<!-- Composition of JT Shields -->
+<composition name="JTSH_ShieldElements" >
+ <posXYZ volume="JTSH_Plugs" X_Y_Z="0.;0.;0." rot="0.;0.;0." />
+ <posXYZ volume="JTSH_PolyRings" X_Y_Z="0.;0.;0." rot="0.;0.;0." />
+</composition>
+
+<composition name="JTSH_Shield" >
+ <posXYZ volume="JTSH_ShieldElements" X_Y_Z="0.;0.; JTSH_zpositio_Shield_Z" rot="0.;0.;0." />
+ <posXYZ volume="JTSH_ShieldElements" X_Y_Z="0.;0.;-JTSH_zpositio_Shield_Z" rot="0.;JTSH_yrotatio_Shield_rotY;0." />
+ <posXYZ volume="JTC_JTCT_TopTube" X_Y_Z="0.;0.; JFSH_ECTnomiz_ECT_Nominal_zpos+JFSH_JFCMCzof_JFCMainCylinder_zoffset-JTC_JTCT_JTCTopFullZ/2.-GENV_Eps" rot="0.;JTSH_yrotatio_Shield_rotY;0." />
+ <posXYZ volume="JTC_JTCT_TopTube" X_Y_Z="0.;0.;-JFSH_ECTnomiz_ECT_Nominal_zpos-JFSH_JFCMCzof_JFCMainCylinder_zoffset+JTC_JTCT_JTCTopFullZ/2.+GENV_Eps" rot="0.;0.;0." />
+ <posXYZ volume="JTC_JTCB_BottomSmallTube" X_Y_Z="0.;0.;JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ/2.+GENV_Eps" />
+ <posXYZ volume="JTC_JTCB_BottomBigTube" X_Y_Z="0.;0.;JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ+JTC_JTCB_JTCBottomBigZ/2.+2.*GENV_Eps"/>
+ <posXYZ volume="JTC_JTCB_BottomSmallTube" X_Y_Z="0.;0.;-(JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ/2.+GENV_Eps)" />
+ <posXYZ volume="JTC_JTCB_BottomBigTube" X_Y_Z="0.;0.;-(JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ+JTC_JTCB_JTCBottomBigZ/2.+2.*GENV_Eps)"/>
+</composition>
+
+</section>
+
+
+<section name = "pp2"
+ version = "7.0"
+ date = "01-04-2010"
+ author = "new simplified pp2 by Jochen - old versions by Laurent, Andrea Dell'Acqua and Daniel Pomarede removed"
+ top_volume = "pp2">
+
+
+<!-- name = pp2 section name = "Services" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Services : ID Patch Panels PP2 ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+<!-- New Simplified PP2 - subboxes merged by Jochen Meyer-->
+
+<!-- variables for semi simplified boxes -->
+<!-- sector 13 - one -->
+<var name="IPP2_Sec13_Box1_z" value=" 520. " />
+<var name="IPP2_Sec13_Box1_x" value="1300. " />
+<var name="IPP2_Sec13_Box1_y" value=" 420. " />
+
+<var name="IPP2_Sec13_Box2_z" value="IPP2_Sec13_Box1_z" />
+<var name="IPP2_Sec13_Box2_x" value="IPP2_Sec13_Box1_x/2." />
+<var name="IPP2_Sec13_Box2_y" value=" 450. " />
+
+<!-- sector 13 - two -->
+<var name="IPP2_Sec13_Box3_z" value=" 380. " />
+<var name="IPP2_Sec13_Box3_x" value=" 420. " />
+<var name="IPP2_Sec13_Box3_y" value=" 440. " />
+
+<var name="IPP2_Sec13_Box4_z" value=" 700. " />
+<var name="IPP2_Sec13_Box4_x" value=" 400. " />
+<var name="IPP2_Sec13_Box4_y" value="IPP2_Sec13_Box3_y" />
+
+<var name="IPP2_Sec13_Box5_z" value=" 590. " />
+<var name="IPP2_Sec13_Box5_x" value=" 540. " />
+<var name="IPP2_Sec13_Box5_y" value=" 170. " />
+
+<var name="IPP2_Sec13_Box6_z" value=" 500. " />
+<var name="IPP2_Sec13_Box6_x" value=" 150. " />
+<var name="IPP2_Sec13_Box6_y" value=" 100. " />
+
+<var name="IPP2_Sec13_xspace" value=" 37.5" />
+
+<!-- sector 3 & 7 -->
+<var name="IPP2_Sec37_Box1_z" value=" 610. " />
+<var name="IPP2_Sec37_Box1_x" value=" 520. " />
+<var name="IPP2_Sec37_Box1_y" value=" 850. " />
+
+<var name="IPP2_Sec37_Box2_z" value=" 300. " />
+<var name="IPP2_Sec37_Box2_x" value="IPP2_Sec37_Box1_x" />
+<var name="IPP2_Sec37_Box2_y" value=" 420. " />
+
+<var name="IPP2_Sec37_Box3_z" value=" 300. " />
+<var name="IPP2_Sec37_Box3_x" value=" 260. " />
+<var name="IPP2_Sec37_Box3_y" value=" 360. " />
+
+<var name="IPP2_Sec37_Box4_z" value=" 360. " />
+<var name="IPP2_Sec37_Box4_x" value=" 560. " />
+<var name="IPP2_Sec37_Box4_y" value="IPP2_Sec37_Box3_y" />
+
+<var name="IPP2_Sec37_Box5_z" value=" 120. " />
+<var name="IPP2_Sec37_Box5_x" value=" 320. " />
+<var name="IPP2_Sec37_Box5_y" value=" 120. " />
+
+<var name="IPP2_Sec37_Box6_z" value=" 200. " />
+<var name="IPP2_Sec37_Box6_x" value=" 120. " />
+<var name="IPP2_Sec37_Box6_y" value=" 120. " />
+
+<var name="IPP2_Sec37_xoffset" value=" 40. " />
+
+<!-- sector 1 & 9 -->
+<var name="IPP2_Sec19_Box1_z" value=" 610. " />
+<var name="IPP2_Sec19_Box1_x" value=" 520. " />
+<var name="IPP2_Sec19_Box1_y" value="1260. " />
+
+<var name="IPP2_Sec19_Box2_z" value=" 300." />
+<var name="IPP2_Sec19_Box2_x" value=" 520." />
+<var name="IPP2_Sec19_Box2_y" value=" 850." />
+
+<var name="IPP2_Sec19_Box3_z" value=" 420." />
+<var name="IPP2_Sec19_Box3_x" value=" 380." />
+<var name="IPP2_Sec19_Box3_y" value=" 710." />
+
+<var name="IPP2_Sec19_Box4_z" value=" 400." />
+<var name="IPP2_Sec19_Box4_x" value=" 700." />
+<var name="IPP2_Sec19_Box4_y" value="IPP2_Sec19_Box3_y" />
+
+<var name="IPP2_Sec19_Box5_z" value=" 110." />
+<var name="IPP2_Sec19_Box5_x" value=" 400." />
+<var name="IPP2_Sec19_Box5_y" value=" 100." />
+
+<var name="IPP2_Sec19_Box2_yoffset" value=" 300." />
+<var name="IPP2_Sec19_xoffset" value="IPP2_Sec37_xoffset" />
+
+<!-- universal floor -->
+<var name="IPP2_UniFloor_x" value=" 900. "/>
+<var name="IPP2_UniFloor_y" value=" 15. "/>
+<var name="IPP2_UniFloor_z" value="1770. "/>
+
+<var name="IPP2_UniFl_Sec13Zshift" value=" 40. "/>
+
+<!-- coordinates -->
+<var name="IPP2_xpos19" value="+5880. "/>
+<var name="IPP2_ypos19" value="-1100. "/>
+<var name="IPP2_zpos19" value="+2560. "/>
+<var name="IPP2_xpos37" value="+4710. "/>
+<var name="IPP2_ypos37" value="+3340. "/>
+<var name="IPP2_zpos37" value="+2710. "/>
+<var name="IPP2_xpos13_one" value=" 650. "/>
+<var name="IPP2_ypos13_one" value="-6380. "/>
+<var name="IPP2_zpos13_one" value="+3820. "/>
+<var name="IPP2_xpos13_two" value=" +890. "/>
+<var name="IPP2_ypos13_two" value="-6380. "/>
+<var name="IPP2_zpos13_two" value="+2460. "/>
+
+<box name="IPP2_UniFloor" material="Aluminium4" X_Y_Z="IPP2_UniFloor_x; IPP2_UniFloor_y; IPP2_UniFloor_z" />
+
+<box name="IPP2_Sec13_Box1" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box1_x; IPP2_Sec13_Box1_y; IPP2_Sec13_Box1_z" />
+<box name="IPP2_Sec13_Box2" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box2_x; IPP2_Sec13_Box2_y; IPP2_Sec13_Box2_z" />
+<box name="IPP2_Sec13_Box3" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box3_x; IPP2_Sec13_Box3_y; IPP2_Sec13_Box3_z" />
+<box name="IPP2_Sec13_Box4" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box4_x; IPP2_Sec13_Box4_y; IPP2_Sec13_Box4_z" />
+<box name="IPP2_Sec13_Box5" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box5_x; IPP2_Sec13_Box5_y; IPP2_Sec13_Box5_z" />
+<box name="IPP2_Sec13_Box6" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box6_x; IPP2_Sec13_Box6_y; IPP2_Sec13_Box6_z" />
+
+<box name="IPP2_Sec37_Box1" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box1_x; IPP2_Sec37_Box1_y; IPP2_Sec37_Box1_z" />
+<box name="IPP2_Sec37_Box2" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box2_x; IPP2_Sec37_Box2_y; IPP2_Sec37_Box2_z" />
+<box name="IPP2_Sec37_Box3" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box3_x; IPP2_Sec37_Box3_y; IPP2_Sec37_Box3_z" />
+<box name="IPP2_Sec37_Box4" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box4_x; IPP2_Sec37_Box4_y; IPP2_Sec37_Box4_z" />
+<box name="IPP2_Sec37_Box5" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box5_x; IPP2_Sec37_Box5_y; IPP2_Sec37_Box5_z" />
+<box name="IPP2_Sec37_Box6" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box6_x; IPP2_Sec37_Box6_y; IPP2_Sec37_Box6_z" />
+
+<box name="IPP2_Sec19_Box1" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box1_x; IPP2_Sec19_Box1_y; IPP2_Sec19_Box1_z" />
+<box name="IPP2_Sec19_Box2" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box2_x; IPP2_Sec19_Box2_y; IPP2_Sec19_Box2_z" />
+<box name="IPP2_Sec19_Box3" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box3_x; IPP2_Sec19_Box3_y; IPP2_Sec19_Box3_z" />
+<box name="IPP2_Sec19_Box4" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box4_x; IPP2_Sec19_Box4_y; IPP2_Sec19_Box4_z" />
+<box name="IPP2_Sec19_Box5" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box5_x; IPP2_Sec19_Box5_y; IPP2_Sec19_Box5_z" />
+
+<composition name="IPP2_Sec13_single_one">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; IPP2_UniFl_Sec13Zshift" rot="0.; 90.; 0." />
+ <posXYZ volume="IPP2_Sec13_Box1" X_Y_Z="0.; IPP2_Sec13_Box1_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box2" X_Y_Z="0.; IPP2_Sec13_Box2_y/2. + IPP2_Sec13_Box1_y + 2.*GENV_Eps; 0." />
+</composition>
+
+<var name="IPP2_Sec13_length" value="(IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x + IPP2_Sec13_xspace)*2."/>
+
+<composition name="IPP2_Sec13_single_two_Cside">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; -IPP2_UniFl_Sec13Zshift" rot="0.; 90.; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z=" IPP2_Sec13_Box4_x + IPP2_Sec13_Box3_x/2. + IPP2_Sec13_xspace + GENV_Eps; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z=" IPP2_Sec13_Box4_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z="-IPP2_Sec13_Box3_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z="-IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x/2. - IPP2_Sec13_xspace - GENV_Eps; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box5" X_Y_Z=" IPP2_Sec13_Box5_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box5_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box5_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box6" X_Y_Z="-IPP2_Sec13_Box6_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box6_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box6_z - IPP2_Sec13_Box4_z)/2." />
+</composition>
+
+<composition name="IPP2_Sec13_single_two_Aside">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; -IPP2_UniFl_Sec13Zshift" rot="0.; 90.; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z=" IPP2_Sec13_Box4_x + IPP2_Sec13_Box3_x/2. + IPP2_Sec13_xspace + GENV_Eps; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z=" IPP2_Sec13_Box4_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z="-IPP2_Sec13_Box3_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z="-IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x/2. - IPP2_Sec13_xspace - GENV_Eps; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box5" X_Y_Z="-IPP2_Sec13_Box5_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box5_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box5_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box6" X_Y_Z=" IPP2_Sec13_Box6_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box6_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box6_z - IPP2_Sec13_Box4_z)/2." />
+</composition>
+
+<var name="IPP_Sec37_length" value="IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z + IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x"/>
+
+<composition name="IPP2_Sec37_single">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; 0." rot="0.; 0.; 0." />
+ <posXYZ volume="IPP2_Sec37_Box1" X_Y_Z="0.; IPP2_Sec37_Box1_y/2. + GENV_Eps; - IPP_Sec37_length/2. - 2.*GENV_Eps + IPP2_Sec37_Box1_z/2." />
+ <posXYZ volume="IPP2_Sec37_Box2" X_Y_Z="0.; IPP2_Sec37_Box2_y/2. + GENV_Eps; - IPP_Sec37_length/2. - GENV_Eps + IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z/2." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z="IPP2_Sec37_xoffset + (IPP2_Sec13_Box3_z-IPP2_Sec13_Box4_z)/2.; IPP2_Sec13_Box3_y/2. + GENV_Eps; IPP_Sec37_length/2. + 2.*GENV_Eps - IPP2_Sec13_Box3_x/2." rot="0.; 90.; 0."/>
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z="IPP2_Sec37_xoffset ; IPP2_Sec13_Box4_y/2. + GENV_Eps; IPP_Sec37_length/2. + GENV_Eps - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x/2." rot="0.; 90.; 0."/>
+ <posXYZ volume="IPP2_Sec37_Box3" X_Y_Z="IPP2_Sec37_xoffset + (-IPP2_Sec13_Box4_z + IPP2_Sec37_Box3_x)/2.; IPP2_Sec13_Box3_y + IPP2_Sec37_Box3_y/2. + 2.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z + IPP2_Sec37_Box3_z/2. + 2.*GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box4" X_Y_Z="IPP2_Sec37_xoffset + (-IPP2_Sec13_Box4_z + IPP2_Sec37_Box4_x)/2.; IPP2_Sec13_Box4_y + IPP2_Sec37_Box4_y/2. + 2.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box5" X_Y_Z="IPP2_Sec37_xoffset - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x + IPP2_Sec37_Box5_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec13_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z - IPP2_Sec37_Box5_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box6" X_Y_Z="IPP2_Sec37_xoffset - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec13_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z + IPP2_Sec37_Box6_z/2. + 2.*GENV_Eps" />
+</composition>
+
+<var name="IPP_Sec19_length" value="IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z + IPP2_Sec19_Box3_z + IPP2_Sec19_Box4_z"/>
+
+<composition name="IPP2_Sec19_single">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; 0." rot="0.; 0.; 0." />
+ <posXYZ volume="IPP2_Sec19_Box1" X_Y_Z="0.; IPP2_Sec19_Box1_y/2. + GENV_Eps; - IPP_Sec19_length/2. - 2.*GENV_Eps + IPP2_Sec19_Box1_z/2." />
+ <posXYZ volume="IPP2_Sec19_Box2" X_Y_Z="0.; IPP2_Sec19_Box2_y/2. + IPP2_Sec19_Box2_yoffset; - IPP_Sec19_length/2. - GENV_Eps + IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z/2." />
+ <posXYZ volume="IPP2_Sec19_Box3" X_Y_Z="IPP2_Sec19_xoffset + (IPP2_Sec19_Box3_x - IPP2_Sec19_Box4_x)/2.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box3_y/2. + 2.*GENV_Eps; IPP_Sec19_length/2. + 2.*GENV_Eps - IPP2_Sec19_Box3_z/2." />
+ <posXYZ volume="IPP2_Sec19_Box4" X_Y_Z="IPP2_Sec19_xoffset; IPP2_Sec37_Box3_y + IPP2_Sec19_Box4_y/2. + 2.*GENV_Eps; IPP_Sec19_length/2. + GENV_Eps - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z/2." />
+ <posXYZ volume="IPP2_Sec37_Box3" X_Y_Z="IPP2_Sec19_xoffset + (-IPP2_Sec19_Box4_x + IPP2_Sec37_Box3_x)/2.; IPP2_Sec37_Box3_y/2. + GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z + IPP2_Sec37_Box3_z/2. + 2.*GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box4" X_Y_Z="IPP2_Sec19_xoffset + (-IPP2_Sec19_Box4_x + IPP2_Sec37_Box4_x)/2.; IPP2_Sec37_Box4_y/2. + GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box5" X_Y_Z="IPP2_Sec19_xoffset - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x + IPP2_Sec37_Box5_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z - IPP2_Sec37_Box5_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box6" X_Y_Z="IPP2_Sec19_xoffset - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z + IPP2_Sec37_Box6_z/2. + 2.*GENV_Eps" />
+ <posXYZ volume="IPP2_Sec19_Box5" X_Y_Z="0.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box4_y + IPP2_Sec19_Box5_y/2. + 3.*GENV_Eps; 3.*IPP2_Sec19_Box5_z/2." />
+</composition>
+
+<composition name="pp2">
+ <posXYZ volume="IPP2_Sec13_single_one" X_Y_Z="IPP2_xpos13_one - IPP2_Sec13_Box1_x/2.; IPP2_ypos13_one; IPP2_zpos13_one + IPP2_Sec13_Box1_z/2."/>
+ <posXYZ volume="IPP2_Sec13_single_one" X_Y_Z="IPP2_xpos13_one - IPP2_Sec13_Box1_x/2.; IPP2_ypos13_one; -IPP2_zpos13_one - IPP2_Sec13_Box1_z/2." rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec13_single_two_Aside" X_Y_Z="IPP2_xpos13_two - IPP2_Sec13_length/2.; IPP2_ypos13_two; IPP2_zpos13_two + IPP2_Sec13_Box4_z/2."/>
+ <posXYZ volume="IPP2_Sec13_single_two_Cside" X_Y_Z="IPP2_xpos13_two - IPP2_Sec13_length/2.; IPP2_ypos13_two; -IPP2_zpos13_two - IPP2_Sec13_Box4_z/2." rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z=" IPP2_xpos37 + IPP2_Sec13_Box4_z/2. - IPP2_Sec37_xoffset; IPP2_ypos37; IPP2_zpos37 - IPP_Sec37_length/2. + IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z + IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x"/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z=" IPP2_xpos37 + IPP2_Sec13_Box4_z/2. - IPP2_Sec37_xoffset; IPP2_ypos37; -IPP2_zpos37 + IPP_Sec37_length/2. - IPP2_Sec37_Box1_z - IPP2_Sec37_Box2_z - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x"/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z="-IPP2_xpos37 - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_xoffset; IPP2_ypos37; IPP2_zpos37 - IPP_Sec37_length/2. + IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z + IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x" rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z="-IPP2_xpos37 - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_xoffset; IPP2_ypos37; -IPP2_zpos37 + IPP_Sec37_length/2. - IPP2_Sec37_Box1_z - IPP2_Sec37_Box2_z - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x" rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z=" IPP2_xpos19 + IPP2_Sec19_Box4_x/2. - IPP2_Sec37_xoffset; IPP2_ypos19; IPP2_zpos19 - IPP_Sec19_length/2. + IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z + IPP2_Sec19_Box3_z + IPP2_Sec19_Box4_z"/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z=" IPP2_xpos19 + IPP2_Sec19_Box4_x/2. - IPP2_Sec37_xoffset; IPP2_ypos19; -IPP2_zpos19 + IPP_Sec19_length/2. - IPP2_Sec19_Box1_z - IPP2_Sec19_Box2_z - IPP2_Sec37_Box4_z - IPP2_Sec37_Box3_z"/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z="-IPP2_xpos19 - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_xoffset; IPP2_ypos19; IPP2_zpos19 - IPP_Sec19_length/2. + IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z + IPP2_Sec37_Box4_z + IPP2_Sec37_Box3_z" rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z="-IPP2_xpos19 - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_xoffset; IPP2_ypos19; -IPP2_zpos19 + IPP_Sec19_length/2. - IPP2_Sec19_Box1_z - IPP2_Sec19_Box2_z - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z" rot="0.; 180.; 0."/>
+</composition>
+
+</section>
+
+<section name = "Eta0Services"
+ version = "7.0"
+ date = "29 Mar 2010"
+ author = "Laurent Chevalier"
+ top_volume = "servicesAtZ0">
+
+<!-- name = Eta0Services section name = "Services" -->
+<!--
+ **************************************************************
+ *** ****
+ *** Services ****
+ *** ****
+ **************************************************************
+-->
+<tubs name="EMCaloPipeI" material="Iron1" Rio_Z=" 310 ; 320; 5500" nbPhi="20" />
+<tubs name="EMCaloPipeO" material="Iron1" Rio_Z=" 190 ; 200; 1400" nbPhi="20" />
+<tubs name="CuivreCable" material="Aluminium2" Rio_Z=" 0.; 170; 5500" nbPhi="20" />
+<tubs name="CuivreCabl0" material="Aluminium2" Rio_Z=" 0.; 170; 5000" nbPhi="20" />
+<var name="SerStart" value="7500"/>
+<var name="SerZ" value="-100"/>
+
+<composition name="services0" > <!-- modified positions to avoid overlap -->
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0; 541 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0; 181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-541 ;SerZ" rot=" 0.;90.;0." />
+</composition>
+
+<composition name="services1" >
+ <posRPhiZ volume="services0" R_Phi_Z=" SerStart; Zero ; Zero" />
+</composition>
+
+<composition name="services2" > <!-- modified positions to avoid overlap -->
+ <posXYZ volume="CuivreCabl0" X_Y_Z=" 300; 541 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCabl0" X_Y_Z=" 300; 181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-541 ;SerZ" rot=" 0.;90.;0." />
+</composition>
+
+<!-- flexible chain sector 9
+
+name = "Flexible Chain Sector 9-35Volumes"
+version = "0.0"
+date = "01.03.2019"
+author = "Niko Tsutskiridze - Georgian Team" -->
+
+
+<!-- Towing ARM -->
+<box name="TowingArm_main" material="ShieldSteel" X_Y_Z=" 263.; 795.; 2480." />
+<box name="TowingArm_main_Subtr" material="ShieldSteel" X_Y_Z="250.; 782.; 2500." />
+
+<subtraction name="TowingArm_Sub" >
+ <posXYZ volume="TowingArm_main" />
+ <posXYZ volume="TowingArm_main_Subtr" />
+</subtraction>
+
+<box name="TowingARM_Plate_main" material="ShieldSteel" X_Y_Z="102.; 550.; 550." />
+<box name="TowingARM_Plate_Subtr" material="ShieldSteel" X_Y_Z="102.; 510.; 510. " />
+
+<subtraction name="TowingArm_Plate" >
+ <posXYZ volume="TowingARM_Plate_main" />
+ <posXYZ volume="TowingARM_Plate_Subtr" X_Y_Z=" 10. ; 0. ; 0. " />
+</subtraction>
+
+<composition name="TowingArm" >
+ <posXYZ volume="TowingArm_Sub" rot="0. ; 0. ; 0." />
+ <posXYZ volume="TowingArm_Plate" X_Y_Z="182.6; 0. ; 930. " rot=" 0. ; 0. ; 0." />
+</composition>
+<!-- End Towing ARM -->
+
+<!-- Drag Chain -->
+<box name="DragChain_Main" material="ShieldSteel" X_Y_Z=" 5555.; 804.; 17.5" />
+<tubs name="DragChain_Tube" material="ShieldSteel" Rio_Z="912.5; 930.; 804." profile="0.; 90." nbPhi="36."/>
+<box name="DragChain_SmMain" material="ShieldSteel" X_Y_Z=" 17.5; 804.; 275." />
+
+<union name="DragChain" >
+ <posXYZ volume="DragChain_Main"/>
+ <posXYZ volume="DragChain_Tube" X_Y_Z="2777.5; 0. ; 921.25 " rot=" 270. ; 0. ; 0." />
+ <posXYZ volume="DragChain_SmMain" X_Y_Z="3698.75; 0. ; 1056.75 "/>
+</union>
+<!-- End Towing ARM -->
+
+<!-- Pipes -->
+<box name="Pipe_Main" material="ShieldSteel" X_Y_Z=" 5425.; 439.; 2.05" />
+<tubs name="Pipe_Tube" material="ShieldSteel" Rio_Z="900.; 902.05; 439." profile="0.; 90." nbPhi="36."/>
+<box name="Pipe_SmMain" material="ShieldSteel" X_Y_Z=" 2.05; 439.; 5114." />
+
+<union name="FCH_Pipes" >
+ <posXYZ volume="Pipe_Main" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Pipe_Tube" X_Y_Z="2712.5; 0. ; 901.025 " rot=" 270. ; 0. ; 0." />
+ <posXYZ volume="Pipe_SmMain" X_Y_Z="3613.525; 0. ; 3454.025 "/>
+</union>
+<!-- End Pipes -->
+
+<!-- Cables -->
+<box name="Cable_Main" material="Copper" X_Y_Z=" 5425.; 720.; 6.7" />
+<tubs name="Cable_Tube" material="Copper" Rio_Z="1013.3; 1020.; 720." profile="0.; 90." nbPhi="36."/>
+<box name="Cable_SmMain" material="Copper" X_Y_Z=" 6.7; 720.; 2504." />
+
+<union name="FCH_Cable" >
+ <posXYZ volume="Cable_Main" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Cable_Tube" X_Y_Z="2712.5; 0. ; 1016.65 " rot=" 270. ; 0. ; 0." />
+ <posXYZ volume="Cable_SmMain" X_Y_Z="3729.15; 0. ; 2266.65 "/>
+</union>
+<!-- End Cables -->
+
+<!-- Support -->
+<box name="Support_MaBox" material="ShieldSteel" X_Y_Z=" 5230.; 1005.; 750." />
+<box name="Support_MaCutBox1" material="ShieldSteel" X_Y_Z=" 5240.; 1005.; 336.9" />
+<box name="Support_MaCutBox2" material="ShieldSteel" X_Y_Z=" 5130.; 895.; 760." />
+
+<subtraction name="Support_Ma" >
+ <posXYZ volume="Support_MaBox" />
+ <posXYZ volume="Support_MaCutBox1" X_Y_Z="0.; 12.6 ; -181.15 " rot=" 0. ; 0. ; 0."/>
+ <posXYZ volume="Support_MaCutBox1" X_Y_Z="0.; 12.6 ; 181.15 " rot=" 0. ; 0. ; 0."/>
+ <posXYZ volume="Support_MaCutBox2" X_Y_Z="0.; 0. ; 0. " rot=" 0. ; 0. ; 0."/>
+</subtraction>
+
+<gvxy name="Support_Leg1" material="ShieldSteel" dZ="700.">
+ <gvxy_point X_Y="-50.; -50."/>
+ <gvxy_point X_Y="-50.; -40."/>
+ <gvxy_point X_Y="-6.5; -40."/>
+ <gvxy_point X_Y="-6.5; 40."/>
+ <gvxy_point X_Y="-50.; 40."/>
+ <gvxy_point X_Y="-50.; 50."/>
+ <gvxy_point X_Y="50.; 50."/>
+ <gvxy_point X_Y="50.; 40."/>
+ <gvxy_point X_Y="6.5; 40."/>
+ <gvxy_point X_Y="6.5; -40."/>
+ <gvxy_point X_Y="50.; -40."/>
+ <gvxy_point X_Y="50.; -50."/>
+</gvxy>
+
+<gvxy name="Support_Leg2" material="ShieldSteel" dZ="522.7">
+ <gvxy_point X_Y="-50.; -50."/>
+ <gvxy_point X_Y="-50.; -31.4"/>
+ <gvxy_point X_Y="-9.3; -31.4"/>
+ <gvxy_point X_Y="-9.3; 40."/>
+ <gvxy_point X_Y="-50.; 31.4"/>
+ <gvxy_point X_Y="-50.; 50."/>
+ <gvxy_point X_Y="50.; 50."/>
+ <gvxy_point X_Y="50.; 31.4"/>
+ <gvxy_point X_Y="9.3; 31.4"/>
+ <gvxy_point X_Y="9.3; -31.4"/>
+ <gvxy_point X_Y="50.; -31.4"/>
+ <gvxy_point X_Y="50.; -50."/>
+</gvxy>
+
+<composition name="FCH_SupportLeg" >
+ <posXYZ volume="Support_Leg1" X_Y_Z="0.; 0. ; 0. " rot="0. ; 90. ; 0." />
+ <posXYZ volume="Support_Leg2" X_Y_Z="-257.5; 311.36 ; 0. " rot="0. ; 90. ; 90." />
+</composition>
+
+<gvxy name="Support_SidePl1" material="ShieldSteel" dZ="3150.5">
+ <gvxy_point X_Y="150.; 62.5"/>
+ <gvxy_point X_Y="156.; 62.5"/>
+ <gvxy_point X_Y="156.; -62.5"/>
+ <gvxy_point X_Y="-156.; -62.5"/>
+ <gvxy_point X_Y="-156.; 62.5"/>
+ <gvxy_point X_Y="-150.; 62.5"/>
+ <gvxy_point X_Y="-150.; -56.7"/>
+ <gvxy_point X_Y="150.; -57.7"/>
+</gvxy>
+
+<gvxy name="Support_SidePl2" material="ShieldSteel" dZ="2300.">
+ <gvxy_point X_Y="-150.; 812.5"/>
+ <gvxy_point X_Y="-156.; 812.5"/>
+ <gvxy_point X_Y="-156.; 937.5"/>
+ <gvxy_point X_Y="156.; 937.5"/>
+ <gvxy_point X_Y="156.; 812.5"/>
+ <gvxy_point X_Y="150.; 812.5"/>
+ <gvxy_point X_Y="150.; 931.7"/>
+ <gvxy_point X_Y="-150.; 931.7"/>
+</gvxy>
+
+<composition name="Support_SidePl" >
+ <posXYZ volume="Support_SidePl1" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SidePl2" X_Y_Z="0.; 0. ; 425.25 " rot="0. ; 0. ; 0." />
+</composition>
+
+<gvxy name="Support_SideFrPl1" material="ShieldSteel" dZ="14.">
+ <gvxy_point X_Y="-379.; -329.5"/>
+ <gvxy_point X_Y="-379.; -444.5"/>
+ <gvxy_point X_Y="-928.5; -594.5"/>
+ <gvxy_point X_Y="-1118.5; -594.5"/>
+ <gvxy_point X_Y="-1118.5; -220.5"/>
+ <gvxy_point X_Y="-300.; 594.5"/>
+ <gvxy_point X_Y="300.; 594.5"/>
+ <gvxy_point X_Y="1118.5; -220.5"/>
+ <gvxy_point X_Y="1118.5; -594.5"/>
+ <gvxy_point X_Y="928.5; -594.5"/>
+ <gvxy_point X_Y="379.; -444.5"/>
+ <gvxy_point X_Y="379.; -329.5"/>
+</gvxy>
+
+<box name="Support_SideFrPl2_Box" material="ShieldSteel" X_Y_Z=" 431.5; 1054.; 76." />
+<box name="Support_SideFrPl2_Cut" material="ShieldSteel" X_Y_Z=" 431.5; 1000.; 80." />
+
+<subtraction name="Support_SideFrPl2" >
+ <posXYZ volume="Support_SideFrPl2_Box" />
+ <posXYZ volume="Support_SideFrPl2_Cut" X_Y_Z="27.; 0. ; 0. " rot=" 0. ; 0. ; 0."/>
+</subtraction>
+
+<box name="Support_SideFrPl3_Box" material="ShieldSteel" X_Y_Z=" 1252.; 100.; 708." />
+<box name="Support_SideFrPl3_Cut" material="ShieldSteel" X_Y_Z=" 1252.; 110.; 650." />
+
+<subtraction name="Support_SideFrPl3" >
+ <posXYZ volume="Support_SideFrPl3_Box" />
+ <posXYZ volume="Support_SideFrPl3_Cut" X_Y_Z="29.; 0. ; 0. " rot=" 0. ; 0. ; 0."/>
+</subtraction>
+
+<composition name="FCH_Support" >
+ <posXYZ volume="Support_Ma" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_SupportLeg" X_Y_Z="-2283.; -1075.31 ; 333.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_SupportLeg" X_Y_Z="-2283.; -1075.31 ; -333.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SidePl" X_Y_Z="3636.8; -439.8 ; 2825.25 " rot="0. ; 180. ; 0." />
+ <posXYZ volume="Support_SidePl" X_Y_Z="3636.8; -439.8 ; -2825.25 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SideFrPl1" X_Y_Z="3241.3; -500. ; 0. " rot="0. ; 90. ; 90." />
+ <posXYZ volume="Support_SideFrPl2" X_Y_Z="3668.55; -2.6 ; 1156.51 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SideFrPl2" X_Y_Z="3668.55; -2.6 ; -1156.51 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SideFrPl3" X_Y_Z="3263.3; 576.92 ; 0. " rot="0. ; 0. ; 0." />
+</composition>
+<!-- End Support -->
+
+<composition name="FlexibleChainSector9" >
+ <posXYZ volume="TowingArm" X_Y_Z="-4469.28; 0. ; 2659.1 " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="TowingArm" X_Y_Z="-4469.28; 0. ; -2659.1 " rot=" 180. ; 0. ; 0." />
+ <posXYZ volume="DragChain" X_Y_Z="-8197.5; 0. ; 222.75 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="DragChain" X_Y_Z="-8197.5; 0. ; -222.75 " rot="180. ; 0. ; 0." />
+ <posXYZ volume="FCH_Pipes" X_Y_Z="-8090.84; -158.75 ; 194.625 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_Pipes" X_Y_Z="-8090.84; -158.75 ; -194.625 " rot="180. ; 0. ; 0." />
+ <posXYZ volume="FCH_Cable" X_Y_Z="-8091.32; -21. ; 79. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_Cable" X_Y_Z="-8091.32; -21. ; -79. " rot="180. ; 0. ; 0." />
+ <posXYZ volume="FCH_Support" X_Y_Z="-8103.; 2.5 ; 0. " rot="0. ; 0. ; 0." />
+</composition>
+
+<!-- end of flexible chain sector 9 -->
+
+<!-- flexible chain sector 11 and 15
+
+name = "41_Vol_-_FlexibleChainSector11-15"
+version = "0.0"
+date = "07-06-2019"
+author = "Niko Tsutskiridze, Davit Shekiladze" -->
+
+<!-- Support -->
+<box name="Support_BottomPlate" material="ShieldSteel" X_Y_Z=" 4300.; 9.5; 506." />
+<box name="Support_SidesPlates" material="ShieldSteel" X_Y_Z=" 4312.; 828.5; 25." />
+<box name="Support_SidesPlatesCutBox" material="ShieldSteel" X_Y_Z=" 1956.; 710.; 30." />
+
+<subtraction name="Support_SidesPlatesSubtr" >
+ <posXYZ volume="Support_SidesPlates" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_SidesPlatesCutBox" X_Y_Z=" -1078. ; -40.75 ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_SidesPlatesCutBox" X_Y_Z=" 1078. ; -40.75 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="Support_MidlPlates" material="ShieldSteel" X_Y_Z=" 4312.; 814.9; 20." />
+<box name="Support_MidlPlatesCutBox" material="ShieldSteel" X_Y_Z=" 1954.; 615.; 25." />
+
+<subtraction name="Support_MidlPlatesSubtr" >
+ <posXYZ volume="Support_MidlPlates" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_MidlPlatesCutBox" X_Y_Z=" -1079. ; -0.05 ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_MidlPlatesCutBox" X_Y_Z=" 1079. ; -0.05 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<composition name="Support_SidesPlatesM" >
+ <posXYZ volume="Support_SidesPlatesSubtr" X_Y_Z=" 0. ; 405.547 ; 265.6 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_SidesPlatesSubtr" X_Y_Z=" 0. ; 405.547 ; -265.6 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_MidlPlatesSubtr" X_Y_Z=" 0. ; 412.35 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</composition>
+
+<gvxy name="Support_WingPlate" material="ShieldSteel" dZ="2287." >
+ <gvxy_point X_Y=" -114.148; 64.757 " />
+ <gvxy_point X_Y=" -114.148; -69.961 " />
+ <gvxy_point X_Y=" -119.041; -69.961 " />
+ <gvxy_point X_Y=" -119.041; 69.961 " />
+ <gvxy_point X_Y=" 119.041; 69.961 " />
+ <gvxy_point X_Y=" 119.041; -69.961 " />
+ <gvxy_point X_Y=" 114.148; -69.961 " />
+ <gvxy_point X_Y=" 114.148; 64.757 " />
+</gvxy>
+
+<box name="Support_WingBox1" material="ShieldSteel" X_Y_Z=" 297.155; 896.845; 100." />
+<box name="Support_WingCutBox1" material="ShieldSteel" X_Y_Z=" 238.155; 846.845; 110." />
+
+<subtraction name="Support_WingBox1Subtr" >
+ <posXYZ volume="Support_WingBox1" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox1" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+
+<box name="Support_WingBox" material="ShieldSteel" X_Y_Z=" 302.155; 901.845; 100." />
+<box name="Support_WingCutBox" material="ShieldSteel" X_Y_Z=" 238.155; 846.845; 110." />
+
+<subtraction name="Support_WingBoxSubtr" >
+ <posXYZ volume="Support_WingBox" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="Support_WingBox2" material="ShieldSteel" X_Y_Z=" 291.; 866.094; 100." />
+<box name="Support_WingCutBox2" material="ShieldSteel" X_Y_Z=" 246.155; 821.094; 110." />
+
+<subtraction name="Support_WingBox2Subtr" >
+ <posXYZ volume="Support_WingBox2" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox2" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="Support_WingBox3" material="ShieldSteel" X_Y_Z=" 242.; 629.5; 1041." />
+<box name="Support_WingCutBox3" material="ShieldSteel" X_Y_Z=" 217.; 600.; 1050." />
+
+<subtraction name="Support_WingBox3Subtr" >
+ <posXYZ volume="Support_WingBox3" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox3" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<composition name="Support_WingSidepartsLeft" >
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; 344.027 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; -344.027 ; 0." rot=" 180.; 0.;0." />
+ <posXYZ volume="Support_WingBox1Subtr" X_Y_Z=" 0. ; 0.; 583.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; 1087.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; -133.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; -794.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox2Subtr" X_Y_Z=" 18.6 ; 15.3; 1237.2 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox3Subtr" X_Y_Z=" -11. ; 3.6; -1744. " rot=" 0. ; 0. ; 0. "/>
+</composition>
+
+<composition name="Support_WingSidepartsRight" >
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; 344.027 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; -344.027 ; 0." rot=" 180.; 0.;0." />
+ <posXYZ volume="Support_WingBox1Subtr" X_Y_Z=" 0. ; 0.; -583.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; -1087.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; 133.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; 794.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox2Subtr" X_Y_Z=" 18.6 ; 15.3; -1237.2 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox3Subtr" X_Y_Z=" -11. ; 3.6; 1744. " rot=" 0. ; 0. ; 0. "/>
+</composition>
+
+<box name="Support_WingCentBottom" material="ShieldSteel" X_Y_Z=" 1396.; 795.; 18." />
+
+<tubs name="Support_WingCentBottomCutTube" material="ShieldSteel" Rio_Z=" 0. ; 385. ; 20. " nbPhi="32" />
+<subtraction name="Support_WingCentBottomCut" >
+ <posXYZ volume="Support_WingCentBottom" X_Y_Z=" 0. ; 10. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCentBottomCutTube" X_Y_Z=" 690. ; 292.5 ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCentBottomCutTube" X_Y_Z=" -690. ; 292.5 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<gvxy name="Support_WingMiddleTopPlate" material="ShieldSteel" dZ="14." >
+ <gvxy_point X_Y=" -463.; 290.825 " />
+ <gvxy_point X_Y=" -463.; -290.825 " />
+ <gvxy_point X_Y=" -563.; -290.825 " />
+ <gvxy_point X_Y=" -563.; 390.825 " />
+ <gvxy_point X_Y=" 563.; 390.825 " />
+ <gvxy_point X_Y=" 563.; -290.825 " />
+ <gvxy_point X_Y=" 463.; -290.825 " />
+ <gvxy_point X_Y=" 463.; 290.825 " />
+</gvxy>
+
+<gvxy name="Support_WingMiddleBackPlate" material="ShieldSteel" dZ="100." >
+ <gvxy_point X_Y=" -263.; 410.525 " />
+ <gvxy_point X_Y=" -263.; -410.525 " />
+ <gvxy_point X_Y=" -288.; -410.525 " />
+ <gvxy_point X_Y=" -288.; 430.525 " />
+ <gvxy_point X_Y=" 288.; 430.525 " />
+ <gvxy_point X_Y=" 288.; -410.525 " />
+ <gvxy_point X_Y=" 263.; -410.525 " />
+ <gvxy_point X_Y=" 263.; 410.525 " />
+</gvxy>
+
+<composition name="Support_WingMiddle" >
+ <posXYZ volume="Support_WingCentBottomCut" X_Y_Z=" 2690. ; -4.774 ; 0." rot=" 90.; -90.;0." />
+ <posXYZ volume="Support_WingMiddleTopPlate" X_Y_Z=" 3065.32 ; 835.9 ; 0." rot=" 90.; -90.;0." />
+ <posXYZ volume="Support_WingMiddleBackPlate" X_Y_Z=" 2324.5 ; 418.6 ; 0." rot=" 0.; 90.;0." />
+</composition>
+
+<!-- End Support -->
+
+<!-- Drag Chain-->
+<box name="plate_of_drag_chain1" material="ShieldSteel" X_Y_Z="4639.; 640.; 16."/>
+<tubs name="plate_of_drag_chain2" material="ShieldSteel" Rio_Z="409.; 425.; 640." profile="90.; 90." nbPhi="32"/>
+<box name="plate_of_drag_chain3" material="ShieldSteel" X_Y_Z="16; 640.; 324.5"/>
+
+<composition name="Drag_Chain_assembly" >
+ <posXYZ volume="plate_of_drag_chain1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="plate_of_drag_chain2" X_Y_Z=" 2319.55; 0.; -417." rot=" 90.; 90.; 0."/>
+ <posXYZ volume="plate_of_drag_chain3" X_Y_Z=" 2736.5; 0.; -579.3" rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="Drag_Chain" >
+ <posXYZ volume="Drag_Chain_assembly" X_Y_Z=" 178.09; 387.39; -134." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Drag_Chain_assembly" X_Y_Z=" 178.09; 387.39; 134." rot=" 180.; 0.; 0."/>
+</composition>
+<!--End Drag Chain-->
+
+<!-- Cable-->
+<box name="plate_of_Cable1" material="Copper" X_Y_Z="4609.; 192.; 16."/>
+<tubs name="plate_of_Cable2" material="Copper" Rio_Z="409.; 425.; 192." profile="90.; 90." nbPhi="32"/>
+<box name="plate_of_Cable3" material="Copper" X_Y_Z="16.; 192.; 3282."/>
+
+<composition name="Cable_assembly" >
+ <posXYZ volume="plate_of_Cable1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="plate_of_Cable2" X_Y_Z=" 2304.55; 0; -417." rot=" 90.; 90.; 0."/>
+ <posXYZ volume="plate_of_Cable3" X_Y_Z=" 2721.5; 0.; -2058.05" rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="Cable" >
+ <posXYZ volume="Cable_assembly" X_Y_Z=" 163.09; 554.39; -180." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Cable_assembly" X_Y_Z=" 163.09; 554.39; 180." rot=" 180.; 0.; 0."/>
+</composition>
+<!--End Cable-->
+
+<!-- Pipes-->
+<box name="plate_of_Pipes1" material="ShieldSteel" X_Y_Z="4609.; 240.; 16."/>
+<tubs name="plate_of_Pipes2" material="ShieldSteel" Rio_Z="409.; 425.; 240." profile="90.; 90." nbPhi="32"/>
+<box name="plate_of_Pipes3" material="ShieldSteel" X_Y_Z="16.; 240.; 3282."/>
+
+<composition name="Pipes_assembly" >
+ <posXYZ volume="plate_of_Pipes1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="plate_of_Pipes2" X_Y_Z=" 2304.55; 0.; -417." rot=" 90.; 90.; 0."/>
+ <posXYZ volume="plate_of_Pipes3" X_Y_Z=" 2721.5; 0.; -2058.05" rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="Pipes" >
+ <posXYZ volume="Pipes_assembly" X_Y_Z=" 163.09; 287.39; 180." rot=" 180.; 0.; 0."/>
+ <posXYZ volume="Pipes_assembly" X_Y_Z=" 163.09; 287.39; -180." rot=" 0.; 0.; 0."/>
+</composition>
+<!--End Pipes-->
+
+<composition name="Flexible_Chain_Sector11-15" >
+ <posXYZ volume="Support_BottomPlate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_SidesPlatesM" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_WingSidepartsLeft" X_Y_Z=" 2913.853 ; 402.7 ; -1985.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Support_WingSidepartsRight" X_Y_Z=" 2913.853 ; 402.7 ; 1985.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Support_WingMiddle" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Drag_Chain" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Cable" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Pipes" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+</composition>
+
+<composition name="FlexibleChainSector11-15" >
+ <posXYZ volume="Flexible_Chain_Sector11-15" X_Y_Z=" -5446.554 ; -5631.994 ; 0." rot=" 0.; 0.;45." />
+ <posXYZ volume="Flexible_Chain_Sector11-15" X_Y_Z=" 5446.554 ; -5631.994 ; 0." rot=" 0.; 180.; -45." />
+</composition>
+
+<!-- end of flexible chain sector 11 and 15 -->
+
+<composition name="servicesAtZ0" >
+ <posXYZ volume="EMCaloPipeI" X_Y_Z=" Zero; 7000 ; Zero" rot=" 90.; 0.;0." />
+ <posXYZ volume="EMCaloPipeO" X_Y_Z=" Zero; -5000 ; 100" rot=" 90.; 0.;0." />
+ <posXYZ volume="services1" X_Y_Z=" Zero; Zero ; Zero" rot=" 0.; 0.;0." />
+ <posRPhiZ volume="services1" R_Phi_Z="Zero; 45 ; Zero" rot=" 0.; 0.;0." />
+ <posRPhiZ volume="services1" R_Phi_Z="Zero; 135 ; Zero" rot=" 0.; 0.;0." />
+ <posXYZ volume="FlexibleChainSector9" X_Y_Z="0;0;0" rot="0;0;0"/>
+ <posXYZ volume="FlexibleChainSector11-15" X_Y_Z="0;0;0" rot="0;0;0"/>
+</composition>
+</section>
+
+<section name = "AccessPlatforms"
+ version = "7.0"
+ date = "21 Mar 2005"
+ author = "Laurent Chevalier, Daniel Pomarede"
+ top_volume = "MBAP_AccessPlatform">
+
+
+<!-- name = AccessPlatforms section name = "Services" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Access : Muon Barrel Access Platforms ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+<!-- Design from ATLHXT__0001 -->
+
+<!-- Platform 1-2 positioned between Strut 1 and Strut 2 -->
+<!-- Platform 2-3 positioned between Strut 2 and Strut 3 -->
+<!-- Platform 3-4 positioned between Strut 3 and Strut 4 -->
+
+<!-- Platform dimensions -->
+<var name="MBAP_P12s1dz1" value="3000." />
+<var name="MBAP_P12s1dz2" value="2500." />
+<var name="MBAP_P23s1dz1" value="2700." />
+<var name="MBAP_P23s1dz2" value="2200." />
+<var name="MBAP_P34s1dz1" value="2200." />
+<var name="MBAP_P34s1dz2" value="1700." />
+
+<var name="MBAP_P14s3dz" value="8600." />
+<var name="MBAP_P14s3dx" value=" 540." />
+
+<var name="MBAP_PLAs1dx1" value="1225." />
+<var name="MBAP_PLAs1dx2" value=" 600." />
+<var name="MBAP_PFLhe" value=" 1.5" />
+
+<!-- Platform positions -->
+<!-- sector 1 & 9 -->
+<var name="MBAP_Ps01posx" value=" 7800." />
+<var name="MBAP_Ps01posy" value="-1200." />
+<!-- sector 11 & 15 -->
+<var name="MBAP_Ps11posx" value=" 5000." />
+<var name="MBAP_Ps11posy" value="-6500." />
+<!-- sector 3 & 7 -->
+<var name="MBAP_Ps14posx" value=" 6730." />
+<var name="MBAP_Ps14posy" value=" 5300." />
+<var name="MBAP_Ps14angz" value=" 45." />
+
+<var name="MBAP_P12posz" value=" 3425." /> <!-- ??? could use (ABRT_Zvouss(5)+ABRT_Zvouss(6))/2. ??? -->
+<var name="MBAP_P23posz" value=" 6691.25" /> <!-- ??? could use (ABRT_Zvouss(6)+ABRT_Zvouss(7))/2. ??? -->
+<var name="MBAP_P34posz" value=" 9545." /> <!-- ??? could use (ABRT_Zvouss(7)+ABRT_Zvouss(8))/2. ??? -->
+
+<!-- Useful variables -->
+<var name="MBAP_xyzref" value=" 0. " />
+
+<!-- Modelization of floor of Platform -->
+
+<var name="MBAP_PFL12xa" value="MBAP_P12s1dz1/2." />
+<var name="MBAP_PFL23xa" value="MBAP_P23s1dz1/2." />
+<var name="MBAP_PFL34xa" value="MBAP_P34s1dz1/2." />
+<var name="MBAP_PFLya" value="MBAP_xyzref" />
+
+<var name="MBAP_PFL12xb" value="MBAP_PFL12xa" />
+<var name="MBAP_PFL23xb" value="MBAP_PFL23xa" />
+<var name="MBAP_PFL34xb" value="MBAP_PFL34xa" />
+<var name="MBAP_PFLyb" value="MBAP_PLAs1dx2" />
+
+<var name="MBAP_PFL12xc" value="MBAP_P12s1dz2/2." />
+<var name="MBAP_PFL23xc" value="MBAP_P23s1dz2/2." />
+<var name="MBAP_PFL34xc" value="MBAP_P34s1dz2/2." />
+<var name="MBAP_PFLyc" value="MBAP_PFLyb" />
+
+<var name="MBAP_PFL12xd" value="MBAP_PFL12xc" />
+<var name="MBAP_PFL23xd" value="MBAP_PFL23xc" />
+<var name="MBAP_PFL34xd" value="MBAP_PFL34xc" />
+<var name="MBAP_PFLyd" value="MBAP_PLAs1dx1-GENV_Eps" />
+
+<!-- sector 1 & 9 -->
+
+<gvxysx name="MBAP_PlatformFloor12s1s9" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL12xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL12xb;MBAP_PFLyb"/>
+ <gvxy_point X_Y="MBAP_PFL12xc;MBAP_PFLyc"/>
+ <gvxy_point X_Y="MBAP_PFL12xd;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor23s1s9" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL23xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL23xb;MBAP_PFLyb"/>
+ <gvxy_point X_Y="MBAP_PFL23xc;MBAP_PFLyc"/>
+ <gvxy_point X_Y="MBAP_PFL23xd;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor34s1s9" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL34xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL34xb;MBAP_PFLyb"/>
+ <gvxy_point X_Y="MBAP_PFL34xc;MBAP_PFLyc"/>
+ <gvxy_point X_Y="MBAP_PFL34xd;MBAP_PFLyd"/>
+</gvxysx>
+
+<!-- sector 11 & 15 -->
+
+<gvxysx name="MBAP_PlatformFloor12s11s15" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL12xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL12xa;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor23s11s15" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL23xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL23xa;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor34s11s15" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL34xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL34xa;MBAP_PFLyd"/>
+</gvxysx>
+
+<!-- sector 3 & 7 -->
+
+<box name="MBAP_PlatformFloor14s3s7" material="Aluminium4" X_Y_Z="MBAP_P14s3dx;MBAP_PFLhe;MBAP_P14s3dz" />
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Modelization of rambarde of Platforms 1-2, 2-3, 3-4 -->
+
+<!-- Primary variables -->
+
+<!-- Tubes radii -->
+<var name="MBAP_PlatRaRo" value=" 17." />
+
+<!-- Slanted Support for Platform 1-4 sector 3 & 7 -->
+<!-- dimensions -->
+<var name="MBAP_PSSs3dy1" value=" 242.5"/>
+<var name="MBAP_PSSs3dy2" value=" 393." />
+<var name="MBAP_PSSs3dx1" value=" 393." />
+
+<!-- absolute positions -->
+<var name="MBAP_PSSs3zp1" value=" 1975. " /> <!-- could use ABRT_Zvouss(5) + 200 + 62.5 , see ATLHXT__0001 -->
+<var name="MBAP_PSSs3zp6" value="10582.5" /> <!-- could use ABRT_Zvouss(8) - 200 - 62.5 , see ATLHXT__0001 -->
+
+<!-- Relative positions of Slanted Supports -->
+<var name="MBAP_PSSzrp6" value="MBAP_PSSs3zp6-MBAP_PSSs3zp1" />
+
+<!-- Bottom Frame Tube angle -->
+<var name="MBAP_P14s3BFa" value="-atan(MBAP_PSSs3dy2/MBAP_PSSs3dx1)/GENV_PiS180" />
+
+<!-- Floor Position, angle w.r.t Frame -->
+<var name="MBAP_P14s3Fla" value="MBAP_P14s3BFa" />
+<var name="MBAP_P14s3Flx" value="-(MBAP_PSSs3dy1+MBAP_PSSs3dy2/2.)+(MBAP_PlatRaRo+MBAP_PFLhe/2.)*cos(MBAP_P14s3Fla*GENV_PiS180)" />
+<var name="MBAP_P14s3Fly" value="MBAP_PSSs3dx1/2.+(MBAP_PlatRaRo+MBAP_PFLhe/2.)*cos(MBAP_P14s3Fla*GENV_PiS180)" />
+<var name="MBAP_P14s3Flz" value="MBAP_PSSzrp6/2." />
+
+<!-- Primary variables -->
+
+<!-- Supporting Frame -->
+<!-- longitudinal and transverse beams -->
+
+<var name="AP13_SFBeamTh" value=" 8."/> <!-- Thickness -->
+<var name="AP13_SFBeamHe" value=" 50."/> <!-- Height -->
+<var name="AP13_SFBeamDx" value="100."/> <!-- Transverse Size (X-wise) -->
+
+<!-- Frame 12 (connect BT strut 1 - strut 2) -->
+
+<!-- Longitudinal and Transverse beam length / cf ATLHXT__0032 -->
+<var name="AP13_Fr34Llen" value="2400."/>
+
+<!-- Longitudinal and Transverse Positions -->
+<var name="AP13_Fr23xsp1" value="2160."/> <!-- separation of longitudinal beams along x -->
+<var name="AP13_Fr34Tzof" value=" 615."/> <!-- offset transverse beams along z -->
+<var name="AP13_Fr34Tzsp" value=" 840."/> <!-- separation of transverse beams along z -->
+
+<!-- Y-position -->
+<var name="AP13_Fr12y" value="-9190."/>
+
+<!-- Modelization of beam -->
+<var name="AP13_SFBeamXa" value="AP13_SFBeamDx/2."/>
+<var name="AP13_SFBeamYa" value="0."/>
+<var name="AP13_SFBeamXb" value="AP13_SFBeamXa"/>
+<var name="AP13_SFBeamYb" value="AP13_SFBeamHe"/>
+<var name="AP13_SFBeamXc" value="AP13_SFBeamXa-AP13_SFBeamTh"/>
+<var name="AP13_SFBeamYc" value="AP13_SFBeamYb"/>
+<var name="AP13_SFBeamXd" value="AP13_SFBeamXc"/>
+<var name="AP13_SFBeamYd" value="AP13_SFBeamYa+AP13_SFBeamTh"/>
+
+<!-- Positions of beams -->
+<var name="AP13_Fr23x1" value="AP13_Fr23xsp1/2.+AP13_SFBeamDx/2."/>
+<var name="AP13_Fr12Typ" value="-AP13_SFBeamHe"/> <!-- Transversal beam y position -->
+<var name="AP13_Fr34Tz1" value="-AP13_Fr34Llen/2.+ AP13_Fr34Tzof +AP13_SFBeamDx/2."/> <!-- Transversal beam z position -->
+<var name="AP13_Fr34Tz2" value="AP13_Fr34Tz1 + AP13_Fr34Tzsp -AP13_SFBeamDx"/> <!-- Transversal beam z position -->
+
+<var name="PL05" value="2200."/>
+<var name="DZS5" value="3000."/>
+
+<gvxysx name="MBAP_Sector05_Beam12Transversal" material="Aluminium" dZ="DZS5">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_Sector05_Beam34Longitudinal" material="Aluminium" dZ="PL05">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+
+<!-- NEw simplify Platforms lc 24-03-10 -->
+
+<!-- sector 3 & 7 -->
+<composition name="MBAP_AccessPlatform14s3s7AssemblyS">
+ <posXYZ volume="MBAP_PlatformFloor14s3s7" X_Y_Z="MBAP_P14s3Flx;MBAP_P14s3Fly;MBAP_P14s3Flz" rot="0.;0.;MBAP_P14s3Fla"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7AssemblySymS">
+ <posXYZ volume="MBAP_PlatformFloor14s3s7" X_Y_Z="MBAP_P14s3Flx;MBAP_P14s3Fly;-MBAP_P14s3Flz" rot="0.;0.;MBAP_P14s3Fla"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7_zplusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblyS" X_Y_Z=" MBAP_Ps14posx;MBAP_Ps14posy; MBAP_PSSs3zp1" rot="0.; 0.; MBAP_Ps14angz"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7Sym_zplusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblySymS" X_Y_Z=" MBAP_Ps14posx;MBAP_Ps14posy; -MBAP_PSSs3zp1" rot="0.; 0.; MBAP_Ps14angz"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7_zminusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblyS" X_Y_Z="-MBAP_Ps14posx;MBAP_Ps14posy;-MBAP_PSSs3zp1" rot="0.;180.;-MBAP_Ps14angz"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7Sym_zminusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblySymS" X_Y_Z="-MBAP_Ps14posx;MBAP_Ps14posy;MBAP_PSSs3zp1" rot="0.;180.;-MBAP_Ps14angz"/>
+</composition>
+
+
+<box name="MBAP_PlatformFloorS" material="Aluminium4" X_Y_Z="DZS5;MBAP_PFLhe;2*AP13_Fr23x1-65" />
+<composition name="MBAP_Sector05_Platform2">
+ <posXYZ volume="MBAP_Sector05_Beam34Longitudinal" X_Y_Z=" AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector05_Beam34Longitudinal" X_Y_Z="-AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector05_Beam12Transversal" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz1" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_Sector05_Beam12Transversal" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz2" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_PlatformFloorS" X_Y_Z="0.;MBAP_PFLhe+0.1;0." />
+</composition>
+
+<var name="AP05" value="5370."/>
+
+<composition name="MBAP_Sector05S">
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; +5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; +1500."/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; +3700"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; -5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; -1500"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; -3700"/>
+</composition>
+
+<var name="AP05_MS" value="7650.1"/>
+<composition name="MBAP_Sector05_MediumS">
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +1500."/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +3700"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -1500"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -3700"/>
+</composition>
+
+<var name="AP13_MS" value="-6700."/>
+<composition name="MBAP_Sector13_MediumS">
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +1500."/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +3700"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -1500"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -3700"/>
+</composition>
+
+<gvxysx name="MBAP_Sector13_Beam12Transversal2" material="Aluminium" dZ="5000.">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+<gvxysx name="MBAP_Sector13_Beam34Longitudinal2" material="Aluminium" dZ="5000">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+<gvxysx name="MBAP_Sector13_Beam34Longitudinal3" material="Aluminium" dZ="6000">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+<box name="MBAP_PlatformFloorS2" material="Aluminium4" X_Y_Z="DZS5+1700;MBAP_PFLhe; 6000." />
+<composition name="MBAP_Sector13_Platform3">
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal3" X_Y_Z=" AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal3" X_Y_Z="-AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz1" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz2" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_PlatformFloorS2" X_Y_Z="0.;MBAP_PFLhe;0." />
+</composition>
+<box name="MBAP_PlatformFloorS3" material="Aluminium4" X_Y_Z="DZS5+1700;MBAP_PFLhe; 4900." />
+<composition name="MBAP_Sector13_Platform2">
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal2" X_Y_Z=" AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal2" X_Y_Z="-AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz1" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz2" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_PlatformFloorS3" X_Y_Z="0.;MBAP_PFLhe;0." />
+</composition>
+
+<composition name="MBAP_Sector13S">
+ <posXYZ volume="MBAP_Sector13_Platform3" X_Y_Z="0.;AP13_Fr12y; +9300"/>
+ <posXYZ volume="MBAP_Sector13_Platform2" X_Y_Z="0.;AP13_Fr12y; +3000"/>
+ <posXYZ volume="MBAP_Sector13_Platform2" X_Y_Z="0.;AP13_Fr12y; -2650"/>
+ <posXYZ volume="MBAP_Sector13_Platform3" X_Y_Z="0.;AP13_Fr12y; -9300"/>
+</composition>
+
+
+<composition name="MBAP_AccessPlatform">
+
+<!-- sector 1 & 9 -->
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P34posz" rot="90.;270.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P34posz" rot="90.;270.;0."/>
+
+<!-- sector 11 & 15 -->
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P34posz" rot="90.;270.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P34posz" rot="90.;270.;0."/>
+
+<!-- sector 3 & 7 -->
+ <posXYZ volume="MBAP_AccessPlatform14s3s7_zplusS" />
+ <posXYZ volume="MBAP_AccessPlatform14s3s7Sym_zplusS" />
+ <posXYZ volume="MBAP_AccessPlatform14s3s7_zminusS" />
+ <posXYZ volume="MBAP_AccessPlatform14s3s7Sym_zminusS" />
+
+
+<!-- Access Platform Sector 13 Bottom Level -->
+ <posXYZ volume="MBAP_Sector13S" />
+ <posXYZ volume="MBAP_Sector13_MediumS" />
+<!-- Access Platform Sector 05 Top Level -->
+ <posXYZ volume="MBAP_Sector05S" />
+ <posXYZ volume="MBAP_Sector05_MediumS" />
+
+</composition>
+
+</section>
+<section name = "MDT Big Wheel"
+ version = "7.0"
+ date = "11 Oct 2005"
+ author = "Daniel Pomarede"
+ top_volume = "MBWH_BigWheels">
+
+
+<!-- name = MDT Big Wheel section name = "Supports" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** MDT Big Wheel ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+
+
+<var name="MBWH_zposL" value="13950" />
+
+
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** common items ****
+ *** ****
+ **************************************************************
+-->
+
+
+<!-- Cut profiles cross bracing large and small sector -->
+<!-- ATLMHHBM0091 & ATLMHHBM0100-->
+<var name="MBWH_CBext" value="200"/>
+<var name="MBWH_CBhei" value="60"/>
+
+<!-- Spokes U profile -->
+
+<!-- ATLMHHBM0130 & ATLMHHBM0085 & ATLMHHBM0086 & ATLMHHBM0087 -->
+
+<var name="MBWH_SUPthi" value=" 5." />
+<var name="MBWH_SUPext" value=" 230." />
+<var name="MBWH_SUPhei" value=" 55." />
+
+<!-- Spokes Reinforcing bar -->
+
+<!-- ATLMHHBM0082A & ATLMHHBM0051A & ATLMHHBM0154A -->
+
+<!-- Slate -->
+<var name="MBWH_RBSlen" value="1080"/>
+<var name="MBWH_RBSwid" value="100"/>
+<var name="MBWH_RBSthi" value="25"/>
+<!-- Bracket -->
+<var name="MBWH_RBBlen" value="200"/>
+<var name="MBWH_RBBsiz" value="60"/>
+<var name="MBWH_RBBthi" value="10"/>
+
+<!-- holes spacing for clamping Reinforcing bar on spokes -->
+<!-- ATLMHHBM0130 & ATLMHHBM0085 -->
+<var name="MBWH_SRBhos" value="160" />
+
+<!-- Plates of Cross Bracings -->
+<var name="MBWH_CBPth" value="8"/> <!-- thickness -->
+
+<!-- Derived variables -->
+<var name="MBWH_RBBxa" value="0"/>
+<var name="MBWH_RBBya" value="0"/>
+<var name="MBWH_RBBxb" value="MBWH_RBBsiz"/>
+<var name="MBWH_RBByb" value="MBWH_RBBya"/>
+<var name="MBWH_RBBxc" value="MBWH_RBBxb"/>
+<var name="MBWH_RBByc" value="MBWH_RBBsiz"/>
+<var name="MBWH_RBBxd" value="MBWH_RBBxc-MBWH_RBBthi"/>
+<var name="MBWH_RBByd" value="MBWH_RBByc"/>
+<var name="MBWH_RBBxe" value="MBWH_RBBxd"/>
+<var name="MBWH_RBBye" value="MBWH_RBBthi"/>
+<var name="MBWH_RBBxf" value="MBWH_RBBxa"/>
+<var name="MBWH_RBByf" value="MBWH_RBBye"/>
+
+<var name="MBWH_RBBxp" value="-MBWH_RBSlen/2.+MBWH_RBBsiz"/>
+<var name="MBWH_RBByp1" value="-MBWH_RBSthi/2.-MBWH_RBBsiz"/>
+<var name="MBWH_RBByp2" value="MBWH_RBSthi/2."/>
+
+<box name="MBWH_ReinforcingBarSlate" material="Aluminium1" X_Y_Z="MBWH_RBSlen;MBWH_RBSthi;MBWH_RBSwid"/>
+
+<gvxy name="MBWH_ReinforcingBarBracket" material="Aluminium2" dZ="MBWH_RBBlen">
+ <gvxy_point X_Y="MBWH_RBBxa;MBWH_RBBya"/>
+ <gvxy_point X_Y="MBWH_RBBxb;MBWH_RBByb"/>
+ <gvxy_point X_Y="MBWH_RBBxc;MBWH_RBByc"/>
+ <gvxy_point X_Y="MBWH_RBBxd;MBWH_RBByd"/>
+ <gvxy_point X_Y="MBWH_RBBxe;MBWH_RBBye"/>
+ <gvxy_point X_Y="MBWH_RBBxf;MBWH_RBByf"/>
+</gvxy>
+
+<composition name="MBWH_ReinforcingBar">
+ <posXYZ volume="MBWH_ReinforcingBarSlate"/>
+ <posXYZ volume="MBWH_ReinforcingBarBracket" X_Y_Z=" MBWH_RBBxp;MBWH_RBByp1;0" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBarBracket" X_Y_Z="-MBWH_RBBxp;MBWH_RBByp2;0"/>
+</composition>
+
+<!-- positions of reinforcing bars -->
+<var name="MBWH_SRBpx" value="MBWH_SUPext/2.+MBWH_RBSthi/2.+MBWH_RBBthi"/>
+<var name="MBWH_SRBpy" value="-MBWH_RBSlen/2.+MBWH_SUPhei+MBWH_RBBthi"/>
+
+<!-- Spokes -->
+<!-- Derived variables -->
+<var name="MBWH_SUPxa" value="MBWH_SUPext/2." />
+<var name="MBWH_SUPya" value="0." />
+<var name="MBWH_SUPxb" value="MBWH_SUPxa" />
+<var name="MBWH_SUPyb" value="MBWH_SUPhei" />
+<var name="MBWH_SUPxc" value="MBWH_SUPxb-MBWH_SUPthi" />
+<var name="MBWH_SUPyc" value="MBWH_SUPyb" />
+<var name="MBWH_SUPxd" value="MBWH_SUPxc" />
+<var name="MBWH_SUPyd" value="MBWH_SUPthi" />
+
+<!-- Plates of Cross Bracings -->
+<var name="MBWH_CBPx" value="(MBWH_CBext+MBWH_CBPth)/2." /> <!-- x pos -->
+
+
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** Large Sector ****
+ *** ****
+ **************************************************************
+-->
+
+<!-- ATLMHHBM0091 -->
+<!-- Cut profiles cross bracing large sector -->
+<var name="MBWH_CBLthi" value="5"/>
+
+<!-- Contreventements lengths -->
+<!-- item numbering in ATLMHHBM0002 -->
+<var name="MBWH_CBLl11" value="3690." /> <!-- item 11 -->
+<var name="MBWH_CBLl17" value="2700." /> <!-- item 17 -->
+<var name="MBWH_CBLl22" value="1740." /> <!-- item 22 -->
+<var name="MBWH_CBLl26" value=" 750." /> <!-- item 26 -->
+
+<!-- Contreventements positions (...to be confirmed...) -->
+<var name="MBWH_CBLy11" value="9700." /> <!-- item 11 -->
+<var name="MBWH_CBLy17" value="7750." /> <!-- item 17 -->
+<var name="MBWH_CBLy22" value="5800." /> <!-- item 22 -->
+<var name="MBWH_CBLy26" value="3850." /> <!-- item 26 -->
+
+
+<!-- item numbering in ATLMHHBM0002 -->
+<!-- Cross bracing, bay 1 large sector -->
+<var name="MBWH_CBLl10" value="4260." /> <!-- item 10 --> <!-- drawing ATLMHHBM0066 -->
+<!-- Cross bracing, bay 2 large sector -->
+<var name="MBWH_CBLl15" value="3590." /> <!-- item 15 --> <!-- drawing ATLMHHBM0068 -->
+<!-- Cross bracing, bay 3 large sector -->
+<var name="MBWH_CBLl21" value="2830." /> <!-- item 21 --> <!-- drawing ATLMHHBM0070 -->
+<!-- Cross bracing, bay 4 large sector -->
+<var name="MBWH_CBLl25" value="2130." /> <!-- item 25 --> <!-- drawing ATLMHHBM0073 -->
+
+<!-- item numbering in ATLMHHBM0002 -->
+<!-- Contreventements, bay 1 large sector -->
+<var name="MBWH_CBLl8" value="1780."/> <!-- item 8 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl9" value="2310."/> <!-- item 9 --> <!-- drawing ATLMHHBM0091 -->
+
+<!-- Contreventements, bay 2 large sector -->
+<var name="MBWH_CBLl14" value="1450."/> <!-- item 14 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl13" value="2005."/> <!-- item 13 --> <!-- drawing ATLMHHBM0091 -->
+
+<!-- Contreventements, bay 3 large sector -->
+<var name="MBWH_CBLl20" value="1055."/> <!-- item 20 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl18" value="1685."/> <!-- item 18 --> <!-- drawing ATLMHHBM0091 -->
+
+<!-- Contreventements, bay 4 large sector -->
+<var name="MBWH_CBLl24" value="590."/> <!-- item 24 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl23" value="1430."/> <!-- item 23 --> <!-- drawing ATLMHHBM0091 -->
+
+
+<!-- Plates -->
+ <!-- item 10 for Bay 1 --> <!-- drawing ATLMHHBM0066 -->
+<var name="MBWH_CBPL10le" value="419"/> <!-- length -->
+<var name="MBWH_CBPL10wi" value="216"/> <!-- width -->
+<var name="MBWH_CBPL10cu" value="40"/> <!-- cut -->
+<var name="MBWH_CBPL10ti" value="22"/> <!-- tilt -->
+<var name="MBWH_CBPL10za" value="2174"/> <!-- Plate offset -->
+<var name="MBWH_CBPL10ya" value="14"/> <!-- Plate offset -->
+ <!-- item 15 for Bay 2 --> <!-- drawing ATLMHHBM0068 -->
+<var name="MBWH_CBPL15le" value="345"/> <!-- length -->
+<var name="MBWH_CBPL15wi" value="224"/> <!-- width -->
+<var name="MBWH_CBPL15cu" value="30"/> <!-- cut -->
+<var name="MBWH_CBPL15ti" value="30"/> <!-- tilt -->
+<var name="MBWH_CBPL15za" value="1322"/> <!-- Plate offset -->
+<var name="MBWH_CBPL15ya" value="9"/> <!-- Plate offset -->
+ <!-- item 21 for Bay 3 --> <!-- drawing ATLMHHBM0070 -->
+<var name="MBWH_CBPL21le" value="269"/> <!-- length -->
+<var name="MBWH_CBPL21wi" value="230"/> <!-- width -->
+<var name="MBWH_CBPL21cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPL21ti" value="40"/> <!-- tilt -->
+<var name="MBWH_CBPL21za" value="938"/> <!-- Plate offset -->
+<var name="MBWH_CBPL21ya" value="13"/> <!-- Plate offset -->
+ <!-- item 25 for Bay 4 --> <!-- drawing ATLMHHBM0073 -->
+<var name="MBWH_CBPL25le" value="300"/> <!-- length -->
+<var name="MBWH_CBPL25wi" value="222"/> <!-- width -->
+<var name="MBWH_CBPL25cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPL25ti" value="33"/> <!-- tilt --> <!-- ==> to be confirmed <== -->
+<var name="MBWH_CBPL25za" value="470"/> <!-- Plate offset -->
+<var name="MBWH_CBPL25ya" value="21"/> <!-- Plate offset -->
+
+
+<!-- positions (...to be confirmed...) -->
+<var name="MBWH_Croily10" value="10500"/> <!-- item 10 -->
+<var name="MBWH_Croily15" value="8600"/> <!-- item 15 -->
+<var name="MBWH_Croily21" value="6600"/> <!-- item 21 -->
+<var name="MBWH_Croily25" value="4450"/> <!-- item 25 -->
+
+
+<!-- ATLMHHBM0002 -->
+<!-- Spokes Opening angle large sector -->
+<var name="MBWH_SLangle" value="14." />
+
+<!-- Spoke large sector -->
+<!-- Inner spoke large sector ATLMHHBM0130 -->
+<!-- External spoke large sector ATLMHHBM0128 -->
+
+<!-- ATLMHHBM0130 -->
+<!-- U profile length -->
+<var name="MBWH_SlsUPlen" value="8465" /> <!-- ??? to be confirmed for both -->
+
+<!-- relative positions of reinforcing bars -->
+<var name="MBWH_SlsRBdz1" value="1317" />
+<var name="MBWH_SlsRBdz2" value="1787" />
+<var name="MBWH_SlsRBdz3" value="2030" />
+<var name="MBWH_SlsRBdz4" value="1740" />
+
+
+<!-- External Spokes supports -->
+
+<!-- ATLMHHBM0128 -->
+<!-- position along the spoke of 1st support -->
+<var name="MBWH_SlsSup1" value=" 414" />
+<!-- size of support -->
+<var name="MBWH_SlsSSize" value=" 220" /> <!-- as measured on drawing, to be confirmed in atlmhhbm0123 ? -->
+
+<!-- Transversal beam, central support -->
+
+<!-- ATLMHHBM0080 -->
+<var name="MBWH_TBCSlen1" value="2396." />
+<var name="MBWH_TBCSlen2" value="2526.6"/>
+<var name="MBWH_TBCSext" value=" 87." />
+<var name="MBWH_TBCShei" value=" 180." />
+<var name="MBWH_TBCSthi1" value=" 15." />
+<var name="MBWH_TBCSthi2" value=" 10." />
+<var name="MBWH_TBCSoffs" value=" 135." />
+<var name="MBWH_TBCSang1" value=" 14." />
+<var name="MBWH_TBCSang2" value="22.5"/>
+
+
+<!-- Connection beam / extremity plate -->
+
+<!-- ATLMHHBM0076 -->
+<!-- thickness, assumed constant -->
+<var name="MBWH_CBEPthic" value="15."/>
+<!-- dimensions and angles -->
+<var name="MBWH_CBEPl1" value="195.8"/>
+<var name="MBWH_CBEPl2" value="230."/>
+<var name="MBWH_CBEPl3" value="263."/>
+
+<var name="MBWH_CBEPh1" value="89.5"/>
+<var name="MBWH_CBEPh2" value="169.2"/>
+<var name="MBWH_CBEPh3" value="72.8"/>
+<var name="MBWH_CBEPh4" value="81.2"/>
+<var name="MBWH_CBEPh5" value="125"/>
+
+<var name="MBWH_CBEPa1" value="22.5"/>
+<var name="MBWH_CBEPa2" value="67.5"/>
+<var name="MBWH_CBEPa3" value="82."/>
+<var name="MBWH_CBEPa4" value="15."/>
+
+
+<!-- Extremity plate -->
+
+<!-- ATLMHHBM0075 -->
+<!-- thickness, assumed constant -->
+<var name="MBWH_EPthic" value="15."/>
+<!-- dimensions and angles -->
+<var name="MBWH_EPl1" value="227.8"/>
+<var name="MBWH_EPl2" value="423"/>
+<var name="MBWH_EPl3" value="193.7"/>
+
+<var name="MBWH_EPh1" value="250.7"/>
+<var name="MBWH_EPh2" value="170.3"/>
+<var name="MBWH_EPh3" value="383"/>
+<var name="MBWH_EPh4" value="76.1"/>
+
+
+<!-- Central Reinforcing bar -->
+
+<!-- ATLMHHBM0113 -->
+
+<var name="MBWH_CRBLPwid" value="180"/>
+<var name="MBWH_CRBPL1pi" value="643"/>
+<var name="MBWH_CRBPL1po" value="647"/>
+<var name="MBWH_CRBSHIof" value="4"/>
+
+<!-- L Profile -->
+<var name="MBWH_CRBLPthi" value="12"/>
+<var name="MBWH_CRBLPle1" value="910"/>
+<var name="MBWH_CRBLPhe1" value="60"/>
+<var name="MBWH_CRBLPle2" value="145"/>
+<var name="MBWH_CRBLPhe2" value="39"/>
+
+<!-- Plate 1 -->
+<var name="MBWH_CRBPL1th" value="12"/>
+<var name="MBWH_CRBPL1le" value="340"/>
+<var name="MBWH_CRBPL1wi" value="156"/>
+
+<!-- Plate 2 -->
+<var name="MBWH_CRBPL2th" value="12"/>
+<var name="MBWH_CRBPL2le" value="210"/>
+<var name="MBWH_CRBPL2wi" value="156"/>
+
+<!-- Shim -->
+<var name="MBWH_CRBSHIth" value="12"/>
+<var name="MBWH_CRBSHIle" value="165"/>
+<var name="MBWH_CRBSHIwi" value="156"/>
+
+<!-- position of Reinforcing Bar relative to extremity plate ... pifometric, to be confirmed -->
+<var name="MBWH_CRBxoff" value="-200"/>
+<var name="MBWH_CRByoff" value="-400"/>
+<var name="MBWH_CRBzoff" value="-300"/>
+
+
+<!-- ATLMHHBM0002 -->
+<!-- position of 1st support in atlas ref system -->
+<var name="MBWH_SlsSuy1" value=" 3612.7" />
+<var name="MBWH_SlsSux1" value=" 1305." />
+<!-- ATLMHHBM0128 -->
+<!-- x extension -->
+<var name="MBWH_SlsSxext" value=" 139.3" />
+
+<!-- Derived variables -->
+<!-- Positions -->
+<var name="MBWH_Slsypos" value="MBWH_SlsSuy1+(.5*MBWH_SlsUPlen-MBWH_SlsSup1)*cos(MBWH_SLangle*GENV_PiS180)"/>
+<var name="MBWH_Slsxp1" value="MBWH_SlsSux1+(MBWH_SlsSxext-.5*MBWH_SUPhei)/cos(MBWH_SLangle*GENV_PiS180)-.5*MBWH_SlsSSize*sin(MBWH_SLangle*GENV_PiS180) " />
+<!-- external spokes -->
+<var name="MBWH_SlsExref" value="MBWH_Slsxp1 +(.5*MBWH_SlsUPlen-MBWH_SlsSup1)*sin(MBWH_SLangle*GENV_PiS180) "/>
+<!-- inner spokes -->
+<var name="MBWH_SlsIxref" value="MBWH_SlsExref - (MBWH_RBSlen-MBWH_RBBsiz)/cos(MBWH_SLangle*GENV_PiS180) "/>
+
+<!-- Connection beam / extremity plate -->
+<!-- Derived variables -->
+<var name="MBWH_CBEPxa" value="0"/>
+<var name="MBWH_CBEPya" value="0"/>
+<var name="MBWH_CBEPxb" value="MBWH_CBEPxa"/>
+<var name="MBWH_CBEPyb" value="MBWH_CBEPh1"/>
+<var name="MBWH_CBEPxc" value="MBWH_CBEPl2-MBWH_CBEPl3"/>
+<var name="MBWH_CBEPyc" value="MBWH_CBEPh2"/>
+<var name="MBWH_CBEPxd" value="MBWH_CBEPxc+MBWH_CBEPl1"/>
+<var name="MBWH_CBEPyd" value="MBWH_CBEPyc"/>
+<var name="MBWH_CBEPxe" value="MBWH_CBEPxd+(MBWH_CBEPh2-MBWH_CBEPh5)/tan(MBWH_CBEPa2*GENV_PiS180)"/>
+<var name="MBWH_CBEPye" value="MBWH_CBEPh5"/>
+<var name="MBWH_CBEPxf" value="MBWH_CBEPxe+(MBWH_CBEPh5-MBWH_CBEPh4)/tan(MBWH_CBEPa3*GENV_PiS180)"/>
+<var name="MBWH_CBEPyf" value="MBWH_CBEPh4"/>
+<var name="MBWH_CBEPxg" value="MBWH_CBEPxf+(MBWH_CBEPh4-MBWH_CBEPh3)/tan(MBWH_CBEPa4*GENV_PiS180)"/>
+<var name="MBWH_CBEPyg" value="MBWH_CBEPh3"/>
+<var name="MBWH_CBEPxh" value="MBWH_CBEPl2"/>
+<var name="MBWH_CBEPyh" value="MBWH_CBEPya"/>
+
+<!-- Modelization -->
+<gvxy name="MBWH_ConnectionBeamExtremityPlate" material="Aluminium2" dZ="MBWH_CBEPthic">
+ <gvxy_point X_Y="MBWH_CBEPxa;MBWH_CBEPya"/>
+ <gvxy_point X_Y="MBWH_CBEPxb;MBWH_CBEPyb"/>
+ <gvxy_point X_Y="MBWH_CBEPxc;MBWH_CBEPyc"/>
+ <gvxy_point X_Y="MBWH_CBEPxd;MBWH_CBEPyd"/>
+ <gvxy_point X_Y="MBWH_CBEPxe;MBWH_CBEPye"/>
+ <gvxy_point X_Y="MBWH_CBEPxf;MBWH_CBEPyf"/>
+ <gvxy_point X_Y="MBWH_CBEPxg;MBWH_CBEPyg"/>
+ <gvxy_point X_Y="MBWH_CBEPxh;MBWH_CBEPyh"/>
+</gvxy>
+
+<!-- Extremity plate -->
+<!-- Derived variables -->
+<var name="MBWH_EPxa" value="0"/>
+<var name="MBWH_EPya" value="0"/>
+<var name="MBWH_EPxb" value="MBWH_EPxa"/>
+<var name="MBWH_EPyb" value="MBWH_EPh1"/>
+<var name="MBWH_EPxc" value="MBWH_EPl2-MBWH_EPl3"/>
+<var name="MBWH_EPyc" value="MBWH_EPh3"/>
+<var name="MBWH_EPxd" value="MBWH_EPl2"/>
+<var name="MBWH_EPyd" value="MBWH_EPyc"/>
+<var name="MBWH_EPxe" value="MBWH_EPxd"/>
+<var name="MBWH_EPye" value="MBWH_EPyd-MBWH_EPh2"/>
+<var name="MBWH_EPxf" value="MBWH_EPl1"/>
+<var name="MBWH_EPyf" value="MBWH_EPh4"/>
+<var name="MBWH_EPxg" value="MBWH_EPxf"/>
+<var name="MBWH_EPyg" value="MBWH_EPya"/>
+
+<!-- Modelization -->
+<gvxy name="MBWH_ExtremityPlate" material="Aluminium1" dZ="MBWH_EPthic">
+ <gvxy_point X_Y="MBWH_EPxa;MBWH_EPya"/>
+ <gvxy_point X_Y="MBWH_EPxb;MBWH_EPyb"/>
+ <gvxy_point X_Y="MBWH_EPxc;MBWH_EPyc"/>
+ <gvxy_point X_Y="MBWH_EPxd;MBWH_EPyd"/>
+ <gvxy_point X_Y="MBWH_EPxe;MBWH_EPye"/>
+ <gvxy_point X_Y="MBWH_EPxf;MBWH_EPyf"/>
+ <gvxy_point X_Y="MBWH_EPxg;MBWH_EPyg"/>
+</gvxy>
+
+
+<!-- Central Reinforcing bar -->
+<!-- L Profile -->
+<!-- Derived variables -->
+<!-- piece 1 -->
+<var name="MBWH_CRBLP1xa" value="0"/>
+<var name="MBWH_CRBLP1ya" value="0"/>
+<var name="MBWH_CRBLP1xb" value="MBWH_CRBLPle1"/>
+<var name="MBWH_CRBLP1yb" value="MBWH_CRBLP1ya"/>
+<var name="MBWH_CRBLP1xc" value="MBWH_CRBLP1xb"/>
+<var name="MBWH_CRBLP1yc" value="MBWH_CRBLPhe2"/>
+<var name="MBWH_CRBLP1xd" value="MBWH_CRBLPle1-MBWH_CRBLPle2"/>
+<var name="MBWH_CRBLP1yd" value="MBWH_CRBLPhe1"/>
+<var name="MBWH_CRBLP1xe" value="MBWH_CRBLP1xa"/>
+<var name="MBWH_CRBLP1ye" value="MBWH_CRBLP1yd"/>
+
+<!-- piece 2 -->
+<var name="MBWH_CRBLP2dy" value="MBWH_CRBLPhe1-MBWH_CRBLPthi"/>
+
+
+<!-- Modelization -->
+<gvxy name="MBWH_CRB-LProfile1" material="Aluminium1" dZ="MBWH_CRBLPthi">
+ <gvxy_point X_Y="MBWH_CRBLP1xa;MBWH_CRBLP1ya"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xb;MBWH_CRBLP1yb"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xc;MBWH_CRBLP1yc"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xd;MBWH_CRBLP1yd"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xe;MBWH_CRBLP1ye"/>
+</gvxy>
+
+<var name="MBWH_CRBLP1z" value="-MBWH_CRBLPwid/2.+MBWH_CRBLPthi/2"/>
+
+<box name="MBWH_CRB-LProfile2" material="Aluminium1" X_Y_Z="MBWH_CRBLPle1;MBWH_CRBLP2dy;MBWH_CRBLPthi"/>
+<var name="MBWH_CRBLP2x" value="MBWH_CRBLPle1/2"/>
+<var name="MBWH_CRBLP2y" value="MBWH_CRBLPthi/2"/>
+<var name="MBWH_CRBLP2z" value="MBWH_CRBLP1z+(MBWH_CRBLPthi+MBWH_CRBLP2dy)/2"/>
+
+<box name="MBWH_CRB-Plate2" material="Aluminium1" X_Y_Z="MBWH_CRBPL2le;MBWH_CRBPL2th;MBWH_CRBPL2wi"/>
+<var name="MBWH_CRBPL2xp" value="MBWH_CRBLPle1/2"/>
+<var name="MBWH_CRBPL2yp" value="MBWH_CRBLPthi+MBWH_CRBPL2th/2"/>
+
+<box name="MBWH_CRB-Plate1" material="Aluminium1" X_Y_Z="MBWH_CRBPL1le;MBWH_CRBPL1th;MBWH_CRBPL1wi"/>
+<var name="MBWH_CRBPL1x1" value="MBWH_CRBLPle1/2+MBWH_CRBPL1pi-MBWH_CRBPL1le/2"/>
+<var name="MBWH_CRBPL1x2" value="MBWH_CRBLPle1/2-MBWH_CRBPL1po+MBWH_CRBPL1le/2"/>
+<var name="MBWH_CRBPL1yp" value="-MBWH_CRBPL1th/2."/>
+
+<box name="MBWH_CRB-Shim" material="Aluminium1" X_Y_Z="MBWH_CRBSHIle;MBWH_CRBSHIth;MBWH_CRBSHIwi"/>
+<var name="MBWH_CRBSHIx1" value="MBWH_CRBPL1x1+MBWH_CRBPL1le/2.-MBWH_CRBSHIle/2.-MBWH_CRBSHIof"/>
+<var name="MBWH_CRBSHIx2" value="MBWH_CRBPL1x2-MBWH_CRBPL1le/2.+MBWH_CRBSHIle/2.+MBWH_CRBSHIof"/>
+<var name="MBWH_CRBSHIyp" value="MBWH_CRBPL1yp-MBWH_CRBPL1th/2.-MBWH_CRBSHIth/2."/>
+
+
+<composition name="MBWH_CRB-LProfile_1">
+ <posXYZ volume="MBWH_CRB-LProfile1" X_Y_Z="0;0;MBWH_CRBLP1z"/>
+ <posXYZ volume="MBWH_CRB-LProfile2" X_Y_Z="MBWH_CRBLP2x;MBWH_CRBLP2y;MBWH_CRBLP2z" rot="90;0;0"/>
+</composition>
+
+<composition name="MBWH_CRB-LProfile_2">
+ <posXYZ volume="MBWH_CRB-LProfile1" X_Y_Z="0;0;-MBWH_CRBLP1z"/>
+ <posXYZ volume="MBWH_CRB-LProfile2" X_Y_Z="MBWH_CRBLP2x;MBWH_CRBLP2y;-MBWH_CRBLP2z" rot="90;0;0"/>
+</composition>
+
+
+<composition name="MBWH_CentralReinforcingbar">
+ <posXYZ volume="MBWH_CRB-LProfile_1"/>
+ <posXYZ volume="MBWH_CRB-LProfile_2"/>
+ <posXYZ volume="MBWH_CRB-Plate2" X_Y_Z="MBWH_CRBPL2xp;MBWH_CRBPL2yp;0"/>
+ <posXYZ volume="MBWH_CRB-Plate1" X_Y_Z="MBWH_CRBPL1x1;MBWH_CRBPL1yp;0"/>
+ <posXYZ volume="MBWH_CRB-Plate1" X_Y_Z="MBWH_CRBPL1x2;MBWH_CRBPL1yp;0"/>
+ <posXYZ volume="MBWH_CRB-Shim" X_Y_Z="MBWH_CRBSHIx1;MBWH_CRBSHIyp;0"/>
+ <posXYZ volume="MBWH_CRB-Shim" X_Y_Z="MBWH_CRBSHIx2;MBWH_CRBSHIyp;0"/>
+</composition>
+
+<!-- Cut profiles cross bracing large sector -->
+<!-- Derived variables -->
+<var name="MBWH_CBLxa" value="MBWH_CBext/2." />
+<var name="MBWH_CBLya" value="0." />
+<var name="MBWH_CBLxb" value="MBWH_CBLxa" />
+<var name="MBWH_CBLyb" value="MBWH_CBhei" />
+<var name="MBWH_CBLxc" value="MBWH_CBLxb-MBWH_CBLthi" />
+<var name="MBWH_CBLyc" value="MBWH_CBLyb" />
+<var name="MBWH_CBLxd" value="MBWH_CBLxc" />
+<var name="MBWH_CBLyd" value="MBWH_CBLthi" />
+
+<!-- Modelization -->
+
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem11" material="Aluminium1" dZ="MBWH_CBLl11">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem17" material="Aluminium1" dZ="MBWH_CBLl17">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem22" material="Aluminium1" dZ="MBWH_CBLl22">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem26" material="Aluminium1" dZ="MBWH_CBLl26">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem10" material="Aluminium1" dZ="MBWH_CBLl10">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem15" material="Aluminium1" dZ="MBWH_CBLl15">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem21" material="Aluminium1" dZ="MBWH_CBLl21">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem25" material="Aluminium1" dZ="MBWH_CBLl25">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+
+<!-- Contreventements, bay 1 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem8" material="Aluminium1" dZ="MBWH_CBLl8">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem9" material="Aluminium1" dZ="MBWH_CBLl9">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 2 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem14" material="Aluminium1" dZ="MBWH_CBLl14">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem13" material="Aluminium1" dZ="MBWH_CBLl13">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 3 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem20" material="Aluminium1" dZ="MBWH_CBLl20">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem18" material="Aluminium1" dZ="MBWH_CBLl18">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 4 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem24" material="Aluminium1" dZ="MBWH_CBLl24">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem23" material="Aluminium1" dZ="MBWH_CBLl23">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+
+<!-- cross bracing Plates large sector -->
+
+<!-- Bay 1 -->
+<var name="MBWH_CBPL10x1" value="MBWH_CBPL10le/2." />
+<var name="MBWH_CBPL10y1" value="MBWH_CBPL10wi/2.-MBWH_CBPL10cu" />
+<var name="MBWH_CBPL10x2" value="MBWH_CBPL10x1-MBWH_CBPL10cu" />
+<var name="MBWH_CBPL10y2" value="MBWH_CBPL10wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem10" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL10x1;MBWH_CBPL10y1"/>
+ <gvxy_point X_Y="MBWH_CBPL10x2;MBWH_CBPL10y2"/>
+</gvxysxy>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBPL15x1" value="MBWH_CBPL15le/2." />
+<var name="MBWH_CBPL15y1" value="MBWH_CBPL15wi/2.-MBWH_CBPL15cu" />
+<var name="MBWH_CBPL15x2" value="MBWH_CBPL15x1-MBWH_CBPL15cu" />
+<var name="MBWH_CBPL15y2" value="MBWH_CBPL15wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem15" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL15x1;MBWH_CBPL15y1"/>
+ <gvxy_point X_Y="MBWH_CBPL15x2;MBWH_CBPL15y2"/>
+</gvxysxy>
+
+<!-- Bay 3 -->
+<var name="MBWH_CBPL21x1" value="MBWH_CBPL21le/2." />
+<var name="MBWH_CBPL21y1" value="MBWH_CBPL21wi/2.-MBWH_CBPL21cu" />
+<var name="MBWH_CBPL21x2" value="MBWH_CBPL21x1-MBWH_CBPL21cu" />
+<var name="MBWH_CBPL21y2" value="MBWH_CBPL21wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem21" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL21x1;MBWH_CBPL21y1"/>
+ <gvxy_point X_Y="MBWH_CBPL21x2;MBWH_CBPL21y2"/>
+</gvxysxy>
+
+<!-- Bay 4 -->
+<var name="MBWH_CBPL25x1" value="MBWH_CBPL25le/2." />
+<var name="MBWH_CBPL25y1" value="MBWH_CBPL25wi/2.-MBWH_CBPL25cu" />
+<var name="MBWH_CBPL25x2" value="MBWH_CBPL25x1-MBWH_CBPL25cu" />
+<var name="MBWH_CBPL25y2" value="MBWH_CBPL25wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem25" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL25x1;MBWH_CBPL25y1"/>
+ <gvxy_point X_Y="MBWH_CBPL25x2;MBWH_CBPL25y2"/>
+</gvxysxy>
+
+
+<!-- Bay 1 -->
+<var name="MBWH_CBL10z" value="MBWH_CBLl10/2." />
+<var name="MBWH_CBPL10d" value="MBWH_CBPL10wi-2.*MBWH_CBPL10cu" />
+<var name="MBWH_CBPL10zb" value="MBWH_CBPL10za+sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10d/2." />
+<var name="MBWH_CBPL10yb" value="MBWH_CBPL10ya-cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10d/2." />
+<var name="MBWH_CBPL10zc" value="MBWH_CBPL10zb+cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10le/2" />
+<var name="MBWH_CBPL10yc" value="MBWH_CBPL10yb+sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10le/2" />
+ <!-- get positions of contreventements 8,9 using locations of item 10 extremities -->
+<var name="MBWH_cvl10xo" value="-MBWH_CBPL10zc*cos(MBWH_CBPL10ti*GENV_PiS180)-0.5*(MBWH_CBhei)*sin(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvl10yo" value=" MBWH_CBPL10zc*sin(MBWH_CBPL10ti*GENV_PiS180)-0.5*(MBWH_CBhei)*cos(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvl10xu" value="MBWH_cvl10xo+MBWH_CBLl10*cos(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvl10yu" value="MBWH_cvl10yo-MBWH_CBLl10*sin(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvlx8" value="-MBWH_cvl10xu+cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl8/2." />
+<var name="MBWH_cvly8" value=" MBWH_cvl10yu+sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl8/2." />
+<var name="MBWH_cvlx9" value="-MBWH_cvl10xo-cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl9/2." />
+<var name="MBWH_cvly9" value=" MBWH_cvl10yo-sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl9/2." />
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem10Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem10" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay1LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem10" X_Y_Z="0;0;MBWH_CBL10z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem10Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL10yc;MBWH_CBPL10zc" rot="-MBWH_CBPL10ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem10Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL10yc;MBWH_CBPL10zc" rot="-MBWH_CBPL10ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay1LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay1LargeSector" X_Y_Z="0;-MBWH_CBPL10yc;-MBWH_CBPL10zc" />
+</composition>
+<composition name="MBWH_CroisillonBay1LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay1LargeSector" rot="MBWH_CBPL10ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem8" X_Y_Z="MBWH_cvlx8;MBWH_cvly8;0" rot="-MBWH_CBPL10ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem9" X_Y_Z="MBWH_cvlx9;MBWH_cvly9;0" rot="-MBWH_CBPL10ti;90;0" />
+</composition>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBL15z" value="MBWH_CBLl15/2." />
+<var name="MBWH_CBPL15d" value="MBWH_CBPL15wi-2.*MBWH_CBPL15cu" />
+<var name="MBWH_CBPL15zb" value="MBWH_CBPL15za+sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15d/2." />
+<var name="MBWH_CBPL15yb" value="MBWH_CBPL15ya-cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15d/2." />
+<var name="MBWH_CBPL15zi" value="MBWH_CBPL15zb+cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15le/2" />
+<var name="MBWH_CBPL15yi" value="MBWH_CBPL15yb+sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15le/2" />
+<var name="MBWH_CBPL15zc" value="MBWH_CBLl15-MBWH_CBPL15zi" />
+<var name="MBWH_CBPL15yc" value="MBWH_CBhei-MBWH_CBPL15yi" />
+ <!-- get positions of contreventements 14, 13 using locations of item 15 extremities -->
+<var name="MBWH_cvl15xo" value="-MBWH_CBPL15zc*cos(MBWH_CBPL15ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL15ya)*sin(MBWH_CBPL15ti*GENV_PiS180)"/>
+<var name="MBWH_cvl15yo" value=" MBWH_CBPL15zc*sin(MBWH_CBPL15ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL15ya)*cos(MBWH_CBPL15ti*GENV_PiS180)"/>
+<var name="MBWH_cvl15xu" value="MBWH_cvl15xo+MBWH_CBLl15*cos(MBWH_CBPL15ti*GENV_PiS180)" />
+<var name="MBWH_cvl15yu" value="MBWH_cvl15yo-MBWH_CBLl15*sin(MBWH_CBPL15ti*GENV_PiS180)" />
+<var name="MBWH_cvlx14" value="-MBWH_cvl15xu+cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl14/2." />
+<var name="MBWH_cvly14" value=" MBWH_cvl15yu+sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl14/2." />
+<var name="MBWH_cvlx13" value="-MBWH_cvl15xo-cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl13/2." />
+<var name="MBWH_cvly13" value=" MBWH_cvl15yo-sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl13/2." />
+
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem15Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem15" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay2LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem15" X_Y_Z="0;0;MBWH_CBL15z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem15Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL15yc;MBWH_CBPL15zc" rot="-MBWH_CBPL15ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem15Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL15yc;MBWH_CBPL15zc" rot="-MBWH_CBPL15ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay2LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay2LargeSector" X_Y_Z="0;-MBWH_CBPL15yc;-MBWH_CBPL15zc" />
+</composition>
+<composition name="MBWH_CroisillonBay2LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay2LargeSector" rot="MBWH_CBPL15ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem14" X_Y_Z="MBWH_cvlx14;MBWH_cvly14;0" rot="-MBWH_CBPL15ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem13" X_Y_Z="MBWH_cvlx13;MBWH_cvly13;0" rot="-MBWH_CBPL15ti;90;0" />
+</composition>
+
+
+<!-- Bay 3 -->
+<var name="MBWH_CBL21z" value="MBWH_CBLl21/2." />
+<var name="MBWH_CBPL21d" value="MBWH_CBPL21wi-2.*MBWH_CBPL21cu" />
+<var name="MBWH_CBPL21zb" value="MBWH_CBPL21za+sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21d/2." />
+<var name="MBWH_CBPL21yb" value="MBWH_CBPL21ya-cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21d/2." />
+<var name="MBWH_CBPL21z" value="MBWH_CBPL21zb+cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21le/2" />
+<var name="MBWH_CBPL21yi" value="MBWH_CBPL21yb+sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21le/2" />
+<var name="MBWH_CBPL21zc" value="MBWH_CBLl21-MBWH_CBPL21z" />
+<var name="MBWH_CBPL21yc" value="MBWH_CBhei-MBWH_CBPL21yi" />
+ <!-- get positions of contreventements 14, 13 using locations of item 21 extremities -->
+<var name="MBWH_cvl21xo" value="-MBWH_CBPL21zc*cos(MBWH_CBPL21ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL21ya)*sin(MBWH_CBPL21ti*GENV_PiS180)"/>
+<var name="MBWH_cvl21yo" value=" MBWH_CBPL21zc*sin(MBWH_CBPL21ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL21ya)*cos(MBWH_CBPL21ti*GENV_PiS180)"/>
+<var name="MBWH_cvl21xu" value="MBWH_cvl21xo+MBWH_CBLl21*cos(MBWH_CBPL21ti*GENV_PiS180)" />
+<var name="MBWH_cvl21yu" value="MBWH_cvl21yo-MBWH_CBLl21*sin(MBWH_CBPL21ti*GENV_PiS180)" />
+<var name="MBWH_cvlx20" value="-MBWH_cvl21xu+cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl20/2." />
+<var name="MBWH_cvly20" value=" MBWH_cvl21yu+sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl20/2." />
+<var name="MBWH_cvlx18" value="-MBWH_cvl21xo-cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl18/2." />
+<var name="MBWH_cvly18" value=" MBWH_cvl21yo-sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl18/2." />
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem21Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem21" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay3LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem21" X_Y_Z="0;0;MBWH_CBL21z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem21Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL21yc;MBWH_CBPL21zc" rot="-MBWH_CBPL21ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem21Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL21yc;MBWH_CBPL21zc" rot="-MBWH_CBPL21ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay3LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay3LargeSector" X_Y_Z="0;-MBWH_CBPL21yc;-MBWH_CBPL21zc" />
+</composition>
+<composition name="MBWH_CroisillonBay3LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay3LargeSector" rot="MBWH_CBPL21ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem20" X_Y_Z="MBWH_cvlx20;MBWH_cvly20;0" rot="-MBWH_CBPL21ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem18" X_Y_Z="MBWH_cvlx18;MBWH_cvly18;0" rot="-MBWH_CBPL21ti;90;0" />
+</composition>
+
+
+
+<!-- Bay 4 -->
+<var name="MBWH_CBPL25tii" value="90-MBWH_CBPL25ti" />
+<var name="MBWH_CBL25z" value="-MBWH_CBLl25/2." />
+<var name="MBWH_CBPL25d" value="MBWH_CBPL25wi-2.*MBWH_CBPL25cu" />
+<var name="MBWH_CBPL25zb" value="-MBWH_CBPL25za-sin(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25d/2." />
+<var name="MBWH_CBPL25yb" value="MBWH_CBPL25ya-cos(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25d/2." />
+<var name="MBWH_CBPL25zc" value="MBWH_CBPL25zb-cos(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25le/2" />
+<var name="MBWH_CBPL25yc" value="MBWH_CBPL25yb+sin(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25le/2" />
+ <!-- get positions of contreventements 14, 13 using locations of item 25 extremities -->
+<var name="MBWH_cvl25xo" value="-MBWH_CBPL25zc*cos(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL25ya)*sin(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25yo" value=" MBWH_CBPL25zc*sin(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL25ya)*cos(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25xo" value="-MBWH_CBPL25zc*cos(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei)*cos(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25yo" value=" MBWH_CBPL25zc*sin(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei)*sin(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25xu" value="MBWH_cvl25xo-MBWH_CBLl25*cos(MBWH_CBPL25tii*GENV_PiS180)" />
+<var name="MBWH_cvl25yu" value="MBWH_cvl25yo+MBWH_CBLl25*sin(MBWH_CBPL25tii*GENV_PiS180)" />
+<var name="MBWH_cvlx24" value="-MBWH_cvl25xo+cos(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl24/2." />
+<var name="MBWH_cvly24" value=" MBWH_cvl25yo+sin(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl24/2." />
+<var name="MBWH_cvlx23" value="-MBWH_cvl25xu-cos(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl23/2." />
+<var name="MBWH_cvly23" value=" MBWH_cvl25yu-sin(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl23/2." />
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem25Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem25" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay4LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem25" X_Y_Z="0;0;MBWH_CBL25z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem25Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL25yc;MBWH_CBPL25zc" rot="MBWH_CBPL25ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem25Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL25yc;MBWH_CBPL25zc" rot="MBWH_CBPL25ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay4LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay4LargeSector" X_Y_Z="0;-MBWH_CBPL25yc;-MBWH_CBPL25zc" />
+</composition>
+<composition name="MBWH_CroisillonBay4LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay4LargeSector" rot="90-MBWH_CBPL25ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem24" X_Y_Z="MBWH_cvlx24;MBWH_cvly24;0" rot="MBWH_CBPL25ti-90;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem23" X_Y_Z="MBWH_cvlx23;MBWH_cvly23;0" rot="MBWH_CBPL25ti-90;90;0" />
+</composition>
+
+
+
+<!-- Inner and Outer spoke large sector -->
+
+<gvxysx name="MBWH_SpokeLargeSectorUprofile" material="Aluminium1" dZ="MBWH_SlsUPlen">
+ <gvxy_point X_Y="MBWH_SUPxa;MBWH_SUPya"/>
+ <gvxy_point X_Y="MBWH_SUPxb;MBWH_SUPyb"/>
+ <gvxy_point X_Y="MBWH_SUPxc;MBWH_SUPyc"/>
+ <gvxy_point X_Y="MBWH_SUPxd;MBWH_SUPyd"/>
+</gvxysx>
+
+<!-- Derived variables -->
+<!-- positions of reinforcing bars -->
+<var name="MBWH_SlsRBpz1" value="MBWH_SlsUPlen/2.-MBWH_SlsRBdz1-MBWH_SRBhos/2."/>
+<var name="MBWH_SlsRBpz2" value="MBWH_SlsRBpz1-MBWH_SlsRBdz2"/>
+<var name="MBWH_SlsRBpz3" value="MBWH_SlsRBpz2-MBWH_SlsRBdz3"/>
+<var name="MBWH_SlsRBpz4" value="MBWH_SlsRBpz3-MBWH_SlsRBdz4"/>
+
+<!-- Relative positions of spokes -->
+<var name="MBWH_SlsIxpos" value="MBWH_SRBpx+MBWH_SUPext/2.+MBWH_RBBthi+MBWH_RBSthi/2." />
+<var name="MBWH_SlsIypos" value="-MBWH_RBSlen+MBWH_RBBsiz" />
+<var name="MBWH_SlsIzpos" value="-MBWH_SlsIypos*tan(MBWH_SLangle*GENV_PiS180)" />
+
+
+<!-- Transversal beam, central support -->
+<!-- Derived variables -->
+<var name="MBWH_TBCSxa" value="MBWH_TBCSlen1/2." />
+<var name="MBWH_TBCSya" value="0." />
+<var name="MBWH_TBCSxc" value="MBWH_TBCSlen2/2.-MBWH_TBCSext" />
+<var name="MBWH_TBCSyc" value="MBWH_TBCShei" />
+<var name="MBWH_TBCSxb" value="MBWH_TBCSlen2/2." />
+<var name="MBWH_TBCSyb" value="MBWH_TBCSyc-MBWH_TBCSext*tan(MBWH_TBCSang1*GENV_PiS180)" />
+
+<var name="MBWH_TBCSxa1" value="MBWH_TBCSxa-MBWH_TBCSoffs/cos(MBWH_TBCSang1*GENV_PiS180)" />
+<var name="MBWH_TBCSya1" value="0." />
+<var name="MBWH_TBCSxb1" value="MBWH_TBCSxa1+MBWH_TBCShei*tan(MBWH_TBCSang2*GENV_PiS180)" />
+<var name="MBWH_TBCSyb1" value="MBWH_TBCShei" />
+
+<var name="MBWH_TBCSxoff" value="(MBWH_TBCSthi1+MBWH_TBCSthi2)/2." />
+
+<!-- Transversal beam, central support Position -->
+<var name="MBWH_TBCSypos" value="MBWH_Slsypos-(.5*MBWH_SlsUPlen)*cos(MBWH_SLangle*GENV_PiS180)-MBWH_TBCShei"/>
+<var name="MBWH_TBCSzpos" value="-MBWH_SlsIzpos/2.-MBWH_TBCSxoff"/>
+<!-- Connection beam / extremity plate position relative to Transversal beam, central support -->
+<var name="MBWH_CBEPxpos" value="MBWH_TBCSxa1+MBWH_CBEPyb*cos(MBWH_CBEPa1*GENV_PiS180)+(MBWH_CBEPyc-MBWH_CBEPyb)/cos(MBWH_CBEPa1*GENV_PiS180)"/>
+<var name="MBWH_CBEPypos" value="-MBWH_CBEPyb*sin(MBWH_CBEPa1*GENV_PiS180)-GENV_Eps"/>
+<var name="MBWH_CBEPzpos" value="MBWH_TBCSthi1/2+MBWH_CBEPthic/2+GENV_Eps"/>
+<!-- extremity plate position relative to Transversal beam, central support -->
+<var name="MBWH_EPxpos" value="MBWH_CBEPxpos+MBWH_EPl1*sin(MBWH_CBEPa1*GENV_PiS180)-0.5*MBWH_EPthic*cos(MBWH_CBEPa1*GENV_PiS180)"/>
+<var name="MBWH_EPypos" value="MBWH_CBEPypos+MBWH_EPl1*cos(MBWH_CBEPa1*GENV_PiS180)+0.5*MBWH_EPthic*sin(MBWH_CBEPa1*GENV_PiS180)"/>
+<var name="MBWH_EPzpos" value="MBWH_CBEPzpos-MBWH_CBEPthic/2"/>
+<!-- Reinforcing Bar relative to extremity plate position -->
+<var name="MBWH_RBxpos" value="MBWH_EPxpos+MBWH_CRBxoff"/>
+<var name="MBWH_RBypos" value="MBWH_EPypos+MBWH_CRByoff"/>
+<var name="MBWH_RBzpos" value="MBWH_EPzpos+MBWH_CRBzoff"/>
+
+
+<gvxysx name="MBWH_TransvBeamCSupLargeSect1" material="Aluminium1" dZ="MBWH_TBCSthi1">
+ <gvxy_point X_Y="MBWH_TBCSxa;MBWH_TBCSya"/>
+ <gvxy_point X_Y="MBWH_TBCSxb;MBWH_TBCSyb"/>
+ <gvxy_point X_Y="MBWH_TBCSxc;MBWH_TBCSyc"/>
+</gvxysx>
+<gvxysx name="MBWH_TransvBeamCSupLargeSect2" material="Aluminium1" dZ="MBWH_TBCSthi2">
+ <gvxy_point X_Y="MBWH_TBCSxa1;MBWH_TBCSya1"/>
+ <gvxy_point X_Y="MBWH_TBCSxb1;MBWH_TBCSyb1"/>
+</gvxysx>
+
+<composition name="MBWH_TransvBeamCSupLargeSect">
+ <posXYZ volume="MBWH_TransvBeamCSupLargeSect1" />
+ <posXYZ volume="MBWH_TransvBeamCSupLargeSect2" X_Y_Z="0;0;MBWH_TBCSxoff"/>
+</composition>
+
+
+<composition name="MBWH_SpokesLargeSectorAssembly1">
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz1" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz2" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz3" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz4" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile" X_Y_Z=" MBWH_SlsIxpos;MBWH_SlsIypos;MBWH_SlsIzpos"/>
+</composition>
+
+<composition name="MBWH_SpokesLargeSectorAssembly2">
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz1" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz2" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz3" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz4" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile" X_Y_Z=" MBWH_SlsIxpos;MBWH_SlsIypos;-MBWH_SlsIzpos"/>
+</composition>
+
+
+<composition name="MBWH_SpokesLargeSectorAssemblyTemp1">
+ <posXYZ volume="MBWH_SpokesLargeSectorAssembly1" X_Y_Z="MBWH_SlsIxref;MBWH_Slsypos;0" rot="0.; 90.;90-MBWH_SLangle" />
+</composition>
+
+<composition name="MBWH_SpokesLargeSectorAssemblyTemp2">
+ <posXYZ volume="MBWH_SpokesLargeSectorAssembly2" X_Y_Z="-MBWH_SlsIxref;MBWH_Slsypos;0" rot="180.; 90.;90+MBWH_SLangle" />
+</composition>
+
+<composition name="MBWH_InnerAssemblyTemp1">
+ <posXYZ volume="MBWH_ConnectionBeamExtremityPlate" X_Y_Z="MBWH_CBEPxpos;MBWH_CBEPypos;MBWH_CBEPzpos" rot="0;0;90-MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_ExtremityPlate" X_Y_Z="MBWH_EPxpos;MBWH_EPypos;MBWH_EPzpos" rot="-90.; 0.;-90-MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_CentralReinforcingbar" X_Y_Z="MBWH_RBxpos;MBWH_RBypos;MBWH_RBzpos" rot="180.; 0.;-90-MBWH_CBEPa1" />
+</composition>
+
+<composition name="MBWH_InnerAssemblyTemp2">
+ <posXYZ volume="MBWH_ConnectionBeamExtremityPlate" X_Y_Z="-MBWH_CBEPxpos;MBWH_CBEPypos;MBWH_CBEPzpos" rot="180;0;90+MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_ExtremityPlate" X_Y_Z="-MBWH_EPxpos;MBWH_EPypos;MBWH_EPzpos" rot="-90.; 0.;-90+MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_CentralReinforcingbar" X_Y_Z="-MBWH_RBxpos;MBWH_RBypos;MBWH_RBzpos" rot="0.; 0.;-90+MBWH_CBEPa1" />
+</composition>
+
+<composition name="MBWH_InnerAssembly">
+ <posXYZ volume="MBWH_TransvBeamCSupLargeSect" X_Y_Z="0;0;0" />
+ <posXYZ volume="MBWH_InnerAssemblyTemp1" />
+ <posXYZ volume="MBWH_InnerAssemblyTemp2" />
+</composition>
+
+
+
+<composition name="MBWH_LargeSector">
+ <posXYZ volume="MBWH_SpokesLargeSectorAssemblyTemp1" />
+ <posXYZ volume="MBWH_SpokesLargeSectorAssemblyTemp2" />
+ <posXYZ volume="MBWH_InnerAssembly" X_Y_Z="0;MBWH_TBCSypos;MBWH_TBCSzpos"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem11" X_Y_Z=" 0.;MBWH_CBLy11;0" rot="0.;90.;0."/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem17" X_Y_Z=" 0.;MBWH_CBLy17;0" rot="0.;90.;0."/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem22" X_Y_Z=" 0.;MBWH_CBLy22;0" rot="0.;90.;0."/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem26" X_Y_Z=" 0.;MBWH_CBLy26;0" rot="0.;90.;0."/>
+
+ <posXYZ volume="MBWH_CroisillonBay1LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily10;0" rot="0.;0.;0."/>
+ <posXYZ volume="MBWH_CroisillonBay2LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily15;0" rot="0.;0.;0."/>
+ <posXYZ volume="MBWH_CroisillonBay3LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily21;0" rot="0.;0.;0."/>
+ <posXYZ volume="MBWH_CroisillonBay4LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily25+20;0" rot="0.;0.;0."/>
+</composition>
+
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** Small Sector ****
+ *** ****
+ **************************************************************
+-->
+
+<!-- ATLMHHBM0100 -->
+<!-- Cut profiles Cross Bracing small sector -->
+<var name="MBWH_CBSthi" value="6"/>
+
+<!-- Contreventements lengths -->
+<!-- item numbering in ATLMHHBM0003 -->
+<var name="MBWH_CBSl10" value="1650" /> <!-- item 10 -->
+<var name="MBWH_CBSl14" value="1050" /> <!-- item 14 -->
+<var name="MBWH_CBSl18a" value="533" /> <!-- item 18 -->
+<var name="MBWH_CBSl18b" value="510" /> <!-- item 18 -->
+
+<!-- Contreventements positions (...to be confirmed...) -->
+<var name="MBWH_CBSy10" value="9730" /> <!-- item 10 -->
+<var name="MBWH_CBSy14" value="7760" /> <!-- item 14 -->
+<var name="MBWH_CBSy18" value="5820" /> <!-- item 18 -->
+
+<!-- item numbering in ATLMHHBM0003 -->
+<!-- Cross bracing, bay 1 small sector -->
+<var name="MBWH_CBSl9" value="2625"/> <!-- item 9 --> <!-- drawing ATLMHHBM0047 -->
+<!-- Cross bracing, bay 2 small sector -->
+<var name="MBWH_CBSl11" value="2360"/> <!-- item 11 --> <!-- drawing ATLMHHBM0049 -->
+<!-- Cross bracing, bay 3 small sector -->
+<var name="MBWH_CBSl15" value="2025"/> <!-- item 15 --> <!-- drawing ATLMHHBM0052 -->
+
+<!-- item numbering in ATLMHHBM0003 -->
+<!-- Contreventements, bay 1 small sector -->
+<var name="MBWH_CBSl7" value="1430"/> <!-- item 7 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSl8" value="1120"/> <!-- item 8 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSb1xof" value="6"/> <!-- x offset item 7 & 8 , to be confirmed - see drawing ATLMHHBM0003 -->
+<var name="MBWH_CBSb1yof" value="2"/> <!-- y offset item 7 & 8 , to be confirmed - see drawing ATLMHHBM0003 -->
+
+<!-- Contreventements, bay 2 small sector -->
+<var name="MBWH_CBSl12" value="1360"/> <!-- item 12 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSl13" value="890"/> <!-- item 13 --> <!-- drawing ATLMHHBM0100 -->
+
+<!-- Contreventements, bay 3 small sector -->
+<var name="MBWH_CBSl16" value="1260"/> <!-- item 16 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSl17" value="600"/> <!-- item 17 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSb3xof" value="8"/> <!-- x offset item 16 & 17, to be confirmed - see drawing ATLMHHBM0003 -->
+<var name="MBWH_CBSb3yof" value="2"/> <!-- y offset item 16 & 17, to be confirmed - see drawing ATLMHHBM0003 -->
+
+<!-- Plates -->
+ <!-- item 9 for Bay 1 --> <!-- drawing ATLMHHBM0057 -->
+<var name="MBWH_CBPS9le" value="300"/> <!-- length -->
+<var name="MBWH_CBPS9wi" value="270"/> <!-- width -->
+<var name="MBWH_CBPS9cu" value="60"/> <!-- cut -->
+<var name="MBWH_CBPS9ti" value="41.2"/> <!-- tilt --> <!-- ????????????? -->
+<var name="MBWH_CBPS9za" value="1311"/> <!-- Plate offset -->
+<var name="MBWH_CBPS9ya" value="-13.3"/> <!-- Plate offset -->
+ <!-- item 11 for Bay 2 --> <!-- drawing ATLMHHBM0049 -->
+<var name="MBWH_CBPS11le" value="260"/> <!-- length -->
+<var name="MBWH_CBPS11wi" value="300"/> <!-- width -->
+<var name="MBWH_CBPS11cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPS11ti" value="52.9"/> <!-- tilt --> <!-- ????????????? -->
+<var name="MBWH_CBPS11za" value="764.9"/> <!-- Plate offset -->
+<var name="MBWH_CBPS11ya" value="32.1"/> <!-- Plate offset w.r.t base -->
+ <!-- item 15 for Bay 3 --> <!-- drawing ATLMHHBM0052 -->
+<var name="MBWH_CBPS15le" value="200"/> <!-- length -->
+<var name="MBWH_CBPS15wi" value="380"/> <!-- width -->
+<var name="MBWH_CBPS15cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPS15ti" value="65.5"/> <!-- tilt --> <!-- ????????????? -->
+<var name="MBWH_CBPS15za" value="473.8"/> <!-- Plate offset -->
+<var name="MBWH_CBPS15ya" value="26"/> <!-- Plate offset -->
+
+<!-- positions (... measured on ATLMHHBM003 ... to be confirmed ...) -->
+<var name="MBWH_Croisy9" value="10550"/> <!-- item 9 -->
+<var name="MBWH_Croisy11" value="8580"/> <!-- item 11 -->
+<var name="MBWH_Croisy15" value="6520"/> <!-- item 15 -->
+
+<!-- Special Cut profiles cross bracing small sector item 18-->
+<!-- ATLMHHBM0067-->
+<var name="MBWH_CBext18" value="138"/>
+<var name="MBWH_CBhei18" value="35"/>
+<var name="MBWH_CBSthi18" value="5"/>
+
+
+<!-- ATLMHHBM0003B -->
+<!-- Spokes Opening angle small sector -->
+<var name="MBWH_SSangle" value="8.5"/>
+<!-- Y-ref -->
+<var name="MBWH_yref" value="1682.7"/>
+<!-- Inner spoke y position wrt ref -->
+<var name="MBWH_SIypos" value="2252.8"/>
+<!-- External spoke y position wrt ref -->
+<var name="MBWH_SEypos" value="280.7"/>
+
+<!-- Spoke small sector -->
+<!-- Inner spoke small sector ATLMHHBM0085 -->
+<!-- External spoke small sector ATLMHHBM0086 & ATLMHHBM0087 -->
+
+<!-- ATLMHHBM0085 ... -->
+<!-- U profile length Inner spoke -->
+<var name="MBWH_SsiUPlen" value="7680"/>
+<!-- U profile length External spoke -->
+<var name="MBWH_SseUPlen" value="9530"/>
+<!-- U profile Inner spoke extremity cut height -->
+<var name="MBWH_SsiUPhcu" value="12"/>
+
+
+<!-- ATLMHHBM0085 -->
+<!-- relative positions of reinforcing bars -->
+<var name="MBWH_SssRBdz1" value="2575"/>
+<var name="MBWH_SssRBdz2" value="2055"/>
+<var name="MBWH_SssRBdz3" value="2250"/>
+
+<!-- Spoke Reinforcing Bar 1 and 2 -->
+<var name="MBWH_SRBthi" value="25"/>
+
+<!-- ATLMHHBM0054 -->
+<!-- Spoke Reinforcing Bar 1 -->
+<var name="MBWH_SRB1dx1" value="962"/>
+<var name="MBWH_SRB1dx2" value="1765"/>
+<var name="MBWH_SRB1dx3" value="81"/>
+<var name="MBWH_SRB1dx4" value="1712"/>
+<var name="MBWH_SRB1dy1" value="150"/>
+<var name="MBWH_SRB1dy2" value="440"/>
+<var name="MBWH_SRB1dy3" value="180"/>
+<var name="MBWH_SRB1alph" value="39"/>
+<var name="MBWH_SRB1ypos" value="2910"/>
+
+<!-- ATLMHHBM0058 -->
+<!-- Spoke Reinforcing Bar 2 -->
+<var name="MBWH_SRB2dx1" value="2474"/>
+<var name="MBWH_SRB2dx2" value="2429"/>
+<var name="MBWH_SRB2dy" value="152"/>
+<var name="MBWH_SRB2ypos" value="5020"/>
+
+
+<!-- Cut profiles cross bracing small sector -->
+<!-- Derived variables -->
+<var name="MBWH_CBSxa" value="MBWH_CBext/2." />
+<var name="MBWH_CBSya" value="0." />
+<var name="MBWH_CBSxb" value="MBWH_CBSxa" />
+<var name="MBWH_CBSyb" value="MBWH_CBhei" />
+<var name="MBWH_CBSxc" value="MBWH_CBSxb-MBWH_CBSthi" />
+<var name="MBWH_CBSyc" value="MBWH_CBSyb" />
+<var name="MBWH_CBSxd" value="MBWH_CBSxc" />
+<var name="MBWH_CBSyd" value="MBWH_CBSthi" />
+<!-- Derived variables for special item 18 -->
+<var name="MBWH_CBS18xa" value="MBWH_CBext18/2." />
+<var name="MBWH_CBS18ya" value="0." />
+<var name="MBWH_CBS18xb" value="MBWH_CBS18xa" />
+<var name="MBWH_CBS18yb" value="MBWH_CBhei18" />
+<var name="MBWH_CBS18xc" value="MBWH_CBS18xb-MBWH_CBSthi18" />
+<var name="MBWH_CBS18yc" value="MBWH_CBS18yb" />
+<var name="MBWH_CBS18xd" value="MBWH_CBS18xc" />
+<var name="MBWH_CBS18yd" value="MBWH_CBSthi18" />
+
+<var name="MBWH_CBSy18b" value="MBWH_CBSy18-MBWH_CBhei18" />
+
+<!-- Modelization -->
+
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem10" material="Aluminium1" dZ="MBWH_CBSl10">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem14" material="Aluminium1" dZ="MBWH_CBSl14">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem18a" material="Aluminium1" dZ="MBWH_CBSl18a">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem18b" material="Aluminium1" dZ="MBWH_CBSl18b">
+ <gvxy_point X_Y="MBWH_CBS18xa;MBWH_CBS18ya"/>
+ <gvxy_point X_Y="MBWH_CBS18xb;MBWH_CBS18yb"/>
+ <gvxy_point X_Y="MBWH_CBS18xc;MBWH_CBS18yc"/>
+ <gvxy_point X_Y="MBWH_CBS18xd;MBWH_CBS18yd"/>
+</gvxysx>
+
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem9" material="Aluminium1" dZ="MBWH_CBSl9">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem11" material="Aluminium1" dZ="MBWH_CBSl11">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem15" material="Aluminium1" dZ="MBWH_CBSl15">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+
+<!-- Contreventements, bay 1 small sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem7" material="Aluminium1" dZ="MBWH_CBSl7">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem8" material="Aluminium1" dZ="MBWH_CBSl8">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 2 small sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem12" material="Aluminium1" dZ="MBWH_CBSl12">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem13" material="Aluminium1" dZ="MBWH_CBSl13">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 3 small sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem16" material="Aluminium1" dZ="MBWH_CBSl16">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem17" material="Aluminium1" dZ="MBWH_CBSl17">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+
+
+<!-- cross bracing Plates small sector -->
+
+<!-- Bay 1 -->
+<var name="MBWH_CBPS9x1" value="MBWH_CBPS9le/2." />
+<var name="MBWH_CBPS9y1" value="MBWH_CBPS9wi/2.-MBWH_CBPS9cu" />
+<var name="MBWH_CBPS9x2" value="MBWH_CBPS9x1-MBWH_CBPS9cu" />
+<var name="MBWH_CBPS9y2" value="MBWH_CBPS9wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateSmallSectorItem9" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPS9x1;MBWH_CBPS9y1"/>
+ <gvxy_point X_Y="MBWH_CBPS9x2;MBWH_CBPS9y2"/>
+</gvxysxy>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBPS11x1" value="MBWH_CBPS11le/2." />
+<var name="MBWH_CBPS11y1" value="MBWH_CBPS11wi/2.-MBWH_CBPS11cu" />
+<var name="MBWH_CBPS11x2" value="MBWH_CBPS11x1-MBWH_CBPS11cu" />
+<var name="MBWH_CBPS11y2" value="MBWH_CBPS11wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateSmallSectorItem11" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPS11x1;MBWH_CBPS11y1"/>
+ <gvxy_point X_Y="MBWH_CBPS11x2;MBWH_CBPS11y2"/>
+</gvxysxy>
+
+<!-- Bay 3 -->
+<var name="MBWH_CBPS15x1" value="MBWH_CBPS15le/2." />
+<var name="MBWH_CBPS15y1" value="MBWH_CBPS15wi/2.-MBWH_CBPS15cu" />
+<var name="MBWH_CBPS15x2" value="MBWH_CBPS15x1-MBWH_CBPS15cu" />
+<var name="MBWH_CBPS15y2" value="MBWH_CBPS15wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateSmallSectorItem15" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPS15x1;MBWH_CBPS15y1"/>
+ <gvxy_point X_Y="MBWH_CBPS15x2;MBWH_CBPS15y2"/>
+</gvxysxy>
+
+
+<!-- Bay 1 -->
+<var name="MBWH_CBS9z" value="MBWH_CBSl9/2." />
+<var name="MBWH_CBPS9d" value="MBWH_CBPS9wi-2.*MBWH_CBPS9cu" />
+<var name="MBWH_CBPS9zb" value="MBWH_CBPS9za+sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9d/2." />
+<var name="MBWH_CBPS9ya" value="MBWH_CBPS9cu*sqrt(2.)*cos((45-MBWH_CBPS9ti)*GENV_PiS180) -MBWH_CBhei+MBWH_CBPS9ya" />
+<var name="MBWH_CBPS9yb" value="-MBWH_CBPS9ya-cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9d/2." />
+<var name="MBWH_CBPS9zc" value="MBWH_CBPS9zb+cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9le/2" />
+<var name="MBWH_CBPS9yc" value="MBWH_CBPS9yb+sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9le/2" />
+ <!-- get positions of contreventements 7,8 using locations of item 9 extremities -->
+<var name="MBWH_cvs9xo" value="-MBWH_CBPS9zc*cos(MBWH_CBPS9ti*GENV_PiS180)-0.5*(MBWH_CBhei)*sin(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvs9yo" value=" MBWH_CBPS9zc*sin(MBWH_CBPS9ti*GENV_PiS180)-0.5*(MBWH_CBhei)*cos(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvs9xu" value="MBWH_cvs9xo+MBWH_CBSl9*cos(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvs9yu" value="MBWH_cvs9yo-MBWH_CBSl9*sin(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvsx8" value="-MBWH_cvs9xu+cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl8/2.-MBWH_CBSb1xof" />
+<var name="MBWH_cvsy8" value=" MBWH_cvs9yu+sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl8/2.-MBWH_CBSb1yof" />
+<var name="MBWH_cvsx7" value="-MBWH_cvs9xo-cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl7/2.-MBWH_CBSb1xof" />
+<var name="MBWH_cvsy7" value=" MBWH_cvs9yo-sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl7/2.-MBWH_CBSb1yof" />
+
+<composition name="MBWH_CrossBracingPlateSmallSectorItem9Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem9" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay1SmallSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem9" X_Y_Z="0;0;MBWH_CBS9z" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem9Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPS9yc;MBWH_CBPS9zc" rot="-MBWH_CBPS9ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem9Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPS9yc;MBWH_CBPS9zc" rot="-MBWH_CBPS9ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay1SmallSector">
+ <posXYZ volume="MBWH_CrossBracingBay1SmallSector" X_Y_Z="0;-MBWH_CBPS9yc;-MBWH_CBPS9zc" />
+</composition>
+<composition name="MBWH_CroisillonBay1SmallSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay1SmallSector" rot="MBWH_CBPS9ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem7" X_Y_Z="MBWH_cvsx7;MBWH_cvsy7;0" rot="-MBWH_CBPS9ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem8" X_Y_Z="MBWH_cvsx8;MBWH_cvsy8;0" rot="-MBWH_CBPS9ti;90;0" />
+</composition>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBS11z" value="MBWH_CBSl11/2." />
+<var name="MBWH_CBPS11d" value="MBWH_CBPS11le-2.*MBWH_CBPS11cu" />
+<var name="MBWH_CBPS11zb" value="MBWH_CBPS11za+cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11d/2." />
+<var name="MBWH_CBPS11yb" value="MBWH_CBPS11ya+sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11d/2." />
+<var name="MBWH_CBPS11zc" value="MBWH_CBPS11zb+sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11wi/2" />
+<var name="MBWH_CBPS11yc" value="MBWH_CBPS11yb-cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11wi/2" />
+ <!-- get positions of contreventements 13, 12 using locations of item 11 extremities -->
+<var name="MBWH_cvs11xo" value="-(MBWH_CBSl11-MBWH_CBPS11zc)*cos(MBWH_CBPS11ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS11yc)*sin(MBWH_CBPS11ti*GENV_PiS180)"/>
+<var name="MBWH_cvs11yo" value=" (MBWH_CBSl11-MBWH_CBPS11zc)*sin(MBWH_CBPS11ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS11yc)*cos(MBWH_CBPS11ti*GENV_PiS180)"/>
+<var name="MBWH_cvs11xu" value="MBWH_cvs11xo+MBWH_CBSl11*cos(MBWH_CBPS11ti*GENV_PiS180)" />
+<var name="MBWH_cvs11yu" value="MBWH_cvs11yo-MBWH_CBSl11*sin(MBWH_CBPS11ti*GENV_PiS180)" />
+<var name="MBWH_cvsx13" value="-MBWH_cvs11xu+cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl13/2." />
+<var name="MBWH_cvsy13" value=" MBWH_cvs11yu+sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl13/2." />
+<var name="MBWH_cvsx12" value="-MBWH_cvs11xo-cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl12/2." />
+<var name="MBWH_cvsy12" value=" MBWH_cvs11yo-sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl12/2." />
+
+<composition name="MBWH_CrossBracingPlateSmallSectorItem11Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem11" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay2SmallSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem11" X_Y_Z="0;MBWH_CBhei;MBWH_CBS11z" rot="0.;0.;180" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem11Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPS11yc;MBWH_CBPS11zc" rot="-MBWH_CBPS11ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem11Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPS11yc;MBWH_CBPS11zc" rot="-MBWH_CBPS11ti;0;0"/>
+</composition>
+
+<composition name="MBWH_CroisillonBay2SmallSector">
+ <posXYZ volume="MBWH_CrossBracingBay2SmallSector" X_Y_Z="0;-MBWH_CBPS11yc;-MBWH_CBPS11zc" />
+</composition>
+<composition name="MBWH_CroisillonBay2SmallSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay2SmallSector" rot="MBWH_CBPS11ti;90;180" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem13" X_Y_Z="MBWH_cvsx13;MBWH_cvsy13;0" rot="-MBWH_CBPS11ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem12" X_Y_Z="MBWH_cvsx12;MBWH_cvsy12;0" rot="-MBWH_CBPS11ti;90;0" />
+</composition>
+
+
+
+<!-- Bay 3 -->
+<var name="MBWH_CBS15z" value="MBWH_CBSl15/2." />
+<var name="MBWH_CBPS15d" value="MBWH_CBPS15le-2.*MBWH_CBPS15cu" />
+<var name="MBWH_CBPS15zb" value="MBWH_CBPS15za+cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15d/2." />
+<var name="MBWH_CBPS15yb" value="MBWH_CBPS15ya+sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15d/2." />
+<var name="MBWH_CBPS15zc" value="MBWH_CBPS15zb+sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15wi/2" />
+<var name="MBWH_CBPS15yc" value="MBWH_CBPS15yb-cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15wi/2" />
+ <!-- get positions of contreventements 16, 17 using locations of item 15 extremities -->
+<var name="MBWH_cvs15xo" value="-(MBWH_CBSl15-MBWH_CBPS15zc)*cos(MBWH_CBPS15ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS15yc)*sin(MBWH_CBPS15ti*GENV_PiS180)"/>
+<var name="MBWH_cvs15yo" value=" (MBWH_CBSl15-MBWH_CBPS15zc)*sin(MBWH_CBPS15ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS15yc)*cos(MBWH_CBPS15ti*GENV_PiS180)"/>
+<var name="MBWH_cvs15xu" value="MBWH_cvs15xo+MBWH_CBSl15*cos(MBWH_CBPS15ti*GENV_PiS180)" />
+<var name="MBWH_cvs15yu" value="MBWH_cvs15yo-MBWH_CBSl15*sin(MBWH_CBPS15ti*GENV_PiS180)" />
+<var name="MBWH_cvsx17" value="-MBWH_cvs15xu+cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl17/2.-MBWH_CBSb3xof" />
+<var name="MBWH_cvsy17" value=" MBWH_cvs15yu+sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl17/2.-MBWH_CBSb3yof" />
+<var name="MBWH_cvsx16" value="-MBWH_cvs15xo-cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl16/2.-MBWH_CBSb3xof" />
+<var name="MBWH_cvsy16" value=" MBWH_cvs15yo-sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl16/2.-MBWH_CBSb3yof" />
+
+<composition name="MBWH_CrossBracingPlateSmallSectorItem15Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem15" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay3SmallSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem15" X_Y_Z="0;MBWH_CBhei;MBWH_CBS15z" rot="0.;0.;180" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem15Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPS15yc;MBWH_CBPS15zc" rot="-MBWH_CBPS15ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem15Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPS15yc;MBWH_CBPS15zc" rot="-MBWH_CBPS15ti;0;0"/>
+</composition>
+
+<composition name="MBWH_CroisillonBay3SmallSector">
+ <posXYZ volume="MBWH_CrossBracingBay3SmallSector" X_Y_Z="0;-MBWH_CBPS15yc;-MBWH_CBPS15zc" />
+</composition>
+<composition name="MBWH_CroisillonBay3SmallSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay3SmallSector" rot="MBWH_CBPS15ti;90;180" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem16" X_Y_Z="MBWH_cvsx16;MBWH_cvsy16;0" rot="-MBWH_CBPS15ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem17" X_Y_Z="MBWH_cvsx17;MBWH_cvsy17;0" rot="-MBWH_CBPS15ti;90;0" />
+</composition>
+
+
+
+
+
+
+<!-- Derived variables -->
+<!-- positions of reinforcing bars -->
+<var name="MBWH_SssRBpz1" value="MBWH_SsiUPlen/2.-MBWH_SssRBdz1-MBWH_SRBhos/2."/>
+<var name="MBWH_SssRBpz2" value="MBWH_SssRBpz1-MBWH_SssRBdz2"/>
+<var name="MBWH_SssRBpz3" value="MBWH_SssRBpz2-MBWH_SssRBdz3"/>
+
+<!-- Relative positions of spokes -->
+<var name="MBWH_SssIxpos" value="MBWH_SRBpx+MBWH_SUPext/2.+MBWH_RBBthi+MBWH_RBSthi/2." />
+<var name="MBWH_SssIypos" value="-MBWH_RBSlen+MBWH_RBBsiz" />
+<var name="MBWH_SssIzof1" value="-(MBWH_SseUPlen-MBWH_SsiUPlen)/2." />
+<var name="MBWH_SssIzof2" value=" MBWH_SssIypos*tan(MBWH_SSangle*GENV_PiS180)+(MBWH_SIypos-MBWH_SEypos)/cos(MBWH_SSangle*GENV_PiS180)" />
+<var name="MBWH_SssIzpos" value="MBWH_SssIzof1+MBWH_SssIzof2" />
+
+<!-- inner spokes position -->
+<var name="MBWH_SssIxref" value="0.5*MBWH_SsiUPlen*sin(MBWH_SSangle*GENV_PiS180)+(MBWH_SUPhei-MBWH_SsiUPhcu)*cos(MBWH_SSangle*GENV_PiS180)"/>
+<var name="MBWH_Sssypos" value="MBWH_yref+MBWH_SIypos+0.5*MBWH_SsiUPlen*cos(MBWH_SSangle*GENV_PiS180) "/>
+
+<!-- Inner spoke small sector -->
+
+<gvxysx name="MBWH_InnerSpokeSmallSectorUprofile" material="Aluminium4" dZ="MBWH_SsiUPlen-180">
+ <gvxy_point X_Y="MBWH_SUPxa;MBWH_SUPya"/>
+ <gvxy_point X_Y="MBWH_SUPxb;MBWH_SUPyb"/>
+ <gvxy_point X_Y="MBWH_SUPxc;MBWH_SUPyc"/>
+ <gvxy_point X_Y="MBWH_SUPxd;MBWH_SUPyd"/>
+</gvxysx>
+
+<!-- External spoke small sector -->
+
+<gvxysx name="MBWH_ExternalSpokeSmallSectorUprofile" material="Aluminium4" dZ="MBWH_SseUPlen">
+ <gvxy_point X_Y="MBWH_SUPxa;MBWH_SUPya"/>
+ <gvxy_point X_Y="MBWH_SUPxb;MBWH_SUPyb"/>
+ <gvxy_point X_Y="MBWH_SUPxc;MBWH_SUPyc"/>
+ <gvxy_point X_Y="MBWH_SUPxd;MBWH_SUPyd"/>
+</gvxysx>
+
+<!-- Spoke Reinforcing Bar 1 -->
+<var name="MBWH_SRB1x1" value="MBWH_SRB1dx1/2"/>
+<var name="MBWH_SRB1y1" value="0"/>
+<var name="MBWH_SRB1x3" value="MBWH_SRB1dx2/2"/>
+<var name="MBWH_SRB1y3" value="MBWH_SRB1dy3-MBWH_SRB1dy2"/>
+<var name="MBWH_SRB1x2" value="MBWH_SRB1x3-MBWH_SRB1dx3"/>
+<var name="MBWH_SRB1y2" value="MBWH_SRB1y3"/>
+<var name="MBWH_SRB1x4" value="MBWH_SRB1dx4/2"/>
+<var name="MBWH_SRB1y4" value="-MBWH_SRB1dy2"/>
+<var name="MBWH_SRB1x6" value="MBWH_SRB1x1-MBWH_SRB1dy1*tan(0.5*MBWH_SRB1alph*GENV_PiS180)"/>
+<var name="MBWH_SRB1y6" value="-MBWH_SRB1dy1"/>
+<var name="MBWH_SRB1x5" value="MBWH_SRB1x6+(MBWH_SRB1dy2-MBWH_SRB1dy1)/tan(MBWH_SRB1alph*GENV_PiS180)"/>
+<var name="MBWH_SRB1y5" value="MBWH_SRB1y4"/>
+
+<var name="MBWH_SRB1zpos" value="MBWH_SssIxpos-MBWH_CBext/2.-MBWH_SRBthi"/>
+
+<gvxysx name="MBWH_SpokeReinforcingBar1SmallSector" material="Aluminium1" dZ="MBWH_SRBthi">
+ <gvxy_point X_Y="MBWH_SRB1x1;MBWH_SRB1y1"/>
+ <gvxy_point X_Y="MBWH_SRB1x2;MBWH_SRB1y2"/>
+ <gvxy_point X_Y="MBWH_SRB1x3;MBWH_SRB1y3"/>
+ <gvxy_point X_Y="MBWH_SRB1x4;MBWH_SRB1y4"/>
+ <gvxy_point X_Y="MBWH_SRB1x5;MBWH_SRB1y5"/>
+ <gvxy_point X_Y="MBWH_SRB1x6;MBWH_SRB1y6"/>
+</gvxysx>
+
+<!-- Spoke Reinforcing Bar 1 -->
+<var name="MBWH_SRB2x1" value="MBWH_SRB2dx1/2"/>
+<var name="MBWH_SRB2y1" value="0"/>
+<var name="MBWH_SRB2x2" value="MBWH_SRB2dx2/2"/>
+<var name="MBWH_SRB2y2" value="-MBWH_SRB2dy"/>
+
+<var name="MBWH_SRB2zpos" value="MBWH_SssIxpos-MBWH_CBext/2.-MBWH_SRBthi"/>
+
+<gvxysx name="MBWH_SpokeReinforcingBar2SmallSector" material="Aluminium1" dZ="MBWH_SRBthi">
+ <gvxy_point X_Y="MBWH_SRB2x1;MBWH_SRB2y1"/>
+ <gvxy_point X_Y="MBWH_SRB2x2;MBWH_SRB2y2"/>
+</gvxysx>
+
+
+<composition name="MBWH_SpokesSmallSectorAssembly1">
+ <posXYZ volume="MBWH_InnerSpokeSmallSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SssRBpz1" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SssRBpz2" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SssRBpz3" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ExternalSpokeSmallSectorUprofile" X_Y_Z=" MBWH_SssIxpos;MBWH_SssIypos;MBWH_SssIzpos"/>
+</composition>
+
+<composition name="MBWH_SpokesSmallSectorAssembly2">
+ <posXYZ volume="MBWH_InnerSpokeSmallSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SssRBpz1" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SssRBpz2" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SssRBpz3" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ExternalSpokeSmallSectorUprofile" X_Y_Z=" MBWH_SssIxpos;MBWH_SssIypos;-MBWH_SssIzpos"/>
+</composition>
+
+<composition name="MBWH_SpokesSmallSectorAssemblyTemp1">
+ <posXYZ volume="MBWH_SpokesSmallSectorAssembly1" X_Y_Z="MBWH_SssIxref;MBWH_Sssypos;0" rot="0.; -90.;90-MBWH_SSangle" />
+</composition>
+
+<composition name="MBWH_SpokesSmallSectorAssemblyTemp2">
+ <posXYZ volume="MBWH_SpokesSmallSectorAssembly2" X_Y_Z="-MBWH_SssIxref;MBWH_Sssypos;0" rot="180.; -90.;90+MBWH_SSangle" />
+</composition>
+
+<composition name="MBWH_SmallSector">
+ <posXYZ volume="MBWH_SpokesSmallSectorAssemblyTemp1" />
+ <posXYZ volume="MBWH_SpokesSmallSectorAssemblyTemp2" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem10" X_Y_Z="0;MBWH_CBSy10-5.;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem14" X_Y_Z="0;MBWH_CBSy14;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem18a" X_Y_Z="0;MBWH_CBSy18;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem18b" X_Y_Z="0;MBWH_CBSy18b;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CroisillonBay1SmallSectorRot" X_Y_Z="0;MBWH_Croisy9;0"/>
+ <posXYZ volume="MBWH_CroisillonBay2SmallSectorRot" X_Y_Z="0;MBWH_Croisy11;0" rot="0;180;0"/>
+ <posXYZ volume="MBWH_CroisillonBay3SmallSectorRot" X_Y_Z="0;MBWH_Croisy15;0"/>
+ <posXYZ volume="MBWH_SpokeReinforcingBar1SmallSector" X_Y_Z="0;MBWH_SRB1ypos;MBWH_SRB1zpos-2.6"/>
+ <posXYZ volume="MBWH_SpokeReinforcingBar2SmallSector" X_Y_Z="0;MBWH_SRB2ypos;MBWH_SRB2zpos-2.6"/>
+</composition>
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** Big Wheel Assembly ****
+ *** ****
+ **************************************************************
+-->
+
+<var name="MBWH_zposS" value="MBWH_zposL+MBWH_SlsIxpos" />
+
+<composition name="MBWH_BigWheelOctant">
+ <posXYZ volume="MBWH_SmallSector" X_Y_Z=" 0.;0.;MBWH_zposS" rot="0.;180.;22.5"/>
+ <posXYZ volume="MBWH_LargeSector" X_Y_Z=" 0.;0.;MBWH_zposL" rot="0.;180.;0."/>
+</composition>
+
+<array name="MBWH_BWOA" values="-90;-45;0;45;90;135;180;225" /> <!-- octant angles -->
+
+<composition name="MBWH_BigWheel">
+ <foreach index="I" begin="0" loops="8" >
+ <posXYZ volume="MBWH_BigWheelOctant" rot="0.;0.;MBWH_BWOA[I]"/>
+ </foreach>
+</composition>
+
+<composition name="MBWH_BigWheels">
+ <posXYZ volume="MBWH_BigWheel"/>
+ <posXYZ volume="MBWH_BigWheel" rot="0.;180.;0."/>
+</composition>
+
+</section>
+
+<section name = "Calorimeter Saddle"
+ version = "7.0"
+ date = "9 May 2006"
+ author = "Daniel Pomarede"
+ top_volume = "SADL_CalorimeterSaddle">
+
+<!-- name = Calorimeter Saddle section name = "Supports" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** Calorimeter Saddle ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+
+<!-- Andrei Table need for the structure missing in Oracle table -->
+<var name="SADL_numboxes" value="12"/>
+<var name="SADL_numbreps" value="1"/>
+<var name="SADL_numtubes" value="4"/>
+<var name="SADL_NumEmTubesBrep" value="1"/>
+<var name="SADL_Gusset_tubecut" value="0"/>
+<var name="SADL_num_Gusset_vol" value="12"/>
+<var name="SADL_numbreppoint" value="10"/>
+<var name="SADL_SymX" value="1"/>
+<var name="SADL_SymY" value="0"/>
+<var name="SADL_SymZ" value="1"/>
+<var name="PiDegOver4" value=" 45"/>
+<var name="PiDegOver2" value=" 90"/>
+<var name="Pideg" value="180"/>
+<var name="2Pideg" value="360"/>
+<var name="SADL_Stzrot" value="45"/>
+<var name="SADL_Stzrotmoins" value="-45"/>
+<!--SaddleBOVN -->
+<var name="SADL_BoxBeam_numHPlateVol" value="1"/>
+<var name="SADL_BoxBeam_numVPlateVol" value="2"/>
+<var name="SADL_numConnGussetBBeamVol" value="4"/>
+<var name="SADL_numStiffenerVol" value="4"/>
+<var name="SADL_numBarrelBlocking_JackVol" value="4"/>
+<array name="SADL_SymBoxBeam" values="1;0;0"/>
+<array name="SADL_SymExtendedBoxBeam" values="1;0;1"/>
+<array name="SADL_SymConnGussetBBeam" values="1;0;1"/>
+<array name="SADL_SymStiffener" values="1;0;1"/>
+<array name="SADL_SymBarrel_Blocking_Jack" values="1;0;1"/>
+<array name="SADL_Material" values="1;2"/> <!-- 1=Iron, 2=Aluminium-->
+<array name="SADL_EmptyVolBoxBeam" values="0;0;0"/> <!--values="NUMEMBO(number empty boxes);NUMEMTU(tubes);NUMEMBR(breps)"-->
+<array name="SADL_EmptyVolExtendedBoxBeam" values="0;0;0"/>
+<array name="SADL_EmptyVolConnGussetBBeam" values="0;0;0"/>
+<array name="SADL_EmptyVolStiffener" values="0;0;0"/>
+<array name="SADL_EmptyVolBarrel_Blocking_Jack" values="0;0;0"/>
+<!--SaddleTUVN -->
+<var name="SADL_RoundedSupport" value="2"/>
+<var name="SAD_Barrel_Blocking_Jack_Cylinder" value="4"/>
+<array name="SADL_SymRoundedSupport" values="1;0;1"/>
+<array name="SADL_SymBarrel_Blocking_Jack_Cylinder" values="1;0;1"/>
+<array name="SADL_EmptyVolRoundedSupport" values="0;0;0"/>
+<array name="SADL_EmptyVolBarrel_Blocking_Jack_Cylinder" values="0;0;0"/>
+
+
+
+<!-- for box -->
+<var name="SADL_BoxBeam_HPlate_vol" value="1"/>
+<var name="SADL_BoxBeam_VPlate_vol" value="2"/>
+<var name="SADL_ConnGussetBBeam_vol" value="4"/>
+<var name="SADL_ConnGussetBBeam_VPlate_vol" value="2"/>
+
+<!-- END -->
+
+<!-- ATLLBUS_0019 -->
+<var name="SADL_BxBLen" value="6200"/>
+<var name="SADL_BxBWid" value="520"/>
+<var name="SADL_BxBHei" value="360"/>
+<var name="SADL_BxBHThi1" value="90"/>
+<var name="SADL_BxBHThi2" value="40"/>
+<var name="SADL_BxBVThi" value="60"/>
+<!-- ATLLBUS_0003 -->
+<var name="SADL_BxBxref" value="2740"/>
+<var name="SADL_BxByref" value="4000"/>
+
+<!-- Extended Barrel Box Beam -->
+
+<!-- ATLLEUS_0002 -->
+<var name="SADL_BxBELen" value="3355"/>
+<var name="SADL_EBxBzpos" value="4832.5"/>
+
+<!-- Rounded Support -->
+
+<!-- ATLLBUS_0006 & ATLLBUS_0009 & ATLLBUS_0012 & ATLLBUS_0015 -->
+<var name="SADL_RSprof1" value="301.8"/>
+<var name="SADL_RSprof2" value="32"/>
+<var name="SADL_RSLenAC" value="731"/>
+<var name="SADL_RSLenBD" value="746"/>
+<var name="SADL_RSrin" value="4240"/>
+<var name="SADL_RSrout" value="4310"/>
+
+<!-- Gusset -->
+
+<!-- ATLLBUS_0005 -->
+<var name="SADL_GudZ" value="70"/>
+<var name="SADL_GualphA" value="31"/>
+<var name="SADL_GualphE" value="22.5"/>
+<var name="SADL_GuthicAB" value="61"/>
+<var name="SADL_GuthicBC" value="63.6"/>
+<var name="SADL_GudyAF" value="252"/>
+<var name="SADL_GudxAF" value="443.8"/>
+<var name="SADL_GudxEF" value="55"/>
+<var name="SADL_GudxFJ" value="1087.7"/>
+<var name="SADL_GudyAJ" value="1634.3"/>
+<var name="SADL_GudyFG" value="430"/>
+<var name="SADL_GudxGH" value="510"/>
+<var name="SADL_GudxFI" value="1125.5"/>
+<var name="SADL_GudyHI" value="1440.6"/>
+
+<!-- ATLLBUS_0006 -->
+<var name="SADL_Guposxg" value="2715"/>
+<var name="SADL_Guposyg" value="-3485"/>
+
+<!-- ATLLBUS_0006 -->
+<var name="SADL_Gussdz1" value="265"/>
+<var name="SADL_Gussdz2" value="280"/>
+
+<!-- Connection Gusset / Box Beam -->
+<!-- ATLLBUS_0006 & ATLLBUS_0007 -->
+<var name="SADL_CGBBthi" value="25"/>
+<var name="SADL_CGBBlen" value="870"/>
+<var name="SADL_CGBBHwid" value="545"/>
+<var name="SADL_CGBBVwid" value="400"/>
+
+<!-- Stiffener -->
+<!-- ATLLBUS_0018 & ATLLEUS_0021 -->
+
+<var name="SADL_StifLen" value="1149"/>
+<!-- extremity plate -->
+<var name="SADL_StEPwid" value="152"/>
+<var name="SADL_StEPthi" value="15"/>
+<!-- tube-square -->
+<var name="SADL_StTUthi" value="10"/>
+<var name="SADL_StTUext" value="100"/>
+
+<!-- Doublet -->
+<!-- ATLLBUS_0003 -->
+<var name="SADL_SaddZmax" value="2820"/> <!-- Gusset surface is in this plane -->
+<!-- ATLLEUS_0002 -->
+<var name="SADL_ESadZmax" value="6150"/> <!-- Gusset surface is in this plane -->
+
+<!-- stiffener position -->
+<!-- ATLLBUS_0008 -->
+<var name="SADL_Stxpos" value=" 3362"/>
+<var name="SADL_Stypos" value="-2910"/>
+
+<!-- Barrel Blocking Jacks -->
+<!-- Barrel Blocking Jacks positions -->
+<array name="SADL_BlJazpos" values="529;2369;3989;5789" />
+<var name="SADL_BlJaypos" value="-4390+50"/> <!-- added 50 for the modification of SADL_BBJSCthi (few lines below)-->
+<var name="SADL_BlJaxpos" value="3000"/>
+
+<var name="SADL_BBJPlen" value="520"/>
+<var name="SADL_BBJPwid" value="360"/>
+<var name="SADL_BBJPthi" value="45"/>
+
+<var name="SADL_BBJBCthi" value="290"/>
+<var name="SADL_BBJBCrad" value="152"/>
+<var name="SADL_BBJSCthi" value="5"/> <!-- modified from 55 to 5 to avoid overlap -->
+<var name="SADL_BBJSCrad" value="98"/>
+
+
+
+<!-- Derived variables -->
+
+<!-- Box Beam -->
+
+<var name="SADL_BxBHyp1" value="-SADL_BxBHei/2.-SADL_BxBHThi1/2."/>
+<var name="SADL_BxBHyp2" value="SADL_BxBHei/2.+SADL_BxBHThi2/2."/>
+<var name="SADL_BxBVxpos" value="SADL_BxBWid/2.-SADL_BxBVThi/2."/>
+
+<!-- Gusset -->
+
+<var name="SADL_Guxa" value="0"/>
+<var name="SADL_Guya" value="0"/>
+<var name="SADL_Guxb" value="SADL_Guxa+SADL_GuthicAB*sin(SADL_GualphA*GENV_PiS180)"/>
+<var name="SADL_Guyb" value="SADL_Guya-SADL_GuthicAB*cos(SADL_GualphA*GENV_PiS180)"/>
+<var name="SADL_Guxc" value="SADL_Guxb+SADL_GuthicBC/tan(SADL_GualphA*GENV_PiS180)"/>
+<var name="SADL_Guyc" value="SADL_Guyb+SADL_GuthicBC"/>
+
+<var name="SADL_Guxf" value="SADL_Guxa+SADL_GudxAF"/>
+<var name="SADL_Guyf" value="SADL_Guya-SADL_GudyAF"/>
+<var name="SADL_Guxe" value="SADL_Guxf-SADL_GudxEF"/>
+<var name="SADL_Guye" value="SADL_Guyf"/>
+<var name="SADL_Guyd" value="SADL_Guyc"/>
+<var name="SADL_Guxd" value="SADL_Guxe-(SADL_Guyd-SADL_Guye)*tan(SADL_GualphE*GENV_PiS180)"/>
+<var name="SADL_Guxg" value="SADL_Guxf"/>
+<var name="SADL_Guyg" value="SADL_Guyf+SADL_GudyFG"/>
+<var name="SADL_Guxh" value="SADL_Guxg+SADL_GudxGH"/>
+<var name="SADL_Guyh" value="SADL_Guyg"/>
+
+<var name="SADL_Guxi" value="SADL_Guxf+SADL_GudxFI"/>
+<var name="SADL_Guyi" value="SADL_Guyh+SADL_GudyHI"/>
+<var name="SADL_Guxj" value="SADL_Guxf+SADL_GudxFJ"/>
+<var name="SADL_Guyj" value="SADL_Guya+SADL_GudyAJ"/>
+
+<var name="SADL_Guposxa" value="SADL_Guposxg-SADL_Guxg"/>
+<var name="SADL_Guposya" value="SADL_Guposyg-SADL_Guyg"/>
+
+<var name="SADL_Gusspz2" value="SADL_Gussdz2+SADL_GudZ"/>
+<var name="SADL_Gusspz1" value="SADL_Gussdz1+SADL_GudZ"/>
+
+<!-- Box beam positions -->
+
+<var name="SADL_BxBxpos" value="SADL_BxBxref+SADL_BxBWid/2"/>
+<var name="SADL_BxBypos" value="-SADL_BxByref+SADL_BxBHei/2+SADL_BxBHThi1"/>
+
+<!-- Connection Gusset / Box Beam -->
+
+<var name="SADL_CGBBHPx" value="SADL_Guposxg+SADL_CGBBHwid/2"/>
+<var name="SADL_CGBBHPy" value="SADL_Guposyg-SADL_CGBBthi/2"/>
+<var name="SADL_CGBBVPx" value="SADL_Guposxg+SADL_CGBBthi/2"/>
+<var name="SADL_CGBBVPy" value="SADL_Guposyg-SADL_CGBBVwid/2-SADL_CGBBthi"/>
+
+<!-- Stiffener -->
+
+<!-- height of flange -->
+<var name="SADL_StTFlhei" value="SADL_StTUext-2*SADL_StTUthi"/>
+<!-- x/y pos of flange/plate -->
+<var name="SADL_StTFlpos" value="SADL_StTUext/2-SADL_StTUthi/2"/>
+<!-- length -->
+<var name="SADL_StifLen0" value="SADL_StifLen-2*SADL_StEPthi"/>
+<!-- z pos of extremity plate -->
+<var name="SADL_StEPzpos" value="SADL_StifLen/2-SADL_StEPthi/2"/>
+
+<!-- Barrel Doublet -->
+<!-- ATLLBUS_0003 -->
+<var name="SADL_SaddZ2" value="SADL_SaddZmax-SADL_Gussdz1-1.5*SADL_GudZ"/>
+<!-- position of first unit is inferred from stiffener length -->
+<var name="SADL_SaddZ1" value="SADL_SaddZ2-3.*SADL_GudZ-2.*SADL_Gussdz2-SADL_StifLen"/>
+
+<!-- stiffener position -->
+<var name="SADL_Stzpos" value="(SADL_SaddZ1+SADL_SaddZ2)/2"/>
+
+<!-- Extended Barrel Doublet -->
+<!-- ATLLEUS_0002 -->
+<var name="SADL_ESaddZ2" value="SADL_ESadZmax-SADL_Gussdz1-1.5*SADL_GudZ"/>
+<!-- position of first unit is inferred from stiffener length -->
+<var name="SADL_ESaddZ1" value="SADL_ESaddZ2-3.*SADL_GudZ-2.*SADL_Gussdz2-SADL_StifLen"/>
+
+<!-- stiffener position -->
+<var name="SADL_EStzpos" value="(SADL_ESaddZ1+SADL_ESaddZ2)/2"/>
+
+<!-- Barrel Blocking Jacks -->
+
+<var name="SADL_BBJSCyp" value="SADL_BBJSCthi/2"/>
+<var name="SADL_BBJBCyp" value="SADL_BBJSCthi+SADL_BBJBCthi/2"/>
+<var name="SADL_BBJPyp" value="SADL_BBJSCthi+SADL_BBJBCthi+SADL_BBJPthi/2"/>
+
+<!-- Andrei Table need for the structure missing in Oracle table -->
+<var name="SADL_Gusset_Plate_Zmoins" value="-SADL_Gusspz2"/>
+<var name="SADL_BxBVxposmoins" value="-SADL_BxBVxpos"/>
+<var name="SADL_StEPzposmoins" value="-SADL_StEPzpos"/>
+<var name="SADL_StTFlposRot" value="SADL_StTFlpos*sin(SADL_Stzrot*GENV_PiS180)"/>
+<var name="SADL_StTFlposRotmoins" value="-SADL_StTFlposRot"/>
+<!-- Andrei Table need for the structure missing in Oracle table -->
+
+<!-- Modelization -->
+
+<!-- Box Beam -->
+<box name="SADL_BoxBeam_HPlate_Lower" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi1;SADL_BxBLen"/>
+<box name="SADL_BoxBeam_HPlate_Upper" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi2;SADL_BxBLen"/>
+<box name="SADL_BoxBeam_VPlate" material="Iron1" X_Y_Z="SADL_BxBVThi;SADL_BxBHei ;SADL_BxBLen"/>
+
+<!-- Extended Barrel Box Beam -->
+<box name="SADL_Extended_BoxBeam_HPlate_Lower" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi1;SADL_BxBELen"/>
+<box name="SADL_Extended_BoxBeam_HPlate_Upper" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi2;SADL_BxBELen"/>
+<box name="SADL_Extended_BoxBeam_VPlate" material="Iron1" X_Y_Z="SADL_BxBVThi;SADL_BxBHei ;SADL_BxBELen"/>
+
+<composition name="SADL_BoxBeam">
+ <posXYZ volume="SADL_BoxBeam_HPlate_Lower" X_Y_Z="0;SADL_BxBHyp1;0" />
+ <posXYZ volume="SADL_BoxBeam_HPlate_Upper" X_Y_Z="0;SADL_BxBHyp2;0" />
+ <posXYZ volume="SADL_BoxBeam_VPlate" X_Y_Z=" SADL_BxBVxpos;0;0" />
+ <posXYZ volume="SADL_BoxBeam_VPlate" X_Y_Z="-SADL_BxBVxpos;0;0" />
+</composition>
+
+<composition name="SADL_Extended_BoxBeam">
+ <posXYZ volume="SADL_Extended_BoxBeam_HPlate_Lower" X_Y_Z="0;SADL_BxBHyp1;0" />
+ <posXYZ volume="SADL_Extended_BoxBeam_HPlate_Upper" X_Y_Z="0;SADL_BxBHyp2;0" />
+ <posXYZ volume="SADL_Extended_BoxBeam_VPlate" X_Y_Z=" SADL_BxBVxpos;0;0" />
+ <posXYZ volume="SADL_Extended_BoxBeam_VPlate" X_Y_Z="-SADL_BxBVxpos;0;0" />
+</composition>
+
+<!-- Rounded Support -->
+<tubs name="SADL_RoundedSupportAC" material="Iron2" Rio_Z="SADL_RSrin;SADL_RSrout;SADL_RSLenAC" profile="SADL_RSprof1;SADL_RSprof2"/>
+<tubs name="SADL_RoundedSupportBD" material="Iron2" Rio_Z="SADL_RSrin;SADL_RSrout;SADL_RSLenBD" profile="SADL_RSprof1;SADL_RSprof2"/>
+
+<!-- Gusset -->
+<gvxy name="SADL_Gusset_Core" material="Iron" dZ="SADL_GudZ">
+ <gvxy_point X_Y="SADL_Guxa;SADL_Guya"/>
+ <gvxy_point X_Y="SADL_Guxb;SADL_Guyb"/>
+ <gvxy_point X_Y="SADL_Guxc;SADL_Guyc"/>
+ <gvxy_point X_Y="SADL_Guxd;SADL_Guyd"/>
+ <gvxy_point X_Y="SADL_Guxe;SADL_Guye"/>
+ <gvxy_point X_Y="SADL_Guxf;SADL_Guyf"/>
+ <gvxy_point X_Y="SADL_Guxg;SADL_Guyg"/>
+ <gvxy_point X_Y="SADL_Guxh;SADL_Guyh"/>
+ <gvxy_point X_Y="SADL_Guxi;SADL_Guyi"/>
+ <gvxy_point X_Y="SADL_Guxj;SADL_Guyj"/>
+</gvxy>
+
+<tubs name="SADL_Gusset_Cut" material="Aluminium4" Rio_Z="0;SADL_RSrout;SADL_RSLenBD" profile="SADL_RSprof1;SADL_RSprof2" />
+
+<subtraction name="SADL_Gusset_Plate" >
+ <posXYZ volume="SADL_Gusset_Core" X_Y_Z="SADL_Guposxa;SADL_Guposya;0"/>
+ <posXYZ volume="SADL_Gusset_Cut"/>
+</subtraction>
+
+<!-- Connection Gusset / Box Beam -->
+
+<box name="SADL_ConnGussetBBeam_HPlate" material="Iron4" X_Y_Z="SADL_CGBBHwid;SADL_CGBBthi;SADL_CGBBlen"/>
+<box name="SADL_ConnGussetBBeam_VPlate" material="Iron4" X_Y_Z="SADL_CGBBthi;SADL_CGBBVwid;SADL_CGBBlen"/>
+
+<composition name="SADL_Saddle_UnitA">
+ <posXYZ volume="SADL_RoundedSupportAC" />
+ <posXYZ volume="SADL_Gusset_Plate" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="Zero;Zero;SADL_Gusspz1" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="Zero;Zero;SADL_Gusset_Plate_Zmoins" />
+ <posXYZ volume="SADL_ConnGussetBBeam_HPlate" X_Y_Z="SADL_CGBBHPx;SADL_CGBBHPy;0" />
+ <posXYZ volume="SADL_ConnGussetBBeam_VPlate" X_Y_Z="SADL_CGBBVPx;SADL_CGBBVPy;0" />
+</composition>
+
+<composition name="SADL_Saddle_UnitB">
+ <posXYZ volume="SADL_RoundedSupportBD" />
+ <posXYZ volume="SADL_Gusset_Plate" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;SADL_Gusspz2" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;-SADL_Gusspz2" />
+ <posXYZ volume="SADL_ConnGussetBBeam_HPlate" X_Y_Z="SADL_CGBBHPx;SADL_CGBBHPy;0" />
+ <posXYZ volume="SADL_ConnGussetBBeam_VPlate" X_Y_Z="SADL_CGBBVPx;SADL_CGBBVPy;0" />
+</composition>
+
+<!-- Stiffener -->
+
+<box name="SADL_Stiffener_Plate" material="Iron1" X_Y_Z="SADL_StEPwid;SADL_StEPwid;SADL_StEPthi"/>
+<box name="SADL_Stiffener_Tube_Plate" material="Iron1" X_Y_Z="SADL_StTUext;SADL_StTUthi; SADL_StifLen0"/>
+<box name="SADL_Stiffener_Tube_Flange" material="Iron1" X_Y_Z="SADL_StTUthi;SADL_StTFlhei;SADL_StifLen0"/>
+
+<composition name="SADL_Stiffener">
+ <posXYZ volume="SADL_Stiffener_Tube_Flange" X_Y_Z=" SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Tube_Flange" X_Y_Z="-SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Tube_Plate" X_Y_Z="0; SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Tube_Plate" X_Y_Z="0;-SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Plate" X_Y_Z="0;0; SADL_StEPzpos" />
+ <posXYZ volume="SADL_Stiffener_Plate" X_Y_Z="0;0;-SADL_StEPzpos" />
+</composition>
+
+<composition name="SADL_Saddle_Doublet">
+ <posXYZ volume="SADL_Saddle_UnitB" X_Y_Z="0;0;SADL_SaddZ1" />
+ <posXYZ volume="SADL_Saddle_UnitA" X_Y_Z="0;0;SADL_SaddZ2" />
+ <posXYZ volume="SADL_Stiffener" X_Y_Z="SADL_Stxpos;SADL_Stypos;SADL_Stzpos" rot="Zero;Zero;SADL_Stzrot" />
+</composition>
+
+<composition name="SADL_Extended_Saddle_Doublet">
+ <posXYZ volume="SADL_Extended_BoxBeam" X_Y_Z="SADL_BxBxpos;SADL_BxBypos;SADL_EBxBzpos" />
+ <posXYZ volume="SADL_Saddle_UnitB" X_Y_Z="0;0;SADL_ESaddZ1" />
+ <posXYZ volume="SADL_Saddle_UnitA" X_Y_Z="0;0;SADL_ESaddZ2" />
+ <posXYZ volume="SADL_Stiffener" X_Y_Z="SADL_Stxpos;SADL_Stypos;SADL_EStzpos" rot="Zero;Zero;SADL_Stzrot" />
+</composition>
+
+<composition name="SADL_Saddle_Quadruplet">
+ <posXYZ volume="SADL_Saddle_Doublet" />
+ <posXYZ volume="SADL_Saddle_Doublet" rot="0;180;0" X_Y_Z="0.;0.;2*SADL_Stzpos"/>
+</composition>
+
+<composition name="SADL_Extended_Saddle_Quadruplet">
+ <posXYZ volume="SADL_Extended_Saddle_Doublet" />
+ <posXYZ volume="SADL_Extended_Saddle_Doublet" rot="0;180;0" X_Y_Z="0.;0.;2*SADL_EStzpos" />
+</composition>
+
+<!-- Barrel Blocking Jacks -->
+
+<box name="SADL_Barrel_Blocking_Jack_Plate" material="Iron1" X_Y_Z="SADL_BBJPlen;SADL_BBJPwid;SADL_BBJPthi"/>
+
+<tubs name="SADL_Barrel_Blocking_Jack_BigCylinder" material="Iron2" Rio_Z="0;SADL_BBJBCrad;SADL_BBJBCthi" />
+<tubs name="SADL_Barrel_Blocking_Jack_SmallCylinder" material="Iron2" Rio_Z="0;SADL_BBJSCrad;SADL_BBJSCthi" />
+
+<composition name="SADL_Barrel_Blocking_Jack_Unit">
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_SmallCylinder" X_Y_Z="0;SADL_BBJSCyp;0" rot="PiDegOver2;Zero;Zero"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_BigCylinder" X_Y_Z="0;SADL_BBJBCyp;0" rot="PiDegOver2;Zero;Zero"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Plate" X_Y_Z="0;SADL_BBJPyp;0" rot="PiDegOver2;Zero;Zero"/>
+</composition>
+
+<composition name="SADL_Barrel_Blocking_Jacks">
+ <foreach index="I" begin="0" loops="4" >
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z=" SADL_BlJaxpos;SADL_BlJaypos; SADL_BlJazpos[I]"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z="-SADL_BlJaxpos;SADL_BlJaypos; SADL_BlJazpos[I]"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z=" SADL_BlJaxpos;SADL_BlJaypos;-SADL_BlJazpos[I]"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z="-SADL_BlJaxpos;SADL_BlJaypos;-SADL_BlJazpos[I]"/>
+ </foreach>
+</composition>
+
+<composition name="SADL_CalorimeterSaddle1">
+ <posXYZ volume="SADL_BoxBeam" X_Y_Z=" SADL_BxBxpos;SADL_BxBypos;0" />
+ <posXYZ volume="SADL_BoxBeam" X_Y_Z="-SADL_BxBxpos;SADL_BxBypos;0" />
+ <posXYZ volume="SADL_Saddle_Quadruplet" />
+ <posXYZ volume="SADL_Saddle_Quadruplet" rot="0;180.;0" />
+ <posXYZ volume="SADL_Extended_Saddle_Quadruplet" />
+ <posXYZ volume="SADL_Extended_Saddle_Quadruplet" rot="0;180.;0" />
+ <posXYZ volume="SADL_Barrel_Blocking_Jacks" />
+</composition>
+
+<composition name="SADL_CalorimeterSaddle">
+ <posXYZ volume="SADL_CalorimeterSaddle1" X_Y_Z=" 0.;-50.;0" />
+</composition>
+
+</section>
+
+
+<section name = "TGC Big Wheel"
+ version = "7.0"
+ date = "14 04 2008, redone 20 08 2013"
+ author = "laurent+andrea, jochen - initial implementation removed "
+ top_volume = "useless">
+
+<!-- general parameters for surrounding boxes -->
+
+<var name="TGC_BigWheel_SurBoxWallThick" value=" 12. " />
+<var name="TGC_BigWheel_SurBoxSideLength" value=" 250. " />
+<var name="TGC_BigWheel_SurBoxDistance" value=" 50. " />
+<var name="TGC_BigWheel_SurBoxSpcLength" value=" 200. " />
+<var name="TGC_BigWheel_SurBoxSpcHeight" value=" 80. " />
+<var name="TGC_BigWheel_SurBoxSpcWall" value=" 5. " />
+
+<!-- name = TGC2 Big Wheel section name = "Supports" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** TGC Big Wheel ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+<var name="TBWH_BigWheel_ZPosL" value=" 14730. "/>
+
+<var name="TBWH_BigWheel_RadDist00" value=" 2445. "/>
+<var name="TBWH_BigWheel_RadDist01" value=" 3700. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist02" value=" 4562. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist03" value=" 5946. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist04" value=" 6974. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist05" value=" 8134. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist06" value=" 9161. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist07" value=" 10527. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist08" value=" 11348. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist09" value=" 12230. "/>
+<var name="TBWH_BigWheel_RadDistOutPlate" value=" 4195. "/>
+<var name="TBWH_BigWheel_RadDistPlate02" value=" 4140. - TBWH_BigWheel_RadDist00 + 170. + 30. "/> <!-- two different values on same blueprint -->
+<var name="TBWH_BigWheel_PhiDistRPlate1" value=" 388. "/>
+
+<var name="TBWH_BigWheel_ZThickPhiPlate" value=" 30. "/>
+<var name="TBWH_BigWheel_WallThickPhiPlate" value=" 16. "/>
+<var name="TBWH_BigWheel_RThickPhiPlate1" value=" 200. "/>
+<var name="TBWH_BigWheel_RThickPhiPlate2" value=" 150. "/>
+<var name="TBWH_BigWheel_RThickPhiPlate3" value=" 100. "/>
+<var name="TBWH_BigWheel_ZThickRPlate" value=" 150. "/>
+<var name="TBWH_BigWheel_PhiThickRPlate" value=" 50. "/>
+<var name="TBWH_BigWheel_WallThickRPlate" value=" 5. "/>
+
+<var name="TBWH_BigWheel_PhiPlaDelEvenOdd" value="TBWH_BigWheel_RThickPhiPlate2 + TBWH_BigWheel_PhiThickRPlate/2."/>
+
+<var name="TBWH_BigWheel_PhiStepAngle1" value=" 7.5 * GENV_PiS180 "/>
+<var name="TBWH_BigWheel_PhiStepAngle2" value=" 15. * GENV_PiS180 "/>
+
+<var name="TBWH_BigWheel_PhiStep1toP1" value=" -88. "/> <!-- estimate -->
+<var name="TBWH_BigWheel_PhiStepP1toP2" value=" 372. "/> <!-- estimate -->
+
+<var name="TBWH_BigWheel_PhiStep2toP1" value=" 459. "/>
+<var name="TBWH_BigWheel_PhiStepP2toP2" value=" 780. + TBWH_BigWheel_PhiThickRPlate"/> <!-- estimate -->
+
+<var name="TBWH_BigWheel_TubeInnerR" value=" 2335. "/>
+<var name="TBWH_BigWheel_TubeOuterR" value=" TBWH_BigWheel_TubeInnerR + 405. "/>
+
+<!-- lowest phi plate - plate 1 -->
+<gvxysx name="TBWH_PhiPlate1" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" (TBWH_BigWheel_RadDist00+TBWH_BigWheel_RadDist01+TBWH_BigWheel_RThickPhiPlate1)*sin(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_RadDist01+TBWH_BigWheel_RThickPhiPlate1"/>
+ <gvxy_point X_Y=" (TBWH_BigWheel_RadDist00+TBWH_BigWheel_RadDist01)*sin(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_RadDist01"/>
+</gvxysx>
+
+<!-- first phi plate with kink - plate 2 -->
+<var name="TBWH_PhiPlate2_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist02-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate2_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist02-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate2_XPos2" value="TBWH_PhiPlate2_XPos1+(TBWH_BigWheel_RadDist02*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate2_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate2_YPos2" value="TBWH_BigWheel_RadDist02-(TBWH_BigWheel_RadDist02*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate2_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate2_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos3; TBWH_BigWheel_RadDist02+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate2_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate2_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos1; TBWH_BigWheel_RadDist02"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate2_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist02+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate2_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate2_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist02-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- second phi plate with kink - plate 3 -->
+<var name="TBWH_PhiPlate3_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist03-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate3_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist03-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate3" />
+<var name="TBWH_PhiPlate3_XPos2" value="TBWH_PhiPlate3_XPos1+(TBWH_BigWheel_RadDist03*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate3_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+<var name="TBWH_PhiPlate3_YPos2" value="TBWH_BigWheel_RadDist03-(TBWH_BigWheel_RadDist03*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate3_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TBWH_PhiPlate3" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos3; TBWH_BigWheel_RadDist03+TBWH_BigWheel_RThickPhiPlate3"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos2+TBWH_BigWheel_RThickPhiPlate3*sin(TBWH_BigWheel_PhiStepAngle2)+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate3_YPos2+TBWH_BigWheel_RThickPhiPlate3*cos(TBWH_BigWheel_PhiStepAngle2)-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate3_YPos2-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos1; TBWH_BigWheel_RadDist03"/>
+</gvxysx>
+
+<!-- third phi plate with kink - plate 4 -->
+<var name="TBWH_PhiPlate4_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist04-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate4_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist04-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate4_XPos2" value="TBWH_PhiPlate4_XPos1+(TBWH_BigWheel_RadDist04*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate4_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate4_YPos2" value="TBWH_BigWheel_RadDist04-(TBWH_BigWheel_RadDist04*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate4_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate4_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos3; TBWH_BigWheel_RadDist04+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate4_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate4_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos1; TBWH_BigWheel_RadDist04"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate4_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist04+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate4_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate4_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist04-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- forth phi plate with kink - plate 5 -->
+<var name="TBWH_PhiPlate5_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist05-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate5_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist05-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate3" />
+<var name="TBWH_PhiPlate5_XPos2" value="TBWH_PhiPlate5_XPos1+(TBWH_BigWheel_RadDist05*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate5_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+<var name="TBWH_PhiPlate5_YPos2" value="TBWH_BigWheel_RadDist05-(TBWH_BigWheel_RadDist05*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate5_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TBWH_PhiPlate5" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos3; TBWH_BigWheel_RadDist05+TBWH_BigWheel_RThickPhiPlate3"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos2+TBWH_BigWheel_RThickPhiPlate3*sin(TBWH_BigWheel_PhiStepAngle2)+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate5_YPos2+TBWH_BigWheel_RThickPhiPlate3*cos(TBWH_BigWheel_PhiStepAngle2)-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate5_YPos2-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos1; TBWH_BigWheel_RadDist05"/>
+</gvxysx>
+
+<!-- fifth phi plate with kink - plate 6 -->
+<var name="TBWH_PhiPlate6_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist06-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate6_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist06-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate6_XPos2" value="TBWH_PhiPlate6_XPos1+(TBWH_BigWheel_RadDist06*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate6_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate6_YPos2" value="TBWH_BigWheel_RadDist06-(TBWH_BigWheel_RadDist06*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate6_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate6_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos3; TBWH_BigWheel_RadDist06+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate6_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate6_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos1; TBWH_BigWheel_RadDist06"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate6_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist06+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate6_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate6_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist06-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- sixth phi plate with kink - plate 7 -->
+<var name="TBWH_PhiPlate7_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist07-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate7_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist07-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate3" />
+<var name="TBWH_PhiPlate7_XPos2" value="TBWH_PhiPlate7_XPos1+(TBWH_BigWheel_RadDist07*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate7_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+<var name="TBWH_PhiPlate7_YPos2" value="TBWH_BigWheel_RadDist07-(TBWH_BigWheel_RadDist07*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate7_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TBWH_PhiPlate7" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos3; TBWH_BigWheel_RadDist07+TBWH_BigWheel_RThickPhiPlate3"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos2+TBWH_BigWheel_RThickPhiPlate3*sin(TBWH_BigWheel_PhiStepAngle2)+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate7_YPos2+TBWH_BigWheel_RThickPhiPlate3*cos(TBWH_BigWheel_PhiStepAngle2)-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate7_YPos2-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos1; TBWH_BigWheel_RadDist07"/>
+</gvxysx>
+
+<!-- seventh phi plate with kink - plate 8 -->
+<var name="TBWH_PhiPlate8_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist08-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate8_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist08-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate8_XPos2" value="TBWH_PhiPlate8_XPos1+(TBWH_BigWheel_RadDist08*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate8_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate8_YPos2" value="TBWH_BigWheel_RadDist08-(TBWH_BigWheel_RadDist08*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate8_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate8_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos3; TBWH_BigWheel_RadDist08+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate8_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate8_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos1; TBWH_BigWheel_RadDist08"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate8_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist08+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate8_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate8_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist08-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- first R plate - center -->
+<box name="TBWH_RPlate1_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate1_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00+TBWH_BigWheel_WallThickRPlate; TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate1">
+ <posXYZ volume="TBWH_RPlate1_base" X_Y_Z=" TBWH_BigWheel_PhiDistRPlate1/2.+TBWH_BigWheel_PhiThickRPlate/2.; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." />
+ <posXYZ volume="TBWH_RPlate1_sub" X_Y_Z=" TBWH_BigWheel_PhiDistRPlate1/2.+TBWH_BigWheel_PhiThickRPlate/2.+TBWH_BigWheel_WallThickRPlate; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." />
+</subtraction>
+
+<!-- second R plate - 7.5 degrees -->
+<box name="TBWH_RPlate2_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/cos(TBWH_BigWheel_PhiStepAngle1); TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate2_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00+TBWH_BigWheel_WallThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle1); TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate2">
+ <posXYZ volume="TBWH_RPlate2_base" X_Y_Z=" TBWH_PhiPlate2_XPos1+(TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00-2.*TBWH_BigWheel_RadDist02)*tan(TBWH_BigWheel_PhiStepAngle1)/2.; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate2_sub" X_Y_Z=" TBWH_PhiPlate2_XPos1+(TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00-2.*TBWH_BigWheel_RadDist02)*tan(TBWH_BigWheel_PhiStepAngle1)/2.-TBWH_BigWheel_WallThickRPlate; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+</subtraction>
+
+<!-- third R plate - 7.5 degrees TBWH_BigWheel_PhiThickRPlate-->
+<var name="TBWH_RPlate3_length" value="(TBWH_BigWheel_RadDist09 - TBWH_BigWheel_RadDist00 - (TBWH_PhiPlate2_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)) - (TBWH_BigWheel_PhiStep2toP1 + TBWH_BigWheel_PhiThickRPlate) * sin(TBWH_BigWheel_PhiStepAngle2) ) / cos(TBWH_BigWheel_PhiStepAngle1)" />
+
+<box name="TBWH_RPlate3_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_RPlate3_length; TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate3_sub1" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_RPlate3_length + TBWH_BigWheel_WallThickRPlate/cos(TBWH_BigWheel_PhiStepAngle1); TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+<box name="TBWH_RPlate3_sub2" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_RPlate3_length; TBWH_BigWheel_ZThickRPlate+2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate3_tmp">
+ <posXYZ volume="TBWH_RPlate3_base" X_Y_Z=" TBWH_RPlate3_length/2.*sin(TBWH_BigWheel_PhiStepAngle1); TBWH_RPlate3_length/2.*cos(TBWH_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate3_sub1" X_Y_Z=" TBWH_RPlate3_length/2.*sin(TBWH_BigWheel_PhiStepAngle1)-TBWH_BigWheel_WallThickRPlate; TBWH_RPlate3_length/2.*cos(TBWH_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate3_sub2" X_Y_Z="TBWH_RPlate3_length/2.*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/2*(cos(TBWH_BigWheel_PhiStepAngle1)-cos(TBWH_BigWheel_PhiStepAngle2));TBWH_RPlate3_length/2.*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/2*(sin(TBWH_BigWheel_PhiStepAngle2)-sin(TBWH_BigWheel_PhiStepAngle1)); 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<var name="TBWH_RPlate3_PosX" value="TBWH_PhiPlate2_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiThickRPlate*(0.5*cos(TBWH_BigWheel_PhiStepAngle1)-cos(TBWH_BigWheel_PhiStepAngle2))-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<var name="TBWH_RPlate3_PosY" value="TBWH_PhiPlate2_YPos2+(TBWH_BigWheel_PhiStep2toP1-TBWH_BigWheel_PhiStepP2toP2)*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiThickRPlate*(sin(TBWH_BigWheel_PhiStepAngle2)-0.5*sin(TBWH_BigWheel_PhiStepAngle1))+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<composition name="TBWH_RPlate3" >
+ <posXYZ volume="TBWH_RPlate3_tmp" X_Y_Z=" TBWH_RPlate3_PosX-GENV_Eps; TBWH_RPlate3_PosY ; 0." />
+</composition>
+
+<!-- first R plate - 15 degrees -->
+<box name="TBWH_RPlate4_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)/cos(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate4_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00+TBWH_BigWheel_WallThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate4">
+ <posXYZ volume="TBWH_RPlate4_base" X_Y_Z=" (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)*tan(TBWH_BigWheel_PhiStepAngle2)/2.+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1-1.5*TBWH_BigWheel_PhiThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle2); (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate4_sub" X_Y_Z=" (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)*tan(TBWH_BigWheel_PhiStepAngle2)/2.-TBWH_BigWheel_WallThickRPlate+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1-1.5*TBWH_BigWheel_PhiThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle2); (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- second R plate - 15 degrees -->
+<box name="TBWH_RPlate5_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/cos(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate5_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/cos(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_WallThickRPlate; TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<var name="TBWH_RPlate5_PosX" value="sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate/2. +TBWH_PhiPlate2_XPos2 +TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2) +tan(TBWH_BigWheel_PhiStepAngle2)*(TBWH_BigWheel_RadDist09/2.-TBWH_PhiPlate2_YPos2+TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_RadDist00)"/>
+
+<subtraction name="TBWH_RPlate5">
+ <posXYZ volume="TBWH_RPlate5_base" X_Y_Z=" TBWH_RPlate5_PosX - cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.; (TBWH_BigWheel_RadDist09+cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/2. - TBWH_BigWheel_RadDist00 + sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate5_sub" X_Y_Z=" TBWH_RPlate5_PosX - cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.+TBWH_BigWheel_WallThickRPlate; (TBWH_BigWheel_RadDist09+cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/2.- TBWH_BigWheel_RadDist00 + sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<composition name="TBWH_Support_EvenSector_ASide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_Support_OddSector_ASide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_Support_EvenSector_CSide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_Support_OddSector_CSide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<!-- tube and boxes are rather rouhg approximated here - should be okay though - Cavern Background only -->
+
+<tubs name="TBWH_CentralTube" material="Aluminium" Rio_Z="TBWH_BigWheel_TubeInnerR; TBWH_BigWheel_TubeOuterR; TBWH_BigWheel_WallThickPhiPlate" nbPhi="20" />
+
+<box name="TBWH_SurBox_base" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSideLength; TGC_BigWheel_SurBoxSideLength" />
+<box name="TBWH_SurBox_inner" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall" />
+
+<subtraction name="TBWH_SurBox_default" >
+ <posXYZ volume="TBWH_SurBox_base" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+ <posXYZ volume="TBWH_SurBox_inner" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+</subtraction>
+
+<box name="TBWH_SurBoxSpc_base" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSpcLength; TGC_BigWheel_SurBoxSpcHeight" />
+<box name="TBWH_SurBoxSpc_inner" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSpcLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSpcHeight" />
+
+<subtraction name="TBWH_SurBoxSpc" >
+ <posXYZ volume="TBWH_SurBoxSpc_base" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2." />
+ <posXYZ volume="TBWH_SurBoxSpc_inner" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2.-TGC_BigWheel_SurBoxSpcWall" />
+</subtraction>
+
+<composition name="TBWH_SurBox_extended" >
+ <posXYZ volume="TBWH_SurBox_default" X_Y_Z=" 0.; TGC_BigWheel_SurBoxSideLength + TGC_BigWheel_SurBoxDistance; 0." />
+ <posXYZ volume="TBWH_SurBoxSpc" X_Y_Z=" 0.; 0.; GENV_Eps" />
+ <posXYZ volume="TBWH_SurBoxSpc" X_Y_Z=" 0.; 0.; -GENV_Eps" rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_BigWheel_ASide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TBWH_Support_EvenSector_ASide" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TBWH_Support_OddSector_ASide" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TBWH_SurBox_default" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TBWH_SurBox_extended" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TBWH_CentralTube" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TBWH_BigWheel_CSide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TBWH_Support_EvenSector_CSide" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TBWH_Support_OddSector_CSide" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TBWH_SurBox_default" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TBWH_SurBox_extended" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TBWH_CentralTube" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TBWH_BigWheels">
+ <posXYZ volume="TBWH_BigWheel_ASide" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="TBWH_BigWheel_CSide" X_Y_Z=" 0.; 0.; 0." />
+</composition>
+
+<!-- name = TGC3 Big Wheel section name = "Supports" -->
+<var name="TGC3_BigWheel_ZPosL" value=" 15150. "/>
+
+<var name="TGC3_BigWheel_RadDist00" value=" 2445. "/>
+<var name="TGC3_BigWheel_RadDist01" value=" 970. "/>
+<var name="TGC3_BigWheel_RadDist02" value=" 2528. "/>
+<var name="TGC3_BigWheel_RadDist03" value=" 3560. "/>
+<var name="TGC3_BigWheel_RadDist04" value=" 4767. "/>
+<var name="TGC3_BigWheel_RadDist05" value=" 5800. "/>
+<var name="TGC3_BigWheel_RadDist06" value=" 7005. "/>
+<var name="TGC3_BigWheel_RadDist07" value=" 8037. "/>
+<var name="TGC3_BigWheel_RadDist08" value=" 9243. "/>
+<var name="TGC3_BigWheel_RadDist09" value=" 12230. "/>
+<var name="TGC3_BigWheel_RadDistOutPlate" value=" 4150. "/>
+<var name="TGC3_BigWheel_RadDistPlate02" value=" 2353. "/>
+<var name="TGC3_BigWheel_PhiDistRPlate1" value=" 390. "/>
+
+<var name="TGC3_BigWheel_ZThickPhiPlate" value=" 30. "/>
+<var name="TGC3_BigWheel_WallThickPhiPlate" value=" 16. "/>
+<var name="TGC3_BigWheel_RThickPhiPlate1" value=" 200. "/>
+<var name="TGC3_BigWheel_RThickPhiPlate2" value=" 130. "/> <!-- estimated -->
+<var name="TGC3_BigWheel_ZThickRPlate" value=" 150. "/>
+<var name="TGC3_BigWheel_PhiThickRPlate" value=" 50. "/>
+<var name="TGC3_BigWheel_WallThickRPlate" value=" 5. "/>
+
+<var name="TGC3_BigWheel_PhiPlaDelEvenOdd" value="TGC3_BigWheel_RThickPhiPlate2 + TGC3_BigWheel_PhiThickRPlate"/>
+
+<var name="TGC3_BigWheel_PhiStepAngle1" value=" 7.5 * GENV_PiS180 "/>
+<var name="TGC3_BigWheel_PhiStepAngle2" value=" 15. * GENV_PiS180 "/>
+
+<var name="TGC3_BigWheel_PhiStep1toP1" value=" -28. "/> <!-- estimate -->
+<var name="TGC3_BigWheel_PhiStepP1toP2" value=" 456. "/>
+
+<var name="TGC3_BigWheel_PhiStep2toP1" value=" 468. "/>
+<var name="TGC3_BigWheel_PhiStepP2toP2" value=" 765. + TGC3_BigWheel_PhiThickRPlate"/> <!-- estimate -->
+
+<var name="TGC3_BigWheel_TubeInnerR" value=" 2335. "/>
+<var name="TGC3_BigWheel_TubeOuterR" value=" TGC3_BigWheel_TubeInnerR + 405. "/>
+
+<!-- lowest phi plate - plate 1 -->
+<gvxysx name="TGC3_PhiPlate1" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" (TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1)*sin(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1"/>
+ <gvxy_point X_Y=" (TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01)*sin(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_RadDist01"/>
+</gvxysx>
+
+<!-- first phi plate with kink - plate 2 -->
+<var name="TGC3_PhiPlate2_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist02-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate2_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist02-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate2_XPos2" value="TGC3_PhiPlate2_XPos1+(TGC3_BigWheel_RadDist02*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate2_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate2_YPos2" value="TGC3_BigWheel_RadDist02-(TGC3_BigWheel_RadDist02*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate2_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate2_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos3; TGC3_BigWheel_RadDist02+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate2_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate2_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos1; TGC3_BigWheel_RadDist02"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate2_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist02+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate2_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate2_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist02-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- second phi plate with kink - plate 3 -->
+<var name="TGC3_PhiPlate3_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist03-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate3_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist03-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate3_XPos2" value="TGC3_PhiPlate3_XPos1+(TGC3_BigWheel_RadDist03*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate3_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+<var name="TGC3_PhiPlate3_YPos2" value="TGC3_BigWheel_RadDist03-(TGC3_BigWheel_RadDist03*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate3_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC3_PhiPlate3" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos3; TGC3_BigWheel_RadDist03+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate3_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate3_YPos2-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos1; TGC3_BigWheel_RadDist03"/>
+</gvxysx>
+
+<!-- third phi plate with kink - plate 4 -->
+<var name="TGC3_PhiPlate4_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist04-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate4_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist04-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate4_XPos2" value="TGC3_PhiPlate4_XPos1+(TGC3_BigWheel_RadDist04*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate4_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate4_YPos2" value="TGC3_BigWheel_RadDist04-(TGC3_BigWheel_RadDist04*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate4_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate4_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos3; TGC3_BigWheel_RadDist04+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate4_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate4_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos1; TGC3_BigWheel_RadDist04"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate4_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist04+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate4_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate4_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist04-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- forth phi plate with kink - plate 5 -->
+<var name="TGC3_PhiPlate5_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist05-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate5_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist05-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate5_XPos2" value="TGC3_PhiPlate5_XPos1+(TGC3_BigWheel_RadDist05*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate5_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+<var name="TGC3_PhiPlate5_YPos2" value="TGC3_BigWheel_RadDist05-(TGC3_BigWheel_RadDist05*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate5_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC3_PhiPlate5" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos3; TGC3_BigWheel_RadDist05+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate5_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate5_YPos2-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos1; TGC3_BigWheel_RadDist05"/>
+</gvxysx>
+
+<!-- fifth phi plate with kink - plate 6 -->
+<var name="TGC3_PhiPlate6_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist06-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate6_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist06-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate6_XPos2" value="TGC3_PhiPlate6_XPos1+(TGC3_BigWheel_RadDist06*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate6_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate6_YPos2" value="TGC3_BigWheel_RadDist06-(TGC3_BigWheel_RadDist06*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate6_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate6_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos3; TGC3_BigWheel_RadDist06+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate6_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate6_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos1; TGC3_BigWheel_RadDist06"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate6_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist06+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate6_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate6_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist06-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- sixth phi plate with kink - plate 7 -->
+<var name="TGC3_PhiPlate7_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist07-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate7_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist07-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate7_XPos2" value="TGC3_PhiPlate7_XPos1+(TGC3_BigWheel_RadDist07*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate7_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+<var name="TGC3_PhiPlate7_YPos2" value="TGC3_BigWheel_RadDist07-(TGC3_BigWheel_RadDist07*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate7_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC3_PhiPlate7" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos3; TGC3_BigWheel_RadDist07+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate7_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate7_YPos2-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos1; TGC3_BigWheel_RadDist07"/>
+</gvxysx>
+
+<!-- seventh phi plate with kink - plate 8 -->
+<var name="TGC3_PhiPlate8_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist08-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate8_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist08-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate8_XPos2" value="TGC3_PhiPlate8_XPos1+(TGC3_BigWheel_RadDist08*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate8_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate8_YPos2" value="TGC3_BigWheel_RadDist08-(TGC3_BigWheel_RadDist08*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate8_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate8_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos3; TGC3_BigWheel_RadDist08+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate8_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate8_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos1; TGC3_BigWheel_RadDist08"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate8_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist08+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate8_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate8_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist08-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- first R plate - center -->
+<box name="TGC3_RPlate1_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate1_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00+TGC3_BigWheel_WallThickRPlate; TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate1">
+ <posXYZ volume="TGC3_RPlate1_base" X_Y_Z=" TGC3_BigWheel_PhiDistRPlate1/2.+TGC3_BigWheel_PhiThickRPlate/2.; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." />
+ <posXYZ volume="TGC3_RPlate1_sub" X_Y_Z=" TGC3_BigWheel_PhiDistRPlate1/2.+TGC3_BigWheel_PhiThickRPlate/2.+TGC3_BigWheel_WallThickRPlate; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." />
+</subtraction>
+
+<!-- second R plate - 7.5 degrees -->
+<box name="TGC3_RPlate2_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/cos(TGC3_BigWheel_PhiStepAngle1); TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate2_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00+TGC3_BigWheel_WallThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle1); TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate2">
+ <posXYZ volume="TGC3_RPlate2_base" X_Y_Z=" TGC3_PhiPlate2_XPos1+(TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00-2.*TGC3_BigWheel_RadDist02)*tan(TGC3_BigWheel_PhiStepAngle1)/2.; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate2_sub" X_Y_Z=" TGC3_PhiPlate2_XPos1+(TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00-2.*TGC3_BigWheel_RadDist02)*tan(TGC3_BigWheel_PhiStepAngle1)/2.-TGC3_BigWheel_WallThickRPlate; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+</subtraction>
+
+<!-- third R plate - 7.5 degrees TGC3_BigWheel_PhiThickRPlate-->
+<var name="TGC3_RPlate3_length" value="(TGC3_BigWheel_RadDist09 - TGC3_BigWheel_RadDist00 - (TGC3_PhiPlate2_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)) - (TGC3_BigWheel_PhiStep2toP1 + TGC3_BigWheel_PhiThickRPlate) * sin(TGC3_BigWheel_PhiStepAngle2) ) / cos(TGC3_BigWheel_PhiStepAngle1)" />
+
+<box name="TGC3_RPlate3_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_RPlate3_length; TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate3_sub1" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_RPlate3_length + TGC3_BigWheel_WallThickRPlate/cos(TGC3_BigWheel_PhiStepAngle1); TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+<box name="TGC3_RPlate3_sub2" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_RPlate3_length; TGC3_BigWheel_ZThickRPlate+2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate3_tmp">
+ <posXYZ volume="TGC3_RPlate3_base" X_Y_Z=" TGC3_RPlate3_length/2.*sin(TGC3_BigWheel_PhiStepAngle1); TGC3_RPlate3_length/2.*cos(TGC3_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate3_sub1" X_Y_Z=" TGC3_RPlate3_length/2.*sin(TGC3_BigWheel_PhiStepAngle1)-TGC3_BigWheel_WallThickRPlate; TGC3_RPlate3_length/2.*cos(TGC3_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate3_sub2" X_Y_Z="TGC3_RPlate3_length/2.*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/2*(cos(TGC3_BigWheel_PhiStepAngle1)-cos(TGC3_BigWheel_PhiStepAngle2));TGC3_RPlate3_length/2.*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/2*(sin(TGC3_BigWheel_PhiStepAngle2)-sin(TGC3_BigWheel_PhiStepAngle1)); 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<var name="TGC3_RPlate3_PosX" value="TGC3_PhiPlate2_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiThickRPlate*(0.5*cos(TGC3_BigWheel_PhiStepAngle1)-cos(TGC3_BigWheel_PhiStepAngle2))-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<var name="TGC3_RPlate3_PosY" value="TGC3_PhiPlate2_YPos2+(TGC3_BigWheel_PhiStep2toP1-TGC3_BigWheel_PhiStepP2toP2)*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiThickRPlate*(sin(TGC3_BigWheel_PhiStepAngle2)-0.5*sin(TGC3_BigWheel_PhiStepAngle1))+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<composition name="TGC3_RPlate3" >
+ <posXYZ volume="TGC3_RPlate3_tmp" X_Y_Z=" TGC3_RPlate3_PosX-GENV_Eps; TGC3_RPlate3_PosY ; 0." />
+</composition>
+
+<!-- first R plate - 15 degrees -->
+<box name="TGC3_RPlate4_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)/cos(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate4_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00+TGC3_BigWheel_WallThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate4">
+ <posXYZ volume="TGC3_RPlate4_base" X_Y_Z=" (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)*tan(TGC3_BigWheel_PhiStepAngle2)/2.+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1-1.5*TGC3_BigWheel_PhiThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle2); (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate4_sub" X_Y_Z=" (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)*tan(TGC3_BigWheel_PhiStepAngle2)/2.-TGC3_BigWheel_WallThickRPlate+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1-1.5*TGC3_BigWheel_PhiThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle2); (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- second R plate - 15 degrees -->
+<box name="TGC3_RPlate5_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/cos(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate5_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/cos(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_WallThickRPlate; TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<var name="TGC3_RPlate5_PosX" value="sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate/2. +TGC3_PhiPlate2_XPos2 +TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2) +tan(TGC3_BigWheel_PhiStepAngle2)*(TGC3_BigWheel_RadDist09/2.-TGC3_PhiPlate2_YPos2+TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_RadDist00)"/>
+
+<subtraction name="TGC3_RPlate5">
+ <posXYZ volume="TGC3_RPlate5_base" X_Y_Z=" TGC3_RPlate5_PosX - cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.; (TGC3_BigWheel_RadDist09+cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/2. - TGC3_BigWheel_RadDist00 + sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate5_sub" X_Y_Z=" TGC3_RPlate5_PosX - cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.+TGC3_BigWheel_WallThickRPlate; (TGC3_BigWheel_RadDist09+cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/2.- TGC3_BigWheel_RadDist00 + sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- very rough approximation of trigger boxes and cables - everything estimated - even/odd sectors for TGC3 -->
+<!-- change of variables does not change placement correctly - fine tuning required -->
+
+<var name="TGC3_TrigBoxThicknessZ" value=" 2. " />
+<var name="TGC3_TrigBoxWidthPhi" value=" 260. " />
+<var name="TGC3_TrigBoxLengthR" value=" 5160. " />
+<var name="TGC3_TrigBoxAngle1" value=" 3.25" />
+<var name="TGC3_TrigBoxAngle2" value=" 12. " />
+
+<box name="TGC3_TrigBox" material="Aluminium" X_Y_Z="TGC3_TrigBoxWidthPhi; TGC3_TrigBoxLengthR; TGC3_TrigBoxThicknessZ" />
+
+<var name="TGC3_TrigCableThicknessZ1" value=" 5. " />
+<var name="TGC3_TrigCableThicknessZ2" value=" 3. " />
+<var name="TGC3_TrigCableThicknessZ3" value=" 6.5 " />
+<var name="TGC3_TrigCableWidthPhi1" value=" 130. " />
+<var name="TGC3_TrigCableWidthPhi2" value=" 100. " />
+<var name="TGC3_TrigCableWidthPhi3" value=" 75. " />
+<var name="TGC3_TrigCableWidthPhi4" value=" 60. " />
+<var name="TGC3_TrigCableWidthPhi5" value=" 250. " />
+<var name="TGC3_TrigCableLengthR1" value=" 4500. " />
+<var name="TGC3_TrigCableLengthR3" value=" 1600. " />
+<var name="TGC3_TrigCableLengthR4" value=" 1400. " />
+<var name="TGC3_TrigCableLengthR5" value=" 1550. " />
+
+<box name="TGC3_TrigCable1" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi1; TGC3_TrigCableLengthR1; TGC3_TrigCableThicknessZ1" />
+<box name="TGC3_TrigCable2" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi2; TGC3_TrigCableLengthR1; TGC3_TrigCableThicknessZ2" />
+<box name="TGC3_TrigCable3" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi3; TGC3_TrigCableLengthR3; TGC3_TrigCableThicknessZ3" />
+<box name="TGC3_TrigCable4" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi4; TGC3_TrigCableLengthR4; TGC3_TrigCableThicknessZ3" />
+<box name="TGC3_TrigCable5" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi5; TGC3_TrigCableLengthR5; TGC3_TrigCableThicknessZ1" />
+
+<composition name="TGC3_Support_EvenSector_ASide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC3_Support_OddSector_ASide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC3_Support_EvenSector_CSide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC3_Support_OddSector_CSide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<!-- tube and boxes are rather rouhg approximated here - should be okay though - Cavern Background only -->
+
+<tubs name="TGC3_CentralTube" material="Aluminium" Rio_Z="TGC3_BigWheel_TubeInnerR; TGC3_BigWheel_TubeOuterR; TGC3_BigWheel_WallThickPhiPlate" nbPhi="20" />
+
+<box name="TGC3_SurBox_base" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSideLength; TGC_BigWheel_SurBoxSideLength" />
+<box name="TGC3_SurBox_inner" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall" />
+
+<subtraction name="TGC3_SurBox_default" >
+ <posXYZ volume="TGC3_SurBox_base" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+ <posXYZ volume="TGC3_SurBox_inner" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+</subtraction>
+
+<box name="TGC3_SurBoxSpc_base" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSpcLength; TGC_BigWheel_SurBoxSpcHeight" />
+<box name="TGC3_SurBoxSpc_inner" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSpcLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSpcHeight" />
+
+<subtraction name="TGC3_SurBoxSpc" >
+ <posXYZ volume="TGC3_SurBoxSpc_base" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2." />
+ <posXYZ volume="TGC3_SurBoxSpc_inner" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2.-TGC_BigWheel_SurBoxSpcWall" />
+</subtraction>
+
+<composition name="TGC3_SurBox_extended" >
+ <posXYZ volume="TGC3_SurBox_default" X_Y_Z=" 0.; TGC_BigWheel_SurBoxSideLength + TGC_BigWheel_SurBoxDistance; 0." />
+ <posXYZ volume="TGC3_SurBoxSpc" X_Y_Z=" 0.; 0.; GENV_Eps" />
+ <posXYZ volume="TGC3_SurBoxSpc" X_Y_Z=" 0.; 0.; -GENV_Eps" rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TGC3_BigWheel_ASide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC3_Support_EvenSector_ASide" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC3_Support_OddSector_ASide" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC3_SurBox_default" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TGC3_SurBox_extended" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TGC3_CentralTube" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC3_BigWheel_CSide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC3_Support_EvenSector_CSide" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC3_Support_OddSector_CSide" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC3_SurBox_default" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TGC3_SurBox_extended" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TGC3_CentralTube" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC3_BigWheels">
+ <posXYZ volume="TGC3_BigWheel_ASide" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="TGC3_BigWheel_CSide" X_Y_Z=" 0.; 0.; 0." />
+</composition>
+
+<!-- name = TGC1 Big Wheel section name = "Supports" -->
+<!-- Spokes U zposition -->
+<var name="TGC1_BigWheel_ZPosL" value=" 13435. " />
+
+<var name="TGC1_BigWheel_RadDist00" value=" 1777.5 "/>
+<var name="TGC1_BigWheel_RadDist01" value=" 922. "/>
+<var name="TGC1_BigWheel_RadDist02" value=" 2582.5 "/>
+<var name="TGC1_BigWheel_RadDist03" value=" 3572.5 "/>
+<var name="TGC1_BigWheel_RadDist04" value=" 4667.5 "/>
+<var name="TGC1_BigWheel_RadDist05" value=" 5672.5 "/>
+<var name="TGC1_BigWheel_RadDist06" value=" 6754.5 "/>
+<var name="TGC1_BigWheel_RadDist07" value=" 7772.5 "/>
+<var name="TGC1_BigWheel_RadDist08" value=" 8682.5 "/>
+<var name="TGC1_BigWheel_RadDist09" value=" 10990. "/>
+<var name="TGC1_BigWheel_RadDistOutPlate" value=" 3670. "/>
+<var name="TGC1_BigWheel_RadDistPlate02" value=" 2547. "/>
+<var name="TGC1_BigWheel_PhiDistRPlate1" value=" 350. "/>
+
+<var name="TGC1_BigWheel_ZThickPhiPlate" value=" 30. "/>
+<var name="TGC1_BigWheel_WallThickPhiPlate" value=" 16. "/>
+<var name="TGC1_BigWheel_RThickPhiPlate1" value=" 200. "/>
+<var name="TGC1_BigWheel_RThickPhiPlate2" value=" 120. "/>
+<var name="TGC1_BigWheel_ZThickRPlate" value=" 150. "/>
+<var name="TGC1_BigWheel_PhiThickRPlate" value=" 50. "/>
+<var name="TGC1_BigWheel_WallThickRPlate" value=" 5. "/>
+
+<var name="TGC1_BigWheel_PhiPlaDelEvenOdd" value="TGC1_BigWheel_RThickPhiPlate2 + TGC1_BigWheel_PhiThickRPlate/2."/>
+
+<var name="TGC1_BigWheel_PhiStepAngle1" value=" 7.5 * GENV_PiS180 "/>
+<var name="TGC1_BigWheel_PhiStepAngle2" value=" 15. * GENV_PiS180 "/>
+
+<var name="TGC1_BigWheel_PhiStep1toP1" value=" 18. "/>
+<var name="TGC1_BigWheel_PhiStepP1toP2" value=" 497. "/>
+
+<var name="TGC1_BigWheel_PhiStep2toP1" value=" 442. "/>
+<var name="TGC1_BigWheel_PhiStepP2toP2" value=" 642. + TGC1_BigWheel_PhiThickRPlate"/>
+
+<var name="TGC1_BigWheel_TubeInnerR" value=" 1715. "/>
+<var name="TGC1_BigWheel_TubeOuterR" value=" TGC1_BigWheel_TubeInnerR + 405. "/>
+
+<!-- lowest phi plate - plate 1 -->
+<gvxysx name="TGC1_PhiPlate1" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" (TGC1_BigWheel_RadDist00+TGC1_BigWheel_RadDist01+TGC1_BigWheel_RThickPhiPlate1)*sin(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_RadDist01+TGC1_BigWheel_RThickPhiPlate1"/>
+ <gvxy_point X_Y=" (TGC1_BigWheel_RadDist00+TGC1_BigWheel_RadDist01)*sin(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_RadDist01"/>
+</gvxysx>
+
+<!-- first phi plate with kink - plate 2 -->
+<var name="TGC1_PhiPlate2_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist02-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate2_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist02-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate2_XPos2" value="TGC1_PhiPlate2_XPos1+(TGC1_BigWheel_RadDist02*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate2_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate2_YPos2" value="TGC1_BigWheel_RadDist02-(TGC1_BigWheel_RadDist02*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate2_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate2_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos3; TGC1_BigWheel_RadDist02+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate2_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate2_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos1; TGC1_BigWheel_RadDist02"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate2_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist02+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate2_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate2_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist02-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- second phi plate with kink - plate 3 -->
+<var name="TGC1_PhiPlate3_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist03-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate3_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist03-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate3_XPos2" value="TGC1_PhiPlate3_XPos1+(TGC1_BigWheel_RadDist03*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate3_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+<var name="TGC1_PhiPlate3_YPos2" value="TGC1_BigWheel_RadDist03-(TGC1_BigWheel_RadDist03*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate3_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC1_PhiPlate3" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos3; TGC1_BigWheel_RadDist03+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate3_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate3_YPos2-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos1; TGC1_BigWheel_RadDist03"/>
+</gvxysx>
+
+<!-- third phi plate with kink - plate 4 -->
+<var name="TGC1_PhiPlate4_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist04-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate4_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist04-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate4_XPos2" value="TGC1_PhiPlate4_XPos1+(TGC1_BigWheel_RadDist04*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate4_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate4_YPos2" value="TGC1_BigWheel_RadDist04-(TGC1_BigWheel_RadDist04*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate4_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate4_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos3; TGC1_BigWheel_RadDist04+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate4_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate4_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos1; TGC1_BigWheel_RadDist04"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate4_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist04+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate4_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate4_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist04-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- forth phi plate with kink - plate 5 -->
+<var name="TGC1_PhiPlate5_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist05-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate5_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist05-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate5_XPos2" value="TGC1_PhiPlate5_XPos1+(TGC1_BigWheel_RadDist05*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate5_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+<var name="TGC1_PhiPlate5_YPos2" value="TGC1_BigWheel_RadDist05-(TGC1_BigWheel_RadDist05*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate5_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC1_PhiPlate5" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos3; TGC1_BigWheel_RadDist05+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate5_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate5_YPos2-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos1; TGC1_BigWheel_RadDist05"/>
+</gvxysx>
+
+<!-- fifth phi plate with kink - plate 6 -->
+<var name="TGC1_PhiPlate6_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist06-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate6_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist06-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate6_XPos2" value="TGC1_PhiPlate6_XPos1+(TGC1_BigWheel_RadDist06*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate6_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate6_YPos2" value="TGC1_BigWheel_RadDist06-(TGC1_BigWheel_RadDist06*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate6_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate6_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos3; TGC1_BigWheel_RadDist06+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate6_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate6_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos1; TGC1_BigWheel_RadDist06"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate6_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist06+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate6_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate6_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist06-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- sixth phi plate with kink - plate 7 -->
+<var name="TGC1_PhiPlate7_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist07-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate7_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist07-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate7_XPos2" value="TGC1_PhiPlate7_XPos1+(TGC1_BigWheel_RadDist07*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate7_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+<var name="TGC1_PhiPlate7_YPos2" value="TGC1_BigWheel_RadDist07-(TGC1_BigWheel_RadDist07*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate7_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC1_PhiPlate7" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos3; TGC1_BigWheel_RadDist07+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate7_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate7_YPos2-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos1; TGC1_BigWheel_RadDist07"/>
+</gvxysx>
+
+<!-- seventh phi plate with kink - plate 8 -->
+<var name="TGC1_PhiPlate8_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist08-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate8_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist08-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate8_XPos2" value="TGC1_PhiPlate8_XPos1+(TGC1_BigWheel_RadDist08*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate8_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate8_YPos2" value="TGC1_BigWheel_RadDist08-(TGC1_BigWheel_RadDist08*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate8_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate8_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos3; TGC1_BigWheel_RadDist08+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate8_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate8_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos1; TGC1_BigWheel_RadDist08"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate8_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist08+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate8_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate8_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist08-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- first R plate - center -->
+<box name="TGC1_RPlate1_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate1_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00+TGC1_BigWheel_WallThickRPlate; TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate1">
+ <posXYZ volume="TGC1_RPlate1_base" X_Y_Z=" TGC1_BigWheel_PhiDistRPlate1/2.+TGC1_BigWheel_PhiThickRPlate/2.; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." />
+ <posXYZ volume="TGC1_RPlate1_sub" X_Y_Z=" TGC1_BigWheel_PhiDistRPlate1/2.+TGC1_BigWheel_PhiThickRPlate/2.+TGC1_BigWheel_WallThickRPlate; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." />
+</subtraction>
+
+<!-- second R plate - 7.5 degrees -->
+<box name="TGC1_RPlate2_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/cos(TGC1_BigWheel_PhiStepAngle1); TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate2_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00+TGC1_BigWheel_WallThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle1); TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate2">
+ <posXYZ volume="TGC1_RPlate2_base" X_Y_Z=" TGC1_PhiPlate2_XPos1+(TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00-2.*TGC1_BigWheel_RadDist02)*tan(TGC1_BigWheel_PhiStepAngle1)/2.; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate2_sub" X_Y_Z=" TGC1_PhiPlate2_XPos1+(TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00-2.*TGC1_BigWheel_RadDist02)*tan(TGC1_BigWheel_PhiStepAngle1)/2.-TGC1_BigWheel_WallThickRPlate; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+</subtraction>
+
+<!-- third R plate - 7.5 degrees TGC1_BigWheel_PhiThickRPlate-->
+<var name="TGC1_RPlate3_length" value="(TGC1_BigWheel_RadDist09 - TGC1_BigWheel_RadDist00 - (TGC1_PhiPlate2_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)) - (TGC1_BigWheel_PhiStep2toP1 + TGC1_BigWheel_PhiThickRPlate) * sin(TGC1_BigWheel_PhiStepAngle2) ) / cos(TGC1_BigWheel_PhiStepAngle1)" />
+
+<box name="TGC1_RPlate3_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_RPlate3_length; TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate3_sub1" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_RPlate3_length + TGC1_BigWheel_WallThickRPlate/cos(TGC1_BigWheel_PhiStepAngle1); TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+<box name="TGC1_RPlate3_sub2" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_RPlate3_length; TGC1_BigWheel_ZThickRPlate+2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate3_tmp">
+ <posXYZ volume="TGC1_RPlate3_base" X_Y_Z=" TGC1_RPlate3_length/2.*sin(TGC1_BigWheel_PhiStepAngle1); TGC1_RPlate3_length/2.*cos(TGC1_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate3_sub1" X_Y_Z=" TGC1_RPlate3_length/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_BigWheel_WallThickRPlate; TGC1_RPlate3_length/2.*cos(TGC1_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate3_sub2" X_Y_Z="TGC1_RPlate3_length/2.*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/2*(cos(TGC1_BigWheel_PhiStepAngle1)-cos(TGC1_BigWheel_PhiStepAngle2));TGC1_RPlate3_length/2.*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/2*(sin(TGC1_BigWheel_PhiStepAngle2)-sin(TGC1_BigWheel_PhiStepAngle1)); 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<var name="TGC1_RPlate3_PosX" value="TGC1_PhiPlate2_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiThickRPlate*(0.5*cos(TGC1_BigWheel_PhiStepAngle1)-cos(TGC1_BigWheel_PhiStepAngle2))-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<var name="TGC1_RPlate3_PosY" value="TGC1_PhiPlate2_YPos2+(TGC1_BigWheel_PhiStep2toP1-TGC1_BigWheel_PhiStepP2toP2)*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiThickRPlate*(sin(TGC1_BigWheel_PhiStepAngle2)-0.5*sin(TGC1_BigWheel_PhiStepAngle1))+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<composition name="TGC1_RPlate3" >
+ <posXYZ volume="TGC1_RPlate3_tmp" X_Y_Z=" TGC1_RPlate3_PosX-GENV_Eps; TGC1_RPlate3_PosY ; 0." />
+</composition>
+
+<!-- first R plate - 15 degrees -->
+<box name="TGC1_RPlate4_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)/cos(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate4_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00+TGC1_BigWheel_WallThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate4">
+ <posXYZ volume="TGC1_RPlate4_base" X_Y_Z=" (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)*tan(TGC1_BigWheel_PhiStepAngle2)/2.+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1-1.5*TGC1_BigWheel_PhiThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle2); (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate4_sub" X_Y_Z=" (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)*tan(TGC1_BigWheel_PhiStepAngle2)/2.-TGC1_BigWheel_WallThickRPlate+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1-1.5*TGC1_BigWheel_PhiThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle2); (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- second R plate - 15 degrees -->
+<box name="TGC1_RPlate5_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/cos(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate5_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/cos(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_WallThickRPlate; TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<var name="TGC1_RPlate5_PosX" value="sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate/2. +TGC1_PhiPlate2_XPos2 +TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2) +tan(TGC1_BigWheel_PhiStepAngle2)*(TGC1_BigWheel_RadDist09/2.-TGC1_PhiPlate2_YPos2+TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_RadDist00)"/>
+
+<subtraction name="TGC1_RPlate5">
+ <posXYZ volume="TGC1_RPlate5_base" X_Y_Z=" TGC1_RPlate5_PosX - cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.; (TGC1_BigWheel_RadDist09+cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/2. - TGC1_BigWheel_RadDist00 + sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate5_sub" X_Y_Z=" TGC1_RPlate5_PosX - cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.+TGC1_BigWheel_WallThickRPlate; (TGC1_BigWheel_RadDist09+cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/2.- TGC1_BigWheel_RadDist00 + sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- very rough approximation of trigger boxes and cables - everything estimated - everywhere for TGC1 -->
+<!-- change of variables does not change placement correctly - fine tuning required -->
+
+<var name="TGC1_TrigBoxThicknessZ" value=" 2. " />
+<var name="TGC1_TrigBoxWidthPhi" value=" 260. " />
+<var name="TGC1_TrigBoxLengthR" value=" 3160. " />
+
+<box name="TGC1_TrigBox" material="Aluminium" X_Y_Z="TGC1_TrigBoxWidthPhi; TGC1_TrigBoxLengthR; TGC1_TrigBoxThicknessZ" />
+
+<var name="TGC1_TrigCableThicknessZ1" value=" 4. " />
+<var name="TGC1_TrigCableWidthPhi1" value=" 100. " />
+<var name="TGC1_TrigCableLengthR1" value=" 5650. " />
+
+<box name="TGC1_TrigCable1" material="Copper" X_Y_Z=" TGC1_TrigCableWidthPhi1; TGC1_TrigCableLengthR1; TGC1_TrigCableThicknessZ1" />
+
+<composition name="TGC1_Support_EvenSector_ASide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC1_Support_OddSector_ASide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC1_Support_EvenSector_CSide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC1_Support_OddSector_CSide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<!-- tube and boxes are rather rouhg approximated here - should be okay though - Cavern Background only -->
+
+<tubs name="TGC1_CentralTube" material="Aluminium" Rio_Z="TGC1_BigWheel_TubeInnerR; TGC1_BigWheel_TubeOuterR; TGC1_BigWheel_WallThickPhiPlate" nbPhi="20" />
+
+<box name="TGC1_SurBox_base" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSideLength; TGC_BigWheel_SurBoxSideLength" />
+<box name="TGC1_SurBox_inner" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall" />
+
+<subtraction name="TGC1_SurBox_default" >
+ <posXYZ volume="TGC1_SurBox_base" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+ <posXYZ volume="TGC1_SurBox_inner" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+</subtraction>
+
+<box name="TGC1_SurBoxSpc_base" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSpcLength; TGC_BigWheel_SurBoxSpcHeight" />
+<box name="TGC1_SurBoxSpc_inner" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSpcLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSpcHeight" />
+
+<subtraction name="TGC1_SurBoxSpc" >
+ <posXYZ volume="TGC1_SurBoxSpc_base" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2." />
+ <posXYZ volume="TGC1_SurBoxSpc_inner" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2.-TGC_BigWheel_SurBoxSpcWall" />
+</subtraction>
+
+<composition name="TGC1_SurBox_extended" >
+ <posXYZ volume="TGC1_SurBox_default" X_Y_Z=" 0.; TGC_BigWheel_SurBoxSideLength + TGC_BigWheel_SurBoxDistance; 0." />
+ <posXYZ volume="TGC1_SurBoxSpc" X_Y_Z=" 0.; 0.; GENV_Eps" />
+ <posXYZ volume="TGC1_SurBoxSpc" X_Y_Z=" 0.; 0.; -GENV_Eps" rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TGC1_BigWheel_ASide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC1_Support_EvenSector_ASide" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC1_Support_OddSector_ASide" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC1_SurBox_default" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ <posXYZ volume="TGC1_SurBox_extended" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <posXYZ volume="TGC1_CentralTube" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC1_BigWheel_CSide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC1_Support_EvenSector_CSide" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC1_Support_OddSector_CSide" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC1_SurBox_default" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ <posXYZ volume="TGC1_SurBox_extended" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <posXYZ volume="TGC1_CentralTube" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC1_BigWheels">
+ <posXYZ volume="TGC1_BigWheel_ASide" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="TGC1_BigWheel_CSide" X_Y_Z=" 0.; 0.; 0." />
+</composition>
+
+</section>
+
+<section name = "MdtRailSupport"
+ version = "1.0"
+ date = "21 10 2010"
+ author = "Claude, Jochen, laurent"
+ top_volume = "MDTRail">
+<defaults unit_length="mm" />
+
+<var name="Zero" value=" 0"/>
+
+<var name="R_BOL_rail" value="9650."/>
+<var name="S_BOL_rail" value="2710."/>
+<var name="Z_BOL_rail" value="6350."/>
+<box name="rail_BOL" material="Aluminium" X_Y_Z="120.;120.;11300." />
+
+<composition name="BOL_MDTRail">
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S=" S_BOL_rail" R_Z="R_BOL_rail; Z_BOL_rail" impliedRot="true" />
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S="-S_BOL_rail" R_Z="R_BOL_rail; Z_BOL_rail" impliedRot="true" />
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S=" S_BOL_rail" R_Z="R_BOL_rail;-Z_BOL_rail" impliedRot="true" />
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S="-S_BOL_rail" R_Z="R_BOL_rail;-Z_BOL_rail" impliedRot="true" />
+</composition>
+
+<var name="R_BOL_service" value="9520."/>
+<var name="S_BOL_service" value="2570."/>
+<var name="Z_BOL_service" value="6350."/>
+<box name="service_BOL" material="Carbon" X_Y_Z="200.;150.; 11300." />
+
+<composition name="BOL_MDTService">
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S=" S_BOL_service" R_Z="R_BOL_service; Z_BOL_service" impliedRot="true" />
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S="-S_BOL_service" R_Z="R_BOL_service; Z_BOL_service" impliedRot="true" />
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S=" S_BOL_service" R_Z="R_BOL_service;-Z_BOL_service" impliedRot="true" />
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S="-S_BOL_service" R_Z="R_BOL_service;-Z_BOL_service" impliedRot="true" />
+</composition>
+
+
+<var name="R_BML_rail" value="7139."/>
+<var name="S_BML_rail" value="1998."/>
+<var name="Z_BML_rail" value="4850."/>
+<box name="rail_BML" material="Aluminium" X_Y_Z="120.;120.; 8300." />
+
+<composition name="BML_MDTRail">
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S=" S_BML_rail" R_Z="R_BML_rail; Z_BML_rail" impliedRot="true" />
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S="-S_BML_rail" R_Z="R_BML_rail; Z_BML_rail" impliedRot="true" />
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S=" S_BML_rail" R_Z="R_BML_rail;-Z_BML_rail" impliedRot="true" />
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S="-S_BML_rail" R_Z="R_BML_rail;-Z_BML_rail" impliedRot="true" />
+</composition>
+
+<var name="R_BML_support1" value="6900."/>
+<var name="S_BML_support1" value="2120."/>
+<var name="Z1_BML_support1" value="1712.5"/>
+<var name="Z2_BML_support1" value="5137.5"/>
+<var name="Z3_BML_support1" value="8245.0"/>
+<box name="support1_BML" material="Aluminium" X_Y_Z="590.;120.; 120." />
+
+<composition name="BML_RailSupport1">
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1; Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1; Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1;-Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1;-Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1; Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1; Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1;-Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1;-Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1; Z3_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1; Z3_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1;-Z3_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1;-Z3_BML_support1" impliedRot="true" />
+</composition>
+
+<var name="R_BML_support2" value="7139."/>
+<var name="S_BML_support2" value="2362."/>
+<var name="Z1_BML_support2" value="3490.0"/>
+<var name="Z2_BML_support2" value="6760.0"/>
+<box name="support2_BML" material="Aluminium" X_Y_Z=" 120.; 590.; 120." />
+
+<composition name="BML_RailSupport2">
+ <!-- the standard BML rail support brackets are in 2 orthogonal directions, but not in sectors 11/13/15,
+ to account for it, just add 7 brackets each (i.e. leave out the bottom sectors),
+ 4 by using symmetry and the 3 remaining ones positioned manually -->
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+</composition>
+
+
+<var name="R_BML_service" value="7139."/>
+<var name="S_BML_service" value="1860."/>
+<var name="Z_BML_service" value="4850."/>
+<box name="service_BML" material="Carbon" X_Y_Z="250.;120.; 8300." />
+
+<composition name="BML_MDTService">
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S=" S_BML_service" R_Z="R_BML_service; Z_BML_service" impliedRot="true" />
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S="-S_BML_service" R_Z="R_BML_service; Z_BML_service" impliedRot="true" />
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S=" S_BML_service" R_Z="R_BML_service;-Z_BML_service" impliedRot="true" />
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S="-S_BML_service" R_Z="R_BML_service;-Z_BML_service" impliedRot="true" />
+</composition>
+
+<var name="R_BML_trigbox" value="7575."/>
+<var name="S_BML_trigbox" value=" 900."/>
+<var name="Z_BML_trigbox" value="4850."/>
+<box name="trigbox_BML" material="Carbon" X_Y_Z="50.;1000.; 8300." />
+<composition name="BML_trigbox">
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S=" S_BML_trigbox" R_Z="R_BML_trigbox; Z_BML_trigbox" impliedRot="true" />
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S="-S_BML_trigbox" R_Z="R_BML_trigbox; Z_BML_trigbox" impliedRot="true" />
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S=" S_BML_trigbox" R_Z="R_BML_trigbox;-Z_BML_trigbox" impliedRot="true" />
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S="-S_BML_trigbox" R_Z="R_BML_trigbox;-Z_BML_trigbox" impliedRot="true" />
+</composition>
+
+<var name="R_BMS_service" value="8095."/>
+<var name="S_BMS_service" value="1610."/>
+<var name="Z_BMS_service" value="4850."/>
+<box name="service_BMS" material="Carbon" X_Y_Z="100.;120.; 8300." />
+
+<composition name="BMS_MDTService">
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S=" S_BMS_service" R_Z="R_BMS_service; Z_BMS_service" impliedRot="true" />
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S="-S_BMS_service" R_Z="R_BMS_service; Z_BMS_service" impliedRot="true" />
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S=" S_BMS_service" R_Z="R_BMS_service;-Z_BMS_service" impliedRot="true" />
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S="-S_BMS_service" R_Z="R_BMS_service;-Z_BMS_service" impliedRot="true" />
+</composition>
+
+<var name="R_BMS_trigbox" value="7740."/>
+<var name="S_BMS_trigbox" value=" 550."/>
+<var name="Z_BMS_trigbox1" value="1950."/>
+<var name="Z_BMS_trigbox2" value="5150."/>
+<var name="Z_BMS_trigbox3" value="8150."/>
+<box name="trigbox_BMS" material="Carbon" X_Y_Z="50.;900.; 2000." />
+
+<composition name="BMS_trigbox">
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox3" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox3" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox3" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox3" impliedRot="true" />
+</composition>
+
+
+<composition name="MDTRail">
+ <posXYZ volume="BOL_MDTRail" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BOL_MDTService" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_MDTRail" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_RailSupport1" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_RailSupport2" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_MDTService" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_trigbox" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BMS_MDTService" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BMS_trigbox" X_Y_Z="Zero;Zero;Zero"/>
+</composition>
+
+</section>
+
+<section name = "HFtruck"
+ version = "0.0"
+ date = "13-09-2017"
+ author = "Besik Kekelia"
+ top_volume = "HFTruckRail">
+
+<!-- name = HFTruck section name = "Supports" -->
+<!--
+ **************************************************************
+ *** ****
+ *** HF Truck ****
+ *** ****
+ **************************************************************
+-->
+
+<defaults unit_length="mm" />
+
+<!-- Description of HF Truck -->
+
+<!-- Description of Column C1-L, C2-R -->
+<gvxy name="Column" material="Iron" dZ="6662.">
+<gvxy_point X_Y="1485.; 1645."/>
+<gvxy_point X_Y="1525.; 1645."/>
+<gvxy_point X_Y="1525.; 1409.5"/>
+<gvxy_point X_Y="2225.; 1409.5"/>
+<gvxy_point X_Y="2225.; 1645."/>
+<gvxy_point X_Y="2265.; 1645."/>
+<gvxy_point X_Y="2265.; 1105."/>
+<gvxy_point X_Y="2225.; 1105."/>
+<gvxy_point X_Y="2225.; 1340.5"/>
+<gvxy_point X_Y="1525.; 1340.5"/>
+<gvxy_point X_Y="1525.; 1105."/>
+<gvxy_point X_Y="1485.; 1105."/>
+</gvxy>
+
+<tubs name="Column_Tube" material="Iron" Rio_Z="147.95; 254.; 2680.9" nbPhi="32"/>
+
+<composition name="Column_C1-L_C2-R" >
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; 0. " rot=" 90.; 0.; 180." />
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; -2750. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; -2750. " rot=" 90.; 0.; 180." />
+ <posXYZ volume="Column_Tube" X_Y_Z=" 1875.; 2068.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Column_Tube" X_Y_Z=" -1875.; 2068.; 0. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Column C1-L, C2-R -->
+
+
+<!-- Description of Beam -->
+<gvxy name="Beam_1" material="Iron" dZ="5319.9">
+<gvxy_point X_Y="-1645.; 4211.05"/>
+<gvxy_point X_Y="-1645.; 4171.05"/>
+<gvxy_point X_Y="-1420.05; 4171.05"/>
+<gvxy_point X_Y="-1420.05; 3371.05"/>
+<gvxy_point X_Y="-1645.; 3371.05"/>
+<gvxy_point X_Y="-1645.; 3331.05"/>
+<gvxy_point X_Y="-1109.95; 3331.05"/>
+<gvxy_point X_Y="-1109.95; 3371.05"/>
+<gvxy_point X_Y="-1329.95; 3371.05"/>
+<gvxy_point X_Y="-1329.95; 4171.05"/>
+<gvxy_point X_Y="-1109.95; 4171.05"/>
+<gvxy_point X_Y="-1109.95; 4211.05"/>
+</gvxy>
+
+<box name="Beam_Box" material="Iron" X_Y_Z="880.; 40.; 540."/>
+
+<composition name="Beam" >
+ <posXYZ volume="Beam_1" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 90.; 0." />
+ <posXYZ volume="Beam_1" X_Y_Z=" 0.; 0.; -2750. " rot=" 0.; 90.; 0." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" -2680.; 3771.05; 1375. " rot=" 0.; 0.; 90." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" 2680.; 3771.05; 1375. " rot=" 0.; 0.; 90." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" -2680.; 3771.05; -1375. " rot=" 0.; 0.; 90." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" 2680.; 3771.05; -1375. " rot=" 0.; 0.; 90." />
+</composition>
+<!-- end of Description of Beam -->
+
+<!-- Description of Rail -->
+
+<gvxy name="Rail_1" material="Iron" dZ="5400.">
+<gvxy_point X_Y="-1740.; 4659.14"/>
+<gvxy_point X_Y="-1010.; 4659.14"/>
+<gvxy_point X_Y="-1010.; 4559.14"/>
+<gvxy_point X_Y="-1345.; 4559.14"/>
+<gvxy_point X_Y="-1345.; 4319.14"/>
+<gvxy_point X_Y="-1150.; 4319.14"/>
+<gvxy_point X_Y="-1150.; 4259.14"/>
+<gvxy_point X_Y="-1600.; 4259.14"/>
+<gvxy_point X_Y="-1600.; 4319.14"/>
+<gvxy_point X_Y="-1405.; 4319.14"/>
+<gvxy_point X_Y="-1405.; 4559.14"/>
+<gvxy_point X_Y="-1740.; 4559.14"/>
+</gvxy>
+
+<composition name="Rail" >
+ <posXYZ volume="Rail_1" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 90.; -0.708" />
+ <posXYZ volume="Rail_1" X_Y_Z=" 0.; 0.; -2750. " rot=" 0.; 90.; -0.708" />
+</composition>
+<!-- end of Description of Rail -->
+
+
+<!-- Description of Shims -->
+<gvxy name="Shims_1" material="Iron" dZ="238.">
+<gvxy_point X_Y="-2700.; 4291.76"/>
+<gvxy_point X_Y="2700.; 4225.029"/>
+<gvxy_point X_Y="2700.; 4211."/>
+<gvxy_point X_Y="-2700.; 4211."/>
+</gvxy>
+
+<composition name="Shims" >
+ <posXYZ volume="Shims_1" X_Y_Z=" 0.; 1.; 1375. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Shims_1" X_Y_Z=" 0.; 1.; -1375. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Shims -->
+
+<!-- Description of Bracing -->
+<gvxy name="Bracing_1" material="Aluminium" dZ="4038.">
+<gvxy_point X_Y="1745.; 99.5"/>
+<gvxy_point X_Y="1745.; 120."/>
+<gvxy_point X_Y="2005.; 120."/>
+<gvxy_point X_Y="2005.; 99.5"/>
+<gvxy_point X_Y="1883.; 99.5"/>
+<gvxy_point X_Y="1883.; -99.5"/>
+<gvxy_point X_Y="2005.; -99.5"/>
+<gvxy_point X_Y="2005.; -120."/>
+<gvxy_point X_Y="1745.; -120."/>
+<gvxy_point X_Y="1745.; -99.5"/>
+<gvxy_point X_Y="1847.; -99.5"/>
+<gvxy_point X_Y="1847.; 99.5"/>
+</gvxy>
+
+<gvxy name="subt_box" material="Aluminium" dZ="4038.">
+<gvxy_point X_Y="1735.46; 120.05"/>
+<gvxy_point X_Y="2016.3; 120.05"/>
+<gvxy_point X_Y="2016.3; -120.05"/>
+<gvxy_point X_Y="1735.46; -120.05"/>
+</gvxy>
+
+ <subtraction name="Sub_Bracing_1" >
+ <posXYZ volume="Bracing_1" X_Y_Z=" 0.; 0.; 0." rot=" -60.3; 0.; 0."/>
+ <posXYZ volume="subt_box" X_Y_Z=" 0.; 0; 0." rot=" 60.3; 0.; 0."/>
+ </subtraction>
+
+<gvxy name="Bracing_2" material="Aluminium" dZ="3588.">
+<gvxy_point X_Y="-120.; 120."/>
+<gvxy_point X_Y="-102.; 120."/>
+<gvxy_point X_Y="-102.; 6.25"/>
+<gvxy_point X_Y="102.; 6.25"/>
+<gvxy_point X_Y="102.; 120."/>
+<gvxy_point X_Y="120.; 120."/>
+<gvxy_point X_Y="120.; -120."/>
+<gvxy_point X_Y="102.; -120."/>
+<gvxy_point X_Y="102.; -6.25"/>
+<gvxy_point X_Y="-102.; -6.25"/>
+<gvxy_point X_Y="-102.; -120."/>
+<gvxy_point X_Y="-120.; -120."/>
+</gvxy>
+
+<box name="sub_Bracing_2" material="Aluminium" X_Y_Z="241.1; 240.1; 3600."/>
+
+ <subtraction name="Sub_Bracing_2" >
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; 0.; 0." rot=" 0; 90.; 38.2"/>
+ <posXYZ volume="sub_Bracing_2" X_Y_Z=" 0.; 0; 0." rot=" 0.; 90.; -38.2"/>
+ </subtraction>
+
+<composition name="Bracing" >
+ <posXYZ volume="Bracing_1" X_Y_Z=" 0.; 0.; 0. " rot="60.3; 0.; 0." />
+ <posXYZ volume="Sub_Bracing_1" X_Y_Z=" 0.; 0.; 0. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_1" X_Y_Z=" -3750.; 0.; 0. " rot="60.3; 0.; 0." />
+ <posXYZ volume="Sub_Bracing_1" X_Y_Z=" -3750.; 0.; 0. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; -712.3; 1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; -712.3; 1375. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; 1990.7; 1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; 1990.7; 1375. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; -712.3; -1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; -712.3; -1375. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; 1990.7; -1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; 1990.7; -1375. " rot="0.; 0.; 0." />
+</composition>
+
+<!-- end of Description of Bracing -->
+
+
+<!-- Description of Brackets -->
+<gvxy name="Brackets_1" material="Iron" dZ="880.">
+<gvxy_point X_Y="-2145.; -2028.9"/>
+<gvxy_point X_Y="-1605.; -2028.9"/>
+<gvxy_point X_Y="-1605.; -2094.9"/>
+<gvxy_point X_Y="-1845.; -2094.9"/>
+<gvxy_point X_Y="-1845.; -3175."/>
+<gvxy_point X_Y="-1605.; -3175."/>
+<gvxy_point X_Y="-1605.; -3241."/>
+<gvxy_point X_Y="-2145.; -3241."/>
+<gvxy_point X_Y="-2145.; -3175."/>
+<gvxy_point X_Y="-1905.; -3175."/>
+<gvxy_point X_Y="-1905.; -2094.9"/>
+<gvxy_point X_Y="-2145.; -2094.9"/>
+</gvxy>
+
+<composition name="Brackets" >
+ <posXYZ volume="Brackets_1" X_Y_Z=" 0.; 0.; 665. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Brackets_1" X_Y_Z=" 0.; 0.; -665. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Brackets_1" X_Y_Z=" 3750.; 0.; 665. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Brackets_1" X_Y_Z=" 3750.; 0.; -665. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Brackets -->
+
+<!-- Description of Inox -->
+<box name="Inox_1" material="Iron" X_Y_Z="267.; 5478.; 36.8"/>
+
+<composition name="Inox" >
+ <posXYZ volume="Inox_1" X_Y_Z=" -2398.5; 500.; 1086.55 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Inox_1" X_Y_Z=" -2398.5; 500.; -1086.55 " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Inox -->
+
+<!-- Description of Infrastructure -->
+<gvxy name="Infrastructure_Feet_1" material="Iron" dZ="974.">
+<gvxy_point X_Y="1935.; -467."/>
+<gvxy_point X_Y="1935.; -478."/>
+<gvxy_point X_Y="1878.25; -478."/>
+<gvxy_point X_Y="1878.25; -576."/>
+<gvxy_point X_Y="1935.; -576."/>
+<gvxy_point X_Y="1935.; -587."/>
+<gvxy_point X_Y="1815.; -587."/>
+<gvxy_point X_Y="1815.; -576."/>
+<gvxy_point X_Y="1871.75; -576."/>
+<gvxy_point X_Y="1871.75; -478."/>
+<gvxy_point X_Y="1815.; -478."/>
+<gvxy_point X_Y="1815.; -467."/>
+</gvxy>
+
+<box name="Infrastructure_box_1" material="Iron" X_Y_Z="4449.1; 11.3; 1949.1"/>
+
+<gvxy name="Infrastructure_Feet_2" material="Iron" dZ="974.">
+<gvxy_point X_Y="-1476.; 1355.95"/>
+<gvxy_point X_Y="-1476.; 1349.05"/>
+<gvxy_point X_Y="-1510.15; 1349.05"/>
+<gvxy_point X_Y="-1510.15; 1222.85"/>
+<gvxy_point X_Y="-1476.; 1222.85"/>
+<gvxy_point X_Y="-1476.; 1215.95"/>
+<gvxy_point X_Y="-1549.; 1215.95"/>
+<gvxy_point X_Y="-1549.; 1222.85"/>
+<gvxy_point X_Y="-1515.95; 1222.85"/>
+<gvxy_point X_Y="-1514.85; 1349.05"/>
+<gvxy_point X_Y="-1549.; 1349.05"/>
+<gvxy_point X_Y="-1549.; 1355.95"/>
+</gvxy>
+
+<box name="Infrastructure_box_2" material="Iron" X_Y_Z="5360.; 20.4; 510."/>
+
+<composition name="Infrastructure" >
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" 0.; 2809.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" 0.; 2809.05; -1054. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" -3750.; 2809.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" -3750.; 2809.05; -1054. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_box_1" X_Y_Z=" 0.; 3301.75; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 0.; 0.; 610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 0.; 0.; -610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 3025.; 0.; 610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 3025.; 0.; -610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_box_2" X_Y_Z=" 0.; 1366.2; 379. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_box_2" X_Y_Z=" 0.; 1366.2; -379. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Infrastructure -->
+
+<!-- Description of JF Table -->
+
+<!-- Description of JF Table Beam -->
+
+<box name="Table_Beam_2" material="Iron" X_Y_Z="3500.; 50.; 500."/>
+<tubs name="sub_tube" material="Iron" Rio_Z="0.; 155.; 2700." nbPhi="32"/>
+
+ <subtraction name="Sub_Beam_2" >
+ <posXYZ volume="Table_Beam_2" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" -825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" 825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ </subtraction>
+
+<gvxy name="Table_Beam_3" material="Iron" dZ="500.">
+<gvxy_point X_Y="-1750.; -225."/>
+<gvxy_point X_Y="-979.29; -225."/>
+<gvxy_point X_Y="-679.29; -525."/>
+<gvxy_point X_Y="679.29; -525."/>
+<gvxy_point X_Y="979.29; -225."/>
+<gvxy_point X_Y="1750.; -225."/>
+<gvxy_point X_Y="1750.; -317."/>
+<gvxy_point X_Y="958.; -317."/>
+<gvxy_point X_Y="700.; -575."/>
+<gvxy_point X_Y="-700.; -575."/>
+<gvxy_point X_Y="-958.; -317."/>
+<gvxy_point X_Y="-1750.; -317."/>
+</gvxy>
+
+ <subtraction name="Sub_Table_Beam_3" >
+ <posXYZ volume="Table_Beam_3" X_Y_Z=" 0.; 0.; 0." rot=" 0; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" -825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" 825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ </subtraction>
+
+<box name="Table_Beam_4" material="Iron" X_Y_Z="80.; 199.9; 500."/>
+<box name="Table_Beam_5" material="Iron" X_Y_Z="400.; 199.9; 50."/>
+<box name="Table_Beam_6" material="Iron" X_Y_Z="50.; 400.; 500."/>
+
+<gvxy name="Table_Beam_7" material="Iron" dZ="499.9">
+<gvxy_point X_Y="-640.05; 250."/>
+<gvxy_point X_Y="-540.05; 250."/>
+<gvxy_point X_Y="-540.05; 34."/>
+<gvxy_point X_Y="540.05; 34."/>
+<gvxy_point X_Y="540.05; 250."/>
+<gvxy_point X_Y="640.05; 250."/>
+<gvxy_point X_Y="640.05; -250."/>
+<gvxy_point X_Y="540.05; -250."/>
+<gvxy_point X_Y="540.05; -34."/>
+<gvxy_point X_Y="-540.05; -34."/>
+<gvxy_point X_Y="-540.05; -250."/>
+<gvxy_point X_Y="-640.05; -250."/>
+</gvxy>
+
+<composition name="JF_Table_Beam_1" >
+ <posXYZ volume="Sub_Beam_2" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Sub_Table_Beam_3" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_4" X_Y_Z=" 1080.; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_4" X_Y_Z=" -1080.; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" -1550.; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" -1550.; -125.; 225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" -1550.; -125.; -225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" 1549.95; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" 1549.95; -125.; 225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" 1549.95; -125.; -225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_6" X_Y_Z=" 1775.1; -75.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_7" X_Y_Z=" 0.; -275.; 0. " rot=" 90.; 0.; 0." />
+</composition>
+
+<!-- end of Description of JF Table Beam -->
+
+<!-- Description of JF Table Cross Bar -->
+
+<box name="HF_Cross_Bar_1" material="Iron" X_Y_Z="200.; 200.; 1049.9"/>
+<box name="HF_Cross_Bar_sub_box" material="Iron" X_Y_Z="170.; 170.; 1100."/>
+
+<subtraction name="Sub_HF_Cross_Bar" >
+ <posXYZ volume="HF_Cross_Bar_1" X_Y_Z=" 0.; 0.; 0." rot=" 0; 0.; 0."/>
+ <posXYZ volume="HF_Cross_Bar_sub_box" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ </subtraction>
+<!-- end of Description of JF Table Cross Bar -->
+
+<!-- Description of Jacks -->
+<tubs name="Jacks_1" material="ShieldBrass" Rio_Z="122.5; 149.; 1540." nbPhi="32"/>
+<tubs name="Jacks_2" material="ShieldBrass" Rio_Z="120.; 245.; 90." nbPhi="32"/>
+<tubs name="Jacks_3" material="ShieldBrass" Rio_Z="0.; 103.5; 1570." nbPhi="32"/>
+<tubs name="Jacks_4" material="ShieldBrass" Rio_Z="105.; 155.; 100." nbPhi="32"/>
+<tubs name="Jacks_5" material="ShieldBrass" Rio_Z="0.; 80.; 160." nbPhi="32"/>
+
+<composition name="Jacks" >
+ <posXYZ volume="Jacks_1" X_Y_Z=" 0.; -745.; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_2" X_Y_Z=" 0.; 70.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_3" X_Y_Z=" 0.; 900.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_4" X_Y_Z=" 0.; 1735.1; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_5" X_Y_Z=" 0.; 1787.; 0. " rot=" 90.; 0.; 0." />
+</composition>
+<!-- end of Description of Jacks -->
+
+<!-- Description of Motorised NuT -->
+
+<box name="Motorised_NuT" material="Aluminium" X_Y_Z="290.; 280.; 300."/>
+
+<!-- end of Description of Motorised NuT -->
+
+<composition name="JF_Table" >
+ <posXYZ volume="JF_Table_Beam_1" X_Y_Z=" 0.; 0.; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="JF_Table_Beam_1" X_Y_Z=" 0.; 0.; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Sub_HF_Cross_Bar" X_Y_Z=" 1552.5; -120.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Sub_HF_Cross_Bar" X_Y_Z=" -1552.5; -120.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" 825.; 0.; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" -825.; 0.; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" 825.; 0.; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" -825.; 0.; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" 410.; 195.05; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" 410.; 195.05; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" -410.; 195.05; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" -410.; 195.05; -775. " rot=" 0.; 0.; 0." />
+</composition>
+
+<!-- end of Description of JF Table Beam -->
+<composition name="Truck_A_C" >
+<posXYZ volume="Column_C1-L_C2-R" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Beam" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Rail" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Shims" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Bracing" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Brackets" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Inox" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Infrastructure" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="JF_Table" X_Y_Z=" 0.; 5000.; 0. " rot=" 0.; 90.; 0." />
+</composition>
+
+<composition name="HFTruckRail" >
+ <posXYZ volume="Truck_A_C" X_Y_Z=" 0. ; -9000.; 19132." />
+ <posXYZ volume="Truck_A_C" X_Y_Z=" 0. ; -9000.; -19132." />
+</composition>
+
+
+</section>
+
+
+<section name = "RUN2_Services"
+ version = "1.0"
+ date = "September 2014"
+ author = "Antonios Leisos, Jochen Meyer"
+ top_volume = "RUN2_Services">
+
+<!-- name = Run2 supports section name = "Services" -->
+
+<var name="BME_ElectronicsBox_Frame_xwid" value="2350."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_ywid" value=" 100."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_zwid" value=" 600."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_width" value=" 50."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_plate_width" value=" 7."/> <!-- Approximate value -->
+<var name="BME_ElectronicsBox_Frame_box_width" value=" 5."/> <!-- Approximate value tuned to the weight -->
+<var name="BME_ElectronicsBox_Frame_distance_from_chamber" value="120."/> <!-- Markus Lippert:121mm and a little bit smaller since thery are not parallel -->
+
+<box name="BME_ElectronicsBox_Outer" material="Aluminium" X_Y_Z="BME_ElectronicsBox_Frame_xwid; BME_ElectronicsBox_Frame_ywid ; BME_ElectronicsBox_Frame_zwid" />
+<box name="BME_ElectronicsBox_Inner" material="Aluminium" X_Y_Z="BME_ElectronicsBox_Frame_xwid-2.*BME_ElectronicsBox_Frame_width; BME_ElectronicsBox_Frame_ywid+10. ; BME_ElectronicsBox_Frame_zwid-2.*BME_ElectronicsBox_Frame_width" />
+
+<subtraction name="BME_Electronics_Box" >
+ <posXYZ volume="BME_ElectronicsBox_Outer" />
+ <posXYZ volume="BME_ElectronicsBox_Inner" />
+</subtraction>
+
+<box name="BME_ElectronicsBox_Plate" material="Aluminium" X_Y_Z="BME_ElectronicsBox_Frame_xwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps; BME_ElectronicsBox_Frame_plate_width; BME_ElectronicsBox_Frame_zwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps" />
+
+<box name="BME_ElectronicsBox_Box" material="Carbon" X_Y_Z="BME_ElectronicsBox_Frame_xwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps; BME_ElectronicsBox_Frame_box_width; BME_ElectronicsBox_Frame_zwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps" />
+
+<composition name="BME_Electronics">
+ <posXYZ volume="BME_Electronics_Box" />
+ <posXYZ volume="BME_ElectronicsBox_Plate" X_Y_Z=" 0.;BME_ElectronicsBox_Frame_ywid*0.5-BME_ElectronicsBox_Frame_plate_width*0.5;0." />
+ <posXYZ volume="BME_ElectronicsBox_Box" X_Y_Z=" 0.;BME_ElectronicsBox_Frame_ywid*0.5-BME_ElectronicsBox_Frame_plate_width-BME_ElectronicsBox_Frame_box_width/2.-GENV_Eps;0." />
+</composition>
+
+<var name="BOEwall_thickness" value="200."/>
+<var name="BOEwall_ywid" value="2000."/>
+<var name="BOEwall_xwid" value="3400."/>
+<var name="BOEwall_zwid" value="2200."/>
+
+<var name="BOEbox4_xwid" value="BOEwall_xwid-2*BOEwall_thickness"/>
+<var name="BOEbox4_ywid" value="BOEwall_ywid"/>
+<var name="BOEbox4_zwid" value="BOEwall_thickness"/>
+<var name="BOEbox4_xpos" value="0."/>
+<var name="BOEbox4_ypos" value="0."/>
+<var name="BOEbox4_zpos" value="0."/>
+
+<var name="BOEbox5_xwid" value="BOEwall_thickness"/>
+<var name="BOEbox5_ywid" value="BOEwall_ywid"/>
+<var name="BOEbox5_zwid" value="BOEwall_zwid"/>
+<var name="BOEbox5_xpos" value="BOEbox4_xwid/2+BOEbox5_xwid/2+GENV_Eps"/>
+<var name="BOEbox5_ypos" value="BOEbox4_ypos"/>
+<var name="BOEbox5_zpos" value="BOEwall_zwid/2-BOEwall_thickness/2"/>
+
+<box name="BOEbox4" material="Aluminium" X_Y_Z=" BOEbox4_xwid;BOEbox4_ywid;BOEbox4_zwid" />
+<box name="BOEbox5" material="Aluminium" X_Y_Z=" BOEbox5_xwid;BOEbox5_ywid;BOEbox5_zwid" />
+
+<var name="ElavatorSupport_xwid" value=" 200. "/> <!-- approximate value -->
+<var name="ElavatorSupport_zwid" value=" 200. "/> <!-- approximate value -->
+<var name="ElavatorSupport_ywid" value="BOEwall_ywid"/>
+<var name="ElavatorSupport_xpos" value="1000. "/> <!-- approximate value -->
+<var name="ElavatorSupport_ypos" value="BOEbox5_ypos"/>
+<var name="ElavatorSupport_zpos" value="BOEbox5_zpos"/>
+
+<var name="ElavatorCross_zwid" value=" 10. "/> <!-- approximate value -->
+<var name="ElavatorCross_xwid" value="2.*ElavatorSupport_xpos-ElavatorSupport_xwid-2.*GENV_Eps"/>
+<var name="ElavatorCross_ywid" value="1000. "/> <!-- approximate value -->
+<var name="ElavatorCross_xpos" value="BOEbox4_xpos"/>
+<var name="ElavatorCross_ypos" value="BOEwall_ywid/2.-ElavatorCross_ywid/2."/>
+<var name="ElavatorCross_zpos" value="ElavatorSupport_zpos"/>
+
+<var name="ElavatorTopFrame_xwid" value="BOEbox4_xwid+2.*BOEbox5_xwid"/>
+<var name="ElavatorTopFrame_zwid" value="BOEbox5_zwid"/>
+<var name="ElavatorTopFrame_ywid" value=" 200. "/> <!-- approximate value -->
+<var name="ElavatorTopFrame_xpos" value="BOEbox4_xpos"/>
+<var name="ElavatorTopFrame_ypos" value="BOEbox4_ywid/2+ElavatorTopFrame_ywid/2+GENV_Eps"/>
+<var name="ElavatorTopFrame_zpos" value="BOEbox5_zpos"/>
+<var name="ElavatorTopFrame_thickness" value=" 30. "/> <!-- approximate value -->
+<var name="ElavatorTopPlate_xwid" value="ElavatorTopFrame_xwid"/>
+<var name="ElavatorTopPlate_zwid" value="ElavatorTopFrame_zwid"/>
+<var name="ElavatorTopPlate_ywid" value=" 5. "/> <!-- approximate value -->
+<var name="ElavatorTopPlate_xpos" value="BOEbox4_xpos"/>
+<var name="ElavatorTopPlate_ypos" value="ElavatorTopFrame_ypos+ElavatorTopFrame_ywid/2+ElavatorTopPlate_ywid/2+GENV_Eps"/>
+<var name="ElavatorTopPlate_zpos" value="BOEbox5_zpos"/>
+
+<box name="ElevatorSupport" material="Aluminium" X_Y_Z=" ElavatorSupport_xwid; ElavatorSupport_ywid; ElavatorSupport_zwid" />
+<box name="ElevatorCross" material="Aluminium" X_Y_Z=" ElavatorCross_xwid; ElavatorCross_ywid; ElavatorCross_zwid" />
+<box name="ElevatorTopFrame_Outer" material="Aluminium" X_Y_Z="ElavatorTopFrame_xwid; ElavatorTopFrame_ywid; ElavatorTopFrame_zwid" />
+<box name="ElevatorTopFrame_Inner" material="Aluminium" X_Y_Z="ElavatorTopFrame_xwid-ElavatorTopFrame_thickness; ElavatorTopFrame_ywid; ElavatorTopFrame_zwid-ElavatorTopFrame_thickness" />
+
+<subtraction name="ElevatorTopFrame" >
+ <posXYZ volume="ElevatorTopFrame_Outer" />
+ <posXYZ volume="ElevatorTopFrame_Inner" />
+</subtraction>
+
+<box name="ElevatorTopPlate" material="Aluminium" X_Y_Z=" ElavatorTopPlate_xwid; ElavatorTopPlate_ywid; ElavatorTopPlate_zwid" />
+
+<composition name="BOEwallside" >
+ <posXYZ volume="BOEbox4" X_Y_Z=" BOEbox4_xpos; BOEbox4_ypos; BOEbox4_zpos" />
+ <posXYZ volume="ElevatorSupport" X_Y_Z=" ElavatorSupport_xpos; ElavatorSupport_ypos; ElavatorSupport_zpos" />
+ <posXYZ volume="ElevatorCross" X_Y_Z=" ElavatorCross_xpos; ElavatorCross_ypos; ElavatorCross_zpos" />
+ <posXYZ volume="ElevatorSupport" X_Y_Z=" -ElavatorSupport_xpos; ElavatorSupport_ypos; ElavatorSupport_zpos" />
+ <posXYZ volume="ElevatorTopFrame" X_Y_Z=" ElavatorTopFrame_xpos; ElavatorTopFrame_ypos; ElavatorTopFrame_zpos" />
+ <posXYZ volume="ElevatorTopPlate" X_Y_Z=" ElavatorTopPlate_xpos; ElavatorTopPlate_ypos; ElavatorTopPlate_zpos" />
+ <posXYZ volume="BOEbox5" X_Y_Z=" BOEbox5_xpos; BOEbox5_ypos; BOEbox5_zpos" />
+ <posXYZ volume="BOEbox5" X_Y_Z=" -BOEbox5_xpos; BOEbox5_ypos; BOEbox5_zpos" />
+</composition>
+
+<composition name="BOEwall">
+ <posXYZ volume="BOEwallside" X_Y_Z=" 0.; -12970 ; 6900." rot="0.;180.; 0" />
+ <posXYZ volume="BOEwallside" X_Y_Z=" 0.; -12970 ; -7060." rot="0.; 0.; 0" />
+</composition>
+
+<composition name="RUN2_Services">
+ <posXYZ volume="BME_Electronics" X_Y_Z="0.;-7786.6-0.5*229.5;GENV_Eps+7057.8+0.5*BME_ElectronicsBox_Frame_zwid+BME_ElectronicsBox_Frame_distance_from_chamber" />
+ <posXYZ volume="BME_Electronics" X_Y_Z="0.;-7786.6-0.5*229.5;-GENV_Eps-7057.8-0.5*BME_ElectronicsBox_Frame_zwid-BME_ElectronicsBox_Frame_distance_from_chamber" />
+ <posXYZ volume="BOEwall" X_Y_Z="0.; 0.; 0." rot="-0.708; 0.; 0"/>
+</composition>
+
+</section>
+
+<section name = "ATLAS Plancher (in french in the text)"
+ version = "7.0"
+ date = "22 November 2008"
+ author = "Laurent"
+ top_volume = "Plancher">
+
+<!-- name = Plancher section name = "Supports" -->
+<!-- plan:ATF1 UX 150001 -->
+<defaults unit_length="mm"/>
+
+<box name="box1" material="Iron" X_Y_Z="30000; 5002;27000" />
+<box name="box2" material="Iron" X_Y_Z="30000; 1336; 9000" />
+<box name="box3" material="Iron" X_Y_Z=" 5200;10000;27010" /> <!-- use larger length in z than box1 to not run into issues with volume subtraction -->
+
+<subtraction name="central" >
+ <posXYZ volume="box1" X_Y_Z="0; 0;0" />
+ <posXYZ volume="box3" X_Y_Z="0;4541;0" />
+</subtraction>
+
+<composition name="PlancherTilte">
+ <posXYZ volume="central" X_Y_Z="0; -13871; 0" /> <!-- the distance between cavern floor and centre of beam axis at IP is 11370mm, cf. atcz____0005-vAC -->
+ <posXYZ volume="box2" X_Y_Z="0; -15704; 18005" />
+ <posXYZ volume="box2" X_Y_Z="0; -15704; -18005" />
+</composition>
+
+<composition name="Plancher">
+ <posXYZ volume="PlancherTilte" X_Y_Z="0;0;0" rot="-0.708;0;0"/>
+</composition>
+
+</section>
+
+<section name = "ID-EMC-Tile"
+ version = "7.0"
+ date = "21 Juin 2010"
+ author = "Laurent Chevalier"
+ top_volume = "IDEMTile">
+
+<!-- name = Tile Fingers section name = "ID-EM-Tile"-->
+
+<trd name="TileFinger1" material="Iron1" Xmp_Ymp_Z="420 ; 420 ; 176 ; 130 ; 300 " />
+
+<var name="FingerPos" value="6540" />
+<var name="FingerShift" value="210" />
+
+<composition name="TileFinger2">
+ <posXYZ volume="TileFinger1" X_Y_Z="JDSH_BDRRouRa_RetrunRing_outerRadius-JDReturnL/2. ; 0 ; 0." rot=" 90.; 90.; 270." />
+</composition>
+
+<composition name="TileFinger3">
+ <foreach index="IFing" begin="1" loops="8" >
+ <posXYZ volume="TileFinger2" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; IFing*45/8 +2.81" />
+ </foreach>
+</composition>
+
+<composition name="TileFingersA">
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 270" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 315" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 0" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 45" />
+</composition>
+<composition name="TileFingersB">
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 90" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 135" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 180" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 225" />
+</composition>
+
+<composition name="TileFingers">
+ <posXYZ volume="TileFingersA" X_Y_Z="0 ; 0 ; FingerPos - FingerShift" />
+ <posXYZ volume="TileFingersB" X_Y_Z="0 ; 0 ; FingerPos - FingerShift" />
+ <posXYZ volume="TileFingersA" X_Y_Z="0 ; 0 ;-FingerPos + FingerShift" />
+ <posXYZ volume="TileFingersB" X_Y_Z="0 ; 0 ;-FingerPos + FingerShift" />
+</composition>
+
+</section>
+
+<!-- ===========================================NJD=========================================== -->
+
+<section name = "NJD Disk"
+ version = "0.0"
+ date = "16-11-2016"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "JDSH_Shield_NSW">
+
+<!-- NJD Disk -->
+
+<!-- main disk-->
+<tubs name="MD01" material="ShieldSteel" Rio_Z="430.; 4360.; 40." nbPhi="32." />
+<tubs name="MD02" material="ShieldSteel" Rio_Z="430.; 2700.; 48.7" nbPhi="32." />
+<tubs name="MDB01_Cut" material="ShieldSteel" Rio_Z="0.; 840.; 3." nbPhi="32." />
+
+<gvxy name="MD03" material="ShieldSteel" dZ="40." >
+ <gvxy_point X_Y="-3370.; -3950."/>
+ <gvxy_point X_Y="-3370.; -3880."/>
+ <gvxy_point X_Y="-3679.5; -2484."/>
+ <gvxy_point X_Y="-3990.; -1734.39"/>
+ <gvxy_point X_Y="-2599.16; -3470."/>
+ <gvxy_point X_Y="-2670.; -3570."/>
+ <gvxy_point X_Y="-2670.; -3950."/>
+</gvxy>
+
+<subtraction name="MDB01_Un" >
+ <posXYZ volume="MD01" />
+ <posXYZ volume="MDB01_Cut" X_Y_Z=" 0.; 0.; 19.4 " />
+</subtraction>
+
+<union name="MDB01" >
+ <posXYZ volume="MDB01_Un" />
+ <posXYZ volume="MD03" />
+ <posXYZ volume="MD03" rot=" 0.; 180.; 0."/>
+</union>
+<!-- End main disk-->
+
+
+<!-- Ret.Flux -->
+<tubs name="FLUX_Box" material="ShieldSteel" Rio_Z="3800.; 4360.; 39.9" nbPhi="32." />
+<box name="FLUX_Cut_Box" material="ShieldSteel" X_Y_Z="2200.; 400.; 50." />
+
+<subtraction name="FLUX" >
+ <posXYZ volume="FLUX_Box" />
+ <posXYZ volume="FLUX_Cut_Box" X_Y_Z=" -1930.; 3430.; 0." />
+</subtraction>
+<!-- End Ret.Flux -->
+
+<!-- FIXING PLATE -->
+<box name="FIXING_PLATE" material="ShieldSteel" X_Y_Z="350.; 975.; 40.9" />
+<box name="FIXING_PLATE_Special" material="ShieldSteel" X_Y_Z="350.; 787.5; 40.9" />
+
+<composition name="FIXING_PLATE_Pos" >
+ <posXYZ volume="FIXING_PLATE" X_Y_Z=" 0.; 3252.5; 0." />
+</composition>
+
+<composition name="FIXING_PLATE_Ass" >
+ <posXYZ volume="FIXING_PLATE_Special" X_Y_Z=" -1208.8; 2918.31; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 67.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 112.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 157.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 202.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 247.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 292.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 337.5" />
+</composition>
+<!-- End FIXING PLATE -->
+
+<!-- NJD feet-->
+<gvxy name="JF01" material="ShieldSteel" dZ="37.3" >
+ <gvxy_point X_Y="-3300.; -3950."/>
+ <gvxy_point X_Y="-3300.; -3480."/>
+ <gvxy_point X_Y="-3270.; -3450."/>
+ <gvxy_point X_Y="-2730.; -3450."/>
+ <gvxy_point X_Y="-2700.; -3480."/>
+ <gvxy_point X_Y="-2700.; -3950."/>
+</gvxy>
+
+<gvxy name="JF02" material="ShieldSteel" dZ="35." >
+ <gvxy_point X_Y="-342.4; -3950."/>
+ <gvxy_point X_Y="-342.4; -3930."/>
+ <gvxy_point X_Y="-77.4; -3470."/>
+ <gvxy_point X_Y="-57.4; -3470."/>
+ <gvxy_point X_Y="-57.4; -3920."/>
+ <gvxy_point X_Y="-87.4; -3950."/>
+</gvxy>
+
+<gvxy name="JF03" material="ShieldSteel" dZ="48." >
+ <gvxy_point X_Y="-3370.; -362."/>
+ <gvxy_point X_Y="-3370.; 704."/>
+ <gvxy_point X_Y="-3495.; 704."/>
+ <gvxy_point X_Y="-3495.; 933."/>
+ <gvxy_point X_Y="-2660.; 933."/>
+ <gvxy_point X_Y="-2660.; 653."/>
+ <gvxy_point X_Y="-2700.; 653."/>
+ <gvxy_point X_Y="-2700.; 523."/>
+ <gvxy_point X_Y="-2590.; 523."/>
+ <gvxy_point X_Y="-2590.; -52."/>
+ <gvxy_point X_Y="-2685.; -52."/>
+ <gvxy_point X_Y="-2685.; -362."/>
+</gvxy>
+
+<gvxy name="JF04" material="ShieldSteel" dZ="41.6" >
+ <gvxy_point X_Y="-453.5; -4251.1"/>
+ <gvxy_point X_Y="-453.5; -4158.1"/>
+ <gvxy_point X_Y="-603.; -4083.1"/>
+ <gvxy_point X_Y="-603.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -3998.1"/>
+ <gvxy_point X_Y="883.; -3998.1"/>
+ <gvxy_point X_Y="883.; -4251.1"/>
+</gvxy>
+
+<gvxy name="JF05" material="ShieldSteel" dZ="356.1" >
+ <gvxy_point X_Y="-603.; -4048.1"/>
+ <gvxy_point X_Y="-603.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -3998.1"/>
+ <gvxy_point X_Y="-253.; -3998.1"/>
+ <gvxy_point X_Y="-253.; -4048.1"/>
+</gvxy>
+
+<box name="JF06" material="ShieldSteel" X_Y_Z="536.; 253.; 71.4" />
+
+<!-- Right-->
+<composition name="Right_Feet" >
+ <posXYZ volume="JF01" X_Y_Z=" 0.; 0.; 38.7" rot=" 0.; 0.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" -2802.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" -3197.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF03" X_Y_Z=" 0.; -3974.05; 0." rot=" -90.; 0.; 0." />
+ <posXYZ volume="JF04" X_Y_Z=" -2805.2; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF04" X_Y_Z=" -3203.; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF05" X_Y_Z=" -3004.1; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF06" X_Y_Z=" -3000.; -4124.6; -918.75" rot=" 0.; 0.; 0." />
+</composition>
+<!-- End Right-->
+
+<!-- Left-->
+<composition name="Left_Feet" >
+ <posXYZ volume="JF01" X_Y_Z=" 0.; 0.; 38.7" rot=" 0.; 180.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" 2802.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" 3197.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF03" X_Y_Z=" 0.; -3974.05; 0." rot=" -90.; 0.; 180." />
+ <posXYZ volume="JF04" X_Y_Z=" 2805.2; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF04" X_Y_Z=" 3203.; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF05" X_Y_Z=" 3004.1; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF06" X_Y_Z=" 3000.; -4124.6; -918.75" rot=" 0.; 0.; 0." />
+</composition>
+<!-- End Right-->
+<!-- End NJD feet-->
+
+<composition name="JDDisk_ASide" >
+ <posXYZ volume="MDB01" X_Y_Z=" 0.; 0.; 6880." rot=" 0.; 0.; 0." />
+ <posXYZ volume="MD02" X_Y_Z=" 0.; 0.; 6835.6" rot=" 0.; 0.;0."/>
+ <posXYZ volume="FLUX" X_Y_Z=" 0.; 0.; 6840." rot=" 0.; 0.; 0." />
+ <posXYZ volume="FIXING_PLATE_Ass" X_Y_Z=" 0.; 0.; 6839.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Right_Feet" X_Y_Z=" 0.; 0.; 6880." rot=" 0.; 180.; 0." />
+ <posXYZ volume="Left_Feet" X_Y_Z=" 0.; 0.; 6880." rot=" 0.; 180.; 0." />
+</composition>
+
+<composition name="JDDisk_CSide" >
+ <posXYZ volume="MDB01" X_Y_Z=" 0.; 0.; -6880." rot=" 0.; 180.; 0." />
+ <posXYZ volume="MD02" X_Y_Z=" 0.; 0.; -6835.6" rot=" 0.; 0.;0."/>
+ <posXYZ volume="FLUX" X_Y_Z=" 0.; 0.; -6840." rot=" 0.; 0.; 0." />
+ <posXYZ volume="FIXING_PLATE_Ass" X_Y_Z=" 0.; 0.; -6839.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Right_Feet" X_Y_Z=" 0.; 0.; -6880." rot=" 0.; 0.; 0." />
+ <posXYZ volume="Left_Feet" X_Y_Z=" 0.; 0.; -6880." rot=" 0.; 0.; 0." />
+</composition>
+<!-- End NJD Disk -->
+
+<!-- Vertical Shielding HO -->
+<tubs name="Vertical_Shielding_HO_Poly" material="PolyBoronB2O3" Rio_Z=" 840. ; 1655. ; 40." nbPhi="32." /> <!-- HD PE Borotron 5% HD050 - Density: 1010kg/m3 -->
+<tubs name="Lateral_plate_TubeCut_Lead" material="Lead" Rio_Z=" 870. ; 1655. ; 10." nbPhi="32." />
+
+<composition name="Vertical_Shielding_HO_Assembly" >
+ <posXYZ volume="Vertical_Shielding_HO_Poly" X_Y_Z=" 0. ; 0.; 6920." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Lateral_plate_TubeCut_Lead" X_Y_Z=" 0. ; 0.; 6945.01" rot="0. ; 0. ; 0." />
+</composition>
+<!-- End Vertical Shielding HO -->
+
+<!-- NJD Vert Shield -->
+ <!-- Inner -->
+<tubs name="Inner_SST" material="ShieldSteel" Rio_Z="1025. ; 1105. ; 70." nbPhi="32." />
+ <!-- End Inner -->
+
+ <!-- Middle -->
+<tubs name="Middle_Iron" material="Iron" Rio_Z="1135. ; 1359.9 ; 70." nbPhi="32." />
+<tubs name="Middle_Borotron" material="PolyBoronB2O3" Rio_Z=" 1360. ; 1589.9 ; 70." nbPhi="32." /> <!-- HD PE Borotron 5% HD050 - Density: 1010kg/m3 -->
+<tubs name="Middle_Lead" material="Lead" Rio_Z="1590. ; 1610. ; 70." nbPhi="32." />
+
+<composition name="Middle_VS" >
+ <posXYZ volume="Middle_Iron" X_Y_Z=" 0. ; 0.; 6775." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Middle_Borotron" X_Y_Z=" 0. ; 0.; 6775." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Middle_Lead" X_Y_Z=" 0. ; 0.; 6775." rot="0. ; 0. ; 0." />
+</composition>
+ <!-- End Middle -->
+
+ <!-- Outer -->
+<tubs name="Outer_Borotron" material="PolyBoronB2O3" Rio_Z="1643. ; 1762.9 ; 50." nbPhi="32." /> <!-- HD PE Borotron 5% HD050 - Density: 1010kg/m3 -->
+<tubs name="Outer_Lead" material="Lead" Rio_Z="1763. ; 1772.9 ; 50." nbPhi="32." />
+<tubs name="Outer_SSteel" material="ShieldSteel" Rio_Z="1773. ; 1777. ; 50." nbPhi="32." />
+
+<composition name="Outer_VS" >
+ <posXYZ volume="Outer_Borotron" X_Y_Z=" 0. ; 0.; 6760." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Outer_Lead" X_Y_Z=" 0. ; 0.; 6760." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Outer_SSteel" X_Y_Z=" 0. ; 0.; 6760." rot="0. ; 0. ; 0." />
+</composition>
+ <!-- End Outer -->
+
+<composition name="NJD_Vert_Shield_assembly" >
+ <posXYZ volume="Inner_SST" X_Y_Z=" 0. ; 0.; 6770." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Middle_VS" />
+ <posXYZ volume="Outer_VS" />
+</composition>
+ <!-- NJD Vert Shield -->
+
+<!-- ================================================ NSW movement ========================================= -->
+<!-- NSW movement -->
+<tubs name="JD_PAD" material="Iron" Rio_Z="0.; 352.75; 105." nbPhi="36" />
+<tubs name="JD_TOP_Pad" material="Iron" Rio_Z="0.; 155.8; 226.4" nbPhi="36" />
+<tubs name="BJ_asse" material="Iron" Rio_Z="0.; 73.; 380." nbPhi="36" />
+<box name="XbracketN" material="Iron" X_Y_Z="95.88; 230.; 218." />
+<tubs name="VerinN" material="Iron" Rio_Z="22.5; 55.65; 1477." nbPhi="36" />
+
+<box name="JD_TOP_Pad2" material="Iron" X_Y_Z="180.; 425.; 226." />
+
+
+
+<box name="Bracket_FC" material="Iron" X_Y_Z="613.; 56.; 56." />
+
+<box name="NSW_Extension_Main" material="Iron" X_Y_Z="478.8; 252.2; 340." />
+
+<box name="NSW_Extension_CutBox" material="Iron" X_Y_Z="218.; 270.2; 480." />
+
+<subtraction name="NSW_Extension">
+ <posXYZ volume="NSW_Extension_Main" rot="0. ; 90. ; 0." />
+ <posXYZ volume="NSW_Extension_CutBox" X_Y_Z="0.; -58.2; 0." />
+</subtraction>
+
+<composition name="NSW_MovementL" >
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 496.94; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad2" X_Y_Z=" 0.; 635.14; 166.42 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 1701.; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad" X_Y_Z=" 0.; 1701.; 166.01 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 950.58; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 1273.; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" -272.7; 604.; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" -272.7; 1611.5; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="VerinN" X_Y_Z=" -388.; 1002.5; 212. " rot="90. ; 0. ; 0." />
+ <posXYZ volume="Bracket_FC" X_Y_Z=" 524.51; 254.66; 339.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="NSW_Extension" X_Y_Z=" 0.; 635.14; 202.62 " rot="90. ; 0. ; 180." />
+</composition>
+
+<composition name="NSW_MovementR" >
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 496.94; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad2" X_Y_Z=" 0.; 635.14; 166.42 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 1701.; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad" X_Y_Z=" 0.; 1701.; 166.01 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 950.58; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 1273.; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" 272.7; 604.; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" 272.7; 1611.5; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="VerinN" X_Y_Z=" 388.; 1002.5; 212. " rot="90. ; 0. ; 0." />
+ <posXYZ volume="Bracket_FC" X_Y_Z=" -524.51; 254.66; 339.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="NSW_Extension" X_Y_Z=" 0.; 635.14; 202.62 " rot="90. ; 0. ; 180." />
+</composition>
+
+<composition name="NSW_Movement" >
+ <posXYZ volume="NSW_MovementL" X_Y_Z=" -3000.; -4329.5; 8153. " rot="-90. ; 0. ; 0." />
+ <posXYZ volume="NSW_MovementR" X_Y_Z=" 3000.; -4329.5; 8153. " rot="-90. ; 0. ; 0." />
+</composition>
+<!-- end NSW movement -->
+
+<composition name="JDSH_Shield_NSW" >
+ <posXYZ volume="JDDisk_ASide" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0." />
+ <!-- Aside -->
+ <posXYZ volume="Vertical_Shielding_HO_Assembly" />
+ <posXYZ volume="NJD_Vert_Shield_assembly" />
+ <posXYZ volume="NSW_Movement" X_Y_Z=" 0.; 0.; 0. " rot="0. ; 0. ; 0."/>
+</composition>
+
+</section>
+
+<!-- ===========================================Full ATLAS=========================================== -->
+
+<section name = "ATLAS"
+ version = "7.0"
+ date = "22 November 2008"
+ author = "Laurent"
+ top_volume = "All">
+
+<composition name="Magnets">
+ <posXYZ volume="ECT_Toroids" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="BAR_Toroid" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="Solenoid" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="Service">
+ <posXYZ volume="servicesAtZ0" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="pp2" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="MBAP_AccessPlatform" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="RUN2_Services" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="Shield">
+ <posXYZ volume="JTSH_Shield" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="JDSH_Shield" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="JDSH_Shield_NSW" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="JFSH_Shield" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="Supports">
+ <posXYZ volume="Feet" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="RailAssembly" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="HFTruckRail" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="SADL_CalorimeterSaddle" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="MBWH_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="TBWH_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="TGC1_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="TGC3_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="MDTRail" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="Plancher" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="IdEmTile">
+ <posXYZ volume="TileFingers" X_Y_Z="0.;0.;0." />
+</composition>
+
+</section>
+
+</AGDD>
diff --git a/MuonSpectrometer/MuonG4/MuonPassiveMaterials/data/passiveMat_r.09.02.xml b/MuonSpectrometer/MuonG4/MuonPassiveMaterials/data/passiveMat_r.09.02.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0c812065e9a38766d9e5fa43bac843c3fe0bb4cb
--- /dev/null
+++ b/MuonSpectrometer/MuonG4/MuonPassiveMaterials/data/passiveMat_r.09.02.xml
@@ -0,0 +1,9536 @@
+<?xml version="1.0"?>
+
+<AGDD>
+
+<section name = "General Variables"
+ version = "7.0"
+ date = "17 January 2005"
+ author = "Serguei Baranov, Daniel Pomarede"
+ top_volume = "useless">
+
+<!-- name = Constants of general use section name = "Constante" -->
+
+<var name="GENV_Pi" value="2. * asin(1)" />
+<var name="GENV_Eps" value="0.1" />
+<var name="GENV_PiS180" value="GENV_Pi/180." />
+
+<var name="GENV_Si5" value="sin( 5.0*GENV_PiS180)"/>
+<var name="GENV_Co5" value="cos( 5.0*GENV_PiS180)"/>
+
+<var name="GENV_Ta15" value="tan(15.0*GENV_PiS180)"/>
+
+<var name="GENV_Ta20" value="tan(20.0*GENV_PiS180)"/>
+
+<var name="GENV_Si225" value="sin(22.5*GENV_PiS180)"/>
+<var name="GENV_Co225" value="cos(22.5*GENV_PiS180)"/>
+<var name="GENV_Ta225" value="tan(22.5*GENV_PiS180)"/>
+
+<var name="GENV_Ta375" value="tan(37.5*GENV_PiS180)"/>
+
+<var name="GENV_Si45" value="sin(45.0*GENV_PiS180)"/>
+<var name="GENV_Co45" value="cos(45.0*GENV_PiS180)"/>
+<var name="GENV_Ta45" value="tan(45.0*GENV_PiS180)"/>
+
+<var name="GENV_Si525" value="sin(52.5*GENV_PiS180)"/>
+<var name="GENV_Co525" value="cos(52.5*GENV_PiS180)"/>
+
+<var name="GENV_Ta55" value="tan(55.0*GENV_PiS180)"/>
+
+<var name="GENV_Si675" value="sin(67.5*GENV_PiS180)"/>
+<var name="GENV_Co675" value="cos(67.5*GENV_PiS180)"/>
+<var name="GENV_Ta675" value="tan(67.5*GENV_PiS180)"/>
+
+<var name="GENV_Ta77" value="tan(77.0*GENV_PiS180)"/>
+<var name="Zero" value=" 0"/>
+
+<var name="PiOver2" value="90." />
+<var name="PiOver4" value="45." />
+
+</section>
+<section name = "Atlas ECT Toroidal Magnets"
+ version = "8.0"
+ date = "01-01-10, 28 November 2002 -> Summer 2011"
+ author = "Laurent Chevalier, Marc Virchaux, Daniel Pomarede -> review Jochen Meyer"
+ top_volume = "ECT_Toroids">
+
+<!-- name = Atlas ECT Toroidal Magnets section name = "Magnets" -->
+
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** Atlas End-Cap Toroids (ECT) ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+<var name="AECT_Toroid_ZPosition" value=" 10406. "/> <!-- confirmed atczte__0002-vAB -->
+
+
+<!-- cold mass parameters -->
+
+<!-- conductor surrounding mass from atltecc_0012-v0 and atltecc_0013-v0 -->
+
+<var name="AECT_CMZwid_ColdMassZwidth" value=" 4490.7 "/> <!-- warm: 4510. -->
+<var name="AECT_CMRwid_ColdMassRadwidth" value=" 3942.0 "/> <!-- warm: 3959. -->
+<var name="AECT_CMPwid_ColdMassPhiwidth" value=" 270.8 "/> <!-- warm: 272. -->
+<var name="AECT_CMHrad_ColdMassHolerad" value=" 250. "/> <!-- warm value kept, may be increased due to shrinking of surrounding material -->
+<var name="AECT_CMEOff_ColdMassEdgeOff" value=" 612.4 "/> <!-- warm: 615. cold: 612.4 -->
+<var name="AECT_CMHRp1_ColdMassHoleRpo1" value=" 1702.7 "/> <!-- warm: 1710. -->
+<var name="AECT_CMHRp2_ColdMassHoleRpo2" value=" 995.7 "/> <!-- warm: 1000. -->
+
+<var name="AECT_CMIWba_ColdMassInWebbase" value=" 402.3 "/> <!-- from atltecc_0011-v0, warm: 202. for the half of it-->
+<var name="AECT_CMIWed_ColdMassInWebedge" value=" 199.1 "/> <!-- from atltecc_0011-v0, warm: 200. -->
+<!-- following value does not agree to atltecc_0011-v0, it's from consistency calculation, seems smaller in blueprints -->
+<!-- if one wants to decrease the outer radius of the coil this value has to be reduced in the same way! -->
+<var name="AECT_CMIWhi_ColdMassInWebhigh" value=" 90.1 "/>
+<var name="AECT_CMgodi_ColdMassgloboutdi" value=" 10164.1 "/> <!-- from 10014054-07, warm: 10238. -->
+<var name="AECT_CMgira_ColdMassglobinrad" value=" 1045. "/> <!-- from atltec__0001-v0, warm 1050. -->
+
+<!-- keystone box from atltecc_0008-v0 -->
+
+<var name="AECT_KSthic_KeyStonethickness" value=" 39.8 "/> <!-- warm: 40. -->
+<var name="AECT_KSlthi_KeyStonelowthick" value=" 59.7 "/> <!-- warm: 60. -->
+<var name="AECT_KSHrad_KeyStoneHolerad" value=" 570. "/> <!-- warm value kept, may be increased due to shrinking of surrounding material -->
+<var name="AECT_KSHRpo_KeyStoneHoleRpos" value=" 2041.2 "/> <!-- warm: 2050. -->
+<var name="AECT_KSZwid_KeyStoneZwidth" value=" 3265.9 "/> <!-- warm: 3280. -->
+<var name="AECT_KStRwi_KeyStonetotRwidth" value=" 2837.8 "/> <!-- warm: 2850. -->
+<var name="AECT_KSmRwi_KeyStonemidRwidth" value=" 507.8 "/> <!-- warm: 510. -->
+<var name="AECT_KSlRwi_KeyStonelowRwidth" value=" 199.1 "/> <!-- warm: 200. -->
+<var name="AECT_KStPwi_KeyStonetopPhiwid" value=" 2816.4 "/> <!-- warm: 2828.5 -->
+<var name="AECT_KSlPwi_KeyStonelowPhiwid" value=" 428.1 "/> <!-- warm: 430. -->
+<var name="AECT_KSlPof_KeyStonelowPhioff" value=" 214.1 "/> <!-- warm: 215. -->
+<var name="AECT_KSBRwi_KeyStoneBoxRwidth" value=" 492.9 "/> <!-- warm: 495. -->
+<var name="AECT_KSFPRo_KeyStoneFootPROff" value=" 291.7 "/> <!-- warm: 293. -->
+
+<box name="ECT_CM_ConductorFrame_basic" material="Aluminium" X_Y_Z="AECT_CMZwid_ColdMassZwidth ; AECT_CMRwid_ColdMassRadwidth; AECT_CMPwid_ColdMassPhiwidth" />
+<box name="ECT_CM_ConductorFrame_edge" material="Aluminium" X_Y_Z="AECT_CMEOff_ColdMassEdgeOff; AECT_CMEOff_ColdMassEdgeOff; 2.*AECT_CMPwid_ColdMassPhiwidth" />
+<tubs name="ECT_CM_ConductorFrame_Hole" material="Aluminium" Rio_Z="0.; AECT_CMHrad_ColdMassHolerad; 2.*AECT_CMPwid_ColdMassPhiwidth" nbPhi="20" />
+
+<subtraction name="ECT_CM_ConductorFrame" >
+ <posXYZ volume="ECT_CM_ConductorFrame_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" AECT_CMZwid_ColdMassZwidth/2.; AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" -AECT_CMZwid_ColdMassZwidth/2.; AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" AECT_CMZwid_ColdMassZwidth/2.; -AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_edge" X_Y_Z=" -AECT_CMZwid_ColdMassZwidth/2.; -AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 0.; 45. "/>
+ <posXYZ volume="ECT_CM_ConductorFrame_Hole" X_Y_Z=" 0.; AECT_CMRwid_ColdMassRadwidth/2. - AECT_CMHRp1_ColdMassHoleRpo1 ; 0." />
+ <posXYZ volume="ECT_CM_ConductorFrame_Hole" X_Y_Z=" 0.; AECT_CMRwid_ColdMassRadwidth/2. - AECT_CMHRp1_ColdMassHoleRpo1 - AECT_CMHRp2_ColdMassHoleRpo2 ; 0." />
+</subtraction>
+
+<gvxysx name="ECT_CM_ConductorInnerWeb" material="Aluminium" dZ="AECT_KSZwid_KeyStoneZwidth">
+ <gvxy_point X_Y="AECT_CMIWba_ColdMassInWebbase/2. - GENV_Eps; 0."/>
+ <gvxy_point X_Y="GENV_Si225*AECT_CMIWed_ColdMassInWebedge + AECT_CMIWba_ColdMassInWebbase/2.-GENV_Eps; GENV_Co225*AECT_CMIWed_ColdMassInWebedge"/>
+ <gvxy_point X_Y="AECT_CMPwid_ColdMassPhiwidth/2. + 2.*GENV_Eps; GENV_Co225*AECT_CMIWed_ColdMassInWebedge"/>
+ <gvxy_point X_Y="AECT_CMPwid_ColdMassPhiwidth/2. + 2.*GENV_Eps ; AECT_CMIWhi_ColdMassInWebhigh - GENV_Eps"/>
+</gvxysx>
+
+<trd name="ECT_CM_KeyStoneTop" material="Aluminium" Xmp_Ymp_Z=" AECT_KStPwi_KeyStonetopPhiwid; AECT_KStPwi_KeyStonetopPhiwid - 2.*GENV_Ta225*AECT_KSthic_KeyStonethickness; AECT_KSZwid_KeyStoneZwidth; AECT_KSZwid_KeyStoneZwidth; AECT_KSthic_KeyStonethickness" />
+
+<box name="ECT_CM_KeyStoneMid_basic" material="Aluminium" X_Y_Z="AECT_KStPwi_KeyStonetopPhiwid - GENV_Ta225 * AECT_KSthic_KeyStonethickness * 2. ; AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth ; AECT_KSthic_KeyStonethickness" />
+<box name="ECT_CM_KeyStoneMid_CutBox" material="Aluminium" X_Y_Z="AECT_KStPwi_KeyStonetopPhiwid; AECT_KSZwid_KeyStoneZwidth ; 2.*AECT_KSthic_KeyStonethickness" />
+<tubs name="ECT_CM_KeyStoneMid_Hole" material="Aluminium" Rio_Z="0.; AECT_KSHrad_KeyStoneHolerad; 2.*AECT_KSthic_KeyStonethickness" nbPhi="20" />
+
+<subtraction name="ECT_CM_KeyStoneMid" >
+ <posXYZ volume="ECT_CM_KeyStoneMid_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneMid_Hole" X_Y_Z=" 0.; AECT_KSHRpo_KeyStoneHoleRpos - AECT_KSmRwi_KeyStonemidRwidth/2. - AECT_KStRwi_KeyStonetotRwidth/2.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneMid_CutBox" X_Y_Z=" (AECT_KStPwi_KeyStonetopPhiwid * (1.+GENV_Co225) - AECT_KSZwid_KeyStoneZwidth*GENV_Si225 - GENV_Ta225 * AECT_KSthic_KeyStonethickness*2.)/2. + GENV_Eps; (-AECT_KSZwid_KeyStoneZwidth*GENV_Co225 - AECT_KStPwi_KeyStonetopPhiwid * GENV_Si225)/2. + (AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps * GENV_Ta225 ; 0." rot=" 0.; 0.; -22.5 "/>
+ <posXYZ volume="ECT_CM_KeyStoneMid_CutBox" X_Y_Z="-(AECT_KStPwi_KeyStonetopPhiwid * (1.+GENV_Co225) - AECT_KSZwid_KeyStoneZwidth*GENV_Si225 - GENV_Ta225 * AECT_KSthic_KeyStonethickness*2.)/2. - GENV_Eps; (-AECT_KSZwid_KeyStoneZwidth*GENV_Co225 - AECT_KStPwi_KeyStonetopPhiwid * GENV_Si225)/2. + (AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps * GENV_Ta225 ; 0." rot=" 0.; 0.; 22.5 "/>
+</subtraction>
+
+<gvxysx name="ECT_CM_KeyStoneLow" material="Aluminium" dZ="AECT_KSthic_KeyStonethickness">
+ <gvxy_point X_Y=" AECT_KStPwi_KeyStonetopPhiwid/2. - (AECT_KStRwi_KeyStonetotRwidth - AECT_KSmRwi_KeyStonemidRwidth) * GENV_Ta225 ; AECT_KSmRwi_KeyStonemidRwidth"/>
+ <gvxy_point X_Y=" AECT_KSlPof_KeyStonelowPhioff ; AECT_KSlRwi_KeyStonelowRwidth"/>
+ <gvxy_point X_Y=" AECT_KSlPof_KeyStonelowPhioff - AECT_KSlthi_KeyStonelowthick; AECT_KSlRwi_KeyStonelowRwidth"/>
+ <gvxy_point X_Y=" AECT_KSlPof_KeyStonelowPhioff - AECT_KSlthi_KeyStonelowthick; AECT_KSlthi_KeyStonelowthick"/>
+</gvxysx>
+
+<box name="ECT_CM_KeyStoneInnerWeb_Box1" material="Aluminium" X_Y_Z=" AECT_KSlthi_KeyStonelowthick - GENV_Eps/2.; AECT_KSlRwi_KeyStonelowRwidth - AECT_KSlthi_KeyStonelowthick; AECT_KSZwid_KeyStoneZwidth" />
+<box name="ECT_CM_KeyStoneInnerWeb_Box2" material="Aluminium" X_Y_Z=" AECT_KSlPwi_KeyStonelowPhiwid - GENV_Eps/2.; AECT_KSlthi_KeyStonelowthick - GENV_Eps; AECT_KSZwid_KeyStoneZwidth" />
+<box name="ECT_CM_KeyStoneFootPlate" material="Aluminium" X_Y_Z=" AECT_KSthic_KeyStonethickness; AECT_KSBRwi_KeyStoneBoxRwidth; AECT_KSZwid_KeyStoneZwidth" />
+
+<composition name="ECT_CM_KeyStone" >
+ <posXYZ volume="ECT_CM_KeyStoneTop" X_Y_Z=" 0.; AECT_KStRwi_KeyStonetotRwidth - AECT_KSthic_KeyStonethickness/2. + 1.5*GENV_Eps*GENV_Co225; -1.5*GENV_Eps*GENV_Si225" rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_CM_KeyStoneMid" X_Y_Z=" 0.; AECT_KStRwi_KeyStonetotRwidth - (AECT_KStRwi_KeyStonetotRwidth + AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps*GENV_Co225; AECT_KSZwid_KeyStoneZwidth/2. - AECT_KSthic_KeyStonethickness/2.-GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneMid" X_Y_Z=" 0.; AECT_KStRwi_KeyStonetotRwidth - (AECT_KStRwi_KeyStonetotRwidth + AECT_KSthic_KeyStonethickness - AECT_KSmRwi_KeyStonemidRwidth)/2. + GENV_Eps*GENV_Co225; -AECT_KSZwid_KeyStoneZwidth/2. + AECT_KSthic_KeyStonethickness/2.-GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneLow" X_Y_Z=" 0.; 0.5*GENV_Eps*GENV_Co225; AECT_KSZwid_KeyStoneZwidth/2. - AECT_KSthic_KeyStonethickness/2.-0.5*GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneLow" X_Y_Z=" 0.; 0.5*GENV_Eps*GENV_Co225; -AECT_KSZwid_KeyStoneZwidth/2. + AECT_KSthic_KeyStonethickness/2.-0.5*GENV_Eps*GENV_Si225" />
+ <posXYZ volume="ECT_CM_KeyStoneInnerWeb_Box1" X_Y_Z=" (AECT_KSlPwi_KeyStonelowPhiwid - AECT_KSlthi_KeyStonelowthick)/2.; (AECT_KSlthi_KeyStonelowthick + AECT_KSlRwi_KeyStonelowRwidth)/2.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneInnerWeb_Box1" X_Y_Z="-(AECT_KSlPwi_KeyStonelowPhiwid - AECT_KSlthi_KeyStonelowthick)/2.; (AECT_KSlthi_KeyStonelowthick + AECT_KSlRwi_KeyStonelowRwidth)/2.; 0." />
+ <posXYZ volume="ECT_CM_KeyStoneInnerWeb_Box2" X_Y_Z=" 0.; AECT_KSlthi_KeyStonelowthick/2.; 0" />
+ <posXYZ volume="ECT_CM_KeyStoneFootPlate" X_Y_Z=" (AECT_KSthic_KeyStonethickness*(GENV_Co225 - 2.*GENV_Si225) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Si225 + AECT_KStPwi_KeyStonetopPhiwid)/2. - GENV_Si225*AECT_KSFPRo_KeyStoneFootPROff; (AECT_KSthic_KeyStonethickness*(-GENV_Si225 - 2) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Co225)/2. + AECT_KStRwi_KeyStonetotRwidth - GENV_Co225*AECT_KSFPRo_KeyStoneFootPROff; 0" rot=" 0.; 0.; -22.5 "/>
+ <posXYZ volume="ECT_CM_KeyStoneFootPlate" X_Y_Z="-(AECT_KSthic_KeyStonethickness*(GENV_Co225 - 2.*GENV_Si225) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Si225 + AECT_KStPwi_KeyStonetopPhiwid)/2. + GENV_Si225*AECT_KSFPRo_KeyStoneFootPROff; (AECT_KSthic_KeyStonethickness*(-GENV_Si225 - 2) + AECT_KSBRwi_KeyStoneBoxRwidth*GENV_Co225)/2. + AECT_KStRwi_KeyStonetotRwidth - GENV_Co225*AECT_KSFPRo_KeyStoneFootPROff; 0" rot=" 0.; 0.; 22.5 "/>
+</composition>
+
+<var name="AECT_KSRahi_KeyStoneradihight" value="2.*GENV_Si225*(AECT_KSBRwi_KeyStoneBoxRwidth-AECT_KSFPRo_KeyStoneFootPROff-AECT_KSthic_KeyStonethickness)+2.*GENV_Co225*AECT_KSthic_KeyStonethickness+AECT_KStPwi_KeyStonetopPhiwid" />
+<var name="AECT_KSRpwi_KeyStonephiwidth" value="AECT_KStRwi_KeyStonetotRwidth + GENV_Co225*(AECT_KSBRwi_KeyStoneBoxRwidth - AECT_KSFPRo_KeyStoneFootPROff) - AECT_KSthic_KeyStonethickness "/>
+
+<composition name="ECT_ColdMass" >
+ <posXYZ volume="ECT_CM_ConductorFrame" X_Y_Z=" 0.; AECT_CMgodi_ColdMassgloboutdi/2. - AECT_CMRwid_ColdMassRadwidth/2.; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="ECT_CM_ConductorInnerWeb" X_Y_Z=" 0.; AECT_CMgira_ColdMassglobinrad; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="ECT_CM_KeyStone" X_Y_Z=" -AECT_CMgira_ColdMassglobinrad*GENV_Si225; AECT_CMgira_ColdMassglobinrad*GENV_Co225; 0." rot=" 0.; 0.; 22.5"/>
+</composition>
+
+<!-- thermal radiation shielding - Coil Cover - atlteyr_0288-v0 and atlteyr_0289-v0 -->
+<var name="AECT_CCZwid_CoilCoverZwidth" value=" 348. "/>
+<var name="AECT_CCPwid_CoilCoverPhiwidth" value=" 700. "/>
+<var name="AECT_CCfRwi_CoilCoverfullRwid" value=" 3601. "/>
+<var name="AECT_CCthic_CoilCoverthicknes" value=" 10. "/>
+<var name="AECT_CCRaof_CoilCoverRadoff" value=" 52. "/>
+
+<trd name="ECT_CC_CoilCoverSide" material="Aluminium" Xmp_Ymp_Z="AECT_CCfRwi_CoilCoverfullRwid-AECT_CCRaof_CoilCoverRadoff+2.*(AECT_CCthic_CoilCoverthicknes/GENV_Si45 + AECT_CCthic_CoilCoverthicknes); AECT_CCfRwi_CoilCoverfullRwid-AECT_CCRaof_CoilCoverRadoff - 2.*(AECT_CCZwid_CoilCoverZwidth-AECT_CCthic_CoilCoverthicknes/GENV_Si45); AECT_CCthic_CoilCoverthicknes; AECT_CCthic_CoilCoverthicknes; AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes"/>
+
+<gvxysx name="ECT_CC_CoilCoverTop" material="Aluminium" dZ="AECT_CCPwid_CoilCoverPhiwidth">
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes/GENV_Si45 ; AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes "/>
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. + AECT_CCthic_CoilCoverthicknes/GENV_Si45 + AECT_CCthic_CoilCoverthicknes; 0"/>
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. + AECT_CCthic_CoilCoverthicknes ; 0"/>
+ <gvxy_point X_Y=" (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCZwid_CoilCoverZwidth - AECT_CCthic_CoilCoverthicknes*GENV_Ta225 + AECT_CCthic_CoilCoverthicknes/GENV_Si45; AECT_CCZwid_CoilCoverZwidth - AECT_CCthic_CoilCoverthicknes + AECT_CCthic_CoilCoverthicknes"/>
+</gvxysx>
+
+<!-- thermal radiation shielding - EndPlate - atlteyr_0068-v0, atlteyr_0077-v0, atlteyr_0078-v0 and atlteyr_0110-v0 -->
+<var name="AECT_EPthic_EndPlatethickness" value=" 20. "/>
+<var name="AECT_EPHoPo_EndPlateHolepos" value=" 1720. "/>
+<var name="AECT_EPHoDi_EndPlateHolediame" value=" 830. "/>
+<var name="AECT_EPfuhi_EndPlatefullhight" value=" 3467. "/>
+<var name="AECT_EPmihi_EndPlateminihight" value=" 2740. "/>
+<var name="AECT_EPfuwi_EndPlatefullwidth" value=" 1959. "/>
+<var name="AECT_EPmiwi_EndPlatemidwidth" value=" 1200.5 "/>
+<var name="AECT_EPhiwi_EndPlatehighwidth" value=" 775. "/>
+<var name="AECT_EPlowi_EndPlatelowwidth" value=" 182. "/>
+<var name="AECT_EPEfuw_EndPlateExtfullwi" value=" 530. "/>
+<var name="AECT_EPEmiw_EndPlateExtminiwi" value=" 275. "/>
+<var name="AECT_EPEhig_EndPlateExthight" value=" 240. "/>
+<var name="AECT_EPBBhi_EndPlateBackBoxwi" value=" 1230. "/>
+<var name="AECT_EPBBwi_EndPlateBackBoxhi" value=" 145. "/>
+<var name="AECT_EPFBhi_EndPlateFrontBoxw" value=" 410. "/>
+<var name="AECT_EPFBwi_EndPlateFrontBoxh" value=" 125. "/>
+
+<!-- derived variable to get second last point via cot(22.5)*(x-a)= -tan(22.5)*(x-b) + c -->
+<var name="AECT_EPAuVX_EndPlateAuxVarX" value="GENV_Co225*GENV_Si225*(AECT_EPfuhi_EndPlatefullhight-GENV_Si225*AECT_EPEmiw_EndPlateExtminiwi-(AECT_EPEhig_EndPlateExthight)*GENV_Co225)+GENV_Co225*GENV_Co225* AECT_EPlowi_EndPlatelowwidth+GENV_Si225*GENV_Si225*(AECT_EPfuwi_EndPlatefullwidth-(AECT_EPEhig_EndPlateExthight)*GENV_Si225) "/>
+
+<gvxysx name="ECT_EP_EndPlate_basic" material="Aluminium" dZ="AECT_EPthic_EndPlatethickness">
+ <gvxy_point X_Y=" AECT_EPhiwi_EndPlatehighwidth; AECT_EPmihi_EndPlateminihight "/>
+ <gvxy_point X_Y=" AECT_EPmiwi_EndPlatemidwidth; AECT_EPmihi_EndPlateminihight + (AECT_EPmiwi_EndPlatemidwidth - AECT_EPhiwi_EndPlatehighwidth)*GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth - AECT_EPEfuw_EndPlateExtfullwi/GENV_Co225; AECT_EPmihi_EndPlateminihight + (AECT_EPmiwi_EndPlatemidwidth - AECT_EPhiwi_EndPlatehighwidth)*GENV_Ta225 + (AECT_EPfuwi_EndPlatefullwidth - AECT_EPmiwi_EndPlatemidwidth - AECT_EPEfuw_EndPlateExtfullwi/GENV_Co225)/GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth - AECT_EPEmiw_EndPlateExtminiwi*GENV_Co225; AECT_EPfuhi_EndPlatefullhight "/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth; AECT_EPfuhi_EndPlatefullhight - AECT_EPEmiw_EndPlateExtminiwi*GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EPfuwi_EndPlatefullwidth - (AECT_EPEhig_EndPlateExthight )*GENV_Si225; AECT_EPfuhi_EndPlatefullhight - AECT_EPEmiw_EndPlateExtminiwi*GENV_Si225 - (AECT_EPEhig_EndPlateExthight )*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EPAuVX_EndPlateAuxVarX; (AECT_EPAuVX_EndPlateAuxVarX-AECT_EPlowi_EndPlatelowwidth)/GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_EPlowi_EndPlatelowwidth; 0. "/>
+</gvxysx>
+
+<box name="ECT_EP_EndPlate_BackBox" material="Aluminium" X_Y_Z="AECT_EPBBhi_EndPlateBackBoxwi; 2.*AECT_EPBBwi_EndPlateBackBoxhi; 2.*AECT_EPthic_EndPlatethickness" />
+<box name="ECT_EP_EndPlate_FrontBox" material="Aluminium" X_Y_Z="AECT_EPFBhi_EndPlateFrontBoxw; 2.*AECT_EPFBwi_EndPlateFrontBoxh; 2.*AECT_EPthic_EndPlatethickness" />
+<tubs name="ECT_EP_EndPlate_Hole" material="Aluminium" Rio_Z="0.; AECT_EPHoDi_EndPlateHolediame/2.; 2.*AECT_EPthic_EndPlatethickness" nbPhi="20" />
+
+<subtraction name="ECT_EP_EndPlate_front" >
+ <posXYZ volume="ECT_EP_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_Hole" X_Y_Z=" 0.; AECT_EPHoPo_EndPlateHolepos; 0." />
+</subtraction>
+
+<subtraction name="ECT_EP_EndPlate_back" >
+ <posXYZ volume="ECT_EP_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_Hole" X_Y_Z=" 0.; AECT_EPHoPo_EndPlateHolepos; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_BackBox" X_Y_Z=" 0.; AECT_EPmihi_EndPlateminihight; 0." />
+</subtraction>
+
+<subtraction name="ECT_EP_EndPlate_special" >
+ <posXYZ volume="ECT_EP_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_Hole" X_Y_Z=" 0.; AECT_EPHoPo_EndPlateHolepos; 0." />
+ <posXYZ volume="ECT_EP_EndPlate_FrontBox" X_Y_Z=" 0.; AECT_EPmihi_EndPlateminihight; 0." />
+</subtraction>
+
+<!-- thermal radiation shielding - Shell - atlteyr_0280-v0 and atlteyr_0070-v0 -->
+<var name="AECT_OSCCZd_ShellCCZdimension" value=" 3940. "/>
+<var name="AECT_OSCCRw_ShellCCRadwidth" value=" 400. "/>
+<var name="AECT_OSCCmw_ShellCCminiwidth" value=" 372. "/>
+<var name="AECT_OSCCmw_ShellCCedgelength" value=" 451. "/>
+<var name="AECT_OSCCth_ShellCCthickness" value=" 10. "/>
+
+<var name="AECT_OSCCmw_ShellCClongwidth" value=" 423. "/>
+<var name="AECT_OSCCmw_ShellCCshortwidth" value=" 107. "/>
+<var name="AECT_OSCCtc_ShellCCthickconn" value=" 20. "/>
+
+<var name="AECT_OSCCOv_ShellCCoverlap" value=" 60. "/>
+
+<var name="AECT_OSJPiw_ShellJPinnerwidth" value=" 1912. "/>
+<var name="AECT_OSJPew_ShellJPedgewidth" value=" 238. "/>
+<var name="AECT_OSJPtc_ShellJPZlength" value=" 2815. "/>
+<var name="AECT_OSAFBt_ShellAFBthickness" value=" 15. "/>
+<var name="AECT_OSAFBh_ShellAFBhight" value=" 215. "/>
+<var name="AECT_OSFSBh_ShellFSBhight" value=" 190. "/>
+
+<var name="AECT_STaidi_StayTubeAlignindi" value=" 910. "/>
+<var name="AECT_STaodi_StayTubeAlignoutd" value=" 930. "/>
+<var name="AECT_STaflt_StayTubeAlignFlth" value=" 20. "/>
+
+<gvxysx name="ECT_TS_ShellCoilCover" material="Aluminium" dZ="AECT_OSCCZd_ShellCCZdimension">
+ <gvxy_point X_Y=" - AECT_OSCCmw_ShellCCminiwidth/2. ; AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCOv_ShellCCoverlap - AECT_OSCCth_ShellCCthickness"/>
+ <gvxy_point X_Y=" - (AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCOv_ShellCCoverlap - AECT_OSCCmw_ShellCCedgelength*GENV_Si45"/>
+ <gvxy_point X_Y=" - (AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth - AECT_OSCCOv_ShellCCoverlap"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth - AECT_OSCCOv_ShellCCoverlap"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 - AECT_OSCCtc_ShellCCthickconn*GENV_Ta225 "/>
+ <gvxy_point X_Y=" AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.) ; 0 "/>
+ <gvxy_point X_Y=" - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.) ; AECT_OSCCtc_ShellCCthickconn*GENV_Si45 "/>
+ <gvxy_point X_Y=" - (AECT_OSCCtc_ShellCCthickconn + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45"/>
+ <gvxy_point X_Y=" - (AECT_OSCCtc_ShellCCthickconn + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth"/>
+ <gvxy_point X_Y=" - (AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.); AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCth_ShellCCthickness*(GENV_Ta225-1)- AECT_OSCCmw_ShellCCedgelength*GENV_Si45 - AECT_OSCCOv_ShellCCoverlap"/>
+ <gvxy_point X_Y=" - AECT_OSCCth_ShellCCthickness*GENV_Ta225 - AECT_OSCCmw_ShellCCminiwidth/2.; AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCtc_ShellCCthickconn*GENV_Si45 + AECT_OSCCmw_ShellCClongwidth + AECT_OSCCRw_ShellCCRadwidth - AECT_OSCCOv_ShellCCoverlap"/>
+</gvxysx>
+
+<gvxysx name="ECT_TS_JointPlate" material="Aluminium" dZ="AECT_OSJPtc_ShellJPZlength">
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSCCtc_ShellCCthickconn*tan(11.25*GENV_PiS180) ; -(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225+AECT_OSCCtc_ShellCCthickconn*GENV_Si225 ; AECT_OSCCtc_ShellCCthickconn*(1-GENV_Co225)+AECT_OSJPew_ShellJPedgewidth*GENV_Si225-(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225 ; AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225-(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.; AECT_OSCCtc_ShellCCthickconn-(AECT_OSCCtc_ShellCCthickconn+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+</gvxysx>
+
+<gvxysx name="ECT_TS_AxialForceBox" material="Aluminium" dZ="AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength">
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.+AECT_OSAFBt_ShellAFBthickness ; -(AECT_OSAFBh_ShellAFBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.+AECT_OSAFBt_ShellAFBthickness ; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSAFBt_ShellAFBthickness-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSAFBt_ShellAFBthickness*tan(11.25*GENV_PiS180) ; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSAFBt_ShellAFBthickness-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225+AECT_OSAFBt_ShellAFBthickness*GENV_Si225 ; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSAFBt_ShellAFBthickness*GENV_Co225+AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225 ; (AECT_OSAFBh_ShellAFBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.; AECT_OSAFBh_ShellAFBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPBBhi_EndPlateBackBoxwi/2.; AECT_OSAFBt_ShellAFBthickness-(AECT_OSAFBh_ShellAFBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+</gvxysx>
+
+<gvxysx name="ECT_TS_FrontSpecialBox" material="Aluminium" dZ="AECT_OSJPtc_ShellJPZlength">
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.+AECT_OSCCtc_ShellCCthickconn ; -(AECT_OSFSBh_ShellFSBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2. "/>
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.+AECT_OSCCtc_ShellCCthickconn ; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSCCtc_ShellCCthickconn-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSCCtc_ShellCCthickconn*tan(11.25*GENV_PiS180) ; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSCCtc_ShellCCthickconn-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225+AECT_OSCCtc_ShellCCthickconn*GENV_Si225 ; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSCCtc_ShellCCthickconn*GENV_Co225+AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.+AECT_OSJPew_ShellJPedgewidth*GENV_Co225 ; (AECT_OSFSBh_ShellFSBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+ <gvxy_point X_Y=" AECT_OSJPiw_ShellJPinnerwidth/2.; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.; AECT_OSFSBh_ShellFSBhight/2.-AECT_OSJPew_ShellJPedgewidth*GENV_Si225/2."/>
+ <gvxy_point X_Y=" AECT_EPFBhi_EndPlateFrontBoxw/2.; AECT_OSCCtc_ShellCCthickconn-(AECT_OSFSBh_ShellFSBhight+AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2."/>
+</gvxysx>
+
+<tubs name="ECT_ST_StayTube_Tube" material="Aluminium" Rio_Z="AECT_STaidi_StayTubeAlignindi/2.; AECT_STaodi_StayTubeAlignoutd/2.; AECT_OSCCZd_ShellCCZdimension" nbPhi="20" />
+<tubs name="ECT_ST_StayTube_Flange" material="Aluminium" Rio_Z="AECT_EPHoDi_EndPlateHolediame/2.; AECT_STaodi_StayTubeAlignoutd/2.; AECT_STaflt_StayTubeAlignFlth" nbPhi="20" />
+
+<var name="AECT_SCCXwi_ShellCCfullXwidth" value="(AECT_OSJPiw_ShellJPinnerwidth/2. + AECT_OSJPew_ShellJPedgewidth*GENV_Co225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225)" />
+<var name="AECT_SCCYwi_ShellCCfullYwidth" value="(AECT_OSCCtc_ShellCCthickconn + AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2." />
+<var name="AECT_SAFBXw_ShellAFBfullXwidt" value="(AECT_OSJPiw_ShellJPinnerwidth/2. + AECT_OSJPew_ShellJPedgewidth*GENV_Co225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225)" />
+<var name="AECT_SAFBYw_ShellAFBfullYwidt" value="(AECT_OSAFBh_ShellAFBhight + AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2." />
+<var name="AECT_SFSBYw_ShellFSBfullYwidt" value="(AECT_OSFSBh_ShellFSBhight + AECT_OSJPew_ShellJPedgewidth*GENV_Si225)/2." />
+
+<!-- Radius for ThermalRadiationShield Endplate (TRSEPr) and Shell (TRSShr), last term is responsible for the gap in between -> needed safety factor -> see also the photos -->
+<var name="AECT_TRSEPr_EndplateRadPos" value="AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 - (AECT_EPfuhi_EndPlatefullhight - AECT_EPEmiw_EndPlateExtminiwi*GENV_Si225)/GENV_Co225 - AECT_EPlowi_EndPlatelowwidth*GENV_Si225 - (AECT_EPfuwi_EndPlatefullwidth - AECT_EPAuVX_EndPlateAuxVarX - (AECT_EPEhig_EndPlateExthight)*GENV_Si225)*GENV_Ta225/GENV_Co225 + AECT_EPthic_EndPlatethickness*1.5" />
+<var name="AECT_CCSPYp_CoilCoverSideYpos" value="AECT_EPfuwi_EndPlatefullwidth/GENV_Si225+AECT_EPthic_EndPlatethickness*1.5-AECT_EPEhig_EndPlateExthight-(AECT_CCfRwi_CoilCoverfullRwid-AECT_CCRaof_CoilCoverRadoff)/2.-AECT_CCthic_CoilCoverthicknes/GENV_Si45-AECT_CCthic_CoilCoverthicknes" />
+<var name="AECT_TRSShr_ShellRadPos" value="(-(AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.)))/GENV_Ta225 + (AECT_OSJPiw_ShellJPinnerwidth/2.) * (GENV_Si225+GENV_Co225/GENV_Ta225) + ((AECT_OSJPew_ShellJPedgewidth-AECT_OSCCOv_ShellCCoverlap)*GENV_Co45 )*(1+1/GENV_Ta225)" />
+<var name="AECT_SCCXpo_ShellCCXpos" value=" - AECT_SCCXwi_ShellCCfullXwidth*GENV_Co225 + AECT_SCCYwi_ShellCCfullYwidth*GENV_Si225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Co225 + (AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.))+AECT_OSCCOv_ShellCCoverlap*GENV_Si45" />
+<var name="AECT_SFSBXp_ShellFSBXpos" value=" - AECT_SCCXwi_ShellCCfullXwidth*GENV_Co225 + AECT_SFSBYw_ShellFSBfullYwidt*GENV_Si225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Co225 + (AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.))+AECT_OSCCOv_ShellCCoverlap*GENV_Si45" />
+<var name="AECT_SAFBXp_ShellAFBXpos" value=" - AECT_SAFBXw_ShellAFBfullXwidt*GENV_Co225 + AECT_SAFBYw_ShellAFBfullYwidt*GENV_Si225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225*GENV_Co225 + (AECT_OSCCtc_ShellCCthickconn*(GENV_Si45-1.) - (AECT_OSCCmw_ShellCCshortwidth*GENV_Si45 + AECT_OSCCth_ShellCCthickness + AECT_OSCCmw_ShellCCedgelength*GENV_Si45 + AECT_OSCCmw_ShellCCminiwidth/2.))+AECT_OSCCOv_ShellCCoverlap*GENV_Si45" />
+
+<composition name="ECT_TS_ThermalShield_default_tmp" >
+ <posXYZ volume="ECT_EP_EndPlate_front" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; AECT_OSCCZd_ShellCCZdimension/2. + 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_EP_EndPlate_back" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; -AECT_OSCCZd_ShellCCZdimension/2. - 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; AECT_OSCCZd_ShellCCZdimension/2. + 2.25*AECT_EPthic_EndPlatethickness + GENV_Eps" rot=" 90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; -AECT_OSCCZd_ShellCCZdimension/2. - 2.25*AECT_EPthic_EndPlatethickness - GENV_Eps" rot=" -90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_TS_ShellCoilCover" X_Y_Z=" 0.; AECT_TRSShr_ShellRadPos + GENV_Eps; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_TS_JointPlate" X_Y_Z=" AECT_SCCXpo_ShellCCXpos; -AECT_SCCXwi_ShellCCfullXwidth*GENV_Si225 - AECT_SCCYwi_ShellCCfullYwidth*GENV_Co225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45 ; (AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength)/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_TS_AxialForceBox" X_Y_Z=" AECT_SAFBXp_ShellAFBXpos + GENV_Eps; -AECT_SAFBXw_ShellAFBfullXwidt*GENV_Si225 - AECT_SAFBYw_ShellAFBfullYwidt*GENV_Co225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45 ; -(AECT_OSCCZd_ShellCCZdimension-(AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength))/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Tube" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; AECT_OSCCZd_ShellCCZdimension/2.+AECT_STaflt_StayTubeAlignFlth/2. + GENV_Eps" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225;-AECT_OSCCZd_ShellCCZdimension/2.-AECT_STaflt_StayTubeAlignFlth/2. - GENV_Eps" rot=" 0.; 0.; 22.5" />
+</composition>
+
+<composition name="ECT_TS_ThermalShield_default" >
+ <posXYZ volume="ECT_TS_ThermalShield_default_tmp" rot=" 0.; 0.; -90." />
+</composition>
+
+<composition name="ECT_TS_ThermalShield_special" >
+ <posXYZ volume="ECT_EP_EndPlate_special" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; AECT_OSCCZd_ShellCCZdimension/2. + 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_EP_EndPlate_back" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 ; AECT_TRSEPr_EndplateRadPos; -AECT_OSCCZd_ShellCCZdimension/2. - 1.75*AECT_EPthic_EndPlatethickness" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; AECT_OSCCZd_ShellCCZdimension/2. + 2.25*AECT_EPthic_EndPlatethickness + GENV_Eps" rot=" 90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverTop" X_Y_Z=" 0. ; AECT_EPfuwi_EndPlatefullwidth/GENV_Si225 + AECT_EPthic_EndPlatethickness*1.5 - AECT_EPEhig_EndPlateExthight - (AECT_CCfRwi_CoilCoverfullRwid - AECT_CCRaof_CoilCoverRadoff)/2. - AECT_CCthic_CoilCoverthicknes/GENV_Si45 - AECT_CCthic_CoilCoverthicknes ; -AECT_OSCCZd_ShellCCZdimension/2. - 2.25*AECT_EPthic_EndPlatethickness - GENV_Eps" rot=" -90.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z=" (AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. + GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; AECT_OSCCZd_ShellCCZdimension/2.+2.25*AECT_EPthic_EndPlatethickness + GENV_Eps + (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot=" 0.; 0.; 90." />
+ <posXYZ volume="ECT_CC_CoilCoverSide" X_Y_Z="-(AECT_CCPwid_CoilCoverPhiwidth + AECT_CCthic_CoilCoverthicknes)/2. - GENV_Eps; AECT_CCSPYp_CoilCoverSideYpos; -AECT_OSCCZd_ShellCCZdimension/2.-2.25*AECT_EPthic_EndPlatethickness - GENV_Eps - (AECT_CCZwid_CoilCoverZwidth + AECT_CCthic_CoilCoverthicknes)/2." rot="180.; 0.; 90." />
+ <posXYZ volume="ECT_TS_ShellCoilCover" X_Y_Z=" 0.; AECT_TRSShr_ShellRadPos + GENV_Eps; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_TS_FrontSpecialBox" X_Y_Z=" AECT_SFSBXp_ShellFSBXpos; -AECT_SCCXwi_ShellCCfullXwidth*GENV_Si225 - AECT_SFSBYw_ShellFSBfullYwidt*GENV_Co225 + AECT_OSCCtc_ShellCCthickconn*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45; (AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength)/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_TS_AxialForceBox" X_Y_Z=" AECT_SAFBXp_ShellAFBXpos + GENV_Eps; -AECT_SAFBXw_ShellAFBfullXwidt*GENV_Si225 - AECT_SAFBYw_ShellAFBfullYwidt*GENV_Co225 + AECT_OSAFBt_ShellAFBthickness*GENV_Si225*GENV_Si225+ AECT_TRSShr_ShellRadPos+AECT_OSCCOv_ShellCCoverlap*GENV_Si45 ; -(AECT_OSCCZd_ShellCCZdimension-(AECT_OSCCZd_ShellCCZdimension-AECT_OSJPtc_ShellJPZlength))/2." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Tube" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225; AECT_OSCCZd_ShellCCZdimension/2.+AECT_STaflt_StayTubeAlignFlth/2. + GENV_Eps" rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="ECT_ST_StayTube_Flange" X_Y_Z=" -AECT_TRSEPr_EndplateRadPos*GENV_Ta225 - AECT_EPHoPo_EndPlateHolepos*GENV_Si225; AECT_TRSEPr_EndplateRadPos + AECT_EPHoPo_EndPlateHolepos*GENV_Co225;-AECT_OSCCZd_ShellCCZdimension/2.-AECT_STaflt_StayTubeAlignFlth/2. - GENV_Eps" rot=" 0.; 0.; 22.5" />
+</composition>
+
+<!-- main envelope surrounding coldmass and thermal shield - atlteyv_0012, atlteyv_0014, atlteyv_0015, atlteyv_0025, atlteyv_0027 and atlteyv_0076 -->
+<var name="AECT_EVEPRI_EVEndPlateRadiInne" value=" 670. "/>
+<var name="AECT_EVEPRT_EVEndPlateRadiTurr" value=" 930. "/>
+<var name="AECT_EVEPth_EVEndPlatethicknes" value=" 75. "/>
+<var name="AECT_EVEPid_EVEndPlateindist" value=" 4320. "/>
+<var name="AECT_EVEPod_EVEndPlateoutdist" value=" 5345. "/>
+<var name="AECT_EVEPli_EVEndPlatelowinter" value=" 1212. "/>
+<var name="AECT_EVEPui_EVEndPlateupinter" value=" 1238. "/>
+<var name="AECT_EVEPHd_EVEndPlateHolediam" value=" 160. "/>
+<var name="AECT_EVEPHr_EVEndPlateHolerad" value=" 3100. "/>
+<var name="AECT_EVEPHa_EVEndPlateHoleang" value=" 3.6 "/>
+<var name="AECT_EVEPSl_EVEndPlatespeclen" value=" 303. "/>
+<var name="AECT_EVEPSa_EVEndPlatespecang" value=" 127.5 "/>
+<var name="AECT_EVEPSr_EVEndPlatespecrad" value=" 3985. "/>
+
+<var name="AECT_EVAFod_EVAlignFlangeoutdi" value=" 450. "/>
+<var name="AECT_EVAFzw_EVAlignFlangezwidt" value=" 70. "/>
+<var name="AECT_EVATid_EVAlignTubeinndiam" value=" 262. "/>
+<var name="AECT_EVATww_EVAlignTuberwallwi" value=" 20. "/>
+
+<var name="AECT_EVOShZ_EVOutShellholeZwid" value=" 4800. "/>
+
+<var name="AECT_EVOSio_EVOutShellinneroff" value=" 15. "/>
+<var name="AECT_EVOSso_EVOutShellspecioff" value=" 50. "/>
+<var name="AECT_EVOSit_EVOutShellinnthick" value=" 40. "/>
+<var name="AECT_EVOSCZ_EVOutShellConnZwid" value=" 120. "/>
+
+<var name="AECT_EVOSCR_EVOutShellConnlowR" value=" 140. "/>
+<var name="AECT_EVOSCR_EVOutShellConnbigR" value=" 220. "/>
+<var name="AECT_EVOSCR_EVOutShellConnspeR" value=" 360. "/>
+
+<var name="AECT_EVSSAh_EVSideSupporthight" value=" 225. "/>
+<var name="AECT_EVSSAw_EVSideSupportwidth" value=" 250. "/>
+<var name="AECT_EVTSAh_EVTopSupporthight" value=" 150. "/>
+<var name="AECT_EVTSRa_EVTopSupportRadius" value=" 1230. "/>
+<var name="AECT_EVTSAl_EVTopSupportlength" value=" 2913. "/>
+<var name="AECT_EVTSCo_EVTopSupportCutoff" value=" 95. "/>
+<var name="AECT_EVTSCw_EVTopSupportCutwid" value=" 103. "/>
+
+<var name="AECT_EVSSan_EVSideSupportangle" value="atan((AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225 - AECT_EVEPid_EVEndPlateindist)/(AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPli_EVEndPlatelowinter/2. - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225 ))"/>
+<var name="AECT_EVEPSt_EVEndPlatespectana" value="tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)"/>
+
+<tubs name="ECT_EV_InnerTube" material="Aluminium" Rio_Z="0.; AECT_EVEPRI_EVEndPlateRadiInne; 2.*AECT_EVEPth_EVEndPlatethicknes" nbPhi="20" />
+<tubs name="ECT_EV_TurretTube" material="Aluminium" Rio_Z="0.; AECT_EVEPRT_EVEndPlateRadiTurr; 2.*AECT_EVEPth_EVEndPlatethicknes" nbPhi="20" />
+<tubs name="ECT_EV_AlignHole" material="Aluminium" Rio_Z="0.; AECT_EVEPHd_EVEndPlateHolediam/2.; 2.*AECT_EVEPth_EVEndPlatethicknes" nbPhi="20" />
+
+<gvxy name="ECT_EV_EndPlate_basic" material="Aluminium" dZ="AECT_EVEPth_EVEndPlatethicknes">
+ <gvxy_point X_Y=" 0. ; 0. "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+</gvxy>
+
+<var name="AECT_EVEPpx_EVEndPlateS_Point6_X" value="(AECT_EVEPid_EVEndPlateindist+(1./AECT_EVEPSt_EVEndPlatespectana)*(-AECT_EVEPli_EVEndPlatelowinter/2.)-(AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225)-GENV_Ta225*(-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225))/(1./AECT_EVEPSt_EVEndPlatespectana-GENV_Ta225)"/>
+<var name="AECT_EVEPpy_EVEndPlateS_Point6_Y" value="(-AECT_EVEPpx_EVEndPlateS_Point6_X+(-AECT_EVEPli_EVEndPlatelowinter/2.))/AECT_EVEPSt_EVEndPlatespectana+AECT_EVEPid_EVEndPlateindist"/>
+
+<gvxy name="ECT_EV_EndPlate_special" material="Aluminium" dZ="AECT_EVEPth_EVEndPlatethicknes">
+ <gvxy_point X_Y=" 0. ; 0. "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y=" AECT_EVEPpx_EVEndPlateS_Point6_X; AECT_EVEPpy_EVEndPlateS_Point6_Y"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 "/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+</gvxy>
+
+<subtraction name="ECT_EV_EndPlate_Inner_default" >
+ <posXYZ volume="ECT_EV_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_InnerTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Turret_default" >
+ <posXYZ volume="ECT_EV_EndPlate_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_TurretTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Inner_special_Sector6" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="ECT_EV_InnerTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Turret_special_Sector6" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="ECT_EV_TurretTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Inner_special_Sector7" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_InnerTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_EndPlate_Turret_special_Sector7" >
+ <posXYZ volume="ECT_EV_EndPlate_special" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_TurretTube" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_AlignHole" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<var name="AECT_EVOSfo_EVOutShellfulloff" value="AECT_EVOSio_EVOutShellinneroff + AECT_EVOSit_EVOutShellinnthick"/>
+<var name="AECT_EVOSpx_OutShell_Point2_X" value="((AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)/GENV_Co225 + tan(AECT_EVSSan_EVSideSupportangle)*(AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.))- (AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff))/(tan(AECT_EVSSan_EVSideSupportangle) + GENV_Ta225)"/>
+<var name="AECT_EVOSpx_OutShell_Point5_X" value="((AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)/GENV_Co225 + tan(AECT_EVSSan_EVSideSupportangle)*(AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.))- (AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/(tan(AECT_EVSSan_EVSideSupportangle) + GENV_Ta225)"/>
+
+<gvxysx name="ECT_EV_OutShell_default" material="Aluminium" dZ="AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point2_X; (AECT_EVOSpx_OutShell_Point2_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Co225"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point5_X; (AECT_EVOSpx_OutShell_Point5_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+</gvxysx>
+
+<var name="AECT_EVOSpx_OutShellS_Point7_X" value="-AECT_EVEPli_EVEndPlatelowinter/2. - AECT_EVOSio_EVOutShellinneroff*(1./cos((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180) - tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))"/>
+<var name="AECT_EVOSpy_OutShellS_Point7_Y" value="AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+<var name="AECT_EVOSpx_OutShellS_Point9_X" value="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 - (AECT_EVOSso_EVOutShellspecioff-AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Si225)"/>
+<var name="AECT_EVOSpy_OutShellS_Point9_Y" value="AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 - (AECT_EVOSso_EVOutShellspecioff+AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Co225)"/>
+
+<var name="AECT_EVOSpx_OutShellS_Point8_X" value="(AECT_EVOSpy_OutShellS_Point7_Y + (1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))*AECT_EVOSpx_OutShellS_Point7_X - GENV_Ta225*AECT_EVOSpx_OutShellS_Point9_X - AECT_EVOSpy_OutShellS_Point9_Y )/((1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)) - GENV_Ta225)"/>
+
+<var name="AECT_EVOSpx_OutShellS_Point12_X" value="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 - (AECT_EVOSso_EVOutShellspecioff-AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Si225)"/>
+<var name="AECT_EVOSpy_OutShellS_Point12_Y" value="AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 - (AECT_EVOSso_EVOutShellspecioff+AECT_EVOSio_EVOutShellinneroff)/(2.*GENV_Co225) - AECT_EVOSit_EVOutShellinnthick/GENV_Co225"/>
+<var name="AECT_EVOSpx_OutShellS_Point14_X" value="-AECT_EVEPli_EVEndPlatelowinter/2. - (AECT_EVOSio_EVOutShellinneroff + AECT_EVOSit_EVOutShellinnthick)*(1./cos((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180) - tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))"/>
+<var name="AECT_EVOSpy_OutShellS_Point14_Y" value="AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff - AECT_EVOSit_EVOutShellinnthick"/>
+
+<var name="AECT_EVOSpx_OutShellS_Point13_X" value="(AECT_EVOSpy_OutShellS_Point14_Y + (1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180))*AECT_EVOSpx_OutShellS_Point14_X - GENV_Ta225*AECT_EVOSpx_OutShellS_Point12_X - AECT_EVOSpy_OutShellS_Point12_Y )/((1./tan((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)) - GENV_Ta225)"/>
+
+<gvxy name="ECT_EV_OutShell_special" material="Aluminium" dZ="AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point2_X; (AECT_EVOSpx_OutShell_Point2_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSfo_EVOutShellfulloff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSfo_EVOutShellfulloff"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Co225"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShell_Point5_X; (AECT_EVOSpx_OutShell_Point5_X - (AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.)))*tan(AECT_EVSSan_EVSideSupportangle) + AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSio_EVOutShellinneroff*tan(AECT_EVSSan_EVSideSupportangle/2.); AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point7_X ; AECT_EVOSpy_OutShellS_Point7_Y"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point8_X ; AECT_EVOSpy_OutShellS_Point7_Y - tan((180.-AECT_EVEPSa_EVEndPlatespecang)*GENV_PiS180)*(AECT_EVOSpx_OutShellS_Point8_X - AECT_EVOSpx_OutShellS_Point7_X)"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point9_X ; AECT_EVOSpy_OutShellS_Point9_Y"/>
+ <gvxy_point X_Y=" -(AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff)*GENV_Co225"/>
+ <gvxy_point X_Y=" -(AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Si225; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSfo_EVOutShellfulloff)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point12_X ; AECT_EVOSpy_OutShellS_Point12_Y"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point13_X; AECT_EVOSpy_OutShellS_Point14_Y - tan((180-AECT_EVEPSa_EVEndPlatespecang)*GENV_PiS180)*(AECT_EVOSpx_OutShellS_Point13_X - AECT_EVOSpx_OutShellS_Point14_X)"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutShellS_Point14_X ; AECT_EVOSpy_OutShellS_Point14_Y"/>
+</gvxy>
+
+<!-- introduced becaused used for calculation-->
+<var name="AECT_EVOSpx_OutConnector_Point6_X" value="AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSCR_EVOutShellConnbigR*sin(AECT_EVSSan_EVSideSupportangle) - (AECT_EVOSCR_EVOutShellConnlowR - AECT_EVOSCR_EVOutShellConnbigR*cos(AECT_EVSSan_EVSideSupportangle))/tan(AECT_EVSSan_EVSideSupportangle)"/>
+<!-- derived variable for fifth point via the formula tan(suppangle)*(x-point6_x)+point6_y = -tan(22.5)*(x-point4_x)+point4_y for x coordinate, y simple trigonometry -->
+<var name="AECT_EVOSpx_OutConnector_Point5_X" value="((AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVOSCR_EVOutShellConnlowR*GENV_Si225)*GENV_Ta225+tan(AECT_EVSSan_EVSideSupportangle)*AECT_EVOSpx_OutConnector_Point6_X+(AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 - AECT_EVOSCR_EVOutShellConnlowR*GENV_Co225) - (AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR))/(GENV_Ta225+tan(AECT_EVSSan_EVSideSupportangle))"/>
+
+<gvxysx name="ECT_EV_OutShellConnector_default" material="Aluminium" dZ="AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Si225 ; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnector_Point5_X ; (AECT_EVOSpx_OutConnector_Point5_X-AECT_EVOSpx_OutConnector_Point6_X)*tan(AECT_EVSSan_EVSideSupportangle)+AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSCR_EVOutShellConnbigR*sin(AECT_EVSSan_EVSideSupportangle) - (AECT_EVOSCR_EVOutShellConnlowR - AECT_EVOSCR_EVOutShellConnbigR*cos(AECT_EVSSan_EVSideSupportangle))/tan(AECT_EVSSan_EVSideSupportangle); AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+</gvxysx>
+
+<var name="AECT_EVOSpx_OutConnectorS_Point14_X" value="-AECT_EVEPli_EVEndPlatelowinter/2. - AECT_EVOSCR_EVOutShellConnspeR*(1./cos((AECT_EVEPSa_EVEndPlatespecang-90)*GENV_PiS180)) + AECT_EVOSCR_EVOutShellConnlowR*AECT_EVEPSt_EVEndPlatespectana"/>
+<var name="AECT_EVOSpx_OutConnectorS_Point13_X" value="(AECT_EVEPid_EVEndPlateindist-AECT_EVOSCR_EVOutShellConnlowR+(1./AECT_EVEPSt_EVEndPlatespectana)*AECT_EVOSpx_OutConnectorS_Point14_X+GENV_Ta225*(AECT_EVEPod_EVEndPlateoutdist*GENV_Si225-AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225)-AECT_EVEPod_EVEndPlateoutdist*GENV_Co225-AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225+AECT_EVOSCR_EVOutShellConnlowR/GENV_Co225)/(1./AECT_EVEPSt_EVEndPlatespectana-GENV_Ta225)"/>
+
+<gvxy name="ECT_EV_OutShellConnector_special" material="Aluminium" dZ="AECT_EVOSCZ_EVOutShellConnZwid">
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2. + AECT_EVOSCR_EVOutShellConnbigR*sin(AECT_EVSSan_EVSideSupportangle) - (AECT_EVOSCR_EVOutShellConnlowR - AECT_EVOSCR_EVOutShellConnbigR*cos(AECT_EVSSan_EVSideSupportangle))/tan(AECT_EVSSan_EVSideSupportangle); AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnector_Point5_X ; (AECT_EVOSpx_OutConnector_Point5_X-AECT_EVOSpx_OutConnector_Point6_X)*tan(AECT_EVSSan_EVSideSupportangle)+AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+ <gvxy_point X_Y=" (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Si225 ; (AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSCR_EVOutShellConnlowR)*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225"/>
+ <gvxy_point X_Y=" AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 - AECT_EVEPui_EVEndPlateupinter/2. *GENV_Co225; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 + AECT_EVEPui_EVEndPlateupinter/2. *GENV_Si225"/>
+ <gvxy_point X_Y=" AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y="-AECT_EVEPli_EVEndPlatelowinter/2.; AECT_EVEPid_EVEndPlateindist"/>
+ <gvxy_point X_Y=" AECT_EVEPpx_EVEndPlateS_Point6_X; AECT_EVEPpy_EVEndPlateS_Point6_Y"/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 "/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225 "/>
+ <gvxy_point X_Y="(-AECT_EVEPod_EVEndPlateoutdist+AECT_EVOSCR_EVOutShellConnlowR)*GENV_Si225 ; (AECT_EVEPod_EVEndPlateoutdist-AECT_EVOSCR_EVOutShellConnlowR)*GENV_Co225 "/>
+ <gvxy_point X_Y="-AECT_EVEPod_EVEndPlateoutdist*GENV_Si225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Co225 ; AECT_EVEPod_EVEndPlateoutdist*GENV_Co225+AECT_EVEPSl_EVEndPlatespeclen*GENV_Si225 - AECT_EVOSCR_EVOutShellConnlowR/GENV_Co225 "/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnectorS_Point13_X; AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR - tan((180.-AECT_EVEPSa_EVEndPlatespecang)*GENV_PiS180)*(AECT_EVOSpx_OutConnectorS_Point13_X - AECT_EVOSpx_OutConnectorS_Point14_X)"/>
+ <gvxy_point X_Y=" AECT_EVOSpx_OutConnectorS_Point14_X; AECT_EVEPid_EVEndPlateindist - AECT_EVOSCR_EVOutShellConnlowR"/>
+</gvxy>
+
+<composition name="ECT_EV_Envelop_default" >
+ <posXYZ volume="ECT_EV_EndPlate_Inner_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVEPth_EVEndPlatethicknes/2. + GENV_Eps" rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_EndPlate_Turret_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVEPth_EVEndPlatethicknes/2. - GENV_Eps" rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_OutShell_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; 0." rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVOSCZ_EVOutShellConnZwid/2. + GENV_Eps/2." rot=" 0.; 0.; -67.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_default" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid/2. - GENV_Eps/2." rot=" 0.; 0.; -67.5"/>
+</composition>
+
+<composition name="ECT_EV_Envelop_special_Sector6" >
+ <posXYZ volume="ECT_EV_EndPlate_Inner_special_Sector6" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVEPth_EVEndPlatethicknes/2. + GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_EndPlate_Turret_special_Sector6" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVEPth_EVEndPlatethicknes/2. - GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShell_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; 0." rot=" 0.; 180.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVOSCZ_EVOutShellConnZwid/2. + GENV_Eps/2." rot=" 0.; 180.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid/2. - GENV_Eps/2." rot=" 0.; 180.; 22.5"/>
+</composition>
+
+<composition name="ECT_EV_Envelop_special_Sector7" >
+ <posXYZ volume="ECT_EV_EndPlate_Inner_special_Sector7" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVEPth_EVEndPlatethicknes/2. + GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_EndPlate_Turret_special_Sector7" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVEPth_EVEndPlatethicknes/2. - GENV_Eps" rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShell_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; 0." rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_EVOSCZ_EVOutShellConnZwid/2. + GENV_Eps/2." rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_EV_OutShellConnector_special" X_Y_Z=" GENV_Eps*GENV_Si225; GENV_Eps*GENV_Co225; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid/2. - GENV_Eps/2." rot=" 0.; 0.; 22.5"/>
+</composition>
+
+<box name="ECT_EV_SideAttachment" material="Aluminium" X_Y_Z="AECT_EVSSAh_EVSideSupporthight - AECT_EVOSit_EVOutShellinnthick - AECT_EVOSio_EVOutShellinneroff; AECT_EVSSAw_EVSideSupportwidth; AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid" />
+<box name="ECT_EV_Attachment_basic" material="Aluminium" X_Y_Z="AECT_EVTSAl_EVTopSupportlength; 2.*AECT_EVTSAh_EVTopSupporthight; AECT_EVTSAh_EVTopSupporthight" />
+<box name="ECT_EV_Attachment_CutBox" material="Aluminium" X_Y_Z="2.*AECT_EVTSCw_EVTopSupportCutwid; 4.*AECT_EVTSAh_EVTopSupporthight; AECT_EVTSAh_EVTopSupporthight" />
+<tubs name="ECT_EV_Attachment_CutTube" material="Aluminium" Rio_Z="0.; AECT_EVEPHd_EVEndPlateHolediam/2.; 2.*AECT_EVTSAh_EVTopSupporthight" nbPhi="20" />
+
+<tubs name="ECT_EV_AlignFlange_default_pre" material="Aluminium" Rio_Z="AECT_EVEPHd_EVEndPlateHolediam/2.; AECT_EVAFod_EVAlignFlangeoutdi/2.; AECT_EVAFzw_EVAlignFlangezwidt" nbPhi="20" />
+<tubs name="ECT_EV_AlignFlange_special_base" material="Aluminium" Rio_Z="0.; AECT_EVAFod_EVAlignFlangeoutdi/2.; AECT_EVTSAh_EVTopSupporthight" nbPhi="20" />
+<box name="ECT_EV_AlignFlange_special_cut" material="Aluminium" X_Y_Z="2.*AECT_EVAFod_EVAlignFlangeoutdi; 2.*AECT_EVTSAh_EVTopSupporthight; 2.*AECT_EVTSAh_EVTopSupporthight" />
+<tubs name="ECT_EV_AlignTube_default_pre" material="Aluminium" Rio_Z="AECT_EVATid_EVAlignTubeinndiam/2.; AECT_EVATid_EVAlignTubeinndiam/2.+AECT_EVATww_EVAlignTuberwallwi; AECT_EVOShZ_EVOutShellholeZwid-2.*AECT_EVAFzw_EVAlignFlangezwidt - GENV_Eps" nbPhi="20" />
+<tubs name="ECT_EV_AlignTube_special_pre" material="Aluminium" Rio_Z="AECT_EVATid_EVAlignTubeinndiam/2.; AECT_EVATid_EVAlignTubeinndiam/2.+AECT_EVATww_EVAlignTuberwallwi; AECT_EVOShZ_EVOutShellholeZwid-2.*AECT_EVTSAh_EVTopSupporthight - GENV_Eps" nbPhi="20" />
+
+<subtraction name="ECT_EV_FrontAttachment" >
+ <posXYZ volume="ECT_EV_Attachment_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_Attachment_CutBox" X_Y_Z=" AECT_EVTSAl_EVTopSupportlength/2.; 0.; -AECT_EVTSCo_EVTopSupportCutoff" />
+ <posXYZ volume="ECT_EV_Attachment_CutTube" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180) - AECT_EVTSRa_EVTopSupportRadius - AECT_EVTSAl_EVTopSupportlength/2.; -AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<subtraction name="ECT_EV_BackAttachment" >
+ <posXYZ volume="ECT_EV_Attachment_basic" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_Attachment_CutBox" X_Y_Z=" AECT_EVTSAl_EVTopSupportlength/2.; 0.; AECT_EVTSCo_EVTopSupportCutoff" />
+ <posXYZ volume="ECT_EV_Attachment_CutTube" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180) - AECT_EVTSRa_EVTopSupportRadius - AECT_EVTSAl_EVTopSupportlength/2.; -AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<composition name="ECT_EV_AlignTube_default">
+ <posRPhiZ volume="ECT_EV_AlignTube_default_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; 22.5 - AECT_EVEPHa_EVEndPlateHoleang; 0. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_default_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; 22.5 - AECT_EVEPHa_EVEndPlateHoleang; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVAFzw_EVAlignFlangezwidt/2. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_default_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; 22.5 - AECT_EVEPHa_EVEndPlateHoleang;-AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVAFzw_EVAlignFlangezwidt/2. " />
+</composition>
+
+<subtraction name="ECT_EV_AlignFlange_special_pre" >
+ <posXYZ volume="ECT_EV_AlignFlange_special_base" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180);-AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+ <posXYZ volume="ECT_EV_AlignFlange_special_cut" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180);-GENV_Eps; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="ECT_EV_Attachment_CutTube" X_Y_Z=" AECT_EVEPHr_EVEndPlateHolerad*cos(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180);-AECT_EVEPHr_EVEndPlateHolerad*sin(AECT_EVEPHa_EVEndPlateHoleang*GENV_PiS180); 0." />
+</subtraction>
+
+<composition name="ECT_EV_AlignTube_special">
+ <posRPhiZ volume="ECT_EV_AlignTube_special_pre" R_Phi_Z=" AECT_EVEPHr_EVEndPlateHolerad ; -AECT_EVEPHa_EVEndPlateHoleang; 0. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_special_pre" R_Phi_Z=" 0. ; 0.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVTSAh_EVTopSupporthight/2. " />
+ <posRPhiZ volume="ECT_EV_AlignFlange_special_pre" R_Phi_Z=" 0. ; 0.;-AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVTSAh_EVTopSupporthight/2. " />
+</composition>
+
+<!-- radiation shielding mounted inside main envelope towards IP - atljt___0023, atljt___0026, atljt___0029 and atljt___0031 -->
+<var name="AECT_JTVSth_JTVShieldthicknes" value=" 80. "/>
+<var name="AECT_JTVSlw_JTVShieldlowwidth" value=" 321. "/>
+<var name="AECT_JTVSuw_JTVShieldupwidth" value=" 1854. "/>
+<var name="AECT_JTVSth_JTVShieldtothight" value=" 1975. "/>
+<var name="AECT_JTVSmh_JTVShieldmidhight" value=" 1850. "/>
+<var name="AECT_JTVShd_JTVShieldholediam" value=" 650. "/>
+<var name="AECT_JTVSpx_JTVShieldholeposX" value=" 195. "/>
+<var name="AECT_JTVSpy_JTVShieldholeposY" value=" 1569. "/>
+<var name="AECT_JTVSpr_JTVShieldposR" value=" 1470. "/>
+<var name="AECT_JTVSpp_JTVShieldpophioff" value=" 435. "/>
+
+<var name="AECT_JTVSth_JTVSpecial2tothig" value=" 1713. "/>
+<var name="AECT_JTVSth_JTVSpecial1tothig" value=" 1690. "/>
+<var name="AECT_JTVSlh_JTVSpecial1lowhig" value=" 931. "/>
+<var name="AECT_JTVSmh_JTVSpecial1midhig" value=" 691. "/>
+<var name="AECT_JTVSlh_JTVSpecial1phioff" value=" 170. "/>
+
+<var name="AECT_JTVSpr_JTVSpecial2posR" value=" 1522. "/>
+<var name="AECT_JTVSpr_JTVSpecial1posR" value=" 1717. "/>
+
+<gvxy name="ECT_JTV_Shielding_basic" material="PolyBoronB4C" dZ="AECT_JTVSth_JTVShieldthicknes">
+ <gvxy_point X_Y=" AECT_JTVSlw_JTVShieldlowwidth/2.; 0."/>
+ <gvxy_point X_Y=" AECT_JTVSuw_JTVShieldupwidth/2.; AECT_JTVSmh_JTVShieldmidhight"/>
+ <gvxy_point X_Y=" 0.; AECT_JTVSth_JTVShieldtothight"/>
+ <gvxy_point X_Y="-AECT_JTVSuw_JTVShieldupwidth/2.; AECT_JTVSmh_JTVShieldmidhight"/>
+ <gvxy_point X_Y="-AECT_JTVSlw_JTVShieldlowwidth/2.; 0."/>
+</gvxy>
+
+<tubs name="ECT_JTV_AlignHole" material="PolyBoronB4C" Rio_Z="0.; AECT_JTVShd_JTVShieldholediam/2.; 2.*AECT_JTVSth_JTVShieldthicknes" nbPhi="20" />
+
+<subtraction name="ECT_JTV_Shielding_default_tmp" >
+ <posXYZ volume="ECT_JTV_Shielding_basic" X_Y_Z=" AECT_JTVSlw_JTVShieldlowwidth/2.*GENV_Co225+AECT_JTVSpp_JTVShieldpophioff; AECT_JTVSpr_JTVShieldposR-AECT_JTVSlw_JTVShieldlowwidth/2.*GENV_Si225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2." rot=" 0.; 0.; -22.5"/>
+ <posXYZ volume="ECT_JTV_AlignHole" X_Y_Z=" AECT_JTVSpp_JTVShieldpophioff+(AECT_JTVSlw_JTVShieldlowwidth/2.+AECT_JTVSpx_JTVShieldholeposX)*GENV_Co225+AECT_JTVSpy_JTVShieldholeposY*GENV_Si225; AECT_JTVSpr_JTVShieldposR-(AECT_JTVSlw_JTVShieldlowwidth/2.+AECT_JTVSpx_JTVShieldholeposX)*GENV_Si225+AECT_JTVSpy_JTVShieldholeposY*GENV_Co225; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2."/>
+</subtraction>
+
+<composition name="ECT_JTV_Shielding_default" >
+ <posXYZ volume="ECT_JTV_Shielding_default_tmp" rot=" 0.; 0.; -45."/>
+</composition>
+
+<gvxy name="ECT_JTV_Shielding_special1" material="PolyBoronB4C" dZ="AECT_JTVSth_JTVShieldthicknes">
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" 0.; AECT_JTVSlh_JTVSpecial1lowhig"/>
+ <gvxy_point X_Y=" AECT_JTVSlh_JTVSpecial1phioff; AECT_JTVSlh_JTVSpecial1lowhig"/>
+ <gvxy_point X_Y=" AECT_JTVSlh_JTVSpecial1phioff; AECT_JTVSth_JTVSpecial1tothig"/>
+ <gvxy_point X_Y=" (AECT_JTVSlh_JTVSpecial1lowhig+AECT_JTVSmh_JTVSpecial1midhig)*GENV_Ta225; AECT_JTVSlh_JTVSpecial1lowhig+AECT_JTVSmh_JTVSpecial1midhig"/>
+</gvxy>
+
+<gvxy name="ECT_JTV_Shielding_special2" material="PolyBoronB4C" dZ="AECT_JTVSth_JTVShieldthicknes">
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" 0.; AECT_JTVSth_JTVSpecial1tothig"/>
+ <gvxy_point X_Y=" -AECT_JTVSth_JTVSpecial2tothig*GENV_Si225; AECT_JTVSth_JTVSpecial2tothig*GENV_Co225"/>
+</gvxy>
+
+<composition name="ECT_JTV_Shielding_special" >
+ <posXYZ volume="ECT_JTV_Shielding_special1" X_Y_Z=" -AECT_JTVSpp_JTVShieldpophioff; AECT_JTVSpr_JTVSpecial1posR; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2." rot=" 0.; 0.; 22.5"/>
+ <posXYZ volume="ECT_JTV_Shielding_special2" X_Y_Z=" -AECT_JTVSpp_JTVShieldpophioff - (AECT_JTVSpr_JTVSpecial1posR-AECT_JTVSpr_JTVSpecial2posR)/GENV_Ta225; AECT_JTVSpr_JTVSpecial2posR; AECT_EVOShZ_EVOutShellholeZwid/2. - AECT_JTVSth_JTVShieldthicknes/2." rot=" 0.; 0.; 22.5" />
+</composition>
+
+<!-- central tube surrounding beampipe - atlteyv_0017 -->
+<var name="AECT_CTIcle_CentTubeIncomplen" value=" 4953. - 14. "/>
+<var name="AECT_CTIpo1_CentTubeInposoff1" value=" 70. "/>
+<var name="AECT_CTIpo2_CentTubeInposoff2" value=" 565. "/>
+<var name="AECT_CTIpo3_CentTubeInposoff3" value=" 500. "/>
+<var name="AECT_CTIdi1_CentTubeInDiainn1" value=" 1220. "/>
+<var name="AECT_CTIdi3_CentTubeInDiainn3" value=" 1650. "/>
+<var name="AECT_CTIdi4_CentTubeInDiainn4" value=" 1730. "/>
+<var name="AECT_CTIdo1_CentTubeInDiaout1" value=" 1339. "/>
+<var name="AECT_CTIdo2_CentTubeInDiaout2" value=" 1859. "/>
+<var name="AECT_CTIdo3_CentTubeInDiaout3" value=" 2400. "/>
+<var name="AECT_CTIno2_CentTubeInnegoff2" value=" 185. "/>
+<var name="AECT_CTIdit_CentTubeInDiaintu" value=" 1740. "/>
+<var name="AECT_CTIdot_CentTubeInDiaoutu" value=" 1780. "/>
+<var name="AECT_CTIpfo_CentTubeInpofuoff" value=" 750. "/>
+
+<pcon name="ECT_EV_CentralTube" material="ShieldSteel" nbPhi="20" >
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo1_CentTubeInDiaout1/2.; AECT_CTIcle_CentTubeIncomplen/2." />
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo1_CentTubeInDiaout1/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi1_CentTubeInDiainn1/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo2_CentTubeInposoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi3_CentTubeInDiainn3/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo2_CentTubeInposoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi3_CentTubeInDiainn3/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo3_CentTubeInposoff3" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo3_CentTubeInposoff3" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2.-AECT_CTIpfo_CentTubeInpofuoff + AECT_CTIpo3_CentTubeInposoff3" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; AECT_CTIcle_CentTubeIncomplen/2.-AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdit_CentTubeInDiaintu/2.; AECT_CTIdot_CentTubeInDiaoutu/2.; AECT_CTIcle_CentTubeIncomplen/2.-AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdit_CentTubeInDiaintu/2.; AECT_CTIdot_CentTubeInDiaoutu/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpfo_CentTubeInpofuoff" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo3_CentTubeInDiaout3/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo3_CentTubeInDiaout3/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIpo1_CentTubeInposoff1" />
+ <polyplane Rio_Z=" AECT_CTIdi4_CentTubeInDiainn4/2.; AECT_CTIdo2_CentTubeInDiaout2/2.; -AECT_CTIcle_CentTubeIncomplen/2." />
+</pcon>
+
+<!-- JTV surrounding central tube IP - atljt___0037-vAD -->
+<var name="AECT_JTVFRi_FrontRingInnerRad" value=" 1305. "/>
+<var name="AECT_JTVFDo_FrontRingOuterDia" value=" 2840. "/>
+<var name="AECT_JTVFMr_FrontRingMostInRa" value=" 930. "/>
+<var name="AECT_JTVFZw_FrontRingZwidth" value=" 160. "/>
+<var name="AECT_JTVFZp_FrontRingZposition" value=" 220. "/> <!-- relative pos - from drilling hole position + combination with atlteyv_0076 -->
+<!-- JTV surrounding central tube non IP - atljt___0039-vAC -->
+<var name="AECT_JTVBRi_BackRingInnerRad" value=" 1245. "/>
+<var name="AECT_JTVBDm_BackRingMediumDia" value=" 2400. "/>
+<var name="AECT_JTVBDo_BackRingOuterDia" value=" 2690. "/>
+<var name="AECT_JTVBMr_BackRingMostInRa" value=" 965. "/>
+<var name="AECT_JTVBZw_BackRingZwidth" value=" 140. "/>
+<var name="AECT_JTVBZo_BackRingZoffset" value=" 80. "/>
+
+<pcon name="ECT_JTV_FrontRing" material="PolyBoronB4C" nbPhi="20" >
+ <polyplane Rio_Z=" AECT_JTVFMr_FrontRingMostInRa; AECT_JTVFRi_FrontRingInnerRad; AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1 - AECT_JTVFZp_FrontRingZposition" />
+ <polyplane Rio_Z=" AECT_JTVFMr_FrontRingMostInRa; AECT_JTVFDo_FrontRingOuterDia/2.; AECT_JTVFDo_FrontRingOuterDia/2. - AECT_JTVFRi_FrontRingInnerRad + AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1 - AECT_JTVFZp_FrontRingZposition" />
+ <polyplane Rio_Z=" AECT_JTVFMr_FrontRingMostInRa; AECT_JTVFDo_FrontRingOuterDia/2.; AECT_JTVFZw_FrontRingZwidth + AECT_CTIcle_CentTubeIncomplen/2. - AECT_CTIpo1_CentTubeInposoff1 - AECT_JTVFZp_FrontRingZposition" />
+</pcon>
+
+<pcon name="ECT_JTV_BackRing" material="PolyBoronB4C" nbPhi="20" >
+ <polyplane Rio_Z=" AECT_JTVBDm_BackRingMediumDia/2. + GENV_Eps; AECT_JTVBDo_BackRingOuterDia/2.; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 - AECT_JTVBZw_BackRingZwidth + AECT_JTVBZo_BackRingZoffset" />
+ <polyplane Rio_Z=" AECT_JTVBDm_BackRingMediumDia/2. + GENV_Eps; AECT_JTVBDo_BackRingOuterDia/2.; - AECT_JTVBDo_BackRingOuterDia/2. + AECT_JTVBRi_BackRingInnerRad -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 + AECT_JTVBZo_BackRingZoffset" />
+ <polyplane Rio_Z=" AECT_JTVBDm_BackRingMediumDia/2. + GENV_Eps; AECT_JTVBRi_BackRingInnerRad + AECT_JTVBZo_BackRingZoffset; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 " />
+ <polyplane Rio_Z=" AECT_JTVBMr_BackRingMostInRa; AECT_JTVBRi_BackRingInnerRad + AECT_JTVBZo_BackRingZoffset; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 " />
+ <polyplane Rio_Z=" AECT_JTVBMr_BackRingMostInRa; AECT_JTVBRi_BackRingInnerRad; -AECT_CTIcle_CentTubeIncomplen/2.+AECT_CTIno2_CentTubeInnegoff2 + AECT_JTVBZo_BackRingZoffset " />
+</pcon>
+
+<!-- yoke positioned at the ends of central tube - atlteyv_0076, atlteys_0007 and atlteys_0013 -->
+<var name="AECT_CTYpoZ_CentTubeYokeposZ" value=" 1932 "/>
+<var name="AECT_CTYthi_CentTubeYokethick" value=" 60. "/>
+<var name="AECT_CTYwid_CentTubeYokewidth" value=" 125. "/>
+<var name="AECT_CTYlen_CentTubeYokelengt" value=" 1500. "/>
+<var name="AECT_CTYidi_CentTubeYokeindia" value=" 130. "/>
+<var name="AECT_CTYodi_CentTubeYokeoudia" value=" 300. "/>
+<var name="AECT_CTYpdi_CentTubeYokeposdi" value=" 1860. "/>
+<var name="AECT_CTYst1_CentTubeYokesupt1" value=" 30. "/>
+<var name="AECT_CTYst2_CentTubeYokesupt2" value=" 40. "/>
+<var name="AECT_CTYSan_CentTubeYokesupa" value="atan(AECT_CTYodi_CentTubeYokeoudia/AECT_CTYpdi_CentTubeYokeposdi)/GENV_PiS180"/>
+
+<tubs name="ECT_EV_Yoke_Connector" material="Iron" Rio_Z="0.; AECT_CTYodi_CentTubeYokeoudia/2.; AECT_CTYthi_CentTubeYokethick + AECT_CTYst1_CentTubeYokesupt1 + AECT_CTYst2_CentTubeYokesupt2" nbPhi="20" />
+<tubs name="ECT_EV_Yoke_End" material="Iron" Rio_Z="AECT_CTYidi_CentTubeYokeindia/2.; AECT_CTYodi_CentTubeYokeoudia/2.; AECT_CTYthi_CentTubeYokethick + GENV_Eps" nbPhi="20" />
+<box name="ECT_EV_Yoke_Box" material="Iron" X_Y_Z="AECT_CTYlen_CentTubeYokelengt+AECT_CTYodi_CentTubeYokeoudia/2.; AECT_CTYthi_CentTubeYokethick; AECT_CTYwid_CentTubeYokewidth" />
+
+<union name="ECT_EV_Yoke_basic">
+ <posXYZ volume="ECT_EV_Yoke_Box" X_Y_Z=" AECT_CTYthi_CentTubeYokethick/2.+AECT_CTYst2_CentTubeYokesupt2; -(AECT_CTYlen_CentTubeYokelengt+AECT_CTYodi_CentTubeYokeoudia)/2.; 0." rot=" 0.; 0.; 90. "/>
+ <posXYZ volume="ECT_EV_Yoke_Connector" X_Y_Z=" (AECT_CTYthi_CentTubeYokethick + AECT_CTYst1_CentTubeYokesupt1 + AECT_CTYst2_CentTubeYokesupt2)/2.; 0.; 0." rot=" 0.; 90.; 0. " />
+ <posXYZ volume="ECT_EV_Yoke_End" X_Y_Z=" AECT_CTYthi_CentTubeYokethick/2.+AECT_CTYst2_CentTubeYokesupt2; -(AECT_CTYlen_CentTubeYokelengt+AECT_CTYodi_CentTubeYokeoudia); 0." rot=" 0.; 90.; 0. "/>
+</union>
+
+<tubs name="ECT_EV_Yoke_InnerSupport" material="Iron" Rio_Z="AECT_CTYpdi_CentTubeYokeposdi/2.; AECT_CTYpdi_CentTubeYokeposdi/2.+AECT_CTYst2_CentTubeYokesupt2; AECT_CTYodi_CentTubeYokeoudia + AECT_CTYst2_CentTubeYokesupt2" profile="22.5+AECT_CTYSan_CentTubeYokesupa;135.-2.*AECT_CTYSan_CentTubeYokesupa" nbPhi="20" />
+<tubs name="ECT_EV_Yoke_OuterSupport" material="Iron" Rio_Z="AECT_CTYpdi_CentTubeYokeposdi/2. + AECT_CTYst2_CentTubeYokesupt2 + AECT_CTYthi_CentTubeYokethick ; AECT_CTYpdi_CentTubeYokeposdi/2. + AECT_CTYst2_CentTubeYokesupt2 + AECT_CTYthi_CentTubeYokethick + AECT_CTYst1_CentTubeYokesupt1; AECT_CTYodi_CentTubeYokeoudia/2." profile="22.5+AECT_CTYSan_CentTubeYokesupa;135.-2.*AECT_CTYSan_CentTubeYokesupa" nbPhi="20" />
+
+<composition name="ECT_EV_Yoke">
+ <posRPhiZ volume="ECT_EV_Yoke_InnerSupport" R_Phi_Z=" GENV_Eps/2. ; 0.; 0. "/>
+ <posRPhiZ volume="ECT_EV_Yoke_OuterSupport" R_Phi_Z=" GENV_Eps/2 ; 0.; 0. "/>
+ <posRPhiZ volume="ECT_EV_Yoke_basic" R_Phi_Z=" AECT_CTYpdi_CentTubeYokeposdi/2.+GENV_Eps/2 ; 22.5; 0. " />
+ <posRPhiZ volume="ECT_EV_Yoke_basic" R_Phi_Z="-AECT_CTYpdi_CentTubeYokeposdi/2.-GENV_Eps/2 ; -22.5; 0. " rot=" 0.; 180.; 0. "/>
+</composition>
+
+<!-- thermal shielding surrounding central tube - atlteyr_0349 and atlteyr_0310 -->
+<var name="AECT_CTTSid_CentTubeTSInnDia" value=" 1965. "/>
+<var name="AECT_CTTSil_CentTubeTSinnlen" value=" 3400. "/>
+<var name="AECT_CTTSFi_CentTubeTSFIDia1" value=" 2100. "/>
+<var name="AECT_CTTSFi_CentTubeTSFIDia2" value=" 2610. "/>
+<var name="AECT_CTTSFl_CentTubeTSFlength" value=" 260. "/>
+<var name="AECT_CTTSth_CentTubeTSthickne" value=" 10. "/>
+
+<tubs name="ECT_TS_CentralTube_inner" material="Aluminium" Rio_Z="AECT_CTTSid_CentTubeTSInnDia/2.; AECT_CTTSid_CentTubeTSInnDia/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen " nbPhi="20" />
+<tubs name="ECT_TS_CentralTube_middle" material="Aluminium" Rio_Z="AECT_CTTSid_CentTubeTSInnDia/2.; AECT_CTTSFi_CentTubeTSFIDia1/2. + AECT_CTTSth_CentTubeTSthickne; 3.*AECT_CTTSth_CentTubeTSthickne" nbPhi="20" />
+<pcon name="ECT_TS_CentralTube_top" material="Aluminium" nbPhi="20" profile=" -7.; 194.">
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia2/2.; AECT_CTTSFi_CentTubeTSFIDia2/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne + AECT_CTTSFl_CentTubeTSFlength" />
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia1/2.; AECT_CTTSFi_CentTubeTSFIDia1/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne " />
+</pcon>
+<pcon name="ECT_TS_CentralTube_low" material="Aluminium" nbPhi="20" profile=" 200.; 140.">
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia2/2.; AECT_CTTSFi_CentTubeTSFIDia2/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne + AECT_CTTSFl_CentTubeTSFlength" />
+ <polyplane Rio_Z=" AECT_CTTSFi_CentTubeTSFIDia1/2.; AECT_CTTSFi_CentTubeTSFIDia1/2. + AECT_CTTSth_CentTubeTSthickne; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne " />
+</pcon>
+
+<composition name="ECT_TS_CentralTube">
+ <posXYZ volume="ECT_TS_CentralTube_inner"/>
+ <posXYZ volume="ECT_TS_CentralTube_middle" X_Y_Z="0. ; 0.; AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne/2. + GENV_Eps/2."/>
+ <posXYZ volume="ECT_TS_CentralTube_middle" X_Y_Z="0. ; 0.;-(AECT_CTTSil_CentTubeTSinnlen/2. + 3.*AECT_CTTSth_CentTubeTSthickne/2. + GENV_Eps/2.)"/>
+ <posXYZ volume="ECT_TS_CentralTube_top" X_Y_Z=" 0. ; 0.; GENV_Eps"/>
+ <posXYZ volume="ECT_TS_CentralTube_top" X_Y_Z=" 0. ; 0.;-GENV_Eps" rot=" 0.; 180.; 0. "/>
+ <posXYZ volume="ECT_TS_CentralTube_low" X_Y_Z=" 0. ; 0.; GENV_Eps"/>
+ <posXYZ volume="ECT_TS_CentralTube_low" X_Y_Z=" 0. ; 0.;-GENV_Eps" rot=" 0.; 180.; 0. "/>
+</composition>
+
+<!-- tie rod and corresponding mounting points attached to main envelope - atlteyv_0026, atlteyv_0027, atlte___0009, atlteys_0001 and derived calculations-->
+<var name="AECT_CryStOL0_CryStoutLength0" value=" 545." />
+<var name="AECT_CryStOL1_CryStoutLength1" value=" 400." />
+<var name="AECT_CryStOW0_CryStoutpWidth0" value=" 1080." />
+<var name="AECT_CryStOW1_CryStoutpWidth1" value=" 770." />
+<var name="AECT_CryStOH1_CryStoutRadius" value=" 4530." />
+<var name="AECT_CryStOPZ_CryStoutPosiZ" value=" 50." />
+<var name="AECT_CryStIwi_CryStinnZwidth" value=" 400." />
+<var name="AECT_CryStIhi_CryStinnhight" value=" 250." />
+<var name="AECT_CryStIos_CryStinnoffset" value=" 50." />
+<var name="AECT_CryoStTh_CryoStopThickness" value=" 40." />
+<var name="AECT_TieRodZl_TieRodZlength" value=" 3660." />
+<var name="AECT_TieRodDi_TieRodDiameter" value=" 56." />
+<var name="AECT_TieRodPo_TieRodPhioffset" value=" 71." />
+<var name="AECT_TieRodZo_TieRodZoffset" value=" 135." />
+<var name="AECT_TieRodRo_TieRodRoffset" value=" 75." />
+
+<box name="ECT_CryoStop1" material="Aluminium" X_Y_Z=" AECT_CryStOW0_CryStoutpWidth0; AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff); AECT_CryStOL0_CryStoutLength0" />
+<box name="ECT_CryoStop2" material="Aluminium" X_Y_Z=" AECT_CryStOW0_CryStoutpWidth0-2.*AECT_CryoStTh_CryoStopThickness ; AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff) ; AECT_CryStOL0_CryStoutLength0+GENV_Eps " />
+<trd name="ECT_CryoStop3" material="Aluminium"
+ Xmp_Ymp_Z=" AECT_CryStOW0_CryStoutpWidth0+GENV_Eps ; AECT_CryStOW0_CryStoutpWidth0+GENV_Eps ;
+ 2.*AECT_CryoStTh_CryoStopThickness ; 2.*(AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff)); AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff) - AECT_CryoStTh_CryoStopThickness" />
+<box name="ECT_CryoStop4" material="Aluminium" X_Y_Z=" AECT_CryStOW1_CryStoutpWidth1; AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff)+GENV_Eps ; AECT_CryStOL0_CryStoutLength0+GENV_Eps " />
+<subtraction name="ECT_EV_CryoStop_outside_basic" >
+ <posXYZ volume="ECT_CryoStop1" />
+ <posXYZ volume="ECT_CryoStop2" X_Y_Z=" 0. ; -AECT_CryoStTh_CryoStopThickness ; 0. " />
+ <posXYZ volume="ECT_CryoStop3" X_Y_Z=" 0. ; (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2. ; -AECT_CryStOL0_CryStoutLength0/2. + AECT_CryStOL1_CryStoutLength1 +(AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff) - AECT_CryoStTh_CryoStopThickness)/2. " />
+ <posXYZ volume="ECT_CryoStop4" />
+</subtraction>
+
+<composition name="ECT_EV_CryoStop_outside_tmp" >
+ <posXYZ volume="ECT_EV_CryoStop_outside_basic" rot=" 0.; 0.; -90. "/>
+</composition>
+
+<var name="AFT_ECTBrkt_Thickness" value=" 20. " />
+<var name="AFT_ECTBrkt_LowPlateThickness" value=" 30. " />
+<var name="AFT_ECTBrkt_CtrSpacerGap" value=" 360. " />
+<var name="AFT_ECTBrkt_MidSpacerGap" value=" 720. " />
+<var name="AFT_ECTBrkt_SmallXWidth" value="1080. " />
+<var name="AFT_ECTBrkt_TotalXWidth" value="1120. " />
+<var name="AFT_ECTBrkt_TotalYWidth" value=" 230. " />
+
+<var name="AFT_ECTBrkt_TopPlate_ZWidth" value=" 115. " />
+<var name="AFT_ECTBrkt_DownPlate_ZWidth" value=" 200. " />
+<var name="AFT_ECTBrkt_SidePlate_ZWidth" value=" 510. " />
+<var name="AFT_ECTBrkt_ZOffset" value=" 165. " />
+<var name="AFT_ECTBrkt_PlateZOffset" value=" 25. " />
+<var name="AFT_ECTBrkt_PlateSmallYOffset" value=" 55. " />
+<var name="AFT_ECTBrkt_PlateBigYOffset" value=" 119.5" />
+<var name="AFT_ECTBrkt_SpacerYOffset" value=" 110. " />
+
+<box name="AFT_ECTBrkt_CtrSpacer" material="Iron" X_Y_Z=" AFT_ECTBrkt_CtrSpacerGap; AFT_ECTBrkt_Thickness; AFT_ECTBrkt_TopPlate_ZWidth" />
+<box name="AFT_ECTBrkt_MidSpacer" material="Iron" X_Y_Z=" (AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/2.-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_Thickness; AFT_ECTBrkt_TopPlate_ZWidth" />
+<box name="AFT_ECTBrkt_LowCtrPlate" material="Iron" X_Y_Z=" AFT_ECTBrkt_SmallXWidth; AFT_ECTBrkt_Thickness; AFT_ECTBrkt_DownPlate_ZWidth-AFT_ECTBrkt_Thickness" />
+<box name="AFT_ECTBrkt_LowSidePlate" material="Iron" X_Y_Z=" (AFT_ECTBrkt_TotalXWidth-AFT_ECTBrkt_MidSpacerGap)/2.+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth" />
+<box name="AFT_ECTBrkt_CrossPlate" material="Iron" X_Y_Z=" AFT_ECTBrkt_SmallXWidth; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_Thickness" />
+
+<gvxy name="AFT_ECTBrkt_FrontPlate" material="Iron" dZ="AFT_ECTBrkt_Thickness" >
+ <gvxy_point X_Y=" 0.; 0. " />
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+ <gvxy_point X_Y=" AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+ <gvxy_point X_Y=" AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_PlateZOffset" />
+ <gvxy_point X_Y=" AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_PlateZOffset; 0. " />
+</gvxy>
+
+<gvxy name="AFT_ECTBrkt_SidePlate" material="Iron" dZ="AFT_ECTBrkt_Thickness" >
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-AFT_ECTBrkt_Thickness; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset; AFT_ECTBrkt_PlateSmallYOffset " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-AFT_ECTBrkt_Thickness" />
+</gvxy>
+
+<gvxy name="AFT_ECTBrkt_MiddlePlate" material="Iron" dZ="AFT_ECTBrkt_Thickness" >
+ <gvxy_point X_Y=" 0.; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-2.*AFT_ECTBrkt_Thickness; 0. " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_DownPlate_ZWidth-2.*AFT_ECTBrkt_Thickness; AFT_ECTBrkt_PlateBigYOffset-AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" AFT_ECTBrkt_PlateZOffset; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-2.*AFT_ECTBrkt_Thickness " />
+ <gvxy_point X_Y=" 0.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness-2.*AFT_ECTBrkt_Thickness " />
+</gvxy>
+
+<box name="AFT_ECTBrkt_GapCloser" material="Iron" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.; AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.; 122." /> <!-- z dimension adjusted from construction -->
+<box name="AFT_ECTBrkt_GapCloserRub" material="Carbon" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/1.5; (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2.; 70." />
+
+<composition name="AFT_ECTBrkt_tmp" >
+ <posXYZ volume="AFT_ECTBrkt_LowSidePlate" X_Y_Z=" ((AFT_ECTBrkt_TotalXWidth-AFT_ECTBrkt_MidSpacerGap)/2.+AFT_ECTBrkt_Thickness)/2.+AFT_ECTBrkt_MidSpacerGap/2.-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness/2.; AFT_ECTBrkt_SidePlate_ZWidth/2. " />
+ <posXYZ volume="AFT_ECTBrkt_LowSidePlate" X_Y_Z="-((AFT_ECTBrkt_TotalXWidth-AFT_ECTBrkt_MidSpacerGap)/2.+AFT_ECTBrkt_Thickness)/2.-AFT_ECTBrkt_MidSpacerGap/2.+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness/2.; AFT_ECTBrkt_SidePlate_ZWidth/2. " />
+ <posXYZ volume="AFT_ECTBrkt_LowCtrPlate" X_Y_Z=" 0.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-(AFT_ECTBrkt_DownPlate_ZWidth+AFT_ECTBrkt_Thickness)/2." />
+ <posXYZ volume="AFT_ECTBrkt_CrossPlate" X_Y_Z=" 0.; AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness)/2.; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness/2. " />
+ <posXYZ volume="AFT_ECTBrkt_FrontPlate" X_Y_Z=" AFT_ECTBrkt_TotalXWidth/2.-AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset " rot="0.; -90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_FrontPlate" X_Y_Z="-AFT_ECTBrkt_TotalXWidth/2.+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset " rot="0.; -90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z=" AFT_ECTBrkt_SmallXWidth/2.-AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0." />
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z=" AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_MidSpacerGap/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z="-AFT_ECTBrkt_SmallXWidth/2.+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_SidePlate" X_Y_Z="-AFT_ECTBrkt_Thickness/2.-AFT_ECTBrkt_MidSpacerGap/2.; AFT_ECTBrkt_LowPlateThickness; AFT_ECTBrkt_SidePlate_ZWidth-2.*AFT_ECTBrkt_Thickness-AFT_ECTBrkt_ZOffset+AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_MiddlePlate" X_Y_Z=" AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_MiddlePlate" X_Y_Z="-AFT_ECTBrkt_CtrSpacerGap/2.-AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness " rot="0.; 90.; 0."/>
+ <posXYZ volume="AFT_ECTBrkt_CtrSpacer" X_Y_Z=" 0.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_SpacerYOffset; -AFT_ECTBrkt_TopPlate_ZWidth/2.+AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness" />
+ <posXYZ volume="AFT_ECTBrkt_MidSpacer" X_Y_Z=" (AFT_ECTBrkt_MidSpacerGap+AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_SpacerYOffset; -AFT_ECTBrkt_TopPlate_ZWidth/2.+AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness" />
+ <posXYZ volume="AFT_ECTBrkt_MidSpacer" X_Y_Z="-(AFT_ECTBrkt_MidSpacerGap+AFT_ECTBrkt_CtrSpacerGap)/4.-AFT_ECTBrkt_Thickness/2.; AFT_ECTBrkt_LowPlateThickness+AFT_ECTBrkt_Thickness/2.+AFT_ECTBrkt_SpacerYOffset; -AFT_ECTBrkt_TopPlate_ZWidth/2.+AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset-AFT_ECTBrkt_Thickness" />
+ <posXYZ volume="AFT_ECTBrkt_GapCloser" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.; (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+123./2."/>
+ <posXYZ volume="AFT_ECTBrkt_GapCloser" X_Y_Z="-((AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.); (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+123./2."/>
+ <posXYZ volume="AFT_ECTBrkt_GapCloserRub" X_Y_Z="(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.; (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+124.+70./2."/>
+ <posXYZ volume="AFT_ECTBrkt_GapCloserRub" X_Y_Z="-((AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap)/4.+AFT_ECTBrkt_CtrSpacerGap/2.+AFT_ECTBrkt_Thickness/2.); (AFT_ECTBrkt_TotalYWidth-AFT_ECTBrkt_LowPlateThickness+(AFT_ECTBrkt_MidSpacerGap-AFT_ECTBrkt_CtrSpacerGap-2.*AFT_ECTBrkt_Thickness)/2.)/2. + AFT_ECTBrkt_LowPlateThickness+GENV_Eps; AFT_ECTBrkt_SidePlate_ZWidth-AFT_ECTBrkt_ZOffset+124.+70./2."/>
+</composition>
+
+<composition name="AFT_ECTBrkt" >
+ <posXYZ volume="AFT_ECTBrkt_tmp" X_Y_Z=" (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2.; 0.; -AECT_CryStOL0_CryStoutLength0/2." rot=" 0.; 0.; -90. "/>
+</composition>
+
+<composition name="ECT_EV_CryoStop_outside" >
+ <posRPhiZ volume="ECT_EV_CryoStop_outside_tmp" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff + (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2.; 22.5; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid +AECT_CryStOL0_CryStoutLength0/2.+AECT_CryStOPZ_CryStoutPosiZ "/>
+ <posRPhiZ volume="AFT_ECTBrkt" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff + (AECT_CryStOH1_CryStoutRadius-(AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff))/2.; 22.5; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid +AECT_CryStOL0_CryStoutLength0/2.+AECT_CryStOPZ_CryStoutPosiZ " />
+</composition>
+
+<gvxy name="ECT_CryoStop_inside_basic" material="Aluminium" dZ="AECT_CryoStTh_CryoStopThickness">
+ <gvxy_point X_Y=" -AECT_CryStIos_CryStinnoffset; 0."/>
+ <gvxy_point X_Y=" -AECT_CryStIwi_CryStinnZwidth; 0."/>
+ <gvxy_point X_Y=" -AECT_CryStIwi_CryStinnZwidth; -AECT_CryStIos_CryStinnoffset"/>
+ <gvxy_point X_Y=" -(AECT_CryStIhi_CryStinnhight-AECT_CryStIos_CryStinnoffset)*GENV_Si45; -AECT_CryStIhi_CryStinnhight"/>
+ <gvxy_point X_Y=" 0.; -AECT_CryStIhi_CryStinnhight"/>
+ <gvxy_point X_Y=" 0.; -AECT_CryStIos_CryStinnoffset"/>
+</gvxy>
+
+<tubs name="ECT_TieRod" material="Iron" Rio_Z="0.; AECT_TieRodDi_TieRodDiameter/2.; AECT_TieRodZl_TieRodZlength" nbPhi="20" />
+
+<composition name="ECT_EV_CryoStop_inside_basic">
+ <posXYZ volume="ECT_CryoStop_inside_basic" X_Y_Z=" (AECT_CryStOW0_CryStoutpWidth0 - AECT_CryoStTh_CryoStopThickness)/2. ; 0.; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="ECT_CryoStop_inside_basic" X_Y_Z="-(AECT_CryStOW0_CryStoutpWidth0 - AECT_CryoStTh_CryoStopThickness)/2. ; 0.; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="ECT_TieRod" X_Y_Z=" (AECT_CryStOW0_CryStoutpWidth0)/2. - AECT_CryoStTh_CryoStopThickness - AECT_TieRodPo_TieRodPhioffset; -AECT_CryStIhi_CryStinnhight + AECT_TieRodRo_TieRodRoffset; AECT_TieRodZo_TieRodZoffset + AECT_TieRodZl_TieRodZlength/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="ECT_TieRod" X_Y_Z="-(AECT_CryStOW0_CryStoutpWidth0)/2. + AECT_CryoStTh_CryoStopThickness + AECT_TieRodPo_TieRodPhioffset; -AECT_CryStIhi_CryStinnhight + AECT_TieRodRo_TieRodRoffset; AECT_TieRodZo_TieRodZoffset + AECT_TieRodZl_TieRodZlength/2." rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="ECT_EV_CryoStop_inside_tmp" >
+ <posXYZ volume="ECT_EV_CryoStop_inside_basic" rot=" 0.; 0.; -90. "/>
+</composition>
+
+<composition name="ECT_EV_CryoStop_inside" >
+ <posRPhiZ volume="ECT_EV_CryoStop_inside_tmp" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - AECT_EVOSio_EVOutShellinneroff - AECT_EVOSit_EVOutShellinnthick; 22.5; -AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_EVOSCZ_EVOutShellConnZwid "/>
+</composition>
+
+<!-- Atlas End-Cap toroid Service Turret - whole construction approximated -->
+<var name="AECT_SrvTu1Dz_ServTur1Dz" value=" 830." />
+<var name="AECT_SrvTu1He_ServTur1Height" value=" 2350." /> <!-- original value 2000, modified due to overlap with new ECT-ServiceTower -->
+<var name="AECT_SrvTu1oW_ServTur1OutWidth" value=" 1100." />
+<var name="AECT_SrvTu1iW_ServTur1InnWidth" value=" 1000." />
+<var name="AECT_SrvTu1Ed_ServTur1Edge" value=" 120." />
+<var name="AECT_SrvTu2Dz_ServTur2Dz" value=" 900." />
+<var name="AECT_SrvTu2He_ServTur2Height" value=" 1000." />
+<var name="AECT_SrvTu2oR_ServTur2OutRad" value=" 150." />
+<var name="AECT_SrvTu2iR_ServTur2InnRad" value=" 140." />
+<var name="AECT_SrvTu3Dz_ServTur3Dz" value=" 260." />
+<var name="AECT_SrvTu3He_ServTur3Height" value=" 3650." /> <!-- original value 4000, modified due to overlap with new ECT-ServiceTower -->
+<var name="AECT_ServTuZoff_ServTurZoffset" value=" 834." />
+
+
+<!-- Description of the Atlas End-cap Toroid Service Turret -->
+
+<gvxysxy name="ECT_ServTur1" material="Aluminium" dZ="AECT_SrvTu1He_ServTur1Height" >
+ <gvxy_point X_Y=" AECT_SrvTu1oW_ServTur1OutWidth/2. ; AECT_SrvTu1oW_ServTur1OutWidth/2.-AECT_SrvTu1Ed_ServTur1Edge " />
+ <gvxy_point X_Y=" AECT_SrvTu1oW_ServTur1OutWidth/2.-AECT_SrvTu1Ed_ServTur1Edge ; AECT_SrvTu1oW_ServTur1OutWidth/2. " />
+</gvxysxy>
+<gvxysxy name="ECT_ServTur0" material="Aluminium" dZ="AECT_SrvTu1He_ServTur1Height" >
+ <gvxy_point X_Y=" AECT_SrvTu1iW_ServTur1InnWidth/2. ; AECT_SrvTu1iW_ServTur1InnWidth/2.-AECT_SrvTu1Ed_ServTur1Edge*AECT_SrvTu1iW_ServTur1InnWidth/AECT_SrvTu1oW_ServTur1OutWidth " />
+ <gvxy_point X_Y=" AECT_SrvTu1iW_ServTur1InnWidth/2.-AECT_SrvTu1Ed_ServTur1Edge*AECT_SrvTu1iW_ServTur1InnWidth/AECT_SrvTu1oW_ServTur1OutWidth ; AECT_SrvTu1iW_ServTur1InnWidth/2. " />
+</gvxysxy>
+<subtraction name="ECT_ServTurA" >
+ <posXYZ volume="ECT_ServTur1" rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTur0" X_Y_Z=" 0. ; -AECT_SrvTu1oW_ServTur1OutWidth+AECT_SrvTu1iW_ServTur1InnWidth ; 0. " rot=" 90.; 0.; 0. "/>
+</subtraction>
+<tubs name="ECT_ServTurB1_base" material="Aluminium" Rio_Z="AECT_SrvTu2iR_ServTur2InnRad; AECT_SrvTu2oR_ServTur2OutRad; AECT_SrvTu2He_ServTur2Height + AECT_SrvTu2oR_ServTur2OutRad - GENV_Eps" nbPhi="20" />
+<tubs name="ECT_ServTurB2_base" material="Aluminium" Rio_Z="AECT_SrvTu2iR_ServTur2InnRad; AECT_SrvTu2oR_ServTur2OutRad; AECT_SrvTu2Dz_ServTur2Dz - AECT_SrvTu3Dz_ServTur3Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad" nbPhi="20" />
+<tubs name="ECT_ServTurB3_base" material="Aluminium" Rio_Z="AECT_SrvTu2iR_ServTur2InnRad; AECT_SrvTu2oR_ServTur2OutRad; AECT_SrvTu3He_ServTur3Height + AECT_SrvTu2oR_ServTur2OutRad" nbPhi="20" />
+<box name="ECT_ServTurB_CutBox" material="Aluminium" X_Y_Z="4.*AECT_SrvTu2oR_ServTur2OutRad/GENV_Co45; 4.*AECT_SrvTu2oR_ServTur2OutRad/GENV_Co45; 4.*AECT_SrvTu2oR_ServTur2OutRad/GENV_Co45" />
+<subtraction name="ECT_ServTurB1" >
+ <posXYZ volume="ECT_ServTurB1_base" X_Y_Z=" 0. ; (AECT_SrvTu2He_ServTur2Height + AECT_SrvTu2oR_ServTur2OutRad + GENV_Eps)/2. + AECT_SrvTu1He_ServTur1Height/2. ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz " rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height + 2.*AECT_SrvTu2oR_ServTur2OutRad + AECT_SrvTu1He_ServTur1Height/2.; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz - 2.*AECT_SrvTu2oR_ServTur2OutRad " rot=" 45.; 0.; 0. "/>
+</subtraction>
+<subtraction name="ECT_ServTurB2" >
+ <posXYZ volume="ECT_ServTurB2_base" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz- (AECT_SrvTu2Dz_ServTur2Dz - AECT_SrvTu3Dz_ServTur3Dz)/2." rot=" 0.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. - 2.*AECT_SrvTu2oR_ServTur2OutRad ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad - GENV_Eps/2." rot=" 45.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. + 2.*AECT_SrvTu2oR_ServTur2OutRad ; AECT_SrvTu2Dz_ServTur2Dz-AECT_SrvTu1Dz_ServTur1Dz - (AECT_SrvTu2Dz_ServTur2Dz - AECT_SrvTu3Dz_ServTur3Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad) + GENV_Eps/2." rot=" 45.; 0.; 0. "/>
+</subtraction>
+<subtraction name="ECT_ServTurB3" >
+ <posXYZ volume="ECT_ServTurB3_base" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. + (AECT_SrvTu3He_ServTur3Height - AECT_SrvTu2oR_ServTur2OutRad)/2. ; AECT_SrvTu3Dz_ServTur3Dz-AECT_SrvTu1Dz_ServTur1Dz " rot=" 90.; 0.; 0. "/>
+ <posXYZ volume="ECT_ServTurB_CutBox" X_Y_Z=" 0. ; AECT_SrvTu2He_ServTur2Height+AECT_SrvTu1He_ServTur1Height/2. - 2.*AECT_SrvTu2oR_ServTur2OutRad ; AECT_SrvTu3Dz_ServTur3Dz-AECT_SrvTu1Dz_ServTur1Dz + 2.*AECT_SrvTu2oR_ServTur2OutRad " rot=" 45.; 0.; 0. "/>
+</subtraction>
+<composition name="ECT_ServTur" >
+ <posXYZ volume="ECT_ServTurA" />
+ <posXYZ volume="ECT_ServTurB1" />
+ <posXYZ volume="ECT_ServTurB2" />
+ <posXYZ volume="ECT_ServTurB3" />
+</composition>
+
+<!-- new Description of the Atlas End-cap Toroid Service Tower -->
+<!-- Right and Left Leg variables -->
+<var name="ECST_zwid" value=" 100.0" /> <!-- atltept_0009-v0.pdf --> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_ywid" value=" 6000.0" /> <!-- atltept_0009-v0.pdf --> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_RL_xwid" value=" 200. " /> <!-- atltept_0009-v0.pdf -->
+<var name="ECST_LL_xwid" value=" 100. " /> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_RL_inner_distanceZ" value=" 270. " /> <!-- atltept_0009-v0.pdf -->
+<var name="ECST_LL_inner_distanceX" value=" 240. " /> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_LL_inner_distanceZ" value=" 270. " /> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_RL_ywid" value="ECST_ywid" />
+<var name="ECST_RL_zwid" value="ECST_zwid" />
+<var name="ECST_LL_ywid" value="ECST_ywid" />
+<var name="ECST_LL_zwid" value="ECST_zwid" />
+<var name="ECST_RightLeftLeg_InnerDistanceX" value="1665.+40." /> <!-- atltept_0014-vAA.pdf (added 40 to match) -->
+
+<!-- Front Arm variables -->
+<var name="ECST_Front_Bracket23_topwidth" value=" 77.5" /> <!-- approximate 77.5=(440-130)/4 see altept_0014vAA.pdf -->
+<var name="ECST_Front_Hand_width" value=" 10.0"/>
+<var name="ECST_Front_Hand_pointAX" value=" 0. "/> <!-- atltept_0033-v0.pdf lower right point-->
+<var name="ECST_Front_Hand_pointAY" value=" 0. "/> <!-- atltept_0033-v0.pdf lower right point-->
+<var name="ECST_Front_Hand_Gap" value=" 10. "/> <!-- atltept_0033-v0.pdf lower right point-->
+<var name="ECST_Front_Bracket_Distance_From_Bottom_Leg" value="2342.5+155+20"/> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_Front_Bracket_Distance_From_Leg" value="100"/> <!-- approximate, not calculated -->
+<var name="ECST_Front_Bracket_width" value="10.0"/>
+<var name="ECST_Front_Bracket_Connector_to_LLRod_ywid" value="195"/> <!-- atlept_0018-v0.pdf-->
+<var name="ECST_Front_Hand_pointBX" value="ECST_Front_Hand_pointAX-120.0"/>
+<var name="ECST_Front_Hand_pointBY" value="ECST_Front_Hand_pointAY"/>
+<var name="ECST_Front_Hand_pointCX" value="ECST_Front_Hand_pointAX-195.0"/>
+<var name="ECST_Front_Hand_pointCY" value="ECST_Front_Hand_pointAY+287.0"/>
+<var name="ECST_Front_Hand_pointDX" value="ECST_Front_Hand_pointAX-76.1"/>
+<var name="ECST_Front_Hand_pointDY" value="ECST_Front_Hand_pointAY+394.1"/>
+<var name="ECST_Front_Hand_pointEX" value="ECST_Front_Hand_pointAX"/>
+<var name="ECST_Front_Hand_pointEY" value="ECST_Front_Hand_pointAY+220.0"/>
+
+<!-- Front bar variables -->
+<var name="ECST_Front_Bar1_xwid" value=" 200." />
+<var name="ECST_Front_Bar2_xwid" value="1840." />
+<var name="ECST_Front_Bar3_xwid" value=" 130." />
+<var name="ECST_Front_Bar_ywid" value=" 200." />
+<var name="ECST_Front_Bar_zwid" value=" 100." />
+<var name="ECST_Front_Bar_starty" value="1107.5" /><!-- atltept_0014-vAA.pdf 1107.5=6977.5-(5807.5+62.5) with respect to the bottom of the right (or) left leg bar-->
+<var name="ECST_Front_Bar_startz" value="1192.5" /><!-- atltept_0014-vAA.pdf 1192.5=12373.5-11181 with respect to the right (or)left leg bar (outer surface-->
+<var name="ECST_Front_Bar_xwid" value="ECST_Front_Bar1_xwid+ECST_Front_Bar2_xwid+ECST_Front_Bar3_xwid+2*ECST_Front_Hand_width"/>
+
+<var name="ECST_vecx_CD" value="ECST_Front_Hand_pointDX-ECST_Front_Hand_pointCX"/>
+<var name="ECST_vecy_CD" value="ECST_Front_Hand_pointDY-ECST_Front_Hand_pointCY"/>
+<var name="ECST_unit_perp_CDx" value="(-ECST_vecy_CD/ECST_vecx_CD)/sqrt((-ECST_vecy_CD/ECST_vecx_CD)**2+1)"/>
+<var name="ECST_unit_perp_CDy" value="(1.)/sqrt((-ECST_vecy_CD/ECST_vecx_CD)**2+1)"/>
+
+<var name="ECST_Front_Bracket_pointCX" value="ECST_Front_Hand_pointCX+GENV_Eps*ECST_unit_perp_CDx"/>
+<var name="ECST_Front_Bracket_pointCY" value="ECST_Front_Hand_pointCY+GENV_Eps*ECST_unit_perp_CDy"/>
+<var name="ECST_Front_Bracket_pointDX" value="ECST_Front_Hand_pointDX+GENV_Eps*ECST_unit_perp_CDx"/>
+<var name="ECST_Front_Bracket_pointDY" value="ECST_Front_Hand_pointDY+GENV_Eps*ECST_unit_perp_CDy"/>
+
+<var name="ECST_Front_Bracket_pointFX" value="ECST_Front_Hand_pointAX-(ECST_Front_Bar_startz+ECST_Front_Hand_Gap)+ECST_Front_Bracket_Distance_From_Leg"/>
+<var name="ECST_Front_Bracket_pointFY" value="ECST_Front_Hand_pointAY+ECST_Front_Bracket_Distance_From_Bottom_Leg-(ECST_Front_Bar_starty-ECST_Front_Hand_Gap)"/> <!-- atltept_0018-v0.pdf -->
+<var name="ECST_Front_Bracket_pointGX" value="ECST_Front_Bracket_pointFX"/>
+<var name="ECST_Front_Bracket_pointGY" value="ECST_Front_Bracket_pointFY+ECST_Front_Bracket_Connector_to_LLRod_ywid"/>
+
+<var name="ECST_Front_Bracket_pointD1X" value="ECST_Front_Bracket_pointDX+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointCX-ECST_Front_Bracket_pointDX)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+<var name="ECST_Front_Bracket_pointD1Y" value="ECST_Front_Bracket_pointDY+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointCY-ECST_Front_Bracket_pointDY)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+<var name="ECST_Front_Bracket_pointC1X" value="ECST_Front_Bracket_pointCX+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+<var name="ECST_Front_Bracket_pointC1Y" value="ECST_Front_Bracket_pointCY+ECST_Front_Bracket_width*((ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)/sqrt((ECST_Front_Bracket_pointDX-ECST_Front_Bracket_pointCX)**2+(ECST_Front_Bracket_pointDY-ECST_Front_Bracket_pointCY)**2))"/>
+
+<var name="ECST_Front_Bracket_pointF1X" value="ECST_Front_Bracket_pointFX"/>
+<var name="ECST_Front_Bracket_pointF1Y" value="ECST_Front_Bracket_pointFY+ECST_Front_Bracket_width"/>
+<var name="ECST_Front_Bracket_pointG1X" value="ECST_Front_Bracket_pointGX"/>
+<var name="ECST_Front_Bracket_pointG1Y" value="ECST_Front_Bracket_pointGY-ECST_Front_Bracket_width"/>
+<var name="ECST_vecx_GD" value="ECST_Front_Bracket_pointGX-ECST_Front_Bracket_pointDX"/>
+<var name="ECST_vecy_GD" value="ECST_Front_Bracket_pointGY-ECST_Front_Bracket_pointCY"/>
+<var name="ECST_unit_perp_GDx" value="(-ECST_vecy_GD/ECST_vecx_GD)/sqrt((-ECST_vecy_GD/ECST_vecx_GD)**2+1)"/>
+<var name="ECST_unit_perp_GDy" value="(1.)/sqrt((-ECST_vecy_GD/ECST_vecx_GD)**2+1)"/>
+
+<var name="ECST_Front_Arm1_widthx" value="ECST_Front_Hand_pointAX-ECST_Front_Bracket_pointGX"/>
+<var name="ECST_Front_Arm1_widthy" value="-ECST_Front_Hand_pointAY+ECST_Front_Bracket_pointGY"/>
+<var name="ECST_Front_Arm1_widthz" value="ECST_Front_Bracket23_topwidth"/>
+<var name="ECST_Front_Arm2_widthx" value="ECST_Front_Hand_pointAX-ECST_Front_Bracket_pointGX"/>
+<var name="ECST_Front_Arm2_widthy" value="-ECST_Front_Hand_pointAY+ECST_Front_Bracket_pointGY"/>
+<var name="ECST_Front_Arm2_widthz" value="ECST_Front_Bracket23_topwidth"/>
+
+<var name="ECST_Bar_Length" value="sqrt((ECST_Front_Bracket_pointG1X-ECST_Front_Bracket_pointD1X)**2+(ECST_Front_Bracket_pointG1Y-ECST_Front_Bracket_pointD1Y)**2)"/>
+
+<!-- Left Leg cover variables -->
+<var name="ECST_cover_thickness" value="20."/>
+<var name="ECST_cover_dist_rod" value="30."/>
+<var name="ECST_Left_Leg_HoleBracket_ypos" value="ECST_Front_Bracket_pointF1Y-ECST_ywid/2+ECST_Front_Bar_starty-ECST_Front_Hand_Gap+80"/>
+
+<!-- Left Leg Support Frames variables -->
+<var name="ECST_SupportFrame_dist_rod" value="30."/>
+<var name="ECST_SupportFrame_Thickness" value="20."/>
+
+<!-- Right Leg Variables -->
+<var name="ECST_SupportFrameA_Height" value="370."/> <!-- altept_0009, altept_0012, altept_0018 -->
+<var name="ECST_SupportFrameB_Height" value="360."/>
+<var name="ECST_SupportFrameC_Height" value="360."/>
+<var name="ECST_SupportFrameD_Height" value="150."/>
+
+<var name="ECST_SupportFrameA_Ypos" value="ECST_ywid/2-ECST_SupportFrameA_Height/2"/>
+<var name="ECST_SupportFrameA_Ypos_abs" value="ECST_ywid-ECST_SupportFrameA_Height"/> <!-- starting y -->
+<var name="ECST_SupportFrameB_Ypos_abs" value="4060."/> <!-- starting y -->
+<var name="ECST_SupportFrameB_Ypos" value="ECST_SupportFrameB_Ypos_abs-ECST_ywid/2+ECST_SupportFrameB_Height/2"/>
+<var name="ECST_SupportFrameC_Ypos_abs" value="2343."/> <!-- starting y 2343-->
+<var name="ECST_SupportFrameC_Ypos" value="ECST_SupportFrameC_Ypos_abs-ECST_ywid/2+ECST_SupportFrameC_Height/2"/>
+<var name="ECST_SupportFrameD_Ypos_abs" value="1108."/> <!-- starting y -->
+<var name="ECST_SupportFrameD_Ypos" value="ECST_SupportFrameD_Ypos_abs-ECST_ywid/2+ECST_SupportFrameD_Height/2"/>
+
+<!-- Middle Pieces Variables -->
+<var name="ECST_MiddleBarA_ywid" value=" 160."/> <!-- altept_0022, altept_0023, altept_0024 -->
+<var name="ECST_MiddleBarA_width" value=" 20."/>
+<var name="ECST_MiddleBarA1_ywid" value="ECST_MiddleBarA_ywid-2*ECST_MiddleBarA_width"/>
+<var name="ECST_MiddleBarA1_zwid" value="ECST_MiddleBarA_width"/>
+<var name="ECST_MiddleBarA2_xwid" value="1400."/>
+<var name="ECST_MiddleBarA2_ywid" value="ECST_MiddleBarA_width"/>
+<var name="ECST_MiddleBarA2_zwid" value=" 50."/>
+<var name="ECST_MiddleBarA1Back_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA1Back_ypos" value=" 0."/>
+<var name="ECST_MiddleBarA1Back_zpos" value="ECST_MiddleBarA1_zwid/2."/>
+<var name="ECST_MiddleBarA2Back_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA2Back_ypos" value="(ECST_MiddleBarA1_ywid+ECST_MiddleBarA2_ywid)/2.+GENV_Eps"/>
+<var name="ECST_MiddleBarA2Back_zpos" value="(ECST_MiddleBarA2_zwid)/2."/>
+<var name="ECST_MiddleBarA1Front_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA1Front_ypos" value=" 0."/>
+<var name="ECST_MiddleBarA1Front_zpos" value="ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2-ECST_MiddleBarA1_zwid/2."/>
+<var name="ECST_MiddleBarA2Front_xpos" value=" 0."/>
+<var name="ECST_MiddleBarA2Front_ypos" value="(ECST_MiddleBarA1_ywid+ECST_MiddleBarA2_ywid)/2+GENV_Eps"/>
+<var name="ECST_MiddleBarA2Front_zpos" value="ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2-ECST_MiddleBarA2_zwid/2"/>
+<var name="ECST_MiddleBarAFront_ypos" value="ECST_SupportFrameA_Ypos_abs+ECST_SupportFrameA_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps"/>
+<var name="ECST_MiddleBarABack_ypos" value="ECST_SupportFrameA_Ypos_abs+ECST_SupportFrameA_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps"/>
+<var name="ECST_MiddleBarALow_ypos" value="ECST_SupportFrameA_Ypos_abs+ECST_MiddleBarA_ywid/2.+GENV_Eps"/>
+<var name="ECST_MiddleBarB2_xwid" value="1424."/>
+<var name="ECST_MiddleBarB_ypos" value="ECST_SupportFrameB_Ypos_abs+ECST_SupportFrameB_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps" />
+<var name="ECST_MiddleBarC2_xwid" value="1420."/>
+<var name="ECST_MiddleBarC_ypos" value="ECST_SupportFrameC_Ypos_abs+ECST_SupportFrameC_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps" />
+<var name="ECST_MiddleBarD2_xwid" value="1420."/>
+<var name="ECST_MiddleBarD_ypos" value="ECST_SupportFrameD_Ypos_abs+ECST_SupportFrameD_Height-ECST_MiddleBarA_ywid/2.-GENV_Eps" />
+
+<var name="ECST_InclinedBar_width" value="20."/>
+<var name="ECST_InclinedBar_zwid" value="50."/>
+<var name="ECST_InclinedBar_ywid" value="210."/>
+<var name="ECST_InclinedBar_ystart" value="ECST_SupportFrameC_Ypos_abs+ECST_SupportFrameC_Height"/>
+<var name="ECST_InclinedBar_xstart" value="-(ECST_RightLeftLeg_InnerDistanceX-ECST_SupportFrame_Thickness-ECST_SupportFrame_dist_rod-ECST_cover_dist_rod-ECST_cover_thickness)/2.+GENV_Eps"/>
+<var name="ECST_InclinedBar1_p1x" value="ECST_InclinedBar_xstart"/>
+<var name="ECST_InclinedBar1_p1y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_width+GENV_Eps"/>
+<var name="ECST_InclinedBar1_p2x" value="ECST_InclinedBar1_p1x"/>
+<var name="ECST_InclinedBar1_p2y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_ywid-ECST_InclinedBar_width-GENV_Eps"/>
+<var name="ECST_InclinedBar1_p3x" value="ECST_InclinedBar_xstart+ECST_RightLeftLeg_InnerDistanceX-(ECST_SupportFrame_dist_rod+ECST_SupportFrame_Thickness)-ECST_cover_thickness-ECST_cover_dist_rod-2.*GENV_Eps"/>
+<var name="ECST_InclinedBar1_p3y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_ywid-ECST_InclinedBar_width-GENV_Eps"/>
+<var name="ECST_InclinedBar1_p4x" value="ECST_InclinedBar_xstart+ECST_RightLeftLeg_InnerDistanceX-(ECST_SupportFrame_dist_rod+ECST_SupportFrame_Thickness)-ECST_cover_thickness-ECST_cover_dist_rod-2.*GENV_Eps"/>
+<var name="ECST_InclinedBar1_p4y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_width+GENV_Eps"/>
+
+<var name="ECST_InclinedBar2_p1x" value="ECST_InclinedBar1_p1x"/>
+<var name="ECST_InclinedBar2_p1y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_ywid-ECST_InclinedBar_width"/>
+<var name="ECST_InclinedBar2_p2x" value="ECST_InclinedBar1_p2x"/>
+<var name="ECST_InclinedBar2_p2y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_ywid"/>
+<var name="ECST_InclinedBar2_p3x" value="ECST_InclinedBar1_p3x"/>
+<var name="ECST_InclinedBar2_p3y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_ywid"/>
+<var name="ECST_InclinedBar2_p4x" value="ECST_InclinedBar1_p4x"/>
+<var name="ECST_InclinedBar2_p4y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_ywid-ECST_InclinedBar_width"/>
+
+<var name="ECST_InclinedBar3_p1x" value="ECST_InclinedBar1_p1x"/>
+<var name="ECST_InclinedBar3_p1y" value="ECST_InclinedBar_ystart"/>
+<var name="ECST_InclinedBar3_p2x" value="ECST_InclinedBar1_p2x"/>
+<var name="ECST_InclinedBar3_p2y" value="ECST_InclinedBar_ystart+ECST_InclinedBar_width"/>
+<var name="ECST_InclinedBar3_p3x" value="ECST_InclinedBar1_p3x"/>
+<var name="ECST_InclinedBar3_p3y" value="ECST_SupportFrameB_Ypos_abs+ECST_InclinedBar_width"/>
+<var name="ECST_InclinedBar3_p4x" value="ECST_InclinedBar1_p4x"/>
+<var name="ECST_InclinedBar3_p4y" value="ECST_SupportFrameB_Ypos_abs"/>
+
+<!-- Front Structure Variables --> <!-- values approximated from photos -->
+<var name="ECST_Front_Frame_ywid" value="ECST_Bar_Length*0.92"/>
+<var name="ECST_Front_Frame_zwid" value="ECST_Bar_Length*0.624"/>
+<var name="ECST_Front_Frame_width" value="26."/>
+<var name="ECST_Front_Frame_xwid" value="0.5*ECST_LL_inner_distanceX+ECST_LL_xwid+ECST_RightLeftLeg_InnerDistanceX+ECST_RL_xwid*0.5+2*ECST_Front_Frame_width"/>
+<var name="ECST_Front_Frame_xpos" value="0.5*(-0.5*ECST_LL_inner_distanceX-ECST_LL_xwid+ECST_RL_xwid*0.5)"/>
+<var name="ECST_Front_Frame_ypos" value="ECST_Front_Bar_starty+ECST_Front_Bar_ywid/2+0.504*ECST_Bar_Length+ECST_Front_Frame_zwid*0.5"/>
+<var name="ECST_Front_Frame_zpos" value="ECST_LL_inner_distanceZ+2*ECST_LL_zwid+2*ECST_cover_dist_rod+2*ECST_cover_thickness+ECST_Front_Frame_zwid*0.5+GENV_Eps"/>
+<var name="ECST_Front_Glass_xwid" value="ECST_Front_Frame_xwid-200."/>
+<var name="ECST_Front_Glass_ywid" value="ECST_Front_Frame_ywid-200."/>
+<var name="ECST_Front_Glass_zwid" value="20."/>
+<var name="ECST_Front_Frame_UpperPart_ywid" value="5."/>
+
+<var name="ECST_movez" value="ECST_RL_inner_distanceZ/2+ECST_zwid+ECST_cover_thickness+ECST_cover_dist_rod"/>
+<var name="ECST_movey" value="ECST_ywid/2"/>
+
+
+<!-- Right Leg Construction -->
+<box name="ECST_Right_Leg_SupportFrameAOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameA_Height; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameAInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameA_Height+20.0 ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+<box name="ECST_Right_Leg_SupportFrameBOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameB_Height ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameBInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameB_Height+20.0 ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+<box name="ECST_Right_Leg_HoleBracket" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; 300.; 200." />
+<box name="ECST_Right_Leg_SupportFrameCOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameC_Height ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameCInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameC_Height+20. ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+<box name="ECST_Right_Leg_SupportFrameDOuter" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2; ECST_SupportFrameD_Height; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2+ECST_SupportFrame_Thickness*2" />
+<box name="ECST_Right_Leg_SupportFrameDInner" material="Aluminium" X_Y_Z="ECST_RL_xwid+ECST_SupportFrame_dist_rod*2; ECST_SupportFrameD_Height+20.0 ; ECST_RL_inner_distanceZ+2*ECST_RL_zwid+ECST_SupportFrame_dist_rod*2 " />
+
+<subtraction name="ECST_Right_Leg_SupportFrameA" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameAOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameAInner" />
+</subtraction>
+<subtraction name="ECST_Right_Leg_SupportFrameB" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameBOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameBInner" />
+</subtraction>
+<subtraction name="ECST_Right_Leg_SupportFrameC" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameCOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameCInner" />
+ <posXYZ volume="ECST_Right_Leg_HoleBracket" X_Y_Z=" 0.; 50.;(ECST_LL_inner_distanceZ/2+ECST_LL_zwid+ECST_cover_dist_rod+ECST_cover_thickness/2) " />
+</subtraction>
+<subtraction name="ECST_Right_Leg_SupportFrameD" >
+ <posXYZ volume="ECST_Right_Leg_SupportFrameDOuter" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameDInner" />
+</subtraction>
+
+<box name="ECST_Right_Leg_Rod" material="Aluminium" X_Y_Z="ECST_RL_xwid; ECST_RL_ywid ; ECST_RL_zwid" />
+<composition name="ECST_Right_Leg" >
+ <posXYZ volume="ECST_Right_Leg_Rod" X_Y_Z="0. ; 0. ; ECST_RL_zwid/2+ECST_RL_inner_distanceZ/2" />
+ <posXYZ volume="ECST_Right_Leg_Rod" X_Y_Z="0. ; 0. ; -ECST_RL_zwid/2-ECST_RL_inner_distanceZ/2" />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameA" X_Y_Z="0.;ECST_SupportFrameA_Ypos; 0." />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameB" X_Y_Z="0.;ECST_SupportFrameB_Ypos; 0." />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameC" X_Y_Z="0.;ECST_SupportFrameC_Ypos; 0." />
+ <posXYZ volume="ECST_Right_Leg_SupportFrameD" X_Y_Z="0.;ECST_SupportFrameD_Ypos; 0." />
+</composition>
+
+<!-- Left Leg Construction -->
+<box name="ECST_Left_Leg_Rod" material="Aluminium" X_Y_Z="ECST_LL_xwid; ECST_LL_ywid ; ECST_LL_zwid" />
+<box name="ECST_Left_Leg_coverouter" material="Aluminium" X_Y_Z="ECST_LL_inner_distanceX+2*ECST_LL_xwid+ECST_cover_dist_rod*2+ECST_cover_thickness*2; ECST_ywid ; ECST_LL_inner_distanceZ+2*ECST_LL_zwid+ECST_cover_dist_rod*2+ECST_cover_thickness*2" />
+<box name="ECST_Left_Leg_coverinner" material="Aluminium" X_Y_Z="ECST_LL_inner_distanceX+2*ECST_LL_xwid+ECST_cover_dist_rod*2; ECST_ywid + 2.*GENV_Eps; ECST_LL_inner_distanceZ+2*ECST_LL_zwid+ECST_cover_dist_rod*2" />
+<box name="ECST_Left_Leg_HoleBracket" material="Aluminium" X_Y_Z="300.; 300.; 200." />
+
+<subtraction name="ECST_Left_Leg_cover" >
+ <posXYZ volume="ECST_Left_Leg_coverouter" />
+ <posXYZ volume="ECST_Left_Leg_coverinner" />
+ <posXYZ volume="ECST_Left_Leg_HoleBracket" X_Y_Z=" 0.; ECST_Left_Leg_HoleBracket_ypos;(ECST_LL_inner_distanceZ/2+ECST_LL_zwid+ECST_cover_dist_rod+ECST_cover_thickness/2) " />
+</subtraction>
+<composition name="ECST_Left_Leg" >
+ <posXYZ volume="ECST_Left_Leg_cover" />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="-ECST_LL_xwid/2.-ECST_LL_inner_distanceX/2.; 0.; ECST_LL_zwid/2.+ECST_LL_inner_distanceZ/2." />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="-ECST_LL_xwid/2.-ECST_LL_inner_distanceX/2.; 0.; -ECST_LL_zwid/2.-ECST_LL_inner_distanceZ/2." />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="ECST_LL_xwid/2.+ECST_LL_inner_distanceX/2.; 0.; -ECST_LL_zwid/2.-ECST_LL_inner_distanceZ/2." />
+ <posXYZ volume="ECST_Left_Leg_Rod" X_Y_Z="ECST_LL_xwid/2.+ECST_LL_inner_distanceX/2.; 0.; ECST_LL_zwid/2.+ECST_LL_inner_distanceZ/2." />
+</composition>
+
+<!-- Middle Pieces Construction -->
+<box name="ECST_MiddleBarA1" material="Aluminium" X_Y_Z="ECST_RightLeftLeg_InnerDistanceX-(ECST_SupportFrame_dist_rod+ECST_SupportFrame_Thickness)-ECST_cover_thickness-ECST_cover_dist_rod-2*GENV_Eps;ECST_MiddleBarA1_ywid-2.*GENV_Eps ; ECST_MiddleBarA1_zwid" />
+<box name="ECST_MiddleBarA2" material="Aluminium" X_Y_Z="ECST_MiddleBarA2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+<box name="ECST_MiddleBarB2" material="Aluminium" X_Y_Z="ECST_MiddleBarB2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+<box name="ECST_MiddleBarC2" material="Aluminium" X_Y_Z="ECST_MiddleBarC2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+<box name="ECST_MiddleBarD2" material="Aluminium" X_Y_Z="ECST_MiddleBarD2_xwid;ECST_MiddleBarA2_ywid;ECST_MiddleBarA2_zwid" />
+
+<composition name="ECST_MiddleBars" >
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Front_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA1Front_ypos;ECST_MiddleBarA1Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarAFront_ypos-ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarAFront_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarAFront_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Front_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA1Front_ypos;ECST_MiddleBarA1Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarB_ypos-ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarB_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarB2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarB_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Front_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA1Front_ypos;ECST_MiddleBarA1Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Front_xpos;ECST_MiddleBarC_ypos-ECST_MiddleBarA2Front_ypos; ECST_MiddleBarA2Front_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarC_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarC2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarC_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarA1" X_Y_Z="ECST_MiddleBarA1Back_xpos;ECST_MiddleBarD_ypos+ECST_MiddleBarA1Back_ypos;ECST_MiddleBarA1Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarD2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarD_ypos+ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+ <posXYZ volume="ECST_MiddleBarD2" X_Y_Z="ECST_MiddleBarA2Back_xpos;ECST_MiddleBarD_ypos-1.*ECST_MiddleBarA2Back_ypos; ECST_MiddleBarA2Back_zpos" />
+</composition>
+
+<gvxy name="ECST_InclinedBar1" material="Aluminium" dZ="ECST_InclinedBar_width" >
+ <gvxy_point X_Y="ECST_InclinedBar1_p1x;ECST_InclinedBar1_p1y" />
+ <gvxy_point X_Y="ECST_InclinedBar1_p2x;ECST_InclinedBar1_p2y" />
+ <gvxy_point X_Y="ECST_InclinedBar1_p3x;ECST_InclinedBar1_p3y" />
+ <gvxy_point X_Y="ECST_InclinedBar1_p4x;ECST_InclinedBar1_p4y" />
+</gvxy>
+<gvxy name="ECST_InclinedBar2" material="Aluminium" dZ="ECST_InclinedBar_zwid" >
+ <gvxy_point X_Y="ECST_InclinedBar2_p1x;ECST_InclinedBar2_p1y" />
+ <gvxy_point X_Y="ECST_InclinedBar2_p2x;ECST_InclinedBar2_p2y" />
+ <gvxy_point X_Y="ECST_InclinedBar2_p3x;ECST_InclinedBar2_p3y" />
+ <gvxy_point X_Y="ECST_InclinedBar2_p4x;ECST_InclinedBar2_p4y" />
+</gvxy>
+<gvxy name="ECST_InclinedBar3" material="Aluminium" dZ="ECST_InclinedBar_zwid" >
+ <gvxy_point X_Y="ECST_InclinedBar3_p1x;ECST_InclinedBar3_p1y" />
+ <gvxy_point X_Y="ECST_InclinedBar3_p2x;ECST_InclinedBar3_p2y" />
+ <gvxy_point X_Y="ECST_InclinedBar3_p3x;ECST_InclinedBar3_p3y" />
+ <gvxy_point X_Y="ECST_InclinedBar3_p4x;ECST_InclinedBar3_p4y" />
+</gvxy>
+<composition name="ECST_InclinedBar" >
+ <posXYZ volume="ECST_InclinedBar1" X_Y_Z="0. ; 0. ; ECST_InclinedBar_width/2." />
+ <posXYZ volume="ECST_InclinedBar2" X_Y_Z="0. ; 0. ; ECST_InclinedBar_zwid/2." />
+ <posXYZ volume="ECST_InclinedBar3" X_Y_Z="0. ; 0. ; ECST_InclinedBar_zwid/2." />
+ <posXYZ volume="ECST_InclinedBar1" X_Y_Z="0. ; 0. ; 2*ECST_movez-ECST_InclinedBar_width/2." />
+ <posXYZ volume="ECST_InclinedBar2" X_Y_Z="0. ; 0. ; 2*ECST_movez-ECST_InclinedBar_zwid/2." />
+ <posXYZ volume="ECST_InclinedBar3" X_Y_Z="0. ; 0. ; 2*ECST_movez-ECST_InclinedBar_zwid/2." />
+</composition>
+
+<!-- Front frame Construction (from photos) -->
+<box name="ECST_Front_Frame_Outer" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid; ECST_Front_Frame_ywid ; ECST_Front_Frame_zwid" />
+<box name="ECST_Front_Frame_Inner4" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid-2*ECST_Front_Frame_width; ECST_Front_Frame_ywid/2. ; ECST_Front_Frame_zwid/2." />
+<box name="ECST_Front_Frame_Inner1" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid-2*ECST_Front_Frame_width; ECST_Front_Frame_ywid-2*ECST_Front_Frame_width ; ECST_Front_Frame_zwid+200" />
+<box name="ECST_Front_Frame_Inner2" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid+200; ECST_Front_Frame_ywid-2*ECST_Front_Frame_width ; ECST_Front_Frame_zwid-2*ECST_Front_Frame_width" />
+<box name="ECST_Front_Frame_Inner3" material="Aluminium" X_Y_Z="ECST_Front_Frame_xwid-2*ECST_Front_Frame_width; ECST_Front_Frame_ywid; ECST_Front_Frame_zwid-2*ECST_Front_Frame_width" />
+<subtraction name="ECST_Front_Structure" >
+ <posXYZ volume="ECST_Front_Frame_Outer" />
+ <posXYZ volume="ECST_Front_Frame_Inner1" />
+ <posXYZ volume="ECST_Front_Frame_Inner2" />
+ <posXYZ volume="ECST_Front_Frame_Inner3" X_Y_Z="0.;-ECST_Front_Frame_UpperPart_ywid;0." />
+ <posXYZ volume="ECST_Front_Frame_Inner4" X_Y_Z="0.;- ECST_Front_Frame_ywid/2.;- ECST_Front_Frame_zwid/2." />
+</subtraction>
+
+<box name="ECST_Front_Glass_Outer" material="std::Polyethylene" X_Y_Z="ECST_Front_Glass_xwid; ECST_Front_Glass_ywid ; ECST_Front_Glass_zwid" />
+<composition name="ECST_Front_Glass" >
+ <posXYZ volume="ECST_Front_Structure" X_Y_Z="0.; 0.; -2.*GENV_Eps " />
+ <posXYZ volume="ECST_Front_Glass_Outer" X_Y_Z="0.;0.;0.5*ECST_Front_Frame_zwid+20." />
+</composition>
+
+
+<!-- Front Bar Construction from atltept_0033-v0.pdf -->
+<box name="ECST_Front_Bar1" material="Aluminium" X_Y_Z="ECST_Front_Bar1_xwid-GENV_Eps; ECST_Front_Bar_ywid ; ECST_Front_Bar_zwid" />
+<box name="ECST_Front_Bar2" material="Aluminium" X_Y_Z="ECST_Front_Bar2_xwid-GENV_Eps; ECST_Front_Bar_ywid ; ECST_Front_Bar_zwid" />
+<box name="ECST_Front_Bar3" material="Aluminium" X_Y_Z="ECST_Front_Bar3_xwid-GENV_Eps; ECST_Front_Bar_ywid ; ECST_Front_Bar_zwid" />
+<composition name="ECST_Front_Bar" >
+ <posXYZ volume="ECST_Front_Bar1" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid/2;0.;0." />
+ <posXYZ volume="ECST_Front_Bar2" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid-ECST_Front_Hand_width-ECST_Front_Bar2_xwid/2;0.;0." />
+ <posXYZ volume="ECST_Front_Bar3" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid-2*ECST_Front_Hand_width-ECST_Front_Bar2_xwid-ECST_Front_Bar3_xwid/2;0.;0." />
+</composition>
+<!-- Arm Construction -->
+<!-- ECST_Front_Hand -->
+<gvxy name="ECST_Front_Hand" material="Aluminium" dZ="ECST_Front_Hand_width" >
+ <gvxy_point X_Y="ECST_Front_Hand_pointAX ; ECST_Front_Hand_pointAY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointBX ; ECST_Front_Hand_pointBY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointCX ; ECST_Front_Hand_pointCY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointDX ; ECST_Front_Hand_pointDY " />
+ <gvxy_point X_Y="ECST_Front_Hand_pointEX ; ECST_Front_Hand_pointEY " />
+</gvxy>
+<!-- ECST_Front_Bracket -->
+<gvxy name="ECST_Front_Bracket1" material="Aluminium" dZ="ECST_Front_Bracket_width" >
+ <gvxy_point X_Y="ECST_Front_Bracket_pointD1X ; ECST_Front_Bracket_pointD1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointC1X ; ECST_Front_Bracket_pointC1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointF1X ; ECST_Front_Bracket_pointF1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointF1X-ECST_Front_Bracket_Distance_From_Leg+GENV_Eps ; ECST_Front_Bracket_pointF1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointG1X-ECST_Front_Bracket_Distance_From_Leg+GENV_Eps ; ECST_Front_Bracket_pointG1Y " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointG1X ; ECST_Front_Bracket_pointG1Y " />
+</gvxy>
+<gvxy name="ECST_Front_Bracket2" material="Aluminium" dZ="ECST_Front_Bracket23_topwidth" >
+ <gvxy_point X_Y="ECST_Front_Bracket_pointDX+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointDY+GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointD1X+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointD1Y+GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointG1X+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointG1Y+GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointGX+GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointGY+GENV_Eps*ECST_unit_perp_GDy " />
+</gvxy>
+<gvxy name="ECST_Front_Bracket3" material="Aluminium" dZ="ECST_Front_Bracket23_topwidth" >
+ <gvxy_point X_Y="ECST_Front_Bracket_pointC1X-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointC1Y-GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointCX-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointCY-GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointFX-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointFY-GENV_Eps*ECST_unit_perp_GDy " />
+ <gvxy_point X_Y="ECST_Front_Bracket_pointF1X-GENV_Eps*ECST_unit_perp_GDx ; ECST_Front_Bracket_pointF1Y-GENV_Eps*ECST_unit_perp_GDy " />
+</gvxy>
+<!-- ECST_Front_Arm -->
+<composition name="ECST_Front_Arm1">
+ <posXYZ volume="ECST_Front_Hand" />
+ <posXYZ volume="ECST_Front_Bracket1" />
+ <posXYZ volume="ECST_Front_Bracket2" X_Y_Z="0.;0.;ECST_Front_Bracket23_topwidth/2" />
+ <posXYZ volume="ECST_Front_Bracket3" X_Y_Z="0.;0.;ECST_Front_Bracket23_topwidth/2" />
+</composition>
+<composition name="ECST_Front_Arm2">
+ <posXYZ volume="ECST_Front_Hand" />
+ <posXYZ volume="ECST_Front_Bracket1" />
+ <posXYZ volume="ECST_Front_Bracket2" X_Y_Z="0.;0.;-ECST_Front_Bracket23_topwidth/2" />
+ <posXYZ volume="ECST_Front_Bracket3" X_Y_Z="0.;0.;-ECST_Front_Bracket23_topwidth/2" />
+</composition>
+<!-- ECST_Front -->
+<composition name="ECST_Front">
+ <posXYZ volume="ECST_Front_Bar" />
+ <posXYZ volume="ECST_Front_Arm1" X_Y_Z="ECST_Front_Bar_xwid/2-ECST_Front_Bar1_xwid-ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+ <posXYZ volume="ECST_Front_Arm1" X_Y_Z="-ECST_Front_Bar_xwid/2-ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+ <posXYZ volume="ECST_Front_Arm2" X_Y_Z="ECST_Front_Bar_xwid/2+ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+ <posXYZ volume="ECST_Front_Arm2" X_Y_Z="-ECST_Front_Bar_xwid/2+ECST_Front_Bar3_xwid+ECST_Front_Hand_width/2;-ECST_Front_Bar_ywid/2-ECST_Front_Hand_Gap;ECST_Front_Bar_zwid/2+ECST_Front_Hand_Gap" rot="0.;-90.;0." />
+</composition>
+
+<composition name="ECT_ServiceTower" >
+ <posXYZ volume="ECST_Right_Leg" X_Y_Z="ECST_RL_xwid/2.+ECST_RightLeftLeg_InnerDistanceX/2.; ECST_movey; ECST_movez" />
+ <posXYZ volume="ECST_Left_Leg" X_Y_Z="-ECST_LL_inner_distanceX/2-ECST_LL_xwid-ECST_RightLeftLeg_InnerDistanceX/2.; ECST_movey; ECST_movez" />
+ <posXYZ volume="ECST_MiddleBars" />
+ <posXYZ volume="ECST_InclinedBar" />
+ <posXYZ volume="ECST_Front" X_Y_Z="ECST_RightLeftLeg_InnerDistanceX/2+ECST_RL_xwid-ECST_Front_Bar_xwid/2; ECST_Front_Bar_starty-ECST_ywid/2+ECST_Front_Bar_ywid/2+ECST_movey; ECST_Front_Bar_startz+ECST_zwid+ECST_RL_inner_distanceZ/2-ECST_Front_Bar_zwid/2+ECST_movez" />
+ <posXYZ volume="ECST_Front_Glass" X_Y_Z="ECST_Front_Frame_xpos;ECST_Front_Frame_ypos;ECST_Front_Frame_zpos" />
+</composition>
+
+<var name="ECST_SToDzBot" value="1650." /> <!-- atczte__0002-vAB 14-JUL-2006 -->
+<var name="ECST_SToThic2" value=" 50."/>
+<var name="ECST_SToYpos" value="5800." /> <!-- atczte__0002-vAB 14-JUL-2006 -->
+
+<var name="AECT_SupInnWheel_Thickness" value=" 20. "/>
+<var name="AECT_SupInnWheel_Distance" value=" 390. "/>
+<var name="AECT_SupInnWheel_SideDY" value=" 160. "/>
+<var name="AECT_SupInnWheel_SideDZ" value=" 3010. "/>
+<var name="AECT_SupInnWheel_PlateDZ" value=" 160. "/>
+<var name="AECT_SupInnWheel_Yoff" value=" 88. "/>
+
+<var name="AECT_SupOutWheel_Thickness" value=" 71. "/>
+<var name="AECT_SupOutWheel_DY" value=" 446. "/>
+<var name="AECT_SupOutWheel_XPosInn" value=" 2575. "/>
+<var name="AECT_SupOutWheel_XPosOut" value=" 3434. "/>
+
+<var name="AECT_SupWheel_AirPadSup_addDY" value=" 150. "/>
+<var name="AECT_SupWheel_AirPadSup_relZ" value=" 1330. "/>
+
+<var name="AECT_SupWheel_AirPad_Rad" value=" 350. "/>
+<var name="AECT_SupWheel_AirPad_Hight" value=" 125. "/>
+
+<var name="AECT_SupWheel_dxJackBox_DX" value=" 555. "/>
+<var name="AECT_SupWheel_dyJackBox_DY" value=" 110. "/>
+<var name="AECT_SupWheel_dzJackBox_DZ" value=" 275. "/>
+<var name="AECT_SupWheel_Jack_AbsXPos" value=" 3045. "/>
+<var name="AECT_SupWheel_Jack_DiffXPos" value=" 230. "/>
+<var name="AECT_SupWheel_Jack_Radius" value=" 80. "/>
+<var name="AECT_SupWheel_Jack_Hight" value=" 280. "/>
+<var name="AECT_SupWheel_SpecBox_DZ" value=" 2500. "/>
+
+<var name="AECT_SupWheel_YPos" value="-3945. "/>
+
+<array name="AECT_SupInnWheel_PlatePos" values=" 350. ; 852. ; 1425. ; 1998. " />
+
+<box name="ECT_SupInnWheel_Side" material="Aluminium" X_Y_Z=" AECT_SupInnWheel_Thickness ; AECT_SupInnWheel_SideDY ; AECT_SupInnWheel_SideDZ " />
+<box name="ECT_SupInnWheel_Plate" material="Aluminium" X_Y_Z=" AECT_SupInnWheel_Distance - 2.*AECT_SupInnWheel_Thickness ; AECT_SupInnWheel_Thickness ; AECT_SupInnWheel_PlateDZ " />
+<box name="ECT_SupOutWheel" material="Aluminium" X_Y_Z=" AECT_SupOutWheel_Thickness ; AECT_SupOutWheel_DY ; AECT_EVOShZ_EVOutShellholeZwid - 2.*AECT_EVOSCZ_EVOutShellConnZwid " />
+<box name="ECT_SupWheel_AirPadSup" material="Iron" X_Y_Z=" AECT_SupInnWheel_Distance - 2.*AECT_SupInnWheel_Thickness; AECT_SupInnWheel_SideDY+AECT_SupWheel_AirPadSup_addDY; 2.*(AECT_SupWheel_AirPadSup_relZ-AECT_SupInnWheel_SideDZ/2+AECT_SupInnWheel_PlatePos[0])"/>
+<tubs name="ECT_SupWheel_AirPad" material="Iron" Rio_Z=" 0. ; AECT_SupWheel_AirPad_Rad ; AECT_SupWheel_AirPad_Hight"/>
+<box name="ECT_SupWheel_JackBox" material="Iron" X_Y_Z="AECT_SupWheel_dxJackBox_DX; AECT_SupWheel_dyJackBox_DY; AECT_SupWheel_dzJackBox_DZ"/>
+<tubs name="ECT_SupWheel_Jack" material="Iron" Rio_Z=" 0. ; AECT_SupWheel_Jack_Radius ; AECT_SupWheel_Jack_Hight"/>
+<box name="ECT_SupWheel_SpecBox" material="Aluminium" X_Y_Z="AECT_SupInnWheel_SideDY; AECT_SupInnWheel_SideDY; AECT_SupWheel_SpecBox_DZ"/>
+
+<composition name="ECT_SupWheel_basic">
+ <posXYZ volume="ECT_SupOutWheel" X_Y_Z=" (AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn+AECT_SupOutWheel_Thickness)/2.; -AECT_SupOutWheel_DY/2. ; 0. " />
+ <posXYZ volume="ECT_SupOutWheel" X_Y_Z="-(AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn+AECT_SupOutWheel_Thickness)/2.; -AECT_SupOutWheel_DY/2. ; 0. " />
+ <posXYZ volume="ECT_SupInnWheel_Side" X_Y_Z=" (AECT_SupInnWheel_Distance-AECT_SupInnWheel_Thickness)/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff ; 0. " />
+ <posXYZ volume="ECT_SupInnWheel_Side" X_Y_Z="-(AECT_SupInnWheel_Distance-AECT_SupInnWheel_Thickness)/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff ; 0. " />
+ <foreach index="Irib" begin="1" loops="3" >
+ <posXYZ volume="ECT_SupInnWheel_Plate" X_Y_Z=" 0.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; -(AECT_SupInnWheel_SideDZ-AECT_SupInnWheel_PlateDZ)/2.+AECT_SupInnWheel_PlatePos[Irib]" />
+ </foreach>
+ <posXYZ volume="ECT_SupInnWheel_Plate" X_Y_Z="0.; (AECT_SupInnWheel_SideDY-AECT_SupInnWheel_Thickness)/2.-AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; -(AECT_SupInnWheel_SideDZ-AECT_SupInnWheel_PlateDZ)/2.+AECT_SupInnWheel_PlatePos[0] " />
+ <posXYZ volume="ECT_SupInnWheel_Plate" X_Y_Z="0.; (AECT_SupInnWheel_SideDY-AECT_SupInnWheel_Thickness)/2.-AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; (AECT_SupInnWheel_SideDZ-AECT_SupInnWheel_PlateDZ)/2.-AECT_SupInnWheel_PlatePos[0] " />
+ <posXYZ volume="ECT_SupWheel_AirPadSup" X_Y_Z="0.; -(AECT_SupInnWheel_SideDY+AECT_SupWheel_AirPadSup_addDY)/2.; AECT_SupWheel_AirPadSup_relZ" />
+ <posXYZ volume="ECT_SupWheel_AirPadSup" X_Y_Z="0.; -(AECT_SupInnWheel_SideDY+AECT_SupWheel_AirPadSup_addDY)/2.; -AECT_SupWheel_AirPadSup_relZ" />
+ <posXYZ volume="ECT_SupWheel_AirPad" X_Y_Z="0.; -AECT_SupInnWheel_SideDY-AECT_SupWheel_AirPadSup_addDY-AECT_SupWheel_AirPad_Hight/2.; AECT_SupWheel_AirPadSup_relZ " rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_AirPad" X_Y_Z="0.; -AECT_SupInnWheel_SideDY-AECT_SupWheel_AirPadSup_addDY-AECT_SupWheel_AirPad_Hight/2.; -AECT_SupWheel_AirPadSup_relZ " rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_Jack" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY-AECT_SupWheel_Jack_Hight/2.; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVOSCZ_EVOutShellConnZwid" rot="90.; 0.; 0."/>
+ <posXYZ volume="ECT_SupWheel_JackBox" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos/2.; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY/2.; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_EVOSCZ_EVOutShellConnZwid" />
+ <posXYZ volume="ECT_SupWheel_JackBox" X_Y_Z="(-AECT_SupOutWheel_XPosOut-AECT_SupOutWheel_XPosInn)/2.+AECT_SupWheel_Jack_AbsXPos-AECT_SupWheel_Jack_DiffXPos/2.; -AECT_EVOSso_EVOutShellspecioff-AECT_SupWheel_dyJackBox_DY/2.; AECT_EVOShZ_EVOutShellholeZwid/2.-AECT_EVOSCZ_EVOutShellConnZwid" />
+</composition>
+
+<composition name="ECT_SupWheel_Right">
+ <posXYZ volume="ECT_SupWheel_basic" X_Y_Z=" (AECT_SupOutWheel_XPosOut+AECT_SupOutWheel_XPosInn)/2.; 0.; 0." />
+ <posXYZ volume="ECT_SupWheel_SpecBox" X_Y_Z=" AECT_SupOutWheel_XPosOut-AECT_SupInnWheel_SideDY/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; AECT_SupWheel_SpecBox_DZ/2." />
+</composition>
+
+<composition name="ECT_SupWheel_Left">
+ <posXYZ volume="ECT_SupWheel_basic" X_Y_Z=" -(AECT_SupOutWheel_XPosOut+AECT_SupOutWheel_XPosInn)/2.; 0.; 0." rot="0.; 180.; 0."/>
+ <posXYZ volume="ECT_SupWheel_SpecBox" X_Y_Z=" -AECT_SupOutWheel_XPosOut+AECT_SupInnWheel_SideDY/2.; -AECT_SupInnWheel_SideDY/2.-AECT_SupInnWheel_Yoff; AECT_SupWheel_SpecBox_DZ/2." />
+</composition>
+
+<composition name="ECT_SuppoWheels" >
+ <posXYZ volume="ECT_SupWheel_Right" X_Y_Z=" 0. ; AECT_SupWheel_YPos ; 0. " />
+ <posXYZ volume="ECT_SupWheel_Left" X_Y_Z=" 0. ; AECT_SupWheel_YPos ; 0. " />
+</composition>
+
+<composition name="ECT_Toroid_single" >
+ <mposPhi volume="ECT_ColdMass" ncopy="8" />
+ <mposWedge volume="ECT_TS_ThermalShield_default" wedge_number="8" sectors=" 0; 1; 1; 1; 0; 1; 1; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_TS_ThermalShield_special" R_Phi_Z=" 0. ; -90. ; 0. " >
+ <sector value="1" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_TS_ThermalShield_special" R_Phi_Z=" 0. ;-270. ; 0. " >
+ <sector value="5" />
+ </posRPhiZ>
+ <posXYZ volume="ECT_TS_CentralTube"/>
+ <mposWedge volume="ECT_JTV_Shielding_default" wedge_number="8" sectors=" 0; 1; 1; 1; 0; 1; 1; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_JTV_Shielding_special" R_Phi_Z=" 0. ; -90. ; 0. " >
+ <sector value="1" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_JTV_Shielding_special" R_Phi_Z=" 0. ;-270. ; 0. " >
+ <sector value="5" />
+ </posRPhiZ>
+ <mposWedge volume="ECT_EV_Envelop_default" wedge_number="8" sectors=" 1; 1; 1; 1; 1; 0; 0; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_EV_Envelop_special_Sector6" R_Phi_Z=" 0. ; 135. ; 0. " >
+ <sector value="6" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_EV_Envelop_special_Sector7" R_Phi_Z=" 0. ; 180. ; 0. " >
+ <sector value="7" />
+ </posRPhiZ>
+ <mposWedge volume="ECT_EV_AlignTube_default" wedge_number="8" sectors=" 0; 1; 1; 1; 0; 1; 1; 1" >
+ <sector value="1" step="1" />
+ </mposWedge>
+ <posRPhiZ volume="ECT_EV_AlignTube_special" R_Phi_Z=" 0. ; 22.5 ; 0. " >
+ <sector value="1" />
+ </posRPhiZ>
+ <posRPhiZ volume="ECT_EV_AlignTube_special" R_Phi_Z=" 0. ;202.5 ; 0. " >
+ <sector value="5" />
+ </posRPhiZ>
+ <posXYZ volume="ECT_EV_CentralTube"/>
+ <posXYZ volume="ECT_JTV_FrontRing" />
+ <posXYZ volume="ECT_JTV_BackRing" X_Y_Z=" 0.; 0.; GENV_Eps"/>
+ <posXYZ volume="ECT_EV_Yoke" X_Y_Z=" 0.; 0.; AECT_CTYpoZ_CentTubeYokeposZ"/>
+ <posXYZ volume="ECT_EV_Yoke" X_Y_Z=" 0.; 0.; -AECT_CTYpoZ_CentTubeYokeposZ"/>
+ <posRPhiZ volume="ECT_EV_SideAttachment" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - (AECT_EVSSAh_EVSideSupporthight + AECT_EVOSit_EVOutShellinnthick + AECT_EVOSio_EVOutShellinneroff)/2. ; 22.5 ; 0. " />
+ <posRPhiZ volume="ECT_EV_SideAttachment" R_Phi_Z=" AECT_EVEPid_EVEndPlateindist - (AECT_EVSSAh_EVSideSupporthight + AECT_EVOSit_EVOutShellinnthick + AECT_EVOSio_EVOutShellinneroff)/2. ; 202.5 ; 0. " />
+ <posRPhiZ volume="ECT_EV_FrontAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 22.5 ; (AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <posRPhiZ volume="ECT_EV_FrontAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 202.5 ; (AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <posRPhiZ volume="ECT_EV_BackAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 22.5 ; -(AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <posRPhiZ volume="ECT_EV_BackAttachment" R_Phi_Z=" AECT_EVTSRa_EVTopSupportRadius + (AECT_EVTSAl_EVTopSupportlength)/2. ; 202.5 ; -(AECT_EVOShZ_EVOutShellholeZwid - AECT_EVTSAh_EVTopSupporthight)/2." />
+ <mposPhi volume="ECT_EV_CryoStop_outside" ncopy="8" />
+ <mposPhi volume="ECT_EV_CryoStop_inside" ncopy="8" />
+ <posXYZ volume="ECT_ServTur" X_Y_Z=" 0. ; AECT_SrvTu1He_ServTur1Height/2. + AECT_EVEPod_EVEndPlateoutdist - AECT_EVOSio_EVOutShellinneroff; -AECT_EVOShZ_EVOutShellholeZwid/2.+AECT_ServTuZoff_ServTurZoffset" />
+ <posXYZ volume="ECT_ServiceTower" X_Y_Z=" 0. ; ECST_SToYpos ; -ECST_SToThic2 - AECT_EVOShZ_EVOutShellholeZwid/2. + AECT_ServTuZoff_ServTurZoffset - ECST_SToDzBot/2. " rot="0. ; 0. ; 0. " />
+ <posXYZ volume="ECT_SuppoWheels" />
+</composition>
+
+<composition name="ECT_ToroidN" >
+ <posXYZ volume="ECT_Toroid_single" X_Y_Z=" 0. ; 0. ; -AECT_Toroid_ZPosition" >
+ <ring value="-1" />
+ </posXYZ>
+</composition>
+
+<composition name="ECT_ToroidP" >
+ <posXYZ volume="ECT_Toroid_single" X_Y_Z=" 0. ; 0. ; AECT_Toroid_ZPosition" rot="0. ; 180. ; 0. ">
+ <ring value=" 1" />
+ </posXYZ>
+</composition>
+
+<composition name="ECT_Toroids" >
+ <posXYZ volume="ECT_ToroidN" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="ECT_ToroidP" X_Y_Z=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- gvxy status 10/25 are converted to subtractions -->
+
+</section>
+
+
+<section name = "Atlas Barrel Toroidal Magnets"
+ version = "7.0"
+ date = "01-01-10, 28 November 2002"
+ author = "Jochen Meyer, Laurent Chevalier, Marc Virchaux, Daniel Pomarede"
+ top_volume = "BAR_Toroid">
+
+<!-- name = Atlas Barrel Toroidal Magnets section name = "Magnets" -->
+
+<!-- reviewed/corrected in March 2010 by Jochen Meyer
+ comment: * blueprint references are available on the twiki Pages
+ * still some details are missing -->
+
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** Atlas Barrel Toroid (BAR) ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+<!-- Atlas Barrel toroid Cryostat -->
+
+<var name="ABRT_CryoRmin" value=" 4720." /> <!-- atltbw__0002-vAD 4745. -->
+<var name="ABRT_CryoRmax" value=" 10030." /> <!-- atltbw__0002-vAD 10065. -->
+<var name="ABRT_CryoZmax" value=" 12630." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryoRcur" value=" 821." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryoRadi_Radius" value=" 550." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryoRadT_RadThick" value=" 15." /> <!-- not confirmed -->
+
+<!-- Cryostat Attachment -->
+
+<!-- BEGIN confirmation with atltbyv_0010-vAB (if no other comment) -->
+<var name="ABRT_CryAttD0_CryoAttDiam0" value=" 550." />
+<var name="ABRT_CryAttD1_CryoAttDiam1" value=" 439." />
+<var name="ABRT_CryAttAl_CryoAttAlfa" value=" 8." /> <!-- atltbwv_0029-vAB -->
+<var name="ABRT_CryAttXh_CryoAttXhigh" value=" 1490." />
+<var name="ABRT_CryAttTh_CryoAttThick" value=" 10." />
+<var name="ABRT_CryAttRx_CryoAttRmax" value=" ABRT_CryoRmin + ABRT_CryoRadi_Radius" />
+<var name="ABRT_CryAttSe_CryoAttSlimend" value=" 557." />
+<!-- END confirmation with atltbyv_0010-vAB -->
+
+<!-- BEGIN confirmation with atltbyv_0007-vAC (if no other comment) -->
+<var name="ABRT_CryAtWiY_CryoAttWingY" value=" 600." />
+<var name="ABRT_CryAtWXp_CryoAttWingXp" value=" 590." />
+<var name="ABRT_CryAtWXn_CryoAttWingXn" value=" -41." />
+<var name="ABRT_CryAtWBo_CryoAttWingBoss" value=" 40." />
+<var name="ABRT_CryAtWTh_CryoAttWingThick" value=" 20." /> <!-- atltbyv_0004-vAC -->
+<var name="ABRT_CryAtWZe_CryoAttWingZesp" value=" 590." /> <!-- atltbyv_0003-vAE --> <!-- atltbyv_0004-vAC -->
+<var name="ABRT_CryAtWRa_CryoAttWingRad" value=" 570." />
+<var name="ABRT_CryAtWYc_CryoAttWingYcut" value=" 150." />
+<!-- END confirmation with atltbyv_0007-vAC -->
+
+<!-- Cryostat Ribs -->
+
+<!-- BEGIN confirmation with atltbyv_0004-vAC (if no other comment) -->
+<var name="ABRT_CryRibYw_CryoRibYwid" value=" 500." />
+<var name="ABRT_CryRibZl_CryoRibZlen" value=" 290." /> <!-- approx. since length is varying for each rib -->
+<var name="ABRT_CryRibTh_CryoRibThick" value=" 10." />
+<var name="ABRT_CryRiWYp_CryoRibWingYp" value=" 436." />
+<var name="ABRT_CryRiWYn_CryoRibWingYn" value=" 1100." />
+<var name="ABRT_CryRiWXp_CryoRibWingXp" value=" 430." />
+<var name="ABRT_CryRiWTh_CryoRibWingThick" value=" 10." />
+<var name="ABRT_CryRiWXc_CryoRibWingXncut" value=" 75." />
+<var name="ABRT_CryRiWAn_CryoRibWingAngle" value=" 62." />
+<var name="ABRT_CryRiWXn_CryoRibWingXn" value=" -tan(ABRT_CryRiWAn_CryoRibWingAngle*GENV_PiS180)*(ABRT_CryRiWYn_CryoRibWingYn - ABRT_CryRiWYp_CryoRibWingYp)/2. + ABRT_CryRiWXp_CryoRibWingXp " />
+<!-- END confirmation with atltbyv_0004-vAC -->
+
+<!-- Cryostat Ring -->
+
+<var name="ABRT_CryRngRm_CryoRingRmed" value=" 8790." /> <!-- atltbw__0002-vAD-->
+<var name="ABRT_CryRngZm_CryoRingZmed" value=" -1030." /> <!-- atltbyv_0003-vAE -->
+<var name="ABRT_CryRngRa_CryoRingRadius" value=" 340." /> <!-- atltbyv_0004-vAC -->
+
+
+<!-- Struts -->
+<!-- BEGIN confirmation with atltbws_0023-vAA (if no other comment) -->
+<var name="ABRT_StrtYlen" value=" 5690." />
+<var name="ABRT_StrtZwid_StrutZwidth" value=" 500." />
+<var name="ABRT_StrtRthi_StrutRthick" value=" 50." />
+<var name="ABRT_StrtPoff_StrutPlateoff" value=" 50." />
+<var name="ABRT_StrtPthi_StrutPlatethick" value=" 50." />
+<var name="ABRT_StrtZthi_StrutZthick" value=" 40." />
+<!-- END confirmation with atltbws_0023-vAA -->
+
+<var name="ABRT_StrWRmax_StrutWingRmax" value="ABRT_CryoRmax" /> <!-- has to be true, otherwise everything will break down-->
+
+<!-- BEGIN confirmation with atltbyv_0006-vAB (if no other comment) -->
+<var name="ABRT_StrWYmax_StrutWingYmax" value=" 390." />
+<var name="ABRT_StrWYmed_StrutWingYmedi" value=" 791." />
+<var name="ABRT_StrWYRli_StrutWingYRlink" value=" 732." />
+<var name="ABRT_StrWRwid_StrutWingRwidth" value=" 1250." />
+<var name="ABRT_StrWYmin_StrutWingYmin" value=" 245." />
+<var name="ABRT_StrWZthi_StrutWingZthick" value=" 20." />
+<var name="ABRT_StrWYthi_StrutWingYthick" value=" 50." />
+<var name="ABRT_StrWZlen_StrutWingZlen" value=" 430." />
+<var name="ABRT_StrWYucu_StrutWingYupcut" value=" 150." />
+<var name="ABRT_StrWSPth_StrutWingSmallPlatethick" value=" 500." />
+<var name="ABRT_StrWBPth_StrutWingBigPlatethick" value=" 520." />
+<var name="ABRT_StrWBPhi_StrutWingBigPlateheight" value=" 700." />
+<!-- END confirmation with atltbyv_0006-vAB -->
+
+<array name="ABRT_Zvouss" values=" -10845. ; -8245. ; -5137.5 ; -1712.5 ; 1712.5 ; 5137.5 ; 8245. ; 10845. " /> <!-- atltbyv_0003-vAE -->
+<array name="ABRT_Zrib" values=" -9540. ; -6760. ; -3490. ; 0. ; 3490. ; 6760. ; 9540. " /> <!-- atltbyv_0003-vAE -->
+
+
+
+<!-- Derived variables -->
+
+<var name="ABRT_CryRiXhi_CryoRibXhigh" value="(ABRT_CryoRmax+ABRT_CryoRmin)/2. - ABRT_CryoRmin - ABRT_CryoRadi_Radius" />
+<var name="ABRT_CryAttXs_CryoAttXsec" value="(ABRT_CryAttD0_CryoAttDiam0 - 2.*ABRT_CryAttTh_CryoAttThick - ABRT_CryAttD1_CryoAttDiam1)/2./tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180)" />
+<var name="ABRT_StrWRmed_StrutWingRmedi" value="(ABRT_StrtYlen + 2.* ( ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick)) / 2. / GENV_Si225" />
+<var name="ABRT_StrWRmin_StrutWingRmin" value="ABRT_StrWRmax_StrutWingRmax - ABRT_StrWRwid_StrutWingRwidth" />
+<var name="ABRT_StrWYlow_StrutWingYlower" value="(ABRT_StrWRmin_StrutWingRmin - ABRT_StrWYmin_StrutWingYmin * GENV_Ta20 - ABRT_StrWRmed_StrutWingRmedi + ABRT_StrWYmed_StrutWingYmedi / GENV_Ta225 ) / (GENV_Ta675 - GENV_Ta20)" />
+<var name="ABRT_StrWRlow_StrutWingRlower" value="GENV_Ta675 * ABRT_StrWYlow_StrutWingYlower + ABRT_StrWRmed_StrutWingRmedi - ABRT_StrWYmed_StrutWingYmedi / GENV_Ta225 " />
+<var name="ABRT_StrWAlow_StrutWingAlower" value="atan((ABRT_StrWRlow_StrutWingRlower-ABRT_StrWRmax_StrutWingRmax + ABRT_StrWRwid_StrutWingRwidth)/(ABRT_StrWYlow_StrutWingYlower-ABRT_StrWYmin_StrutWingYmin))" />
+<var name="ABRT_StrWAupp_StrutWingAupper" value="atan((ABRT_StrWRmax_StrutWingRmax-ABRT_StrWRmed_StrutWingRmedi)/(ABRT_StrWYmed_StrutWingYmedi-ABRT_StrWYmax_StrutWingYmax))" />
+
+<!-- Description of an Atlas Barrel Cold Mass -->
+
+<!-- BEGIN confirmation with atltbcc_0002-v0 (if no other comment) -->
+<var name="ABRT_CoMaRmin_ColdMassRmin" value=" 4851.1" /> <!-- not confirmed, old GUESS 4857.5 -->
+<var name="ABRT_CoMaRmax_ColdMassRmax" value=" 9924.3" /> <!-- not confirmed, old GUESS 9952.5 -->
+<var name="ABRT_CoMaZmax_ColdMassZmax" value="12478.8" /> <!-- warm: 12532.5 -->
+<var name="ABRT_CoMaRcuI_ColdMassRcurv" value=" 1449.8" /> <!-- warm: 1456. -->
+<var name="ABRT_CoMaRThi_ColdMassRThick" value=" 791.6" /> <!-- warm: 795. -->
+<var name="ABRT_CoMaYThi_ColdMassYThick" value=" 288. " /> <!-- warm: 288. (here warm value used because of ABRT_BielAtTh_BiellAttThick=288. too) -->
+<var name="ABRT_CoMaRibZ_ColdMassRibZ" value=" 99.6" /> <!-- warm: 100. -->
+<var name="ABRT_CoMaRanL_ColdMassRanglen" value=" 385.6" /> <!-- warm: 387.2 -->
+<!-- END confirmation with atltbcc_0002-v0 -->
+
+<box name="BAR_ColdMassAlongZ" material="Aluminium8" X_Y_Z="ABRT_CoMaRThi_ColdMassRThick; ABRT_CoMaYThi_ColdMassYThick; 2.*(ABRT_CoMaZmax_ColdMassZmax - ABRT_CoMaRcuI_ColdMassRcurv) - GENV_Eps" />
+<box name="BAR_ColdMassAlongR" material="Aluminium8" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRmin_ColdMassRmin - 2.*ABRT_CoMaRcuI_ColdMassRcurv - GENV_Eps; ABRT_CoMaYThi_ColdMassYThick; ABRT_CoMaRThi_ColdMassRThick " />
+
+<gvxy name="BAR_CornerAngled_Cut" material="Aluminium8" dZ="ABRT_CoMaYThi_ColdMassYThick + GENV_Eps" >
+ <gvxy_point X_Y=" ABRT_CoMaRThi_ColdMassRThick; -GENV_Eps " />
+ <gvxy_point X_Y=" ABRT_CoMaRThi_ColdMassRThick; ABRT_CoMaRcuI_ColdMassRcurv - ABRT_CoMaRThi_ColdMassRThick - ABRT_CoMaRanL_ColdMassRanglen" />
+ <gvxy_point X_Y=" ABRT_CoMaRThi_ColdMassRThick + ABRT_CoMaRanL_ColdMassRanglen; ABRT_CoMaRcuI_ColdMassRcurv - ABRT_CoMaRThi_ColdMassRThick" />
+ <gvxy_point X_Y=" ABRT_CoMaRcuI_ColdMassRcurv + GENV_Eps; ABRT_CoMaRcuI_ColdMassRcurv - ABRT_CoMaRThi_ColdMassRThick" />
+ <gvxy_point X_Y=" ABRT_CoMaRcuI_ColdMassRcurv + GENV_Eps; -GENV_Eps " />
+</gvxy>
+<tubs name="BAR_CornerRound" material="Aluminium8" Rio_Z=" 0. ; ABRT_CoMaRcuI_ColdMassRcurv ; ABRT_CoMaYThi_ColdMassYThick" profile="90.; 90." nbPhi="8" />
+<subtraction name="BAR_Corner" >
+ <posXYZ volume="BAR_CornerRound" X_Y_Z=" ABRT_CoMaRcuI_ColdMassRcurv; 0. ; 0. " rot=" 90. ; 0. ; 0. "/>
+ <posXYZ volume="BAR_CornerAngled_Cut" X_Y_Z=" 0. ; 0. ; 0. " rot=" 90. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="BAR_ColdMassRib" material="Aluminium8" X_Y_Z=" ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRmin_ColdMassRmin - 2.*ABRT_CoMaRThi_ColdMassRThick - GENV_Eps; ABRT_CoMaYThi_ColdMassYThick; ABRT_CoMaRibZ_ColdMassRibZ" />
+
+<composition name="BAR_ColdMassCoil" >
+ <posXYZ volume="BAR_ColdMassAlongZ" X_Y_Z="ABRT_CoMaRmin_ColdMassRmin + ABRT_CoMaRThi_ColdMassRThick/2. ; 0; 0." />
+ <posXYZ volume="BAR_ColdMassAlongZ" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRThi_ColdMassRThick/2. ; 0; 0." />
+ <posXYZ volume="BAR_ColdMassAlongR" X_Y_Z="(ABRT_CoMaRmax_ColdMassRmax+ABRT_CoMaRmin_ColdMassRmin)/2.; 0; ABRT_CoMaZmax_ColdMassZmax - ABRT_CoMaRThi_ColdMassRThick/2." />
+ <posXYZ volume="BAR_ColdMassAlongR" X_Y_Z="(ABRT_CoMaRmax_ColdMassRmax+ABRT_CoMaRmin_ColdMassRmin)/2.; 0; -ABRT_CoMaZmax_ColdMassZmax + ABRT_CoMaRThi_ColdMassRThick/2." />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmin_ColdMassRmin ; 0.; ABRT_CoMaZmax_ColdMassZmax - ABRT_CoMaRcuI_ColdMassRcurv" rot=" 0. ; 0. ; 0. " />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmin_ColdMassRmin + ABRT_CoMaRcuI_ColdMassRcurv ; 0.; -ABRT_CoMaZmax_ColdMassZmax" rot=" 0. ; 270. ; 0. " />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax ; 0.; -ABRT_CoMaZmax_ColdMassZmax + ABRT_CoMaRcuI_ColdMassRcurv" rot=" 0. ; 180. ; 0. " />
+ <posXYZ volume="BAR_Corner" X_Y_Z="ABRT_CoMaRmax_ColdMassRmax - ABRT_CoMaRcuI_ColdMassRcurv; 0.; ABRT_CoMaZmax_ColdMassZmax" rot=" 0. ; 90. ; 0. " />
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_ColdMassRib" X_Y_Z=" (ABRT_CoMaRmax_ColdMassRmax+ABRT_CoMaRmin_ColdMassRmin)/2.; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</composition>
+
+
+<!-- Description of an Atlas Barrel toroid Biellette -->
+
+<!-- BEGIN confirmation with atltbys_0002-v0 (if no other comment) -->
+<var name="ABRT_BielYhei_BiellYheight" value= "1099." /> <!-- approx., explanation see twikipage -->
+<var name="ABRT_BielYso1_BiellYsole1" value= " 27." /> <!-- approx., explanation see twikipage -->
+<var name="ABRT_BielXsol_BiellXsole" value= " 130." />
+<var name="ABRT_BielXth1_BiellXthick1" value= " 20." />
+<var name="ABRT_BielXth2_BiellXthick2" value= " 30." />
+<var name="ABRT_BielZth1_BiellZthick1" value= " 240." />
+<var name="ABRT_BielRHol_BiellRadHole" value= " 62." />
+<var name="ABRT_BielYcHo_BiellYcenHole" value= " 120." />
+<var name="ABRT_BielElen_BiellEdgeLen" value= " 120." />
+<var name="ABRT_BielYki1_BiellYKink1" value= " 484." />
+<var name="ABRT_BielAki1_BiellAngKink1" value= " 10." />
+<var name="ABRT_BielAppr_BiellApprox" value= " 21." /> <!-- approx., explanation see twikipage -->
+<!-- END confirmation with atltbys_0002-v0 -->
+
+<var name="ABRT_BielYso2_BiellYsole2" value= " GENV_Ta15 * (ABRT_BielXsol_BiellXsole - ABRT_BielXth1_BiellXthick1)/2. + ABRT_BielYso1_BiellYsole1" />
+<var name="ABRT_BielYXHo_BiellXYHole" value= " ABRT_BielElen_BiellEdgeLen * ( -1 + 2.*GENV_Si45 )" />
+
+<!-- Aluminium7 to be replaced by Titanium7 !!!! -->
+<gvxysx name="BAR_Biellette_1" material="Aluminium7" dZ="ABRT_BielZth1_BiellZthick1" >
+ <gvxy_point X_Y=" ABRT_BielYXHo_BiellXYHole ; 0. " />
+ <gvxy_point X_Y=" ABRT_BielElen_BiellEdgeLen ; ABRT_BielElen_BiellEdgeLen - ABRT_BielYXHo_BiellXYHole " />
+ <gvxy_point X_Y=" ABRT_BielElen_BiellEdgeLen ; ABRT_BielElen_BiellEdgeLen + 49.7 " />
+ <gvxy_point X_Y=" ABRT_BielXth2_BiellXthick2/2. ; ABRT_BielElen_BiellEdgeLen + 49.7 + (ABRT_BielZth1_BiellZthick1 - ABRT_BielXth2_BiellXthick2)/(2. * tan(40.0*GENV_PiS180)) " />
+ <gvxy_point X_Y=" ABRT_BielXth2_BiellXthick2/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYki1_BiellYKink1 + ABRT_BielAppr_BiellApprox - (ABRT_BielXth2_BiellXthick2 - ABRT_BielXth1_BiellXthick1)/tan(ABRT_BielAki1_BiellAngKink1*GENV_PiS180) " />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYki1_BiellYKink1 + ABRT_BielAppr_BiellApprox" />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYso2_BiellYsole2 " />
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole/2. ; ABRT_BielYhei_BiellYheight - ABRT_BielYso1_BiellYsole1 " />
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole/2. ; ABRT_BielYhei_BiellYheight " />
+</gvxysx>
+<tubs name="BAR_Biellette_2" material="Aluminium7" Rio_Z="0.; ABRT_BielRHol_BiellRadHole; 300." nbPhi="16" />
+<gvxy name="BAR_Biellette_3" material="Aluminium7" dZ="500." >
+ <gvxy_point X_Y=" 70. ; -GENV_Eps " />
+ <gvxy_point X_Y=" 70. ; 246. " />
+ <gvxy_point X_Y=" ABRT_BielZth1_BiellZthick1/2. + GENV_Eps ; 358. " />
+ <gvxy_point X_Y=" ABRT_BielZth1_BiellZthick1/2. + GENV_Eps ; -GENV_Eps " />
+</gvxy>
+<subtraction name="BAR_Biellette" >
+ <posXYZ volume="BAR_Biellette_1" />
+ <posXYZ volume="BAR_Biellette_2" X_Y_Z=" 0. ; ABRT_BielYcHo_BiellYcenHole ; 0. " />
+ <posXYZ volume="BAR_Biellette_3" rot=" 0. ; 90. ; 0. " />
+ <posXYZ volume="BAR_Biellette_3" rot=" 0. ; -90. ; 0. " />
+</subtraction>
+
+
+<!-- BEGIN confirmation with atltbcc_0006-v0 (if no other comment) -->
+<var name="ABRT_BielAtL1_BiellAttLeng1" value= " 575. " />
+<var name="ABRT_BielAtL2_BiellAttLeng2" value= " 280. " />
+<var name="ABRT_BielAtTh_BiellAttThick" value= " 288. " />
+<var name="ABRT_BielAtHe_BiellAttHeight" value= " 147.5" />
+<!-- END confirmation with atltbcc_0006-v0 -->
+
+<trd name="BAR_BiellAttFull" material="Aluminium8" Xmp_Ymp_Z=" ABRT_BielAtL1_BiellAttLeng1 ; ABRT_BielAtL2_BiellAttLeng2 ; ABRT_BielAtTh_BiellAttThick ; ABRT_BielAtTh_BiellAttThick ; ABRT_BielAtHe_BiellAttHeight " />
+<gvxysx name="BAR_BiellAttHol" material="Aluminium8" dZ="2.*ABRT_BielAtTh_BiellAttThick" >
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole*0.6 ; -GENV_Eps " />
+ <gvxy_point X_Y=" ABRT_BielXsol_BiellXsole*0.6 ; ABRT_BielYso1_BiellYsole1 " />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1*0.7 ; ABRT_BielYso2_BiellYsole2+GENV_Eps " />
+ <gvxy_point X_Y=" ABRT_BielXth1_BiellXthick1*0.7 ; ABRT_BielAtHe_BiellAttHeight+GENV_Eps " />
+</gvxysx>
+<subtraction name="BAR_BiellAtt" >
+ <posXYZ volume="BAR_BiellAttFull" X_Y_Z=" ABRT_BielAtHe_BiellAttHeight/2. ; 0. ; 0. " rot=" 0. ; 90. ; 0. " />
+ <posXYZ volume="BAR_BiellAttHol" rot=" 90. ; 90. ; 0. " />
+</subtraction>
+
+<composition name="BAR_ColdMass_Sector" >
+ <posXYZ volume="BAR_ColdMassCoil" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. " />
+ <foreach index="Ivouss" begin="0" loops="8" >
+ <posXYZ volume="BAR_Biellette" X_Y_Z=" ABRT_CoMaRmin_ColdMassRmin+ABRT_CoMaRThi_ColdMassRThick+ABRT_BielYhei_BiellYheight+GENV_Eps ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 90. " />
+ <posXYZ volume="BAR_BiellAtt" X_Y_Z=" ABRT_CoMaRmin_ColdMassRmin+ABRT_CoMaRThi_ColdMassRThick+GENV_Eps ; 0. ; ABRT_Zvouss[Ivouss] " />
+ </foreach>
+</composition>
+
+
+
+
+<!-- Description of the Atlas Barrel toroid Cryostat -->
+
+<!-- basic CryoTube volumes, uncut -->
+<tubs name="BAR_CryoTubAlongZBase" material="Iron1" Rio_Z="ABRT_CryoRadi_Radius - ABRT_CryoRadT_RadThick; ABRT_CryoRadi_Radius; 2.*ABRT_CryoZmax - 2.*ABRT_CryoRadi_Radius - ABRT_CryoRcur*sqrt(2.) + 2.*GENV_Ta225*ABRT_CryoRadi_Radius" nbPhi="25" />
+<tubs name="BAR_CryoTubAlongRBase" material="Iron1" Rio_Z="ABRT_CryoRadi_Radius - ABRT_CryoRadT_RadThick; ABRT_CryoRadi_Radius; ABRT_CryoRmax - ABRT_CryoRmin - 2.*ABRT_CryoRadi_Radius - ABRT_CryoRcur*sqrt(2.) + 2.*GENV_Ta225*ABRT_CryoRadi_Radius" nbPhi="32" />
+<tubs name="BAR_CryoTubCornerBase" material="Iron1" Rio_Z="ABRT_CryoRadi_Radius - ABRT_CryoRadT_RadThick; ABRT_CryoRadi_Radius; ABRT_CryoRcur + 2.*GENV_Ta225*ABRT_CryoRadi_Radius" nbPhi="32" />
+
+<!-- basic CryoRib volumes, uncut -->
+<box name="BAR_CryoRibOut" material="Iron1" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRmin - 2.* ABRT_CryoRadi_Radius ; ABRT_CryRibYw_CryoRibYwid ; ABRT_CryRibZl_CryoRibZlen " />
+<box name="BAR_CryoRibIn" material="Iron6" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRmin - 2.* ABRT_CryoRadi_Radius + 2.*GENV_Eps ; ABRT_CryRibYw_CryoRibYwid-2.*ABRT_CryRibTh_CryoRibThick ; ABRT_CryRibZl_CryoRibZlen-2.*ABRT_CryRibTh_CryoRibThick " />
+
+<!-- basic CryoAtt volumes, uncut -->
+<pcon name="BAR_CryoAttOut" material="Iron1" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. ; 0. " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttXs_CryoAttXsec - ABRT_CryAttSe_CryoAttSlimend" />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2.+ABRT_CryAttTh_CryoAttThick ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttSe_CryoAttSlimend" />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2.+ABRT_CryAttTh_CryoAttThick ; ABRT_CryAttXh_CryoAttXhigh " />
+</pcon>
+<pcon name="BAR_CryoAttIn" material="Iron6" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2.-ABRT_CryAttTh_CryoAttThick ; -GENV_Eps " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2.-ABRT_CryAttTh_CryoAttThick ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttXs_CryoAttXsec - ABRT_CryAttSe_CryoAttSlimend - ABRT_CryAttTh_CryoAttThick*tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180/2.) " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2. ; ABRT_CryAttXh_CryoAttXhigh - ABRT_CryAttSe_CryoAttSlimend-ABRT_CryAttTh_CryoAttThick*tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180/2.) " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD1_CryoAttDiam1/2. ; ABRT_CryAttXh_CryoAttXhigh + GENV_Eps " />
+</pcon>
+
+<!-- CryoTube cut volumes -->
+<box name="BAR_CryoTubCutBox" material="Iron1" X_Y_Z="2.*ABRT_CryoRadi_Radius/GENV_Co225; 2.*ABRT_CryoRadi_Radius/GENV_Co225; 2.*ABRT_CryoRadi_Radius/GENV_Co225 " />
+<tubs name="BAR_CryoTubCut" material="Iron1" Rio_Z=" 0. ; ABRT_CryoRadi_Radius+10.*GENV_Eps ; 2.*ABRT_CryRngRa_CryoRingRadius+2.*ABRT_CryRibZl_CryoRibZlen+ABRT_StrWZlen_StrutWingZlen " nbPhi="32" />
+
+<!-- Begin of CryoRibWing -->
+<gvxysx name="BAR_CryoRibWingA" material="Iron4" dZ=" ABRT_CryRibZl_CryoRibZlen+2.*ABRT_CryRiWTh_CryoRibWingThick+2.*GENV_Eps" >
+ <gvxy_point X_Y=" ABRT_CryRiWYp_CryoRibWingYp/2. ; ABRT_CryRiWXp_CryoRibWingXp " />
+ <gvxy_point X_Y=" ABRT_CryRiWYn_CryoRibWingYn/2. ; ABRT_CryRiWXn_CryoRibWingXn " />
+ <gvxy_point X_Y=" ABRT_CryRiWYn_CryoRibWingYn/2. ; -ABRT_CryoRadi_Radius+ABRT_CryRiWXc_CryoRibWingXncut " />
+</gvxysx>
+<box name="BAR_CryoRibWingB" material="Iron1" X_Y_Z=" 4.*ABRT_CryoRadi_Radius ; 4.*ABRT_CryoRadi_Radius ; ABRT_CryRibZl_CryoRibZlen+2.*GENV_Eps " />
+<subtraction name="BAR_CryoRibWing" >
+ <posXYZ volume="BAR_CryoRibWingA" />
+ <posXYZ volume="BAR_CryoRibWingB" />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" 0. ; -ABRT_CryoRadi_Radius - 5.*GENV_Eps ; 0. " />
+</subtraction>
+<!-- End of CryoRibWing -->
+
+<!-- Begin of CryoAttWing -->
+<gvxysx name="BAR_CryoAttWingA" material="Iron4" dZ=" ABRT_CryAtWZe_CryoAttWingZesp+2.*ABRT_CryAtWTh_CryoAttWingThick" >
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY-ABRT_CryAtWBo_CryoAttWingBoss ; ABRT_CryAtWXp_CryoAttWingXp " />
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY ; ABRT_CryAtWXp_CryoAttWingXp-ABRT_CryAtWBo_CryoAttWingBoss " />
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY ; ABRT_CryAtWXn_CryoAttWingXn " />
+ <gvxy_point X_Y=" ABRT_CryAtWiY_CryoAttWingY-(2*ABRT_CryoRadi_Radius+ABRT_CryAtWXn_CryoAttWingXn)*GENV_Ta225 ;-2.*ABRT_CryoRadi_Radius " />
+</gvxysx>
+<box name="BAR_CryoAttWingB" material="Iron1" X_Y_Z=" 4.*ABRT_CryoRadi_Radius ; 6.*ABRT_CryoRadi_Radius ; ABRT_CryAtWZe_CryoAttWingZesp " />
+<tubs name="BAR_CryoAttWingC" material="Iron4" Rio_Z=" ABRT_CryAtWRa_CryoAttWingRad ; 2.*ABRT_CryAtWRa_CryoAttWingRad ; 2.*ABRT_CryAtWZe_CryoAttWingZesp " profile=" 202.5 ; 135. " nbPhi="16" />
+<box name="BAR_CryoAttWingD" material="Iron1" X_Y_Z=" 2.*ABRT_CryAtWYc_CryoAttWingYcut ; 2.*ABRT_CryoRadi_Radius ; 3.*ABRT_CryAtWZe_CryoAttWingZesp " />
+<subtraction name="BAR_CryoAttWing" >
+ <posXYZ volume="BAR_CryoAttWingA" />
+ <posXYZ volume="BAR_CryoAttWingB" />
+ <posXYZ volume="BAR_CryoAttWingC" />
+ <posXYZ volume="BAR_CryoTubCut" />
+ <posXYZ volume="BAR_CryoAttWingD" X_Y_Z=" 0. ; -ABRT_CryoRadi_Radius ; 0. " />
+</subtraction>
+<!-- End of CryoAttWing -->
+<!-- laurent -->
+<!-- Begin of CryoTube volumes including cuts -->
+<subtraction name="BAR_CryoTubAlongZ_Down" >
+ <posXYZ volume="BAR_CryoTubAlongZBase" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius ; 0. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps " rot=" 0. ; 22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; -(ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps)" rot=" 0. ; -22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="0" loops="8" >
+ <posXYZ volume="BAR_CryoAttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_CryoTubAlongZ_Up" >
+ <posXYZ volume="BAR_CryoTubAlongZBase" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius; 0. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps " rot=" 0. ; -22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 ; 0. ; -(ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps)" rot=" 0. ; 22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_CryoTubAlongR_Plus" >
+ <posXYZ volume="BAR_CryoTubAlongRBase" X_Y_Z=" (ABRT_CryoRmin + ABRT_CryoRmax)/2.; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius" rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRcur/sqrt(2.) + GENV_Eps; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 " rot=" 0. ; -22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRcur/sqrt(2.) - GENV_Eps; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRadi_Radius*GENV_Ta225 " rot=" 0. ; 22.5 ; 0. "/>
+</subtraction>
+
+<subtraction name="BAR_CryoTubCorner" >
+ <posXYZ volume="BAR_CryoTubCornerBase" X_Y_Z=" (ABRT_CryoRcur + 2.*GENV_Ta225*ABRT_CryoRadi_Radius)/(2.*sqrt(2.)) + ABRT_CryoRadi_Radius/sqrt(2.) + ABRT_CryoRmin; 0. ; (ABRT_CryoRcur + 2.*GENV_Ta225*ABRT_CryoRadi_Radius)/(2.*sqrt(2.)) - ABRT_CryoRadi_Radius/sqrt(2.) + ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRcur/sqrt(2.) + GENV_Ta225*ABRT_CryoRadi_Radius" rot=" 0. ; 45. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius - GENV_Ta225*ABRT_CryoRadi_Radius; 0. ; ABRT_CryoZmax - ABRT_CryoRcur/sqrt(2.) - 2.*ABRT_CryoRadi_Radius" rot=" 0. ; 22.5 ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCutBox" X_Y_Z=" ABRT_CryoRmin + 2.*ABRT_CryoRadi_Radius + ABRT_CryoRcur/sqrt(2.) ; 0. ; ABRT_CryoZmax - ABRT_CryoRadi_Radius + ABRT_CryoRadi_Radius*GENV_Ta225" rot=" 0. ; -22.5 ; 0. "/>
+</subtraction>
+<!-- End of CryoTube with cuts -->
+
+<!-- Begin of barrel toroid thermal shielding between CryoTub and Coldmass -->
+<var name="BAR_ThermShield_OuterAngle" value=" 35. " />
+<var name="BAR_ThermShield_InnerAngle" value=" 30. " />
+
+<var name="BAR_ThermShield_Thickness" value=" 5. " />
+<var name="BAR_ThermShield_YHight" value=" 656. " />
+<var name="BAR_ThermShield_OuterXLenght" value=" 152. " />
+<var name="BAR_ThermShield_InnerXLenght" value=" 121. " />
+<var name="BAR_ThermShield_TopXLenght" value=" 657. " />
+<var name="BAR_ThermShield_XOverlap" value=" 35. " />
+
+<!-- <var name="BAR_ThermShield_TotalZLength" value=" 25105. " /> replaced by Zmax of coldmass to be consistent, arbitrary value added to resolve overlap, difference after adding arbitrary value of 80 is 67.4 mm -->
+<var name="BAR_ThermShield_TotalZLength" value=" 2.*ABRT_CoMaZmax_ColdMassZmax + 80. " />
+<!-- <var name="BAR_ThermShield_TotalXLength" value=" 5135. " /> replaced by radius diff of coldmass to be consistent, difference 61.8 mm, adding arbitrary value to resolve overlap, afterwards only 11.8mm diff -->
+<var name="BAR_ThermShield_RadiusMin" value="ABRT_CoMaRmin_ColdMassRmin - 25. " />
+<var name="BAR_ThermShield_RadiusMax" value="ABRT_CoMaRmax_ColdMassRmax + 25. " />
+<var name="BAR_ThermShield_TotalXLength" value="BAR_ThermShield_RadiusMax - BAR_ThermShield_RadiusMin" />
+<var name="BAR_ThermShield_OuterEdgeLen" value=" 1217.4 " />
+
+<var name="BAR_ThermShield_XLenght" value="BAR_ThermShield_TopXLenght+BAR_ThermShield_InnerXLenght+BAR_ThermShield_OuterXLenght-2.*BAR_ThermShield_XOverlap" />
+
+<gvxysx name="BAR_ThermShield_AlongZOuter" material="Aluminium1" dZ="(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5.-GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) ; BAR_ThermShield_XLenght/2." />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2.+ BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) ; -BAR_ThermShield_XLenght/2." />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_AlongZInner" material="Aluminium1" dZ="(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5.-GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_InnerAngle/2.*GENV_PiS180); BAR_ThermShield_XLenght/2. - BAR_ThermShield_Thickness" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap - BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_InnerAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap + BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_OuterAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_OuterAngle/2.*GENV_PiS180); -BAR_ThermShield_XLenght/2. + BAR_ThermShield_Thickness" />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_AlongROuter" material="Aluminium1" dZ="BAR_ThermShield_TotalXLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45 - GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) ; BAR_ThermShield_XLenght/2." />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2.+ BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) ; -BAR_ThermShield_XLenght/2." />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_AlongRInner" material="Aluminium1" dZ="BAR_ThermShield_TotalXLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45 - GENV_Eps">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_InnerAngle/2.*GENV_PiS180); BAR_ThermShield_XLenght/2. - BAR_ThermShield_Thickness" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap - BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_InnerAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap + BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_OuterAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_OuterAngle/2.*GENV_PiS180); -BAR_ThermShield_XLenght/2. + BAR_ThermShield_Thickness" />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_CornerOuter" material="Aluminium1" dZ="BAR_ThermShield_OuterEdgeLen">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) ; BAR_ThermShield_XLenght/2." />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. + BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2.+ BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) ; -BAR_ThermShield_XLenght/2." />
+</gvxysx>
+
+<gvxysx name="BAR_ThermShield_CornerInner" material="Aluminium1" dZ="BAR_ThermShield_OuterEdgeLen">
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_InnerXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_InnerAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_InnerAngle/2.*GENV_PiS180); BAR_ThermShield_XLenght/2. - BAR_ThermShield_Thickness" />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght + BAR_ThermShield_XOverlap - BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_InnerAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; BAR_ThermShield_XLenght/2. - BAR_ThermShield_InnerXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - BAR_ThermShield_Thickness ; -BAR_ThermShield_XLenght/2. + BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap + BAR_ThermShield_Thickness * tan( (90.-BAR_ThermShield_OuterAngle)/2.*GENV_PiS180) " />
+ <gvxy_point X_Y=" BAR_ThermShield_YHight/2. - (BAR_ThermShield_OuterXLenght - BAR_ThermShield_XOverlap)/tan( BAR_ThermShield_OuterAngle*GENV_PiS180) - BAR_ThermShield_Thickness*tan( BAR_ThermShield_OuterAngle/2.*GENV_PiS180); -BAR_ThermShield_XLenght/2. + BAR_ThermShield_Thickness" />
+</gvxysx>
+
+<box name="BAR_ThermShield_CutBox" material="Aluminium1" X_Y_Z="BAR_ThermShield_XLenght/GENV_Co225; BAR_ThermShield_XLenght/GENV_Co225; BAR_ThermShield_XLenght/GENV_Co225" />
+
+<pcon name="BAR_ThermShield_AttIn" material="Aluminium1" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. + 20. ; -GENV_Eps " />
+ <polyplane Rio_Z="0. ; ABRT_CryAttD0_CryoAttDiam0/2. + 20. ; ABRT_CryAttXh_CryoAttXhigh + GENV_Eps " />
+</pcon>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part1" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. + BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps " rot=" 0. ; 22.5 ; 0. "/>
+ <foreach index="Irib" begin="6" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="6" loops="2" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part2" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <foreach index="Irib" begin="4" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="5" loops="1" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part3" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; -90. "/>
+ <foreach index="Irib" begin="3" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="3" loops="2" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part4" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <foreach index="Irib" begin="1" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="2" loops="1" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Down_Part5" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght/2. + BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; -(BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps)" rot=" 0. ; -22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+ <foreach index="Ivouss" begin="0" loops="2" >
+ <posXYZ volume="BAR_ThermShield_AttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 90. ; 0. " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part1" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps " rot=" 0. ; -22.5 ; 0. "/>
+ <foreach index="Irib" begin="6" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part2" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; (BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <foreach index="Irib" begin="4" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part3" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; 0. " rot=" 0. ; 0. ; 90. "/>
+ <foreach index="Irib" begin="3" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part4" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <foreach index="Irib" begin="1" loops="2" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongZ_Up_Part5" >
+ <posXYZ volume="BAR_ThermShield_AlongZOuter" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_AlongZInner" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. ; 0. ; -2.*(BAR_ThermShield_TotalZLength - 2.*BAR_ThermShield_OuterEdgeLen*GENV_Si45)/5. " rot=" 0. ; 0. ; 90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMax - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 ; 0. ; -(BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps)" rot=" 0. ; 22.5 ; 0. "/>
+ <foreach index="Irib" begin="0" loops="1" >
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax+ABRT_CryoRmin)/2. ; 0. ; ABRT_Zrib[Irib] " />
+ </foreach>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_AlongR" >
+ <posXYZ volume="BAR_ThermShield_AlongROuter" X_Y_Z=" (BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax)/2.; 0. ; (BAR_ThermShield_TotalZLength - BAR_ThermShield_XLenght)/2. " rot=" -90. ; 0. ; -90. " />
+ <posXYZ volume="BAR_ThermShield_AlongRInner" X_Y_Z=" (BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax)/2.; 0. ; (BAR_ThermShield_TotalZLength - BAR_ThermShield_XLenght)/2. " rot=" -90. ; 0. ; -90. " />
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) + GENV_Eps; 0. ; BAR_ThermShield_TotalZLength/2. - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 " rot=" 0. ; -22.5 ; 0. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMax - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - GENV_Eps; 0. ; BAR_ThermShield_TotalZLength/2. - BAR_ThermShield_XLenght/2. - BAR_ThermShield_XLenght/2.*GENV_Ta225 " rot=" 0. ; 22.5 ; 0. "/>
+</subtraction>
+
+<subtraction name="BAR_ThermShield_Corner" >
+ <posXYZ volume="BAR_ThermShield_CornerOuter" X_Y_Z=" (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + BAR_ThermShield_XLenght/2./sqrt(2.) + BAR_ThermShield_RadiusMin; 0. ; - (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + (2.+sqrt(2.))*BAR_ThermShield_XLenght*GENV_Ta225/(2.*sqrt(2.)) - (1.+sqrt(2.))*BAR_ThermShield_XLenght/(2.*sqrt(2.)) + BAR_ThermShield_TotalZLength/2." rot=" -45. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CornerInner" X_Y_Z=" (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + BAR_ThermShield_XLenght/2./sqrt(2.) + BAR_ThermShield_RadiusMin; 0. ; - (BAR_ThermShield_OuterEdgeLen)/(2.*sqrt(2.)) + (2.+sqrt(2.))*BAR_ThermShield_XLenght*GENV_Ta225/(2.*sqrt(2.)) - (1.+sqrt(2.))*BAR_ThermShield_XLenght/(2.*sqrt(2.)) + BAR_ThermShield_TotalZLength/2." rot=" -45. ; 0. ; -90. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + (1. - GENV_Ta225)*BAR_ThermShield_XLenght/2.; 0. ; BAR_ThermShield_TotalZLength/2. - (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) - BAR_ThermShield_XLenght" rot=" 0. ; 22.5 ; 0. "/>
+ <posXYZ volume="BAR_ThermShield_CutBox" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_XLenght + (BAR_ThermShield_OuterEdgeLen-BAR_ThermShield_XLenght*GENV_Ta225)/sqrt(2.) ; 0. ; BAR_ThermShield_TotalZLength/2. - BAR_ThermShield_XLenght/2.*(1. -GENV_Ta225)" rot=" 0. ; -22.5 ; 0. "/>
+</subtraction>
+
+<composition name="BAR_ThermShield_Sector" >
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part1" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part2" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part3" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part4" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Down_Part5" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part1" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part2" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part3" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part4" />
+ <posXYZ volume="BAR_ThermShield_AlongZ_Up_Part5" />
+ <posXYZ volume="BAR_ThermShield_AlongR" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_ThermShield_AlongR" X_Y_Z=" 0.; 0.; 0." rot=" 0. ; 180. ; 180. "/>
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" 0.; 0.; 0." rot=" 0. ; 180. ; 180. "/>
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax; 0.; 0." rot=" 0. ; 180. ; 0. "/>
+ <posXYZ volume="BAR_ThermShield_Corner" X_Y_Z=" BAR_ThermShield_RadiusMin + BAR_ThermShield_RadiusMax; 0.; 0." rot=" 0. ; 0. ; 180. "/>
+</composition>
+
+<!-- End of barrel toroid thermal shielding -->
+
+<var name="AFT_BTBrktInf_BackPlate_XLong" value="1080. " />
+<var name="AFT_BTBrktInf_BackPlate_XOff" value=" 140. " />
+<var name="AFT_BTBrktInf_BackPlate_XGap" value=" 190. " />
+
+<var name="AFT_BTBrktInf_BackPlate_YLong" value=" 305. " />
+<var name="AFT_BTBrktInf_BackPlate_YAngle" value=" 22. " />
+<var name="AFT_BTBrktInf_BackPlate_YOff" value=" 150. " />
+<var name="AFT_BTBrktInf_BackPlate_YGap" value=" 40. " />
+
+<var name="AFT_BTBrktInf_BackPlate_Thickness" value=" 20. " />
+
+<gvxysx name="AFT_BTBrktInf_BackPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff-AFT_BTBrktInf_BackPlate_XGap; 0."/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff-AFT_BTBrktInf_BackPlate_XGap; AFT_BTBrktInf_BackPlate_YGap"/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff; AFT_BTBrktInf_BackPlate_YGap"/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff; 0."/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.; 0."/>
+ <gvxy_point X_Y="AFT_BTBrktInf_BackPlate_XLong/2.; AFT_BTBrktInf_BackPlate_YOff"/>
+ <gvxy_point X_Y="(AFT_BTBrktInf_BackPlate_XLong/2.)-((AFT_BTBrktInf_BackPlate_YLong-AFT_BTBrktInf_BackPlate_YOff)*tan(AFT_BTBrktInf_BackPlate_YAngle*GENV_PiS180)); AFT_BTBrktInf_BackPlate_YLong"/>
+</gvxysx>
+
+<var name="AFT_BTBrktInf_ZLength" value=" 280. " />
+<var name="AFT_BTBrktInf_TopCentralXLong" value=" 590. " />
+<var name="AFT_BTBrktInf_CentralSpacerYLong" value=" 80. " />
+<var name="AFT_BTBrktInf_YSpacerTotal" value=" 168. " />
+
+<var name="AFT_BTBrktInf_CentralSpacerOffsetX" value=" 407. " />
+<var name="AFT_BTBrktInf_SideSpacerOffsetX" value=" 42.5" />
+
+<box name="AFT_BTBrktInf_LowCenterLongX" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_XLong-2.*(AFT_BTBrktInf_BackPlate_XOff+AFT_BTBrktInf_BackPlate_XGap); AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_LowSideLongX" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_XOff; AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_TopCenterLongX" material="Iron" X_Y_Z="AFT_BTBrktInf_TopCentralXLong; 2.+AFT_BTBrktInf_BackPlate_Thickness*2.; AFT_BTBrktInf_ZLength" />
+
+<box name="AFT_BTBrktInf_CtrSpacerPlate" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_CentralSpacerYLong; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_MidSpacerPlate" material="Iron" X_Y_Z="2.*AFT_BTBrktInf_BackPlate_Thickness+2.; AFT_BTBrktInf_YSpacerTotal-2.-2.*AFT_BTBrktInf_BackPlate_Thickness-AFT_BTBrktInf_CentralSpacerYLong; AFT_BTBrktInf_ZLength" />
+<box name="AFT_BTBrktInf_SideSpacerPlate" material="Iron" X_Y_Z="AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_YSpacerTotal; AFT_BTBrktInf_ZLength" />
+
+<composition name="AFT_BTBrktInf">
+ <posXYZ volume="AFT_BTBrktInf_BackPlate" X_Y_Z=" 0.; 0.; AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrktInf_ZLength" />
+ <posXYZ volume="AFT_BTBrktInf_LowCenterLongX" X_Y_Z=" 0.; AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_LowSideLongX" X_Y_Z=" (AFT_BTBrktInf_BackPlate_XLong-AFT_BTBrktInf_BackPlate_XOff)/2.; AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_LowSideLongX" X_Y_Z=" -(AFT_BTBrktInf_BackPlate_XLong-AFT_BTBrktInf_BackPlate_XOff)/2.; AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_TopCenterLongX" X_Y_Z=" 0.; AFT_BTBrktInf_CentralSpacerYLong+2.*AFT_BTBrktInf_BackPlate_Thickness+1.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_CtrSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_CentralSpacerOffsetX+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_CentralSpacerYLong/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_CtrSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_CentralSpacerYLong/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_MidSpacerPlate" X_Y_Z="-AFT_BTBrktInf_TopCentralXLong/2.+AFT_BTBrktInf_BackPlate_Thickness+1.; (AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_CentralSpacerYLong)/2.+2.*AFT_BTBrktInf_BackPlate_Thickness+1.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_MidSpacerPlate" X_Y_Z=" AFT_BTBrktInf_TopCentralXLong/2.-AFT_BTBrktInf_BackPlate_Thickness-1.; (AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_CentralSpacerYLong)/2.+2.*AFT_BTBrktInf_BackPlate_Thickness+1.; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_BackPlate_XOff-AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_SideSpacerOffsetX; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_BackPlate_XOff+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+ <posXYZ volume="AFT_BTBrktInf_SideSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_SideSpacerOffsetX; AFT_BTBrktInf_YSpacerTotal/2.+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrktInf_ZLength/2." />
+</composition>
+
+<var name="AFT_BTBrkt_BackPlate_XLong" value=" 955. " />
+<var name="AFT_BTBrkt_BackPlate_XShort" value=" 545. " />
+<var name="AFT_BTBrkt_BackPlate_YLong" value=" 183. " />
+<var name="AFT_BTBrkt_BackPlate_YShort" value=" 86. " />
+
+<gvxysx name="AFT_BTBrkt_BackPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XShort/2.; 0."/>
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XShort/2.; AFT_BTBrkt_BackPlate_YShort-AFT_BTBrktInf_BackPlate_Thickness"/>
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XLong/2.+(AFT_BTBrkt_BackPlate_YLong-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness)*tan(AFT_BTBrktInf_BackPlate_YAngle*GENV_PiS180); AFT_BTBrkt_BackPlate_YShort-AFT_BTBrktInf_BackPlate_Thickness"/>
+ <gvxy_point X_Y="AFT_BTBrkt_BackPlate_XLong/2.; AFT_BTBrkt_BackPlate_YLong"/>
+</gvxysx>
+
+<var name="AFT_BTBrkt_SidePlateXLength" value=" 235. " />
+<var name="AFT_BTBrkt_CentralPlateXLength" value=" 546. " />
+<var name="AFT_BTBrkt_ZLength" value=" 260. " />
+
+<box name="AFT_BTBrkt_SideLongX" material="Iron" X_Y_Z="AFT_BTBrkt_SidePlateXLength+AFT_BTBrktInf_BackPlate_Thickness; 2.*AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength"/>
+
+<var name="AFT_BTBrkt_CtrSpacerPlate_XShort" value=" 10. " />
+<var name="AFT_BTBrkt_CtrSpacerPlate_YLong" value=" 308. " />
+
+<var name="AFT_BTBrkt_MidSpacerPlate_XShort" value=" 9. " />
+<var name="AFT_BTBrkt_MidSpacerPlate_YLong" value=" 378. " />
+
+<var name="AFT_BTBrkt_SideSpacerPlate_XShort" value=" 15.5" />
+<var name="AFT_BTBrkt_SideSpacerPlate_XLong" value=" 820. " />
+<var name="AFT_BTBrkt_SideSpacerPlate_YShort" value=" 125. " />
+<var name="AFT_BTBrkt_SideSpacerPlate_YLong" value=" 530. " />
+<var name="AFT_BTBrkt_SideSpacerPlate_XDist" value=" 457. " />
+
+<gvxy name="AFT_BTBrkt_CtrSpacerPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; AFT_BTBrkt_CtrSpacerPlate_YLong-AFT_BTBrkt_ZLength+AFT_BTBrkt_CtrSpacerPlate_XShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_CtrSpacerPlate_XShort; AFT_BTBrkt_CtrSpacerPlate_YLong"/>
+ <gvxy_point X_Y=" 0.; AFT_BTBrkt_CtrSpacerPlate_YLong"/>
+</gvxy>
+
+<gvxy name="AFT_BTBrkt_MidSpacerPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y=" 0.; AFT_BTBrktInf_YSpacerTotal-2.-AFT_BTBrktInf_CentralSpacerYLong"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; AFT_BTBrktInf_YSpacerTotal-2.-AFT_BTBrktInf_CentralSpacerYLong"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_ZLength; AFT_BTBrkt_MidSpacerPlate_YLong-AFT_BTBrkt_ZLength+AFT_BTBrkt_MidSpacerPlate_XShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_MidSpacerPlate_XShort; AFT_BTBrkt_MidSpacerPlate_YLong"/>
+ <gvxy_point X_Y=" 0.; AFT_BTBrkt_MidSpacerPlate_YLong"/>
+</gvxy>
+
+<gvxy name="AFT_BTBrkt_SideSpacerPlate" material="Iron" dZ="AFT_BTBrktInf_BackPlate_Thickness" >
+ <gvxy_point X_Y=" 0.; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XLong; 0."/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XLong; AFT_BTBrkt_SideSpacerPlate_YShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XShort+AFT_BTBrkt_SideSpacerPlate_YLong-AFT_BTBrkt_SideSpacerPlate_YShort; AFT_BTBrkt_SideSpacerPlate_YShort"/>
+ <gvxy_point X_Y=" AFT_BTBrkt_SideSpacerPlate_XShort; AFT_BTBrkt_SideSpacerPlate_YLong"/>
+ <gvxy_point X_Y=" 0.; AFT_BTBrkt_SideSpacerPlate_YLong"/>
+</gvxy>
+
+<var name="AFT_BTBrkt_FrontTube_StartAngle" value=" 195. " />
+<var name="AFT_BTBrkt_FrontTube_Angle" value=" 70. " />
+<var name="AFT_BTBrkt_FrontTube_Radius" value=" 550. " />
+<var name="AFT_BTBrkt_FrontTube_ZLength" value=" 250. " />
+<var name="AFT_BTBrkt_FrontTube_YOffset" value=" 558. " />
+<var name="AFT_BTBrkt_BackTube_ZLength" value=" 700. " />
+<var name="AFT_BTBrkt_BackTube_StartAngle" value=" 190. " />
+<var name="AFT_BTBrkt_BackTube_YOffset" value=" 226. " />
+
+<tubs name="AFT_BTBrkt_FrontTube" material="Iron" Rio_Z="AFT_BTBrkt_FrontTube_Radius; AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2. ; AFT_BTBrkt_FrontTube_ZLength" profile="AFT_BTBrkt_FrontTube_StartAngle; AFT_BTBrkt_FrontTube_Angle" nbPhi="20" />
+<tubs name="AFT_BTBrkt_BackTube" material="Iron" Rio_Z="AFT_BTBrkt_FrontTube_Radius; AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2. ; AFT_BTBrkt_BackTube_ZLength" profile="AFT_BTBrkt_BackTube_StartAngle; AFT_BTBrkt_FrontTube_Angle" nbPhi="20" />
+
+<var name="AFT_BTBrkt_BackTube_PosOff" value=" (AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2.)*cos(asin((AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness)/(AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2.)))*GENV_Si45"/>
+
+<var name="AFT_BTBrkt_FrontPlate_ZOffset" value=" 10. " />
+<var name="AFT_BTBrkt_FrontPlate_ZGap" value=" 190. " />
+<var name="AFT_BTBrkt_FrontPlate_XWidth" value=" 115. " />
+<var name="AFT_BTBrkt_FrontPlate_YHight" value=" 120. " />
+
+<tubs name="AFT_BTBrkt_FrontPlate_SubTube" material="Iron" Rio_Z="0.; AFT_BTBrkt_FrontTube_Radius+AFT_BTBrktInf_BackPlate_Thickness/2.+GENV_Eps ; AFT_BTBrkt_BackTube_ZLength" profile=" 300.; 70." nbPhi="50" />
+<box name="AFT_BTBrkt_FrontPlate_Full" material="Iron" X_Y_Z="AFT_BTBrkt_FrontPlate_XWidth; AFT_BTBrkt_FrontPlate_YHight; AFT_BTBrktInf_BackPlate_Thickness" />
+
+<subtraction name="AFT_BTBrkt_FrontPlate">
+ <posXYZ volume="AFT_BTBrkt_FrontPlate_Full" X_Y_Z=" AFT_BTBrkt_SideSpacerPlate_XDist-AFT_BTBrkt_FrontPlate_XWidth/2.; AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrkt_FrontPlate_YHight/2.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_FrontPlate_SubTube" X_Y_Z=" 0.; AFT_BTBrkt_FrontTube_YOffset; 0." />
+</subtraction>
+
+<composition name="AFT_BTBrkt">
+ <!-- the following "AFT_BTBrkt_BackPlate" volume creates clashes with other barrel toroid volumes. A quick check showed that
+ removing this volume makes the barrel toroid description clash free, so this should be investigated -->
+ <posXYZ volume="AFT_BTBrkt_BackPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength+AFT_BTBrktInf_BackPlate_Thickness/2."/>
+ <posXYZ volume="AFT_BTBrkt_SideLongX" X_Y_Z="-(AFT_BTBrkt_CentralPlateXLength+AFT_BTBrkt_SidePlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 1.5*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrkt_ZLength/2."/>
+ <posXYZ volume="AFT_BTBrkt_SideLongX" X_Y_Z=" (AFT_BTBrkt_CentralPlateXLength+AFT_BTBrkt_SidePlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 1.5*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness/2.; AFT_BTBrkt_ZLength/2."/>
+ <posXYZ volume="AFT_BTBrkt_CtrSpacerPlate" X_Y_Z="-AFT_BTBrktInf_BackPlate_XLong/2.+AFT_BTBrktInf_CentralSpacerOffsetX+AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_CtrSpacerPlate" X_Y_Z=" AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_MidSpacerPlate" X_Y_Z="-(AFT_BTBrkt_CentralPlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_MidSpacerPlate" X_Y_Z=" (AFT_BTBrkt_CentralPlateXLength-AFT_BTBrktInf_BackPlate_Thickness)/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_SideSpacerPlate" X_Y_Z="-AFT_BTBrkt_SideSpacerPlate_XDist-AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_SideSpacerPlate" X_Y_Z=" AFT_BTBrkt_SideSpacerPlate_XDist+AFT_BTBrktInf_BackPlate_Thickness/2.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal+AFT_BTBrktInf_BackPlate_Thickness; AFT_BTBrkt_ZLength" rot=" 0.; 90.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_FrontTube" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_FrontTube_YOffset; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrkt_FrontTube_ZLength/2." />
+ <posXYZ volume="AFT_BTBrkt_FrontTube" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_FrontTube_YOffset; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrkt_FrontTube_ZLength/2." rot=" 0.; 0.; 80."/>
+ <posXYZ volume="AFT_BTBrkt_BackTube" X_Y_Z=" 0.; 3.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_CtrSpacerPlate_YLong+AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45; AFT_BTBrkt_ZLength-AFT_BTBrkt_CtrSpacerPlate_XShort-AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45" rot=" -45.; 0.; 0."/>
+ <posXYZ volume="AFT_BTBrkt_BackTube" X_Y_Z=" 0.; 3.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort+AFT_BTBrkt_CtrSpacerPlate_YLong+AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45; AFT_BTBrkt_ZLength-AFT_BTBrkt_CtrSpacerPlate_XShort-AFT_BTBrkt_BackTube_PosOff+(AFT_BTBrkt_BackTube_ZLength/2.-AFT_BTBrkt_BackTube_YOffset)*GENV_Si45" rot=" 0.; 45.; 90."/>
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset" />
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset+AFT_BTBrkt_FrontPlate_ZGap+AFT_BTBrktInf_BackPlate_Thickness" />
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset" rot=" 0.; 180.; 0." />
+ <posXYZ volume="AFT_BTBrkt_FrontPlate" X_Y_Z=" 0.; 2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrktInf_YSpacerTotal-AFT_BTBrkt_BackPlate_YShort; AFT_BTBrkt_ZLength-AFT_BTBrkt_SideSpacerPlate_XLong+AFT_BTBrktInf_BackPlate_Thickness/2.+AFT_BTBrkt_FrontPlate_ZOffset+AFT_BTBrkt_FrontPlate_ZGap+AFT_BTBrktInf_BackPlate_Thickness" rot=" 0.; 180.; 0." />
+</composition>
+
+<var name="AFT_BTBrkt_Cryotubethickness" value="AFT_BTBrkt_FrontTube_YOffset+2.-AFT_BTBrkt_FrontTube_Radius" />
+<var name="AFT_BTBrkt_CryotubeouterRadius" value="AFT_BTBrkt_FrontTube_YOffset+2." />
+<var name="AFT_BTBrkt_CtrSpacerXOffset" value="AFT_BTBrktInf_BackPlate_XLong/2.-AFT_BTBrktInf_CentralSpacerOffsetX-AFT_BTBrktInf_BackPlate_Thickness" />
+
+<var name="AFT_BTBrkt_PositioningParameter" value="(AFT_BTBrktInf_BackPlate_Thickness-AFT_BTBrkt_Cryotubethickness+2.-AFT_BTBrkt_ZLength+AFT_BTBrkt_CtrSpacerPlate_YLong+AFT_BTBrkt_Cryotubethickness)*GENV_Si45-(AFT_BTBrkt_CryotubeouterRadius-sqrt(AFT_BTBrkt_CryotubeouterRadius*AFT_BTBrkt_CryotubeouterRadius-AFT_BTBrkt_CtrSpacerXOffset*AFT_BTBrkt_CtrSpacerXOffset))+AFT_BTBrkt_Cryotubethickness" />
+
+<composition name="AFT_BTBrkt_final" >
+ <posXYZ volume="AFT_BTBrkt" X_Y_Z=" 0.; -(AFT_BTBrktInf_CentralSpacerYLong+2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrkt_Cryotubethickness); 2.*GENV_Si45*AFT_BTBrkt_PositioningParameter" />
+ <posXYZ volume="AFT_BTBrktInf" X_Y_Z=" 0.; -(AFT_BTBrktInf_CentralSpacerYLong+2.*AFT_BTBrktInf_BackPlate_Thickness+AFT_BTBrkt_Cryotubethickness); 2.*GENV_Si45*AFT_BTBrkt_PositioningParameter" />
+</composition>
+
+<composition name="BAR_CryoTubCorner_AFT" >
+ <posXYZ volume="BAR_CryoTubCorner" X_Y_Z=" 0.; 0. ; 0." />
+ <posXYZ volume="AFT_BTBrkt_final" X_Y_Z=" ABRT_CryoRmin - 10.*GENV_Eps; 0.; ABRT_CryoZmax - ABRT_CryoRadi_Radius - ABRT_CryoRcur/sqrt(2.) + GENV_Ta225*ABRT_CryoRadi_Radius + 10.*GENV_Eps" rot=" 0. ; 0. ; -90. "/>
+</composition>
+
+<!-- CryoRib with cuts -->
+<subtraction name="BAR_CryoRib" >
+ <posXYZ volume="BAR_CryoRibOut" X_Y_Z=" (ABRT_CryoRmax + ABRT_CryoRmin)/2. ; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoRibIn" X_Y_Z=" (ABRT_CryoRmax + ABRT_CryoRmin)/2. ; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" ABRT_CryoRmax - ABRT_CryoRadi_Radius - 10.*GENV_Eps; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + 10.*GENV_Eps; 0. ; 0. " />
+</subtraction>
+
+<!-- CryoAtt with cuts -->
+<subtraction name="BAR_CryoAtt" >
+ <posXYZ volume="BAR_CryoAttOut" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; 0. " rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoAttIn" X_Y_Z=" ABRT_CryAttRx_CryoAttRmax ; 0. ; 0. " rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRadi_Radius + 10.*GENV_Eps; 0. ; 0. " />
+</subtraction>
+
+<!-- CryoRing with cuts -->
+<tubs name="BAR_CryoRingA" material="Iron1" Rio_Z=" ABRT_CryRngRa_CryoRingRadius-ABRT_CryoRadT_RadThick ; ABRT_CryRngRa_CryoRingRadius ; 2.*ABRT_CryRngRm_CryoRingRmed*GENV_Ta225 " nbPhi="20" />
+<subtraction name="BAR_CryoRing" >
+ <posXYZ volume="BAR_CryoRingA" />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" (ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Co225-ABRT_CryRngRm_CryoRingRmed ; 0. ; (ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Si225 " rot=" 90. ; 0. ; 0. " />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" (ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Co225-ABRT_CryRngRm_CryoRingRmed ; 0. ; -(ABRT_CryoRmax-ABRT_CryoRadi_Radius)*GENV_Si225 " rot=" 90. ; 0. ; 0. " />
+</subtraction>
+
+<composition name="BAR_CryoTub_Sector" >
+ <posXYZ volume="BAR_CryoTubAlongZ_Down" />
+ <posXYZ volume="BAR_CryoTubAlongZ_Up" />
+ <posXYZ volume="BAR_CryoTubAlongR_Plus" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_CryoTubAlongR_Plus" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRmax; 0.; 0." rot=" 0. ; 180. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCorner_AFT" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="BAR_CryoTubCorner_AFT" X_Y_Z=" 0.; 0.; 0." rot=" 0. ; 180. ; 180. "/>
+ <posXYZ volume="BAR_CryoTubCorner" X_Y_Z=" ABRT_CryoRmin + ABRT_CryoRmax; 0.; 0." rot=" 0. ; 180. ; 0. "/>
+ <posXYZ volume="BAR_CryoTubCorner" X_Y_Z="-GENV_Ta225*ABRT_CryoRadi_Radius*(1.+sqrt(2.)) + ABRT_CryoRmax - ABRT_CryoZmax + ABRT_CryoRadi_Radius; 0.; GENV_Ta225*ABRT_CryoRadi_Radius*(1.+sqrt(2.)) + ABRT_CryoRmin + ABRT_CryoZmax - ABRT_CryoRadi_Radius" rot=" 0. ; 90. ; 0. "/>
+ <posXYZ volume="BAR_CryoRing" X_Y_Z=" ABRT_CryRngRm_CryoRingRmed*GENV_Co225 ; -ABRT_CryRngRm_CryoRingRmed*GENV_Si225 ; ABRT_CryRngZm_CryoRingZmed " rot=" 90. ; 0. ; -22.5 " />
+ <foreach index="Irib" begin="0" loops="7" >
+ <posXYZ volume="BAR_CryoRibWing" X_Y_Z=" ABRT_CryoRmin+2.*ABRT_CryoRadi_Radius ; 0. ; ABRT_Zrib[Irib] " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_CryoRibWing" X_Y_Z=" ABRT_CryoRmax-2.*ABRT_CryoRadi_Radius ; 0. ; ABRT_Zrib[Irib] " rot=" 0. ; 0. ; 90. " />
+ <posXYZ volume="BAR_CryoRib" X_Y_Z=" 0.; 0.; ABRT_Zrib[Irib]" rot=" 0. ; 0. ; 0. " />
+ </foreach>
+ <foreach index="Ivouss" begin="0" loops="8" >
+ <posXYZ volume="BAR_CryoAttWing" X_Y_Z=" ABRT_CryoRmin+ABRT_CryoRadi_Radius ; 0. ; ABRT_Zvouss[Ivouss] " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_CryoAtt" X_Y_Z=" 0.; 0.; ABRT_Zvouss[Ivouss]" rot=" 0. ; 0. ; 0. " />
+ </foreach>
+</composition>
+
+
+<!-- Description of an Atlas Barrel toroid Strut -->
+
+<gvxysx name="BAR_StrutWingFull" material="Iron4" dZ="ABRT_StrWZthi_StrutWingZthick" >
+ <gvxy_point X_Y=" ABRT_StrWYmax_StrutWingYmax ; ABRT_StrWRmax_StrutWingRmax " />
+ <gvxy_point X_Y=" ABRT_StrWYmed_StrutWingYmedi; ABRT_StrWRmed_StrutWingRmedi " />
+ <gvxy_point X_Y=" ABRT_StrWYlow_StrutWingYlower; ABRT_StrWRlow_StrutWingRlower " />
+ <gvxy_point X_Y=" ABRT_StrWYmin_StrutWingYmin ; ABRT_StrWRmin_StrutWingRmin " />
+</gvxysx>
+<box name="BAR_StrutWingUpCut" material="Aluminium1" X_Y_Z=" 2*ABRT_StrWYucu_StrutWingYupcut; ABRT_StrWYucu_StrutWingYupcut; ABRT_StrWYucu_StrutWingYupcut" />
+<subtraction name="BAR_StrutWing" >
+ <posXYZ volume="BAR_StrutWingFull" />
+ <posXYZ volume="BAR_CryoTubCut" X_Y_Z=" 0. ; ABRT_CryoRmax - ABRT_CryoRadi_Radius - 5.*GENV_Eps ; 0. " />
+ <posXYZ volume="BAR_StrutWingUpCut" X_Y_Z=" 0. ; ABRT_CryoRmax ; 0. "/>
+</subtraction>
+<box name="BAR_StrutWingBigSidePlate" material="Iron1" X_Y_Z=" ABRT_StrWYthi_StrutWingYthick ; ABRT_StrWBPhi_StrutWingBigPlateheight ; ABRT_StrWBPth_StrutWingBigPlatethick " />
+<box name="BAR_StrutWingTopPlate" material="Iron1" X_Y_Z=" 2. * ABRT_StrWYmax_StrutWingYmax; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<box name="BAR_StrutWingBottomPlate" material="Iron1" X_Y_Z=" 2. * ABRT_StrWYmin_StrutWingYmin; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<box name="BAR_StrutWingUpperSidePlate" material="Iron1" X_Y_Z=" (ABRT_StrWYmed_StrutWingYmedi-ABRT_StrWYmax_StrutWingYmax)/(cos(ABRT_StrWAupp_StrutWingAupper ))- ABRT_StrWZthi_StrutWingZthick; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<box name="BAR_StrutWingLowerSidePlate" material="Iron1" X_Y_Z=" (ABRT_StrWYlow_StrutWingYlower-ABRT_StrWYmin_StrutWingYmin)/(cos(ABRT_StrWAlow_StrutWingAlower )) - ABRT_StrWZthi_StrutWingZthick; ABRT_StrWZthi_StrutWingZthick ; ABRT_StrWSPth_StrutWingSmallPlatethick " />
+<union name="BAR_StrutWingBox" >
+ <posXYZ volume="BAR_StrutWing" X_Y_Z=" 0. ; 0. ; -ABRT_StrWZlen_StrutWingZlen/2. " />
+ <posXYZ volume="BAR_StrutWing" X_Y_Z=" 0. ; 0. ; +ABRT_StrWZlen_StrutWingZlen/2. " />
+ <posXYZ volume="BAR_StrutWingBigSidePlate" X_Y_Z=" (ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick/2. )*GENV_Co225; ABRT_StrWRmax_StrutWingRmax-ABRT_CryoRadi_Radius-(ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick/2.)*GENV_Si225; 0. " rot=" 0. ; 0. ; -22.5" />
+ <posXYZ volume="BAR_StrutWingBigSidePlate" X_Y_Z=" (- ABRT_StrWYRli_StrutWingYRlink - ABRT_StrWYthi_StrutWingYthick/2. )*GENV_Co225; ABRT_StrWRmax_StrutWingRmax-ABRT_CryoRadi_Radius-(ABRT_StrWYRli_StrutWingYRlink + ABRT_StrWYthi_StrutWingYthick/2.)*GENV_Si225; 0. " rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="BAR_StrutWingTopPlate" X_Y_Z=" 0. ; ABRT_StrWRmax_StrutWingRmax+ABRT_StrWZthi_StrutWingZthick/2.+GENV_Eps ; 0. " />
+ <posXYZ volume="BAR_StrutWingBottomPlate" X_Y_Z=" 0. ;ABRT_StrWRmin_StrutWingRmin-ABRT_StrWZthi_StrutWingZthick/2. ; 0. " />
+ <posXYZ volume="BAR_StrutWingUpperSidePlate" X_Y_Z=" (-ABRT_StrWYmed_StrutWingYmedi - ABRT_StrWYmax_StrutWingYmax - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) - cos(ABRT_StrWAupp_StrutWingAupper)))/2.; (ABRT_StrWRmax_StrutWingRmax + ABRT_StrWRmed_StrutWingRmedi + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) + cos(ABRT_StrWAupp_StrutWingAupper)))/2.; 0. " rot=" 0. ; 0. ; ABRT_StrWAupp_StrutWingAupper/GENV_PiS180" />
+ <posXYZ volume="BAR_StrutWingUpperSidePlate" X_Y_Z=" ( ABRT_StrWYmed_StrutWingYmedi + ABRT_StrWYmax_StrutWingYmax + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) - cos(ABRT_StrWAupp_StrutWingAupper)))/2.; (ABRT_StrWRmax_StrutWingRmax + ABRT_StrWRmed_StrutWingRmedi + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAupp_StrutWingAupper) + cos(ABRT_StrWAupp_StrutWingAupper)))/2.; 0. " rot=" 0. ; 0. ; -ABRT_StrWAupp_StrutWingAupper/GENV_PiS180" />
+ <posXYZ volume="BAR_StrutWingLowerSidePlate" X_Y_Z=" ( ABRT_StrWYlow_StrutWingYlower + ABRT_StrWYmin_StrutWingYmin + ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) - cos(ABRT_StrWAlow_StrutWingAlower)))/2.; (ABRT_StrWRlow_StrutWingRlower+ABRT_StrWRmin_StrutWingRmin - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) + cos(ABRT_StrWAlow_StrutWingAlower)))/2. ; 0. " rot=" 0. ; 0. ; ABRT_StrWAlow_StrutWingAlower/GENV_PiS180" />
+ <posXYZ volume="BAR_StrutWingLowerSidePlate" X_Y_Z=" (-ABRT_StrWYlow_StrutWingYlower - ABRT_StrWYmin_StrutWingYmin - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) - cos(ABRT_StrWAlow_StrutWingAlower)))/2.; (ABRT_StrWRlow_StrutWingRlower+ABRT_StrWRmin_StrutWingRmin - ABRT_StrWZthi_StrutWingZthick*(sin(ABRT_StrWAlow_StrutWingAlower) + cos(ABRT_StrWAlow_StrutWingAlower)))/2. ; 0. " rot=" 0. ; 0. ; -ABRT_StrWAlow_StrutWingAlower/GENV_PiS180" />
+</union>
+
+<box name="BAR_StrutFull" material="Aluminium4" X_Y_Z=" ABRT_StrtYlen- 2.* ABRT_StrtPthi_StrutPlatethick ; ABRT_StrWBPhi_StrutWingBigPlateheight - 2.*ABRT_StrtPoff_StrutPlateoff ; ABRT_StrtZwid_StrutZwidth - 2.*ABRT_StrtPoff_StrutPlateoff " />
+<box name="BAR_StrutHole" material="Aluminium1" X_Y_Z=" ABRT_StrtYlen- 2.* ABRT_StrtPthi_StrutPlatethick + 10.*GENV_Eps; ABRT_StrWBPhi_StrutWingBigPlateheight - 2.*ABRT_StrtPoff_StrutPlateoff-2.*ABRT_StrtRthi_StrutRthick ; ABRT_StrtZwid_StrutZwidth - 2.*ABRT_StrtPoff_StrutPlateoff " />
+<box name="BAR_StrutPlate" material="Aluminium4" X_Y_Z=" ABRT_StrtPthi_StrutPlatethick; ABRT_StrWBPhi_StrutWingBigPlateheight ; ABRT_StrtZwid_StrutZwidth " />
+<subtraction name="BAR_StrutBarr" >
+ <posXYZ volume="BAR_StrutFull" />
+ <posXYZ volume="BAR_StrutHole" X_Y_Z=" 0. ; 0. ; -(ABRT_StrtZwid_StrutZwidth - 2.* ABRT_StrtPoff_StrutPlateoff)/2. -ABRT_StrtZthi_StrutZthick/2. " />
+ <posXYZ volume="BAR_StrutHole" X_Y_Z=" 0. ; 0. ; (ABRT_StrtZwid_StrutZwidth - 2.* ABRT_StrtPoff_StrutPlateoff)/2. +ABRT_StrtZthi_StrutZthick/2. " />
+</subtraction>
+<!-- ABRT_StrtXpos_Strut_Xposition is done by calculation => should be taken from blueprint atltbw__0002-vAD BUT ONLY in combination with update of ABRT_CryoRmin and ABRT_CryoRmax -->
+<var name="ABRT_StrtXpos_Strut_Xposition" value="ABRT_StrWRmax_StrutWingRmax-ABRT_CryoRadi_Radius-ABRT_StrtYlen/2.*GENV_Si225-(ABRT_StrWBPhi_StrutWingBigPlateheight/2. - ABRT_StrtPoff_StrutPlateoff)" />
+<composition name="BAR_Strut_Sector" >
+ <posXYZ volume="BAR_StrutWingBox" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_StrutBarr" X_Y_Z=" ABRT_StrtXpos_Strut_Xposition; -ABRT_StrtXpos_Strut_Xposition*GENV_Ta225; 0. " rot=" 0. ; 0. ; -112.5" />
+ <posXYZ volume="BAR_StrutPlate" X_Y_Z=" ABRT_StrtXpos_Strut_Xposition-ABRT_StrtYlen/2.*GENV_Si225+ABRT_StrtPthi_StrutPlatethick/2.*GENV_Si225 ; -ABRT_StrtXpos_Strut_Xposition*GENV_Ta225-ABRT_StrtYlen/2.*GENV_Co225+ABRT_StrtPthi_StrutPlatethick/2.*GENV_Co225; 0." rot=" 0. ; 0. ; -112.5" />
+ <posXYZ volume="BAR_StrutPlate" X_Y_Z=" ABRT_StrtXpos_Strut_Xposition+ABRT_StrtYlen/2.*GENV_Si225-ABRT_StrtPthi_StrutPlatethick/2.*GENV_Si225 ; -ABRT_StrtXpos_Strut_Xposition*GENV_Ta225+ABRT_StrtYlen/2.*GENV_Co225-ABRT_StrtPthi_StrutPlatethick/2.*GENV_Co225; 0." rot=" 0. ; 0. ; -112.5" />
+</composition>
+
+
+
+
+<!-- Description of an Atlas Barrel toroid voussoir and voussoir head -->
+
+<!-- BEGIN confirmation with atltbwv_0028-vAA (if no other comment) -->
+<var name="ABRT_VousBlXh_VoussBlockXheight" value= "850." />
+<var name="ABRT_VousPliX_VoussPlateInnerXwid" value= "120." />
+<var name="ABRT_VousPloX_VoussPlateOuterXwid" value= "80." />
+<var name="ABRT_VousBlYw_VoussBlockYwid" value="2850." />
+<var name="ABRT_VouBlYwS_VoussBlockYwidSub" value= "120." />
+<var name="ABRT_VouRCYwi_VoussRectCutYwid" value= "815." />
+<var name="ABRT_VouRPYwi_VoussReinforcePlatYwid" value= "50." />
+<var name="ABRT_VouBlZle_VoussBlockZlen" value= "500." />
+<var name="ABRT_VouBlZlS_VoussBlockZlenSub" value= "50." />
+<var name="ABRT_VouBZWTh_VoussBlockZWallTh" value= "50." />
+<var name="ABRT_VouCutZe_VoussCutZExt" value=" 500." /> <!-- no confirmation since arbitrary cut parameter -->
+<var name="ABRT_VouRCutR_VoussRoundCutRad" value= "300." />
+<var name="ABRT_VouReCsl_VoussRectCutXYslant" value= "30." /> <!-- no confirmation since approx. for rounded corners -->
+<!-- END confirmation with atltbwv_0028-vAA -->
+
+<!-- BEGIN confirmation with atltbwv_0029-vAB (if no other comment) -->
+<var name="ABRT_CnbCoYex_ConboxCoreYextension" value= " 880." />
+<var name="ABRT_CnbCoXex_ConboxCoreXextension" value= "2367." />
+<var name="ABRT_CnbCoXsu_ConboxCoreXsup" value= " 834." />
+<var name="ABRT_CnbCoXin_ConboxCoreXinf" value= " 640.7"/>
+<var name="ABRT_CnbEaHei_ConboxEarHeight" value= " 850." />
+<var name="ABRT_CnbEaCxi_ConboxEarCutXin" value= " 350." />
+<var name="ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut" value= " 120." />
+<var name="ABRT_CnbEaCtu_ConboxEarCutPlateThickUp" value= " 80." />
+<var name="ABRT_CnbEaCzw_ConboxEarCutZwall" value= " 50." />
+<var name="ABRT_CnbEaCze_ConboxEarCutZextr" value= " 135." />
+<var name="ABRT_CnbEaCPl_ConboxInnerEarCutPlate" value= " 60." /> <!-- atltbwv_0052-vAA -->
+<var name="ABRT_CnbCaDma_ConboxCavityDmax" value= " 528." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaDme_ConboxCavityDmedium" value= " 478." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaDmi_ConboxCavityDmin" value= " 468." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaZin_ConboxCavityZinter2" value= " 50." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnbCaZex_ConboxCavityZext" value= " 790." /> <!-- atltbwv_0059-v0 -->
+<var name="ABRT_CnboxZex_ConboxZextension" value= " 550." />
+
+<var name="ABRT_VousMBRa_VoussoirMainBlockRadius" value= "5723." /> <!-- atltbw__0002-vAD -->
+<var name="ABRT_CnbxMBRa_ConboxMainBlockRadius" value= "6942." /> <!-- atltbw__0002-vAD -->
+<!-- END confirmation with atltbwv_0029-vAB -->
+
+
+<!-- Constants and derived variables -->
+
+<var name="ABRT_VouCRCYr_VoussCentrRectCutYreach" value=" ABRT_VousBlYw_VoussBlockYwid/2.-ABRT_VouBlYwS_VoussBlockYwidSub-ABRT_VouRCYwi_VoussRectCutYwid-ABRT_VouRPYwi_VoussReinforcePlatYwid" />
+<var name="ABRT_VousRCXw_VoussRectCutXwid" value=" ABRT_VousBlXh_VoussBlockXheight-ABRT_VousPliX_VoussPlateInnerXwid-ABRT_VousPloX_VoussPlateOuterXwid" />
+<var name="ABRT_VousCXof_VoussCutXoffset" value="(ABRT_VousPliX_VoussPlateInnerXwid-ABRT_VousPloX_VoussPlateOuterXwid)/2." />
+<var name="ABRT_VousCYpo_VoussoirCutYpos" value=" ABRT_VousBlYw_VoussBlockYwid/2.-ABRT_VouBlYwS_VoussBlockYwidSub-ABRT_VouRCYwi_VoussRectCutYwid/2." />
+<var name="ABRT_VousCZpo_VoussoirCutZpos" value=" ABRT_VouCutZe_VoussCutZExt/2.+ABRT_VouBZWTh_VoussBlockZWallTh/2." />
+<var name="ABRT_CnbEaXtp_ConboxEarXtop" value=" ABRT_CnbCoXex_ConboxCoreXextension/2. " />
+<var name="ABRT_CnbEaYtp_ConboxEarYtop" value=" ABRT_CnbCoYex_ConboxCoreYextension - GENV_Ta225 *(ABRT_CnbCoXex_ConboxCoreXextension-ABRT_CnbCoXsu_ConboxCoreXsup)/2." />
+<var name="ABRT_CnbEaXbt_ConboxEarXbot" value=" ABRT_CnbEaXtp_ConboxEarXtop - ABRT_CnbEaHei_ConboxEarHeight*GENV_Si225 " />
+<var name="ABRT_CnbEaYbt_ConboxEarYbot" value=" ABRT_CnbEaYtp_ConboxEarYtop - ABRT_CnbEaHei_ConboxEarHeight*GENV_Co225 " />
+<var name="ABRT_CnbECXol_ConboxEarCutXoutlow" value=" ABRT_CnbEaXbt_ConboxEarXbot - ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut*sqrt(2.)*GENV_Si225" />
+<var name="ABRT_CnbECYol_ConboxEarCutYoutlow" value=" ABRT_CnbEaYbt_ConboxEarYbot + ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut*sqrt(2.)*GENV_Co225" />
+<var name="ABRT_CnbECYil_ConboxEarCutYinlow" value=" ABRT_CnbECYol_ConboxEarCutYoutlow + (ABRT_CnbECXol_ConboxEarCutXoutlow-ABRT_CnbEaCxi_ConboxEarCutXin)*GENV_Ta225 " />
+<var name="ABRT_CnbECoHe_ConboxEarCutOutHeight" value=" ABRT_CnbEaHei_ConboxEarHeight- ABRT_CnbEaCtl_ConboxEarCutPlateThickLowOut-ABRT_CnbEaCtu_ConboxEarCutPlateThickUp" />
+<var name="ABRT_CnbECXou_ConboxEarCutXoutup" value=" ABRT_CnbECXol_ConboxEarCutXoutlow + ABRT_CnbECoHe_ConboxEarCutOutHeight*GENV_Si225" />
+<var name="ABRT_CnbECYou_ConboxEarCutYoutup" value=" ABRT_CnbECYol_ConboxEarCutYoutlow + ABRT_CnbECoHe_ConboxEarCutOutHeight*GENV_Co225" />
+<var name="ABRT_CnbECYiu_ConboxEarCutYinup" value=" ABRT_CnbECYou_ConboxEarCutYoutup + (ABRT_CnbECXou_ConboxEarCutXoutup-ABRT_CnbEaCxi_ConboxEarCutXin)*GENV_Ta225" />
+<var name="ABRT_CnbECZpo_ConboxEarCutZpos" value=" ABRT_CnboxZex_ConboxZextension/2. + ABRT_CnbEaCze_ConboxEarCutZextr " />
+<var name="ABRT_CnbIECZp_ConboxInnerEarCutZpos" value=" ABRT_CnboxZex_ConboxZextension/2. + ABRT_CnbEaCzw_ConboxEarCutZwall/2. " />
+<var name="ABRT_CnbCaZin_ConboxCavityZinter" value="(ABRT_CnbCaDma_ConboxCavityDmax - ABRT_CnbCaDme_ConboxCavityDmedium)/2. / tan(ABRT_CryAttAl_CryoAttAlfa*GENV_PiS180)" />
+<var name="ABRT_VoussRad_VoussoirRadius" value=" ABRT_VousMBRa_VoussoirMainBlockRadius + ABRT_VousBlXh_VoussBlockXheight/2." />
+<var name="ABRT_CnboxRad_ConboxRadius" value=" ABRT_CnbxMBRa_ConboxMainBlockRadius - ABRT_CnbCoYex_ConboxCoreYextension" />
+
+
+
+<!-- Description of the voussoir head (connexion box) -->
+
+<gvxysx name="BAR_ConboxMainBlock" material="Aluminium4" dZ="ABRT_CnboxZex_ConboxZextension" >
+ <gvxy_point X_Y=" ABRT_CnbCoXin_ConboxCoreXinf/2. ; 0. " />
+ <gvxy_point X_Y=" ABRT_CnbEaXbt_ConboxEarXbot ; ABRT_CnbEaYbt_ConboxEarYbot " />
+ <gvxy_point X_Y=" ABRT_CnbEaXtp_ConboxEarXtop ; ABRT_CnbEaYtp_ConboxEarYtop " />
+ <gvxy_point X_Y=" ABRT_CnbCoXsu_ConboxCoreXsup/2. ; ABRT_CnbCoYex_ConboxCoreYextension " />
+</gvxysx>
+<gvxy name="BAR_ConboxEarCut" material="Aluminium1" dZ="ABRT_CnboxZex_ConboxZextension" >
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin ; ABRT_CnbECYil_ConboxEarCutYinlow " />
+ <gvxy_point X_Y=" ABRT_CnbECXol_ConboxEarCutXoutlow ; ABRT_CnbECYol_ConboxEarCutYoutlow " />
+ <gvxy_point X_Y=" ABRT_CnbECXou_ConboxEarCutXoutup ; ABRT_CnbECYou_ConboxEarCutYoutup " />
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin ; ABRT_CnbECYiu_ConboxEarCutYinup " />
+</gvxy>
+<gvxy name="BAR_ConboxInnerEarCut" material="Aluminium1" dZ="ABRT_CnboxZex_ConboxZextension" >
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin + ABRT_CnbEaCPl_ConboxInnerEarCutPlate ; ABRT_CnbECYil_ConboxEarCutYinlow - ABRT_CnbEaCPl_ConboxInnerEarCutPlate * GENV_Ta225 " />
+ <gvxy_point X_Y=" ABRT_CnbECXol_ConboxEarCutXoutlow ; ABRT_CnbECYol_ConboxEarCutYoutlow " />
+ <gvxy_point X_Y=" ABRT_CnbECXou_ConboxEarCutXoutup ; ABRT_CnbECYou_ConboxEarCutYoutup " />
+ <gvxy_point X_Y=" ABRT_CnbEaCxi_ConboxEarCutXin + ABRT_CnbEaCPl_ConboxInnerEarCutPlate ; ABRT_CnbECYiu_ConboxEarCutYinup - ABRT_CnbEaCPl_ConboxInnerEarCutPlate * GENV_Ta225 " />
+</gvxy>
+<pcon name="BAR_ConboxCavity" material="Aluminium1" nbPhi="20" >
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDma_ConboxCavityDmax/2. ; 0. " />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDme_ConboxCavityDmedium/2. ; ABRT_CnbCaZin_ConboxCavityZinter" />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDme_ConboxCavityDmedium/2. ; ABRT_CnbCaZex_ConboxCavityZext - ABRT_CnbCaZin_ConboxCavityZinter2 " />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDmi_ConboxCavityDmin/2. ; ABRT_CnbCaZex_ConboxCavityZext - ABRT_CnbCaZin_ConboxCavityZinter2 " />
+ <polyplane Rio_Z="0. ; ABRT_CnbCaDmi_ConboxCavityDmin/2. ; ABRT_CnbCaZex_ConboxCavityZext " />
+</pcon>
+<tubs name="BAR_ConboxShaft" material="Aluminium4" Rio_Z=" 0. ; ABRT_BielRHol_BiellRadHole-3.*GENV_Eps ; 0.95*ABRT_CryAttD1_CryoAttDiam1 " nbPhi="16" />
+<!--<tubs name="BAR_ConboxShaftB" material="Aluminium1" Rio_Z=" 0. ; ABRT_CryAttD1_CryoAttDiam1/2.-3.*GENV_Eps ; 4.*ABRT_BielRHol_BiellRadHole " nbPhi="20" />
+<intersection name="BAR_ConboxShaft" >
+ <posXYZ volume="BAR_ConboxShaftA" />
+ <posXYZ volume="BAR_ConboxShaftB" rot=" 0. ; 90. ; 0. "/>
+</intersection>-->
+
+
+<!-- Description of the voussoir -->
+
+<gvxysxy name="BAR_VoussoirMainBlock" material="Aluminium4" dZ="ABRT_VousBlXh_VoussBlockXheight" >
+ <gvxy_point X_Y=" ABRT_VouBlZle_VoussBlockZlen/2. - ABRT_VouBlZlS_VoussBlockZlenSub ; ABRT_VousBlYw_VoussBlockYwid/2. - ABRT_VouBlYwS_VoussBlockYwidSub -ABRT_VouBlZlS_VoussBlockZlenSub/GENV_Ta15 " />
+ <gvxy_point X_Y=" ABRT_VouBlZle_VoussBlockZlen/2. ; ABRT_VousBlYw_VoussBlockYwid/2. - ABRT_VouBlYwS_VoussBlockYwidSub " />
+ <gvxy_point X_Y=" ABRT_VouBlZle_VoussBlockZlen/2. ; ABRT_VousBlYw_VoussBlockYwid/2. " />
+</gvxysxy>
+<gvxysxy name="BAR_VoussoirRectCut" material="Aluminium1" dZ="ABRT_VouCutZe_VoussCutZExt" >
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2. ; ABRT_VouRCYwi_VoussRectCutYwid/2.-ABRT_VouReCsl_VoussRectCutXYslant" />
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2.-ABRT_VouReCsl_VoussRectCutXYslant ; ABRT_VouRCYwi_VoussRectCutYwid/2." />
+</gvxysxy>
+<gvxysxy name="BAR_VoussoirCentralRectCut" material="Aluminium1" dZ="ABRT_VouCutZe_VoussCutZExt" >
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2. ; ABRT_VouCRCYr_VoussCentrRectCutYreach-ABRT_VouReCsl_VoussRectCutXYslant" />
+ <gvxy_point X_Y=" ABRT_VousRCXw_VoussRectCutXwid/2.-ABRT_VouReCsl_VoussRectCutXYslant ; ABRT_VouCRCYr_VoussCentrRectCutYreach" />
+</gvxysxy>
+<tubs name="BAR_VoussoirRoundCut" material="Aluminium1" Rio_Z=" 0 ; ABRT_VouRCutR_VoussRoundCutRad ; ABRT_VouCutZe_VoussCutZExt" nbPhi="18" />
+
+<union name="BAR_VoussoirCut" >
+ <posXYZ volume="BAR_VoussoirRoundCut" X_Y_Z=" 0. ; ABRT_VousCYpo_VoussoirCutYpos ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRoundCut" X_Y_Z=" 0. ; -ABRT_VousCYpo_VoussoirCutYpos ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; ABRT_VousCYpo_VoussoirCutYpos ; ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; -ABRT_VousCYpo_VoussoirCutYpos ; ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; ABRT_VousCYpo_VoussoirCutYpos ;-ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirRectCut" X_Y_Z=" 0. ; -ABRT_VousCYpo_VoussoirCutYpos ;-ABRT_VousCZpo_VoussoirCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirCentralRectCut" X_Y_Z=" GENV_Eps ; 0. ; ABRT_VousCZpo_VoussoirCutZpos+GENV_Eps" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_VoussoirCentralRectCut" X_Y_Z="-GENV_Eps ; 0. ;-ABRT_VousCZpo_VoussoirCutZpos-GENV_Eps" rot=" 0. ; 0. ; 0." />
+</union>
+<subtraction name="BAR_Voussoir" >
+ <posXYZ volume="BAR_VoussoirMainBlock" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 90. ; 0." />
+ <posXYZ volume="BAR_VoussoirCut" X_Y_Z=" ABRT_VousCXof_VoussCutXoffset ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<union name="BAR_ConboxTheCut" >
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbECZpo_ConboxEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ; ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxInnerEarCut" X_Y_Z=" 0. ; 0. ;-ABRT_CnbIECZp_ConboxInnerEarCutZpos " rot=" 0. ; 180. ; 0." />
+ <posXYZ volume="BAR_ConboxCavity" X_Y_Z=" 0. ; 0. ; 0. " rot=" -90. ; 0. ; 0." />
+</union>
+<subtraction name="BAR_ConnectingBox" >
+ <posXYZ volume="BAR_ConboxMainBlock" />
+ <posXYZ volume="BAR_ConboxTheCut" />
+</subtraction>
+
+<composition name="BAR_Voussoir_Sector" >
+ <posXYZ volume="BAR_ConnectingBox" X_Y_Z=" ABRT_CnboxRad_ConboxRadius ; 0. ; 0. " rot=" 0. ; 0. ; -90. " />
+ <posXYZ volume="BAR_ConboxShaft" X_Y_Z=" ABRT_CoMaRmin_ColdMassRmin+ABRT_CoMaRThi_ColdMassRThick+ABRT_BielYhei_BiellYheight-ABRT_BielYcHo_BiellYcenHole ; 0. ; 0. " rot=" 90. ; 0. ; 0. " />
+ <posXYZ volume="BAR_Voussoir" X_Y_Z=" GENV_Co225*ABRT_VoussRad_VoussoirRadius ; -GENV_Si225*ABRT_VoussRad_VoussoirRadius ; 0. " rot=" 0. ; 0. ; -22.5" />
+</composition>
+
+
+
+
+
+<composition name="BAR_Toroid_Sector" >
+ <posXYZ volume="BAR_CryoTub_Sector" />
+ <posXYZ volume="BAR_ThermShield_Sector" />
+ <foreach index="Ivouss" begin="0" loops="4" >
+ <posXYZ volume="BAR_Strut_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="-4+Ivouss" />
+ </posXYZ>
+ <posXYZ volume="BAR_Voussoir_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="-4+Ivouss" />
+ </posXYZ>
+ </foreach>
+ <foreach index="Ivouss" begin="4" loops="4" >
+ <posXYZ volume="BAR_Strut_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="Ivouss-3" />
+ </posXYZ>
+ <posXYZ volume="BAR_Voussoir_Sector" X_Y_Z=" 0. ; 0. ; ABRT_Zvouss[Ivouss] " >
+ <ring value="Ivouss-3" />
+ </posXYZ>
+ </foreach>
+ <posXYZ volume="BAR_ColdMass_Sector" />
+</composition>
+
+<!--
+<composition name="BAR_Toroid" >
+ <mposPhi volume="BAR_Toroid_Sector" Phi0="22.5" ncopy="8" >
+ <sector value="1" step="1" />
+ </mposPhi>
+</composition>
+-->
+<composition name="BAR_sector02" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ; 22.5" />
+</composition>
+<composition name="BAR_sector04" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ; 67.5" />
+</composition>
+<composition name="BAR_sector06" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;112.5" />
+</composition>
+<composition name="BAR_sector08" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;157.5" />
+</composition>
+<composition name="BAR_sector10" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;202.5" />
+</composition>
+<composition name="BAR_sector12" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;247.5" />
+</composition>
+<composition name="BAR_sector14" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;292.5" />
+</composition>
+<composition name="BAR_sector16" >
+ <posXYZ volume="BAR_Toroid_Sector" rot=" 0. ; 0. ;337.5" />
+</composition>
+<composition name="BAR_Toroid" >
+ <posXYZ volume="BAR_sector02"/>
+ <posXYZ volume="BAR_sector04"/>
+ <posXYZ volume="BAR_sector06"/>
+ <posXYZ volume="BAR_sector08"/>
+ <posXYZ volume="BAR_sector10"/>
+ <posXYZ volume="BAR_sector12"/>
+ <posXYZ volume="BAR_sector14"/>
+ <posXYZ volume="BAR_sector16"/>
+</composition>
+
+</section>
+
+<section name = "Solenoid"
+ version = "1.1"
+ date = "22 11 1962"
+ author = "laurent"
+ top_volume = "Solenoid">
+<!-- name = Solenoid section name = "Magnets" -->
+<!--
+ **************************************************************
+ *** ****
+ *** Solenoid ****
+ *** ****
+ **************************************************************
+-->
+
+<tubs name="tubs_hole" material="Aluminium" Rio_Z="1210;1267;5300" />
+<composition name="Solenoid">
+ <posXYZ volume="tubs_hole" X_Y_Z=" 0 ; 0 ; 0" />
+</composition>
+</section>
+
+
+<section name = "ATLAS Feet"
+ version = "0.0"
+ date = "29-05-2019"
+ author = "Niko Tsutskiridze"
+ top_volume = "Feet">
+
+<!-- name = Feet only section name = "Feet" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Feet ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+<!-- Basic parameters extracted from drawing ATLHBFB_0003 -->
+
+<gvxysx name="Standard_Bottom_Plate" material="ShieldSteel" dZ="1198.">
+ <gvxy_point X_Y="-820.5; 15.8"/>
+ <gvxy_point X_Y="-820.5;-75."/>
+ <gvxy_point X_Y="-914.;-75."/>
+ <gvxy_point X_Y="-914.;75."/>
+</gvxysx>
+
+<gvxy name="Standard_MineSide_Plate" material="ShieldSteel" dZ="81.5">
+ <gvxy_point X_Y="-1274.71; -2610."/>
+ <gvxy_point X_Y="-1274.71; -1004.21"/>
+ <gvxy_point X_Y="-1224.78; -883.67"/>
+ <gvxy_point X_Y="-956.89; -994.63"/>
+ <gvxy_point X_Y="-930.12; -930."/>
+ <gvxy_point X_Y="-634.5; -1052.5"/>
+ <gvxy_point X_Y="-406.96; -1052.5"/>
+ <gvxy_point X_Y="27.91; -2.63"/>
+ <gvxy_point X_Y="-615.13; 640.42"/>
+ <gvxy_point X_Y="-40.29; 2028.2"/>
+ <gvxy_point X_Y="-40.29; 2630."/>
+ <gvxy_point X_Y="559.49; 2630"/>
+ <gvxy_point X_Y="559.49; 2610."/>
+ <gvxy_point X_Y="1274.71; 2610."/>
+ <gvxy_point X_Y="1274.71; 1820."/>
+ <gvxy_point X_Y="906.15; 223.58"/>
+ <gvxy_point X_Y="524.76; -697.17"/>
+ <gvxy_point X_Y="524.76; -2610."/>
+</gvxy>
+
+<tubs name="Standard_MineSide_Plate_CutTube" material="ShieldSteel" Rio_Z="0.; 615.; 85." nbPhi="32"/>
+<subtraction name="Standard_MineSide_PlateSub" >
+ <posXYZ volume="Standard_MineSide_Plate" />
+ <posXYZ volume="Standard_MineSide_Plate_CutTube" X_Y_Z="-406.956; -437.5; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<box name="Standard_Midd_Plate" material="ShieldSteel" X_Y_Z="297.; 153.6; 1100."/>
+
+<box name="Standard_Back_Top_Plate" material="ShieldSteel" X_Y_Z="59.3; 790.; 1040."/>
+
+<box name="Standard_Back_Plate" material="ShieldSteel" X_Y_Z="76.56; 1969.5; 896.8"/>
+
+<gvxysx name="Standard_Inner_Back_Plate" material="ShieldSteel" dZ="44.">
+ <gvxy_point X_Y="-375.; -365."/>
+ <gvxy_point X_Y="-375.; 315."/>
+ <gvxy_point X_Y="-325.; 365."/>
+</gvxysx>
+
+<box name="Standard_Inner_Middle_plate" material="ShieldSteel" X_Y_Z="157.32; 680.; 630."/>
+
+<tubs name="Standard_Innert_Tub" material="ShieldSteel" Rio_Z="562.5; 605.5; 800." profile="213.; 134.8" nbPhi="32"/>
+
+<composition name="Standard_Inner_Parts" >
+ <posXYZ volume="Standard_Inner_Back_Plate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="Standard_Inner_Middle_plate" X_Y_Z=" -335.3 ; -30.35 ; 0." rot=" 0.; 0.; -50." />
+ <posXYZ volume="Standard_Innert_Tub" X_Y_Z=" -754.18 ; 568.54 ; 0." />
+</composition>
+
+<gvxysx name="Standard_Front_Cover" material="ShieldSteel" dZ="80.6">
+ <gvxy_point X_Y="-550.; -1505."/>
+ <gvxy_point X_Y="-550.; -465."/>
+ <gvxy_point X_Y="-535.; -450."/>
+ <gvxy_point X_Y="-535.; 1505."/>
+</gvxysx>
+
+<box name="Standard_Front_CoverCutBox" material="ShieldSteel" X_Y_Z="270.; 1450.; 20."/>
+
+<subtraction name="Standard_Front_CoverCut" >
+ <posXYZ volume="Standard_Front_Cover" />
+ <posXYZ volume="Standard_Front_CoverCutBox" X_Y_Z="535.; 790.; 40.3" rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Standard_Front_CoverCutBox" X_Y_Z="-535.; 790.; 40.3" rot=" 0.; 0.; 0."/>
+</subtraction>
+
+<composition name="Standard_Feet" >
+ <posXYZ volume="Standard_Bottom_Plate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_MineSide_PlateSub" X_Y_Z=" 374.97 ; 2685.1 ; 489.25" />
+ <posXYZ volume="Standard_MineSide_PlateSub" X_Y_Z=" 374.97 ; 2685.1 ; -489.25" />
+ <posXYZ volume="Standard_Midd_Plate" X_Y_Z=" -691.06 ; 1818.81 ; 0." rot=" 0.; 0.; -22.5" />
+ <posXYZ volume="Standard_Back_Top_Plate" X_Y_Z=" 1679.34 ; 4900. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Back_Plate" X_Y_Z=" 782.25 ; 2122.5 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Inner_Parts" X_Y_Z=" 721.955 ; 1680. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Front_CoverCut" X_Y_Z=" -320.4 ; 3211.01 ; 0." rot=" 0.; 90.; -22.5" />
+</composition>
+ <!-- End Standard Feet -->
+
+
+ <!-- Extremity Feet -->
+<gvxysx name="Extremity_Bottom_Plate" material="ShieldSteel" dZ="1660.4">
+ <gvxy_point X_Y="-820.5; 10."/>
+ <gvxy_point X_Y="-820.5; -80."/>
+ <gvxy_point X_Y="-905.25; -80."/>
+ <gvxy_point X_Y="-905.25; 70."/>
+</gvxysx>
+
+<gvxy name="Extremity_MineSide_Plate" material="ShieldSteel" dZ="82.6">
+ <gvxy_point X_Y="-1335.33; -2760.58"/>
+ <gvxy_point X_Y="-1335.33; -1154.7"/>
+ <gvxy_point X_Y="-1285.36; -1034.06"/>
+ <gvxy_point X_Y="-1017.44; -1145.04"/>
+ <gvxy_point X_Y="-990.65; -1080.37"/>
+ <gvxy_point X_Y="-694.43; -1203.06"/>
+ <gvxy_point X_Y="-467.05; -1203.06"/>
+ <gvxy_point X_Y="147.95; -587.13"/>
+ <gvxy_point X_Y="147.7; -423.3"/>
+ <gvxy_point X_Y="91.24; 222.13"/>
+ <gvxy_point X_Y="-574.73; 733.15"/>
+ <gvxy_point X_Y="-140.51; 1781.5"/>
+ <gvxy_point X_Y="-158.99; 1789.16"/>
+ <gvxy_point X_Y="-100.4; 1930.6"/>
+ <gvxy_point X_Y="-100.4; 2599.44"/>
+ <gvxy_point X_Y="521.14; 2599.44"/>
+ <gvxy_point X_Y="521.14; 2506.22"/>
+ <gvxy_point X_Y="924.48; 2359.42"/>
+ <gvxy_point X_Y="1024.48; 2359.42"/>
+ <gvxy_point X_Y="1065.9; 2459.42"/>
+ <gvxy_point X_Y="1534.62; 2459.42"/>
+ <gvxy_point X_Y="1534.62; 1659.41"/>
+ <gvxy_point X_Y="1212.31; 1659.43"/>
+ <gvxy_point X_Y="846.05; 72.99"/>
+ <gvxy_point X_Y="464.66; -847.76"/>
+ <gvxy_point X_Y="464.66; -2760.58"/>
+</gvxy>
+
+<tubs name="Extremity_MineSide_Plate_CutTube" material="ShieldSteel" Rio_Z="0.; 615.; 85." nbPhi="32"/>
+
+<subtraction name="Extremity_MineSide_PlateSub" >
+ <posXYZ volume="Extremity_MineSide_Plate" />
+ <posXYZ volume="Extremity_MineSide_Plate_CutTube" X_Y_Z="-467.04; -588.06; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<box name="Extremity_Midd_Plate" material="ShieldSteel" X_Y_Z="299.; 151.2; 1480."/>
+
+<box name="Extremity_Back_Top_Plate" material="ShieldSteel" X_Y_Z="69.95; 800.; 1624."/>
+
+<box name="Extremity_AlMid_Plate" material="ShieldSteel" X_Y_Z="101.04; 400.; 1275."/>
+
+<gvxy name="Extremity_Back_Plate" material="ShieldSteel" dZ="1274.8">
+ <gvxy_point X_Y="-40.; -1003."/>
+ <gvxy_point X_Y="-40.; 585."/>
+ <gvxy_point X_Y="160.41; 1081.04"/>
+ <gvxy_point X_Y="234.5; 1051.11"/>
+ <gvxy_point X_Y="40.; 569.22"/>
+ <gvxy_point X_Y="40.; -1003."/>
+</gvxy>
+
+<gvxysx name="Extremity_Back_PlateCutArb" material="ShieldSteel" dZ="300.">
+ <gvxy_point X_Y="-225.; -175."/>
+ <gvxy_point X_Y="-225.; -18."/>
+ <gvxy_point X_Y="-415.21; 175."/>
+</gvxysx>
+
+<subtraction name="Extremity_Back_PlateCut" >
+ <posXYZ volume="Extremity_Back_Plate" />
+ <posXYZ volume="Extremity_Back_PlateCutArb" X_Y_Z="136.77; 915.87; 0." rot=" 0.; 90.; -22."/>
+</subtraction>
+
+<box name="Extremity_Front_Cover" material="ShieldSteel" X_Y_Z="80.34; 3015.; 1450."/>
+
+<tubs name="Extremity_Front_Cover_CutTube" material="ShieldSteel" Rio_Z="0.; 225.; 100." nbPhi="32"/>
+
+<box name="Extremity_Front_CoverCutBox" material="ShieldSteel" X_Y_Z="20.; 1210.; 250."/>
+
+<subtraction name="Extremity_Front_CoverCut" >
+ <posXYZ volume="Extremity_Front_Cover" />
+ <posXYZ volume="Extremity_Front_Cover_CutTube" X_Y_Z="0.; 332.5; 0." rot=" 0.; 90.; 0."/>
+ <posXYZ volume="Extremity_Front_CoverCutBox" X_Y_Z="40.17; 912.5; 725." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Front_CoverCutBox" X_Y_Z="40.17; 912.5; -725." rot=" 0.; 0.; 0."/>
+</subtraction>
+
+<composition name="Extremiy_Feet" >
+ <posXYZ volume="Extremity_Bottom_Plate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_MineSide_PlateSub" X_Y_Z=" 435.33 ; 2830.59 ; 678.9" />
+ <posXYZ volume="Extremity_MineSide_PlateSub" X_Y_Z=" 435.33 ; 2830.59 ; -678.9" />
+ <posXYZ volume="Extremity_Midd_Plate" X_Y_Z=" -691.23 ; 1812.79 ; 0." rot=" 0.; 0.; -22.5" />
+ <posXYZ volume="Extremity_Back_Top_Plate" X_Y_Z=" 2004.954 ; 4890. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_AlMid_Plate" X_Y_Z=" 1243.8 ; 3636.8 ; 0." rot=" 0.; 0.; -22.5" />
+ <posXYZ volume="Extremity_Back_PlateCut" X_Y_Z=" 840.5 ; 2070. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Front_CoverCut" X_Y_Z=" -321.16 ; 3203.82 ; 0." rot=" 0.; 0.; -22.5" />
+</composition>
+ <!-- End Extremity Feet -->
+
+
+ <!-- Standard Main Strut -->
+<gvxysx name="Sta_Main_Strut" material="Aluminium" dZ="3440.">
+ <gvxy_point X_Y="-200.; -300."/>
+ <gvxy_point X_Y="-200.; -250."/>
+ <gvxy_point X_Y="-20.; -218.3"/>
+ <gvxy_point X_Y="-20.; 218.3"/>
+ <gvxy_point X_Y="-200.; 250."/>
+ <gvxy_point X_Y="-200.; 300."/>
+</gvxysx>
+
+<tubs name="Standard_Main_StrutCutTube" material="Aluminium" Rio_Z="0.; 210.; 50." nbPhi="32"/>
+
+<subtraction name="Standard_Main_StrutCut" >
+ <posXYZ volume="Sta_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Main_StrutCutTube" X_Y_Z="897.5 ; 0. ; 0." />
+ <posXYZ volume="Standard_Main_StrutCutTube" X_Y_Z="-897.5 ; 0. ; 0." />
+</subtraction>
+
+<box name="Standard_Main_Strut_Plate1" material="Aluminium" X_Y_Z="69.99; 690.; 500."/>
+
+<box name="Standard_Main_Strut_Plate2" material="Aluminium" X_Y_Z="109.99; 790.; 975."/>
+
+<composition name="Standard_Main_Strut" >
+ <posXYZ volume="Standard_Main_StrutCut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate1" X_Y_Z=" 1755. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate1" X_Y_Z=" -1755. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate2" X_Y_Z=" 1844.99 ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Main_Strut_Plate2" X_Y_Z=" -1844.99 ; 0. ; 0." rot=" 0.; 0.;0." />
+</composition>
+ <!-- End Standard Main Strut -->
+
+
+ <!-- Extremity Main Strut -->
+<gvxysx name="Extr_Main_Strut" material="Aluminium" dZ="2780.">
+ <gvxy_point X_Y="-200.; -300."/>
+ <gvxy_point X_Y="-200.; -250."/>
+ <gvxy_point X_Y="-20.; -218.3"/>
+ <gvxy_point X_Y="-20.; 218.3"/>
+ <gvxy_point X_Y="-200.; 250."/>
+ <gvxy_point X_Y="-200.; 300."/>
+</gvxysx>
+
+<tubs name="Extremity_Main_StrutCutTube" material="Aluminium" Rio_Z="0.; 210.; 50." nbPhi="32"/>
+
+<subtraction name="Extremity_Main_StrutCut" >
+ <posXYZ volume="Extr_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Extremity_Main_StrutCutTube" X_Y_Z="897.5 ; 0. ; 0." />
+ <posXYZ volume="Extremity_Main_StrutCutTube" X_Y_Z="-897.5 ; 0. ; 0." />
+</subtraction>
+
+<box name="Extremity_Main_Strut_Plate1" material="Aluminium" X_Y_Z="69.99; 690.; 500."/>
+
+<box name="Extremity_Main_Strut_Plate2" material="Aluminium" X_Y_Z="109.99; 740.; 1344."/>
+
+<composition name="Extremity_Main_Strut" >
+ <posXYZ volume="Extremity_Main_StrutCut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate1" X_Y_Z=" 1425 ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate1" X_Y_Z=" -1425 ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate2" X_Y_Z=" 1515. ; 25. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut_Plate2" X_Y_Z=" -1515. ; 25. ; 0." rot=" 0.; 0.;0." />
+</composition>
+ <!-- End Extremity Main Strut -->
+
+
+ <!-- Girder 1 -->
+<box name="Standard_Girder1_Plate1" material="ShieldSteel" X_Y_Z="640.; 40.; 1527.3"/>
+
+<gvxysx name="Standard_Girder1_Plate2" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-670.; -465."/>
+ <gvxy_point X_Y="-670.; -345."/>
+ <gvxy_point X_Y="-763.65; -345."/>
+ <gvxy_point X_Y="-763.65; -20.05"/>
+</gvxysx>
+
+<gvxy name="Standard_Girder1_2_3_Plate3" material="ShieldSteel" dZ="76.35">
+ <gvxy_point X_Y="353.5; -410."/>
+ <gvxy_point X_Y="353.5; -120."/>
+ <gvxy_point X_Y="246.; -120."/>
+ <gvxy_point X_Y="246.; 120."/>
+ <gvxy_point X_Y="600.; 120."/>
+ <gvxy_point X_Y="600.; 410."/>
+ <gvxy_point X_Y="241.; 410."/>
+ <gvxy_point X_Y="241.; 305."/>
+ <gvxy_point X_Y="-389.; 305."/>
+ <gvxy_point X_Y="-389.; 410."/>
+ <gvxy_point X_Y="-600.; 410."/>
+ <gvxy_point X_Y="-600.; 120."/>
+ <gvxy_point X_Y="-389.; 120."/>
+ <gvxy_point X_Y="-389.; -120."/>
+ <gvxy_point X_Y="-496.5; -120."/>
+ <gvxy_point X_Y="-496.5; -320."/>
+ <gvxy_point X_Y="-296.5; -410."/>
+</gvxy>
+
+<box name="Standard_Girder1_2_3_Plate3CutBox" material="ShieldSteel" X_Y_Z="460.; 260.; 40."/>
+
+<subtraction name="Standard_Girder1_2_3_Plate3Cut_Side1" >
+ <posXYZ volume="Standard_Girder1_2_3_Plate3" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3CutBox" X_Y_Z="-71.5 ; 95. ; -23.175" />
+</subtraction>
+
+<subtraction name="Standard_Girder1_2_3_Plate3Cut_Side2" >
+ <posXYZ volume="Standard_Girder1_2_3_Plate3" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3CutBox" X_Y_Z="-71.5 ; 95. ; 23.175" />
+</subtraction>
+
+<box name="Standard_Girder1-2-3_Plate4" material="ShieldSteel" X_Y_Z="460.; 375.; 30."/>
+
+<gvxysx name="Standard_Girder1_Plate5" material="ShieldSteel" dZ="460.">
+ <gvxy_point X_Y="-450.; -435.05"/>
+ <gvxy_point X_Y="-713.35; -320.05"/>
+ <gvxy_point X_Y="-763.65; -320.05"/>
+ <gvxy_point X_Y="-763.65; -280.05"/>
+ <gvxy_point X_Y="-705.; -280.05"/>
+ <gvxy_point X_Y="-441.65; -395.05"/>
+</gvxysx>
+
+<composition name="Standard_Girder1" >
+ <posXYZ volume="Standard_Girder1_Plate1" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_Plate2" X_Y_Z=" 250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_Plate2" X_Y_Z=" -250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side1" X_Y_Z=" 71.5 ; -254.2 ; -801.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side2" X_Y_Z=" 71.5 ; -254.2 ; 801.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -405." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -70." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_Plate5" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+</composition>
+ <!-- End Girder 1 -->
+
+
+ <!-- Girder 2 -->
+<box name="Standard_Girder2_Plate1" material="ShieldSteel" X_Y_Z="640.; 40.; 1982.3"/>
+
+<gvxysx name="Standard_Girder2_Plate2" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-897.5; -465."/>
+ <gvxy_point X_Y="-897.5; -345."/>
+ <gvxy_point X_Y="-991.15; -345."/>
+ <gvxy_point X_Y="-991.15; -20.05"/>
+</gvxysx>
+
+<gvxysx name="Standard_Girder2_Plate5" material="ShieldSteel" dZ="460.">
+ <gvxy_point X_Y="-677.5; -435.05"/>
+ <gvxy_point X_Y="-940.85; -320.05"/>
+ <gvxy_point X_Y="-991.15; -320.05"/>
+ <gvxy_point X_Y="-991.15; -280.05"/>
+ <gvxy_point X_Y="-932.5; -280.05"/>
+ <gvxy_point X_Y="-669.15; -395.05"/>
+</gvxysx>
+
+<composition name="Standard_Girder2" >
+ <posXYZ volume="Standard_Girder2_Plate1" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2_Plate2" X_Y_Z=" 250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder2_Plate2" X_Y_Z=" -250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side1" X_Y_Z=" 71.5 ; -254.2 ; -1029.4" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side2" X_Y_Z=" 71.5 ; -254.2 ; 1029.4" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -277.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; 27.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2_Plate5" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+</composition>
+ <!-- End Girder 2 -->
+
+
+ <!-- Girder 3 -->
+<box name="Standard_Girder3_Plate1" material="ShieldSteel" X_Y_Z="640.; 40.; 2203.3"/>
+
+<gvxysx name="Standard_Girder3_Plate2" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-1007.5; -465."/>
+ <gvxy_point X_Y="-1007.5; -345."/>
+ <gvxy_point X_Y="-1101.65; -345."/>
+ <gvxy_point X_Y="-1101.65; -20.05"/>
+</gvxysx>
+
+<gvxysx name="Standard_Girder3_Plate5" material="ShieldSteel" dZ="460.">
+ <gvxy_point X_Y="-788.; -435.05"/>
+ <gvxy_point X_Y="-1051.35; -320.05"/>
+ <gvxy_point X_Y="-1101.65; -320.05"/>
+ <gvxy_point X_Y="-1101.65; -280.05"/>
+ <gvxy_point X_Y="-1043.; -280.05"/>
+ <gvxy_point X_Y="-779.65; -395.05"/>
+</gvxysx>
+
+<composition name="Standard_Girder3" >
+ <posXYZ volume="Standard_Girder3_Plate1" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3_Plate2" X_Y_Z=" 250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder3_Plate2" X_Y_Z=" -250.05 ; 0. ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side1" X_Y_Z=" 71.5 ; -254.2 ; -1139.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1_2_3_Plate3Cut_Side2" X_Y_Z=" 71.5 ; -254.2 ; 1139.9" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; -168." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3_Plate4" X_Y_Z=" 0. ; -207.51 ; 167." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3_Plate5" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 90.;0." />
+</composition>
+
+<composition name="Standard_Girder1-2-3" >
+ <posXYZ volume="Standard_Girder1" X_Y_Z=" 0. ; 0. ; 8005.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1" X_Y_Z=" 0. ; 0. ; -8005.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2" X_Y_Z=" 0. ; 0. ; 5027.52" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder2" X_Y_Z=" 0. ; 0. ; -5027.52" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3" X_Y_Z=" 0. ; 0. ; 1712.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder3" X_Y_Z=" 0. ; 0. ; -1712.5" rot=" 0.; 0.;0." />
+</composition>
+
+ <!-- End Girder 3 -->
+
+
+ <!-- Extremity Girder -->
+<box name="Extremity_Girder_Plate1" material="ShieldSteel" X_Y_Z="859.; 1100.; 75."/>
+<box name="Extremity_Girder_Plate1CutBox" material="ShieldSteel" X_Y_Z="459.; 700.; 80."/>
+
+<subtraction name="Extremity_Girder_Plate1Cut" >
+ <posXYZ volume="Extremity_Girder_Plate1" />
+ <posXYZ volume="Extremity_Girder_Plate1CutBox" />
+</subtraction>
+
+<gvxysx name="Extremity_Girder_Plate2" material="ShieldSteel" dZ="75.">
+ <gvxy_point X_Y="-325.; -370."/>
+ <gvxy_point X_Y="-325.; 230."/>
+ <gvxy_point X_Y="-425.; 324."/>
+ <gvxy_point X_Y="-425.; 370."/>
+</gvxysx>
+
+<gvxy name="Extremity_Girder_Plate3" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-362.; 175.5"/>
+ <gvxy_point X_Y="-362.; 428.5"/>
+ <gvxy_point X_Y="362.; 428.5"/>
+ <gvxy_point X_Y="362.; -428.5"/>
+</gvxy>
+
+<box name="Extremity_Girder_Plate4" material="ShieldSteel" X_Y_Z="389.; 383.; 40."/>
+
+<gvxysx name="Extremity_Girder_Plate5" material="ShieldSteel" dZ="40.">
+ <gvxy_point X_Y="-394.5; -400."/>
+ <gvxy_point X_Y="-253.5; 400."/>
+</gvxysx>
+
+<composition name="Extremity_Girder" >
+ <posXYZ volume="Extremity_Girder_Plate1Cut" X_Y_Z=" 0. ; 0. ; -0.05" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Girder_Plate2" X_Y_Z=" 0. ; 442.5 ; 407.51" rot=" -90.; 0.; 0." />
+ <posXYZ volume="Extremity_Girder_Plate3" X_Y_Z=" 251.21 ; -23.55 ; 397.53" rot=" 0.; 80.;0." />
+ <posXYZ volume="Extremity_Girder_Plate3" X_Y_Z=" -251.21 ; -23.55 ; 397.53" rot=" 0.; 100.;0." />
+ <posXYZ volume="Extremity_Girder_Plate4" X_Y_Z=" 0. ; 213.45 ; 580." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Girder_Plate5" X_Y_Z=" 0. ; -209.5 ; 362.7" rot=" 49.7; 0.;0." />
+</composition>
+ <!-- End Extremity Girder -->
+
+
+ <!-- Rail_Support -->
+<gvxysx name="Standard_Rail_Support" material="ShieldSteel" dZ="525.">
+ <gvxy_point X_Y="-350.; -452.1"/>
+ <gvxy_point X_Y="-350.; -437.1"/>
+ <gvxy_point X_Y="-550.; -437.1"/>
+ <gvxy_point X_Y="-550.; -342.1"/>
+ <gvxy_point X_Y="-540.; -342.1"/>
+ <gvxy_point X_Y="-540.; 318.5"/>
+ <gvxy_point X_Y="-597.5; 318.5"/>
+ <gvxy_point X_Y="-597.5; 452.1"/>
+</gvxysx>
+
+<box name="Standard_Rail_SupportCutBox1" material="ShieldSteel" X_Y_Z="920.; 290.6; 425."/>
+<box name="Standard_Rail_SupportCutBox2" material="ShieldSteel" X_Y_Z="920.; 290.; 425."/>
+
+<subtraction name="Standard_Rail_SupportCut" >
+ <posXYZ volume="Standard_Rail_Support" />
+ <posXYZ volume="Standard_Rail_SupportCutBox1" X_Y_Z=" 0 ; 173.2 ; 262.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Rail_SupportCutBox1" X_Y_Z=" 0 ; 173.2 ; -262.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Rail_SupportCutBox2" X_Y_Z=" 0 ; -197.1 ; 262.5" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Rail_SupportCutBox2" X_Y_Z=" 0 ; -197.1 ; -262.5" rot=" 0.; 0.;0." />
+</subtraction>
+ <!-- End Rail_Support -->
+
+
+ <!-- Extremity Rail_Support -->
+<gvxysx name="Extremity_Rail_Support_Plate1" material="ShieldSteel" dZ="1820.">
+ <gvxy_point X_Y="-40.; -678.8"/>
+ <gvxy_point X_Y="-40.; -127.7"/>
+ <gvxy_point X_Y="-262.5; -127.7"/>
+ <gvxy_point X_Y="-262.5; 0."/>
+</gvxysx>
+
+<box name="Extremity_Rail_Support_Plate1Cut" material="ShieldSteel" X_Y_Z="100.; 1102.2; 40."/>
+
+<subtraction name="Extremity_Rail_SupportCut" >
+ <posXYZ volume="Extremity_Rail_Support_Plate1" />
+ <posXYZ volume="Extremity_Rail_Support_Plate1Cut" X_Y_Z=" 0 ; -678.8 ; -910." rot=" 0.; 0.;0." />
+</subtraction>
+
+<gvxy name="Extremity_Rail_Support_Plate2" material="ShieldSteel" dZ="80.">
+ <gvxy_point X_Y="179.5; -113."/>
+ <gvxy_point X_Y="284.; -262.5"/>
+ <gvxy_point X_Y="490.; -262.5"/>
+ <gvxy_point X_Y="490.; 262.5"/>
+ <gvxy_point X_Y="-715.; 262.5"/>
+ <gvxy_point X_Y="-715.; -262.5"/>
+ <gvxy_point X_Y="-575.; -262.5"/>
+ <gvxy_point X_Y="-470.5; -113."/>
+</gvxy>
+
+<box name="Extremity_Rail_Support_Plate3-4" material="ShieldSteel" X_Y_Z="525.; 551.1; 80."/>
+
+<union name="Extremity_Rail_SupportUni1" >
+ <posXYZ volume="Extremity_Rail_SupportCut" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate2" X_Y_Z=" 0.; -423.8; 0. " rot=" 90.; -90.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; 530." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; -755." rot=" 0.; 0.; 0."/>
+</union>
+
+<gvxy name="Extremity_Rail_Support_Plate5" material="ShieldSteel" dZ="110.">
+ <gvxy_point X_Y="-645.; -45."/>
+ <gvxy_point X_Y="-645.; -262.5"/>
+ <gvxy_point X_Y="-890.; -262.5"/>
+ <gvxy_point X_Y="-890.; 262.5"/>
+ <gvxy_point X_Y="910.; 262.5"/>
+ <gvxy_point X_Y="910.; -262.5"/>
+ <gvxy_point X_Y="305.; -262.5"/>
+ <gvxy_point X_Y="305.; -45."/>
+</gvxy>
+
+<box name="Extremity_Rail_Support_Plate5CutBox" material="ShieldSteel" X_Y_Z="210.; 550.; 40."/>
+
+<subtraction name="Extremity_Rail_Support_Plate5Cut1" >
+ <posXYZ volume="Extremity_Rail_Support_Plate5" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" 485. ; 0. ; 55." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" -815. ; 0. ; 55." rot=" 0.; 0.;0." />
+</subtraction>
+
+
+<composition name="Extremity_Rail_Support1" >
+ <posXYZ volume="Extremity_Rail_SupportUni1" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5Cut1" X_Y_Z=" 0 ; -733.85 ; 0." rot=" 0.; -90.; 90." />
+</composition>
+
+<subtraction name="Extremity_Rail_Support_Plate5Cut2" >
+ <posXYZ volume="Extremity_Rail_Support_Plate5" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" 485. ; 0. ; -55." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Rail_Support_Plate5CutBox" X_Y_Z=" -815. ; 0. ; -55." rot=" 0.; 0.;0." />
+</subtraction>
+
+<union name="Extremity_Rail_SupportUni2" >
+ <posXYZ volume="Extremity_Rail_SupportCut" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate2" X_Y_Z=" 0.; -423.8; 0." rot=" -90.; -90.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; 530." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Extremity_Rail_Support_Plate3-4" X_Y_Z=" 0.; -403.25; -755." rot=" 0.; 0.; 0."/>
+</union>
+
+<composition name="Extremity_Rail_Support2" >
+ <posXYZ volume="Extremity_Rail_SupportUni2" />
+ <posXYZ volume="Extremity_Rail_Support_Plate5Cut2" X_Y_Z=" 0 ; -733.85 ; 0." rot=" 0.; -90.; -90." />
+</composition>
+ <!-- End Extremity Rail_Support -->
+
+
+ <!-- assembly of Standard feet, Standard rail support and Standard strut -->
+<composition name="Standard_Feet_Comp" >
+ <posXYZ volume="Standard_Feet" X_Y_Z=" -3609.69 ; -4899.96 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet" X_Y_Z=" 3609.69 ; -4899.96 ; 0." rot=" 0.; 180.;0." />
+ <posXYZ volume="Standard_Rail_SupportCut" X_Y_Z=" -2982.592 ; 852.63 ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Rail_SupportCut" X_Y_Z=" 2982.592 ; 852.63 ; 0." rot=" 0.; 90.;0." />
+ <posXYZ volume="Standard_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+</composition>
+
+<composition name="Extremity_Feet_Comp" >
+ <posXYZ volume="Extremiy_Feet" X_Y_Z=" -3609.95 ; -4895. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremiy_Feet" X_Y_Z=" 3609.95 ; -4895. ; 0." rot=" 0.; 180.;0." />
+ <posXYZ volume="Extremity_Rail_Support1" X_Y_Z=" -2982.641; 1304.32 ; 165.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Rail_Support2" X_Y_Z=" 2982.641; 1304.32 ; 165.02" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Main_Strut" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Girder" X_Y_Z=" 2735.53 ; -969.96 ; -758.8" rot=" 0.; 180.; 0." />
+ <posXYZ volume="Extremity_Girder" X_Y_Z=" -2735.53 ; -969.96 ; -757.8" rot=" 0.; 180.; 0." />
+</composition>
+ <!-- End assembly of Standard feet, Standard rail support and Standard strut -->
+
+
+<composition name="Feet" >
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 3425.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 6630.036" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 9380.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -3425.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -6630.036" rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -9380.034" rot=" 0.; 0.;0." />
+
+ <posXYZ volume="Extremity_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; 12080.034" rot=" 0.; 0.;0." />
+ <posXYZ volume="Extremity_Feet_Comp" X_Y_Z=" 0. ; -6135.059 ; -12080.034" rot=" 0.; 180.;0." />
+
+ <posXYZ volume="Standard_Girder1-2-3" X_Y_Z=" -2735.5 ; -6613.91 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Standard_Girder1-2-3" X_Y_Z=" 2735.5 ; -6613.91 ; 0." rot=" 0.; 180.;0." />
+</composition>
+
+</section>
+
+
+<section name = "ATLAS Rail"
+ version = "7.0"
+ date = "10 December 2003"
+ author = "Jochen Meyer, Laurent Chevalier, Daniel Pomarede"
+ top_volume = "RailAssembly">
+
+
+
+<!-- Basic parameters -->
+
+<!-- Rails Main section -->
+<!-- BEGIN confirmation with atlhbrb_0001-vAH (if no other comment) -->
+<var name="RAIL_CeRzleng_CentralRail_Zlength" value="6850." />
+<var name="RAIL_ExRzleng_ExtremityRail_Zlength" value="9784." />
+<var name="RAIL_CeRwidt1_CentralRail_Width1" value=" 450." />
+<var name="RAIL_CeRwidt2_CentralRail_Width2" value=" 120." />
+<var name="RAIL_CeRwid3o_CentralRail_Width3outer" value=" 380." />
+<var name="RAIL_CeRwid3i_CentralRail_Width3inner" value=" 350." />
+
+<var name="RAIL_CeRthic1_CentralRail_Thick1" value=" 100." />
+<var name="RAIL_CeRthic2_CentralRail_Thick2" value=" 200." />
+
+<!-- Reinforcement Plates -->
+
+<var name="RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength" value=" 50." />
+<var name="RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength" value=" 40." />
+<var name="RAIL_CeRRPIx1_CentralRailReinforcementPlateInner_Xdist1" value="260." />
+<var name="RAIL_CeRRPOx1_CentralRailReinforcementPlateOuter_Xdist1" value="290." />
+
+<!-- CentralRailReinforcementPlate_std_Zpos -->
+<array name="RAIL_CeRRPSzp" values="490.;1090.;1687.5;2285.;2885.;3400.;3915.;4515.;5112.5;5710.;6310. " />
+<!-- ExtremityRailReinforcementPlate_std_Zpos -->
+<array name="RAIL_ExRRPSzp" values="540;1085;1627.5;2170;2715;3230;3745;4315;4895;5465;5980;6495;7017.5;7540;8062.5;8720;9375" />
+
+<!-- Global position -->
+<var name="RAIL_Xpos" value=" 2985." /> <!-- confirmed atcnh___0005-vAG -->
+<var name="RAIL_Ypos_above" value="-4390." /> <!-- confirmed atcnh___0005-vAG -->
+
+<!-- Derived variables -->
+
+<var name="RAIL_totHeight" value="RAIL_CeRthic2_CentralRail_Thick2+2.*RAIL_CeRthic1_CentralRail_Thick1" />
+
+
+
+<!-- Feet Modelization -->
+
+<!-- Rail Main section -->
+
+<var name="RAIL_CeRy" value="0." />
+
+<var name="RAIL_CeRxb" value="RAIL_CeRwidt1_CentralRail_Width1/2." />
+<var name="RAIL_CeRyb" value="0." />
+
+<var name="RAIL_CeRxc" value="RAIL_CeRxb" />
+<var name="RAIL_CeRyc" value="RAIL_CeRthic1_CentralRail_Thick1" />
+
+<var name="RAIL_CeRxd" value="RAIL_CeRwidt2_CentralRail_Width2/2." />
+<var name="RAIL_CeRyd" value="RAIL_CeRyc" />
+
+<var name="RAIL_CeRxe" value="RAIL_CeRxd" />
+<var name="RAIL_CeRye" value="RAIL_CeRyd+RAIL_CeRthic2_CentralRail_Thick2" />
+
+<var name="RAIL_CeRxf" value="RAIL_CeRwid3i_CentralRail_Width3inner" />
+<var name="RAIL_CeRyf" value="RAIL_CeRye" />
+
+<var name="RAIL_CeRxg" value="RAIL_CeRxf" />
+<var name="RAIL_CeRyg" value="RAIL_CeRyf+RAIL_CeRthic1_CentralRail_Thick1" />
+
+<var name="RAIL_CeRxh" value="-RAIL_CeRwid3o_CentralRail_Width3outer" />
+<var name="RAIL_CeRyh" value="RAIL_CeRyg" />
+
+<var name="RAIL_CeRxi" value="RAIL_CeRxh" />
+<var name="RAIL_CeRyi" value="RAIL_CeRye" />
+
+<var name="RAIL_CeRxj" value="-RAIL_CeRwidt2_CentralRail_Width2/2." />
+<var name="RAIL_CeRyj" value="RAIL_CeRyi" />
+
+<var name="RAIL_CeRxk" value="RAIL_CeRxj" />
+<var name="RAIL_CeRyk" value="RAIL_CeRyc" />
+
+<var name="RAIL_CeRxl" value="-RAIL_CeRwidt1_CentralRail_Width1/2." />
+<var name="RAIL_CeRyl" value="RAIL_CeRyk" />
+
+<var name="RAIL_CeRxm" value="RAIL_CeRxl" />
+<var name="RAIL_CeRym" value="RAIL_CeRy " />
+
+<!-- gvxy name="CentralRail" material="Iron" dZ="RAIL_CeRzleng_CentralRail_Zlength" >
+ <gvxy_point X_Y="-RAIL_CeRxb;RAIL_CeRyb"/>
+ <gvxy_point X_Y="-RAIL_CeRxc;RAIL_CeRyc"/>
+ <gvxy_point X_Y="-RAIL_CeRxd;RAIL_CeRyd"/>
+ <gvxy_point X_Y="-RAIL_CeRxe;RAIL_CeRye"/>
+ <gvxy_point X_Y="-RAIL_CeRxf;RAIL_CeRyf"/>
+ <gvxy_point X_Y="-RAIL_CeRxg;RAIL_CeRyg"/>
+ <gvxy_point X_Y="-RAIL_CeRxh;RAIL_CeRyh"/>
+ <gvxy_point X_Y="-RAIL_CeRxi;RAIL_CeRyi"/>
+ <gvxy_point X_Y="-RAIL_CeRxj;RAIL_CeRyj"/>
+ <gvxy_point X_Y="-RAIL_CeRxk;RAIL_CeRyk"/>
+ <gvxy_point X_Y="-RAIL_CeRxl;RAIL_CeRyl"/>
+ <gvxy_point X_Y="-RAIL_CeRxm;RAIL_CeRym"/>
+</gvxy -->
+
+<var name="Rail_temp1" value="RAIL_CeRyg/2.-(RAIL_CeRyg-RAIL_CeRyf)/2." />
+<var name="Rail_temp2" value="-RAIL_CeRyg/2.+(RAIL_CeRyc-RAIL_CeRyb)/2." />
+<var name="Rail_temp3" value="(RAIL_CeRxg+RAIL_CeRxh)/2." />
+
+<box name="ExtremityRail_a" material="Iron" X_Y_Z="RAIL_CeRxd*2.;RAIL_CeRyg;RAIL_ExRzleng_ExtremityRail_Zlength - GENV_Eps" />
+<box name="ExtremityRail_b" material="Iron" X_Y_Z="(RAIL_CeRxg-RAIL_CeRxh);(RAIL_CeRyg-RAIL_CeRyf);RAIL_ExRzleng_ExtremityRail_Zlength" />
+<box name="ExtremityRail_c" material="Iron" X_Y_Z="-2.*RAIL_CeRxl;(RAIL_CeRyc-RAIL_CeRyb);RAIL_ExRzleng_ExtremityRail_Zlength" />
+<union name="ExtremityRail_d" >
+ <posXYZ volume="ExtremityRail_a" />
+ <posXYZ volume="ExtremityRail_b" X_Y_Z="-Rail_temp3;Rail_temp1;0"/>
+ <posXYZ volume="ExtremityRail_c" X_Y_Z="0.;Rail_temp2;0"/>
+</union>
+
+<composition name="ExtremityRail_plus_new" >
+ <posXYZ volume="ExtremityRail_d" X_Y_Z="0.;RAIL_CeRyg/2.;0." />
+</composition>
+
+<box name="CentralRail_a" material="Iron" X_Y_Z="RAIL_CeRxd*2.;RAIL_CeRyg;RAIL_CeRzleng_CentralRail_Zlength - GENV_Eps" />
+<box name="CentralRail_b" material="Iron" X_Y_Z="(RAIL_CeRxg-RAIL_CeRxh);(RAIL_CeRyg-RAIL_CeRyf);RAIL_CeRzleng_CentralRail_Zlength" />
+<box name="CentralRail_c" material="Iron" X_Y_Z="-2.*RAIL_CeRxl;(RAIL_CeRyc-RAIL_CeRyb);RAIL_CeRzleng_CentralRail_Zlength" />
+<union name="CentralRail_d" >
+ <posXYZ volume="CentralRail_a" />
+ <posXYZ volume="CentralRail_b" X_Y_Z="-Rail_temp3;Rail_temp1;0"/>
+ <posXYZ volume="CentralRail_c" X_Y_Z="0.;Rail_temp2;0"/>
+</union>
+
+<composition name="CentralRail_new" >
+ <posXYZ volume="CentralRail_d" X_Y_Z="0.;RAIL_CeRyg/2.;0." />
+</composition>
+
+<!--gvxy name="ExtremityRail_plus" material="Iron" dZ="RAIL_ExRzleng_ExtremityRail_Zlength" >
+ <gvxy_point X_Y=" -RAIL_CeRxb ; RAIL_CeRyb " />
+ <gvxy_point X_Y=" -RAIL_CeRxc ; RAIL_CeRyc " />
+ <gvxy_point X_Y=" -RAIL_CeRxd ; RAIL_CeRyd " />
+ <gvxy_point X_Y=" -RAIL_CeRxe ; RAIL_CeRye " />
+ <gvxy_point X_Y=" -RAIL_CeRxf ; RAIL_CeRyf " />
+ <gvxy_point X_Y=" -RAIL_CeRxg ; RAIL_CeRyg " />
+ <gvxy_point X_Y=" -RAIL_CeRxh ; RAIL_CeRyh " />
+ <gvxy_point X_Y=" -RAIL_CeRxi ; RAIL_CeRyi " />
+ <gvxy_point X_Y=" -RAIL_CeRxj ; RAIL_CeRyj " />
+ <gvxy_point X_Y=" -RAIL_CeRxk ; RAIL_CeRyk " />
+ <gvxy_point X_Y=" -RAIL_CeRxl ; RAIL_CeRyl " />
+ <gvxy_point X_Y=" -RAIL_CeRxm ; RAIL_CeRym " />
+</gvxy -->
+
+<composition name="ExtremityRail_minus" >
+ <posXYZ volume="ExtremityRail_plus_new" rot=" 0.; 180.; 0. " />
+</composition>
+
+
+
+<!-- Reinforcement Plates -->
+
+<var name="RAIL_CeRRPIy2_CentralRailReinforcementPlateInner_Ydist2" value="(RAIL_CeRRPIx1_CentralRailReinforcementPlateInner_Xdist1 + RAIL_CeRwidt2_CentralRail_Width2/2. - RAIL_CeRxc) * GENV_Ta55" />
+
+<var name="RAIL_CeRRPIxa" value="RAIL_CeRxd" />
+<var name="RAIL_CeRRPIya" value="RAIL_CeRyd" />
+<var name="RAIL_CeRRPIxb" value="RAIL_CeRxc" />
+<var name="RAIL_CeRRPIyb" value="RAIL_CeRyc" />
+<var name="RAIL_CeRRPIxc" value="RAIL_CeRxd + RAIL_CeRRPIx1_CentralRailReinforcementPlateInner_Xdist1" />
+<var name="RAIL_CeRRPIyc" value="RAIL_CeRyc + RAIL_CeRRPIy2_CentralRailReinforcementPlateInner_Ydist2" />
+<var name="RAIL_CeRRPIxd" value="RAIL_CeRRPIxc" />
+<var name="RAIL_CeRRPIyd" value="RAIL_CeRye" />
+<var name="RAIL_CeRRPIxe" value="RAIL_CeRRPIxa" />
+<var name="RAIL_CeRRPIye" value="RAIL_CeRRPIyd" />
+
+<gvxy name="CentralRailReinforcementPlateInner_extremity" material="Iron" dZ="RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength" >
+ <gvxy_point X_Y=" -RAIL_CeRRPIxa ; RAIL_CeRRPIya " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxb ; RAIL_CeRRPIyb " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxc ; RAIL_CeRRPIyc " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxd ; RAIL_CeRRPIyd " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxe ; RAIL_CeRRPIye " />
+</gvxy>
+
+
+<var name="RAIL_CeRRPOxa" value="-RAIL_CeRxd" />
+<var name="RAIL_CeRRPOya" value=" RAIL_CeRyd" />
+<var name="RAIL_CeRRPOxb" value="-RAIL_CeRxc" />
+<var name="RAIL_CeRRPOyb" value=" RAIL_CeRyc" />
+<var name="RAIL_CeRRPOxc" value="-RAIL_CeRxd - RAIL_CeRRPOx1_CentralRailReinforcementPlateOuter_Xdist1" />
+<var name="RAIL_CeRRPOyc" value=" RAIL_CeRyc + RAIL_CeRRPIy2_CentralRailReinforcementPlateInner_Ydist2" />
+<var name="RAIL_CeRRPOxd" value=" RAIL_CeRRPOxc" />
+<var name="RAIL_CeRRPOyd" value=" RAIL_CeRye" />
+<var name="RAIL_CeRRPOxe" value=" RAIL_CeRRPOxa" />
+<var name="RAIL_CeRRPOye" value=" RAIL_CeRRPOyd" />
+
+<gvxy name="CentralRailReinforcementPlateOuter_extremity" material="Iron" dZ="RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength" >
+ <gvxy_point X_Y=" RAIL_CeRRPOxa ; RAIL_CeRRPOya " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxb ; RAIL_CeRRPOyb " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxc ; RAIL_CeRRPOyc " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxd ; RAIL_CeRRPOyd " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxe ; RAIL_CeRRPOye " />
+</gvxy>
+
+<var name="RAIL_CeRRPe1z_CentralRailReinforcementPlate_extremity1_Zpos" value="-RAIL_CeRzleng_CentralRail_Zlength/2. + RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength/2. " />
+<var name="RAIL_CeRRPe2z_CentralRailReinforcementPlate_extremity2_Zpos" value="-RAIL_CeRRPe1z_CentralRailReinforcementPlate_extremity1_Zpos" />
+<var name="RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" value="-RAIL_ExRzleng_ExtremityRail_Zlength/2. + RAIL_CeRRPEzl_CentralRailReinforcementPlate_extremity_Zlength/2. " />
+<var name="RAIL_ExRRPe2z_ExtremityRailReinforcementPlate_extremity2_Zpos" value="-RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" />
+
+<gvxy name="CentralRailReinforcementPlateInner_std" material="Iron" dZ="RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength" >
+ <gvxy_point X_Y=" -RAIL_CeRRPIxa ; RAIL_CeRRPIya " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxb ; RAIL_CeRRPIyb " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxc ; RAIL_CeRRPIyc " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxd ; RAIL_CeRRPIyd " />
+ <gvxy_point X_Y=" -RAIL_CeRRPIxe ; RAIL_CeRRPIye " />
+</gvxy>
+<gvxy name="CentralRailReinforcementPlateOuter_std" material="Iron" dZ="RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength" >
+ <gvxy_point X_Y=" RAIL_CeRRPOxa ; RAIL_CeRRPOya " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxb ; RAIL_CeRRPOyb " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxc ; RAIL_CeRRPOyc " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxd ; RAIL_CeRRPOyd " />
+ <gvxy_point X_Y=" RAIL_CeRRPOxe ; RAIL_CeRRPOye " />
+</gvxy>
+
+
+
+<composition name="CentralRailReinforcementPlate_extremity_minus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_extremity" rot="0.;180.;0." />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_extremity" />
+</composition>
+<composition name="CentralRailReinforcementPlate_extremity_plus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_extremity" />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_extremity" rot="0.;180.;0." />
+</composition>
+
+<composition name="CentralRailReinforcementPlate_std_minus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_std" rot="0.;180.;0." />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_std" />
+</composition>
+<composition name="CentralRailReinforcementPlate_std_plus" >
+ <posXYZ volume="CentralRailReinforcementPlateInner_std" />
+ <posXYZ volume="CentralRailReinforcementPlateOuter_std" rot="0.;180.;0." />
+</composition>
+
+
+
+<!-- Feet Assembly -->
+
+<composition name="CentralRailAssembly" >
+ <!-- posXYZ volume="CentralRail" rot="0.;180.;0." /-->
+ <posXYZ volume="CentralRail_new" rot="0.;180.;0." />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z=" 0.;0.; RAIL_CeRRPe1z_CentralRailReinforcementPlate_extremity1_Zpos" />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z=" 0.;0.; RAIL_CeRRPe2z_CentralRailReinforcementPlate_extremity2_Zpos" />
+ <foreach index="I" begin="0" loops="11" >
+ <posXYZ volume="CentralRailReinforcementPlate_std_minus" X_Y_Z=" 0.;0.;-RAIL_CeRzleng_CentralRail_Zlength/2. + RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength/2. + RAIL_CeRRPSzp[I]" />
+ </foreach>
+</composition>
+
+
+<var name="RAIL_Ypos" value="RAIL_Ypos_above - RAIL_totHeight" /> <!-- ATTENTION THIS VARIABLE IS ALSO USED IN SHIELDING AND HFTRUCK SECTIONS -->
+<var name="RAIL_ExtrZpos" value="RAIL_CeRzleng_CentralRail_Zlength/2.+RAIL_ExRzleng_ExtremityRail_Zlength/2." />
+
+
+<composition name="ExtremityRailAssembly" >
+ <posXYZ volume="ExtremityRail_minus" X_Y_Z=" -RAIL_Xpos;0.; 0." />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z="-RAIL_Xpos;0.; RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_minus" X_Y_Z="-RAIL_Xpos;0.; RAIL_ExRRPe2z_ExtremityRailReinforcementPlate_extremity2_Zpos" />
+
+ <foreach index="I" begin="0" loops="17" >
+ <posXYZ volume="CentralRailReinforcementPlate_std_minus" X_Y_Z=" -RAIL_Xpos;0.;-RAIL_ExRzleng_ExtremityRail_Zlength/2. - RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength/2. + RAIL_ExRRPSzp[I]" />
+ </foreach>
+
+ <!--posXYZ volume="ExtremityRail_plus" X_Y_Z=" RAIL_Xpos;0.; 0." /-->
+ <posXYZ volume="ExtremityRail_plus_new" X_Y_Z=" RAIL_Xpos;0.; 0." />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_plus" X_Y_Z=" RAIL_Xpos;0.; RAIL_ExRRPe1z_ExtremityRailReinforcementPlate_extremity1_Zpos" />
+ <posXYZ volume="CentralRailReinforcementPlate_extremity_plus" X_Y_Z=" RAIL_Xpos;0.; RAIL_ExRRPe2z_ExtremityRailReinforcementPlate_extremity2_Zpos" />
+
+ <foreach index="I" begin="0" loops="17" >
+ <posXYZ volume="CentralRailReinforcementPlate_std_plus" X_Y_Z=" RAIL_Xpos;0.;-RAIL_ExRzleng_ExtremityRail_Zlength/2. - RAIL_CeRRPSzl_CentralRailReinforcementPlate_std_Zlength/2. + RAIL_ExRRPSzp[I]" />
+ </foreach>
+</composition>
+
+<composition name="RailAssembly" >
+ <posXYZ volume="CentralRailAssembly" X_Y_Z="-RAIL_Xpos;RAIL_Ypos; 0." rot="0.; 0.;0." />
+ <posXYZ volume="CentralRailAssembly" X_Y_Z=" RAIL_Xpos;RAIL_Ypos; 0." rot="0.;180.;0." />
+ <posXYZ volume="ExtremityRailAssembly" X_Y_Z=" 0.;RAIL_Ypos; RAIL_ExtrZpos" rot="0.; 0.;0." />
+ <posXYZ volume="ExtremityRailAssembly" X_Y_Z=" 0.;RAIL_Ypos;-RAIL_ExtrZpos" rot="0.;180.;0." />
+</composition>
+
+</section>
+
+
+
+
+
+<section name = "ATLAS Shielding"
+ version = "8.0"
+ date = "10 January 2011"
+ author = "Daniel Pomarede, reviewed by Jochen"
+ top_volume = "useless">
+
+
+<!-- name = A Frame Welded Assembly section name = "Shielding" -->
+
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Shields ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+
+<!-- JF Shielding -->
+
+<!-- "A" Frame Welded Assembly -->
+
+
+
+<!-- Useful variables -->
+
+<var name="JFSH_XYZref" value=" 0." /> <!-- NO CONFIRMATION NEEDED -->
+<var name="JFSH_rot180" value=" 180." /> <!-- NO CONFIRMATION NEEDED -->
+
+<!-- Primary variables -->
+
+<!-- BEGIN confirmation with atljf___0087-vAC (if no other comment) -->
+<var name="JFSH_AFBBleng_AFrame_BottomBar_length" value="5498." />
+<var name="JFSH_AFBheigh_AFrame_Bar_height" value=" 250." />
+<var name="JFSH_AFrwidth_AFrame_width" value=" 250." />
+<var name="JFSH_AFBthic1_AFrame_Bar_thickness1" value=" 9." />
+<var name="JFSH_AFBthic2_AFrame_Bar_thickness2" value=" 14." />
+<var name="JFSH_AFLangle_AFrame_Leg_angle" value=" 42." />
+
+<var name="JFSH_AFSlengt_AFrame_Spacer_length" value=" 140." />
+<var name="JFSH_AFSheigh_AFrame_Spacer_height" value=" 290." />
+
+<var name="JFSH_AFWEBBx1_AFrame_Web_element_BottomBar_X1" value=" 0." /> <!-- NO CONFIRMATION NEEDED -->
+<var name="JFSH_AFWEBBx2_AFrame_Web_element_BottomBar_X2" value="1306." /> <!-- confirmed atljf___0028-vAD -->
+<var name="JFSH_AFWEleng_AFrame_Web_element_length" value=" 30." />
+<var name="JFSH_AFWEBLx1_AFrame_Web_element_Leg_DX1" value="1090.+8." /> <!-- temporarily sum to avoid overlap, second Flange needs to be introduced, confirmed atljf___0028-vAD-->
+<var name="JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2" value=" 965." /> <!-- confirmed atljf___0028-vAD -->
+
+<var name="JFSH_AFFthick_AFrame_Flange_thickness" value=" 15." />
+<var name="JFSH_AFFlengt_AFrame_Flange_length" value=" 935." />
+
+<var name="JFSH_AFTPleng_AFrame_TopPlate_length" value=" 300." />
+<var name="JFSH_AFTPheig_AFrame_TopPlate_height" value=" 50." />
+
+<var name="JFSH_AFWheigh_AFrame_Wedge_height" value=" 149.2"/>
+<var name="JFSH_AFWexten_AFrame_Wedge_extension" value=" 200." />
+<var name="JFSH_AFWthick_AFrame_Wedge_thickness" value=" 50." />
+<var name="JFSH_AFWzoffs_AFrame_Wedge_zoffset" value=" 20." /> <!-- confirmed atljf___0028-vAD -->
+
+<var name="JFSH_AFFEElen_AFrame_Feet_length" value=" 830."/>
+<var name="JFSH_AFFEEthi_AFrame_Feet_thickness" value=" 50."/>
+<var name="JFSH_AFFEEsle_AFrame_Feet_shortlength" value=" 100. - 20."/> <!-- reduced value to avoid clash with rail -->
+<var name="JFSH_AFFEEhei_AFrame_Feet_height" value=" 225."/>
+<var name="JFSH_AFFEEext_AFrame_Feet_X_extension" value=" 6830."/> <!-- confirmed atljf___0028-vAD -->
+
+<var name="JFSH_AFtothei_AFrame_Total_height" value=" 2740."/> <!-- confirmed atljf___0028-vAD -->
+<var name="JFSH_AFECTcle_Clearance_ECT_AFrame" value=" 25."/> <!-- confirmed atljf___0010-vAC -->
+
+<var name="JFSH_ECTnomiz_ECT_Nominal_zpos" value="12914."/> <!-- confirmed atljf___0010-vAC -->
+<!-- END confirmation with atljf___0087-vAC -->
+
+<!-- Derived variables TEMPORAY already declare in RAIL Section laurent 05-05-10 ********* -->
+<var name="RAIL_CeRthic1_CentralRail_Thick1JFSH" value=" 100." /> <!-- confirmed atlhbrb_0001-vAH -->
+<var name="RAIL_CeRthic2_CentralRail_Thick2JFSH" value=" 200." /> <!-- confirmed atlhbrb_0001-vAH -->
+<var name="RAIL_Ypos_aboveJFSH" value="-4390." /> <!-- confirmed atcnh___0005-vAG -->
+<var name="RAIL_totHeightJFSH" value="RAIL_CeRthic2_CentralRail_Thick2JFSH+2.*RAIL_CeRthic1_CentralRail_Thick1JFSH" />
+<var name="RAIL_YposJFSH" value="RAIL_Ypos_aboveJFSH - RAIL_totHeightJFSH" />
+<var name="JFSH_AFyposit_AFrame_Ypos" value="RAIL_YposJFSH+RAIL_totHeightJFSH+JFSH_AFFEEthi_AFrame_Feet_thickness" />
+<var name="JFSH_AFzposit_AFrame_Zpos" value="JFSH_XYZref + JFSH_AFECTcle_Clearance_ECT_AFrame +JFSH_AFrwidth_AFrame_width/2." />
+<var name="JFSH_AFASposy_AFrame_Assembly_Y" value=" JFSH_AFyposit_AFrame_Ypos" />
+<var name="JFSH_AFASposz_AFrame_Assembly_Z" value=" JFSH_AFzposit_AFrame_Zpos" />
+<!-- Derived variables TEMPORAY already declare in RAIL Section ********* -->
+
+
+<!-- "A" Frame Welded Assembly Bottom Bar Lower Horizontal Plate -->
+<var name="JFSH_AFBLHPxa" value="JFSH_AFBBleng_AFrame_BottomBar_length/2." />
+<var name="JFSH_AFBLHPya" value="JFSH_XYZref" />
+<var name="JFSH_AFBLHPyb" value="JFSH_AFBLHPya+JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFBLHPxb" value="JFSH_AFBLHPxa - (JFSH_AFBLHPyb-JFSH_AFBLHPya)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<trd name="JFSH_AFrame_BottomBar_LowerHorizontalPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFBLHPxb; 2.*JFSH_AFBLHPxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFBLHPyb-JFSH_AFBLHPya" />
+
+
+<!-- "A" Frame Welded Assembly Bottom Bar Vertical Plate -->
+
+<var name="JFSH_AFBBVPxa" value="JFSH_AFBLHPxb" />
+<var name="JFSH_AFBBVPya" value="JFSH_AFBthic2_AFrame_Bar_thickness2" />
+<var name="JFSH_AFBBVPyb" value="JFSH_AFBheigh_AFrame_Bar_height - JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFBBVPxb" value="JFSH_AFBBVPxa - (JFSH_AFBBVPyb-JFSH_AFBBVPya)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<trd name="JFSH_AFrame_BottomBar_VerticalPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFBBVPxb; 2.*JFSH_AFBBVPxa; JFSH_AFBthic1_AFrame_Bar_thickness1; JFSH_AFBthic1_AFrame_Bar_thickness1; JFSH_AFBBVPyb-JFSH_AFBBVPya" />
+
+<!-- "A" Frame Welded Assembly Bottom Bar Upper Horizontal Plate -->
+
+<var name="JFSH_AFBUHPxa" value="JFSH_AFBBVPxb" />
+<var name="JFSH_AFBUHPya" value="JFSH_AFBBVPyb" />
+<var name="JFSH_AFBUHPyb" value="JFSH_AFBUHPya + JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFBUHPxb" value="JFSH_AFBUHPxa - (JFSH_AFBUHPyb-JFSH_AFBUHPya)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<trd name="JFSH_AFrame_BottomBar_UpperHorizontalPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFBUHPxb; 2.*JFSH_AFBUHPxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFBUHPyb-JFSH_AFBUHPya" />
+
+
+<!-- "A" Frame Welded Assembly Leg Lower Horizontal Plate -->
+
+<var name="JFSH_AFLLHPxa" value="JFSH_AFBLHPxa" />
+<var name="JFSH_AFLLHPya" value="JFSH_AFBLHPya" />
+
+<var name="JFSH_AFLLHPxb" value="JFSH_AFSlengt_AFrame_Spacer_length/2." />
+<var name="JFSH_AFLLHPyb" value="(JFSH_AFLLHPxa-JFSH_AFLLHPxb)*tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180) " />
+
+<var name="JFSH_AFLLHPxc" value="JFSH_AFLLHPxb" />
+<var name="JFSH_AFLLHPyc" value="JFSH_AFLLHPyb + JFSH_AFBthic2_AFrame_Bar_thickness2/cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<var name="JFSH_AFLLHPxd" value="JFSH_AFLLHPxa + JFSH_AFBthic2_AFrame_Bar_thickness2/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLLHPyd" value="JFSH_AFBLHPya" />
+
+<box name="JFSH_AFrame_Leg_LowerHorizontalPlate_basic" material="ShieldSteel" X_Y_Z="JFSH_AFBthic2_AFrame_Bar_thickness2; JFSH_AFLLHPyc/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Leg_LowerHorizontalPlate_cut1" material="ShieldSteel" X_Y_Z="2.*JFSH_AFLLHPxb; JFSH_AFrwidth_AFrame_width; 2.*JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Leg_LowerHorizontalPlate_cut2" material="ShieldSteel" X_Y_Z="JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; 2.*JFSH_AFrwidth_AFrame_width" />
+
+<subtraction name="JFSH_AFrame_Leg_LowerHorizontalPlate">
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate_basic" X_Y_Z="(JFSH_AFLLHPxd+JFSH_AFLLHPxb)/2.-JFSH_AFBthic2_AFrame_Bar_thickness2*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2.; JFSH_AFLLHPyc/2.-JFSH_AFBthic2_AFrame_Bar_thickness2*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2.; 0. " rot=" 0.; 0.; 90-JFSH_AFLangle_AFrame_Leg_angle"/>
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate_cut1" X_Y_Z="0.; JFSH_AFLLHPyc; 0."/>
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate_cut2" X_Y_Z="JFSH_AFLLHPxd; -JFSH_AFrwidth_AFrame_width/2.; 0."/>
+</subtraction>
+
+<!-- "A" Frame Welded Assembly Leg Vertical Plate -->
+
+<var name="JFSH_AFLVPxa" value="JFSH_AFLLHPxd" />
+<var name="JFSH_AFLVPya" value="JFSH_AFLLHPyd" />
+
+<var name="JFSH_AFLVPxb" value="JFSH_AFLLHPxc" />
+<var name="JFSH_AFLVPyb" value="JFSH_AFLLHPyc" />
+
+<var name="JFSH_AFLVPxc" value="JFSH_AFLVPxb" />
+<var name="JFSH_AFLVPyc" value="JFSH_AFtothei_AFrame_Total_height - JFSH_AFTPheig_AFrame_TopPlate_height" />
+
+<var name="JFSH_AFLVPxe" value="JFSH_AFLVPxa + (JFSH_AFBheigh_AFrame_Bar_height-2*JFSH_AFBthic2_AFrame_Bar_thickness2)/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLVPye" value="JFSH_AFBLHPya" />
+
+<var name="JFSH_AFLVPyd" value="JFSH_AFLVPyc" />
+<var name="JFSH_AFLVPxd" value="JFSH_AFLVPxe - (JFSH_AFLVPyd)/tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<box name="JFSH_AFrame_Leg_VerticalPlate_basic" material="ShieldSteel" X_Y_Z="-(JFSH_AFLVPxa-JFSH_AFLVPxe)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); (JFSH_AFLVPxe-JFSH_AFLVPxb)/cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); JFSH_AFBthic1_AFrame_Bar_thickness1" />
+<box name="JFSH_AFrame_Leg_VerticalPlate_cut1" material="ShieldSteel" X_Y_Z="JFSH_AFLVPxa; JFSH_AFLVPxa; JFSH_AFLVPxa"/>
+<box name="JFSH_AFrame_Leg_VerticalPlate_cut2" material="ShieldSteel" X_Y_Z="JFSH_AFLVPxa; JFSH_AFLVPxa; JFSH_AFLVPxa"/>
+<box name="JFSH_AFrame_Leg_VerticalPlate_cut3" material="ShieldSteel" X_Y_Z="JFSH_AFLVPxa; JFSH_AFLVPxa; JFSH_AFLVPxa"/>
+
+<subtraction name="JFSH_AFrame_Leg_VerticalPlate">
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_basic" X_Y_Z="(JFSH_AFLVPxe+JFSH_AFLVPxc)/2.+(JFSH_AFLVPxa-JFSH_AFLVPxe)*(1-cos(2.*JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180))/4.; (JFSH_AFLVPxe-JFSH_AFLVPxb)*tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2.+(JFSH_AFLVPxa-JFSH_AFLVPxe)*sin(2.*JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/4.; 0" rot=" 0.; 0.; 90-JFSH_AFLangle_AFrame_Leg_angle"/>
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_cut1" X_Y_Z="JFSH_AFLVPxa; -JFSH_AFLVPxa/2.; 0"/>
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_cut2" X_Y_Z="-JFSH_AFLVPxa/2.+JFSH_AFLVPxb; JFSH_AFLVPyb; 0"/>
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate_cut3" X_Y_Z="0.; JFSH_AFLVPyc+JFSH_AFLVPxa/2.; 0"/>
+</subtraction>
+
+<!-- "A" Frame Welded Assembly Leg Upper Horizontal Plate -->
+
+<var name="JFSH_AFLUHPxa" value="JFSH_AFLVPxe" />
+<var name="JFSH_AFLUHPya" value="JFSH_AFLVPye" />
+
+<var name="JFSH_AFLUHPxb" value="JFSH_AFLVPxd" />
+<var name="JFSH_AFLUHPyb" value="JFSH_AFLVPyd" />
+
+<var name="JFSH_AFLUHPxc" value="JFSH_AFLUHPxb + JFSH_AFBthic2_AFrame_Bar_thickness2/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLUHPyc" value="JFSH_AFLVPyc" />
+
+<var name="JFSH_AFLUHPxd" value="JFSH_AFLUHPxa + JFSH_AFBthic2_AFrame_Bar_thickness2/sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFLUHPyd" value="JFSH_AFLUHPya" />
+
+<var name="JFSH_AFrame_Leg_Angle" value="atan(JFSH_AFLUHPyb / (JFSH_AFLUHPxb - JFSH_AFLUHPxa))"/>
+<box name="JFSH_AFrame_Leg_UpperHorizontalPlate_basic" material="ShieldSteel" X_Y_Z="(JFSH_AFLUHPxa - JFSH_AFLUHPxb)/cos(JFSH_AFrame_Leg_Angle) + cos(JFSH_AFrame_Leg_Angle)*(JFSH_AFLUHPxd - JFSH_AFLUHPxa); -sin(JFSH_AFrame_Leg_Angle)*(JFSH_AFLUHPxd - JFSH_AFLUHPxa);JFSH_AFrwidth_AFrame_width"/>
+<box name="JFSH_AFrame_Leg_UpperHorizontalPlate_cut" material="ShieldSteel" X_Y_Z="(JFSH_AFLUHPxd-JFSH_AFLUHPxa)*4.;(JFSH_AFLUHPxd-JFSH_AFLUHPxa)*4.;JFSH_AFrwidth_AFrame_width*2."/>
+
+<subtraction name="JFSH_AFrame_Leg_UpperHorizontalPlate">
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate_basic" X_Y_Z="JFSH_AFLUHPxb + (JFSH_AFLUHPxd - JFSH_AFLUHPxb)/2.; JFSH_AFLUHPyb/2.; 0." rot="0.;0.;JFSH_AFrame_Leg_Angle/GENV_Pi*180." />
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate_cut" X_Y_Z="JFSH_AFLUHPxd; -2.*(JFSH_AFLUHPxd - JFSH_AFLUHPxa); 0."/>
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate_cut" X_Y_Z="JFSH_AFLUHPxc; JFSH_AFLUHPyc + 2.*(JFSH_AFLUHPxd - JFSH_AFLUHPxa); 0."/>
+</subtraction>
+
+<!-- "A" Frame Welded Assembly Top Plate -->
+
+<var name="JFSH_AFTPLAxa" value="JFSH_AFTPleng_AFrame_TopPlate_length/2." />
+<var name="JFSH_AFTPLAya" value="JFSH_AFtothei_AFrame_Total_height-JFSH_AFTPheig_AFrame_TopPlate_height" />
+
+<var name="JFSH_AFTPLAxb" value="JFSH_AFTPLAxa " />
+<var name="JFSH_AFTPLAyb" value="JFSH_AFtothei_AFrame_Total_height" />
+
+<trd name="JFSH_AFrame_TopPlate" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFTPLAxb; 2.*JFSH_AFTPLAxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFTPLAyb-JFSH_AFTPLAya" />
+
+<!-- "A" Frame Welded Assembly Spacer -->
+
+<var name="JFSH_AFSPACxa" value="JFSH_AFSlengt_AFrame_Spacer_length/2." />
+<var name="JFSH_AFSPACya" value="JFSH_AFTPLAya-JFSH_AFSheigh_AFrame_Spacer_height" />
+
+<var name="JFSH_AFSPACxb" value="JFSH_AFSPACxa " />
+<var name="JFSH_AFSPACyb" value="JFSH_AFTPLAya" />
+
+<trd name="JFSH_AFrame_Spacer" material="ShieldSteel" Xmp_Ymp_Z="2.*JFSH_AFSPACxb; 2.*JFSH_AFSPACxa; JFSH_AFrwidth_AFrame_width; JFSH_AFrwidth_AFrame_width; JFSH_AFSPACyb-JFSH_AFSPACya" />
+
+
+<!-- "A" Frame Welded Assembly Web -->
+
+<var name="JFSH_AFWEBwid_AFrame_Web_element_width" value="(JFSH_AFrwidth_AFrame_width-JFSH_AFBthic1_AFrame_Bar_thickness1)/2." />
+<var name="JFSH_AFWEBhei_AFrame_Web_element_height" value="JFSH_AFBheigh_AFrame_Bar_height-2.*JFSH_AFBthic2_AFrame_Bar_thickness2" />
+
+<var name="JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y" value="JFSH_AFBthic2_AFrame_Bar_thickness2+JFSH_AFWEBhei_AFrame_Web_element_height/2" />
+<var name="JFSH_AFWEBzpo_AFrame_Web_element_Z" value="JFSH_AFBthic1_AFrame_Bar_thickness1/2. + JFSH_AFWEBwid_AFrame_Web_element_width/2." />
+
+<box name="JFSH_AFrame_Web_element" material="ShieldSteel" X_Y_Z="JFSH_AFWEleng_AFrame_Web_element_length;JFSH_AFWEBhei_AFrame_Web_element_height;JFSH_AFWEBwid_AFrame_Web_element_width" />
+
+<composition name="JFSH_AFrame_Web_composite_element" >
+ <posXYZ volume="JFSH_AFrame_Web_element" X_Y_Z="0.;0.; JFSH_AFWEBzpo_AFrame_Web_element_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_element" X_Y_Z="0.;0.;-JFSH_AFWEBzpo_AFrame_Web_element_Z" rot="0.;0.;0." />
+</composition>
+
+<!-- "A" Frame Welded Assembly Web element leg -->
+
+<var name="JFSH_AFWELxi1" value="JFSH_AFLUHPxd - JFSH_AFWEBLx1_AFrame_Web_element_Leg_DX1*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyi1" value="JFSH_AFWEBLx1_AFrame_Web_element_Leg_DX1*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELxp1" value="JFSH_AFWELxi1-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyp1" value="JFSH_AFWELyi1-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<var name="JFSH_AFWELxi2" value="JFSH_AFWELxi1 - JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyi2" value="JFSH_AFWELyi1 + JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELxp2" value="JFSH_AFWELxi2-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyp2" value="JFSH_AFWELyi2-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<var name="JFSH_AFWELxi3" value="JFSH_AFWELxi2 - JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyi3" value="JFSH_AFWELyi2 + JFSH_AFWEBLx2_AFrame_Web_element_Leg_DX2*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELxp3" value="JFSH_AFWELxi3-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWELyp3" value="JFSH_AFWELyi3-(JFSH_AFWEBhei_AFrame_Web_element_height/2 + JFSH_AFBthic2_AFrame_Bar_thickness2)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+
+<!-- "A" Frame Welded Assembly Flanges -->
+
+<var name="JFSH_AFFwidth_AFrame_Flange_width" value="JFSH_AFWEBwid_AFrame_Web_element_width" />
+<var name="JFSH_AFFzposi_AFrame_Flange_Z" value="JFSH_AFWEBzpo_AFrame_Web_element_Z" />
+
+<box name="JFSH_AFrame_Flange" material="ShieldSteel" X_Y_Z="JFSH_AFFlengt_AFrame_Flange_length;JFSH_AFFthick_AFrame_Flange_thickness;JFSH_AFFwidth_AFrame_Flange_width" />
+<composition name="JFSH_AFrame_Flange_composite" >
+ <posXYZ volume="JFSH_AFrame_Flange" X_Y_Z="0.;0.; JFSH_AFFzposi_AFrame_Flange_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Flange" X_Y_Z="0.;0.;-JFSH_AFFzposi_AFrame_Flange_Z" rot="0.;0.;0." />
+</composition>
+
+<var name="JFSH_AFFposx1_AFrame_Flange_X1" value="JFSH_AFWELxp1+(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+<var name="JFSH_AFFposy1_AFrame_Flange_Y1" value="JFSH_AFWELyp1-(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+
+<var name="JFSH_AFFposx2_AFrame_Flange_X2" value="JFSH_AFWELxp2+(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+<var name="JFSH_AFFposy2_AFrame_Flange_Y2" value="JFSH_AFWELyp2-(JFSH_AFFlengt_AFrame_Flange_length+JFSH_AFWEleng_AFrame_Web_element_length)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)/2" />
+
+<!-- "A" Frame Welded Assembly Wedges -->
+
+<var name="JFSH_AFWposxa_AFrame_Wedge_XA" value="JFSH_XYZref" />
+<var name="JFSH_AFWposya_AFrame_Wedge_YA" value="JFSH_XYZref" />
+<var name="JFSH_AFWposxb_AFrame_Wedge_XB" value="JFSH_AFWheigh_AFrame_Wedge_height*tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposyb_AFrame_Wedge_YB" value="JFSH_AFWheigh_AFrame_Wedge_height" />
+<var name="JFSH_AFWposxc_AFrame_Wedge_XC" value="JFSH_AFWposxb_AFrame_Wedge_XB+JFSH_AFWexten_AFrame_Wedge_extension*cos(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposyc_AFrame_Wedge_YC" value="JFSH_AFWposyb_AFrame_Wedge_YB-JFSH_AFWexten_AFrame_Wedge_extension*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposxd_AFrame_Wedge_XD" value="JFSH_AFWposxc_AFrame_Wedge_XC- JFSH_AFWposyc_AFrame_Wedge_YC * tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposyd_AFrame_Wedge_YD" value="JFSH_AFWposya_AFrame_Wedge_YA" />
+
+<var name="JFSH_AFWposx0_AFrame_Wedge_X0" value="JFSH_AFWposxb_AFrame_Wedge_XB + JFSH_AFWposyb_AFrame_Wedge_YB / tan(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180)" />
+<var name="JFSH_AFWposy0_AFrame_Wedge_Y0" value="JFSH_AFWposxa_AFrame_Wedge_XA" />
+
+<box name="JFSH_AFrame_Wedge_basic" material="ShieldSteel" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; JFSH_AFWposyb_AFrame_Wedge_YB; JFSH_AFWthick_AFrame_Wedge_thickness"/>
+<box name="JFSH_AFrame_Wedge_cut1" material="ShieldSteel" X_Y_Z="2.*(JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxb_AFrame_Wedge_XB)*sin(JFSH_AFLangle_AFrame_Leg_angle*GENV_PiS180); JFSH_AFWposxc_AFrame_Wedge_XC; 2.*JFSH_AFWthick_AFrame_Wedge_thickness"/>
+<box name="JFSH_AFrame_Wedge_cut2" material="ShieldSteel" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; 2.*JFSH_AFWposxb_AFrame_Wedge_XB*cos(atan(JFSH_AFWposxb_AFrame_Wedge_XB/JFSH_AFWposyb_AFrame_Wedge_YB)); 2.*JFSH_AFWthick_AFrame_Wedge_thickness"/>
+<box name="JFSH_AFrame_Wedge_cut3" material="ShieldSteel" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; 2.*(JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxd_AFrame_Wedge_XD)*cos(atan((JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxd_AFrame_Wedge_XD)/JFSH_AFWposyc_AFrame_Wedge_YC)); 2.*JFSH_AFWthick_AFrame_Wedge_thickness"/>
+
+<subtraction name="JFSH_AFrame_Wedge">
+ <posXYZ volume="JFSH_AFrame_Wedge_basic" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC/2.; JFSH_AFWposyb_AFrame_Wedge_YB/2.; 0." />
+ <posXYZ volume="JFSH_AFrame_Wedge_cut1" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; JFSH_AFWposyb_AFrame_Wedge_YB; 0." rot=" 0.; 0.; 90-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Wedge_cut2" X_Y_Z="0.; JFSH_AFWposyb_AFrame_Wedge_YB; 0." rot=" 0.; 0.; 90-atan(JFSH_AFWposxb_AFrame_Wedge_XB/JFSH_AFWposyb_AFrame_Wedge_YB)/GENV_PiS180" />
+ <posXYZ volume="JFSH_AFrame_Wedge_cut3" X_Y_Z="JFSH_AFWposxc_AFrame_Wedge_XC; 0.; 0." rot=" 0.; 0.; 90-atan((JFSH_AFWposxc_AFrame_Wedge_XC-JFSH_AFWposxd_AFrame_Wedge_XD)/JFSH_AFWposyc_AFrame_Wedge_YC)/GENV_PiS180" />
+</subtraction>
+
+<var name="JFSH_AFWposix_AFrame_Wedge_X" value=" JFSH_AFBUHPxb - JFSH_AFWposx0_AFrame_Wedge_X0" />
+<var name="JFSH_AFWposiy_AFrame_Wedge_Y" value=" JFSH_AFBUHPyb - JFSH_AFWposy0_AFrame_Wedge_Y0" />
+<var name="JFSH_AFWposiz_AFrame_Wedge_Z" value=" JFSH_AFrwidth_AFrame_width/2. - JFSH_AFWzoffs_AFrame_Wedge_zoffset - JFSH_AFWthick_AFrame_Wedge_thickness/2." />
+
+<!-- "A" Frame Welded Assembly Feet -->
+
+<var name="JFSH_AFFeetxa_AFrame_Feet_XA" value="JFSH_AFFEElen_AFrame_Feet_length/2." />
+<var name="JFSH_AFFeetya_AFrame_Feet_YA" value="JFSH_XYZref" />
+<var name="JFSH_AFFeetxb_AFrame_Feet_XB" value="JFSH_AFFeetxa_AFrame_Feet_XA" />
+<var name="JFSH_AFFeetyb_AFrame_Feet_YB" value="JFSH_AFFeetya_AFrame_Feet_YA - JFSH_AFFEEhei_AFrame_Feet_height" />
+<var name="JFSH_AFFeetxc_AFrame_Feet_XC" value="JFSH_AFFeetxb_AFrame_Feet_XB - JFSH_AFFEEsle_AFrame_Feet_shortlength" />
+<var name="JFSH_AFFeetyc_AFrame_Feet_YC" value="JFSH_AFFeetyb_AFrame_Feet_YB" />
+<var name="JFSH_AFFeetxd_AFrame_Feet_XD" value="JFSH_AFFeetxc_AFrame_Feet_XC" />
+<var name="JFSH_AFFeetyd_AFrame_Feet_YD" value="JFSH_AFFeetyb_AFrame_Feet_YB+JFSH_AFFEEthi_AFrame_Feet_thickness" />
+<var name="JFSH_AFFeetxe_AFrame_Feet_XE" value="JFSH_AFFeetxc_AFrame_Feet_XC+JFSH_AFFEEsle_AFrame_Feet_shortlength-JFSH_AFFEEthi_AFrame_Feet_thickness" />
+<var name="JFSH_AFFeetye_AFrame_Feet_YE" value="JFSH_AFFeetyd_AFrame_Feet_YD" />
+<var name="JFSH_AFFeetxf_AFrame_Feet_XF" value="JFSH_AFFeetxe_AFrame_Feet_XE" />
+<var name="JFSH_AFFeetyf_AFrame_Feet_YF" value="JFSH_AFFeetya_AFrame_Feet_YA-JFSH_AFFEEthi_AFrame_Feet_thickness" />
+
+<var name="JFSH_AFFeetpx_AFrame_Feet_X" value=" JFSH_AFFEEext_AFrame_Feet_X_extension/2. - JFSH_AFFEElen_AFrame_Feet_length/2." />
+
+<box name="JFSH_AFrame_Feet_basic" material="ShieldSteel" X_Y_Z="2.*JFSH_AFFeetxa_AFrame_Feet_XA; -JFSH_AFFeetyb_AFrame_Feet_YB; JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Feet_cut1" material="ShieldSteel" X_Y_Z="2.*JFSH_AFFeetxe_AFrame_Feet_XE; JFSH_AFFeetyf_AFrame_Feet_YF-JFSH_AFFeetye_AFrame_Feet_YE; 2.*JFSH_AFrwidth_AFrame_width" />
+<box name="JFSH_AFrame_Feet_cut2" material="ShieldSteel" X_Y_Z="2.*JFSH_AFFeetxc_AFrame_Feet_XC; JFSH_AFFeetyf_AFrame_Feet_YF-JFSH_AFFeetye_AFrame_Feet_YE; 2.*JFSH_AFrwidth_AFrame_width" />
+
+<subtraction name="JFSH_AFrame_Feet">
+ <posXYZ volume="JFSH_AFrame_Feet_basic" X_Y_Z="0.; JFSH_AFFeetyb_AFrame_Feet_YB/2.; 0."/>
+ <posXYZ volume="JFSH_AFrame_Feet_cut1" X_Y_Z="0.; (JFSH_AFFeetye_AFrame_Feet_YE-JFSH_AFFeetyf_AFrame_Feet_YF)/2.+JFSH_AFFeetyf_AFrame_Feet_YF; 0."/>
+ <posXYZ volume="JFSH_AFrame_Feet_cut2" X_Y_Z="0.; JFSH_AFFeetyc_AFrame_Feet_YC; 0."/>
+</subtraction>
+
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- "A" Frame Welded Assembly Composition of volumes -->
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<composition name="JFSH_AFrame_BottomBar" >
+ <posXYZ volume="JFSH_AFrame_BottomBar_LowerHorizontalPlate" X_Y_Z="0.;(JFSH_AFBLHPyb-JFSH_AFBLHPya)/2.; 0." rot="90.;0.;0."/>
+ <posXYZ volume="JFSH_AFrame_BottomBar_VerticalPlate" X_Y_Z="0.;(JFSH_AFBBVPyb-JFSH_AFBBVPya)/2.+JFSH_AFBLHPyb-JFSH_AFBLHPya; 0." rot="90.;0.;0."/>
+ <posXYZ volume="JFSH_AFrame_BottomBar_UpperHorizontalPlate" X_Y_Z="0.;(JFSH_AFBUHPyb-JFSH_AFBUHPya)/2.+JFSH_AFBBVPyb-JFSH_AFBBVPya+JFSH_AFBLHPyb-JFSH_AFBLHPya; 0." rot="90.;0.;0."/>
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWEBBx1_AFrame_Web_element_BottomBar_X1;JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y;0. " rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWEBBx2_AFrame_Web_element_BottomBar_X2;JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y;0. " rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z="-JFSH_AFWEBBx2_AFrame_Web_element_BottomBar_X2;JFSH_AFWEBBBy_AFrame_Web_element_BottomBar_Y;0. " rot="0.;0.;0." />
+</composition>
+
+<composition name="JFSH_AFrame_Leg" >
+ <posXYZ volume="JFSH_AFrame_Leg_LowerHorizontalPlate" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg_VerticalPlate" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg_UpperHorizontalPlate" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWELxp1;JFSH_AFWELyp1;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWELxp2;JFSH_AFWELyp2;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Web_composite_element" X_Y_Z=" JFSH_AFWELxp3;JFSH_AFWELyp3;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Flange_composite" X_Y_Z=" JFSH_AFFposx1_AFrame_Flange_X1;JFSH_AFFposy1_AFrame_Flange_Y1;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+ <posXYZ volume="JFSH_AFrame_Flange_composite" X_Y_Z=" JFSH_AFFposx2_AFrame_Flange_X2;JFSH_AFFposy2_AFrame_Flange_Y2;0. " rot="0.;0.;-JFSH_AFLangle_AFrame_Leg_angle" />
+</composition>
+
+<composition name="JFSH_AFrame_Assembly" >
+ <posXYZ volume="JFSH_AFrame_TopPlate" X_Y_Z="0.;JFSH_AFTPLAyb-(JFSH_AFTPLAyb-JFSH_AFTPLAya)/2.; 0." rot="90.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Spacer" X_Y_Z="0.;JFSH_AFSPACyb-(JFSH_AFSPACyb-JFSH_AFSPACya)/2.; 0." rot="90.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_BottomBar" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg" X_Y_Z="0.;0.; 0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Leg" X_Y_Z="0.;0.; 0." rot="0.;JFSH_rot180;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z=" JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y; JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z=" JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y;-JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z="-JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y; JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;JFSH_rot180;0." />
+ <posXYZ volume="JFSH_AFrame_Wedge" X_Y_Z="-JFSH_AFWposix_AFrame_Wedge_X;JFSH_AFWposiy_AFrame_Wedge_Y;-JFSH_AFWposiz_AFrame_Wedge_Z" rot="0.;JFSH_rot180;0." />
+ <posXYZ volume="JFSH_AFrame_Feet" X_Y_Z=" JFSH_AFFeetpx_AFrame_Feet_X;0.;0." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Feet" X_Y_Z="-JFSH_AFFeetpx_AFrame_Feet_X;0.;0." rot="0.;0.;0." />
+</composition>
+
+<!-- name = JF Shielding section name = "Shielding" -->
+<!-- Simple modelization -->
+
+
+<!-- Primary variables -->
+
+<!-- BEGIN confirmation with atljf___0010-vAC (if no other comment) -->
+<!-- Main Cylinder -->
+<var name="JFSH_JFCMClen_JFCMainCylinder_length" value=" 5041." />
+<var name="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1" value=" 282." /> <!-- NO CONFIRMATION POSSIBLE; changed by Sven.Menke@CERN.CH Jul 2020 from 304 to 282 according to http://atlas.web.cern.ch/Atlas/GROUPS/Shielding/shielding.htm -->
+<var name="JFSH_JFCMCouR_JFCMainCylinder_outerRadius" value=" 1550." />
+<var name="JFSH_JFCMChSl_JFCMainCylinder_HoleSLope" value=" 1.1"/> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JFSH_JFCMChSl_JFCMainCylinder_HoleSLope_zoffset" value=" 1630." /> <!-- this length plus plug is straight; introduced by Sven.Menke@CERN.CH Jul 2020 according to https://edms.cern.ch/ui/file/322317/AC/atljf___0003-vAC.pdf -->
+<var name="JFSH_JFCMChSl_JFCMainCylinder_OctoZoverlap" value=" 520." /> <!-- this is the z-portion of JFC3 that is modeled here as Oct; introduced by Sven.Menke@CERN.CH Jul 2020 -->
+<var name="JFSH_JFCMCzof_JFCMainCylinder_zoffset" value=" 45." />
+<var name="JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff" value=" 30." /> <!-- confirmed atljf___0031-vAE -->
+<var name="JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff" value=" 50." /> <!-- confirmed atljf___0030-vAD -->
+
+<!-- PLUG -->
+<var name="JFSH_PLUGleng_Plug_length" value=" 250." />
+<var name="JFSH_PLUGinRa_Plug_innerRadius" value=" 280." /> <!-- confirmed atljf___0006-vAE -->
+<var name="JFSH_PLUGouRa_Plug_outerRadius" value=" 520." /> <!-- confirmed atljf___0006-vAE -->
+
+<!-- JFS Octogon -->
+<var name="JFSH_JFSOCmRa_JFSOctogon_mainRadius" value=" 2100." />
+<var name="JFSH_JFSOClen_JFSOctogon_length" value=" 3000." />
+<var name="JFSH_JFSOCzof_JFSOctogon_zoffset" value=" 5086." />
+<var name="JFSH_JFSOCrso_JFSOctogon_rolledsteeloff" value=" 30." /> <!-- confirmed atljf___0029-vAG -->
+<var name="JFSH_JFSOCpoo_JFSOctogon_polybaronoff" value=" 80." /> <!-- confirmed atljf___0024-vAD -->
+
+<!-- END confirmation with atljf___0010-vAC -->
+
+<!-- A-Frame to JFS Octogon connection -->
+<var name="JFSH_AFOconle_AFrame_to_JFSOctogon_connection_length" value=" 230." /> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JFSH_AFOconwi_AFrame_to_JFSOctogon_connection_width" value=" 200." /> <!-- NO CONFIRMATION POSSIBLE -->
+<var name="JFSH_AFOconhe_AFrame_to_JFSOctogon_connection_height" value=" 67." /> <!-- NO CONFIRMATION POSSIBLE -->
+
+<!-- Derived variables -->
+
+<var name="JFSH_JFCMCir2_JFCMainCylinder_innerRadius2" value="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1+(JFSH_JFCMClen_JFCMainCylinder_length-JFSH_JFCMChSl_JFCMainCylinder_HoleSLope_zoffset)*tan(JFSH_JFCMChSl_JFCMainCylinder_HoleSLope*GENV_PiS180)"/> <!-- changed by SvenMenke@CERN.CH Jul 2020 -->
+<var name="JFSH_JFCMCir3_JFCMainCylinder_innerRadius3" value="JFSH_JFCMCir2_JFCMainCylinder_innerRadius2+JFSH_JFCMChSl_JFCMainCylinder_OctoZoverlap*tan(JFSH_JFCMChSl_JFCMainCylinder_HoleSLope*GENV_PiS180)"/> <!-- added by SvenMenke@CERN.CH Jul 2020 -->
+<var name="JFSH_JFCMCzpo_JFCMainCylinder_Z" value="JFSH_XYZref+JFSH_JFCMCzof_JFCMainCylinder_zoffset" />
+<var name="JFSH_JFSOCzpo_JFSOctogon_Z" value="JFSH_XYZref+JFSH_JFSOCzof_JFSOctogon_zoffset+JFSH_JFSOClen_JFSOctogon_length/2." />
+<var name="JFSH_PLUGzpos_Plug_posz" value="JFSH_XYZref-JFSH_PLUGleng_Plug_length"/>
+
+<!-- JFC Cylinder -->
+<pcon name="JFSH_JFCMainCylinder_core" material="ShieldIron" >
+ <polyplane Rio_Z="JFSH_PLUGinRa_Plug_innerRadius;JFSH_PLUGouRa_Plug_outerRadius;JFSH_PLUGzpos_Plug_posz" />
+ <polyplane Rio_Z="JFSH_PLUGinRa_Plug_innerRadius;JFSH_PLUGouRa_Plug_outerRadius;0." />
+ <polyplane Rio_Z="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps;0." />
+ <polyplane Rio_Z="JFSH_JFCMCir1_JFCMainCylinder_innerRadius1;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps;JFSH_JFCMChSl_JFCMainCylinder_HoleSLope_zoffset" /> <!-- added plane by Sven.Menke@CERN.CH Jul 2020 since JFC2 is first straight and then with 1.1 degrees like JFC3 -->
+ <polyplane Rio_Z="JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps;JFSH_JFCMClen_JFCMainCylinder_length" />
+</pcon>
+
+<tubs name="JFSH_JFCMainCylinder_steelroll" material="ShieldSteel" Rio_Z=" JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff+GENV_Eps; JFSH_JFCMCouR_JFCMainCylinder_outerRadius; JFSH_JFCMClen_JFCMainCylinder_length"/>
+<tubs name="JFSH_JFCMainCylinder_polyroll" material="PolyBoronH3B03" Rio_Z=" JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff; JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff; JFSH_JFCMClen_JFCMainCylinder_length"/>
+
+<!-- A Frame to JFC Cylinder connection -->
+
+<box name="JFSH_AFrame_to_JFCMainCylinder_connection" material="ShieldSteel" X_Y_Z="JFSH_AFOconwi_AFrame_to_JFSOctogon_connection_width;JFSH_AFOconhe_AFrame_to_JFSOctogon_connection_height;JFSH_AFOconle_AFrame_to_JFSOctogon_connection_length" />
+
+<var name="JFSH_AFMCcony_AFrame_to_JFCMainCylinder_connection_Y" value="JFSH_AFASposy_AFrame_Assembly_Y + JFSH_AFtothei_AFrame_Total_height + JFSH_AFOconhe_AFrame_to_JFSOctogon_connection_height/2." />
+<var name="JFSH_AFMCconz_AFrame_to_JFCMainCylinder_connection_Z" value="JFSH_AFOconle_AFrame_to_JFSOctogon_connection_length/2.+GENV_Eps" />
+<var name="JFSH_AFconnexion2" value="15." /> <!-- former value 290. -->
+<union name="JFSH_JFCMainCylinder_compsteel" >
+ <posXYZ volume="JFSH_JFCMainCylinder_steelroll" X_Y_Z=" 0. ; 0. ; JFSH_JFCMClen_JFCMainCylinder_length/2. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_AFrame_to_JFCMainCylinder_connection" X_Y_Z=" 0. ; JFSH_AFMCcony_AFrame_to_JFCMainCylinder_connection_Y ; JFSH_AFMCconz_AFrame_to_JFCMainCylinder_connection_Z+JFSH_AFconnexion2" rot=" 0. ; 0. ; 0." />
+</union>
+
+<composition name="JFSH_JFCCylinder" >
+ <posXYZ volume="JFSH_JFCMainCylinder_core" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFCMainCylinder_compsteel" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFCMainCylinder_polyroll" X_Y_Z=" 0. ; 0. ; JFSH_JFCMClen_JFCMainCylinder_length/2. " rot=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- JFS Octogon -->
+
+<var name="JFSH_JFSOctxa_JFSOctogon_XA" value="JFSH_JFSOCmRa_JFSOctogon_mainRadius-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-JFSH_JFSOCpoo_JFSOctogon_polybaronoff-GENV_Eps" />
+<var name="JFSH_JFSOctya_JFSOctogon_YA" value="JFSH_JFSOctxa_JFSOctogon_XA*GENV_Ta225" />
+<var name="JFSH_JFSOctxb_JFSOctogon_XB" value="JFSH_JFSOctya_JFSOctogon_YA" />
+<var name="JFSH_JFSOctyb_JFSOctogon_YB" value="JFSH_JFSOctxa_JFSOctogon_XA" />
+
+<gvxysxy name="JFSH_JFSOctogon_Coreedge" material="ShieldIron" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-JFSH_JFSOCpoo_JFSOctogon_polybaronoff-GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA ; JFSH_JFSOctya_JFSOctogon_YA " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB ; JFSH_JFSOctyb_JFSOctogon_YB " />
+</gvxysxy>
+
+<tubs name="JFSH_JFSOctogon_Coreround" material="ShieldIron" Rio_Z=" 0. ;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff-GENV_Eps; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps"/>
+
+<union name="JFSH_JFSOctogon_Core" >
+ <posXYZ volume="JFSH_JFSOctogon_Coreedge" X_Y_Z=" 0.; 0.; (JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)/2. "/>
+ <posXYZ volume="JFSH_JFSOctogon_Coreround" X_Y_Z=" 0.; 0.;-(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-JFSH_JFSOCpoo_JFSOctogon_polybaronoff)/2.+GENV_Eps" />
+</union>
+
+<pcon name="JFSH_JFSOctogon_Hole" material="ShieldIron" > <!-- changed from tubs to pcon by Sven.Menke@CERN.CH Jul 2020 since inner bore of JFC3 has 1.1 degree angle -->
+ <polyplane Rio_Z="0.;JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;-0.6*JFSH_JFSOClen_JFSOctogon_length"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;-0.5*JFSH_JFSOClen_JFSOctogon_length"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir2_JFCMainCylinder_innerRadius2;-0.5*JFSH_JFSOClen_JFSOctogon_length"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir3_JFCMainCylinder_innerRadius3;-0.5*JFSH_JFSOClen_JFSOctogon_length+JFSH_JFCMChSl_JFCMainCylinder_OctoZoverlap"/>
+ <polyplane Rio_Z="0.;JFSH_JFCMCir3_JFCMainCylinder_innerRadius3; 0.6*JFSH_JFSOClen_JFSOctogon_length"/>
+</pcon>
+<var name="JFSH_JFSOctHBPzo_JFSOctogon_HoleBPzoffset" value=" 600." /> <!-- confirmed atljf___0010-vAC -->
+<var name="JFSH_JFSOctHBPoR_JFSOctogon_HoleBPoutRad" value=" 436. + 1." /> <!-- value of MuonSys mother volume -->
+<tubs name="JFSH_JFSOctogon_HoleBP" material="ShieldIron" Rio_Z=" 0. ;JFSH_JFSOctHBPoR_JFSOctogon_HoleBPoutRad; JFSH_JFSOClen_JFSOctogon_length"/>
+<subtraction name="JFSH_JFSOctogon_main" >
+ <posXYZ volume="JFSH_JFSOctogon_Core" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Hole" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_HoleBP" X_Y_Z=" 0. ; 0. ; JFSH_JFSOctHBPzo_JFSOctogon_HoleBPzoffset " rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<gvxysxy name="JFSH_JFSOctogon_Polyedge_baseside" material="PolyBoronH3B03" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff - JFSH_JFSOCpoo_JFSOctogon_polybaronoff - GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps " />
+</gvxysxy>
+
+<gvxysxy name="JFSH_JFSOctogon_Polyedge_subblock" material="PolyBoronH3B03" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCpoo_JFSOctogon_polybaronoff-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+GENV_Eps ; JFSH_JFSOctya_JFSOctogon_YA+GENV_Eps*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+GENV_Eps*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+GENV_Eps " />
+</gvxysxy>
+
+<subtraction name="JFSH_JFSOctogon_Polyedge_side">
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_baseside" X_Y_Z=" 0. ; 0. ; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff/2. + JFSH_JFSOCpoo_JFSOctogon_polybaronoff/2." />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_subblock" X_Y_Z=" 0. ; 0. ; (JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff-GENV_Eps)/2.+GENV_Eps" />
+</subtraction>
+
+<gvxysxy name="JFSH_JFSOctogon_Polyedge_basefront" material="PolyBoronB2O3" dZ="JFSH_JFSOCpoo_JFSOctogon_polybaronoff" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+JFSH_JFSOCpoo_JFSOctogon_polybaronoff+GENV_Eps " />
+</gvxysxy>
+
+<tubs name="JFSH_JFSOctogon_Polyedge_subtube" material="PolyBoronB2O3" Rio_Z=" 0. ;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff+GENV_Eps; JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps"/>
+
+<subtraction name="JFSH_JFSOctogon_Polyedge_front">
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_basefront" X_Y_Z=" 0. ; 0. ; -(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCpoo_JFSOctogon_polybaronoff)/2.+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff" />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_subtube" X_Y_Z=" 0. ; 0. ; -(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCpoo_JFSOctogon_polybaronoff)/2.+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff" />
+</subtraction>
+
+<gvxysxy name="JFSH_JFSOctogon_Steeledge_base" material="ShieldSteel" dZ="JFSH_JFSOClen_JFSOctogon_length" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps) ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+GENV_Eps) " />
+</gvxysxy>
+
+<gvxysxy name="JFSH_JFSOctogon_Steeledge_subblock" material="ShieldSteel" dZ="JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+2.*GENV_Eps" >
+ <gvxy_point X_Y=" JFSH_JFSOctxa_JFSOctogon_XA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps) ; JFSH_JFSOctya_JFSOctogon_YA+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps)*GENV_Ta225 " />
+ <gvxy_point X_Y=" JFSH_JFSOctxb_JFSOctogon_XB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps)*GENV_Ta225 ; JFSH_JFSOctyb_JFSOctogon_YB+(JFSH_JFSOCpoo_JFSOctogon_polybaronoff+2.*GENV_Eps) " />
+</gvxysxy>
+<tubs name="JFSH_JFSOctogon_Steeledge_subtube" material="ShieldSteel" Rio_Z=" 0. ;JFSH_JFCMCouR_JFCMainCylinder_outerRadius-JFSH_JFCMCrso_JFCMainCylinder_rolledsteeloff-JFSH_JFCMCpoo_JFCMainCylinder_polybaronoff+GENV_Eps; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff+2.*GENV_Eps"/>
+
+<subtraction name="JFSH_JFSOctogon_Steeledge_main">
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_base" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_subblock" X_Y_Z=" 0. ; 0. ; JFSH_JFSOCrso_JFSOctogon_rolledsteeloff/2." />
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_subtube" X_Y_Z=" 0. ; 0. ; -(JFSH_JFSOClen_JFSOctogon_length-JFSH_JFSOCrso_JFSOctogon_rolledsteeloff)/2." />
+</subtraction>
+
+<composition name="JFSH_JFSOctogon">
+ <posXYZ volume="JFSH_JFSOctogon_main" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_side" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Polyedge_front" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JFSH_JFSOctogon_Steeledge_main" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- JN Nose Shielding -->
+
+<!-- TX1STM Elements -->
+<var name="JNSH_TX1e1oRa" value=" 1480." /> <!-- JFSH_tx1stm_element1_outerRadius -->
+<var name="JNSH_TX1e1iRa" value=" 1285." /> <!-- JFSH_tx1stm_element1_innerRadius -->
+<var name="JNSH_TX1e1iLe" value=" 1045." /> <!-- JFSH_tx1stm_element1_length -->
+<var name="JNSH_TX1e2iRa" value=" 1085." /> <!-- JFSH_tx1stm_element2_innerRadius -->
+<var name="JNSH_TX1e2iLe" value=" 1100." /> <!-- JFSH_tx1stm_element2_length -->
+<var name="JNSH_TX1e3iLe" value=" 2900." /> <!-- JFSH_tx1stm_element3_length -->
+
+<var name="JNSH_TX1SO1iRa" value=" 1550." />
+<var name="JNSH_TX1SO1oRa" value=" 2620." />
+<var name="JNSH_TX1SO1iLe" value=" 1800." /> <!-- to adjust for cavern asymmetry and wall-position -->
+<var name="JNSH_TX1SO6oRa" value=" 2075." />
+<var name="JNSH_TX1SO6iLe" value=" 200." />
+
+<var name="JNSH_TX1STzof" value=" JFSH_JFSOClen_JFSOctogon_length + JFSH_JFSOCzof_JFSOctogon_zoffset" />
+
+<var name="JNSH_TX1e1zpo_tx1stm_element1_Z" value="JFSH_XYZref+JNSH_TX1STzof+JNSH_TX1e1iLe/2." />
+<var name="JNSH_TX1e2zpo_tx1stm_element2_Z" value="JNSH_TX1e1zpo_tx1stm_element1_Z+JNSH_TX1e1iLe/2.+JNSH_TX1e2iLe/2."/>
+<var name="JNSH_TX1e3zpo_tx1stm_element3_Z" value="JNSH_TX1e2zpo_tx1stm_element2_Z+JNSH_TX1e2iLe/2.+JNSH_TX1e3iLe/2."/>
+
+<var name="JNSH_TX1SO6zpo_tx1som_element6_Z" value="JFSH_XYZref+JNSH_TX1STzof+JNSH_TX1SO6iLe/2."/>
+<var name="JNSH_TX1SO1zpo_tx1som_element1_Z" value="JNSH_TX1SO6zpo_tx1som_element6_Z+JNSH_TX1SO6iLe/2.+JNSH_TX1SO1iLe/2."/>
+
+<!-- JFS TX1STM -->
+<tubs name="JNSH_tx1stm_element1" material="ShieldIron" Rio_Z="JNSH_TX1e1iRa ; JNSH_TX1e1oRa ; JNSH_TX1e1iLe"/>
+<tubs name="JNSH_tx1stm_element2" material="ShieldIron" Rio_Z="JNSH_TX1e2iRa ; JNSH_TX1e1oRa ; JNSH_TX1e2iLe"/>
+<tubs name="JNSH_tx1stm_element3" material="ShieldIron" Rio_Z="JNSH_TX1e1iRa ; JNSH_TX1e1oRa ; JNSH_TX1e3iLe"/>
+
+<var name="JNSH_tx1som_e1_XA" value="JNSH_TX1SO1oRa * tan(11.25 * GENV_PiS180)" />
+<var name="JNSH_tx1som_e1_YA" value="JNSH_TX1SO1oRa" />
+<var name="JNSH_tx1som_e1_XB" value="JNSH_tx1som_e1_XA * (1. + 2.*GENV_Co225)" />
+<var name="JNSH_tx1som_e1_YB" value="JNSH_tx1som_e1_YA - 2.*JNSH_tx1som_e1_XA*GENV_Si225" />
+<var name="JNSH_tx1som_e1_XC" value="JNSH_tx1som_e1_YB" />
+<var name="JNSH_tx1som_e1_YC" value="JNSH_tx1som_e1_XB" />
+<var name="JNSH_tx1som_e1_XD" value="JNSH_tx1som_e1_YA" />
+<var name="JNSH_tx1som_e1_YD" value="JNSH_tx1som_e1_XA" />
+
+<gvxysxy name="JNSH_tx1som_element1_basic" material="ShieldIron" dZ="JNSH_TX1SO1iLe" >
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XD ; JNSH_tx1som_e1_YD " />
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XC ; JNSH_tx1som_e1_YC " />
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XB ; JNSH_tx1som_e1_YB " />
+ <gvxy_point X_Y=" JNSH_tx1som_e1_XA ; JNSH_tx1som_e1_YA " />
+</gvxysxy>
+<tubs name="JNSH_tx1som_element6_cutout" material="ShieldIron" Rio_Z="0. ; JNSH_TX1SO1iRa ; 2.*JNSH_TX1SO1iLe"/>
+<subtraction name="JNSH_tx1som_element1" >
+ <posXYZ volume="JNSH_tx1som_element1_basic" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="JNSH_tx1som_element6_cutout" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<tubs name="JNSH_tx1som_element6" material="ShieldIron" Rio_Z="JNSH_TX1SO1iRa ; JNSH_TX1SO6oRa ; JNSH_TX1SO6iLe"/>
+
+
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- JF and JN Shield Composition of volumes -->
+<!-- +++++++++++++++++++++++++++++++++++++++++++++++++ -->
+
+<composition name="JFSH_ShieldElements" >
+ <posXYZ volume="JFSH_JFCCylinder" X_Y_Z="0.;0.;JFSH_JFCMCzpo_JFCMainCylinder_Z" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_AFrame_Assembly" X_Y_Z="0.;-4340; JFSH_JFCMCzpo_JFCMainCylinder_Z+JFSH_AFconnexion2+110." rot="0.;0.;0." />
+ <posXYZ volume="JFSH_JFSOctogon" X_Y_Z="0.;0.;JFSH_JFSOCzpo_JFSOctogon_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1stm_element1" X_Y_Z="0.;0.;JNSH_TX1e1zpo_tx1stm_element1_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1stm_element2" X_Y_Z="0.;0.;JNSH_TX1e2zpo_tx1stm_element2_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1stm_element3" X_Y_Z="0.;0.;JNSH_TX1e3zpo_tx1stm_element3_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1som_element6" X_Y_Z="0.;0.;JNSH_TX1SO6zpo_tx1som_element6_Z" rot="0.;0.;0." />
+ <posXYZ volume="JNSH_tx1som_element1" X_Y_Z="0.;0.;JNSH_TX1SO1zpo_tx1som_element1_Z" rot="0.;0.;0." />
+</composition>
+
+
+<composition name="JFSH_Shield" >
+ <posXYZ volume="JFSH_ShieldElements" X_Y_Z="0.;0.; JFSH_ECTnomiz_ECT_Nominal_zpos" rot="0.;0.;0." />
+ <posXYZ volume="JFSH_ShieldElements" X_Y_Z="0.;0.;-JFSH_ECTnomiz_ECT_Nominal_zpos" rot="0.;JFSH_rot180;0." />
+</composition>
+
+
+<!-- name = JT Toroid Shielding section name = "Shielding" -->
+<!-- Primary variables -->
+<var name="JTSH_OPlength_OuterPlugs_length" value=" 4736. " /> <!-- confirmed atljt___0055-vAC -->
+<!-- BEGIN confirmation with atljt___0059-vAB (if no other comment) -->
+<var name="JTSH_OPinnRad_OuterPlugs_innerRadius" value=" 600. " />
+<var name="JTSH_OPinnRad_OuterPlugs_innerRadiusSmall" value=" 562.5" /> <!-- confirmed atljt___0056-vAC -->
+<var name="JTSH_OPoutRad_OuterPlugs_outerRadius" value=" 802. " />
+<var name="JTSH_IPlength_InnerPlugs_length" value=" 3686. " /> <!-- confirmed atljt___0055-vAC -->
+<var name="JTSH_IPinnRa1_InnerPlugs_innerRadius1" value=" 170.8" />
+<var name="JTSH_IPtiltAn_InnerPlugs_tiltAngle" value=" 1.1" />
+<var name="JTSH_IPzoffse_InnerPlugs_zoffset" value=" 1000. " />
+<var name="JTSH_PRlenoff_PolyRings_lengthoffset" value=" 67. " /> <!-- confirmed atljt___0055-vAC -->
+<!-- END confirmation with atljt___0059-vAB -->
+<!-- BEGIN confirmation with atljt___0052-vAA (if no other comment) -->
+<var name="JTSH_PRinnRad_PolyRings_innerRadius" value=" 802. " />
+<var name="JTSH_PRinRaof_PolyRings_innerRadoff" value=" 15. " />
+<var name="JTSH_PRoutRad_PolyRings_outerRadius" value=" 857. " />
+<var name="JTSH_PRexttAn_PolyRings_extension_tiltAngle" value=" 18. " />
+<!-- END confirmation with atljt___0052-vAA -->
+<var name="JTSH_PRipexle_PolyRings_IPextension_length" value=" 205. " /> <!-- confirmed atljt___0059-vAB -->
+<var name="JTSH_zpositio_Shield_Z" value=" 7917. " /> <!-- atljt___0055-vAC says 7941. , TC says wrong by 3cm -->
+<var name="JTSH_yrotatio_Shield_rotY" value=" 180. " /> <!-- NO CONFIRMATION NEEDED -->
+
+<var name="JTSH_IPinnRa2_InnerPlugs_innerRadius2" value="JTSH_IPinnRa1_InnerPlugs_innerRadius1 + JTSH_IPlength_InnerPlugs_length *tan(JTSH_IPtiltAn_InnerPlugs_tiltAngle*GENV_PiS180)"/> <!-- changed by Sven.Menke@CERN.CH Jul 2020 from JTSH_OPlength_OuterPlugs_length to JTSH_IPlength_InnerPlugs_length -->
+<var name="JTSH_PRextzpo_PolyRings_extension_z" value="(JTSH_PRoutRad_PolyRings_outerRadius-JTSH_PRinnRad_PolyRings_innerRadius-JTSH_PRinRaof_PolyRings_innerRadoff)/tan(JTSH_PRexttAn_PolyRings_extension_tiltAngle*GENV_PiS180)"/>
+
+<var name="JTSH_OPzposi1_OuterPlugs_z1" value="JTSH_PRipexle_PolyRings_IPextension_length" />
+<var name="JTSH_OPzposi2_OuterPlugs_z2" value="JTSH_OPzposi1_OuterPlugs_z1+JTSH_OPlength_OuterPlugs_length" />
+
+<var name="JTSH_IPzposi1_InnerPlugs_z1" value="JTSH_IPzoffse_InnerPlugs_zoffset" />
+<var name="JTSH_IPzposi2_InnerPlugs_z2" value="JTSH_IPzposi1_InnerPlugs_z1+JTSH_IPlength_InnerPlugs_length" />
+
+<var name="JTSH_PRzposi1_PolyRings_z1" value="JTSH_OPzposi2_OuterPlugs_z2-JTSH_OPlength_OuterPlugs_length+JTSH_PRlenoff_PolyRings_lengthoffset" />
+<var name="JTSH_PRzposi2_PolyRings_z2" value="JTSH_OPzposi2_OuterPlugs_z2-JTSH_OPlength_OuterPlugs_length+JTSH_PRlenoff_PolyRings_lengthoffset+JTSH_PRextzpo_PolyRings_extension_z" />
+<var name="JTSH_PRzposi3_PolyRings_z3" value="JTSH_OPzposi2_OuterPlugs_z2" />
+
+<!-- Modelization of JT Plugs (outer and inner combined) -->
+<pcon name="JTSH_Plugs" material="ShieldIron" >
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadius;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_OPzposi1_OuterPlugs_z1" />
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadius;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi1_InnerPlugs_z1" />
+ <polyplane Rio_Z="JTSH_IPinnRa1_InnerPlugs_innerRadius1;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi1_InnerPlugs_z1" />
+ <polyplane Rio_Z="JTSH_IPinnRa2_InnerPlugs_innerRadius2;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi2_InnerPlugs_z2" />
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadiusSmall;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_IPzposi2_InnerPlugs_z2" />
+ <polyplane Rio_Z="JTSH_OPinnRad_OuterPlugs_innerRadiusSmall;JTSH_OPoutRad_OuterPlugs_outerRadius;JTSH_OPzposi2_OuterPlugs_z2" />
+</pcon>
+
+<pcon name="JTSH_PolyRings" material="PolyBoronB2O3" >
+ <polyplane Rio_Z="JTSH_PRinnRad_PolyRings_innerRadius;JTSH_PRinnRad_PolyRings_innerRadius+JTSH_PRinRaof_PolyRings_innerRadoff;JTSH_PRzposi1_PolyRings_z1" />
+ <polyplane Rio_Z="JTSH_PRinnRad_PolyRings_innerRadius;JTSH_PRoutRad_PolyRings_outerRadius;JTSH_PRzposi2_PolyRings_z2" />
+ <polyplane Rio_Z="JTSH_PRinnRad_PolyRings_innerRadius;JTSH_PRoutRad_PolyRings_outerRadius;JTSH_PRzposi3_PolyRings_z3" />
+</pcon>
+
+<!-- **************************************************************
+ *** Installed for Run2 ****
+ ************************************************************** -->
+
+<var name="JTC_JTCC_JTCCommonAngle" value=" 66. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomRadYOffset" value=" 177. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomCenterCutX" value=" 300. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomCenterCutY" value="JTC_JTCB_JTCBottomCenterCutX" /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomSideCutY" value=" 400. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomBigRad" value=" 1500. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomBigX" value=" 1220. " /> <!-- atujt___0020-v0 -->
+<var name="JTC_JTCB_JTCBottomBigZ" value=" 25. + 13. " /> <!-- atujt___0020-v0 , adjustments discussed with TC-->
+<var name="JTC_JTCB_JTCBottomSmallRad" value=" 864.9" /> <!-- atujt___0022-v0 says 865. but overlaps with ECT_EV_CentralTube -->
+<var name="JTC_JTCB_JTCBottomSmallX" value=" 610. " /> <!-- atujt___0022-v0 -->
+<var name="JTC_JTCB_JTCBottomSmallZ" value=" 36. - 13. " /> <!-- atujt___0022-v0 , TC says distance to JF is 4cm, it's mounted on ECT -->
+
+<var name="JTC_JTCT_JTCTopInnerRad" value=" 522.5" /> <!-- atujt___0018-v0 -->
+<var name="JTC_JTCT_JTCTopMediumRad" value=" 1050. " /> <!-- atujt___0029-v0 -->
+<var name="JTC_JTCT_JTCTopOuterRad" value=" 1500. " /> <!-- atujt___0018-v0 -->
+<var name="JTC_JTCT_JTCTopFullZ" value=" 65. + 10. " /> <!-- atujt___0018-v0 , adding 1cm to close gap to ECT, agreed with TC -->
+<var name="JTC_JTCT_JTCTopThickZ" value=" 45. + 5. " /> <!-- atujt___0018-v0 , adding 5mm just to be a bit closer, agreed with TC-->
+<var name="JTC_JTCT_JTCTopCenterXCut" value=" 374. " /> <!-- atujt___0026-v0 -->
+<var name="JTC_JTCT_JTCTopSideCutY" value=" 395. " /> <!-- atujt___0026-v0 -->
+<var name="JTC_JTCT_JTCTopRadYOff" value=" 161. " /> <!-- atujt___0026-v0 -->
+
+<var name="JTC_JTCB_BottomTiltedXOffset" value="tan(JTC_JTCC_JTCCommonAngle*GENV_PiS180)*(JTC_JTCB_JTCBottomSideCutY-JTC_JTCB_JTCBottomRadYOffset)"/>
+<var name="JTC_JTCT_TopTiltedXOffset" value="tan(JTC_JTCC_JTCCommonAngle*GENV_PiS180)*(JTC_JTCT_JTCTopSideCutY-JTC_JTCT_JTCTopRadYOff)"/>
+
+<tubs name="JTC_JTCB_BottomBigTubeBase" material="PolyBoron207HD5" Rio_Z=" 0.; JTC_JTCB_JTCBottomBigRad; JTC_JTCB_JTCBottomBigZ" nbPhi="20" profile="180.; 180."/>
+<tubs name="JTC_JTCB_BottomSmallTubeBase" material="PolyBoron207HD5" Rio_Z=" 0.; JTC_JTCB_JTCBottomSmallRad; JTC_JTCB_JTCBottomSmallZ" nbPhi="20" profile="180.; 180."/>
+<tubs name="JTC_JTCB_BottomAuxCutTube" material="PolyBoron207HD5" Rio_Z=" 0.; JFSH_PLUGouRa_Plug_outerRadius+GENV_Eps; JTC_JTCT_JTCTopFullZ" />
+
+<!-- not required since approximations in JFSH
+box name="JTC_JTCB_BottomCentralCut" material="PolyBoron207HD5" X_Y_Z=" 2.*(JTC_JTCB_JTCBottomCenterCutX+GENV_Eps); JTC_JTCB_JTCBottomCenterCutY+2.*GENV_Eps; JTC_JTCB_JTCBottomBigZ+2.*GENV_Eps"/>
+-->
+<box name="JTC_JTCB_SideCut" material="PolyBoron207HD5" X_Y_Z=" 2.*JTC_JTCB_JTCBottomCenterCutX; JTC_JTCB_JTCBottomSideCutY+2.*GENV_Eps; JTC_JTCB_JTCBottomBigZ+4.*GENV_Eps"/>
+<box name="JTC_JTCB_EndCut" material="PolyBoron207HD5" X_Y_Z=" JTC_JTCB_JTCBottomBigX; JTC_JTCB_JTCBottomBigRad+2.*GENV_Eps; JTC_JTCB_JTCBottomBigZ+6.*GENV_Eps"/>
+<box name="JTC_JTCB_TiltCut" material="PolyBoron207HD5" X_Y_Z=" JTC_JTCB_JTCBottomBigRad; JTC_JTCB_JTCBottomBigRad; JTC_JTCT_JTCTopFullZ+8.*GENV_Eps"/>
+
+<subtraction name="JTC_JTCB_BottomBigTube">
+ <posXYZ volume="JTC_JTCB_BottomBigTubeBase" X_Y_Z=" 0.; 0.; 0. " />
+ <posXYZ volume="JTC_JTCB_BottomAuxCutTube" X_Y_Z=" 0.; 0.; 0. " />
+<!-- <posXYZ volume="JTC_JTCB_BottomCentralCut" X_Y_Z=" 0.; -JTC_JTCB_JTCBottomCenterCutY/2.+GENV_Eps; 0." /> -->
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" 2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" -2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" 1.5*JTC_JTCB_JTCBottomBigX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" -1.5*JTC_JTCB_JTCBottomBigX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" -JTC_JTCB_BottomTiltedXOffset-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; 90.-JTC_JTCC_JTCCommonAngle"/>
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" JTC_JTCB_BottomTiltedXOffset+cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; -90.+JTC_JTCC_JTCCommonAngle"/>
+</subtraction>
+
+<subtraction name="JTC_JTCB_BottomSmallTube">
+ <posXYZ volume="JTC_JTCB_BottomSmallTubeBase" X_Y_Z=" 0.; 0.; 0. " />
+ <posXYZ volume="JTC_JTCB_BottomAuxCutTube" X_Y_Z=" 0.; 0.; 0. " />
+<!-- <posXYZ volume="JTC_JTCB_BottomCentralCut" X_Y_Z=" 0.; -JTC_JTCB_JTCBottomCenterCutY/2.+GENV_Eps; 0." /> -->
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" 2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_SideCut" X_Y_Z=" -2.*JTC_JTCB_JTCBottomCenterCutX; -JTC_JTCB_JTCBottomSideCutY/2.+GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" 0.5*JTC_JTCB_JTCBottomBigX+JTC_JTCB_JTCBottomSmallX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_EndCut" X_Y_Z=" -0.5*JTC_JTCB_JTCBottomBigX-JTC_JTCB_JTCBottomSmallX; -JTC_JTCB_JTCBottomBigRad/2.; 0." />
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" -JTC_JTCB_BottomTiltedXOffset-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; 90.-JTC_JTCC_JTCCommonAngle"/>
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" JTC_JTCB_BottomTiltedXOffset+cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCB_JTCBottomSideCutY+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; -90.+JTC_JTCC_JTCCommonAngle"/>
+</subtraction>
+
+<tubs name="JTC_JTCT_TopTubeBase" material="PolyBoron207HD5" Rio_Z=" JTC_JTCT_JTCTopInnerRad; JTC_JTCT_JTCTopOuterRad; JTC_JTCT_JTCTopFullZ" nbPhi="25" />
+<tubs name="JTC_JTCT_TopCutTube" material="PolyBoron207HD5" Rio_Z=" 0.; JTC_JTCT_JTCTopMediumRad; JTC_JTCT_JTCTopFullZ-JTC_JTCT_JTCTopThickZ+GENV_Eps" nbPhi="25"/>
+
+<box name="JTC_JTCT_TopCentralCut" material="PolyBoron207HD5" X_Y_Z=" 2.*JTC_JTCT_JTCTopCenterXCut; JTC_JTCT_JTCTopOuterRad+2.*GENV_Eps; JTC_JTCT_JTCTopFullZ+4.*GENV_Eps"/>
+<box name="JTC_JTCT_SideCut" material="PolyBoron207HD5" X_Y_Z=" 2.*JTC_JTCT_TopTiltedXOffset; JTC_JTCT_JTCTopOuterRad; JTC_JTCT_JTCTopFullZ+6.*GENV_Eps"/>
+
+<subtraction name="JTC_JTCT_TopTube">
+ <posXYZ volume="JTC_JTCT_TopTubeBase" X_Y_Z=" 0.; 0.; 0. " />
+ <posXYZ volume="JTC_JTCT_TopCutTube" X_Y_Z=" 0.; 0.; JTC_JTCT_JTCTopThickZ/2.+GENV_Eps" />
+ <posXYZ volume="JTC_JTCT_TopCentralCut" X_Y_Z=" 0.; -JTC_JTCT_JTCTopOuterRad/2.-GENV_Eps; 0." />
+ <posXYZ volume="JTC_JTCT_SideCut" X_Y_Z=" 0.; -JTC_JTCT_JTCTopOuterRad/2.-JTC_JTCT_JTCTopSideCutY; 0." />
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" JTC_JTCT_TopTiltedXOffset+sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCT_JTCTopSideCutY-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; JTC_JTCC_JTCCommonAngle"/>
+ <posXYZ volume="JTC_JTCB_TiltCut" X_Y_Z=" -JTC_JTCT_TopTiltedXOffset-sin((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); -JTC_JTCT_JTCTopSideCutY-cos((45.-(90-JTC_JTCC_JTCCommonAngle))*GENV_PiS180)*JTC_JTCB_JTCBottomBigRad/sqrt(2.); 0." rot="0.; 0.; -JTC_JTCC_JTCCommonAngle"/>
+</subtraction>
+
+<!-- Composition of JT Shields -->
+<composition name="JTSH_ShieldElements" >
+ <posXYZ volume="JTSH_Plugs" X_Y_Z="0.;0.;0." rot="0.;0.;0." />
+ <posXYZ volume="JTSH_PolyRings" X_Y_Z="0.;0.;0." rot="0.;0.;0." />
+</composition>
+
+<composition name="JTSH_Shield" >
+ <posXYZ volume="JTSH_ShieldElements" X_Y_Z="0.;0.; JTSH_zpositio_Shield_Z" rot="0.;0.;0." />
+ <posXYZ volume="JTSH_ShieldElements" X_Y_Z="0.;0.;-JTSH_zpositio_Shield_Z" rot="0.;JTSH_yrotatio_Shield_rotY;0." />
+ <posXYZ volume="JTC_JTCT_TopTube" X_Y_Z="0.;0.; JFSH_ECTnomiz_ECT_Nominal_zpos+JFSH_JFCMCzof_JFCMainCylinder_zoffset-JTC_JTCT_JTCTopFullZ/2.-GENV_Eps" rot="0.;JTSH_yrotatio_Shield_rotY;0." />
+ <posXYZ volume="JTC_JTCT_TopTube" X_Y_Z="0.;0.;-JFSH_ECTnomiz_ECT_Nominal_zpos-JFSH_JFCMCzof_JFCMainCylinder_zoffset+JTC_JTCT_JTCTopFullZ/2.+GENV_Eps" rot="0.;0.;0." />
+ <posXYZ volume="JTC_JTCB_BottomSmallTube" X_Y_Z="0.;0.;JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ/2.+GENV_Eps" />
+ <posXYZ volume="JTC_JTCB_BottomBigTube" X_Y_Z="0.;0.;JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ+JTC_JTCB_JTCBottomBigZ/2.+2.*GENV_Eps"/>
+ <posXYZ volume="JTC_JTCB_BottomSmallTube" X_Y_Z="0.;0.;-(JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ/2.+GENV_Eps)" />
+ <posXYZ volume="JTC_JTCB_BottomBigTube" X_Y_Z="0.;0.;-(JTSH_OPzposi2_OuterPlugs_z2+JTSH_zpositio_Shield_Z+JTC_JTCB_JTCBottomSmallZ+JTC_JTCB_JTCBottomBigZ/2.+2.*GENV_Eps)"/>
+</composition>
+
+</section>
+
+
+<section name = "pp2"
+ version = "7.0"
+ date = "01-04-2010"
+ author = "new simplified pp2 by Jochen - old versions by Laurent, Andrea Dell'Acqua and Daniel Pomarede removed"
+ top_volume = "pp2">
+
+
+<!-- name = pp2 section name = "Services" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Services : ID Patch Panels PP2 ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+<!-- New Simplified PP2 - subboxes merged by Jochen Meyer-->
+
+<!-- variables for semi simplified boxes -->
+<!-- sector 13 - one -->
+<var name="IPP2_Sec13_Box1_z" value=" 520. " />
+<var name="IPP2_Sec13_Box1_x" value="1300. " />
+<var name="IPP2_Sec13_Box1_y" value=" 420. " />
+
+<var name="IPP2_Sec13_Box2_z" value="IPP2_Sec13_Box1_z" />
+<var name="IPP2_Sec13_Box2_x" value="IPP2_Sec13_Box1_x/2." />
+<var name="IPP2_Sec13_Box2_y" value=" 450. " />
+
+<!-- sector 13 - two -->
+<var name="IPP2_Sec13_Box3_z" value=" 380. " />
+<var name="IPP2_Sec13_Box3_x" value=" 420. " />
+<var name="IPP2_Sec13_Box3_y" value=" 440. " />
+
+<var name="IPP2_Sec13_Box4_z" value=" 700. " />
+<var name="IPP2_Sec13_Box4_x" value=" 400. " />
+<var name="IPP2_Sec13_Box4_y" value="IPP2_Sec13_Box3_y" />
+
+<var name="IPP2_Sec13_Box5_z" value=" 590. " />
+<var name="IPP2_Sec13_Box5_x" value=" 540. " />
+<var name="IPP2_Sec13_Box5_y" value=" 170. " />
+
+<var name="IPP2_Sec13_Box6_z" value=" 500. " />
+<var name="IPP2_Sec13_Box6_x" value=" 150. " />
+<var name="IPP2_Sec13_Box6_y" value=" 100. " />
+
+<var name="IPP2_Sec13_xspace" value=" 37.5" />
+
+<!-- sector 3 & 7 -->
+<var name="IPP2_Sec37_Box1_z" value=" 610. " />
+<var name="IPP2_Sec37_Box1_x" value=" 520. " />
+<var name="IPP2_Sec37_Box1_y" value=" 850. " />
+
+<var name="IPP2_Sec37_Box2_z" value=" 300. " />
+<var name="IPP2_Sec37_Box2_x" value="IPP2_Sec37_Box1_x" />
+<var name="IPP2_Sec37_Box2_y" value=" 420. " />
+
+<var name="IPP2_Sec37_Box3_z" value=" 300. " />
+<var name="IPP2_Sec37_Box3_x" value=" 260. " />
+<var name="IPP2_Sec37_Box3_y" value=" 360. " />
+
+<var name="IPP2_Sec37_Box4_z" value=" 360. " />
+<var name="IPP2_Sec37_Box4_x" value=" 560. " />
+<var name="IPP2_Sec37_Box4_y" value="IPP2_Sec37_Box3_y" />
+
+<var name="IPP2_Sec37_Box5_z" value=" 120. " />
+<var name="IPP2_Sec37_Box5_x" value=" 320. " />
+<var name="IPP2_Sec37_Box5_y" value=" 120. " />
+
+<var name="IPP2_Sec37_Box6_z" value=" 200. " />
+<var name="IPP2_Sec37_Box6_x" value=" 120. " />
+<var name="IPP2_Sec37_Box6_y" value=" 120. " />
+
+<var name="IPP2_Sec37_xoffset" value=" 40. " />
+
+<!-- sector 1 & 9 -->
+<var name="IPP2_Sec19_Box1_z" value=" 610. " />
+<var name="IPP2_Sec19_Box1_x" value=" 520. " />
+<var name="IPP2_Sec19_Box1_y" value="1260. " />
+
+<var name="IPP2_Sec19_Box2_z" value=" 300." />
+<var name="IPP2_Sec19_Box2_x" value=" 520." />
+<var name="IPP2_Sec19_Box2_y" value=" 850." />
+
+<var name="IPP2_Sec19_Box3_z" value=" 420." />
+<var name="IPP2_Sec19_Box3_x" value=" 380." />
+<var name="IPP2_Sec19_Box3_y" value=" 710." />
+
+<var name="IPP2_Sec19_Box4_z" value=" 400." />
+<var name="IPP2_Sec19_Box4_x" value=" 700." />
+<var name="IPP2_Sec19_Box4_y" value="IPP2_Sec19_Box3_y" />
+
+<var name="IPP2_Sec19_Box5_z" value=" 110." />
+<var name="IPP2_Sec19_Box5_x" value=" 400." />
+<var name="IPP2_Sec19_Box5_y" value=" 100." />
+
+<var name="IPP2_Sec19_Box2_yoffset" value=" 300." />
+<var name="IPP2_Sec19_xoffset" value="IPP2_Sec37_xoffset" />
+
+<!-- universal floor -->
+<var name="IPP2_UniFloor_x" value=" 900. "/>
+<var name="IPP2_UniFloor_y" value=" 15. "/>
+<var name="IPP2_UniFloor_z" value="1770. "/>
+
+<var name="IPP2_UniFl_Sec13Zshift" value=" 40. "/>
+
+<!-- coordinates -->
+<var name="IPP2_xpos19" value="+5880. "/>
+<var name="IPP2_ypos19" value="-1100. "/>
+<var name="IPP2_zpos19" value="+2560. "/>
+<var name="IPP2_xpos37" value="+4710. "/>
+<var name="IPP2_ypos37" value="+3340. "/>
+<var name="IPP2_zpos37" value="+2710. "/>
+<var name="IPP2_xpos13_one" value=" 650. "/>
+<var name="IPP2_ypos13_one" value="-6380. "/>
+<var name="IPP2_zpos13_one" value="+3820. "/>
+<var name="IPP2_xpos13_two" value=" +890. "/>
+<var name="IPP2_ypos13_two" value="-6380. "/>
+<var name="IPP2_zpos13_two" value="+2460. "/>
+
+<box name="IPP2_UniFloor" material="Aluminium4" X_Y_Z="IPP2_UniFloor_x; IPP2_UniFloor_y; IPP2_UniFloor_z" />
+
+<box name="IPP2_Sec13_Box1" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box1_x; IPP2_Sec13_Box1_y; IPP2_Sec13_Box1_z" />
+<box name="IPP2_Sec13_Box2" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box2_x; IPP2_Sec13_Box2_y; IPP2_Sec13_Box2_z" />
+<box name="IPP2_Sec13_Box3" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box3_x; IPP2_Sec13_Box3_y; IPP2_Sec13_Box3_z" />
+<box name="IPP2_Sec13_Box4" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box4_x; IPP2_Sec13_Box4_y; IPP2_Sec13_Box4_z" />
+<box name="IPP2_Sec13_Box5" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box5_x; IPP2_Sec13_Box5_y; IPP2_Sec13_Box5_z" />
+<box name="IPP2_Sec13_Box6" material="Aluminium1" X_Y_Z="IPP2_Sec13_Box6_x; IPP2_Sec13_Box6_y; IPP2_Sec13_Box6_z" />
+
+<box name="IPP2_Sec37_Box1" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box1_x; IPP2_Sec37_Box1_y; IPP2_Sec37_Box1_z" />
+<box name="IPP2_Sec37_Box2" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box2_x; IPP2_Sec37_Box2_y; IPP2_Sec37_Box2_z" />
+<box name="IPP2_Sec37_Box3" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box3_x; IPP2_Sec37_Box3_y; IPP2_Sec37_Box3_z" />
+<box name="IPP2_Sec37_Box4" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box4_x; IPP2_Sec37_Box4_y; IPP2_Sec37_Box4_z" />
+<box name="IPP2_Sec37_Box5" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box5_x; IPP2_Sec37_Box5_y; IPP2_Sec37_Box5_z" />
+<box name="IPP2_Sec37_Box6" material="Aluminium1" X_Y_Z="IPP2_Sec37_Box6_x; IPP2_Sec37_Box6_y; IPP2_Sec37_Box6_z" />
+
+<box name="IPP2_Sec19_Box1" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box1_x; IPP2_Sec19_Box1_y; IPP2_Sec19_Box1_z" />
+<box name="IPP2_Sec19_Box2" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box2_x; IPP2_Sec19_Box2_y; IPP2_Sec19_Box2_z" />
+<box name="IPP2_Sec19_Box3" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box3_x; IPP2_Sec19_Box3_y; IPP2_Sec19_Box3_z" />
+<box name="IPP2_Sec19_Box4" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box4_x; IPP2_Sec19_Box4_y; IPP2_Sec19_Box4_z" />
+<box name="IPP2_Sec19_Box5" material="Aluminium1" X_Y_Z="IPP2_Sec19_Box5_x; IPP2_Sec19_Box5_y; IPP2_Sec19_Box5_z" />
+
+<composition name="IPP2_Sec13_single_one">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; IPP2_UniFl_Sec13Zshift" rot="0.; 90.; 0." />
+ <posXYZ volume="IPP2_Sec13_Box1" X_Y_Z="0.; IPP2_Sec13_Box1_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box2" X_Y_Z="0.; IPP2_Sec13_Box2_y/2. + IPP2_Sec13_Box1_y + 2.*GENV_Eps; 0." />
+</composition>
+
+<var name="IPP2_Sec13_length" value="(IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x + IPP2_Sec13_xspace)*2."/>
+
+<composition name="IPP2_Sec13_single_two_Cside">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; -IPP2_UniFl_Sec13Zshift" rot="0.; 90.; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z=" IPP2_Sec13_Box4_x + IPP2_Sec13_Box3_x/2. + IPP2_Sec13_xspace + GENV_Eps; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z=" IPP2_Sec13_Box4_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z="-IPP2_Sec13_Box3_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z="-IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x/2. - IPP2_Sec13_xspace - GENV_Eps; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box5" X_Y_Z=" IPP2_Sec13_Box5_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box5_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box5_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box6" X_Y_Z="-IPP2_Sec13_Box6_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box6_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box6_z - IPP2_Sec13_Box4_z)/2." />
+</composition>
+
+<composition name="IPP2_Sec13_single_two_Aside">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; -IPP2_UniFl_Sec13Zshift" rot="0.; 90.; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z=" IPP2_Sec13_Box4_x + IPP2_Sec13_Box3_x/2. + IPP2_Sec13_xspace + GENV_Eps; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z=" IPP2_Sec13_Box4_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z="-IPP2_Sec13_Box3_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y/2. + GENV_Eps; (IPP2_Sec13_Box3_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z="-IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x/2. - IPP2_Sec13_xspace - GENV_Eps; IPP2_Sec13_Box4_y/2. + GENV_Eps; 0." />
+ <posXYZ volume="IPP2_Sec13_Box5" X_Y_Z="-IPP2_Sec13_Box5_x/2. - IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box5_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box5_z - IPP2_Sec13_Box4_z)/2." />
+ <posXYZ volume="IPP2_Sec13_Box6" X_Y_Z=" IPP2_Sec13_Box6_x/2. + IPP2_Sec13_xspace; IPP2_Sec13_Box3_y + IPP2_Sec13_Box6_y/2. + 2.*GENV_Eps; (IPP2_Sec13_Box6_z - IPP2_Sec13_Box4_z)/2." />
+</composition>
+
+<var name="IPP_Sec37_length" value="IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z + IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x"/>
+
+<composition name="IPP2_Sec37_single">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; 0." rot="0.; 0.; 0." />
+ <posXYZ volume="IPP2_Sec37_Box1" X_Y_Z="0.; IPP2_Sec37_Box1_y/2. + GENV_Eps; - IPP_Sec37_length/2. - 2.*GENV_Eps + IPP2_Sec37_Box1_z/2." />
+ <posXYZ volume="IPP2_Sec37_Box2" X_Y_Z="0.; IPP2_Sec37_Box2_y/2. + GENV_Eps; - IPP_Sec37_length/2. - GENV_Eps + IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z/2." />
+ <posXYZ volume="IPP2_Sec13_Box3" X_Y_Z="IPP2_Sec37_xoffset + (IPP2_Sec13_Box3_z-IPP2_Sec13_Box4_z)/2.; IPP2_Sec13_Box3_y/2. + GENV_Eps; IPP_Sec37_length/2. + 2.*GENV_Eps - IPP2_Sec13_Box3_x/2." rot="0.; 90.; 0."/>
+ <posXYZ volume="IPP2_Sec13_Box4" X_Y_Z="IPP2_Sec37_xoffset ; IPP2_Sec13_Box4_y/2. + GENV_Eps; IPP_Sec37_length/2. + GENV_Eps - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x/2." rot="0.; 90.; 0."/>
+ <posXYZ volume="IPP2_Sec37_Box3" X_Y_Z="IPP2_Sec37_xoffset + (-IPP2_Sec13_Box4_z + IPP2_Sec37_Box3_x)/2.; IPP2_Sec13_Box3_y + IPP2_Sec37_Box3_y/2. + 2.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z + IPP2_Sec37_Box3_z/2. + 2.*GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box4" X_Y_Z="IPP2_Sec37_xoffset + (-IPP2_Sec13_Box4_z + IPP2_Sec37_Box4_x)/2.; IPP2_Sec13_Box4_y + IPP2_Sec37_Box4_y/2. + 2.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box5" X_Y_Z="IPP2_Sec37_xoffset - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x + IPP2_Sec37_Box5_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec13_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z - IPP2_Sec37_Box5_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box6" X_Y_Z="IPP2_Sec37_xoffset - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec13_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec37_length/2. - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x + IPP2_Sec37_Box4_z + IPP2_Sec37_Box6_z/2. + 2.*GENV_Eps" />
+</composition>
+
+<var name="IPP_Sec19_length" value="IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z + IPP2_Sec19_Box3_z + IPP2_Sec19_Box4_z"/>
+
+<composition name="IPP2_Sec19_single">
+ <posXYZ volume="IPP2_UniFloor" X_Y_Z="0.; -IPP2_UniFloor_y/2.; 0." rot="0.; 0.; 0." />
+ <posXYZ volume="IPP2_Sec19_Box1" X_Y_Z="0.; IPP2_Sec19_Box1_y/2. + GENV_Eps; - IPP_Sec19_length/2. - 2.*GENV_Eps + IPP2_Sec19_Box1_z/2." />
+ <posXYZ volume="IPP2_Sec19_Box2" X_Y_Z="0.; IPP2_Sec19_Box2_y/2. + IPP2_Sec19_Box2_yoffset; - IPP_Sec19_length/2. - GENV_Eps + IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z/2." />
+ <posXYZ volume="IPP2_Sec19_Box3" X_Y_Z="IPP2_Sec19_xoffset + (IPP2_Sec19_Box3_x - IPP2_Sec19_Box4_x)/2.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box3_y/2. + 2.*GENV_Eps; IPP_Sec19_length/2. + 2.*GENV_Eps - IPP2_Sec19_Box3_z/2." />
+ <posXYZ volume="IPP2_Sec19_Box4" X_Y_Z="IPP2_Sec19_xoffset; IPP2_Sec37_Box3_y + IPP2_Sec19_Box4_y/2. + 2.*GENV_Eps; IPP_Sec19_length/2. + GENV_Eps - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z/2." />
+ <posXYZ volume="IPP2_Sec37_Box3" X_Y_Z="IPP2_Sec19_xoffset + (-IPP2_Sec19_Box4_x + IPP2_Sec37_Box3_x)/2.; IPP2_Sec37_Box3_y/2. + GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z + IPP2_Sec37_Box3_z/2. + 2.*GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box4" X_Y_Z="IPP2_Sec19_xoffset + (-IPP2_Sec19_Box4_x + IPP2_Sec37_Box4_x)/2.; IPP2_Sec37_Box4_y/2. + GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box5" X_Y_Z="IPP2_Sec19_xoffset - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x + IPP2_Sec37_Box5_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z - IPP2_Sec37_Box5_z/2. + GENV_Eps" />
+ <posXYZ volume="IPP2_Sec37_Box6" X_Y_Z="IPP2_Sec19_xoffset - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_Box3_x - IPP2_Sec37_Box6_x/2.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box4_y + IPP2_Sec37_Box5_y/2. + 3.*GENV_Eps; IPP_Sec19_length/2. - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z + IPP2_Sec37_Box4_z + IPP2_Sec37_Box6_z/2. + 2.*GENV_Eps" />
+ <posXYZ volume="IPP2_Sec19_Box5" X_Y_Z="0.; IPP2_Sec37_Box4_y + IPP2_Sec19_Box4_y + IPP2_Sec19_Box5_y/2. + 3.*GENV_Eps; 3.*IPP2_Sec19_Box5_z/2." />
+</composition>
+
+<composition name="pp2">
+ <posXYZ volume="IPP2_Sec13_single_one" X_Y_Z="IPP2_xpos13_one - IPP2_Sec13_Box1_x/2.; IPP2_ypos13_one; IPP2_zpos13_one + IPP2_Sec13_Box1_z/2."/>
+ <posXYZ volume="IPP2_Sec13_single_one" X_Y_Z="IPP2_xpos13_one - IPP2_Sec13_Box1_x/2.; IPP2_ypos13_one; -IPP2_zpos13_one - IPP2_Sec13_Box1_z/2." rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec13_single_two_Aside" X_Y_Z="IPP2_xpos13_two - IPP2_Sec13_length/2.; IPP2_ypos13_two; IPP2_zpos13_two + IPP2_Sec13_Box4_z/2."/>
+ <posXYZ volume="IPP2_Sec13_single_two_Cside" X_Y_Z="IPP2_xpos13_two - IPP2_Sec13_length/2.; IPP2_ypos13_two; -IPP2_zpos13_two - IPP2_Sec13_Box4_z/2." rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z=" IPP2_xpos37 + IPP2_Sec13_Box4_z/2. - IPP2_Sec37_xoffset; IPP2_ypos37; IPP2_zpos37 - IPP_Sec37_length/2. + IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z + IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x"/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z=" IPP2_xpos37 + IPP2_Sec13_Box4_z/2. - IPP2_Sec37_xoffset; IPP2_ypos37; -IPP2_zpos37 + IPP_Sec37_length/2. - IPP2_Sec37_Box1_z - IPP2_Sec37_Box2_z - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x"/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z="-IPP2_xpos37 - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_xoffset; IPP2_ypos37; IPP2_zpos37 - IPP_Sec37_length/2. + IPP2_Sec37_Box1_z + IPP2_Sec37_Box2_z + IPP2_Sec13_Box3_x + IPP2_Sec13_Box4_x" rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec37_single" X_Y_Z="-IPP2_xpos37 - IPP2_Sec13_Box4_z/2. + IPP2_Sec37_xoffset; IPP2_ypos37; -IPP2_zpos37 + IPP_Sec37_length/2. - IPP2_Sec37_Box1_z - IPP2_Sec37_Box2_z - IPP2_Sec13_Box3_x - IPP2_Sec13_Box4_x" rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z=" IPP2_xpos19 + IPP2_Sec19_Box4_x/2. - IPP2_Sec37_xoffset; IPP2_ypos19; IPP2_zpos19 - IPP_Sec19_length/2. + IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z + IPP2_Sec19_Box3_z + IPP2_Sec19_Box4_z"/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z=" IPP2_xpos19 + IPP2_Sec19_Box4_x/2. - IPP2_Sec37_xoffset; IPP2_ypos19; -IPP2_zpos19 + IPP_Sec19_length/2. - IPP2_Sec19_Box1_z - IPP2_Sec19_Box2_z - IPP2_Sec37_Box4_z - IPP2_Sec37_Box3_z"/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z="-IPP2_xpos19 - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_xoffset; IPP2_ypos19; IPP2_zpos19 - IPP_Sec19_length/2. + IPP2_Sec19_Box1_z + IPP2_Sec19_Box2_z + IPP2_Sec37_Box4_z + IPP2_Sec37_Box3_z" rot="0.; 180.; 0."/>
+ <posXYZ volume="IPP2_Sec19_single" X_Y_Z="-IPP2_xpos19 - IPP2_Sec19_Box4_x/2. + IPP2_Sec37_xoffset; IPP2_ypos19; -IPP2_zpos19 + IPP_Sec19_length/2. - IPP2_Sec19_Box1_z - IPP2_Sec19_Box2_z - IPP2_Sec19_Box3_z - IPP2_Sec19_Box4_z" rot="0.; 180.; 0."/>
+</composition>
+
+</section>
+
+<section name = "Eta0Services"
+ version = "7.0"
+ date = "29 Mar 2010"
+ author = "Laurent Chevalier"
+ top_volume = "servicesAtZ0">
+
+<!-- name = Eta0Services section name = "Services" -->
+<!--
+ **************************************************************
+ *** ****
+ *** Services ****
+ *** ****
+ **************************************************************
+-->
+<tubs name="EMCaloPipeI" material="Iron1" Rio_Z=" 310 ; 320; 5500" nbPhi="20" />
+<tubs name="EMCaloPipeO" material="Iron1" Rio_Z=" 190 ; 200; 1400" nbPhi="20" />
+<tubs name="CuivreCable" material="Aluminium2" Rio_Z=" 0.; 170; 5500" nbPhi="20" />
+<tubs name="CuivreCabl0" material="Aluminium2" Rio_Z=" 0.; 170; 5000" nbPhi="20" />
+<var name="SerStart" value="7500"/>
+<var name="SerZ" value="-100"/>
+
+<composition name="services0" > <!-- modified positions to avoid overlap -->
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0; 541 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0; 181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-541 ;SerZ" rot=" 0.;90.;0." />
+</composition>
+
+<composition name="services1" >
+ <posRPhiZ volume="services0" R_Phi_Z=" SerStart; Zero ; Zero" />
+</composition>
+
+<composition name="services2" > <!-- modified positions to avoid overlap -->
+ <posXYZ volume="CuivreCabl0" X_Y_Z=" 300; 541 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCabl0" X_Y_Z=" 300; 181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-181 ;SerZ" rot=" 0.;90.;0." />
+ <posXYZ volume="CuivreCable" X_Y_Z=" 0;-541 ;SerZ" rot=" 0.;90.;0." />
+</composition>
+
+<!-- flexible chain sector 9
+
+name = "Flexible Chain Sector 9-35Volumes"
+version = "0.0"
+date = "01.03.2019"
+author = "Niko Tsutskiridze - Georgian Team" -->
+
+
+<!-- Towing ARM -->
+<box name="TowingArm_main" material="ShieldSteel" X_Y_Z=" 263.; 795.; 2480." />
+<box name="TowingArm_main_Subtr" material="ShieldSteel" X_Y_Z="250.; 782.; 2500." />
+
+<subtraction name="TowingArm_Sub" >
+ <posXYZ volume="TowingArm_main" />
+ <posXYZ volume="TowingArm_main_Subtr" />
+</subtraction>
+
+<box name="TowingARM_Plate_main" material="ShieldSteel" X_Y_Z="102.; 550.; 550." />
+<box name="TowingARM_Plate_Subtr" material="ShieldSteel" X_Y_Z="102.; 510.; 510. " />
+
+<subtraction name="TowingArm_Plate" >
+ <posXYZ volume="TowingARM_Plate_main" />
+ <posXYZ volume="TowingARM_Plate_Subtr" X_Y_Z=" 10. ; 0. ; 0. " />
+</subtraction>
+
+<composition name="TowingArm" >
+ <posXYZ volume="TowingArm_Sub" rot="0. ; 0. ; 0." />
+ <posXYZ volume="TowingArm_Plate" X_Y_Z="182.6; 0. ; 930. " rot=" 0. ; 0. ; 0." />
+</composition>
+<!-- End Towing ARM -->
+
+<!-- Drag Chain -->
+<box name="DragChain_Main" material="ShieldSteel" X_Y_Z=" 5555.; 804.; 17.5" />
+<tubs name="DragChain_Tube" material="ShieldSteel" Rio_Z="912.5; 930.; 804." profile="0.; 90." nbPhi="36."/>
+<box name="DragChain_SmMain" material="ShieldSteel" X_Y_Z=" 17.5; 804.; 275." />
+
+<union name="DragChain" >
+ <posXYZ volume="DragChain_Main"/>
+ <posXYZ volume="DragChain_Tube" X_Y_Z="2777.5; 0. ; 921.25 " rot=" 270. ; 0. ; 0." />
+ <posXYZ volume="DragChain_SmMain" X_Y_Z="3698.75; 0. ; 1056.75 "/>
+</union>
+<!-- End Towing ARM -->
+
+<!-- Pipes -->
+<box name="Pipe_Main" material="ShieldSteel" X_Y_Z=" 5425.; 439.; 2.05" />
+<tubs name="Pipe_Tube" material="ShieldSteel" Rio_Z="900.; 902.05; 439." profile="0.; 90." nbPhi="36."/>
+<box name="Pipe_SmMain" material="ShieldSteel" X_Y_Z=" 2.05; 439.; 5114." />
+
+<union name="FCH_Pipes" >
+ <posXYZ volume="Pipe_Main" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Pipe_Tube" X_Y_Z="2712.5; 0. ; 901.025 " rot=" 270. ; 0. ; 0." />
+ <posXYZ volume="Pipe_SmMain" X_Y_Z="3613.525; 0. ; 3454.025 "/>
+</union>
+<!-- End Pipes -->
+
+<!-- Cables -->
+<box name="Cable_Main" material="Copper" X_Y_Z=" 5425.; 720.; 6.7" />
+<tubs name="Cable_Tube" material="Copper" Rio_Z="1013.3; 1020.; 720." profile="0.; 90." nbPhi="36."/>
+<box name="Cable_SmMain" material="Copper" X_Y_Z=" 6.7; 720.; 2504." />
+
+<union name="FCH_Cable" >
+ <posXYZ volume="Cable_Main" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Cable_Tube" X_Y_Z="2712.5; 0. ; 1016.65 " rot=" 270. ; 0. ; 0." />
+ <posXYZ volume="Cable_SmMain" X_Y_Z="3729.15; 0. ; 2266.65 "/>
+</union>
+<!-- End Cables -->
+
+<!-- Support -->
+<box name="Support_MaBox" material="ShieldSteel" X_Y_Z=" 5230.; 1005.; 750." />
+<box name="Support_MaCutBox1" material="ShieldSteel" X_Y_Z=" 5240.; 1005.; 336.9" />
+<box name="Support_MaCutBox2" material="ShieldSteel" X_Y_Z=" 5130.; 895.; 760." />
+
+<subtraction name="Support_Ma" >
+ <posXYZ volume="Support_MaBox" />
+ <posXYZ volume="Support_MaCutBox1" X_Y_Z="0.; 12.6 ; -181.15 " rot=" 0. ; 0. ; 0."/>
+ <posXYZ volume="Support_MaCutBox1" X_Y_Z="0.; 12.6 ; 181.15 " rot=" 0. ; 0. ; 0."/>
+ <posXYZ volume="Support_MaCutBox2" X_Y_Z="0.; 0. ; 0. " rot=" 0. ; 0. ; 0."/>
+</subtraction>
+
+<gvxy name="Support_Leg1" material="ShieldSteel" dZ="700.">
+ <gvxy_point X_Y="-50.; -50."/>
+ <gvxy_point X_Y="-50.; -40."/>
+ <gvxy_point X_Y="-6.5; -40."/>
+ <gvxy_point X_Y="-6.5; 40."/>
+ <gvxy_point X_Y="-50.; 40."/>
+ <gvxy_point X_Y="-50.; 50."/>
+ <gvxy_point X_Y="50.; 50."/>
+ <gvxy_point X_Y="50.; 40."/>
+ <gvxy_point X_Y="6.5; 40."/>
+ <gvxy_point X_Y="6.5; -40."/>
+ <gvxy_point X_Y="50.; -40."/>
+ <gvxy_point X_Y="50.; -50."/>
+</gvxy>
+
+<gvxy name="Support_Leg2" material="ShieldSteel" dZ="522.7">
+ <gvxy_point X_Y="-50.; -50."/>
+ <gvxy_point X_Y="-50.; -31.4"/>
+ <gvxy_point X_Y="-9.3; -31.4"/>
+ <gvxy_point X_Y="-9.3; 40."/>
+ <gvxy_point X_Y="-50.; 31.4"/>
+ <gvxy_point X_Y="-50.; 50."/>
+ <gvxy_point X_Y="50.; 50."/>
+ <gvxy_point X_Y="50.; 31.4"/>
+ <gvxy_point X_Y="9.3; 31.4"/>
+ <gvxy_point X_Y="9.3; -31.4"/>
+ <gvxy_point X_Y="50.; -31.4"/>
+ <gvxy_point X_Y="50.; -50."/>
+</gvxy>
+
+<composition name="FCH_SupportLeg" >
+ <posXYZ volume="Support_Leg1" X_Y_Z="0.; 0. ; 0. " rot="0. ; 90. ; 0." />
+ <posXYZ volume="Support_Leg2" X_Y_Z="-257.5; 311.36 ; 0. " rot="0. ; 90. ; 90." />
+</composition>
+
+<gvxy name="Support_SidePl1" material="ShieldSteel" dZ="3150.5">
+ <gvxy_point X_Y="150.; 62.5"/>
+ <gvxy_point X_Y="156.; 62.5"/>
+ <gvxy_point X_Y="156.; -62.5"/>
+ <gvxy_point X_Y="-156.; -62.5"/>
+ <gvxy_point X_Y="-156.; 62.5"/>
+ <gvxy_point X_Y="-150.; 62.5"/>
+ <gvxy_point X_Y="-150.; -56.7"/>
+ <gvxy_point X_Y="150.; -57.7"/>
+</gvxy>
+
+<gvxy name="Support_SidePl2" material="ShieldSteel" dZ="2300.">
+ <gvxy_point X_Y="-150.; 812.5"/>
+ <gvxy_point X_Y="-156.; 812.5"/>
+ <gvxy_point X_Y="-156.; 937.5"/>
+ <gvxy_point X_Y="156.; 937.5"/>
+ <gvxy_point X_Y="156.; 812.5"/>
+ <gvxy_point X_Y="150.; 812.5"/>
+ <gvxy_point X_Y="150.; 931.7"/>
+ <gvxy_point X_Y="-150.; 931.7"/>
+</gvxy>
+
+<composition name="Support_SidePl" >
+ <posXYZ volume="Support_SidePl1" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SidePl2" X_Y_Z="0.; 0. ; 425.25 " rot="0. ; 0. ; 0." />
+</composition>
+
+<gvxy name="Support_SideFrPl1" material="ShieldSteel" dZ="14.">
+ <gvxy_point X_Y="-379.; -329.5"/>
+ <gvxy_point X_Y="-379.; -444.5"/>
+ <gvxy_point X_Y="-928.5; -594.5"/>
+ <gvxy_point X_Y="-1118.5; -594.5"/>
+ <gvxy_point X_Y="-1118.5; -220.5"/>
+ <gvxy_point X_Y="-300.; 594.5"/>
+ <gvxy_point X_Y="300.; 594.5"/>
+ <gvxy_point X_Y="1118.5; -220.5"/>
+ <gvxy_point X_Y="1118.5; -594.5"/>
+ <gvxy_point X_Y="928.5; -594.5"/>
+ <gvxy_point X_Y="379.; -444.5"/>
+ <gvxy_point X_Y="379.; -329.5"/>
+</gvxy>
+
+<box name="Support_SideFrPl2_Box" material="ShieldSteel" X_Y_Z=" 431.5; 1054.; 76." />
+<box name="Support_SideFrPl2_Cut" material="ShieldSteel" X_Y_Z=" 431.5; 1000.; 80." />
+
+<subtraction name="Support_SideFrPl2" >
+ <posXYZ volume="Support_SideFrPl2_Box" />
+ <posXYZ volume="Support_SideFrPl2_Cut" X_Y_Z="27.; 0. ; 0. " rot=" 0. ; 0. ; 0."/>
+</subtraction>
+
+<box name="Support_SideFrPl3_Box" material="ShieldSteel" X_Y_Z=" 1252.; 100.; 708." />
+<box name="Support_SideFrPl3_Cut" material="ShieldSteel" X_Y_Z=" 1252.; 110.; 650." />
+
+<subtraction name="Support_SideFrPl3" >
+ <posXYZ volume="Support_SideFrPl3_Box" />
+ <posXYZ volume="Support_SideFrPl3_Cut" X_Y_Z="29.; 0. ; 0. " rot=" 0. ; 0. ; 0."/>
+</subtraction>
+
+<composition name="FCH_Support" >
+ <posXYZ volume="Support_Ma" X_Y_Z="0.; 0. ; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_SupportLeg" X_Y_Z="-2283.; -1075.31 ; 333.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_SupportLeg" X_Y_Z="-2283.; -1075.31 ; -333.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SidePl" X_Y_Z="3636.8; -439.8 ; 2825.25 " rot="0. ; 180. ; 0." />
+ <posXYZ volume="Support_SidePl" X_Y_Z="3636.8; -439.8 ; -2825.25 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SideFrPl1" X_Y_Z="3241.3; -500. ; 0. " rot="0. ; 90. ; 90." />
+ <posXYZ volume="Support_SideFrPl2" X_Y_Z="3668.55; -2.6 ; 1156.51 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SideFrPl2" X_Y_Z="3668.55; -2.6 ; -1156.51 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="Support_SideFrPl3" X_Y_Z="3263.3; 576.92 ; 0. " rot="0. ; 0. ; 0." />
+</composition>
+<!-- End Support -->
+
+<composition name="FlexibleChainSector9" >
+ <posXYZ volume="TowingArm" X_Y_Z="-4469.28; 0. ; 2659.1 " rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="TowingArm" X_Y_Z="-4469.28; 0. ; -2659.1 " rot=" 180. ; 0. ; 0." />
+ <posXYZ volume="DragChain" X_Y_Z="-8197.5; 0. ; 222.75 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="DragChain" X_Y_Z="-8197.5; 0. ; -222.75 " rot="180. ; 0. ; 0." />
+ <posXYZ volume="FCH_Pipes" X_Y_Z="-8090.84; -158.75 ; 194.625 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_Pipes" X_Y_Z="-8090.84; -158.75 ; -194.625 " rot="180. ; 0. ; 0." />
+ <posXYZ volume="FCH_Cable" X_Y_Z="-8091.32; -21. ; 79. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="FCH_Cable" X_Y_Z="-8091.32; -21. ; -79. " rot="180. ; 0. ; 0." />
+ <posXYZ volume="FCH_Support" X_Y_Z="-8103.; 2.5 ; 0. " rot="0. ; 0. ; 0." />
+</composition>
+
+<!-- end of flexible chain sector 9 -->
+
+<!-- flexible chain sector 11 and 15
+
+name = "41_Vol_-_FlexibleChainSector11-15"
+version = "0.0"
+date = "07-06-2019"
+author = "Niko Tsutskiridze, Davit Shekiladze" -->
+
+<!-- Support -->
+<box name="Support_BottomPlate" material="ShieldSteel" X_Y_Z=" 4300.; 9.5; 506." />
+<box name="Support_SidesPlates" material="ShieldSteel" X_Y_Z=" 4312.; 828.5; 25." />
+<box name="Support_SidesPlatesCutBox" material="ShieldSteel" X_Y_Z=" 1956.; 710.; 30." />
+
+<subtraction name="Support_SidesPlatesSubtr" >
+ <posXYZ volume="Support_SidesPlates" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_SidesPlatesCutBox" X_Y_Z=" -1078. ; -40.75 ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_SidesPlatesCutBox" X_Y_Z=" 1078. ; -40.75 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="Support_MidlPlates" material="ShieldSteel" X_Y_Z=" 4312.; 814.9; 20." />
+<box name="Support_MidlPlatesCutBox" material="ShieldSteel" X_Y_Z=" 1954.; 615.; 25." />
+
+<subtraction name="Support_MidlPlatesSubtr" >
+ <posXYZ volume="Support_MidlPlates" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_MidlPlatesCutBox" X_Y_Z=" -1079. ; -0.05 ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_MidlPlatesCutBox" X_Y_Z=" 1079. ; -0.05 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<composition name="Support_SidesPlatesM" >
+ <posXYZ volume="Support_SidesPlatesSubtr" X_Y_Z=" 0. ; 405.547 ; 265.6 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_SidesPlatesSubtr" X_Y_Z=" 0. ; 405.547 ; -265.6 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_MidlPlatesSubtr" X_Y_Z=" 0. ; 412.35 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</composition>
+
+<gvxy name="Support_WingPlate" material="ShieldSteel" dZ="2287." >
+ <gvxy_point X_Y=" -114.148; 64.757 " />
+ <gvxy_point X_Y=" -114.148; -69.961 " />
+ <gvxy_point X_Y=" -119.041; -69.961 " />
+ <gvxy_point X_Y=" -119.041; 69.961 " />
+ <gvxy_point X_Y=" 119.041; 69.961 " />
+ <gvxy_point X_Y=" 119.041; -69.961 " />
+ <gvxy_point X_Y=" 114.148; -69.961 " />
+ <gvxy_point X_Y=" 114.148; 64.757 " />
+</gvxy>
+
+<box name="Support_WingBox1" material="ShieldSteel" X_Y_Z=" 297.155; 896.845; 100." />
+<box name="Support_WingCutBox1" material="ShieldSteel" X_Y_Z=" 238.155; 846.845; 110." />
+
+<subtraction name="Support_WingBox1Subtr" >
+ <posXYZ volume="Support_WingBox1" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox1" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+
+<box name="Support_WingBox" material="ShieldSteel" X_Y_Z=" 302.155; 901.845; 100." />
+<box name="Support_WingCutBox" material="ShieldSteel" X_Y_Z=" 238.155; 846.845; 110." />
+
+<subtraction name="Support_WingBoxSubtr" >
+ <posXYZ volume="Support_WingBox" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="Support_WingBox2" material="ShieldSteel" X_Y_Z=" 291.; 866.094; 100." />
+<box name="Support_WingCutBox2" material="ShieldSteel" X_Y_Z=" 246.155; 821.094; 110." />
+
+<subtraction name="Support_WingBox2Subtr" >
+ <posXYZ volume="Support_WingBox2" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox2" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<box name="Support_WingBox3" material="ShieldSteel" X_Y_Z=" 242.; 629.5; 1041." />
+<box name="Support_WingCutBox3" material="ShieldSteel" X_Y_Z=" 217.; 600.; 1050." />
+
+<subtraction name="Support_WingBox3Subtr" >
+ <posXYZ volume="Support_WingBox3" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCutBox3" X_Y_Z=" 0. ; 0. ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<composition name="Support_WingSidepartsLeft" >
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; 344.027 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; -344.027 ; 0." rot=" 180.; 0.;0." />
+ <posXYZ volume="Support_WingBox1Subtr" X_Y_Z=" 0. ; 0.; 583.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; 1087.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; -133.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; -794.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox2Subtr" X_Y_Z=" 18.6 ; 15.3; 1237.2 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox3Subtr" X_Y_Z=" -11. ; 3.6; -1744. " rot=" 0. ; 0. ; 0. "/>
+</composition>
+
+<composition name="Support_WingSidepartsRight" >
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; 344.027 ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_WingPlate" X_Y_Z=" 0. ; -344.027 ; 0." rot=" 180.; 0.;0." />
+ <posXYZ volume="Support_WingBox1Subtr" X_Y_Z=" 0. ; 0.; -583.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; -1087.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; 133.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBoxSubtr" X_Y_Z=" 0. ; 0.; 794.5 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox2Subtr" X_Y_Z=" 18.6 ; 15.3; -1237.2 " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingBox3Subtr" X_Y_Z=" -11. ; 3.6; 1744. " rot=" 0. ; 0. ; 0. "/>
+</composition>
+
+<box name="Support_WingCentBottom" material="ShieldSteel" X_Y_Z=" 1396.; 795.; 18." />
+
+<tubs name="Support_WingCentBottomCutTube" material="ShieldSteel" Rio_Z=" 0. ; 385. ; 20. " nbPhi="32" />
+<subtraction name="Support_WingCentBottomCut" >
+ <posXYZ volume="Support_WingCentBottom" X_Y_Z=" 0. ; 10. ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCentBottomCutTube" X_Y_Z=" 690. ; 292.5 ; 0. " rot=" 0. ; 0. ; 0. "/>
+ <posXYZ volume="Support_WingCentBottomCutTube" X_Y_Z=" -690. ; 292.5 ; 0. " rot=" 0. ; 0. ; 0. "/>
+</subtraction>
+
+<gvxy name="Support_WingMiddleTopPlate" material="ShieldSteel" dZ="14." >
+ <gvxy_point X_Y=" -463.; 290.825 " />
+ <gvxy_point X_Y=" -463.; -290.825 " />
+ <gvxy_point X_Y=" -563.; -290.825 " />
+ <gvxy_point X_Y=" -563.; 390.825 " />
+ <gvxy_point X_Y=" 563.; 390.825 " />
+ <gvxy_point X_Y=" 563.; -290.825 " />
+ <gvxy_point X_Y=" 463.; -290.825 " />
+ <gvxy_point X_Y=" 463.; 290.825 " />
+</gvxy>
+
+<gvxy name="Support_WingMiddleBackPlate" material="ShieldSteel" dZ="100." >
+ <gvxy_point X_Y=" -263.; 410.525 " />
+ <gvxy_point X_Y=" -263.; -410.525 " />
+ <gvxy_point X_Y=" -288.; -410.525 " />
+ <gvxy_point X_Y=" -288.; 430.525 " />
+ <gvxy_point X_Y=" 288.; 430.525 " />
+ <gvxy_point X_Y=" 288.; -410.525 " />
+ <gvxy_point X_Y=" 263.; -410.525 " />
+ <gvxy_point X_Y=" 263.; 410.525 " />
+</gvxy>
+
+<composition name="Support_WingMiddle" >
+ <posXYZ volume="Support_WingCentBottomCut" X_Y_Z=" 2690. ; -4.774 ; 0." rot=" 90.; -90.;0." />
+ <posXYZ volume="Support_WingMiddleTopPlate" X_Y_Z=" 3065.32 ; 835.9 ; 0." rot=" 90.; -90.;0." />
+ <posXYZ volume="Support_WingMiddleBackPlate" X_Y_Z=" 2324.5 ; 418.6 ; 0." rot=" 0.; 90.;0." />
+</composition>
+
+<!-- End Support -->
+
+<!-- Drag Chain-->
+<box name="plate_of_drag_chain1" material="ShieldSteel" X_Y_Z="4639.; 640.; 16."/>
+<tubs name="plate_of_drag_chain2" material="ShieldSteel" Rio_Z="409.; 425.; 640." profile="90.; 90." nbPhi="32"/>
+<box name="plate_of_drag_chain3" material="ShieldSteel" X_Y_Z="16; 640.; 324.5"/>
+
+<composition name="Drag_Chain_assembly" >
+ <posXYZ volume="plate_of_drag_chain1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="plate_of_drag_chain2" X_Y_Z=" 2319.55; 0.; -417." rot=" 90.; 90.; 0."/>
+ <posXYZ volume="plate_of_drag_chain3" X_Y_Z=" 2736.5; 0.; -579.3" rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="Drag_Chain" >
+ <posXYZ volume="Drag_Chain_assembly" X_Y_Z=" 178.09; 387.39; -134." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Drag_Chain_assembly" X_Y_Z=" 178.09; 387.39; 134." rot=" 180.; 0.; 0."/>
+</composition>
+<!--End Drag Chain-->
+
+<!-- Cable-->
+<box name="plate_of_Cable1" material="Copper" X_Y_Z="4609.; 192.; 16."/>
+<tubs name="plate_of_Cable2" material="Copper" Rio_Z="409.; 425.; 192." profile="90.; 90." nbPhi="32"/>
+<box name="plate_of_Cable3" material="Copper" X_Y_Z="16.; 192.; 3282."/>
+
+<composition name="Cable_assembly" >
+ <posXYZ volume="plate_of_Cable1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="plate_of_Cable2" X_Y_Z=" 2304.55; 0; -417." rot=" 90.; 90.; 0."/>
+ <posXYZ volume="plate_of_Cable3" X_Y_Z=" 2721.5; 0.; -2058.05" rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="Cable" >
+ <posXYZ volume="Cable_assembly" X_Y_Z=" 163.09; 554.39; -180." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="Cable_assembly" X_Y_Z=" 163.09; 554.39; 180." rot=" 180.; 0.; 0."/>
+</composition>
+<!--End Cable-->
+
+<!-- Pipes-->
+<box name="plate_of_Pipes1" material="ShieldSteel" X_Y_Z="4609.; 240.; 16."/>
+<tubs name="plate_of_Pipes2" material="ShieldSteel" Rio_Z="409.; 425.; 240." profile="90.; 90." nbPhi="32"/>
+<box name="plate_of_Pipes3" material="ShieldSteel" X_Y_Z="16.; 240.; 3282."/>
+
+<composition name="Pipes_assembly" >
+ <posXYZ volume="plate_of_Pipes1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="plate_of_Pipes2" X_Y_Z=" 2304.55; 0.; -417." rot=" 90.; 90.; 0."/>
+ <posXYZ volume="plate_of_Pipes3" X_Y_Z=" 2721.5; 0.; -2058.05" rot=" 0.; 0.; 0."/>
+</composition>
+
+<composition name="Pipes" >
+ <posXYZ volume="Pipes_assembly" X_Y_Z=" 163.09; 287.39; 180." rot=" 180.; 0.; 0."/>
+ <posXYZ volume="Pipes_assembly" X_Y_Z=" 163.09; 287.39; -180." rot=" 0.; 0.; 0."/>
+</composition>
+<!--End Pipes-->
+
+<composition name="Flexible_Chain_Sector11-15" >
+ <posXYZ volume="Support_BottomPlate" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_SidesPlatesM" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Support_WingSidepartsLeft" X_Y_Z=" 2913.853 ; 402.7 ; -1985.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Support_WingSidepartsRight" X_Y_Z=" 2913.853 ; 402.7 ; 1985.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Support_WingMiddle" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Drag_Chain" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Cable" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+ <posXYZ volume="Pipes" X_Y_Z=" 0. ; 0. ; 0." rot=" 0.; 0.;0." />
+</composition>
+
+<composition name="FlexibleChainSector11-15" >
+ <posXYZ volume="Flexible_Chain_Sector11-15" X_Y_Z=" -5446.554 ; -5631.994 ; 0." rot=" 0.; 0.;45." />
+ <posXYZ volume="Flexible_Chain_Sector11-15" X_Y_Z=" 5446.554 ; -5631.994 ; 0." rot=" 0.; 180.; -45." />
+</composition>
+
+<!-- end of flexible chain sector 11 and 15 -->
+
+<composition name="servicesAtZ0" >
+ <posXYZ volume="EMCaloPipeI" X_Y_Z=" Zero; 7000 ; Zero" rot=" 90.; 0.;0." />
+ <posXYZ volume="EMCaloPipeO" X_Y_Z=" Zero; -5000 ; 100" rot=" 90.; 0.;0." />
+ <posXYZ volume="services1" X_Y_Z=" Zero; Zero ; Zero" rot=" 0.; 0.;0." />
+ <posRPhiZ volume="services1" R_Phi_Z="Zero; 45 ; Zero" rot=" 0.; 0.;0." />
+ <posRPhiZ volume="services1" R_Phi_Z="Zero; 135 ; Zero" rot=" 0.; 0.;0." />
+ <posXYZ volume="FlexibleChainSector9" X_Y_Z="0;0;0" rot="0;0;0"/>
+ <posXYZ volume="FlexibleChainSector11-15" X_Y_Z="0;0;0" rot="0;0;0"/>
+</composition>
+</section>
+
+<section name = "AccessPlatforms"
+ version = "7.0"
+ date = "21 Mar 2005"
+ author = "Laurent Chevalier, Daniel Pomarede"
+ top_volume = "MBAP_AccessPlatform">
+
+
+<!-- name = AccessPlatforms section name = "Services" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** ATLAS Access : Muon Barrel Access Platforms ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+<!-- Design from ATLHXT__0001 -->
+
+<!-- Platform 1-2 positioned between Strut 1 and Strut 2 -->
+<!-- Platform 2-3 positioned between Strut 2 and Strut 3 -->
+<!-- Platform 3-4 positioned between Strut 3 and Strut 4 -->
+
+<!-- Platform dimensions -->
+<var name="MBAP_P12s1dz1" value="3000." />
+<var name="MBAP_P12s1dz2" value="2500." />
+<var name="MBAP_P23s1dz1" value="2700." />
+<var name="MBAP_P23s1dz2" value="2200." />
+<var name="MBAP_P34s1dz1" value="2200." />
+<var name="MBAP_P34s1dz2" value="1700." />
+
+<var name="MBAP_P14s3dz" value="8600." />
+<var name="MBAP_P14s3dx" value=" 540." />
+
+<var name="MBAP_PLAs1dx1" value="1225." />
+<var name="MBAP_PLAs1dx2" value=" 600." />
+<var name="MBAP_PFLhe" value=" 1.5" />
+
+<!-- Platform positions -->
+<!-- sector 1 & 9 -->
+<var name="MBAP_Ps01posx" value=" 7800." />
+<var name="MBAP_Ps01posy" value="-1200." />
+<!-- sector 11 & 15 -->
+<var name="MBAP_Ps11posx" value=" 5000." />
+<var name="MBAP_Ps11posy" value="-6500." />
+<!-- sector 3 & 7 -->
+<var name="MBAP_Ps14posx" value=" 6730." />
+<var name="MBAP_Ps14posy" value=" 5300." />
+<var name="MBAP_Ps14angz" value=" 45." />
+
+<var name="MBAP_P12posz" value=" 3425." /> <!-- ??? could use (ABRT_Zvouss(5)+ABRT_Zvouss(6))/2. ??? -->
+<var name="MBAP_P23posz" value=" 6691.25" /> <!-- ??? could use (ABRT_Zvouss(6)+ABRT_Zvouss(7))/2. ??? -->
+<var name="MBAP_P34posz" value=" 9545." /> <!-- ??? could use (ABRT_Zvouss(7)+ABRT_Zvouss(8))/2. ??? -->
+
+<!-- Useful variables -->
+<var name="MBAP_xyzref" value=" 0. " />
+
+<!-- Modelization of floor of Platform -->
+
+<var name="MBAP_PFL12xa" value="MBAP_P12s1dz1/2." />
+<var name="MBAP_PFL23xa" value="MBAP_P23s1dz1/2." />
+<var name="MBAP_PFL34xa" value="MBAP_P34s1dz1/2." />
+<var name="MBAP_PFLya" value="MBAP_xyzref" />
+
+<var name="MBAP_PFL12xb" value="MBAP_PFL12xa" />
+<var name="MBAP_PFL23xb" value="MBAP_PFL23xa" />
+<var name="MBAP_PFL34xb" value="MBAP_PFL34xa" />
+<var name="MBAP_PFLyb" value="MBAP_PLAs1dx2" />
+
+<var name="MBAP_PFL12xc" value="MBAP_P12s1dz2/2." />
+<var name="MBAP_PFL23xc" value="MBAP_P23s1dz2/2." />
+<var name="MBAP_PFL34xc" value="MBAP_P34s1dz2/2." />
+<var name="MBAP_PFLyc" value="MBAP_PFLyb" />
+
+<var name="MBAP_PFL12xd" value="MBAP_PFL12xc" />
+<var name="MBAP_PFL23xd" value="MBAP_PFL23xc" />
+<var name="MBAP_PFL34xd" value="MBAP_PFL34xc" />
+<var name="MBAP_PFLyd" value="MBAP_PLAs1dx1-GENV_Eps" />
+
+<!-- sector 1 & 9 -->
+
+<gvxysx name="MBAP_PlatformFloor12s1s9" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL12xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL12xb;MBAP_PFLyb"/>
+ <gvxy_point X_Y="MBAP_PFL12xc;MBAP_PFLyc"/>
+ <gvxy_point X_Y="MBAP_PFL12xd;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor23s1s9" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL23xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL23xb;MBAP_PFLyb"/>
+ <gvxy_point X_Y="MBAP_PFL23xc;MBAP_PFLyc"/>
+ <gvxy_point X_Y="MBAP_PFL23xd;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor34s1s9" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL34xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL34xb;MBAP_PFLyb"/>
+ <gvxy_point X_Y="MBAP_PFL34xc;MBAP_PFLyc"/>
+ <gvxy_point X_Y="MBAP_PFL34xd;MBAP_PFLyd"/>
+</gvxysx>
+
+<!-- sector 11 & 15 -->
+
+<gvxysx name="MBAP_PlatformFloor12s11s15" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL12xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL12xa;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor23s11s15" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL23xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL23xa;MBAP_PFLyd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_PlatformFloor34s11s15" material="Aluminium4" dZ="MBAP_PFLhe" >
+ <gvxy_point X_Y="MBAP_PFL34xa;MBAP_PFLya"/>
+ <gvxy_point X_Y="MBAP_PFL34xa;MBAP_PFLyd"/>
+</gvxysx>
+
+<!-- sector 3 & 7 -->
+
+<box name="MBAP_PlatformFloor14s3s7" material="Aluminium4" X_Y_Z="MBAP_P14s3dx;MBAP_PFLhe;MBAP_P14s3dz" />
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Modelization of rambarde of Platforms 1-2, 2-3, 3-4 -->
+
+<!-- Primary variables -->
+
+<!-- Tubes radii -->
+<var name="MBAP_PlatRaRo" value=" 17." />
+
+<!-- Slanted Support for Platform 1-4 sector 3 & 7 -->
+<!-- dimensions -->
+<var name="MBAP_PSSs3dy1" value=" 242.5"/>
+<var name="MBAP_PSSs3dy2" value=" 393." />
+<var name="MBAP_PSSs3dx1" value=" 393." />
+
+<!-- absolute positions -->
+<var name="MBAP_PSSs3zp1" value=" 1975. " /> <!-- could use ABRT_Zvouss(5) + 200 + 62.5 , see ATLHXT__0001 -->
+<var name="MBAP_PSSs3zp6" value="10582.5" /> <!-- could use ABRT_Zvouss(8) - 200 - 62.5 , see ATLHXT__0001 -->
+
+<!-- Relative positions of Slanted Supports -->
+<var name="MBAP_PSSzrp6" value="MBAP_PSSs3zp6-MBAP_PSSs3zp1" />
+
+<!-- Bottom Frame Tube angle -->
+<var name="MBAP_P14s3BFa" value="-atan(MBAP_PSSs3dy2/MBAP_PSSs3dx1)/GENV_PiS180" />
+
+<!-- Floor Position, angle w.r.t Frame -->
+<var name="MBAP_P14s3Fla" value="MBAP_P14s3BFa" />
+<var name="MBAP_P14s3Flx" value="-(MBAP_PSSs3dy1+MBAP_PSSs3dy2/2.)+(MBAP_PlatRaRo+MBAP_PFLhe/2.)*cos(MBAP_P14s3Fla*GENV_PiS180)" />
+<var name="MBAP_P14s3Fly" value="MBAP_PSSs3dx1/2.+(MBAP_PlatRaRo+MBAP_PFLhe/2.)*cos(MBAP_P14s3Fla*GENV_PiS180)" />
+<var name="MBAP_P14s3Flz" value="MBAP_PSSzrp6/2." />
+
+<!-- Primary variables -->
+
+<!-- Supporting Frame -->
+<!-- longitudinal and transverse beams -->
+
+<var name="AP13_SFBeamTh" value=" 8."/> <!-- Thickness -->
+<var name="AP13_SFBeamHe" value=" 50."/> <!-- Height -->
+<var name="AP13_SFBeamDx" value="100."/> <!-- Transverse Size (X-wise) -->
+
+<!-- Frame 12 (connect BT strut 1 - strut 2) -->
+
+<!-- Longitudinal and Transverse beam length / cf ATLHXT__0032 -->
+<var name="AP13_Fr34Llen" value="2400."/>
+
+<!-- Longitudinal and Transverse Positions -->
+<var name="AP13_Fr23xsp1" value="2160."/> <!-- separation of longitudinal beams along x -->
+<var name="AP13_Fr34Tzof" value=" 615."/> <!-- offset transverse beams along z -->
+<var name="AP13_Fr34Tzsp" value=" 840."/> <!-- separation of transverse beams along z -->
+
+<!-- Y-position -->
+<var name="AP13_Fr12y" value="-9190."/>
+
+<!-- Modelization of beam -->
+<var name="AP13_SFBeamXa" value="AP13_SFBeamDx/2."/>
+<var name="AP13_SFBeamYa" value="0."/>
+<var name="AP13_SFBeamXb" value="AP13_SFBeamXa"/>
+<var name="AP13_SFBeamYb" value="AP13_SFBeamHe"/>
+<var name="AP13_SFBeamXc" value="AP13_SFBeamXa-AP13_SFBeamTh"/>
+<var name="AP13_SFBeamYc" value="AP13_SFBeamYb"/>
+<var name="AP13_SFBeamXd" value="AP13_SFBeamXc"/>
+<var name="AP13_SFBeamYd" value="AP13_SFBeamYa+AP13_SFBeamTh"/>
+
+<!-- Positions of beams -->
+<var name="AP13_Fr23x1" value="AP13_Fr23xsp1/2.+AP13_SFBeamDx/2."/>
+<var name="AP13_Fr12Typ" value="-AP13_SFBeamHe"/> <!-- Transversal beam y position -->
+<var name="AP13_Fr34Tz1" value="-AP13_Fr34Llen/2.+ AP13_Fr34Tzof +AP13_SFBeamDx/2."/> <!-- Transversal beam z position -->
+<var name="AP13_Fr34Tz2" value="AP13_Fr34Tz1 + AP13_Fr34Tzsp -AP13_SFBeamDx"/> <!-- Transversal beam z position -->
+
+<var name="PL05" value="2200."/>
+<var name="DZS5" value="3000."/>
+
+<gvxysx name="MBAP_Sector05_Beam12Transversal" material="Aluminium" dZ="DZS5">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+
+<gvxysx name="MBAP_Sector05_Beam34Longitudinal" material="Aluminium" dZ="PL05">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+
+<!-- NEw simplify Platforms lc 24-03-10 -->
+
+<!-- sector 3 & 7 -->
+<composition name="MBAP_AccessPlatform14s3s7AssemblyS">
+ <posXYZ volume="MBAP_PlatformFloor14s3s7" X_Y_Z="MBAP_P14s3Flx;MBAP_P14s3Fly;MBAP_P14s3Flz" rot="0.;0.;MBAP_P14s3Fla"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7AssemblySymS">
+ <posXYZ volume="MBAP_PlatformFloor14s3s7" X_Y_Z="MBAP_P14s3Flx;MBAP_P14s3Fly;-MBAP_P14s3Flz" rot="0.;0.;MBAP_P14s3Fla"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7_zplusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblyS" X_Y_Z=" MBAP_Ps14posx;MBAP_Ps14posy; MBAP_PSSs3zp1" rot="0.; 0.; MBAP_Ps14angz"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7Sym_zplusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblySymS" X_Y_Z=" MBAP_Ps14posx;MBAP_Ps14posy; -MBAP_PSSs3zp1" rot="0.; 0.; MBAP_Ps14angz"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7_zminusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblyS" X_Y_Z="-MBAP_Ps14posx;MBAP_Ps14posy;-MBAP_PSSs3zp1" rot="0.;180.;-MBAP_Ps14angz"/>
+</composition>
+<composition name="MBAP_AccessPlatform14s3s7Sym_zminusS">
+ <posXYZ volume="MBAP_AccessPlatform14s3s7AssemblySymS" X_Y_Z="-MBAP_Ps14posx;MBAP_Ps14posy;MBAP_PSSs3zp1" rot="0.;180.;-MBAP_Ps14angz"/>
+</composition>
+
+
+<box name="MBAP_PlatformFloorS" material="Aluminium4" X_Y_Z="DZS5;MBAP_PFLhe;2*AP13_Fr23x1-65" />
+<composition name="MBAP_Sector05_Platform2">
+ <posXYZ volume="MBAP_Sector05_Beam34Longitudinal" X_Y_Z=" AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector05_Beam34Longitudinal" X_Y_Z="-AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector05_Beam12Transversal" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz1" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_Sector05_Beam12Transversal" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz2" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_PlatformFloorS" X_Y_Z="0.;MBAP_PFLhe+0.1;0." />
+</composition>
+
+<var name="AP05" value="5370."/>
+
+<composition name="MBAP_Sector05S">
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; +5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; +1500."/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; +3700"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; -5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; -1500"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05; -3700"/>
+</composition>
+
+<var name="AP05_MS" value="7650.1"/>
+<composition name="MBAP_Sector05_MediumS">
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +1500."/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; +3700"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -1500"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP05_MS; -3700"/>
+</composition>
+
+<var name="AP13_MS" value="-6700."/>
+<composition name="MBAP_Sector13_MediumS">
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +1500."/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; +3700"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -5900"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -8100"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -1500"/>
+ <posXYZ volume="MBAP_Sector05_Platform2" X_Y_Z="0.;AP13_MS; -3700"/>
+</composition>
+
+<gvxysx name="MBAP_Sector13_Beam12Transversal2" material="Aluminium" dZ="5000.">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+<gvxysx name="MBAP_Sector13_Beam34Longitudinal2" material="Aluminium" dZ="5000">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+<gvxysx name="MBAP_Sector13_Beam34Longitudinal3" material="Aluminium" dZ="6000">
+ <gvxy_point X_Y="AP13_SFBeamXa;AP13_SFBeamYa"/>
+ <gvxy_point X_Y="AP13_SFBeamXb;AP13_SFBeamYb"/>
+ <gvxy_point X_Y="AP13_SFBeamXc;AP13_SFBeamYc"/>
+ <gvxy_point X_Y="AP13_SFBeamXd;AP13_SFBeamYd"/>
+</gvxysx>
+<box name="MBAP_PlatformFloorS2" material="Aluminium4" X_Y_Z="DZS5+1700;MBAP_PFLhe; 6000." />
+<composition name="MBAP_Sector13_Platform3">
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal3" X_Y_Z=" AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal3" X_Y_Z="-AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz1" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz2" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_PlatformFloorS2" X_Y_Z="0.;MBAP_PFLhe;0." />
+</composition>
+<box name="MBAP_PlatformFloorS3" material="Aluminium4" X_Y_Z="DZS5+1700;MBAP_PFLhe; 4900." />
+<composition name="MBAP_Sector13_Platform2">
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal2" X_Y_Z=" AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam34Longitudinal2" X_Y_Z="-AP13_Fr23x1;2.*MBAP_PFLhe;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz1" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_Sector13_Beam12Transversal2" X_Y_Z="0.;AP13_Fr12Typ; AP13_Fr34Tz2" rot="0.;90.;0." />
+ <posXYZ volume="MBAP_PlatformFloorS3" X_Y_Z="0.;MBAP_PFLhe;0." />
+</composition>
+
+<composition name="MBAP_Sector13S">
+ <posXYZ volume="MBAP_Sector13_Platform3" X_Y_Z="0.;AP13_Fr12y; +9300"/>
+ <posXYZ volume="MBAP_Sector13_Platform2" X_Y_Z="0.;AP13_Fr12y; +3000"/>
+ <posXYZ volume="MBAP_Sector13_Platform2" X_Y_Z="0.;AP13_Fr12y; -2650"/>
+ <posXYZ volume="MBAP_Sector13_Platform3" X_Y_Z="0.;AP13_Fr12y; -9300"/>
+</composition>
+
+
+<composition name="MBAP_AccessPlatform">
+
+<!-- sector 1 & 9 -->
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z=" MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy; MBAP_P34posz" rot="90.;270.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s1s9" X_Y_Z="-MBAP_Ps01posx;MBAP_Ps01posy;-MBAP_P34posz" rot="90.;270.;0."/>
+
+<!-- sector 11 & 15 -->
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P12posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P23posz" rot="90.; 90.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z=" MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P34posz" rot="90.; 90.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy; MBAP_P34posz" rot="90.;270.;0."/>
+
+ <posXYZ volume="MBAP_PlatformFloor12s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P12posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor23s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P23posz" rot="90.;270.;0."/>
+ <posXYZ volume="MBAP_PlatformFloor34s11s15" X_Y_Z="-MBAP_Ps11posx;MBAP_Ps11posy;-MBAP_P34posz" rot="90.;270.;0."/>
+
+<!-- sector 3 & 7 -->
+ <posXYZ volume="MBAP_AccessPlatform14s3s7_zplusS" />
+ <posXYZ volume="MBAP_AccessPlatform14s3s7Sym_zplusS" />
+ <posXYZ volume="MBAP_AccessPlatform14s3s7_zminusS" />
+ <posXYZ volume="MBAP_AccessPlatform14s3s7Sym_zminusS" />
+
+
+<!-- Access Platform Sector 13 Bottom Level -->
+ <posXYZ volume="MBAP_Sector13S" />
+ <posXYZ volume="MBAP_Sector13_MediumS" />
+<!-- Access Platform Sector 05 Top Level -->
+ <posXYZ volume="MBAP_Sector05S" />
+ <posXYZ volume="MBAP_Sector05_MediumS" />
+
+</composition>
+
+</section>
+<section name = "MDT Big Wheel"
+ version = "7.0"
+ date = "11 Oct 2005"
+ author = "Daniel Pomarede"
+ top_volume = "MBWH_BigWheels">
+
+
+<!-- name = MDT Big Wheel section name = "Supports" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** MDT Big Wheel ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+
+
+<var name="MBWH_zposL" value="13950" />
+
+
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** common items ****
+ *** ****
+ **************************************************************
+-->
+
+
+<!-- Cut profiles cross bracing large and small sector -->
+<!-- ATLMHHBM0091 & ATLMHHBM0100-->
+<var name="MBWH_CBext" value="200"/>
+<var name="MBWH_CBhei" value="60"/>
+
+<!-- Spokes U profile -->
+
+<!-- ATLMHHBM0130 & ATLMHHBM0085 & ATLMHHBM0086 & ATLMHHBM0087 -->
+
+<var name="MBWH_SUPthi" value=" 5." />
+<var name="MBWH_SUPext" value=" 230." />
+<var name="MBWH_SUPhei" value=" 55." />
+
+<!-- Spokes Reinforcing bar -->
+
+<!-- ATLMHHBM0082A & ATLMHHBM0051A & ATLMHHBM0154A -->
+
+<!-- Slate -->
+<var name="MBWH_RBSlen" value="1080"/>
+<var name="MBWH_RBSwid" value="100"/>
+<var name="MBWH_RBSthi" value="25"/>
+<!-- Bracket -->
+<var name="MBWH_RBBlen" value="200"/>
+<var name="MBWH_RBBsiz" value="60"/>
+<var name="MBWH_RBBthi" value="10"/>
+
+<!-- holes spacing for clamping Reinforcing bar on spokes -->
+<!-- ATLMHHBM0130 & ATLMHHBM0085 -->
+<var name="MBWH_SRBhos" value="160" />
+
+<!-- Plates of Cross Bracings -->
+<var name="MBWH_CBPth" value="8"/> <!-- thickness -->
+
+<!-- Derived variables -->
+<var name="MBWH_RBBxa" value="0"/>
+<var name="MBWH_RBBya" value="0"/>
+<var name="MBWH_RBBxb" value="MBWH_RBBsiz"/>
+<var name="MBWH_RBByb" value="MBWH_RBBya"/>
+<var name="MBWH_RBBxc" value="MBWH_RBBxb"/>
+<var name="MBWH_RBByc" value="MBWH_RBBsiz"/>
+<var name="MBWH_RBBxd" value="MBWH_RBBxc-MBWH_RBBthi"/>
+<var name="MBWH_RBByd" value="MBWH_RBByc"/>
+<var name="MBWH_RBBxe" value="MBWH_RBBxd"/>
+<var name="MBWH_RBBye" value="MBWH_RBBthi"/>
+<var name="MBWH_RBBxf" value="MBWH_RBBxa"/>
+<var name="MBWH_RBByf" value="MBWH_RBBye"/>
+
+<var name="MBWH_RBBxp" value="-MBWH_RBSlen/2.+MBWH_RBBsiz"/>
+<var name="MBWH_RBByp1" value="-MBWH_RBSthi/2.-MBWH_RBBsiz"/>
+<var name="MBWH_RBByp2" value="MBWH_RBSthi/2."/>
+
+<box name="MBWH_ReinforcingBarSlate" material="Aluminium1" X_Y_Z="MBWH_RBSlen;MBWH_RBSthi;MBWH_RBSwid"/>
+
+<gvxy name="MBWH_ReinforcingBarBracket" material="Aluminium2" dZ="MBWH_RBBlen">
+ <gvxy_point X_Y="MBWH_RBBxa;MBWH_RBBya"/>
+ <gvxy_point X_Y="MBWH_RBBxb;MBWH_RBByb"/>
+ <gvxy_point X_Y="MBWH_RBBxc;MBWH_RBByc"/>
+ <gvxy_point X_Y="MBWH_RBBxd;MBWH_RBByd"/>
+ <gvxy_point X_Y="MBWH_RBBxe;MBWH_RBBye"/>
+ <gvxy_point X_Y="MBWH_RBBxf;MBWH_RBByf"/>
+</gvxy>
+
+<composition name="MBWH_ReinforcingBar">
+ <posXYZ volume="MBWH_ReinforcingBarSlate"/>
+ <posXYZ volume="MBWH_ReinforcingBarBracket" X_Y_Z=" MBWH_RBBxp;MBWH_RBByp1;0" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBarBracket" X_Y_Z="-MBWH_RBBxp;MBWH_RBByp2;0"/>
+</composition>
+
+<!-- positions of reinforcing bars -->
+<var name="MBWH_SRBpx" value="MBWH_SUPext/2.+MBWH_RBSthi/2.+MBWH_RBBthi"/>
+<var name="MBWH_SRBpy" value="-MBWH_RBSlen/2.+MBWH_SUPhei+MBWH_RBBthi"/>
+
+<!-- Spokes -->
+<!-- Derived variables -->
+<var name="MBWH_SUPxa" value="MBWH_SUPext/2." />
+<var name="MBWH_SUPya" value="0." />
+<var name="MBWH_SUPxb" value="MBWH_SUPxa" />
+<var name="MBWH_SUPyb" value="MBWH_SUPhei" />
+<var name="MBWH_SUPxc" value="MBWH_SUPxb-MBWH_SUPthi" />
+<var name="MBWH_SUPyc" value="MBWH_SUPyb" />
+<var name="MBWH_SUPxd" value="MBWH_SUPxc" />
+<var name="MBWH_SUPyd" value="MBWH_SUPthi" />
+
+<!-- Plates of Cross Bracings -->
+<var name="MBWH_CBPx" value="(MBWH_CBext+MBWH_CBPth)/2." /> <!-- x pos -->
+
+
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** Large Sector ****
+ *** ****
+ **************************************************************
+-->
+
+<!-- ATLMHHBM0091 -->
+<!-- Cut profiles cross bracing large sector -->
+<var name="MBWH_CBLthi" value="5"/>
+
+<!-- Contreventements lengths -->
+<!-- item numbering in ATLMHHBM0002 -->
+<var name="MBWH_CBLl11" value="3690." /> <!-- item 11 -->
+<var name="MBWH_CBLl17" value="2700." /> <!-- item 17 -->
+<var name="MBWH_CBLl22" value="1740." /> <!-- item 22 -->
+<var name="MBWH_CBLl26" value=" 750." /> <!-- item 26 -->
+
+<!-- Contreventements positions (...to be confirmed...) -->
+<var name="MBWH_CBLy11" value="9700." /> <!-- item 11 -->
+<var name="MBWH_CBLy17" value="7750." /> <!-- item 17 -->
+<var name="MBWH_CBLy22" value="5800." /> <!-- item 22 -->
+<var name="MBWH_CBLy26" value="3850." /> <!-- item 26 -->
+
+
+<!-- item numbering in ATLMHHBM0002 -->
+<!-- Cross bracing, bay 1 large sector -->
+<var name="MBWH_CBLl10" value="4260." /> <!-- item 10 --> <!-- drawing ATLMHHBM0066 -->
+<!-- Cross bracing, bay 2 large sector -->
+<var name="MBWH_CBLl15" value="3590." /> <!-- item 15 --> <!-- drawing ATLMHHBM0068 -->
+<!-- Cross bracing, bay 3 large sector -->
+<var name="MBWH_CBLl21" value="2830." /> <!-- item 21 --> <!-- drawing ATLMHHBM0070 -->
+<!-- Cross bracing, bay 4 large sector -->
+<var name="MBWH_CBLl25" value="2130." /> <!-- item 25 --> <!-- drawing ATLMHHBM0073 -->
+
+<!-- item numbering in ATLMHHBM0002 -->
+<!-- Contreventements, bay 1 large sector -->
+<var name="MBWH_CBLl8" value="1780."/> <!-- item 8 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl9" value="2310."/> <!-- item 9 --> <!-- drawing ATLMHHBM0091 -->
+
+<!-- Contreventements, bay 2 large sector -->
+<var name="MBWH_CBLl14" value="1450."/> <!-- item 14 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl13" value="2005."/> <!-- item 13 --> <!-- drawing ATLMHHBM0091 -->
+
+<!-- Contreventements, bay 3 large sector -->
+<var name="MBWH_CBLl20" value="1055."/> <!-- item 20 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl18" value="1685."/> <!-- item 18 --> <!-- drawing ATLMHHBM0091 -->
+
+<!-- Contreventements, bay 4 large sector -->
+<var name="MBWH_CBLl24" value="590."/> <!-- item 24 --> <!-- drawing ATLMHHBM0091 -->
+<var name="MBWH_CBLl23" value="1430."/> <!-- item 23 --> <!-- drawing ATLMHHBM0091 -->
+
+
+<!-- Plates -->
+ <!-- item 10 for Bay 1 --> <!-- drawing ATLMHHBM0066 -->
+<var name="MBWH_CBPL10le" value="419"/> <!-- length -->
+<var name="MBWH_CBPL10wi" value="216"/> <!-- width -->
+<var name="MBWH_CBPL10cu" value="40"/> <!-- cut -->
+<var name="MBWH_CBPL10ti" value="22"/> <!-- tilt -->
+<var name="MBWH_CBPL10za" value="2174"/> <!-- Plate offset -->
+<var name="MBWH_CBPL10ya" value="14"/> <!-- Plate offset -->
+ <!-- item 15 for Bay 2 --> <!-- drawing ATLMHHBM0068 -->
+<var name="MBWH_CBPL15le" value="345"/> <!-- length -->
+<var name="MBWH_CBPL15wi" value="224"/> <!-- width -->
+<var name="MBWH_CBPL15cu" value="30"/> <!-- cut -->
+<var name="MBWH_CBPL15ti" value="30"/> <!-- tilt -->
+<var name="MBWH_CBPL15za" value="1322"/> <!-- Plate offset -->
+<var name="MBWH_CBPL15ya" value="9"/> <!-- Plate offset -->
+ <!-- item 21 for Bay 3 --> <!-- drawing ATLMHHBM0070 -->
+<var name="MBWH_CBPL21le" value="269"/> <!-- length -->
+<var name="MBWH_CBPL21wi" value="230"/> <!-- width -->
+<var name="MBWH_CBPL21cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPL21ti" value="40"/> <!-- tilt -->
+<var name="MBWH_CBPL21za" value="938"/> <!-- Plate offset -->
+<var name="MBWH_CBPL21ya" value="13"/> <!-- Plate offset -->
+ <!-- item 25 for Bay 4 --> <!-- drawing ATLMHHBM0073 -->
+<var name="MBWH_CBPL25le" value="300"/> <!-- length -->
+<var name="MBWH_CBPL25wi" value="222"/> <!-- width -->
+<var name="MBWH_CBPL25cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPL25ti" value="33"/> <!-- tilt --> <!-- ==> to be confirmed <== -->
+<var name="MBWH_CBPL25za" value="470"/> <!-- Plate offset -->
+<var name="MBWH_CBPL25ya" value="21"/> <!-- Plate offset -->
+
+
+<!-- positions (...to be confirmed...) -->
+<var name="MBWH_Croily10" value="10500"/> <!-- item 10 -->
+<var name="MBWH_Croily15" value="8600"/> <!-- item 15 -->
+<var name="MBWH_Croily21" value="6600"/> <!-- item 21 -->
+<var name="MBWH_Croily25" value="4450"/> <!-- item 25 -->
+
+
+<!-- ATLMHHBM0002 -->
+<!-- Spokes Opening angle large sector -->
+<var name="MBWH_SLangle" value="14." />
+
+<!-- Spoke large sector -->
+<!-- Inner spoke large sector ATLMHHBM0130 -->
+<!-- External spoke large sector ATLMHHBM0128 -->
+
+<!-- ATLMHHBM0130 -->
+<!-- U profile length -->
+<var name="MBWH_SlsUPlen" value="8465" /> <!-- ??? to be confirmed for both -->
+
+<!-- relative positions of reinforcing bars -->
+<var name="MBWH_SlsRBdz1" value="1317" />
+<var name="MBWH_SlsRBdz2" value="1787" />
+<var name="MBWH_SlsRBdz3" value="2030" />
+<var name="MBWH_SlsRBdz4" value="1740" />
+
+
+<!-- External Spokes supports -->
+
+<!-- ATLMHHBM0128 -->
+<!-- position along the spoke of 1st support -->
+<var name="MBWH_SlsSup1" value=" 414" />
+<!-- size of support -->
+<var name="MBWH_SlsSSize" value=" 220" /> <!-- as measured on drawing, to be confirmed in atlmhhbm0123 ? -->
+
+<!-- Transversal beam, central support -->
+
+<!-- ATLMHHBM0080 -->
+<var name="MBWH_TBCSlen1" value="2396." />
+<var name="MBWH_TBCSlen2" value="2526.6"/>
+<var name="MBWH_TBCSext" value=" 87." />
+<var name="MBWH_TBCShei" value=" 180." />
+<var name="MBWH_TBCSthi1" value=" 15." />
+<var name="MBWH_TBCSthi2" value=" 10." />
+<var name="MBWH_TBCSoffs" value=" 135." />
+<var name="MBWH_TBCSang1" value=" 14." />
+<var name="MBWH_TBCSang2" value="22.5"/>
+
+
+<!-- Connection beam / extremity plate -->
+
+<!-- ATLMHHBM0076 -->
+<!-- thickness, assumed constant -->
+<var name="MBWH_CBEPthic" value="15."/>
+<!-- dimensions and angles -->
+<var name="MBWH_CBEPl1" value="195.8"/>
+<var name="MBWH_CBEPl2" value="230."/>
+<var name="MBWH_CBEPl3" value="263."/>
+
+<var name="MBWH_CBEPh1" value="89.5"/>
+<var name="MBWH_CBEPh2" value="169.2"/>
+<var name="MBWH_CBEPh3" value="72.8"/>
+<var name="MBWH_CBEPh4" value="81.2"/>
+<var name="MBWH_CBEPh5" value="125"/>
+
+<var name="MBWH_CBEPa1" value="22.5"/>
+<var name="MBWH_CBEPa2" value="67.5"/>
+<var name="MBWH_CBEPa3" value="82."/>
+<var name="MBWH_CBEPa4" value="15."/>
+
+
+<!-- Extremity plate -->
+
+<!-- ATLMHHBM0075 -->
+<!-- thickness, assumed constant -->
+<var name="MBWH_EPthic" value="15."/>
+<!-- dimensions and angles -->
+<var name="MBWH_EPl1" value="227.8"/>
+<var name="MBWH_EPl2" value="423"/>
+<var name="MBWH_EPl3" value="193.7"/>
+
+<var name="MBWH_EPh1" value="250.7"/>
+<var name="MBWH_EPh2" value="170.3"/>
+<var name="MBWH_EPh3" value="383"/>
+<var name="MBWH_EPh4" value="76.1"/>
+
+
+<!-- Central Reinforcing bar -->
+
+<!-- ATLMHHBM0113 -->
+
+<var name="MBWH_CRBLPwid" value="180"/>
+<var name="MBWH_CRBPL1pi" value="643"/>
+<var name="MBWH_CRBPL1po" value="647"/>
+<var name="MBWH_CRBSHIof" value="4"/>
+
+<!-- L Profile -->
+<var name="MBWH_CRBLPthi" value="12"/>
+<var name="MBWH_CRBLPle1" value="910"/>
+<var name="MBWH_CRBLPhe1" value="60"/>
+<var name="MBWH_CRBLPle2" value="145"/>
+<var name="MBWH_CRBLPhe2" value="39"/>
+
+<!-- Plate 1 -->
+<var name="MBWH_CRBPL1th" value="12"/>
+<var name="MBWH_CRBPL1le" value="340"/>
+<var name="MBWH_CRBPL1wi" value="156"/>
+
+<!-- Plate 2 -->
+<var name="MBWH_CRBPL2th" value="12"/>
+<var name="MBWH_CRBPL2le" value="210"/>
+<var name="MBWH_CRBPL2wi" value="156"/>
+
+<!-- Shim -->
+<var name="MBWH_CRBSHIth" value="12"/>
+<var name="MBWH_CRBSHIle" value="165"/>
+<var name="MBWH_CRBSHIwi" value="156"/>
+
+<!-- position of Reinforcing Bar relative to extremity plate ... pifometric, to be confirmed -->
+<var name="MBWH_CRBxoff" value="-200"/>
+<var name="MBWH_CRByoff" value="-400"/>
+<var name="MBWH_CRBzoff" value="-300"/>
+
+
+<!-- ATLMHHBM0002 -->
+<!-- position of 1st support in atlas ref system -->
+<var name="MBWH_SlsSuy1" value=" 3612.7" />
+<var name="MBWH_SlsSux1" value=" 1305." />
+<!-- ATLMHHBM0128 -->
+<!-- x extension -->
+<var name="MBWH_SlsSxext" value=" 139.3" />
+
+<!-- Derived variables -->
+<!-- Positions -->
+<var name="MBWH_Slsypos" value="MBWH_SlsSuy1+(.5*MBWH_SlsUPlen-MBWH_SlsSup1)*cos(MBWH_SLangle*GENV_PiS180)"/>
+<var name="MBWH_Slsxp1" value="MBWH_SlsSux1+(MBWH_SlsSxext-.5*MBWH_SUPhei)/cos(MBWH_SLangle*GENV_PiS180)-.5*MBWH_SlsSSize*sin(MBWH_SLangle*GENV_PiS180) " />
+<!-- external spokes -->
+<var name="MBWH_SlsExref" value="MBWH_Slsxp1 +(.5*MBWH_SlsUPlen-MBWH_SlsSup1)*sin(MBWH_SLangle*GENV_PiS180) "/>
+<!-- inner spokes -->
+<var name="MBWH_SlsIxref" value="MBWH_SlsExref - (MBWH_RBSlen-MBWH_RBBsiz)/cos(MBWH_SLangle*GENV_PiS180) "/>
+
+<!-- Connection beam / extremity plate -->
+<!-- Derived variables -->
+<var name="MBWH_CBEPxa" value="0"/>
+<var name="MBWH_CBEPya" value="0"/>
+<var name="MBWH_CBEPxb" value="MBWH_CBEPxa"/>
+<var name="MBWH_CBEPyb" value="MBWH_CBEPh1"/>
+<var name="MBWH_CBEPxc" value="MBWH_CBEPl2-MBWH_CBEPl3"/>
+<var name="MBWH_CBEPyc" value="MBWH_CBEPh2"/>
+<var name="MBWH_CBEPxd" value="MBWH_CBEPxc+MBWH_CBEPl1"/>
+<var name="MBWH_CBEPyd" value="MBWH_CBEPyc"/>
+<var name="MBWH_CBEPxe" value="MBWH_CBEPxd+(MBWH_CBEPh2-MBWH_CBEPh5)/tan(MBWH_CBEPa2*GENV_PiS180)"/>
+<var name="MBWH_CBEPye" value="MBWH_CBEPh5"/>
+<var name="MBWH_CBEPxf" value="MBWH_CBEPxe+(MBWH_CBEPh5-MBWH_CBEPh4)/tan(MBWH_CBEPa3*GENV_PiS180)"/>
+<var name="MBWH_CBEPyf" value="MBWH_CBEPh4"/>
+<var name="MBWH_CBEPxg" value="MBWH_CBEPxf+(MBWH_CBEPh4-MBWH_CBEPh3)/tan(MBWH_CBEPa4*GENV_PiS180)"/>
+<var name="MBWH_CBEPyg" value="MBWH_CBEPh3"/>
+<var name="MBWH_CBEPxh" value="MBWH_CBEPl2"/>
+<var name="MBWH_CBEPyh" value="MBWH_CBEPya"/>
+
+<!-- Modelization -->
+<gvxy name="MBWH_ConnectionBeamExtremityPlate" material="Aluminium2" dZ="MBWH_CBEPthic">
+ <gvxy_point X_Y="MBWH_CBEPxa;MBWH_CBEPya"/>
+ <gvxy_point X_Y="MBWH_CBEPxb;MBWH_CBEPyb"/>
+ <gvxy_point X_Y="MBWH_CBEPxc;MBWH_CBEPyc"/>
+ <gvxy_point X_Y="MBWH_CBEPxd;MBWH_CBEPyd"/>
+ <gvxy_point X_Y="MBWH_CBEPxe;MBWH_CBEPye"/>
+ <gvxy_point X_Y="MBWH_CBEPxf;MBWH_CBEPyf"/>
+ <gvxy_point X_Y="MBWH_CBEPxg;MBWH_CBEPyg"/>
+ <gvxy_point X_Y="MBWH_CBEPxh;MBWH_CBEPyh"/>
+</gvxy>
+
+<!-- Extremity plate -->
+<!-- Derived variables -->
+<var name="MBWH_EPxa" value="0"/>
+<var name="MBWH_EPya" value="0"/>
+<var name="MBWH_EPxb" value="MBWH_EPxa"/>
+<var name="MBWH_EPyb" value="MBWH_EPh1"/>
+<var name="MBWH_EPxc" value="MBWH_EPl2-MBWH_EPl3"/>
+<var name="MBWH_EPyc" value="MBWH_EPh3"/>
+<var name="MBWH_EPxd" value="MBWH_EPl2"/>
+<var name="MBWH_EPyd" value="MBWH_EPyc"/>
+<var name="MBWH_EPxe" value="MBWH_EPxd"/>
+<var name="MBWH_EPye" value="MBWH_EPyd-MBWH_EPh2"/>
+<var name="MBWH_EPxf" value="MBWH_EPl1"/>
+<var name="MBWH_EPyf" value="MBWH_EPh4"/>
+<var name="MBWH_EPxg" value="MBWH_EPxf"/>
+<var name="MBWH_EPyg" value="MBWH_EPya"/>
+
+<!-- Modelization -->
+<gvxy name="MBWH_ExtremityPlate" material="Aluminium1" dZ="MBWH_EPthic">
+ <gvxy_point X_Y="MBWH_EPxa;MBWH_EPya"/>
+ <gvxy_point X_Y="MBWH_EPxb;MBWH_EPyb"/>
+ <gvxy_point X_Y="MBWH_EPxc;MBWH_EPyc"/>
+ <gvxy_point X_Y="MBWH_EPxd;MBWH_EPyd"/>
+ <gvxy_point X_Y="MBWH_EPxe;MBWH_EPye"/>
+ <gvxy_point X_Y="MBWH_EPxf;MBWH_EPyf"/>
+ <gvxy_point X_Y="MBWH_EPxg;MBWH_EPyg"/>
+</gvxy>
+
+
+<!-- Central Reinforcing bar -->
+<!-- L Profile -->
+<!-- Derived variables -->
+<!-- piece 1 -->
+<var name="MBWH_CRBLP1xa" value="0"/>
+<var name="MBWH_CRBLP1ya" value="0"/>
+<var name="MBWH_CRBLP1xb" value="MBWH_CRBLPle1"/>
+<var name="MBWH_CRBLP1yb" value="MBWH_CRBLP1ya"/>
+<var name="MBWH_CRBLP1xc" value="MBWH_CRBLP1xb"/>
+<var name="MBWH_CRBLP1yc" value="MBWH_CRBLPhe2"/>
+<var name="MBWH_CRBLP1xd" value="MBWH_CRBLPle1-MBWH_CRBLPle2"/>
+<var name="MBWH_CRBLP1yd" value="MBWH_CRBLPhe1"/>
+<var name="MBWH_CRBLP1xe" value="MBWH_CRBLP1xa"/>
+<var name="MBWH_CRBLP1ye" value="MBWH_CRBLP1yd"/>
+
+<!-- piece 2 -->
+<var name="MBWH_CRBLP2dy" value="MBWH_CRBLPhe1-MBWH_CRBLPthi"/>
+
+
+<!-- Modelization -->
+<gvxy name="MBWH_CRB-LProfile1" material="Aluminium1" dZ="MBWH_CRBLPthi">
+ <gvxy_point X_Y="MBWH_CRBLP1xa;MBWH_CRBLP1ya"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xb;MBWH_CRBLP1yb"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xc;MBWH_CRBLP1yc"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xd;MBWH_CRBLP1yd"/>
+ <gvxy_point X_Y="MBWH_CRBLP1xe;MBWH_CRBLP1ye"/>
+</gvxy>
+
+<var name="MBWH_CRBLP1z" value="-MBWH_CRBLPwid/2.+MBWH_CRBLPthi/2"/>
+
+<box name="MBWH_CRB-LProfile2" material="Aluminium1" X_Y_Z="MBWH_CRBLPle1;MBWH_CRBLP2dy;MBWH_CRBLPthi"/>
+<var name="MBWH_CRBLP2x" value="MBWH_CRBLPle1/2"/>
+<var name="MBWH_CRBLP2y" value="MBWH_CRBLPthi/2"/>
+<var name="MBWH_CRBLP2z" value="MBWH_CRBLP1z+(MBWH_CRBLPthi+MBWH_CRBLP2dy)/2"/>
+
+<box name="MBWH_CRB-Plate2" material="Aluminium1" X_Y_Z="MBWH_CRBPL2le;MBWH_CRBPL2th;MBWH_CRBPL2wi"/>
+<var name="MBWH_CRBPL2xp" value="MBWH_CRBLPle1/2"/>
+<var name="MBWH_CRBPL2yp" value="MBWH_CRBLPthi+MBWH_CRBPL2th/2"/>
+
+<box name="MBWH_CRB-Plate1" material="Aluminium1" X_Y_Z="MBWH_CRBPL1le;MBWH_CRBPL1th;MBWH_CRBPL1wi"/>
+<var name="MBWH_CRBPL1x1" value="MBWH_CRBLPle1/2+MBWH_CRBPL1pi-MBWH_CRBPL1le/2"/>
+<var name="MBWH_CRBPL1x2" value="MBWH_CRBLPle1/2-MBWH_CRBPL1po+MBWH_CRBPL1le/2"/>
+<var name="MBWH_CRBPL1yp" value="-MBWH_CRBPL1th/2."/>
+
+<box name="MBWH_CRB-Shim" material="Aluminium1" X_Y_Z="MBWH_CRBSHIle;MBWH_CRBSHIth;MBWH_CRBSHIwi"/>
+<var name="MBWH_CRBSHIx1" value="MBWH_CRBPL1x1+MBWH_CRBPL1le/2.-MBWH_CRBSHIle/2.-MBWH_CRBSHIof"/>
+<var name="MBWH_CRBSHIx2" value="MBWH_CRBPL1x2-MBWH_CRBPL1le/2.+MBWH_CRBSHIle/2.+MBWH_CRBSHIof"/>
+<var name="MBWH_CRBSHIyp" value="MBWH_CRBPL1yp-MBWH_CRBPL1th/2.-MBWH_CRBSHIth/2."/>
+
+
+<composition name="MBWH_CRB-LProfile_1">
+ <posXYZ volume="MBWH_CRB-LProfile1" X_Y_Z="0;0;MBWH_CRBLP1z"/>
+ <posXYZ volume="MBWH_CRB-LProfile2" X_Y_Z="MBWH_CRBLP2x;MBWH_CRBLP2y;MBWH_CRBLP2z" rot="90;0;0"/>
+</composition>
+
+<composition name="MBWH_CRB-LProfile_2">
+ <posXYZ volume="MBWH_CRB-LProfile1" X_Y_Z="0;0;-MBWH_CRBLP1z"/>
+ <posXYZ volume="MBWH_CRB-LProfile2" X_Y_Z="MBWH_CRBLP2x;MBWH_CRBLP2y;-MBWH_CRBLP2z" rot="90;0;0"/>
+</composition>
+
+
+<composition name="MBWH_CentralReinforcingbar">
+ <posXYZ volume="MBWH_CRB-LProfile_1"/>
+ <posXYZ volume="MBWH_CRB-LProfile_2"/>
+ <posXYZ volume="MBWH_CRB-Plate2" X_Y_Z="MBWH_CRBPL2xp;MBWH_CRBPL2yp;0"/>
+ <posXYZ volume="MBWH_CRB-Plate1" X_Y_Z="MBWH_CRBPL1x1;MBWH_CRBPL1yp;0"/>
+ <posXYZ volume="MBWH_CRB-Plate1" X_Y_Z="MBWH_CRBPL1x2;MBWH_CRBPL1yp;0"/>
+ <posXYZ volume="MBWH_CRB-Shim" X_Y_Z="MBWH_CRBSHIx1;MBWH_CRBSHIyp;0"/>
+ <posXYZ volume="MBWH_CRB-Shim" X_Y_Z="MBWH_CRBSHIx2;MBWH_CRBSHIyp;0"/>
+</composition>
+
+<!-- Cut profiles cross bracing large sector -->
+<!-- Derived variables -->
+<var name="MBWH_CBLxa" value="MBWH_CBext/2." />
+<var name="MBWH_CBLya" value="0." />
+<var name="MBWH_CBLxb" value="MBWH_CBLxa" />
+<var name="MBWH_CBLyb" value="MBWH_CBhei" />
+<var name="MBWH_CBLxc" value="MBWH_CBLxb-MBWH_CBLthi" />
+<var name="MBWH_CBLyc" value="MBWH_CBLyb" />
+<var name="MBWH_CBLxd" value="MBWH_CBLxc" />
+<var name="MBWH_CBLyd" value="MBWH_CBLthi" />
+
+<!-- Modelization -->
+
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem11" material="Aluminium1" dZ="MBWH_CBLl11">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem17" material="Aluminium1" dZ="MBWH_CBLl17">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem22" material="Aluminium1" dZ="MBWH_CBLl22">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem26" material="Aluminium1" dZ="MBWH_CBLl26">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem10" material="Aluminium1" dZ="MBWH_CBLl10">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem15" material="Aluminium1" dZ="MBWH_CBLl15">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem21" material="Aluminium1" dZ="MBWH_CBLl21">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem25" material="Aluminium1" dZ="MBWH_CBLl25">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+
+<!-- Contreventements, bay 1 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem8" material="Aluminium1" dZ="MBWH_CBLl8">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem9" material="Aluminium1" dZ="MBWH_CBLl9">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 2 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem14" material="Aluminium1" dZ="MBWH_CBLl14">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem13" material="Aluminium1" dZ="MBWH_CBLl13">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 3 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem20" material="Aluminium1" dZ="MBWH_CBLl20">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem18" material="Aluminium1" dZ="MBWH_CBLl18">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 4 large sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem24" material="Aluminium1" dZ="MBWH_CBLl24">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingLargeSectorItem23" material="Aluminium1" dZ="MBWH_CBLl23">
+ <gvxy_point X_Y="MBWH_CBLxa;MBWH_CBLya"/>
+ <gvxy_point X_Y="MBWH_CBLxb;MBWH_CBLyb"/>
+ <gvxy_point X_Y="MBWH_CBLxc;MBWH_CBLyc"/>
+ <gvxy_point X_Y="MBWH_CBLxd;MBWH_CBLyd"/>
+</gvxysx>
+
+
+<!-- cross bracing Plates large sector -->
+
+<!-- Bay 1 -->
+<var name="MBWH_CBPL10x1" value="MBWH_CBPL10le/2." />
+<var name="MBWH_CBPL10y1" value="MBWH_CBPL10wi/2.-MBWH_CBPL10cu" />
+<var name="MBWH_CBPL10x2" value="MBWH_CBPL10x1-MBWH_CBPL10cu" />
+<var name="MBWH_CBPL10y2" value="MBWH_CBPL10wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem10" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL10x1;MBWH_CBPL10y1"/>
+ <gvxy_point X_Y="MBWH_CBPL10x2;MBWH_CBPL10y2"/>
+</gvxysxy>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBPL15x1" value="MBWH_CBPL15le/2." />
+<var name="MBWH_CBPL15y1" value="MBWH_CBPL15wi/2.-MBWH_CBPL15cu" />
+<var name="MBWH_CBPL15x2" value="MBWH_CBPL15x1-MBWH_CBPL15cu" />
+<var name="MBWH_CBPL15y2" value="MBWH_CBPL15wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem15" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL15x1;MBWH_CBPL15y1"/>
+ <gvxy_point X_Y="MBWH_CBPL15x2;MBWH_CBPL15y2"/>
+</gvxysxy>
+
+<!-- Bay 3 -->
+<var name="MBWH_CBPL21x1" value="MBWH_CBPL21le/2." />
+<var name="MBWH_CBPL21y1" value="MBWH_CBPL21wi/2.-MBWH_CBPL21cu" />
+<var name="MBWH_CBPL21x2" value="MBWH_CBPL21x1-MBWH_CBPL21cu" />
+<var name="MBWH_CBPL21y2" value="MBWH_CBPL21wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem21" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL21x1;MBWH_CBPL21y1"/>
+ <gvxy_point X_Y="MBWH_CBPL21x2;MBWH_CBPL21y2"/>
+</gvxysxy>
+
+<!-- Bay 4 -->
+<var name="MBWH_CBPL25x1" value="MBWH_CBPL25le/2." />
+<var name="MBWH_CBPL25y1" value="MBWH_CBPL25wi/2.-MBWH_CBPL25cu" />
+<var name="MBWH_CBPL25x2" value="MBWH_CBPL25x1-MBWH_CBPL25cu" />
+<var name="MBWH_CBPL25y2" value="MBWH_CBPL25wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateLargeSectorItem25" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPL25x1;MBWH_CBPL25y1"/>
+ <gvxy_point X_Y="MBWH_CBPL25x2;MBWH_CBPL25y2"/>
+</gvxysxy>
+
+
+<!-- Bay 1 -->
+<var name="MBWH_CBL10z" value="MBWH_CBLl10/2." />
+<var name="MBWH_CBPL10d" value="MBWH_CBPL10wi-2.*MBWH_CBPL10cu" />
+<var name="MBWH_CBPL10zb" value="MBWH_CBPL10za+sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10d/2." />
+<var name="MBWH_CBPL10yb" value="MBWH_CBPL10ya-cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10d/2." />
+<var name="MBWH_CBPL10zc" value="MBWH_CBPL10zb+cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10le/2" />
+<var name="MBWH_CBPL10yc" value="MBWH_CBPL10yb+sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBPL10le/2" />
+ <!-- get positions of contreventements 8,9 using locations of item 10 extremities -->
+<var name="MBWH_cvl10xo" value="-MBWH_CBPL10zc*cos(MBWH_CBPL10ti*GENV_PiS180)-0.5*(MBWH_CBhei)*sin(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvl10yo" value=" MBWH_CBPL10zc*sin(MBWH_CBPL10ti*GENV_PiS180)-0.5*(MBWH_CBhei)*cos(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvl10xu" value="MBWH_cvl10xo+MBWH_CBLl10*cos(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvl10yu" value="MBWH_cvl10yo-MBWH_CBLl10*sin(MBWH_CBPL10ti*GENV_PiS180)" />
+<var name="MBWH_cvlx8" value="-MBWH_cvl10xu+cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl8/2." />
+<var name="MBWH_cvly8" value=" MBWH_cvl10yu+sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl8/2." />
+<var name="MBWH_cvlx9" value="-MBWH_cvl10xo-cos(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl9/2." />
+<var name="MBWH_cvly9" value=" MBWH_cvl10yo-sin(MBWH_CBPL10ti*GENV_PiS180)*MBWH_CBLl9/2." />
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem10Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem10" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay1LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem10" X_Y_Z="0;0;MBWH_CBL10z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem10Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL10yc;MBWH_CBPL10zc" rot="-MBWH_CBPL10ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem10Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL10yc;MBWH_CBPL10zc" rot="-MBWH_CBPL10ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay1LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay1LargeSector" X_Y_Z="0;-MBWH_CBPL10yc;-MBWH_CBPL10zc" />
+</composition>
+<composition name="MBWH_CroisillonBay1LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay1LargeSector" rot="MBWH_CBPL10ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem8" X_Y_Z="MBWH_cvlx8;MBWH_cvly8;0" rot="-MBWH_CBPL10ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem9" X_Y_Z="MBWH_cvlx9;MBWH_cvly9;0" rot="-MBWH_CBPL10ti;90;0" />
+</composition>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBL15z" value="MBWH_CBLl15/2." />
+<var name="MBWH_CBPL15d" value="MBWH_CBPL15wi-2.*MBWH_CBPL15cu" />
+<var name="MBWH_CBPL15zb" value="MBWH_CBPL15za+sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15d/2." />
+<var name="MBWH_CBPL15yb" value="MBWH_CBPL15ya-cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15d/2." />
+<var name="MBWH_CBPL15zi" value="MBWH_CBPL15zb+cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15le/2" />
+<var name="MBWH_CBPL15yi" value="MBWH_CBPL15yb+sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBPL15le/2" />
+<var name="MBWH_CBPL15zc" value="MBWH_CBLl15-MBWH_CBPL15zi" />
+<var name="MBWH_CBPL15yc" value="MBWH_CBhei-MBWH_CBPL15yi" />
+ <!-- get positions of contreventements 14, 13 using locations of item 15 extremities -->
+<var name="MBWH_cvl15xo" value="-MBWH_CBPL15zc*cos(MBWH_CBPL15ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL15ya)*sin(MBWH_CBPL15ti*GENV_PiS180)"/>
+<var name="MBWH_cvl15yo" value=" MBWH_CBPL15zc*sin(MBWH_CBPL15ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL15ya)*cos(MBWH_CBPL15ti*GENV_PiS180)"/>
+<var name="MBWH_cvl15xu" value="MBWH_cvl15xo+MBWH_CBLl15*cos(MBWH_CBPL15ti*GENV_PiS180)" />
+<var name="MBWH_cvl15yu" value="MBWH_cvl15yo-MBWH_CBLl15*sin(MBWH_CBPL15ti*GENV_PiS180)" />
+<var name="MBWH_cvlx14" value="-MBWH_cvl15xu+cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl14/2." />
+<var name="MBWH_cvly14" value=" MBWH_cvl15yu+sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl14/2." />
+<var name="MBWH_cvlx13" value="-MBWH_cvl15xo-cos(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl13/2." />
+<var name="MBWH_cvly13" value=" MBWH_cvl15yo-sin(MBWH_CBPL15ti*GENV_PiS180)*MBWH_CBLl13/2." />
+
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem15Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem15" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay2LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem15" X_Y_Z="0;0;MBWH_CBL15z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem15Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL15yc;MBWH_CBPL15zc" rot="-MBWH_CBPL15ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem15Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL15yc;MBWH_CBPL15zc" rot="-MBWH_CBPL15ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay2LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay2LargeSector" X_Y_Z="0;-MBWH_CBPL15yc;-MBWH_CBPL15zc" />
+</composition>
+<composition name="MBWH_CroisillonBay2LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay2LargeSector" rot="MBWH_CBPL15ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem14" X_Y_Z="MBWH_cvlx14;MBWH_cvly14;0" rot="-MBWH_CBPL15ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem13" X_Y_Z="MBWH_cvlx13;MBWH_cvly13;0" rot="-MBWH_CBPL15ti;90;0" />
+</composition>
+
+
+<!-- Bay 3 -->
+<var name="MBWH_CBL21z" value="MBWH_CBLl21/2." />
+<var name="MBWH_CBPL21d" value="MBWH_CBPL21wi-2.*MBWH_CBPL21cu" />
+<var name="MBWH_CBPL21zb" value="MBWH_CBPL21za+sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21d/2." />
+<var name="MBWH_CBPL21yb" value="MBWH_CBPL21ya-cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21d/2." />
+<var name="MBWH_CBPL21z" value="MBWH_CBPL21zb+cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21le/2" />
+<var name="MBWH_CBPL21yi" value="MBWH_CBPL21yb+sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBPL21le/2" />
+<var name="MBWH_CBPL21zc" value="MBWH_CBLl21-MBWH_CBPL21z" />
+<var name="MBWH_CBPL21yc" value="MBWH_CBhei-MBWH_CBPL21yi" />
+ <!-- get positions of contreventements 14, 13 using locations of item 21 extremities -->
+<var name="MBWH_cvl21xo" value="-MBWH_CBPL21zc*cos(MBWH_CBPL21ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL21ya)*sin(MBWH_CBPL21ti*GENV_PiS180)"/>
+<var name="MBWH_cvl21yo" value=" MBWH_CBPL21zc*sin(MBWH_CBPL21ti*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL21ya)*cos(MBWH_CBPL21ti*GENV_PiS180)"/>
+<var name="MBWH_cvl21xu" value="MBWH_cvl21xo+MBWH_CBLl21*cos(MBWH_CBPL21ti*GENV_PiS180)" />
+<var name="MBWH_cvl21yu" value="MBWH_cvl21yo-MBWH_CBLl21*sin(MBWH_CBPL21ti*GENV_PiS180)" />
+<var name="MBWH_cvlx20" value="-MBWH_cvl21xu+cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl20/2." />
+<var name="MBWH_cvly20" value=" MBWH_cvl21yu+sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl20/2." />
+<var name="MBWH_cvlx18" value="-MBWH_cvl21xo-cos(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl18/2." />
+<var name="MBWH_cvly18" value=" MBWH_cvl21yo-sin(MBWH_CBPL21ti*GENV_PiS180)*MBWH_CBLl18/2." />
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem21Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem21" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay3LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem21" X_Y_Z="0;0;MBWH_CBL21z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem21Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL21yc;MBWH_CBPL21zc" rot="-MBWH_CBPL21ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem21Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL21yc;MBWH_CBPL21zc" rot="-MBWH_CBPL21ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay3LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay3LargeSector" X_Y_Z="0;-MBWH_CBPL21yc;-MBWH_CBPL21zc" />
+</composition>
+<composition name="MBWH_CroisillonBay3LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay3LargeSector" rot="MBWH_CBPL21ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem20" X_Y_Z="MBWH_cvlx20;MBWH_cvly20;0" rot="-MBWH_CBPL21ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem18" X_Y_Z="MBWH_cvlx18;MBWH_cvly18;0" rot="-MBWH_CBPL21ti;90;0" />
+</composition>
+
+
+
+<!-- Bay 4 -->
+<var name="MBWH_CBPL25tii" value="90-MBWH_CBPL25ti" />
+<var name="MBWH_CBL25z" value="-MBWH_CBLl25/2." />
+<var name="MBWH_CBPL25d" value="MBWH_CBPL25wi-2.*MBWH_CBPL25cu" />
+<var name="MBWH_CBPL25zb" value="-MBWH_CBPL25za-sin(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25d/2." />
+<var name="MBWH_CBPL25yb" value="MBWH_CBPL25ya-cos(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25d/2." />
+<var name="MBWH_CBPL25zc" value="MBWH_CBPL25zb-cos(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25le/2" />
+<var name="MBWH_CBPL25yc" value="MBWH_CBPL25yb+sin(MBWH_CBPL25ti*GENV_PiS180)*MBWH_CBPL25le/2" />
+ <!-- get positions of contreventements 14, 13 using locations of item 25 extremities -->
+<var name="MBWH_cvl25xo" value="-MBWH_CBPL25zc*cos(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL25ya)*sin(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25yo" value=" MBWH_CBPL25zc*sin(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei+MBWH_CBPL25ya)*cos(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25xo" value="-MBWH_CBPL25zc*cos(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei)*cos(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25yo" value=" MBWH_CBPL25zc*sin(MBWH_CBPL25tii*GENV_PiS180)-0.5*(MBWH_CBhei)*sin(MBWH_CBPL25ti*GENV_PiS180)"/>
+<var name="MBWH_cvl25xu" value="MBWH_cvl25xo-MBWH_CBLl25*cos(MBWH_CBPL25tii*GENV_PiS180)" />
+<var name="MBWH_cvl25yu" value="MBWH_cvl25yo+MBWH_CBLl25*sin(MBWH_CBPL25tii*GENV_PiS180)" />
+<var name="MBWH_cvlx24" value="-MBWH_cvl25xo+cos(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl24/2." />
+<var name="MBWH_cvly24" value=" MBWH_cvl25yo+sin(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl24/2." />
+<var name="MBWH_cvlx23" value="-MBWH_cvl25xu-cos(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl23/2." />
+<var name="MBWH_cvly23" value=" MBWH_cvl25yu-sin(MBWH_CBPL25tii*GENV_PiS180)*MBWH_CBLl23/2." />
+
+<composition name="MBWH_CrossBracingPlateLargeSectorItem25Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem25" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay4LargeSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem25" X_Y_Z="0;0;MBWH_CBL25z" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem25Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPL25yc;MBWH_CBPL25zc" rot="MBWH_CBPL25ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateLargeSectorItem25Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPL25yc;MBWH_CBPL25zc" rot="MBWH_CBPL25ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay4LargeSector">
+ <posXYZ volume="MBWH_CrossBracingBay4LargeSector" X_Y_Z="0;-MBWH_CBPL25yc;-MBWH_CBPL25zc" />
+</composition>
+<composition name="MBWH_CroisillonBay4LargeSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay4LargeSector" rot="90-MBWH_CBPL25ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem24" X_Y_Z="MBWH_cvlx24;MBWH_cvly24;0" rot="MBWH_CBPL25ti-90;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem23" X_Y_Z="MBWH_cvlx23;MBWH_cvly23;0" rot="MBWH_CBPL25ti-90;90;0" />
+</composition>
+
+
+
+<!-- Inner and Outer spoke large sector -->
+
+<gvxysx name="MBWH_SpokeLargeSectorUprofile" material="Aluminium1" dZ="MBWH_SlsUPlen">
+ <gvxy_point X_Y="MBWH_SUPxa;MBWH_SUPya"/>
+ <gvxy_point X_Y="MBWH_SUPxb;MBWH_SUPyb"/>
+ <gvxy_point X_Y="MBWH_SUPxc;MBWH_SUPyc"/>
+ <gvxy_point X_Y="MBWH_SUPxd;MBWH_SUPyd"/>
+</gvxysx>
+
+<!-- Derived variables -->
+<!-- positions of reinforcing bars -->
+<var name="MBWH_SlsRBpz1" value="MBWH_SlsUPlen/2.-MBWH_SlsRBdz1-MBWH_SRBhos/2."/>
+<var name="MBWH_SlsRBpz2" value="MBWH_SlsRBpz1-MBWH_SlsRBdz2"/>
+<var name="MBWH_SlsRBpz3" value="MBWH_SlsRBpz2-MBWH_SlsRBdz3"/>
+<var name="MBWH_SlsRBpz4" value="MBWH_SlsRBpz3-MBWH_SlsRBdz4"/>
+
+<!-- Relative positions of spokes -->
+<var name="MBWH_SlsIxpos" value="MBWH_SRBpx+MBWH_SUPext/2.+MBWH_RBBthi+MBWH_RBSthi/2." />
+<var name="MBWH_SlsIypos" value="-MBWH_RBSlen+MBWH_RBBsiz" />
+<var name="MBWH_SlsIzpos" value="-MBWH_SlsIypos*tan(MBWH_SLangle*GENV_PiS180)" />
+
+
+<!-- Transversal beam, central support -->
+<!-- Derived variables -->
+<var name="MBWH_TBCSxa" value="MBWH_TBCSlen1/2." />
+<var name="MBWH_TBCSya" value="0." />
+<var name="MBWH_TBCSxc" value="MBWH_TBCSlen2/2.-MBWH_TBCSext" />
+<var name="MBWH_TBCSyc" value="MBWH_TBCShei" />
+<var name="MBWH_TBCSxb" value="MBWH_TBCSlen2/2." />
+<var name="MBWH_TBCSyb" value="MBWH_TBCSyc-MBWH_TBCSext*tan(MBWH_TBCSang1*GENV_PiS180)" />
+
+<var name="MBWH_TBCSxa1" value="MBWH_TBCSxa-MBWH_TBCSoffs/cos(MBWH_TBCSang1*GENV_PiS180)" />
+<var name="MBWH_TBCSya1" value="0." />
+<var name="MBWH_TBCSxb1" value="MBWH_TBCSxa1+MBWH_TBCShei*tan(MBWH_TBCSang2*GENV_PiS180)" />
+<var name="MBWH_TBCSyb1" value="MBWH_TBCShei" />
+
+<var name="MBWH_TBCSxoff" value="(MBWH_TBCSthi1+MBWH_TBCSthi2)/2." />
+
+<!-- Transversal beam, central support Position -->
+<var name="MBWH_TBCSypos" value="MBWH_Slsypos-(.5*MBWH_SlsUPlen)*cos(MBWH_SLangle*GENV_PiS180)-MBWH_TBCShei"/>
+<var name="MBWH_TBCSzpos" value="-MBWH_SlsIzpos/2.-MBWH_TBCSxoff"/>
+<!-- Connection beam / extremity plate position relative to Transversal beam, central support -->
+<var name="MBWH_CBEPxpos" value="MBWH_TBCSxa1+MBWH_CBEPyb*cos(MBWH_CBEPa1*GENV_PiS180)+(MBWH_CBEPyc-MBWH_CBEPyb)/cos(MBWH_CBEPa1*GENV_PiS180)"/>
+<var name="MBWH_CBEPypos" value="-MBWH_CBEPyb*sin(MBWH_CBEPa1*GENV_PiS180)-GENV_Eps"/>
+<var name="MBWH_CBEPzpos" value="MBWH_TBCSthi1/2+MBWH_CBEPthic/2+GENV_Eps"/>
+<!-- extremity plate position relative to Transversal beam, central support -->
+<var name="MBWH_EPxpos" value="MBWH_CBEPxpos+MBWH_EPl1*sin(MBWH_CBEPa1*GENV_PiS180)-0.5*MBWH_EPthic*cos(MBWH_CBEPa1*GENV_PiS180)"/>
+<var name="MBWH_EPypos" value="MBWH_CBEPypos+MBWH_EPl1*cos(MBWH_CBEPa1*GENV_PiS180)+0.5*MBWH_EPthic*sin(MBWH_CBEPa1*GENV_PiS180)"/>
+<var name="MBWH_EPzpos" value="MBWH_CBEPzpos-MBWH_CBEPthic/2"/>
+<!-- Reinforcing Bar relative to extremity plate position -->
+<var name="MBWH_RBxpos" value="MBWH_EPxpos+MBWH_CRBxoff"/>
+<var name="MBWH_RBypos" value="MBWH_EPypos+MBWH_CRByoff"/>
+<var name="MBWH_RBzpos" value="MBWH_EPzpos+MBWH_CRBzoff"/>
+
+
+<gvxysx name="MBWH_TransvBeamCSupLargeSect1" material="Aluminium1" dZ="MBWH_TBCSthi1">
+ <gvxy_point X_Y="MBWH_TBCSxa;MBWH_TBCSya"/>
+ <gvxy_point X_Y="MBWH_TBCSxb;MBWH_TBCSyb"/>
+ <gvxy_point X_Y="MBWH_TBCSxc;MBWH_TBCSyc"/>
+</gvxysx>
+<gvxysx name="MBWH_TransvBeamCSupLargeSect2" material="Aluminium1" dZ="MBWH_TBCSthi2">
+ <gvxy_point X_Y="MBWH_TBCSxa1;MBWH_TBCSya1"/>
+ <gvxy_point X_Y="MBWH_TBCSxb1;MBWH_TBCSyb1"/>
+</gvxysx>
+
+<composition name="MBWH_TransvBeamCSupLargeSect">
+ <posXYZ volume="MBWH_TransvBeamCSupLargeSect1" />
+ <posXYZ volume="MBWH_TransvBeamCSupLargeSect2" X_Y_Z="0;0;MBWH_TBCSxoff"/>
+</composition>
+
+
+<composition name="MBWH_SpokesLargeSectorAssembly1">
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz1" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz2" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz3" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SlsRBpz4" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile" X_Y_Z=" MBWH_SlsIxpos;MBWH_SlsIypos;MBWH_SlsIzpos"/>
+</composition>
+
+<composition name="MBWH_SpokesLargeSectorAssembly2">
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz1" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz2" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz3" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SlsRBpz4" rot="0.;0.;90."/>
+ <posXYZ volume="MBWH_SpokeLargeSectorUprofile" X_Y_Z=" MBWH_SlsIxpos;MBWH_SlsIypos;-MBWH_SlsIzpos"/>
+</composition>
+
+
+<composition name="MBWH_SpokesLargeSectorAssemblyTemp1">
+ <posXYZ volume="MBWH_SpokesLargeSectorAssembly1" X_Y_Z="MBWH_SlsIxref;MBWH_Slsypos;0" rot="0.; 90.;90-MBWH_SLangle" />
+</composition>
+
+<composition name="MBWH_SpokesLargeSectorAssemblyTemp2">
+ <posXYZ volume="MBWH_SpokesLargeSectorAssembly2" X_Y_Z="-MBWH_SlsIxref;MBWH_Slsypos;0" rot="180.; 90.;90+MBWH_SLangle" />
+</composition>
+
+<composition name="MBWH_InnerAssemblyTemp1">
+ <posXYZ volume="MBWH_ConnectionBeamExtremityPlate" X_Y_Z="MBWH_CBEPxpos;MBWH_CBEPypos;MBWH_CBEPzpos" rot="0;0;90-MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_ExtremityPlate" X_Y_Z="MBWH_EPxpos;MBWH_EPypos;MBWH_EPzpos" rot="-90.; 0.;-90-MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_CentralReinforcingbar" X_Y_Z="MBWH_RBxpos;MBWH_RBypos;MBWH_RBzpos" rot="180.; 0.;-90-MBWH_CBEPa1" />
+</composition>
+
+<composition name="MBWH_InnerAssemblyTemp2">
+ <posXYZ volume="MBWH_ConnectionBeamExtremityPlate" X_Y_Z="-MBWH_CBEPxpos;MBWH_CBEPypos;MBWH_CBEPzpos" rot="180;0;90+MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_ExtremityPlate" X_Y_Z="-MBWH_EPxpos;MBWH_EPypos;MBWH_EPzpos" rot="-90.; 0.;-90+MBWH_CBEPa1" />
+ <posXYZ volume="MBWH_CentralReinforcingbar" X_Y_Z="-MBWH_RBxpos;MBWH_RBypos;MBWH_RBzpos" rot="0.; 0.;-90+MBWH_CBEPa1" />
+</composition>
+
+<composition name="MBWH_InnerAssembly">
+ <posXYZ volume="MBWH_TransvBeamCSupLargeSect" X_Y_Z="0;0;0" />
+ <posXYZ volume="MBWH_InnerAssemblyTemp1" />
+ <posXYZ volume="MBWH_InnerAssemblyTemp2" />
+</composition>
+
+
+
+<composition name="MBWH_LargeSector">
+ <posXYZ volume="MBWH_SpokesLargeSectorAssemblyTemp1" />
+ <posXYZ volume="MBWH_SpokesLargeSectorAssemblyTemp2" />
+ <posXYZ volume="MBWH_InnerAssembly" X_Y_Z="0;MBWH_TBCSypos;MBWH_TBCSzpos"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem11" X_Y_Z=" 0.;MBWH_CBLy11;0" rot="0.;90.;0."/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem17" X_Y_Z=" 0.;MBWH_CBLy17;0" rot="0.;90.;0."/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem22" X_Y_Z=" 0.;MBWH_CBLy22;0" rot="0.;90.;0."/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingLargeSectorItem26" X_Y_Z=" 0.;MBWH_CBLy26;0" rot="0.;90.;0."/>
+
+ <posXYZ volume="MBWH_CroisillonBay1LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily10;0" rot="0.;0.;0."/>
+ <posXYZ volume="MBWH_CroisillonBay2LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily15;0" rot="0.;0.;0."/>
+ <posXYZ volume="MBWH_CroisillonBay3LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily21;0" rot="0.;0.;0."/>
+ <posXYZ volume="MBWH_CroisillonBay4LargeSectorRot" X_Y_Z=" 0.;MBWH_Croily25+20;0" rot="0.;0.;0."/>
+</composition>
+
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** Small Sector ****
+ *** ****
+ **************************************************************
+-->
+
+<!-- ATLMHHBM0100 -->
+<!-- Cut profiles Cross Bracing small sector -->
+<var name="MBWH_CBSthi" value="6"/>
+
+<!-- Contreventements lengths -->
+<!-- item numbering in ATLMHHBM0003 -->
+<var name="MBWH_CBSl10" value="1650" /> <!-- item 10 -->
+<var name="MBWH_CBSl14" value="1050" /> <!-- item 14 -->
+<var name="MBWH_CBSl18a" value="533" /> <!-- item 18 -->
+<var name="MBWH_CBSl18b" value="510" /> <!-- item 18 -->
+
+<!-- Contreventements positions (...to be confirmed...) -->
+<var name="MBWH_CBSy10" value="9730" /> <!-- item 10 -->
+<var name="MBWH_CBSy14" value="7760" /> <!-- item 14 -->
+<var name="MBWH_CBSy18" value="5820" /> <!-- item 18 -->
+
+<!-- item numbering in ATLMHHBM0003 -->
+<!-- Cross bracing, bay 1 small sector -->
+<var name="MBWH_CBSl9" value="2625"/> <!-- item 9 --> <!-- drawing ATLMHHBM0047 -->
+<!-- Cross bracing, bay 2 small sector -->
+<var name="MBWH_CBSl11" value="2360"/> <!-- item 11 --> <!-- drawing ATLMHHBM0049 -->
+<!-- Cross bracing, bay 3 small sector -->
+<var name="MBWH_CBSl15" value="2025"/> <!-- item 15 --> <!-- drawing ATLMHHBM0052 -->
+
+<!-- item numbering in ATLMHHBM0003 -->
+<!-- Contreventements, bay 1 small sector -->
+<var name="MBWH_CBSl7" value="1430"/> <!-- item 7 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSl8" value="1120"/> <!-- item 8 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSb1xof" value="6"/> <!-- x offset item 7 & 8 , to be confirmed - see drawing ATLMHHBM0003 -->
+<var name="MBWH_CBSb1yof" value="2"/> <!-- y offset item 7 & 8 , to be confirmed - see drawing ATLMHHBM0003 -->
+
+<!-- Contreventements, bay 2 small sector -->
+<var name="MBWH_CBSl12" value="1360"/> <!-- item 12 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSl13" value="890"/> <!-- item 13 --> <!-- drawing ATLMHHBM0100 -->
+
+<!-- Contreventements, bay 3 small sector -->
+<var name="MBWH_CBSl16" value="1260"/> <!-- item 16 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSl17" value="600"/> <!-- item 17 --> <!-- drawing ATLMHHBM0100 -->
+<var name="MBWH_CBSb3xof" value="8"/> <!-- x offset item 16 & 17, to be confirmed - see drawing ATLMHHBM0003 -->
+<var name="MBWH_CBSb3yof" value="2"/> <!-- y offset item 16 & 17, to be confirmed - see drawing ATLMHHBM0003 -->
+
+<!-- Plates -->
+ <!-- item 9 for Bay 1 --> <!-- drawing ATLMHHBM0057 -->
+<var name="MBWH_CBPS9le" value="300"/> <!-- length -->
+<var name="MBWH_CBPS9wi" value="270"/> <!-- width -->
+<var name="MBWH_CBPS9cu" value="60"/> <!-- cut -->
+<var name="MBWH_CBPS9ti" value="41.2"/> <!-- tilt --> <!-- ????????????? -->
+<var name="MBWH_CBPS9za" value="1311"/> <!-- Plate offset -->
+<var name="MBWH_CBPS9ya" value="-13.3"/> <!-- Plate offset -->
+ <!-- item 11 for Bay 2 --> <!-- drawing ATLMHHBM0049 -->
+<var name="MBWH_CBPS11le" value="260"/> <!-- length -->
+<var name="MBWH_CBPS11wi" value="300"/> <!-- width -->
+<var name="MBWH_CBPS11cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPS11ti" value="52.9"/> <!-- tilt --> <!-- ????????????? -->
+<var name="MBWH_CBPS11za" value="764.9"/> <!-- Plate offset -->
+<var name="MBWH_CBPS11ya" value="32.1"/> <!-- Plate offset w.r.t base -->
+ <!-- item 15 for Bay 3 --> <!-- drawing ATLMHHBM0052 -->
+<var name="MBWH_CBPS15le" value="200"/> <!-- length -->
+<var name="MBWH_CBPS15wi" value="380"/> <!-- width -->
+<var name="MBWH_CBPS15cu" value="20"/> <!-- cut -->
+<var name="MBWH_CBPS15ti" value="65.5"/> <!-- tilt --> <!-- ????????????? -->
+<var name="MBWH_CBPS15za" value="473.8"/> <!-- Plate offset -->
+<var name="MBWH_CBPS15ya" value="26"/> <!-- Plate offset -->
+
+<!-- positions (... measured on ATLMHHBM003 ... to be confirmed ...) -->
+<var name="MBWH_Croisy9" value="10550"/> <!-- item 9 -->
+<var name="MBWH_Croisy11" value="8580"/> <!-- item 11 -->
+<var name="MBWH_Croisy15" value="6520"/> <!-- item 15 -->
+
+<!-- Special Cut profiles cross bracing small sector item 18-->
+<!-- ATLMHHBM0067-->
+<var name="MBWH_CBext18" value="138"/>
+<var name="MBWH_CBhei18" value="35"/>
+<var name="MBWH_CBSthi18" value="5"/>
+
+
+<!-- ATLMHHBM0003B -->
+<!-- Spokes Opening angle small sector -->
+<var name="MBWH_SSangle" value="8.5"/>
+<!-- Y-ref -->
+<var name="MBWH_yref" value="1682.7"/>
+<!-- Inner spoke y position wrt ref -->
+<var name="MBWH_SIypos" value="2252.8"/>
+<!-- External spoke y position wrt ref -->
+<var name="MBWH_SEypos" value="280.7"/>
+
+<!-- Spoke small sector -->
+<!-- Inner spoke small sector ATLMHHBM0085 -->
+<!-- External spoke small sector ATLMHHBM0086 & ATLMHHBM0087 -->
+
+<!-- ATLMHHBM0085 ... -->
+<!-- U profile length Inner spoke -->
+<var name="MBWH_SsiUPlen" value="7680"/>
+<!-- U profile length External spoke -->
+<var name="MBWH_SseUPlen" value="9530"/>
+<!-- U profile Inner spoke extremity cut height -->
+<var name="MBWH_SsiUPhcu" value="12"/>
+
+
+<!-- ATLMHHBM0085 -->
+<!-- relative positions of reinforcing bars -->
+<var name="MBWH_SssRBdz1" value="2575"/>
+<var name="MBWH_SssRBdz2" value="2055"/>
+<var name="MBWH_SssRBdz3" value="2250"/>
+
+<!-- Spoke Reinforcing Bar 1 and 2 -->
+<var name="MBWH_SRBthi" value="25"/>
+
+<!-- ATLMHHBM0054 -->
+<!-- Spoke Reinforcing Bar 1 -->
+<var name="MBWH_SRB1dx1" value="962"/>
+<var name="MBWH_SRB1dx2" value="1765"/>
+<var name="MBWH_SRB1dx3" value="81"/>
+<var name="MBWH_SRB1dx4" value="1712"/>
+<var name="MBWH_SRB1dy1" value="150"/>
+<var name="MBWH_SRB1dy2" value="440"/>
+<var name="MBWH_SRB1dy3" value="180"/>
+<var name="MBWH_SRB1alph" value="39"/>
+<var name="MBWH_SRB1ypos" value="2910"/>
+
+<!-- ATLMHHBM0058 -->
+<!-- Spoke Reinforcing Bar 2 -->
+<var name="MBWH_SRB2dx1" value="2474"/>
+<var name="MBWH_SRB2dx2" value="2429"/>
+<var name="MBWH_SRB2dy" value="152"/>
+<var name="MBWH_SRB2ypos" value="5020"/>
+
+
+<!-- Cut profiles cross bracing small sector -->
+<!-- Derived variables -->
+<var name="MBWH_CBSxa" value="MBWH_CBext/2." />
+<var name="MBWH_CBSya" value="0." />
+<var name="MBWH_CBSxb" value="MBWH_CBSxa" />
+<var name="MBWH_CBSyb" value="MBWH_CBhei" />
+<var name="MBWH_CBSxc" value="MBWH_CBSxb-MBWH_CBSthi" />
+<var name="MBWH_CBSyc" value="MBWH_CBSyb" />
+<var name="MBWH_CBSxd" value="MBWH_CBSxc" />
+<var name="MBWH_CBSyd" value="MBWH_CBSthi" />
+<!-- Derived variables for special item 18 -->
+<var name="MBWH_CBS18xa" value="MBWH_CBext18/2." />
+<var name="MBWH_CBS18ya" value="0." />
+<var name="MBWH_CBS18xb" value="MBWH_CBS18xa" />
+<var name="MBWH_CBS18yb" value="MBWH_CBhei18" />
+<var name="MBWH_CBS18xc" value="MBWH_CBS18xb-MBWH_CBSthi18" />
+<var name="MBWH_CBS18yc" value="MBWH_CBS18yb" />
+<var name="MBWH_CBS18xd" value="MBWH_CBS18xc" />
+<var name="MBWH_CBS18yd" value="MBWH_CBSthi18" />
+
+<var name="MBWH_CBSy18b" value="MBWH_CBSy18-MBWH_CBhei18" />
+
+<!-- Modelization -->
+
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem10" material="Aluminium1" dZ="MBWH_CBSl10">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem14" material="Aluminium1" dZ="MBWH_CBSl14">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem18a" material="Aluminium1" dZ="MBWH_CBSl18a">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem18b" material="Aluminium1" dZ="MBWH_CBSl18b">
+ <gvxy_point X_Y="MBWH_CBS18xa;MBWH_CBS18ya"/>
+ <gvxy_point X_Y="MBWH_CBS18xb;MBWH_CBS18yb"/>
+ <gvxy_point X_Y="MBWH_CBS18xc;MBWH_CBS18yc"/>
+ <gvxy_point X_Y="MBWH_CBS18xd;MBWH_CBS18yd"/>
+</gvxysx>
+
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem9" material="Aluminium1" dZ="MBWH_CBSl9">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem11" material="Aluminium1" dZ="MBWH_CBSl11">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem15" material="Aluminium1" dZ="MBWH_CBSl15">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+
+<!-- Contreventements, bay 1 small sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem7" material="Aluminium1" dZ="MBWH_CBSl7">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem8" material="Aluminium1" dZ="MBWH_CBSl8">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 2 small sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem12" material="Aluminium1" dZ="MBWH_CBSl12">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem13" material="Aluminium1" dZ="MBWH_CBSl13">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+<!-- Contreventements, bay 3 small sector -->
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem16" material="Aluminium1" dZ="MBWH_CBSl16">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+<gvxysx name="MBWH_CutProfilesCrossBracingSmallSectorItem17" material="Aluminium1" dZ="MBWH_CBSl17">
+ <gvxy_point X_Y="MBWH_CBSxa;MBWH_CBSya"/>
+ <gvxy_point X_Y="MBWH_CBSxb;MBWH_CBSyb"/>
+ <gvxy_point X_Y="MBWH_CBSxc;MBWH_CBSyc"/>
+ <gvxy_point X_Y="MBWH_CBSxd;MBWH_CBSyd"/>
+</gvxysx>
+
+
+
+<!-- cross bracing Plates small sector -->
+
+<!-- Bay 1 -->
+<var name="MBWH_CBPS9x1" value="MBWH_CBPS9le/2." />
+<var name="MBWH_CBPS9y1" value="MBWH_CBPS9wi/2.-MBWH_CBPS9cu" />
+<var name="MBWH_CBPS9x2" value="MBWH_CBPS9x1-MBWH_CBPS9cu" />
+<var name="MBWH_CBPS9y2" value="MBWH_CBPS9wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateSmallSectorItem9" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPS9x1;MBWH_CBPS9y1"/>
+ <gvxy_point X_Y="MBWH_CBPS9x2;MBWH_CBPS9y2"/>
+</gvxysxy>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBPS11x1" value="MBWH_CBPS11le/2." />
+<var name="MBWH_CBPS11y1" value="MBWH_CBPS11wi/2.-MBWH_CBPS11cu" />
+<var name="MBWH_CBPS11x2" value="MBWH_CBPS11x1-MBWH_CBPS11cu" />
+<var name="MBWH_CBPS11y2" value="MBWH_CBPS11wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateSmallSectorItem11" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPS11x1;MBWH_CBPS11y1"/>
+ <gvxy_point X_Y="MBWH_CBPS11x2;MBWH_CBPS11y2"/>
+</gvxysxy>
+
+<!-- Bay 3 -->
+<var name="MBWH_CBPS15x1" value="MBWH_CBPS15le/2." />
+<var name="MBWH_CBPS15y1" value="MBWH_CBPS15wi/2.-MBWH_CBPS15cu" />
+<var name="MBWH_CBPS15x2" value="MBWH_CBPS15x1-MBWH_CBPS15cu" />
+<var name="MBWH_CBPS15y2" value="MBWH_CBPS15wi/2." />
+<gvxysxy name="MBWH_CrossBracingPlateSmallSectorItem15" material="Aluminium1" dZ="MBWH_CBPth">
+ <gvxy_point X_Y="MBWH_CBPS15x1;MBWH_CBPS15y1"/>
+ <gvxy_point X_Y="MBWH_CBPS15x2;MBWH_CBPS15y2"/>
+</gvxysxy>
+
+
+<!-- Bay 1 -->
+<var name="MBWH_CBS9z" value="MBWH_CBSl9/2." />
+<var name="MBWH_CBPS9d" value="MBWH_CBPS9wi-2.*MBWH_CBPS9cu" />
+<var name="MBWH_CBPS9zb" value="MBWH_CBPS9za+sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9d/2." />
+<var name="MBWH_CBPS9ya" value="MBWH_CBPS9cu*sqrt(2.)*cos((45-MBWH_CBPS9ti)*GENV_PiS180) -MBWH_CBhei+MBWH_CBPS9ya" />
+<var name="MBWH_CBPS9yb" value="-MBWH_CBPS9ya-cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9d/2." />
+<var name="MBWH_CBPS9zc" value="MBWH_CBPS9zb+cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9le/2" />
+<var name="MBWH_CBPS9yc" value="MBWH_CBPS9yb+sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBPS9le/2" />
+ <!-- get positions of contreventements 7,8 using locations of item 9 extremities -->
+<var name="MBWH_cvs9xo" value="-MBWH_CBPS9zc*cos(MBWH_CBPS9ti*GENV_PiS180)-0.5*(MBWH_CBhei)*sin(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvs9yo" value=" MBWH_CBPS9zc*sin(MBWH_CBPS9ti*GENV_PiS180)-0.5*(MBWH_CBhei)*cos(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvs9xu" value="MBWH_cvs9xo+MBWH_CBSl9*cos(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvs9yu" value="MBWH_cvs9yo-MBWH_CBSl9*sin(MBWH_CBPS9ti*GENV_PiS180)" />
+<var name="MBWH_cvsx8" value="-MBWH_cvs9xu+cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl8/2.-MBWH_CBSb1xof" />
+<var name="MBWH_cvsy8" value=" MBWH_cvs9yu+sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl8/2.-MBWH_CBSb1yof" />
+<var name="MBWH_cvsx7" value="-MBWH_cvs9xo-cos(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl7/2.-MBWH_CBSb1xof" />
+<var name="MBWH_cvsy7" value=" MBWH_cvs9yo-sin(MBWH_CBPS9ti*GENV_PiS180)*MBWH_CBSl7/2.-MBWH_CBSb1yof" />
+
+<composition name="MBWH_CrossBracingPlateSmallSectorItem9Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem9" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay1SmallSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem9" X_Y_Z="0;0;MBWH_CBS9z" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem9Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPS9yc;MBWH_CBPS9zc" rot="-MBWH_CBPS9ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem9Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPS9yc;MBWH_CBPS9zc" rot="-MBWH_CBPS9ti;0;0"/>
+</composition>
+<composition name="MBWH_CroisillonBay1SmallSector">
+ <posXYZ volume="MBWH_CrossBracingBay1SmallSector" X_Y_Z="0;-MBWH_CBPS9yc;-MBWH_CBPS9zc" />
+</composition>
+<composition name="MBWH_CroisillonBay1SmallSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay1SmallSector" rot="MBWH_CBPS9ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem7" X_Y_Z="MBWH_cvsx7;MBWH_cvsy7;0" rot="-MBWH_CBPS9ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem8" X_Y_Z="MBWH_cvsx8;MBWH_cvsy8;0" rot="-MBWH_CBPS9ti;90;0" />
+</composition>
+
+<!-- Bay 2 -->
+<var name="MBWH_CBS11z" value="MBWH_CBSl11/2." />
+<var name="MBWH_CBPS11d" value="MBWH_CBPS11le-2.*MBWH_CBPS11cu" />
+<var name="MBWH_CBPS11zb" value="MBWH_CBPS11za+cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11d/2." />
+<var name="MBWH_CBPS11yb" value="MBWH_CBPS11ya+sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11d/2." />
+<var name="MBWH_CBPS11zc" value="MBWH_CBPS11zb+sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11wi/2" />
+<var name="MBWH_CBPS11yc" value="MBWH_CBPS11yb-cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBPS11wi/2" />
+ <!-- get positions of contreventements 13, 12 using locations of item 11 extremities -->
+<var name="MBWH_cvs11xo" value="-(MBWH_CBSl11-MBWH_CBPS11zc)*cos(MBWH_CBPS11ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS11yc)*sin(MBWH_CBPS11ti*GENV_PiS180)"/>
+<var name="MBWH_cvs11yo" value=" (MBWH_CBSl11-MBWH_CBPS11zc)*sin(MBWH_CBPS11ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS11yc)*cos(MBWH_CBPS11ti*GENV_PiS180)"/>
+<var name="MBWH_cvs11xu" value="MBWH_cvs11xo+MBWH_CBSl11*cos(MBWH_CBPS11ti*GENV_PiS180)" />
+<var name="MBWH_cvs11yu" value="MBWH_cvs11yo-MBWH_CBSl11*sin(MBWH_CBPS11ti*GENV_PiS180)" />
+<var name="MBWH_cvsx13" value="-MBWH_cvs11xu+cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl13/2." />
+<var name="MBWH_cvsy13" value=" MBWH_cvs11yu+sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl13/2." />
+<var name="MBWH_cvsx12" value="-MBWH_cvs11xo-cos(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl12/2." />
+<var name="MBWH_cvsy12" value=" MBWH_cvs11yo-sin(MBWH_CBPS11ti*GENV_PiS180)*MBWH_CBSl12/2." />
+
+<composition name="MBWH_CrossBracingPlateSmallSectorItem11Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem11" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay2SmallSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem11" X_Y_Z="0;MBWH_CBhei;MBWH_CBS11z" rot="0.;0.;180" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem11Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPS11yc;MBWH_CBPS11zc" rot="-MBWH_CBPS11ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem11Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPS11yc;MBWH_CBPS11zc" rot="-MBWH_CBPS11ti;0;0"/>
+</composition>
+
+<composition name="MBWH_CroisillonBay2SmallSector">
+ <posXYZ volume="MBWH_CrossBracingBay2SmallSector" X_Y_Z="0;-MBWH_CBPS11yc;-MBWH_CBPS11zc" />
+</composition>
+<composition name="MBWH_CroisillonBay2SmallSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay2SmallSector" rot="MBWH_CBPS11ti;90;180" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem13" X_Y_Z="MBWH_cvsx13;MBWH_cvsy13;0" rot="-MBWH_CBPS11ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem12" X_Y_Z="MBWH_cvsx12;MBWH_cvsy12;0" rot="-MBWH_CBPS11ti;90;0" />
+</composition>
+
+
+
+<!-- Bay 3 -->
+<var name="MBWH_CBS15z" value="MBWH_CBSl15/2." />
+<var name="MBWH_CBPS15d" value="MBWH_CBPS15le-2.*MBWH_CBPS15cu" />
+<var name="MBWH_CBPS15zb" value="MBWH_CBPS15za+cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15d/2." />
+<var name="MBWH_CBPS15yb" value="MBWH_CBPS15ya+sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15d/2." />
+<var name="MBWH_CBPS15zc" value="MBWH_CBPS15zb+sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15wi/2" />
+<var name="MBWH_CBPS15yc" value="MBWH_CBPS15yb-cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBPS15wi/2" />
+ <!-- get positions of contreventements 16, 17 using locations of item 15 extremities -->
+<var name="MBWH_cvs15xo" value="-(MBWH_CBSl15-MBWH_CBPS15zc)*cos(MBWH_CBPS15ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS15yc)*sin(MBWH_CBPS15ti*GENV_PiS180)"/>
+<var name="MBWH_cvs15yo" value=" (MBWH_CBSl15-MBWH_CBPS15zc)*sin(MBWH_CBPS15ti*GENV_PiS180)-(MBWH_CBhei-MBWH_CBPS15yc)*cos(MBWH_CBPS15ti*GENV_PiS180)"/>
+<var name="MBWH_cvs15xu" value="MBWH_cvs15xo+MBWH_CBSl15*cos(MBWH_CBPS15ti*GENV_PiS180)" />
+<var name="MBWH_cvs15yu" value="MBWH_cvs15yo-MBWH_CBSl15*sin(MBWH_CBPS15ti*GENV_PiS180)" />
+<var name="MBWH_cvsx17" value="-MBWH_cvs15xu+cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl17/2.-MBWH_CBSb3xof" />
+<var name="MBWH_cvsy17" value=" MBWH_cvs15yu+sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl17/2.-MBWH_CBSb3yof" />
+<var name="MBWH_cvsx16" value="-MBWH_cvs15xo-cos(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl16/2.-MBWH_CBSb3xof" />
+<var name="MBWH_cvsy16" value=" MBWH_cvs15yo-sin(MBWH_CBPS15ti*GENV_PiS180)*MBWH_CBSl16/2.-MBWH_CBSb3yof" />
+
+<composition name="MBWH_CrossBracingPlateSmallSectorItem15Rot">
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem15" rot="0.;90.;0" />
+</composition>
+<composition name="MBWH_CrossBracingBay3SmallSector">
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem15" X_Y_Z="0;MBWH_CBhei;MBWH_CBS15z" rot="0.;0.;180" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem15Rot" X_Y_Z="-MBWH_CBPx;MBWH_CBPS15yc;MBWH_CBPS15zc" rot="-MBWH_CBPS15ti;0;0" />
+ <posXYZ volume="MBWH_CrossBracingPlateSmallSectorItem15Rot" X_Y_Z=" MBWH_CBPx;MBWH_CBPS15yc;MBWH_CBPS15zc" rot="-MBWH_CBPS15ti;0;0"/>
+</composition>
+
+<composition name="MBWH_CroisillonBay3SmallSector">
+ <posXYZ volume="MBWH_CrossBracingBay3SmallSector" X_Y_Z="0;-MBWH_CBPS15yc;-MBWH_CBPS15zc" />
+</composition>
+<composition name="MBWH_CroisillonBay3SmallSectorRot">
+ <posXYZ volume="MBWH_CroisillonBay3SmallSector" rot="MBWH_CBPS15ti;90;180" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem16" X_Y_Z="MBWH_cvsx16;MBWH_cvsy16;0" rot="-MBWH_CBPS15ti;90;0" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem17" X_Y_Z="MBWH_cvsx17;MBWH_cvsy17;0" rot="-MBWH_CBPS15ti;90;0" />
+</composition>
+
+
+
+
+
+
+<!-- Derived variables -->
+<!-- positions of reinforcing bars -->
+<var name="MBWH_SssRBpz1" value="MBWH_SsiUPlen/2.-MBWH_SssRBdz1-MBWH_SRBhos/2."/>
+<var name="MBWH_SssRBpz2" value="MBWH_SssRBpz1-MBWH_SssRBdz2"/>
+<var name="MBWH_SssRBpz3" value="MBWH_SssRBpz2-MBWH_SssRBdz3"/>
+
+<!-- Relative positions of spokes -->
+<var name="MBWH_SssIxpos" value="MBWH_SRBpx+MBWH_SUPext/2.+MBWH_RBBthi+MBWH_RBSthi/2." />
+<var name="MBWH_SssIypos" value="-MBWH_RBSlen+MBWH_RBBsiz" />
+<var name="MBWH_SssIzof1" value="-(MBWH_SseUPlen-MBWH_SsiUPlen)/2." />
+<var name="MBWH_SssIzof2" value=" MBWH_SssIypos*tan(MBWH_SSangle*GENV_PiS180)+(MBWH_SIypos-MBWH_SEypos)/cos(MBWH_SSangle*GENV_PiS180)" />
+<var name="MBWH_SssIzpos" value="MBWH_SssIzof1+MBWH_SssIzof2" />
+
+<!-- inner spokes position -->
+<var name="MBWH_SssIxref" value="0.5*MBWH_SsiUPlen*sin(MBWH_SSangle*GENV_PiS180)+(MBWH_SUPhei-MBWH_SsiUPhcu)*cos(MBWH_SSangle*GENV_PiS180)"/>
+<var name="MBWH_Sssypos" value="MBWH_yref+MBWH_SIypos+0.5*MBWH_SsiUPlen*cos(MBWH_SSangle*GENV_PiS180) "/>
+
+<!-- Inner spoke small sector -->
+
+<gvxysx name="MBWH_InnerSpokeSmallSectorUprofile" material="Aluminium4" dZ="MBWH_SsiUPlen-180">
+ <gvxy_point X_Y="MBWH_SUPxa;MBWH_SUPya"/>
+ <gvxy_point X_Y="MBWH_SUPxb;MBWH_SUPyb"/>
+ <gvxy_point X_Y="MBWH_SUPxc;MBWH_SUPyc"/>
+ <gvxy_point X_Y="MBWH_SUPxd;MBWH_SUPyd"/>
+</gvxysx>
+
+<!-- External spoke small sector -->
+
+<gvxysx name="MBWH_ExternalSpokeSmallSectorUprofile" material="Aluminium4" dZ="MBWH_SseUPlen">
+ <gvxy_point X_Y="MBWH_SUPxa;MBWH_SUPya"/>
+ <gvxy_point X_Y="MBWH_SUPxb;MBWH_SUPyb"/>
+ <gvxy_point X_Y="MBWH_SUPxc;MBWH_SUPyc"/>
+ <gvxy_point X_Y="MBWH_SUPxd;MBWH_SUPyd"/>
+</gvxysx>
+
+<!-- Spoke Reinforcing Bar 1 -->
+<var name="MBWH_SRB1x1" value="MBWH_SRB1dx1/2"/>
+<var name="MBWH_SRB1y1" value="0"/>
+<var name="MBWH_SRB1x3" value="MBWH_SRB1dx2/2"/>
+<var name="MBWH_SRB1y3" value="MBWH_SRB1dy3-MBWH_SRB1dy2"/>
+<var name="MBWH_SRB1x2" value="MBWH_SRB1x3-MBWH_SRB1dx3"/>
+<var name="MBWH_SRB1y2" value="MBWH_SRB1y3"/>
+<var name="MBWH_SRB1x4" value="MBWH_SRB1dx4/2"/>
+<var name="MBWH_SRB1y4" value="-MBWH_SRB1dy2"/>
+<var name="MBWH_SRB1x6" value="MBWH_SRB1x1-MBWH_SRB1dy1*tan(0.5*MBWH_SRB1alph*GENV_PiS180)"/>
+<var name="MBWH_SRB1y6" value="-MBWH_SRB1dy1"/>
+<var name="MBWH_SRB1x5" value="MBWH_SRB1x6+(MBWH_SRB1dy2-MBWH_SRB1dy1)/tan(MBWH_SRB1alph*GENV_PiS180)"/>
+<var name="MBWH_SRB1y5" value="MBWH_SRB1y4"/>
+
+<var name="MBWH_SRB1zpos" value="MBWH_SssIxpos-MBWH_CBext/2.-MBWH_SRBthi"/>
+
+<gvxysx name="MBWH_SpokeReinforcingBar1SmallSector" material="Aluminium1" dZ="MBWH_SRBthi">
+ <gvxy_point X_Y="MBWH_SRB1x1;MBWH_SRB1y1"/>
+ <gvxy_point X_Y="MBWH_SRB1x2;MBWH_SRB1y2"/>
+ <gvxy_point X_Y="MBWH_SRB1x3;MBWH_SRB1y3"/>
+ <gvxy_point X_Y="MBWH_SRB1x4;MBWH_SRB1y4"/>
+ <gvxy_point X_Y="MBWH_SRB1x5;MBWH_SRB1y5"/>
+ <gvxy_point X_Y="MBWH_SRB1x6;MBWH_SRB1y6"/>
+</gvxysx>
+
+<!-- Spoke Reinforcing Bar 1 -->
+<var name="MBWH_SRB2x1" value="MBWH_SRB2dx1/2"/>
+<var name="MBWH_SRB2y1" value="0"/>
+<var name="MBWH_SRB2x2" value="MBWH_SRB2dx2/2"/>
+<var name="MBWH_SRB2y2" value="-MBWH_SRB2dy"/>
+
+<var name="MBWH_SRB2zpos" value="MBWH_SssIxpos-MBWH_CBext/2.-MBWH_SRBthi"/>
+
+<gvxysx name="MBWH_SpokeReinforcingBar2SmallSector" material="Aluminium1" dZ="MBWH_SRBthi">
+ <gvxy_point X_Y="MBWH_SRB2x1;MBWH_SRB2y1"/>
+ <gvxy_point X_Y="MBWH_SRB2x2;MBWH_SRB2y2"/>
+</gvxysx>
+
+
+<composition name="MBWH_SpokesSmallSectorAssembly1">
+ <posXYZ volume="MBWH_InnerSpokeSmallSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SssRBpz1" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SssRBpz2" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;MBWH_SssRBpz3" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ExternalSpokeSmallSectorUprofile" X_Y_Z=" MBWH_SssIxpos;MBWH_SssIypos;MBWH_SssIzpos"/>
+</composition>
+
+<composition name="MBWH_SpokesSmallSectorAssembly2">
+ <posXYZ volume="MBWH_InnerSpokeSmallSectorUprofile"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SssRBpz1" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SssRBpz2" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ReinforcingBar" X_Y_Z=" MBWH_SRBpx;MBWH_SRBpy;-MBWH_SssRBpz3" rot="0;0;90"/>
+ <posXYZ volume="MBWH_ExternalSpokeSmallSectorUprofile" X_Y_Z=" MBWH_SssIxpos;MBWH_SssIypos;-MBWH_SssIzpos"/>
+</composition>
+
+<composition name="MBWH_SpokesSmallSectorAssemblyTemp1">
+ <posXYZ volume="MBWH_SpokesSmallSectorAssembly1" X_Y_Z="MBWH_SssIxref;MBWH_Sssypos;0" rot="0.; -90.;90-MBWH_SSangle" />
+</composition>
+
+<composition name="MBWH_SpokesSmallSectorAssemblyTemp2">
+ <posXYZ volume="MBWH_SpokesSmallSectorAssembly2" X_Y_Z="-MBWH_SssIxref;MBWH_Sssypos;0" rot="180.; -90.;90+MBWH_SSangle" />
+</composition>
+
+<composition name="MBWH_SmallSector">
+ <posXYZ volume="MBWH_SpokesSmallSectorAssemblyTemp1" />
+ <posXYZ volume="MBWH_SpokesSmallSectorAssemblyTemp2" />
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem10" X_Y_Z="0;MBWH_CBSy10-5.;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem14" X_Y_Z="0;MBWH_CBSy14;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem18a" X_Y_Z="0;MBWH_CBSy18;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CutProfilesCrossBracingSmallSectorItem18b" X_Y_Z="0;MBWH_CBSy18b;0" rot="0;90;0"/>
+ <posXYZ volume="MBWH_CroisillonBay1SmallSectorRot" X_Y_Z="0;MBWH_Croisy9;0"/>
+ <posXYZ volume="MBWH_CroisillonBay2SmallSectorRot" X_Y_Z="0;MBWH_Croisy11;0" rot="0;180;0"/>
+ <posXYZ volume="MBWH_CroisillonBay3SmallSectorRot" X_Y_Z="0;MBWH_Croisy15;0"/>
+ <posXYZ volume="MBWH_SpokeReinforcingBar1SmallSector" X_Y_Z="0;MBWH_SRB1ypos;MBWH_SRB1zpos-2.6"/>
+ <posXYZ volume="MBWH_SpokeReinforcingBar2SmallSector" X_Y_Z="0;MBWH_SRB2ypos;MBWH_SRB2zpos-2.6"/>
+</composition>
+
+
+<!--
+ **************************************************************
+ *** ****
+ *** Big Wheel Assembly ****
+ *** ****
+ **************************************************************
+-->
+
+<var name="MBWH_zposS" value="MBWH_zposL+MBWH_SlsIxpos" />
+
+<composition name="MBWH_BigWheelOctant">
+ <posXYZ volume="MBWH_SmallSector" X_Y_Z=" 0.;0.;MBWH_zposS" rot="0.;180.;22.5"/>
+ <posXYZ volume="MBWH_LargeSector" X_Y_Z=" 0.;0.;MBWH_zposL" rot="0.;180.;0."/>
+</composition>
+
+<array name="MBWH_BWOA" values="-90;-45;0;45;90;135;180;225" /> <!-- octant angles -->
+
+<composition name="MBWH_BigWheel">
+ <foreach index="I" begin="0" loops="8" >
+ <posXYZ volume="MBWH_BigWheelOctant" rot="0.;0.;MBWH_BWOA[I]"/>
+ </foreach>
+</composition>
+
+<composition name="MBWH_BigWheels">
+ <posXYZ volume="MBWH_BigWheel"/>
+ <posXYZ volume="MBWH_BigWheel" rot="0.;180.;0."/>
+</composition>
+
+</section>
+
+<section name = "Calorimeter Saddle"
+ version = "7.0"
+ date = "9 May 2006"
+ author = "Daniel Pomarede"
+ top_volume = "SADL_CalorimeterSaddle">
+
+<!-- name = Calorimeter Saddle section name = "Supports" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** Calorimeter Saddle ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+
+
+
+<!-- Andrei Table need for the structure missing in Oracle table -->
+<var name="SADL_numboxes" value="12"/>
+<var name="SADL_numbreps" value="1"/>
+<var name="SADL_numtubes" value="4"/>
+<var name="SADL_NumEmTubesBrep" value="1"/>
+<var name="SADL_Gusset_tubecut" value="0"/>
+<var name="SADL_num_Gusset_vol" value="12"/>
+<var name="SADL_numbreppoint" value="10"/>
+<var name="SADL_SymX" value="1"/>
+<var name="SADL_SymY" value="0"/>
+<var name="SADL_SymZ" value="1"/>
+<var name="PiDegOver4" value=" 45"/>
+<var name="PiDegOver2" value=" 90"/>
+<var name="Pideg" value="180"/>
+<var name="2Pideg" value="360"/>
+<var name="SADL_Stzrot" value="45"/>
+<var name="SADL_Stzrotmoins" value="-45"/>
+<!--SaddleBOVN -->
+<var name="SADL_BoxBeam_numHPlateVol" value="1"/>
+<var name="SADL_BoxBeam_numVPlateVol" value="2"/>
+<var name="SADL_numConnGussetBBeamVol" value="4"/>
+<var name="SADL_numStiffenerVol" value="4"/>
+<var name="SADL_numBarrelBlocking_JackVol" value="4"/>
+<array name="SADL_SymBoxBeam" values="1;0;0"/>
+<array name="SADL_SymExtendedBoxBeam" values="1;0;1"/>
+<array name="SADL_SymConnGussetBBeam" values="1;0;1"/>
+<array name="SADL_SymStiffener" values="1;0;1"/>
+<array name="SADL_SymBarrel_Blocking_Jack" values="1;0;1"/>
+<array name="SADL_Material" values="1;2"/> <!-- 1=Iron, 2=Aluminium-->
+<array name="SADL_EmptyVolBoxBeam" values="0;0;0"/> <!--values="NUMEMBO(number empty boxes);NUMEMTU(tubes);NUMEMBR(breps)"-->
+<array name="SADL_EmptyVolExtendedBoxBeam" values="0;0;0"/>
+<array name="SADL_EmptyVolConnGussetBBeam" values="0;0;0"/>
+<array name="SADL_EmptyVolStiffener" values="0;0;0"/>
+<array name="SADL_EmptyVolBarrel_Blocking_Jack" values="0;0;0"/>
+<!--SaddleTUVN -->
+<var name="SADL_RoundedSupport" value="2"/>
+<var name="SAD_Barrel_Blocking_Jack_Cylinder" value="4"/>
+<array name="SADL_SymRoundedSupport" values="1;0;1"/>
+<array name="SADL_SymBarrel_Blocking_Jack_Cylinder" values="1;0;1"/>
+<array name="SADL_EmptyVolRoundedSupport" values="0;0;0"/>
+<array name="SADL_EmptyVolBarrel_Blocking_Jack_Cylinder" values="0;0;0"/>
+
+
+
+<!-- for box -->
+<var name="SADL_BoxBeam_HPlate_vol" value="1"/>
+<var name="SADL_BoxBeam_VPlate_vol" value="2"/>
+<var name="SADL_ConnGussetBBeam_vol" value="4"/>
+<var name="SADL_ConnGussetBBeam_VPlate_vol" value="2"/>
+
+<!-- END -->
+
+<!-- ATLLBUS_0019 -->
+<var name="SADL_BxBLen" value="6200"/>
+<var name="SADL_BxBWid" value="520"/>
+<var name="SADL_BxBHei" value="360"/>
+<var name="SADL_BxBHThi1" value="90"/>
+<var name="SADL_BxBHThi2" value="40"/>
+<var name="SADL_BxBVThi" value="60"/>
+<!-- ATLLBUS_0003 -->
+<var name="SADL_BxBxref" value="2740"/>
+<var name="SADL_BxByref" value="4000"/>
+
+<!-- Extended Barrel Box Beam -->
+
+<!-- ATLLEUS_0002 -->
+<var name="SADL_BxBELen" value="3355"/>
+<var name="SADL_EBxBzpos" value="4832.5"/>
+
+<!-- Rounded Support -->
+
+<!-- ATLLBUS_0006 & ATLLBUS_0009 & ATLLBUS_0012 & ATLLBUS_0015 -->
+<var name="SADL_RSprof1" value="301.8"/>
+<var name="SADL_RSprof2" value="32"/>
+<var name="SADL_RSLenAC" value="731"/>
+<var name="SADL_RSLenBD" value="746"/>
+<var name="SADL_RSrin" value="4240"/>
+<var name="SADL_RSrout" value="4310"/>
+
+<!-- Gusset -->
+
+<!-- ATLLBUS_0005 -->
+<var name="SADL_GudZ" value="70"/>
+<var name="SADL_GualphA" value="31"/>
+<var name="SADL_GualphE" value="22.5"/>
+<var name="SADL_GuthicAB" value="61"/>
+<var name="SADL_GuthicBC" value="63.6"/>
+<var name="SADL_GudyAF" value="252"/>
+<var name="SADL_GudxAF" value="443.8"/>
+<var name="SADL_GudxEF" value="55"/>
+<var name="SADL_GudxFJ" value="1087.7"/>
+<var name="SADL_GudyAJ" value="1634.3"/>
+<var name="SADL_GudyFG" value="430"/>
+<var name="SADL_GudxGH" value="510"/>
+<var name="SADL_GudxFI" value="1125.5"/>
+<var name="SADL_GudyHI" value="1440.6"/>
+
+<!-- ATLLBUS_0006 -->
+<var name="SADL_Guposxg" value="2715"/>
+<var name="SADL_Guposyg" value="-3485"/>
+
+<!-- ATLLBUS_0006 -->
+<var name="SADL_Gussdz1" value="265"/>
+<var name="SADL_Gussdz2" value="280"/>
+
+<!-- Connection Gusset / Box Beam -->
+<!-- ATLLBUS_0006 & ATLLBUS_0007 -->
+<var name="SADL_CGBBthi" value="25"/>
+<var name="SADL_CGBBlen" value="870"/>
+<var name="SADL_CGBBHwid" value="545"/>
+<var name="SADL_CGBBVwid" value="400"/>
+
+<!-- Stiffener -->
+<!-- ATLLBUS_0018 & ATLLEUS_0021 -->
+
+<var name="SADL_StifLen" value="1149"/>
+<!-- extremity plate -->
+<var name="SADL_StEPwid" value="152"/>
+<var name="SADL_StEPthi" value="15"/>
+<!-- tube-square -->
+<var name="SADL_StTUthi" value="10"/>
+<var name="SADL_StTUext" value="100"/>
+
+<!-- Doublet -->
+<!-- ATLLBUS_0003 -->
+<var name="SADL_SaddZmax" value="2820"/> <!-- Gusset surface is in this plane -->
+<!-- ATLLEUS_0002 -->
+<var name="SADL_ESadZmax" value="6150"/> <!-- Gusset surface is in this plane -->
+
+<!-- stiffener position -->
+<!-- ATLLBUS_0008 -->
+<var name="SADL_Stxpos" value=" 3362"/>
+<var name="SADL_Stypos" value="-2910"/>
+
+<!-- Barrel Blocking Jacks -->
+<!-- Barrel Blocking Jacks positions -->
+<array name="SADL_BlJazpos" values="529;2369;3989;5789" />
+<var name="SADL_BlJaypos" value="-4390+50"/> <!-- added 50 for the modification of SADL_BBJSCthi (few lines below)-->
+<var name="SADL_BlJaxpos" value="3000"/>
+
+<var name="SADL_BBJPlen" value="520"/>
+<var name="SADL_BBJPwid" value="360"/>
+<var name="SADL_BBJPthi" value="45"/>
+
+<var name="SADL_BBJBCthi" value="290"/>
+<var name="SADL_BBJBCrad" value="152"/>
+<var name="SADL_BBJSCthi" value="5"/> <!-- modified from 55 to 5 to avoid overlap -->
+<var name="SADL_BBJSCrad" value="98"/>
+
+
+
+<!-- Derived variables -->
+
+<!-- Box Beam -->
+
+<var name="SADL_BxBHyp1" value="-SADL_BxBHei/2.-SADL_BxBHThi1/2."/>
+<var name="SADL_BxBHyp2" value="SADL_BxBHei/2.+SADL_BxBHThi2/2."/>
+<var name="SADL_BxBVxpos" value="SADL_BxBWid/2.-SADL_BxBVThi/2."/>
+
+<!-- Gusset -->
+
+<var name="SADL_Guxa" value="0"/>
+<var name="SADL_Guya" value="0"/>
+<var name="SADL_Guxb" value="SADL_Guxa+SADL_GuthicAB*sin(SADL_GualphA*GENV_PiS180)"/>
+<var name="SADL_Guyb" value="SADL_Guya-SADL_GuthicAB*cos(SADL_GualphA*GENV_PiS180)"/>
+<var name="SADL_Guxc" value="SADL_Guxb+SADL_GuthicBC/tan(SADL_GualphA*GENV_PiS180)"/>
+<var name="SADL_Guyc" value="SADL_Guyb+SADL_GuthicBC"/>
+
+<var name="SADL_Guxf" value="SADL_Guxa+SADL_GudxAF"/>
+<var name="SADL_Guyf" value="SADL_Guya-SADL_GudyAF"/>
+<var name="SADL_Guxe" value="SADL_Guxf-SADL_GudxEF"/>
+<var name="SADL_Guye" value="SADL_Guyf"/>
+<var name="SADL_Guyd" value="SADL_Guyc"/>
+<var name="SADL_Guxd" value="SADL_Guxe-(SADL_Guyd-SADL_Guye)*tan(SADL_GualphE*GENV_PiS180)"/>
+<var name="SADL_Guxg" value="SADL_Guxf"/>
+<var name="SADL_Guyg" value="SADL_Guyf+SADL_GudyFG"/>
+<var name="SADL_Guxh" value="SADL_Guxg+SADL_GudxGH"/>
+<var name="SADL_Guyh" value="SADL_Guyg"/>
+
+<var name="SADL_Guxi" value="SADL_Guxf+SADL_GudxFI"/>
+<var name="SADL_Guyi" value="SADL_Guyh+SADL_GudyHI"/>
+<var name="SADL_Guxj" value="SADL_Guxf+SADL_GudxFJ"/>
+<var name="SADL_Guyj" value="SADL_Guya+SADL_GudyAJ"/>
+
+<var name="SADL_Guposxa" value="SADL_Guposxg-SADL_Guxg"/>
+<var name="SADL_Guposya" value="SADL_Guposyg-SADL_Guyg"/>
+
+<var name="SADL_Gusspz2" value="SADL_Gussdz2+SADL_GudZ"/>
+<var name="SADL_Gusspz1" value="SADL_Gussdz1+SADL_GudZ"/>
+
+<!-- Box beam positions -->
+
+<var name="SADL_BxBxpos" value="SADL_BxBxref+SADL_BxBWid/2"/>
+<var name="SADL_BxBypos" value="-SADL_BxByref+SADL_BxBHei/2+SADL_BxBHThi1"/>
+
+<!-- Connection Gusset / Box Beam -->
+
+<var name="SADL_CGBBHPx" value="SADL_Guposxg+SADL_CGBBHwid/2"/>
+<var name="SADL_CGBBHPy" value="SADL_Guposyg-SADL_CGBBthi/2"/>
+<var name="SADL_CGBBVPx" value="SADL_Guposxg+SADL_CGBBthi/2"/>
+<var name="SADL_CGBBVPy" value="SADL_Guposyg-SADL_CGBBVwid/2-SADL_CGBBthi"/>
+
+<!-- Stiffener -->
+
+<!-- height of flange -->
+<var name="SADL_StTFlhei" value="SADL_StTUext-2*SADL_StTUthi"/>
+<!-- x/y pos of flange/plate -->
+<var name="SADL_StTFlpos" value="SADL_StTUext/2-SADL_StTUthi/2"/>
+<!-- length -->
+<var name="SADL_StifLen0" value="SADL_StifLen-2*SADL_StEPthi"/>
+<!-- z pos of extremity plate -->
+<var name="SADL_StEPzpos" value="SADL_StifLen/2-SADL_StEPthi/2"/>
+
+<!-- Barrel Doublet -->
+<!-- ATLLBUS_0003 -->
+<var name="SADL_SaddZ2" value="SADL_SaddZmax-SADL_Gussdz1-1.5*SADL_GudZ"/>
+<!-- position of first unit is inferred from stiffener length -->
+<var name="SADL_SaddZ1" value="SADL_SaddZ2-3.*SADL_GudZ-2.*SADL_Gussdz2-SADL_StifLen"/>
+
+<!-- stiffener position -->
+<var name="SADL_Stzpos" value="(SADL_SaddZ1+SADL_SaddZ2)/2"/>
+
+<!-- Extended Barrel Doublet -->
+<!-- ATLLEUS_0002 -->
+<var name="SADL_ESaddZ2" value="SADL_ESadZmax-SADL_Gussdz1-1.5*SADL_GudZ"/>
+<!-- position of first unit is inferred from stiffener length -->
+<var name="SADL_ESaddZ1" value="SADL_ESaddZ2-3.*SADL_GudZ-2.*SADL_Gussdz2-SADL_StifLen"/>
+
+<!-- stiffener position -->
+<var name="SADL_EStzpos" value="(SADL_ESaddZ1+SADL_ESaddZ2)/2"/>
+
+<!-- Barrel Blocking Jacks -->
+
+<var name="SADL_BBJSCyp" value="SADL_BBJSCthi/2"/>
+<var name="SADL_BBJBCyp" value="SADL_BBJSCthi+SADL_BBJBCthi/2"/>
+<var name="SADL_BBJPyp" value="SADL_BBJSCthi+SADL_BBJBCthi+SADL_BBJPthi/2"/>
+
+<!-- Andrei Table need for the structure missing in Oracle table -->
+<var name="SADL_Gusset_Plate_Zmoins" value="-SADL_Gusspz2"/>
+<var name="SADL_BxBVxposmoins" value="-SADL_BxBVxpos"/>
+<var name="SADL_StEPzposmoins" value="-SADL_StEPzpos"/>
+<var name="SADL_StTFlposRot" value="SADL_StTFlpos*sin(SADL_Stzrot*GENV_PiS180)"/>
+<var name="SADL_StTFlposRotmoins" value="-SADL_StTFlposRot"/>
+<!-- Andrei Table need for the structure missing in Oracle table -->
+
+<!-- Modelization -->
+
+<!-- Box Beam -->
+<box name="SADL_BoxBeam_HPlate_Lower" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi1;SADL_BxBLen"/>
+<box name="SADL_BoxBeam_HPlate_Upper" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi2;SADL_BxBLen"/>
+<box name="SADL_BoxBeam_VPlate" material="Iron1" X_Y_Z="SADL_BxBVThi;SADL_BxBHei ;SADL_BxBLen"/>
+
+<!-- Extended Barrel Box Beam -->
+<box name="SADL_Extended_BoxBeam_HPlate_Lower" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi1;SADL_BxBELen"/>
+<box name="SADL_Extended_BoxBeam_HPlate_Upper" material="Iron1" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi2;SADL_BxBELen"/>
+<box name="SADL_Extended_BoxBeam_VPlate" material="Iron1" X_Y_Z="SADL_BxBVThi;SADL_BxBHei ;SADL_BxBELen"/>
+
+<composition name="SADL_BoxBeam">
+ <posXYZ volume="SADL_BoxBeam_HPlate_Lower" X_Y_Z="0;SADL_BxBHyp1;0" />
+ <posXYZ volume="SADL_BoxBeam_HPlate_Upper" X_Y_Z="0;SADL_BxBHyp2;0" />
+ <posXYZ volume="SADL_BoxBeam_VPlate" X_Y_Z=" SADL_BxBVxpos;0;0" />
+ <posXYZ volume="SADL_BoxBeam_VPlate" X_Y_Z="-SADL_BxBVxpos;0;0" />
+</composition>
+
+<composition name="SADL_Extended_BoxBeam">
+ <posXYZ volume="SADL_Extended_BoxBeam_HPlate_Lower" X_Y_Z="0;SADL_BxBHyp1;0" />
+ <posXYZ volume="SADL_Extended_BoxBeam_HPlate_Upper" X_Y_Z="0;SADL_BxBHyp2;0" />
+ <posXYZ volume="SADL_Extended_BoxBeam_VPlate" X_Y_Z=" SADL_BxBVxpos;0;0" />
+ <posXYZ volume="SADL_Extended_BoxBeam_VPlate" X_Y_Z="-SADL_BxBVxpos;0;0" />
+</composition>
+
+<!-- Rounded Support -->
+<tubs name="SADL_RoundedSupportAC" material="Iron2" Rio_Z="SADL_RSrin;SADL_RSrout;SADL_RSLenAC" profile="SADL_RSprof1;SADL_RSprof2"/>
+<tubs name="SADL_RoundedSupportBD" material="Iron2" Rio_Z="SADL_RSrin;SADL_RSrout;SADL_RSLenBD" profile="SADL_RSprof1;SADL_RSprof2"/>
+
+<!-- Gusset -->
+<gvxy name="SADL_Gusset_Core" material="Iron" dZ="SADL_GudZ">
+ <gvxy_point X_Y="SADL_Guxa;SADL_Guya"/>
+ <gvxy_point X_Y="SADL_Guxb;SADL_Guyb"/>
+ <gvxy_point X_Y="SADL_Guxc;SADL_Guyc"/>
+ <gvxy_point X_Y="SADL_Guxd;SADL_Guyd"/>
+ <gvxy_point X_Y="SADL_Guxe;SADL_Guye"/>
+ <gvxy_point X_Y="SADL_Guxf;SADL_Guyf"/>
+ <gvxy_point X_Y="SADL_Guxg;SADL_Guyg"/>
+ <gvxy_point X_Y="SADL_Guxh;SADL_Guyh"/>
+ <gvxy_point X_Y="SADL_Guxi;SADL_Guyi"/>
+ <gvxy_point X_Y="SADL_Guxj;SADL_Guyj"/>
+</gvxy>
+
+<tubs name="SADL_Gusset_Cut" material="Aluminium4" Rio_Z="0;SADL_RSrout;SADL_RSLenBD" profile="SADL_RSprof1;SADL_RSprof2" />
+
+<subtraction name="SADL_Gusset_Plate" >
+ <posXYZ volume="SADL_Gusset_Core" X_Y_Z="SADL_Guposxa;SADL_Guposya;0"/>
+ <posXYZ volume="SADL_Gusset_Cut"/>
+</subtraction>
+
+<!-- Connection Gusset / Box Beam -->
+
+<box name="SADL_ConnGussetBBeam_HPlate" material="Iron4" X_Y_Z="SADL_CGBBHwid;SADL_CGBBthi;SADL_CGBBlen"/>
+<box name="SADL_ConnGussetBBeam_VPlate" material="Iron4" X_Y_Z="SADL_CGBBthi;SADL_CGBBVwid;SADL_CGBBlen"/>
+
+<composition name="SADL_Saddle_UnitA">
+ <posXYZ volume="SADL_RoundedSupportAC" />
+ <posXYZ volume="SADL_Gusset_Plate" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="Zero;Zero;SADL_Gusspz1" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="Zero;Zero;SADL_Gusset_Plate_Zmoins" />
+ <posXYZ volume="SADL_ConnGussetBBeam_HPlate" X_Y_Z="SADL_CGBBHPx;SADL_CGBBHPy;0" />
+ <posXYZ volume="SADL_ConnGussetBBeam_VPlate" X_Y_Z="SADL_CGBBVPx;SADL_CGBBVPy;0" />
+</composition>
+
+<composition name="SADL_Saddle_UnitB">
+ <posXYZ volume="SADL_RoundedSupportBD" />
+ <posXYZ volume="SADL_Gusset_Plate" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;SADL_Gusspz2" />
+ <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;-SADL_Gusspz2" />
+ <posXYZ volume="SADL_ConnGussetBBeam_HPlate" X_Y_Z="SADL_CGBBHPx;SADL_CGBBHPy;0" />
+ <posXYZ volume="SADL_ConnGussetBBeam_VPlate" X_Y_Z="SADL_CGBBVPx;SADL_CGBBVPy;0" />
+</composition>
+
+<!-- Stiffener -->
+
+<box name="SADL_Stiffener_Plate" material="Iron1" X_Y_Z="SADL_StEPwid;SADL_StEPwid;SADL_StEPthi"/>
+<box name="SADL_Stiffener_Tube_Plate" material="Iron1" X_Y_Z="SADL_StTUext;SADL_StTUthi; SADL_StifLen0"/>
+<box name="SADL_Stiffener_Tube_Flange" material="Iron1" X_Y_Z="SADL_StTUthi;SADL_StTFlhei;SADL_StifLen0"/>
+
+<composition name="SADL_Stiffener">
+ <posXYZ volume="SADL_Stiffener_Tube_Flange" X_Y_Z=" SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Tube_Flange" X_Y_Z="-SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Tube_Plate" X_Y_Z="0; SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Tube_Plate" X_Y_Z="0;-SADL_StTFlpos;0;0" />
+ <posXYZ volume="SADL_Stiffener_Plate" X_Y_Z="0;0; SADL_StEPzpos" />
+ <posXYZ volume="SADL_Stiffener_Plate" X_Y_Z="0;0;-SADL_StEPzpos" />
+</composition>
+
+<composition name="SADL_Saddle_Doublet">
+ <posXYZ volume="SADL_Saddle_UnitB" X_Y_Z="0;0;SADL_SaddZ1" />
+ <posXYZ volume="SADL_Saddle_UnitA" X_Y_Z="0;0;SADL_SaddZ2" />
+ <posXYZ volume="SADL_Stiffener" X_Y_Z="SADL_Stxpos;SADL_Stypos;SADL_Stzpos" rot="Zero;Zero;SADL_Stzrot" />
+</composition>
+
+<composition name="SADL_Extended_Saddle_Doublet">
+ <posXYZ volume="SADL_Extended_BoxBeam" X_Y_Z="SADL_BxBxpos;SADL_BxBypos;SADL_EBxBzpos" />
+ <posXYZ volume="SADL_Saddle_UnitB" X_Y_Z="0;0;SADL_ESaddZ1" />
+ <posXYZ volume="SADL_Saddle_UnitA" X_Y_Z="0;0;SADL_ESaddZ2" />
+ <posXYZ volume="SADL_Stiffener" X_Y_Z="SADL_Stxpos;SADL_Stypos;SADL_EStzpos" rot="Zero;Zero;SADL_Stzrot" />
+</composition>
+
+<composition name="SADL_Saddle_Quadruplet">
+ <posXYZ volume="SADL_Saddle_Doublet" />
+ <posXYZ volume="SADL_Saddle_Doublet" rot="0;180;0" X_Y_Z="0.;0.;2*SADL_Stzpos"/>
+</composition>
+
+<composition name="SADL_Extended_Saddle_Quadruplet">
+ <posXYZ volume="SADL_Extended_Saddle_Doublet" />
+ <posXYZ volume="SADL_Extended_Saddle_Doublet" rot="0;180;0" X_Y_Z="0.;0.;2*SADL_EStzpos" />
+</composition>
+
+<!-- Barrel Blocking Jacks -->
+
+<box name="SADL_Barrel_Blocking_Jack_Plate" material="Iron1" X_Y_Z="SADL_BBJPlen;SADL_BBJPwid;SADL_BBJPthi"/>
+
+<tubs name="SADL_Barrel_Blocking_Jack_BigCylinder" material="Iron2" Rio_Z="0;SADL_BBJBCrad;SADL_BBJBCthi" />
+<tubs name="SADL_Barrel_Blocking_Jack_SmallCylinder" material="Iron2" Rio_Z="0;SADL_BBJSCrad;SADL_BBJSCthi" />
+
+<composition name="SADL_Barrel_Blocking_Jack_Unit">
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_SmallCylinder" X_Y_Z="0;SADL_BBJSCyp;0" rot="PiDegOver2;Zero;Zero"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_BigCylinder" X_Y_Z="0;SADL_BBJBCyp;0" rot="PiDegOver2;Zero;Zero"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Plate" X_Y_Z="0;SADL_BBJPyp;0" rot="PiDegOver2;Zero;Zero"/>
+</composition>
+
+<composition name="SADL_Barrel_Blocking_Jacks">
+ <foreach index="I" begin="0" loops="4" >
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z=" SADL_BlJaxpos;SADL_BlJaypos; SADL_BlJazpos[I]"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z="-SADL_BlJaxpos;SADL_BlJaypos; SADL_BlJazpos[I]"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z=" SADL_BlJaxpos;SADL_BlJaypos;-SADL_BlJazpos[I]"/>
+ <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z="-SADL_BlJaxpos;SADL_BlJaypos;-SADL_BlJazpos[I]"/>
+ </foreach>
+</composition>
+
+<composition name="SADL_CalorimeterSaddle1">
+ <posXYZ volume="SADL_BoxBeam" X_Y_Z=" SADL_BxBxpos;SADL_BxBypos;0" />
+ <posXYZ volume="SADL_BoxBeam" X_Y_Z="-SADL_BxBxpos;SADL_BxBypos;0" />
+ <posXYZ volume="SADL_Saddle_Quadruplet" />
+ <posXYZ volume="SADL_Saddle_Quadruplet" rot="0;180.;0" />
+ <posXYZ volume="SADL_Extended_Saddle_Quadruplet" />
+ <posXYZ volume="SADL_Extended_Saddle_Quadruplet" rot="0;180.;0" />
+ <posXYZ volume="SADL_Barrel_Blocking_Jacks" />
+</composition>
+
+<composition name="SADL_CalorimeterSaddle">
+ <posXYZ volume="SADL_CalorimeterSaddle1" X_Y_Z=" 0.;-50.;0" />
+</composition>
+
+</section>
+
+
+<section name = "TGC Big Wheel"
+ version = "7.0"
+ date = "14 04 2008, redone 20 08 2013"
+ author = "laurent+andrea, jochen - initial implementation removed "
+ top_volume = "useless">
+
+<!-- general parameters for surrounding boxes -->
+
+<var name="TGC_BigWheel_SurBoxWallThick" value=" 12. " />
+<var name="TGC_BigWheel_SurBoxSideLength" value=" 250. " />
+<var name="TGC_BigWheel_SurBoxDistance" value=" 50. " />
+<var name="TGC_BigWheel_SurBoxSpcLength" value=" 200. " />
+<var name="TGC_BigWheel_SurBoxSpcHeight" value=" 80. " />
+<var name="TGC_BigWheel_SurBoxSpcWall" value=" 5. " />
+
+<!-- name = TGC2 Big Wheel section name = "Supports" -->
+<!-- **************************************************************
+ **************************************************************
+ *** ****
+ *** TGC Big Wheel ****
+ *** ****
+ **************************************************************
+ ************************************************************** -->
+<var name="TBWH_BigWheel_ZPosL" value=" 14730. "/>
+
+<var name="TBWH_BigWheel_RadDist00" value=" 2445. "/>
+<var name="TBWH_BigWheel_RadDist01" value=" 3700. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist02" value=" 4562. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist03" value=" 5946. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist04" value=" 6974. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist05" value=" 8134. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist06" value=" 9161. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist07" value=" 10527. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist08" value=" 11348. - TBWH_BigWheel_RadDist00"/>
+<var name="TBWH_BigWheel_RadDist09" value=" 12230. "/>
+<var name="TBWH_BigWheel_RadDistOutPlate" value=" 4195. "/>
+<var name="TBWH_BigWheel_RadDistPlate02" value=" 4140. - TBWH_BigWheel_RadDist00 + 170. + 30. "/> <!-- two different values on same blueprint -->
+<var name="TBWH_BigWheel_PhiDistRPlate1" value=" 388. "/>
+
+<var name="TBWH_BigWheel_ZThickPhiPlate" value=" 30. "/>
+<var name="TBWH_BigWheel_WallThickPhiPlate" value=" 16. "/>
+<var name="TBWH_BigWheel_RThickPhiPlate1" value=" 200. "/>
+<var name="TBWH_BigWheel_RThickPhiPlate2" value=" 150. "/>
+<var name="TBWH_BigWheel_RThickPhiPlate3" value=" 100. "/>
+<var name="TBWH_BigWheel_ZThickRPlate" value=" 150. "/>
+<var name="TBWH_BigWheel_PhiThickRPlate" value=" 50. "/>
+<var name="TBWH_BigWheel_WallThickRPlate" value=" 5. "/>
+
+<var name="TBWH_BigWheel_PhiPlaDelEvenOdd" value="TBWH_BigWheel_RThickPhiPlate2 + TBWH_BigWheel_PhiThickRPlate/2."/>
+
+<var name="TBWH_BigWheel_PhiStepAngle1" value=" 7.5 * GENV_PiS180 "/>
+<var name="TBWH_BigWheel_PhiStepAngle2" value=" 15. * GENV_PiS180 "/>
+
+<var name="TBWH_BigWheel_PhiStep1toP1" value=" -88. "/> <!-- estimate -->
+<var name="TBWH_BigWheel_PhiStepP1toP2" value=" 372. "/> <!-- estimate -->
+
+<var name="TBWH_BigWheel_PhiStep2toP1" value=" 459. "/>
+<var name="TBWH_BigWheel_PhiStepP2toP2" value=" 780. + TBWH_BigWheel_PhiThickRPlate"/> <!-- estimate -->
+
+<var name="TBWH_BigWheel_TubeInnerR" value=" 2335. "/>
+<var name="TBWH_BigWheel_TubeOuterR" value=" TBWH_BigWheel_TubeInnerR + 405. "/>
+
+<!-- lowest phi plate - plate 1 -->
+<gvxysx name="TBWH_PhiPlate1" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" (TBWH_BigWheel_RadDist00+TBWH_BigWheel_RadDist01+TBWH_BigWheel_RThickPhiPlate1)*sin(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_RadDist01+TBWH_BigWheel_RThickPhiPlate1"/>
+ <gvxy_point X_Y=" (TBWH_BigWheel_RadDist00+TBWH_BigWheel_RadDist01)*sin(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_RadDist01"/>
+</gvxysx>
+
+<!-- first phi plate with kink - plate 2 -->
+<var name="TBWH_PhiPlate2_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist02-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate2_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist02-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate2_XPos2" value="TBWH_PhiPlate2_XPos1+(TBWH_BigWheel_RadDist02*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate2_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate2_YPos2" value="TBWH_BigWheel_RadDist02-(TBWH_BigWheel_RadDist02*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate2_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate2_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos3; TBWH_BigWheel_RadDist02+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate2_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate2_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos1; TBWH_BigWheel_RadDist02"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate2_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist02+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate2_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate2_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate2_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist02-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- second phi plate with kink - plate 3 -->
+<var name="TBWH_PhiPlate3_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist03-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate3_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist03-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate3" />
+<var name="TBWH_PhiPlate3_XPos2" value="TBWH_PhiPlate3_XPos1+(TBWH_BigWheel_RadDist03*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate3_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+<var name="TBWH_PhiPlate3_YPos2" value="TBWH_BigWheel_RadDist03-(TBWH_BigWheel_RadDist03*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate3_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TBWH_PhiPlate3" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos3; TBWH_BigWheel_RadDist03+TBWH_BigWheel_RThickPhiPlate3"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos2+TBWH_BigWheel_RThickPhiPlate3*sin(TBWH_BigWheel_PhiStepAngle2)+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate3_YPos2+TBWH_BigWheel_RThickPhiPlate3*cos(TBWH_BigWheel_PhiStepAngle2)-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate3_YPos2-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate3_XPos1; TBWH_BigWheel_RadDist03"/>
+</gvxysx>
+
+<!-- third phi plate with kink - plate 4 -->
+<var name="TBWH_PhiPlate4_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist04-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate4_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist04-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate4_XPos2" value="TBWH_PhiPlate4_XPos1+(TBWH_BigWheel_RadDist04*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate4_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate4_YPos2" value="TBWH_BigWheel_RadDist04-(TBWH_BigWheel_RadDist04*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate4_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate4_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos3; TBWH_BigWheel_RadDist04+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate4_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate4_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos1; TBWH_BigWheel_RadDist04"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate4_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist04+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate4_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate4_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate4_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist04-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- forth phi plate with kink - plate 5 -->
+<var name="TBWH_PhiPlate5_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist05-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate5_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist05-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate3" />
+<var name="TBWH_PhiPlate5_XPos2" value="TBWH_PhiPlate5_XPos1+(TBWH_BigWheel_RadDist05*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate5_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+<var name="TBWH_PhiPlate5_YPos2" value="TBWH_BigWheel_RadDist05-(TBWH_BigWheel_RadDist05*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate5_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TBWH_PhiPlate5" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos3; TBWH_BigWheel_RadDist05+TBWH_BigWheel_RThickPhiPlate3"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos2+TBWH_BigWheel_RThickPhiPlate3*sin(TBWH_BigWheel_PhiStepAngle2)+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate5_YPos2+TBWH_BigWheel_RThickPhiPlate3*cos(TBWH_BigWheel_PhiStepAngle2)-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate5_YPos2-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate5_XPos1; TBWH_BigWheel_RadDist05"/>
+</gvxysx>
+
+<!-- fifth phi plate with kink - plate 6 -->
+<var name="TBWH_PhiPlate6_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist06-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate6_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist06-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate6_XPos2" value="TBWH_PhiPlate6_XPos1+(TBWH_BigWheel_RadDist06*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate6_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate6_YPos2" value="TBWH_BigWheel_RadDist06-(TBWH_BigWheel_RadDist06*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate6_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate6_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos3; TBWH_BigWheel_RadDist06+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate6_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate6_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos1; TBWH_BigWheel_RadDist06"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate6_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist06+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate6_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate6_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate6_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist06-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- sixth phi plate with kink - plate 7 -->
+<var name="TBWH_PhiPlate7_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist07-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate7_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist07-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate3" />
+<var name="TBWH_PhiPlate7_XPos2" value="TBWH_PhiPlate7_XPos1+(TBWH_BigWheel_RadDist07*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate7_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+<var name="TBWH_PhiPlate7_YPos2" value="TBWH_BigWheel_RadDist07-(TBWH_BigWheel_RadDist07*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate7_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TBWH_PhiPlate7" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos3; TBWH_BigWheel_RadDist07+TBWH_BigWheel_RThickPhiPlate3"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos2+TBWH_BigWheel_RThickPhiPlate3*sin(TBWH_BigWheel_PhiStepAngle2)+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate7_YPos2+TBWH_BigWheel_RThickPhiPlate3*cos(TBWH_BigWheel_PhiStepAngle2)-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate7_YPos2-(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate7_XPos1; TBWH_BigWheel_RadDist07"/>
+</gvxysx>
+
+<!-- seventh phi plate with kink - plate 8 -->
+<var name="TBWH_PhiPlate8_XPos1" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist08-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2." />
+<var name="TBWH_PhiPlate8_XPos3" value="tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RadDist08-TBWH_BigWheel_PhiStep1toP1/cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/cos(TBWH_BigWheel_PhiStepAngle2)/2.+tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_RThickPhiPlate2" />
+<var name="TBWH_PhiPlate8_XPos2" value="TBWH_PhiPlate8_XPos1+(TBWH_BigWheel_RadDist08*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate8_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*cos(TBWH_BigWheel_PhiStepAngle2)" />
+<var name="TBWH_PhiPlate8_YPos2" value="TBWH_BigWheel_RadDist08-(TBWH_BigWheel_RadDist08*tan(TBWH_BigWheel_PhiStepAngle2)-TBWH_PhiPlate8_XPos1)*cos(TBWH_BigWheel_PhiStepAngle2)*sin(TBWH_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TBWH_PhiPlate8_Even" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos3; TBWH_BigWheel_RadDist08+TBWH_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate8_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2); TBWH_PhiPlate8_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos1; TBWH_BigWheel_RadDist08"/>
+</gvxysx>
+
+<gvxysx name="TBWH_PhiPlate8_Odd" material="Aluminium" dZ="TBWH_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos3-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist08+TBWH_BigWheel_RThickPhiPlate2-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_RThickPhiPlate2*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate8_YPos2+TBWH_BigWheel_RThickPhiPlate2*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos2+TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2)-tan(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_PhiPlate8_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TBWH_PhiPlate8_XPos1-tan(TBWH_BigWheel_PhiStepAngle1)*TBWH_BigWheel_PhiPlaDelEvenOdd; TBWH_BigWheel_RadDist08-TBWH_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- first R plate - center -->
+<box name="TBWH_RPlate1_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate1_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00+TBWH_BigWheel_WallThickRPlate; TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate1">
+ <posXYZ volume="TBWH_RPlate1_base" X_Y_Z=" TBWH_BigWheel_PhiDistRPlate1/2.+TBWH_BigWheel_PhiThickRPlate/2.; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." />
+ <posXYZ volume="TBWH_RPlate1_sub" X_Y_Z=" TBWH_BigWheel_PhiDistRPlate1/2.+TBWH_BigWheel_PhiThickRPlate/2.+TBWH_BigWheel_WallThickRPlate; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." />
+</subtraction>
+
+<!-- second R plate - 7.5 degrees -->
+<box name="TBWH_RPlate2_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/cos(TBWH_BigWheel_PhiStepAngle1); TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate2_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00+TBWH_BigWheel_WallThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle1); TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate2">
+ <posXYZ volume="TBWH_RPlate2_base" X_Y_Z=" TBWH_PhiPlate2_XPos1+(TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00-2.*TBWH_BigWheel_RadDist02)*tan(TBWH_BigWheel_PhiStepAngle1)/2.; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate2_sub" X_Y_Z=" TBWH_PhiPlate2_XPos1+(TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00-2.*TBWH_BigWheel_RadDist02)*tan(TBWH_BigWheel_PhiStepAngle1)/2.-TBWH_BigWheel_WallThickRPlate; (TBWH_BigWheel_RadDist09+TBWH_BigWheel_RadDistPlate02-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+</subtraction>
+
+<!-- third R plate - 7.5 degrees TBWH_BigWheel_PhiThickRPlate-->
+<var name="TBWH_RPlate3_length" value="(TBWH_BigWheel_RadDist09 - TBWH_BigWheel_RadDist00 - (TBWH_PhiPlate2_YPos2-TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)) - (TBWH_BigWheel_PhiStep2toP1 + TBWH_BigWheel_PhiThickRPlate) * sin(TBWH_BigWheel_PhiStepAngle2) ) / cos(TBWH_BigWheel_PhiStepAngle1)" />
+
+<box name="TBWH_RPlate3_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_RPlate3_length; TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate3_sub1" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_RPlate3_length + TBWH_BigWheel_WallThickRPlate/cos(TBWH_BigWheel_PhiStepAngle1); TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+<box name="TBWH_RPlate3_sub2" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; TBWH_RPlate3_length; TBWH_BigWheel_ZThickRPlate+2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate3_tmp">
+ <posXYZ volume="TBWH_RPlate3_base" X_Y_Z=" TBWH_RPlate3_length/2.*sin(TBWH_BigWheel_PhiStepAngle1); TBWH_RPlate3_length/2.*cos(TBWH_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate3_sub1" X_Y_Z=" TBWH_RPlate3_length/2.*sin(TBWH_BigWheel_PhiStepAngle1)-TBWH_BigWheel_WallThickRPlate; TBWH_RPlate3_length/2.*cos(TBWH_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate3_sub2" X_Y_Z="TBWH_RPlate3_length/2.*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/2*(cos(TBWH_BigWheel_PhiStepAngle1)-cos(TBWH_BigWheel_PhiStepAngle2));TBWH_RPlate3_length/2.*cos(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_PhiThickRPlate/2*(sin(TBWH_BigWheel_PhiStepAngle2)-sin(TBWH_BigWheel_PhiStepAngle1)); 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<var name="TBWH_RPlate3_PosX" value="TBWH_PhiPlate2_XPos2+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1)*cos(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiThickRPlate*(0.5*cos(TBWH_BigWheel_PhiStepAngle1)-cos(TBWH_BigWheel_PhiStepAngle2))-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<var name="TBWH_RPlate3_PosY" value="TBWH_PhiPlate2_YPos2+(TBWH_BigWheel_PhiStep2toP1-TBWH_BigWheel_PhiStepP2toP2)*sin(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_PhiThickRPlate*(sin(TBWH_BigWheel_PhiStepAngle2)-0.5*sin(TBWH_BigWheel_PhiStepAngle1))+sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate" />
+
+<composition name="TBWH_RPlate3" >
+ <posXYZ volume="TBWH_RPlate3_tmp" X_Y_Z=" TBWH_RPlate3_PosX-GENV_Eps; TBWH_RPlate3_PosY ; 0." />
+</composition>
+
+<!-- first R plate - 15 degrees -->
+<box name="TBWH_RPlate4_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)/cos(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate4_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00+TBWH_BigWheel_WallThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<subtraction name="TBWH_RPlate4">
+ <posXYZ volume="TBWH_RPlate4_base" X_Y_Z=" (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)*tan(TBWH_BigWheel_PhiStepAngle2)/2.+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1-1.5*TBWH_BigWheel_PhiThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle2); (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate4_sub" X_Y_Z=" (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)*tan(TBWH_BigWheel_PhiStepAngle2)/2.-TBWH_BigWheel_WallThickRPlate+(TBWH_BigWheel_PhiStepP2toP2-TBWH_BigWheel_PhiStep2toP1-1.5*TBWH_BigWheel_PhiThickRPlate)/cos(TBWH_BigWheel_PhiStepAngle2); (TBWH_BigWheel_RadDist09-TBWH_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- second R plate - 15 degrees -->
+<box name="TBWH_RPlate5_base" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/cos(TBWH_BigWheel_PhiStepAngle2); TBWH_BigWheel_ZThickRPlate" />
+<box name="TBWH_RPlate5_sub" material="Aluminium" X_Y_Z=" TBWH_BigWheel_PhiThickRPlate; (TBWH_BigWheel_RadDist09-cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/cos(TBWH_BigWheel_PhiStepAngle2)+TBWH_BigWheel_WallThickRPlate; TBWH_BigWheel_ZThickRPlate-2.*TBWH_BigWheel_WallThickRPlate" />
+
+<var name="TBWH_RPlate5_PosX" value="sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate/2. +TBWH_PhiPlate2_XPos2 +TBWH_BigWheel_PhiStepP2toP2*cos(TBWH_BigWheel_PhiStepAngle2) +tan(TBWH_BigWheel_PhiStepAngle2)*(TBWH_BigWheel_RadDist09/2.-TBWH_PhiPlate2_YPos2+TBWH_BigWheel_PhiStepP2toP2*sin(TBWH_BigWheel_PhiStepAngle2)-TBWH_BigWheel_RadDist00)"/>
+
+<subtraction name="TBWH_RPlate5">
+ <posXYZ volume="TBWH_RPlate5_base" X_Y_Z=" TBWH_RPlate5_PosX - cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.; (TBWH_BigWheel_RadDist09+cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/2. - TBWH_BigWheel_RadDist00 + sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TBWH_RPlate5_sub" X_Y_Z=" TBWH_RPlate5_PosX - cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.+TBWH_BigWheel_WallThickRPlate; (TBWH_BigWheel_RadDist09+cos(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_RadDistOutPlate)/2.- TBWH_BigWheel_RadDist00 + sin(TBWH_BigWheel_PhiStepAngle2)*TBWH_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TBWH_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<composition name="TBWH_Support_EvenSector_ASide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_Support_OddSector_ASide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_Support_EvenSector_CSide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Even" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_Support_OddSector_CSide">
+ <posXYZ volume="TBWH_PhiPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate2_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate4_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate6_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate7" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_PhiPlate8_Odd" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate1" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate2" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate3" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate4" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; -TBWH_BigWheel_ZThickPhiPlate-TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TBWH_RPlate5" X_Y_Z=" 0.; TBWH_BigWheel_RadDist00; TBWH_BigWheel_ZThickPhiPlate+TBWH_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+</composition>
+
+<!-- tube and boxes are rather rouhg approximated here - should be okay though - Cavern Background only -->
+
+<tubs name="TBWH_CentralTube" material="Aluminium" Rio_Z="TBWH_BigWheel_TubeInnerR; TBWH_BigWheel_TubeOuterR; TBWH_BigWheel_WallThickPhiPlate" nbPhi="20" />
+
+<box name="TBWH_SurBox_base" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSideLength; TGC_BigWheel_SurBoxSideLength" />
+<box name="TBWH_SurBox_inner" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall" />
+
+<subtraction name="TBWH_SurBox_default" >
+ <posXYZ volume="TBWH_SurBox_base" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+ <posXYZ volume="TBWH_SurBox_inner" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+</subtraction>
+
+<box name="TBWH_SurBoxSpc_base" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSpcLength; TGC_BigWheel_SurBoxSpcHeight" />
+<box name="TBWH_SurBoxSpc_inner" material="Aluminium" X_Y_Z=" 2.*TBWH_BigWheel_RadDist09*tan(TBWH_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSpcLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSpcHeight" />
+
+<subtraction name="TBWH_SurBoxSpc" >
+ <posXYZ volume="TBWH_SurBoxSpc_base" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2." />
+ <posXYZ volume="TBWH_SurBoxSpc_inner" X_Y_Z=" 0.; TBWH_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2.-TGC_BigWheel_SurBoxSpcWall" />
+</subtraction>
+
+<composition name="TBWH_SurBox_extended" >
+ <posXYZ volume="TBWH_SurBox_default" X_Y_Z=" 0.; TGC_BigWheel_SurBoxSideLength + TGC_BigWheel_SurBoxDistance; 0." />
+ <posXYZ volume="TBWH_SurBoxSpc" X_Y_Z=" 0.; 0.; GENV_Eps" />
+ <posXYZ volume="TBWH_SurBoxSpc" X_Y_Z=" 0.; 0.; -GENV_Eps" rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TBWH_BigWheel_ASide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TBWH_Support_EvenSector_ASide" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TBWH_Support_OddSector_ASide" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TBWH_SurBox_default" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TBWH_SurBox_extended" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TBWH_CentralTube" X_Y_Z=" 0.; 0.; TBWH_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TBWH_BigWheel_CSide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TBWH_Support_EvenSector_CSide" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TBWH_Support_OddSector_CSide" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TBWH_SurBox_default" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TBWH_SurBox_extended" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TBWH_CentralTube" X_Y_Z=" 0.; 0.; -TBWH_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TBWH_BigWheels">
+ <posXYZ volume="TBWH_BigWheel_ASide" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="TBWH_BigWheel_CSide" X_Y_Z=" 0.; 0.; 0." />
+</composition>
+
+<!-- name = TGC3 Big Wheel section name = "Supports" -->
+<var name="TGC3_BigWheel_ZPosL" value=" 15150. "/>
+
+<var name="TGC3_BigWheel_RadDist00" value=" 2445. "/>
+<var name="TGC3_BigWheel_RadDist01" value=" 970. "/>
+<var name="TGC3_BigWheel_RadDist02" value=" 2528. "/>
+<var name="TGC3_BigWheel_RadDist03" value=" 3560. "/>
+<var name="TGC3_BigWheel_RadDist04" value=" 4767. "/>
+<var name="TGC3_BigWheel_RadDist05" value=" 5800. "/>
+<var name="TGC3_BigWheel_RadDist06" value=" 7005. "/>
+<var name="TGC3_BigWheel_RadDist07" value=" 8037. "/>
+<var name="TGC3_BigWheel_RadDist08" value=" 9243. "/>
+<var name="TGC3_BigWheel_RadDist09" value=" 12230. "/>
+<var name="TGC3_BigWheel_RadDistOutPlate" value=" 4150. "/>
+<var name="TGC3_BigWheel_RadDistPlate02" value=" 2353. "/>
+<var name="TGC3_BigWheel_PhiDistRPlate1" value=" 390. "/>
+
+<var name="TGC3_BigWheel_ZThickPhiPlate" value=" 30. "/>
+<var name="TGC3_BigWheel_WallThickPhiPlate" value=" 16. "/>
+<var name="TGC3_BigWheel_RThickPhiPlate1" value=" 200. "/>
+<var name="TGC3_BigWheel_RThickPhiPlate2" value=" 130. "/> <!-- estimated -->
+<var name="TGC3_BigWheel_ZThickRPlate" value=" 150. "/>
+<var name="TGC3_BigWheel_PhiThickRPlate" value=" 50. "/>
+<var name="TGC3_BigWheel_WallThickRPlate" value=" 5. "/>
+
+<var name="TGC3_BigWheel_PhiPlaDelEvenOdd" value="TGC3_BigWheel_RThickPhiPlate2 + TGC3_BigWheel_PhiThickRPlate"/>
+
+<var name="TGC3_BigWheel_PhiStepAngle1" value=" 7.5 * GENV_PiS180 "/>
+<var name="TGC3_BigWheel_PhiStepAngle2" value=" 15. * GENV_PiS180 "/>
+
+<var name="TGC3_BigWheel_PhiStep1toP1" value=" -28. "/> <!-- estimate -->
+<var name="TGC3_BigWheel_PhiStepP1toP2" value=" 456. "/>
+
+<var name="TGC3_BigWheel_PhiStep2toP1" value=" 468. "/>
+<var name="TGC3_BigWheel_PhiStepP2toP2" value=" 765. + TGC3_BigWheel_PhiThickRPlate"/> <!-- estimate -->
+
+<var name="TGC3_BigWheel_TubeInnerR" value=" 2335. "/>
+<var name="TGC3_BigWheel_TubeOuterR" value=" TGC3_BigWheel_TubeInnerR + 405. "/>
+
+<!-- lowest phi plate - plate 1 -->
+<gvxysx name="TGC3_PhiPlate1" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" (TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1)*sin(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1"/>
+ <gvxy_point X_Y=" (TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01)*sin(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_RadDist01"/>
+</gvxysx>
+
+<!-- first phi plate with kink - plate 2 -->
+<var name="TGC3_PhiPlate2_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist02-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate2_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist02-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate2_XPos2" value="TGC3_PhiPlate2_XPos1+(TGC3_BigWheel_RadDist02*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate2_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate2_YPos2" value="TGC3_BigWheel_RadDist02-(TGC3_BigWheel_RadDist02*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate2_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate2_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos3; TGC3_BigWheel_RadDist02+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate2_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate2_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos1; TGC3_BigWheel_RadDist02"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate2_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist02+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate2_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate2_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate2_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist02-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- second phi plate with kink - plate 3 -->
+<var name="TGC3_PhiPlate3_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist03-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate3_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist03-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate3_XPos2" value="TGC3_PhiPlate3_XPos1+(TGC3_BigWheel_RadDist03*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate3_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+<var name="TGC3_PhiPlate3_YPos2" value="TGC3_BigWheel_RadDist03-(TGC3_BigWheel_RadDist03*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate3_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC3_PhiPlate3" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos3; TGC3_BigWheel_RadDist03+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate3_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate3_YPos2-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate3_XPos1; TGC3_BigWheel_RadDist03"/>
+</gvxysx>
+
+<!-- third phi plate with kink - plate 4 -->
+<var name="TGC3_PhiPlate4_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist04-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate4_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist04-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate4_XPos2" value="TGC3_PhiPlate4_XPos1+(TGC3_BigWheel_RadDist04*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate4_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate4_YPos2" value="TGC3_BigWheel_RadDist04-(TGC3_BigWheel_RadDist04*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate4_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate4_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos3; TGC3_BigWheel_RadDist04+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate4_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate4_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos1; TGC3_BigWheel_RadDist04"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate4_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist04+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate4_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate4_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate4_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist04-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- forth phi plate with kink - plate 5 -->
+<var name="TGC3_PhiPlate5_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist05-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate5_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist05-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate5_XPos2" value="TGC3_PhiPlate5_XPos1+(TGC3_BigWheel_RadDist05*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate5_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+<var name="TGC3_PhiPlate5_YPos2" value="TGC3_BigWheel_RadDist05-(TGC3_BigWheel_RadDist05*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate5_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC3_PhiPlate5" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos3; TGC3_BigWheel_RadDist05+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate5_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate5_YPos2-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate5_XPos1; TGC3_BigWheel_RadDist05"/>
+</gvxysx>
+
+<!-- fifth phi plate with kink - plate 6 -->
+<var name="TGC3_PhiPlate6_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist06-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate6_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist06-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate6_XPos2" value="TGC3_PhiPlate6_XPos1+(TGC3_BigWheel_RadDist06*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate6_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate6_YPos2" value="TGC3_BigWheel_RadDist06-(TGC3_BigWheel_RadDist06*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate6_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate6_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos3; TGC3_BigWheel_RadDist06+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate6_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate6_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos1; TGC3_BigWheel_RadDist06"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate6_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist06+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate6_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate6_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate6_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist06-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- sixth phi plate with kink - plate 7 -->
+<var name="TGC3_PhiPlate7_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist07-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate7_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist07-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate7_XPos2" value="TGC3_PhiPlate7_XPos1+(TGC3_BigWheel_RadDist07*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate7_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+<var name="TGC3_PhiPlate7_YPos2" value="TGC3_BigWheel_RadDist07-(TGC3_BigWheel_RadDist07*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate7_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC3_PhiPlate7" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos3; TGC3_BigWheel_RadDist07+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate7_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate7_YPos2-(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate7_XPos1; TGC3_BigWheel_RadDist07"/>
+</gvxysx>
+
+<!-- seventh phi plate with kink - plate 8 -->
+<var name="TGC3_PhiPlate8_XPos1" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist08-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC3_PhiPlate8_XPos3" value="tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RadDist08-TGC3_BigWheel_PhiStep1toP1/cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/cos(TGC3_BigWheel_PhiStepAngle2)/2.+tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_RThickPhiPlate2" />
+<var name="TGC3_PhiPlate8_XPos2" value="TGC3_PhiPlate8_XPos1+(TGC3_BigWheel_RadDist08*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate8_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*cos(TGC3_BigWheel_PhiStepAngle2)" />
+<var name="TGC3_PhiPlate8_YPos2" value="TGC3_BigWheel_RadDist08-(TGC3_BigWheel_RadDist08*tan(TGC3_BigWheel_PhiStepAngle2)-TGC3_PhiPlate8_XPos1)*cos(TGC3_BigWheel_PhiStepAngle2)*sin(TGC3_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC3_PhiPlate8_Even" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos3; TGC3_BigWheel_RadDist08+TGC3_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate8_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2); TGC3_PhiPlate8_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos1; TGC3_BigWheel_RadDist08"/>
+</gvxysx>
+
+<gvxysx name="TGC3_PhiPlate8_Odd" material="Aluminium" dZ="TGC3_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos3-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist08+TGC3_BigWheel_RThickPhiPlate2-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_RThickPhiPlate2*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate8_YPos2+TGC3_BigWheel_RThickPhiPlate2*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos2+TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2)-tan(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_PhiPlate8_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC3_PhiPlate8_XPos1-tan(TGC3_BigWheel_PhiStepAngle1)*TGC3_BigWheel_PhiPlaDelEvenOdd; TGC3_BigWheel_RadDist08-TGC3_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- first R plate - center -->
+<box name="TGC3_RPlate1_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate1_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00+TGC3_BigWheel_WallThickRPlate; TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate1">
+ <posXYZ volume="TGC3_RPlate1_base" X_Y_Z=" TGC3_BigWheel_PhiDistRPlate1/2.+TGC3_BigWheel_PhiThickRPlate/2.; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." />
+ <posXYZ volume="TGC3_RPlate1_sub" X_Y_Z=" TGC3_BigWheel_PhiDistRPlate1/2.+TGC3_BigWheel_PhiThickRPlate/2.+TGC3_BigWheel_WallThickRPlate; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." />
+</subtraction>
+
+<!-- second R plate - 7.5 degrees -->
+<box name="TGC3_RPlate2_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/cos(TGC3_BigWheel_PhiStepAngle1); TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate2_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00+TGC3_BigWheel_WallThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle1); TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate2">
+ <posXYZ volume="TGC3_RPlate2_base" X_Y_Z=" TGC3_PhiPlate2_XPos1+(TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00-2.*TGC3_BigWheel_RadDist02)*tan(TGC3_BigWheel_PhiStepAngle1)/2.; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate2_sub" X_Y_Z=" TGC3_PhiPlate2_XPos1+(TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00-2.*TGC3_BigWheel_RadDist02)*tan(TGC3_BigWheel_PhiStepAngle1)/2.-TGC3_BigWheel_WallThickRPlate; (TGC3_BigWheel_RadDist09+TGC3_BigWheel_RadDistPlate02-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+</subtraction>
+
+<!-- third R plate - 7.5 degrees TGC3_BigWheel_PhiThickRPlate-->
+<var name="TGC3_RPlate3_length" value="(TGC3_BigWheel_RadDist09 - TGC3_BigWheel_RadDist00 - (TGC3_PhiPlate2_YPos2-TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)) - (TGC3_BigWheel_PhiStep2toP1 + TGC3_BigWheel_PhiThickRPlate) * sin(TGC3_BigWheel_PhiStepAngle2) ) / cos(TGC3_BigWheel_PhiStepAngle1)" />
+
+<box name="TGC3_RPlate3_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_RPlate3_length; TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate3_sub1" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_RPlate3_length + TGC3_BigWheel_WallThickRPlate/cos(TGC3_BigWheel_PhiStepAngle1); TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+<box name="TGC3_RPlate3_sub2" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; TGC3_RPlate3_length; TGC3_BigWheel_ZThickRPlate+2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate3_tmp">
+ <posXYZ volume="TGC3_RPlate3_base" X_Y_Z=" TGC3_RPlate3_length/2.*sin(TGC3_BigWheel_PhiStepAngle1); TGC3_RPlate3_length/2.*cos(TGC3_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate3_sub1" X_Y_Z=" TGC3_RPlate3_length/2.*sin(TGC3_BigWheel_PhiStepAngle1)-TGC3_BigWheel_WallThickRPlate; TGC3_RPlate3_length/2.*cos(TGC3_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate3_sub2" X_Y_Z="TGC3_RPlate3_length/2.*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/2*(cos(TGC3_BigWheel_PhiStepAngle1)-cos(TGC3_BigWheel_PhiStepAngle2));TGC3_RPlate3_length/2.*cos(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_PhiThickRPlate/2*(sin(TGC3_BigWheel_PhiStepAngle2)-sin(TGC3_BigWheel_PhiStepAngle1)); 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<var name="TGC3_RPlate3_PosX" value="TGC3_PhiPlate2_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiThickRPlate*(0.5*cos(TGC3_BigWheel_PhiStepAngle1)-cos(TGC3_BigWheel_PhiStepAngle2))-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<var name="TGC3_RPlate3_PosY" value="TGC3_PhiPlate2_YPos2+(TGC3_BigWheel_PhiStep2toP1-TGC3_BigWheel_PhiStepP2toP2)*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_PhiThickRPlate*(sin(TGC3_BigWheel_PhiStepAngle2)-0.5*sin(TGC3_BigWheel_PhiStepAngle1))+sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate" />
+
+<composition name="TGC3_RPlate3" >
+ <posXYZ volume="TGC3_RPlate3_tmp" X_Y_Z=" TGC3_RPlate3_PosX-GENV_Eps; TGC3_RPlate3_PosY ; 0." />
+</composition>
+
+<!-- first R plate - 15 degrees -->
+<box name="TGC3_RPlate4_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)/cos(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate4_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00+TGC3_BigWheel_WallThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC3_RPlate4">
+ <posXYZ volume="TGC3_RPlate4_base" X_Y_Z=" (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)*tan(TGC3_BigWheel_PhiStepAngle2)/2.+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1-1.5*TGC3_BigWheel_PhiThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle2); (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate4_sub" X_Y_Z=" (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)*tan(TGC3_BigWheel_PhiStepAngle2)/2.-TGC3_BigWheel_WallThickRPlate+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1-1.5*TGC3_BigWheel_PhiThickRPlate)/cos(TGC3_BigWheel_PhiStepAngle2); (TGC3_BigWheel_RadDist09-TGC3_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- second R plate - 15 degrees -->
+<box name="TGC3_RPlate5_base" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/cos(TGC3_BigWheel_PhiStepAngle2); TGC3_BigWheel_ZThickRPlate" />
+<box name="TGC3_RPlate5_sub" material="Aluminium" X_Y_Z=" TGC3_BigWheel_PhiThickRPlate; (TGC3_BigWheel_RadDist09-cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/cos(TGC3_BigWheel_PhiStepAngle2)+TGC3_BigWheel_WallThickRPlate; TGC3_BigWheel_ZThickRPlate-2.*TGC3_BigWheel_WallThickRPlate" />
+
+<var name="TGC3_RPlate5_PosX" value="sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate/2. +TGC3_PhiPlate2_XPos2 +TGC3_BigWheel_PhiStepP2toP2*cos(TGC3_BigWheel_PhiStepAngle2) +tan(TGC3_BigWheel_PhiStepAngle2)*(TGC3_BigWheel_RadDist09/2.-TGC3_PhiPlate2_YPos2+TGC3_BigWheel_PhiStepP2toP2*sin(TGC3_BigWheel_PhiStepAngle2)-TGC3_BigWheel_RadDist00)"/>
+
+<subtraction name="TGC3_RPlate5">
+ <posXYZ volume="TGC3_RPlate5_base" X_Y_Z=" TGC3_RPlate5_PosX - cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.; (TGC3_BigWheel_RadDist09+cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/2. - TGC3_BigWheel_RadDist00 + sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC3_RPlate5_sub" X_Y_Z=" TGC3_RPlate5_PosX - cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.+TGC3_BigWheel_WallThickRPlate; (TGC3_BigWheel_RadDist09+cos(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_RadDistOutPlate)/2.- TGC3_BigWheel_RadDist00 + sin(TGC3_BigWheel_PhiStepAngle2)*TGC3_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC3_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- very rough approximation of trigger boxes and cables - everything estimated - even/odd sectors for TGC3 -->
+<!-- change of variables does not change placement correctly - fine tuning required -->
+
+<var name="TGC3_TrigBoxThicknessZ" value=" 2. " />
+<var name="TGC3_TrigBoxWidthPhi" value=" 260. " />
+<var name="TGC3_TrigBoxLengthR" value=" 5160. " />
+<var name="TGC3_TrigBoxAngle1" value=" 3.25" />
+<var name="TGC3_TrigBoxAngle2" value=" 12. " />
+
+<box name="TGC3_TrigBox" material="Aluminium" X_Y_Z="TGC3_TrigBoxWidthPhi; TGC3_TrigBoxLengthR; TGC3_TrigBoxThicknessZ" />
+
+<var name="TGC3_TrigCableThicknessZ1" value=" 5. " />
+<var name="TGC3_TrigCableThicknessZ2" value=" 3. " />
+<var name="TGC3_TrigCableThicknessZ3" value=" 6.5 " />
+<var name="TGC3_TrigCableWidthPhi1" value=" 130. " />
+<var name="TGC3_TrigCableWidthPhi2" value=" 100. " />
+<var name="TGC3_TrigCableWidthPhi3" value=" 75. " />
+<var name="TGC3_TrigCableWidthPhi4" value=" 60. " />
+<var name="TGC3_TrigCableWidthPhi5" value=" 250. " />
+<var name="TGC3_TrigCableLengthR1" value=" 4500. " />
+<var name="TGC3_TrigCableLengthR3" value=" 1600. " />
+<var name="TGC3_TrigCableLengthR4" value=" 1400. " />
+<var name="TGC3_TrigCableLengthR5" value=" 1550. " />
+
+<box name="TGC3_TrigCable1" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi1; TGC3_TrigCableLengthR1; TGC3_TrigCableThicknessZ1" />
+<box name="TGC3_TrigCable2" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi2; TGC3_TrigCableLengthR1; TGC3_TrigCableThicknessZ2" />
+<box name="TGC3_TrigCable3" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi3; TGC3_TrigCableLengthR3; TGC3_TrigCableThicknessZ3" />
+<box name="TGC3_TrigCable4" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi4; TGC3_TrigCableLengthR4; TGC3_TrigCableThicknessZ3" />
+<box name="TGC3_TrigCable5" material="Copper" X_Y_Z=" TGC3_TrigCableWidthPhi5; TGC3_TrigCableLengthR5; TGC3_TrigCableThicknessZ1" />
+
+<composition name="TGC3_Support_EvenSector_ASide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC3_Support_OddSector_ASide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2." rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2." rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC3_Support_EvenSector_CSide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Even" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC3_Support_OddSector_CSide">
+ <posXYZ volume="TGC3_PhiPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate2_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate4_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate6_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate7" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_PhiPlate8_Odd" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate1" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate2" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate3" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate4" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; -TGC3_BigWheel_ZThickPhiPlate-TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC3_RPlate5" X_Y_Z=" 0.; TGC3_BigWheel_RadDist00; TGC3_BigWheel_ZThickPhiPlate+TGC3_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" TGC3_PhiPlate4_XPos3-TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigBoxWidthPhi/4.*cos(TGC3_TrigBoxAngle1*GENV_PiS180); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC3_TrigBoxAngle1" />
+ <posXYZ volume="TGC3_TrigBox" X_Y_Z=" -TGC3_TrigBoxLengthR/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-7.*TGC3_TrigBoxWidthPhi/10.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_PhiPlate3_XPos2+(TGC3_BigWheel_PhiStepP2toP2-TGC3_BigWheel_PhiStep2toP1)*cos(TGC3_BigWheel_PhiStepAngle2)); -TGC3_TrigBoxLengthR/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -TGC3_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC3_TrigBoxAngle2" />
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 850.; -TGC3_TrigCableWidthPhi1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="-TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 580.; -TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+ <posXYZ volume="TGC3_TrigCable3" X_Y_Z="-TGC3_TrigCableLengthR3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_TrigCableWidthPhi3/2.*cos(TGC3_TrigBoxAngle1*GENV_PiS180) + 380.; -TGC3_TrigCableWidthPhi3/2.*sin(TGC3_TrigBoxAngle1*GENV_PiS180)-(TGC3_TrigCableLengthR3/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle1*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; -TGC3_TrigBoxAngle1"/>
+
+ <posXYZ volume="TGC3_TrigCable1" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2315; TGC3_TrigCableWidthPhi1*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable2" X_Y_Z="TGC3_TrigCableLengthR1/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableWidthPhi2/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-2620.; TGC3_TrigCableWidthPhi2/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-TGC3_TrigCableLengthR1/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ2/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+ <posXYZ volume="TGC3_TrigCable4" X_Y_Z="TGC3_TrigCableLengthR4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_TrigCableWidthPhi4/2.*cos(TGC3_TrigBoxAngle2*GENV_PiS180)-1430.; -TGC3_TrigCableWidthPhi4/2.*sin(TGC3_TrigBoxAngle2*GENV_PiS180)-(TGC3_TrigCableLengthR4/2.+TGC3_TrigBoxLengthR)*cos(TGC3_TrigBoxAngle2*GENV_PiS180)+TGC3_BigWheel_RadDist09; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ3/2.)" rot="0.; 0.; TGC3_TrigBoxAngle2"/>
+
+ <posXYZ volume="TGC3_TrigCable5" X_Y_Z="TGC3_TrigCableLengthR5/2.*sin(TGC3_BigWheel_PhiStepAngle2)+TGC3_TrigCableWidthPhi5/2.*cos(TGC3_BigWheel_PhiStepAngle2)-700.; TGC3_BigWheel_RadDist00+TGC3_BigWheel_RadDist01+TGC3_BigWheel_RThickPhiPlate1-75; -(TGC3_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC3_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC3_BigWheel_PhiStepAngle2/GENV_PiS180"/>
+
+</composition>
+
+<!-- tube and boxes are rather rouhg approximated here - should be okay though - Cavern Background only -->
+
+<tubs name="TGC3_CentralTube" material="Aluminium" Rio_Z="TGC3_BigWheel_TubeInnerR; TGC3_BigWheel_TubeOuterR; TGC3_BigWheel_WallThickPhiPlate" nbPhi="20" />
+
+<box name="TGC3_SurBox_base" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSideLength; TGC_BigWheel_SurBoxSideLength" />
+<box name="TGC3_SurBox_inner" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall" />
+
+<subtraction name="TGC3_SurBox_default" >
+ <posXYZ volume="TGC3_SurBox_base" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+ <posXYZ volume="TGC3_SurBox_inner" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+</subtraction>
+
+<box name="TGC3_SurBoxSpc_base" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSpcLength; TGC_BigWheel_SurBoxSpcHeight" />
+<box name="TGC3_SurBoxSpc_inner" material="Aluminium" X_Y_Z=" 2.*TGC3_BigWheel_RadDist09*tan(TGC3_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSpcLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSpcHeight" />
+
+<subtraction name="TGC3_SurBoxSpc" >
+ <posXYZ volume="TGC3_SurBoxSpc_base" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2." />
+ <posXYZ volume="TGC3_SurBoxSpc_inner" X_Y_Z=" 0.; TGC3_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2.-TGC_BigWheel_SurBoxSpcWall" />
+</subtraction>
+
+<composition name="TGC3_SurBox_extended" >
+ <posXYZ volume="TGC3_SurBox_default" X_Y_Z=" 0.; TGC_BigWheel_SurBoxSideLength + TGC_BigWheel_SurBoxDistance; 0." />
+ <posXYZ volume="TGC3_SurBoxSpc" X_Y_Z=" 0.; 0.; GENV_Eps" />
+ <posXYZ volume="TGC3_SurBoxSpc" X_Y_Z=" 0.; 0.; -GENV_Eps" rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TGC3_BigWheel_ASide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC3_Support_EvenSector_ASide" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC3_Support_OddSector_ASide" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC3_SurBox_default" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TGC3_SurBox_extended" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TGC3_CentralTube" X_Y_Z=" 0.; 0.; TGC3_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC3_BigWheel_CSide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC3_Support_EvenSector_CSide" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC3_Support_OddSector_CSide" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC3_SurBox_default" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="7" >
+ <posXYZ volume="TGC3_SurBox_extended" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" rot="0.; 0.; -90.+counter*30." />
+ </foreach>
+ <posXYZ volume="TGC3_CentralTube" X_Y_Z=" 0.; 0.; -TGC3_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC3_BigWheels">
+ <posXYZ volume="TGC3_BigWheel_ASide" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="TGC3_BigWheel_CSide" X_Y_Z=" 0.; 0.; 0." />
+</composition>
+
+<!-- name = TGC1 Big Wheel section name = "Supports" -->
+<!-- Spokes U zposition -->
+<var name="TGC1_BigWheel_ZPosL" value=" 13435. " />
+
+<var name="TGC1_BigWheel_RadDist00" value=" 1777.5 "/>
+<var name="TGC1_BigWheel_RadDist01" value=" 922. "/>
+<var name="TGC1_BigWheel_RadDist02" value=" 2582.5 "/>
+<var name="TGC1_BigWheel_RadDist03" value=" 3572.5 "/>
+<var name="TGC1_BigWheel_RadDist04" value=" 4667.5 "/>
+<var name="TGC1_BigWheel_RadDist05" value=" 5672.5 "/>
+<var name="TGC1_BigWheel_RadDist06" value=" 6754.5 "/>
+<var name="TGC1_BigWheel_RadDist07" value=" 7772.5 "/>
+<var name="TGC1_BigWheel_RadDist08" value=" 8682.5 "/>
+<var name="TGC1_BigWheel_RadDist09" value=" 10990. "/>
+<var name="TGC1_BigWheel_RadDistOutPlate" value=" 3670. "/>
+<var name="TGC1_BigWheel_RadDistPlate02" value=" 2547. "/>
+<var name="TGC1_BigWheel_PhiDistRPlate1" value=" 350. "/>
+
+<var name="TGC1_BigWheel_ZThickPhiPlate" value=" 30. "/>
+<var name="TGC1_BigWheel_WallThickPhiPlate" value=" 16. "/>
+<var name="TGC1_BigWheel_RThickPhiPlate1" value=" 200. "/>
+<var name="TGC1_BigWheel_RThickPhiPlate2" value=" 120. "/>
+<var name="TGC1_BigWheel_ZThickRPlate" value=" 150. "/>
+<var name="TGC1_BigWheel_PhiThickRPlate" value=" 50. "/>
+<var name="TGC1_BigWheel_WallThickRPlate" value=" 5. "/>
+
+<var name="TGC1_BigWheel_PhiPlaDelEvenOdd" value="TGC1_BigWheel_RThickPhiPlate2 + TGC1_BigWheel_PhiThickRPlate/2."/>
+
+<var name="TGC1_BigWheel_PhiStepAngle1" value=" 7.5 * GENV_PiS180 "/>
+<var name="TGC1_BigWheel_PhiStepAngle2" value=" 15. * GENV_PiS180 "/>
+
+<var name="TGC1_BigWheel_PhiStep1toP1" value=" 18. "/>
+<var name="TGC1_BigWheel_PhiStepP1toP2" value=" 497. "/>
+
+<var name="TGC1_BigWheel_PhiStep2toP1" value=" 442. "/>
+<var name="TGC1_BigWheel_PhiStepP2toP2" value=" 642. + TGC1_BigWheel_PhiThickRPlate"/>
+
+<var name="TGC1_BigWheel_TubeInnerR" value=" 1715. "/>
+<var name="TGC1_BigWheel_TubeOuterR" value=" TGC1_BigWheel_TubeInnerR + 405. "/>
+
+<!-- lowest phi plate - plate 1 -->
+<gvxysx name="TGC1_PhiPlate1" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" (TGC1_BigWheel_RadDist00+TGC1_BigWheel_RadDist01+TGC1_BigWheel_RThickPhiPlate1)*sin(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_RadDist01+TGC1_BigWheel_RThickPhiPlate1"/>
+ <gvxy_point X_Y=" (TGC1_BigWheel_RadDist00+TGC1_BigWheel_RadDist01)*sin(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_RadDist01"/>
+</gvxysx>
+
+<!-- first phi plate with kink - plate 2 -->
+<var name="TGC1_PhiPlate2_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist02-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate2_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist02-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate2_XPos2" value="TGC1_PhiPlate2_XPos1+(TGC1_BigWheel_RadDist02*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate2_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate2_YPos2" value="TGC1_BigWheel_RadDist02-(TGC1_BigWheel_RadDist02*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate2_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate2_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos3; TGC1_BigWheel_RadDist02+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate2_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate2_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos1; TGC1_BigWheel_RadDist02"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate2_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist02+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate2_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate2_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate2_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist02-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- second phi plate with kink - plate 3 -->
+<var name="TGC1_PhiPlate3_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist03-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate3_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist03-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate3_XPos2" value="TGC1_PhiPlate3_XPos1+(TGC1_BigWheel_RadDist03*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate3_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+<var name="TGC1_PhiPlate3_YPos2" value="TGC1_BigWheel_RadDist03-(TGC1_BigWheel_RadDist03*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate3_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC1_PhiPlate3" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos3; TGC1_BigWheel_RadDist03+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate3_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate3_YPos2-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate3_XPos1; TGC1_BigWheel_RadDist03"/>
+</gvxysx>
+
+<!-- third phi plate with kink - plate 4 -->
+<var name="TGC1_PhiPlate4_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist04-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate4_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist04-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate4_XPos2" value="TGC1_PhiPlate4_XPos1+(TGC1_BigWheel_RadDist04*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate4_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate4_YPos2" value="TGC1_BigWheel_RadDist04-(TGC1_BigWheel_RadDist04*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate4_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate4_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos3; TGC1_BigWheel_RadDist04+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate4_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate4_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos1; TGC1_BigWheel_RadDist04"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate4_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist04+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate4_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate4_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate4_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist04-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- forth phi plate with kink - plate 5 -->
+<var name="TGC1_PhiPlate5_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist05-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate5_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist05-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate5_XPos2" value="TGC1_PhiPlate5_XPos1+(TGC1_BigWheel_RadDist05*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate5_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+<var name="TGC1_PhiPlate5_YPos2" value="TGC1_BigWheel_RadDist05-(TGC1_BigWheel_RadDist05*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate5_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC1_PhiPlate5" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos3; TGC1_BigWheel_RadDist05+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate5_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate5_YPos2-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate5_XPos1; TGC1_BigWheel_RadDist05"/>
+</gvxysx>
+
+<!-- fifth phi plate with kink - plate 6 -->
+<var name="TGC1_PhiPlate6_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist06-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate6_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist06-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate6_XPos2" value="TGC1_PhiPlate6_XPos1+(TGC1_BigWheel_RadDist06*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate6_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate6_YPos2" value="TGC1_BigWheel_RadDist06-(TGC1_BigWheel_RadDist06*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate6_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate6_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos3; TGC1_BigWheel_RadDist06+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate6_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate6_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos1; TGC1_BigWheel_RadDist06"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate6_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist06+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate6_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate6_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate6_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist06-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- sixth phi plate with kink - plate 7 -->
+<var name="TGC1_PhiPlate7_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist07-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate7_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist07-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate7_XPos2" value="TGC1_PhiPlate7_XPos1+(TGC1_BigWheel_RadDist07*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate7_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+<var name="TGC1_PhiPlate7_YPos2" value="TGC1_BigWheel_RadDist07-(TGC1_BigWheel_RadDist07*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate7_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<gvxysx name="TGC1_PhiPlate7" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos3; TGC1_BigWheel_RadDist07+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate7_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate7_YPos2-(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate7_XPos1; TGC1_BigWheel_RadDist07"/>
+</gvxysx>
+
+<!-- seventh phi plate with kink - plate 8 -->
+<var name="TGC1_PhiPlate8_XPos1" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist08-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2." />
+<var name="TGC1_PhiPlate8_XPos3" value="tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RadDist08-TGC1_BigWheel_PhiStep1toP1/cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/cos(TGC1_BigWheel_PhiStepAngle2)/2.+tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_RThickPhiPlate2" />
+<var name="TGC1_PhiPlate8_XPos2" value="TGC1_PhiPlate8_XPos1+(TGC1_BigWheel_RadDist08*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate8_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*cos(TGC1_BigWheel_PhiStepAngle2)" />
+<var name="TGC1_PhiPlate8_YPos2" value="TGC1_BigWheel_RadDist08-(TGC1_BigWheel_RadDist08*tan(TGC1_BigWheel_PhiStepAngle2)-TGC1_PhiPlate8_XPos1)*cos(TGC1_BigWheel_PhiStepAngle2)*sin(TGC1_BigWheel_PhiStepAngle2)" />
+
+<gvxysx name="TGC1_PhiPlate8_Even" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos3; TGC1_BigWheel_RadDist08+TGC1_BigWheel_RThickPhiPlate2"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate8_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2); TGC1_PhiPlate8_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos1; TGC1_BigWheel_RadDist08"/>
+</gvxysx>
+
+<gvxysx name="TGC1_PhiPlate8_Odd" material="Aluminium" dZ="TGC1_BigWheel_WallThickPhiPlate" >
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos3-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist08+TGC1_BigWheel_RThickPhiPlate2-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_RThickPhiPlate2*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate8_YPos2+TGC1_BigWheel_RThickPhiPlate2*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos2+TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2)-tan(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_PhiPlate8_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+ <gvxy_point X_Y=" TGC1_PhiPlate8_XPos1-tan(TGC1_BigWheel_PhiStepAngle1)*TGC1_BigWheel_PhiPlaDelEvenOdd; TGC1_BigWheel_RadDist08-TGC1_BigWheel_PhiPlaDelEvenOdd"/>
+</gvxysx>
+
+<!-- first R plate - center -->
+<box name="TGC1_RPlate1_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate1_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00+TGC1_BigWheel_WallThickRPlate; TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate1">
+ <posXYZ volume="TGC1_RPlate1_base" X_Y_Z=" TGC1_BigWheel_PhiDistRPlate1/2.+TGC1_BigWheel_PhiThickRPlate/2.; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." />
+ <posXYZ volume="TGC1_RPlate1_sub" X_Y_Z=" TGC1_BigWheel_PhiDistRPlate1/2.+TGC1_BigWheel_PhiThickRPlate/2.+TGC1_BigWheel_WallThickRPlate; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." />
+</subtraction>
+
+<!-- second R plate - 7.5 degrees -->
+<box name="TGC1_RPlate2_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/cos(TGC1_BigWheel_PhiStepAngle1); TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate2_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00+TGC1_BigWheel_WallThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle1); TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate2">
+ <posXYZ volume="TGC1_RPlate2_base" X_Y_Z=" TGC1_PhiPlate2_XPos1+(TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00-2.*TGC1_BigWheel_RadDist02)*tan(TGC1_BigWheel_PhiStepAngle1)/2.; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate2_sub" X_Y_Z=" TGC1_PhiPlate2_XPos1+(TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00-2.*TGC1_BigWheel_RadDist02)*tan(TGC1_BigWheel_PhiStepAngle1)/2.-TGC1_BigWheel_WallThickRPlate; (TGC1_BigWheel_RadDist09+TGC1_BigWheel_RadDistPlate02-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+</subtraction>
+
+<!-- third R plate - 7.5 degrees TGC1_BigWheel_PhiThickRPlate-->
+<var name="TGC1_RPlate3_length" value="(TGC1_BigWheel_RadDist09 - TGC1_BigWheel_RadDist00 - (TGC1_PhiPlate2_YPos2-TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)) - (TGC1_BigWheel_PhiStep2toP1 + TGC1_BigWheel_PhiThickRPlate) * sin(TGC1_BigWheel_PhiStepAngle2) ) / cos(TGC1_BigWheel_PhiStepAngle1)" />
+
+<box name="TGC1_RPlate3_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_RPlate3_length; TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate3_sub1" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_RPlate3_length + TGC1_BigWheel_WallThickRPlate/cos(TGC1_BigWheel_PhiStepAngle1); TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+<box name="TGC1_RPlate3_sub2" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; TGC1_RPlate3_length; TGC1_BigWheel_ZThickRPlate+2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate3_tmp">
+ <posXYZ volume="TGC1_RPlate3_base" X_Y_Z=" TGC1_RPlate3_length/2.*sin(TGC1_BigWheel_PhiStepAngle1); TGC1_RPlate3_length/2.*cos(TGC1_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate3_sub1" X_Y_Z=" TGC1_RPlate3_length/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_BigWheel_WallThickRPlate; TGC1_RPlate3_length/2.*cos(TGC1_BigWheel_PhiStepAngle1); 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate3_sub2" X_Y_Z="TGC1_RPlate3_length/2.*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/2*(cos(TGC1_BigWheel_PhiStepAngle1)-cos(TGC1_BigWheel_PhiStepAngle2));TGC1_RPlate3_length/2.*cos(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_PhiThickRPlate/2*(sin(TGC1_BigWheel_PhiStepAngle2)-sin(TGC1_BigWheel_PhiStepAngle1)); 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<var name="TGC1_RPlate3_PosX" value="TGC1_PhiPlate2_XPos2+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1)*cos(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiThickRPlate*(0.5*cos(TGC1_BigWheel_PhiStepAngle1)-cos(TGC1_BigWheel_PhiStepAngle2))-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<var name="TGC1_RPlate3_PosY" value="TGC1_PhiPlate2_YPos2+(TGC1_BigWheel_PhiStep2toP1-TGC1_BigWheel_PhiStepP2toP2)*sin(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_PhiThickRPlate*(sin(TGC1_BigWheel_PhiStepAngle2)-0.5*sin(TGC1_BigWheel_PhiStepAngle1))+sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate" />
+
+<composition name="TGC1_RPlate3" >
+ <posXYZ volume="TGC1_RPlate3_tmp" X_Y_Z=" TGC1_RPlate3_PosX-GENV_Eps; TGC1_RPlate3_PosY ; 0." />
+</composition>
+
+<!-- first R plate - 15 degrees -->
+<box name="TGC1_RPlate4_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)/cos(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate4_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00+TGC1_BigWheel_WallThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<subtraction name="TGC1_RPlate4">
+ <posXYZ volume="TGC1_RPlate4_base" X_Y_Z=" (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)*tan(TGC1_BigWheel_PhiStepAngle2)/2.+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1-1.5*TGC1_BigWheel_PhiThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle2); (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate4_sub" X_Y_Z=" (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)*tan(TGC1_BigWheel_PhiStepAngle2)/2.-TGC1_BigWheel_WallThickRPlate+(TGC1_BigWheel_PhiStepP2toP2-TGC1_BigWheel_PhiStep2toP1-1.5*TGC1_BigWheel_PhiThickRPlate)/cos(TGC1_BigWheel_PhiStepAngle2); (TGC1_BigWheel_RadDist09-TGC1_BigWheel_RadDist00)/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- second R plate - 15 degrees -->
+<box name="TGC1_RPlate5_base" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/cos(TGC1_BigWheel_PhiStepAngle2); TGC1_BigWheel_ZThickRPlate" />
+<box name="TGC1_RPlate5_sub" material="Aluminium" X_Y_Z=" TGC1_BigWheel_PhiThickRPlate; (TGC1_BigWheel_RadDist09-cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/cos(TGC1_BigWheel_PhiStepAngle2)+TGC1_BigWheel_WallThickRPlate; TGC1_BigWheel_ZThickRPlate-2.*TGC1_BigWheel_WallThickRPlate" />
+
+<var name="TGC1_RPlate5_PosX" value="sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate/2. +TGC1_PhiPlate2_XPos2 +TGC1_BigWheel_PhiStepP2toP2*cos(TGC1_BigWheel_PhiStepAngle2) +tan(TGC1_BigWheel_PhiStepAngle2)*(TGC1_BigWheel_RadDist09/2.-TGC1_PhiPlate2_YPos2+TGC1_BigWheel_PhiStepP2toP2*sin(TGC1_BigWheel_PhiStepAngle2)-TGC1_BigWheel_RadDist00)"/>
+
+<subtraction name="TGC1_RPlate5">
+ <posXYZ volume="TGC1_RPlate5_base" X_Y_Z=" TGC1_RPlate5_PosX - cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.; (TGC1_BigWheel_RadDist09+cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/2. - TGC1_BigWheel_RadDist00 + sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+ <posXYZ volume="TGC1_RPlate5_sub" X_Y_Z=" TGC1_RPlate5_PosX - cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.+TGC1_BigWheel_WallThickRPlate; (TGC1_BigWheel_RadDist09+cos(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_RadDistOutPlate)/2.- TGC1_BigWheel_RadDist00 + sin(TGC1_BigWheel_PhiStepAngle2)*TGC1_BigWheel_PhiThickRPlate/2.; 0." rot=" 0.; 0.; -TGC1_BigWheel_PhiStepAngle2/GENV_PiS180" />
+</subtraction>
+
+<!-- very rough approximation of trigger boxes and cables - everything estimated - everywhere for TGC1 -->
+<!-- change of variables does not change placement correctly - fine tuning required -->
+
+<var name="TGC1_TrigBoxThicknessZ" value=" 2. " />
+<var name="TGC1_TrigBoxWidthPhi" value=" 260. " />
+<var name="TGC1_TrigBoxLengthR" value=" 3160. " />
+
+<box name="TGC1_TrigBox" material="Aluminium" X_Y_Z="TGC1_TrigBoxWidthPhi; TGC1_TrigBoxLengthR; TGC1_TrigBoxThicknessZ" />
+
+<var name="TGC1_TrigCableThicknessZ1" value=" 4. " />
+<var name="TGC1_TrigCableWidthPhi1" value=" 100. " />
+<var name="TGC1_TrigCableLengthR1" value=" 5650. " />
+
+<box name="TGC1_TrigCable1" material="Copper" X_Y_Z=" TGC1_TrigCableWidthPhi1; TGC1_TrigCableLengthR1; TGC1_TrigCableThicknessZ1" />
+
+<composition name="TGC1_Support_EvenSector_ASide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC1_Support_OddSector_ASide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; -(TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2.)" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC1_Support_EvenSector_CSide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Even" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<composition name="TGC1_Support_OddSector_CSide">
+ <posXYZ volume="TGC1_PhiPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate2_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate4_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate6_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate7" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_PhiPlate8_Odd" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; 0." />
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate1" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate2" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate3" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate4" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; -TGC1_BigWheel_ZThickPhiPlate-TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="TGC1_RPlate5" X_Y_Z=" 0.; TGC1_BigWheel_RadDist00; TGC1_BigWheel_ZThickPhiPlate+TGC1_BigWheel_ZThickRPlate/2." rot=" 0.; 180.; 0."/>
+
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(TGC1_PhiPlate6_XPos1-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigBoxWidthPhi/8.*cos(TGC1_BigWheel_PhiStepAngle1)); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+ <posXYZ volume="TGC1_TrigBox" X_Y_Z=" -(-TGC1_TrigBoxLengthR/2.*sin(TGC1_BigWheel_PhiStepAngle1)-3.*TGC1_TrigBoxWidthPhi/4.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate5_XPos2); -TGC1_TrigBoxLengthR/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_ZThickPhiPlate" rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180" />
+
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(-TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1) + TGC1_PhiPlate6_XPos1 + 175.); -TGC1_TrigCableWidthPhi1/2.*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+ <posXYZ volume="TGC1_TrigCable1" X_Y_Z="-(TGC1_TrigCableLengthR1/2.*sin(TGC1_BigWheel_PhiStepAngle1)+3.*TGC1_TrigCableWidthPhi1/2.*cos(TGC1_BigWheel_PhiStepAngle1)-TGC1_PhiPlate7_XPos2); TGC1_TrigCableWidthPhi1*sin(TGC1_BigWheel_PhiStepAngle1)-TGC1_TrigCableLengthR1/2.*cos(TGC1_BigWheel_PhiStepAngle1)+TGC1_BigWheel_RadDist09; TGC1_BigWheel_WallThickPhiPlate/2.+GENV_Eps+TGC1_TrigCableThicknessZ1/2." rot="0.; 0.; -TGC1_BigWheel_PhiStepAngle1/GENV_PiS180"/>
+
+</composition>
+
+<!-- tube and boxes are rather rouhg approximated here - should be okay though - Cavern Background only -->
+
+<tubs name="TGC1_CentralTube" material="Aluminium" Rio_Z="TGC1_BigWheel_TubeInnerR; TGC1_BigWheel_TubeOuterR; TGC1_BigWheel_WallThickPhiPlate" nbPhi="20" />
+
+<box name="TGC1_SurBox_base" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSideLength; TGC_BigWheel_SurBoxSideLength" />
+<box name="TGC1_SurBox_inner" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSideLength-2.*TGC_BigWheel_SurBoxSpcWall" />
+
+<subtraction name="TGC1_SurBox_default" >
+ <posXYZ volume="TGC1_SurBox_base" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+ <posXYZ volume="TGC1_SurBox_inner" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+TGC_BigWheel_SurBoxSideLength; 0." />
+</subtraction>
+
+<box name="TGC1_SurBoxSpc_base" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2); TGC_BigWheel_SurBoxSpcLength; TGC_BigWheel_SurBoxSpcHeight" />
+<box name="TGC1_SurBoxSpc_inner" material="Aluminium" X_Y_Z=" 2.*TGC1_BigWheel_RadDist09*tan(TGC1_BigWheel_PhiStepAngle2)+2.*GENV_Eps; TGC_BigWheel_SurBoxSpcLength-2.*TGC_BigWheel_SurBoxSpcWall; TGC_BigWheel_SurBoxSpcHeight" />
+
+<subtraction name="TGC1_SurBoxSpc" >
+ <posXYZ volume="TGC1_SurBoxSpc_base" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2." />
+ <posXYZ volume="TGC1_SurBoxSpc_inner" X_Y_Z=" 0.; TGC1_BigWheel_RadDist09+1.5*TGC_BigWheel_SurBoxSideLength+TGC_BigWheel_SurBoxDistance/2.; TGC_BigWheel_SurBoxSideLength/2.+TGC_BigWheel_SurBoxSpcHeight/2.-TGC_BigWheel_SurBoxSpcWall" />
+</subtraction>
+
+<composition name="TGC1_SurBox_extended" >
+ <posXYZ volume="TGC1_SurBox_default" X_Y_Z=" 0.; TGC_BigWheel_SurBoxSideLength + TGC_BigWheel_SurBoxDistance; 0." />
+ <posXYZ volume="TGC1_SurBoxSpc" X_Y_Z=" 0.; 0.; GENV_Eps" />
+ <posXYZ volume="TGC1_SurBoxSpc" X_Y_Z=" 0.; 0.; -GENV_Eps" rot=" 0.; 180.; 0."/>
+</composition>
+
+<composition name="TGC1_BigWheel_ASide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC1_Support_EvenSector_ASide" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC1_Support_OddSector_ASide" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC1_SurBox_default" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ <posXYZ volume="TGC1_SurBox_extended" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <posXYZ volume="TGC1_CentralTube" X_Y_Z=" 0.; 0.; TGC1_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC1_BigWheel_CSide">
+ <foreach index="counter" begin="0" loops="6" >
+ <posXYZ volume="TGC1_Support_EvenSector_CSide" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*60." />
+ <posXYZ volume="TGC1_Support_OddSector_CSide" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; 30.+(counter)*60." />
+ </foreach>
+ <foreach index="counter" begin="0" loops="12" >
+ <posXYZ volume="TGC1_SurBox_default" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ <posXYZ volume="TGC1_SurBox_extended" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" rot="0.; 0.; counter*30." />
+ </foreach>
+ <posXYZ volume="TGC1_CentralTube" X_Y_Z=" 0.; 0.; -TGC1_BigWheel_ZPosL" />
+</composition>
+
+<composition name="TGC1_BigWheels">
+ <posXYZ volume="TGC1_BigWheel_ASide" X_Y_Z=" 0.; 0.; 0." />
+ <posXYZ volume="TGC1_BigWheel_CSide" X_Y_Z=" 0.; 0.; 0." />
+</composition>
+
+</section>
+
+<section name = "MdtRailSupport"
+ version = "1.0"
+ date = "21 10 2010"
+ author = "Claude, Jochen, laurent"
+ top_volume = "MDTRail">
+<defaults unit_length="mm" />
+
+<var name="Zero" value=" 0"/>
+
+<var name="R_BOL_rail" value="9650."/>
+<var name="S_BOL_rail" value="2710."/>
+<var name="Z_BOL_rail" value="6350."/>
+<box name="rail_BOL" material="Aluminium" X_Y_Z="120.;120.;11300." />
+
+<composition name="BOL_MDTRail">
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S=" S_BOL_rail" R_Z="R_BOL_rail; Z_BOL_rail" impliedRot="true" />
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S="-S_BOL_rail" R_Z="R_BOL_rail; Z_BOL_rail" impliedRot="true" />
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S=" S_BOL_rail" R_Z="R_BOL_rail;-Z_BOL_rail" impliedRot="true" />
+ <mposPhi volume="rail_BOL" ncopy="7" Phi0="-45." dPhi=" 45." S="-S_BOL_rail" R_Z="R_BOL_rail;-Z_BOL_rail" impliedRot="true" />
+</composition>
+
+<var name="R_BOL_service" value="9520."/>
+<var name="S_BOL_service" value="2570."/>
+<var name="Z_BOL_service" value="6350."/>
+<box name="service_BOL" material="Carbon" X_Y_Z="200.;150.; 11300." />
+
+<composition name="BOL_MDTService">
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S=" S_BOL_service" R_Z="R_BOL_service; Z_BOL_service" impliedRot="true" />
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S="-S_BOL_service" R_Z="R_BOL_service; Z_BOL_service" impliedRot="true" />
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S=" S_BOL_service" R_Z="R_BOL_service;-Z_BOL_service" impliedRot="true" />
+ <mposPhi volume="service_BOL" ncopy="8" Phi0="0." S="-S_BOL_service" R_Z="R_BOL_service;-Z_BOL_service" impliedRot="true" />
+</composition>
+
+
+<var name="R_BML_rail" value="7139."/>
+<var name="S_BML_rail" value="1998."/>
+<var name="Z_BML_rail" value="4850."/>
+<box name="rail_BML" material="Aluminium" X_Y_Z="120.;120.; 8300." />
+
+<composition name="BML_MDTRail">
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S=" S_BML_rail" R_Z="R_BML_rail; Z_BML_rail" impliedRot="true" />
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S="-S_BML_rail" R_Z="R_BML_rail; Z_BML_rail" impliedRot="true" />
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S=" S_BML_rail" R_Z="R_BML_rail;-Z_BML_rail" impliedRot="true" />
+ <mposPhi volume="rail_BML" ncopy="8" Phi0="0." S="-S_BML_rail" R_Z="R_BML_rail;-Z_BML_rail" impliedRot="true" />
+</composition>
+
+<var name="R_BML_support1" value="6900."/>
+<var name="S_BML_support1" value="2120."/>
+<var name="Z1_BML_support1" value="1712.5"/>
+<var name="Z2_BML_support1" value="5137.5"/>
+<var name="Z3_BML_support1" value="8245.0"/>
+<box name="support1_BML" material="Aluminium" X_Y_Z="590.;120.; 120." />
+
+<composition name="BML_RailSupport1">
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1; Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1; Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1;-Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1;-Z1_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1; Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1; Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1;-Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1;-Z2_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1; Z3_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1; Z3_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S=" S_BML_support1" R_Z="R_BML_support1;-Z3_BML_support1" impliedRot="true" />
+ <mposPhi volume="support1_BML" ncopy="8" Phi0="0." S="-S_BML_support1" R_Z="R_BML_support1;-Z3_BML_support1" impliedRot="true" />
+</composition>
+
+<var name="R_BML_support2" value="7139."/>
+<var name="S_BML_support2" value="2362."/>
+<var name="Z1_BML_support2" value="3490.0"/>
+<var name="Z2_BML_support2" value="6760.0"/>
+<box name="support2_BML" material="Aluminium" X_Y_Z=" 120.; 590.; 120." />
+
+<composition name="BML_RailSupport2">
+ <!-- the standard BML rail support brackets are in 2 orthogonal directions, but not in sectors 11/13/15,
+ to account for it, just add 7 brackets each (i.e. leave out the bottom sectors),
+ 4 by using symmetry and the 3 remaining ones positioned manually -->
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2; Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2;-Z1_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2; Z2_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="-45." S=" S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+
+ <mposPhi volume="support2_BML" ncopy="4" Phi0="0." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="45." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="135." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+ <mposPhi volume="support2_BML" ncopy="1" Phi0="225." S="-S_BML_support2" R_Z="R_BML_support2;-Z2_BML_support2" impliedRot="true" />
+</composition>
+
+
+<var name="R_BML_service" value="7139."/>
+<var name="S_BML_service" value="1860."/>
+<var name="Z_BML_service" value="4850."/>
+<box name="service_BML" material="Carbon" X_Y_Z="250.;120.; 8300." />
+
+<composition name="BML_MDTService">
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S=" S_BML_service" R_Z="R_BML_service; Z_BML_service" impliedRot="true" />
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S="-S_BML_service" R_Z="R_BML_service; Z_BML_service" impliedRot="true" />
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S=" S_BML_service" R_Z="R_BML_service;-Z_BML_service" impliedRot="true" />
+ <mposPhi volume="service_BML" ncopy="8" Phi0="0." S="-S_BML_service" R_Z="R_BML_service;-Z_BML_service" impliedRot="true" />
+</composition>
+
+<var name="R_BML_trigbox" value="7575."/>
+<var name="S_BML_trigbox" value=" 900."/>
+<var name="Z_BML_trigbox" value="4850."/>
+<box name="trigbox_BML" material="Carbon" X_Y_Z="50.;1000.; 8300." />
+<composition name="BML_trigbox">
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S=" S_BML_trigbox" R_Z="R_BML_trigbox; Z_BML_trigbox" impliedRot="true" />
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S="-S_BML_trigbox" R_Z="R_BML_trigbox; Z_BML_trigbox" impliedRot="true" />
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S=" S_BML_trigbox" R_Z="R_BML_trigbox;-Z_BML_trigbox" impliedRot="true" />
+ <mposPhi volume="trigbox_BML" ncopy="8" Phi0="0." S="-S_BML_trigbox" R_Z="R_BML_trigbox;-Z_BML_trigbox" impliedRot="true" />
+</composition>
+
+<var name="R_BMS_service" value="8095."/>
+<var name="S_BMS_service" value="1610."/>
+<var name="Z_BMS_service" value="4850."/>
+<box name="service_BMS" material="Carbon" X_Y_Z="100.;120.; 8300." />
+
+<composition name="BMS_MDTService">
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S=" S_BMS_service" R_Z="R_BMS_service; Z_BMS_service" impliedRot="true" />
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S="-S_BMS_service" R_Z="R_BMS_service; Z_BMS_service" impliedRot="true" />
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S=" S_BMS_service" R_Z="R_BMS_service;-Z_BMS_service" impliedRot="true" />
+ <mposPhi volume="service_BMS" ncopy="8" Phi0="22.5" S="-S_BMS_service" R_Z="R_BMS_service;-Z_BMS_service" impliedRot="true" />
+</composition>
+
+<var name="R_BMS_trigbox" value="7740."/>
+<var name="S_BMS_trigbox" value=" 550."/>
+<var name="Z_BMS_trigbox1" value="1950."/>
+<var name="Z_BMS_trigbox2" value="5150."/>
+<var name="Z_BMS_trigbox3" value="8150."/>
+<box name="trigbox_BMS" material="Carbon" X_Y_Z="50.;900.; 2000." />
+
+<composition name="BMS_trigbox">
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox1" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox2" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox3" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox; Z_BMS_trigbox3" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S=" S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox3" impliedRot="true" />
+ <mposPhi volume="trigbox_BMS" ncopy="6" Phi0="-22.5" dPhi="45." S="-S_BMS_trigbox" R_Z="R_BMS_trigbox;-Z_BMS_trigbox3" impliedRot="true" />
+</composition>
+
+
+<composition name="MDTRail">
+ <posXYZ volume="BOL_MDTRail" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BOL_MDTService" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_MDTRail" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_RailSupport1" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_RailSupport2" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_MDTService" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BML_trigbox" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BMS_MDTService" X_Y_Z="Zero;Zero;Zero"/>
+ <posXYZ volume="BMS_trigbox" X_Y_Z="Zero;Zero;Zero"/>
+</composition>
+
+</section>
+
+<section name = "HFtruck"
+ version = "0.0"
+ date = "13-09-2017"
+ author = "Besik Kekelia"
+ top_volume = "HFTruckRail">
+
+<!-- name = HFTruck section name = "Supports" -->
+<!--
+ **************************************************************
+ *** ****
+ *** HF Truck ****
+ *** ****
+ **************************************************************
+-->
+
+<defaults unit_length="mm" />
+
+<!-- Description of HF Truck -->
+
+<!-- Description of Column C1-L, C2-R -->
+<gvxy name="Column" material="Iron" dZ="6662.">
+<gvxy_point X_Y="1485.; 1645."/>
+<gvxy_point X_Y="1525.; 1645."/>
+<gvxy_point X_Y="1525.; 1409.5"/>
+<gvxy_point X_Y="2225.; 1409.5"/>
+<gvxy_point X_Y="2225.; 1645."/>
+<gvxy_point X_Y="2265.; 1645."/>
+<gvxy_point X_Y="2265.; 1105."/>
+<gvxy_point X_Y="2225.; 1105."/>
+<gvxy_point X_Y="2225.; 1340.5"/>
+<gvxy_point X_Y="1525.; 1340.5"/>
+<gvxy_point X_Y="1525.; 1105."/>
+<gvxy_point X_Y="1485.; 1105."/>
+</gvxy>
+
+<tubs name="Column_Tube" material="Iron" Rio_Z="147.95; 254.; 2680.9" nbPhi="32"/>
+
+<composition name="Column_C1-L_C2-R" >
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; 0. " rot=" 90.; 0.; 180." />
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; -2750. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Column" X_Y_Z=" 0.; 0.; -2750. " rot=" 90.; 0.; 180." />
+ <posXYZ volume="Column_Tube" X_Y_Z=" 1875.; 2068.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Column_Tube" X_Y_Z=" -1875.; 2068.; 0. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Column C1-L, C2-R -->
+
+
+<!-- Description of Beam -->
+<gvxy name="Beam_1" material="Iron" dZ="5319.9">
+<gvxy_point X_Y="-1645.; 4211.05"/>
+<gvxy_point X_Y="-1645.; 4171.05"/>
+<gvxy_point X_Y="-1420.05; 4171.05"/>
+<gvxy_point X_Y="-1420.05; 3371.05"/>
+<gvxy_point X_Y="-1645.; 3371.05"/>
+<gvxy_point X_Y="-1645.; 3331.05"/>
+<gvxy_point X_Y="-1109.95; 3331.05"/>
+<gvxy_point X_Y="-1109.95; 3371.05"/>
+<gvxy_point X_Y="-1329.95; 3371.05"/>
+<gvxy_point X_Y="-1329.95; 4171.05"/>
+<gvxy_point X_Y="-1109.95; 4171.05"/>
+<gvxy_point X_Y="-1109.95; 4211.05"/>
+</gvxy>
+
+<box name="Beam_Box" material="Iron" X_Y_Z="880.; 40.; 540."/>
+
+<composition name="Beam" >
+ <posXYZ volume="Beam_1" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 90.; 0." />
+ <posXYZ volume="Beam_1" X_Y_Z=" 0.; 0.; -2750. " rot=" 0.; 90.; 0." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" -2680.; 3771.05; 1375. " rot=" 0.; 0.; 90." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" 2680.; 3771.05; 1375. " rot=" 0.; 0.; 90." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" -2680.; 3771.05; -1375. " rot=" 0.; 0.; 90." />
+ <posXYZ volume="Beam_Box" X_Y_Z=" 2680.; 3771.05; -1375. " rot=" 0.; 0.; 90." />
+</composition>
+<!-- end of Description of Beam -->
+
+<!-- Description of Rail -->
+
+<gvxy name="Rail_1" material="Iron" dZ="5400.">
+<gvxy_point X_Y="-1740.; 4659.14"/>
+<gvxy_point X_Y="-1010.; 4659.14"/>
+<gvxy_point X_Y="-1010.; 4559.14"/>
+<gvxy_point X_Y="-1345.; 4559.14"/>
+<gvxy_point X_Y="-1345.; 4319.14"/>
+<gvxy_point X_Y="-1150.; 4319.14"/>
+<gvxy_point X_Y="-1150.; 4259.14"/>
+<gvxy_point X_Y="-1600.; 4259.14"/>
+<gvxy_point X_Y="-1600.; 4319.14"/>
+<gvxy_point X_Y="-1405.; 4319.14"/>
+<gvxy_point X_Y="-1405.; 4559.14"/>
+<gvxy_point X_Y="-1740.; 4559.14"/>
+</gvxy>
+
+<composition name="Rail" >
+ <posXYZ volume="Rail_1" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 90.; -0.708" />
+ <posXYZ volume="Rail_1" X_Y_Z=" 0.; 0.; -2750. " rot=" 0.; 90.; -0.708" />
+</composition>
+<!-- end of Description of Rail -->
+
+
+<!-- Description of Shims -->
+<gvxy name="Shims_1" material="Iron" dZ="238.">
+<gvxy_point X_Y="-2700.; 4291.76"/>
+<gvxy_point X_Y="2700.; 4225.029"/>
+<gvxy_point X_Y="2700.; 4211."/>
+<gvxy_point X_Y="-2700.; 4211."/>
+</gvxy>
+
+<composition name="Shims" >
+ <posXYZ volume="Shims_1" X_Y_Z=" 0.; 1.; 1375. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Shims_1" X_Y_Z=" 0.; 1.; -1375. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Shims -->
+
+<!-- Description of Bracing -->
+<gvxy name="Bracing_1" material="Aluminium" dZ="4038.">
+<gvxy_point X_Y="1745.; 99.5"/>
+<gvxy_point X_Y="1745.; 120."/>
+<gvxy_point X_Y="2005.; 120."/>
+<gvxy_point X_Y="2005.; 99.5"/>
+<gvxy_point X_Y="1883.; 99.5"/>
+<gvxy_point X_Y="1883.; -99.5"/>
+<gvxy_point X_Y="2005.; -99.5"/>
+<gvxy_point X_Y="2005.; -120."/>
+<gvxy_point X_Y="1745.; -120."/>
+<gvxy_point X_Y="1745.; -99.5"/>
+<gvxy_point X_Y="1847.; -99.5"/>
+<gvxy_point X_Y="1847.; 99.5"/>
+</gvxy>
+
+<gvxy name="subt_box" material="Aluminium" dZ="4038.">
+<gvxy_point X_Y="1735.46; 120.05"/>
+<gvxy_point X_Y="2016.3; 120.05"/>
+<gvxy_point X_Y="2016.3; -120.05"/>
+<gvxy_point X_Y="1735.46; -120.05"/>
+</gvxy>
+
+ <subtraction name="Sub_Bracing_1" >
+ <posXYZ volume="Bracing_1" X_Y_Z=" 0.; 0.; 0." rot=" -60.3; 0.; 0."/>
+ <posXYZ volume="subt_box" X_Y_Z=" 0.; 0; 0." rot=" 60.3; 0.; 0."/>
+ </subtraction>
+
+<gvxy name="Bracing_2" material="Aluminium" dZ="3588.">
+<gvxy_point X_Y="-120.; 120."/>
+<gvxy_point X_Y="-102.; 120."/>
+<gvxy_point X_Y="-102.; 6.25"/>
+<gvxy_point X_Y="102.; 6.25"/>
+<gvxy_point X_Y="102.; 120."/>
+<gvxy_point X_Y="120.; 120."/>
+<gvxy_point X_Y="120.; -120."/>
+<gvxy_point X_Y="102.; -120."/>
+<gvxy_point X_Y="102.; -6.25"/>
+<gvxy_point X_Y="-102.; -6.25"/>
+<gvxy_point X_Y="-102.; -120."/>
+<gvxy_point X_Y="-120.; -120."/>
+</gvxy>
+
+<box name="sub_Bracing_2" material="Aluminium" X_Y_Z="241.1; 240.1; 3600."/>
+
+ <subtraction name="Sub_Bracing_2" >
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; 0.; 0." rot=" 0; 90.; 38.2"/>
+ <posXYZ volume="sub_Bracing_2" X_Y_Z=" 0.; 0; 0." rot=" 0.; 90.; -38.2"/>
+ </subtraction>
+
+<composition name="Bracing" >
+ <posXYZ volume="Bracing_1" X_Y_Z=" 0.; 0.; 0. " rot="60.3; 0.; 0." />
+ <posXYZ volume="Sub_Bracing_1" X_Y_Z=" 0.; 0.; 0. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_1" X_Y_Z=" -3750.; 0.; 0. " rot="60.3; 0.; 0." />
+ <posXYZ volume="Sub_Bracing_1" X_Y_Z=" -3750.; 0.; 0. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; -712.3; 1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; -712.3; 1375. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; 1990.7; 1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; 1990.7; 1375. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; -712.3; -1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; -712.3; -1375. " rot="0.; 0.; 0." />
+ <posXYZ volume="Bracing_2" X_Y_Z=" 0.; 1990.7; -1375. " rot="0.; 90.; -38.2" />
+ <posXYZ volume="Sub_Bracing_2" X_Y_Z=" 0.; 1990.7; -1375. " rot="0.; 0.; 0." />
+</composition>
+
+<!-- end of Description of Bracing -->
+
+
+<!-- Description of Brackets -->
+<gvxy name="Brackets_1" material="Iron" dZ="880.">
+<gvxy_point X_Y="-2145.; -2028.9"/>
+<gvxy_point X_Y="-1605.; -2028.9"/>
+<gvxy_point X_Y="-1605.; -2094.9"/>
+<gvxy_point X_Y="-1845.; -2094.9"/>
+<gvxy_point X_Y="-1845.; -3175."/>
+<gvxy_point X_Y="-1605.; -3175."/>
+<gvxy_point X_Y="-1605.; -3241."/>
+<gvxy_point X_Y="-2145.; -3241."/>
+<gvxy_point X_Y="-2145.; -3175."/>
+<gvxy_point X_Y="-1905.; -3175."/>
+<gvxy_point X_Y="-1905.; -2094.9"/>
+<gvxy_point X_Y="-2145.; -2094.9"/>
+</gvxy>
+
+<composition name="Brackets" >
+ <posXYZ volume="Brackets_1" X_Y_Z=" 0.; 0.; 665. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Brackets_1" X_Y_Z=" 0.; 0.; -665. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Brackets_1" X_Y_Z=" 3750.; 0.; 665. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Brackets_1" X_Y_Z=" 3750.; 0.; -665. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Brackets -->
+
+<!-- Description of Inox -->
+<box name="Inox_1" material="Iron" X_Y_Z="267.; 5478.; 36.8"/>
+
+<composition name="Inox" >
+ <posXYZ volume="Inox_1" X_Y_Z=" -2398.5; 500.; 1086.55 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Inox_1" X_Y_Z=" -2398.5; 500.; -1086.55 " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Inox -->
+
+<!-- Description of Infrastructure -->
+<gvxy name="Infrastructure_Feet_1" material="Iron" dZ="974.">
+<gvxy_point X_Y="1935.; -467."/>
+<gvxy_point X_Y="1935.; -478."/>
+<gvxy_point X_Y="1878.25; -478."/>
+<gvxy_point X_Y="1878.25; -576."/>
+<gvxy_point X_Y="1935.; -576."/>
+<gvxy_point X_Y="1935.; -587."/>
+<gvxy_point X_Y="1815.; -587."/>
+<gvxy_point X_Y="1815.; -576."/>
+<gvxy_point X_Y="1871.75; -576."/>
+<gvxy_point X_Y="1871.75; -478."/>
+<gvxy_point X_Y="1815.; -478."/>
+<gvxy_point X_Y="1815.; -467."/>
+</gvxy>
+
+<box name="Infrastructure_box_1" material="Iron" X_Y_Z="4449.1; 11.3; 1949.1"/>
+
+<gvxy name="Infrastructure_Feet_2" material="Iron" dZ="974.">
+<gvxy_point X_Y="-1476.; 1355.95"/>
+<gvxy_point X_Y="-1476.; 1349.05"/>
+<gvxy_point X_Y="-1510.15; 1349.05"/>
+<gvxy_point X_Y="-1510.15; 1222.85"/>
+<gvxy_point X_Y="-1476.; 1222.85"/>
+<gvxy_point X_Y="-1476.; 1215.95"/>
+<gvxy_point X_Y="-1549.; 1215.95"/>
+<gvxy_point X_Y="-1549.; 1222.85"/>
+<gvxy_point X_Y="-1515.95; 1222.85"/>
+<gvxy_point X_Y="-1514.85; 1349.05"/>
+<gvxy_point X_Y="-1549.; 1349.05"/>
+<gvxy_point X_Y="-1549.; 1355.95"/>
+</gvxy>
+
+<box name="Infrastructure_box_2" material="Iron" X_Y_Z="5360.; 20.4; 510."/>
+
+<composition name="Infrastructure" >
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" 0.; 2809.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" 0.; 2809.05; -1054. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" -3750.; 2809.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_1" X_Y_Z=" -3750.; 2809.05; -1054. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Infrastructure_box_1" X_Y_Z=" 0.; 3301.75; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 0.; 0.; 610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 0.; 0.; -610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 3025.; 0.; 610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_Feet_2" X_Y_Z=" 3025.; 0.; -610.5 " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_box_2" X_Y_Z=" 0.; 1366.2; 379. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Infrastructure_box_2" X_Y_Z=" 0.; 1366.2; -379. " rot=" 0.; 0.; 0." />
+</composition>
+<!-- end of Description of Infrastructure -->
+
+<!-- Description of JF Table -->
+
+<!-- Description of JF Table Beam -->
+
+<box name="Table_Beam_2" material="Iron" X_Y_Z="3500.; 50.; 500."/>
+<tubs name="sub_tube" material="Iron" Rio_Z="0.; 155.; 2700." nbPhi="32"/>
+
+ <subtraction name="Sub_Beam_2" >
+ <posXYZ volume="Table_Beam_2" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" -825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" 825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ </subtraction>
+
+<gvxy name="Table_Beam_3" material="Iron" dZ="500.">
+<gvxy_point X_Y="-1750.; -225."/>
+<gvxy_point X_Y="-979.29; -225."/>
+<gvxy_point X_Y="-679.29; -525."/>
+<gvxy_point X_Y="679.29; -525."/>
+<gvxy_point X_Y="979.29; -225."/>
+<gvxy_point X_Y="1750.; -225."/>
+<gvxy_point X_Y="1750.; -317."/>
+<gvxy_point X_Y="958.; -317."/>
+<gvxy_point X_Y="700.; -575."/>
+<gvxy_point X_Y="-700.; -575."/>
+<gvxy_point X_Y="-958.; -317."/>
+<gvxy_point X_Y="-1750.; -317."/>
+</gvxy>
+
+ <subtraction name="Sub_Table_Beam_3" >
+ <posXYZ volume="Table_Beam_3" X_Y_Z=" 0.; 0.; 0." rot=" 0; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" -825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ <posXYZ volume="sub_tube" X_Y_Z=" 825.; 0.; 0." rot=" 90.; 0.; 0."/>
+ </subtraction>
+
+<box name="Table_Beam_4" material="Iron" X_Y_Z="80.; 199.9; 500."/>
+<box name="Table_Beam_5" material="Iron" X_Y_Z="400.; 199.9; 50."/>
+<box name="Table_Beam_6" material="Iron" X_Y_Z="50.; 400.; 500."/>
+
+<gvxy name="Table_Beam_7" material="Iron" dZ="499.9">
+<gvxy_point X_Y="-640.05; 250."/>
+<gvxy_point X_Y="-540.05; 250."/>
+<gvxy_point X_Y="-540.05; 34."/>
+<gvxy_point X_Y="540.05; 34."/>
+<gvxy_point X_Y="540.05; 250."/>
+<gvxy_point X_Y="640.05; 250."/>
+<gvxy_point X_Y="640.05; -250."/>
+<gvxy_point X_Y="540.05; -250."/>
+<gvxy_point X_Y="540.05; -34."/>
+<gvxy_point X_Y="-540.05; -34."/>
+<gvxy_point X_Y="-540.05; -250."/>
+<gvxy_point X_Y="-640.05; -250."/>
+</gvxy>
+
+<composition name="JF_Table_Beam_1" >
+ <posXYZ volume="Sub_Beam_2" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Sub_Table_Beam_3" X_Y_Z=" 0.; 0.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_4" X_Y_Z=" 1080.; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_4" X_Y_Z=" -1080.; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" -1550.; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" -1550.; -125.; 225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" -1550.; -125.; -225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" 1549.95; -125.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" 1549.95; -125.; 225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_5" X_Y_Z=" 1549.95; -125.; -225. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_6" X_Y_Z=" 1775.1; -75.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Table_Beam_7" X_Y_Z=" 0.; -275.; 0. " rot=" 90.; 0.; 0." />
+</composition>
+
+<!-- end of Description of JF Table Beam -->
+
+<!-- Description of JF Table Cross Bar -->
+
+<box name="HF_Cross_Bar_1" material="Iron" X_Y_Z="200.; 200.; 1049.9"/>
+<box name="HF_Cross_Bar_sub_box" material="Iron" X_Y_Z="170.; 170.; 1100."/>
+
+<subtraction name="Sub_HF_Cross_Bar" >
+ <posXYZ volume="HF_Cross_Bar_1" X_Y_Z=" 0.; 0.; 0." rot=" 0; 0.; 0."/>
+ <posXYZ volume="HF_Cross_Bar_sub_box" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0."/>
+ </subtraction>
+<!-- end of Description of JF Table Cross Bar -->
+
+<!-- Description of Jacks -->
+<tubs name="Jacks_1" material="ShieldBrass" Rio_Z="122.5; 149.; 1540." nbPhi="32"/>
+<tubs name="Jacks_2" material="ShieldBrass" Rio_Z="120.; 245.; 90." nbPhi="32"/>
+<tubs name="Jacks_3" material="ShieldBrass" Rio_Z="0.; 103.5; 1570." nbPhi="32"/>
+<tubs name="Jacks_4" material="ShieldBrass" Rio_Z="105.; 155.; 100." nbPhi="32"/>
+<tubs name="Jacks_5" material="ShieldBrass" Rio_Z="0.; 80.; 160." nbPhi="32"/>
+
+<composition name="Jacks" >
+ <posXYZ volume="Jacks_1" X_Y_Z=" 0.; -745.; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_2" X_Y_Z=" 0.; 70.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_3" X_Y_Z=" 0.; 900.05; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_4" X_Y_Z=" 0.; 1735.1; 0. " rot=" 90.; 0.; 0." />
+ <posXYZ volume="Jacks_5" X_Y_Z=" 0.; 1787.; 0. " rot=" 90.; 0.; 0." />
+</composition>
+<!-- end of Description of Jacks -->
+
+<!-- Description of Motorised NuT -->
+
+<box name="Motorised_NuT" material="Aluminium" X_Y_Z="290.; 280.; 300."/>
+
+<!-- end of Description of Motorised NuT -->
+
+<composition name="JF_Table" >
+ <posXYZ volume="JF_Table_Beam_1" X_Y_Z=" 0.; 0.; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="JF_Table_Beam_1" X_Y_Z=" 0.; 0.; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Sub_HF_Cross_Bar" X_Y_Z=" 1552.5; -120.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Sub_HF_Cross_Bar" X_Y_Z=" -1552.5; -120.; 0. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" 825.; 0.; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" -825.; 0.; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" 825.; 0.; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Jacks" X_Y_Z=" -825.; 0.; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" 410.; 195.05; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" 410.; 195.05; -775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" -410.; 195.05; 775. " rot=" 0.; 0.; 0." />
+ <posXYZ volume="Motorised_NuT" X_Y_Z=" -410.; 195.05; -775. " rot=" 0.; 0.; 0." />
+</composition>
+
+<!-- end of Description of JF Table Beam -->
+<composition name="Truck_A_C" >
+<posXYZ volume="Column_C1-L_C2-R" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Beam" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Rail" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Shims" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Bracing" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Brackets" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Inox" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="Infrastructure" X_Y_Z=" 0. ; 0. ; 0." />
+ <posXYZ volume="JF_Table" X_Y_Z=" 0.; 5000.; 0. " rot=" 0.; 90.; 0." />
+</composition>
+
+<composition name="HFTruckRail" >
+ <posXYZ volume="Truck_A_C" X_Y_Z=" 0. ; -9000.; 19132." />
+ <posXYZ volume="Truck_A_C" X_Y_Z=" 0. ; -9000.; -19132." />
+</composition>
+
+
+</section>
+
+
+<section name = "RUN2_Services"
+ version = "1.0"
+ date = "September 2014"
+ author = "Antonios Leisos, Jochen Meyer"
+ top_volume = "RUN2_Services">
+
+<!-- name = Run2 supports section name = "Services" -->
+
+<var name="BME_ElectronicsBox_Frame_xwid" value="2350."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_ywid" value=" 100."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_zwid" value=" 600."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_width" value=" 50."/> <!-- ATLMHS_0114 -->
+<var name="BME_ElectronicsBox_Frame_plate_width" value=" 7."/> <!-- Approximate value -->
+<var name="BME_ElectronicsBox_Frame_box_width" value=" 5."/> <!-- Approximate value tuned to the weight -->
+<var name="BME_ElectronicsBox_Frame_distance_from_chamber" value="120."/> <!-- Markus Lippert:121mm and a little bit smaller since thery are not parallel -->
+
+<box name="BME_ElectronicsBox_Outer" material="Aluminium" X_Y_Z="BME_ElectronicsBox_Frame_xwid; BME_ElectronicsBox_Frame_ywid ; BME_ElectronicsBox_Frame_zwid" />
+<box name="BME_ElectronicsBox_Inner" material="Aluminium" X_Y_Z="BME_ElectronicsBox_Frame_xwid-2.*BME_ElectronicsBox_Frame_width; BME_ElectronicsBox_Frame_ywid+10. ; BME_ElectronicsBox_Frame_zwid-2.*BME_ElectronicsBox_Frame_width" />
+
+<subtraction name="BME_Electronics_Box" >
+ <posXYZ volume="BME_ElectronicsBox_Outer" />
+ <posXYZ volume="BME_ElectronicsBox_Inner" />
+</subtraction>
+
+<box name="BME_ElectronicsBox_Plate" material="Aluminium" X_Y_Z="BME_ElectronicsBox_Frame_xwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps; BME_ElectronicsBox_Frame_plate_width; BME_ElectronicsBox_Frame_zwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps" />
+
+<box name="BME_ElectronicsBox_Box" material="Carbon" X_Y_Z="BME_ElectronicsBox_Frame_xwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps; BME_ElectronicsBox_Frame_box_width; BME_ElectronicsBox_Frame_zwid-2.*BME_ElectronicsBox_Frame_width-2.*GENV_Eps" />
+
+<composition name="BME_Electronics">
+ <posXYZ volume="BME_Electronics_Box" />
+ <posXYZ volume="BME_ElectronicsBox_Plate" X_Y_Z=" 0.;BME_ElectronicsBox_Frame_ywid*0.5-BME_ElectronicsBox_Frame_plate_width*0.5;0." />
+ <posXYZ volume="BME_ElectronicsBox_Box" X_Y_Z=" 0.;BME_ElectronicsBox_Frame_ywid*0.5-BME_ElectronicsBox_Frame_plate_width-BME_ElectronicsBox_Frame_box_width/2.-GENV_Eps;0." />
+</composition>
+
+<var name="BOEwall_thickness" value="200."/>
+<var name="BOEwall_ywid" value="2000."/>
+<var name="BOEwall_xwid" value="3400."/>
+<var name="BOEwall_zwid" value="2200."/>
+
+<var name="BOEbox4_xwid" value="BOEwall_xwid-2*BOEwall_thickness"/>
+<var name="BOEbox4_ywid" value="BOEwall_ywid"/>
+<var name="BOEbox4_zwid" value="BOEwall_thickness"/>
+<var name="BOEbox4_xpos" value="0."/>
+<var name="BOEbox4_ypos" value="0."/>
+<var name="BOEbox4_zpos" value="0."/>
+
+<var name="BOEbox5_xwid" value="BOEwall_thickness"/>
+<var name="BOEbox5_ywid" value="BOEwall_ywid"/>
+<var name="BOEbox5_zwid" value="BOEwall_zwid"/>
+<var name="BOEbox5_xpos" value="BOEbox4_xwid/2+BOEbox5_xwid/2+GENV_Eps"/>
+<var name="BOEbox5_ypos" value="BOEbox4_ypos"/>
+<var name="BOEbox5_zpos" value="BOEwall_zwid/2-BOEwall_thickness/2"/>
+
+<box name="BOEbox4" material="Aluminium" X_Y_Z=" BOEbox4_xwid;BOEbox4_ywid;BOEbox4_zwid" />
+<box name="BOEbox5" material="Aluminium" X_Y_Z=" BOEbox5_xwid;BOEbox5_ywid;BOEbox5_zwid" />
+
+<var name="ElavatorSupport_xwid" value=" 200. "/> <!-- approximate value -->
+<var name="ElavatorSupport_zwid" value=" 200. "/> <!-- approximate value -->
+<var name="ElavatorSupport_ywid" value="BOEwall_ywid"/>
+<var name="ElavatorSupport_xpos" value="1000. "/> <!-- approximate value -->
+<var name="ElavatorSupport_ypos" value="BOEbox5_ypos"/>
+<var name="ElavatorSupport_zpos" value="BOEbox5_zpos"/>
+
+<var name="ElavatorCross_zwid" value=" 10. "/> <!-- approximate value -->
+<var name="ElavatorCross_xwid" value="2.*ElavatorSupport_xpos-ElavatorSupport_xwid-2.*GENV_Eps"/>
+<var name="ElavatorCross_ywid" value="1000. "/> <!-- approximate value -->
+<var name="ElavatorCross_xpos" value="BOEbox4_xpos"/>
+<var name="ElavatorCross_ypos" value="BOEwall_ywid/2.-ElavatorCross_ywid/2."/>
+<var name="ElavatorCross_zpos" value="ElavatorSupport_zpos"/>
+
+<var name="ElavatorTopFrame_xwid" value="BOEbox4_xwid+2.*BOEbox5_xwid"/>
+<var name="ElavatorTopFrame_zwid" value="BOEbox5_zwid"/>
+<var name="ElavatorTopFrame_ywid" value=" 200. "/> <!-- approximate value -->
+<var name="ElavatorTopFrame_xpos" value="BOEbox4_xpos"/>
+<var name="ElavatorTopFrame_ypos" value="BOEbox4_ywid/2+ElavatorTopFrame_ywid/2+GENV_Eps"/>
+<var name="ElavatorTopFrame_zpos" value="BOEbox5_zpos"/>
+<var name="ElavatorTopFrame_thickness" value=" 30. "/> <!-- approximate value -->
+<var name="ElavatorTopPlate_xwid" value="ElavatorTopFrame_xwid"/>
+<var name="ElavatorTopPlate_zwid" value="ElavatorTopFrame_zwid"/>
+<var name="ElavatorTopPlate_ywid" value=" 5. "/> <!-- approximate value -->
+<var name="ElavatorTopPlate_xpos" value="BOEbox4_xpos"/>
+<var name="ElavatorTopPlate_ypos" value="ElavatorTopFrame_ypos+ElavatorTopFrame_ywid/2+ElavatorTopPlate_ywid/2+GENV_Eps"/>
+<var name="ElavatorTopPlate_zpos" value="BOEbox5_zpos"/>
+
+<box name="ElevatorSupport" material="Aluminium" X_Y_Z=" ElavatorSupport_xwid; ElavatorSupport_ywid; ElavatorSupport_zwid" />
+<box name="ElevatorCross" material="Aluminium" X_Y_Z=" ElavatorCross_xwid; ElavatorCross_ywid; ElavatorCross_zwid" />
+<box name="ElevatorTopFrame_Outer" material="Aluminium" X_Y_Z="ElavatorTopFrame_xwid; ElavatorTopFrame_ywid; ElavatorTopFrame_zwid" />
+<box name="ElevatorTopFrame_Inner" material="Aluminium" X_Y_Z="ElavatorTopFrame_xwid-ElavatorTopFrame_thickness; ElavatorTopFrame_ywid; ElavatorTopFrame_zwid-ElavatorTopFrame_thickness" />
+
+<subtraction name="ElevatorTopFrame" >
+ <posXYZ volume="ElevatorTopFrame_Outer" />
+ <posXYZ volume="ElevatorTopFrame_Inner" />
+</subtraction>
+
+<box name="ElevatorTopPlate" material="Aluminium" X_Y_Z=" ElavatorTopPlate_xwid; ElavatorTopPlate_ywid; ElavatorTopPlate_zwid" />
+
+<composition name="BOEwallside" >
+ <posXYZ volume="BOEbox4" X_Y_Z=" BOEbox4_xpos; BOEbox4_ypos; BOEbox4_zpos" />
+ <posXYZ volume="ElevatorSupport" X_Y_Z=" ElavatorSupport_xpos; ElavatorSupport_ypos; ElavatorSupport_zpos" />
+ <posXYZ volume="ElevatorCross" X_Y_Z=" ElavatorCross_xpos; ElavatorCross_ypos; ElavatorCross_zpos" />
+ <posXYZ volume="ElevatorSupport" X_Y_Z=" -ElavatorSupport_xpos; ElavatorSupport_ypos; ElavatorSupport_zpos" />
+ <posXYZ volume="ElevatorTopFrame" X_Y_Z=" ElavatorTopFrame_xpos; ElavatorTopFrame_ypos; ElavatorTopFrame_zpos" />
+ <posXYZ volume="ElevatorTopPlate" X_Y_Z=" ElavatorTopPlate_xpos; ElavatorTopPlate_ypos; ElavatorTopPlate_zpos" />
+ <posXYZ volume="BOEbox5" X_Y_Z=" BOEbox5_xpos; BOEbox5_ypos; BOEbox5_zpos" />
+ <posXYZ volume="BOEbox5" X_Y_Z=" -BOEbox5_xpos; BOEbox5_ypos; BOEbox5_zpos" />
+</composition>
+
+<composition name="BOEwall">
+ <posXYZ volume="BOEwallside" X_Y_Z=" 0.; -12970 ; 6900." rot="0.;180.; 0" />
+ <posXYZ volume="BOEwallside" X_Y_Z=" 0.; -12970 ; -7060." rot="0.; 0.; 0" />
+</composition>
+
+<composition name="RUN2_Services">
+ <posXYZ volume="BME_Electronics" X_Y_Z="0.;-7786.6-0.5*229.5;GENV_Eps+7057.8+0.5*BME_ElectronicsBox_Frame_zwid+BME_ElectronicsBox_Frame_distance_from_chamber" />
+ <posXYZ volume="BME_Electronics" X_Y_Z="0.;-7786.6-0.5*229.5;-GENV_Eps-7057.8-0.5*BME_ElectronicsBox_Frame_zwid-BME_ElectronicsBox_Frame_distance_from_chamber" />
+ <posXYZ volume="BOEwall" X_Y_Z="0.; 0.; 0." rot="-0.708; 0.; 0"/>
+</composition>
+
+</section>
+
+<section name = "ATLAS Plancher (in french in the text)"
+ version = "7.0"
+ date = "22 November 2008"
+ author = "Laurent"
+ top_volume = "Plancher">
+
+<!-- name = Plancher section name = "Supports" -->
+<!-- plan:ATF1 UX 150001 -->
+<defaults unit_length="mm"/>
+
+<box name="box1" material="Iron" X_Y_Z="30000; 5002;27000" />
+<box name="box2" material="Iron" X_Y_Z="30000; 1336; 9000" />
+<box name="box3" material="Iron" X_Y_Z=" 5200;10000;27010" /> <!-- use larger length in z than box1 to not run into issues with volume subtraction -->
+
+<subtraction name="central" >
+ <posXYZ volume="box1" X_Y_Z="0; 0;0" />
+ <posXYZ volume="box3" X_Y_Z="0;4541;0" />
+</subtraction>
+
+<composition name="PlancherTilte">
+ <posXYZ volume="central" X_Y_Z="0; -13871; 0" /> <!-- the distance between cavern floor and centre of beam axis at IP is 11370mm, cf. atcz____0005-vAC -->
+ <posXYZ volume="box2" X_Y_Z="0; -15704; 18005" />
+ <posXYZ volume="box2" X_Y_Z="0; -15704; -18005" />
+</composition>
+
+<composition name="Plancher">
+ <posXYZ volume="PlancherTilte" X_Y_Z="0;0;0" rot="-0.708;0;0"/>
+</composition>
+
+</section>
+
+<section name = "ID-EMC-Tile"
+ version = "7.0"
+ date = "21 Juin 2010"
+ author = "Laurent Chevalier"
+ top_volume = "IDEMTile">
+
+<!-- name = Tile Fingers section name = "ID-EM-Tile"-->
+
+<trd name="TileFinger1" material="Iron1" Xmp_Ymp_Z="420 ; 420 ; 176 ; 130 ; 300 " />
+
+<var name="FingerPos" value="6540" />
+<var name="FingerShift" value="210" />
+<var name="JDSH_BDRRouRa_RetrunRing_outerRadius" value=" 4220." />
+<var name="JDReturnL" value="385. " />
+
+<composition name="TileFinger2">
+ <posXYZ volume="TileFinger1" X_Y_Z="JDSH_BDRRouRa_RetrunRing_outerRadius-JDReturnL/2. ; 0 ; 0." rot=" 90.; 90.; 270." />
+</composition>
+
+<composition name="TileFinger3">
+ <foreach index="IFing" begin="1" loops="8" >
+ <posXYZ volume="TileFinger2" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; IFing*45/8 +2.81" />
+ </foreach>
+</composition>
+
+<composition name="TileFingersA">
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 270" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 315" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 0" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 45" />
+</composition>
+<composition name="TileFingersB">
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 90" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 135" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 180" />
+ <posXYZ volume="TileFinger3" X_Y_Z="0 ; 0 ; 0" rot="0.;0.; 225" />
+</composition>
+
+<composition name="TileFingers">
+ <posXYZ volume="TileFingersA" X_Y_Z="0 ; 0 ; FingerPos - FingerShift" />
+ <posXYZ volume="TileFingersB" X_Y_Z="0 ; 0 ; FingerPos - FingerShift" />
+ <posXYZ volume="TileFingersA" X_Y_Z="0 ; 0 ;-FingerPos + FingerShift" />
+ <posXYZ volume="TileFingersB" X_Y_Z="0 ; 0 ;-FingerPos + FingerShift" />
+</composition>
+
+</section>
+
+<!-- ===========================================NJD=========================================== -->
+
+<section name = "NJD Disk"
+ version = "0.0"
+ date = "16-11-2016"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "JDSH_Shield_NSW">
+
+<!-- NJD Disk -->
+
+<!-- main disk-->
+<tubs name="MD01" material="ShieldSteel" Rio_Z="430.; 4360.; 40." nbPhi="32." />
+<tubs name="MD02" material="ShieldSteel" Rio_Z="430.; 2700.; 48.7" nbPhi="32." />
+<tubs name="MDB01_Cut" material="ShieldSteel" Rio_Z="0.; 840.; 3." nbPhi="32." />
+
+<gvxy name="MD03" material="ShieldSteel" dZ="40." >
+ <gvxy_point X_Y="-3370.; -3950."/>
+ <gvxy_point X_Y="-3370.; -3880."/>
+ <gvxy_point X_Y="-3679.5; -2484."/>
+ <gvxy_point X_Y="-3990.; -1734.39"/>
+ <gvxy_point X_Y="-2599.16; -3470."/>
+ <gvxy_point X_Y="-2670.; -3570."/>
+ <gvxy_point X_Y="-2670.; -3950."/>
+</gvxy>
+
+<subtraction name="MDB01_Un" >
+ <posXYZ volume="MD01" />
+ <posXYZ volume="MDB01_Cut" X_Y_Z=" 0.; 0.; 19.4 " />
+</subtraction>
+
+<union name="MDB01" >
+ <posXYZ volume="MDB01_Un" />
+ <posXYZ volume="MD03" />
+ <posXYZ volume="MD03" rot=" 0.; 180.; 0."/>
+</union>
+<!-- End main disk-->
+
+
+<!-- Ret.Flux -->
+<tubs name="FLUX_Box" material="ShieldSteel" Rio_Z="3800.; 4360.; 39.9" nbPhi="32." />
+<box name="FLUX_Cut_Box" material="ShieldSteel" X_Y_Z="2200.; 400.; 50." />
+
+<subtraction name="FLUX" >
+ <posXYZ volume="FLUX_Box" />
+ <posXYZ volume="FLUX_Cut_Box" X_Y_Z=" -1930.; 3430.; 0." />
+</subtraction>
+<!-- End Ret.Flux -->
+
+<!-- FIXING PLATE -->
+<box name="FIXING_PLATE" material="ShieldSteel" X_Y_Z="350.; 975.; 40.9" />
+<box name="FIXING_PLATE_Special" material="ShieldSteel" X_Y_Z="350.; 787.5; 40.9" />
+
+<composition name="FIXING_PLATE_Pos" >
+ <posXYZ volume="FIXING_PLATE" X_Y_Z=" 0.; 3252.5; 0." />
+</composition>
+
+<composition name="FIXING_PLATE_Ass" >
+ <posXYZ volume="FIXING_PLATE_Special" X_Y_Z=" -1208.8; 2918.31; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 67.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 112.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 157.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 202.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 247.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 292.5" />
+ <posXYZ volume="FIXING_PLATE_Pos" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 337.5" />
+</composition>
+<!-- End FIXING PLATE -->
+
+<!-- NJD feet-->
+<gvxy name="JF01" material="ShieldSteel" dZ="37.3" >
+ <gvxy_point X_Y="-3300.; -3950."/>
+ <gvxy_point X_Y="-3300.; -3480."/>
+ <gvxy_point X_Y="-3270.; -3450."/>
+ <gvxy_point X_Y="-2730.; -3450."/>
+ <gvxy_point X_Y="-2700.; -3480."/>
+ <gvxy_point X_Y="-2700.; -3950."/>
+</gvxy>
+
+<gvxy name="JF02" material="ShieldSteel" dZ="35." >
+ <gvxy_point X_Y="-342.4; -3950."/>
+ <gvxy_point X_Y="-342.4; -3930."/>
+ <gvxy_point X_Y="-77.4; -3470."/>
+ <gvxy_point X_Y="-57.4; -3470."/>
+ <gvxy_point X_Y="-57.4; -3920."/>
+ <gvxy_point X_Y="-87.4; -3950."/>
+</gvxy>
+
+<gvxy name="JF03" material="ShieldSteel" dZ="48." >
+ <gvxy_point X_Y="-3370.; -362."/>
+ <gvxy_point X_Y="-3370.; 704."/>
+ <gvxy_point X_Y="-3495.; 704."/>
+ <gvxy_point X_Y="-3495.; 933."/>
+ <gvxy_point X_Y="-2660.; 933."/>
+ <gvxy_point X_Y="-2660.; 653."/>
+ <gvxy_point X_Y="-2700.; 653."/>
+ <gvxy_point X_Y="-2700.; 523."/>
+ <gvxy_point X_Y="-2590.; 523."/>
+ <gvxy_point X_Y="-2590.; -52."/>
+ <gvxy_point X_Y="-2685.; -52."/>
+ <gvxy_point X_Y="-2685.; -362."/>
+</gvxy>
+
+<gvxy name="JF04" material="ShieldSteel" dZ="41.6" >
+ <gvxy_point X_Y="-453.5; -4251.1"/>
+ <gvxy_point X_Y="-453.5; -4158.1"/>
+ <gvxy_point X_Y="-603.; -4083.1"/>
+ <gvxy_point X_Y="-603.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -3998.1"/>
+ <gvxy_point X_Y="883.; -3998.1"/>
+ <gvxy_point X_Y="883.; -4251.1"/>
+</gvxy>
+
+<gvxy name="JF05" material="ShieldSteel" dZ="356.1" >
+ <gvxy_point X_Y="-603.; -4048.1"/>
+ <gvxy_point X_Y="-603.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -4038.1"/>
+ <gvxy_point X_Y="-362.; -3998.1"/>
+ <gvxy_point X_Y="-253.; -3998.1"/>
+ <gvxy_point X_Y="-253.; -4048.1"/>
+</gvxy>
+
+<box name="JF06" material="ShieldSteel" X_Y_Z="536.; 253.; 71.4" />
+
+<!-- Right-->
+<composition name="Right_Feet" >
+ <posXYZ volume="JF01" X_Y_Z=" 0.; 0.; 38.7" rot=" 0.; 0.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" -2802.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" -3197.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF03" X_Y_Z=" 0.; -3974.05; 0." rot=" -90.; 0.; 0." />
+ <posXYZ volume="JF04" X_Y_Z=" -2805.2; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF04" X_Y_Z=" -3203.; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF05" X_Y_Z=" -3004.1; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF06" X_Y_Z=" -3000.; -4124.6; -918.75" rot=" 0.; 0.; 0." />
+</composition>
+<!-- End Right-->
+
+<!-- Left-->
+<composition name="Left_Feet" >
+ <posXYZ volume="JF01" X_Y_Z=" 0.; 0.; 38.7" rot=" 0.; 180.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" 2802.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF02" X_Y_Z=" 3197.5; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF03" X_Y_Z=" 0.; -3974.05; 0." rot=" -90.; 0.; 180." />
+ <posXYZ volume="JF04" X_Y_Z=" 2805.2; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF04" X_Y_Z=" 3203.; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF05" X_Y_Z=" 3004.1; 0.; 0." rot=" 0.; 90.; 0." />
+ <posXYZ volume="JF06" X_Y_Z=" 3000.; -4124.6; -918.75" rot=" 0.; 0.; 0." />
+</composition>
+<!-- End Right-->
+<!-- End NJD feet-->
+
+<composition name="JDDisk_ASide" >
+ <posXYZ volume="MDB01" X_Y_Z=" 0.; 0.; 6880." rot=" 0.; 0.; 0." />
+ <posXYZ volume="MD02" X_Y_Z=" 0.; 0.; 6835.6" rot=" 0.; 0.;0."/>
+ <posXYZ volume="FLUX" X_Y_Z=" 0.; 0.; 6840." rot=" 0.; 0.; 0." />
+ <posXYZ volume="FIXING_PLATE_Ass" X_Y_Z=" 0.; 0.; 6839.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Right_Feet" X_Y_Z=" 0.; 0.; 6880." rot=" 0.; 180.; 0." />
+ <posXYZ volume="Left_Feet" X_Y_Z=" 0.; 0.; 6880." rot=" 0.; 180.; 0." />
+</composition>
+
+<composition name="JDDisk_CSide" >
+ <posXYZ volume="MDB01" X_Y_Z=" 0.; 0.; -6880." rot=" 0.; 180.; 0." />
+ <posXYZ volume="MD02" X_Y_Z=" 0.; 0.; -6835.6" rot=" 0.; 0.;0."/>
+ <posXYZ volume="FLUX" X_Y_Z=" 0.; 0.; -6840." rot=" 0.; 0.; 0." />
+ <posXYZ volume="FIXING_PLATE_Ass" X_Y_Z=" 0.; 0.; -6839.5" rot=" 0.; 0.; 0." />
+ <posXYZ volume="Right_Feet" X_Y_Z=" 0.; 0.; -6880." rot=" 0.; 0.; 0." />
+ <posXYZ volume="Left_Feet" X_Y_Z=" 0.; 0.; -6880." rot=" 0.; 0.; 0." />
+</composition>
+<!-- End NJD Disk -->
+
+<!-- Vertical Shielding HO -->
+<tubs name="Vertical_Shielding_HO_Poly" material="PolyBoronB2O3" Rio_Z=" 840. ; 1655. ; 40." nbPhi="32." /> <!-- HD PE Borotron 5% HD050 - Density: 1010kg/m3 -->
+<tubs name="Lateral_plate_TubeCut_Lead" material="Lead" Rio_Z=" 870. ; 1655. ; 10." nbPhi="32." />
+
+<composition name="Vertical_Shielding_HO_Assembly" >
+ <posXYZ volume="Vertical_Shielding_HO_Poly" X_Y_Z=" 0. ; 0.; 6920." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Lateral_plate_TubeCut_Lead" X_Y_Z=" 0. ; 0.; 6945.01" rot="0. ; 0. ; 0." />
+</composition>
+<!-- End Vertical Shielding HO -->
+
+<!-- NJD Vert Shield -->
+ <!-- Inner -->
+<tubs name="Inner_SST" material="ShieldSteel" Rio_Z="1025. ; 1105. ; 70." nbPhi="32." />
+ <!-- End Inner -->
+
+ <!-- Middle -->
+<tubs name="Middle_Iron" material="Iron" Rio_Z="1135. ; 1359.9 ; 70." nbPhi="32." />
+<tubs name="Middle_Borotron" material="PolyBoronB2O3" Rio_Z=" 1360. ; 1589.9 ; 70." nbPhi="32." /> <!-- HD PE Borotron 5% HD050 - Density: 1010kg/m3 -->
+<tubs name="Middle_Lead" material="Lead" Rio_Z="1590. ; 1610. ; 70." nbPhi="32." />
+
+<composition name="Middle_VS" >
+ <posXYZ volume="Middle_Iron" X_Y_Z=" 0. ; 0.; 6775." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Middle_Borotron" X_Y_Z=" 0. ; 0.; 6775." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Middle_Lead" X_Y_Z=" 0. ; 0.; 6775." rot="0. ; 0. ; 0." />
+</composition>
+ <!-- End Middle -->
+
+ <!-- Outer -->
+<tubs name="Outer_Borotron" material="PolyBoronB2O3" Rio_Z="1643. ; 1762.9 ; 50." nbPhi="32." /> <!-- HD PE Borotron 5% HD050 - Density: 1010kg/m3 -->
+<tubs name="Outer_Lead" material="Lead" Rio_Z="1763. ; 1772.9 ; 50." nbPhi="32." />
+<tubs name="Outer_SSteel" material="ShieldSteel" Rio_Z="1773. ; 1777. ; 50." nbPhi="32." />
+
+<composition name="Outer_VS" >
+ <posXYZ volume="Outer_Borotron" X_Y_Z=" 0. ; 0.; 6760." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Outer_Lead" X_Y_Z=" 0. ; 0.; 6760." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Outer_SSteel" X_Y_Z=" 0. ; 0.; 6760." rot="0. ; 0. ; 0." />
+</composition>
+ <!-- End Outer -->
+
+<composition name="NJD_Vert_Shield_assembly" >
+ <posXYZ volume="Inner_SST" X_Y_Z=" 0. ; 0.; 6770." rot="0. ; 0. ; 0." />
+ <posXYZ volume="Middle_VS" />
+ <posXYZ volume="Outer_VS" />
+</composition>
+ <!-- NJD Vert Shield -->
+
+<!-- ================================================ NSW movement ========================================= -->
+<!-- NSW movement -->
+<tubs name="JD_PAD" material="Iron" Rio_Z="0.; 352.75; 105." nbPhi="36" />
+<tubs name="JD_TOP_Pad" material="Iron" Rio_Z="0.; 155.8; 226.4" nbPhi="36" />
+<tubs name="BJ_asse" material="Iron" Rio_Z="0.; 73.; 380." nbPhi="36" />
+<box name="XbracketN" material="Iron" X_Y_Z="95.88; 230.; 218." />
+<tubs name="VerinN" material="Iron" Rio_Z="22.5; 55.65; 1477." nbPhi="36" />
+
+<box name="JD_TOP_Pad2" material="Iron" X_Y_Z="180.; 425.; 226." />
+
+
+
+<box name="Bracket_FC" material="Iron" X_Y_Z="613.; 56.; 56." />
+
+<box name="NSW_Extension_Main" material="Iron" X_Y_Z="478.8; 252.2; 340." />
+
+<box name="NSW_Extension_CutBox" material="Iron" X_Y_Z="218.; 270.2; 480." />
+
+<subtraction name="NSW_Extension">
+ <posXYZ volume="NSW_Extension_Main" rot="0. ; 90. ; 0." />
+ <posXYZ volume="NSW_Extension_CutBox" X_Y_Z="0.; -58.2; 0." />
+</subtraction>
+
+<composition name="NSW_MovementL" >
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 496.94; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad2" X_Y_Z=" 0.; 635.14; 166.42 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 1701.; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad" X_Y_Z=" 0.; 1701.; 166.01 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 950.58; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 1273.; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" -272.7; 604.; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" -272.7; 1611.5; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="VerinN" X_Y_Z=" -388.; 1002.5; 212. " rot="90. ; 0. ; 0." />
+ <posXYZ volume="Bracket_FC" X_Y_Z=" 524.51; 254.66; 339.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="NSW_Extension" X_Y_Z=" 0.; 635.14; 202.62 " rot="90. ; 0. ; 180." />
+</composition>
+
+<composition name="NSW_MovementR" >
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 496.94; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad2" X_Y_Z=" 0.; 635.14; 166.42 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_PAD" X_Y_Z=" 0.; 1701.; 0. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="JD_TOP_Pad" X_Y_Z=" 0.; 1701.; 166.01 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 950.58; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="BJ_asse" X_Y_Z=" 0.; 1273.; 130. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" 272.7; 604.; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="XbracketN" X_Y_Z=" 272.7; 1611.5; 170. " rot="0. ; 0. ; 0." />
+ <posXYZ volume="VerinN" X_Y_Z=" 388.; 1002.5; 212. " rot="90. ; 0. ; 0." />
+ <posXYZ volume="Bracket_FC" X_Y_Z=" -524.51; 254.66; 339.5 " rot="0. ; 0. ; 0." />
+ <posXYZ volume="NSW_Extension" X_Y_Z=" 0.; 635.14; 202.62 " rot="90. ; 0. ; 180." />
+</composition>
+
+<composition name="NSW_Movement" >
+ <posXYZ volume="NSW_MovementL" X_Y_Z=" -3000.; -4329.5; 8153. " rot="-90. ; 0. ; 0." />
+ <posXYZ volume="NSW_MovementR" X_Y_Z=" 3000.; -4329.5; 8153. " rot="-90. ; 0. ; 0." />
+</composition>
+<!-- end NSW movement -->
+
+<composition name="JDSH_Shield_NSW" >
+ <posXYZ volume="JDDisk_ASide" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="JDDisk_CSide" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0." />
+ <!-- Aside -->
+ <posXYZ volume="Vertical_Shielding_HO_Assembly" />
+ <posXYZ volume="NJD_Vert_Shield_assembly" />
+ <posXYZ volume="NSW_Movement" X_Y_Z=" 0.; 0.; 0. " rot="0. ; 0. ; 0."/>
+ <!-- Cside -->
+ <posXYZ volume="Vertical_Shielding_HO_Assembly" rot="0. ; 180. ; 0." />
+ <posXYZ volume="NJD_Vert_Shield_assembly" rot="0. ; 180. ; 0." />
+ <posXYZ volume="NSW_Movement" X_Y_Z=" 0.; 0.; 0. " rot="0. ; 180. ; 0."/>
+</composition>
+
+</section>
+
+<!-- ===========================================Full ATLAS=========================================== -->
+
+<section name = "ATLAS"
+ version = "7.0"
+ date = "22 November 2008"
+ author = "Laurent"
+ top_volume = "All">
+
+<composition name="Magnets">
+ <posXYZ volume="ECT_Toroids" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="BAR_Toroid" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="Solenoid" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="Service">
+ <posXYZ volume="servicesAtZ0" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="pp2" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="MBAP_AccessPlatform" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="RUN2_Services" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="Shield">
+ <posXYZ volume="JTSH_Shield" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="JDSH_Shield_NSW" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="JFSH_Shield" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="Supports">
+ <posXYZ volume="Feet" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="RailAssembly" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="HFTruckRail" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="SADL_CalorimeterSaddle" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="MBWH_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="TBWH_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="TGC1_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="TGC3_BigWheels" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="MDTRail" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="Plancher" X_Y_Z="0.;0.;0."/>
+</composition>
+
+<composition name="IdEmTile">
+ <posXYZ volume="TileFingers" X_Y_Z="0.;0.;0." />
+</composition>
+
+</section>
+
+</AGDD>
diff --git a/MuonSpectrometer/MuonG4/NSW_Sim/data/stations.v2.08.xml b/MuonSpectrometer/MuonG4/NSW_Sim/data/stations.v2.08.xml
new file mode 100644
index 0000000000000000000000000000000000000000..32a5a4b96bf338e2e3f49bfcf1e069d4ff7f0480
--- /dev/null
+++ b/MuonSpectrometer/MuonG4/NSW_Sim/data/stations.v2.08.xml
@@ -0,0 +1,1808 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AGDD>
+
+<section name="NSW_Parameters" version="1" top_volume="useless" date="December 16 2014" author="S.Chen" >
+<!-- Global variables-->
+<var name="NSW_NbrOfLayers" value="4"/>
+<var name="NSW_NbrOfDriftPcb" value="3"/>
+<var name="NSW_NbrOfROPcb" value="2"/>
+<!--Center between the large sectors and the small sectors-->
+<var name="ZCenter_Global" value="7409"/>
+</section>
+
+<section name="NSW_sTGC_Parameters" version="13.7" top_volume="useless" date=" June 30, 2016 " author="Daniel Lellouch">
+<!-- ================ Global Variables ================= -->
+
+<!-- Thickness of a quadruplet -->
+<var name="NSW_sTGC_Tck" value="49.34"/>
+<!-- Gas Gap inside one layer -->
+<var name="NSW_sTGC_GasTck" value="2.85"/>
+<!-- G10 thickness per layer -->
+<var name="NSW_sTGC_pcbTck" value="3"/>
+<!-- Number of layers in a quaduplet -->
+<var name="NSW_sTGC_NbrOfLayers" value="4"/>
+<!-- Wire pitch -->
+<var name="NSW_sTGC_WirePitch" value="1.8"/>
+<!-- Strip pitch -->
+<var name="NSW_sTGC_StripPitch" value="3.2"/>
+<!-- Strip width -->
+<var name="NSW_sTGC_StripWidth" value="2.7"/>
+<!-- Width of G10 frame besides gas volume -->
+<var name="NSW_sTGC_SideFrame" value="28.5"/>
+<!-- Width of G10 frame in base w/o capacitor -->
+<var name="NSW_sTGC_hFrameNoCapacitor" value="11"/>
+<!-- Width of G10 frame in base with capacitor -->
+<var name="NSW_sTGC_hFrameCapacitor" value="14"/>
+<!-- Opening (in degrees) of trapezes in small wedges -->
+<var name="NSW_sTGC_SmallOpening" value="17"/>
+<!-- Opening (in degrees) of trapezes in large wedges -->
+<var name="NSW_sTGC_LargeOpening" value="28"/>
+<!-- Z center of small Pivot -->
+<var name="NSW_sTGC_ZSmallPivot" value="ZCenter_Global-65"/>
+<!-- Z center of small Confirm -->
+<var name="NSW_sTGC_ZSmallConfirm" value="ZCenter_Global-399"/>
+<!-- Z center of Large Pivot -->
+<var name="NSW_sTGC_ZLargePivot" value="ZCenter_Global+65"/>
+<!-- Z center of Large Confirm -->
+<var name="NSW_sTGC_ZLargeConfirm" value="ZCenter_Global+399"/>
+<!-- Z of each volume, relative to center of quadruplet -->
+<array name="NSW_sTGC_LayerDeltaZ" values="-16.45;-5.48;5.49;16.46"/>
+<!-- Side of the Pad readout -->
+<array name="NSW_sTGC_PadSide" values="-1;1;-1;1"/>
+<!-- Side of the Strip readout -->
+<array name="NSW_sTGC_StripSide" values="1;-1;1;-1"/>
+</section>
+
+<!-- ================ sTGC ========================= -->
+
+
+<section name="NewSmallWheels_sTGC" version="22.1" top_volume="NSW_sTGC" date=" June 22, 2018 " author="Daniel Lellouch">
+
+<composition name="NSW_sTGC">
+
+<sTGC_Tech type="sTGC_1" geometryLevel="1" nLayers="NSW_sTGC_NbrOfLayers" gasTck="NSW_sTGC_GasTck" pcbTck="NSW_sTGC_pcbTck" Tck="NSW_sTGC_Tck" f4="NSW_sTGC_hFrameNoCapacitor" f5="NSW_sTGC_hFrameNoCapacitor" f6="NSW_sTGC_SideFrame"/>
+
+<!-- ================ small Pivot ========================= -->
+
+<sTGC type="sTG1-QS1P" tech="sTGC_1" subType="QS1P" sWidth="346.93" lWidth="743.15" Length="1325.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="279.32" lPadWidth="667.18" padH="80;80;80.24;80.24" rankPadPhi="4;3;2;1" nPadPhi="4;4;3;3" anglePadPhi="5" firstPadPhiDivision_C="-5;-5;-2.5;-2.5" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-5;-5;-2.5;-2.5" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="17;17;17;17" firstPadH="65.8;65.8;28.61;28.61" firstPadRow="1;1;1;1" sStripWidth="293.48" lStripWidth="681.33" wireCutout="802.8;829.8;856.8;883.8" nWires="371;370;370;370" firstWire="-333;-331.65;-332.55;-332.1" wireGroupWidth="20" nStrips="406" firstTriggerBand="6;6;6;6" nTriggerBands="28;28;28;28" firstStripInTrigger="73;73;73;73" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="13;12;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;9" StripsInBandsLayer2="13;12;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;9" StripsInBandsLayer3="14;14;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;6" StripsInBandsLayer4="14;14;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;6" nWireGroups="19;20;19;19" firstWireGroup="20;5;10;15"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS1P" type="ENDCAP" chamberType="sTGS" radius="1563" zPos="NSW_sTGC_ZSmallPivot" phi0="22.5"/>
+
+<sTGC type="sTG1-QS2P" tech="sTGC_1" subType="QS2P" sWidth="746.14" lWidth="1102.25" Length="1191.4" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="677.64" lPadWidth="1026.28" padH="80;80;80.24;80.24" rankPadPhi="2;1;4;3" nPadPhi="2;2;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="0;0;-3.75;-3.75" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="0;0;-3.75;-3.75" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="15;15;15;15" firstPadH="93.2;93.2;60.09;60.09" firstPadRow="18;18;18;18" sStripWidth="691.8" lStripWidth="1040.43" wireCutout="0;0;0;0" nWires="569;570;570;570" firstWire="-511.2;-511.65;-512.55;-512.1" wireGroupWidth="20" nStrips="365" firstTriggerBand="34;34;34;34" nTriggerBands="29;29;29;29" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="14;14;14;13;12;12;13;12;13;12; 12;13;12;13;12;13;12;13;13;12; 13;12;13;12;13;12;13;12;11" StripsInBandsLayer2="14;14;14;13;12;12;13;12;13;12; 12;13;12;13;12;13;12;13;13;12; 13;12;13;12;13;12;13;12;11" StripsInBandsLayer3="14;14;14;13;12;12;13;12;13;12; 12;13;12;13;12;13;12;13;13;12; 13;12;13;12;13;12;13;12;10" StripsInBandsLayer4="14;14;14;13;12;12;13;12;13;12; 13;13;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;10" nWireGroups="29;30;29;29" firstWireGroup="20;5;10;15"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS2P" type="ENDCAP" chamberType="sTGS" radius="2831.5" zPos="NSW_sTGC_ZSmallPivot" phi0="22.5"/>
+
+<sTGC type="sTG1-QS3P" tech="sTGC_1" subType="QS3P" sWidth="1105.96" lWidth="1406.59" Length="1005.8" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1037.46" lPadWidth="1330.62" padH="80;80;80.24;80.24" rankPadPhi="2;1;4;3" nPadPhi="2;2;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="0;0;-3.75;-3.75" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="0;0;-3.75;-3.75" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="12;12;13;13" firstPadH="89.4;89.4;59.88;59.88" firstPadRow="33;33;33;33" sStripWidth="1051.61" lStripWidth="1344.78" wireCutout="0;0;0;0" nWires="739;739;739;738" firstWire="-664.2;-664.65;-663.75;-663.3" wireGroupWidth="20" nStrips="307" firstTriggerBand="64;64;64;64" nTriggerBands="25;25;25;25" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="3;13;13;10;13;13;13;13;13;13;13; 13;12;12;13;12;13;12;13;12;12; 13;13;13;14" StripsInBandsLayer2="3;13;13;10;13;13;13;13;13;13;13; 13;12;12;13;12;13;12;13;12;12; 13;13;13;14" StripsInBandsLayer3="6;13;12;11;14;12;13;12;13;13;13; 13;13;12;13;12;13;12;13;12;13; 13;12;13;11" StripsInBandsLayer4="6;13;12;11;14;12;13;12;13;13;13; 13;13;12;13;12;13;12;13;12;13; 13;12;13;11" nWireGroups="37;38;38;38" firstWireGroup="20;14;10;3"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS3P" type="ENDCAP" chamberType="sTGS" radius="3942.5" zPos="NSW_sTGC_ZSmallPivot" phi0="22.5"/>
+
+
+<!-- ================ small confirm =============== -->
+
+<sTGC type="sTG1-QS1C" tech="sTGC_1" subType="QS1C" sWidth="346.93" lWidth="743.15" Length="1325.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="293.48" lPadWidth="681.33" padH="76.35;76.35;76.59;76.59" rankPadPhi="1;4;2;3" nPadPhi="4;4;4;4" anglePadPhi="5" firstPadPhiDivision_C="-3.75;-6.25;-3.75;-6.25" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-6.25;-3.75;-6.25;-3.75" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="17;17;18;18" firstPadH="78.4;78.4;43.21;43.21" firstPadRow="2;2;2;2" sStripWidth="293.48" lStripWidth="681.33" wireCutout="883.8;856.8;829.8;802.8" nWires="370;370;370;371" firstWire="-332.1;-332.55;-331.65;-333" wireGroupWidth="20" nStrips="406" firstTriggerBand="7;7;8;8" nTriggerBands="29;29;29;29" firstStripInTrigger="73;73;73;73" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="13;12;12;12;12;12;12;12;12;12;11;12;12;12;12;12;12;12;12;12;12;12;12; 12;11;12;12;12;12;12;12;14;10;11" StripsInBandsLayer2="13;12;12;12;12;12;12;12;12;12;11;12;12;12;12;12;12;12;12;12;12;12;12; 12;11;12;12;12;12;12;12;14;10;11" StripsInBandsLayer3="8;12;12;12;12;12;12;12;12;12;12;12; 12;12;12;12;12;11;12;12;12;12; 12;12;12;12;12;12;12;12;12;13;14" StripsInBandsLayer4="8;12;12;12;12;12;12;12;12;12;12;12; 12;12;12;12;12;11;12;12;12;12; 12;12;12;12;12;12;12;12;12;13;14" nWireGroups="19;19;20;19" firstWireGroup="15;10;5;20"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS1C" type="ENDCAP" chamberType="sTGS" radius="1563" zPos="NSW_sTGC_ZSmallConfirm" phi0="22.5"/>
+
+<sTGC type="sTG1-QS2C" tech="sTGC_1" subType="QS2C" sWidth="746.14" lWidth="1102.25" Length="1191.4" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="691.8" lPadWidth="1040.43" padH="76.35;76.35;76.59;76.59" rankPadPhi="3;2;4;1" nPadPhi="3;3;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-1.87;-5.62;-1.87" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-1.87;-5.62;-1.87;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="16;16;15;15" firstPadH="43.8;43.8;89.29;89.29" firstPadRow="19;19;20;20" sStripWidth="691.8" lStripWidth="1040.43" wireCutout="0;0;0;0" nWires="570;570;570;569" firstWire="-512.1;-512.55;-511.65;-511.2" wireGroupWidth="20" nStrips="365" firstTriggerBand="36;36;36;36" nTriggerBands="31;31;31;31" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="7;12;12;12;11;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;12;12; 12;12;12;12;12;12;12;12;12" StripsInBandsLayer2="7;12;12;12;11;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;12;12; 12;12;12;12;12;12;12;12;12" StripsInBandsLayer3="9;12;12;12;12;12;12;12;12;12;12;11; 12;12;11;12;12;12;12;12;12;12; 12;12;12;12;12;12;11;11;11" StripsInBandsLayer4="9;12;12;12;12;12;12;12;12;12;12;11; 12;12;12;12;12;12;12;12;12;12; 12;12;12;12;12;12;11;11;11" nWireGroups="29;29;30;29" firstWireGroup="15;10;5;20"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS2C" type="ENDCAP" chamberType="sTGS" radius="2831.5" zPos="NSW_sTGC_ZSmallConfirm" phi0="22.5"/>
+
+<sTGC type="sTG1-QS3C" tech="sTGC_1" subType="QS3C" sWidth="1105.96" lWidth="1406.59" Length="1005.8" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1051.61" lPadWidth="1344.78" padH="76.35;76.35;76.59;76.59" rankPadPhi="3;2;4;1" nPadPhi="3;3;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-1.87;-5.62;-1.87" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-1.87;-5.62;-1.87;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="13;13;14;14" firstPadH="61.66;61.66;34.38;34.38" firstPadRow="35;35;35;35" sStripWidth="1051.61" lStripWidth="1344.78" wireCutout="0;0;0;0" nWires="738;739;739;739" firstWire="-663.3;-663.75;-664.65;-664.2" wireGroupWidth="20" nStrips="307" firstTriggerBand="67;67;67;67" nTriggerBands="21;21;21;21" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="3;12;12;12;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;11;12;13;13;13;13;14" StripsInBandsLayer2="3;12;12;12;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;11;12;13;13;13;13;14" StripsInBandsLayer3="5;13;12;12;12;12;12;12;12;12;12; 11;12;12;12;12;12;12;12;12;12;12;12;12;12;14" StripsInBandsLayer4="5;13;12;12;12;12;12;12;12;12;12; 11;12;12;12;12;12;12;12;12;12;12;12;12;12;14" nWireGroups="38;38;38;37" firstWireGroup="3;10;14;20"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS3C" type="ENDCAP" chamberType="sTGS" radius="3942.5" zPos="NSW_sTGC_ZSmallConfirm" phi0="22.5"/>
+
+
+<!-- ================ Large Pivot ==================== -->
+
+<sTGC type="sTG1-QL1P" tech="sTGC_1" subType="QL1P" sWidth="542.61" lWidth="1206.82" Length="1332" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="476.42" lPadWidth="1126.66" padH="81.42;81.42;81.66;81.66" rankPadPhi="4;3;2;1" nPadPhi="6;6;7;7" anglePadPhi="5" firstPadPhiDivision_C="-10;-10;-12.5;-12.5" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-10;-10;-12.5;-12.5" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="17;17;16;16" firstPadH="54.39;54.39;98.15;98.15" firstPadRow="1;1;2;2" sStripWidth="490.84" lStripWidth="1141.09" wireCutout="808;835;862;889" nWires="621;620;620;620" firstWire="-558;-556.65;-557.55;-557.1" wireGroupWidth="20" nStrips="408" firstTriggerBand="7;7;7;7" nTriggerBands="28;28;28;28" firstStripInTrigger="73;73;73;73" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="11;12;13;13;13;12;13;13;12;13;13;12;13;13;13;12;13;13;12;13;13;12;13; 13;13;12;13;13;12;9;13;12;8" StripsInBandsLayer2="11;12;13;13;13;12;13;13;12;13;13;12;13;13;13;12;13;13;12;13;13;12;13; 13;13;12;13;13;12;9;13;12;8" StripsInBandsLayer3="12;12;13;13;13;12;13;13;13;12;13;13;13;12;13;13;12;13;13;13;12;13;13; 13;12;13;13;13;12;9;13;12;6" StripsInBandsLayer4="12;12;13;13;13;12;13;13;13;12;13;13;13;12;13;13;12;13;13;13;12;13;13; 13;12;13;13;13;12;9;13;12;6" nWireGroups="32;32;32;32" firstWireGroup="20;5;10;15"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL1P" type="ENDCAP" chamberType="sTGL" radius="1595" zPos="NSW_sTGC_ZLargePivot" phi0="0.0"/>
+
+<sTGC type="sTG1-QL2P" tech="sTGC_1" subType="QL2P" sWidth="1211.81" lWidth="1807.5" Length="1194.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1144.12" lPadWidth="1727.34" padH="81.42;81.42;81.66;81.66" rankPadPhi="2;1;4;3" nPadPhi="4;4;5;5" anglePadPhi="7.5" firstPadPhiDivision_C="-7.5;-7.5;-11.25;-11.25" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-7.5;-7.5;-11.25;-11.25" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="14;14;15;15" firstPadH="99.51;99.51;65.69;65.69" firstPadRow="18;18;18;18" sStripWidth="1158.55" lStripWidth="1741.77" wireCutout="0;0;0;0" nWires="953;954;954;954" firstWire="-856.8;-857.25;-858.15;-857.7" wireGroupWidth="20" nStrips="366" firstTriggerBand="35;35;35;35" nTriggerBands="29;29;29;29" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="11;13;13;13;12;13;13;12;13;13; 13;12;13;13;12;13;13;12;13;13;13; 12;13;13;11;13;13;13;12" StripsInBandsLayer2="11;13;13;13;12;13;13;12;13;13; 13;12;13;13;12;13;13;12;13;13;13; 12;13;13;11;13;13;13;12" StripsInBandsLayer3="14;12;13;13;13;12;13;13;13;12; 13;13;13;12;13;13;12;13;13;13;12; 13;13;13;11;13;13;13;9" StripsInBandsLayer4="14;12;13;13;13;12;13;13;13;12; 13;13;13;12;13;13;12;13;13;13;12; 13;13;13;11;13;13;13;9" nWireGroups="48;49;49;48" firstWireGroup="20;5;10;15"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL2P" type="ENDCAP" chamberType="sTGL" radius="2868.3" zPos="NSW_sTGC_ZLargePivot" phi0="0.0"/>
+
+<sTGC type="sTG1-QL3P" tech="sTGC_1" subType="QL3P" sWidth="1813.68" lWidth="2111" Length="1153" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="545.3" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode="539.26">
+
+<sTGC_readout sPadWidth="1745.99" lPadWidth="2054" padH="81.42;81.42;81.66;81.66"
+ rankPadPhi="2;1;4;3" nPadPhi="4;4;5;5" anglePadPhi="7.5" firstPadPhiDivision_C="-7.5;-7.5;-11.25;-11.25" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-7.5;-7.5;-11.25;-11.25" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="15;15;14;14" firstPadH="32.38;32.38;83.57;83.57" firstPadRow="32;32;33;33" sStripWidth="1760.42" lStripWidth="2054" wireCutout="0;0;0;0" nWires="1133;1134;1134;1134" firstWire="-1018.8;-1019.25;-1020.15;-1019.7" wireGroupWidth="20" nStrips="353" firstTriggerBand="64;64;64;64" nTriggerBands="24;24;24;24" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="11;11;13;13;12;13;13;13;12; 13;13;12;13;13;13;12;13;13;13; 12;13;12;13;12;11;11;10;10;10" StripsInBandsLayer2="11;11;13;13;12;13;13;13;12; 13;13;12;13;13;13;12;13;13;13; 12;13;12;13;12;11;11;10;10;10" StripsInBandsLayer3="13;13;12;13;13;13;13;13;12; 13;13;13;12;13;13;13;13;12;13; 13;13;12;13;13;13;13;13;7" StripsInBandsLayer4="13;13;12;13;13;13;13;13;12; 13;13;13;12;13;13;13;13;12;13; 13;13;12;13;13;13;13;13;7" nWireGroups="57;58;58;57" firstWireGroup="20;5;10;15"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL3P" type="ENDCAP" chamberType="sTGL" radius="4054.5" zPos="NSW_sTGC_ZLargePivot" phi0="0.0"/>
+
+<!-- =============== Large Confirm ===================== -->
+
+<sTGC type="sTG1-QL1C" tech="sTGC_1" subType="QL1C" sWidth="542.61" lWidth="1206.82" Length="1332" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="490.84" lPadWidth="1141.09" padH="85.07;85.07;85.31;85.31" rankPadPhi="4;3;2;1" nPadPhi="6;6;6;6" anglePadPhi="5" firstPadPhiDivision_C="-8.75;-11.25;-8.75;-11.25" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-11.25;-8.75;-11.25;-8.75" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="16;16;16;16" firstPadH="77.79;77.79;38.01;38.01" firstPadRow="1;1;1;1" sStripWidth="490.84" lStripWidth="1141.09" wireCutout="889;862;835;808" nWires="620;620;620;621" firstWire="-557.1;-556.65;-557.55;-558" wireGroupWidth="20" nStrips="408" firstTriggerBand="6;6;6;6" nTriggerBands="26;26;26;26" firstStripInTrigger="73;73;73;73" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="13;11;14;13;13;13;14;13;13;14;13;13; 13;14;13;13;13;14;13;13;14;13; 13;13;14;13;13;13;14;14;11" StripsInBandsLayer2="13;11;14;13;13;13;14;13;13;14;13;13; 13;14;13;13;13;14;13;13;14;13; 13;13;14;13;13;13;14;14;11" StripsInBandsLayer3="14;11;14;13;13;14;13;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;14;13;10" StripsInBandsLayer4="14;11;14;13;13;14;13;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;14;13;10" nWireGroups="32;32;32;32" firstWireGroup="15;10;5;20"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL1C" type="ENDCAP" chamberType="sTGL" radius="1595" zPos="NSW_sTGC_ZLargeConfirm" phi0="0.0"/>
+
+<sTGC type="sTG1-QL2C" tech="sTGC_1" subType="QL2C" sWidth="1211.81" lWidth="1807.5" Length="1194.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1158.55" lPadWidth="1741.77" padH="85.07;85.07;85.31;85.31" rankPadPhi="3;2;4;1" nPadPhi="4;4;4;4" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-9.37;-5.62;-9.37" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-9.37;-5.62;-9.37;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="14;14;14;14" firstPadH="99.84;99.84;63.9;63.9" firstPadRow="17;17;17;17" sStripWidth="1158.55" lStripWidth="1741.77" wireCutout="0;0;0;0" nWires="954;954;954;953" firstWire="-857.7;-857.25;-858.15;-856.8" wireGroupWidth="20" nStrips="366" firstTriggerBand="32;32;32;32" nTriggerBands="29;29;29;29" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="10;10;11;13;13;14;13;13;14; 13;13;14;13;14;13;13;13;13;14; 13;13;13;14;13;13;14;13;13;3" StripsInBandsLayer2="10;10;11;13;13;14;13;13;14; 13;13;14;13;14;13;13;13;13;14; 13;13;13;14;13;13;14;13;13;3" StripsInBandsLayer3="11;11;12;12;13;14;13;13;14; 13;13;14;13;13;13;14;13;13;14; 13;13;14;13;13;14;13;13;12;2" StripsInBandsLayer4="11;11;12;12;13;14;13;13;14; 13;13;14;13;13;13;14;13;13;14; 13;13;14;13;13;14;13;13;12;2" nWireGroups="48;49;49;48" firstWireGroup="20;5;10;15"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL2C" type="ENDCAP" chamberType="sTGL" radius="2868.3" zPos="NSW_sTGC_ZLargeConfirm" phi0="0.0"/>
+
+<sTGC type="sTG1-QL3C" tech="sTGC_1" subType="QL3C" sWidth="1813.68" lWidth="2111" Length="1153" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="545.3" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode="539.26">
+
+<sTGC_readout sPadWidth="1760.42" lPadWidth="2054" padH="85.07;85.07;85.31;85.31" rankPadPhi="3;2;4;1" nPadPhi="4;4;4;4" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-9.37;-5.62;-9.37" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-9.37;-5.62;-9.37;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="13;13;14;14" firstPadH="83.76;83.76;51.17;51.17" firstPadRow="31;31;31;31" sStripWidth="1760.42" lStripWidth="2054" wireCutout="0;0;0;0" nWires="1134;1134;1134;1133" firstWire="-1019.7;-1019.25;-1020.15;-1018.8" wireGroupWidth="20" nStrips="353" firstTriggerBand="61;61;61;61" nTriggerBands="27;27;27;27" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="12;12;12;12;11;14;13;13;14;13; 13;14;13;13;14;13;13;13;14;13; 13;13;14;13;13;14;14" StripsInBandsLayer2="12;12;12;12;11;14;13;13;14;13; 13;14;13;13;14;13;13;13;14;13; 13;13;14;13;13;14;14" StripsInBandsLayer3="13;13;13;14;10;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;11" StripsInBandsLayer4="13;13;13;14;10;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;11" nWireGroups="57;58;58;57" firstWireGroup="20;5;10;15"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL3C" type="ENDCAP" chamberType="sTGL" radius="4054.5" zPos="NSW_sTGC_ZLargeConfirm" phi0="0.0"/>
+
+</composition>
+</section>
+
+
+<!-- ========== MicroMegas ============================== -->
+
+<section name="NSW_MM_Parameters" version="1" top_volume="useless" date="December 16 2014" author="S.Chen" >
+
+<!-- Frames. "f1": frame width close to the trapezium large side. "f2": frame width close to the trapezium small side. "f3": frame width close to the trapezium oblique side -->
+
+<!-- Distance from IP, labeled zmin_MM in Parameter Book -->
+<var name="NSW_MM_LM_distanceFromIP" value="7536"/>
+<var name="NSW_MM_SM_distanceFromIP" value="7072"/>
+<!-- Thickness of Multilayer and the subcomponent (mm)-->
+<var name="NSW_MM_GasTck" value="5.05"/>
+<var name="NSW_MM_ROPcbTck" value="11.75"/>
+<var name="NSW_MM_DriftPcbTck" value="11.3"/>
+<var name="NSW_MM_MultilayerTck" value="NSW_NbrOfLayers* NSW_MM_GasTck + (NSW_NbrOfDriftPcb) * NSW_MM_DriftPcbTck+ ( NSW_NbrOfROPcb) * NSW_MM_ROPcbTck" /> <!-- Thickness of one multilayer -->
+
+<!-- Large sector modules (LM1" LM2). Modules are all trapezoid. ""Height"": radial envelope" ""base/top Width"": upper/lower side of the trapezoid-->
+<var name="NSW_MM_LM1_InnerRadius" value="923" />
+<var name="NSW_MM_LM1_Length" value="2310" />
+<var name="NSW_MM_LM1_outerRadius" value="NSW_MM_LM1_InnerRadius+NSW_MM_LM1_Length" />
+<var name="NSW_MM_LM1_f1" value="35.175"/>
+<var name="NSW_MM_LM1_f2" value="35.625"/>
+<var name="NSW_MM_LM1_f3" value="117.26"/>
+<var name="NSW_MM_LMGap_Length" value="5" /> <!-- Radial gap between LM1 and LM2 -->
+<var name="NSW_MM_LM2_InnerRadius" value="NSW_MM_LM1_outerRadius+NSW_MM_LMGap_Length" />
+<var name="NSW_MM_LM2_Length" value="1410" />
+<var name="NSW_MM_LM2_outerRadius" value="NSW_MM_LM2_InnerRadius+NSW_MM_LM2_Length" />
+<var name="NSW_MM_LM1_baseWidth" value="640" />
+<var name="NSW_MM_LM1_topWidth" value="2008.5" />
+<var name="NSW_MM_LM2_baseWidth" value="2022.8" />
+<var name="NSW_MM_LM2_topWidth" value="2220" />
+<var name="NSW_MM_LM2_f1" value="35.175"/>
+<var name="NSW_MM_LM2_f2" value="35.175"/>
+<var name="NSW_MM_LM2_f3" value="112.52"/>
+<!-- These lines added by Alexandre Laurier to fix MM active Geometry / updated values by Chara Kitsaki -->
+<!-- *_activeBottom: bottom length -->
+<!-- *_activeTop: top length -->
+<!-- *_activeH: radial distance -->
+<var name="NSW_MM_LM1_activeBottom" value="426.73"/>
+<var name="NSW_MM_LM1_activeTop" value="1753.0"/>
+<var name="NSW_MM_LM1_activeH" value="2239.2"/>
+<var name="NSW_MM_LM2_activeBottom" value="1802.5"/>
+<var name="NSW_MM_LM2_activeTop" value="1990.0"/>
+<var name="NSW_MM_LM2_activeH" value="1339.65"/>
+<!-- These lines added by Chara Kitsaki to implement all the parameters needed for the strips description -->
+<!-- *_etaMissedTop: the #of eta strips that are not connected to the FE boards (top part of the module) -->
+<!-- *_etaMissedBottom: the #of eta strips that are not connected to the FE boards (bottom part of the module) -->
+<!-- *_stereoMissedBottom: the #of stereo strips that are not connected to the FE boards (bottom part of the module) -->
+<!-- *_stereoMissedTop: the #of stereo strips that are not connected to the FE boards (top part of the module) -->
+<!-- *_stereoRoutedTop: the #of stereo strips that are shorter in length due to geometry restrictions (top part of the module) -->
+<!-- *_stereoRoutedBottom: the #of stereo strips that are shorter in length due to geometry restrictions (bottom part of the module) -->
+<var name="NSW_MM_LM1_etaMissedTop" value="72"/>
+<var name="NSW_MM_LM1_etaMissedBottom" value="72"/>
+<var name="NSW_MM_LM1_stereoMissedTop" value="36"/>
+<var name="NSW_MM_LM1_stereoMissedBottom" value="86"/>
+<var name="NSW_MM_LM1_stereoRoutedTop" value="88"/>
+<var name="NSW_MM_LM1_stereoRoutedBottom" value="0"/>
+<var name="NSW_MM_LM2_etaMissedTop" value="48"/>
+<var name="NSW_MM_LM2_etaMissedBottom" value="47"/>
+<var name="NSW_MM_LM2_stereoMissedTop" value="43"/>
+<var name="NSW_MM_LM2_stereoMissedBottom" value="42"/>
+<var name="NSW_MM_LM2_stereoRoutedTop" value="64"/>
+<var name="NSW_MM_LM2_stereoRoutedBottom" value="58"/>
+<!-- Small sector modules (SM1" SM2). Modules are all trapezoids. ""Height"": radial envelope" ""base/top Width"": upper/lower side -->
+<var name="NSW_MM_SM1_InnerRadius" value="895" />
+<var name="NSW_MM_SM1_Length" value="2210" />
+<var name="NSW_MM_SM1_outerRadius" value="NSW_MM_SM1_InnerRadius+NSW_MM_SM1_Length" />
+<var name="NSW_MM_SMGap_Length" value="5" /> <!-- Radial gap between SM1 and SM2 -->
+<var name="NSW_MM_SM1_f1" value="34.1875"/>
+<var name="NSW_MM_SM1_f2" value="35.0875"/>
+<var name="NSW_MM_SM1_f3" value="114.02"/>
+<var name="NSW_MM_SM2_InnerRadius" value="NSW_MM_SM1_outerRadius+NSW_MM_SMGap_Length" />
+<var name="NSW_MM_SM2_Length" value="1350" />
+<var name="NSW_MM_SM2_outerRadius" value="NSW_MM_SM2_InnerRadius+NSW_MM_SM2_Length" />
+<var name="NSW_MM_SM1_baseWidth" value="500" />
+<var name="NSW_MM_SM1_topWidth" value="1319.2" />
+<var name="NSW_MM_SM2_baseWidth" value="1321.1" />
+<var name="NSW_MM_SM2_topWidth" value="1821.5" />
+<var name="NSW_MM_SM2_f1" value="35.1375"/>
+<var name="NSW_MM_SM2_f2" value="34.7625"/>
+<var name="NSW_MM_SM2_f3" value="114.4"/>
+<!-- These lines added by Alexandre Laurier to fix MM active Geometry / updated values by Chara Kitsaki -->
+<var name="NSW_MM_SM1_activeBottom" value="284.0"/>
+<var name="NSW_MM_SM1_activeTop" value="1078.4"/>
+<var name="NSW_MM_SM1_activeH" value="2140.725"/>
+<var name="NSW_MM_SM2_activeBottom" value="1103.05"/>
+<var name="NSW_MM_SM2_activeTop" value="1579.6"/>
+<var name="NSW_MM_SM2_activeH" value="1280.1"/>
+<!-- These lines added by Chara Kitsaki to implement all the parameters needed for the strips description -->
+<var name="NSW_MM_SM1_etaMissedTop" value="41"/>
+<var name="NSW_MM_SM1_etaMissedBottom" value="42"/>
+<var name="NSW_MM_SM1_stereoMissedTop" value="11"/>
+<var name="NSW_MM_SM1_stereoMissedBottom" value="35"/>
+<var name="NSW_MM_SM1_stereoRoutedTop" value="66"/>
+<var name="NSW_MM_SM1_stereoRoutedBottom" value="18"/>
+<var name="NSW_MM_SM2_etaMissedTop" value="31"/>
+<var name="NSW_MM_SM2_etaMissedBottom" value="29"/>
+<var name="NSW_MM_SM2_stereoMissedTop" value="1"/>
+<var name="NSW_MM_SM2_stereoMissedBottom" value="1"/>
+<var name="NSW_MM_SM2_stereoRoutedTop" value="79"/>
+<var name="NSW_MM_SM2_stereoRoutedBottom" value="64"/>
+
+<var name="NSW_MM_LargeSector_ZCENTER" value="ZCenter_Global+232."/>
+<var name="NSW_MM_SmallSector_ZCENTER" value="ZCenter_Global-232."/>
+
+
+<!-- Thickness of inter-multilayer spacers -->
+<var name="NSW_MM_SpacerThickness" value="52" />
+
+<!-- Global z-coordinate for the sector center -->
+<!-- <var name="NSW_MM_LargeSector_ZCENTER" value="NSW_MM_LM_distanceFromIP + 4.*NSW_MM_DriftPcbTck + 4.*NSW_MM_ROPcbTck + 4.*NSW_MM_GasTck + NSW_MM_SpacerThickness/2."/>
+<var name="NSW_MM_SmallSector_ZCENTER" value="NSW_MM_SM_distanceFromIP + 4.*NSW_MM_DriftPcbTck + 4.*NSW_MM_ROPcbTck + 4.*NSW_MM_GasTck + NSW_MM_SpacerThickness/2."/> -->
+
+</section>
+
+<section name="NewSmallWheelsMM" version="1" top_volume="NSW_MM" date="December 16 2014" author="S.Chen" >
+
+
+<!-- Technologies -->
+<mm_Tech type="MM_1" geometryLevel="1" nLayers="NSW_NbrOfLayers" gasTck="NSW_MM_GasTck" driftPcbTck="NSW_MM_DriftPcbTck" ROPcbTck="NSW_MM_ROPcbTck" Tck="NSW_MM_MultilayerTck" />
+<!--Chilufya<mmSpacer_Tech type="Spa_1" Tck="NSW_MM_SpacerThickness" />Chilufya-->
+
+<!-- large wheel -->
+<!-- These lines are modified by Chara Kitsaki -->
+<!-- minYPhiL minYPhiR: the (radial)distance kept (left and right part of the module) between the first active stereo and eta strips -->
+<!-- dlStereoTop, dlStereoBottom: the distance between the first stereo and eta strip that is kept starting from the corner-->
+<!-- Some strips are not connected to the FE boards these we call missed strips -->
+<!-- At the corners of the module some strips are shorter in length and they are routed to the FE boards (routed strips). These areas are of low efficiency. LM1 is the special case (there is not much space to route any strips at the module's bottom part) -->
+
+<micromegas type="sMD1-1-1" tech="MM_1" subType="M1L1" sWidth="NSW_MM_LM1_baseWidth" lWidth="NSW_MM_LM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM1_Length" ylFrame="NSW_MM_LM1_f1" ysFrame="NSW_MM_LM1_f2" xFrame="NSW_MM_LM1_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM1_InnerRadius" roLength="NSW_MM_LM1_Length" activeBottomLength="NSW_MM_LM1_activeBottom" activeTopLength="NSW_MM_LM1_activeTop" activeH="NSW_MM_LM1_activeH" minYPhiR="12" minYPhiL="0.69" maxYPhi="6.69" nMissedTopEta="NSW_MM_LM1_etaMissedTop" nMissedBottomEta="NSW_MM_LM1_etaMissedBottom" nMissedTopStereo="NSW_MM_LM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM1_stereoMissedBottom" nRoutedTop="NSW_MM_LM1_stereoRoutedTop" nRoutedBottom="NSW_MM_LM1_stereoRoutedBottom" dlStereoTop="257.61" dlStereoBottom="426.73" totalStrips="5120"/>
+</micromegas>
+<micromegas type="sMD1-2-1" tech="MM_1" subType="M2L1" sWidth="NSW_MM_LM2_baseWidth" lWidth="NSW_MM_LM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM2_Length" ylFrame="NSW_MM_LM2_f1" ysFrame="NSW_MM_LM2_f2" xFrame="NSW_MM_LM2_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM2_InnerRadius" roLength="NSW_MM_LM2_Length" activeBottomLength="NSW_MM_LM2_activeBottom" activeTopLength="NSW_MM_LM2_activeTop" activeH="NSW_MM_LM2_activeH" minYPhiR="21.39" minYPhiL="0" maxYPhi="23.77" nMissedTopEta="NSW_MM_LM2_etaMissedTop" nMissedBottomEta="NSW_MM_LM2_etaMissedBottom" nMissedTopStereo="NSW_MM_LM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM2_stereoMissedBottom" nRoutedTop="NSW_MM_LM2_stereoRoutedTop" nRoutedBottom="NSW_MM_LM2_stereoRoutedBottom" dlStereoTop="909.4" dlStereoBottom="815.32" totalStrips="3072"/>
+</micromegas>
+<micromegas type="sMD1-1-2" tech="MM_1" subType="M1L2" sWidth="NSW_MM_LM1_baseWidth" lWidth="NSW_MM_LM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM1_Length" ylFrame="NSW_MM_LM1_f1" ysFrame="NSW_MM_LM1_f2" xFrame="NSW_MM_LM1_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM1_InnerRadius" roLength="NSW_MM_LM1_Length" activeBottomLength="NSW_MM_LM1_activeBottom" activeTopLength="NSW_MM_LM1_activeTop" activeH="NSW_MM_LM1_activeH" minYPhiR="12" minYPhiL="0.69" maxYPhi="6.69" nMissedTopEta="NSW_MM_LM1_etaMissedTop" nMissedBottomEta="NSW_MM_LM1_etaMissedBottom" nMissedTopStereo="NSW_MM_LM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM1_stereoMissedBottom" nRoutedTop="NSW_MM_LM1_stereoRoutedTop" nRoutedBottom="NSW_MM_LM1_stereoRoutedBottom" dlStereoTop="257.61" dlStereoBottom="426.73" totalStrips="5120"/>
+</micromegas>
+<micromegas type="sMD1-2-2" tech="MM_1" subType="M2L2" sWidth="NSW_MM_LM2_baseWidth" lWidth="NSW_MM_LM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM2_Length" ylFrame="NSW_MM_LM2_f1" ysFrame="NSW_MM_LM2_f2" xFrame="NSW_MM_LM2_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM2_InnerRadius" roLength="NSW_MM_LM2_Length" activeBottomLength="NSW_MM_LM2_activeBottom" activeTopLength="NSW_MM_LM2_activeTop" activeH="NSW_MM_LM2_activeH" minYPhiR="21.39" minYPhiL="0" maxYPhi="23.77" nMissedTopEta="NSW_MM_LM2_etaMissedTop" nMissedBottomEta="NSW_MM_LM2_etaMissedBottom" nMissedTopStereo="NSW_MM_LM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM2_stereoMissedBottom" nRoutedTop="NSW_MM_LM2_stereoRoutedTop" nRoutedBottom="NSW_MM_LM2_stereoRoutedBottom" dlStereoTop="909.4" dlStereoBottom="815.32" totalStrips="3072"/>
+</micromegas>
+
+<!--Chilufya<mmSpacer type="spa1-1" tech="Spa_1" sWidth="NSW_MM_LM1_baseWidth" lWidth="NSW_MM_LM1_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_LM1_Length" />
+<mmSpacer type="spa1-2" tech="Spa_1" sWidth="NSW_MM_LM2_baseWidth" lWidth="NSW_MM_LM2_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_LM2_Length" />Chilufya-->
+
+
+<!-- small wheel -->
+<micromegas type="sMD3-1-1" tech="MM_1" subType="M1S1" sWidth="NSW_MM_SM1_baseWidth" lWidth="NSW_MM_SM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM1_Length" ylFrame="NSW_MM_SM1_f1" ysFrame="NSW_MM_SM1_f2" xFrame="NSW_MM_SM1_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM1_InnerRadius" roLength="NSW_MM_SM1_Length" activeBottomLength="NSW_MM_SM1_activeBottom" activeTopLength="NSW_MM_SM1_activeTop" activeH="NSW_MM_SM1_activeH" minYPhiR="0.75" minYPhiL="0" maxYPhi="1.36" nMissedTopEta="NSW_MM_SM1_etaMissedTop" nMissedBottomEta="NSW_MM_SM1_etaMissedBottom" nMissedTopStereo="NSW_MM_SM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM1_stereoMissedBottom" nRoutedTop="NSW_MM_SM1_stereoRoutedTop" nRoutedBottom="NSW_MM_SM1_stereoRoutedBottom" dlStereoTop="52.15" dlStereoBottom="28.41" totalStrips="5120"/>
+</micromegas>
+<micromegas type="sMD3-2-1" tech="MM_1" subType="M2S1" sWidth="NSW_MM_SM2_baseWidth" lWidth="NSW_MM_SM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM2_Length" ylFrame="NSW_MM_SM2_f1" ysFrame="NSW_MM_SM2_f2" xFrame="NSW_MM_SM2_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM2_InnerRadius" roLength="NSW_MM_SM2_Length" activeBottomLength="NSW_MM_SM2_activeBottom" activeTopLength="NSW_MM_SM2_activeTop" activeH="NSW_MM_SM2_activeH" minYPhiR="2.53" minYPhiL="0" maxYPhi="7.92" nMissedTopEta="NSW_MM_SM2_etaMissedTop" nMissedBottomEta="NSW_MM_SM2_etaMissedBottom" nMissedTopStereo="NSW_MM_SM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM2_stereoMissedBottom" nRoutedTop="NSW_MM_SM2_stereoRoutedTop" nRoutedBottom="NSW_MM_SM2_stereoRoutedBottom" dlStereoTop="303.86" dlStereoBottom="96.14" totalStrips="3072"/>
+</micromegas>
+<micromegas type="sMD3-1-2" tech="MM_1" subType="M1S2" sWidth="NSW_MM_SM1_baseWidth" lWidth="NSW_MM_SM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM1_Length" ylFrame="NSW_MM_SM1_f1" ysFrame="NSW_MM_SM1_f2" xFrame="NSW_MM_SM1_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM1_InnerRadius" roLength="NSW_MM_SM1_Length" activeBottomLength="NSW_MM_SM1_activeBottom" activeTopLength="NSW_MM_SM1_activeTop" activeH="NSW_MM_SM1_activeH" minYPhiR="0.75" minYPhiL="0" maxYPhi="1.36" nMissedTopEta="NSW_MM_SM1_etaMissedTop" nMissedBottomEta="NSW_MM_SM1_etaMissedBottom" nMissedTopStereo="NSW_MM_SM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM1_stereoMissedBottom" nRoutedTop="NSW_MM_SM1_stereoRoutedTop" nRoutedBottom="NSW_MM_SM1_stereoRoutedBottom" dlStereoTop="52.15" dlStereoBottom="28.41" totalStrips="5120"/>
+</micromegas>
+<micromegas type="sMD3-2-2" tech="MM_1" subType="M2S2" sWidth="NSW_MM_SM2_baseWidth" lWidth="NSW_MM_SM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM2_Length" ylFrame="NSW_MM_SM2_f1" ysFrame="NSW_MM_SM2_f2" xFrame="NSW_MM_SM2_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM2_InnerRadius" roLength="NSW_MM_SM2_Length" activeBottomLength="NSW_MM_SM2_activeBottom" activeTopLength="NSW_MM_SM2_activeTop" activeH="NSW_MM_SM2_activeH" minYPhiR="2.53" minYPhiL="0" maxYPhi="7.92" nMissedTopEta="NSW_MM_SM2_etaMissedTop" nMissedBottomEta="NSW_MM_SM2_etaMissedBottom" nMissedTopStereo="NSW_MM_SM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM2_stereoMissedBottom" nRoutedTop="NSW_MM_SM2_stereoRoutedTop" nRoutedBottom="NSW_MM_SM2_stereoRoutedBottom" dlStereoTop="303.86" dlStereoBottom="96.14" totalStrips="3072"/>
+</micromegas>
+<!--Chilufya<mmSpacer type="spa3-1" tech="Spa_1" sWidth="NSW_MM_SM1_baseWidth" lWidth="NSW_MM_SM1_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_SM1_Length" />
+<mmSpacer type="spa3-2" tech="Spa_1" sWidth="NSW_MM_SM2_baseWidth" lWidth="NSW_MM_SM2_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_SM2_Length" />Chilufya-->
+
+<composition name="NSW_MM" >
+<!-- A-SIDE -->
+
+<!-- LARGE SECTOR -->
+
+<!-- MM multilayer 1 -->
+<chamberPosition volume="sMD1-1-1" radius="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" />
+<chamberPosition volume="sMD1-2-1" radius="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" />
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa1-1" ncopy="8" R_Z="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2;NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 270.; 90." />
+<mposPhi volume="spa1-2" ncopy="8" R_Z="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2;NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 270.; 90." />Chilufya-->
+
+<!-- MM multilayer 2 -->
+<chamberPosition volume="sMD1-1-2" radius="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" />
+<chamberPosition volume="sMD1-2-2" radius="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" />
+
+<!-- SMALL SECTOR -->
+
+<!-- MM multilayer 1 -->
+<chamberPosition volume="sMD3-1-1" radius="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" />
+<chamberPosition volume="sMD3-2-1" radius="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" />
+
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa3-1" ncopy="8" R_Z="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2;NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 270.; 90." />
+<mposPhi volume="spa3-2" ncopy="8" R_Z="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2;NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 270.; 90." />Chilufya-->
+
+<!-- MM multilayer 2 -->
+<chamberPosition volume="sMD3-1-2" radius="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" />
+<chamberPosition volume="sMD3-2-2" radius="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" />
+
+<!-- C-SIDE -->
+<!-- LARGE SECTOR -->
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa1-1" ncopy="8" R_Z="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2;-NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 90.; 90." />
+<mposPhi volume="spa1-2" ncopy="8" R_Z="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2;-NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 90.; 90." />Chilufya-->
+
+<!-- SMALL SECTOR -->
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa3-1" ncopy="8" R_Z="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2;-NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 90.; 90." />
+<mposPhi volume="spa3-2" ncopy="8" R_Z="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2;-NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 90.; 90." />Chilufya-->
+
+</composition>
+
+</section>
+
+
+
+
+
+
+
+<!--====================================SPACER FRAME===============================================-->
+
+<section name = "LS and SS Spacer Frames"
+ version = "0.0"
+ date = "25-07-2017"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "NSW_Spacer">
+
+<!-- LS Spacer Ftame -->
+<gvxy name="LS_StructuralPlate_Main" material="Aluminium" dZ="5.9">
+ <gvxy_point X_Y="226.; 958."/>
+ <gvxy_point X_Y="914.15; 3281."/>
+ <gvxy_point X_Y="1007.3; 4613."/>
+ <gvxy_point X_Y="0.01; 4613."/>
+ <gvxy_point X_Y="0.01; 958."/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut1" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="902.87; 4123."/>
+ <gvxy_point X_Y="932.24; 4543."/>
+ <gvxy_point X_Y="40.; 4543."/>
+ <gvxy_point X_Y="40.; 4123."/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut2" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="774.41; 3913.25"/>
+ <gvxy_point X_Y="770.86; 3963."/>
+ <gvxy_point X_Y="135.; 3963."/>
+ <gvxy_point X_Y="135.; 3821.33"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut3" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="778.83; 3639.29"/>
+ <gvxy_point X_Y="792.52; 3835.04"/>
+ <gvxy_point X_Y="203.42; 3750.35"/>
+ <gvxy_point X_Y="203.46; 3720.65"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut4" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="477.15; 3586.36"/>
+ <gvxy_point X_Y="477.24; 3606.18"/>
+ <gvxy_point X_Y="135.; 3654.58"/>
+ <gvxy_point X_Y="135.; 3541.07"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut5" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="762.41; 3404.48"/>
+ <gvxy_point X_Y="772.57; 3549.82"/>
+ <gvxy_point X_Y="286.06; 3485.41"/>
+ <gvxy_point X_Y="286.1; 3465.58"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut6" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="600.; 3314.58"/>
+ <gvxy_point X_Y="602.55; 3354.42"/>
+ <gvxy_point X_Y="60.; 3424.01"/>
+ <gvxy_point X_Y="60.; 3314.58"/>
+</gvxy>
+
+<box name="LS_StructuralPlate_Cut7" material="Aluminium" X_Y_Z="138.; 70.; 7. " />
+
+<gvxy name="LS_StructuralPlate_Cut8" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="678.71; 2838.18"/>
+ <gvxy_point X_Y="772.71; 3155.5"/>
+ <gvxy_point X_Y="63.52; 3155.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut9" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="533.6; 2715.5"/>
+ <gvxy_point X_Y="551.94; 2791.05"/>
+ <gvxy_point X_Y="40.; 3055.11"/>
+ <gvxy_point X_Y="40.; 2715.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut10" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="459.9; 2169.9"/>
+ <gvxy_point X_Y="585.97; 2595.5"/>
+ <gvxy_point X_Y="117.42; 2595.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut11" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="391.41; 2095.5"/>
+ <gvxy_point X_Y="135.; 2414.15"/>
+ <gvxy_point X_Y="135.; 2095.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut12" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="344.91; 1865.18"/>
+ <gvxy_point X_Y="389.44; 2015.5"/>
+ <gvxy_point X_Y="258.79; 2015.5"/>
+</gvxy>
+<gvxy name="LS_StructuralPlate_Cut13" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="275.45; 1825.5"/>
+ <gvxy_point X_Y="172.35; 2005.44"/>
+ <gvxy_point X_Y="135.; 1995.5"/>
+ <gvxy_point X_Y="135.; 1825.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut14" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="173.8; 1028."/>
+ <gvxy_point X_Y="380.41; 1725.5"/>
+ <gvxy_point X_Y="40.; 1725.5"/>
+ <gvxy_point X_Y="40.; 1028."/>
+</gvxy>
+
+<subtraction name="LS_StructuralPlateSub" >
+ <posXYZ volume="LS_StructuralPlate_Main" />
+ <posXYZ volume="LS_StructuralPlate_Cut1" />
+ <posXYZ volume="LS_StructuralPlate_Cut2" />
+ <posXYZ volume="LS_StructuralPlate_Cut3" />
+ <posXYZ volume="LS_StructuralPlate_Cut4" />
+ <posXYZ volume="LS_StructuralPlate_Cut5" />
+ <posXYZ volume="LS_StructuralPlate_Cut6" />
+ <posXYZ volume="LS_StructuralPlate_Cut7" X_Y_Z="589.; 3235.5; 0." />
+ <posXYZ volume="LS_StructuralPlate_Cut8" />
+ <posXYZ volume="LS_StructuralPlate_Cut9" />
+ <posXYZ volume="LS_StructuralPlate_Cut10" />
+ <posXYZ volume="LS_StructuralPlate_Cut11" />
+ <posXYZ volume="LS_StructuralPlate_Cut12" />
+ <posXYZ volume="LS_StructuralPlate_Cut13" />
+ <posXYZ volume="LS_StructuralPlate_Cut14" />
+</subtraction>
+
+<composition name="LS_StructuralPlate" >
+ <posXYZ volume="LS_StructuralPlateSub" />
+ <posXYZ volume="LS_StructuralPlateSub" rot="0. ; 180. ; 0." />
+</composition>
+
+<box name="LS_Central_reference_bar" material="Aluminium" X_Y_Z="1704.; 100.; 27.8 " />
+
+<box name="LS_Channel_section_L2000_Main" material="Aluminium" X_Y_Z="50.; 2000.; 30. " />
+<box name="LS_Channel_section_L2000_Cut" material="Aluminium" X_Y_Z="40.; 2050.; 20. " />
+<subtraction name="LS_Channel_section_L2000" >
+ <posXYZ volume="LS_Channel_section_L2000_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_Channel_section_L1200_Main" material="Aluminium" X_Y_Z="50.; 1200.; 30. " />
+<subtraction name="LS_Channel_section_L1200" >
+ <posXYZ volume="LS_Channel_section_L1200_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_Channel_section_L850_Main" material="Aluminium" X_Y_Z="50.; 850.; 30. " />
+<subtraction name="LS_Channel_section_L850" >
+ <posXYZ volume="LS_Channel_section_L850_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_Channel_section_L1000_Main" material="Aluminium" X_Y_Z="50.; 1000.; 30. " />
+<subtraction name="LS_Channel_section_L1000" >
+ <posXYZ volume="LS_Channel_section_L1000_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_UProfile_L1460_Main" material="Aluminium" X_Y_Z="20.; 1460.; 30. " />
+<box name="LS_UProfile_L1460_Cut" material="Aluminium" X_Y_Z="20.; 1500.; 24. " />
+<subtraction name="LS_UProfile_L1460" >
+ <posXYZ volume="LS_UProfile_L1460_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="LS_UProfile_L750_Main" material="Aluminium" X_Y_Z="20.; 750.; 30. " />
+<subtraction name="LS_UProfile_L750" >
+ <posXYZ volume="LS_UProfile_L750_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="3.; 0.; 0." />
+</subtraction>
+
+<gvxy name="LS_Top_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="914.3; 3484.44"/>
+ <gvxy_point X_Y="1146.47; 3571.68"/>
+ <gvxy_point X_Y="1141.27; 3656.86"/>
+ <gvxy_point X_Y="1054.98; 3656.86"/>
+ <gvxy_point X_Y="1054.98; 4070."/>
+ <gvxy_point X_Y="813.64; 4070."/>
+ <gvxy_point X_Y="774.65; 3494.2"/>
+</gvxy>
+
+<gvxy name="LS_Bottom_Grabber_interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="-801.54; 2552.21"/>
+ <gvxy_point X_Y="-858.34; 2743.97"/>
+ <gvxy_point X_Y="-591.97; 2822.88"/>
+ <gvxy_point X_Y="-535.17; 2631.11"/>
+</gvxy>
+
+<gvxy name="LS_Bottom_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="-558.42; 1731.46"/>
+ <gvxy_point X_Y="-616.93; 1928.98"/>
+ <gvxy_point X_Y="-678.34; 1910.78"/>
+ <gvxy_point X_Y="-727.9; 1985.99"/>
+ <gvxy_point X_Y="-570.48; 2124.21"/>
+ <gvxy_point X_Y="-437.49; 2163.6"/>
+ <gvxy_point X_Y="-329.56; 1799.25"/>
+</gvxy>
+
+<box name="LS_MM_Connectors" material="Aluminium" X_Y_Z="76.; 40.; 30. " />
+<composition name="LS_MM_Connectors_Assembly" >
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="323.24; 1278.98; 0." rot="0. ; 0. ; -16.5" />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="596.23; 2200.58; 0." rot="0. ; 0. ; -16.5" />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="800.97; 2891.78; 0." rot="0. ; 0. ; -16.5" />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="922.31; 3368.81; 0." rot="0. ; 0. ; -4." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="986.76; 4290.41; 0." rot="0. ; 0. ; -4." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="824.; 4615.; 0." rot="0. ; 0. ; 90." />
+</composition>
+
+<box name="LS_KM_Joint" material="ShieldSteel" X_Y_Z="150.; 118.; 48. " />
+
+<composition name="LS_Spacer_Frame_Assembly" >
+ <posXYZ volume="LS_StructuralPlate" X_Y_Z="0.; 0.; 18." />
+ <posXYZ volume="LS_StructuralPlate" X_Y_Z="0.; 0.; -18." />
+ <posXYZ volume="LS_Central_reference_bar" X_Y_Z="0.; 3235.5; 0." />
+ <posXYZ volume="LS_Channel_section_L2000" X_Y_Z="0.; 2185.49; 0." />
+ <posXYZ volume="LS_Channel_section_L1200" X_Y_Z="0.; 3885.51; 0." />
+ <posXYZ volume="LS_Channel_section_L850" X_Y_Z="130.5; 3710.51; 0." />
+ <posXYZ volume="LS_Channel_section_L850" X_Y_Z="-130.5; 3710.51; 0." />
+ <posXYZ volume="LS_Channel_section_L1000" X_Y_Z="130.5; 2223.; 0." />
+ <posXYZ volume="LS_Channel_section_L1000" X_Y_Z="-130.5; 2223.; 0." />
+ <posXYZ volume="LS_UProfile_L1460" X_Y_Z="252.; 2455.49; 0." />
+ <posXYZ volume="LS_UProfile_L1460" X_Y_Z="-252.; 2455.49; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="252.; 3760.5; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-252.; 3760.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="465.; 3760.5; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-465.; 3760.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="678.; 3760.5; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-678.; 3760.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="465.; 2551.; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-465.; 2551.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_Top_Interface" X_Y_Z="0.; 0.; 0." />
+ <posXYZ volume="LS_Top_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="0.; 956.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="0.; 4615.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="LS_KM_Joint" X_Y_Z="-1130.01; 3970.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_KM_Joint" X_Y_Z="1130.01; 3970.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_KM_Joint" X_Y_Z="656.6; 1798.8; 0." rot="0. ; 0. ; -16.5" />
+</composition>
+
+<composition name="LS" >
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- LS Spacer Ftame -->
+
+<!-- SS Spacer Ftame -->
+<gvxy name="SS_StructuralPlate_Main" material="Aluminium" dZ="5.9">
+ <gvxy_point X_Y="154.8; 930."/>
+ <gvxy_point X_Y="745.; 4114.46"/>
+ <gvxy_point X_Y="745.; 4425."/>
+ <gvxy_point X_Y="0.01; 4425."/>
+ <gvxy_point X_Y="0.01; 930."/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut1" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="685.; 4242.5"/>
+ <gvxy_point X_Y="685.; 4375."/>
+ <gvxy_point X_Y="25.; 4375."/>
+ <gvxy_point X_Y="25.; 4242.5"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut2" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="449.11; 4102.75"/>
+ <gvxy_point X_Y="446.87; 4122.5"/>
+ <gvxy_point X_Y="125.; 4122.5"/>
+ <gvxy_point X_Y="125.; 4028.36"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut3" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="577.21; 3867.18"/>
+ <gvxy_point X_Y="620.57; 4101.07"/>
+ <gvxy_point X_Y="131.86; 3988.9"/>
+ <gvxy_point X_Y="131.86; 3969.4"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut4" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="395.9; 3847.5"/>
+ <gvxy_point X_Y="398.14; 3867.25"/>
+ <gvxy_point X_Y="125.; 3929.94"/>
+ <gvxy_point X_Y="125.; 3847.5"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut5" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="495.98; 3705.39"/>
+ <gvxy_point X_Y="495.98; 3747.5"/>
+ <gvxy_point X_Y="25.; 3747.5"/>
+ <gvxy_point X_Y="25.; 3475.7"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut6" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="488.74; 3225.16"/>
+ <gvxy_point X_Y="576.8; 3700.3"/>
+ <gvxy_point X_Y="45.63; 3441.26"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut7" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="408.58; 3177.5"/>
+ <gvxy_point X_Y="417.35; 3215.48"/>
+ <gvxy_point X_Y="25.; 3406.82"/>
+ <gvxy_point X_Y="25.; 3177.5"/>
+</gvxy>
+
+<box name="SS_StructuralPlate_Cut8" material="Aluminium" X_Y_Z="92.; 70.; 7. " />
+
+<gvxy name="SS_StructuralPlate_Cut9" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="429.19; 3037.5"/>
+ <gvxy_point X_Y="25.; 3037.5"/>
+ <gvxy_point X_Y="25.; 2483.96"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut10" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="342.44; 2435.8"/>
+ <gvxy_point X_Y="445.53; 2992.05"/>
+ <gvxy_point X_Y="50.98; 2451.7"/>
+ <gvxy_point X_Y="59.05; 2435.8"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut11" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="275.17; 2072.87"/>
+ <gvxy_point X_Y="330.64; 2372.16"/>
+ <gvxy_point X_Y="310.98; 2395.8"/>
+ <gvxy_point X_Y="39.37; 2395.8"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut12" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="245.39; 2045.82"/>
+ <gvxy_point X_Y="25.; 2347.65"/>
+ <gvxy_point X_Y="25.; 2045.82"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut13" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="144.83; 1534.74"/>
+ <gvxy_point X_Y="203.73; 1852.5"/>
+ <gvxy_point X_Y="125.; 1852.5"/>
+ <gvxy_point X_Y="125.; 1536.56"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut14" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="123.38; 980."/>
+ <gvxy_point X_Y="201.04; 1399."/>
+ <gvxy_point X_Y="25.; 1399."/>
+ <gvxy_point X_Y="25.; 980."/>
+</gvxy>
+
+<subtraction name="SS_StructuralPlateSub" >
+ <posXYZ volume="SS_StructuralPlate_Main" />
+ <posXYZ volume="SS_StructuralPlate_Cut1" />
+ <posXYZ volume="SS_StructuralPlate_Cut2" />
+ <posXYZ volume="SS_StructuralPlate_Cut3" />
+ <posXYZ volume="SS_StructuralPlate_Cut4" />
+ <posXYZ volume="SS_StructuralPlate_Cut5" />
+ <posXYZ volume="SS_StructuralPlate_Cut6" />
+ <posXYZ volume="SS_StructuralPlate_Cut7" />
+ <posXYZ volume="SS_StructuralPlate_Cut8" X_Y_Z="-340.5; 3107.5; 0." />
+ <posXYZ volume="SS_StructuralPlate_Cut9" />
+ <posXYZ volume="SS_StructuralPlate_Cut10" />
+ <posXYZ volume="SS_StructuralPlate_Cut11" />
+ <posXYZ volume="SS_StructuralPlate_Cut12" />
+ <posXYZ volume="SS_StructuralPlate_Cut13" />
+ <posXYZ volume="SS_StructuralPlate_Cut14" />
+</subtraction>
+
+<composition name="SS_StructuralPlate" >
+ <posXYZ volume="SS_StructuralPlateSub" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_StructuralPlateSub" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+</composition>
+
+<box name="SS_Central_reference_bar" material="Aluminium" X_Y_Z="1012.; 100.; 28. " />
+
+<box name="SS_Channel_section_L1100_Main" material="Aluminium" X_Y_Z="50.; 1100.; 30. " />
+<subtraction name="SS_Channel_section_L1100" >
+ <posXYZ volume="SS_Channel_section_L1100_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+
+<box name="SS_Channel_section_L650_Main" material="Aluminium" X_Y_Z="50.; 650.; 30. " />
+<subtraction name="SS_Channel_section_L650" >
+ <posXYZ volume="SS_Channel_section_L650_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="SS_UProfile_L1000_Main" material="Aluminium" X_Y_Z="20.; 1000.; 30. " />
+<subtraction name="SS_UProfile_L1000" >
+ <posXYZ volume="SS_UProfile_L1000_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="SS_UProfile_L920_Main" material="Aluminium" X_Y_Z="20.; 920.; 30. " />
+<subtraction name="SS_UProfile_L920" >
+ <posXYZ volume="SS_UProfile_L920_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="SS_UProfile_L1200_Main" material="Aluminium" X_Y_Z="20.; 1200.; 30. " />
+<subtraction name="SS_UProfile_L1200" >
+ <posXYZ volume="SS_UProfile_L1200_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="SS_UProfile_L700_Main" material="Aluminium" X_Y_Z="20.; 700.; 30. " />
+<subtraction name="SS_UProfile_L700" >
+ <posXYZ volume="SS_UProfile_L700_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<gvxy name="SS_Top_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="849.99; 3705.17"/>
+ <gvxy_point X_Y="849.99; 4260."/>
+ <gvxy_point X_Y="627.69; 4260."/>
+ <gvxy_point X_Y="627.69; 4106.34"/>
+ <gvxy_point X_Y="564.77; 3758.03"/>
+</gvxy>
+
+<gvxy name="SS_Bottom_Grabber_interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="454.99; 1875."/>
+ <gvxy_point X_Y="454.99; 2075."/>
+ <gvxy_point X_Y="255.; 2075."/>
+ <gvxy_point X_Y="255.; 1875."/>
+</gvxy>
+
+<gvxy name="SS_Bottom_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="442.2; 1397.5"/>
+ <gvxy_point X_Y="442.2; 1560.65"/>
+ <gvxy_point X_Y="397.; 1560.65"/>
+ <gvxy_point X_Y="397.; 1792.5"/>
+ <gvxy_point X_Y="194.29; 1792.5"/>
+ <gvxy_point X_Y="149.53; 1434.71"/>
+ <gvxy_point X_Y="204.54; 1397.5"/>
+</gvxy>
+
+<box name="SS_MM_Connectors" material="Aluminium" X_Y_Z="76.; 40.; 30. " />
+<box name="SS_MM_Connectors_Lar" material="Aluminium" X_Y_Z="120.; 40.; 30. " />
+<composition name="SS_MM_Connectors_Assembly" >
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="214.86; 1243.14; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="376.17; 2113.54; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="497.16; 2766.34; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="626.36; 3463.34; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors_Lar" X_Y_Z="766.02; 4337.75; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="624.; 4427.; 0." rot="0. ; 0. ; 90." />
+</composition>
+
+<box name="SS_KM_Joint" material="ShieldSteel" X_Y_Z="154.; 101.; 48. " />
+
+<composition name="SS_Spacer_Frame_Assembly" >
+ <posXYZ volume="SS_StructuralPlate" X_Y_Z="0.; 0.; 18." />
+ <posXYZ volume="SS_StructuralPlate" X_Y_Z="0.; 0.; -18." />
+ <posXYZ volume="SS_Central_reference_bar" X_Y_Z="0.; 3107.5; 0." />
+ <posXYZ volume="LS_Channel_section_L2000" X_Y_Z="0.; 2057.49; 0." />
+ <posXYZ volume="SS_Channel_section_L1100" X_Y_Z="0.; 3707.51; 0." />
+ <posXYZ volume="SS_Channel_section_L1100" X_Y_Z="-110.5; 3707.51; 0." />
+ <posXYZ volume="SS_Channel_section_L1100" X_Y_Z="110.5; 3707.51; 0." />
+ <posXYZ volume="SS_Channel_section_L650" X_Y_Z="-110.5; 1722.; 0." />
+ <posXYZ volume="SS_Channel_section_L650" X_Y_Z="110.5; 1722.; 0." />
+ <posXYZ volume="SS_UProfile_L1000" X_Y_Z="-345.; 3742.5; 0." />
+ <posXYZ volume="SS_UProfile_L1000" X_Y_Z="345.; 3742.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_UProfile_L920" X_Y_Z="-195.; 3782.5; 0." />
+ <posXYZ volume="SS_UProfile_L920" X_Y_Z="195.; 3782.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_UProfile_L1200" X_Y_Z="-195.; 2457.49; 0." />
+ <posXYZ volume="SS_UProfile_L1200" X_Y_Z="195.; 2457.49; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_UProfile_L700" X_Y_Z="-360.; 2587.5; 0." />
+ <posXYZ volume="SS_UProfile_L700" X_Y_Z="360.; 2587.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_Top_Interface" X_Y_Z="0.; 0.; 0." />
+ <posXYZ volume="SS_Top_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="0.; 928.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="0.; 4427.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="SS_KM_Joint" X_Y_Z="-927.01; 4160.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_KM_Joint" X_Y_Z="927.01; 4160.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_KM_Joint" X_Y_Z="-532.01; 1975.; 0." rot="0. ; 0. ; 0." />
+</composition>
+
+<composition name="SS_AssemblyRot" >
+ <posXYZ volume="SS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 22.5" />
+</composition>
+
+<composition name="SS" >
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- End SS Spacer_Frame-->
+
+<composition name="LS_and_SS_SideA" >
+ <posXYZ volume="LS" X_Y_Z="0.; 0.; 7641." rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="SS" X_Y_Z="0.; 0.; 7177." rot=" 0. ; 0. ; 0." />
+</composition>
+
+<composition name="LS_and_SS_SideC" >
+ <posXYZ volume="LS" X_Y_Z="0.; 0.; -7641." rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="SS" X_Y_Z="0.; 0.; -7177." rot=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- ================================================ LS/SS Frames ========================================= -->
+<!-- SS_Frame -->
+<gvxysx name="SS_Frame_Main" material="muo::FR4" dZ="10.4">
+ <gvxy_point X_Y="172.6; 911.2"/>
+ <gvxy_point X_Y="172.6; 986.2"/>
+ <gvxy_point X_Y="235.1; 1403.7"/>
+ <gvxy_point X_Y="348.7; 1386.7"/>
+ <gvxy_point X_Y="366.4; 1505.4"/>
+ <gvxy_point X_Y="252.7; 1522.4"/>
+ <gvxy_point X_Y="582.3; 3727.8"/>
+ <gvxy_point X_Y="795.; 3696.1"/>
+ <gvxy_point X_Y="812.7; 3814.8"/>
+ <gvxy_point X_Y="600.1; 3846.5"/>
+ <gvxy_point X_Y="688.2; 4436.4"/>
+</gvxysx>
+
+<gvxysx name="SS_Frame_Sub1" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="470.5; 3486.4"/>
+ <gvxy_point X_Y="601.2; 4361.4"/>
+</gvxysx>
+
+<gvxysx name="SS_Frame_Sub2" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="290.5; 2282.6"/>
+ <gvxy_point X_Y="452.5; 3366.4"/>
+</gvxysx>
+
+<gvxysx name="SS_Frame_Sub3" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="96.8; 986.2"/>
+ <gvxy_point X_Y="272.6; 2162.6"/>
+</gvxysx>
+
+<subtraction name="SS_Frame" >
+ <posXYZ volume="SS_Frame_Main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="SS_Frame_Sub1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="SS_Frame_Sub2" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="SS_Frame_Sub3" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<tubs name="LM_SS_Fixed_Interfaces_main" material="ShieldSteel" Rio_Z="0.; 37.5; 410." nbPhi="32"/>
+
+<box name="LM_SS_Fixed_Interfaces_Subtr" material="ShieldSteel" X_Y_Z="80.; 130.; 31."/>
+
+<subtraction name="LM_SS_Fixed_Interfaces" >
+ <posXYZ volume="LM_SS_Fixed_Interfaces_main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LM_SS_Fixed_Interfaces_Subtr" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<composition name="SS_Frame_Assembly" >
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; 136.8" rot=" 0.; 0.; 0." />
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; -136.8" rot=" 0.; 0.; 0." />
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; 197.2" rot=" 0.; 0.; 0." />
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; -197.2" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_SS_Fixed_Interfaces" X_Y_Z=" 846.; 3749.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_SS_Fixed_Interfaces" X_Y_Z=" -846.; 3749.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_SS_Fixed_Interfaces" X_Y_Z=" -399.7; 1439.7; 0." rot=" 0.; 0.; 0." />
+</composition>
+
+<composition name="SS_Frame_Assembly_Pos" >
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 67.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 112.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 157.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 202.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 247.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 292.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 337.5" />
+</composition>
+<!-- End SS_Frame -->
+
+<!-- LS_Frame -->
+<gvxysx name="LS_Frame_Main" material="muo::FR4" dZ="10.6">
+ <gvxy_point X_Y="277.29; 940."/>
+ <gvxy_point X_Y="277.29; 1015."/>
+ <gvxy_point X_Y="495.6; 1890.3"/>
+ <gvxy_point X_Y="665.5; 1890.3"/>
+ <gvxy_point X_Y="695.4; 2010.2"/>
+ <gvxy_point X_Y="525.5; 2010.2"/>
+ <gvxy_point X_Y="923.57; 3606.2"/>
+ <gvxy_point X_Y="1083.2; 3566.4"/>
+ <gvxy_point X_Y="1112.2; 3682.8"/>
+ <gvxy_point X_Y="952.6; 3722.6"/>
+ <gvxy_point X_Y="1040.5; 4075."/>
+ <gvxy_point X_Y="1040.5; 4622."/>
+</gvxysx>
+
+<gvxysx name="LS_Frame_Sub1" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="965.5; 4547."/>
+ <gvxy_point X_Y="965.5; 4085."/>
+ <gvxy_point X_Y="825.; 3525."/>
+</gvxysx>
+
+<gvxysx name="LS_Frame_Sub2" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="796.; 3405."/>
+ <gvxy_point X_Y="525.; 2317.8"/>
+</gvxysx>
+
+<gvxysx name="LS_Frame_Sub3" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="494.9; 2197.8"/>
+ <gvxy_point X_Y="200.; 1015."/>
+</gvxysx>
+
+<subtraction name="LS_Frame" >
+ <posXYZ volume="LS_Frame_Main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LS_Frame_Sub1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LS_Frame_Sub2" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LS_Frame_Sub3" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<tubs name="LM_LS_Fixed_Interfaces_main" material="ShieldSteel" Rio_Z="0.; 37.4; 410." nbPhi="32"/>
+
+<subtraction name="LM_LS_Fixed_Interfaces" >
+ <posXYZ volume="LM_LS_Fixed_Interfaces_main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LM_SS_Fixed_Interfaces_Subtr" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<composition name="LS_Frame_Assembly" >
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; 136.7" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; -136.7" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; 197.3" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; -197.3" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_LS_Fixed_Interfaces" X_Y_Z=" 1139.32; 3615.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_LS_Fixed_Interfaces" X_Y_Z=" -1139.32; 3615.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_LS_Fixed_Interfaces" X_Y_Z=" -720.55; 1935.83; 0." rot=" 0.; 0.; 0." />
+</composition>
+
+<composition name="LS_Frame_Assembly_Pos" >
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 45." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 90." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 135." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 180." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 225." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 270." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 315." />
+</composition>
+<!-- End LS_Frame -->
+
+<composition name="NSW_Spacer" >
+ <!-- Aside -->
+ <posXYZ volume="LS_and_SS_SideA" />
+ <posXYZ volume="SS_Frame_Assembly_Pos" X_Y_Z=" 0.; 0.; 7177." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame_Assembly_Pos" X_Y_Z=" 0.; 0.; 7641." rot=" 0.; 0.; 0." />
+ <!-- Cside -->
+ <posXYZ volume="LS_and_SS_SideC" />
+ <posXYZ volume="SS_Frame_Assembly_Pos" X_Y_Z=" 0.; 0.; -7177." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame_Assembly_Pos" X_Y_Z=" 0.; 0.; -7641." rot=" 0.; 0.; 0." />
+</composition>
+
+</section>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--====================================Support Structures and Hub===============================================-->
+
+<section name = "NSW Aluminum Structure and HUB"
+ version = "0.0"
+ date = "25-04-2017"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "NSW_Aluminum_Structure_and_HUB">
+
+<!-- ********************************************** New Hub ************************************************** -->
+
+<!-- Horizontal Shielding -->
+<gvxysx name="Hub_Outer_Plate1" material="Lead" dZ="517.5">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+ <gvxysx name="Hub_Outer_Plate2" material="PolyBoron207HD5" dZ="517.5">
+ <gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate3" material="Lead" dZ="504.">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate4" material="PolyBoron207HD5" dZ="545.">
+ <gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate5" material="Lead" dZ="30.">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate6" material="PolyBoron207HD5" dZ="30.">
+ <gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate7" material="Lead" dZ="85.">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate8" material="PolyBoron207HD5" dZ="126.">
+<gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<composition name="Horizontal_Shielding_ForRot_Spec" >
+ <posXYZ volume="Hub_Outer_Plate5" X_Y_Z="0.; 0.; 908.2" />
+ <posXYZ volume="Hub_Outer_Plate6" X_Y_Z="0.; 0.; 908.2" />
+</composition>
+
+<composition name="Horizontal_Shielding_ForRot_Spec2" >
+ <posXYZ volume="Hub_Outer_Plate3" X_Y_Z="0.; 0.; 248.7" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="Hub_Outer_Plate4" X_Y_Z="0.; 0.; 228.2" rot=" 0. ; 0. ; 22.5" />
+</composition>
+
+<composition name="Horizontal_Shielding_ForRot" >
+ <posXYZ volume="Hub_Outer_Plate1" X_Y_Z="0.; 0.; 643.45" />
+ <posXYZ volume="Hub_Outer_Plate2" X_Y_Z="0.; 0.; 643.45" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec2" />
+ <posXYZ volume="Hub_Outer_Plate7" X_Y_Z="0.; 0.; 39.2" />
+ <posXYZ volume="Hub_Outer_Plate8" X_Y_Z="0.; 0.; 18.7" />
+</composition>
+
+<composition name="Horizontal_Shielding" >
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 315." />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; 67.5" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; -22.5" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; -67.5" />
+</composition>
+<!-- End Horizontal Shielding (New Hub) -->
+
+<!-- Other Parts of New Hub -->
+<pcon name="HUB_Extension_inner_tube" material="ShieldSteel" nbPhi="20">
+ <polyplane Rio_Z="172.; 225.; 997.75"/>
+ <polyplane Rio_Z=" 152.3; 225.; 0."/>
+</pcon>
+<tubs name="HUB_Extension_plate_HO_side" material="ShieldSteel" Rio_Z="172.5; 530.; 59.2" />
+<tubs name="Copper_disk_Extension" material="Copper" Rio_Z="225.5; 454.5; 998." />
+<tubs name="HUB_Extension_outer_tube" material="ShieldSteel" Rio_Z="455.5; 530.; 998.7" />
+
+<pcon name="HUB_Main_part_inner_tube" material="ShieldSteel" nbPhi="20">
+ <polyplane Rio_Z="148.7; 225.; 858.5"/>
+ <polyplane Rio_Z=" 137.; 225.; 0."/>
+</pcon>
+
+<tubs name="Copper_disk_Main_part" material="Copper" Rio_Z="225.5; 699.5; 760." />
+
+<gvxysxy name="Plate_IP_Main" material="ShieldSteel" dZ="91.6">
+ <gvxy_point X_Y="769.95; 153.16"/>
+ <gvxy_point X_Y="652.77; 436.16"/>
+ <gvxy_point X_Y="436.16; 652.77"/>
+ <gvxy_point X_Y="153.16; 769.95"/>
+</gvxysxy>
+
+<tubs name="Plate_IP_Cut_Tube" material="ShieldSteel" Rio_Z="0.; 226.; 95." />
+
+<subtraction name="Plate_IP" >
+ <posXYZ volume="Plate_IP_Main" />
+ <posXYZ volume="Plate_IP_Cut_Tube" />
+</subtraction>
+
+<gvxysxy name="HUB_Main_part_outer_tube_Main" material="ShieldSteel" dZ="767.7">
+ <gvxy_point X_Y="769.95; 153.16"/>
+ <gvxy_point X_Y="652.77; 436.16"/>
+ <gvxy_point X_Y="436.16; 652.77"/>
+ <gvxy_point X_Y="153.16; 769.95"/>
+</gvxysxy>
+
+<tubs name="HUB_Main_part_outer_tube_Cut_Tube" material="ShieldSteel" Rio_Z="0.; 700.; 770." />
+
+<subtraction name="HUB_Main_part_outer_tube" >
+ <posXYZ volume="HUB_Main_part_outer_tube_Main" />
+ <posXYZ volume="HUB_Main_part_outer_tube_Cut_Tube" />
+</subtraction>
+
+<gvxysxy name="Plate_HO_Main" material="ShieldSteel" dZ="78.">
+ <gvxy_point X_Y="769.95; 153.16"/>
+ <gvxy_point X_Y="652.77; 436.16"/>
+ <gvxy_point X_Y="436.16; 652.77"/>
+ <gvxy_point X_Y="153.16; 769.95"/>
+</gvxysxy>
+
+<tubs name="Plate_HO_Cut_Tube" material="ShieldSteel" Rio_Z="0.; 150.5; 80." />
+
+<subtraction name="Plate_HO" >
+ <posXYZ volume="Plate_HO_Main" />
+ <posXYZ volume="Plate_HO_Cut_Tube" />
+</subtraction>
+
+<tubs name="Plate_HO_SupportTube" material="ShieldSteel" Rio_Z="585.; 770.; 21.4" profile="-15.; 210." nbPhi="20"/>
+
+<tubs name="Disque_shileding_ext" material="PolyBoron207HD5" Rio_Z="532.5; 800.; 40." />
+<tubs name="Plaque_polyboron_droite_v2" material="PolyBoron207HD5" Rio_Z="532.5; 582.5; 200." />
+
+<composition name="Hub_Other_Parts_Assembly" >
+ <posXYZ volume="HUB_Extension_plate_HO_side" X_Y_Z="0.; 0.; 1920.6" />
+ <posXYZ volume="HUB_Extension_inner_tube" X_Y_Z="0.; 0.; 892.25" />
+ <posXYZ volume="Copper_disk_Extension" X_Y_Z="0.; 0.; 1391.95" />
+ <posXYZ volume="HUB_Extension_outer_tube" X_Y_Z="0.; 0.; 1391.6" />
+ <posXYZ volume="HUB_Main_part_inner_tube" X_Y_Z="0.; 0.; -45.8" />
+ <posXYZ volume="Copper_disk_Main_part" X_Y_Z="0.; 0.; 434.2" />
+ <posXYZ volume="Plate_IP" />
+ <posXYZ volume="HUB_Main_part_outer_tube" X_Y_Z="0.; 0.; 430.3" />
+ <posXYZ volume="Disque_shileding_ext" X_Y_Z="0.; 0.; 944.2" />
+ <posXYZ volume="Plaque_polyboron_droite_v2" X_Y_Z="0.; 0.; 1064.25" />
+ <posXYZ volume="Plate_HO" X_Y_Z="0.; 0.; 853.2" />
+ <posXYZ volume="Plate_HO_SupportTube" X_Y_Z="0.; 0.; 902.95" />
+</composition>
+<!-- End Other Parts of New Hub -->
+
+<composition name="New_Hub" >
+ <posXYZ volume="Hub_Other_Parts_Assembly" />
+ <posXYZ volume="Horizontal_Shielding" />
+</composition>
+<!-- ************************************************************************************** End New Hub *********************************************** -->
+
+<!-- **************************************************** Inner Spoke ******************************************************************* -->
+<gvxysx name="Base_Leg" material="Aluminium" dZ="390.">
+ <gvxy_point X_Y="40.; 531.5"/>
+ <gvxy_point X_Y=" 40.; -501.5"/>
+ <gvxy_point X_Y="150.; -501.5"/>
+ <gvxy_point X_Y=" 150.; -531.5"/>
+</gvxysx>
+
+<gvxy name="JOINING_BAR3" material="Aluminium" dZ="150.">
+ <gvxy_point X_Y="75.; 23."/>
+ <gvxy_point X_Y="75.; 7."/>
+ <gvxy_point X_Y="640.; 7."/>
+ <gvxy_point X_Y="640.; -23."/>
+ <gvxy_point X_Y="-640.; -23."/>
+ <gvxy_point X_Y="-640.; 7."/>
+ <gvxy_point X_Y="-75.; 7."/>
+ <gvxy_point X_Y="-75.; 23."/>
+</gvxy>
+
+<box name="LATERAL_PLATE_L" material="Aluminium" X_Y_Z="21.; 1680.; 390. " />
+
+<gvxysx name="Front_plate2" material="Aluminium" dZ="14.">
+ <gvxy_point X_Y="98.65; 2867.18"/>
+ <gvxy_point X_Y=" 89.94; 2805.19"/>
+ <gvxy_point X_Y="89.94; 2587.18"/>
+</gvxysx>
+
+<gvxysx name="LS_OUTER3_MainBox" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="323.7; 450."/>
+ <gvxy_point X_Y=" 197.21; -450."/>
+</gvxysx>
+
+<box name="LS_OUTER3_CutBox" material="Aluminium" X_Y_Z="250.; 600.; 35. " />
+
+<subtraction name="LS_OUTER3" >
+ <posXYZ volume="LS_OUTER3_MainBox" />
+ <posXYZ volume="LS_OUTER3_CutBox" X_Y_Z=" 0.; -50.; 0. " />
+</subtraction>
+
+<gvxysx name="REAR_PLATE1" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="176.95; 309.25"/>
+ <gvxy_point X_Y=" 90.03; -309.25"/>
+</gvxysx>
+
+<gvxy name="REAR_PLATE2" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="273.95; 174.5"/>
+ <gvxy_point X_Y="224.9; -174.5"/>
+ <gvxy_point X_Y="125.; -174.5"/>
+ <gvxy_point X_Y="125.; -154.5"/>
+ <gvxy_point X_Y="-125.; -154.5"/>
+ <gvxy_point X_Y="-125.; -174.5"/>
+ <gvxy_point X_Y="-224.9; -174.5"/>
+ <gvxy_point X_Y="-273.95; 174.5"/>
+</gvxy>
+
+<box name="SHIM1" material="Aluminium" X_Y_Z="700.; 150.; 21.6 " />
+<box name="SHIM2" material="Aluminium" X_Y_Z="350.; 150.; 21.6 " />
+
+<gvxysx name="REAR_PLATE3" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="323.7; 80."/>
+ <gvxy_point X_Y=" 301.21; -80."/>
+</gvxysx>
+
+<box name="KM_FRONT_PLATE1" material="ShieldSteel" X_Y_Z="34.; 160.; 250. " />
+<box name="KM_LOCKING_PLATE1" material="ShieldSteel" X_Y_Z="20.; 120.; 200. " />
+
+<gvxy name="JOINING_BAR2" material="Aluminium" dZ="29.">
+ <gvxy_point X_Y="175.; 75."/>
+ <gvxy_point X_Y="964.81; -64.27"/>
+ <gvxy_point X_Y="938.77; -211.99"/>
+ <gvxy_point X_Y="161.88; -75."/>
+ <gvxy_point X_Y="-161.88; -75."/>
+ <gvxy_point X_Y="-938.77; -211.99"/>
+ <gvxy_point X_Y="-964.81; -64.27"/>
+ <gvxy_point X_Y="-175.; 75."/>
+</gvxy>
+
+<gvxy name="JOINING_BAR1" material="Aluminium" dZ="29.">
+ <gvxy_point X_Y="350.; 75."/>
+ <gvxy_point X_Y="1196.93; -74.34"/>
+ <gvxy_point X_Y="1170.88; -222.06"/>
+ <gvxy_point X_Y="336.88; -75."/>
+ <gvxy_point X_Y="-336.88; -75."/>
+ <gvxy_point X_Y="-1170.88; -222.06"/>
+ <gvxy_point X_Y="-1196.93; -74.34"/>
+ <gvxy_point X_Y="-350.; 75."/>
+</gvxy>
+
+<composition name="Inner_Spoke_Assembly" >
+ <posXYZ volume="Base_Leg" X_Y_Z="0.; 1301.5; 0." />
+ <posXYZ volume="JOINING_BAR1" X_Y_Z="0.; 4385.; -231.2" />
+ <posXYZ volume="JOINING_BAR2" X_Y_Z="0.; 3065.; -231.2" />
+ <posXYZ volume="JOINING_BAR3" X_Y_Z="0.; 1715.; -218.05" rot=" 90. ; 0. ; 0." />
+ <posXYZ volume="LATERAL_PLATE_L" X_Y_Z="-217.3; 3635.56; 0." rot=" 0. ; 0. ; 8." />
+ <posXYZ volume="LATERAL_PLATE_L" X_Y_Z="217.3; 3635.56; 0." rot=" 0. ; 0. ; -8." />
+ <posXYZ volume="Front_plate2" X_Y_Z="0.; 0.; 188." />
+ <posXYZ volume="LS_OUTER3" X_Y_Z="0.; 4018.41; 180." />
+ <posXYZ volume="REAR_PLATE1" X_Y_Z="0.; 3114.99; -180." />
+ <posXYZ volume="REAR_PLATE2" X_Y_Z="0.; 3939.93; -180." />
+ <posXYZ volume="REAR_PLATE3" X_Y_Z="0.; 4388.42; -180." />
+ <posXYZ volume="SHIM1" X_Y_Z="0.; 4385.; -205.85" />
+ <posXYZ volume="SHIM2" X_Y_Z="0.; 3065.; -205.85" />
+ <posXYZ volume="KM_FRONT_PLATE1" X_Y_Z="318.34; 4156.56; 25." rot=" 0. ; 0. ; -8." />
+ <posXYZ volume="KM_FRONT_PLATE1" X_Y_Z="-318.34; 4156.56; 25." rot=" 0. ; 0. ; 8." />
+ <posXYZ volume="KM_LOCKING_PLATE1" X_Y_Z="270.71; 4163.26; 0." rot=" 0. ; 0. ; -8." />
+ <posXYZ volume="KM_LOCKING_PLATE1" X_Y_Z="-270.71; 4163.26; 0." rot=" 0. ; 0. ; 8." />
+</composition>
+
+<composition name="Inner_Spoke" >
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 67.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 112.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 157.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 202.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 247.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 292.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 337.5" />
+</composition>
+
+<!-- *********************************************************************************** End Inner Spoke **************************************************\
+************************************* -->
+
+<!-- *********************************************************************************** Outer Spoke ******************************************************\
+************************************* -->
+
+<box name="NSW_F1_spoke_MainBox" material="Aluminium" X_Y_Z="135.; 1060.; 185. " />
+<box name="NSW_F1_spoke_CutBox" material="Aluminium" X_Y_Z="111.; 1070.; 161. " />
+
+<subtraction name="NSW_F1_spoke" >
+ <posXYZ volume="NSW_F1_spoke_MainBox" />
+ <posXYZ volume="NSW_F1_spoke_CutBox" />
+</subtraction>
+<box name="NSW_F1_spoke_Bot_Plate" material="Aluminium" X_Y_Z="300.; 48.; 300. " />
+
+<gvxysx name="Plaque_interface2" material="Aluminium" dZ="37.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<gvxysx name="Plaque_interface2.1" material="Aluminium" dZ="45.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<box name="NSW_SS_spoke_Pillar_MainBox" material="Aluminium" X_Y_Z="135.; 2683.25; 185. " />
+<box name="NSW_SS_spoke_Pillar_CutBox" material="Aluminium" X_Y_Z="113.; 2685.; 163. " />
+
+<subtraction name="NSW_SS_spoke_Pillar" >
+ <posXYZ volume="NSW_SS_spoke_Pillar_MainBox" />
+ <posXYZ volume="NSW_SS_spoke_Pillar_CutBox" />
+</subtraction>
+
+<box name="Spoke_Joint" material="ShieldSteel" X_Y_Z="75.; 85.; 124.4 " />
+
+<gvxysx name="Manifolds_Support_Main" material="Aluminium" dZ="150.">
+ <gvxy_point X_Y="585.; 75."/>
+ <gvxy_point X_Y=" 551.74; -75."/>
+</gvxysx>
+
+<box name="Manifolds_Support_CutBox1" material="Aluminium" X_Y_Z="1180.; 140.; 140. " />
+<box name="Manifolds_Support_CutBox2" material="Aluminium" X_Y_Z="160.; 90.; 160. " />
+
+<subtraction name="Manifolds_Support" >
+ <posXYZ volume="Manifolds_Support_Main" />
+ <posXYZ volume="Manifolds_Support_CutBox1" />
+ <posXYZ volume="Manifolds_Support_CutBox2" X_Y_Z="135.; -45.; 0." />
+</subtraction>
+
+<box name="Cale" material="Aluminium" X_Y_Z="135.; 280.; 52. " />
+<box name="JD_JOINT2.1_Plate1" material="Aluminium" X_Y_Z="250.; 270.; 20. " />
+<box name="Shim_JD" material="Aluminium" X_Y_Z="250.; 270.; 29. " />
+<box name="JD_JOINT1_Pipe_MainBox" material="Aluminium" X_Y_Z="1300.; 120.; 80." />
+<box name="JD_JOINT1_Pipe_CutBox" material="Aluminium" X_Y_Z="1305.; 100.; 60. " />
+
+<subtraction name="JD_JOINT1_Pipe" >
+ <posXYZ volume="JD_JOINT1_Pipe_MainBox" />
+ <posXYZ volume="JD_JOINT1_Pipe_CutBox" />
+</subtraction>
+
+<box name="JD_JOINT2_Pipe_MainBox" material="Aluminium" X_Y_Z="900.; 120.; 80." />
+
+<subtraction name="JD_JOINT2_Pipe" >
+ <posXYZ volume="JD_JOINT2_Pipe_MainBox" />
+ <posXYZ volume="JD_JOINT1_Pipe_CutBox" />
+</subtraction>
+
+<box name="KM_FRONT_PLATE.1.1" material="ShieldSteel" X_Y_Z="27.; 272.; 120. " />
+<box name="Manifolds_Support_Plate" material="Aluminium" X_Y_Z="9.8; 275.; 175. " />
+<box name="AL_BAR_KM_INCLINED_PLATE" material="Aluminium" X_Y_Z="290.; 38.; 67. " />
+
+<composition name="Outer_Spoke_Assembly" >
+ <posXYZ volume="NSW_F1_spoke" X_Y_Z="0.; 1350.; 0." />
+ <posXYZ volume="NSW_F1_spoke_Bot_Plate" X_Y_Z="0.; 795.95; 0." />
+ <posXYZ volume="Manifolds_Support" X_Y_Z="0.; 4515.33; 0." />
+ <posXYZ volume="Plaque_interface2" X_Y_Z="0.; 1745.; 111.05" />
+ <posXYZ volume="Plaque_interface2.1" X_Y_Z="0.; 1745.; -115.05" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="371.; 3267.85; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="-371.; 3267.85; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="610.52; 4348.24; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="322.65; 3049.77; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="-610.52; 4348.24; 154.75" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="-322.65; 3049.77; 154.75" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale" X_Y_Z="537.79; 4020.21; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="338.24; 3120.06; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="-537.79; 4020.21; -118.55" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale" X_Y_Z="-338.24; 3120.06; -118.55" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="315.; 3120.6; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-315.; 3120.6; -154.6" />
+ <posXYZ volume="Shim_JD" X_Y_Z="515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="315.; 3120.6; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-315.; 3120.6; -261.55" />
+ <posXYZ volume="JD_JOINT1_Pipe" X_Y_Z="0.; 4020.2; -207." />
+ <posXYZ volume="JD_JOINT2_Pipe" X_Y_Z="0.; 3120.6; -207." />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="641.41; 4289.16; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="-641.41; 4289.16; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Manifolds_Support_Plate" X_Y_Z="560.93; 4459.11; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Manifolds_Support_Plate" X_Y_Z="-560.93; 4459.11; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="AL_BAR_KM_INCLINED_PLATE" X_Y_Z="-243.; 4099.25; -228.5" />
+</composition>
+
+<!-- Outer Spoke Foot -->
+<gvxysx name="Plaque_interface2_SpecMain" material="Aluminium" dZ="37.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<box name="Plaque_interface2_Spec_CutBox" material="Aluminium" X_Y_Z="160.; 260.; 13. " />
+
+<subtraction name="Plaque_interface2_Spec" >
+ <posXYZ volume="Plaque_interface2_SpecMain" />
+ <posXYZ volume="Plaque_interface2_Spec_CutBox" X_Y_Z="-120.94; 337.19; -12.5" rot=" 0. ; 0. ; 12.5" />
+</subtraction>
+
+<gvxysx name="Plaque_interface2.1_SpecMain" material="Aluminium" dZ="45.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<subtraction name="Plaque_interface2.1_Spec" >
+ <posXYZ volume="Plaque_interface2.1_SpecMain" />
+ <posXYZ volume="Plaque_interface2_Spec_CutBox" X_Y_Z="-120.94; 337.19; 16.5" rot=" 0. ; 0. ; 12.5" />
+</subtraction>
+
+<box name="NSW_SS_spoke_PillarSpec_MainBox" material="ShieldSteel" X_Y_Z="135.; 2818.1; 210. " />
+<box name="NSW_SS_spoke_PillarSpec_CutBox" material="Aluminium" X_Y_Z="91.; 2820.; 166. " />
+
+<subtraction name="NSW_SS_spokeSpec_Pillar" >
+ <posXYZ volume="NSW_SS_spoke_PillarSpec_MainBox" />
+ <posXYZ volume="NSW_SS_spoke_PillarSpec_CutBox" />
+</subtraction>
+
+<box name="Cale_Spec" material="Aluminium" X_Y_Z="135.; 280.; 38.6 " />
+<box name="Spoke_Joint1.2" material="Aluminium" X_Y_Z="66.; 100.; 111.9 " />
+
+<box name="BOTTOM_PLATE.1_Horisontal_Plate" material="ShieldSteel" X_Y_Z="29.8; 775.; 495. " />
+<box name="BOTTOM_PLATE.1_Vertical_Main_Plate" material="ShieldSteel" X_Y_Z="460.; 640.; 35. " />
+
+<gvxy name="Connecting_Plates2.1" material="Aluminium" dZ="22.">
+ <gvxy_point X_Y="-252.; 130.65"/>
+ <gvxy_point X_Y="70.; 130.65"/>
+ <gvxy_point X_Y="252.; 25.65"/>
+ <gvxy_point X_Y="258.6; -124.1"/>
+ <gvxy_point X_Y="108.7; -130.65"/>
+ <gvxy_point X_Y="-252.; 19.35"/>
+</gvxy>
+
+<box name="Tube_alu_feet_MainBox" material="Aluminium" X_Y_Z="1050.; 135.; 185. " />
+<box name="Tube_alu_feet_CutBox" material="Aluminium" X_Y_Z="1055.; 111.4; 161.4 " />
+
+<subtraction name="Tube_alu_feet" >
+ <posXYZ volume="Tube_alu_feet_MainBox" />
+ <posXYZ volume="Tube_alu_feet_CutBox" />
+</subtraction>
+
+<box name="Fix_nut" material="ShieldSteel" X_Y_Z="50.; 52.; 290. " />
+
+<gvxy name="Beam_Interface" material="Aluminium" dZ="300.">
+ <gvxy_point X_Y="-80.; 73.4"/>
+ <gvxy_point X_Y="80.; 73.4"/>
+ <gvxy_point X_Y="80.; -73.4"/>
+ <gvxy_point X_Y="-80.; 28.5"/>
+</gvxy>
+
+<gvxy name="Beam_Interface2" material="Aluminium" dZ="300.">
+ <gvxy_point X_Y="-80.; 79.8"/>
+ <gvxy_point X_Y="80.; 79.8"/>
+ <gvxy_point X_Y="80.; 12.6"/>
+ <gvxy_point X_Y="-80.; -79.8"/>
+</gvxy>
+
+<box name="LS_T_Joint" material="ShieldSteel" X_Y_Z="80.; 70.; 134.9 " />
+<box name="LS_T_Joint2" material="ShieldSteel" X_Y_Z="77.; 67.; 147.4 " />
+
+<gvxy name="Renfort_Bas1_MainBox" material="Aluminium" dZ="135.">
+ <gvxy_point X_Y="-337.73; -67.5"/>
+ <gvxy_point X_Y="-251.72; 67.5"/>
+ <gvxy_point X_Y="251.72; 67.5"/>
+ <gvxy_point X_Y="337.27; -67.5"/>
+</gvxy>
+
+<box name="Renfort_Bas1_CutBox" material="Aluminium" X_Y_Z="680.; 115.; 115. " />
+
+
+<subtraction name="Renfort_Bas1" >
+ <posXYZ volume="Renfort_Bas1_MainBox" />
+ <posXYZ volume="Renfort_Bas1_CutBox" />
+</subtraction>
+
+<composition name="Outer_Spoke_Assembly_FOOT1" >
+ <posXYZ volume="NSW_F1_spoke" X_Y_Z="0.; 1350.; 0." />
+ <posXYZ volume="NSW_F1_spoke_Bot_Plate" X_Y_Z="0.; 795.95; 0." />
+ <posXYZ volume="Plaque_interface2_Spec" X_Y_Z="0.; 1745.; 111.05" />
+ <posXYZ volume="Plaque_interface2.1_Spec" X_Y_Z="0.; 1745.; -115.05" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="371.; 3267.85; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="NSW_SS_spokeSpec_Pillar" X_Y_Z="-385.59; 3333.67; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Shim_JD" X_Y_Z="515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="315.; 3120.6; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-315.; 3120.6; -261.55" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="315.; 3120.6; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-315.; 3120.6; -154.6" />
+ <posXYZ volume="Cale" X_Y_Z="537.79; 4020.21; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="338.24; 3120.06; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-537.79; 4020.21; -124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-338.24; 3120.06; -124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="JD_JOINT1_Pipe" X_Y_Z="0.; 4020.2; -207." />
+ <posXYZ volume="JD_JOINT2_Pipe" X_Y_Z="0.; 3120.6; -207." />
+ <posXYZ volume="AL_BAR_KM_INCLINED_PLATE" X_Y_Z="-243.; 4099.25; -228.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="322.65; 3049.77; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="610.52; 4348.24; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-322.65; 3049.28; 161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-610.4; 4347.75; 161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="641.41; 4289.16; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="BOTTOM_PLATE.1_Horisontal_Plate" X_Y_Z="-675.29; 4889.64; -29." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="BOTTOM_PLATE.1_Vertical_Main_Plate" X_Y_Z="-491.47; 4727.04; -257.5" rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; 103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; -103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Tube_alu_feet" X_Y_Z="35.49; 4779.63; 0." rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-840.79; 4666.23; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-443.82; 5063.2; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Beam_Interface" X_Y_Z="-716.12; 4723.86; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Beam_Interface2" X_Y_Z="-496.92; 4934.01; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_T_Joint" X_Y_Z="-649.; 4560.58; -172.5" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="LS_T_Joint2" X_Y_Z="-356.49; 4881.55; -166.25" rot=" 0. ; 0. ; 75." />
+ <posXYZ volume="Renfort_Bas1" X_Y_Z="-329.24; 4539.98; 0." rot=" 0. ; 0. ; 45." />
+</composition>
+
+<composition name="Outer_Spoke_Assembly_FOOT2" >
+ <posXYZ volume="NSW_F1_spoke" X_Y_Z="0.; 1350.; 0." />
+ <posXYZ volume="NSW_F1_spoke_Bot_Plate" X_Y_Z="0.; 795.95; 0." />
+ <posXYZ volume="Plaque_interface2_Spec" X_Y_Z="0.; 1745.; 111.05" />
+ <posXYZ volume="Plaque_interface2.1_Spec" X_Y_Z="0.; 1745.; -115.05" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="371.; 3267.85; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="NSW_SS_spokeSpec_Pillar" X_Y_Z="-385.59; 3333.67; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Shim_JD" X_Y_Z="515.; 4020.2; 261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="315.; 3120.6; 261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-515.; 4020.2; 261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-315.; 3120.6; 261.55" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="515.; 4020.2; 154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="315.; 3120.6; 154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-515.; 4020.2; 154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-315.; 3120.6; 154.6" />
+ <posXYZ volume="Cale" X_Y_Z="537.79; 4020.21; 118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="338.24; 3120.06; 118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-537.79; 4020.21; 124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-338.24; 3120.06; 124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="JD_JOINT1_Pipe" X_Y_Z="0.; 4020.2; 207." />
+ <posXYZ volume="JD_JOINT2_Pipe" X_Y_Z="0.; 3120.6; 207." />
+ <posXYZ volume="AL_BAR_KM_INCLINED_PLATE" X_Y_Z="-243.; 4099.25; 228.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="322.65; 3049.77; -154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="610.52; 4348.24; -154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-322.65; 3049.28; -161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-610.4; 4347.75; -161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="641.41; 4289.16; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="BOTTOM_PLATE.1_Horisontal_Plate" X_Y_Z="-675.29; 4889.64; 29." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="BOTTOM_PLATE.1_Vertical_Main_Plate" X_Y_Z="-491.47; 4727.04; 257.5" rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; -103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; 103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Tube_alu_feet" X_Y_Z="35.49; 4779.63; 0." rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-840.79; 4666.23; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-443.82; 5063.2; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Beam_Interface" X_Y_Z="-716.12; 4723.86; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Beam_Interface2" X_Y_Z="-496.92; 4934.01; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_T_Joint" X_Y_Z="-649.; 4560.58; 172.5" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="LS_T_Joint2" X_Y_Z="-356.49; 4881.55; 166.25" rot=" 0. ; 0. ; 75." />
+ <posXYZ volume="Renfort_Bas1" X_Y_Z="-329.24; 4539.98; 0." rot=" 0. ; 0. ; 45." />
+</composition>
+<!-- End Outer Spoke Foot -->
+
+
+<composition name="Outer_Spoke" >
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="Outer_Spoke_Assembly_FOOT1" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="Outer_Spoke_Assembly_FOOT2" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 180. ; 225." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- ********************************************************************************* End Outer Spoke ****************************************************\
+************************************** -->
+
+<!-- *********************************************************************************** LSO LSI Connection ***********************************************\
+************************************* -->
+
+<box name="LSO_LSI_connection_Rot" material="ShieldSteel" X_Y_Z="63.; 754.1; 46. " />
+
+<composition name="LSO_LSI_connection_Pos" >
+ <posXYZ volume="LSO_LSI_connection_Rot" X_Y_Z="0.; 2210.09; 0." />
+</composition>
+
+<composition name="LSO_LSI_Connection" >
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; 67.5" />
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; -22.5" />
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; -67.5" />
+</composition>
+
+<!-- *********************************************************************************** End LSO LSI Connection *******************************************\
+************************************* -->
+
+<!-- *********************************************************************************** Alignment Bars ***************************************************\
+**************************************** -->
+
+<!-- SS Bar -->
+<tubs name="SS_Bar_Tube" material="Aluminium" Rio_Z="0.; 49.1; 2382." />
+
+<composition name="SS_Bar_Assembly" >
+ <posXYZ volume="SS_Bar_Tube" X_Y_Z="69.2; 3364.6; 0" rot=" 90. ; 0. ; -3.35" />
+</composition>
+
+<composition name="SS_Bar" >
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- End SS Bar -->
+
+<!-- LS Bar -->
+<tubs name="LS_Bar_Tube" material="Aluminium" Rio_Z="0.; 48.; 2340." />
+<box name="LS_Arm" material="Aluminium" X_Y_Z="1010.; 40.; 50. " />
+
+<composition name="LS_Bar_Assembly" >
+ <posXYZ volume="LS_Bar_Tube" X_Y_Z="1286.4; 3086.18; 0." rot=" 90. ; 0. ; -25." />
+ <posXYZ volume="LS_Arm" X_Y_Z="1789.34; 4164.73; 0." rot=" 0. ; 0. ; -25." />
+</composition>
+
+<composition name="LS_Bar" >
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- End LS Bar -->
+
+<!-- *********************************************************************************** End Alignment Bars ***********************************************\
+******************************************** -->
+
+
+<composition name="NSW_Aluminum_Structure_and_HUB_Assembly" >
+ <posXYZ volume="New_Hub" />
+ <posXYZ volume="Inner_Spoke" />
+ <posXYZ volume="LSO_LSI_Connection" />
+ <posXYZ volume="Outer_Spoke" />
+ <posXYZ volume="SS_Bar" />
+ <posXYZ volume="LS_Bar" />
+</composition>
+
+<composition name="NSW_Aluminum_Structure_and_HUB_SideA" >
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB_Assembly" X_Y_Z="0.; 0.; 6943.8" rot=" 0. ; 0. ; 0." />
+</composition>
+
+<composition name="NSW_Aluminum_Structure_and_HUB_SideC" >
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB_Assembly" X_Y_Z="0.; 0.; -6943.8" rot=" 0. ; 180. ; 0." />
+</composition>
+
+<composition name="NSW_Aluminum_Structure_and_HUB" >
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB_SideA" />
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB_SideC" />
+</composition>
+
+</section>
+
+<!-- ==================================================Feet========================================= -->
+
+<section name = "A Plate"
+ version = "0.0"
+ date = "29-05-2017"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "A_Plate">
+
+<gvxy name="Lateral_Plate_Main" material="ShieldSteel" dZ="21.">
+ <gvxy_point X_Y="-3300.; -4000."/>
+ <gvxy_point X_Y="-3548.3; -3235.72"/>
+ <gvxy_point X_Y="-1458.4; -560.8"/>
+ <gvxy_point X_Y="73.9; 73.9"/>
+ <gvxy_point X_Y="-628.9; -1622.8"/>
+ <gvxy_point X_Y="-818.3; -1544.4"/>
+ <gvxy_point X_Y="-1558.6; -2491.9"/>
+ <gvxy_point X_Y="-1427.8; -2980."/>
+ <gvxy_point X_Y="-0.01; -2980."/>
+ <gvxy_point X_Y="-0.01; -3280."/>
+ <gvxy_point X_Y="-1701.9; -3280."/>
+ <gvxy_point X_Y="-1995.3; -3050.8"/>
+ <gvxy_point X_Y="-2650.; -3889."/>
+ <gvxy_point X_Y="-2650.; -4000."/>
+</gvxy>
+
+<tubs name="Lateral_plate_TubeCut" material="ShieldSteel" Rio_Z=" 0. ; 600. ; 25." nbPhi="36." />
+
+<subtraction name="Lateral_Plate" >
+ <posXYZ volume="Lateral_Plate_Main" />
+ <posXYZ volume="Lateral_plate_TubeCut" X_Y_Z="-0.01; -0.01; 0." rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<tubs name="Anchorage" material="ShieldSteel" Rio_Z=" 0. ; 22.6 ; 577." nbPhi="36." />
+
+<gvxy name="Vertical_Top_Plate" material="ShieldSteel" dZ="33.">
+ <gvxy_point X_Y="-3300.; -3998."/>
+ <gvxy_point X_Y="-3300.; -3730."/>
+ <gvxy_point X_Y="-2865.; -3730."/>
+ <gvxy_point X_Y="-2675.; -3920."/>
+ <gvxy_point X_Y="-2675.; -3998."/>
+</gvxy>
+
+<box name="Horizontal_Plate" material="ShieldSteel" X_Y_Z="625.; 40.6; 287. " />
+
+<composition name="A_Plate_Assembly" >
+ <posXYZ volume="Lateral_Plate" />
+ <posXYZ volume="Lateral_Plate" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="Anchorage" X_Y_Z="-3447.; -3283.25; -299.01" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Anchorage" X_Y_Z="3447.; -3283.25; -299.01" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Vertical_Top_Plate" X_Y_Z="0.; 0.; -27.01" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Vertical_Top_Plate" X_Y_Z="0.; 0.; -27.01" rot="0. ; 180. ; 0." />
+ <posXYZ volume="Horizontal_Plate" X_Y_Z="-2987.5; -3929.7; -187.02" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Horizontal_Plate" X_Y_Z="2987.5; -3929.7; -187.02" rot="0. ; 0. ; 0." />
+</composition>
+
+<composition name="A_Plate_SideA" >
+ <posXYZ volume="A_Plate_Assembly" X_Y_Z=" 0. ; 0.; 7857.5" />
+</composition>
+
+<composition name="A_Plate_SideC" >
+ <posXYZ volume="A_Plate_Assembly" X_Y_Z=" 0. ; 0.; -7857.5" rot="0. ; 180. ; 0." />
+</composition>
+
+<composition name="A_Plate" >
+ <posXYZ volume="A_Plate_SideA" />
+ <posXYZ volume="A_Plate_SideC" />
+</composition>
+
+</section>
+
+<!-- ========== Poisitionning all Volumes in NSW================ -->
+
+<section name="NewSmallWheels" version="4.3" top_volume="NewSmallWheel" date=" April 20, 2015 " author="Daniel Lellouch">
+
+<composition name="NewSmallWheel">
+ <posXYZ volume="NSW_sTGC" X_Y_Z="0.;0.;0."/>
+ <posXYZ volume="NSW_MM" X_Y_Z="0.;0.;0." />
+ <posXYZ volume="NSW_Spacer" />
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB" />
+ <posXYZ volume="A_Plate" />
+</composition>
+
+</section>
+
+</AGDD>
diff --git a/MuonSpectrometer/MuonG4/NSW_Sim/data/stations.v2.08_Aside.xml b/MuonSpectrometer/MuonG4/NSW_Sim/data/stations.v2.08_Aside.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5315642e882fea5db3fe740810528177ff680709
--- /dev/null
+++ b/MuonSpectrometer/MuonG4/NSW_Sim/data/stations.v2.08_Aside.xml
@@ -0,0 +1,1796 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<AGDD>
+
+<section name="NSW_Parameters" version="1" top_volume="useless" date="December 16 2014" author="S.Chen" >
+<!-- Global variables-->
+<var name="NSW_NbrOfLayers" value="4"/>
+<var name="NSW_NbrOfDriftPcb" value="3"/>
+<var name="NSW_NbrOfROPcb" value="2"/>
+<!--Center between the large sectors and the small sectors-->
+<var name="ZCenter_Global" value="7409"/>
+</section>
+
+<section name="NSW_sTGC_Parameters" version="13.7" top_volume="useless" date=" June 30, 2016 " author="Daniel Lellouch">
+<!-- ================ Global Variables ================= -->
+
+<!-- Thickness of a quadruplet -->
+<var name="NSW_sTGC_Tck" value="49.34"/>
+<!-- Gas Gap inside one layer -->
+<var name="NSW_sTGC_GasTck" value="2.85"/>
+<!-- G10 thickness per layer -->
+<var name="NSW_sTGC_pcbTck" value="3"/>
+<!-- Number of layers in a quaduplet -->
+<var name="NSW_sTGC_NbrOfLayers" value="4"/>
+<!-- Wire pitch -->
+<var name="NSW_sTGC_WirePitch" value="1.8"/>
+<!-- Strip pitch -->
+<var name="NSW_sTGC_StripPitch" value="3.2"/>
+<!-- Strip width -->
+<var name="NSW_sTGC_StripWidth" value="2.7"/>
+<!-- Width of G10 frame besides gas volume -->
+<var name="NSW_sTGC_SideFrame" value="28.5"/>
+<!-- Width of G10 frame in base w/o capacitor -->
+<var name="NSW_sTGC_hFrameNoCapacitor" value="11"/>
+<!-- Width of G10 frame in base with capacitor -->
+<var name="NSW_sTGC_hFrameCapacitor" value="14"/>
+<!-- Opening (in degrees) of trapezes in small wedges -->
+<var name="NSW_sTGC_SmallOpening" value="17"/>
+<!-- Opening (in degrees) of trapezes in large wedges -->
+<var name="NSW_sTGC_LargeOpening" value="28"/>
+<!-- Z center of small Pivot -->
+<var name="NSW_sTGC_ZSmallPivot" value="ZCenter_Global-65"/>
+<!-- Z center of small Confirm -->
+<var name="NSW_sTGC_ZSmallConfirm" value="ZCenter_Global-399"/>
+<!-- Z center of Large Pivot -->
+<var name="NSW_sTGC_ZLargePivot" value="ZCenter_Global+65"/>
+<!-- Z center of Large Confirm -->
+<var name="NSW_sTGC_ZLargeConfirm" value="ZCenter_Global+399"/>
+<!-- Z of each volume, relative to center of quadruplet -->
+<array name="NSW_sTGC_LayerDeltaZ" values="-16.45;-5.48;5.49;16.46"/>
+<!-- Side of the Pad readout -->
+<array name="NSW_sTGC_PadSide" values="-1;1;-1;1"/>
+<!-- Side of the Strip readout -->
+<array name="NSW_sTGC_StripSide" values="1;-1;1;-1"/>
+</section>
+
+<!-- ================ sTGC ========================= -->
+
+
+<section name="NewSmallWheels_sTGC" version="22.1" top_volume="NSW_sTGC" date=" June 22, 2018 " author="Daniel Lellouch">
+
+<composition name="NSW_sTGC">
+
+<sTGC_Tech type="sTGC_1" geometryLevel="1" nLayers="NSW_sTGC_NbrOfLayers" gasTck="NSW_sTGC_GasTck" pcbTck="NSW_sTGC_pcbTck" Tck="NSW_sTGC_Tck" f4="NSW_sTGC_hFrameNoCapacitor" f5="NSW_sTGC_hFrameNoCapacitor" f6="NSW_sTGC_SideFrame" zLayout="Z_POSITIVE"/>
+
+<!-- ================ small Pivot ========================= -->
+
+<sTGC type="sTG1-QS1P" tech="sTGC_1" subType="QS1P" sWidth="346.93" lWidth="743.15" Length="1325.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="279.32" lPadWidth="667.18" padH="80;80;80.24;80.24" rankPadPhi="4;3;2;1" nPadPhi="4;4;3;3" anglePadPhi="5" firstPadPhiDivision_C="-5;-5;-2.5;-2.5" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-5;-5;-2.5;-2.5" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="17;17;17;17" firstPadH="65.8;65.8;28.61;28.61" firstPadRow="1;1;1;1" sStripWidth="293.48" lStripWidth="681.33" wireCutout="802.8;829.8;856.8;883.8" nWires="371;370;370;370" firstWire="-333;-331.65;-332.55;-332.1" wireGroupWidth="20" nStrips="406" firstTriggerBand="6;6;6;6" nTriggerBands="28;28;28;28" firstStripInTrigger="73;73;73;73" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="13;12;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;9" StripsInBandsLayer2="13;12;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;9" StripsInBandsLayer3="14;14;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;6" StripsInBandsLayer4="14;14;13;12;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;12;13;12;13;12;13; 12;13;12;13;12;10;6" nWireGroups="19;20;19;19" firstWireGroup="20;5;10;15" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS1P" type="ENDCAP" chamberType="sTGS" radius="1563" zPos="NSW_sTGC_ZSmallPivot" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QS2P" tech="sTGC_1" subType="QS2P" sWidth="746.14" lWidth="1102.25" Length="1191.4" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="677.64" lPadWidth="1026.28" padH="80;80;80.24;80.24" rankPadPhi="2;1;4;3" nPadPhi="2;2;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="0;0;-3.75;-3.75" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="0;0;-3.75;-3.75" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="15;15;15;15" firstPadH="93.2;93.2;60.09;60.09" firstPadRow="18;18;18;18" sStripWidth="691.8" lStripWidth="1040.43" wireCutout="0;0;0;0" nWires="569;570;570;570" firstWire="-511.2;-511.65;-512.55;-512.1" wireGroupWidth="20" nStrips="365" firstTriggerBand="34;34;34;34" nTriggerBands="29;29;29;29" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="14;14;14;13;12;12;13;12;13;12; 12;13;12;13;12;13;12;13;13;12; 13;12;13;12;13;12;13;12;11" StripsInBandsLayer2="14;14;14;13;12;12;13;12;13;12; 12;13;12;13;12;13;12;13;13;12; 13;12;13;12;13;12;13;12;11" StripsInBandsLayer3="14;14;14;13;12;12;13;12;13;12; 12;13;12;13;12;13;12;13;13;12; 13;12;13;12;13;12;13;12;10" StripsInBandsLayer4="14;14;14;13;12;12;13;12;13;12; 13;13;13;12;13;12;13;12;13;12; 13;12;13;12;13;12;13;12;10" nWireGroups="29;30;29;29" firstWireGroup="20;5;10;15" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS2P" type="ENDCAP" chamberType="sTGS" radius="2831.5" zPos="NSW_sTGC_ZSmallPivot" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QS3P" tech="sTGC_1" subType="QS3P" sWidth="1105.96" lWidth="1406.59" Length="1005.8" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1037.46" lPadWidth="1330.62" padH="80;80;80.24;80.24" rankPadPhi="2;1;4;3" nPadPhi="2;2;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="0;0;-3.75;-3.75" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="0;0;-3.75;-3.75" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="12;12;13;13" firstPadH="89.4;89.4;59.88;59.88" firstPadRow="33;33;33;33" sStripWidth="1051.61" lStripWidth="1344.78" wireCutout="0;0;0;0" nWires="739;739;739;738" firstWire="-664.2;-664.65;-663.75;-663.3" wireGroupWidth="20" nStrips="307" firstTriggerBand="64;64;64;64" nTriggerBands="25;25;25;25" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="3;13;13;10;13;13;13;13;13;13;13; 13;12;12;13;12;13;12;13;12;12; 13;13;13;14" StripsInBandsLayer2="3;13;13;10;13;13;13;13;13;13;13; 13;12;12;13;12;13;12;13;12;12; 13;13;13;14" StripsInBandsLayer3="6;13;12;11;14;12;13;12;13;13;13; 13;13;12;13;12;13;12;13;12;13; 13;12;13;11" StripsInBandsLayer4="6;13;12;11;14;12;13;12;13;13;13; 13;13;12;13;12;13;12;13;12;13; 13;12;13;11" nWireGroups="37;38;38;38" firstWireGroup="20;14;10;3" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS3P" type="ENDCAP" chamberType="sTGS" radius="3942.5" zPos="NSW_sTGC_ZSmallPivot" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+
+<!-- ================ small confirm =============== -->
+
+<sTGC type="sTG1-QS1C" tech="sTGC_1" subType="QS1C" sWidth="346.93" lWidth="743.15" Length="1325.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="293.48" lPadWidth="681.33" padH="76.35;76.35;76.59;76.59" rankPadPhi="1;4;2;3" nPadPhi="4;4;4;4" anglePadPhi="5" firstPadPhiDivision_C="-3.75;-6.25;-3.75;-6.25" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-6.25;-3.75;-6.25;-3.75" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="17;17;18;18" firstPadH="78.4;78.4;43.21;43.21" firstPadRow="2;2;2;2" sStripWidth="293.48" lStripWidth="681.33" wireCutout="883.8;856.8;829.8;802.8" nWires="370;370;370;371" firstWire="-332.1;-332.55;-331.65;-333" wireGroupWidth="20" nStrips="406" firstTriggerBand="7;7;8;8" nTriggerBands="29;29;29;29" firstStripInTrigger="73;73;73;73" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="13;12;12;12;12;12;12;12;12;12;11;12;12;12;12;12;12;12;12;12;12;12;12; 12;11;12;12;12;12;12;12;14;10;11" StripsInBandsLayer2="13;12;12;12;12;12;12;12;12;12;11;12;12;12;12;12;12;12;12;12;12;12;12; 12;11;12;12;12;12;12;12;14;10;11" StripsInBandsLayer3="8;12;12;12;12;12;12;12;12;12;12;12; 12;12;12;12;12;11;12;12;12;12; 12;12;12;12;12;12;12;12;12;13;14" StripsInBandsLayer4="8;12;12;12;12;12;12;12;12;12;12;12; 12;12;12;12;12;11;12;12;12;12; 12;12;12;12;12;12;12;12;12;13;14" nWireGroups="19;19;20;19" firstWireGroup="15;10;5;20" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS1C" type="ENDCAP" chamberType="sTGS" radius="1563" zPos="NSW_sTGC_ZSmallConfirm" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QS2C" tech="sTGC_1" subType="QS2C" sWidth="746.14" lWidth="1102.25" Length="1191.4" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="691.8" lPadWidth="1040.43" padH="76.35;76.35;76.59;76.59" rankPadPhi="3;2;4;1" nPadPhi="3;3;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-1.87;-5.62;-1.87" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-1.87;-5.62;-1.87;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="16;16;15;15" firstPadH="43.8;43.8;89.29;89.29" firstPadRow="19;19;20;20" sStripWidth="691.8" lStripWidth="1040.43" wireCutout="0;0;0;0" nWires="570;570;570;569" firstWire="-512.1;-512.55;-511.65;-511.2" wireGroupWidth="20" nStrips="365" firstTriggerBand="36;36;36;36" nTriggerBands="31;31;31;31" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="7;12;12;12;11;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;12;12; 12;12;12;12;12;12;12;12;12" StripsInBandsLayer2="7;12;12;12;11;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;12;12; 12;12;12;12;12;12;12;12;12" StripsInBandsLayer3="9;12;12;12;12;12;12;12;12;12;12;11; 12;12;11;12;12;12;12;12;12;12; 12;12;12;12;12;12;11;11;11" StripsInBandsLayer4="9;12;12;12;12;12;12;12;12;12;12;11; 12;12;12;12;12;12;12;12;12;12; 12;12;12;12;12;12;11;11;11" nWireGroups="29;29;30;29" firstWireGroup="15;10;5;20" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS2C" type="ENDCAP" chamberType="sTGS" radius="2831.5" zPos="NSW_sTGC_ZSmallConfirm" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QS3C" tech="sTGC_1" subType="QS3C" sWidth="1105.96" lWidth="1406.59" Length="1005.8" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1051.61" lPadWidth="1344.78" padH="76.35;76.35;76.59;76.59" rankPadPhi="3;2;4;1" nPadPhi="3;3;3;3" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-1.87;-5.62;-1.87" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-1.87;-5.62;-1.87;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="13;13;14;14" firstPadH="61.66;61.66;34.38;34.38" firstPadRow="35;35;35;35" sStripWidth="1051.61" lStripWidth="1344.78" wireCutout="0;0;0;0" nWires="738;739;739;739" firstWire="-663.3;-663.75;-664.65;-664.2" wireGroupWidth="20" nStrips="307" firstTriggerBand="67;67;67;67" nTriggerBands="21;21;21;21" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="3;12;12;12;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;11;12;13;13;13;13;14" StripsInBandsLayer2="3;12;12;12;12;12;12;12;12;12;12; 12;12;11;12;12;12;12;12;11;12;13;13;13;13;14" StripsInBandsLayer3="5;13;12;12;12;12;12;12;12;12;12; 11;12;12;12;12;12;12;12;12;12;12;12;12;12;14" StripsInBandsLayer4="5;13;12;12;12;12;12;12;12;12;12; 11;12;12;12;12;12;12;12;12;12;12;12;12;12;14" nWireGroups="38;38;38;37" firstWireGroup="3;10;14;20" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QS3C" type="ENDCAP" chamberType="sTGS" radius="3942.5" zPos="NSW_sTGC_ZSmallConfirm" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+
+<!-- ================ Large Pivot ==================== -->
+
+<sTGC type="sTG1-QL1P" tech="sTGC_1" subType="QL1P" sWidth="542.61" lWidth="1206.82" Length="1332" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="476.42" lPadWidth="1126.66" padH="81.42;81.42;81.66;81.66" rankPadPhi="4;3;2;1" nPadPhi="6;6;7;7" anglePadPhi="5" firstPadPhiDivision_C="-10;-10;-12.5;-12.5" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-10;-10;-12.5;-12.5" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="17;17;16;16" firstPadH="54.39;54.39;98.15;98.15" firstPadRow="1;1;2;2" sStripWidth="490.84" lStripWidth="1141.09" wireCutout="808;835;862;889" nWires="621;620;620;620" firstWire="-558;-556.65;-557.55;-557.1" wireGroupWidth="20" nStrips="408" firstTriggerBand="7;7;7;7" nTriggerBands="28;28;28;28" firstStripInTrigger="73;73;73;73" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="11;12;13;13;13;12;13;13;12;13;13;12;13;13;13;12;13;13;12;13;13;12;13; 13;13;12;13;13;12;9;13;12;8" StripsInBandsLayer2="11;12;13;13;13;12;13;13;12;13;13;12;13;13;13;12;13;13;12;13;13;12;13; 13;13;12;13;13;12;9;13;12;8" StripsInBandsLayer3="12;12;13;13;13;12;13;13;13;12;13;13;13;12;13;13;12;13;13;13;12;13;13; 13;12;13;13;13;12;9;13;12;6" StripsInBandsLayer4="12;12;13;13;13;12;13;13;13;12;13;13;13;12;13;13;12;13;13;13;12;13;13; 13;12;13;13;13;12;9;13;12;6" nWireGroups="32;32;32;32" firstWireGroup="20;5;10;15" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL1P" type="ENDCAP" chamberType="sTGL" radius="1595" zPos="NSW_sTGC_ZLargePivot" phi0="0.0" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QL2P" tech="sTGC_1" subType="QL2P" sWidth="1211.81" lWidth="1807.5" Length="1194.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1144.12" lPadWidth="1727.34" padH="81.42;81.42;81.66;81.66" rankPadPhi="2;1;4;3" nPadPhi="4;4;5;5" anglePadPhi="7.5" firstPadPhiDivision_C="-7.5;-7.5;-11.25;-11.25" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-7.5;-7.5;-11.25;-11.25" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="14;14;15;15" firstPadH="99.51;99.51;65.69;65.69" firstPadRow="18;18;18;18" sStripWidth="1158.55" lStripWidth="1741.77" wireCutout="0;0;0;0" nWires="953;954;954;954" firstWire="-856.8;-857.25;-858.15;-857.7" wireGroupWidth="20" nStrips="366" firstTriggerBand="35;35;35;35" nTriggerBands="29;29;29;29" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="11;13;13;13;12;13;13;12;13;13; 13;12;13;13;12;13;13;12;13;13;13; 12;13;13;11;13;13;13;12" StripsInBandsLayer2="11;13;13;13;12;13;13;12;13;13; 13;12;13;13;12;13;13;12;13;13;13; 12;13;13;11;13;13;13;12" StripsInBandsLayer3="14;12;13;13;13;12;13;13;13;12; 13;13;13;12;13;13;12;13;13;13;12; 13;13;13;11;13;13;13;9" StripsInBandsLayer4="14;12;13;13;13;12;13;13;13;12; 13;13;13;12;13;13;12;13;13;13;12; 13;13;13;11;13;13;13;9" nWireGroups="48;49;49;48" firstWireGroup="20;5;10;15" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL2P" type="ENDCAP" chamberType="sTGL" radius="2868.3" zPos="NSW_sTGC_ZLargePivot" phi0="0.0" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QL3P" tech="sTGC_1" subType="QL3P" sWidth="1813.68" lWidth="2111" Length="1153" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="545.3" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode="539.26">
+
+<sTGC_readout sPadWidth="1745.99" lPadWidth="2054" padH="81.42;81.42;81.66;81.66"
+ rankPadPhi="2;1;4;3" nPadPhi="4;4;5;5" anglePadPhi="7.5" firstPadPhiDivision_C="-7.5;-7.5;-11.25;-11.25" PadPhiShift_C="2;-2;2;-2" firstPadPhiDivision_A="-7.5;-7.5;-11.25;-11.25" PadPhiShift_A="-2;2;-2;2" rankPadH="1;2;3;4" nPadH="15;15;14;14" firstPadH="32.38;32.38;83.57;83.57" firstPadRow="32;32;33;33" sStripWidth="1760.42" lStripWidth="2054" wireCutout="0;0;0;0" nWires="1133;1134;1134;1134" firstWire="-1018.8;-1019.25;-1020.15;-1019.7" wireGroupWidth="20" nStrips="353" firstTriggerBand="64;64;64;64" nTriggerBands="24;24;24;24" firstStripInTrigger="1;1;1;1" firstStripWidth="1.6;3.2;1.6;3.2" StripsInBandsLayer1="11;11;13;13;12;13;13;13;12; 13;13;12;13;13;13;12;13;13;13; 12;13;12;13;12;11;11;10;10;10" StripsInBandsLayer2="11;11;13;13;12;13;13;13;12; 13;13;12;13;13;13;12;13;13;13; 12;13;12;13;12;11;11;10;10;10" StripsInBandsLayer3="13;13;12;13;13;13;13;13;12; 13;13;13;12;13;13;13;13;12;13; 13;13;12;13;13;13;13;13;7" StripsInBandsLayer4="13;13;12;13;13;13;13;13;12; 13;13;13;12;13;13;13;13;12;13; 13;13;12;13;13;13;13;13;7" nWireGroups="57;58;58;57" firstWireGroup="20;5;10;15" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL3P" type="ENDCAP" chamberType="sTGL" radius="4054.5" zPos="NSW_sTGC_ZLargePivot" phi0="0.0" zLayout="Z_POSITIVE"/>
+
+<!-- =============== Large Confirm ===================== -->
+
+<sTGC type="sTG1-QL1C" tech="sTGC_1" subType="QL1C" sWidth="542.61" lWidth="1206.82" Length="1332" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="490.84" lPadWidth="1141.09" padH="85.07;85.07;85.31;85.31" rankPadPhi="4;3;2;1" nPadPhi="6;6;6;6" anglePadPhi="5" firstPadPhiDivision_C="-8.75;-11.25;-8.75;-11.25" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-11.25;-8.75;-11.25;-8.75" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="16;16;16;16" firstPadH="77.79;77.79;38.01;38.01" firstPadRow="1;1;1;1" sStripWidth="490.84" lStripWidth="1141.09" wireCutout="889;862;835;808" nWires="620;620;620;621" firstWire="-557.1;-556.65;-557.55;-558" wireGroupWidth="20" nStrips="408" firstTriggerBand="6;6;6;6" nTriggerBands="26;26;26;26" firstStripInTrigger="73;73;73;73" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="13;11;14;13;13;13;14;13;13;14;13;13; 13;14;13;13;13;14;13;13;14;13; 13;13;14;13;13;13;14;14;11" StripsInBandsLayer2="13;11;14;13;13;13;14;13;13;14;13;13; 13;14;13;13;13;14;13;13;14;13; 13;13;14;13;13;13;14;14;11" StripsInBandsLayer3="14;11;14;13;13;14;13;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;14;13;10" StripsInBandsLayer4="14;11;14;13;13;14;13;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;14;13;10" nWireGroups="32;32;32;32" firstWireGroup="15;10;5;20" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL1C" type="ENDCAP" chamberType="sTGL" radius="1595" zPos="NSW_sTGC_ZLargeConfirm" phi0="0.0" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QL2C" tech="sTGC_1" subType="QL2C" sWidth="1211.81" lWidth="1807.5" Length="1194.6" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="0" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode ="0">
+
+<sTGC_readout sPadWidth="1158.55" lPadWidth="1741.77" padH="85.07;85.07;85.31;85.31" rankPadPhi="3;2;4;1" nPadPhi="4;4;4;4" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-9.37;-5.62;-9.37" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-9.37;-5.62;-9.37;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="14;14;14;14" firstPadH="99.84;99.84;63.9;63.9" firstPadRow="17;17;17;17" sStripWidth="1158.55" lStripWidth="1741.77" wireCutout="0;0;0;0" nWires="954;954;954;953" firstWire="-857.7;-857.25;-858.15;-856.8" wireGroupWidth="20" nStrips="366" firstTriggerBand="32;32;32;32" nTriggerBands="29;29;29;29" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="10;10;11;13;13;14;13;13;14; 13;13;14;13;14;13;13;13;13;14; 13;13;13;14;13;13;14;13;13;3" StripsInBandsLayer2="10;10;11;13;13;14;13;13;14; 13;13;14;13;14;13;13;13;13;14; 13;13;13;14;13;13;14;13;13;3" StripsInBandsLayer3="11;11;12;12;13;14;13;13;14; 13;13;14;13;13;13;14;13;13;14; 13;13;14;13;13;14;13;13;12;2" StripsInBandsLayer4="11;11;12;12;13;14;13;13;14; 13;13;14;13;13;13;14;13;13;14; 13;13;14;13;13;14;13;13;12;2" nWireGroups="48;49;49;48" firstWireGroup="20;5;10;15" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL2C" type="ENDCAP" chamberType="sTGL" radius="2868.3" zPos="NSW_sTGC_ZLargeConfirm" phi0="0.0" zLayout="Z_POSITIVE"/>
+
+<sTGC type="sTG1-QL3C" tech="sTGC_1" subType="QL3C" sWidth="1813.68" lWidth="2111" Length="1153" Tck="NSW_sTGC_Tck" xFrame="NSW_sTGC_SideFrame" ysFrame="NSW_sTGC_hFrameNoCapacitor" ylFrame="NSW_sTGC_hFrameCapacitor" yCutout="545.3" stripPitch="NSW_sTGC_StripPitch" wirePitch="NSW_sTGC_WirePitch" stripWidth="NSW_sTGC_StripWidth" yCutoutCathode="539.26">
+
+<sTGC_readout sPadWidth="1760.42" lPadWidth="2054" padH="85.07;85.07;85.31;85.31" rankPadPhi="3;2;4;1" nPadPhi="4;4;4;4" anglePadPhi="7.5" firstPadPhiDivision_C="-5.62;-9.37;-5.62;-9.37" PadPhiShift_C="-2;2;-2;2" firstPadPhiDivision_A="-9.37;-5.62;-9.37;-5.62" PadPhiShift_A="2;-2;2;-2" rankPadH="1;2;3;4" nPadH="13;13;14;14" firstPadH="83.76;83.76;51.17;51.17" firstPadRow="31;31;31;31" sStripWidth="1760.42" lStripWidth="2054" wireCutout="0;0;0;0" nWires="1134;1134;1134;1133" firstWire="-1019.7;-1019.25;-1020.15;-1018.8" wireGroupWidth="20" nStrips="353" firstTriggerBand="61;61;61;61" nTriggerBands="27;27;27;27" firstStripInTrigger="1;1;1;1" firstStripWidth="3.2;1.6;3.2;1.6" StripsInBandsLayer1="12;12;12;12;11;14;13;13;14;13; 13;14;13;13;14;13;13;13;14;13; 13;13;14;13;13;14;14" StripsInBandsLayer2="12;12;12;12;11;14;13;13;14;13; 13;14;13;13;14;13;13;13;14;13; 13;13;14;13;13;14;14" StripsInBandsLayer3="13;13;13;14;10;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;11" StripsInBandsLayer4="13;13;13;14;10;13;13;14;13;13; 14;13;13;14;13;13;14;13;13;13; 14;13;13;14;13;13;11" nWireGroups="57;58;58;57" firstWireGroup="20;5;10;15" zLayout="Z_POSITIVE"/>
+</sTGC>
+
+<chamberPosition volume="sTG1-QL3C" type="ENDCAP" chamberType="sTGL" radius="4054.5" zPos="NSW_sTGC_ZLargeConfirm" phi0="0.0" zLayout="Z_POSITIVE"/>
+
+</composition>
+</section>
+
+
+<!-- ========== MicroMegas ============================== -->
+
+<section name="NSW_MM_Parameters" version="1" top_volume="useless" date="December 16 2014" author="S.Chen" >
+
+<!-- Frames. "f1": frame width close to the trapezium large side. "f2": frame width close to the trapezium small side. "f3": frame width close to the trapezium oblique side -->
+
+<!-- Distance from IP, labeled zmin_MM in Parameter Book -->
+<var name="NSW_MM_LM_distanceFromIP" value="7536"/>
+<var name="NSW_MM_SM_distanceFromIP" value="7072"/>
+<!-- Thickness of Multilayer and the subcomponent (mm)-->
+<var name="NSW_MM_GasTck" value="5.05"/>
+<var name="NSW_MM_ROPcbTck" value="11.75"/>
+<var name="NSW_MM_DriftPcbTck" value="11.3"/>
+<var name="NSW_MM_MultilayerTck" value="NSW_NbrOfLayers* NSW_MM_GasTck + (NSW_NbrOfDriftPcb) * NSW_MM_DriftPcbTck+ ( NSW_NbrOfROPcb) * NSW_MM_ROPcbTck" /> <!-- Thickness of one multilayer -->
+
+<!-- Large sector modules (LM1" LM2). Modules are all trapezoid. ""Height"": radial envelope" ""base/top Width"": upper/lower side of the trapezoid-->
+<var name="NSW_MM_LM1_InnerRadius" value="923" />
+<var name="NSW_MM_LM1_Length" value="2310" />
+<var name="NSW_MM_LM1_outerRadius" value="NSW_MM_LM1_InnerRadius+NSW_MM_LM1_Length" />
+<var name="NSW_MM_LM1_f1" value="35.175"/>
+<var name="NSW_MM_LM1_f2" value="35.625"/>
+<var name="NSW_MM_LM1_f3" value="117.26"/>
+<var name="NSW_MM_LMGap_Length" value="5" /> <!-- Radial gap between LM1 and LM2 -->
+<var name="NSW_MM_LM2_InnerRadius" value="NSW_MM_LM1_outerRadius+NSW_MM_LMGap_Length" />
+<var name="NSW_MM_LM2_Length" value="1410" />
+<var name="NSW_MM_LM2_outerRadius" value="NSW_MM_LM2_InnerRadius+NSW_MM_LM2_Length" />
+<var name="NSW_MM_LM1_baseWidth" value="640" />
+<var name="NSW_MM_LM1_topWidth" value="2008.5" />
+<var name="NSW_MM_LM2_baseWidth" value="2022.8" />
+<var name="NSW_MM_LM2_topWidth" value="2220" />
+<var name="NSW_MM_LM2_f1" value="35.175"/>
+<var name="NSW_MM_LM2_f2" value="35.175"/>
+<var name="NSW_MM_LM2_f3" value="112.52"/>
+<!-- These lines added by Alexandre Laurier to fix MM active Geometry / updated values by Chara Kitsaki -->
+<!-- *_activeBottom: bottom length -->
+<!-- *_activeTop: top length -->
+<!-- *_activeH: radial distance -->
+<var name="NSW_MM_LM1_activeBottom" value="426.73"/>
+<var name="NSW_MM_LM1_activeTop" value="1753.0"/>
+<var name="NSW_MM_LM1_activeH" value="2239.2"/>
+<var name="NSW_MM_LM2_activeBottom" value="1802.5"/>
+<var name="NSW_MM_LM2_activeTop" value="1990.0"/>
+<var name="NSW_MM_LM2_activeH" value="1339.65"/>
+<!-- These lines added by Chara Kitsaki to implement all the parameters needed for the strips description -->
+<!-- *_etaMissedTop: the #of eta strips that are not connected to the FE boards (top part of the module) -->
+<!-- *_etaMissedBottom: the #of eta strips that are not connected to the FE boards (bottom part of the module) -->
+<!-- *_stereoMissedBottom: the #of stereo strips that are not connected to the FE boards (bottom part of the module) -->
+<!-- *_stereoMissedTop: the #of stereo strips that are not connected to the FE boards (top part of the module) -->
+<!-- *_stereoRoutedTop: the #of stereo strips that are shorter in length due to geometry restrictions (top part of the module) -->
+<!-- *_stereoRoutedBottom: the #of stereo strips that are shorter in length due to geometry restrictions (bottom part of the module) -->
+<var name="NSW_MM_LM1_etaMissedTop" value="72"/>
+<var name="NSW_MM_LM1_etaMissedBottom" value="72"/>
+<var name="NSW_MM_LM1_stereoMissedTop" value="36"/>
+<var name="NSW_MM_LM1_stereoMissedBottom" value="86"/>
+<var name="NSW_MM_LM1_stereoRoutedTop" value="88"/>
+<var name="NSW_MM_LM1_stereoRoutedBottom" value="0"/>
+<var name="NSW_MM_LM2_etaMissedTop" value="48"/>
+<var name="NSW_MM_LM2_etaMissedBottom" value="47"/>
+<var name="NSW_MM_LM2_stereoMissedTop" value="43"/>
+<var name="NSW_MM_LM2_stereoMissedBottom" value="42"/>
+<var name="NSW_MM_LM2_stereoRoutedTop" value="64"/>
+<var name="NSW_MM_LM2_stereoRoutedBottom" value="58"/>
+<!-- Small sector modules (SM1" SM2). Modules are all trapezoids. ""Height"": radial envelope" ""base/top Width"": upper/lower side -->
+<var name="NSW_MM_SM1_InnerRadius" value="895" />
+<var name="NSW_MM_SM1_Length" value="2210" />
+<var name="NSW_MM_SM1_outerRadius" value="NSW_MM_SM1_InnerRadius+NSW_MM_SM1_Length" />
+<var name="NSW_MM_SMGap_Length" value="5" /> <!-- Radial gap between SM1 and SM2 -->
+<var name="NSW_MM_SM1_f1" value="34.1875"/>
+<var name="NSW_MM_SM1_f2" value="35.0875"/>
+<var name="NSW_MM_SM1_f3" value="114.02"/>
+<var name="NSW_MM_SM2_InnerRadius" value="NSW_MM_SM1_outerRadius+NSW_MM_SMGap_Length" />
+<var name="NSW_MM_SM2_Length" value="1350" />
+<var name="NSW_MM_SM2_outerRadius" value="NSW_MM_SM2_InnerRadius+NSW_MM_SM2_Length" />
+<var name="NSW_MM_SM1_baseWidth" value="500" />
+<var name="NSW_MM_SM1_topWidth" value="1319.2" />
+<var name="NSW_MM_SM2_baseWidth" value="1321.1" />
+<var name="NSW_MM_SM2_topWidth" value="1821.5" />
+<var name="NSW_MM_SM2_f1" value="35.1375"/>
+<var name="NSW_MM_SM2_f2" value="34.7625"/>
+<var name="NSW_MM_SM2_f3" value="114.4"/>
+<!-- These lines added by Alexandre Laurier to fix MM active Geometry / updated values by Chara Kitsaki -->
+<var name="NSW_MM_SM1_activeBottom" value="284.0"/>
+<var name="NSW_MM_SM1_activeTop" value="1078.4"/>
+<var name="NSW_MM_SM1_activeH" value="2140.725"/>
+<var name="NSW_MM_SM2_activeBottom" value="1103.05"/>
+<var name="NSW_MM_SM2_activeTop" value="1579.6"/>
+<var name="NSW_MM_SM2_activeH" value="1280.1"/>
+<!-- These lines added by Chara Kitsaki to implement all the parameters needed for the strips description -->
+<var name="NSW_MM_SM1_etaMissedTop" value="41"/>
+<var name="NSW_MM_SM1_etaMissedBottom" value="42"/>
+<var name="NSW_MM_SM1_stereoMissedTop" value="11"/>
+<var name="NSW_MM_SM1_stereoMissedBottom" value="35"/>
+<var name="NSW_MM_SM1_stereoRoutedTop" value="66"/>
+<var name="NSW_MM_SM1_stereoRoutedBottom" value="18"/>
+<var name="NSW_MM_SM2_etaMissedTop" value="31"/>
+<var name="NSW_MM_SM2_etaMissedBottom" value="29"/>
+<var name="NSW_MM_SM2_stereoMissedTop" value="1"/>
+<var name="NSW_MM_SM2_stereoMissedBottom" value="1"/>
+<var name="NSW_MM_SM2_stereoRoutedTop" value="79"/>
+<var name="NSW_MM_SM2_stereoRoutedBottom" value="64"/>
+
+<var name="NSW_MM_LargeSector_ZCENTER" value="ZCenter_Global+232."/>
+<var name="NSW_MM_SmallSector_ZCENTER" value="ZCenter_Global-232."/>
+
+
+<!-- Thickness of inter-multilayer spacers -->
+<var name="NSW_MM_SpacerThickness" value="52" />
+
+<!-- Global z-coordinate for the sector center -->
+<!-- <var name="NSW_MM_LargeSector_ZCENTER" value="NSW_MM_LM_distanceFromIP + 4.*NSW_MM_DriftPcbTck + 4.*NSW_MM_ROPcbTck + 4.*NSW_MM_GasTck + NSW_MM_SpacerThickness/2."/>
+<var name="NSW_MM_SmallSector_ZCENTER" value="NSW_MM_SM_distanceFromIP + 4.*NSW_MM_DriftPcbTck + 4.*NSW_MM_ROPcbTck + 4.*NSW_MM_GasTck + NSW_MM_SpacerThickness/2."/> -->
+
+</section>
+
+<section name="NewSmallWheelsMM" version="1" top_volume="NSW_MM" date="December 16 2014" author="S.Chen" >
+
+<!-- Technologies -->
+<mm_Tech type="MM_1" geometryLevel="1" nLayers="NSW_NbrOfLayers" gasTck="NSW_MM_GasTck" driftPcbTck="NSW_MM_DriftPcbTck" ROPcbTck="NSW_MM_ROPcbTck" Tck="NSW_MM_MultilayerTck" zLayout="Z_POSITIVE"/>
+<!--Chilufya<mmSpacer_Tech type="Spa_1" Tck="NSW_MM_SpacerThickness" />Chilufya-->
+
+<!-- large wheel -->
+<!-- These lines are modified by Chara Kitsaki -->
+<!-- minYPhiL minYPhiR: the (radial)distance kept (left and right part of the module) between the first active stereo and eta strips -->
+<!-- dlStereoTop, dlStereoBottom: the distance between the first stereo and eta strip that is kept starting from the corner-->
+<!-- Some strips are not connected to the FE boards these we call missed strips -->
+<!-- At the corners of the module some strips are shorter in length and they are routed to the FE boards (routed strips). These areas are of low efficiency. LM1 is the special case (there is not much space to route any strips at the module's bottom part) -->
+
+<micromegas type="sMD1-1-1" tech="MM_1" subType="M1L1" sWidth="NSW_MM_LM1_baseWidth" lWidth="NSW_MM_LM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM1_Length" ylFrame="NSW_MM_LM1_f1" ysFrame="NSW_MM_LM1_f2" xFrame="NSW_MM_LM1_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM1_InnerRadius" roLength="NSW_MM_LM1_Length" activeBottomLength="NSW_MM_LM1_activeBottom" activeTopLength="NSW_MM_LM1_activeTop" activeH="NSW_MM_LM1_activeH" minYPhiR="12" minYPhiL="0.69" maxYPhi="6.69" nMissedTopEta="NSW_MM_LM1_etaMissedTop" nMissedBottomEta="NSW_MM_LM1_etaMissedBottom" nMissedTopStereo="NSW_MM_LM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM1_stereoMissedBottom" nRoutedTop="NSW_MM_LM1_stereoRoutedTop" nRoutedBottom="NSW_MM_LM1_stereoRoutedBottom" dlStereoTop="257.61" dlStereoBottom="426.73" totalStrips="5120" zLayout="Z_POSITIVE" />
+</micromegas>
+<micromegas type="sMD1-2-1" tech="MM_1" subType="M2L1" sWidth="NSW_MM_LM2_baseWidth" lWidth="NSW_MM_LM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM2_Length" ylFrame="NSW_MM_LM2_f1" ysFrame="NSW_MM_LM2_f2" xFrame="NSW_MM_LM2_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM2_InnerRadius" roLength="NSW_MM_LM2_Length" activeBottomLength="NSW_MM_LM2_activeBottom" activeTopLength="NSW_MM_LM2_activeTop" activeH="NSW_MM_LM2_activeH" minYPhiR="21.39" minYPhiL="0" maxYPhi="23.77" nMissedTopEta="NSW_MM_LM2_etaMissedTop" nMissedBottomEta="NSW_MM_LM2_etaMissedBottom" nMissedTopStereo="NSW_MM_LM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM2_stereoMissedBottom" nRoutedTop="NSW_MM_LM2_stereoRoutedTop" nRoutedBottom="NSW_MM_LM2_stereoRoutedBottom" dlStereoTop="909.4" dlStereoBottom="815.32" totalStrips="3072" zLayout="Z_POSITIVE" />
+</micromegas>
+<micromegas type="sMD1-1-2" tech="MM_1" subType="M1L2" sWidth="NSW_MM_LM1_baseWidth" lWidth="NSW_MM_LM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM1_Length" ylFrame="NSW_MM_LM1_f1" ysFrame="NSW_MM_LM1_f2" xFrame="NSW_MM_LM1_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM1_InnerRadius" roLength="NSW_MM_LM1_Length" activeBottomLength="NSW_MM_LM1_activeBottom" activeTopLength="NSW_MM_LM1_activeTop" activeH="NSW_MM_LM1_activeH" minYPhiR="12" minYPhiL="0.69" maxYPhi="6.69" nMissedTopEta="NSW_MM_LM1_etaMissedTop" nMissedBottomEta="NSW_MM_LM1_etaMissedBottom" nMissedTopStereo="NSW_MM_LM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM1_stereoMissedBottom" nRoutedTop="NSW_MM_LM1_stereoRoutedTop" nRoutedBottom="NSW_MM_LM1_stereoRoutedBottom" dlStereoTop="257.61" dlStereoBottom="426.73" totalStrips="5120" zLayout="Z_POSITIVE" />
+</micromegas>
+<micromegas type="sMD1-2-2" tech="MM_1" subType="M2L2" sWidth="NSW_MM_LM2_baseWidth" lWidth="NSW_MM_LM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_LM2_Length" ylFrame="NSW_MM_LM2_f1" ysFrame="NSW_MM_LM2_f2" xFrame="NSW_MM_LM2_f3" >
+<mm_readout stripPitch="0.45" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_LM2_InnerRadius" roLength="NSW_MM_LM2_Length" activeBottomLength="NSW_MM_LM2_activeBottom" activeTopLength="NSW_MM_LM2_activeTop" activeH="NSW_MM_LM2_activeH" minYPhiR="21.39" minYPhiL="0" maxYPhi="23.77" nMissedTopEta="NSW_MM_LM2_etaMissedTop" nMissedBottomEta="NSW_MM_LM2_etaMissedBottom" nMissedTopStereo="NSW_MM_LM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_LM2_stereoMissedBottom" nRoutedTop="NSW_MM_LM2_stereoRoutedTop" nRoutedBottom="NSW_MM_LM2_stereoRoutedBottom" dlStereoTop="909.4" dlStereoBottom="815.32" totalStrips="3072" zLayout="Z_POSITIVE" />
+</micromegas>
+
+<!--Chilufya<mmSpacer type="spa1-1" tech="Spa_1" sWidth="NSW_MM_LM1_baseWidth" lWidth="NSW_MM_LM1_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_LM1_Length" />
+<mmSpacer type="spa1-2" tech="Spa_1" sWidth="NSW_MM_LM2_baseWidth" lWidth="NSW_MM_LM2_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_LM2_Length" />Chilufya-->
+
+
+<!-- small wheel -->
+<micromegas type="sMD3-1-1" tech="MM_1" subType="M1S1" sWidth="NSW_MM_SM1_baseWidth" lWidth="NSW_MM_SM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM1_Length" ylFrame="NSW_MM_SM1_f1" ysFrame="NSW_MM_SM1_f2" xFrame="NSW_MM_SM1_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM1_InnerRadius" roLength="NSW_MM_SM1_Length" activeBottomLength="NSW_MM_SM1_activeBottom" activeTopLength="NSW_MM_SM1_activeTop" activeH="NSW_MM_SM1_activeH" minYPhiR="0.75" minYPhiL="0" maxYPhi="1.36" nMissedTopEta="NSW_MM_SM1_etaMissedTop" nMissedBottomEta="NSW_MM_SM1_etaMissedBottom" nMissedTopStereo="NSW_MM_SM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM1_stereoMissedBottom" nRoutedTop="NSW_MM_SM1_stereoRoutedTop" nRoutedBottom="NSW_MM_SM1_stereoRoutedBottom" dlStereoTop="52.15" dlStereoBottom="28.41" totalStrips="5120" zLayout="Z_POSITIVE" />
+</micromegas>
+<micromegas type="sMD3-2-1" tech="MM_1" subType="M2S1" sWidth="NSW_MM_SM2_baseWidth" lWidth="NSW_MM_SM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM2_Length" ylFrame="NSW_MM_SM2_f1" ysFrame="NSW_MM_SM2_f2" xFrame="NSW_MM_SM2_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.; 0.; 0.02618; -0.02618" readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM2_InnerRadius" roLength="NSW_MM_SM2_Length" activeBottomLength="NSW_MM_SM2_activeBottom" activeTopLength="NSW_MM_SM2_activeTop" activeH="NSW_MM_SM2_activeH" minYPhiR="2.53" minYPhiL="0" maxYPhi="7.92" nMissedTopEta="NSW_MM_SM2_etaMissedTop" nMissedBottomEta="NSW_MM_SM2_etaMissedBottom" nMissedTopStereo="NSW_MM_SM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM2_stereoMissedBottom" nRoutedTop="NSW_MM_SM2_stereoRoutedTop" nRoutedBottom="NSW_MM_SM2_stereoRoutedBottom" dlStereoTop="303.86" dlStereoBottom="96.14" totalStrips="3072" zLayout="Z_POSITIVE" />
+</micromegas>
+<micromegas type="sMD3-1-2" tech="MM_1" subType="M1S2" sWidth="NSW_MM_SM1_baseWidth" lWidth="NSW_MM_SM1_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM1_Length" ylFrame="NSW_MM_SM1_f1" ysFrame="NSW_MM_SM1_f2" xFrame="NSW_MM_SM1_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM1_InnerRadius" roLength="NSW_MM_SM1_Length" activeBottomLength="NSW_MM_SM1_activeBottom" activeTopLength="NSW_MM_SM1_activeTop" activeH="NSW_MM_SM1_activeH" minYPhiR="0.75" minYPhiL="0" maxYPhi="1.36" nMissedTopEta="NSW_MM_SM1_etaMissedTop" nMissedBottomEta="NSW_MM_SM1_etaMissedBottom" nMissedTopStereo="NSW_MM_SM1_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM1_stereoMissedBottom" nRoutedTop="NSW_MM_SM1_stereoRoutedTop" nRoutedBottom="NSW_MM_SM1_stereoRoutedBottom" dlStereoTop="52.15" dlStereoBottom="28.41" totalStrips="5120" zLayout="Z_POSITIVE" />
+</micromegas>
+<micromegas type="sMD3-2-2" tech="MM_1" subType="M2S2" sWidth="NSW_MM_SM2_baseWidth" lWidth="NSW_MM_SM2_topWidth" Tck="NSW_MM_MultilayerTck" Length="NSW_MM_SM2_Length" ylFrame="NSW_MM_SM2_f1" ysFrame="NSW_MM_SM2_f2" xFrame="NSW_MM_SM2_f3" >
+<mm_readout stripPitch="0.425" gasThickness="NSW_MM_GasTck" pcbThickness="NSW_MM_ROPcbTck" driftThickness="NSW_MM_DriftPcbTck" stereoAngle="0.02618; -0.02618; 0.; 0." readoutSide="-1; 1; -1; 1" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." distanceFromZAxis="NSW_MM_SM2_InnerRadius" roLength="NSW_MM_SM2_Length" activeBottomLength="NSW_MM_SM2_activeBottom" activeTopLength="NSW_MM_SM2_activeTop" activeH="NSW_MM_SM2_activeH" minYPhiR="2.53" minYPhiL="0" maxYPhi="7.92" nMissedTopEta="NSW_MM_SM2_etaMissedTop" nMissedBottomEta="NSW_MM_SM2_etaMissedBottom" nMissedTopStereo="NSW_MM_SM2_stereoMissedTop" nMissedBottomStereo="NSW_MM_SM2_stereoMissedBottom" nRoutedTop="NSW_MM_SM2_stereoRoutedTop" nRoutedBottom="NSW_MM_SM2_stereoRoutedBottom" dlStereoTop="303.86" dlStereoBottom="96.14" totalStrips="3072" zLayout="Z_POSITIVE" />
+</micromegas>
+<!--Chilufya<mmSpacer type="spa3-1" tech="Spa_1" sWidth="NSW_MM_SM1_baseWidth" lWidth="NSW_MM_SM1_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_SM1_Length" />
+<mmSpacer type="spa3-2" tech="Spa_1" sWidth="NSW_MM_SM2_baseWidth" lWidth="NSW_MM_SM2_topWidth" Tck="NSW_MM_SpacerThickness" Length="NSW_MM_SM2_Length" />Chilufya-->
+
+<composition name="NSW_MM" >
+<!-- A-SIDE -->
+
+<!-- LARGE SECTOR -->
+
+<!-- MM multilayer 1 -->
+<chamberPosition volume="sMD1-1-1" radius="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" zLayout="Z_POSITIVE"/>
+<chamberPosition volume="sMD1-2-1" radius="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" zLayout="Z_POSITIVE"/>
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa1-1" ncopy="8" R_Z="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2;NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 270.; 90." />
+<mposPhi volume="spa1-2" ncopy="8" R_Z="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2;NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 270.; 90." />Chilufya-->
+
+<!-- MM multilayer 2 -->
+<chamberPosition volume="sMD1-1-2" radius="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" zLayout="Z_POSITIVE"/>
+<chamberPosition volume="sMD1-2-2" radius="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2" zPos="NSW_MM_LargeSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="0" zLayout="Z_POSITIVE"/>
+
+<!-- SMALL SECTOR -->
+
+<!-- MM multilayer 1 -->
+<chamberPosition volume="sMD3-1-1" radius="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" zLayout="Z_POSITIVE"/>
+<chamberPosition volume="sMD3-2-1" radius="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER-NSW_MM_MultilayerTck/2.-NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa3-1" ncopy="8" R_Z="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2;NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 270.; 90." />
+<mposPhi volume="spa3-2" ncopy="8" R_Z="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2;NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 270.; 90." />Chilufya-->
+
+<!-- MM multilayer 2 -->
+<chamberPosition volume="sMD3-1-2" radius="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" zLayout="Z_POSITIVE"/>
+<chamberPosition volume="sMD3-2-2" radius="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2" zPos="NSW_MM_SmallSector_ZCENTER+NSW_MM_MultilayerTck/2.+NSW_MM_SpacerThickness/2." type="ENDCAP" chamberType="Micromegas" phi0="22.5" zLayout="Z_POSITIVE"/>
+
+<!-- C-SIDE -->
+<!-- LARGE SECTOR -->
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa1-1" ncopy="8" R_Z="(NSW_MM_LM1_InnerRadius+NSW_MM_LM1_outerRadius)/2;-NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 90.; 90." />
+<mposPhi volume="spa1-2" ncopy="8" R_Z="(NSW_MM_LM2_InnerRadius+NSW_MM_LM2_outerRadius)/2;-NSW_MM_LargeSector_ZCENTER" Phi0="0" rot=" 90.; 90.; 90." />Chilufya-->
+
+<!-- SMALL SECTOR -->
+<!-- spacer -->
+<!--Chilufya<mposPhi volume="spa3-1" ncopy="8" R_Z="(NSW_MM_SM1_InnerRadius+NSW_MM_SM1_outerRadius)/2;-NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 90.; 90." />
+<mposPhi volume="spa3-2" ncopy="8" R_Z="(NSW_MM_SM2_InnerRadius+NSW_MM_SM2_outerRadius)/2;-NSW_MM_SmallSector_ZCENTER" Phi0="22.5" rot=" 90.; 90.; 90." />Chilufya-->
+
+</composition>
+
+</section>
+
+
+
+
+
+
+
+<!--====================================SPACER FRAME===============================================-->
+
+<section name = "LS and SS Spacer Frames"
+ version = "0.0"
+ date = "25-07-2017"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "NSW_Spacer">
+
+<!-- LS Spacer Ftame -->
+<gvxy name="LS_StructuralPlate_Main" material="Aluminium" dZ="5.9">
+ <gvxy_point X_Y="226.; 958."/>
+ <gvxy_point X_Y="914.15; 3281."/>
+ <gvxy_point X_Y="1007.3; 4613."/>
+ <gvxy_point X_Y="0.01; 4613."/>
+ <gvxy_point X_Y="0.01; 958."/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut1" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="902.87; 4123."/>
+ <gvxy_point X_Y="932.24; 4543."/>
+ <gvxy_point X_Y="40.; 4543."/>
+ <gvxy_point X_Y="40.; 4123."/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut2" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="774.41; 3913.25"/>
+ <gvxy_point X_Y="770.86; 3963."/>
+ <gvxy_point X_Y="135.; 3963."/>
+ <gvxy_point X_Y="135.; 3821.33"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut3" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="778.83; 3639.29"/>
+ <gvxy_point X_Y="792.52; 3835.04"/>
+ <gvxy_point X_Y="203.42; 3750.35"/>
+ <gvxy_point X_Y="203.46; 3720.65"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut4" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="477.15; 3586.36"/>
+ <gvxy_point X_Y="477.24; 3606.18"/>
+ <gvxy_point X_Y="135.; 3654.58"/>
+ <gvxy_point X_Y="135.; 3541.07"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut5" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="762.41; 3404.48"/>
+ <gvxy_point X_Y="772.57; 3549.82"/>
+ <gvxy_point X_Y="286.06; 3485.41"/>
+ <gvxy_point X_Y="286.1; 3465.58"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut6" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="600.; 3314.58"/>
+ <gvxy_point X_Y="602.55; 3354.42"/>
+ <gvxy_point X_Y="60.; 3424.01"/>
+ <gvxy_point X_Y="60.; 3314.58"/>
+</gvxy>
+
+<box name="LS_StructuralPlate_Cut7" material="Aluminium" X_Y_Z="138.; 70.; 7. " />
+
+<gvxy name="LS_StructuralPlate_Cut8" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="678.71; 2838.18"/>
+ <gvxy_point X_Y="772.71; 3155.5"/>
+ <gvxy_point X_Y="63.52; 3155.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut9" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="533.6; 2715.5"/>
+ <gvxy_point X_Y="551.94; 2791.05"/>
+ <gvxy_point X_Y="40.; 3055.11"/>
+ <gvxy_point X_Y="40.; 2715.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut10" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="459.9; 2169.9"/>
+ <gvxy_point X_Y="585.97; 2595.5"/>
+ <gvxy_point X_Y="117.42; 2595.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut11" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="391.41; 2095.5"/>
+ <gvxy_point X_Y="135.; 2414.15"/>
+ <gvxy_point X_Y="135.; 2095.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut12" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="344.91; 1865.18"/>
+ <gvxy_point X_Y="389.44; 2015.5"/>
+ <gvxy_point X_Y="258.79; 2015.5"/>
+</gvxy>
+<gvxy name="LS_StructuralPlate_Cut13" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="275.45; 1825.5"/>
+ <gvxy_point X_Y="172.35; 2005.44"/>
+ <gvxy_point X_Y="135.; 1995.5"/>
+ <gvxy_point X_Y="135.; 1825.5"/>
+</gvxy>
+
+<gvxy name="LS_StructuralPlate_Cut14" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="173.8; 1028."/>
+ <gvxy_point X_Y="380.41; 1725.5"/>
+ <gvxy_point X_Y="40.; 1725.5"/>
+ <gvxy_point X_Y="40.; 1028."/>
+</gvxy>
+
+<subtraction name="LS_StructuralPlateSub" >
+ <posXYZ volume="LS_StructuralPlate_Main" />
+ <posXYZ volume="LS_StructuralPlate_Cut1" />
+ <posXYZ volume="LS_StructuralPlate_Cut2" />
+ <posXYZ volume="LS_StructuralPlate_Cut3" />
+ <posXYZ volume="LS_StructuralPlate_Cut4" />
+ <posXYZ volume="LS_StructuralPlate_Cut5" />
+ <posXYZ volume="LS_StructuralPlate_Cut6" />
+ <posXYZ volume="LS_StructuralPlate_Cut7" X_Y_Z="589.; 3235.5; 0." />
+ <posXYZ volume="LS_StructuralPlate_Cut8" />
+ <posXYZ volume="LS_StructuralPlate_Cut9" />
+ <posXYZ volume="LS_StructuralPlate_Cut10" />
+ <posXYZ volume="LS_StructuralPlate_Cut11" />
+ <posXYZ volume="LS_StructuralPlate_Cut12" />
+ <posXYZ volume="LS_StructuralPlate_Cut13" />
+ <posXYZ volume="LS_StructuralPlate_Cut14" />
+</subtraction>
+
+<composition name="LS_StructuralPlate" >
+ <posXYZ volume="LS_StructuralPlateSub" />
+ <posXYZ volume="LS_StructuralPlateSub" rot="0. ; 180. ; 0." />
+</composition>
+
+<box name="LS_Central_reference_bar" material="Aluminium" X_Y_Z="1704.; 100.; 27.8 " />
+
+<box name="LS_Channel_section_L2000_Main" material="Aluminium" X_Y_Z="50.; 2000.; 30. " />
+<box name="LS_Channel_section_L2000_Cut" material="Aluminium" X_Y_Z="40.; 2050.; 20. " />
+<subtraction name="LS_Channel_section_L2000" >
+ <posXYZ volume="LS_Channel_section_L2000_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_Channel_section_L1200_Main" material="Aluminium" X_Y_Z="50.; 1200.; 30. " />
+<subtraction name="LS_Channel_section_L1200" >
+ <posXYZ volume="LS_Channel_section_L1200_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_Channel_section_L850_Main" material="Aluminium" X_Y_Z="50.; 850.; 30. " />
+<subtraction name="LS_Channel_section_L850" >
+ <posXYZ volume="LS_Channel_section_L850_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_Channel_section_L1000_Main" material="Aluminium" X_Y_Z="50.; 1000.; 30. " />
+<subtraction name="LS_Channel_section_L1000" >
+ <posXYZ volume="LS_Channel_section_L1000_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="LS_UProfile_L1460_Main" material="Aluminium" X_Y_Z="20.; 1460.; 30. " />
+<box name="LS_UProfile_L1460_Cut" material="Aluminium" X_Y_Z="20.; 1500.; 24. " />
+<subtraction name="LS_UProfile_L1460" >
+ <posXYZ volume="LS_UProfile_L1460_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="LS_UProfile_L750_Main" material="Aluminium" X_Y_Z="20.; 750.; 30. " />
+<subtraction name="LS_UProfile_L750" >
+ <posXYZ volume="LS_UProfile_L750_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="3.; 0.; 0." />
+</subtraction>
+
+<gvxy name="LS_Top_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="914.3; 3484.44"/>
+ <gvxy_point X_Y="1146.47; 3571.68"/>
+ <gvxy_point X_Y="1141.27; 3656.86"/>
+ <gvxy_point X_Y="1054.98; 3656.86"/>
+ <gvxy_point X_Y="1054.98; 4070."/>
+ <gvxy_point X_Y="813.64; 4070."/>
+ <gvxy_point X_Y="774.65; 3494.2"/>
+</gvxy>
+
+<gvxy name="LS_Bottom_Grabber_interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="-801.54; 2552.21"/>
+ <gvxy_point X_Y="-858.34; 2743.97"/>
+ <gvxy_point X_Y="-591.97; 2822.88"/>
+ <gvxy_point X_Y="-535.17; 2631.11"/>
+</gvxy>
+
+<gvxy name="LS_Bottom_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="-558.42; 1731.46"/>
+ <gvxy_point X_Y="-616.93; 1928.98"/>
+ <gvxy_point X_Y="-678.34; 1910.78"/>
+ <gvxy_point X_Y="-727.9; 1985.99"/>
+ <gvxy_point X_Y="-570.48; 2124.21"/>
+ <gvxy_point X_Y="-437.49; 2163.6"/>
+ <gvxy_point X_Y="-329.56; 1799.25"/>
+</gvxy>
+
+<box name="LS_MM_Connectors" material="Aluminium" X_Y_Z="76.; 40.; 30. " />
+<composition name="LS_MM_Connectors_Assembly" >
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="323.24; 1278.98; 0." rot="0. ; 0. ; -16.5" />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="596.23; 2200.58; 0." rot="0. ; 0. ; -16.5" />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="800.97; 2891.78; 0." rot="0. ; 0. ; -16.5" />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="922.31; 3368.81; 0." rot="0. ; 0. ; -4." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="986.76; 4290.41; 0." rot="0. ; 0. ; -4." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="824.; 4615.; 0." rot="0. ; 0. ; 90." />
+</composition>
+
+<box name="LS_KM_Joint" material="ShieldSteel" X_Y_Z="150.; 118.; 48. " />
+
+<composition name="LS_Spacer_Frame_Assembly" >
+ <posXYZ volume="LS_StructuralPlate" X_Y_Z="0.; 0.; 18." />
+ <posXYZ volume="LS_StructuralPlate" X_Y_Z="0.; 0.; -18." />
+ <posXYZ volume="LS_Central_reference_bar" X_Y_Z="0.; 3235.5; 0." />
+ <posXYZ volume="LS_Channel_section_L2000" X_Y_Z="0.; 2185.49; 0." />
+ <posXYZ volume="LS_Channel_section_L1200" X_Y_Z="0.; 3885.51; 0." />
+ <posXYZ volume="LS_Channel_section_L850" X_Y_Z="130.5; 3710.51; 0." />
+ <posXYZ volume="LS_Channel_section_L850" X_Y_Z="-130.5; 3710.51; 0." />
+ <posXYZ volume="LS_Channel_section_L1000" X_Y_Z="130.5; 2223.; 0." />
+ <posXYZ volume="LS_Channel_section_L1000" X_Y_Z="-130.5; 2223.; 0." />
+ <posXYZ volume="LS_UProfile_L1460" X_Y_Z="252.; 2455.49; 0." />
+ <posXYZ volume="LS_UProfile_L1460" X_Y_Z="-252.; 2455.49; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="252.; 3760.5; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-252.; 3760.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="465.; 3760.5; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-465.; 3760.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="678.; 3760.5; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-678.; 3760.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="465.; 2551.; 0." />
+ <posXYZ volume="LS_UProfile_L750" X_Y_Z="-465.; 2551.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_Top_Interface" X_Y_Z="0.; 0.; 0." />
+ <posXYZ volume="LS_Top_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="0.; 956.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="LS_MM_Connectors" X_Y_Z="0.; 4615.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="LS_KM_Joint" X_Y_Z="-1130.01; 3970.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_KM_Joint" X_Y_Z="1130.01; 3970.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="LS_KM_Joint" X_Y_Z="656.6; 1798.8; 0." rot="0. ; 0. ; -16.5" />
+</composition>
+
+<composition name="LS" >
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="LS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- LS Spacer Ftame -->
+
+<!-- SS Spacer Ftame -->
+<gvxy name="SS_StructuralPlate_Main" material="Aluminium" dZ="5.9">
+ <gvxy_point X_Y="154.8; 930."/>
+ <gvxy_point X_Y="745.; 4114.46"/>
+ <gvxy_point X_Y="745.; 4425."/>
+ <gvxy_point X_Y="0.01; 4425."/>
+ <gvxy_point X_Y="0.01; 930."/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut1" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="685.; 4242.5"/>
+ <gvxy_point X_Y="685.; 4375."/>
+ <gvxy_point X_Y="25.; 4375."/>
+ <gvxy_point X_Y="25.; 4242.5"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut2" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="449.11; 4102.75"/>
+ <gvxy_point X_Y="446.87; 4122.5"/>
+ <gvxy_point X_Y="125.; 4122.5"/>
+ <gvxy_point X_Y="125.; 4028.36"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut3" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="577.21; 3867.18"/>
+ <gvxy_point X_Y="620.57; 4101.07"/>
+ <gvxy_point X_Y="131.86; 3988.9"/>
+ <gvxy_point X_Y="131.86; 3969.4"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut4" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="395.9; 3847.5"/>
+ <gvxy_point X_Y="398.14; 3867.25"/>
+ <gvxy_point X_Y="125.; 3929.94"/>
+ <gvxy_point X_Y="125.; 3847.5"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut5" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="495.98; 3705.39"/>
+ <gvxy_point X_Y="495.98; 3747.5"/>
+ <gvxy_point X_Y="25.; 3747.5"/>
+ <gvxy_point X_Y="25.; 3475.7"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut6" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="488.74; 3225.16"/>
+ <gvxy_point X_Y="576.8; 3700.3"/>
+ <gvxy_point X_Y="45.63; 3441.26"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut7" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="408.58; 3177.5"/>
+ <gvxy_point X_Y="417.35; 3215.48"/>
+ <gvxy_point X_Y="25.; 3406.82"/>
+ <gvxy_point X_Y="25.; 3177.5"/>
+</gvxy>
+
+<box name="SS_StructuralPlate_Cut8" material="Aluminium" X_Y_Z="92.; 70.; 7. " />
+
+<gvxy name="SS_StructuralPlate_Cut9" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="429.19; 3037.5"/>
+ <gvxy_point X_Y="25.; 3037.5"/>
+ <gvxy_point X_Y="25.; 2483.96"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut10" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="342.44; 2435.8"/>
+ <gvxy_point X_Y="445.53; 2992.05"/>
+ <gvxy_point X_Y="50.98; 2451.7"/>
+ <gvxy_point X_Y="59.05; 2435.8"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut11" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="275.17; 2072.87"/>
+ <gvxy_point X_Y="330.64; 2372.16"/>
+ <gvxy_point X_Y="310.98; 2395.8"/>
+ <gvxy_point X_Y="39.37; 2395.8"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut12" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="245.39; 2045.82"/>
+ <gvxy_point X_Y="25.; 2347.65"/>
+ <gvxy_point X_Y="25.; 2045.82"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut13" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="144.83; 1534.74"/>
+ <gvxy_point X_Y="203.73; 1852.5"/>
+ <gvxy_point X_Y="125.; 1852.5"/>
+ <gvxy_point X_Y="125.; 1536.56"/>
+</gvxy>
+
+<gvxy name="SS_StructuralPlate_Cut14" material="Aluminium" dZ="7.">
+ <gvxy_point X_Y="123.38; 980."/>
+ <gvxy_point X_Y="201.04; 1399."/>
+ <gvxy_point X_Y="25.; 1399."/>
+ <gvxy_point X_Y="25.; 980."/>
+</gvxy>
+
+<subtraction name="SS_StructuralPlateSub" >
+ <posXYZ volume="SS_StructuralPlate_Main" />
+ <posXYZ volume="SS_StructuralPlate_Cut1" />
+ <posXYZ volume="SS_StructuralPlate_Cut2" />
+ <posXYZ volume="SS_StructuralPlate_Cut3" />
+ <posXYZ volume="SS_StructuralPlate_Cut4" />
+ <posXYZ volume="SS_StructuralPlate_Cut5" />
+ <posXYZ volume="SS_StructuralPlate_Cut6" />
+ <posXYZ volume="SS_StructuralPlate_Cut7" />
+ <posXYZ volume="SS_StructuralPlate_Cut8" X_Y_Z="-340.5; 3107.5; 0." />
+ <posXYZ volume="SS_StructuralPlate_Cut9" />
+ <posXYZ volume="SS_StructuralPlate_Cut10" />
+ <posXYZ volume="SS_StructuralPlate_Cut11" />
+ <posXYZ volume="SS_StructuralPlate_Cut12" />
+ <posXYZ volume="SS_StructuralPlate_Cut13" />
+ <posXYZ volume="SS_StructuralPlate_Cut14" />
+</subtraction>
+
+<composition name="SS_StructuralPlate" >
+ <posXYZ volume="SS_StructuralPlateSub" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_StructuralPlateSub" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+</composition>
+
+<box name="SS_Central_reference_bar" material="Aluminium" X_Y_Z="1012.; 100.; 28. " />
+
+<box name="SS_Channel_section_L1100_Main" material="Aluminium" X_Y_Z="50.; 1100.; 30. " />
+<subtraction name="SS_Channel_section_L1100" >
+ <posXYZ volume="SS_Channel_section_L1100_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+
+<box name="SS_Channel_section_L650_Main" material="Aluminium" X_Y_Z="50.; 650.; 30. " />
+<subtraction name="SS_Channel_section_L650" >
+ <posXYZ volume="SS_Channel_section_L650_Main" />
+ <posXYZ volume="LS_Channel_section_L2000_Cut" />
+</subtraction>
+
+<box name="SS_UProfile_L1000_Main" material="Aluminium" X_Y_Z="20.; 1000.; 30. " />
+<subtraction name="SS_UProfile_L1000" >
+ <posXYZ volume="SS_UProfile_L1000_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="SS_UProfile_L920_Main" material="Aluminium" X_Y_Z="20.; 920.; 30. " />
+<subtraction name="SS_UProfile_L920" >
+ <posXYZ volume="SS_UProfile_L920_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="SS_UProfile_L1200_Main" material="Aluminium" X_Y_Z="20.; 1200.; 30. " />
+<subtraction name="SS_UProfile_L1200" >
+ <posXYZ volume="SS_UProfile_L1200_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<box name="SS_UProfile_L700_Main" material="Aluminium" X_Y_Z="20.; 700.; 30. " />
+<subtraction name="SS_UProfile_L700" >
+ <posXYZ volume="SS_UProfile_L700_Main" />
+ <posXYZ volume="LS_UProfile_L1460_Cut" X_Y_Z="-3.; 0.; 0." />
+</subtraction>
+
+<gvxy name="SS_Top_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="849.99; 3705.17"/>
+ <gvxy_point X_Y="849.99; 4260."/>
+ <gvxy_point X_Y="627.69; 4260."/>
+ <gvxy_point X_Y="627.69; 4106.34"/>
+ <gvxy_point X_Y="564.77; 3758.03"/>
+</gvxy>
+
+<gvxy name="SS_Bottom_Grabber_interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="454.99; 1875."/>
+ <gvxy_point X_Y="454.99; 2075."/>
+ <gvxy_point X_Y="255.; 2075."/>
+ <gvxy_point X_Y="255.; 1875."/>
+</gvxy>
+
+<gvxy name="SS_Bottom_Interface" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="442.2; 1397.5"/>
+ <gvxy_point X_Y="442.2; 1560.65"/>
+ <gvxy_point X_Y="397.; 1560.65"/>
+ <gvxy_point X_Y="397.; 1792.5"/>
+ <gvxy_point X_Y="194.29; 1792.5"/>
+ <gvxy_point X_Y="149.53; 1434.71"/>
+ <gvxy_point X_Y="204.54; 1397.5"/>
+</gvxy>
+
+<box name="SS_MM_Connectors" material="Aluminium" X_Y_Z="76.; 40.; 30. " />
+<box name="SS_MM_Connectors_Lar" material="Aluminium" X_Y_Z="120.; 40.; 30. " />
+<composition name="SS_MM_Connectors_Assembly" >
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="214.86; 1243.14; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="376.17; 2113.54; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="497.16; 2766.34; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="626.36; 3463.34; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors_Lar" X_Y_Z="766.02; 4337.75; 0." rot="0. ; 0. ; -10.5" />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="624.; 4427.; 0." rot="0. ; 0. ; 90." />
+</composition>
+
+<box name="SS_KM_Joint" material="ShieldSteel" X_Y_Z="154.; 101.; 48. " />
+
+<composition name="SS_Spacer_Frame_Assembly" >
+ <posXYZ volume="SS_StructuralPlate" X_Y_Z="0.; 0.; 18." />
+ <posXYZ volume="SS_StructuralPlate" X_Y_Z="0.; 0.; -18." />
+ <posXYZ volume="SS_Central_reference_bar" X_Y_Z="0.; 3107.5; 0." />
+ <posXYZ volume="LS_Channel_section_L2000" X_Y_Z="0.; 2057.49; 0." />
+ <posXYZ volume="SS_Channel_section_L1100" X_Y_Z="0.; 3707.51; 0." />
+ <posXYZ volume="SS_Channel_section_L1100" X_Y_Z="-110.5; 3707.51; 0." />
+ <posXYZ volume="SS_Channel_section_L1100" X_Y_Z="110.5; 3707.51; 0." />
+ <posXYZ volume="SS_Channel_section_L650" X_Y_Z="-110.5; 1722.; 0." />
+ <posXYZ volume="SS_Channel_section_L650" X_Y_Z="110.5; 1722.; 0." />
+ <posXYZ volume="SS_UProfile_L1000" X_Y_Z="-345.; 3742.5; 0." />
+ <posXYZ volume="SS_UProfile_L1000" X_Y_Z="345.; 3742.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_UProfile_L920" X_Y_Z="-195.; 3782.5; 0." />
+ <posXYZ volume="SS_UProfile_L920" X_Y_Z="195.; 3782.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_UProfile_L1200" X_Y_Z="-195.; 2457.49; 0." />
+ <posXYZ volume="SS_UProfile_L1200" X_Y_Z="195.; 2457.49; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_UProfile_L700" X_Y_Z="-360.; 2587.5; 0." />
+ <posXYZ volume="SS_UProfile_L700" X_Y_Z="360.; 2587.5; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_Top_Interface" X_Y_Z="0.; 0.; 0." />
+ <posXYZ volume="SS_Top_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_Bottom_Grabber_interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_Bottom_Interface" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_MM_Connectors_Assembly" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="0.; 928.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="SS_MM_Connectors" X_Y_Z="0.; 4427.; 0." rot="0. ; 0. ; 90." />
+ <posXYZ volume="SS_KM_Joint" X_Y_Z="-927.01; 4160.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_KM_Joint" X_Y_Z="927.01; 4160.; 0." rot="0. ; 0. ; 0." />
+ <posXYZ volume="SS_KM_Joint" X_Y_Z="-532.01; 1975.; 0." rot="0. ; 0. ; 0." />
+</composition>
+
+<composition name="SS_AssemblyRot" >
+ <posXYZ volume="SS_Spacer_Frame_Assembly" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 22.5" />
+</composition>
+
+<composition name="SS" >
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="SS_AssemblyRot" X_Y_Z="0.; 0.; 0." rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- End SS Spacer_Frame-->
+
+<composition name="LS_and_SS_SideA" >
+ <posXYZ volume="LS" X_Y_Z="0.; 0.; 7641." rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="SS" X_Y_Z="0.; 0.; 7177." rot=" 0. ; 0. ; 0." />
+</composition>
+
+<!-- ================================================ LS/SS Frames ========================================= -->
+<!-- SS_Frame -->
+<gvxysx name="SS_Frame_Main" material="muo::FR4" dZ="10.4">
+ <gvxy_point X_Y="172.6; 911.2"/>
+ <gvxy_point X_Y="172.6; 986.2"/>
+ <gvxy_point X_Y="235.1; 1403.7"/>
+ <gvxy_point X_Y="348.7; 1386.7"/>
+ <gvxy_point X_Y="366.4; 1505.4"/>
+ <gvxy_point X_Y="252.7; 1522.4"/>
+ <gvxy_point X_Y="582.3; 3727.8"/>
+ <gvxy_point X_Y="795.; 3696.1"/>
+ <gvxy_point X_Y="812.7; 3814.8"/>
+ <gvxy_point X_Y="600.1; 3846.5"/>
+ <gvxy_point X_Y="688.2; 4436.4"/>
+</gvxysx>
+
+<gvxysx name="SS_Frame_Sub1" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="470.5; 3486.4"/>
+ <gvxy_point X_Y="601.2; 4361.4"/>
+</gvxysx>
+
+<gvxysx name="SS_Frame_Sub2" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="290.5; 2282.6"/>
+ <gvxy_point X_Y="452.5; 3366.4"/>
+</gvxysx>
+
+<gvxysx name="SS_Frame_Sub3" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="96.8; 986.2"/>
+ <gvxy_point X_Y="272.6; 2162.6"/>
+</gvxysx>
+
+<subtraction name="SS_Frame" >
+ <posXYZ volume="SS_Frame_Main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="SS_Frame_Sub1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="SS_Frame_Sub2" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="SS_Frame_Sub3" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<tubs name="LM_SS_Fixed_Interfaces_main" material="ShieldSteel" Rio_Z="0.; 37.5; 410." nbPhi="32"/>
+
+<box name="LM_SS_Fixed_Interfaces_Subtr" material="ShieldSteel" X_Y_Z="80.; 130.; 31."/>
+
+<subtraction name="LM_SS_Fixed_Interfaces" >
+ <posXYZ volume="LM_SS_Fixed_Interfaces_main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LM_SS_Fixed_Interfaces_Subtr" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<composition name="SS_Frame_Assembly" >
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; 136.8" rot=" 0.; 0.; 0." />
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; -136.8" rot=" 0.; 0.; 0." />
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; 197.2" rot=" 0.; 0.; 0." />
+ <posXYZ volume="SS_Frame" X_Y_Z=" 0.; 0.; -197.2" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_SS_Fixed_Interfaces" X_Y_Z=" 846.; 3749.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_SS_Fixed_Interfaces" X_Y_Z=" -846.; 3749.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_SS_Fixed_Interfaces" X_Y_Z=" -399.7; 1439.7; 0." rot=" 0.; 0.; 0." />
+</composition>
+
+<composition name="SS_Frame_Assembly_Pos" >
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 22.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 67.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 112.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 157.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 202.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 247.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 292.5" />
+ <posXYZ volume="SS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 337.5" />
+</composition>
+<!-- End SS_Frame -->
+
+<!-- LS_Frame -->
+<gvxysx name="LS_Frame_Main" material="muo::FR4" dZ="10.6">
+ <gvxy_point X_Y="277.29; 940."/>
+ <gvxy_point X_Y="277.29; 1015."/>
+ <gvxy_point X_Y="495.6; 1890.3"/>
+ <gvxy_point X_Y="665.5; 1890.3"/>
+ <gvxy_point X_Y="695.4; 2010.2"/>
+ <gvxy_point X_Y="525.5; 2010.2"/>
+ <gvxy_point X_Y="923.57; 3606.2"/>
+ <gvxy_point X_Y="1083.2; 3566.4"/>
+ <gvxy_point X_Y="1112.2; 3682.8"/>
+ <gvxy_point X_Y="952.6; 3722.6"/>
+ <gvxy_point X_Y="1040.5; 4075."/>
+ <gvxy_point X_Y="1040.5; 4622."/>
+</gvxysx>
+
+<gvxysx name="LS_Frame_Sub1" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="965.5; 4547."/>
+ <gvxy_point X_Y="965.5; 4085."/>
+ <gvxy_point X_Y="825.; 3525."/>
+</gvxysx>
+
+<gvxysx name="LS_Frame_Sub2" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="796.; 3405."/>
+ <gvxy_point X_Y="525.; 2317.8"/>
+</gvxysx>
+
+<gvxysx name="LS_Frame_Sub3" material="muo::FR4" dZ="11.">
+ <gvxy_point X_Y="494.9; 2197.8"/>
+ <gvxy_point X_Y="200.; 1015."/>
+</gvxysx>
+
+<subtraction name="LS_Frame" >
+ <posXYZ volume="LS_Frame_Main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LS_Frame_Sub1" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LS_Frame_Sub2" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LS_Frame_Sub3" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<tubs name="LM_LS_Fixed_Interfaces_main" material="ShieldSteel" Rio_Z="0.; 37.4; 410." nbPhi="32"/>
+
+<subtraction name="LM_LS_Fixed_Interfaces" >
+ <posXYZ volume="LM_LS_Fixed_Interfaces_main" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+ <posXYZ volume="LM_SS_Fixed_Interfaces_Subtr" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.;0."/>
+</subtraction>
+
+<composition name="LS_Frame_Assembly" >
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; 136.7" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; -136.7" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; 197.3" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame" X_Y_Z=" 0.; 0.; -197.3" rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_LS_Fixed_Interfaces" X_Y_Z=" 1139.32; 3615.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_LS_Fixed_Interfaces" X_Y_Z=" -1139.32; 3615.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LM_LS_Fixed_Interfaces" X_Y_Z=" -720.55; 1935.83; 0." rot=" 0.; 0.; 0." />
+</composition>
+
+<composition name="LS_Frame_Assembly_Pos" >
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 45." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 90." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 135." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 180." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 225." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 270." />
+ <posXYZ volume="LS_Frame_Assembly" X_Y_Z=" 0.; 0.; 0." rot=" 0.; 0.; 315." />
+</composition>
+<!-- End LS_Frame -->
+
+<composition name="NSW_Spacer" >
+ <!-- Aside -->
+ <posXYZ volume="LS_and_SS_SideA" />
+ <posXYZ volume="SS_Frame_Assembly_Pos" X_Y_Z=" 0.; 0.; 7177." rot=" 0.; 0.; 0." />
+ <posXYZ volume="LS_Frame_Assembly_Pos" X_Y_Z=" 0.; 0.; 7641." rot=" 0.; 0.; 0." />
+</composition>
+
+</section>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!--====================================Support Structures and Hub===============================================-->
+
+<section name = "NSW Aluminum Structure and HUB"
+ version = "0.0"
+ date = "25-04-2017"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "NSW_Aluminum_Structure_and_HUB">
+
+<!-- ********************************************** New Hub ************************************************** -->
+
+<!-- Horizontal Shielding -->
+<gvxysx name="Hub_Outer_Plate1" material="Lead" dZ="517.5">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+ <gvxysx name="Hub_Outer_Plate2" material="PolyBoron207HD5" dZ="517.5">
+ <gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate3" material="Lead" dZ="504.">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate4" material="PolyBoron207HD5" dZ="545.">
+ <gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate5" material="Lead" dZ="30.">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate6" material="PolyBoron207HD5" dZ="30.">
+ <gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate7" material="Lead" dZ="85.">
+ <gvxy_point X_Y="-163.1; 820.05"/>
+ <gvxy_point X_Y=" -169.25; 850.95"/>
+</gvxysx>
+
+<gvxysx name="Hub_Outer_Plate8" material="PolyBoron207HD5" dZ="126.">
+<gvxy_point X_Y="-163.1; 820."/>
+ <gvxy_point X_Y=" -153.15; 770."/>
+</gvxysx>
+
+<composition name="Horizontal_Shielding_ForRot_Spec" >
+ <posXYZ volume="Hub_Outer_Plate5" X_Y_Z="0.; 0.; 908.2" />
+ <posXYZ volume="Hub_Outer_Plate6" X_Y_Z="0.; 0.; 908.2" />
+</composition>
+
+<composition name="Horizontal_Shielding_ForRot_Spec2" >
+ <posXYZ volume="Hub_Outer_Plate3" X_Y_Z="0.; 0.; 248.7" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="Hub_Outer_Plate4" X_Y_Z="0.; 0.; 228.2" rot=" 0. ; 0. ; 22.5" />
+</composition>
+
+<composition name="Horizontal_Shielding_ForRot" >
+ <posXYZ volume="Hub_Outer_Plate1" X_Y_Z="0.; 0.; 643.45" />
+ <posXYZ volume="Hub_Outer_Plate2" X_Y_Z="0.; 0.; 643.45" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec2" />
+ <posXYZ volume="Hub_Outer_Plate7" X_Y_Z="0.; 0.; 39.2" />
+ <posXYZ volume="Hub_Outer_Plate8" X_Y_Z="0.; 0.; 18.7" />
+</composition>
+
+<composition name="Horizontal_Shielding" >
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="Horizontal_Shielding_ForRot" rot=" 0. ; 0. ; 315." />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; 67.5" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; -22.5" />
+ <posXYZ volume="Horizontal_Shielding_ForRot_Spec" rot=" 0. ; 0. ; -67.5" />
+</composition>
+<!-- End Horizontal Shielding (New Hub) -->
+
+<!-- Other Parts of New Hub -->
+<pcon name="HUB_Extension_inner_tube" material="ShieldSteel" nbPhi="20">
+ <polyplane Rio_Z="172.; 225.; 997.75"/>
+ <polyplane Rio_Z=" 152.3; 225.; 0."/>
+</pcon>
+<tubs name="HUB_Extension_plate_HO_side" material="ShieldSteel" Rio_Z="172.5; 530.; 59.2" />
+<tubs name="Copper_disk_Extension" material="Copper" Rio_Z="225.5; 454.5; 998." />
+<tubs name="HUB_Extension_outer_tube" material="ShieldSteel" Rio_Z="455.5; 530.; 998.7" />
+
+<pcon name="HUB_Main_part_inner_tube" material="ShieldSteel" nbPhi="20">
+ <polyplane Rio_Z="148.7; 225.; 858.5"/>
+ <polyplane Rio_Z=" 137.; 225.; 0."/>
+</pcon>
+
+<tubs name="Copper_disk_Main_part" material="Copper" Rio_Z="225.5; 699.5; 760." />
+
+<gvxysxy name="Plate_IP_Main" material="ShieldSteel" dZ="91.6">
+ <gvxy_point X_Y="769.95; 153.16"/>
+ <gvxy_point X_Y="652.77; 436.16"/>
+ <gvxy_point X_Y="436.16; 652.77"/>
+ <gvxy_point X_Y="153.16; 769.95"/>
+</gvxysxy>
+
+<tubs name="Plate_IP_Cut_Tube" material="ShieldSteel" Rio_Z="0.; 226.; 95." />
+
+<subtraction name="Plate_IP" >
+ <posXYZ volume="Plate_IP_Main" />
+ <posXYZ volume="Plate_IP_Cut_Tube" />
+</subtraction>
+
+<gvxysxy name="HUB_Main_part_outer_tube_Main" material="ShieldSteel" dZ="767.7">
+ <gvxy_point X_Y="769.95; 153.16"/>
+ <gvxy_point X_Y="652.77; 436.16"/>
+ <gvxy_point X_Y="436.16; 652.77"/>
+ <gvxy_point X_Y="153.16; 769.95"/>
+</gvxysxy>
+
+<tubs name="HUB_Main_part_outer_tube_Cut_Tube" material="ShieldSteel" Rio_Z="0.; 700.; 770." />
+
+<subtraction name="HUB_Main_part_outer_tube" >
+ <posXYZ volume="HUB_Main_part_outer_tube_Main" />
+ <posXYZ volume="HUB_Main_part_outer_tube_Cut_Tube" />
+</subtraction>
+
+<gvxysxy name="Plate_HO_Main" material="ShieldSteel" dZ="78.">
+ <gvxy_point X_Y="769.95; 153.16"/>
+ <gvxy_point X_Y="652.77; 436.16"/>
+ <gvxy_point X_Y="436.16; 652.77"/>
+ <gvxy_point X_Y="153.16; 769.95"/>
+</gvxysxy>
+
+<tubs name="Plate_HO_Cut_Tube" material="ShieldSteel" Rio_Z="0.; 150.5; 80." />
+
+<subtraction name="Plate_HO" >
+ <posXYZ volume="Plate_HO_Main" />
+ <posXYZ volume="Plate_HO_Cut_Tube" />
+</subtraction>
+
+<tubs name="Plate_HO_SupportTube" material="ShieldSteel" Rio_Z="585.; 770.; 21.4" profile="-15.; 210." nbPhi="20"/>
+
+<tubs name="Disque_shileding_ext" material="PolyBoron207HD5" Rio_Z="532.5; 800.; 40." />
+<tubs name="Plaque_polyboron_droite_v2" material="PolyBoron207HD5" Rio_Z="532.5; 582.5; 200." />
+
+<composition name="Hub_Other_Parts_Assembly" >
+ <posXYZ volume="HUB_Extension_plate_HO_side" X_Y_Z="0.; 0.; 1920.6" />
+ <posXYZ volume="HUB_Extension_inner_tube" X_Y_Z="0.; 0.; 892.25" />
+ <posXYZ volume="Copper_disk_Extension" X_Y_Z="0.; 0.; 1391.95" />
+ <posXYZ volume="HUB_Extension_outer_tube" X_Y_Z="0.; 0.; 1391.6" />
+ <posXYZ volume="HUB_Main_part_inner_tube" X_Y_Z="0.; 0.; -45.8" />
+ <posXYZ volume="Copper_disk_Main_part" X_Y_Z="0.; 0.; 434.2" />
+ <posXYZ volume="Plate_IP" />
+ <posXYZ volume="HUB_Main_part_outer_tube" X_Y_Z="0.; 0.; 430.3" />
+ <posXYZ volume="Disque_shileding_ext" X_Y_Z="0.; 0.; 944.2" />
+ <posXYZ volume="Plaque_polyboron_droite_v2" X_Y_Z="0.; 0.; 1064.25" />
+ <posXYZ volume="Plate_HO" X_Y_Z="0.; 0.; 853.2" />
+ <posXYZ volume="Plate_HO_SupportTube" X_Y_Z="0.; 0.; 902.95" />
+</composition>
+<!-- End Other Parts of New Hub -->
+
+<composition name="New_Hub" >
+ <posXYZ volume="Hub_Other_Parts_Assembly" />
+ <posXYZ volume="Horizontal_Shielding" />
+</composition>
+<!-- ************************************************************************************** End New Hub *********************************************** -->
+
+<!-- **************************************************** Inner Spoke ******************************************************************* -->
+<gvxysx name="Base_Leg" material="Aluminium" dZ="390.">
+ <gvxy_point X_Y="40.; 531.5"/>
+ <gvxy_point X_Y=" 40.; -501.5"/>
+ <gvxy_point X_Y="150.; -501.5"/>
+ <gvxy_point X_Y=" 150.; -531.5"/>
+</gvxysx>
+
+<gvxy name="JOINING_BAR3" material="Aluminium" dZ="150.">
+ <gvxy_point X_Y="75.; 23."/>
+ <gvxy_point X_Y="75.; 7."/>
+ <gvxy_point X_Y="640.; 7."/>
+ <gvxy_point X_Y="640.; -23."/>
+ <gvxy_point X_Y="-640.; -23."/>
+ <gvxy_point X_Y="-640.; 7."/>
+ <gvxy_point X_Y="-75.; 7."/>
+ <gvxy_point X_Y="-75.; 23."/>
+</gvxy>
+
+<box name="LATERAL_PLATE_L" material="Aluminium" X_Y_Z="21.; 1680.; 390. " />
+
+<gvxysx name="Front_plate2" material="Aluminium" dZ="14.">
+ <gvxy_point X_Y="98.65; 2867.18"/>
+ <gvxy_point X_Y=" 89.94; 2805.19"/>
+ <gvxy_point X_Y="89.94; 2587.18"/>
+</gvxysx>
+
+<gvxysx name="LS_OUTER3_MainBox" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="323.7; 450."/>
+ <gvxy_point X_Y=" 197.21; -450."/>
+</gvxysx>
+
+<box name="LS_OUTER3_CutBox" material="Aluminium" X_Y_Z="250.; 600.; 35. " />
+
+<subtraction name="LS_OUTER3" >
+ <posXYZ volume="LS_OUTER3_MainBox" />
+ <posXYZ volume="LS_OUTER3_CutBox" X_Y_Z=" 0.; -50.; 0. " />
+</subtraction>
+
+<gvxysx name="REAR_PLATE1" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="176.95; 309.25"/>
+ <gvxy_point X_Y=" 90.03; -309.25"/>
+</gvxysx>
+
+<gvxy name="REAR_PLATE2" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="273.95; 174.5"/>
+ <gvxy_point X_Y="224.9; -174.5"/>
+ <gvxy_point X_Y="125.; -174.5"/>
+ <gvxy_point X_Y="125.; -154.5"/>
+ <gvxy_point X_Y="-125.; -154.5"/>
+ <gvxy_point X_Y="-125.; -174.5"/>
+ <gvxy_point X_Y="-224.9; -174.5"/>
+ <gvxy_point X_Y="-273.95; 174.5"/>
+</gvxy>
+
+<box name="SHIM1" material="Aluminium" X_Y_Z="700.; 150.; 21.6 " />
+<box name="SHIM2" material="Aluminium" X_Y_Z="350.; 150.; 21.6 " />
+
+<gvxysx name="REAR_PLATE3" material="Aluminium" dZ="30.">
+ <gvxy_point X_Y="323.7; 80."/>
+ <gvxy_point X_Y=" 301.21; -80."/>
+</gvxysx>
+
+<box name="KM_FRONT_PLATE1" material="ShieldSteel" X_Y_Z="34.; 160.; 250. " />
+<box name="KM_LOCKING_PLATE1" material="ShieldSteel" X_Y_Z="20.; 120.; 200. " />
+
+<gvxy name="JOINING_BAR2" material="Aluminium" dZ="29.">
+ <gvxy_point X_Y="175.; 75."/>
+ <gvxy_point X_Y="964.81; -64.27"/>
+ <gvxy_point X_Y="938.77; -211.99"/>
+ <gvxy_point X_Y="161.88; -75."/>
+ <gvxy_point X_Y="-161.88; -75."/>
+ <gvxy_point X_Y="-938.77; -211.99"/>
+ <gvxy_point X_Y="-964.81; -64.27"/>
+ <gvxy_point X_Y="-175.; 75."/>
+</gvxy>
+
+<gvxy name="JOINING_BAR1" material="Aluminium" dZ="29.">
+ <gvxy_point X_Y="350.; 75."/>
+ <gvxy_point X_Y="1196.93; -74.34"/>
+ <gvxy_point X_Y="1170.88; -222.06"/>
+ <gvxy_point X_Y="336.88; -75."/>
+ <gvxy_point X_Y="-336.88; -75."/>
+ <gvxy_point X_Y="-1170.88; -222.06"/>
+ <gvxy_point X_Y="-1196.93; -74.34"/>
+ <gvxy_point X_Y="-350.; 75."/>
+</gvxy>
+
+<composition name="Inner_Spoke_Assembly" >
+ <posXYZ volume="Base_Leg" X_Y_Z="0.; 1301.5; 0." />
+ <posXYZ volume="JOINING_BAR1" X_Y_Z="0.; 4385.; -231.2" />
+ <posXYZ volume="JOINING_BAR2" X_Y_Z="0.; 3065.; -231.2" />
+ <posXYZ volume="JOINING_BAR3" X_Y_Z="0.; 1715.; -218.05" rot=" 90. ; 0. ; 0." />
+ <posXYZ volume="LATERAL_PLATE_L" X_Y_Z="-217.3; 3635.56; 0." rot=" 0. ; 0. ; 8." />
+ <posXYZ volume="LATERAL_PLATE_L" X_Y_Z="217.3; 3635.56; 0." rot=" 0. ; 0. ; -8." />
+ <posXYZ volume="Front_plate2" X_Y_Z="0.; 0.; 188." />
+ <posXYZ volume="LS_OUTER3" X_Y_Z="0.; 4018.41; 180." />
+ <posXYZ volume="REAR_PLATE1" X_Y_Z="0.; 3114.99; -180." />
+ <posXYZ volume="REAR_PLATE2" X_Y_Z="0.; 3939.93; -180." />
+ <posXYZ volume="REAR_PLATE3" X_Y_Z="0.; 4388.42; -180." />
+ <posXYZ volume="SHIM1" X_Y_Z="0.; 4385.; -205.85" />
+ <posXYZ volume="SHIM2" X_Y_Z="0.; 3065.; -205.85" />
+ <posXYZ volume="KM_FRONT_PLATE1" X_Y_Z="318.34; 4156.56; 25." rot=" 0. ; 0. ; -8." />
+ <posXYZ volume="KM_FRONT_PLATE1" X_Y_Z="-318.34; 4156.56; 25." rot=" 0. ; 0. ; 8." />
+ <posXYZ volume="KM_LOCKING_PLATE1" X_Y_Z="270.71; 4163.26; 0." rot=" 0. ; 0. ; -8." />
+ <posXYZ volume="KM_LOCKING_PLATE1" X_Y_Z="-270.71; 4163.26; 0." rot=" 0. ; 0. ; 8." />
+</composition>
+
+<composition name="Inner_Spoke" >
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 67.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 112.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 157.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 202.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 247.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 292.5" />
+ <posXYZ volume="Inner_Spoke_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 337.5" />
+</composition>
+
+<!-- *********************************************************************************** End Inner Spoke **************************************************\
+************************************* -->
+
+<!-- *********************************************************************************** Outer Spoke ******************************************************\
+************************************* -->
+
+<box name="NSW_F1_spoke_MainBox" material="Aluminium" X_Y_Z="135.; 1060.; 185. " />
+<box name="NSW_F1_spoke_CutBox" material="Aluminium" X_Y_Z="111.; 1070.; 161. " />
+
+<subtraction name="NSW_F1_spoke" >
+ <posXYZ volume="NSW_F1_spoke_MainBox" />
+ <posXYZ volume="NSW_F1_spoke_CutBox" />
+</subtraction>
+<box name="NSW_F1_spoke_Bot_Plate" material="Aluminium" X_Y_Z="300.; 48.; 300. " />
+
+<gvxysx name="Plaque_interface2" material="Aluminium" dZ="37.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<gvxysx name="Plaque_interface2.1" material="Aluminium" dZ="45.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<box name="NSW_SS_spoke_Pillar_MainBox" material="Aluminium" X_Y_Z="135.; 2683.25; 185. " />
+<box name="NSW_SS_spoke_Pillar_CutBox" material="Aluminium" X_Y_Z="113.; 2685.; 163. " />
+
+<subtraction name="NSW_SS_spoke_Pillar" >
+ <posXYZ volume="NSW_SS_spoke_Pillar_MainBox" />
+ <posXYZ volume="NSW_SS_spoke_Pillar_CutBox" />
+</subtraction>
+
+<box name="Spoke_Joint" material="ShieldSteel" X_Y_Z="75.; 85.; 124.4 " />
+
+<gvxysx name="Manifolds_Support_Main" material="Aluminium" dZ="150.">
+ <gvxy_point X_Y="585.; 75."/>
+ <gvxy_point X_Y=" 551.74; -75."/>
+</gvxysx>
+
+<box name="Manifolds_Support_CutBox1" material="Aluminium" X_Y_Z="1180.; 140.; 140. " />
+<box name="Manifolds_Support_CutBox2" material="Aluminium" X_Y_Z="160.; 90.; 160. " />
+
+<subtraction name="Manifolds_Support" >
+ <posXYZ volume="Manifolds_Support_Main" />
+ <posXYZ volume="Manifolds_Support_CutBox1" />
+ <posXYZ volume="Manifolds_Support_CutBox2" X_Y_Z="135.; -45.; 0." />
+</subtraction>
+
+<box name="Cale" material="Aluminium" X_Y_Z="135.; 280.; 52. " />
+<box name="JD_JOINT2.1_Plate1" material="Aluminium" X_Y_Z="250.; 270.; 20. " />
+<box name="Shim_JD" material="Aluminium" X_Y_Z="250.; 270.; 29. " />
+<box name="JD_JOINT1_Pipe_MainBox" material="Aluminium" X_Y_Z="1300.; 120.; 80." />
+<box name="JD_JOINT1_Pipe_CutBox" material="Aluminium" X_Y_Z="1305.; 100.; 60. " />
+
+<subtraction name="JD_JOINT1_Pipe" >
+ <posXYZ volume="JD_JOINT1_Pipe_MainBox" />
+ <posXYZ volume="JD_JOINT1_Pipe_CutBox" />
+</subtraction>
+
+<box name="JD_JOINT2_Pipe_MainBox" material="Aluminium" X_Y_Z="900.; 120.; 80." />
+
+<subtraction name="JD_JOINT2_Pipe" >
+ <posXYZ volume="JD_JOINT2_Pipe_MainBox" />
+ <posXYZ volume="JD_JOINT1_Pipe_CutBox" />
+</subtraction>
+
+<box name="KM_FRONT_PLATE.1.1" material="ShieldSteel" X_Y_Z="27.; 272.; 120. " />
+<box name="Manifolds_Support_Plate" material="Aluminium" X_Y_Z="9.8; 275.; 175. " />
+<box name="AL_BAR_KM_INCLINED_PLATE" material="Aluminium" X_Y_Z="290.; 38.; 67. " />
+
+<composition name="Outer_Spoke_Assembly" >
+ <posXYZ volume="NSW_F1_spoke" X_Y_Z="0.; 1350.; 0." />
+ <posXYZ volume="NSW_F1_spoke_Bot_Plate" X_Y_Z="0.; 795.95; 0." />
+ <posXYZ volume="Manifolds_Support" X_Y_Z="0.; 4515.33; 0." />
+ <posXYZ volume="Plaque_interface2" X_Y_Z="0.; 1745.; 111.05" />
+ <posXYZ volume="Plaque_interface2.1" X_Y_Z="0.; 1745.; -115.05" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="371.; 3267.85; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="-371.; 3267.85; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="610.52; 4348.24; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="322.65; 3049.77; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="-610.52; 4348.24; 154.75" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="-322.65; 3049.77; 154.75" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale" X_Y_Z="537.79; 4020.21; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="338.24; 3120.06; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="-537.79; 4020.21; -118.55" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale" X_Y_Z="-338.24; 3120.06; -118.55" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="315.; 3120.6; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-315.; 3120.6; -154.6" />
+ <posXYZ volume="Shim_JD" X_Y_Z="515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="315.; 3120.6; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-315.; 3120.6; -261.55" />
+ <posXYZ volume="JD_JOINT1_Pipe" X_Y_Z="0.; 4020.2; -207." />
+ <posXYZ volume="JD_JOINT2_Pipe" X_Y_Z="0.; 3120.6; -207." />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="641.41; 4289.16; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="-641.41; 4289.16; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Manifolds_Support_Plate" X_Y_Z="560.93; 4459.11; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Manifolds_Support_Plate" X_Y_Z="-560.93; 4459.11; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="AL_BAR_KM_INCLINED_PLATE" X_Y_Z="-243.; 4099.25; -228.5" />
+</composition>
+
+<!-- Outer Spoke Foot -->
+<gvxysx name="Plaque_interface2_SpecMain" material="Aluminium" dZ="37.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<box name="Plaque_interface2_Spec_CutBox" material="Aluminium" X_Y_Z="160.; 260.; 13. " />
+
+<subtraction name="Plaque_interface2_Spec" >
+ <posXYZ volume="Plaque_interface2_SpecMain" />
+ <posXYZ volume="Plaque_interface2_Spec_CutBox" X_Y_Z="-120.94; 337.19; -12.5" rot=" 0. ; 0. ; 12.5" />
+</subtraction>
+
+<gvxysx name="Plaque_interface2.1_SpecMain" material="Aluminium" dZ="45.">
+ <gvxy_point X_Y="182.5; 375."/>
+ <gvxy_point X_Y="146.5; 213.2"/>
+ <gvxy_point X_Y="90.; -375."/>
+</gvxysx>
+
+<subtraction name="Plaque_interface2.1_Spec" >
+ <posXYZ volume="Plaque_interface2.1_SpecMain" />
+ <posXYZ volume="Plaque_interface2_Spec_CutBox" X_Y_Z="-120.94; 337.19; 16.5" rot=" 0. ; 0. ; 12.5" />
+</subtraction>
+
+<box name="NSW_SS_spoke_PillarSpec_MainBox" material="ShieldSteel" X_Y_Z="135.; 2818.1; 210. " />
+<box name="NSW_SS_spoke_PillarSpec_CutBox" material="Aluminium" X_Y_Z="91.; 2820.; 166. " />
+
+<subtraction name="NSW_SS_spokeSpec_Pillar" >
+ <posXYZ volume="NSW_SS_spoke_PillarSpec_MainBox" />
+ <posXYZ volume="NSW_SS_spoke_PillarSpec_CutBox" />
+</subtraction>
+
+<box name="Cale_Spec" material="Aluminium" X_Y_Z="135.; 280.; 38.6 " />
+<box name="Spoke_Joint1.2" material="Aluminium" X_Y_Z="66.; 100.; 111.9 " />
+
+<box name="BOTTOM_PLATE.1_Horisontal_Plate" material="ShieldSteel" X_Y_Z="29.8; 775.; 495. " />
+<box name="BOTTOM_PLATE.1_Vertical_Main_Plate" material="ShieldSteel" X_Y_Z="460.; 640.; 35. " />
+
+<gvxy name="Connecting_Plates2.1" material="Aluminium" dZ="22.">
+ <gvxy_point X_Y="-252.; 130.65"/>
+ <gvxy_point X_Y="70.; 130.65"/>
+ <gvxy_point X_Y="252.; 25.65"/>
+ <gvxy_point X_Y="258.6; -124.1"/>
+ <gvxy_point X_Y="108.7; -130.65"/>
+ <gvxy_point X_Y="-252.; 19.35"/>
+</gvxy>
+
+<box name="Tube_alu_feet_MainBox" material="Aluminium" X_Y_Z="1050.; 135.; 185. " />
+<box name="Tube_alu_feet_CutBox" material="Aluminium" X_Y_Z="1055.; 111.4; 161.4 " />
+
+<subtraction name="Tube_alu_feet" >
+ <posXYZ volume="Tube_alu_feet_MainBox" />
+ <posXYZ volume="Tube_alu_feet_CutBox" />
+</subtraction>
+
+<box name="Fix_nut" material="ShieldSteel" X_Y_Z="50.; 52.; 290. " />
+
+<gvxy name="Beam_Interface" material="Aluminium" dZ="300.">
+ <gvxy_point X_Y="-80.; 73.4"/>
+ <gvxy_point X_Y="80.; 73.4"/>
+ <gvxy_point X_Y="80.; -73.4"/>
+ <gvxy_point X_Y="-80.; 28.5"/>
+</gvxy>
+
+<gvxy name="Beam_Interface2" material="Aluminium" dZ="300.">
+ <gvxy_point X_Y="-80.; 79.8"/>
+ <gvxy_point X_Y="80.; 79.8"/>
+ <gvxy_point X_Y="80.; 12.6"/>
+ <gvxy_point X_Y="-80.; -79.8"/>
+</gvxy>
+
+<box name="LS_T_Joint" material="ShieldSteel" X_Y_Z="80.; 70.; 134.9 " />
+<box name="LS_T_Joint2" material="ShieldSteel" X_Y_Z="77.; 67.; 147.4 " />
+
+<gvxy name="Renfort_Bas1_MainBox" material="Aluminium" dZ="135.">
+ <gvxy_point X_Y="-337.73; -67.5"/>
+ <gvxy_point X_Y="-251.72; 67.5"/>
+ <gvxy_point X_Y="251.72; 67.5"/>
+ <gvxy_point X_Y="337.27; -67.5"/>
+</gvxy>
+
+<box name="Renfort_Bas1_CutBox" material="Aluminium" X_Y_Z="680.; 115.; 115. " />
+
+
+<subtraction name="Renfort_Bas1" >
+ <posXYZ volume="Renfort_Bas1_MainBox" />
+ <posXYZ volume="Renfort_Bas1_CutBox" />
+</subtraction>
+
+<composition name="Outer_Spoke_Assembly_FOOT1" >
+ <posXYZ volume="NSW_F1_spoke" X_Y_Z="0.; 1350.; 0." />
+ <posXYZ volume="NSW_F1_spoke_Bot_Plate" X_Y_Z="0.; 795.95; 0." />
+ <posXYZ volume="Plaque_interface2_Spec" X_Y_Z="0.; 1745.; 111.05" />
+ <posXYZ volume="Plaque_interface2.1_Spec" X_Y_Z="0.; 1745.; -115.05" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="371.; 3267.85; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="NSW_SS_spokeSpec_Pillar" X_Y_Z="-385.59; 3333.67; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Shim_JD" X_Y_Z="515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="315.; 3120.6; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-515.; 4020.2; -261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-315.; 3120.6; -261.55" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="315.; 3120.6; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-515.; 4020.2; -154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-315.; 3120.6; -154.6" />
+ <posXYZ volume="Cale" X_Y_Z="537.79; 4020.21; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="338.24; 3120.06; -118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-537.79; 4020.21; -124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-338.24; 3120.06; -124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="JD_JOINT1_Pipe" X_Y_Z="0.; 4020.2; -207." />
+ <posXYZ volume="JD_JOINT2_Pipe" X_Y_Z="0.; 3120.6; -207." />
+ <posXYZ volume="AL_BAR_KM_INCLINED_PLATE" X_Y_Z="-243.; 4099.25; -228.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="322.65; 3049.77; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="610.52; 4348.24; 154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-322.65; 3049.28; 161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-610.4; 4347.75; 161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="641.41; 4289.16; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="BOTTOM_PLATE.1_Horisontal_Plate" X_Y_Z="-675.29; 4889.64; -29." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="BOTTOM_PLATE.1_Vertical_Main_Plate" X_Y_Z="-491.47; 4727.04; -257.5" rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; 103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; -103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Tube_alu_feet" X_Y_Z="35.49; 4779.63; 0." rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-840.79; 4666.23; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-443.82; 5063.2; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Beam_Interface" X_Y_Z="-716.12; 4723.86; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Beam_Interface2" X_Y_Z="-496.92; 4934.01; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_T_Joint" X_Y_Z="-649.; 4560.58; -172.5" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="LS_T_Joint2" X_Y_Z="-356.49; 4881.55; -166.25" rot=" 0. ; 0. ; 75." />
+ <posXYZ volume="Renfort_Bas1" X_Y_Z="-329.24; 4539.98; 0." rot=" 0. ; 0. ; 45." />
+</composition>
+
+<composition name="Outer_Spoke_Assembly_FOOT2" >
+ <posXYZ volume="NSW_F1_spoke" X_Y_Z="0.; 1350.; 0." />
+ <posXYZ volume="NSW_F1_spoke_Bot_Plate" X_Y_Z="0.; 795.95; 0." />
+ <posXYZ volume="Plaque_interface2_Spec" X_Y_Z="0.; 1745.; 111.05" />
+ <posXYZ volume="Plaque_interface2.1_Spec" X_Y_Z="0.; 1745.; -115.05" />
+ <posXYZ volume="NSW_SS_spoke_Pillar" X_Y_Z="371.; 3267.85; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="NSW_SS_spokeSpec_Pillar" X_Y_Z="-385.59; 3333.67; 0." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Shim_JD" X_Y_Z="515.; 4020.2; 261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="315.; 3120.6; 261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-515.; 4020.2; 261.55" />
+ <posXYZ volume="Shim_JD" X_Y_Z="-315.; 3120.6; 261.55" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="515.; 4020.2; 154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="315.; 3120.6; 154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-515.; 4020.2; 154.6" />
+ <posXYZ volume="JD_JOINT2.1_Plate1" X_Y_Z="-315.; 3120.6; 154.6" />
+ <posXYZ volume="Cale" X_Y_Z="537.79; 4020.21; 118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale" X_Y_Z="338.24; 3120.06; 118.55" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-537.79; 4020.21; 124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Cale_Spec" X_Y_Z="-338.24; 3120.06; 124.35" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="JD_JOINT1_Pipe" X_Y_Z="0.; 4020.2; 207." />
+ <posXYZ volume="JD_JOINT2_Pipe" X_Y_Z="0.; 3120.6; 207." />
+ <posXYZ volume="AL_BAR_KM_INCLINED_PLATE" X_Y_Z="-243.; 4099.25; 228.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="322.65; 3049.77; -154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint" X_Y_Z="610.52; 4348.24; -154.75" rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-322.65; 3049.28; -161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="Spoke_Joint1.2" X_Y_Z="-610.4; 4347.75; -161." rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="KM_FRONT_PLATE.1.1" X_Y_Z="641.41; 4289.16; 0." rot=" 0. ; 0. ; -12.5" />
+ <posXYZ volume="BOTTOM_PLATE.1_Horisontal_Plate" X_Y_Z="-675.29; 4889.64; 29." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="BOTTOM_PLATE.1_Vertical_Main_Plate" X_Y_Z="-491.47; 4727.04; 257.5" rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; -103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Connecting_Plates2.1" X_Y_Z="475.73; 4596.28; 103.55" rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Tube_alu_feet" X_Y_Z="35.49; 4779.63; 0." rot=" 0. ; 0. ; -15." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-840.79; 4666.23; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Fix_nut" X_Y_Z="-443.82; 5063.2; -5." rot=" 0. ; 0. ; -45." />
+ <posXYZ volume="Beam_Interface" X_Y_Z="-716.12; 4723.86; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Beam_Interface2" X_Y_Z="-496.92; 4934.01; 0." rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_T_Joint" X_Y_Z="-649.; 4560.58; 172.5" rot=" 0. ; 0. ; 12.5" />
+ <posXYZ volume="LS_T_Joint2" X_Y_Z="-356.49; 4881.55; 166.25" rot=" 0. ; 0. ; 75." />
+ <posXYZ volume="Renfort_Bas1" X_Y_Z="-329.24; 4539.98; 0." rot=" 0. ; 0. ; 45." />
+</composition>
+<!-- End Outer Spoke Foot -->
+
+
+<composition name="Outer_Spoke" >
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="Outer_Spoke_Assembly_FOOT1" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="Outer_Spoke_Assembly_FOOT2" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 180. ; 225." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="Outer_Spoke_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- ********************************************************************************* End Outer Spoke ****************************************************\
+************************************** -->
+
+<!-- *********************************************************************************** LSO LSI Connection ***********************************************\
+************************************* -->
+
+<box name="LSO_LSI_connection_Rot" material="ShieldSteel" X_Y_Z="63.; 754.1; 46. " />
+
+<composition name="LSO_LSI_connection_Pos" >
+ <posXYZ volume="LSO_LSI_connection_Rot" X_Y_Z="0.; 2210.09; 0." />
+</composition>
+
+<composition name="LSO_LSI_Connection" >
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; 22.5" />
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; 67.5" />
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; -22.5" />
+ <posXYZ volume="LSO_LSI_connection_Pos" X_Y_Z="0.; 0.; 870.2" rot=" 0. ; 0. ; -67.5" />
+</composition>
+
+<!-- *********************************************************************************** End LSO LSI Connection *******************************************\
+************************************* -->
+
+<!-- *********************************************************************************** Alignment Bars ***************************************************\
+**************************************** -->
+
+<!-- SS Bar -->
+<tubs name="SS_Bar_Tube" material="Aluminium" Rio_Z="0.; 49.1; 2382." />
+
+<composition name="SS_Bar_Assembly" >
+ <posXYZ volume="SS_Bar_Tube" X_Y_Z="69.2; 3364.6; 0" rot=" 90. ; 0. ; -3.35" />
+</composition>
+
+<composition name="SS_Bar" >
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="SS_Bar_Assembly" X_Y_Z="0.; 0.; 233.2" rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- End SS Bar -->
+
+<!-- LS Bar -->
+<tubs name="LS_Bar_Tube" material="Aluminium" Rio_Z="0.; 48.; 2340." />
+<box name="LS_Arm" material="Aluminium" X_Y_Z="1010.; 40.; 50. " />
+
+<composition name="LS_Bar_Assembly" >
+ <posXYZ volume="LS_Bar_Tube" X_Y_Z="1286.4; 3086.18; 0." rot=" 90. ; 0. ; -25." />
+ <posXYZ volume="LS_Arm" X_Y_Z="1789.34; 4164.73; 0." rot=" 0. ; 0. ; -25." />
+</composition>
+
+<composition name="LS_Bar" >
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 0." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 45." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 90." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 135." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 180." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 225." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 270." />
+ <posXYZ volume="LS_Bar_Assembly" X_Y_Z="0.; 0.; 697.2" rot=" 0. ; 0. ; 315." />
+</composition>
+<!-- End LS Bar -->
+
+<!-- *********************************************************************************** End Alignment Bars ***********************************************\
+******************************************** -->
+
+
+<composition name="NSW_Aluminum_Structure_and_HUB_Assembly" >
+ <posXYZ volume="New_Hub" />
+ <posXYZ volume="Inner_Spoke" />
+ <posXYZ volume="LSO_LSI_Connection" />
+ <posXYZ volume="Outer_Spoke" />
+ <posXYZ volume="SS_Bar" />
+ <posXYZ volume="LS_Bar" />
+</composition>
+
+<composition name="NSW_Aluminum_Structure_and_HUB_SideA" >
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB_Assembly" X_Y_Z="0.; 0.; 6943.8" rot=" 0. ; 0. ; 0." />
+</composition>
+
+<composition name="NSW_Aluminum_Structure_and_HUB_SideC" >
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB_Assembly" X_Y_Z="0.; 0.; -6943.8" rot=" 0. ; 180. ; 0." />
+</composition>
+
+<composition name="NSW_Aluminum_Structure_and_HUB" >
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB_SideA" />
+</composition>
+
+</section>
+
+<!-- ==================================================Feet========================================= -->
+
+<section name = "A Plate"
+ version = "0.0"
+ date = "29-05-2017"
+ author = "Georgian Engineering Team - Niko Tsutskiridze"
+ top_volume = "A_Plate">
+
+<gvxy name="Lateral_Plate_Main" material="ShieldSteel" dZ="21.">
+ <gvxy_point X_Y="-3300.; -4000."/>
+ <gvxy_point X_Y="-3548.3; -3235.72"/>
+ <gvxy_point X_Y="-1458.4; -560.8"/>
+ <gvxy_point X_Y="73.9; 73.9"/>
+ <gvxy_point X_Y="-628.9; -1622.8"/>
+ <gvxy_point X_Y="-818.3; -1544.4"/>
+ <gvxy_point X_Y="-1558.6; -2491.9"/>
+ <gvxy_point X_Y="-1427.8; -2980."/>
+ <gvxy_point X_Y="-0.01; -2980."/>
+ <gvxy_point X_Y="-0.01; -3280."/>
+ <gvxy_point X_Y="-1701.9; -3280."/>
+ <gvxy_point X_Y="-1995.3; -3050.8"/>
+ <gvxy_point X_Y="-2650.; -3889."/>
+ <gvxy_point X_Y="-2650.; -4000."/>
+</gvxy>
+
+<tubs name="Lateral_plate_TubeCut" material="ShieldSteel" Rio_Z=" 0. ; 600. ; 25." nbPhi="36." />
+
+<subtraction name="Lateral_Plate" >
+ <posXYZ volume="Lateral_Plate_Main" />
+ <posXYZ volume="Lateral_plate_TubeCut" X_Y_Z="-0.01; -0.01; 0." rot=" 0. ; 0. ; 0." />
+</subtraction>
+
+<tubs name="Anchorage" material="ShieldSteel" Rio_Z=" 0. ; 22.6 ; 577." nbPhi="36." />
+
+<gvxy name="Vertical_Top_Plate" material="ShieldSteel" dZ="33.">
+ <gvxy_point X_Y="-3300.; -3998."/>
+ <gvxy_point X_Y="-3300.; -3730."/>
+ <gvxy_point X_Y="-2865.; -3730."/>
+ <gvxy_point X_Y="-2675.; -3920."/>
+ <gvxy_point X_Y="-2675.; -3998."/>
+</gvxy>
+
+<box name="Horizontal_Plate" material="ShieldSteel" X_Y_Z="625.; 40.6; 287. " />
+
+<composition name="A_Plate_Assembly" >
+ <posXYZ volume="Lateral_Plate" />
+ <posXYZ volume="Lateral_Plate" X_Y_Z="0.; 0.; 0." rot="0. ; 180. ; 0." />
+ <posXYZ volume="Anchorage" X_Y_Z="-3447.; -3283.25; -299.01" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Anchorage" X_Y_Z="3447.; -3283.25; -299.01" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Vertical_Top_Plate" X_Y_Z="0.; 0.; -27.01" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Vertical_Top_Plate" X_Y_Z="0.; 0.; -27.01" rot="0. ; 180. ; 0." />
+ <posXYZ volume="Horizontal_Plate" X_Y_Z="-2987.5; -3929.7; -187.02" rot="0. ; 0. ; 0." />
+ <posXYZ volume="Horizontal_Plate" X_Y_Z="2987.5; -3929.7; -187.02" rot="0. ; 0. ; 0." />
+</composition>
+
+<composition name="A_Plate_SideA" >
+ <posXYZ volume="A_Plate_Assembly" X_Y_Z=" 0. ; 0.; 7857.5" />
+</composition>
+
+<composition name="A_Plate_SideC" >
+ <posXYZ volume="A_Plate_Assembly" X_Y_Z=" 0. ; 0.; -7857.5" rot="0. ; 180. ; 0." />
+</composition>
+
+<composition name="A_Plate" >
+ <posXYZ volume="A_Plate_SideA" />
+</composition>
+
+</section>
+
+<!-- ========== Poisitionning all Volumes in NSW================ -->
+
+<section name="NewSmallWheels" version="4.3" top_volume="NewSmallWheel" date=" April 20, 2015 " author="Daniel Lellouch">
+
+<composition name="NewSmallWheel">
+ <posXYZ volume="NSW_sTGC" X_Y_Z="0.;0.;0." zLayout="Z_POSITIVE"/>
+ <posXYZ volume="NSW_MM" X_Y_Z="0.;0.;0." zLayout="Z_POSITIVE"/>
+ <posXYZ volume="NSW_Spacer" />
+ <posXYZ volume="NSW_Aluminum_Structure_and_HUB" />
+ <posXYZ volume="A_Plate" />
+</composition>
+
+</section>
+
+</AGDD>
diff --git a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MultiLayer.h b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MultiLayer.h
index 6615cdbd61fd99958cf145ee41ee54b1d467557f..6035b7d52b534b4921edcecaf06e418bbb909f75 100755
--- a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MultiLayer.h
+++ b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/MultiLayer.h
@@ -37,6 +37,11 @@ public:
double cutoutTubeLength[5]; // tube length
bool cutoutFullLength[5]; // true if this region is outside the cutout
bool cutoutAtAngle; // true if this station has cutouts at an angle; //EMS1,3 and BOS6
+
+ // the same but for several cutouts along the amdb x (GeoModel y)
+ // gives the (x1,x2) and (y1,y2) tuples of rectangles which are NOT cutout
+ std::vector<std::pair<double,double>> m_nonCutoutXSteps;
+ std::vector<std::pair<double,double>> m_nonCutoutYSteps;
};
} // namespace MuonGM
diff --git a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/RpcLayer.h b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/RpcLayer.h
index c8660272d2247d1610738714bd8604494d1bea16..384db52ba294335270499d09375bd9e3c0fc4132 100755
--- a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/RpcLayer.h
+++ b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/RpcLayer.h
@@ -1,11 +1,15 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef RpcLayer_H
#define RpcLayer_H
+#include "MuonGeoModel/DetectorElement.h"
+#include "GeoModelKernel/GeoVPhysVol.h"
+
#include <string>
+#include <vector>
namespace MuonGM {
diff --git a/MuonSpectrometer/MuonGeoModel/src/Mdt.cxx b/MuonSpectrometer/MuonGeoModel/src/Mdt.cxx
index 9a477a8a478cdf10d49ed1036f31a35b667d48a9..d33adce59ca9daedcd94b7b731f37a34d78fd166 100755
--- a/MuonSpectrometer/MuonGeoModel/src/Mdt.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Mdt.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
#include "MuonGeoModel/Mdt.h"
#include "MuonGeoModel/MDT_Technology.h"
#include "MuonGeoModel/MYSQL.h"
@@ -12,10 +11,19 @@
#include "GeoModelKernel/GeoFullPhysVol.h"
#include "GeoModelKernel/GeoShape.h"
+#include <TString.h> // for Form
+
+#include "float.h"
+
#define verbose_mdt false
namespace MuonGM {
+float round(const float toRound, const unsigned int decimals) {
+ unsigned int factor = std::pow(10,decimals);
+ return std::round(toRound*factor)/factor;
+}
+
Mdt::Mdt(Component* ss, std::string lVName): DetectorElement(ss->name)
{
logVolName = lVName;
@@ -65,6 +73,23 @@ GeoFullPhysVol* Mdt::build(std::vector<Cutout*> vcutdef)
if (verbose_mdt) {
log << MSG::VERBOSE << " mdt cutouts are on " << endmsg;
}
+
+ bool cutoutsVsX=false;
+ bool cutoutsVsY=false;
+ // first check whether there are several cutouts with different amdb x or y coordinates
+ float lastX(FLT_MAX);
+ float lastY(FLT_MAX);
+ for (int i = 0; i < Ncuts; ++i) {
+ if (lastX!=FLT_MAX && lastX*vcutdef[i]->dx<0) cutoutsVsX=true;
+ lastX = vcutdef[i]->dx;
+ if (lastY!=FLT_MAX && lastY*vcutdef[i]->dy<0) cutoutsVsY=true;
+ lastY = vcutdef[i]->dy;
+ }
+ if (cutoutsVsX&&cutoutsVsY) {
+ throw std::runtime_error(Form("File: %s, Line: %d\nMdt::build() - Found more than one cutout in amdb-x direction and more than one cutout in amdb-y direction, currently not supported", __FILE__, __LINE__));
+ }
+
+if (!cutoutsVsX) { // nominal case (used for BMS/BOG/BMG etc.)
int cutoutNtubes[5]; // Number of tubes in sub-multilayer[i]
bool cutoutFullLength[5]; // True if this region is outside the cutout
double cutoutXtubes[5]; // Location of tube center within sub-ml[i] along x-amdb
@@ -95,7 +120,7 @@ GeoFullPhysVol* Mdt::build(std::vector<Cutout*> vcutdef)
int cutLocationCode[3] = {0, 0, 0};
for (int i = 0; i < Ncuts; i++) {
if (vcutdef[i]->dy <= 0) cutLocationCode[i] = -1;
- if (vcutdef[i]->dy + vcutdef[i]->lengthY >= top) cutLocationCode[i] = 1;
+ if (round(vcutdef[i]->dy + vcutdef[i]->lengthY,2) >= round(top,2)) cutLocationCode[i] = 1;
}
// Calculate quantities needed by multilayer
@@ -260,6 +285,79 @@ GeoFullPhysVol* Mdt::build(std::vector<Cutout*> vcutdef)
}
layer->cutoutAtAngle = cutAtAngle;
+ } else {
+ // there are several cutouts along the amdb-x coordinate
+
+ if (longWidth!=width) {
+ throw std::runtime_error(Form("File: %s, Line: %d\nMdt::build() - only support cutouts along amdb-x for rectangular chambers", __FILE__, __LINE__));
+ }
+
+ std::vector<std::pair<double,double>> nonCutoutXSteps;
+ std::vector<std::pair<double,double>> nonCutoutYSteps;
+
+ // Order cutouts by increasing dx
+ for (int i = 0; i < Ncuts; i++) {
+ for (int j = i+1; j < Ncuts; j++) {
+ if (vcutdef[j]->dx < vcutdef[i]->dx) {
+ Cutout* c = vcutdef[i];
+ vcutdef[i] = vcutdef[j];
+ vcutdef[j] = c;
+ }
+ }
+ }
+
+ // in amdb-coordinates
+ double xminChamber = round(-width/2,2);
+ double xmaxChamber = round(width/2,2);
+ double yminChamber = 0;
+ double ymaxChamber = round(length-tubePitch/2,2);
+
+ double latestXMax=xminChamber;
+
+ for (int i = 0; i < Ncuts; ++i) {
+ Cutout* c = vcutdef[i];
+ double lowerX = round(c->dx - c->widthXs/2,2);
+ double xmin = (lowerX <= xminChamber) ? xminChamber : lowerX;
+ if (xmin<latestXMax) {
+ throw std::runtime_error(Form("File: %s, Line: %d\nMdt::build() - cannot have cutouts along amdb-x which overlap in amdb-x", __FILE__, __LINE__));
+ }
+ if (i==0 && xmin>xminChamber) {
+ // we start with a full slice without cutout
+ nonCutoutXSteps.push_back(std::make_pair(xminChamber,lowerX));
+ nonCutoutYSteps.push_back(std::make_pair(yminChamber,ymaxChamber));
+ }
+ double upperX = round(c->dx + c->widthXs/2,2);
+ double xmax = (upperX >= xmaxChamber) ? xmaxChamber : upperX;
+
+ double ymin = round(c->dy+c->lengthY,2) < ymaxChamber ? c->dy+c->lengthY : 0;
+ double ymax = ymaxChamber <= round(c->dy+c->lengthY,2) ? c->dy : ymaxChamber;
+
+ if (latestXMax<xmin) {
+ // there is a full slice between latestXMax and xmin
+ nonCutoutXSteps.push_back(std::make_pair(latestXMax,xmin));
+ nonCutoutYSteps.push_back(std::make_pair(yminChamber,ymaxChamber));
+ }
+
+ nonCutoutXSteps.push_back(std::make_pair(xmin,xmax));
+ nonCutoutYSteps.push_back(std::make_pair(ymin,ymax));
+
+
+ if (i==Ncuts-1 && xmax<xmaxChamber) {
+ // we end with a full slice without cutout
+ nonCutoutXSteps.push_back(std::make_pair(xmax,xmaxChamber));
+ nonCutoutYSteps.push_back(std::make_pair(yminChamber,ymaxChamber));
+ }
+
+ latestXMax = xmax;
+ }
+
+ // Pass information to multilayer and MdtComponent
+ m_component->cutoutTubeXShift = 0;
+ layer->cutoutNsteps = nonCutoutXSteps.size();
+ layer->m_nonCutoutXSteps = nonCutoutXSteps;
+ layer->m_nonCutoutYSteps = nonCutoutYSteps;
+ layer->cutoutAtAngle = false;
+ }
return layer->build();
diff --git a/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx b/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx
index 1e82edc57c12cdf87effb7d9e80fad78210d281d..e56450176cfe24d7c171f35c6142a1f001747482 100755
--- a/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Micromegas.cxx
@@ -2,9 +2,11 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
#include "MuonGeoModel/Micromegas.h"
+
#include "MuonAGDDDescription/MM_Technology.h"
+#include "MuonAGDDDescription/MMDetectorDescription.h"
+#include "MuonAGDDDescription/MMDetectorHelper.h"
#include "AGDDKernel/AGDDDetectorStore.h"
#include "MuonGeoModel/Station.h"
#include "MuonGeoModel/MicromegasComponent.h"
@@ -21,7 +23,6 @@
#include "GeoModelKernel/GeoSerialIdentifier.h"
#include "GeoModelKernel/GeoIdentifierTag.h"
#include "GeoModelKernel/GeoDefinitions.h"
-// for cutouts:
#include "GeoModelKernel/GeoShapeSubtraction.h"
#include "GeoModelKernel/GeoShapeIntersection.h"
#include "GeoModelKernel/GeoShapeShift.h"
@@ -49,15 +50,17 @@ GeoFullPhysVol* Micromegas::build(int minimalgeo)
GeoFullPhysVol* Micromegas::build(int minimalgeo, int , std::vector<Cutout*> )
{
AGDDDetectorStore* ds = AGDDDetectorStore::GetDetectorStore();
+ MMDetectorHelper mmHelper;
+ MMDetectorDescription* mm_descr = mmHelper.Get_MMDetectorSubType(m_component->subType);
+
MM_Technology* t = (MM_Technology*) ds->GetTechnology(name);
thickness = t->Thickness();
double gasTck=t->gasThickness;
double pcbTck=t->pcbThickness;
double roTck=t->roThickness;
- double f1=t->f1Thickness;
- double f2=t->f2Thickness;
- double f3=t->f3Thickness;
-
+ double f1=mm_descr->ylFrame();
+ double f2=mm_descr->ysFrame();
+ double f3=mm_descr->xFrame();
minimalgeo=t->geoLevel;
diff --git a/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx b/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
index 9e39419bd90d15d53d97697e7c8d404379bde802..6dee99d7e56b3d9b0fa832ca5061e2cbe4bb4655 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
@@ -31,6 +31,7 @@
#include <vector>
#include <cassert>
+
using namespace GeoXF;
#define verbose_multilayer false
@@ -39,13 +40,14 @@ namespace MuonGM {
MultiLayer::MultiLayer(std::string n): DetectorElement(n),
nrOfLayers(0), nrOfTubes(0), tubePitch(0.), width(0.), length(0.), thickness(0.),
- mdtthickness(0.), longWidth(0.), nrOfSteps(0), cutoutNsteps(0), cutoutAtAngle(false)
-{
+ mdtthickness(0.), longWidth(0.), nrOfSteps(0), cutoutNsteps(0), cutoutAtAngle(false),
+ m_nonCutoutXSteps(),
+ m_nonCutoutYSteps() {
MsgStream log(Athena::getMessageSvc(), "MultiLayer::MultiLayer");
MYSQL* mysql = MYSQL::GetPointer();
MDT* md = (MDT*)mysql->GetTechnology(name);
- if (md != NULL) {
+ if (md) {
nrOfLayers = md->numOfLayers;
mdtthickness = md->totalThickness;
tubePitch = md->pitch;
@@ -86,9 +88,9 @@ GeoFullPhysVol* MultiLayer::build()
<< endmsg;
}
- const GeoShape* slay = NULL;
- const GeoShape* sfoamup = NULL; // do them both together when there are cutouts
- const GeoShape* sfoamlow = NULL; // do them both together when there are cutouts
+ const GeoShape* slay = nullptr;
+ const GeoShape* sfoamup = nullptr; // do them both together when there are cutouts
+ const GeoShape* sfoamlow = nullptr; // do them both together when there are cutouts
// so calculate other foam-related info first:
double foamthicknesslow = yy[0] - tuberad;
double foamthicknessup;
@@ -106,7 +108,9 @@ GeoFullPhysVol* MultiLayer::build()
} else if (fabs(foamthicknessup - 10.00*Gaudi::Units::mm) < 0.1
&& logVolName.find("BMG") != std::string::npos ) {
foamthicknessup = 10.00*Gaudi::Units::mm;
- } else if ( logVolName == "BME1MDT09" || logVolName == "BME2MDT09" ) { //@@
+ } else if ( logVolName.find("MDT09") != std::string::npos || logVolName.find("MDT14") != std::string::npos ) {
+ // MDT09 is used for BME and BIS sMDTs, MDT14 is used for 2nd multilayer of BIS78
+ // All those sMDTs have no foam layer
foamthicknesslow = 0.;
foamthicknessup = 0.;
} else {
@@ -127,7 +131,9 @@ GeoFullPhysVol* MultiLayer::build()
} else if (fabs(foamthicknesslow - 10.00*Gaudi::Units::mm) < 0.1
&& logVolName.find("BMG") != std::string::npos ) {
foamthicknesslow = 10.00*Gaudi::Units::mm;
- } else if ( logVolName == "BME1MDT09" || logVolName == "BME2MDT09" ) { //@@
+ } else if ( logVolName.find("MDT09") != std::string::npos || logVolName.find("MDT14") != std::string::npos ) {
+ // MDT09 is used for BME and BIS sMDTs, MDT14 is used for 2nd multilayer of BIS78
+ // All those sMDTs have no foam layer
foamthicknesslow = 0.;
foamthicknessup = 0.;
} else {
@@ -143,6 +149,38 @@ GeoFullPhysVol* MultiLayer::build()
// No cutouts - layer is a simple box or trapezoid
slay = new GeoTrd(mdtthickness/2, mdtthickness/2, width/2,
longWidth/2, length/2);
+ } else if (m_nonCutoutXSteps.size()) {
+ // there are cutouts sliced along amdb-x (slices in amdb-y)
+ double submlthick = mdtthickness/2.; // corresponds to half amdb-z (chamber height=constant)
+
+ // loop on the cutout slices and create rectangular boxes which are NOT cutout and add them together to an envelope
+ for (unsigned int i = 0; i < m_nonCutoutXSteps.size(); ++i) {
+
+ double submlwidth = (m_nonCutoutXSteps.at(i).second-m_nonCutoutXSteps.at(i).first)/2; // corresponds to half amdb-x
+ double submllength = (m_nonCutoutYSteps.at(i).second-m_nonCutoutYSteps.at(i).first)/2; // corresponds to half amdb-y
+
+ // need a transform between center multilayer and center of trapezoid (y is amdb-x, z is amdb-y)
+ double yPos = (m_nonCutoutXSteps.at(i).first+m_nonCutoutXSteps.at(i).second)/2;
+ double zPos = (m_nonCutoutYSteps.at(i).first+m_nonCutoutYSteps.at(i).second)/2-length/2;
+ GeoTrf::Transform3D submlpos = GeoTrf::Translate3D(0.,yPos,zPos);
+
+ const GeoTrd* tempSLay = nullptr;
+ const GeoShape* tempSLay1 = nullptr;
+
+ if (submlthick*submlwidth*submllength > 0) {
+ tempSLay = new GeoTrd(submlthick, submlthick, submlwidth, submlwidth, submllength);
+ tempSLay1 = &( (*tempSLay)<<submlpos);
+ } else {
+ log << MSG::WARNING << " problem with shape of temporary trapezoid in LogVolName "
+ << logVolName << " thick,width,length=" << submlthick << "," << submlwidth << "," << submllength << endmsg;
+ }
+
+ if (slay) {
+ slay = &(slay->add(*tempSLay1));
+ } else {
+ slay = tempSLay1;
+ }
+ } // Loop over cutout steps
} else {
// Layer to be built as a boolean of boxes and trapezoids to represent cutouts
if (verbose_multilayer) {
@@ -176,12 +214,12 @@ GeoFullPhysVol* MultiLayer::build()
double widthPos = cutoutXtubes[isub];
GeoTrf::Transform3D submlpos = GeoTrf::Translate3D(0.,widthPos,lengthPos);
- const GeoTrd* tempSLay = NULL;
- const GeoShape* tempSLay1 = NULL;
- const GeoTrd* tempSFoamup = NULL;
- const GeoShape* tempSFoamup1 = NULL;
- const GeoTrd* tempSFoamlow = NULL;
- const GeoShape* tempSFoamlow1 = NULL;
+ const GeoTrd* tempSLay = nullptr;
+ const GeoShape* tempSLay1 = nullptr;
+ const GeoTrd* tempSFoamup = nullptr;
+ const GeoShape* tempSFoamup1 = nullptr;
+ const GeoTrd* tempSFoamlow = nullptr;
+ const GeoShape* tempSFoamlow1 = nullptr;
if (submlthick*submlwidthl*submllength > 0) {
if (verbose_multilayer) {
@@ -210,38 +248,40 @@ GeoFullPhysVol* MultiLayer::build()
<< endmsg;
}
- if (foamthicknessup > foamthicknesslow) {
- if (foamthicknessup*submlwidths*submllength > 0) {
- if (cutoutFullLength[isub]) {
- tempSFoamup = new GeoTrd(foamthicknessup/2., foamthicknessup/2.,
- submlwidths, submlwidthl, submllength);
+ if (!(foamthicknessup==0 && foamthicknesslow==0)) {
+ if (foamthicknessup > foamthicknesslow) {
+ if (foamthicknessup*submlwidths*submllength > 0) {
+ if (cutoutFullLength[isub]) {
+ tempSFoamup = new GeoTrd(foamthicknessup/2., foamthicknessup/2.,
+ submlwidths, submlwidthl, submllength);
+ } else {
+ tempSFoamup = new GeoTrd(foamthicknessup/2., foamthicknessup/2.,
+ cutoutTubeLength[isub]/2., cutoutTubeLength[isub]/2.,
+ submllength);
+ }
+
+ tempSFoamup1 = &( (*tempSFoamup)<<submlpos);
} else {
- tempSFoamup = new GeoTrd(foamthicknessup/2., foamthicknessup/2.,
- cutoutTubeLength[isub]/2., cutoutTubeLength[isub]/2.,
- submllength);
+ log << MSG::INFO << " problem with shape of upper foam trapezoid in LogVolName "
+ << logVolName << " thick,width,length " << foamthicknessup
+ << " " << submlwidths << " " << submllength << endmsg;
}
-
- tempSFoamup1 = &( (*tempSFoamup)<<submlpos);
} else {
- log << MSG::INFO << " problem with shape of upper foam trapezoid in LogVolName "
- << logVolName << " thick,width,length " << foamthicknessup
- << " " << submlwidths << " " << submllength << endmsg;
- }
- } else {
- if (foamthicknesslow*submlwidths*submllength > 0) {
- if (cutoutFullLength[isub]) {
- tempSFoamlow = new GeoTrd(foamthicknesslow/2., foamthicknesslow/2.,
- submlwidths, submlwidthl, submllength);
+ if (foamthicknesslow*submlwidths*submllength > 0) {
+ if (cutoutFullLength[isub]) {
+ tempSFoamlow = new GeoTrd(foamthicknesslow/2., foamthicknesslow/2.,
+ submlwidths, submlwidthl, submllength);
+ } else {
+ tempSFoamlow = new GeoTrd(foamthicknesslow/2., foamthicknesslow/2.,
+ cutoutTubeLength[isub]/2., cutoutTubeLength[isub]/2.,
+ submllength);
+ }
+ tempSFoamlow1 = &( (*tempSFoamlow)<<submlpos);
} else {
- tempSFoamlow = new GeoTrd(foamthicknesslow/2., foamthicknesslow/2.,
- cutoutTubeLength[isub]/2., cutoutTubeLength[isub]/2.,
- submllength);
+ log << MSG::INFO << " problem with shape of lower foam trapezoid in LogVolName "
+ << logVolName << " thick,width,length " << foamthicknesslow
+ << " " << submlwidths << " " << submllength << endmsg;
}
- tempSFoamlow1 = &( (*tempSFoamlow)<<submlpos);
- } else {
- log << MSG::INFO << " problem with shape of lower foam trapezoid in LogVolName "
- << logVolName << " thick,width,length " << foamthicknesslow
- << " " << submlwidths << " " << submllength << endmsg;
}
}
@@ -272,12 +312,12 @@ GeoFullPhysVol* MultiLayer::build()
// Add/subtract cylinders at ends of layers 2 and 4 to accommodate the last MDT
- const GeoShape* stube = NULL;
+ const GeoShape* stube = nullptr;
double tL = longWidth/2.0 - (tubePitch/2.)*TrdDwoverL;
stube = new GeoTube(0.0, tubePitch/2., tL);
stube = & ( (*stube) << GeoTrf::RotateX3D(90.*Gaudi::Units::deg) );
- const GeoShape* stubewithcut = NULL;
- if (cutoutNsteps > 1) {
+ const GeoShape* stubewithcut = nullptr;
+ if (cutoutNsteps > 1 && !m_nonCutoutXSteps.size()) { // adaption of tube cuts only needed for cutouts along amdb-y
double toptubelength = cutoutTubeLength[cutoutNsteps-1];
if (cutoutFullLength[cutoutNsteps-1]) toptubelength = longWidth;
stubewithcut = new GeoTube(0.0, tubePitch/2., toptubelength/2.0);
@@ -301,7 +341,7 @@ GeoFullPhysVol* MultiLayer::build()
slay = &(slay->subtract( (*stube)<<GeoTrf::Translate3D(-mdtthickness/2.+yy[i],0.,-length/2.) ));
// add tube at the end
// distinguish stations with/without cutouts
- if (cutoutNsteps == 1) {
+ if (cutoutNsteps == 1 || m_nonCutoutXSteps.size()) {
// no cutouts
if (verbose_multilayer) {
log << MSG::VERBOSE
@@ -309,7 +349,7 @@ GeoFullPhysVol* MultiLayer::build()
<< " z = " << length/2. << endmsg;
}
slay = &(slay->add( (*stube)<<GeoTrf::Translate3D(-mdtthickness/2.+yy[i],0.,length/2.-tubePitch/2.) ));
- } else {
+ } else { // adaption of tube cuts only needed for cutouts along amdb-y
// there are cutouts
if (verbose_multilayer) {
log << MSG::VERBOSE
@@ -330,10 +370,10 @@ GeoFullPhysVol* MultiLayer::build()
GeoFullPhysVol* play = new GeoFullPhysVol(llay);
double foamposition = 0.;
- const GeoShape* sfoam = NULL;
- const GeoMaterial* mfoam = NULL;
- GeoLogVol* lfoam = NULL;
- GeoPhysVol* pfoam = NULL;
+ const GeoShape* sfoam = nullptr;
+ const GeoMaterial* mfoam = nullptr;
+ GeoLogVol* lfoam = nullptr;
+ GeoPhysVol* pfoam = nullptr;
if (foamthicknesslow != 0) {
foamposition = -(mdtthickness - foamthicknesslow)/2.;
@@ -359,14 +399,16 @@ GeoFullPhysVol* MultiLayer::build()
mfoam = getMaterialManager()->getMaterial("muo::Foam");
lfoam = new GeoLogVol("MultiLayerFoam", sfoam, mfoam);
- } else if (logVolName == "BME1MDT09" || logVolName == "BME2MDT09") {
- lfoam = 0;
+ } else if ( logVolName.find("MDT09") != std::string::npos || logVolName.find("MDT14") != std::string::npos ) {
+ // MDT09 is used for BME and BIS sMDTs, MDT14 is used for 2nd multilayer of BIS78
+ // All those sMDTs have no foam layer
+ lfoam = nullptr;
} else {
log << MSG::ERROR << " no foam thickeness, while it was expected " << endmsg;
throw std::runtime_error("ATTENTION: no foam");
}
- if ( logVolName != "BME1MDT09" && logVolName != "BME2MDT09" ) { //@@
+ if ( lfoam ) { //@@
pfoam = new GeoPhysVol(lfoam);
GeoTransform* xf = new GeoTransform (GeoTrf::TranslateX3D(foamposition));
GeoNameTag* nt = new GeoNameTag(name+" MultiLayerFoam");
@@ -387,7 +429,7 @@ GeoFullPhysVol* MultiLayer::build()
std::vector<int> Ntubes;
// No cutouts
- if (cutoutNsteps <= 1) {
+ if (cutoutNsteps <= 1 || m_nonCutoutXSteps.size()) { // adaption of tube cuts only needed for cutouts along amdb-y
for (int j = 0; j < nrOfSteps; j++) {
tube.length=width+j*diff/nrOfSteps;
@@ -621,7 +663,7 @@ GeoFullPhysVol* MultiLayer::build()
}
} // Loop over layers
- } else if (cutoutNsteps > 1) {
+ } else if (cutoutNsteps > 1 && !m_nonCutoutXSteps.size()) { // adaption of tube cuts only needed for cutouts along amdb-y
bool arrowpointoutwards=false;
bool cutAtAngle = cutoutAtAngle;
if (xx[1]-xx[0]>0.) {
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx
index ae08912e1a3580e9f6c5c3473d6a21dbc0bcf014..090ba7f9c2d1618b5d400d7925a1b189a24838df 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx
@@ -747,8 +747,8 @@ GeoVPhysVol* MuonChamber::build(
std::string key=stName+techname;
// for cutouts:
- // MDT cutouts for BOS1,5, BMS7,14, (problem with BMS4,10), EMS
- bool mdtCutoutFlag = ((stname == "BOS" && std::abs(zi) == 6) || stname == "BMG" ||
+ // MDT cutouts for BOS1,5, BMS7,14, (problem with BMS4,10), EMS, BMG and BIS MDT14
+ bool mdtCutoutFlag = ((stname == "BOS" && std::abs(zi) == 6) || stname == "BMG" || techname=="MDT14" ||
(stname == "BMS" && (std::abs(zi) == 1 && fi == 3)) ||
(stname == "EMS" && (std::abs(zi) == 1 || std::abs(zi) == 3)));
if (((manager->IncludeCutoutsFlag() && mdtCutoutFlag) ||
@@ -1396,17 +1396,18 @@ GeoVPhysVol* MuonChamber::build(
ndbz[doubletR-1]++;
float zdivision=100.;// point between doubletZ=1 and 2;
- if (stname.find("BI")!=std::string::npos && std::abs(zi)==7) zdivision=400.;//BIS78 : RPC8 is smaller than other RPCs
- // do the following check for all RPCs but the BI (station1-6) ones
- if (stname.find("BI")==std::string::npos || std::abs(zi)==7) {
+ // the BIS RPCs are 3-gap RPCs mounted inside of the BIS sMDTs,
+ // for BIS78, there is a second RPC doubletZ at amdb-y (MuonGeoModel-z)=144mm inside the station
+ if (stname.find("BI")!=std::string::npos) {
+ if (std::abs(stationPhi)>=7 && rp->posz>100) doubletZ=2;
+ else doubletZ = ndbz[doubletR-1];
+ } else {
if (zi <= 0 && !is_mirrored) {
if (zpos < -zdivision*Gaudi::Units::mm) doubletZ=2;
} else {
if (zpos > zdivision*Gaudi::Units::mm) doubletZ=2;
}
- } else {
- doubletZ = ndbz[doubletR-1];
}
// BMS (BOG) RPCs can have |xpos|=950 (|xpos|=350)
diff --git a/MuonSpectrometer/MuonGeoModel/src/RpcLayer.cxx b/MuonSpectrometer/MuonGeoModel/src/RpcLayer.cxx
index 123910170f791d82f914c056fd4d9bd6ad2ba0d9..2c8c60ca3b1e494f2d29c6fdee895d7ec1705d38 100755
--- a/MuonSpectrometer/MuonGeoModel/src/RpcLayer.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/RpcLayer.cxx
@@ -2,10 +2,10 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#include "MuonGeoModel/RpcLayer.h"
#include "MuonGeoModel/Rpc.h"
#include "MuonGeoModel/RPC_Technology.h"
-#include "MuonGeoModel/RpcLayer.h"
#include "MuonGeoModel/Cutout.h"
#include "MuonGeoModel/MYSQL.h"
#include "GeoModelKernel/GeoCutVolAction.h"
@@ -18,9 +18,10 @@
#include "GeoModelKernel/GeoIdentifierTag.h"
#include "GeoModelKernel/GeoDefinitions.h"
#include "MuonReadoutGeometry/GlobalUtilities.h"
+#include "GeoModelKernel/GeoShapeSubtraction.h" // for cutouts
+
#include <iomanip>
#include <TString.h> // for Form
-#include "GeoModelKernel/GeoShapeSubtraction.h" // for cutouts
namespace {
static constexpr double const& rpc3GapLayerThickness = 11.8; // gas vol. + ( bakelite + graphite + PET )x2
@@ -112,10 +113,15 @@ GeoVPhysVol* RpcLayer::build(int cutoutson, std::vector<Cutout*> vcutdef)
strpanWidth/2.-strpanCopperThickness,
strpanLength/2.-strpanCopperThickness);
const GeoShape* scustrpan = sstrpan;
+
+ auto stripMaterial = getMaterialManager()->getMaterial("muo::RpcFoam");
+ if (m->nGasGaps()==3) { // for BIS RPCs
+ stripMaterial = getMaterialManager()->getMaterial("muo::Forex");
+ }
+
GeoLogVol* lcustrpan = new GeoLogVol("RPC_StripPanelCuSkin", scustrpan,
getMaterialManager()->getMaterial("std::Copper"));
- GeoLogVol* lfoamstrpan = new GeoLogVol("RPC_StripPanelFoam", sfoamstrpan,
- getMaterialManager()->getMaterial("muo::RpcFoam"));
+ GeoLogVol* lfoamstrpan = new GeoLogVol("RPC_StripPanelFoam", sfoamstrpan, stripMaterial);
newpos += strpanThickness/2. + tol/2.;
GeoPhysVol* pcustrpan11 = new GeoPhysVol(lcustrpan);
@@ -202,23 +208,23 @@ GeoVPhysVol* RpcLayer::build(int cutoutson, std::vector<Cutout*> vcutdef)
if (name == "RPC26" ) { //big RPC7
gasLength = ggLength - 93.25; // ggLength - deadframesizeEta
gasWidth = ggWidth - 109.52; // ggWidth - deadframesizePhi
- y_translation = -45.715;
- z_translation = -37.85;
+ y_translation = -9.1;
+ z_translation = 3.22;
} else if (name == "RPC27" ){//small RPC7
gasLength = ggLength - 93.12; // ggLength - deadframesizeEta
gasWidth = ggWidth - 109.52; // ggWidth - deadframesizePhi
- y_translation = -45.715;
- z_translation = -37.63;
+ y_translation = -9.1;
+ z_translation = 3.06;
} else if (name == "RPC28"){//big RPC8
gasLength = ggLength - 93.04; // ggLength - deadframesizeEta
gasWidth = ggWidth - 109.52; // ggWidth - deadframesizePhi
- y_translation = -26.99;
- z_translation = -37.64;
+ y_translation = -27.7;
+ z_translation = 3.11;
} else if (name == "RPC29"){//small RPC8
gasLength = ggLength - 93.04; // ggLength - deadframesizeEta
gasWidth = ggWidth - 109.2; // ggWidth - deadframesizePhi
- y_translation = -45.8;
- z_translation = -37.64;
+ y_translation = -8.8;
+ z_translation = 3.11;
}
}
diff --git a/MuonSpectrometer/MuonGeoModel/src/sTGC.cxx b/MuonSpectrometer/MuonGeoModel/src/sTGC.cxx
index 6741762fb40139e10f4d36498cffa4d35bc42897..b7b6a3a92fcb9e9c7c0f2cc6e9b29cfb54306f94 100755
--- a/MuonSpectrometer/MuonGeoModel/src/sTGC.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/sTGC.cxx
@@ -3,7 +3,10 @@
*/
#include "MuonGeoModel/sTGC.h"
+
#include "MuonAGDDDescription/sTGC_Technology.h"
+#include "MuonAGDDDescription/sTGCDetectorDescription.h"
+#include "MuonAGDDDescription/sTGCDetectorHelper.h"
#include "AGDDKernel/AGDDDetectorStore.h"
#include "MuonGeoModel/Station.h"
#include "MuonGeoModel/MYSQL.h"
@@ -21,7 +24,6 @@
#include "GeoModelKernel/GeoTransform.h"
#include "GeoModelKernel/GeoSerialIdentifier.h"
#include "GeoModelKernel/GeoIdentifierTag.h"
-// for cutouts:
#include "GeoModelKernel/GeoShapeSubtraction.h"
#include "GeoModelKernel/GeoShapeIntersection.h"
#include "GeoModelKernel/GeoShapeShift.h"
@@ -54,14 +56,17 @@ GeoFullPhysVol* sTGC::build(int minimalgeo)
GeoFullPhysVol* sTGC::build(int minimalgeo, int , std::vector<Cutout*> )
{
AGDDDetectorStore* ds = AGDDDetectorStore::GetDetectorStore();
+ sTGCDetectorHelper stgcHelper;
+ sTGCDetectorDescription* stgc_descr = stgcHelper.Get_sTGCDetectorSubType(m_component->subType);
sTGC_Technology* t = (sTGC_Technology*) ds->GetTechnology(name);
thickness = t->Thickness();
double gasTck=t->gasThickness;
double pcbTck=t->pcbThickness;
- double f4=t->f4Thickness;
- double f5=t->f5Thickness;
- double f6=t->f6Thickness;
+ double f4=stgc_descr->ylFrame();
+ double f5=stgc_descr->ysFrame();
+ double f6=stgc_descr->xFrame();
+
//Evaluate honeycomb thickness
double chamberTck = gasTck+pcbTck; //Note: pcbTck is the xml value and is the combined thickness of 2 pcbs.
double honeycombTck = (thickness - 4*chamberTck)/5;
diff --git a/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonHitRelocation.h b/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonHitRelocation.h
index 875880c81cb1dd6c85b548ca0b1c82f71250ad56..4920a33dcb32289d976d2f8238e8c0b305ebf462 100644
--- a/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonHitRelocation.h
+++ b/MuonSpectrometer/MuonGeoModelTest/MuonGeoModelTest/MuonHitRelocation.h
@@ -7,6 +7,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
+
#include "MuonSimEvent/MdtHitIdHelper.h"
#include "MuonSimEvent/RpcHitIdHelper.h"
#include "MuonSimEvent/TgcHitIdHelper.h"
@@ -15,6 +16,8 @@
#include "MuonSimEvent/MicromegasHitIdHelper.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
+#include <string>
+
// Histograms quantities related to G4 Hits in the Atlas
// Detector. Used to validate GeoModel + much more.
diff --git a/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx b/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx
index d6c7ad5c1b7781ee1bd0ea471037e16c599cddac..fcec4757a47e7b21a0ce6e999f66f636ccd0030d 100644
--- a/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/src/MuonHitRelocation.cxx
@@ -3,7 +3,7 @@
*/
#include "MuonGeoModelTest/MuonHitRelocation.h"
-#include "GaudiKernel/MsgStream.h"
+
#include "GaudiKernel/NTuple.h"
#include "GaudiKernel/INTupleSvc.h"
#include "GaudiKernel/SmartDataPtr.h"
@@ -19,12 +19,8 @@
#include "MuonSimEvent/RPCSimHit.h"
#include "MuonSimEvent/TGCSimHit.h"
#include "MuonSimEvent/CSCSimHit.h"
-
#include "GeoAdaptors/GeoMuonHits.h"
-
-#include <string>
-
class MuonHitRelocation::Clockwork {
public:
@@ -134,7 +130,7 @@ StatusCode MuonHitRelocation::initialize(){
m_cmuonHelper = CscHitIdHelper::GetHelper();
m_rmuonHelper = RpcHitIdHelper::GetHelper(m_idHelperSvc->rpcIdHelper().gasGapMax());
m_tmuonHelper = TgcHitIdHelper::GetHelper();
- m_mmuonHelper = MdtHitIdHelper::GetHelper();
+ m_mmuonHelper = MdtHitIdHelper::GetHelper(m_idHelperSvc->mdtIdHelper().tubeMax());
return StatusCode::SUCCESS;
}
diff --git a/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MdtIdHelper.h b/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MdtIdHelper.h
index ec318ddf578ed6515b25f5bf5456347d6a029028..89647084a44557c81c81061f279744f771da8848 100644
--- a/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MdtIdHelper.h
+++ b/MuonSpectrometer/MuonIdHelpers/MuonIdHelpers/MdtIdHelper.h
@@ -69,7 +69,7 @@ class MdtIdHelper : public MuonIdHelper
// Destructor
- virtual ~MdtIdHelper();
+ virtual ~MdtIdHelper()=default;
////////////// compact identifier stuff begins //////////////////////////////////////
@@ -198,6 +198,7 @@ class MdtIdHelper : public MuonIdHelper
TubeMin = 1,
TubeMax = 78
};
+ unsigned int m_tubesMax; // maximum number of tubes in any chamber
};
// For backwards compatibility
@@ -430,7 +431,7 @@ inline int MdtIdHelper::tubeMin() const
inline int MdtIdHelper::tubeMax() const
{
- return TubeMax;
+ return m_tubesMax;
}
/// Utility methods
diff --git a/MuonSpectrometer/MuonIdHelpers/share/muon_id_test.ref b/MuonSpectrometer/MuonIdHelpers/share/muon_id_test.ref
index 91e3a621d34314237180d92462a91ac5c48bc9b2..e3b438e25cd32988cb14343dd62e256a1a701df9 100644
--- a/MuonSpectrometer/MuonIdHelpers/share/muon_id_test.ref
+++ b/MuonSpectrometer/MuonIdHelpers/share/muon_id_test.ref
@@ -440,6 +440,7 @@ MdtIdHelper INFO The element hash max is 1188
MdtIdHelper INFO The detector element hash max is 2328
MdtIdHelper INFO Initializing MDT hash indices for finding neighbors ...
MdtIdHelper VERBOSE MuonIdHelper::init_neighbors
+MdtIdHelper DEBUG Maximum number of MDT tubes is 78
RpcIdHelper DEBUG (Re)initialize
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
@@ -774,7 +775,7 @@ CscIdHelper INFO The detector element hash max is 64
CscIdHelper INFO The channel hash max is 61440
CscIdHelper INFO Initializing CSC hash indices for finding neighbors ...
CscIdHelper VERBOSE MuonIdHelper::init_neighbors
-=========> checking dictionnary file=IdDictMuonSpectrometer_R.09.AsymNSW.xml
+=========> checking dictionnary file=IdDictMuonSpectrometer_R.09.02.Asym.xml
MdtIdHelper DEBUG (Re)initialize
AtlasDetectorID DEBUG Could not get value for label 'no_side' of field 'DetZside' in dictionary Calorimeter
AtlasDetectorID::initialize_from_dictionary - OK
@@ -786,10 +787,10 @@ MdtIdHelper DEBUG phi decode 1 vals 1:8 mask/zero m
MdtIdHelper DEBUG technology decode 1 vals 0,2 mask/zero mask/shift/bits/offset 1 ffffbfffffffffff 46 1 17 indexes 0 0 1 mode enumerated
MdtIdHelper DEBUG multilayer decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 ffffdfffffffffff 45 1 18 indexes mode both_bounded
MdtIdHelper DEBUG layer decode 1 vals 1:4 mask/zero mask/shift/bits/offset 3 ffffe7ffffffffff 43 2 19 indexes mode both_bounded
-MdtIdHelper DEBUG tube decode 1 vals 1:78 mask/zero mask/shift/bits/offset 7f fffff80fffffffff 36 7 21 indexes mode both_bounded
-MdtIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 216
-MdtIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 257
-MdtIdHelper INFO MultiRange built successfully to tube: MultiRange size is 257
+MdtIdHelper DEBUG tube decode 1 vals 1:110 mask/zero mask/shift/bits/offset 7f fffff80fffffffff 36 7 21 indexes mode both_bounded
+MdtIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 218
+MdtIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 259
+MdtIdHelper INFO MultiRange built successfully to tube: MultiRange size is 259
MdtIdHelper DEBUG module field size is 5 field index = 0
MdtIdHelper DEBUG module field size is 1 field index = 1
MdtIdHelper DEBUG module field size is 4 field index = 2
@@ -820,83 +821,83 @@ MdtIdHelper DEBUG module field size is 16 field index = 26
MdtIdHelper DEBUG module field size is 16 field index = 27
MdtIdHelper DEBUG module field size is 16 field index = 28
MdtIdHelper DEBUG module field size is 16 field index = 29
-MdtIdHelper DEBUG module field size is 10 field index = 30
-MdtIdHelper DEBUG module field size is 6 field index = 31
-MdtIdHelper DEBUG module field size is 16 field index = 32
-MdtIdHelper DEBUG module field size is 16 field index = 33
+MdtIdHelper DEBUG module field size is 5 field index = 30
+MdtIdHelper DEBUG module field size is 3 field index = 31
+MdtIdHelper DEBUG module field size is 8 field index = 32
+MdtIdHelper DEBUG module field size is 8 field index = 33
MdtIdHelper DEBUG module field size is 16 field index = 34
-MdtIdHelper DEBUG module field size is 1 field index = 35
+MdtIdHelper DEBUG module field size is 16 field index = 35
MdtIdHelper DEBUG module field size is 1 field index = 36
MdtIdHelper DEBUG module field size is 1 field index = 37
MdtIdHelper DEBUG module field size is 1 field index = 38
-MdtIdHelper DEBUG module field size is 2 field index = 39
+MdtIdHelper DEBUG module field size is 1 field index = 39
MdtIdHelper DEBUG module field size is 2 field index = 40
-MdtIdHelper DEBUG module field size is 1 field index = 41
-MdtIdHelper DEBUG module field size is 4 field index = 42
-MdtIdHelper DEBUG module field size is 2 field index = 43
-MdtIdHelper DEBUG module field size is 1 field index = 44
-MdtIdHelper DEBUG module field size is 32 field index = 45
-MdtIdHelper DEBUG module field size is 16 field index = 46
-MdtIdHelper DEBUG module field size is 14 field index = 47
-MdtIdHelper DEBUG module field size is 2 field index = 48
-MdtIdHelper DEBUG module field size is 14 field index = 49
-MdtIdHelper DEBUG module field size is 2 field index = 50
-MdtIdHelper DEBUG module field size is 12 field index = 51
+MdtIdHelper DEBUG module field size is 2 field index = 41
+MdtIdHelper DEBUG module field size is 1 field index = 42
+MdtIdHelper DEBUG module field size is 4 field index = 43
+MdtIdHelper DEBUG module field size is 2 field index = 44
+MdtIdHelper DEBUG module field size is 1 field index = 45
+MdtIdHelper DEBUG module field size is 32 field index = 46
+MdtIdHelper DEBUG module field size is 16 field index = 47
+MdtIdHelper DEBUG module field size is 14 field index = 48
+MdtIdHelper DEBUG module field size is 2 field index = 49
+MdtIdHelper DEBUG module field size is 14 field index = 50
+MdtIdHelper DEBUG module field size is 2 field index = 51
MdtIdHelper DEBUG module field size is 12 field index = 52
MdtIdHelper DEBUG module field size is 12 field index = 53
MdtIdHelper DEBUG module field size is 12 field index = 54
MdtIdHelper DEBUG module field size is 12 field index = 55
MdtIdHelper DEBUG module field size is 12 field index = 56
-MdtIdHelper DEBUG module field size is 4 field index = 57
+MdtIdHelper DEBUG module field size is 12 field index = 57
MdtIdHelper DEBUG module field size is 4 field index = 58
MdtIdHelper DEBUG module field size is 4 field index = 59
-MdtIdHelper DEBUG module field size is 2 field index = 60
-MdtIdHelper DEBUG module field size is 1 field index = 61
-MdtIdHelper DEBUG module field size is 2 field index = 62
-MdtIdHelper DEBUG module field size is 1 field index = 63
-MdtIdHelper DEBUG module field size is 3 field index = 64
-MdtIdHelper DEBUG module field size is 2 field index = 65
-MdtIdHelper DEBUG module field size is 3 field index = 66
-MdtIdHelper DEBUG module field size is 1 field index = 67
+MdtIdHelper DEBUG module field size is 4 field index = 60
+MdtIdHelper DEBUG module field size is 2 field index = 61
+MdtIdHelper DEBUG module field size is 1 field index = 62
+MdtIdHelper DEBUG module field size is 2 field index = 63
+MdtIdHelper DEBUG module field size is 1 field index = 64
+MdtIdHelper DEBUG module field size is 3 field index = 65
+MdtIdHelper DEBUG module field size is 2 field index = 66
+MdtIdHelper DEBUG module field size is 3 field index = 67
MdtIdHelper DEBUG module field size is 1 field index = 68
-MdtIdHelper DEBUG module field size is 7 field index = 69
-MdtIdHelper DEBUG module field size is 6 field index = 70
-MdtIdHelper DEBUG module field size is 2 field index = 71
-MdtIdHelper DEBUG module field size is 1 field index = 72
-MdtIdHelper DEBUG module field size is 14 field index = 73
-MdtIdHelper DEBUG module field size is 2 field index = 74
-MdtIdHelper DEBUG module field size is 16 field index = 75
+MdtIdHelper DEBUG module field size is 1 field index = 69
+MdtIdHelper DEBUG module field size is 7 field index = 70
+MdtIdHelper DEBUG module field size is 6 field index = 71
+MdtIdHelper DEBUG module field size is 2 field index = 72
+MdtIdHelper DEBUG module field size is 1 field index = 73
+MdtIdHelper DEBUG module field size is 14 field index = 74
+MdtIdHelper DEBUG module field size is 2 field index = 75
MdtIdHelper DEBUG module field size is 16 field index = 76
MdtIdHelper DEBUG module field size is 16 field index = 77
-MdtIdHelper DEBUG module field size is 10 field index = 78
-MdtIdHelper DEBUG module field size is 2 field index = 79
-MdtIdHelper DEBUG module field size is 12 field index = 80
+MdtIdHelper DEBUG module field size is 16 field index = 78
+MdtIdHelper DEBUG module field size is 10 field index = 79
+MdtIdHelper DEBUG module field size is 2 field index = 80
MdtIdHelper DEBUG module field size is 12 field index = 81
MdtIdHelper DEBUG module field size is 12 field index = 82
MdtIdHelper DEBUG module field size is 12 field index = 83
MdtIdHelper DEBUG module field size is 12 field index = 84
-MdtIdHelper DEBUG module field size is 4 field index = 85
+MdtIdHelper DEBUG module field size is 12 field index = 85
MdtIdHelper DEBUG module field size is 4 field index = 86
MdtIdHelper DEBUG module field size is 4 field index = 87
MdtIdHelper DEBUG module field size is 4 field index = 88
-MdtIdHelper DEBUG module field size is 2 field index = 89
-MdtIdHelper DEBUG module field size is 4 field index = 90
+MdtIdHelper DEBUG module field size is 4 field index = 89
+MdtIdHelper DEBUG module field size is 2 field index = 90
MdtIdHelper DEBUG module field size is 4 field index = 91
MdtIdHelper DEBUG module field size is 4 field index = 92
MdtIdHelper DEBUG module field size is 4 field index = 93
-MdtIdHelper DEBUG module field size is 8 field index = 94
+MdtIdHelper DEBUG module field size is 4 field index = 94
MdtIdHelper DEBUG module field size is 8 field index = 95
MdtIdHelper DEBUG module field size is 8 field index = 96
-MdtIdHelper DEBUG module field size is 4 field index = 97
-MdtIdHelper DEBUG module field size is 8 field index = 98
-MdtIdHelper DEBUG module field size is 4 field index = 99
+MdtIdHelper DEBUG module field size is 8 field index = 97
+MdtIdHelper DEBUG module field size is 4 field index = 98
+MdtIdHelper DEBUG module field size is 8 field index = 99
MdtIdHelper DEBUG module field size is 4 field index = 100
-MdtIdHelper DEBUG module field size is 8 field index = 101
+MdtIdHelper DEBUG module field size is 4 field index = 101
MdtIdHelper DEBUG module field size is 8 field index = 102
-MdtIdHelper DEBUG module field size is 14 field index = 103
+MdtIdHelper DEBUG module field size is 8 field index = 103
MdtIdHelper DEBUG module field size is 14 field index = 104
-MdtIdHelper DEBUG module field size is 2 field index = 105
-MdtIdHelper DEBUG module field size is 16 field index = 106
+MdtIdHelper DEBUG module field size is 14 field index = 105
+MdtIdHelper DEBUG module field size is 2 field index = 106
MdtIdHelper DEBUG module field size is 16 field index = 107
MdtIdHelper DEBUG module field size is 16 field index = 108
MdtIdHelper DEBUG module field size is 16 field index = 109
@@ -920,11 +921,12 @@ MdtIdHelper DEBUG module field size is 16 field index = 126
MdtIdHelper DEBUG module field size is 16 field index = 127
MdtIdHelper DEBUG module field size is 16 field index = 128
MdtIdHelper DEBUG module field size is 16 field index = 129
-MdtIdHelper DEBUG module field size is 2 field index = 130
+MdtIdHelper DEBUG module field size is 16 field index = 130
MdtIdHelper DEBUG module field size is 2 field index = 131
-MdtIdHelper DEBUG module field size is 4 field index = 132
+MdtIdHelper DEBUG module field size is 2 field index = 132
MdtIdHelper DEBUG module field size is 4 field index = 133
MdtIdHelper DEBUG module field size is 4 field index = 134
+MdtIdHelper DEBUG module field size is 4 field index = 135
MdtIdHelper DEBUG detector element field size is 10 field index = 0
MdtIdHelper DEBUG detector element field size is 2 field index = 1
MdtIdHelper DEBUG detector element field size is 8 field index = 2
@@ -959,85 +961,85 @@ MdtIdHelper DEBUG detector element field size is 32 field index = 30
MdtIdHelper DEBUG detector element field size is 32 field index = 31
MdtIdHelper DEBUG detector element field size is 32 field index = 32
MdtIdHelper DEBUG detector element field size is 32 field index = 33
-MdtIdHelper DEBUG detector element field size is 20 field index = 34
-MdtIdHelper DEBUG detector element field size is 12 field index = 35
-MdtIdHelper DEBUG detector element field size is 16 field index = 36
+MdtIdHelper DEBUG detector element field size is 10 field index = 34
+MdtIdHelper DEBUG detector element field size is 6 field index = 35
+MdtIdHelper DEBUG detector element field size is 8 field index = 36
MdtIdHelper DEBUG detector element field size is 16 field index = 37
MdtIdHelper DEBUG detector element field size is 16 field index = 38
-MdtIdHelper DEBUG detector element field size is 2 field index = 39
+MdtIdHelper DEBUG detector element field size is 16 field index = 39
MdtIdHelper DEBUG detector element field size is 2 field index = 40
MdtIdHelper DEBUG detector element field size is 2 field index = 41
MdtIdHelper DEBUG detector element field size is 2 field index = 42
-MdtIdHelper DEBUG detector element field size is 4 field index = 43
+MdtIdHelper DEBUG detector element field size is 2 field index = 43
MdtIdHelper DEBUG detector element field size is 4 field index = 44
-MdtIdHelper DEBUG detector element field size is 2 field index = 45
-MdtIdHelper DEBUG detector element field size is 8 field index = 46
-MdtIdHelper DEBUG detector element field size is 4 field index = 47
-MdtIdHelper DEBUG detector element field size is 2 field index = 48
-MdtIdHelper DEBUG detector element field size is 64 field index = 49
-MdtIdHelper DEBUG detector element field size is 32 field index = 50
-MdtIdHelper DEBUG detector element field size is 28 field index = 51
-MdtIdHelper DEBUG detector element field size is 4 field index = 52
-MdtIdHelper DEBUG detector element field size is 28 field index = 53
-MdtIdHelper DEBUG detector element field size is 4 field index = 54
-MdtIdHelper DEBUG detector element field size is 24 field index = 55
+MdtIdHelper DEBUG detector element field size is 4 field index = 45
+MdtIdHelper DEBUG detector element field size is 2 field index = 46
+MdtIdHelper DEBUG detector element field size is 8 field index = 47
+MdtIdHelper DEBUG detector element field size is 4 field index = 48
+MdtIdHelper DEBUG detector element field size is 2 field index = 49
+MdtIdHelper DEBUG detector element field size is 64 field index = 50
+MdtIdHelper DEBUG detector element field size is 32 field index = 51
+MdtIdHelper DEBUG detector element field size is 28 field index = 52
+MdtIdHelper DEBUG detector element field size is 4 field index = 53
+MdtIdHelper DEBUG detector element field size is 28 field index = 54
+MdtIdHelper DEBUG detector element field size is 4 field index = 55
MdtIdHelper DEBUG detector element field size is 24 field index = 56
MdtIdHelper DEBUG detector element field size is 24 field index = 57
-MdtIdHelper DEBUG detector element field size is 12 field index = 58
+MdtIdHelper DEBUG detector element field size is 24 field index = 58
MdtIdHelper DEBUG detector element field size is 12 field index = 59
-MdtIdHelper DEBUG detector element field size is 24 field index = 60
-MdtIdHelper DEBUG detector element field size is 12 field index = 61
+MdtIdHelper DEBUG detector element field size is 12 field index = 60
+MdtIdHelper DEBUG detector element field size is 24 field index = 61
MdtIdHelper DEBUG detector element field size is 12 field index = 62
-MdtIdHelper DEBUG detector element field size is 8 field index = 63
+MdtIdHelper DEBUG detector element field size is 12 field index = 63
MdtIdHelper DEBUG detector element field size is 8 field index = 64
MdtIdHelper DEBUG detector element field size is 8 field index = 65
-MdtIdHelper DEBUG detector element field size is 4 field index = 66
-MdtIdHelper DEBUG detector element field size is 2 field index = 67
-MdtIdHelper DEBUG detector element field size is 4 field index = 68
-MdtIdHelper DEBUG detector element field size is 2 field index = 69
-MdtIdHelper DEBUG detector element field size is 6 field index = 70
-MdtIdHelper DEBUG detector element field size is 4 field index = 71
-MdtIdHelper DEBUG detector element field size is 6 field index = 72
-MdtIdHelper DEBUG detector element field size is 2 field index = 73
+MdtIdHelper DEBUG detector element field size is 8 field index = 66
+MdtIdHelper DEBUG detector element field size is 4 field index = 67
+MdtIdHelper DEBUG detector element field size is 2 field index = 68
+MdtIdHelper DEBUG detector element field size is 4 field index = 69
+MdtIdHelper DEBUG detector element field size is 2 field index = 70
+MdtIdHelper DEBUG detector element field size is 6 field index = 71
+MdtIdHelper DEBUG detector element field size is 4 field index = 72
+MdtIdHelper DEBUG detector element field size is 6 field index = 73
MdtIdHelper DEBUG detector element field size is 2 field index = 74
-MdtIdHelper DEBUG detector element field size is 14 field index = 75
-MdtIdHelper DEBUG detector element field size is 12 field index = 76
-MdtIdHelper DEBUG detector element field size is 4 field index = 77
-MdtIdHelper DEBUG detector element field size is 2 field index = 78
-MdtIdHelper DEBUG detector element field size is 28 field index = 79
-MdtIdHelper DEBUG detector element field size is 4 field index = 80
-MdtIdHelper DEBUG detector element field size is 32 field index = 81
+MdtIdHelper DEBUG detector element field size is 2 field index = 75
+MdtIdHelper DEBUG detector element field size is 14 field index = 76
+MdtIdHelper DEBUG detector element field size is 12 field index = 77
+MdtIdHelper DEBUG detector element field size is 4 field index = 78
+MdtIdHelper DEBUG detector element field size is 2 field index = 79
+MdtIdHelper DEBUG detector element field size is 28 field index = 80
+MdtIdHelper DEBUG detector element field size is 4 field index = 81
MdtIdHelper DEBUG detector element field size is 32 field index = 82
MdtIdHelper DEBUG detector element field size is 32 field index = 83
-MdtIdHelper DEBUG detector element field size is 20 field index = 84
-MdtIdHelper DEBUG detector element field size is 4 field index = 85
-MdtIdHelper DEBUG detector element field size is 24 field index = 86
+MdtIdHelper DEBUG detector element field size is 32 field index = 84
+MdtIdHelper DEBUG detector element field size is 20 field index = 85
+MdtIdHelper DEBUG detector element field size is 4 field index = 86
MdtIdHelper DEBUG detector element field size is 24 field index = 87
MdtIdHelper DEBUG detector element field size is 24 field index = 88
MdtIdHelper DEBUG detector element field size is 24 field index = 89
MdtIdHelper DEBUG detector element field size is 24 field index = 90
-MdtIdHelper DEBUG detector element field size is 8 field index = 91
+MdtIdHelper DEBUG detector element field size is 24 field index = 91
MdtIdHelper DEBUG detector element field size is 8 field index = 92
MdtIdHelper DEBUG detector element field size is 8 field index = 93
MdtIdHelper DEBUG detector element field size is 8 field index = 94
-MdtIdHelper DEBUG detector element field size is 4 field index = 95
-MdtIdHelper DEBUG detector element field size is 8 field index = 96
+MdtIdHelper DEBUG detector element field size is 8 field index = 95
+MdtIdHelper DEBUG detector element field size is 4 field index = 96
MdtIdHelper DEBUG detector element field size is 8 field index = 97
MdtIdHelper DEBUG detector element field size is 8 field index = 98
MdtIdHelper DEBUG detector element field size is 8 field index = 99
-MdtIdHelper DEBUG detector element field size is 16 field index = 100
+MdtIdHelper DEBUG detector element field size is 8 field index = 100
MdtIdHelper DEBUG detector element field size is 16 field index = 101
MdtIdHelper DEBUG detector element field size is 16 field index = 102
-MdtIdHelper DEBUG detector element field size is 8 field index = 103
-MdtIdHelper DEBUG detector element field size is 16 field index = 104
-MdtIdHelper DEBUG detector element field size is 8 field index = 105
+MdtIdHelper DEBUG detector element field size is 16 field index = 103
+MdtIdHelper DEBUG detector element field size is 8 field index = 104
+MdtIdHelper DEBUG detector element field size is 16 field index = 105
MdtIdHelper DEBUG detector element field size is 8 field index = 106
-MdtIdHelper DEBUG detector element field size is 16 field index = 107
+MdtIdHelper DEBUG detector element field size is 8 field index = 107
MdtIdHelper DEBUG detector element field size is 16 field index = 108
-MdtIdHelper DEBUG detector element field size is 28 field index = 109
+MdtIdHelper DEBUG detector element field size is 16 field index = 109
MdtIdHelper DEBUG detector element field size is 28 field index = 110
-MdtIdHelper DEBUG detector element field size is 4 field index = 111
-MdtIdHelper DEBUG detector element field size is 32 field index = 112
+MdtIdHelper DEBUG detector element field size is 28 field index = 111
+MdtIdHelper DEBUG detector element field size is 4 field index = 112
MdtIdHelper DEBUG detector element field size is 32 field index = 113
MdtIdHelper DEBUG detector element field size is 32 field index = 114
MdtIdHelper DEBUG detector element field size is 32 field index = 115
@@ -1061,11 +1063,12 @@ MdtIdHelper DEBUG detector element field size is 32 field index = 132
MdtIdHelper DEBUG detector element field size is 32 field index = 133
MdtIdHelper DEBUG detector element field size is 32 field index = 134
MdtIdHelper DEBUG detector element field size is 32 field index = 135
-MdtIdHelper DEBUG detector element field size is 4 field index = 136
+MdtIdHelper DEBUG detector element field size is 32 field index = 136
MdtIdHelper DEBUG detector element field size is 4 field index = 137
-MdtIdHelper DEBUG detector element field size is 8 field index = 138
+MdtIdHelper DEBUG detector element field size is 4 field index = 138
MdtIdHelper DEBUG detector element field size is 8 field index = 139
MdtIdHelper DEBUG detector element field size is 8 field index = 140
+MdtIdHelper DEBUG detector element field size is 8 field index = 141
MdtIdHelper DEBUG channel field size is 1200 field index = 0
MdtIdHelper DEBUG channel field size is 192 field index = 1
MdtIdHelper DEBUG channel field size is 960 field index = 2
@@ -1100,88 +1103,88 @@ MdtIdHelper DEBUG channel field size is 3840 field index = 30
MdtIdHelper DEBUG channel field size is 3840 field index = 31
MdtIdHelper DEBUG channel field size is 3840 field index = 32
MdtIdHelper DEBUG channel field size is 3840 field index = 33
-MdtIdHelper DEBUG channel field size is 2400 field index = 34
-MdtIdHelper DEBUG channel field size is 1728 field index = 35
-MdtIdHelper DEBUG channel field size is 768 field index = 36
-MdtIdHelper DEBUG channel field size is 3072 field index = 37
+MdtIdHelper DEBUG channel field size is 1200 field index = 34
+MdtIdHelper DEBUG channel field size is 864 field index = 35
+MdtIdHelper DEBUG channel field size is 384 field index = 36
+MdtIdHelper DEBUG channel field size is 7040 field index = 37
MdtIdHelper DEBUG channel field size is 3072 field index = 38
-MdtIdHelper DEBUG channel field size is 192 field index = 39
-MdtIdHelper DEBUG channel field size is 288 field index = 40
-MdtIdHelper DEBUG channel field size is 240 field index = 41
-MdtIdHelper DEBUG channel field size is 336 field index = 42
-MdtIdHelper DEBUG channel field size is 672 field index = 43
-MdtIdHelper DEBUG channel field size is 576 field index = 44
-MdtIdHelper DEBUG channel field size is 288 field index = 45
-MdtIdHelper DEBUG channel field size is 960 field index = 46
-MdtIdHelper DEBUG channel field size is 384 field index = 47
-MdtIdHelper DEBUG channel field size is 192 field index = 48
-MdtIdHelper DEBUG channel field size is 10752 field index = 49
-MdtIdHelper DEBUG channel field size is 3840 field index = 50
-MdtIdHelper DEBUG channel field size is 3360 field index = 51
-MdtIdHelper DEBUG channel field size is 576 field index = 52
-MdtIdHelper DEBUG channel field size is 4032 field index = 53
-MdtIdHelper DEBUG channel field size is 192 field index = 54
-MdtIdHelper DEBUG channel field size is 4032 field index = 55
-MdtIdHelper DEBUG channel field size is 3456 field index = 56
+MdtIdHelper DEBUG channel field size is 3072 field index = 39
+MdtIdHelper DEBUG channel field size is 192 field index = 40
+MdtIdHelper DEBUG channel field size is 288 field index = 41
+MdtIdHelper DEBUG channel field size is 240 field index = 42
+MdtIdHelper DEBUG channel field size is 336 field index = 43
+MdtIdHelper DEBUG channel field size is 672 field index = 44
+MdtIdHelper DEBUG channel field size is 576 field index = 45
+MdtIdHelper DEBUG channel field size is 288 field index = 46
+MdtIdHelper DEBUG channel field size is 960 field index = 47
+MdtIdHelper DEBUG channel field size is 384 field index = 48
+MdtIdHelper DEBUG channel field size is 192 field index = 49
+MdtIdHelper DEBUG channel field size is 10752 field index = 50
+MdtIdHelper DEBUG channel field size is 3840 field index = 51
+MdtIdHelper DEBUG channel field size is 3360 field index = 52
+MdtIdHelper DEBUG channel field size is 576 field index = 53
+MdtIdHelper DEBUG channel field size is 4032 field index = 54
+MdtIdHelper DEBUG channel field size is 192 field index = 55
+MdtIdHelper DEBUG channel field size is 4032 field index = 56
MdtIdHelper DEBUG channel field size is 3456 field index = 57
-MdtIdHelper DEBUG channel field size is 1440 field index = 58
-MdtIdHelper DEBUG channel field size is 1728 field index = 59
-MdtIdHelper DEBUG channel field size is 2304 field index = 60
-MdtIdHelper DEBUG channel field size is 1440 field index = 61
-MdtIdHelper DEBUG channel field size is 1728 field index = 62
+MdtIdHelper DEBUG channel field size is 3456 field index = 58
+MdtIdHelper DEBUG channel field size is 1440 field index = 59
+MdtIdHelper DEBUG channel field size is 1728 field index = 60
+MdtIdHelper DEBUG channel field size is 2304 field index = 61
+MdtIdHelper DEBUG channel field size is 1440 field index = 62
MdtIdHelper DEBUG channel field size is 1728 field index = 63
-MdtIdHelper DEBUG channel field size is 1536 field index = 64
-MdtIdHelper DEBUG channel field size is 1152 field index = 65
-MdtIdHelper DEBUG channel field size is 864 field index = 66
-MdtIdHelper DEBUG channel field size is 384 field index = 67
-MdtIdHelper DEBUG channel field size is 576 field index = 68
-MdtIdHelper DEBUG channel field size is 288 field index = 69
-MdtIdHelper DEBUG channel field size is 1008 field index = 70
-MdtIdHelper DEBUG channel field size is 672 field index = 71
-MdtIdHelper DEBUG channel field size is 864 field index = 72
-MdtIdHelper DEBUG channel field size is 336 field index = 73
-MdtIdHelper DEBUG channel field size is 432 field index = 74
-MdtIdHelper DEBUG channel field size is 3024 field index = 75
-MdtIdHelper DEBUG channel field size is 2592 field index = 76
-MdtIdHelper DEBUG channel field size is 576 field index = 77
-MdtIdHelper DEBUG channel field size is 288 field index = 78
-MdtIdHelper DEBUG channel field size is 4704 field index = 79
-MdtIdHelper DEBUG channel field size is 576 field index = 80
-MdtIdHelper DEBUG channel field size is 6912 field index = 81
+MdtIdHelper DEBUG channel field size is 1728 field index = 64
+MdtIdHelper DEBUG channel field size is 1536 field index = 65
+MdtIdHelper DEBUG channel field size is 1152 field index = 66
+MdtIdHelper DEBUG channel field size is 864 field index = 67
+MdtIdHelper DEBUG channel field size is 384 field index = 68
+MdtIdHelper DEBUG channel field size is 576 field index = 69
+MdtIdHelper DEBUG channel field size is 288 field index = 70
+MdtIdHelper DEBUG channel field size is 1008 field index = 71
+MdtIdHelper DEBUG channel field size is 672 field index = 72
+MdtIdHelper DEBUG channel field size is 864 field index = 73
+MdtIdHelper DEBUG channel field size is 336 field index = 74
+MdtIdHelper DEBUG channel field size is 432 field index = 75
+MdtIdHelper DEBUG channel field size is 3024 field index = 76
+MdtIdHelper DEBUG channel field size is 2592 field index = 77
+MdtIdHelper DEBUG channel field size is 576 field index = 78
+MdtIdHelper DEBUG channel field size is 288 field index = 79
+MdtIdHelper DEBUG channel field size is 4704 field index = 80
+MdtIdHelper DEBUG channel field size is 576 field index = 81
MdtIdHelper DEBUG channel field size is 6912 field index = 82
-MdtIdHelper DEBUG channel field size is 5376 field index = 83
-MdtIdHelper DEBUG channel field size is 4320 field index = 84
-MdtIdHelper DEBUG channel field size is 576 field index = 85
-MdtIdHelper DEBUG channel field size is 5184 field index = 86
+MdtIdHelper DEBUG channel field size is 6912 field index = 83
+MdtIdHelper DEBUG channel field size is 5376 field index = 84
+MdtIdHelper DEBUG channel field size is 4320 field index = 85
+MdtIdHelper DEBUG channel field size is 576 field index = 86
MdtIdHelper DEBUG channel field size is 5184 field index = 87
MdtIdHelper DEBUG channel field size is 5184 field index = 88
MdtIdHelper DEBUG channel field size is 5184 field index = 89
-MdtIdHelper DEBUG channel field size is 4608 field index = 90
-MdtIdHelper DEBUG channel field size is 1728 field index = 91
-MdtIdHelper DEBUG channel field size is 1536 field index = 92
-MdtIdHelper DEBUG channel field size is 1152 field index = 93
-MdtIdHelper DEBUG channel field size is 960 field index = 94
-MdtIdHelper DEBUG channel field size is 480 field index = 95
-MdtIdHelper DEBUG channel field size is 960 field index = 96
+MdtIdHelper DEBUG channel field size is 5184 field index = 90
+MdtIdHelper DEBUG channel field size is 4608 field index = 91
+MdtIdHelper DEBUG channel field size is 1728 field index = 92
+MdtIdHelper DEBUG channel field size is 1536 field index = 93
+MdtIdHelper DEBUG channel field size is 1152 field index = 94
+MdtIdHelper DEBUG channel field size is 960 field index = 95
+MdtIdHelper DEBUG channel field size is 480 field index = 96
MdtIdHelper DEBUG channel field size is 960 field index = 97
MdtIdHelper DEBUG channel field size is 960 field index = 98
MdtIdHelper DEBUG channel field size is 960 field index = 99
-MdtIdHelper DEBUG channel field size is 2304 field index = 100
+MdtIdHelper DEBUG channel field size is 960 field index = 100
MdtIdHelper DEBUG channel field size is 2304 field index = 101
-MdtIdHelper DEBUG channel field size is 768 field index = 102
-MdtIdHelper DEBUG channel field size is 384 field index = 103
-MdtIdHelper DEBUG channel field size is 3456 field index = 104
-MdtIdHelper DEBUG channel field size is 1344 field index = 105
+MdtIdHelper DEBUG channel field size is 2304 field index = 102
+MdtIdHelper DEBUG channel field size is 768 field index = 103
+MdtIdHelper DEBUG channel field size is 384 field index = 104
+MdtIdHelper DEBUG channel field size is 3456 field index = 105
MdtIdHelper DEBUG channel field size is 1344 field index = 106
-MdtIdHelper DEBUG channel field size is 2688 field index = 107
-MdtIdHelper DEBUG channel field size is 2304 field index = 108
-MdtIdHelper DEBUG channel field size is 3360 field index = 109
+MdtIdHelper DEBUG channel field size is 1344 field index = 107
+MdtIdHelper DEBUG channel field size is 2688 field index = 108
+MdtIdHelper DEBUG channel field size is 2304 field index = 109
MdtIdHelper DEBUG channel field size is 3360 field index = 110
-MdtIdHelper DEBUG channel field size is 576 field index = 111
-MdtIdHelper DEBUG channel field size is 4608 field index = 112
-MdtIdHelper DEBUG channel field size is 3840 field index = 113
-MdtIdHelper DEBUG channel field size is 5376 field index = 114
-MdtIdHelper DEBUG channel field size is 6144 field index = 115
+MdtIdHelper DEBUG channel field size is 3360 field index = 111
+MdtIdHelper DEBUG channel field size is 576 field index = 112
+MdtIdHelper DEBUG channel field size is 4608 field index = 113
+MdtIdHelper DEBUG channel field size is 3840 field index = 114
+MdtIdHelper DEBUG channel field size is 5376 field index = 115
MdtIdHelper DEBUG channel field size is 6144 field index = 116
MdtIdHelper DEBUG channel field size is 6144 field index = 117
MdtIdHelper DEBUG channel field size is 6144 field index = 118
@@ -1190,28 +1193,30 @@ MdtIdHelper DEBUG channel field size is 6144 field index = 120
MdtIdHelper DEBUG channel field size is 6144 field index = 121
MdtIdHelper DEBUG channel field size is 6144 field index = 122
MdtIdHelper DEBUG channel field size is 6144 field index = 123
-MdtIdHelper DEBUG channel field size is 5376 field index = 124
+MdtIdHelper DEBUG channel field size is 6144 field index = 124
MdtIdHelper DEBUG channel field size is 5376 field index = 125
-MdtIdHelper DEBUG channel field size is 4608 field index = 126
+MdtIdHelper DEBUG channel field size is 5376 field index = 126
MdtIdHelper DEBUG channel field size is 4608 field index = 127
MdtIdHelper DEBUG channel field size is 4608 field index = 128
MdtIdHelper DEBUG channel field size is 4608 field index = 129
-MdtIdHelper DEBUG channel field size is 5376 field index = 130
+MdtIdHelper DEBUG channel field size is 4608 field index = 130
MdtIdHelper DEBUG channel field size is 5376 field index = 131
MdtIdHelper DEBUG channel field size is 5376 field index = 132
-MdtIdHelper DEBUG channel field size is 4608 field index = 133
+MdtIdHelper DEBUG channel field size is 5376 field index = 133
MdtIdHelper DEBUG channel field size is 4608 field index = 134
MdtIdHelper DEBUG channel field size is 4608 field index = 135
-MdtIdHelper DEBUG channel field size is 1248 field index = 136
-MdtIdHelper DEBUG channel field size is 864 field index = 137
-MdtIdHelper DEBUG channel field size is 1728 field index = 138
+MdtIdHelper DEBUG channel field size is 4608 field index = 136
+MdtIdHelper DEBUG channel field size is 1248 field index = 137
+MdtIdHelper DEBUG channel field size is 864 field index = 138
MdtIdHelper DEBUG channel field size is 1728 field index = 139
MdtIdHelper DEBUG channel field size is 1728 field index = 140
+MdtIdHelper DEBUG channel field size is 1728 field index = 141
MdtIdHelper INFO Initializing MDT hash indices ...
-MdtIdHelper INFO The element hash max is 1148
-MdtIdHelper INFO The detector element hash max is 2248
+MdtIdHelper INFO The element hash max is 1140
+MdtIdHelper INFO The detector element hash max is 2240
MdtIdHelper INFO Initializing MDT hash indices for finding neighbors ...
MdtIdHelper VERBOSE MuonIdHelper::init_neighbors
+MdtIdHelper DEBUG Maximum number of MDT tubes is 110
RpcIdHelper DEBUG (Re)initialize
AtlasDetectorID DEBUG Could not get value for label 'no_side' of field 'DetZside' in dictionary Calorimeter
AtlasDetectorID::initialize_from_dictionary - OK
@@ -1224,182 +1229,185 @@ RpcIdHelper DEBUG technology decode 1 vals 0,2 mask/zero m
RpcIdHelper DEBUG TR decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 ffffdfffffffffff 45 1 18 indexes mode both_bounded
RpcIdHelper DEBUG TZ decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 ffffe7ffffffffff 43 2 19 indexes mode both_bounded
RpcIdHelper DEBUG TPHI decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 fffffbffffffffff 42 1 21 indexes mode both_bounded
-RpcIdHelper DEBUG gas gap decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 fffffdffffffffff 41 1 22 indexes mode both_bounded
-RpcIdHelper DEBUG phi decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 fffffeffffffffff 40 1 23 indexes mode both_bounded
-RpcIdHelper DEBUG strip decode 1 vals 1:99 mask/zero mask/shift/bits/offset 7f ffffff01ffffffff 33 7 24 indexes mode both_bounded
-RpcIdHelper INFO MultiRange built successfully to doubletR: MultiRange size is 257
-RpcIdHelper INFO MultiRange built successfully to detectorElement: DetectorElement MultiRange size is 257
-RpcIdHelper INFO MultiRange built successfully to rpcStrip: MultiRange size is 257
-RpcIdHelper DEBUG field size is 4 field index = 145
-RpcIdHelper DEBUG field size is 2 field index = 146
+RpcIdHelper DEBUG gas gap decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 fffffcffffffffff 40 2 22 indexes mode both_bounded
+RpcIdHelper DEBUG phi decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffffff7fffffffff 39 1 24 indexes mode both_bounded
+RpcIdHelper DEBUG strip decode 1 vals 1:99 mask/zero mask/shift/bits/offset 7f ffffff80ffffffff 32 7 25 indexes mode both_bounded
+RpcIdHelper INFO MultiRange built successfully to doubletR: MultiRange size is 259
+RpcIdHelper INFO MultiRange built successfully to detectorElement: DetectorElement MultiRange size is 259
+RpcIdHelper INFO MultiRange built successfully to rpcStrip: MultiRange size is 259
+RpcIdHelper DEBUG field size is 4 field index = 146
RpcIdHelper DEBUG field size is 2 field index = 147
-RpcIdHelper DEBUG field size is 4 field index = 148
-RpcIdHelper DEBUG field size is 2 field index = 149
+RpcIdHelper DEBUG field size is 2 field index = 148
+RpcIdHelper DEBUG field size is 4 field index = 149
RpcIdHelper DEBUG field size is 2 field index = 150
-RpcIdHelper DEBUG field size is 4 field index = 151
-RpcIdHelper DEBUG field size is 2 field index = 152
+RpcIdHelper DEBUG field size is 2 field index = 151
+RpcIdHelper DEBUG field size is 4 field index = 152
RpcIdHelper DEBUG field size is 2 field index = 153
-RpcIdHelper DEBUG field size is 8 field index = 154
-RpcIdHelper DEBUG field size is 32 field index = 155
+RpcIdHelper DEBUG field size is 2 field index = 154
+RpcIdHelper DEBUG field size is 8 field index = 155
RpcIdHelper DEBUG field size is 32 field index = 156
-RpcIdHelper DEBUG field size is 28 field index = 157
-RpcIdHelper DEBUG field size is 4 field index = 158
-RpcIdHelper DEBUG field size is 28 field index = 159
-RpcIdHelper DEBUG field size is 4 field index = 160
-RpcIdHelper DEBUG field size is 28 field index = 161
-RpcIdHelper DEBUG field size is 2 field index = 162
-RpcIdHelper DEBUG field size is 14 field index = 163
-RpcIdHelper DEBUG field size is 24 field index = 164
+RpcIdHelper DEBUG field size is 32 field index = 157
+RpcIdHelper DEBUG field size is 28 field index = 158
+RpcIdHelper DEBUG field size is 4 field index = 159
+RpcIdHelper DEBUG field size is 28 field index = 160
+RpcIdHelper DEBUG field size is 4 field index = 161
+RpcIdHelper DEBUG field size is 28 field index = 162
+RpcIdHelper DEBUG field size is 2 field index = 163
+RpcIdHelper DEBUG field size is 14 field index = 164
RpcIdHelper DEBUG field size is 24 field index = 165
RpcIdHelper DEBUG field size is 24 field index = 166
-RpcIdHelper DEBUG field size is 12 field index = 167
+RpcIdHelper DEBUG field size is 24 field index = 167
RpcIdHelper DEBUG field size is 12 field index = 168
-RpcIdHelper DEBUG field size is 24 field index = 169
+RpcIdHelper DEBUG field size is 12 field index = 169
RpcIdHelper DEBUG field size is 24 field index = 170
-RpcIdHelper DEBUG field size is 8 field index = 171
+RpcIdHelper DEBUG field size is 24 field index = 171
RpcIdHelper DEBUG field size is 8 field index = 172
-RpcIdHelper DEBUG field size is 16 field index = 173
+RpcIdHelper DEBUG field size is 8 field index = 173
RpcIdHelper DEBUG field size is 16 field index = 174
RpcIdHelper DEBUG field size is 16 field index = 175
RpcIdHelper DEBUG field size is 16 field index = 176
RpcIdHelper DEBUG field size is 16 field index = 177
-RpcIdHelper DEBUG field size is 12 field index = 178
+RpcIdHelper DEBUG field size is 16 field index = 178
RpcIdHelper DEBUG field size is 12 field index = 179
RpcIdHelper DEBUG field size is 12 field index = 180
RpcIdHelper DEBUG field size is 12 field index = 181
RpcIdHelper DEBUG field size is 12 field index = 182
RpcIdHelper DEBUG field size is 12 field index = 183
-RpcIdHelper DEBUG field size is 8 field index = 184
+RpcIdHelper DEBUG field size is 12 field index = 184
RpcIdHelper DEBUG field size is 8 field index = 185
-RpcIdHelper DEBUG field size is 4 field index = 186
+RpcIdHelper DEBUG field size is 8 field index = 186
RpcIdHelper DEBUG field size is 4 field index = 187
RpcIdHelper DEBUG field size is 4 field index = 188
-RpcIdHelper DEBUG field size is 8 field index = 189
+RpcIdHelper DEBUG field size is 4 field index = 189
RpcIdHelper DEBUG field size is 8 field index = 190
RpcIdHelper DEBUG field size is 8 field index = 191
-RpcIdHelper DEBUG field size is 2 field index = 192
-RpcIdHelper DEBUG field size is 4 field index = 193
+RpcIdHelper DEBUG field size is 8 field index = 192
+RpcIdHelper DEBUG field size is 2 field index = 193
RpcIdHelper DEBUG field size is 4 field index = 194
-RpcIdHelper DEBUG field size is 8 field index = 195
+RpcIdHelper DEBUG field size is 4 field index = 195
RpcIdHelper DEBUG field size is 8 field index = 196
-RpcIdHelper DEBUG field size is 4 field index = 197
-RpcIdHelper DEBUG field size is 2 field index = 198
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 145
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 146
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 147
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 148
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 149
+RpcIdHelper DEBUG field size is 8 field index = 197
+RpcIdHelper DEBUG field size is 4 field index = 198
+RpcIdHelper DEBUG field size is 2 field index = 199
+RpcIdHelper DEBUG field size is 8 field index = 200
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 146
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 147
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 148
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 149
RpcIdHelper DEBUG detectorElement field size is 8 field index = 150
RpcIdHelper DEBUG detectorElement field size is 8 field index = 151
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 152
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 152
RpcIdHelper DEBUG detectorElement field size is 4 field index = 153
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 154
-RpcIdHelper DEBUG detectorElement field size is 128 field index = 155
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 154
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 155
RpcIdHelper DEBUG detectorElement field size is 128 field index = 156
-RpcIdHelper DEBUG detectorElement field size is 56 field index = 157
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 158
-RpcIdHelper DEBUG detectorElement field size is 56 field index = 159
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 160
-RpcIdHelper DEBUG detectorElement field size is 112 field index = 161
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 162
-RpcIdHelper DEBUG detectorElement field size is 28 field index = 163
-RpcIdHelper DEBUG detectorElement field size is 96 field index = 164
-RpcIdHelper DEBUG detectorElement field size is 144 field index = 165
-RpcIdHelper DEBUG detectorElement field size is 96 field index = 166
-RpcIdHelper DEBUG detectorElement field size is 48 field index = 167
-RpcIdHelper DEBUG detectorElement field size is 72 field index = 168
-RpcIdHelper DEBUG detectorElement field size is 48 field index = 169
-RpcIdHelper DEBUG detectorElement field size is 96 field index = 170
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 171
+RpcIdHelper DEBUG detectorElement field size is 128 field index = 157
+RpcIdHelper DEBUG detectorElement field size is 56 field index = 158
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 159
+RpcIdHelper DEBUG detectorElement field size is 56 field index = 160
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 161
+RpcIdHelper DEBUG detectorElement field size is 112 field index = 162
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 163
+RpcIdHelper DEBUG detectorElement field size is 28 field index = 164
+RpcIdHelper DEBUG detectorElement field size is 96 field index = 165
+RpcIdHelper DEBUG detectorElement field size is 144 field index = 166
+RpcIdHelper DEBUG detectorElement field size is 96 field index = 167
+RpcIdHelper DEBUG detectorElement field size is 48 field index = 168
+RpcIdHelper DEBUG detectorElement field size is 72 field index = 169
+RpcIdHelper DEBUG detectorElement field size is 48 field index = 170
+RpcIdHelper DEBUG detectorElement field size is 96 field index = 171
RpcIdHelper DEBUG detectorElement field size is 32 field index = 172
-RpcIdHelper DEBUG detectorElement field size is 64 field index = 173
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 173
RpcIdHelper DEBUG detectorElement field size is 64 field index = 174
RpcIdHelper DEBUG detectorElement field size is 64 field index = 175
RpcIdHelper DEBUG detectorElement field size is 64 field index = 176
RpcIdHelper DEBUG detectorElement field size is 64 field index = 177
-RpcIdHelper DEBUG detectorElement field size is 48 field index = 178
+RpcIdHelper DEBUG detectorElement field size is 64 field index = 178
RpcIdHelper DEBUG detectorElement field size is 48 field index = 179
RpcIdHelper DEBUG detectorElement field size is 48 field index = 180
RpcIdHelper DEBUG detectorElement field size is 48 field index = 181
RpcIdHelper DEBUG detectorElement field size is 48 field index = 182
RpcIdHelper DEBUG detectorElement field size is 48 field index = 183
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 184
+RpcIdHelper DEBUG detectorElement field size is 48 field index = 184
RpcIdHelper DEBUG detectorElement field size is 32 field index = 185
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 186
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 187
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 186
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 187
RpcIdHelper DEBUG detectorElement field size is 16 field index = 188
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 189
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 189
RpcIdHelper DEBUG detectorElement field size is 32 field index = 190
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 191
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 192
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 193
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 191
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 192
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 193
RpcIdHelper DEBUG detectorElement field size is 8 field index = 194
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 195
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 195
RpcIdHelper DEBUG detectorElement field size is 16 field index = 196
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 197
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 198
-RpcIdHelper DEBUG channel field size is 6336 field index = 145
-RpcIdHelper DEBUG channel field size is 1584 field index = 146
-RpcIdHelper DEBUG channel field size is 3168 field index = 147
-RpcIdHelper DEBUG channel field size is 6336 field index = 148
-RpcIdHelper DEBUG channel field size is 3168 field index = 149
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 197
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 198
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 199
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 200
+RpcIdHelper DEBUG channel field size is 6336 field index = 146
+RpcIdHelper DEBUG channel field size is 1584 field index = 147
+RpcIdHelper DEBUG channel field size is 3168 field index = 148
+RpcIdHelper DEBUG channel field size is 6336 field index = 149
RpcIdHelper DEBUG channel field size is 3168 field index = 150
RpcIdHelper DEBUG channel field size is 3168 field index = 151
-RpcIdHelper DEBUG channel field size is 1584 field index = 152
+RpcIdHelper DEBUG channel field size is 3168 field index = 152
RpcIdHelper DEBUG channel field size is 1584 field index = 153
-RpcIdHelper DEBUG channel field size is 6336 field index = 154
-RpcIdHelper DEBUG channel field size is 50688 field index = 155
+RpcIdHelper DEBUG channel field size is 1584 field index = 154
+RpcIdHelper DEBUG channel field size is 6336 field index = 155
RpcIdHelper DEBUG channel field size is 50688 field index = 156
-RpcIdHelper DEBUG channel field size is 22176 field index = 157
-RpcIdHelper DEBUG channel field size is 3168 field index = 158
-RpcIdHelper DEBUG channel field size is 22176 field index = 159
-RpcIdHelper DEBUG channel field size is 6336 field index = 160
-RpcIdHelper DEBUG channel field size is 44352 field index = 161
-RpcIdHelper DEBUG channel field size is 1584 field index = 162
-RpcIdHelper DEBUG channel field size is 11088 field index = 163
-RpcIdHelper DEBUG channel field size is 38016 field index = 164
-RpcIdHelper DEBUG channel field size is 57024 field index = 165
-RpcIdHelper DEBUG channel field size is 38016 field index = 166
-RpcIdHelper DEBUG channel field size is 19008 field index = 167
-RpcIdHelper DEBUG channel field size is 28512 field index = 168
-RpcIdHelper DEBUG channel field size is 19008 field index = 169
-RpcIdHelper DEBUG channel field size is 38016 field index = 170
-RpcIdHelper DEBUG channel field size is 12672 field index = 171
+RpcIdHelper DEBUG channel field size is 50688 field index = 157
+RpcIdHelper DEBUG channel field size is 22176 field index = 158
+RpcIdHelper DEBUG channel field size is 3168 field index = 159
+RpcIdHelper DEBUG channel field size is 22176 field index = 160
+RpcIdHelper DEBUG channel field size is 6336 field index = 161
+RpcIdHelper DEBUG channel field size is 44352 field index = 162
+RpcIdHelper DEBUG channel field size is 1584 field index = 163
+RpcIdHelper DEBUG channel field size is 11088 field index = 164
+RpcIdHelper DEBUG channel field size is 38016 field index = 165
+RpcIdHelper DEBUG channel field size is 57024 field index = 166
+RpcIdHelper DEBUG channel field size is 38016 field index = 167
+RpcIdHelper DEBUG channel field size is 19008 field index = 168
+RpcIdHelper DEBUG channel field size is 28512 field index = 169
+RpcIdHelper DEBUG channel field size is 19008 field index = 170
+RpcIdHelper DEBUG channel field size is 38016 field index = 171
RpcIdHelper DEBUG channel field size is 12672 field index = 172
-RpcIdHelper DEBUG channel field size is 25344 field index = 173
+RpcIdHelper DEBUG channel field size is 12672 field index = 173
RpcIdHelper DEBUG channel field size is 25344 field index = 174
RpcIdHelper DEBUG channel field size is 25344 field index = 175
RpcIdHelper DEBUG channel field size is 25344 field index = 176
RpcIdHelper DEBUG channel field size is 25344 field index = 177
-RpcIdHelper DEBUG channel field size is 19008 field index = 178
+RpcIdHelper DEBUG channel field size is 25344 field index = 178
RpcIdHelper DEBUG channel field size is 19008 field index = 179
RpcIdHelper DEBUG channel field size is 19008 field index = 180
RpcIdHelper DEBUG channel field size is 19008 field index = 181
RpcIdHelper DEBUG channel field size is 19008 field index = 182
RpcIdHelper DEBUG channel field size is 19008 field index = 183
-RpcIdHelper DEBUG channel field size is 12672 field index = 184
+RpcIdHelper DEBUG channel field size is 19008 field index = 184
RpcIdHelper DEBUG channel field size is 12672 field index = 185
-RpcIdHelper DEBUG channel field size is 3168 field index = 186
-RpcIdHelper DEBUG channel field size is 6336 field index = 187
+RpcIdHelper DEBUG channel field size is 12672 field index = 186
+RpcIdHelper DEBUG channel field size is 3168 field index = 187
RpcIdHelper DEBUG channel field size is 6336 field index = 188
-RpcIdHelper DEBUG channel field size is 12672 field index = 189
+RpcIdHelper DEBUG channel field size is 6336 field index = 189
RpcIdHelper DEBUG channel field size is 12672 field index = 190
-RpcIdHelper DEBUG channel field size is 6336 field index = 191
-RpcIdHelper DEBUG channel field size is 1584 field index = 192
-RpcIdHelper DEBUG channel field size is 3168 field index = 193
+RpcIdHelper DEBUG channel field size is 12672 field index = 191
+RpcIdHelper DEBUG channel field size is 6336 field index = 192
+RpcIdHelper DEBUG channel field size is 1584 field index = 193
RpcIdHelper DEBUG channel field size is 3168 field index = 194
-RpcIdHelper DEBUG channel field size is 6336 field index = 195
+RpcIdHelper DEBUG channel field size is 3168 field index = 195
RpcIdHelper DEBUG channel field size is 6336 field index = 196
-RpcIdHelper DEBUG channel field size is 3168 field index = 197
-RpcIdHelper DEBUG channel field size is 1584 field index = 198
-RpcIdHelper DEBUG full module range size is 54
-RpcIdHelper DEBUG full channel range size is 54
+RpcIdHelper DEBUG channel field size is 6336 field index = 197
+RpcIdHelper DEBUG channel field size is 3168 field index = 198
+RpcIdHelper DEBUG channel field size is 1584 field index = 199
+RpcIdHelper DEBUG channel field size is 19008 field index = 200
+RpcIdHelper DEBUG full module range size is 55
+RpcIdHelper DEBUG full channel range size is 55
RpcIdHelper INFO Initializing RPC hash indices ...
-RpcIdHelper INFO The element hash max is 600
-RpcIdHelper INFO The detector element hash max is 1122
+RpcIdHelper INFO The element hash max is 608
+RpcIdHelper INFO The detector element hash max is 1138
RpcIdHelper INFO Initializing RPC hash indices for finding neighbors ...
RpcIdHelper VERBOSE MuonIdHelper::init_neighbors
-RpcIdHelper DEBUG Maximum number of RPC gas gaps is 2
+RpcIdHelper DEBUG Maximum number of RPC gas gaps is 3
TgcIdHelper DEBUG (Re)initialize
AtlasDetectorID DEBUG Could not get value for label 'no_side' of field 'DetZside' in dictionary Calorimeter
AtlasDetectorID::initialize_from_dictionary - OK
@@ -1412,85 +1420,85 @@ TgcIdHelper DEBUG technology decode 1 vals 3 mask/zero m
TgcIdHelper DEBUG gas gap decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 fffff3ffffffffff 42 2 20 indexes mode both_bounded
TgcIdHelper DEBUG is strip decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 fffffdffffffffff 41 1 22 indexes mode both_bounded
TgcIdHelper DEBUG channel decode 1 vals 1:125 mask/zero mask/shift/bits/offset 7f fffffe03ffffffff 34 7 23 indexes mode both_bounded
-TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 216
-TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 216
-TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 257
-TgcIdHelper DEBUG field size is 48 field index = 189
-TgcIdHelper DEBUG field size is 96 field index = 190
-TgcIdHelper DEBUG field size is 96 field index = 191
+TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 218
+TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 218
+TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 259
+TgcIdHelper DEBUG field size is 48 field index = 191
TgcIdHelper DEBUG field size is 96 field index = 192
TgcIdHelper DEBUG field size is 96 field index = 193
-TgcIdHelper DEBUG field size is 48 field index = 194
+TgcIdHelper DEBUG field size is 96 field index = 194
TgcIdHelper DEBUG field size is 96 field index = 195
-TgcIdHelper DEBUG field size is 96 field index = 196
+TgcIdHelper DEBUG field size is 48 field index = 196
TgcIdHelper DEBUG field size is 96 field index = 197
TgcIdHelper DEBUG field size is 96 field index = 198
TgcIdHelper DEBUG field size is 96 field index = 199
-TgcIdHelper DEBUG field size is 48 field index = 200
+TgcIdHelper DEBUG field size is 96 field index = 200
TgcIdHelper DEBUG field size is 96 field index = 201
-TgcIdHelper DEBUG field size is 96 field index = 202
+TgcIdHelper DEBUG field size is 48 field index = 202
TgcIdHelper DEBUG field size is 96 field index = 203
TgcIdHelper DEBUG field size is 96 field index = 204
TgcIdHelper DEBUG field size is 96 field index = 205
-TgcIdHelper DEBUG field size is 24 field index = 206
-TgcIdHelper DEBUG field size is 42 field index = 207
-TgcIdHelper DEBUG detector element field size is 48 field index = 189
-TgcIdHelper DEBUG detector element field size is 96 field index = 190
-TgcIdHelper DEBUG detector element field size is 96 field index = 191
+TgcIdHelper DEBUG field size is 96 field index = 206
+TgcIdHelper DEBUG field size is 96 field index = 207
+TgcIdHelper DEBUG field size is 24 field index = 208
+TgcIdHelper DEBUG field size is 42 field index = 209
+TgcIdHelper DEBUG detector element field size is 48 field index = 191
TgcIdHelper DEBUG detector element field size is 96 field index = 192
TgcIdHelper DEBUG detector element field size is 96 field index = 193
-TgcIdHelper DEBUG detector element field size is 48 field index = 194
+TgcIdHelper DEBUG detector element field size is 96 field index = 194
TgcIdHelper DEBUG detector element field size is 96 field index = 195
-TgcIdHelper DEBUG detector element field size is 96 field index = 196
+TgcIdHelper DEBUG detector element field size is 48 field index = 196
TgcIdHelper DEBUG detector element field size is 96 field index = 197
TgcIdHelper DEBUG detector element field size is 96 field index = 198
TgcIdHelper DEBUG detector element field size is 96 field index = 199
-TgcIdHelper DEBUG detector element field size is 48 field index = 200
+TgcIdHelper DEBUG detector element field size is 96 field index = 200
TgcIdHelper DEBUG detector element field size is 96 field index = 201
-TgcIdHelper DEBUG detector element field size is 96 field index = 202
+TgcIdHelper DEBUG detector element field size is 48 field index = 202
TgcIdHelper DEBUG detector element field size is 96 field index = 203
TgcIdHelper DEBUG detector element field size is 96 field index = 204
TgcIdHelper DEBUG detector element field size is 96 field index = 205
-TgcIdHelper DEBUG detector element field size is 24 field index = 206
-TgcIdHelper DEBUG detector element field size is 42 field index = 207
-TgcIdHelper DEBUG channel field size is 15120 field index = 199
-TgcIdHelper DEBUG channel field size is 4608 field index = 200
-TgcIdHelper DEBUG channel field size is 26496 field index = 201
-TgcIdHelper DEBUG channel field size is 17856 field index = 202
-TgcIdHelper DEBUG channel field size is 6624 field index = 203
-TgcIdHelper DEBUG channel field size is 6912 field index = 204
-TgcIdHelper DEBUG channel field size is 9216 field index = 205
-TgcIdHelper DEBUG channel field size is 9216 field index = 206
+TgcIdHelper DEBUG detector element field size is 96 field index = 206
+TgcIdHelper DEBUG detector element field size is 96 field index = 207
+TgcIdHelper DEBUG detector element field size is 24 field index = 208
+TgcIdHelper DEBUG detector element field size is 42 field index = 209
+TgcIdHelper DEBUG channel field size is 15120 field index = 201
+TgcIdHelper DEBUG channel field size is 4608 field index = 202
+TgcIdHelper DEBUG channel field size is 26496 field index = 203
+TgcIdHelper DEBUG channel field size is 17856 field index = 204
+TgcIdHelper DEBUG channel field size is 6624 field index = 205
+TgcIdHelper DEBUG channel field size is 6912 field index = 206
TgcIdHelper DEBUG channel field size is 9216 field index = 207
TgcIdHelper DEBUG channel field size is 9216 field index = 208
-TgcIdHelper DEBUG channel field size is 12000 field index = 209
-TgcIdHelper DEBUG channel field size is 3072 field index = 210
-TgcIdHelper DEBUG channel field size is 21120 field index = 211
-TgcIdHelper DEBUG channel field size is 19776 field index = 212
-TgcIdHelper DEBUG channel field size is 6144 field index = 213
-TgcIdHelper DEBUG channel field size is 6144 field index = 214
+TgcIdHelper DEBUG channel field size is 9216 field index = 209
+TgcIdHelper DEBUG channel field size is 9216 field index = 210
+TgcIdHelper DEBUG channel field size is 12000 field index = 211
+TgcIdHelper DEBUG channel field size is 3072 field index = 212
+TgcIdHelper DEBUG channel field size is 21120 field index = 213
+TgcIdHelper DEBUG channel field size is 19776 field index = 214
TgcIdHelper DEBUG channel field size is 6144 field index = 215
TgcIdHelper DEBUG channel field size is 6144 field index = 216
TgcIdHelper DEBUG channel field size is 6144 field index = 217
TgcIdHelper DEBUG channel field size is 6144 field index = 218
TgcIdHelper DEBUG channel field size is 6144 field index = 219
TgcIdHelper DEBUG channel field size is 6144 field index = 220
-TgcIdHelper DEBUG channel field size is 11712 field index = 221
-TgcIdHelper DEBUG channel field size is 3072 field index = 222
-TgcIdHelper DEBUG channel field size is 18432 field index = 223
-TgcIdHelper DEBUG channel field size is 20352 field index = 224
-TgcIdHelper DEBUG channel field size is 6144 field index = 225
-TgcIdHelper DEBUG channel field size is 6144 field index = 226
-TgcIdHelper DEBUG channel field size is 5952 field index = 227
+TgcIdHelper DEBUG channel field size is 6144 field index = 221
+TgcIdHelper DEBUG channel field size is 6144 field index = 222
+TgcIdHelper DEBUG channel field size is 11712 field index = 223
+TgcIdHelper DEBUG channel field size is 3072 field index = 224
+TgcIdHelper DEBUG channel field size is 18432 field index = 225
+TgcIdHelper DEBUG channel field size is 20352 field index = 226
+TgcIdHelper DEBUG channel field size is 6144 field index = 227
TgcIdHelper DEBUG channel field size is 6144 field index = 228
-TgcIdHelper DEBUG channel field size is 6144 field index = 229
+TgcIdHelper DEBUG channel field size is 5952 field index = 229
TgcIdHelper DEBUG channel field size is 6144 field index = 230
TgcIdHelper DEBUG channel field size is 6144 field index = 231
TgcIdHelper DEBUG channel field size is 6144 field index = 232
-TgcIdHelper DEBUG channel field size is 1536 field index = 233
-TgcIdHelper DEBUG channel field size is 1536 field index = 234
-TgcIdHelper DEBUG channel field size is 2016 field index = 235
-TgcIdHelper DEBUG channel field size is 2688 field index = 236
+TgcIdHelper DEBUG channel field size is 6144 field index = 233
+TgcIdHelper DEBUG channel field size is 6144 field index = 234
+TgcIdHelper DEBUG channel field size is 1536 field index = 235
+TgcIdHelper DEBUG channel field size is 1536 field index = 236
+TgcIdHelper DEBUG channel field size is 2016 field index = 237
+TgcIdHelper DEBUG channel field size is 2688 field index = 238
TgcIdHelper INFO Initializing TGC hash indices ...
TgcIdHelper INFO The element hash max is 1554
TgcIdHelper INFO The detector element hash max is 1554
@@ -1509,17 +1517,17 @@ CscIdHelper DEBUG cham layer decode 1 vals 2 mask/zero m
CscIdHelper DEBUG layer decode 1 vals 1:4 mask/zero mask/shift/bits/offset 3 fffe7fffffffffff 47 2 15 indexes mode both_bounded
CscIdHelper DEBUG phi decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffffbfffffffffff 46 1 17 indexes mode both_bounded
CscIdHelper DEBUG strip decode 1 vals 1:192 mask/zero mask/shift/bits/offset ff ffffc03fffffffff 38 8 18 indexes mode both_bounded
-CscIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 216
-CscIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 255
-CscIdHelper INFO MultiRange built successfully to cscStrip: MultiRange size is 257
-CscIdHelper DEBUG field size is 8 field index = 135
+CscIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 218
+CscIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 257
+CscIdHelper INFO MultiRange built successfully to cscStrip: MultiRange size is 259
CscIdHelper DEBUG field size is 8 field index = 136
-CscIdHelper DEBUG detector element field size is 8 field index = 141
+CscIdHelper DEBUG field size is 8 field index = 137
CscIdHelper DEBUG detector element field size is 8 field index = 142
-CscIdHelper DEBUG channel field size is 6144 field index = 141
-CscIdHelper DEBUG channel field size is 1536 field index = 142
-CscIdHelper DEBUG channel field size is 6144 field index = 143
-CscIdHelper DEBUG channel field size is 1536 field index = 144
+CscIdHelper DEBUG detector element field size is 8 field index = 143
+CscIdHelper DEBUG channel field size is 6144 field index = 142
+CscIdHelper DEBUG channel field size is 1536 field index = 143
+CscIdHelper DEBUG channel field size is 6144 field index = 144
+CscIdHelper DEBUG channel field size is 1536 field index = 145
CscIdHelper INFO Initializing CSC hash indices ...
CscIdHelper INFO The element hash max is 16
CscIdHelper INFO The detector element hash max is 16
@@ -1538,85 +1546,85 @@ TgcIdHelper DEBUG technology decode 1 vals 3 mask/zero m
TgcIdHelper DEBUG gas gap decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 fffff3ffffffffff 42 2 20 indexes mode both_bounded
TgcIdHelper DEBUG is strip decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 fffffdffffffffff 41 1 22 indexes mode both_bounded
TgcIdHelper DEBUG channel decode 1 vals 1:125 mask/zero mask/shift/bits/offset 7f fffffe03ffffffff 34 7 23 indexes mode both_bounded
-TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 216
-TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 216
-TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 257
-TgcIdHelper DEBUG field size is 48 field index = 189
-TgcIdHelper DEBUG field size is 96 field index = 190
-TgcIdHelper DEBUG field size is 96 field index = 191
+TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 218
+TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 218
+TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 259
+TgcIdHelper DEBUG field size is 48 field index = 191
TgcIdHelper DEBUG field size is 96 field index = 192
TgcIdHelper DEBUG field size is 96 field index = 193
-TgcIdHelper DEBUG field size is 48 field index = 194
+TgcIdHelper DEBUG field size is 96 field index = 194
TgcIdHelper DEBUG field size is 96 field index = 195
-TgcIdHelper DEBUG field size is 96 field index = 196
+TgcIdHelper DEBUG field size is 48 field index = 196
TgcIdHelper DEBUG field size is 96 field index = 197
TgcIdHelper DEBUG field size is 96 field index = 198
TgcIdHelper DEBUG field size is 96 field index = 199
-TgcIdHelper DEBUG field size is 48 field index = 200
+TgcIdHelper DEBUG field size is 96 field index = 200
TgcIdHelper DEBUG field size is 96 field index = 201
-TgcIdHelper DEBUG field size is 96 field index = 202
+TgcIdHelper DEBUG field size is 48 field index = 202
TgcIdHelper DEBUG field size is 96 field index = 203
TgcIdHelper DEBUG field size is 96 field index = 204
TgcIdHelper DEBUG field size is 96 field index = 205
-TgcIdHelper DEBUG field size is 24 field index = 206
-TgcIdHelper DEBUG field size is 42 field index = 207
-TgcIdHelper DEBUG detector element field size is 48 field index = 189
-TgcIdHelper DEBUG detector element field size is 96 field index = 190
-TgcIdHelper DEBUG detector element field size is 96 field index = 191
+TgcIdHelper DEBUG field size is 96 field index = 206
+TgcIdHelper DEBUG field size is 96 field index = 207
+TgcIdHelper DEBUG field size is 24 field index = 208
+TgcIdHelper DEBUG field size is 42 field index = 209
+TgcIdHelper DEBUG detector element field size is 48 field index = 191
TgcIdHelper DEBUG detector element field size is 96 field index = 192
TgcIdHelper DEBUG detector element field size is 96 field index = 193
-TgcIdHelper DEBUG detector element field size is 48 field index = 194
+TgcIdHelper DEBUG detector element field size is 96 field index = 194
TgcIdHelper DEBUG detector element field size is 96 field index = 195
-TgcIdHelper DEBUG detector element field size is 96 field index = 196
+TgcIdHelper DEBUG detector element field size is 48 field index = 196
TgcIdHelper DEBUG detector element field size is 96 field index = 197
TgcIdHelper DEBUG detector element field size is 96 field index = 198
TgcIdHelper DEBUG detector element field size is 96 field index = 199
-TgcIdHelper DEBUG detector element field size is 48 field index = 200
+TgcIdHelper DEBUG detector element field size is 96 field index = 200
TgcIdHelper DEBUG detector element field size is 96 field index = 201
-TgcIdHelper DEBUG detector element field size is 96 field index = 202
+TgcIdHelper DEBUG detector element field size is 48 field index = 202
TgcIdHelper DEBUG detector element field size is 96 field index = 203
TgcIdHelper DEBUG detector element field size is 96 field index = 204
TgcIdHelper DEBUG detector element field size is 96 field index = 205
-TgcIdHelper DEBUG detector element field size is 24 field index = 206
-TgcIdHelper DEBUG detector element field size is 42 field index = 207
-TgcIdHelper DEBUG channel field size is 15120 field index = 199
-TgcIdHelper DEBUG channel field size is 4608 field index = 200
-TgcIdHelper DEBUG channel field size is 26496 field index = 201
-TgcIdHelper DEBUG channel field size is 17856 field index = 202
-TgcIdHelper DEBUG channel field size is 6624 field index = 203
-TgcIdHelper DEBUG channel field size is 6912 field index = 204
-TgcIdHelper DEBUG channel field size is 9216 field index = 205
-TgcIdHelper DEBUG channel field size is 9216 field index = 206
+TgcIdHelper DEBUG detector element field size is 96 field index = 206
+TgcIdHelper DEBUG detector element field size is 96 field index = 207
+TgcIdHelper DEBUG detector element field size is 24 field index = 208
+TgcIdHelper DEBUG detector element field size is 42 field index = 209
+TgcIdHelper DEBUG channel field size is 15120 field index = 201
+TgcIdHelper DEBUG channel field size is 4608 field index = 202
+TgcIdHelper DEBUG channel field size is 26496 field index = 203
+TgcIdHelper DEBUG channel field size is 17856 field index = 204
+TgcIdHelper DEBUG channel field size is 6624 field index = 205
+TgcIdHelper DEBUG channel field size is 6912 field index = 206
TgcIdHelper DEBUG channel field size is 9216 field index = 207
TgcIdHelper DEBUG channel field size is 9216 field index = 208
-TgcIdHelper DEBUG channel field size is 12000 field index = 209
-TgcIdHelper DEBUG channel field size is 3072 field index = 210
-TgcIdHelper DEBUG channel field size is 21120 field index = 211
-TgcIdHelper DEBUG channel field size is 19776 field index = 212
-TgcIdHelper DEBUG channel field size is 6144 field index = 213
-TgcIdHelper DEBUG channel field size is 6144 field index = 214
+TgcIdHelper DEBUG channel field size is 9216 field index = 209
+TgcIdHelper DEBUG channel field size is 9216 field index = 210
+TgcIdHelper DEBUG channel field size is 12000 field index = 211
+TgcIdHelper DEBUG channel field size is 3072 field index = 212
+TgcIdHelper DEBUG channel field size is 21120 field index = 213
+TgcIdHelper DEBUG channel field size is 19776 field index = 214
TgcIdHelper DEBUG channel field size is 6144 field index = 215
TgcIdHelper DEBUG channel field size is 6144 field index = 216
TgcIdHelper DEBUG channel field size is 6144 field index = 217
TgcIdHelper DEBUG channel field size is 6144 field index = 218
TgcIdHelper DEBUG channel field size is 6144 field index = 219
TgcIdHelper DEBUG channel field size is 6144 field index = 220
-TgcIdHelper DEBUG channel field size is 11712 field index = 221
-TgcIdHelper DEBUG channel field size is 3072 field index = 222
-TgcIdHelper DEBUG channel field size is 18432 field index = 223
-TgcIdHelper DEBUG channel field size is 20352 field index = 224
-TgcIdHelper DEBUG channel field size is 6144 field index = 225
-TgcIdHelper DEBUG channel field size is 6144 field index = 226
-TgcIdHelper DEBUG channel field size is 5952 field index = 227
+TgcIdHelper DEBUG channel field size is 6144 field index = 221
+TgcIdHelper DEBUG channel field size is 6144 field index = 222
+TgcIdHelper DEBUG channel field size is 11712 field index = 223
+TgcIdHelper DEBUG channel field size is 3072 field index = 224
+TgcIdHelper DEBUG channel field size is 18432 field index = 225
+TgcIdHelper DEBUG channel field size is 20352 field index = 226
+TgcIdHelper DEBUG channel field size is 6144 field index = 227
TgcIdHelper DEBUG channel field size is 6144 field index = 228
-TgcIdHelper DEBUG channel field size is 6144 field index = 229
+TgcIdHelper DEBUG channel field size is 5952 field index = 229
TgcIdHelper DEBUG channel field size is 6144 field index = 230
TgcIdHelper DEBUG channel field size is 6144 field index = 231
TgcIdHelper DEBUG channel field size is 6144 field index = 232
-TgcIdHelper DEBUG channel field size is 1536 field index = 233
-TgcIdHelper DEBUG channel field size is 1536 field index = 234
-TgcIdHelper DEBUG channel field size is 2016 field index = 235
-TgcIdHelper DEBUG channel field size is 2688 field index = 236
+TgcIdHelper DEBUG channel field size is 6144 field index = 233
+TgcIdHelper DEBUG channel field size is 6144 field index = 234
+TgcIdHelper DEBUG channel field size is 1536 field index = 235
+TgcIdHelper DEBUG channel field size is 1536 field index = 236
+TgcIdHelper DEBUG channel field size is 2016 field index = 237
+TgcIdHelper DEBUG channel field size is 2688 field index = 238
TgcIdHelper INFO Initializing TGC hash indices ...
TgcIdHelper INFO The element hash max is 1554
TgcIdHelper INFO The detector element hash max is 1554
@@ -1634,31 +1642,31 @@ MmIdHelper DEBUG technology decode 1 vals 5 mask/zero m
MmIdHelper DEBUG multilayer decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 fffdffffffffffff 49 1 14 indexes mode both_bounded
MmIdHelper DEBUG gasgap decode 1 vals 1:4 mask/zero mask/shift/bits/offset 3 fffe7fffffffffff 47 2 15 indexes mode both_bounded
MmIdHelper DEBUG channel decode 1 vals 1:5120 mask/zero mask/shift/bits/offset 1fff ffff8003ffffffff 34 13 17 indexes mode both_bounded
-MmIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 216
-MmIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 253
-MmIdHelper INFO MultiRange built successfully to channel: MultiRange size is 257
-MmIdHelper DEBUG field size is 8 field index = 212
-MmIdHelper DEBUG field size is 8 field index = 213
+MmIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 218
+MmIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 255
+MmIdHelper INFO MultiRange built successfully to channel: MultiRange size is 259
MmIdHelper DEBUG field size is 8 field index = 214
MmIdHelper DEBUG field size is 8 field index = 215
-MmIdHelper DEBUG detector element field size is 16 field index = 249
-MmIdHelper DEBUG detector element field size is 16 field index = 250
+MmIdHelper DEBUG field size is 8 field index = 216
+MmIdHelper DEBUG field size is 8 field index = 217
MmIdHelper DEBUG detector element field size is 16 field index = 251
MmIdHelper DEBUG detector element field size is 16 field index = 252
-MmIdHelper DEBUG channel field size is 163840 field index = 249
-MmIdHelper DEBUG channel field size is 163840 field index = 250
-MmIdHelper DEBUG channel field size is 98304 field index = 251
-MmIdHelper DEBUG channel field size is 98304 field index = 252
-MmIdHelper DEBUG channel field size is 163840 field index = 253
-MmIdHelper DEBUG channel field size is 163840 field index = 254
-MmIdHelper DEBUG channel field size is 98304 field index = 255
-MmIdHelper DEBUG channel field size is 98304 field index = 256
+MmIdHelper DEBUG detector element field size is 16 field index = 253
+MmIdHelper DEBUG detector element field size is 16 field index = 254
+MmIdHelper DEBUG channel field size is 163840 field index = 251
+MmIdHelper DEBUG channel field size is 163840 field index = 252
+MmIdHelper DEBUG channel field size is 98304 field index = 253
+MmIdHelper DEBUG channel field size is 98304 field index = 254
+MmIdHelper DEBUG channel field size is 163840 field index = 255
+MmIdHelper DEBUG channel field size is 163840 field index = 256
+MmIdHelper DEBUG channel field size is 98304 field index = 257
+MmIdHelper DEBUG channel field size is 98304 field index = 258
MmIdHelper INFO Initializing MicroMegas hash indices ...
MmIdHelper INFO The element hash max is 32
MmIdHelper INFO The detector element hash max is 64
MmIdHelper INFO Initializing MicroMegas hash indices for finding neighbors ...
MmIdHelper VERBOSE MuonIdHelper::init_neighbors
-=========> checking dictionnary file=IdDictMuonSpectrometer_R.09.NSW.xml
+=========> checking dictionnary file=IdDictMuonSpectrometer_R.09.02.xml
MdtIdHelper DEBUG (Re)initialize
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find csc region index: group, region size 0 0
AtlasDetectorID DEBUG Could not get value for label 'no_side' of field 'DetZside' in dictionary Calorimeter
@@ -1671,10 +1679,10 @@ MdtIdHelper DEBUG phi decode 1 vals 1:8 mask/zero m
MdtIdHelper DEBUG technology decode 1 vals 0,2 mask/zero mask/shift/bits/offset 1 ffff7fffffffffff 47 1 16 indexes 0 0 1 mode enumerated
MdtIdHelper DEBUG multilayer decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 ffffbfffffffffff 46 1 17 indexes mode both_bounded
MdtIdHelper DEBUG layer decode 1 vals 1:4 mask/zero mask/shift/bits/offset 3 ffffcfffffffffff 44 2 18 indexes mode both_bounded
-MdtIdHelper DEBUG tube decode 1 vals 1:78 mask/zero mask/shift/bits/offset 7f fffff01fffffffff 37 7 20 indexes mode both_bounded
-MdtIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 208
-MdtIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 246
-MdtIdHelper INFO MultiRange built successfully to tube: MultiRange size is 246
+MdtIdHelper DEBUG tube decode 1 vals 1:110 mask/zero mask/shift/bits/offset 7f fffff01fffffffff 37 7 20 indexes mode both_bounded
+MdtIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 207
+MdtIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 245
+MdtIdHelper INFO MultiRange built successfully to tube: MultiRange size is 245
MdtIdHelper DEBUG module field size is 5 field index = 0
MdtIdHelper DEBUG module field size is 1 field index = 1
MdtIdHelper DEBUG module field size is 4 field index = 2
@@ -1705,77 +1713,77 @@ MdtIdHelper DEBUG module field size is 16 field index = 26
MdtIdHelper DEBUG module field size is 16 field index = 27
MdtIdHelper DEBUG module field size is 16 field index = 28
MdtIdHelper DEBUG module field size is 16 field index = 29
-MdtIdHelper DEBUG module field size is 10 field index = 30
-MdtIdHelper DEBUG module field size is 6 field index = 31
+MdtIdHelper DEBUG module field size is 16 field index = 30
+MdtIdHelper DEBUG module field size is 16 field index = 31
MdtIdHelper DEBUG module field size is 16 field index = 32
-MdtIdHelper DEBUG module field size is 16 field index = 33
-MdtIdHelper DEBUG module field size is 16 field index = 34
+MdtIdHelper DEBUG module field size is 1 field index = 33
+MdtIdHelper DEBUG module field size is 1 field index = 34
MdtIdHelper DEBUG module field size is 1 field index = 35
MdtIdHelper DEBUG module field size is 1 field index = 36
-MdtIdHelper DEBUG module field size is 1 field index = 37
-MdtIdHelper DEBUG module field size is 1 field index = 38
-MdtIdHelper DEBUG module field size is 2 field index = 39
-MdtIdHelper DEBUG module field size is 2 field index = 40
-MdtIdHelper DEBUG module field size is 1 field index = 41
-MdtIdHelper DEBUG module field size is 4 field index = 42
-MdtIdHelper DEBUG module field size is 2 field index = 43
-MdtIdHelper DEBUG module field size is 1 field index = 44
-MdtIdHelper DEBUG module field size is 32 field index = 45
-MdtIdHelper DEBUG module field size is 16 field index = 46
+MdtIdHelper DEBUG module field size is 2 field index = 37
+MdtIdHelper DEBUG module field size is 2 field index = 38
+MdtIdHelper DEBUG module field size is 1 field index = 39
+MdtIdHelper DEBUG module field size is 4 field index = 40
+MdtIdHelper DEBUG module field size is 2 field index = 41
+MdtIdHelper DEBUG module field size is 1 field index = 42
+MdtIdHelper DEBUG module field size is 32 field index = 43
+MdtIdHelper DEBUG module field size is 16 field index = 44
+MdtIdHelper DEBUG module field size is 14 field index = 45
+MdtIdHelper DEBUG module field size is 2 field index = 46
MdtIdHelper DEBUG module field size is 14 field index = 47
MdtIdHelper DEBUG module field size is 2 field index = 48
-MdtIdHelper DEBUG module field size is 14 field index = 49
-MdtIdHelper DEBUG module field size is 2 field index = 50
+MdtIdHelper DEBUG module field size is 12 field index = 49
+MdtIdHelper DEBUG module field size is 12 field index = 50
MdtIdHelper DEBUG module field size is 12 field index = 51
MdtIdHelper DEBUG module field size is 12 field index = 52
MdtIdHelper DEBUG module field size is 12 field index = 53
MdtIdHelper DEBUG module field size is 12 field index = 54
-MdtIdHelper DEBUG module field size is 12 field index = 55
-MdtIdHelper DEBUG module field size is 12 field index = 56
+MdtIdHelper DEBUG module field size is 4 field index = 55
+MdtIdHelper DEBUG module field size is 4 field index = 56
MdtIdHelper DEBUG module field size is 4 field index = 57
-MdtIdHelper DEBUG module field size is 4 field index = 58
-MdtIdHelper DEBUG module field size is 4 field index = 59
+MdtIdHelper DEBUG module field size is 2 field index = 58
+MdtIdHelper DEBUG module field size is 1 field index = 59
MdtIdHelper DEBUG module field size is 2 field index = 60
MdtIdHelper DEBUG module field size is 1 field index = 61
-MdtIdHelper DEBUG module field size is 2 field index = 62
-MdtIdHelper DEBUG module field size is 1 field index = 63
+MdtIdHelper DEBUG module field size is 3 field index = 62
+MdtIdHelper DEBUG module field size is 2 field index = 63
MdtIdHelper DEBUG module field size is 3 field index = 64
-MdtIdHelper DEBUG module field size is 2 field index = 65
-MdtIdHelper DEBUG module field size is 3 field index = 66
-MdtIdHelper DEBUG module field size is 1 field index = 67
-MdtIdHelper DEBUG module field size is 1 field index = 68
-MdtIdHelper DEBUG module field size is 7 field index = 69
-MdtIdHelper DEBUG module field size is 6 field index = 70
-MdtIdHelper DEBUG module field size is 2 field index = 71
-MdtIdHelper DEBUG module field size is 1 field index = 72
-MdtIdHelper DEBUG module field size is 14 field index = 73
-MdtIdHelper DEBUG module field size is 2 field index = 74
+MdtIdHelper DEBUG module field size is 1 field index = 65
+MdtIdHelper DEBUG module field size is 1 field index = 66
+MdtIdHelper DEBUG module field size is 7 field index = 67
+MdtIdHelper DEBUG module field size is 6 field index = 68
+MdtIdHelper DEBUG module field size is 2 field index = 69
+MdtIdHelper DEBUG module field size is 1 field index = 70
+MdtIdHelper DEBUG module field size is 14 field index = 71
+MdtIdHelper DEBUG module field size is 2 field index = 72
+MdtIdHelper DEBUG module field size is 16 field index = 73
+MdtIdHelper DEBUG module field size is 16 field index = 74
MdtIdHelper DEBUG module field size is 16 field index = 75
-MdtIdHelper DEBUG module field size is 16 field index = 76
-MdtIdHelper DEBUG module field size is 16 field index = 77
-MdtIdHelper DEBUG module field size is 10 field index = 78
-MdtIdHelper DEBUG module field size is 2 field index = 79
+MdtIdHelper DEBUG module field size is 10 field index = 76
+MdtIdHelper DEBUG module field size is 2 field index = 77
+MdtIdHelper DEBUG module field size is 12 field index = 78
+MdtIdHelper DEBUG module field size is 12 field index = 79
MdtIdHelper DEBUG module field size is 12 field index = 80
MdtIdHelper DEBUG module field size is 12 field index = 81
MdtIdHelper DEBUG module field size is 12 field index = 82
-MdtIdHelper DEBUG module field size is 12 field index = 83
-MdtIdHelper DEBUG module field size is 12 field index = 84
+MdtIdHelper DEBUG module field size is 4 field index = 83
+MdtIdHelper DEBUG module field size is 4 field index = 84
MdtIdHelper DEBUG module field size is 4 field index = 85
MdtIdHelper DEBUG module field size is 4 field index = 86
-MdtIdHelper DEBUG module field size is 4 field index = 87
+MdtIdHelper DEBUG module field size is 2 field index = 87
MdtIdHelper DEBUG module field size is 4 field index = 88
-MdtIdHelper DEBUG module field size is 2 field index = 89
+MdtIdHelper DEBUG module field size is 4 field index = 89
MdtIdHelper DEBUG module field size is 4 field index = 90
MdtIdHelper DEBUG module field size is 4 field index = 91
MdtIdHelper DEBUG module field size is 4 field index = 92
-MdtIdHelper DEBUG module field size is 4 field index = 93
+MdtIdHelper DEBUG module field size is 8 field index = 93
MdtIdHelper DEBUG module field size is 4 field index = 94
-MdtIdHelper DEBUG module field size is 8 field index = 95
-MdtIdHelper DEBUG module field size is 4 field index = 96
-MdtIdHelper DEBUG module field size is 4 field index = 97
-MdtIdHelper DEBUG module field size is 14 field index = 98
-MdtIdHelper DEBUG module field size is 14 field index = 99
-MdtIdHelper DEBUG module field size is 2 field index = 100
+MdtIdHelper DEBUG module field size is 4 field index = 95
+MdtIdHelper DEBUG module field size is 14 field index = 96
+MdtIdHelper DEBUG module field size is 14 field index = 97
+MdtIdHelper DEBUG module field size is 2 field index = 98
+MdtIdHelper DEBUG module field size is 16 field index = 99
+MdtIdHelper DEBUG module field size is 16 field index = 100
MdtIdHelper DEBUG module field size is 16 field index = 101
MdtIdHelper DEBUG module field size is 16 field index = 102
MdtIdHelper DEBUG module field size is 16 field index = 103
@@ -1798,13 +1806,11 @@ MdtIdHelper DEBUG module field size is 16 field index = 119
MdtIdHelper DEBUG module field size is 16 field index = 120
MdtIdHelper DEBUG module field size is 16 field index = 121
MdtIdHelper DEBUG module field size is 16 field index = 122
-MdtIdHelper DEBUG module field size is 16 field index = 123
-MdtIdHelper DEBUG module field size is 16 field index = 124
-MdtIdHelper DEBUG module field size is 2 field index = 125
-MdtIdHelper DEBUG module field size is 2 field index = 126
+MdtIdHelper DEBUG module field size is 2 field index = 123
+MdtIdHelper DEBUG module field size is 2 field index = 124
+MdtIdHelper DEBUG module field size is 4 field index = 125
+MdtIdHelper DEBUG module field size is 4 field index = 126
MdtIdHelper DEBUG module field size is 4 field index = 127
-MdtIdHelper DEBUG module field size is 4 field index = 128
-MdtIdHelper DEBUG module field size is 4 field index = 129
MdtIdHelper DEBUG detector element field size is 10 field index = 0
MdtIdHelper DEBUG detector element field size is 2 field index = 1
MdtIdHelper DEBUG detector element field size is 8 field index = 2
@@ -1839,79 +1845,79 @@ MdtIdHelper DEBUG detector element field size is 32 field index = 30
MdtIdHelper DEBUG detector element field size is 32 field index = 31
MdtIdHelper DEBUG detector element field size is 32 field index = 32
MdtIdHelper DEBUG detector element field size is 32 field index = 33
-MdtIdHelper DEBUG detector element field size is 20 field index = 34
-MdtIdHelper DEBUG detector element field size is 12 field index = 35
+MdtIdHelper DEBUG detector element field size is 32 field index = 34
+MdtIdHelper DEBUG detector element field size is 16 field index = 35
MdtIdHelper DEBUG detector element field size is 16 field index = 36
-MdtIdHelper DEBUG detector element field size is 16 field index = 37
-MdtIdHelper DEBUG detector element field size is 16 field index = 38
+MdtIdHelper DEBUG detector element field size is 2 field index = 37
+MdtIdHelper DEBUG detector element field size is 2 field index = 38
MdtIdHelper DEBUG detector element field size is 2 field index = 39
MdtIdHelper DEBUG detector element field size is 2 field index = 40
-MdtIdHelper DEBUG detector element field size is 2 field index = 41
-MdtIdHelper DEBUG detector element field size is 2 field index = 42
-MdtIdHelper DEBUG detector element field size is 4 field index = 43
-MdtIdHelper DEBUG detector element field size is 4 field index = 44
-MdtIdHelper DEBUG detector element field size is 2 field index = 45
-MdtIdHelper DEBUG detector element field size is 8 field index = 46
-MdtIdHelper DEBUG detector element field size is 4 field index = 47
-MdtIdHelper DEBUG detector element field size is 2 field index = 48
-MdtIdHelper DEBUG detector element field size is 64 field index = 49
-MdtIdHelper DEBUG detector element field size is 32 field index = 50
+MdtIdHelper DEBUG detector element field size is 4 field index = 41
+MdtIdHelper DEBUG detector element field size is 4 field index = 42
+MdtIdHelper DEBUG detector element field size is 2 field index = 43
+MdtIdHelper DEBUG detector element field size is 8 field index = 44
+MdtIdHelper DEBUG detector element field size is 4 field index = 45
+MdtIdHelper DEBUG detector element field size is 2 field index = 46
+MdtIdHelper DEBUG detector element field size is 64 field index = 47
+MdtIdHelper DEBUG detector element field size is 32 field index = 48
+MdtIdHelper DEBUG detector element field size is 28 field index = 49
+MdtIdHelper DEBUG detector element field size is 4 field index = 50
MdtIdHelper DEBUG detector element field size is 28 field index = 51
MdtIdHelper DEBUG detector element field size is 4 field index = 52
-MdtIdHelper DEBUG detector element field size is 28 field index = 53
-MdtIdHelper DEBUG detector element field size is 4 field index = 54
+MdtIdHelper DEBUG detector element field size is 24 field index = 53
+MdtIdHelper DEBUG detector element field size is 24 field index = 54
MdtIdHelper DEBUG detector element field size is 24 field index = 55
-MdtIdHelper DEBUG detector element field size is 24 field index = 56
-MdtIdHelper DEBUG detector element field size is 24 field index = 57
-MdtIdHelper DEBUG detector element field size is 12 field index = 58
+MdtIdHelper DEBUG detector element field size is 12 field index = 56
+MdtIdHelper DEBUG detector element field size is 12 field index = 57
+MdtIdHelper DEBUG detector element field size is 24 field index = 58
MdtIdHelper DEBUG detector element field size is 12 field index = 59
-MdtIdHelper DEBUG detector element field size is 24 field index = 60
-MdtIdHelper DEBUG detector element field size is 12 field index = 61
-MdtIdHelper DEBUG detector element field size is 12 field index = 62
+MdtIdHelper DEBUG detector element field size is 12 field index = 60
+MdtIdHelper DEBUG detector element field size is 8 field index = 61
+MdtIdHelper DEBUG detector element field size is 8 field index = 62
MdtIdHelper DEBUG detector element field size is 8 field index = 63
-MdtIdHelper DEBUG detector element field size is 8 field index = 64
-MdtIdHelper DEBUG detector element field size is 8 field index = 65
+MdtIdHelper DEBUG detector element field size is 4 field index = 64
+MdtIdHelper DEBUG detector element field size is 2 field index = 65
MdtIdHelper DEBUG detector element field size is 4 field index = 66
MdtIdHelper DEBUG detector element field size is 2 field index = 67
-MdtIdHelper DEBUG detector element field size is 4 field index = 68
-MdtIdHelper DEBUG detector element field size is 2 field index = 69
+MdtIdHelper DEBUG detector element field size is 6 field index = 68
+MdtIdHelper DEBUG detector element field size is 4 field index = 69
MdtIdHelper DEBUG detector element field size is 6 field index = 70
-MdtIdHelper DEBUG detector element field size is 4 field index = 71
-MdtIdHelper DEBUG detector element field size is 6 field index = 72
-MdtIdHelper DEBUG detector element field size is 2 field index = 73
-MdtIdHelper DEBUG detector element field size is 2 field index = 74
-MdtIdHelper DEBUG detector element field size is 14 field index = 75
-MdtIdHelper DEBUG detector element field size is 12 field index = 76
-MdtIdHelper DEBUG detector element field size is 4 field index = 77
-MdtIdHelper DEBUG detector element field size is 2 field index = 78
-MdtIdHelper DEBUG detector element field size is 28 field index = 79
-MdtIdHelper DEBUG detector element field size is 4 field index = 80
+MdtIdHelper DEBUG detector element field size is 2 field index = 71
+MdtIdHelper DEBUG detector element field size is 2 field index = 72
+MdtIdHelper DEBUG detector element field size is 14 field index = 73
+MdtIdHelper DEBUG detector element field size is 12 field index = 74
+MdtIdHelper DEBUG detector element field size is 4 field index = 75
+MdtIdHelper DEBUG detector element field size is 2 field index = 76
+MdtIdHelper DEBUG detector element field size is 28 field index = 77
+MdtIdHelper DEBUG detector element field size is 4 field index = 78
+MdtIdHelper DEBUG detector element field size is 32 field index = 79
+MdtIdHelper DEBUG detector element field size is 32 field index = 80
MdtIdHelper DEBUG detector element field size is 32 field index = 81
-MdtIdHelper DEBUG detector element field size is 32 field index = 82
-MdtIdHelper DEBUG detector element field size is 32 field index = 83
-MdtIdHelper DEBUG detector element field size is 20 field index = 84
-MdtIdHelper DEBUG detector element field size is 4 field index = 85
+MdtIdHelper DEBUG detector element field size is 20 field index = 82
+MdtIdHelper DEBUG detector element field size is 4 field index = 83
+MdtIdHelper DEBUG detector element field size is 24 field index = 84
+MdtIdHelper DEBUG detector element field size is 24 field index = 85
MdtIdHelper DEBUG detector element field size is 24 field index = 86
MdtIdHelper DEBUG detector element field size is 24 field index = 87
MdtIdHelper DEBUG detector element field size is 24 field index = 88
-MdtIdHelper DEBUG detector element field size is 24 field index = 89
-MdtIdHelper DEBUG detector element field size is 24 field index = 90
+MdtIdHelper DEBUG detector element field size is 8 field index = 89
+MdtIdHelper DEBUG detector element field size is 8 field index = 90
MdtIdHelper DEBUG detector element field size is 8 field index = 91
MdtIdHelper DEBUG detector element field size is 8 field index = 92
-MdtIdHelper DEBUG detector element field size is 8 field index = 93
+MdtIdHelper DEBUG detector element field size is 4 field index = 93
MdtIdHelper DEBUG detector element field size is 8 field index = 94
-MdtIdHelper DEBUG detector element field size is 4 field index = 95
+MdtIdHelper DEBUG detector element field size is 8 field index = 95
MdtIdHelper DEBUG detector element field size is 8 field index = 96
MdtIdHelper DEBUG detector element field size is 8 field index = 97
MdtIdHelper DEBUG detector element field size is 8 field index = 98
-MdtIdHelper DEBUG detector element field size is 8 field index = 99
+MdtIdHelper DEBUG detector element field size is 16 field index = 99
MdtIdHelper DEBUG detector element field size is 8 field index = 100
-MdtIdHelper DEBUG detector element field size is 16 field index = 101
-MdtIdHelper DEBUG detector element field size is 8 field index = 102
-MdtIdHelper DEBUG detector element field size is 8 field index = 103
-MdtIdHelper DEBUG detector element field size is 28 field index = 104
-MdtIdHelper DEBUG detector element field size is 28 field index = 105
-MdtIdHelper DEBUG detector element field size is 4 field index = 106
+MdtIdHelper DEBUG detector element field size is 8 field index = 101
+MdtIdHelper DEBUG detector element field size is 28 field index = 102
+MdtIdHelper DEBUG detector element field size is 28 field index = 103
+MdtIdHelper DEBUG detector element field size is 4 field index = 104
+MdtIdHelper DEBUG detector element field size is 32 field index = 105
+MdtIdHelper DEBUG detector element field size is 32 field index = 106
MdtIdHelper DEBUG detector element field size is 32 field index = 107
MdtIdHelper DEBUG detector element field size is 32 field index = 108
MdtIdHelper DEBUG detector element field size is 32 field index = 109
@@ -1934,13 +1940,11 @@ MdtIdHelper DEBUG detector element field size is 32 field index = 125
MdtIdHelper DEBUG detector element field size is 32 field index = 126
MdtIdHelper DEBUG detector element field size is 32 field index = 127
MdtIdHelper DEBUG detector element field size is 32 field index = 128
-MdtIdHelper DEBUG detector element field size is 32 field index = 129
-MdtIdHelper DEBUG detector element field size is 32 field index = 130
-MdtIdHelper DEBUG detector element field size is 4 field index = 131
-MdtIdHelper DEBUG detector element field size is 4 field index = 132
+MdtIdHelper DEBUG detector element field size is 4 field index = 129
+MdtIdHelper DEBUG detector element field size is 4 field index = 130
+MdtIdHelper DEBUG detector element field size is 8 field index = 131
+MdtIdHelper DEBUG detector element field size is 8 field index = 132
MdtIdHelper DEBUG detector element field size is 8 field index = 133
-MdtIdHelper DEBUG detector element field size is 8 field index = 134
-MdtIdHelper DEBUG detector element field size is 8 field index = 135
MdtIdHelper DEBUG channel field size is 1200 field index = 0
MdtIdHelper DEBUG channel field size is 192 field index = 1
MdtIdHelper DEBUG channel field size is 960 field index = 2
@@ -1975,82 +1979,82 @@ MdtIdHelper DEBUG channel field size is 3840 field index = 30
MdtIdHelper DEBUG channel field size is 3840 field index = 31
MdtIdHelper DEBUG channel field size is 3840 field index = 32
MdtIdHelper DEBUG channel field size is 3840 field index = 33
-MdtIdHelper DEBUG channel field size is 2400 field index = 34
-MdtIdHelper DEBUG channel field size is 1728 field index = 35
-MdtIdHelper DEBUG channel field size is 768 field index = 36
-MdtIdHelper DEBUG channel field size is 3072 field index = 37
-MdtIdHelper DEBUG channel field size is 3072 field index = 38
-MdtIdHelper DEBUG channel field size is 192 field index = 39
-MdtIdHelper DEBUG channel field size is 288 field index = 40
-MdtIdHelper DEBUG channel field size is 240 field index = 41
-MdtIdHelper DEBUG channel field size is 336 field index = 42
-MdtIdHelper DEBUG channel field size is 672 field index = 43
-MdtIdHelper DEBUG channel field size is 576 field index = 44
-MdtIdHelper DEBUG channel field size is 288 field index = 45
-MdtIdHelper DEBUG channel field size is 960 field index = 46
-MdtIdHelper DEBUG channel field size is 384 field index = 47
-MdtIdHelper DEBUG channel field size is 192 field index = 48
-MdtIdHelper DEBUG channel field size is 10752 field index = 49
-MdtIdHelper DEBUG channel field size is 3840 field index = 50
-MdtIdHelper DEBUG channel field size is 3360 field index = 51
-MdtIdHelper DEBUG channel field size is 576 field index = 52
+MdtIdHelper DEBUG channel field size is 14080 field index = 34
+MdtIdHelper DEBUG channel field size is 3072 field index = 35
+MdtIdHelper DEBUG channel field size is 3072 field index = 36
+MdtIdHelper DEBUG channel field size is 192 field index = 37
+MdtIdHelper DEBUG channel field size is 288 field index = 38
+MdtIdHelper DEBUG channel field size is 240 field index = 39
+MdtIdHelper DEBUG channel field size is 336 field index = 40
+MdtIdHelper DEBUG channel field size is 672 field index = 41
+MdtIdHelper DEBUG channel field size is 576 field index = 42
+MdtIdHelper DEBUG channel field size is 288 field index = 43
+MdtIdHelper DEBUG channel field size is 960 field index = 44
+MdtIdHelper DEBUG channel field size is 384 field index = 45
+MdtIdHelper DEBUG channel field size is 192 field index = 46
+MdtIdHelper DEBUG channel field size is 10752 field index = 47
+MdtIdHelper DEBUG channel field size is 3840 field index = 48
+MdtIdHelper DEBUG channel field size is 3360 field index = 49
+MdtIdHelper DEBUG channel field size is 576 field index = 50
+MdtIdHelper DEBUG channel field size is 4032 field index = 51
+MdtIdHelper DEBUG channel field size is 192 field index = 52
MdtIdHelper DEBUG channel field size is 4032 field index = 53
-MdtIdHelper DEBUG channel field size is 192 field index = 54
-MdtIdHelper DEBUG channel field size is 4032 field index = 55
-MdtIdHelper DEBUG channel field size is 3456 field index = 56
-MdtIdHelper DEBUG channel field size is 3456 field index = 57
-MdtIdHelper DEBUG channel field size is 1440 field index = 58
-MdtIdHelper DEBUG channel field size is 1728 field index = 59
-MdtIdHelper DEBUG channel field size is 2304 field index = 60
-MdtIdHelper DEBUG channel field size is 1440 field index = 61
-MdtIdHelper DEBUG channel field size is 1728 field index = 62
-MdtIdHelper DEBUG channel field size is 1728 field index = 63
-MdtIdHelper DEBUG channel field size is 1536 field index = 64
-MdtIdHelper DEBUG channel field size is 1152 field index = 65
-MdtIdHelper DEBUG channel field size is 864 field index = 66
-MdtIdHelper DEBUG channel field size is 384 field index = 67
-MdtIdHelper DEBUG channel field size is 576 field index = 68
-MdtIdHelper DEBUG channel field size is 288 field index = 69
-MdtIdHelper DEBUG channel field size is 1008 field index = 70
-MdtIdHelper DEBUG channel field size is 672 field index = 71
-MdtIdHelper DEBUG channel field size is 864 field index = 72
-MdtIdHelper DEBUG channel field size is 336 field index = 73
-MdtIdHelper DEBUG channel field size is 432 field index = 74
-MdtIdHelper DEBUG channel field size is 3024 field index = 75
-MdtIdHelper DEBUG channel field size is 2592 field index = 76
-MdtIdHelper DEBUG channel field size is 576 field index = 77
-MdtIdHelper DEBUG channel field size is 288 field index = 78
-MdtIdHelper DEBUG channel field size is 4704 field index = 79
-MdtIdHelper DEBUG channel field size is 576 field index = 80
-MdtIdHelper DEBUG channel field size is 6912 field index = 81
-MdtIdHelper DEBUG channel field size is 6912 field index = 82
-MdtIdHelper DEBUG channel field size is 5376 field index = 83
-MdtIdHelper DEBUG channel field size is 4320 field index = 84
-MdtIdHelper DEBUG channel field size is 576 field index = 85
+MdtIdHelper DEBUG channel field size is 3456 field index = 54
+MdtIdHelper DEBUG channel field size is 3456 field index = 55
+MdtIdHelper DEBUG channel field size is 1440 field index = 56
+MdtIdHelper DEBUG channel field size is 1728 field index = 57
+MdtIdHelper DEBUG channel field size is 2304 field index = 58
+MdtIdHelper DEBUG channel field size is 1440 field index = 59
+MdtIdHelper DEBUG channel field size is 1728 field index = 60
+MdtIdHelper DEBUG channel field size is 1728 field index = 61
+MdtIdHelper DEBUG channel field size is 1536 field index = 62
+MdtIdHelper DEBUG channel field size is 1152 field index = 63
+MdtIdHelper DEBUG channel field size is 864 field index = 64
+MdtIdHelper DEBUG channel field size is 384 field index = 65
+MdtIdHelper DEBUG channel field size is 576 field index = 66
+MdtIdHelper DEBUG channel field size is 288 field index = 67
+MdtIdHelper DEBUG channel field size is 1008 field index = 68
+MdtIdHelper DEBUG channel field size is 672 field index = 69
+MdtIdHelper DEBUG channel field size is 864 field index = 70
+MdtIdHelper DEBUG channel field size is 336 field index = 71
+MdtIdHelper DEBUG channel field size is 432 field index = 72
+MdtIdHelper DEBUG channel field size is 3024 field index = 73
+MdtIdHelper DEBUG channel field size is 2592 field index = 74
+MdtIdHelper DEBUG channel field size is 576 field index = 75
+MdtIdHelper DEBUG channel field size is 288 field index = 76
+MdtIdHelper DEBUG channel field size is 4704 field index = 77
+MdtIdHelper DEBUG channel field size is 576 field index = 78
+MdtIdHelper DEBUG channel field size is 6912 field index = 79
+MdtIdHelper DEBUG channel field size is 6912 field index = 80
+MdtIdHelper DEBUG channel field size is 5376 field index = 81
+MdtIdHelper DEBUG channel field size is 4320 field index = 82
+MdtIdHelper DEBUG channel field size is 576 field index = 83
+MdtIdHelper DEBUG channel field size is 5184 field index = 84
+MdtIdHelper DEBUG channel field size is 5184 field index = 85
MdtIdHelper DEBUG channel field size is 5184 field index = 86
MdtIdHelper DEBUG channel field size is 5184 field index = 87
-MdtIdHelper DEBUG channel field size is 5184 field index = 88
-MdtIdHelper DEBUG channel field size is 5184 field index = 89
-MdtIdHelper DEBUG channel field size is 4608 field index = 90
-MdtIdHelper DEBUG channel field size is 1728 field index = 91
-MdtIdHelper DEBUG channel field size is 1536 field index = 92
-MdtIdHelper DEBUG channel field size is 1152 field index = 93
+MdtIdHelper DEBUG channel field size is 4608 field index = 88
+MdtIdHelper DEBUG channel field size is 1728 field index = 89
+MdtIdHelper DEBUG channel field size is 1536 field index = 90
+MdtIdHelper DEBUG channel field size is 1152 field index = 91
+MdtIdHelper DEBUG channel field size is 960 field index = 92
+MdtIdHelper DEBUG channel field size is 480 field index = 93
MdtIdHelper DEBUG channel field size is 960 field index = 94
-MdtIdHelper DEBUG channel field size is 480 field index = 95
+MdtIdHelper DEBUG channel field size is 960 field index = 95
MdtIdHelper DEBUG channel field size is 960 field index = 96
MdtIdHelper DEBUG channel field size is 960 field index = 97
-MdtIdHelper DEBUG channel field size is 960 field index = 98
-MdtIdHelper DEBUG channel field size is 960 field index = 99
-MdtIdHelper DEBUG channel field size is 384 field index = 100
-MdtIdHelper DEBUG channel field size is 3456 field index = 101
-MdtIdHelper DEBUG channel field size is 1344 field index = 102
-MdtIdHelper DEBUG channel field size is 1344 field index = 103
-MdtIdHelper DEBUG channel field size is 3360 field index = 104
-MdtIdHelper DEBUG channel field size is 3360 field index = 105
-MdtIdHelper DEBUG channel field size is 576 field index = 106
-MdtIdHelper DEBUG channel field size is 4608 field index = 107
-MdtIdHelper DEBUG channel field size is 3840 field index = 108
-MdtIdHelper DEBUG channel field size is 5376 field index = 109
+MdtIdHelper DEBUG channel field size is 384 field index = 98
+MdtIdHelper DEBUG channel field size is 3456 field index = 99
+MdtIdHelper DEBUG channel field size is 1344 field index = 100
+MdtIdHelper DEBUG channel field size is 1344 field index = 101
+MdtIdHelper DEBUG channel field size is 3360 field index = 102
+MdtIdHelper DEBUG channel field size is 3360 field index = 103
+MdtIdHelper DEBUG channel field size is 576 field index = 104
+MdtIdHelper DEBUG channel field size is 4608 field index = 105
+MdtIdHelper DEBUG channel field size is 3840 field index = 106
+MdtIdHelper DEBUG channel field size is 5376 field index = 107
+MdtIdHelper DEBUG channel field size is 6144 field index = 108
+MdtIdHelper DEBUG channel field size is 6144 field index = 109
MdtIdHelper DEBUG channel field size is 6144 field index = 110
MdtIdHelper DEBUG channel field size is 6144 field index = 111
MdtIdHelper DEBUG channel field size is 6144 field index = 112
@@ -2058,30 +2062,29 @@ MdtIdHelper DEBUG channel field size is 6144 field index = 113
MdtIdHelper DEBUG channel field size is 6144 field index = 114
MdtIdHelper DEBUG channel field size is 6144 field index = 115
MdtIdHelper DEBUG channel field size is 6144 field index = 116
-MdtIdHelper DEBUG channel field size is 6144 field index = 117
-MdtIdHelper DEBUG channel field size is 6144 field index = 118
-MdtIdHelper DEBUG channel field size is 5376 field index = 119
-MdtIdHelper DEBUG channel field size is 5376 field index = 120
+MdtIdHelper DEBUG channel field size is 5376 field index = 117
+MdtIdHelper DEBUG channel field size is 5376 field index = 118
+MdtIdHelper DEBUG channel field size is 4608 field index = 119
+MdtIdHelper DEBUG channel field size is 4608 field index = 120
MdtIdHelper DEBUG channel field size is 4608 field index = 121
MdtIdHelper DEBUG channel field size is 4608 field index = 122
-MdtIdHelper DEBUG channel field size is 4608 field index = 123
-MdtIdHelper DEBUG channel field size is 4608 field index = 124
+MdtIdHelper DEBUG channel field size is 5376 field index = 123
+MdtIdHelper DEBUG channel field size is 5376 field index = 124
MdtIdHelper DEBUG channel field size is 5376 field index = 125
-MdtIdHelper DEBUG channel field size is 5376 field index = 126
-MdtIdHelper DEBUG channel field size is 5376 field index = 127
+MdtIdHelper DEBUG channel field size is 4608 field index = 126
+MdtIdHelper DEBUG channel field size is 4608 field index = 127
MdtIdHelper DEBUG channel field size is 4608 field index = 128
-MdtIdHelper DEBUG channel field size is 4608 field index = 129
-MdtIdHelper DEBUG channel field size is 4608 field index = 130
-MdtIdHelper DEBUG channel field size is 1248 field index = 131
-MdtIdHelper DEBUG channel field size is 864 field index = 132
+MdtIdHelper DEBUG channel field size is 1248 field index = 129
+MdtIdHelper DEBUG channel field size is 864 field index = 130
+MdtIdHelper DEBUG channel field size is 1728 field index = 131
+MdtIdHelper DEBUG channel field size is 1728 field index = 132
MdtIdHelper DEBUG channel field size is 1728 field index = 133
-MdtIdHelper DEBUG channel field size is 1728 field index = 134
-MdtIdHelper DEBUG channel field size is 1728 field index = 135
MdtIdHelper INFO Initializing MDT hash indices ...
-MdtIdHelper INFO The element hash max is 1108
-MdtIdHelper INFO The detector element hash max is 2168
+MdtIdHelper INFO The element hash max is 1092
+MdtIdHelper INFO The detector element hash max is 2152
MdtIdHelper INFO Initializing MDT hash indices for finding neighbors ...
MdtIdHelper VERBOSE MuonIdHelper::init_neighbors
+MdtIdHelper DEBUG Maximum number of MDT tubes is 110
RpcIdHelper DEBUG (Re)initialize
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find csc region index: group, region size 0 0
AtlasDetectorID DEBUG Could not get value for label 'no_side' of field 'DetZside' in dictionary Calorimeter
@@ -2095,182 +2098,185 @@ RpcIdHelper DEBUG technology decode 1 vals 0,2 mask/zero m
RpcIdHelper DEBUG TR decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 ffffbfffffffffff 46 1 17 indexes mode both_bounded
RpcIdHelper DEBUG TZ decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 ffffcfffffffffff 44 2 18 indexes mode both_bounded
RpcIdHelper DEBUG TPHI decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 fffff7ffffffffff 43 1 20 indexes mode both_bounded
-RpcIdHelper DEBUG gas gap decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 fffffbffffffffff 42 1 21 indexes mode both_bounded
-RpcIdHelper DEBUG phi decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 fffffdffffffffff 41 1 22 indexes mode both_bounded
-RpcIdHelper DEBUG strip decode 1 vals 1:99 mask/zero mask/shift/bits/offset 7f fffffe03ffffffff 34 7 23 indexes mode both_bounded
-RpcIdHelper INFO MultiRange built successfully to doubletR: MultiRange size is 246
-RpcIdHelper INFO MultiRange built successfully to detectorElement: DetectorElement MultiRange size is 246
-RpcIdHelper INFO MultiRange built successfully to rpcStrip: MultiRange size is 246
-RpcIdHelper DEBUG field size is 4 field index = 136
-RpcIdHelper DEBUG field size is 2 field index = 137
+RpcIdHelper DEBUG gas gap decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 fffff9ffffffffff 41 2 21 indexes mode both_bounded
+RpcIdHelper DEBUG phi decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 fffffeffffffffff 40 1 23 indexes mode both_bounded
+RpcIdHelper DEBUG strip decode 1 vals 1:99 mask/zero mask/shift/bits/offset 7f ffffff01ffffffff 33 7 24 indexes mode both_bounded
+RpcIdHelper INFO MultiRange built successfully to doubletR: MultiRange size is 245
+RpcIdHelper INFO MultiRange built successfully to detectorElement: DetectorElement MultiRange size is 245
+RpcIdHelper INFO MultiRange built successfully to rpcStrip: MultiRange size is 245
+RpcIdHelper DEBUG field size is 4 field index = 134
+RpcIdHelper DEBUG field size is 2 field index = 135
+RpcIdHelper DEBUG field size is 2 field index = 136
+RpcIdHelper DEBUG field size is 4 field index = 137
RpcIdHelper DEBUG field size is 2 field index = 138
-RpcIdHelper DEBUG field size is 4 field index = 139
-RpcIdHelper DEBUG field size is 2 field index = 140
+RpcIdHelper DEBUG field size is 2 field index = 139
+RpcIdHelper DEBUG field size is 4 field index = 140
RpcIdHelper DEBUG field size is 2 field index = 141
-RpcIdHelper DEBUG field size is 4 field index = 142
-RpcIdHelper DEBUG field size is 2 field index = 143
-RpcIdHelper DEBUG field size is 2 field index = 144
-RpcIdHelper DEBUG field size is 8 field index = 145
-RpcIdHelper DEBUG field size is 32 field index = 146
-RpcIdHelper DEBUG field size is 32 field index = 147
+RpcIdHelper DEBUG field size is 2 field index = 142
+RpcIdHelper DEBUG field size is 8 field index = 143
+RpcIdHelper DEBUG field size is 32 field index = 144
+RpcIdHelper DEBUG field size is 32 field index = 145
+RpcIdHelper DEBUG field size is 28 field index = 146
+RpcIdHelper DEBUG field size is 4 field index = 147
RpcIdHelper DEBUG field size is 28 field index = 148
RpcIdHelper DEBUG field size is 4 field index = 149
RpcIdHelper DEBUG field size is 28 field index = 150
-RpcIdHelper DEBUG field size is 4 field index = 151
-RpcIdHelper DEBUG field size is 28 field index = 152
-RpcIdHelper DEBUG field size is 2 field index = 153
-RpcIdHelper DEBUG field size is 14 field index = 154
+RpcIdHelper DEBUG field size is 2 field index = 151
+RpcIdHelper DEBUG field size is 14 field index = 152
+RpcIdHelper DEBUG field size is 24 field index = 153
+RpcIdHelper DEBUG field size is 24 field index = 154
RpcIdHelper DEBUG field size is 24 field index = 155
-RpcIdHelper DEBUG field size is 24 field index = 156
-RpcIdHelper DEBUG field size is 24 field index = 157
-RpcIdHelper DEBUG field size is 12 field index = 158
-RpcIdHelper DEBUG field size is 12 field index = 159
-RpcIdHelper DEBUG field size is 24 field index = 160
-RpcIdHelper DEBUG field size is 24 field index = 161
-RpcIdHelper DEBUG field size is 8 field index = 162
-RpcIdHelper DEBUG field size is 8 field index = 163
+RpcIdHelper DEBUG field size is 12 field index = 156
+RpcIdHelper DEBUG field size is 12 field index = 157
+RpcIdHelper DEBUG field size is 24 field index = 158
+RpcIdHelper DEBUG field size is 24 field index = 159
+RpcIdHelper DEBUG field size is 8 field index = 160
+RpcIdHelper DEBUG field size is 8 field index = 161
+RpcIdHelper DEBUG field size is 16 field index = 162
+RpcIdHelper DEBUG field size is 16 field index = 163
RpcIdHelper DEBUG field size is 16 field index = 164
RpcIdHelper DEBUG field size is 16 field index = 165
RpcIdHelper DEBUG field size is 16 field index = 166
-RpcIdHelper DEBUG field size is 16 field index = 167
-RpcIdHelper DEBUG field size is 16 field index = 168
+RpcIdHelper DEBUG field size is 12 field index = 167
+RpcIdHelper DEBUG field size is 12 field index = 168
RpcIdHelper DEBUG field size is 12 field index = 169
RpcIdHelper DEBUG field size is 12 field index = 170
RpcIdHelper DEBUG field size is 12 field index = 171
RpcIdHelper DEBUG field size is 12 field index = 172
-RpcIdHelper DEBUG field size is 12 field index = 173
-RpcIdHelper DEBUG field size is 12 field index = 174
-RpcIdHelper DEBUG field size is 8 field index = 175
-RpcIdHelper DEBUG field size is 8 field index = 176
+RpcIdHelper DEBUG field size is 8 field index = 173
+RpcIdHelper DEBUG field size is 8 field index = 174
+RpcIdHelper DEBUG field size is 4 field index = 175
+RpcIdHelper DEBUG field size is 4 field index = 176
RpcIdHelper DEBUG field size is 4 field index = 177
-RpcIdHelper DEBUG field size is 4 field index = 178
-RpcIdHelper DEBUG field size is 4 field index = 179
+RpcIdHelper DEBUG field size is 8 field index = 178
+RpcIdHelper DEBUG field size is 8 field index = 179
RpcIdHelper DEBUG field size is 8 field index = 180
-RpcIdHelper DEBUG field size is 8 field index = 181
-RpcIdHelper DEBUG field size is 8 field index = 182
-RpcIdHelper DEBUG field size is 2 field index = 183
-RpcIdHelper DEBUG field size is 4 field index = 184
-RpcIdHelper DEBUG field size is 4 field index = 185
-RpcIdHelper DEBUG field size is 8 field index = 186
-RpcIdHelper DEBUG field size is 8 field index = 187
-RpcIdHelper DEBUG field size is 4 field index = 188
-RpcIdHelper DEBUG field size is 2 field index = 189
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 136
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 137
+RpcIdHelper DEBUG field size is 2 field index = 181
+RpcIdHelper DEBUG field size is 4 field index = 182
+RpcIdHelper DEBUG field size is 4 field index = 183
+RpcIdHelper DEBUG field size is 8 field index = 184
+RpcIdHelper DEBUG field size is 8 field index = 185
+RpcIdHelper DEBUG field size is 4 field index = 186
+RpcIdHelper DEBUG field size is 2 field index = 187
+RpcIdHelper DEBUG field size is 16 field index = 188
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 134
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 135
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 136
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 137
RpcIdHelper DEBUG detectorElement field size is 8 field index = 138
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 139
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 139
RpcIdHelper DEBUG detectorElement field size is 8 field index = 140
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 141
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 142
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 143
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 144
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 145
-RpcIdHelper DEBUG detectorElement field size is 128 field index = 146
-RpcIdHelper DEBUG detectorElement field size is 128 field index = 147
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 141
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 142
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 143
+RpcIdHelper DEBUG detectorElement field size is 128 field index = 144
+RpcIdHelper DEBUG detectorElement field size is 128 field index = 145
+RpcIdHelper DEBUG detectorElement field size is 56 field index = 146
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 147
RpcIdHelper DEBUG detectorElement field size is 56 field index = 148
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 149
-RpcIdHelper DEBUG detectorElement field size is 56 field index = 150
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 151
-RpcIdHelper DEBUG detectorElement field size is 112 field index = 152
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 153
-RpcIdHelper DEBUG detectorElement field size is 28 field index = 154
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 149
+RpcIdHelper DEBUG detectorElement field size is 112 field index = 150
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 151
+RpcIdHelper DEBUG detectorElement field size is 28 field index = 152
+RpcIdHelper DEBUG detectorElement field size is 96 field index = 153
+RpcIdHelper DEBUG detectorElement field size is 144 field index = 154
RpcIdHelper DEBUG detectorElement field size is 96 field index = 155
-RpcIdHelper DEBUG detectorElement field size is 144 field index = 156
-RpcIdHelper DEBUG detectorElement field size is 96 field index = 157
+RpcIdHelper DEBUG detectorElement field size is 48 field index = 156
+RpcIdHelper DEBUG detectorElement field size is 72 field index = 157
RpcIdHelper DEBUG detectorElement field size is 48 field index = 158
-RpcIdHelper DEBUG detectorElement field size is 72 field index = 159
-RpcIdHelper DEBUG detectorElement field size is 48 field index = 160
-RpcIdHelper DEBUG detectorElement field size is 96 field index = 161
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 162
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 163
+RpcIdHelper DEBUG detectorElement field size is 96 field index = 159
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 160
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 161
+RpcIdHelper DEBUG detectorElement field size is 64 field index = 162
+RpcIdHelper DEBUG detectorElement field size is 64 field index = 163
RpcIdHelper DEBUG detectorElement field size is 64 field index = 164
RpcIdHelper DEBUG detectorElement field size is 64 field index = 165
RpcIdHelper DEBUG detectorElement field size is 64 field index = 166
-RpcIdHelper DEBUG detectorElement field size is 64 field index = 167
-RpcIdHelper DEBUG detectorElement field size is 64 field index = 168
+RpcIdHelper DEBUG detectorElement field size is 48 field index = 167
+RpcIdHelper DEBUG detectorElement field size is 48 field index = 168
RpcIdHelper DEBUG detectorElement field size is 48 field index = 169
RpcIdHelper DEBUG detectorElement field size is 48 field index = 170
RpcIdHelper DEBUG detectorElement field size is 48 field index = 171
RpcIdHelper DEBUG detectorElement field size is 48 field index = 172
-RpcIdHelper DEBUG detectorElement field size is 48 field index = 173
-RpcIdHelper DEBUG detectorElement field size is 48 field index = 174
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 175
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 176
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 177
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 178
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 179
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 180
-RpcIdHelper DEBUG detectorElement field size is 32 field index = 181
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 182
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 183
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 184
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 185
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 186
-RpcIdHelper DEBUG detectorElement field size is 16 field index = 187
-RpcIdHelper DEBUG detectorElement field size is 8 field index = 188
-RpcIdHelper DEBUG detectorElement field size is 4 field index = 189
-RpcIdHelper DEBUG channel field size is 6336 field index = 136
-RpcIdHelper DEBUG channel field size is 1584 field index = 137
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 173
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 174
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 175
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 176
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 177
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 178
+RpcIdHelper DEBUG detectorElement field size is 32 field index = 179
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 180
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 181
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 182
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 183
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 184
+RpcIdHelper DEBUG detectorElement field size is 16 field index = 185
+RpcIdHelper DEBUG detectorElement field size is 8 field index = 186
+RpcIdHelper DEBUG detectorElement field size is 4 field index = 187
+RpcIdHelper DEBUG detectorElement field size is 64 field index = 188
+RpcIdHelper DEBUG channel field size is 6336 field index = 134
+RpcIdHelper DEBUG channel field size is 1584 field index = 135
+RpcIdHelper DEBUG channel field size is 3168 field index = 136
+RpcIdHelper DEBUG channel field size is 6336 field index = 137
RpcIdHelper DEBUG channel field size is 3168 field index = 138
-RpcIdHelper DEBUG channel field size is 6336 field index = 139
+RpcIdHelper DEBUG channel field size is 3168 field index = 139
RpcIdHelper DEBUG channel field size is 3168 field index = 140
-RpcIdHelper DEBUG channel field size is 3168 field index = 141
-RpcIdHelper DEBUG channel field size is 3168 field index = 142
-RpcIdHelper DEBUG channel field size is 1584 field index = 143
-RpcIdHelper DEBUG channel field size is 1584 field index = 144
-RpcIdHelper DEBUG channel field size is 6336 field index = 145
-RpcIdHelper DEBUG channel field size is 50688 field index = 146
-RpcIdHelper DEBUG channel field size is 50688 field index = 147
+RpcIdHelper DEBUG channel field size is 1584 field index = 141
+RpcIdHelper DEBUG channel field size is 1584 field index = 142
+RpcIdHelper DEBUG channel field size is 6336 field index = 143
+RpcIdHelper DEBUG channel field size is 50688 field index = 144
+RpcIdHelper DEBUG channel field size is 50688 field index = 145
+RpcIdHelper DEBUG channel field size is 22176 field index = 146
+RpcIdHelper DEBUG channel field size is 3168 field index = 147
RpcIdHelper DEBUG channel field size is 22176 field index = 148
-RpcIdHelper DEBUG channel field size is 3168 field index = 149
-RpcIdHelper DEBUG channel field size is 22176 field index = 150
-RpcIdHelper DEBUG channel field size is 6336 field index = 151
-RpcIdHelper DEBUG channel field size is 44352 field index = 152
-RpcIdHelper DEBUG channel field size is 1584 field index = 153
-RpcIdHelper DEBUG channel field size is 11088 field index = 154
+RpcIdHelper DEBUG channel field size is 6336 field index = 149
+RpcIdHelper DEBUG channel field size is 44352 field index = 150
+RpcIdHelper DEBUG channel field size is 1584 field index = 151
+RpcIdHelper DEBUG channel field size is 11088 field index = 152
+RpcIdHelper DEBUG channel field size is 38016 field index = 153
+RpcIdHelper DEBUG channel field size is 57024 field index = 154
RpcIdHelper DEBUG channel field size is 38016 field index = 155
-RpcIdHelper DEBUG channel field size is 57024 field index = 156
-RpcIdHelper DEBUG channel field size is 38016 field index = 157
+RpcIdHelper DEBUG channel field size is 19008 field index = 156
+RpcIdHelper DEBUG channel field size is 28512 field index = 157
RpcIdHelper DEBUG channel field size is 19008 field index = 158
-RpcIdHelper DEBUG channel field size is 28512 field index = 159
-RpcIdHelper DEBUG channel field size is 19008 field index = 160
-RpcIdHelper DEBUG channel field size is 38016 field index = 161
-RpcIdHelper DEBUG channel field size is 12672 field index = 162
-RpcIdHelper DEBUG channel field size is 12672 field index = 163
+RpcIdHelper DEBUG channel field size is 38016 field index = 159
+RpcIdHelper DEBUG channel field size is 12672 field index = 160
+RpcIdHelper DEBUG channel field size is 12672 field index = 161
+RpcIdHelper DEBUG channel field size is 25344 field index = 162
+RpcIdHelper DEBUG channel field size is 25344 field index = 163
RpcIdHelper DEBUG channel field size is 25344 field index = 164
RpcIdHelper DEBUG channel field size is 25344 field index = 165
RpcIdHelper DEBUG channel field size is 25344 field index = 166
-RpcIdHelper DEBUG channel field size is 25344 field index = 167
-RpcIdHelper DEBUG channel field size is 25344 field index = 168
+RpcIdHelper DEBUG channel field size is 19008 field index = 167
+RpcIdHelper DEBUG channel field size is 19008 field index = 168
RpcIdHelper DEBUG channel field size is 19008 field index = 169
RpcIdHelper DEBUG channel field size is 19008 field index = 170
RpcIdHelper DEBUG channel field size is 19008 field index = 171
RpcIdHelper DEBUG channel field size is 19008 field index = 172
-RpcIdHelper DEBUG channel field size is 19008 field index = 173
-RpcIdHelper DEBUG channel field size is 19008 field index = 174
-RpcIdHelper DEBUG channel field size is 12672 field index = 175
-RpcIdHelper DEBUG channel field size is 12672 field index = 176
-RpcIdHelper DEBUG channel field size is 3168 field index = 177
-RpcIdHelper DEBUG channel field size is 6336 field index = 178
-RpcIdHelper DEBUG channel field size is 6336 field index = 179
-RpcIdHelper DEBUG channel field size is 12672 field index = 180
-RpcIdHelper DEBUG channel field size is 12672 field index = 181
-RpcIdHelper DEBUG channel field size is 6336 field index = 182
-RpcIdHelper DEBUG channel field size is 1584 field index = 183
-RpcIdHelper DEBUG channel field size is 3168 field index = 184
-RpcIdHelper DEBUG channel field size is 3168 field index = 185
-RpcIdHelper DEBUG channel field size is 6336 field index = 186
-RpcIdHelper DEBUG channel field size is 6336 field index = 187
-RpcIdHelper DEBUG channel field size is 3168 field index = 188
-RpcIdHelper DEBUG channel field size is 1584 field index = 189
-RpcIdHelper DEBUG full module range size is 54
-RpcIdHelper DEBUG full channel range size is 54
+RpcIdHelper DEBUG channel field size is 12672 field index = 173
+RpcIdHelper DEBUG channel field size is 12672 field index = 174
+RpcIdHelper DEBUG channel field size is 3168 field index = 175
+RpcIdHelper DEBUG channel field size is 6336 field index = 176
+RpcIdHelper DEBUG channel field size is 6336 field index = 177
+RpcIdHelper DEBUG channel field size is 12672 field index = 178
+RpcIdHelper DEBUG channel field size is 12672 field index = 179
+RpcIdHelper DEBUG channel field size is 6336 field index = 180
+RpcIdHelper DEBUG channel field size is 1584 field index = 181
+RpcIdHelper DEBUG channel field size is 3168 field index = 182
+RpcIdHelper DEBUG channel field size is 3168 field index = 183
+RpcIdHelper DEBUG channel field size is 6336 field index = 184
+RpcIdHelper DEBUG channel field size is 6336 field index = 185
+RpcIdHelper DEBUG channel field size is 3168 field index = 186
+RpcIdHelper DEBUG channel field size is 1584 field index = 187
+RpcIdHelper DEBUG channel field size is 38016 field index = 188
+RpcIdHelper DEBUG full module range size is 55
+RpcIdHelper DEBUG full channel range size is 55
RpcIdHelper INFO Initializing RPC hash indices ...
-RpcIdHelper INFO The element hash max is 600
-RpcIdHelper INFO The detector element hash max is 1122
+RpcIdHelper INFO The element hash max is 616
+RpcIdHelper INFO The detector element hash max is 1154
RpcIdHelper INFO Initializing RPC hash indices for finding neighbors ...
RpcIdHelper VERBOSE MuonIdHelper::init_neighbors
-RpcIdHelper DEBUG Maximum number of RPC gas gaps is 2
+RpcIdHelper DEBUG Maximum number of RPC gas gaps is 3
TgcIdHelper DEBUG (Re)initialize
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find csc region index: group, region size 0 0
AtlasDetectorID DEBUG Could not get value for label 'no_side' of field 'DetZside' in dictionary Calorimeter
@@ -2284,59 +2290,60 @@ TgcIdHelper DEBUG technology decode 1 vals 3 mask/zero m
TgcIdHelper DEBUG gas gap decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 ffffe7ffffffffff 43 2 19 indexes mode both_bounded
TgcIdHelper DEBUG is strip decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 fffffbffffffffff 42 1 21 indexes mode both_bounded
TgcIdHelper DEBUG channel decode 1 vals 1:125 mask/zero mask/shift/bits/offset 7f fffffc07ffffffff 35 7 22 indexes mode both_bounded
-TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 208
-TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 208
-TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 246
-TgcIdHelper DEBUG field size is 48 field index = 182
+TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 207
+TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 207
+TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 245
+TgcIdHelper DEBUG field size is 48 field index = 181
+TgcIdHelper DEBUG field size is 96 field index = 182
TgcIdHelper DEBUG field size is 96 field index = 183
TgcIdHelper DEBUG field size is 96 field index = 184
TgcIdHelper DEBUG field size is 96 field index = 185
-TgcIdHelper DEBUG field size is 96 field index = 186
-TgcIdHelper DEBUG field size is 48 field index = 187
+TgcIdHelper DEBUG field size is 48 field index = 186
+TgcIdHelper DEBUG field size is 96 field index = 187
TgcIdHelper DEBUG field size is 96 field index = 188
TgcIdHelper DEBUG field size is 96 field index = 189
TgcIdHelper DEBUG field size is 96 field index = 190
TgcIdHelper DEBUG field size is 96 field index = 191
-TgcIdHelper DEBUG field size is 96 field index = 192
-TgcIdHelper DEBUG field size is 48 field index = 193
+TgcIdHelper DEBUG field size is 48 field index = 192
+TgcIdHelper DEBUG field size is 96 field index = 193
TgcIdHelper DEBUG field size is 96 field index = 194
TgcIdHelper DEBUG field size is 96 field index = 195
TgcIdHelper DEBUG field size is 96 field index = 196
TgcIdHelper DEBUG field size is 96 field index = 197
-TgcIdHelper DEBUG field size is 96 field index = 198
-TgcIdHelper DEBUG field size is 42 field index = 199
-TgcIdHelper DEBUG detector element field size is 48 field index = 182
+TgcIdHelper DEBUG field size is 42 field index = 198
+TgcIdHelper DEBUG detector element field size is 48 field index = 181
+TgcIdHelper DEBUG detector element field size is 96 field index = 182
TgcIdHelper DEBUG detector element field size is 96 field index = 183
TgcIdHelper DEBUG detector element field size is 96 field index = 184
TgcIdHelper DEBUG detector element field size is 96 field index = 185
-TgcIdHelper DEBUG detector element field size is 96 field index = 186
-TgcIdHelper DEBUG detector element field size is 48 field index = 187
+TgcIdHelper DEBUG detector element field size is 48 field index = 186
+TgcIdHelper DEBUG detector element field size is 96 field index = 187
TgcIdHelper DEBUG detector element field size is 96 field index = 188
TgcIdHelper DEBUG detector element field size is 96 field index = 189
TgcIdHelper DEBUG detector element field size is 96 field index = 190
TgcIdHelper DEBUG detector element field size is 96 field index = 191
-TgcIdHelper DEBUG detector element field size is 96 field index = 192
-TgcIdHelper DEBUG detector element field size is 48 field index = 193
+TgcIdHelper DEBUG detector element field size is 48 field index = 192
+TgcIdHelper DEBUG detector element field size is 96 field index = 193
TgcIdHelper DEBUG detector element field size is 96 field index = 194
TgcIdHelper DEBUG detector element field size is 96 field index = 195
TgcIdHelper DEBUG detector element field size is 96 field index = 196
TgcIdHelper DEBUG detector element field size is 96 field index = 197
-TgcIdHelper DEBUG detector element field size is 96 field index = 198
-TgcIdHelper DEBUG detector element field size is 42 field index = 199
-TgcIdHelper DEBUG channel field size is 15120 field index = 190
-TgcIdHelper DEBUG channel field size is 4608 field index = 191
-TgcIdHelper DEBUG channel field size is 26496 field index = 192
-TgcIdHelper DEBUG channel field size is 17856 field index = 193
-TgcIdHelper DEBUG channel field size is 6624 field index = 194
-TgcIdHelper DEBUG channel field size is 6912 field index = 195
+TgcIdHelper DEBUG detector element field size is 42 field index = 198
+TgcIdHelper DEBUG channel field size is 15120 field index = 189
+TgcIdHelper DEBUG channel field size is 4608 field index = 190
+TgcIdHelper DEBUG channel field size is 26496 field index = 191
+TgcIdHelper DEBUG channel field size is 17856 field index = 192
+TgcIdHelper DEBUG channel field size is 6624 field index = 193
+TgcIdHelper DEBUG channel field size is 6912 field index = 194
+TgcIdHelper DEBUG channel field size is 9216 field index = 195
TgcIdHelper DEBUG channel field size is 9216 field index = 196
TgcIdHelper DEBUG channel field size is 9216 field index = 197
TgcIdHelper DEBUG channel field size is 9216 field index = 198
-TgcIdHelper DEBUG channel field size is 9216 field index = 199
-TgcIdHelper DEBUG channel field size is 12000 field index = 200
-TgcIdHelper DEBUG channel field size is 3072 field index = 201
-TgcIdHelper DEBUG channel field size is 21120 field index = 202
-TgcIdHelper DEBUG channel field size is 19776 field index = 203
+TgcIdHelper DEBUG channel field size is 12000 field index = 199
+TgcIdHelper DEBUG channel field size is 3072 field index = 200
+TgcIdHelper DEBUG channel field size is 21120 field index = 201
+TgcIdHelper DEBUG channel field size is 19776 field index = 202
+TgcIdHelper DEBUG channel field size is 6144 field index = 203
TgcIdHelper DEBUG channel field size is 6144 field index = 204
TgcIdHelper DEBUG channel field size is 6144 field index = 205
TgcIdHelper DEBUG channel field size is 6144 field index = 206
@@ -2344,21 +2351,20 @@ TgcIdHelper DEBUG channel field size is 6144 field index = 207
TgcIdHelper DEBUG channel field size is 6144 field index = 208
TgcIdHelper DEBUG channel field size is 6144 field index = 209
TgcIdHelper DEBUG channel field size is 6144 field index = 210
-TgcIdHelper DEBUG channel field size is 6144 field index = 211
-TgcIdHelper DEBUG channel field size is 11712 field index = 212
-TgcIdHelper DEBUG channel field size is 3072 field index = 213
-TgcIdHelper DEBUG channel field size is 18432 field index = 214
-TgcIdHelper DEBUG channel field size is 20352 field index = 215
+TgcIdHelper DEBUG channel field size is 11712 field index = 211
+TgcIdHelper DEBUG channel field size is 3072 field index = 212
+TgcIdHelper DEBUG channel field size is 18432 field index = 213
+TgcIdHelper DEBUG channel field size is 20352 field index = 214
+TgcIdHelper DEBUG channel field size is 6144 field index = 215
TgcIdHelper DEBUG channel field size is 6144 field index = 216
-TgcIdHelper DEBUG channel field size is 6144 field index = 217
-TgcIdHelper DEBUG channel field size is 5952 field index = 218
+TgcIdHelper DEBUG channel field size is 5952 field index = 217
+TgcIdHelper DEBUG channel field size is 6144 field index = 218
TgcIdHelper DEBUG channel field size is 6144 field index = 219
TgcIdHelper DEBUG channel field size is 6144 field index = 220
TgcIdHelper DEBUG channel field size is 6144 field index = 221
TgcIdHelper DEBUG channel field size is 6144 field index = 222
-TgcIdHelper DEBUG channel field size is 6144 field index = 223
-TgcIdHelper DEBUG channel field size is 2016 field index = 224
-TgcIdHelper DEBUG channel field size is 2688 field index = 225
+TgcIdHelper DEBUG channel field size is 2016 field index = 223
+TgcIdHelper DEBUG channel field size is 2688 field index = 224
TgcIdHelper INFO Initializing TGC hash indices ...
TgcIdHelper INFO The element hash max is 1530
TgcIdHelper INFO The detector element hash max is 1530
@@ -2377,59 +2383,60 @@ TgcIdHelper DEBUG technology decode 1 vals 3 mask/zero m
TgcIdHelper DEBUG gas gap decode 1 vals 1:3 mask/zero mask/shift/bits/offset 3 ffffe7ffffffffff 43 2 19 indexes mode both_bounded
TgcIdHelper DEBUG is strip decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 fffffbffffffffff 42 1 21 indexes mode both_bounded
TgcIdHelper DEBUG channel decode 1 vals 1:125 mask/zero mask/shift/bits/offset 7f fffffc07ffffffff 35 7 22 indexes mode both_bounded
-TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 208
-TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 208
-TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 246
-TgcIdHelper DEBUG field size is 48 field index = 182
+TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 207
+TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 207
+TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 245
+TgcIdHelper DEBUG field size is 48 field index = 181
+TgcIdHelper DEBUG field size is 96 field index = 182
TgcIdHelper DEBUG field size is 96 field index = 183
TgcIdHelper DEBUG field size is 96 field index = 184
TgcIdHelper DEBUG field size is 96 field index = 185
-TgcIdHelper DEBUG field size is 96 field index = 186
-TgcIdHelper DEBUG field size is 48 field index = 187
+TgcIdHelper DEBUG field size is 48 field index = 186
+TgcIdHelper DEBUG field size is 96 field index = 187
TgcIdHelper DEBUG field size is 96 field index = 188
TgcIdHelper DEBUG field size is 96 field index = 189
TgcIdHelper DEBUG field size is 96 field index = 190
TgcIdHelper DEBUG field size is 96 field index = 191
-TgcIdHelper DEBUG field size is 96 field index = 192
-TgcIdHelper DEBUG field size is 48 field index = 193
+TgcIdHelper DEBUG field size is 48 field index = 192
+TgcIdHelper DEBUG field size is 96 field index = 193
TgcIdHelper DEBUG field size is 96 field index = 194
TgcIdHelper DEBUG field size is 96 field index = 195
TgcIdHelper DEBUG field size is 96 field index = 196
TgcIdHelper DEBUG field size is 96 field index = 197
-TgcIdHelper DEBUG field size is 96 field index = 198
-TgcIdHelper DEBUG field size is 42 field index = 199
-TgcIdHelper DEBUG detector element field size is 48 field index = 182
+TgcIdHelper DEBUG field size is 42 field index = 198
+TgcIdHelper DEBUG detector element field size is 48 field index = 181
+TgcIdHelper DEBUG detector element field size is 96 field index = 182
TgcIdHelper DEBUG detector element field size is 96 field index = 183
TgcIdHelper DEBUG detector element field size is 96 field index = 184
TgcIdHelper DEBUG detector element field size is 96 field index = 185
-TgcIdHelper DEBUG detector element field size is 96 field index = 186
-TgcIdHelper DEBUG detector element field size is 48 field index = 187
+TgcIdHelper DEBUG detector element field size is 48 field index = 186
+TgcIdHelper DEBUG detector element field size is 96 field index = 187
TgcIdHelper DEBUG detector element field size is 96 field index = 188
TgcIdHelper DEBUG detector element field size is 96 field index = 189
TgcIdHelper DEBUG detector element field size is 96 field index = 190
TgcIdHelper DEBUG detector element field size is 96 field index = 191
-TgcIdHelper DEBUG detector element field size is 96 field index = 192
-TgcIdHelper DEBUG detector element field size is 48 field index = 193
+TgcIdHelper DEBUG detector element field size is 48 field index = 192
+TgcIdHelper DEBUG detector element field size is 96 field index = 193
TgcIdHelper DEBUG detector element field size is 96 field index = 194
TgcIdHelper DEBUG detector element field size is 96 field index = 195
TgcIdHelper DEBUG detector element field size is 96 field index = 196
TgcIdHelper DEBUG detector element field size is 96 field index = 197
-TgcIdHelper DEBUG detector element field size is 96 field index = 198
-TgcIdHelper DEBUG detector element field size is 42 field index = 199
-TgcIdHelper DEBUG channel field size is 15120 field index = 190
-TgcIdHelper DEBUG channel field size is 4608 field index = 191
-TgcIdHelper DEBUG channel field size is 26496 field index = 192
-TgcIdHelper DEBUG channel field size is 17856 field index = 193
-TgcIdHelper DEBUG channel field size is 6624 field index = 194
-TgcIdHelper DEBUG channel field size is 6912 field index = 195
+TgcIdHelper DEBUG detector element field size is 42 field index = 198
+TgcIdHelper DEBUG channel field size is 15120 field index = 189
+TgcIdHelper DEBUG channel field size is 4608 field index = 190
+TgcIdHelper DEBUG channel field size is 26496 field index = 191
+TgcIdHelper DEBUG channel field size is 17856 field index = 192
+TgcIdHelper DEBUG channel field size is 6624 field index = 193
+TgcIdHelper DEBUG channel field size is 6912 field index = 194
+TgcIdHelper DEBUG channel field size is 9216 field index = 195
TgcIdHelper DEBUG channel field size is 9216 field index = 196
TgcIdHelper DEBUG channel field size is 9216 field index = 197
TgcIdHelper DEBUG channel field size is 9216 field index = 198
-TgcIdHelper DEBUG channel field size is 9216 field index = 199
-TgcIdHelper DEBUG channel field size is 12000 field index = 200
-TgcIdHelper DEBUG channel field size is 3072 field index = 201
-TgcIdHelper DEBUG channel field size is 21120 field index = 202
-TgcIdHelper DEBUG channel field size is 19776 field index = 203
+TgcIdHelper DEBUG channel field size is 12000 field index = 199
+TgcIdHelper DEBUG channel field size is 3072 field index = 200
+TgcIdHelper DEBUG channel field size is 21120 field index = 201
+TgcIdHelper DEBUG channel field size is 19776 field index = 202
+TgcIdHelper DEBUG channel field size is 6144 field index = 203
TgcIdHelper DEBUG channel field size is 6144 field index = 204
TgcIdHelper DEBUG channel field size is 6144 field index = 205
TgcIdHelper DEBUG channel field size is 6144 field index = 206
@@ -2437,21 +2444,20 @@ TgcIdHelper DEBUG channel field size is 6144 field index = 207
TgcIdHelper DEBUG channel field size is 6144 field index = 208
TgcIdHelper DEBUG channel field size is 6144 field index = 209
TgcIdHelper DEBUG channel field size is 6144 field index = 210
-TgcIdHelper DEBUG channel field size is 6144 field index = 211
-TgcIdHelper DEBUG channel field size is 11712 field index = 212
-TgcIdHelper DEBUG channel field size is 3072 field index = 213
-TgcIdHelper DEBUG channel field size is 18432 field index = 214
-TgcIdHelper DEBUG channel field size is 20352 field index = 215
+TgcIdHelper DEBUG channel field size is 11712 field index = 211
+TgcIdHelper DEBUG channel field size is 3072 field index = 212
+TgcIdHelper DEBUG channel field size is 18432 field index = 213
+TgcIdHelper DEBUG channel field size is 20352 field index = 214
+TgcIdHelper DEBUG channel field size is 6144 field index = 215
TgcIdHelper DEBUG channel field size is 6144 field index = 216
-TgcIdHelper DEBUG channel field size is 6144 field index = 217
-TgcIdHelper DEBUG channel field size is 5952 field index = 218
+TgcIdHelper DEBUG channel field size is 5952 field index = 217
+TgcIdHelper DEBUG channel field size is 6144 field index = 218
TgcIdHelper DEBUG channel field size is 6144 field index = 219
TgcIdHelper DEBUG channel field size is 6144 field index = 220
TgcIdHelper DEBUG channel field size is 6144 field index = 221
TgcIdHelper DEBUG channel field size is 6144 field index = 222
-TgcIdHelper DEBUG channel field size is 6144 field index = 223
-TgcIdHelper DEBUG channel field size is 2016 field index = 224
-TgcIdHelper DEBUG channel field size is 2688 field index = 225
+TgcIdHelper DEBUG channel field size is 2016 field index = 223
+TgcIdHelper DEBUG channel field size is 2688 field index = 224
TgcIdHelper INFO Initializing TGC hash indices ...
TgcIdHelper INFO The element hash max is 1530
TgcIdHelper INFO The detector element hash max is 1530
@@ -2470,25 +2476,25 @@ MmIdHelper DEBUG technology decode 1 vals 5 mask/zero m
MmIdHelper DEBUG multilayer decode 1 vals 1:2 mask/zero mask/shift/bits/offset 1 fffdffffffffffff 49 1 14 indexes mode both_bounded
MmIdHelper DEBUG gasgap decode 1 vals 1:4 mask/zero mask/shift/bits/offset 3 fffe7fffffffffff 47 2 15 indexes mode both_bounded
MmIdHelper DEBUG channel decode 1 vals 1:5120 mask/zero mask/shift/bits/offset 1fff ffff8003ffffffff 34 13 17 indexes mode both_bounded
-MmIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 208
-MmIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 242
-MmIdHelper INFO MultiRange built successfully to channel: MultiRange size is 246
+MmIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 207
+MmIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 241
+MmIdHelper INFO MultiRange built successfully to channel: MultiRange size is 245
+MmIdHelper DEBUG field size is 16 field index = 203
MmIdHelper DEBUG field size is 16 field index = 204
MmIdHelper DEBUG field size is 16 field index = 205
MmIdHelper DEBUG field size is 16 field index = 206
-MmIdHelper DEBUG field size is 16 field index = 207
+MmIdHelper DEBUG detector element field size is 32 field index = 237
MmIdHelper DEBUG detector element field size is 32 field index = 238
MmIdHelper DEBUG detector element field size is 32 field index = 239
MmIdHelper DEBUG detector element field size is 32 field index = 240
-MmIdHelper DEBUG detector element field size is 32 field index = 241
+MmIdHelper DEBUG channel field size is 327680 field index = 237
MmIdHelper DEBUG channel field size is 327680 field index = 238
-MmIdHelper DEBUG channel field size is 327680 field index = 239
+MmIdHelper DEBUG channel field size is 196608 field index = 239
MmIdHelper DEBUG channel field size is 196608 field index = 240
-MmIdHelper DEBUG channel field size is 196608 field index = 241
+MmIdHelper DEBUG channel field size is 327680 field index = 241
MmIdHelper DEBUG channel field size is 327680 field index = 242
-MmIdHelper DEBUG channel field size is 327680 field index = 243
+MmIdHelper DEBUG channel field size is 196608 field index = 243
MmIdHelper DEBUG channel field size is 196608 field index = 244
-MmIdHelper DEBUG channel field size is 196608 field index = 245
MmIdHelper INFO Initializing MicroMegas hash indices ...
MmIdHelper INFO The element hash max is 64
MmIdHelper INFO The detector element hash max is 128
diff --git a/MuonSpectrometer/MuonIdHelpers/src/MdtIdHelper.cxx b/MuonSpectrometer/MuonIdHelpers/src/MdtIdHelper.cxx
index 135bed971c3890667cda81e86de4acb646b26083..a433dbc3150ba30ce56d16260e702103448623d2 100644
--- a/MuonSpectrometer/MuonIdHelpers/src/MdtIdHelper.cxx
+++ b/MuonSpectrometer/MuonIdHelpers/src/MdtIdHelper.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -9,11 +9,6 @@
* ==============================================================================
*/
-//<doc><file> $Id: MdtIdHelper.cxx,v 1.41 2009-01-20 22:44:13 kblack Exp $
-//<version> $Name: not supported by cvs2svn $
-
-/// Includes
-
#include "MuonIdHelpers/MdtIdHelper.h"
#include "GaudiKernel/ISvcLocator.h"
@@ -21,21 +16,13 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IMessageSvc.h"
-
-/// Constructor
-
-MdtIdHelper::MdtIdHelper() : MuonIdHelper("MdtIdHelper"), m_TUBELAYER_INDEX(0) {}
-
-/// Destructor
-
-MdtIdHelper::~MdtIdHelper()
-{
- // m_Log deleted in base class.
+MdtIdHelper::MdtIdHelper() :
+ MuonIdHelper("MdtIdHelper"),
+ m_TUBELAYER_INDEX(0),
+ m_tubesMax(UINT_MAX) {
}
-
/// initialize dictionary
-
int MdtIdHelper::initialize_from_dictionary(const IdDictMgr& dict_mgr)
{
int status = 0;
@@ -302,6 +289,30 @@ int MdtIdHelper::initialize_from_dictionary(const IdDictMgr& dict_mgr)
(*m_Log) << MSG::INFO << "Initializing MDT hash indices for finding neighbors ... " << endmsg;
status = init_neighbors();
+ // retrieve the maximum number of tubes in any chamber
+ ExpandedIdentifier expId;
+ IdContext channel_context(expId, 0, m_CHANNEL_INDEX);
+ for (const auto &id : m_detectorElement_vec) {
+ if (!get_expanded_id(id, expId, &channel_context)) {
+ for (unsigned int i = 0; i < m_full_channel_range.size(); ++i) {
+ const Range& range = m_full_channel_range[i];
+ if (range.match(expId)) {
+ const Range::field& channel_field = range[m_CHANNEL_INDEX];
+ if (channel_field.has_maximum()) {
+ unsigned int max = channel_field.get_maximum();
+ if (m_tubesMax == UINT_MAX) m_tubesMax = max;
+ else if (max > m_tubesMax) m_tubesMax = max;
+ }
+ }
+ }
+ }
+ }
+ if (m_tubesMax == UINT_MAX) {
+ (*m_Log) << MSG::ERROR << "No maximum number of MDT tubes was retrieved" << endmsg;
+ status = 1;
+ } else {
+ if (m_Log->level()<=MSG::DEBUG) (*m_Log) << MSG::DEBUG << " Maximum number of MDT tubes is " << m_tubesMax << endmsg;
+ }
m_init = true;
return (status);
}
diff --git a/MuonSpectrometer/MuonIdHelpers/test/muon_id_test.cxx b/MuonSpectrometer/MuonIdHelpers/test/muon_id_test.cxx
index faafa5e26d1d730e38f5cc0702c16641a7c2b7af..681bf2e1dbed2ad344b905c2bcb3d1926fee0e24 100644
--- a/MuonSpectrometer/MuonIdHelpers/test/muon_id_test.cxx
+++ b/MuonSpectrometer/MuonIdHelpers/test/muon_id_test.cxx
@@ -175,9 +175,9 @@ int main ()
// check Run 2 layout (no STgc/MM)
if (checkDictFile("IdDictMuonSpectrometer_R.03.xml", true, false, false)) return 1;
// check asymmetric Run 3 layout
- if (checkDictFile("IdDictMuonSpectrometer_R.09.AsymNSW.xml")) return 1;
+ if (checkDictFile("IdDictMuonSpectrometer_R.09.02.Asym.xml")) return 1;
// check symmetric Run 3 layout (no CSC)
- if (checkDictFile("IdDictMuonSpectrometer_R.09.NSW.xml", false, true, true)) return 1;
+ if (checkDictFile("IdDictMuonSpectrometer_R.09.02.xml", false, true, true)) return 1;
return 0;
}
diff --git a/MuonSpectrometer/MuonIdHelpersAlgs/MuonIdHelpersAlgs/ATLAS_CHECK_THREAD_SAFETY b/MuonSpectrometer/MuonIdHelpersAlgs/MuonIdHelpersAlgs/ATLAS_CHECK_THREAD_SAFETY
old mode 100644
new mode 100755
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx
index cca10df314b68a5b43022e13f55863dae96ce2bb..7544613cd3b07ac3e4b0d3a248074c962ea8754c 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx
@@ -1851,7 +1851,7 @@ namespace Muon {
if( m_idHelperSvc->rpcIdHelper().measuresPhi((*mit)->identify()) ) ++nphi;
else ++neta;
}
- ATH_MSG_DEBUG("fillTGC: Filling " << m_idHelperSvc->toStringChamber(chid)
+ ATH_MSG_DEBUG("fillRPC: Filling " << m_idHelperSvc->toStringChamber(chid)
<< ": loc s" << sector << " " << MuonStationIndex::regionName(region) << " " << MuonStationIndex::layerName(layer)
<< " -> eta hits " << neta
<< " phi hits " << nphi );
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonCalibConfig.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonCalibConfig.py
deleted file mode 100644
index c09b3925ad1f2aa89ae7ab2e3d3d504d13129f1c..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonCalibConfig.py
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-import os
-
-from AthenaCommon.Logging import logging
-
-log = logging.getLogger()
-log.info("Loading module %s",__name__)
-
-from AthenaCommon import CfgMgr
-from AthenaCommon.BeamFlags import jobproperties
-beamFlags = jobproperties.Beam
-from AthenaCommon.GlobalFlags import globalflags
-from AthenaCommon.DetFlags import DetFlags
-from AthenaCommon.AlgSequence import AlgSequence
-from AthenaCommon.AppMgr import ToolSvc,ServiceMgr
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-
-from RecExConfig.RecFlags import rec
-
-from MuonRecFlags import muonRecFlags
-from MuonRecUtils import logMuon,logMuonResil,override_lock_and_set_Value
-from MuonRec import muonRec
-
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,getService,getServiceClone
-from AthenaCommon.ConfiguredFactory import getProperty
-
-muonRecFlags.setDefaults()
-
-topSequence = AlgSequence()
-
-# return a list of dictionaires containing the calib config info (keys etc)
-def getCalibConfigs():
- global muonRecFlags,rec
- configs = []
- if muonRecFlags.calibMuonStandalone and (muonRecFlags.doStandalone or rec.readESD):
-# try:
- configs.append( muonRec.getConfig("MuonStandalone").getCalibConfig() )
-# except KeyError:
-# logMuon.warning("Could not get calibration config for MuonStandAlone - not adding MuonStandAlone info to calibration")
-# muonRecFlags.calibMuonStandalone = False
- else:
- muonRecFlags.calibMuonStandalone = False
-
- return configs
-
-
-
-## Setup MuonSegmenToCalibSegment algorithm.
-# @param[in] segmentKeys list of segment keys to use or single segments key (string)
-def getMuonSegmentToCalibSegment():
- global topSequence,muonRecFlags
- try:
- return topSequence.MuonSegmentToCalibSegment
- except AttributeError:
-
- from MuonCalibPatRec.MuonCalibPatRecConf import MuonCalib__MuonSegmentToCalibSegment
- MuonSegmentToCalibSegment = MuonCalib__MuonSegmentToCalibSegment("MuonSegmentToCalibSegment")
- # set consistent time-of-flight correction with MdtDriftCircleOnTrackCreator
- mdtCreator = getPublicTool("MdtDriftCircleOnTrackCreator")
- MuonSegmentToCalibSegment.DoTOF = getProperty(mdtCreator,"DoTofCorrection")
- # when doing segment fits with floating t0's
- MuonSegmentToCalibSegment.UpdateForT0Shift = type(MuonSegmentToCalibSegment.getDefaultProperty("UpdateForT0Shift")) (muonRecFlags.doSegmentT0Fit())
- MuonSegmentToCalibSegment.UseCscSegments = False
- MuonSegmentToCalibSegment.SegmentLocations = [ "MuonSegments" ]
- MuonSegmentToCalibSegment.SegmentAuthors = [ 4,8 ]
- MuonSegmentToCalibSegment.ReadSegments = True # rather than SegmentCombinations
-
- from MuonCnvExample import MuonCalibConfig
- MuonCalibConfig.setupMdtCondDB()
-
- # finally add it to topSequence
- topSequence += MuonSegmentToCalibSegment
-
- return topSequence.MuonSegmentToCalibSegment
-
-
-## Setup the basic MuonCalibAlg algorithm. Needs further configuration after this call
-# depending on the use-case.
-# @param[in] evenTag The event tag written to file
-def getMuonCalibAlg(eventTag):
- global topSequence,beamFlags
- try:
- return topSequence.MuonCalibAlg
- except AttributeError:
- from MuonCalibAlgs.MuonCalibAlgsConf import MuonCalib__MuonCalibAlg
- MuonCalibAlg = MuonCalib__MuonCalibAlg("MuonCalibAlg",
- doMDTs = muonRecFlags.doMDTs(),
- doCSCs = muonRecFlags.doCSCs(),
- doRPCs = muonRecFlags.doRPCs(),
- doTGCs = (muonRecFlags.doTGCs() and muonRecFlags.calibNtupleRawTGC()),
- doTGCCoinData = (muonRecFlags.doTGCs() and muonRecFlags.calibNtupleRawTGC()),
- doTruth = rec.doTruth(),
- DoPrdSelect = muonRecFlags.doPrdSelect(), # optional cutting away of PRD hits to simulate dead channels
- NtupleName = muonRecFlags.calibNtupleOutput(), # set the name of the output calibration ntuple
- EventTag = eventTag )
-
- if beamFlags.beamType == 'singlebeam' or beamFlags.beamType == 'cosmics':
- MuonCalibAlg.addTriggerTag = False
- else:
- MuonCalibAlg.addTriggerTag = rec.doTrigger()
- MuonCalibAlg.doTruth=rec.doTruth()
- topSequence += MuonCalibAlg
- return topSequence.MuonCalibAlg
-
-
-def setupMuonCalibNtuple():
- global topSequence,muonRecFlags,beamFlags,ToolSvc,rec,DetFlags
- if not rec.doMuon() or not DetFlags.Muon_on():
- logMuon.warning("Not setting up requested Muon Calibration Ntuple because Muons are off")
- return
-
- logMuon.info("Setting up Muon Calibration Ntuple")
- try:
- configs = getCalibConfigs()
- # MuonSegmentToCalibSegment is only needed if we want segments
- if muonRecFlags.calibNtupleSegments and muonRecFlags.calibMuonStandalone:
- MuonSegmentToCalibSegment = getMuonSegmentToCalibSegment()
-
- # MuonCalibAlg is always needed
- eventTag="UNKNOWN"
- if (muonRecFlags.calibNtupleSegments or muonRecFlags.calibNtupleTracks) and muonRecFlags.calibMuonStandalone:
- if len(configs) >= 1:
- eventTag = configs[0]["eventTag"]
- elif muonRecFlags.calibNtupleTrigger:
- eventTag = "TRIG"
- else:
- eventTag = "HITS"
-
- MuonCalibAlg = getMuonCalibAlg(eventTag)
- # configure for writing ntuple
- from MuonCalibTools.MuonCalibToolsConf import MuonCalib__PatternNtupleMaker
- MuonCalibTool = MuonCalib__PatternNtupleMaker("MuonCalibPatternNtupleMaker")
- MuonCalibTool.FillTruth = rec.doTruth()
- MuonCalibTool.DoRawTGC = (muonRecFlags.doTGCs() and muonRecFlags.calibNtupleRawTGC())
- ToolSvc += MuonCalibTool
- MuonCalibAlg.MuonCalibTool = MuonCalibTool
-
- # MuonCalibExtraTree only if we want to write tracks
- if muonRecFlags.calibNtupleTracks:
- MuonCalibTool.DelayFinish = True
- from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__MuonCalibExtraTreeAlg
- MuonCalibExtraTreeAlg = MuonCalib__MuonCalibExtraTreeAlg("MuonCalibExtraTreeAlg",
- NtupleName = "PatternNtupleMaker",
- )
- segmentOnTrackSelector=None
- if hasattr(topSequence, "MuonSegmentToCalibSegment"):
- from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__SegmentOnTrackSelector
- segmentOnTrackSelector=MuonCalib__SegmentOnTrackSelector()
- segmentOnTrackSelector.PattternLocation = "PatternsForCalibration"
- ToolSvc+=segmentOnTrackSelector
- MuonCalibExtraTreeAlg.SegmentOnTrackSelector= segmentOnTrackSelector
- if not rec.doMuonCombined():
- tool_nr=0
- from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__ExtraTreeTrackFillerTool
- resPullCalc=getPublicTool("ResidualPullCalculator")
- for config in configs:
- trackDumpTool = MuonCalib__ExtraTreeTrackFillerTool("ExtraTreeTrackFillerTool" + str(tool_nr))
- trackDumpTool.TrackCollectionKey = config['tracksKey']
- trackDumpTool.SegmentAuthors = [config['segmentAuthor']]
- trackDumpTool.TrackAuthor = config['trackAuthor']
- trackDumpTool.PullCalculator = resPullCalc
- ToolSvc+=trackDumpTool
- MuonCalibExtraTreeAlg.TrackFillerTools.append(trackDumpTool)
- tool_nr+=1
- # configure needed tools
-
-
- # add to topSequence
- topSequence += MuonCalibExtraTreeAlg
-
-
- # MuonCalibExtraTreeTriggerAlg only if trigger is available
- if muonRecFlags.calibNtupleTrigger: # and DetFlags.detdescr.LVL1_on() and DetFlags.haveRDO.LVL1_on():
- # protect against running without AtlasTrigger project
- doMuCTPI = True
- if doMuCTPI:
- try:
- from TrigT1RPCRecRoiSvc import TrigT1RPCRecRoiConfig
- from TrigT1TGCRecRoiSvc import TrigT1TGCRecRoiConfig
- except ImportError:
- logMuon.warning("MuonCalibExtraTreeTriggerAlg.doMuCTPI = False because AtlasTrigger is not available")
- doMuCTPI = False
-
- # delay writing of MuonCalibAlg
- MuonCalibTool.DelayFinish = True
- # also delay MuonCalibExtraTreeAlg if it is running
- try:
- topSequence.MuonCalibExtraTreeAlg.DelayFinish = True
- except AttributeError:
- pass
-
- from MuonCalibExtraTreeAlg.MuonCalibExtraTreeAlgConf import MuonCalib__MuonCalibExtraTreeTriggerAlg
- topSequence += MuonCalib__MuonCalibExtraTreeTriggerAlg( 'MuonCalibExtraTreeTriggerAlg',
- doMuCTPI = doMuCTPI,
- doLVL1Calo = rec.doTile() or rec.doLArg() or DetFlags.haveRDO.Calo_on(),
- doMBTS = rec.doTile() or DetFlags.haveRDO.Tile_on() )
-
-
- except:
- from AthenaCommon.Resilience import treatException
- treatException("Problem in MuonCalib - Muon Calibration Ntuple configuration probably incomplete")
-
-
-
-def setupMuonCalib():
- global topSequence,ToolSvc
- if not rec.doMuon() or not DetFlags.Muon_on():
- logMuon.warning("Not setting up requested Muon Calibration because Muons are off")
- return
-
- logMuon.info("Setting up Muon Calibration")
- try:
- from MuonCnvExample.MuonCalibFlags import muonCalibFlags
- muonCalibFlags.setDefaults()
-
- configs = getCalibConfigs()
- #
- # MuonSegmentToCalibSegment
- #
- calibConfig = muonRec.allConfigs()[0].getCalibConfig() #muonRec.getConfig(muonCalibFlags.EventTag()).getCalibConfig()
- MuonSegmentToCalibSegment = getMuonSegmentToCalibSegment()
- #
- # MuonCalibAlg
- #
- MuonCalibAlg = getMuonCalibAlg(muonCalibFlags.EventTag())
-
- from MdtCalibTools.MdtCalibToolsConf import MuonCalib__MdtCalibTool
- MuonCalibTool = MuonCalib__MdtCalibTool()
- calibMode = muonCalibFlags.Mode()
- if calibMode == 'regionNtuple':
- from MdtCalibTools.MdtCalibToolsConf import MuonCalib__MdtCalibNtupleMakerTool
- MdtCalibTool = MuonCalib__MdtCalibNtupleMakerTool()
- else:
- raise RuntimeError( "Unknown Muon Calibration Mode: %r" % calibMode )
-
- ToolSvc += MdtCalibTool
- MuonCalibTool.MdtCalibTool = MdtCalibTool
-
- ToolSvc += MuonCalibTool
- MuonCalibAlg.MuonCalibTool = MuonCalibTool
-
- except:
- from AthenaCommon.Resilience import treatException
- treatException("Problem in MuonCalib - Muon Calibration configuration probably incomplete")
-
-
-# chose the setup
-if muonRecFlags.doCalibNtuple():
- setupMuonCalibNtuple()
-elif muonRecFlags.doCalib():
- setupMuonCalib()
-else:
- logMuon.warning("Loading %s but not setting up any MuonCalibration or Ntuple" % __name__ )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
index cfa9c78c7c529cfaeca6711f42a07cd100b90612..c59a009fa16cf75a1a770fdc1268a1acc2e54789 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
@@ -185,9 +185,17 @@ if muonRecFlags.useAlignmentCorrections():
#--------------------------------------------------------------------------
# Make Calibration Ntuple or run Calibration Algorithm
#--------------------------------------------------------------------------
-if muonRecFlags.doCalib() or muonRecFlags.doCalibNtuple():
+if muonRecFlags.doCalibNtuple():
from MuonRecExample import MuonAlignConfig
- from MuonRecExample import MuonCalibConfig
+ from MuonCnvExample import setupMuonCalibNtuple
+ setupMuonCalibNtuple()
+elif muonRecFlags.doCalib():
+ from MuonRecExample import MuonAlignConfig
+ from MuonCnvExample import setupMuonCalib
+ setupMuonCalib()
+else:
+ logMuon.warning("Loading %s but not setting up any MuonCalibration or Ntuple" % __name__ )
+
#--------------------------------------------------------------------------
# Evaluate tracking performance
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h
index f0855ca0e79ebe1e5ae2b61860b68c6198a76a1f..a09ba844707d4c331c21c0d7b4c53589001f3098 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h
@@ -43,6 +43,7 @@ class MuonAmbiTrackSelectionTool : virtual public Trk::IAmbiTrackSelectionTool,
virtual StatusCode initialize() override;
virtual std::tuple<Trk::Track *, bool> getCleanedOutTrack(const Trk::Track *track, const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map) const override;
private:
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx
index 16a40c19b06b310db674d1f42a059b573e0311c7..2fbb58fbf01c406da80a23cb5ab5944e2224a632 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx
@@ -43,6 +43,7 @@ Muon::MuonAmbiTrackSelectionTool::initialize()
//============================================================================================
std::tuple<Trk::Track *, bool>
Muon::MuonAmbiTrackSelectionTool::getCleanedOutTrack(const Trk::Track *track, const Trk::TrackScore score,
+ [[maybe_unused]] Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map) const
{
(void)score; //@TODO unused ?
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx
index 60f43aac7fe2133b773a84ddf3e0b88304571d51..72dc6102c55aec0da542ed0f53cddcedb6272825 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/MdtSegmentT0Fitter.cxx
@@ -62,6 +62,8 @@ namespace TrkDriftCircleMath {
m_minuit->SetPrintLevel(-1); // -1: no output, 1: std output
if( msgLvl(MSG::VERBOSE) ) m_minuit->SetPrintLevel(1);
gMinuit = oldMinuit;
+
+ ATH_CHECK(m_calibrationDbTool.retrieve());
return StatusCode::SUCCESS;
}
diff --git a/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MdtHitIdHelper.h b/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MdtHitIdHelper.h
index 7c0fd21a1cd2ef23a6c4c1f7e289716fb5696c00..0490b3a36616d393b0c301b33dd4649bf69be1ba 100644
--- a/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MdtHitIdHelper.h
+++ b/MuonSpectrometer/MuonSimEvent/MuonSimEvent/MdtHitIdHelper.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MdtHitIdHelper_H
@@ -14,6 +14,7 @@ class MdtHitIdHelper: public HitIdHelper {
public:
static MdtHitIdHelper* GetHelper();
+ static MdtHitIdHelper* GetHelper(const unsigned int nTubes);
std::string GetStationName(const int& hid) const;
void SetStationName(std::string name, int& hid) const;
int GetPhiSector(const int& hid) const;
@@ -27,7 +28,8 @@ public:
private:
MdtHitIdHelper();
- void Initialize();
+ MdtHitIdHelper(const unsigned int nTubes);
+ void Initialize(const unsigned int nTubes=78); // all MDT/sMDT chambers used in Run1/2 have maximum 78 tubes
void InitializeStationName();
static MdtHitIdHelper* m_help;
diff --git a/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx b/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx
index fdc9330603867e3b24526d89d133ef6a103bf569..b41707681aa575a5badb513264590a25f5da94d3 100644
--- a/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx
+++ b/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx
@@ -22,19 +22,31 @@ MdtHitIdHelper::MdtHitIdHelper() : HitIdHelper()
Initialize();
}
+MdtHitIdHelper::MdtHitIdHelper(const unsigned int nTubes) : HitIdHelper()
+{
+ InitializeStationName();
+ Initialize(nTubes);
+}
+
MdtHitIdHelper* MdtHitIdHelper::GetHelper()
{
if (!m_help) m_help = new MdtHitIdHelper();
return m_help;
}
-void MdtHitIdHelper::Initialize()
+MdtHitIdHelper* MdtHitIdHelper::GetHelper(const unsigned int nTubes)
+{
+ if (!m_help) m_help = new MdtHitIdHelper(nTubes);
+ return m_help;
+}
+
+void MdtHitIdHelper::Initialize(const unsigned int nTubes)
{
InitializeField("PhiSector",1,8);
InitializeField("ZSector",-8,8);
InitializeField("MultiLayer",1,2);
InitializeField("Layer",1,4);
- InitializeField("Tube",1,78);
+ InitializeField("Tube",1,nTubes);
}
void MdtHitIdHelper::InitializeStationName()
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx
index 5fe49d5908c1a2ae995348cbdc240737ef1691f8..ac46b17927242b38bee6d7e814197fc47f79b0ff 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonTruthDecorationAlg.cxx
@@ -25,7 +25,7 @@ namespace Muon {
// Constructor with parameters:
MuonTruthDecorationAlg::MuonTruthDecorationAlg(const std::string &name, ISvcLocator *pSvcLocator) :
AthAlgorithm(name,pSvcLocator),
- m_muonMgr(nullptr) {
+ m_muonMgr(nullptr) {
}
// Initialize method:
@@ -47,9 +47,8 @@ namespace Muon {
}
// Execute method:
- StatusCode MuonTruthDecorationAlg::execute()
+ StatusCode MuonTruthDecorationAlg::execute()
{
-
// skip if no input data found
SG::ReadHandle<xAOD::TruthParticleContainer> truthContainer(m_truthParticleContainerName);
if(!truthContainer.isPresent()) return StatusCode::SUCCESS;
@@ -74,7 +73,7 @@ namespace Muon {
if( truth->status() != 1 ) continue;
if( abs(truth->pdgId()) != 13 || truth->pt() < 1000. ) continue;
xAOD::TruthParticle* truthParticle = new xAOD::TruthParticle();
- muonTruthContainer->push_back( truthParticle );
+ muonTruthContainer->push_back( truthParticle );
truthParticle->setPdgId(truth->pdgId());
truthParticle->setBarcode(truth->barcode());
truthParticle->setStatus(truth->status());
@@ -88,7 +87,7 @@ namespace Muon {
truthLink.toPersistent();
MCTruthPartClassifier::ParticleType type = MCTruthPartClassifier::Unknown;
MCTruthPartClassifier::ParticleOrigin origin = MCTruthPartClassifier::NonDefined;
- ATH_MSG_DEBUG("Found stable muon: " << truth->pt() << " eta " << truth->eta() << " phi " << truth->phi() << " mass " << truth->m()
+ ATH_MSG_DEBUG("Found stable muon: " << truth->pt() << " eta " << truth->eta() << " phi " << truth->phi() << " mass " << truth->m()
<< " barcode " << truth->barcode() << " truthParticle->barcode " << truthParticle->barcode() << " (*truthLink)->barcode " << (*truthLink)->barcode() <<" " << truthLink );
int iType = 0;
int iOrigin = 0;
@@ -129,13 +128,13 @@ namespace Muon {
createSegments(truthLink,segmentContainer,ids);
}
}
-
+
ATH_MSG_DEBUG("Registered " << muonTruthContainer->size() << " truth muons ");
if(m_createTruthSegment) ATH_MSG_DEBUG("Registered " << segmentContainer->size() << " truth muon segments ");
-
+
return StatusCode::SUCCESS;
}
-
+
void MuonTruthDecorationAlg::createSegments( const ElementLink< xAOD::TruthParticleContainer >& truthLink, SG::WriteHandle<xAOD::MuonSegmentContainer> segmentContainer,
const MuonTruthDecorationAlg::ChamberIdMap& ids) const {
@@ -175,7 +174,7 @@ namespace Muon {
std::set<int> etaLayers;
std::set<int> precLayers;
ATH_MSG_DEBUG(" new chamber layer " << Muon::MuonStationIndex::chName(lay.first) << " hits " << ids.size() );
- // loop over hits
+ // loop over hits
for( const auto& id : lay.second ){
ATH_MSG_VERBOSE(" hit " << m_idHelperSvc->toString(id) );
bool measPhi = m_idHelperSvc->measuresPhi(id);
@@ -194,7 +193,7 @@ namespace Muon {
int iid = 10*m_idHelperSvc->mdtIdHelper().multilayer(id) + m_idHelperSvc->mdtIdHelper().tubeLayer(id);
precLayers.insert( iid );
//ATH_MSG_VERBOSE("iid " << iid << " precLayers size " << precLayers.size() );
- }
+ }
}else{
etaLayers.insert( m_idHelperSvc->gasGap(id) );
}
@@ -212,12 +211,12 @@ namespace Muon {
if( gpos.perp() > 0.1 ) ok = true; // sanity check
}
}
- // look up successfull, calculate
+ // look up successfull, calculate
if( ok ){
// small comparison function
- auto isSmaller = [isEndcap]( const Amg::Vector3D& p1, const Amg::Vector3D& p2 ){
- if( isEndcap ) return fabs(p1.z()) < fabs(p2.z());
- else return p1.perp() < p2.perp();
+ auto isSmaller = [isEndcap]( const Amg::Vector3D& p1, const Amg::Vector3D& p2 ){
+ if( isEndcap ) return fabs(p1.z()) < fabs(p2.z());
+ else return p1.perp() < p2.perp();
};
if( !firstPos ) firstPos = new Amg::Vector3D(gpos);
else if( !secondPos ){
@@ -256,10 +255,10 @@ namespace Muon {
if( precLayers.size() > 2 ){
matchMap[lay.first] = index;
if( !phiLayers.empty() ) nphiLayers = phiLayers.size();
- ntrigEtaLayers = etaLayers.size();
+ ntrigEtaLayers = etaLayers.size();
nprecLayers = precLayers.size();
- ATH_MSG_DEBUG(" total counts: precision " << static_cast<int>(nprecLayers)
- << " phi layers " << static_cast<int>(nphiLayers)
+ ATH_MSG_DEBUG(" total counts: precision " << static_cast<int>(nprecLayers)
+ << " phi layers " << static_cast<int>(nphiLayers)
<< " eta trig layers " << static_cast<int>(ntrigEtaLayers) << " associated reco muon " << index
<< " barcode " << (*truthLink)->barcode() << " truthLink " << truthLink );
xAOD::MuonSegment* segment = new xAOD::MuonSegment();
@@ -276,7 +275,7 @@ namespace Muon {
if( firstPos && secondPos ){
Amg::Vector3D gpos = (*firstPos+*secondPos)/2.;
Amg::Vector3D gdir = (*firstPos-*secondPos).unit();
- ATH_MSG_DEBUG(" got position : r " << gpos.perp() << " z " << gpos.z()
+ ATH_MSG_DEBUG(" got position : r " << gpos.perp() << " z " << gpos.z()
<< " and direction: theta " << gdir.theta() << " phi " << gdir.phi() );
segment->setPosition(gpos.x(),gpos.y(),gpos.z());
segment->setDirection(gdir.x(),gdir.y(),gdir.z());
@@ -287,13 +286,13 @@ namespace Muon {
}
}
- void MuonTruthDecorationAlg::addTrackRecords( xAOD::TruthParticle& truthParticle,
+ void MuonTruthDecorationAlg::addTrackRecords( xAOD::TruthParticle& truthParticle,
const xAOD::TruthVertex* vertex ) const {
-
+
// first loop over track records, store parameters at the different positions
int barcode = truthParticle.barcode();
- std::vector< std::pair< Amg::Vector3D, Amg::Vector3D > > parameters;
- if( vertex ) parameters.push_back( std::make_pair(Amg::Vector3D(vertex->x(),vertex->y(),vertex->z()),
+ std::vector< std::pair< Amg::Vector3D, Amg::Vector3D > > parameters;
+ if( vertex ) parameters.push_back( std::make_pair(Amg::Vector3D(vertex->x(),vertex->y(),vertex->z()),
Amg::Vector3D(truthParticle.px(),truthParticle.py(),truthParticle.pz())) );
for( SG::ReadHandle<TrackRecordCollection>& col : m_trackRecordCollectionNames.makeHandles() ){
@@ -311,7 +310,7 @@ namespace Muon {
px=-99999.;
py=-99999.;
pz=-99999.;
-
+
// Need to always make these, to avoid crashes later
float& ex = truthParticle.auxdata<float>(name+"_x_extr");
float& ey = truthParticle.auxdata<float>(name+"_y_extr");
@@ -326,10 +325,10 @@ namespace Muon {
epx=-99999.;
epy=-99999.;
epz=-99999.;
-
+
// loop over collection and find particle with the same bar code
for( const auto& particle : *col ){
-
+
if( (particle.GetBarCode())%m_barcodeOffset != barcode ) continue;
CLHEP::Hep3Vector pos = particle.GetPosition();
CLHEP::Hep3Vector mom = particle.GetMomentum();
@@ -344,7 +343,7 @@ namespace Muon {
break;
}
}
-
+
// second loop, extrapolate between the points
if( vertex && /// require vertex
parameters.size() == m_trackRecordCollectionNames.size()+1 && // logic assumes there is one more parameter than track records
@@ -406,8 +405,8 @@ namespace Muon {
}
ATH_MSG_VERBOSE(" Extrapolated to " << name << std::endl
<< " truth: r " << parameters[i+1].first.perp() << " z " << parameters[i+1].first.z() << " p " << parameters[i+1].second.mag() << std::endl
- << " extrp: r " << exPars->position().perp() << " z " << exPars->position().z() << " p " << exPars->momentum().mag()
- << " res p " << (parameters[i+1].second.mag() - exPars->momentum().mag())
+ << " extrp: r " << exPars->position().perp() << " z " << exPars->position().z() << " p " << exPars->momentum().mag()
+ << " res p " << (parameters[i+1].second.mag() - exPars->momentum().mag())
<< " error " << errorp << " cov " << (*exPars->covariance())(Trk::qOverP,Trk::qOverP)
<< " pull p " << (parameters[i+1].second.mag() - exPars->momentum().mag())/errorp);
delete exPars;
@@ -424,9 +423,8 @@ namespace Muon {
}
- void MuonTruthDecorationAlg::addHitCounts( xAOD::TruthParticle& truthParticle,
+ void MuonTruthDecorationAlg::addHitCounts( xAOD::TruthParticle& truthParticle,
MuonTruthDecorationAlg::ChamberIdMap* ids) const {
-
int barcode = truthParticle.barcode();
std::vector<unsigned int> nprecHitsPerChamberLayer;
@@ -456,7 +454,7 @@ namespace Muon {
// add identifier to map
if( ids ) {
- if( isTgc ){ // TGCS should be added to both EIL and EIS
+ if( isTgc ){ // TGCS should be added to both EIL and EIS
Muon::MuonStationIndex::PhiIndex index = m_idHelperSvc->phiIndex(id);
if( index == Muon::MuonStationIndex::T4 ){
(*ids)[Muon::MuonStationIndex::EIS].push_back(id);
@@ -487,14 +485,14 @@ namespace Muon {
++nphiHitsPerChamberLayer[index];
}else{
++nprecHitsPerChamberLayer[chIndex];
- }
+ }
}
}
}
- uint8_t innerSmallHits = nprecHitsPerChamberLayer[Muon::MuonStationIndex::BIS] + nprecHitsPerChamberLayer[Muon::MuonStationIndex::EIS]
+ uint8_t innerSmallHits = nprecHitsPerChamberLayer[Muon::MuonStationIndex::BIS] + nprecHitsPerChamberLayer[Muon::MuonStationIndex::EIS]
+ nprecHitsPerChamberLayer[Muon::MuonStationIndex::CSS];
- uint8_t innerLargeHits = nprecHitsPerChamberLayer[Muon::MuonStationIndex::BIL] + nprecHitsPerChamberLayer[Muon::MuonStationIndex::EIL]
+ uint8_t innerLargeHits = nprecHitsPerChamberLayer[Muon::MuonStationIndex::BIL] + nprecHitsPerChamberLayer[Muon::MuonStationIndex::EIL]
+ nprecHitsPerChamberLayer[Muon::MuonStationIndex::CSL];
uint8_t middleSmallHits = nprecHitsPerChamberLayer[Muon::MuonStationIndex::BMS] + nprecHitsPerChamberLayer[Muon::MuonStationIndex::EMS];
uint8_t middleLargeHits = nprecHitsPerChamberLayer[Muon::MuonStationIndex::BML] + nprecHitsPerChamberLayer[Muon::MuonStationIndex::EML];
@@ -504,14 +502,14 @@ namespace Muon {
uint8_t extendedLargeHits = nprecHitsPerChamberLayer[Muon::MuonStationIndex::EEL];
uint8_t phiLayer1Hits = nphiHitsPerChamberLayer[Muon::MuonStationIndex::BM1] + nphiHitsPerChamberLayer[Muon::MuonStationIndex::T4]
- + nphiHitsPerChamberLayer[Muon::MuonStationIndex::CSC] + nphiHitsPerChamberLayer[Muon::MuonStationIndex::STGC1]
+ + nphiHitsPerChamberLayer[Muon::MuonStationIndex::CSC] + nphiHitsPerChamberLayer[Muon::MuonStationIndex::STGC1]
+ nphiHitsPerChamberLayer[Muon::MuonStationIndex::STGC2];
uint8_t phiLayer2Hits = nphiHitsPerChamberLayer[Muon::MuonStationIndex::BM2] + nphiHitsPerChamberLayer[Muon::MuonStationIndex::T1];
uint8_t phiLayer3Hits = nphiHitsPerChamberLayer[Muon::MuonStationIndex::BO1] + nphiHitsPerChamberLayer[Muon::MuonStationIndex::T2];
uint8_t phiLayer4Hits = nphiHitsPerChamberLayer[Muon::MuonStationIndex::BO2] + nphiHitsPerChamberLayer[Muon::MuonStationIndex::T3];
uint8_t etaLayer1Hits = ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::BM1] + ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::T4]
- + ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::CSC] + ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::STGC1]
+ + ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::CSC] + ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::STGC1]
+ ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::STGC2];
uint8_t etaLayer2Hits = ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::BM2] + ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::T1];
uint8_t etaLayer3Hits = ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::BO1] + ntrigEtaHitsPerChamberLayer[Muon::MuonStationIndex::T2];
@@ -578,15 +576,15 @@ namespace Muon {
if( msgLvl(MSG::DEBUG) ){
- ATH_MSG_DEBUG("Precision layers " << static_cast<int>(nprecLayers)
- << " phi layers " << static_cast<int>(nphiLayers)
+ ATH_MSG_DEBUG("Precision layers " << static_cast<int>(nprecLayers)
+ << " phi layers " << static_cast<int>(nphiLayers)
<< " triggerEta layers " << static_cast<int>(ntrigEtaLayers) );
if( nprecLayers > 0 ) {
msg(MSG::VERBOSE) << " Precision chambers ";
-
+
for( int index = 0; index < static_cast<int>(nprecHitsPerChamberLayer.size()) ; ++index ) {
- if( nprecHitsPerChamberLayer[index] > 0 ) msg(MSG::VERBOSE) << " " << Muon::MuonStationIndex::chName(static_cast<Muon::MuonStationIndex::ChIndex>(index))
+ if( nprecHitsPerChamberLayer[index] > 0 ) msg(MSG::VERBOSE) << " " << Muon::MuonStationIndex::chName(static_cast<Muon::MuonStationIndex::ChIndex>(index))
<< " hits " << nprecHitsPerChamberLayer[index];
}
}
@@ -601,7 +599,7 @@ namespace Muon {
if( ntrigEtaLayers > 0 ){
msg(MSG::VERBOSE) << endmsg << " Trigger Eta ";
for( int index = 0; index < static_cast<int>(ntrigEtaHitsPerChamberLayer.size()) ; ++index ) {
- if( ntrigEtaHitsPerChamberLayer[index] > 0 ) msg(MSG::VERBOSE) << " " << Muon::MuonStationIndex::phiName(static_cast<Muon::MuonStationIndex::PhiIndex>(index))
+ if( ntrigEtaHitsPerChamberLayer[index] > 0 ) msg(MSG::VERBOSE) << " " << Muon::MuonStationIndex::phiName(static_cast<Muon::MuonStationIndex::PhiIndex>(index))
<< " hits " << ntrigEtaHitsPerChamberLayer[index];
}
}
@@ -613,7 +611,9 @@ namespace Muon {
std::vector<unsigned long long> mdtTruthHits;
std::vector<unsigned long long> cscTruthHits;
std::vector<unsigned long long> tgcTruthHits;
+ std::vector<unsigned long long> stgcTruthHits;
std::vector<unsigned long long> rpcTruthHits;
+ std::vector<unsigned long long> mmTruthHits;
// loop over chamber layers
int nEI=0,nEM=0;
@@ -622,20 +622,25 @@ namespace Muon {
if(lay.first==Muon::MuonStationIndex::EIS || lay.first==Muon::MuonStationIndex::EIL) nEI++;
if(lay.first==Muon::MuonStationIndex::EMS || lay.first==Muon::MuonStationIndex::EML) nEM++;
for( const auto& id : lay.second ){
- if(m_idHelperSvc->isMdt(id)) mdtTruthHits.push_back(id.get_compact());
- else if(m_idHelperSvc->isCsc(id)) cscTruthHits.push_back(id.get_compact());
- else if(m_idHelperSvc->isTgc(id)){
- if((lay.first==Muon::MuonStationIndex::EIS || lay.first==Muon::MuonStationIndex::EIL) && nEI>1) continue; //otherwise we double-count
- if((lay.first==Muon::MuonStationIndex::EMS || lay.first==Muon::MuonStationIndex::EML) && nEM>1) continue; //otherwise we double-count
- tgcTruthHits.push_back(id.get_compact());
- }
- else if(m_idHelperSvc->isRpc(id)) rpcTruthHits.push_back(id.get_compact());
+ if(m_idHelperSvc->isMdt(id)) mdtTruthHits.push_back(id.get_compact());
+ else if(m_idHelperSvc->isCsc(id)) cscTruthHits.push_back(id.get_compact());
+ else if(m_idHelperSvc->isTgc(id)){
+ if((lay.first==Muon::MuonStationIndex::EIS || lay.first==Muon::MuonStationIndex::EIL) && nEI>1) continue; //otherwise we double-count
+ if((lay.first==Muon::MuonStationIndex::EMS || lay.first==Muon::MuonStationIndex::EML) && nEM>1) continue; //otherwise we double-count
+ tgcTruthHits.push_back(id.get_compact());
+ }
+ else if(m_idHelperSvc->issTgc(id)) stgcTruthHits.push_back(id.get_compact());
+ else if(m_idHelperSvc->isRpc(id)) rpcTruthHits.push_back(id.get_compact());
+ else if(m_idHelperSvc->isMM(id)) mmTruthHits.push_back(id.get_compact());
}
}
truthParticle.auxdata<std::vector<unsigned long long> >("truthMdtHits")=mdtTruthHits;
truthParticle.auxdata<std::vector<unsigned long long> >("truthCscHits")=cscTruthHits;
- truthParticle.auxdata<std::vector<unsigned long long> >("truthRpcHits")=rpcTruthHits;
truthParticle.auxdata<std::vector<unsigned long long> >("truthTgcHits")=tgcTruthHits;
+ truthParticle.auxdata<std::vector<unsigned long long> >("truthRpcHits")=rpcTruthHits;
+ truthParticle.auxdata<std::vector<unsigned long long> >("truthStgcHits")=stgcTruthHits;
+ truthParticle.auxdata<std::vector<unsigned long long> >("truthMMHits")=mmTruthHits;
+
ATH_MSG_VERBOSE("Added "<<mdtTruthHits.size()<<" mdt truth hits, "<<cscTruthHits.size()<<" csc truth hits, "<<rpcTruthHits.size()<<" rpc truth hits, and "<<tgcTruthHits.size()<<" tgc truth hits");
}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
index 23bf8872da4fe23149938dcbc2f686eb8702281f..2326a19c2bfeba8bee6e022aa5ab071a0562c0ab 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/CMakeLists.txt
@@ -14,7 +14,7 @@ atlas_add_component( MuonDQAMonitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaMonitoringLib StoreGateLib SGtests GaudiKernel DataQualityInterfaces EventInfo TrigT1Result )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaMonitoringLib StoreGateLib SGtests GaudiKernel EventInfo TrigT1Result )
# Install files from the package:
atlas_install_headers( MuonDQAMonitoring )
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py
index 631bb29d22ae6422ad3ca11ba03475fb80d80f63..c8fd82611938408657031c7bea25ed9e3d920c78 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py
@@ -16,6 +16,12 @@ def MuonDQAMonitoringConfig(flags):
result.merge(MdtMonitoringConfig(flags))
result.merge(RpcMonitoringConfig(flags))
result.merge(TgcRawDataMonitoringConfig(flags))
+ if flags.Detector.GeometryCSC:
+ from CscRawDataMonitoring.CscMonitorAlgorithm import CscMonitoringConfig
+ result.merge(CscMonitoringConfig(flags))
+ if flags.Detector.GeometryMM:
+ from MMRawDataMonitoring.MMMonitorAlgorithm import MMMonitoringConfig
+ result.merge(MMMonitoringConfig(flags))
if flags.DQ.Steering.Muon.doTrackMon:
# do not run in RAW->ESD
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
index 40fa2cf38aadff7ef473f5b17f0e68fe255d09fd..a0b992c67339ddb6dbc8fbad231e35c8116695e6 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
@@ -154,13 +154,23 @@ if DQMonFlags.doMuonSegmentMon():
#------------- ---------#
# Muon track monitoring #
#------------- ---------#
+# switch between legacy and new code
+Run3_test = False
if DQMonFlags.doMuonTrackMon():
- if MuonESDMon:
- try:
+ try:
+ if MuonESDMon and Run3_test:
from MuonTrackMonitoring.MuonTrackMonitorAlgorithm import MuonTrackConfig
topSequence += MuonTrackConfig(DQMonFlags,isOld=True)
- except Exception:
- treatException("DataQualitySteering_jobOptions.py: exception when setting up Muon track monitoring")
+
+ # Legacy monitoring
+ elif MuonESDMon:
+ if DQMonFlags.useTrigger(): ## monitoring tool cannot have a dependence on TrigDecisionTool if DQMonFlags.useTrigger==False (ATLASRECTS-3549)
+ if MuonDQADetFlags.doMuonTrackMon():
+ include ("MuonTrackMonitoring/MuonTrackDQA_options.py")
+ if MuonDQADetFlags.MuonTrkMonDoTrigger():
+ include ("MuonTrackMonitoring/MuonTrigTrackDQA_options.py")
+ except Exception:
+ treatException("DataQualitySteering_jobOptions.py: exception when setting up Muon track monitoring")
#-------------------------#
# Muon physics monitoring #
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValMonAlg.h
new file mode 100755
index 0000000000000000000000000000000000000000..54a68b8bf31d1f13c2927ddadc747f6459ca7f79
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CSCSegmValMonAlg.h
@@ -0,0 +1,69 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CSCSegmValMonAlg_H
+#define CSCSegmValMonAlg_H
+
+#include "AthenaMonitoring/AthMonitorAlgorithm.h"
+#include "AthenaMonitoring/ManagedMonitorToolBase.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+
+#include "MuonSegment/MuonSegment.h"
+#include "TrkSegment/SegmentCollection.h"
+#include "TrkTrack/Track.h"
+
+#include "TrigDecisionTool/TrigDecisionTool.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
+
+#include <vector>
+#include <string>
+
+namespace Trk {
+ class MeasurementBase;
+}
+
+class CSCSegmValMonAlg : public AthMonitorAlgorithm {
+
+ public:
+ /** Constructor */
+ CSCSegmValMonAlg( const std::string& name, ISvcLocator* pSvcLocator );
+ /** Destructor */
+ virtual ~CSCSegmValMonAlg()=default;
+ virtual StatusCode initialize() override;
+ virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
+
+ private:
+
+ typedef std::vector<TH1 *> SegmHistType;
+ typedef std::vector<TH1 *>::const_iterator SegmHistIter;
+
+ typedef std::vector<const Trk::MeasurementBase*> TrkSegmType;
+ typedef std::vector<const Trk::MeasurementBase*>::const_iterator TrkSegmIter;
+
+ typedef enum EndCaps { ECA = 0, ECC } EndCapType;
+
+ bool isCscSegment( const Muon::MuonSegment* seg ) const;
+ unsigned int cscHits( const Muon::MuonSegment* seg ) const;
+ bool segmSlopeCut(const float csc_x, const float csc_ax, const float cut ) const;
+ //Trigger aware monitoring
+ bool evtSelTriggersPassed() const;
+
+ ServiceHandle<Muon::IMuonEDMHelperSvc> m_edmHelperSvc {this, "edmHelper",
+ "Muon::MuonEDMHelperSvc/MuonEDMHelperSvc",
+ "Handle to the service providing the IMuonEDMHelperSvc interface" };
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
+ SG::ReadHandleKey<Trk::SegmentCollection> m_segmKey{this,"SegmentKey","MuonSegments","muon segments"};
+
+ Gaudi::Property<std::vector<std::string>> m_sampSelTriggers{this,"EventSelTriggers",{}};
+ Gaudi::Property<bool> m_doEvtSel{this,"DoEventSelection",false};
+ Gaudi::Property<double> m_segmSlope{this,"SegmentSlopeCut",0};
+
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscClusterValMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscClusterValMonAlg.h
index 813613e7159c7414653a5ef2570af8f4c045ffb5..5a85d20849ce45962c00090a824a555cb93d6bcb 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscClusterValMonAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscClusterValMonAlg.h
@@ -29,7 +29,9 @@ public:
private:
-
+ //Trigger aware monitoring
+ bool evtSelTriggersPassed() const;
+
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
// Strip fitter.
ToolHandle<ICscStripFitter> m_stripFitter{this, "CSCStripFitter", "CSCStripFitter", "Strip fitter Tool"};
@@ -41,10 +43,9 @@ private:
SG::ReadHandleKey<Muon::CscPrepDataContainer> m_cscClusterKey{this,"CSCClusterKey","CSC_Clusters","CSC clusters"};
SG::ReadHandleKey<Muon::CscStripPrepDataContainer> m_cscPRDKey{this,"CSCPrepRawDataKey", "CSC_Measurements","CSC PRDs"};
- unsigned int m_qmaxADCCut;
-
- bool m_doEvtSel;
- std::vector<std::string> m_sampSelTriggers;
-
+ Gaudi::Property<std::vector<std::string>> m_sampSelTriggers{this,"CSCEventSelTriggers",{}};
+ Gaudi::Property<bool> m_doEvtSel{this,"CSCDoEventSelection",false};
+ Gaudi::Property<double> m_qmaxADCCut{this,"CSCQmaxCutADC",100};
+
};
#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscPrdValMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscPrdValMonAlg.h
index 29b8c74ede319da4ae2f3a147a255219af37b595..bad9a1ad686764add17efcd50763938c8b43a2f2 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscPrdValMonAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CscRawDataMonitoring/CscPrdValMonAlg.h
@@ -30,14 +30,15 @@ public:
private:
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
-
- size_t m_cscNoiseCut;
+
SG::ReadHandleKey<Muon::CscStripPrepDataContainer> m_cscPrdKey{this,"CSCPrepRawDataKey","CSC_Measurements","CSC PRDs"};
- bool m_mapxyrz;
// Strip fitter
ToolHandle<ICscStripFitter> m_stripFitter{this, "CSCStripFitter", "CSCStripFitter", "Strip fitter Tool"};
+ Gaudi::Property<bool> m_mapxyrz{this,"MapYXandRZ",false};
+ Gaudi::Property<size_t> m_cscNoiseCut{this,"NoiseCutADC",50};
+
};
#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitorAlgorithm.py
index cad0836c34f96157e17d2ba36319179a1b0448b4..e17c8370b03cb57c298b8e0e04c8d629d779db99 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitorAlgorithm.py
@@ -42,7 +42,7 @@ def CscMonitoringConfig(inputFlags):
# This uses the new Configurables object system.
cscClusMonAlg = helper.addAlgorithm(CompFactory.CscClusterValMonAlg,'CscClusMonAlg')
cscPrdMonAlg = helper.addAlgorithm(CompFactory.CscPrdValMonAlg,'CscPrdMonAlg')
- # cscSegmMonAlg = helper.addAlgorithm(CompFactory.CscSegmValMonAlg,'CscSegmValMonAlg')
+ cscSegmMonAlg = helper.addAlgorithm(CompFactory.CSCSegmValMonAlg,'CscSegmMonAlg')
### STEP 3 ###
@@ -50,9 +50,12 @@ def CscMonitoringConfig(inputFlags):
# some generic property
# exampleMonAlg.RandomHist = True
cscClusMonAlg.CSCQmaxCutADC = 100
+ cscClusMonAlg.CSCDoEventSelection = False
+ cscClusMonAlg.CSCEventSelTriggers = [ "" ]
cscPrdMonAlg.NoiseCutADC = 50
cscPrdMonAlg.MapYXandRZ = False
-
+ cscSegmMonAlg.DoEventSelection = False
+ cscSegmMonAlg.EventSelTriggers = [ "" ] #[ "L1_MU10", "L1_MU15", "EF_mu20_muCombTag_NoEF", "EF_mu15", "EF_mu15_mu10_EFFS", "EF_2mu10", "EF_2mu10_loose" ]
# to enable a trigger filter, for example:
#exampleMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
@@ -66,7 +69,7 @@ def CscMonitoringConfig(inputFlags):
# # this example, no accumulator is returned, so no merge is necessary.
# from MyDomainPackage.MyDomainPackageConf import MyDomainTool
# exampleMonAlg.MyDomainTool = MyDomainTool()
- from MuonConfig.MuonCalibConfig import CscCalibToolCfg
+ from MuonConfig.MuonCalibrationConfig import CscCalibToolCfg
calibtool = result.popToolsAndMerge( CscCalibToolCfg(inputFlags) )
cscClusMonAlg.CscCalibTool = calibtool
@@ -79,7 +82,7 @@ def CscMonitoringConfig(inputFlags):
# object here is the standard GenericMonitoringTool.
cscClusGroup = helper.addGroup(cscClusMonAlg,'CscClusMonitor','Muon/MuonRawDataMonitoring/CSC/')
cscPrdGroup = helper.addGroup(cscPrdMonAlg,'CscPrdMonitor','Muon/MuonRawDataMonitoring/CSC/')
- # cscSegmGroup = helper.addGroup(cscSegmMonAlg,'CscSegmMonitor','Muon/MuonRawDataMonitoring/CSC/')
+ cscSegmGroup = helper.addGroup(cscSegmMonAlg,'CscSegmMonitor','Muon/MuonSegmentMonitoring/')
@@ -351,6 +354,147 @@ def CscMonitoringConfig(inputFlags):
cscClusGroup.defineHistogram('nPhiClusWidthCnt_mon,nEtaClusWidthCnt_mon;h2csc_prd_eta_vs_phi_cluswidth',type='TH2F',title='Eta vs. Phi Cluster width correlation;#varphi-cluster width;#eta-cluster width',
path='PRD/Expert',xbins=100,xmin=0,xmax=100,ybins=100,ymin=0,ymax=100)
+ #Segments
+
+ cscSegmGroup.defineHistogram('n_clust,segm_sectorNo;Muon_Segm_NumSegments_EA',cutmask='sideA',type='TH2F',title='EndCap A: No. of segments; #segments; [sector] + [0.2 #times layer]',
+ path='EndCapA/Overview/MuonSegments/CSC',xbins=20,xmin=0,xmax=80,ybins=90,ymin=0,ymax=18.)
+
+ cscSegmGroup.defineHistogram('n_clust,segm_sectorNo;Muon_Segm_NumSegments_EC',cutmask='sideC',type='TH2F',title='EndCap C: No. of segments; #segments; [sector] + [0.2 #times layer]',
+ path='EndCapC/Overview/MuonSegments/CSC',xbins=20,xmin=0,xmax=80,ybins=85,ymin=-17,ymax=0.)
+
+ thisLabelx=getCSCLabelx("labels_sgm_status")
+ status_bins = len(thisLabelx)
+ cscSegmGroup.defineHistogram('status_mon;Muon_Segm_EtaClusterStatus_EA',cutmask='sideA_phi0',type='TH1F',title='Endcap A: #eta-cluster status;;entries',
+ path='EndCapA/Detail/CSC',xbins=status_bins,xmin=-0.5,xmax=status_bins-0.5,xlabels=thisLabelx)
+
+ thisLabelx=getCSCLabelx("labels_sgm_status")
+ status_bins = len(thisLabelx)
+ cscSegmGroup.defineHistogram('status_mon;Muon_Segm_EtaClusterStatus_EC',cutmask='sideC_phi0',type='TH1F',title='Endcap C: #eta-cluster status;;entries',
+ path='EndCapC/Detail/CSC',xbins=status_bins,xmin=-0.5,xmax=status_bins-0.5,xlabels=thisLabelx)
+
+ thisLabelx=getCSCLabelx("labels_sgm_status")
+ status_bins = len(thisLabelx)
+ cscSegmGroup.defineHistogram('status_mon;Muon_Segm_PhiClusterStatus_EA',cutmask='sideA_phi',type='TH1F',title='Endcap A: #phi-cluster status;;entries',
+ path='EndCapA/Detail/CSC',xbins=status_bins,xmin=-0.5,xmax=status_bins-0.5,xlabels=thisLabelx)
+
+ thisLabelx=getCSCLabelx("labels_sgm_status")
+ status_bins = len(thisLabelx)
+ cscSegmGroup.defineHistogram('status_mon;Muon_Segm_PhiClusterStatus_EC',cutmask='sideC_phi',type='TH1F',title='Endcap C: #phi-cluster status;;entries',
+ path='EndCapC/Detail/CSC',xbins=status_bins,xmin=-0.5,xmax=status_bins-0.5,xlabels=thisLabelx)
+
+
+ cscSegmGroup.defineHistogram('clus_qsum_mon,clus_secLayer;Muon_Segm_QSumEtaGoodClusPerLayer_EA',cutmask='checkStatusEtaA',type='TH2F',title='EndCap A: #eta-cluster charge per layer;counts;[sector] + [0.2 #times layer]',
+ path='EndCapA/Overview/MuonSegments/CSC',xbins=80,xmin=0.,xmax=4000.,ybins=90,ymin=0.,ymax=18.) #PLEASE CHECk
+
+ cscSegmGroup.defineHistogram('clus_time_mon,clus_secLayer;Muon_Segm_TimeEtaGoodClusPerLayer_EA',cutmask='checkTimeEtaA',type='TH2F',title='EndCap A: #eta-cluster time per layer;time [ns];[sector] + [0.2 #times layer]',
+ path='EndCapA/Overview/MuonSegments/CSC',xbins=40,xmin=-200.,xmax=200.,ybins=90,ymin=0.,ymax=18.) #PLEASE CHECk
+
+ cscSegmGroup.defineHistogram('clus_qsum_mon,clus_secLayer;Muon_Segm_QSumEtaGoodClusPerLayer_EC',cutmask='checkStatusEtaC',type='TH2F',title='EndCap C: #eta-cluster charge per layer;counts;[sector] + [0.2 #times layer]',
+ path='EndCapC/Overview/MuonSegments/CSC',xbins=80,xmin=0.,xmax=4000.,ybins=85,ymin=-17.,ymax=0.)
+
+ cscSegmGroup.defineHistogram('clus_time_mon,clus_secLayer;Muon_Segm_TimeEtaGoodClusPerLayer_EC',cutmask='checkTimeEtaC',type='TH2F',title='EndCap C: #eta-cluster time per layer;time [ns];[sector] + [0.2 #times layer]',
+ path='EndCapC/Overview/MuonSegments/CSC',xbins=40,xmin=-200.,xmax=200.,ybins=85,ymin=-17.,ymax=0.)
+
+ cscSegmGroup.defineHistogram('clus_qsum_mon,clus_secLayer;Muon_Segm_QSumPhiGoodClusPerLayer_EA',cutmask='checkStatusPhiA',type='TH2F',title='EndCap A: #phi-cluster charge per layer;counts;[sector] + [0.2 #times layer]',
+ path='EndCapA/Overview/MuonSegments/CSC',xbins=80,xmin=0.,xmax=4000,ybins=90,ymin=0.,ymax=18.)
+
+ cscSegmGroup.defineHistogram('clus_time_mon,clus_secLayer;Muon_Segm_TimePhiGoodClusPerLayer_EA',cutmask='checkTimePhiA',type='TH2F',title='EndCap A: #phi-cluster time per layer;time [ns];[sector] + [0.2 #times layer]',
+ path='EndCapA/Overview/MuonSegments/CSC',xbins=40,xmin=-200.,xmax=200.,ybins=90, ymin=0.,ymax=18.)
+
+ cscSegmGroup.defineHistogram('clus_qsum_mon,clus_secLayer;Muon_Segm_QSumPhiGoodClusPerLayer_EC',cutmask='checkStatusPhiC',type='TH2F',title='EndCap C: #phi-cluster charge per layer;counts;[sector] + [0.2 #times layer]',
+ path='EndCapC/Overview/MuonSegments/CSC',xbins=80,xmin=0.,xmax=4000,ybins=85,ymin=-17.,ymax=0.)
+
+ cscSegmGroup.defineHistogram('clus_time_mon,clus_secLayer;Muon_Segm_TimePhiGoodClusPerLayer_EC',cutmask='checkTimePhiC',type='TH2F',title='EndCap A: #phi-cluster time per layer;time [ns];[sector] + [0.2 #times layer]',
+ path='EndCapC/Overview/MuonSegments/CSC',xbins=40,xmin=-200.,xmax=200.,ybins=85,ymin=-17.,ymax=0.)
+
+ cscSegmGroup.defineHistogram('tmp_etaClusA;Muon_Segm_NumEtaCluster_EA',cutmask='checkClusEtaA',type='TH1F',title='Endcap A: No. of #eta-clusters on segment;#clusters;entries',
+ path='EndCapA/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ cscSegmGroup.defineHistogram('tmp_etaClusGoodA;Muon_Segm_NumGoodEtaCluster_EA',cutmask='checkClusEtaGoodA',type='TH1F',title='Endcap A: No. of good #eta-clusters on segment;#good-clusters;entries',
+ path='EndCapA/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ cscSegmGroup.defineHistogram('tmp_phiClusA;Muon_Segm_NumPhiCluster_EA',cutmask='checkClusPhiA',type='TH1F',title='Endcap A: No. of #phi-clusters on segment;#clusters;entries',
+ path='EndCapA/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ cscSegmGroup.defineHistogram('tmp_phiClusGoodA;Muon_Segm_NumGoodPhiCluster_EA',cutmask='checkClusPhiGoodA',type='TH1F',title='Endcap A: No. of good #phi-clusters on segment;#good-clusters;entries',
+ path='EndCapA/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ cscSegmGroup.defineHistogram('tmp_etaClusC;Muon_Segm_NumEtaCluster_EC',cutmask='checkClusEtaC',type='TH1F',title='Endcap C: No. of #eta-clusters on segment;#clusters;entries',
+ path='EndCapC/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ cscSegmGroup.defineHistogram('tmp_etaClusGoodC;Muon_Segm_NumGoodEtaCluster_EC',cutmask='checkClusEtaGoodC',type='TH1F',title='Endcap C: No. of good #eta-clusters on segment;#good-clusters;entries',
+ path='EndCapC/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ cscSegmGroup.defineHistogram('tmp_phiClusC;Muon_Segm_NumPhiCluster_EC',cutmask='checkClusPhiC',type='TH1F',title='Endcap C: No. of #phi-clusters on segment;#clusters;entries',
+ path='EndCapC/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ cscSegmGroup.defineHistogram('tmp_phiClusGoodC;Muon_Segm_NumGoodPhiCluster_EC',cutmask='checkClusPhiGoodC',type='TH1F',title='Endcap C: No. of good #phi-clusters on segment;#good-clusters;entries',
+ path='EndCapC/Detail/CSC',xbins=11,xmin=-0.5,xmax=10.5)
+
+ thisLabelx=getCSCLabelx("labels_sgm_clusCounts")
+ cscSegmGroup.defineHistogram('tmp_layerIndexA_mon,tmp_isectA_mon;Muon_Segm_NumNClusSegments_EA',type='TH2F',title='EndCap A: #eta-number of 3 and 4 cluster segments with each layer;counts;[sector] + [0.2 #times layer]',
+ path='EndCapA/Detail/CSC',xbins=50,xmin=.5,xmax=5.5,ybins=90,ymin=0,ymax=18.,xlabels=thisLabelx)
+
+ thisLabelx=getCSCLabelx("labels_sgm_clusCounts")
+ cscSegmGroup.defineHistogram('tmp_layerIndexC_mon,tmp_isectC_mon;Muon_Segm_NumNClusSegments_EC',type='TH2F',title='EndCap C: #eta-number of 3 and 4 cluster segments with each layer;counts;[sector] + [0.2 #times layer]',
+ path='EndCapC/Detail/CSC',xbins=50,xmin=.5,xmax=5.5,ybins=85,ymin=-17,ymax=0.,xlabels=thisLabelx)
+
+ cscSegmGroup.defineHistogram('etaClusQSumA;Muon_Segm_QSumEtaCluster_EA',type='TH1F',title='Endcap A: #eta-cluster Qsum;counts;entries',
+ path='EndCapA/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('phiClusQSumA;Muon_Segm_QSumPhiCluster_EA',type='TH1F',title='Endcap A: #phi-cluster Qsum;counts;entries',
+ path='EndCapA/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('etaTimeClusA;Muon_Segm_TimeEtaCluster_EA',type='TH1F',title='Endcap A: #eta-cluster Time;time [ns];entries',
+ path='EndCapA/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('phiTimeClusA;Muon_Segm_TimePhiCluster_EA',type='TH1F',title='Endcap A: #phi-cluster Time;time [ns];entries',
+ path='EndCapA/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('etaClusQSumC;Muon_Segm_QSumEtaCluster_EC',type='TH1F',title='Endcap C: #eta-cluster Qsum;counts;entries',
+ path='EndCapC/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('phiClusQSumC;Muon_Segm_QSumPhiCluster_EC',type='TH1F',title='Endcap C: #phi-cluster Qsum;counts;entries',
+ path='EndCapC/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('etaTimeClusC;Muon_Segm_TimeEtaCluster_EC',type='TH1F',title='Endcap C: #eta-cluster Time;time [ns];entries',
+ path='EndCapC/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('phiTimeClusC;Muon_Segm_TimePhiCluster_EC',type='TH1F',title='Endcap C: #phi-cluster Time;time [ns];entries',
+ path='EndCapC/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('etaQSumGoodClusA;Muon_Segm_QSumGoodEtaCluster_EA',type='TH1F',title='Endcap A: Good #eta-cluster Qsum;counts;entries',
+ path='EndCapA/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('phiQSumGoodClusA;Muon_Segm_QSumGoodPhiCluster_EA',type='TH1F',title='Endcap A: Good #phi-cluster Qsum;counts;entries',
+ path='EndCapA/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('etaQSumGoodClusC;Muon_Segm_QSumGoodEtaCluster_EC',type='TH1F',title='Endcap C: Good #eta-cluster Qsum;counts;entries',
+ path='EndCapC/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('phiQSumGoodClusC;Muon_Segm_QSumGoodPhiCluster_EC',type='TH1F',title='Endcap C: Good #phi-cluster Qsum;counts;entries',
+ path='EndCapC/Detail/CSC',xbins=80,xmin=0.,xmax=4000.)
+
+ cscSegmGroup.defineHistogram('etaTimeGoodClusA;Muon_Segm_TimeGoodEtaCluster_EA',type='TH1F',title='Endcap A: Good #eta-cluster Time;time [ns];entries',
+ path='EndCapA/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('etaTimeGoodClusC;Muon_Segm_TimeGoodEtaCluster_EC',type='TH1F',title='Endcap C: Good #eta-cluster Time;time [ns];entries',
+ path='EndCapC/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('phiTimeGoodClusA;Muon_Segm_TimeGoodPhiCluster_EA',type='TH1F',title='Endcap A: Good #phi-cluster Time;time [ns];entries',
+ path='EndCapA/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('phiTimeGoodClusC;Muon_Segm_TimeGoodPhiCluster_EC',type='TH1F',title='Endcap C: Good #phi-cluster Time;time [ns];entries',
+ path='EndCapC/Detail/CSC',xbins=40,xmin=-200.,xmax=200.)
+
+ cscSegmGroup.defineHistogram('etaQSumTot0,phiQSumTot0;Muon_Segm_QSumGoodClusCorrelation_EA',type='TH2F',title='Endcap A: #phi-cluster vs. good #eta-cluster;good #eta-cluster counts;good #phi-cluster counts',
+ path='EndCapA/Detail/CSC',xbins=80,xmin=0.,xmax=4000.,ybins=80,ymin=0.,ymax=4000.)
+
+ cscSegmGroup.defineHistogram('etaQSumTot,phiQSumTot;Muon_Segm_QSumGoodClusCorrelation_EC',type='TH2F',title='Endcap C: #phi-cluster vs. good #eta-cluster;good #eta-cluster counts;good #phi-cluster counts',
+ path='EndCapC/Detail/CSC',xbins=80,xmin=0.,xmax=4000.,ybins=80,ymin=0.,ymax=4000.)
+
+
+
#myGroup.defineHistogram('lb', title='Luminosity Block;lb;Events',
@@ -432,6 +576,7 @@ if __name__=='__main__':
from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.ESD
+
ConfigFlags.Output.HISTFileName = 'CscMonitorOutput.root'
ConfigFlags.Muon.doCSCs = True
ConfigFlags.Muon.doRPCs = False
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscRawMonLabels.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscRawMonLabels.py
index 3fd6aa2d74a60d8c35773837d2dabb5888017cd7..7d02001b3c2e34ad7bd89b6b0026fbd5c1653409 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscRawMonLabels.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscRawMonLabels.py
@@ -3,4 +3,6 @@
#
labels_clus_occupancy_signal_EA=['','','','','','L01:1', 'L01:2', 'L01:3', 'L01:4', '', 'S02:1', 'S02:2', 'S02:3', 'S02:4', '', 'L03:1', 'L03:2', 'L03:3', 'L03:4', '', 'S04:1', 'S04:2', 'S04:3', 'S04:4', '', 'L05:1', 'L05:2', 'L05:3', 'L05:4', '', 'S06:1', 'S06:2', 'S06:3', 'S06:4', '', 'L07:1', 'L07:2', 'L07:3', 'L07:4', '', 'S08:1', 'S08:2', 'S08:3', 'S08:4', '', 'L09:1', 'L09:2', 'L09:3', 'L09:4', '', 'S10:1', 'S10:2', 'S10:3', 'S10:4', '', 'L11:1', 'L11:2', 'L11:3', 'L11:4', '', 'S12:1', 'S12:2', 'S12:3', 'S12:4', '', 'L13:1', 'L13:2', 'L13:3', 'L13:4', '', 'S14:1', 'S14:2', 'S14:3', 'S14:4', '', 'L15:1', 'L15:2', 'L15:3', 'L15:4', '', 'S16:1', 'S16:2', 'S16:3', 'S16:4', '','','','','','']
-labels_clus_occupancy_signal_EC=['','','','','','L15:4', 'L15:3', 'L15:2', 'L15:1', '', 'S14:4', 'S14:3', 'S14:2', 'S14:1', '', 'L13:4', 'L13:3', 'L13:2', 'L13:1', '', 'S12:4', 'S12:3', 'S12:2', 'S12:1', '', 'L11:4', 'L11:3', 'L11:2', 'L11:1', '', 'S10:4', 'S10:3', 'S10:2', 'S10:1', '', 'L09:4', 'L09:3', 'L09:2', 'L09:1', '', 'S08:4', 'S08:3', 'S08:2', 'S08:1', '', 'L07:4', 'L07:3', 'L07:2', 'L07:1', '', 'S06:4', 'S06:3', 'S06:2', 'S06:1', '', 'L05:4', 'L05:3', 'L05:2', 'L05:1', '', 'S04:4', 'S04:3', 'S04:2', 'S04:1', '', 'L03:4', 'L03:3', 'L03:2', 'L03:1', '', 'S02:4', 'S02:3', 'S02:2', 'S02:1', '', 'L01:4', 'L01:3', 'L01:2', 'L01:1', '', 'S00:4', 'S00:3', 'S00:2', 'S00:1', '']
\ No newline at end of file
+labels_clus_occupancy_signal_EC=['','','','','','L15:4', 'L15:3', 'L15:2', 'L15:1', '', 'S14:4', 'S14:3', 'S14:2', 'S14:1', '', 'L13:4', 'L13:3', 'L13:2', 'L13:1', '', 'S12:4', 'S12:3', 'S12:2', 'S12:1', '', 'L11:4', 'L11:3', 'L11:2', 'L11:1', '', 'S10:4', 'S10:3', 'S10:2', 'S10:1', '', 'L09:4', 'L09:3', 'L09:2', 'L09:1', '', 'S08:4', 'S08:3', 'S08:2', 'S08:1', '', 'L07:4', 'L07:3', 'L07:2', 'L07:1', '', 'S06:4', 'S06:3', 'S06:2', 'S06:1', '', 'L05:4', 'L05:3', 'L05:2', 'L05:1', '', 'S04:4', 'S04:3', 'S04:2', 'S04:1', '', 'L03:4', 'L03:3', 'L03:2', 'L03:1', '', 'S02:4', 'S02:3', 'S02:2', 'S02:1', '', 'L01:4', 'L01:3', 'L01:2', 'L01:1', '', 'S00:4', 'S00:3', 'S00:2', 'S00:1', '']
+labels_sgm_status = [ "Unspoiled", "Simple", "Edge", "MultiPeak", "Narrow", "Wide", "Skewed", "QRatInc", "StripFitFailed", "SplitUnspoiled", "SplitSimple", "SplitEdge", "SplitMultiPeak", "SplitNarrow", "SplitWide", "SplitSkewed", "SplitQRatInc", "SplitStripFitFailed", "Undefined" ]
+labels_sgm_clusCounts = [ "234", "134", "124", "123", "All" ]
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValMonAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValMonAlg.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..d4461e6b8873b9f3115775381b7fee5d9b79a8c0
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CSCSegmValMonAlg.cxx
@@ -0,0 +1,542 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+#include "AthenaMonitoring/AthenaMonManager.h"
+
+#include "CscRawDataMonitoring/CSCSegmValMonAlg.h"
+
+#include "MuonPrepRawData/CscClusterStatus.h"
+#include "MuonPrepRawData/CscStripPrepDataCollection.h"
+#include "MuonPrepRawData/CscStripPrepDataContainer.h"
+#include "MuonPrepRawData/CscPrepData.h"
+
+// Track
+#include "TrkTrack/TrackCollection.h"
+#include "TrkEventPrimitives/PropDirection.h"
+#include "TrkEventPrimitives/LocalDirection.h"
+#include "TrkSurfaces/PlaneSurface.h"
+
+#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
+#include "MuonRIO_OnTrack/CscClusterOnTrack.h"
+
+// STL
+#include <sstream>
+#include <utility>
+#include "GaudiKernel/SystemOfUnits.h"
+
+//________________________________________________________________________________________________________
+CSCSegmValMonAlg::CSCSegmValMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
+ AthMonitorAlgorithm(name,pSvcLocator)
+ { }
+
+
+//________________________________________________________________________________________________________
+StatusCode CSCSegmValMonAlg::initialize() {
+
+ ATH_MSG_INFO( "in CSCSegmValMonAlg::init()" );
+ if( m_doEvtSel ) ATH_CHECK(m_trigDecTool.retrieve());
+
+ if(m_sampSelTriggers.empty() && m_doEvtSel) {
+ ATH_MSG_WARNING("Event selection triggers not specified. Switching off trigger-aware monitoring");
+ m_doEvtSel = false;
+ }
+
+ StoreGateSvc* detStore = nullptr;
+ ATH_CHECK(service("DetectorStore", detStore));
+ ATH_CHECK(m_edmHelperSvc.retrieve());
+ ATH_CHECK(m_idHelperSvc.retrieve());
+ ATH_CHECK(m_segmKey.initialize());
+
+ return AthMonitorAlgorithm::initialize();
+}
+
+//
+// fillHistograms-----------------------------------------------------------------------------------------
+//
+
+StatusCode CSCSegmValMonAlg::fillHistograms(const EventContext& ctx) const{
+
+ ATH_MSG_DEBUG( "in CSCSegmValMonAlg::fillHistograms() " );
+
+ if( m_environment == AthMonitorAlgorithm::Environment_t::tier0 || m_environment == AthMonitorAlgorithm::Environment_t::tier0ESD || m_environment == AthMonitorAlgorithm::Environment_t::user ) {
+
+ // if required, check if event passed sample-selection triggers
+ if(m_doEvtSel && !evtSelTriggersPassed()) return StatusCode::SUCCESS;
+
+ // Segment Cluster counter
+ int segmClustCount[33];
+
+ // arrays to hold cluster-count
+ // 32 chambers and 8 layers (each has one extra - index '0' is not counted)
+ int clusCount[33][9];
+ for(unsigned int kl = 0; kl < 33; kl++ ) {
+ for(unsigned int cm3 = 0; cm3 < 9; cm3++ ){
+ clusCount[kl][cm3] = 0;
+ }
+ }
+
+ SG::ReadHandle<Trk::SegmentCollection> segments(m_segmKey, ctx);
+
+ if ( segments->empty() ){
+ ATH_MSG_DEBUG( " Segm Collection is Empty, done... ");
+ return StatusCode::SUCCESS;
+ }
+
+ ATH_MSG_DEBUG( " Segm Collection size " );
+ ATH_MSG_DEBUG( "Number of segms found: " << segments->size() );
+
+ if(segments->size() > 0){
+ ATH_MSG_DEBUG( "Number of segms in event is: " << segments->size() );
+ ATH_MSG_DEBUG( "This algorithm is designed to operate for single segm / event only" );
+ ATH_MSG_DEBUG( "Processing only the first segm in the segm collection" );
+ }
+
+ int segnum = 0;
+ int layerindex = 0;
+
+ //Loop over segms
+ for (Trk::SegmentCollection::const_iterator s = segments->begin(); s != segments->end(); ++s) {
+
+ //Get segm
+ const Muon::MuonSegment *segm=dynamic_cast<const Muon::MuonSegment*>(*s);
+
+ if (!segm){
+ ATH_MSG_WARNING( "no pointer to segm!!!" );
+ continue;
+ }
+
+ ATH_MSG_DEBUG( "Looking at segment id" );
+ // Skip segment if there are no csc hits
+ if ( cscHits(segm)<1 ) continue;
+
+ // Get contained measurements
+ const std::vector<const Trk::MeasurementBase*> meas = segm->containedMeasurements();
+
+ // Skip segment if no measurements
+ // Number of clusters on segment
+ auto n_clust = Monitored::Scalar<int>("n_clust", meas.size());
+
+ if ( n_clust < 2 ) continue;
+
+ // Analyze segment if it is a csc segment
+ if ( isCscSegment(segm) ){
+
+ segnum++;
+
+ // Initialize cluster counter
+ for(int sect = 0; sect < 33; sect++) {
+ segmClustCount[sect] = 0;
+ for(unsigned int ilay = 0; ilay < 9; ilay++ ){
+ clusCount[sect][ilay] = 0;
+ }
+ }
+
+ // Print out segment information
+ const Trk::FitQuality* fq = segm->fitQuality();
+ double chi2 = 999.;
+ int ndof = -1;
+ if( fq ) {
+ chi2 = fq->chiSquared();
+ ndof = fq->numberDoF();
+ ATH_MSG_DEBUG( "Chi2 " << chi2 );
+ ATH_MSG_DEBUG( "Ndof " << ndof );
+ }
+
+ // cut on segment angle
+ float segm_ly = segm->localParameters()[Trk::locY];
+ float segm_ayz = segm->localDirection().angleYZ();
+ segm_ayz -= M_PI/2.;
+ float segm_cut = m_segmSlope;
+ bool segmAngle_cut = segmSlopeCut(segm_ly, segm_ayz, segm_cut);
+ ATH_MSG_DEBUG(" local_pos: " << segm_ly << "\tangle_yz: " << segm_ayz << "\tcut: " << segm_cut << "\t pass = " << segmAngle_cut );
+
+ ATH_MSG_DEBUG( "R " << segm->globalPosition().perp() );
+ ATH_MSG_DEBUG( "Z " << segm->globalPosition().z() );
+ ATH_MSG_DEBUG( "Phi " << segm->globalPosition().phi() );
+ ATH_MSG_DEBUG( "Eta " << segm->globalPosition().eta() );
+ ATH_MSG_DEBUG( "Dir Phi " << segm->globalDirection().phi() );
+ ATH_MSG_DEBUG( "Dir Eta " << segm->globalDirection().eta() );
+
+ // ==============================================================================
+ // Field Range Notes
+ // ==============================================================================
+ // StationName unsigned integer maps to "CSS", "CSL", etc.
+ // StationEta [-1,1] -1 for backward, 1 for forward endcap
+ // StationPhi [1,8] increases with Phi
+ // Technology [1] maps to "CSC"
+ // ChamberLayer [1,2] increases with |Z|
+ // WireLayer [1,4] increases with |Z|
+ // MeasuresPhi [0,1] 0 if measures R, 1 if measures Phi
+ // Strip [1,n] increases with R for MeasuresPhi=0
+ // increases with Phi for MeasuresPhi=1
+ // ==============================================================================
+
+ // identify the segment location
+ const Trk::MeasurementBase* rio = meas.at(0);
+ Identifier segmId = m_edmHelperSvc->getIdentifier(*rio);
+
+ int segm_stationPhi = m_idHelperSvc->cscIdHelper().stationPhi(segmId);
+ int segm_stationEta = m_idHelperSvc->cscIdHelper().stationEta(segmId);
+ int segm_stationName = m_idHelperSvc->cscIdHelper().stationName(segmId);
+ std::string segm_stationString = m_idHelperSvc->cscIdHelper().stationNameString(segm_stationName);
+ int segm_chamberType = Muon::MuonStationIndex::CSS == segm_stationName ? 0 : 1;
+ auto segm_sectorNo = Monitored::Scalar<int>("segm_sectorNo", (segm_stationEta * (2 * segm_stationPhi - segm_chamberType)) ); // [-16 -> -1] and [+1 -> +16]
+ int segm_isec = segm_sectorNo < 0 ? segm_sectorNo*(-1) : segm_sectorNo+16; // [-16 -> -1] shifted to [1 -> 16] and [+1 -> +16] shifted to [+17 -> +32]
+ ATH_MSG_DEBUG(" sgsec = " << segm_isec << "\tsec = " << segm_sectorNo);
+ auto sideA = Monitored::Scalar<int>("sideA", (int) (segm_stationEta==1));
+ auto sideC = Monitored::Scalar<int>("sideC",(int)(segm_stationEta==-1));
+ fill("CscSegmMonitor",n_clust,segm_sectorNo,sideA,sideC);
+
+ float clus_kiloele = 1.0e-3; // multiply # of electrons by this number to get kiloElectrons (1 ke = 1 ADC)
+ int eta_clus_count[2][2] = {{0, 0},{0, 0}}, phi_clus_count[2][2] = {{0, 0},{0, 0}}; // no. of prec/trans hits per segment
+ float eta_clus_qsum[2][5] = {{-1., -1.}, {-1., -1., -1., -1., -1.}}, phi_clus_qsum[2][5] = {{-1., -1.}, {-1., -1., -1., -1., -1.}}; // qsum over each prec/trans. layer on segment
+ float eta_clus_time[2][5] = {{-1., -1.}, {-1., -1., -1., -1., -1.}}, phi_clus_time[2][5] = {{-1., -1.}, {-1., -1., -1., -1., -1.}}; // time over each prec/trans. layer on segment
+ int eta_clus_use[2][5] = {{0, 0},{0,0,0,0,0}}, phi_clus_use[2][5] = {{0,0}, {0,0,0,0,0}};
+
+ layerindex = 0;
+
+ for( auto& hit : segm->containedMeasurements()) {
+ const Muon::CscClusterOnTrack* clust_rot = dynamic_cast<const Muon::CscClusterOnTrack*>(hit);
+ if ( clust_rot ) {
+ Identifier clusId = m_edmHelperSvc->getIdentifier(*clust_rot);
+
+ // get the cluster coordinates
+ int clus_stationName = m_idHelperSvc->cscIdHelper().stationName(clusId);
+ int clus_chamberType = Muon::MuonStationIndex::CSS == clus_stationName ? 0 : 1;
+ int clus_stationEta = m_idHelperSvc->cscIdHelper().stationEta(clusId);
+ int clus_stationPhi = m_idHelperSvc->cscIdHelper().stationPhi(clusId);
+ int clus_wireLayer = m_idHelperSvc->cscIdHelper().wireLayer(clusId);
+ int clus_measuresPhi = m_idHelperSvc->cscIdHelper().measuresPhi(clusId);
+
+ // convert to my coordinates
+ int clus_sectorNo = clus_stationEta * (2 * clus_stationPhi - clus_chamberType); // [-16 -> -1] and [+1 -> +16]
+ auto clus_secLayer = Monitored::Scalar<float>("clus_secLayer", clus_sectorNo + 0.2 * (clus_wireLayer - 1) + 0.1);
+ int clus_isec = clus_sectorNo < 0 ? clus_sectorNo*(-1) : clus_sectorNo+16; // [-16 -> -1] shifted to [1 -> 16] and [+1 -> +16] shifted to [+17 -> +32]
+ int clus_ilay = (clus_measuresPhi ? clus_wireLayer : clus_wireLayer+4);
+
+ // check the cluster status; probably need to read status info from jobOptions - not done for the moment
+ Muon::CscClusterStatus status = clust_rot->status();
+ auto status_mon = Monitored::Scalar<int>("status_mon",(int)clust_rot->status());
+ auto sideA_phi0 = Monitored::Scalar<int>("sideA_phi0",(int) (segm_stationEta==1)&& (int)(clus_measuresPhi==0));
+ auto sideC_phi0 = Monitored::Scalar<int>("sideC_phi0",(int) (segm_stationEta==-1) && (int)(clus_measuresPhi == 0));
+ auto sideA_phi = Monitored::Scalar<int>("sideA_phi", (int) (segm_stationEta==1) && (int)(clus_measuresPhi!=0));
+ auto sideC_phi = Monitored::Scalar<int>("sideC_phi", (int) (segm_stationEta==-1) && (int)(clus_measuresPhi!=0));
+
+ fill("CscSegmMonitor",status_mon, sideA_phi0, sideC_phi0, sideA_phi, sideC_phi);
+
+ std::string clus_stat = Muon::toString(status);
+ bool clus_status = ( (int(status)==Muon::CscStatusUnspoiled) || (int(status)==Muon::CscStatusSplitUnspoiled) || (int(status)==Muon::CscStatusSimple)) ? true : false;
+ bool clus_stat_eff = ( (int(status) >= 0 && int(status) < 8 ) || (int(status) > 8 && int(status) < 18) ) ? true : false;
+
+ // get cluster
+ const Muon::CscPrepData* theClus = clust_rot->prepRawData();
+ float clus_qsum = 0, clus_time = -1.;
+
+ if(theClus){
+ clus_qsum = theClus->charge() * clus_kiloele;
+ clus_time = theClus->time();
+
+ if(clus_measuresPhi == 0){
+ if(clus_stationEta == 1) eta_clus_count[0][0]++;
+ else eta_clus_count[1][0]++;
+ } else{
+ if(clus_stationEta == 1) phi_clus_count[0][0]++;
+ else phi_clus_count[1][0]++;
+ }
+ }
+
+ auto clus_qsum_mon = Monitored::Scalar<float>("clus_qsum_mon",clus_qsum);
+ auto clus_time_mon = Monitored::Scalar<float>("clus_time_mon",clus_time);
+
+ // get no. of strips per cluster
+ unsigned int clus_noStrips = theClus->rdoList().size();
+
+ //need at least three strips in an eta-cluster
+ bool clus_eta_status = clus_status && ( clus_noStrips > 2 ) && (clus_measuresPhi == 0);
+ bool clus_eta_eff = clus_stat_eff && ( clus_noStrips > 2 ) && (clus_measuresPhi == 0);
+ if(clus_eta_eff){
+ if(clus_stationEta == 1) eta_clus_count[0][1]++;
+ else phi_clus_count[1][1]++;
+ }
+ if(clus_eta_status){
+ if(clus_stationEta == 1){
+ eta_clus_qsum[0][clus_wireLayer] = clus_qsum;
+ eta_clus_time[0][clus_wireLayer] = clus_time;
+ eta_clus_use[0][clus_wireLayer] = 1;
+ }
+ else{
+ eta_clus_qsum[1][clus_wireLayer] = clus_qsum;
+ eta_clus_time[1][clus_wireLayer] = clus_time;
+ eta_clus_use[1][clus_wireLayer] = 1;
+ }
+ }
+
+ // need at least one strip in a phi-cluster
+ bool clus_phi_status = clus_status && ( clus_noStrips > 0 ) && (clus_measuresPhi == 1);
+ if(clus_phi_status) {
+ if(clus_stationEta==1){
+ phi_clus_qsum[0][clus_wireLayer] = clus_qsum;
+ phi_clus_time[0][clus_wireLayer] = clus_time;
+ phi_clus_use[0][clus_wireLayer] = 1;
+ phi_clus_count[0][1]++;
+ } else {
+ phi_clus_qsum[1][clus_wireLayer] = clus_qsum;
+ phi_clus_time[1][clus_wireLayer] = clus_time;
+ phi_clus_use[1][clus_wireLayer] = 1;
+ phi_clus_count[1][1]++;
+ }
+ }
+
+
+ auto checkStatusEtaA = Monitored::Scalar<int>("checkStatusEtaA", (int)clus_eta_status && (int)(clus_stationEta==1));
+ auto checkStatusEtaC = Monitored::Scalar<int>("checkStatusEtaC", (int)clus_eta_status && (int)(clus_stationEta==-1));
+ auto checkTimeEtaA = Monitored::Scalar<int>("checkTimeEtaA", (int)clus_eta_status && (int)(clus_stationEta==1) && (int) (std::abs(clus_time) <= 200));
+ auto checkTimeEtaC = Monitored::Scalar<int>("checkTimeEtaC", (int)clus_eta_status && (int)(clus_stationEta==-1) && (int) (std::abs(clus_time) <= 200));
+
+ auto checkStatusPhiA = Monitored::Scalar<int>("checkStatusPhiA", (int)clus_phi_status && (int)(clus_stationEta==1));
+ auto checkStatusPhiC = Monitored::Scalar<int>("checkStatusPhiC", (int)clus_phi_status && (int)(clus_stationEta==-1));
+ auto checkTimePhiA = Monitored::Scalar<int>("checkTimePhiA", (int)clus_phi_status && (int)(clus_stationEta==1) && (int) (std::abs(clus_time) <= 200));
+ auto checkTimePhiC = Monitored::Scalar<int>("checkTimePhiC", (int)clus_phi_status && (int)(clus_stationEta==-1) && (int) (std::abs(clus_time) <= 200));
+ fill("CscSegmMonitor", clus_qsum_mon, clus_secLayer, clus_time_mon, checkStatusEtaA, checkStatusEtaC, checkTimeEtaA, checkTimeEtaC, checkStatusPhiA, checkStatusPhiC, checkTimePhiA, checkTimePhiC );
+
+ // increment the cluster-count for this layer
+ if(clus_eta_status || clus_phi_status) clusCount[clus_isec][clus_ilay]++;
+
+ // increment segment cluster count
+ if(clus_eta_status) segmClustCount[clus_isec]++;
+
+ if(clus_eta_status) layerindex+=clus_wireLayer;
+
+ ATH_MSG_DEBUG("status = " << clus_stat << "\tcharge = " << clus_qsum << "\ttime= " << clus_time << "\tnstrips = " << clus_noStrips);
+
+
+ } // if clust_rot
+
+ } // for loop over clusters
+
+ auto tmp_etaClusA = Monitored::Scalar<int>("tmp_etaClusA", eta_clus_count[0][0]);
+ auto tmp_etaClusGoodA = Monitored::Scalar<int>("tmp_etaClusGoodA", eta_clus_count[0][1]);
+
+ auto tmp_phiClusA = Monitored::Scalar<int>("tmp_phiClusA", phi_clus_count[0][0]);
+ auto tmp_phiClusGoodA = Monitored::Scalar<int>("tmp_phiClusGoodA", phi_clus_count[0][1]);
+
+ auto checkClusEtaA = Monitored::Scalar<int>("checkClusEtaA", (int)eta_clus_count[0][0] > 0);
+ auto checkClusEtaGoodA = Monitored::Scalar<int>("checkClusEtaGoodA", (int)eta_clus_count[0][1] > 0);
+
+ auto checkClusPhiA = Monitored::Scalar<int>("checkClusPhiA", (int)phi_clus_count[0][0] > 0);
+ auto checkClusPhiGoodA = Monitored::Scalar<int>("checkClusPhiGoodA", (int)phi_clus_count[0][1] > 0);
+
+ auto tmp_etaClusC = Monitored::Scalar<int>("tmp_etaClusC", eta_clus_count[1][0]);
+ auto tmp_etaClusGoodC = Monitored::Scalar<int>("tmp_etaClusGoodC", eta_clus_count[1][1]);
+
+ auto tmp_phiClusC = Monitored::Scalar<int>("tmp_phiClusC", phi_clus_count[1][0]);
+ auto tmp_phiClusGoodC = Monitored::Scalar<int>("tmp_phiClusGoodC", phi_clus_count[1][1]);
+
+ auto checkClusEtaC = Monitored::Scalar<int>("checkClusEtaC", (int)eta_clus_count[1][0] > 0);
+ auto checkClusEtaGoodC = Monitored::Scalar<int>("checkClusEtaGoodC", (int)eta_clus_count[1][1] > 0);
+
+ auto checkClusPhiC = Monitored::Scalar<int>("checkClusPhiC", (int)phi_clus_count[1][0] > 0);
+ auto checkClusPhiGoodC = Monitored::Scalar<int>("checkClusPhiGoodC", (int)phi_clus_count[1][1] > 0);
+
+ fill("CscSegmMonitor", tmp_etaClusA, checkClusEtaA, tmp_etaClusGoodA, checkClusEtaGoodA, tmp_phiClusA, tmp_phiClusGoodA, checkClusPhiA, checkClusPhiGoodA, tmp_etaClusC, checkClusEtaC, tmp_etaClusGoodC, checkClusEtaGoodC, tmp_phiClusC, tmp_phiClusGoodC, checkClusPhiC, checkClusPhiGoodC);
+
+ // Fill number of 3 and 4 cluster segment histogram
+ std::vector<int> tmp_layerIndexA;
+ std::vector<int> tmp_isectA;
+ std::vector<int> tmp_layerIndexC;
+ std::vector<int> tmp_isectC;
+
+ for( int isect = 1; isect < 17; isect++) {
+
+ if(segmClustCount[isect+16] > 2 ) {
+ tmp_layerIndexA.push_back(layerindex-5);
+ tmp_isectA.push_back(isect);
+ }
+
+ if(segmClustCount[isect+16] > 3){
+ for(int i=1; i<=4; i++) {
+ tmp_layerIndexA.push_back(i);
+ tmp_isectA.push_back(isect);
+ }
+ }
+
+ if(segmClustCount[isect] > 2) {
+ tmp_layerIndexC.push_back(layerindex-5);
+ tmp_isectC.push_back(-1.*isect);
+ }
+
+
+ if(segmClustCount[isect] > 3) {
+ for(int i=1; i<=4; i++) {
+ tmp_layerIndexC.push_back(i);
+ tmp_isectC.push_back(-1.*isect);
+ }
+ }
+ }
+
+ auto tmp_layerIndexA_mon = Monitored::Collection("tmp_layerIndexA_mon", tmp_layerIndexA);
+ auto tmp_isectA_mon = Monitored::Collection("tmp_isectA_mon", tmp_isectA);
+ auto tmp_layerIndexC_mon = Monitored::Collection("tmp_layerIndexC_mon", tmp_layerIndexA);
+ auto tmp_isectC_mon = Monitored::Collection("tmp_isectC_mon", tmp_isectA);
+ fill("CscSegmMonitor", tmp_layerIndexA_mon, tmp_isectA_mon, tmp_layerIndexC_mon, tmp_isectC_mon);
+
+ float eta_clus_qsum_tot = 0., phi_clus_qsum_tot = 0.; // total qsum over all prec. trans. layers on segment
+
+ for(unsigned int i=0; i < 2; i++){
+ eta_clus_qsum_tot = 0; phi_clus_qsum_tot = 0.;
+
+ for(unsigned int j = 1; j <5; j++) {
+ if(i==0){
+ auto etaClusQSumA = Monitored::Scalar<float>("etaClusQSumA", eta_clus_qsum[i][j]);
+ auto phiClusQSumA = Monitored::Scalar<float>("phiClusQSumA", phi_clus_qsum[i][j]);
+ fill("CscSegmMonitor", etaClusQSumA, phiClusQSumA);
+
+ if(std::abs(eta_clus_time[i][j]) <= 200) {
+ auto etaTimeClusA = Monitored::Scalar<float>("etaTimeClusA",eta_clus_time[i][j]);
+ fill("CscSegmMonitor", etaTimeClusA);
+ }
+
+ if(std::abs(phi_clus_time[i][j]) <= 200) {
+ auto phiTimeClusA = Monitored::Scalar<float>("phiTimeClusA",phi_clus_time[i][j]);
+ fill("CscSegmMonitor", phiTimeClusA);
+ }
+ }
+
+ if(i==1){
+ auto etaClusQSumC = Monitored::Scalar<float>("etaClusQSumC", eta_clus_qsum[i][j]);
+ auto phiClusQSumC = Monitored::Scalar<float>("phiClusQSumC", phi_clus_qsum[i][j]);
+ fill("CscSegmMonitor", etaClusQSumC, phiClusQSumC);
+
+ if(std::abs(eta_clus_time[i][j]) <= 200) {
+ auto etaTimeClusC = Monitored::Scalar<float>("etaTimeClusC",eta_clus_time[i][j]);
+ fill("CscSegmMonitor", etaTimeClusC);
+ }
+
+ if(std::abs(phi_clus_time[i][j]) <= 200) {
+ auto phiTimeClusC = Monitored::Scalar<float>("phiTimeClusC",phi_clus_time[i][j]);
+ fill("CscSegmMonitor", phiTimeClusC);
+ }
+ }
+
+
+ if(phi_clus_use[i][j] && eta_clus_use[i][j]){
+ eta_clus_qsum_tot += eta_clus_qsum[i][j];
+ phi_clus_qsum_tot += phi_clus_qsum[i][j];
+
+ if(i==0){
+ auto etaQSumGoodClusA = Monitored::Scalar<float>("etaQSumGoodClusA",eta_clus_qsum[i][j]);
+ auto phiQSumGoodClusA = Monitored::Scalar<float>("phiQSumGoodClusA",phi_clus_qsum[i][j]);
+ fill("CscSegmMonitor", etaQSumGoodClusA, phiQSumGoodClusA);
+ if(std::abs(eta_clus_time[i][j]) <= 200){
+ auto etaTimeGoodClusA = Monitored::Scalar<float>("etaTimeGoodClusA",eta_clus_time[i][j]);
+ fill("CscSegmMonitor", etaTimeGoodClusA);
+ }
+
+ if(std::abs(phi_clus_time[i][j]) <= 200) {
+ auto phiTimeGoodClusA = Monitored::Scalar<float>("phiTimeGoodClusA",phi_clus_time[i][j]);
+ fill("CscSegmMonitor", phiTimeGoodClusA);
+ }
+ }
+
+ if(i==1){
+ auto etaQSumGoodClusC = Monitored::Scalar<float>("etaQSumGoodClusC",eta_clus_qsum[i][j]);
+ auto phiQSumGoodClusC = Monitored::Scalar<float>("phiQSumGoodClusC",phi_clus_qsum[i][j]);
+ fill("CscSegmMonitor", etaQSumGoodClusC, phiQSumGoodClusC);
+ if(std::abs(eta_clus_time[i][j]) <= 200){
+ auto etaTimeGoodClusC = Monitored::Scalar<float>("etaTimeGoodClusC",eta_clus_time[i][j]);
+ fill("CscSegmMonitor", etaTimeGoodClusC);
+ }
+
+ if(std::abs(phi_clus_time[i][j]) <= 200) {
+ auto phiTimeGoodClusC = Monitored::Scalar<float>("phiTimeGoodClusC",phi_clus_time[i][j]);
+ fill("CscSegmMonitor", phiTimeGoodClusC);
+ }
+ }
+ }
+ }
+
+ if(i==0) {
+ auto etaQSumTot0 = Monitored::Scalar<float>("etaQSumTot0", eta_clus_qsum_tot);
+ auto phiQSumTot0 = Monitored::Scalar<float>("phiQSumTot0", phi_clus_qsum_tot);
+ fill("CscSegmMonitor", etaQSumTot0, phiQSumTot0);
+ }
+
+ if(i==1) {
+ auto etaQSumTot = Monitored::Scalar<float>("etaQSumTot", eta_clus_qsum_tot);
+ auto phiQSumTot = Monitored::Scalar<float>("phiQSumTot", phi_clus_qsum_tot);
+ fill("CscSegmMonitor", etaQSumTot, phiQSumTot);
+ }
+ }
+ } // if is csc segment
+ } // loop over segms
+ } // environment if
+
+ return StatusCode::SUCCESS;
+}
+
+//________________________________________________________________________________________________________
+bool CSCSegmValMonAlg::evtSelTriggersPassed() const {
+
+ if(!m_doEvtSel) return true;
+
+ for (const auto& trig : m_sampSelTriggers) {
+ if(m_trigDecTool->isPassed(trig, TrigDefs::eventAccepted)) {
+ return true;
+ }
+ }
+ return false;
+
+} // end evtSelTriggersPassed
+
+//________________________________________________________________________________________________________
+bool CSCSegmValMonAlg::isCscSegment( const Muon::MuonSegment* seg ) const {
+ bool isCsc(false);
+
+ std::vector<const Trk::MeasurementBase*> mbs = seg->containedMeasurements();
+ for( unsigned int i = 0; i< mbs.size(); ++i){
+
+ const Trk::RIO_OnTrack* rot = dynamic_cast<const Trk::RIO_OnTrack*> (mbs[i]);
+ if (!rot){
+ const Trk::CompetingRIOsOnTrack* crot = dynamic_cast<const Trk::CompetingRIOsOnTrack*> (mbs[i]);
+ if (crot) rot = &(crot->rioOnTrack(0));
+ }
+ if( !rot ) {
+ continue;
+ }
+ if( m_idHelperSvc->isCsc( rot->identify() ) ) isCsc=true;
+ }
+
+ return isCsc;
+}
+
+
+//________________________________________________________________________________________________________
+unsigned int CSCSegmValMonAlg::cscHits( const Muon::MuonSegment* seg ) const {
+ unsigned int nrHits(0);
+
+ std::vector<const Trk::MeasurementBase*> mbs = seg->containedMeasurements();
+ for( unsigned int i = 0; i< mbs.size(); ++i){
+
+ const Trk::RIO_OnTrack* rot = dynamic_cast<const Trk::RIO_OnTrack*> (mbs[i]);
+ if (!rot){
+ const Trk::CompetingRIOsOnTrack* crot = dynamic_cast<const Trk::CompetingRIOsOnTrack*> (mbs[i]);
+ if (crot) rot = &(crot->rioOnTrack(0));
+ }
+ if( !rot ) {
+ continue;
+ }
+ if( m_idHelperSvc->isCsc( rot->identify() ) ) ++nrHits;
+ }
+
+ return nrHits ;
+}
+
+//________________________________________________________________________________________________________
+bool CSCSegmValMonAlg::segmSlopeCut(const float csc_x, const float csc_ax, const float cut ) const {
+ float s0 = csc_x;
+ float s1 = -std::tan(csc_ax);
+ float s1corr = s1 - 0.000119 * s0;
+ bool good_segm = std::abs(s1corr)<cut ? true : false;
+ return good_segm;
+}
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscClusterValMonAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscClusterValMonAlg.cxx
index 3b42684744905c9069431393deb2e176ebc5f097..77279b9049eff51ff7a576031b7bfcc012a66823 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscClusterValMonAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscClusterValMonAlg.cxx
@@ -2,16 +2,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-/* NAME : CscClusterValMonAlg.cxx
- * PACKAGE : MuonRawDataMonitoring/CscRawDataMonitoring
- * PURPOSE : CSC cluster monitoring
- * AUTHOR : Venkatesh Kaushik <venkat.kaushik@cern.ch> (2009-04-27)
- *
- * MODIFIED: C.Paraskevopoulos, C.Kitsaki
- */
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-
#include "AthenaMonitoring/AthenaMonManager.h"
// Athena include(s)
@@ -27,13 +17,7 @@ using namespace Muon;
CscClusterValMonAlg::CscClusterValMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
AthMonitorAlgorithm(name,pSvcLocator)
- {
- declareProperty("CSCQmaxCutADC", m_qmaxADCCut = 100);
-
- //trigger aware monitoring
- declareProperty("CSCDoEventSelection", m_doEvtSel = false );
- declareProperty("CSCEventSelTriggers", m_sampSelTriggers );
- }
+ { }
StatusCode CscClusterValMonAlg::initialize() {
@@ -63,18 +47,7 @@ StatusCode CscClusterValMonAlg::fillHistograms( const EventContext& ctx ) const
StatusCode sc = StatusCode::SUCCESS;
// check if event passed sample-selection triggers
- //if(m_doEvtSel) { if(!evtSelTriggersPassed()) return sc; }
-
- bool check = false;
-
- if(!m_doEvtSel) check = true;
- std::vector<std::string>::const_iterator
- it = m_sampSelTriggers.begin(), itE = m_sampSelTriggers.end();
- for ( ; it != itE; it++ ) {
- if (m_trigDecTool->isPassed(*it, TrigDefs::eventAccepted)) check = true;
- }
-
- if(m_doEvtSel) { if(!check) return sc; }
+ if(m_doEvtSel) { if(!evtSelTriggersPassed()) return sc; }
// retrieve cluster / strip collection
SG::ReadHandle<CscPrepDataContainer> cscCluster(m_cscClusterKey, ctx);
@@ -453,3 +426,20 @@ StatusCode CscClusterValMonAlg::fillHistograms( const EventContext& ctx ) const
return sc;
}
+
+//
+// evtSelTriggersPassed ----------------------------------------------------------------
+//
+bool CscClusterValMonAlg::evtSelTriggersPassed() const {
+
+ if(!m_doEvtSel) return true;
+
+ for(const auto& trig : m_sampSelTriggers) {
+ if(m_trigDecTool->isPassed(trig,TrigDefs::eventAccepted)){
+ return true;
+ }
+ }
+ return false;
+
+} // end evtSelTriggersPassed
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscPrdValMonAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscPrdValMonAlg.cxx
index 30e457638e64aef8de7d4cb380b4e7fb561c9f75..923d7dbf8426567124d3a3b0ac434ffbcb546d4a 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscPrdValMonAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/CscPrdValMonAlg.cxx
@@ -2,20 +2,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-/* NAME : CscPrdValMonAlg.cxx
- * PACKAGE : MuonRawDataMonitoring/CscRawDataMonitoring
- * PURPOSE : CSC PrepRawData (PRD) monitoring
- * AUTHOR : Ken Johns, Xiaowen Lei (U.Arizona)
- *
- * MODIFIED: N. Benekos(Illinois)
- * V. Kaushik(U.Arizona) : 2009-05-12
- * J. Veatch(U.Arizona) : 2012-02-08
-
- * MODIFIED: C.Kitsaki, C.Paraskevopoulos
- */
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-
#include "AthenaMonitoring/AthenaMonManager.h"
// Athena include(s)
@@ -26,13 +12,9 @@
using namespace Muon;
CscPrdValMonAlg::CscPrdValMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
- AthMonitorAlgorithm(name,pSvcLocator)
- {
- declareProperty("NoiseCutADC", m_cscNoiseCut = 50);
- declareProperty("MapYXandRZ", m_mapxyrz = false);
- }
-
-
+ AthMonitorAlgorithm(name,pSvcLocator)
+ { }
+
StatusCode CscPrdValMonAlg::initialize() {
ATH_MSG_INFO( "CscPrdValMonAlg: in initialize" );
ATH_CHECK(m_idHelperSvc.retrieve());
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx
index 366e04e5294f89848259ffa628e11ff9758d25f0..4b633badcd78eb502821939ea45a0d2f26dd2cbb 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx
@@ -4,6 +4,7 @@
#include "CscRawDataMonitoring/CSCSegmValAlg.h"
#include "CscRawDataMonitoring/CscClusterValMonAlg.h"
#include "CscRawDataMonitoring/CscPrdValMonAlg.h"
+#include "CscRawDataMonitoring/CSCSegmValMonAlg.h"
DECLARE_COMPONENT( CscRdoValAlg )
@@ -12,4 +13,4 @@ DECLARE_COMPONENT( CscClusterValAlg )
DECLARE_COMPONENT( CSCSegmValAlg )
DECLARE_COMPONENT( CscClusterValMonAlg )
DECLARE_COMPONENT( CscPrdValMonAlg )
-
+DECLARE_COMPONENT( CSCSegmValMonAlg )
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/python/MMMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/python/MMMonitorAlgorithm.py
index b85f5ff7b97427ee777e00898e583f671b0a63fc..3d2c55248381762098ccdf57e0893a36f1cb02b4 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/python/MMMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/python/MMMonitorAlgorithm.py
@@ -4,7 +4,7 @@
#
from AthenaConfiguration.ComponentFactory import CompFactory
-from MMMonUtils import getMMLabel,getMMLabelY
+from .MMMonUtils import getMMLabel,getMMLabelY
def MMMonitoringConfig(inputFlags):
'''Function to configures some algorithms in the monitoring system.'''
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
index da1a66572d62e3f8ba36b8a0ae3dd8240e57f933..25a11b32020662d7f42680ab56cc24d4b85e8660 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
@@ -48,7 +48,9 @@ def MdtMonitoringConfig(inputFlags):
mdtMonAlg.do_mdtChamberHits=True
mdtMonAlg.do_mdttdccut_sector=True
mdtMonAlg.do_mdtchamberstatphislice=True
- # Add a gezneric monitoring tool (a "group" in old language). The returned
+ if not inputFlags.DQ.triggerDataAvailable:
+ mdtMonAlg.L1RoiKey=''
+ # Add a generic monitoring tool (a "group" in old language). The returned
# object here is the standard GenericMonitoringTool.
mdtGroup = helper.addGroup(mdtMonAlg,'MdtMonitor','Muon/MuonRawDataMonitoring/MDT/')
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx
index 173475953f63fd5f9688fd0ede093a6b53731e84..9d0df654342e6b918637829f99048b778174608b 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/MdtRawDataMonAlg.cxx
@@ -197,7 +197,7 @@ StatusCode MdtRawDataMonAlg::initialize()
else m_masked_tubes = new MDTNoisyTubes(false);
mdtchamberId();
- ATH_CHECK(m_l1RoiKey.initialize());
+ ATH_CHECK(m_l1RoiKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_muonKey.initialize());
ATH_CHECK(m_segm_type.initialize());
ATH_CHECK(m_key_mdt.initialize());
@@ -302,7 +302,7 @@ StatusCode MdtRawDataMonAlg::fillHistograms(const EventContext& ctx) const
// Retrieve the LVL1 Muon RoIs:
bool trig_BARREL = false;
bool trig_ENDCAP = false;
- try{
+ if (!m_l1RoiKey.empty()) {
SG::ReadHandle<xAOD::MuonRoIContainer> muonRoIs(m_l1RoiKey, ctx);
if(!muonRoIs.isValid()){
ATH_MSG_ERROR("evtStore() does not contain muon L1 ROI Collection with name "<< m_l1RoiKey);
@@ -315,8 +315,6 @@ StatusCode MdtRawDataMonAlg::fillHistograms(const EventContext& ctx) const
trig_ENDCAP = std::any_of(muonRoIs->begin(), muonRoIs->end(),
[](const auto& i){return i->getSource() == xAOD::MuonRoI::RoISource::Endcap;});
}
- } catch (SG::ExcNoAuxStore & excpt){
- ATH_MSG_INFO("SG::ExcNoAuxStore caught, "<<m_l1RoiKey.key()<<" not available.");
}
//declare MDT stuff
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
index b2935e9946d25ad5359b5bbf9fe38fd7718dc3bb..5405b9a27267c91c904df15161b3c78229a16715 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
@@ -19,6 +19,8 @@ def RpcMonitoringConfig(inputFlags):
rpcMonitorAlg.MinRoIDR = 0.3
rpcMonitorAlg.MinPt = 2000
rpcMonitorAlg.MuQuality = 1
+ if not inputFlags.DQ.triggerDataAvailable:
+ rpcMonitorAlg.L1RoiContainerKey = ''
myGroup = helper.addGroup(rpcMonitorAlg, 'RPCMonitorAlgorithm', 'Muon/MuonRawDataMonitoring/RPC/')
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCMonitorAlgorithm.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCMonitorAlgorithm.cxx
index a650050ed2f64d37bcc7da73aad8bdec76e92464..82411ee1d15eea6957b800d91b0f363ad9f95a26 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCMonitorAlgorithm.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCMonitorAlgorithm.cxx
@@ -24,7 +24,7 @@ StatusCode RPCMonitorAlgorithm::initialize()
{
ATH_CHECK( m_MuonContainerKey .initialize());
ATH_CHECK( m_rpcPadContainerKey.initialize());
- ATH_CHECK( m_l1RoiContainerKey .initialize());
+ ATH_CHECK( m_l1RoiContainerKey .initialize(SG::AllowEmpty));
ATH_CHECK( m_muonSelectionTool.retrieve());
@@ -74,29 +74,31 @@ StatusCode RPCMonitorAlgorithm::fillHistograms(const EventContext& ctx) const
//
// read rois
//
- SG::ReadHandle<xAOD::MuonRoIContainer> muonRoIs(m_l1RoiContainerKey, ctx);
- if(!muonRoIs.isValid()){
- ATH_MSG_ERROR("evtStore() does not contain muon L1 ROI Collection with name "<< m_l1RoiContainerKey);
- return StatusCode::FAILURE;
- }
-
std::vector<const xAOD::MuonRoI*> roisBarrel;
std::vector<const xAOD::MuonRoI*> roisBarrelThr1;
- for(const auto& roi : *muonRoIs) {
- roiEtaVec.push_back(roi->eta());
- if(roi->getSource() != xAOD::MuonRoI::RoISource::Barrel) {
- continue;
+ if (! m_l1RoiContainerKey.empty()) {
+ SG::ReadHandle<xAOD::MuonRoIContainer> muonRoIs(m_l1RoiContainerKey, ctx);
+ if(!muonRoIs.isValid()){
+ ATH_MSG_ERROR("evtStore() does not contain muon L1 ROI Collection with name "<< m_l1RoiContainerKey);
+ return StatusCode::FAILURE;
}
- roiBarrelEtaVec.push_back(roi->eta());
- roiBarrelThrVec.push_back(roi->getThrNumber());
- roisBarrel.push_back(roi);
- //
- // collect roi according to the threshold
- //
- int thr = roi->getThrNumber();
- if(thr >= 1) roisBarrelThr1.push_back(roi);
+ for(const auto& roi : *muonRoIs) {
+ roiEtaVec.push_back(roi->eta());
+ if(roi->getSource() != xAOD::MuonRoI::RoISource::Barrel) {
+ continue;
+ }
+
+ roiBarrelEtaVec.push_back(roi->eta());
+ roiBarrelThrVec.push_back(roi->getThrNumber());
+ roisBarrel.push_back(roi);
+ //
+ // collect roi according to the threshold
+ //
+ int thr = roi->getThrNumber();
+ if(thr >= 1) roisBarrelThr1.push_back(roi);
+ }
}
auto roiEtaCollection = Collection("roiEtaCollection", roiEtaVec);
auto roiBarrelEtaCollection = Collection("roiBarrelEtaCollection", roiBarrelEtaVec);
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
index 3de766bd0c5963020501d85e7769cb5298d309f3..f1aca9130cdf715edb83d9e0d5e41d59ec79ded9 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
@@ -26,6 +26,9 @@ def TgcRawDataMonitoringConfig(inputFlags):
tgcRawDataMonAlg.TagTrigList += ',HLT_mu6_L1MU6'
tgcRawDataMonAlg.TagTrigList += ',HLT_mu20_mu8noL1;HLT_mu20'
+ if not inputFlags.DQ.triggerDataAvailable:
+ tgcRawDataMonAlg.MuonRoIContainerName = ''
+
if 'HLT_xAOD__MuonContainer_MuonEFInfo' in inputFlags.Input.Collections:
tgcRawDataMonAlg.MuonEFContainerName='HLT_xAOD__MuonContainer_MuonEFInfo'
if 'TGC_MeasurementsAllBCs' in inputFlags.Input.Collections:
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx
index 2d0e7fbbfc142ed0c56e0940d695be21071ec1fc..5c60f071005e44865e473cb7757dd35b484f888c 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx
@@ -16,7 +16,7 @@ StatusCode TgcRawDataMonitorAlgorithm::initialize() {
ATH_CHECK(m_idHelperSvc.retrieve());
ATH_CHECK(m_extrapolator.retrieve());
ATH_CHECK(m_MuonContainerKey.initialize());
- ATH_CHECK(m_MuonRoIContainerKey.initialize());
+ ATH_CHECK(m_MuonRoIContainerKey.initialize(SG::AllowEmpty));
ATH_CHECK(m_TgcPrepDataContainerKey.initialize());
ATH_CHECK(m_TgcCoinDataContainerCurrBCKey.initialize());
ATH_CHECK(m_TgcCoinDataContainerNextBCKey.initialize());
@@ -70,47 +70,52 @@ StatusCode TgcRawDataMonitorAlgorithm::fillHistograms( const EventContext& ctx )
variables.clear();
return StatusCode::SUCCESS;
}
- /* raw LVL1MuonRoIs distributions */
- SG::ReadHandle<xAOD::MuonRoIContainer> rois(m_MuonRoIContainerKey, ctx);
- if(!rois.isValid()){
- ATH_MSG_ERROR("evtStore() does not contain muon RoI Collection with name "<< m_MuonRoIContainerKey);
- return StatusCode::FAILURE;
+
+ xAOD::MuonRoIContainer rois;
+ if (!m_MuonRoIContainerKey.empty()) {
+ /* raw LVL1MuonRoIs distributions */
+ auto roisptr = SG::get<xAOD::MuonRoIContainer>(m_MuonRoIContainerKey, ctx);
+ if(! roisptr){
+ ATH_MSG_ERROR("evtStore() does not contain muon RoI Collection with name "<< m_MuonRoIContainerKey);
+ return StatusCode::FAILURE;
+ }
+ rois = *roisptr;
}
- auto roi_eta = Monitored::Collection("roi_eta",*rois, []( const xAOD::MuonRoI* m ){return m->eta();}); variables.push_back( roi_eta );
- auto roi_phi = Monitored::Collection("roi_phi",*rois, []( const xAOD::MuonRoI* m ){return m->phi();}); variables.push_back( roi_phi );
- auto roi_phi_rpc = Monitored::Collection("roi_phi_rpc",*rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Barrel)?m->phi():-10;}); variables.push_back( roi_phi_rpc );
- auto roi_phi_tgc = Monitored::Collection("roi_phi_tgc",*rois, []( const xAOD::MuonRoI* m ){return (m->getSource()!=xAOD::MuonRoI::Barrel)?m->phi():-10;}); variables.push_back( roi_phi_tgc );
- auto roi_thr = Monitored::Collection("roi_thr",*rois, []( const xAOD::MuonRoI* m ){return m->getThrNumber();}); variables.push_back( roi_thr );
- auto roi_rpc = Monitored::Collection("roi_rpc",*rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Barrel;}); variables.push_back( roi_rpc );
- auto roi_tgc = Monitored::Collection("roi_tgc",*rois, []( const xAOD::MuonRoI* m ){return m->getSource()!=xAOD::MuonRoI::Barrel;}); variables.push_back( roi_tgc );
+ auto roi_eta = Monitored::Collection("roi_eta",rois, []( const xAOD::MuonRoI* m ){return m->eta();}); variables.push_back( roi_eta );
+ auto roi_phi = Monitored::Collection("roi_phi",rois, []( const xAOD::MuonRoI* m ){return m->phi();}); variables.push_back( roi_phi );
+ auto roi_phi_rpc = Monitored::Collection("roi_phi_rpc",rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Barrel)?m->phi():-10;}); variables.push_back( roi_phi_rpc );
+ auto roi_phi_tgc = Monitored::Collection("roi_phi_tgc",rois, []( const xAOD::MuonRoI* m ){return (m->getSource()!=xAOD::MuonRoI::Barrel)?m->phi():-10;}); variables.push_back( roi_phi_tgc );
+ auto roi_thr = Monitored::Collection("roi_thr",rois, []( const xAOD::MuonRoI* m ){return m->getThrNumber();}); variables.push_back( roi_thr );
+ auto roi_rpc = Monitored::Collection("roi_rpc",rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Barrel;}); variables.push_back( roi_rpc );
+ auto roi_tgc = Monitored::Collection("roi_tgc",rois, []( const xAOD::MuonRoI* m ){return m->getSource()!=xAOD::MuonRoI::Barrel;}); variables.push_back( roi_tgc );
- auto roi_barrel = Monitored::Collection("roi_barrel",*rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Barrel;}); variables.push_back( roi_barrel );
- auto roi_endcap = Monitored::Collection("roi_endcap",*rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Endcap;}); variables.push_back( roi_endcap );
- auto roi_forward = Monitored::Collection("roi_forward",*rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Forward;}); variables.push_back( roi_forward );
+ auto roi_barrel = Monitored::Collection("roi_barrel",rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Barrel;}); variables.push_back( roi_barrel );
+ auto roi_endcap = Monitored::Collection("roi_endcap",rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Endcap;}); variables.push_back( roi_endcap );
+ auto roi_forward = Monitored::Collection("roi_forward",rois, []( const xAOD::MuonRoI* m ){return m->getSource()==xAOD::MuonRoI::Forward;}); variables.push_back( roi_forward );
- auto roi_phi_barrel = Monitored::Collection("roi_phi_barrel",*rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Barrel)?m->phi():-10;}); variables.push_back( roi_phi_barrel );
- auto roi_phi_endcap = Monitored::Collection("roi_phi_endcap",*rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Endcap)?m->phi():-10;}); variables.push_back( roi_phi_endcap );
- auto roi_phi_forward = Monitored::Collection("roi_phi_forward",*rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Forward)?m->phi():-10;}); variables.push_back( roi_phi_forward );
+ auto roi_phi_barrel = Monitored::Collection("roi_phi_barrel",rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Barrel)?m->phi():-10;}); variables.push_back( roi_phi_barrel );
+ auto roi_phi_endcap = Monitored::Collection("roi_phi_endcap",rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Endcap)?m->phi():-10;}); variables.push_back( roi_phi_endcap );
+ auto roi_phi_forward = Monitored::Collection("roi_phi_forward",rois, []( const xAOD::MuonRoI* m ){return (m->getSource()==xAOD::MuonRoI::Forward)?m->phi():-10;}); variables.push_back( roi_phi_forward );
- auto roi_sideA = Monitored::Collection("roi_sideA",*rois, []( const xAOD::MuonRoI* m ){return m->getHemisphere()==xAOD::MuonRoI::Positive;}); variables.push_back( roi_sideA );
- auto roi_sideC = Monitored::Collection("roi_sideC",*rois, []( const xAOD::MuonRoI* m ){return m->getHemisphere()==xAOD::MuonRoI::Negative;}); variables.push_back( roi_sideC );
+ auto roi_sideA = Monitored::Collection("roi_sideA",rois, []( const xAOD::MuonRoI* m ){return m->getHemisphere()==xAOD::MuonRoI::Positive;}); variables.push_back( roi_sideA );
+ auto roi_sideC = Monitored::Collection("roi_sideC",rois, []( const xAOD::MuonRoI* m ){return m->getHemisphere()==xAOD::MuonRoI::Negative;}); variables.push_back( roi_sideC );
- auto thrmask1 = Monitored::Collection("thrmask1",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==1;});variables.push_back(thrmask1);
- auto thrmask2 = Monitored::Collection("thrmask2",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==2;});variables.push_back(thrmask2);
- auto thrmask3 = Monitored::Collection("thrmask3",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==3;});variables.push_back(thrmask3);
- auto thrmask4 = Monitored::Collection("thrmask4",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==4;});variables.push_back(thrmask4);
- auto thrmask5 = Monitored::Collection("thrmask5",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==5;});variables.push_back(thrmask5);
- auto thrmask6 = Monitored::Collection("thrmask6",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==6;});variables.push_back(thrmask6);
- auto thrmask7 = Monitored::Collection("thrmask7",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==7;});variables.push_back(thrmask7);
- auto thrmask8 = Monitored::Collection("thrmask8",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==8;});variables.push_back(thrmask8);
- auto thrmask9 = Monitored::Collection("thrmask9",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==9;});variables.push_back(thrmask9);
- auto thrmask10 = Monitored::Collection("thrmask10",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==10;});variables.push_back(thrmask10);
- auto thrmask11 = Monitored::Collection("thrmask11",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==11;});variables.push_back(thrmask11);
- auto thrmask12 = Monitored::Collection("thrmask12",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==12;});variables.push_back(thrmask12);
- auto thrmask13 = Monitored::Collection("thrmask13",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==13;});variables.push_back(thrmask13);
- auto thrmask14 = Monitored::Collection("thrmask14",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==14;});variables.push_back(thrmask14);
- auto thrmask15 = Monitored::Collection("thrmask15",*rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==15;});variables.push_back(thrmask15);
+ auto thrmask1 = Monitored::Collection("thrmask1",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==1;});variables.push_back(thrmask1);
+ auto thrmask2 = Monitored::Collection("thrmask2",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==2;});variables.push_back(thrmask2);
+ auto thrmask3 = Monitored::Collection("thrmask3",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==3;});variables.push_back(thrmask3);
+ auto thrmask4 = Monitored::Collection("thrmask4",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==4;});variables.push_back(thrmask4);
+ auto thrmask5 = Monitored::Collection("thrmask5",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==5;});variables.push_back(thrmask5);
+ auto thrmask6 = Monitored::Collection("thrmask6",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==6;});variables.push_back(thrmask6);
+ auto thrmask7 = Monitored::Collection("thrmask7",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==7;});variables.push_back(thrmask7);
+ auto thrmask8 = Monitored::Collection("thrmask8",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==8;});variables.push_back(thrmask8);
+ auto thrmask9 = Monitored::Collection("thrmask9",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==9;});variables.push_back(thrmask9);
+ auto thrmask10 = Monitored::Collection("thrmask10",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==10;});variables.push_back(thrmask10);
+ auto thrmask11 = Monitored::Collection("thrmask11",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==11;});variables.push_back(thrmask11);
+ auto thrmask12 = Monitored::Collection("thrmask12",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==12;});variables.push_back(thrmask12);
+ auto thrmask13 = Monitored::Collection("thrmask13",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==13;});variables.push_back(thrmask13);
+ auto thrmask14 = Monitored::Collection("thrmask14",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==14;});variables.push_back(thrmask14);
+ auto thrmask15 = Monitored::Collection("thrmask15",rois,[](const xAOD::MuonRoI* m){return m->getThrNumber()==15;});variables.push_back(thrmask15);
if( !m_anaOfflMuon.value() ){
fill(m_packageName,variables);
@@ -156,7 +161,7 @@ StatusCode TgcRawDataMonitorAlgorithm::fillHistograms( const EventContext& ctx )
if( pt/1000.>15.)max_dr = m_l1trigMatchWindow1.value();
else if(pt/1000.>10.)max_dr = m_l1trigMatchWindow2.value() + m_l1trigMatchWindow3.value() * pt/1000.;
else max_dr = m_l1trigMatchWindow4.value() + m_l1trigMatchWindow5.value() * pt/1000.;
- for(const auto& roi : *rois){
+ for(const auto& roi : rois){
TLorentzVector roivec;
roivec.SetPtEtaPhiM(1,roi->eta(),roi->phi(),1);
double dr = roivec.DeltaR( mymuon.fourvec );
@@ -352,6 +357,7 @@ StatusCode TgcRawDataMonitorAlgorithm::fillHistograms( const EventContext& ctx )
StatusCode TgcRawDataMonitorAlgorithm::triggerMatching(const xAOD::Muon* offline_muon, const std::vector<TagDef>& list_of_triggers ) const
{
if( !m_TagAndProbe.value() )return StatusCode::SUCCESS;
+ if( getTrigDecisionTool().empty() ) return StatusCode::SUCCESS;
TVector3 muonvec; muonvec.SetPtEtaPhi(offline_muon->pt(),offline_muon->eta(),offline_muon->phi());
for(auto tagTrig : list_of_triggers ){
if( !getTrigDecisionTool()->isPassed( tagTrig.eventTrig.Data() ) ) return StatusCode::FAILURE;
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/CMakeLists.txt
index 6d3192f60b81f00e5fe0189ade4fa8e3f00d7b4d..46f589b8c22a67547172511e1b20110c70f023f2 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/CMakeLists.txt
@@ -18,4 +18,4 @@ atlas_add_component( MuonTrackMonitoring
# Install files from the package:
atlas_install_python_modules( python/*.py )
-
+atlas_install_joboptions( share/*.py )
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonGenericTracksMon.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonGenericTracksMon.h
new file mode 100644
index 0000000000000000000000000000000000000000..e8cce9860f10b7f4dce97118a32218ea27c9ef2f
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonGenericTracksMon.h
@@ -0,0 +1,145 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRKPHYSMONITORING_MUONGENERICTRACKSMON_H
+#define MUONTRKPHYSMONITORING_MUONGENERICTRACKSMON_H
+
+// MuonGenericTracksMon.cxx
+// AUTHORS: N. Benekos, E. Christidi, A. Eppig, Tony Liss
+
+#include "GaudiKernel/StatusCode.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/StoreGate.h"
+
+#include "AthenaMonitoring/ManagedMonitorToolBase.h"
+
+#include "MuonTrackMonitoring/RecoMuonPlots.h"
+#include "MuonTrackMonitoring/RecoMuonSegmentPlots.h"
+#include "MuonTrackMonitoring/RecoMuonTrackPlots.h"
+#include "MuonTrackMonitoring/RecoMuonIDTrackPlots.h"
+#include "MuonTrackMonitoring/RecoLumiPlots.h"
+#include "MuonTrackMonitoring/RecoPhysPlots.h"
+#include "MuonTrackMonitoring/RecoVertexPlots.h"
+#include "MuonHistUtils/MuonEnumDefs.h"
+
+#include "TrigConfL1Data/TriggerItem.h"
+
+#include "TrkTrack/Track.h"
+#include "TrkTrack/TrackCollection.h"
+#include "TrkToolInterfaces/IResidualPullCalculator.h"
+#include "TrkToolInterfaces/ITrackSelectorTool.h"
+
+#include "xAODTracking/TrackParticle.h"
+
+#include "GeoPrimitives/GeoPrimitives.h"
+#include "EventPrimitives/EventPrimitives.h"
+#include "EventPrimitives/EventPrimitivesHelpers.h"
+#include "FourMomUtils/P4Helpers.h"
+
+#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
+#include "MuonAnalysisInterfaces/IMuonSelectionTool.h"
+#include "MuonResonanceTools/IMuonResonanceSelectionTool.h"
+#include "MuonResonanceTools/IMuonResonancePairingTool.h"
+
+#include "xAODMuon/MuonContainer.h"
+#include "xAODMuon/Muon.h"
+#include "xAODMuon/MuonSegment.h"
+#include "xAODMuon/MuonSegmentContainer.h"
+#include "xAODEventInfo/EventInfo.h"
+
+#include <vector>
+#include <string>
+#include <algorithm>
+
+class MuonGenericTracksMon : public ManagedMonitorToolBase
+{
+
+ public:
+
+ MuonGenericTracksMon( const std::string & type, const std::string & name, const IInterface* parent );
+ virtual ~MuonGenericTracksMon()=default;
+
+ virtual StatusCode initialize();
+ virtual StatusCode bookHistograms();
+ virtual StatusCode fillHistograms();
+ virtual StatusCode procHistograms();
+
+ //second argument is the souce type
+ void plot_lumi( std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances_Z,
+ std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances_jpsi,
+ const xAOD::MuonContainer* Muons,
+ const xAOD::TrackParticleContainer* tracksMS,
+ const xAOD::MuonSegmentContainer* MuonSegments);
+ void plot_lumi_notrig(const xAOD::MuonContainer* Muons,
+ const xAOD::TrackParticleContainer* tracksMS,
+ const xAOD::MuonSegmentContainer* MuonSegments);
+ //other plots
+ void plot_muon( const xAOD::Muon& muon, int source);
+ void plot_muon_notrig(const xAOD::Muon& muon, int source);
+ void plot_segment(const xAOD::MuonSegment& segment, int source);
+ void plot_track( const xAOD::TrackParticle& track, int source);
+ void plot_vertex( const xAOD::Vertex& aVx, int source);
+ void plot_resonances(std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances, int source);
+
+ void FillPullResid(RecoMuonTrackPlots *, const xAOD::TrackParticle*);
+
+ float m_inst_lumi_bcid;
+ float m_inst_lumi_lb;
+ int m_current_lb;
+
+ TH1* m_hNEvent;//a sample histogram to count the number of events
+
+ // plot classes in vectors (one class per selection: Z, JPsi, all)
+ std::vector<RecoLumiPlots*> m_oRecoLumiPlots;
+ std::vector<RecoMuonSegmentPlots*> m_oRecoMuonSegmentPlots;
+ std::vector<RecoMuonTrackPlots*> m_oRecoMuonMSTrackPlots;
+ std::vector<RecoMuonTrackPlots*> m_oRecoMuonMETrackPlots;
+ std::vector<RecoMuonIDTrackPlots*> m_oRecoMuonIDTrackPlots;
+ std::vector<RecoMuonPlots*> m_oRecoMuonPlots;
+ std::vector<RecoPhysPlots*> m_oRecoPhysPlots;
+ std::vector<RecoVertexPlots*> m_oRecoVertexPlots;
+
+ private:
+
+ std::string m_muonsName;
+ std::string m_muonSegmentsName;
+ std::string m_muonTracksName;
+ std::string m_msVertexCollection;
+ std::string m_muonExtrapTracksName;
+ std::string m_innerTracksName;
+
+ StatusCode setupTools();
+ StatusCode bookInMongroup(TH1* hist, MonGroup& mongroup);
+ StatusCode bookInMongroup(HistData& hist, MonGroup& mongroup, std::string source);
+ StatusCode bookInMongroup(PlotBase& valPlots, MonGroup& mongroup, std::string source);
+ StatusCode bookInMongroup(PlotBase& valPlots, MonGroup& mongroup, std::string source, TString Montype);
+
+ // define the different classes of plots;
+ enum SOURCE {Z = 0, JPSI, CBMUONS, NONCBMUONS, CONTAINER, N_SOURCE};
+ std::string m_sources[SOURCE::N_SOURCE + 1] = {"Z", "Jpsi", "CBMuons", "NonCBMuons", "Container", "N_SOURCE"};
+ enum MUON_COMPONENT {TRACK_MS=0, TRACK_ME, TRACK_ID, N_COMPONENTS};
+ // Trigger items
+ bool m_useTrigger;
+ std::string m_MuonTriggerChainName;
+ std::vector<std::string> m_muon_triggers;
+
+ // ATLAS Detector Description
+ // Handle for the trig decision tool
+ // MCP muon quality tool
+ ToolHandle<CP::IMuonSelectionTool> m_muonSelectionTool{this, "MuonSelectorTool", "CP::MuonSelectionTool/MuonSelectionTool"};
+ ToolHandle<IMuonResonanceSelectionTool> m_ZmumuResonanceSelectionTool{this, "ZmumuResonanceSelectionTool", "MuonResonanceSelectionTool/ZmumuResonanceSelectionTool"};
+ ToolHandle<IMuonResonancePairingTool> m_ZmumuResonancePairingTool{this, "ZmumuResonancePairingTool", "MuonResonancePairingTool/ZmumuResonancePairingTool"};
+ ToolHandle<IMuonResonanceSelectionTool> m_JpsimumuResonanceSelectionTool{this, "JpsimumuResonanceSelectionTool", "MuonResonanceSelectionTool/JpsimumuResonanceSelectionTool"};
+ ToolHandle<IMuonResonancePairingTool> m_JpsimumuResonancePairingTool{this, "JpsimumuResonancePairingTool", "MuonResonancePairingTool/JpsimumuResonancePairingTool"};
+
+ std::string pathToHistName(std::string str){
+ std::replace( str.begin(), str.end(), '/', '_');
+ return str;
+ }
+};
+
+#endif
+
+
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h
similarity index 100%
rename from MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.h
rename to MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/PlotMuons.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/PlotMuons.h
new file mode 100644
index 0000000000000000000000000000000000000000..4372fdbd3d436d9f77ae8913f8c99e06553095b6
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/PlotMuons.h
@@ -0,0 +1,29 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRACKMONITORING_PLOTMUONS_H
+#define MUONTRACKMONITORING_PLOTMUONS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "TrkValHistUtils/ParamPlots.h"
+#include "MuonHistUtils/RecoInfoPlots.h"
+#include "MuonHistUtils/MomentumPullPlots.h"
+#include "MuonHistUtils/MuonHitSummaryPlots.h"
+#include "xAODMuon/Muon.h"
+
+class PlotMuons:public PlotBase{
+
+ public:
+
+ PlotMuons(PlotBase* pParent, std::string sDir);
+
+ void fill(const xAOD::Muon& muon);
+
+ Trk::ParamPlots m_plots_All;
+ Muon::RecoInfoPlots m_plots_RecoInfo;
+ Muon::MomentumPullPlots m_plots_MomentumPull;
+ Muon::MuonHitSummaryPlots m_plots_MuonHitSummary;
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoLumiPlots.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoLumiPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..ff6e605ba529dab62a986145d4dcd1fe6f572bd0
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoLumiPlots.h
@@ -0,0 +1,48 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRACKMONITORING_RECOLUMIPLOTS_H
+#define MUONTRACKMONITORING_RECOLUMIPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+
+
+#include "MuonPrepRawData/MuonPrepDataContainer.h"
+#include "xAODMuon/MuonSegmentContainer.h"
+#include "xAODTracking/TrackParticleContainer.h"
+#include "xAODMuon/MuonContainer.h"
+
+class RecoLumiPlots:public PlotBase {
+
+ public:
+ RecoLumiPlots(PlotBase* pParent, std::string sDir, std::string recObj);
+
+ void fill(const xAOD::MuonSegmentContainer* MuonSegments, int current_lb, float inst_lumi_bcid, float inst_lumi_lb);
+ void fill(const xAOD::TrackParticleContainer* MSTracks, int current_lb, float inst_lumi_bcid, float inst_lumi_lb);
+ void fill_CB(const xAOD::MuonContainer* Muons, int current_lb, float inst_lumi_bcid, float inst_lumi_lb);
+ void fill_Other(const xAOD::MuonContainer* Muons, int current_lb, float inst_lumi_bcid, float inst_lumi_lb);
+ void fill(std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances, int current_lb, float inst_lumi_bcid, float inst_lumi_lb);
+
+ TH1* m_hNSegment_LB_1D;
+ TH1* m_hNMuonTrack_LB_1D;
+ TH1* m_hNMuon_LB_1D;
+ TH1* m_hNResonance_LB_1D;
+
+ TH2* m_hNSegment_LB;
+ TH2* m_hNMuonTrack_LB;
+ TH2* m_hNMuon_LB;
+ TH2* m_hNResonance_LB;
+
+ int n_lbs;
+
+ //for locating Z and Jpsi
+ std::string type;
+ std::string name;
+
+ private:
+ void initializePlots();
+
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonIDTrackPlots.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonIDTrackPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..120005dbf4e56177c1aab7285cb0c202a224f2b6
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonIDTrackPlots.h
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRACKMONITORING_RECOMUONIDTRACKPLOTS_H
+#define MUONTRACKMONITORING_RECOMUONIDTRACKPLOTS_H
+
+#include "xAODMuon/Muon.h"
+#include "xAODMuon/MuonContainer.h"
+#include "xAODTracking/TrackParticle.h"
+//#include "TrkEventPrimitives/ResidualPull.h"
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "TrkValHistUtils/ParamPlots.h"
+#include "TrkValHistUtils/RecoInfoPlots.h"
+#include "TrkValHistUtils/ImpactPlots.h"
+#include "TrkValHistUtils/IDHitPlots.h"
+
+
+class RecoMuonIDTrackPlots:public PlotBase {
+ public:
+ RecoMuonIDTrackPlots(PlotBase* pParent, std::string sDir);
+
+ // Reco only information
+ Trk::ParamPlots m_oAllPlots;
+ Trk::ImpactPlots m_oImpactPlots;
+ Trk::RecoInfoPlots m_oTrkRecoInfoPlots;
+ Trk::IDHitPlots m_oIDHitPlots;
+
+ TH1* m_pt_broad;
+ TH2* m_eta_phi_broad;
+
+ //fill methods
+ void fill(const xAOD::Muon& mu, int component);
+ void fill(const xAOD::TrackParticle& muTP);
+ //void fill(const xAOD::TrackParticle& muTP, int LB_number, float LB_instant);
+ //void fill(const Trk::ResidualPull& resPull, int stationPhi, Muon::MuonStationIndex::TechnologyIndex techid, bool measuresPhi);
+ private:
+ void initializePlots();
+
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonPlots.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..a00bdfa1c064e466b4225548fefbfa5573f801f8
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonPlots.h
@@ -0,0 +1,111 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRACKMONITORING_RECOMUONPLOTS_H
+#define MUONTRACKMONITORING_RECOMUONPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "TrkValHistUtils/ParamPlots.h"
+#include "TrkValHistUtils/MSHitPlots.h"
+#include "TrkValHistUtils/ImpactPlots.h"
+#include "MuonHistUtils/RecoInfoPlots.h"
+#include "MuonHistUtils/MomentumPullPlots.h"
+#include "MuonHistUtils/MuonHitSummaryPlots.h"
+#include "MuonHistUtils/MuonIsolationPlots.h"
+#include "MuonHistUtils/MuonParamPlots.h"
+
+#include "xAODMuon/Muon.h"
+#include "xAODMuon/MuonContainer.h"
+#include "xAODTracking/TrackingPrimitives.h"
+
+class RecoMuonPlots:public PlotBase {
+ public:
+ RecoMuonPlots(PlotBase* pParent, std::string sDir, bool detail=false);
+ void fill(const xAOD::Muon& mu);
+ void fill(const xAOD::Muon& mu, xAOD::Muon::Quality my_quality);
+
+ // Reco only information
+ Trk::ParamPlots m_oAllPlots;
+ Muon::RecoInfoPlots m_oMuRecoInfoPlots;
+ Trk::ImpactPlots m_oImpactPlots;
+ Muon::MomentumPullPlots m_oMomentumPullPlots;
+
+ //extra monitoring efficiency plots; filled in post processing
+ TH2* m_origin_eta_phi;
+ TH2* m_eff_tight;
+ TH2* m_eff_medium;
+ TH2* m_tight_eta_phi;
+ TH2* m_medium_eta_phi;
+ TH1* m_pt_broad;
+ TH2* m_eta_phi_broad;
+
+ //extra monitoring efficiency plots, normalized in post processing
+ TH2* m_eff_nPrec;
+ TH2* m_eff_nPhi;
+ TH2* m_eff_nTrigEta;
+ TH2* m_eff_ndof;
+ TH2* m_eff_chi2;
+ TH2* m_ID_eff_ndof;
+ TH2* m_ID_eff_chi2;
+ TH2* m_MS_eff_ndof;
+ TH2* m_MS_eff_chi2;
+
+ TH2* m_avg_hits_precision_inner;
+ TH2* m_avg_hits_precision_middle;
+ TH2* m_avg_hits_precision_outer;
+ TH2* m_avg_hits_precision_extended;
+
+ TH2* m_avg_hits_trigger_layer1;
+ TH2* m_avg_hits_trigger_layer2;
+ TH2* m_avg_hits_trigger_layer3;
+ TH2* m_avg_hits_trigger_layer4;
+
+ TH2* m_avg_hits_ibl;
+ TH2* m_avg_hits_pix;
+ TH2* m_avg_hits_sct;
+ TH2* m_avg_hits_trt;
+
+ TH2* m_avg_ddpt_idme;
+ TH2* m_avg_dptsignif;
+
+ // overview layers
+ uint8_t hitval_numberOfPrecisionLayers = 0;
+ uint8_t hitval_numberOfPhiLayers = 0;
+ uint8_t hitval_numberOfTriggerEtaLayers = 0;
+
+ // precision hits
+ uint8_t hitval_innerSmallHits = 0;
+ uint8_t hitval_innerLargeHits = 0;
+ uint8_t hitval_middleSmallHits = 0;
+ uint8_t hitval_middleLargeHits = 0;
+ uint8_t hitval_outerSmallHits = 0;
+ uint8_t hitval_outerLargeHits = 0;
+ uint8_t hitval_extendedSmallHits = 0;
+ uint8_t hitval_extendedLargeHits = 0;
+
+ // trigger hits
+ uint8_t hitval_etaLayer1Hits = 0;
+ uint8_t hitval_etaLayer2Hits = 0;
+ uint8_t hitval_etaLayer3Hits = 0;
+ uint8_t hitval_etaLayer4Hits = 0;
+
+ // ID hits
+ uint8_t hitval_numberOfBLayerHits = 0;
+ uint8_t hitval_numberOfPixelHits = 0;
+ uint8_t hitval_numberOfSCTHits = 0;
+ uint8_t hitval_numberOfTRTHits = 0;
+
+ // momentum balance
+ float ddpt_idme = 0;
+ float qoverp_diff = 0;
+ float qoverp_sigma = 0;
+ float qoverp_signif = 0;
+
+ bool Detail;
+
+ private:
+ void initializePlots();
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonSegmentPlots.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonSegmentPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..253d96b7c06cb006a331ea0264e062cad22d0262
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonSegmentPlots.h
@@ -0,0 +1,42 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRACKMONITORING_RECOMUONSEGMENTPLOTS_H
+#define MUONTRACKMONITORING_RECOMUONSEGMENTPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "MuonHistUtils/MuonSegmentPlots.h"
+#include "MuonHistUtils/MuonSegmentSlimPlots.h"
+
+#include "xAODMuon/Muon.h"
+#include "xAODMuon/MuonContainer.h"
+#include "xAODMuon/MuonSegment.h"
+#include "xAODMuon/MuonSegmentContainer.h"
+#include "xAODTracking/TrackParticleContainer.h"
+
+class RecoMuonSegmentPlots:public PlotBase {
+ public:
+ RecoMuonSegmentPlots(PlotBase* pParent, std::string sDir, bool detail=false);
+
+ //fill methods
+ void fill(const xAOD::MuonContainer& muContainer);
+ void fill(const xAOD::Muon& mu);
+ void fill(const std::vector<ElementLink<DataVector<xAOD::MuonSegment_v1>>> Mu_Segments);
+ void fill(const xAOD::MuonSegment& muonSeg);
+
+ //generic plots from MuonHistUtils
+ Muon::MuonSegmentPlots *m_oMuonSegmentPlots;
+ Muon::MuonSegmentSlimPlots *m_oMuonSegmentSlimPlots;
+
+ //Monitoring justification plots
+ bool Detail;
+
+
+ private:
+ void initializePlots();
+
+
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonTrackPlots.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonTrackPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..6aae71f53c97f1bb6d6e0ec807dfd9fa8ae53ac6
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoMuonTrackPlots.h
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRACKMONITORING_RECOMUONTRACKPLOTS_H
+#define MUONTRACKMONITORING_RECOMUONTRACKPLOTS_H
+
+#include "xAODMuon/Muon.h"
+#include "xAODMuon/MuonContainer.h"
+#include "xAODTracking/TrackParticle.h"
+#include "TrkEventPrimitives/ResidualPull.h"
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "TrkValHistUtils/ParamPlots.h"
+#include "TrkValHistUtils/MSHitPlots.h"
+#include "TrkValHistUtils/RecoInfoPlots.h"
+#include "TrkValHistUtils/ImpactPlots.h"
+
+#include "MuonHistUtils/MuonHitResidualPlots.h"
+#include "TrkTrack/TrackStateOnSurface.h"
+#include "TrkTrack/TrackCollection.h"
+#include "TrkParameters/TrackParameters.h"
+
+
+class RecoMuonTrackPlots:public PlotBase {
+ public:
+ RecoMuonTrackPlots(PlotBase* pParent, std::string sDir);
+
+ // Reco only information
+ Trk::ParamPlots m_oAllPlots;
+ Trk::ImpactPlots m_oImpactPlots;
+ Trk::RecoInfoPlots m_oTrkRecoInfoPlots;
+
+ TH1* m_pt_broad;
+ TH2* m_eta_phi_broad;
+
+ //fill methods
+ void fill(const xAOD::Muon& mu, int component);
+ void fill(const xAOD::TrackParticle& muTP);
+ void fill(const xAOD::TrackParticle& muTP, int LB_number, float LB_instant);
+ private:
+ void initializePlots();
+
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoPhysPlots.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoPhysPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..effc089b25488233053b8100167efa45e1024419
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoPhysPlots.h
@@ -0,0 +1,69 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRKPHYSMONITORING_RECOPHYSPLOTS_H
+#define MUONTRKPHYSMONITORING_RECOPHYSPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "xAODMuon/Muon.h"
+
+
+class RecoPhysPlots:public PlotBase {
+ public:
+ RecoPhysPlots(PlotBase *pParent, std::string sDir, std::string recObj);
+
+ void fill(std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > mumucandidates);
+ void fill(const float eta_mu_plus, const float eta_mu_minus, const float invariant_mass);
+
+ float EtaRegionFine(double eta);
+ float EtaRegionCoarse(double eta);
+ bool LabelLargeEtaRegions(TAxis * axis);
+ bool LabelCombinedEtaRegions(TAxis * axis);
+ bool LabelSectorAxis(TAxis * axis);
+
+ TH1* m_Mass;
+ TH1* m_occupancy;
+ TH1* m_2occupancy;
+
+ // TH2* m_Efficiency;
+ // TH2* m_EffNumerator;
+ // TH2* m_EffDenominator;
+
+ // TH1* m_Efficiency_eta;
+ // TH1* m_EffNumerator_eta;
+ // TH1* m_EffDenominator_eta;
+
+ TH1* m_M_Mean;
+ TH1* m_M_Sigma;
+
+ TH1* m_M_EA_EA;
+ TH1* m_M_EA_BA;
+ TH1* m_M_EA_BC;
+ TH1* m_M_EA_EC;
+
+ TH1* m_M_BA_EA;
+ TH1* m_M_BA_BA;
+ TH1* m_M_BA_BC;
+ TH1* m_M_BA_EC;
+
+ TH1* m_M_BC_EA;
+ TH1* m_M_BC_BA;
+ TH1* m_M_BC_BC;
+ TH1* m_M_BC_EC;
+
+ TH1* m_M_EC_EA;
+ TH1* m_M_EC_BA;
+ TH1* m_M_EC_BC;
+ TH1* m_M_EC_EC;
+
+ std::string type;
+
+ void finalizeRecoPlots();
+ private:
+ void SetResultsBin(int iBin, TH1* pInputHist);
+ void initializePlots();
+
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoVertexPlots.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoVertexPlots.h
new file mode 100644
index 0000000000000000000000000000000000000000..ac11ba8e963c5e4d9def52aac8e0cb14c4154be3
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/MuonTrackMonitoring/RecoVertexPlots.h
@@ -0,0 +1,29 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONTRKPHYSMONITORING_RecoVertexPLOTS_H
+#define MUONTRKPHYSMONITORING_RecoVertexPLOTS_H
+
+#include "TrkValHistUtils/PlotBase.h"
+#include "xAODTracking/VertexContainer.h"
+
+
+class RecoVertexPlots:public PlotBase {
+ public:
+ RecoVertexPlots(PlotBase *pParent, std::string sDir);
+
+ void fill(const xAOD::Vertex& msVx);
+
+ TH1* m_nMDT;
+ TH1* m_nRPC;
+ TH1* m_nTGC;
+ TH1* m_nTracklets;
+ TH2* m_VertexEtaPhi;
+
+ private:
+ void initializePlots();
+
+};
+
+#endif
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackDQA_options.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackDQA_options.py
new file mode 100755
index 0000000000000000000000000000000000000000..2ee157a640ae11efc49ee21547eec9fc21d13524
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackDQA_options.py
@@ -0,0 +1,96 @@
+#======================================================================
+# JobOptions for MuonTrackMonitoring
+#======================================================================
+
+muTrackMonMan = AthenaMonManager(name="MuonTrackMonManager",
+ FileKey = DQMonFlags.monManFileKey(),
+ Environment = DQMonFlags.monManEnvironment(),
+ DataType = DQMonFlags.monManDataType(),
+ OutputLevel = WARNING)
+
+from RecExConfig.RecFlags import rec as recFlags
+from MuonRecExample import MuonRecTools
+from MuonTrackMonitoring.MuonTrackMonitoringConf import MuonGenericTracksMon
+from AthenaCommon.AppMgr import ToolSvc
+
+############TriggerAware Trk Monitoring#######################
+# set to true in case you would like to use trigger-aware monitoring
+# only do trigger-aware monitoring if monTrigDecTool known by ToolSvc
+# NoTrig requirement part is intended to run on all streams
+MuonGenericTracksMon_NoTrig = MuonGenericTracksMon(name = "MuonGenericTracksMon_NoTrig",
+ MuonTriggerChainName = "NoTrig/",
+ OutputLevel = WARNING,
+ )
+#ToolSvc += MuonGenericTracksMon_NoTrig
+muTrackMonMan.AthenaMonTools += [MuonGenericTracksMon_NoTrig]
+
+# L1_Trig part is intended to only select events passing L1_MU triggers
+MuonGenericTracksMon_L1Trig = MuonGenericTracksMon(name = "MuonGenericTracksMon_L1Trig",
+ MuonTriggerChainName = "",
+ OutputLevel = WARNING,
+ )
+
+if not DQMonFlags.useTrigger():
+ from AthenaCommon.Logging import log
+ log.error("MuonTrigTrackDQA_options.py: trigger decision tool not found: don't run trigger-aware monitoring")
+else:
+ MuonGenericTracksMon_L1Trig.TriggerChain = "L1_MU4, L1_MU6, L1_MU10, L1_MU11, L1_MU15, L1_MU20, L1_2MU4, L1_2MU6, L1_2MU10"
+ MuonGenericTracksMon_L1Trig.MuonTriggerChainName = ""
+ MuonGenericTracksMon_L1Trig.TrigDecisionTool = monTrigDecTool
+ #ToolSvc += MuonGenericTracksMon_L1Trig
+ muTrackMonMan.AthenaMonTools += [MuonGenericTracksMon_L1Trig]
+
+#for Muon Quality Selection
+if not hasattr(ToolSvc,"MuonSelectorTool"):
+ from MuonSelectorTools.MuonSelectorToolsConf import CP__MuonSelectionTool
+ ToolSvc += CP__MuonSelectionTool("MuonSelectorTool", OutputLevel = ERROR)
+ ToolSvc.MuonSelectorTool.MaxEta = 2.5
+
+#for Muon Resonance Selection
+from MuonResonanceTools.MuonResonanceToolsConf import MuonResonanceSelectionTool
+from MuonResonanceTools.MuonResonanceToolsConf import MuonResonancePairingTool
+
+ToolSvc += MuonResonanceSelectionTool("ZmumuResonanceSelectionTool")
+ToolSvc += MuonResonancePairingTool("ZmumuResonancePairingTool")
+ToolSvc.ZmumuResonanceSelectionTool.OutputLevel = ERROR
+ToolSvc.ZmumuResonanceSelectionTool.PtCut = 20000.0
+ToolSvc.ZmumuResonanceSelectionTool.EtaCut = 2.5
+ToolSvc.ZmumuResonanceSelectionTool.IsoCaloCut = 0.2
+ToolSvc.ZmumuResonanceSelectionTool.IsoTrkCut = 0.2
+ToolSvc.ZmumuResonanceSelectionTool.z0Cut = 100 #to overwrite Z0 cut
+ToolSvc.ZmumuResonanceSelectionTool.Max_d0 = 100
+ToolSvc.ZmumuResonanceSelectionTool.Calibrate = False
+ToolSvc.ZmumuResonanceSelectionTool.EfficiencyCorr = False
+ToolSvc.ZmumuResonanceSelectionTool.MuonSelectionTool.OutputLevel = ERROR
+ToolSvc.ZmumuResonancePairingTool.OutputLevel = ERROR
+ToolSvc.ZmumuResonancePairingTool.HighMassWindow = 106000.0
+ToolSvc.ZmumuResonancePairingTool.LowMassWindow = 76000.0
+
+# J/psi configuration
+ToolSvc += MuonResonanceSelectionTool("JpsimumuResonanceSelectionTool")
+ToolSvc += MuonResonancePairingTool("JpsimumuResonancePairingTool")
+ToolSvc.JpsimumuResonanceSelectionTool.OutputLevel = ERROR
+### loose selections for J/psi ###
+ToolSvc.JpsimumuResonanceSelectionTool.PtCut = 4000.0
+ToolSvc.JpsimumuResonanceSelectionTool.EtaCut = 2.5
+ToolSvc.JpsimumuResonanceSelectionTool.IsoCaloCut = 1
+ToolSvc.JpsimumuResonanceSelectionTool.IsoTrkCut = 1
+ToolSvc.JpsimumuResonanceSelectionTool.z0Cut = 100
+ToolSvc.JpsimumuResonanceSelectionTool.Max_d0 = 100
+ToolSvc.JpsimumuResonanceSelectionTool.Calibrate = False #no calibration on data
+ToolSvc.JpsimumuResonanceSelectionTool.EfficiencyCorr = False #no efficiency correction on data
+ToolSvc.JpsimumuResonanceSelectionTool.MuonSelectionTool.OutputLevel = ERROR
+ToolSvc.JpsimumuResonancePairingTool.OutputLevel = ERROR
+ToolSvc.JpsimumuResonancePairingTool.HighMassWindow = 3600.0
+ToolSvc.JpsimumuResonancePairingTool.LowMassWindow = 2600.0
+
+
+MuonGenericTracksMon_NoTrig.JpsimumuResonanceSelectionTool = ToolSvc.JpsimumuResonanceSelectionTool
+MuonGenericTracksMon_NoTrig.ZmumuResonanceSelectionTool = ToolSvc.ZmumuResonanceSelectionTool
+MuonGenericTracksMon_L1Trig.JpsimumuResonanceSelectionTool = ToolSvc.JpsimumuResonanceSelectionTool
+MuonGenericTracksMon_L1Trig.ZmumuResonanceSelectionTool = ToolSvc.ZmumuResonanceSelectionTool
+
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+topSequence += muTrackMonMan
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackMonitoring_options.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackMonitoring_options.py
new file mode 100755
index 0000000000000000000000000000000000000000..1f701f9ee9e76bc245f3b34f1c0f43acd21b1ec1
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackMonitoring_options.py
@@ -0,0 +1,191 @@
+#======================================================================
+# TOP JobOptions to run on MuonTrackMonitoring
+#======================================================================
+from MuonDQAMonFlags.MuonDQAFlags import MuonDQAFlags as MuonDQAFlags
+#############TriggerAware Trk Monitoring#######################
+if MuonDQAFlags.MuonTrkMonDoTrigger or MuonDQAFlags.doMDTTGC:
+ from TrigDecisionMaker.TrigDecisionMakerConfig import TrigDecisionMaker
+ trigDecMaker = TrigDecisionMaker()
+ topSequence += trigDecMaker
+ #from TrigDecision.TrigDecisionConf import TrigDec__TrigDecisionTool
+ #tdt = TrigDec__TrigDecisionTool()
+ #ToolSvc += tdt
+ tdt = monTrigDecTool
+###############################################################
+#----------------------#
+# Trk Level Monitoring #
+#----------------------#
+### Which Track Collections to read (set array element to 0 or 1):
+# 1-> Moore, 2->MuonBoy
+###############################################################
+#############MuonSelectedTracksMon#############
+from MuonTrackMonitoring.MuonTrackMonitoringConf import MuonSelectedTracksMon
+#############MuonGenericTracksMon#############
+from MuonTrackMonitoring.MuonTrackMonitoringConf import MuonGenericTracksMon
+#############MuonGenericTracksMon#############
+from MuonTrackMonitoring.MuonTrackMonitoringConf import TGCStandaloneTracksMon
+############# NO TriggerAware Trk Monitoring #######################
+if MuonDQAFlags.doMuonTrackMon:
+
+ #############MuonSelectedTracksMon#############
+ MuonSelectedTracksMon = MuonSelectedTracksMon(name = "MuonSelectedTracksMon",
+ WhichTrackCollections = [0,1,1],
+ MuonTrackCollections = ["ExtrapolatedMuonSpectrometerTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ NPhiBins = 360,
+ UseTriggerVector = False,
+ MuonTriggerChainName = "NoMuonTriggerSelection" )
+ #############MuonGenericTracksMon#############
+ MuonGenericTracksMon = MuonGenericTracksMon(name = "MuonGenericTracksMon",
+ WhichTrackCollections = [0,1,1],
+ MuonTrackCollections = ["ExtrapolatedMuonSpectrometerTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ NPhiBins = 360,
+ UseTriggerVector = False,
+ MuonTriggerChainName = "NoMuonTriggerSelection" )
+ #############TGCStandaloneTracksMon_Trig############
+ TGCStandaloneTracksMon_NoTrig = TGCStandaloneTracksMon(name = "TGCStandaloneTracksMon",
+ TriggerAware = False,
+ MuonTriggerChainName = "TriggersInChain")
+ ToolSvc += MuonSelectedTracksMon
+ ToolSvc += MuonGenericTracksMon
+ ToolSvc += TGCStandaloneTracksMon
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon ]
+ monMan.AthenaMonTools += [ TGCStandaloneTracksMon ]
+
+#############TriggerAware Trk Monitoring#######################
+## set to true in case you would like to use trigger-aware monitoring
+## only do trigger-aware monitoring if DQMonFlags.useTrigger is true
+if not DQMonFlags.useTrigger():
+ print "IDPerfMon_jobOptions.py: trigger decision tool not found: don't run trigger-aware monitoring"
+else:
+ if MuonDQAFlags.MuonTrkMonDoTrigger and MuonDQAFlags.doMuonTrackMon:
+ #############MuonSelectedTracksMon_Trig#############
+ MuonSelectedTracksMon_Trig = MuonSelectedTracksMon(name = "MuonSelectedTracksMon_Trig",
+ WhichTrackCollections = [0,1,1],
+ MuonTrackCollections = ["MooreTracks","ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ NPhiBins = 360,
+ UseTriggerVector = True,
+ MuonTriggerDecisionTool = "TrigDec::TrigDecisionTool",
+ Muon_Trigger_Items = ["EF_2mu10", "EF_2mu4", "EF_2mu6", "EF_mu10", "EF_mu20", "EF_mu40"],
+ MuonTriggerChainName = "TriggersInChain")
+ #############MuonGenericTracksMon_Trig############
+ MuonGenericTracksMon_Trig = MuonGenericTracksMon(name = "MuonGenericTracksMon_Trig",
+ WhichTrackCollections = [0,1,1],
+ MuonTrackCollections = ["MooreTracks","ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ NPhiBins = 360,
+ UseTriggerVector = True,
+ MuonTriggerDecisionTool = "TrigDec::TrigDecisionTool",
+ Muon_Trigger_Items = ["EF_2mu10", "EF_2mu4", "EF_2mu6", "EF_mu10", "EF_mu20", "EF_mu40"],
+ MuonTriggerChainName = "TriggersInChain")
+ #############TGCStandaloneTracksMon_Trig############
+ TGCStandaloneTracksMon_Trig = TGCStandaloneTracksMon(name = "TGCStandaloneTracksMon_Trig",
+ TriggerAware = False,
+ MuonTriggerDecisionTool = "TrigDec::TrigDecisionTool",
+ Muon_Trigger_Items = ["MU0", "MU4", "MU6", "MU10", "MU11", "MU15", "MU20", "MU40", "MU0_TGC", "MU6_TGC", "MU0_TGC_HALO" ],
+ MuonTriggerChainName = "TriggersInChain")
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon_Trig ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon_Trig]
+ monMan.AthenaMonTools += [ TGCStandaloneTracksMon_Trig]
+
+ #############MuonSelectedTracksMon_Trig#############
+ MuonSelectedTracksMon_trig2mu4 = MuonSelectedTracksMon(name = "MuonSelectedTracksMon_trig2mu4",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ MuonSelectedTracksMon_trig2mu6 = MuonSelectedTracksMon(name = "MuonSelectedTracksMon_trig2mu6",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ MuonSelectedTracksMon_trigmu10 = MuonSelectedTracksMon(name = "MuonSelectedTracksMon_trigmu10",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ MuonSelectedTracksMon_trigmu20 = MuonSelectedTracksMon(name = "MuonSelectedTracksMon_trigmu20",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ MuonSelectedTracksMon_trigmu40 = MuonSelectedTracksMon(name = "MuonSelectedTracksMon_trigmu40",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ MuonSelectedTracksMon_trig2mu10 = MuonSelectedTracksMon(name = "MuonSelectedTracksMon_trig2mu10",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ #############MuonGenericTracksMon_Trig#############
+ MuonGenericTracksMon_trig2mu4 = MuonSelectedTracksMon(name = "MuonGenericTracksMon_trig2mu4",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ MuonGenericTracksMon_trig2mu6 = MuonSelectedTracksMon(name = "MuonGenericTracksMon_trig2mu6",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False )
+ MuonGenericTracksMon_trigmu10 = MuonGenericTracksMon(name = "MuonGenericTracksMon_trigmu10",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False)
+ MuonGenericTracksMon_trigmu20 = MuonGenericTracksMon(name = "MuonGenericTracksMon_trigmu20",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False)
+ MuonGenericTracksMon_trigmu40 = MuonGenericTracksMon(name = "MuonGenericTracksMon_trigmu40",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False)
+ MuonGenericTracksMon_trig2mu10 = MuonGenericTracksMon(name = "MuonGenericTracksMon_trig2mu10",
+ WhichTrackCollections = [0,1,1], EnableLumi = True,
+ MuonTrackCollections = ["MooreTracks" ,"ConvertedMBoyTracks", "MuidExtrapolatedTracks" ],
+ UseTriggerVector = False)
+ MuonSelectedTracksMon_trig2mu4.TrigDecisionTool = tdt
+ MuonSelectedTracksMon_trig2mu6.TrigDecisionTool = tdt
+ MuonSelectedTracksMon_trigmu10.TrigDecisionTool = tdt
+ MuonSelectedTracksMon_trigmu20.TrigDecisionTool = tdt
+ MuonSelectedTracksMon_trigmu40.TrigDecisionTool = tdt
+ MuonSelectedTracksMon_trig2mu10.TrigDecisionTool = tdt
+ MuonGenericTracksMon_trig2mu4.TrigDecisionTool = tdt
+ MuonGenericTracksMon_trig2mu6.TrigDecisionTool = tdt
+ MuonGenericTracksMon_trigmu10.TrigDecisionTool = tdt
+ MuonGenericTracksMon_trigmu20.TrigDecisionTool = tdt
+ MuonGenericTracksMon_trigmu40.TrigDecisionTool = tdt
+ MuonGenericTracksMon_trig2mu10.TrigDecisionTool = tdt
+ ##############Trigger Items for Muons###############
+ ##############MuonSelectedTracksMon#################
+ MuonSelectedTracksMon_trig2mu4.TriggerChain = "EF_2mu4"
+ MuonSelectedTracksMon_trig2mu6.TriggerChain = "EF_2mu6"
+ MuonSelectedTracksMon_trigmu10.TriggerChain = "EF_mu10"
+ MuonSelectedTracksMon_trigmu20.TriggerChain = "EF_mu20"
+ MuonSelectedTracksMon_trigmu40.TriggerChain = "EF_mu40"
+ MuonSelectedTracksMon_trig2mu10.TriggerChain = "EF_2mu10"
+ MuonSelectedTracksMon_trig2mu4.MuonTriggerChainName = "EF_2mu4"
+ MuonSelectedTracksMon_trig2mu6.MuonTriggerChainName = "EF_2mu6"
+ MuonSelectedTracksMon_trigmu10.MuonTriggerChainName = "EF_mu10"
+ MuonSelectedTracksMon_trigmu20.MuonTriggerChainName = "EF_mu20"
+ MuonSelectedTracksMon_trigmu40.MuonTriggerChainName = "EF_mu40"
+ MuonSelectedTracksMon_trig2mu10.MuonTriggerChainName = "EF_2mu10"
+ ##############MuonGenericTracksMon#################
+ MuonGenericTracksMon_trig2mu4.TriggerChain = "EF_2mu4"
+ MuonGenericTracksMon_trig2mu6.TriggerChain = "EF_2mu6"
+ MuonGenericTracksMon_trigmu10.TriggerChain = "EF_mu10"
+ MuonGenericTracksMon_trigmu20.TriggerChain = "EF_mu20"
+ MuonGenericTracksMon_trigmu40.TriggerChain = "EF_mu40"
+ MuonGenericTracksMon_trig2mu10.TriggerChain = "EF_2mu10"
+ MuonGenericTracksMon_trig2mu4.MuonTriggerChainName = "EF_2mu4"
+ MuonGenericTracksMon_trig2mu6.MuonTriggerChainName = "EF_2mu6"
+ MuonGenericTracksMon_trigmu10.MuonTriggerChainName = "EF_mu10"
+ MuonGenericTracksMon_trigmu20.MuonTriggerChainName = "EF_mu20"
+ MuonGenericTracksMon_trigmu40.MuonTriggerChainName = "EF_mu40"
+ MuonGenericTracksMon_trig2mu10.MuonTriggerChainName = "EF_2mu10"
+ ###################################################
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon_trig2mu4 ]
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon_trig2mu6 ]
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon_trigmu10 ]
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon_trigmu20 ]
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon_trigmu40 ]
+ monMan.AthenaMonTools += [ MuonSelectedTracksMon_trig2mu10 ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon_trig2mu4 ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon_trig2mu6 ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon_trigmu10 ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon_trigmu20 ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon_trigmu40 ]
+ monMan.AthenaMonTools += [ MuonGenericTracksMon_trig2mu10 ]
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonGenericTracksMon.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonGenericTracksMon.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..b7d0976cc5e97b43524b059fff86d73d5eadda4e
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonGenericTracksMon.cxx
@@ -0,0 +1,641 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// ================================================================================
+// MuonGenericTracksMon.cxx
+// ------------------------------
+// AUTHORS: N. Benekos, E. Christidi, A. Cortes, A. Eppig, I. Nomidis, T. Liss
+// B. Tong, Y. Liu, G. Cree
+// created: November 2007
+// modified June 2008: for Trigger Aware monitoring : A. Cortes (UIUC)
+// modified March 2015: XAOD migration and combination of track / segment / muon
+// description: Implementation code for the MuonGenericTracksMon
+// ==============================================================================
+
+#include "MuonTrackMonitoring/MuonGenericTracksMon.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h"
+#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
+#include "TrkEventPrimitives/ResidualPull.h"
+#include "TrkMeasurementBase/MeasurementBase.h"
+#include "TrkTrack/TrackStateOnSurface.h"
+#include "TrkTrack/TrackCollection.h"
+#include "GaudiKernel/MsgStream.h"
+//include Root dependencies
+#include <TH1F.h>
+
+// *********************************************************************
+// Public Methods
+// *********************************************************************
+
+MuonGenericTracksMon::MuonGenericTracksMon( const std::string & type, const std::string & name, const IInterface* parent )
+ :ManagedMonitorToolBase( type, name, parent ),
+ m_inst_lumi_bcid(0.0),
+ m_inst_lumi_lb(0.0),
+ m_current_lb(-1),
+ m_hNEvent(nullptr),
+ m_oRecoLumiPlots(0),
+ m_oRecoMuonSegmentPlots(0),
+ m_oRecoMuonMSTrackPlots(0),
+ m_oRecoMuonMETrackPlots(0),
+ m_oRecoMuonIDTrackPlots(0),
+ m_oRecoMuonPlots(0),
+ m_oRecoPhysPlots(0),
+ m_oRecoVertexPlots(0),
+ m_useTrigger(true)
+{
+
+ declareProperty("UseTriggerVector", m_useTrigger);
+ declareProperty("MuonTriggerChainName", m_MuonTriggerChainName);
+ declareProperty("Muon_Trigger_Items", m_muon_triggers);
+ declareProperty("MuonCollection", m_muonsName = "Muons");
+ declareProperty("MuonSegmentCollection", m_muonSegmentsName = "MuonSegments");
+ declareProperty("MuonTrackCollection", m_muonTracksName = "MuonSpectrometerTrackParticles");
+ declareProperty("MuonExtrapolatedTrackCollection", m_muonExtrapTracksName = "ExtrapolatedMuonTrackParticles");
+ declareProperty("InDetTrackParticles", m_innerTracksName = "InDetTrackParticles");
+ declareProperty("MSVertexCollection", m_msVertexCollection = "MSDisplacedVertex");
+}
+
+StatusCode MuonGenericTracksMon::initialize() {
+ ATH_CHECK(ManagedMonitorToolBase::initialize());
+ ATH_CHECK(setupTools());
+ return StatusCode::SUCCESS;
+}
+
+//======================================================================================//
+StatusCode MuonGenericTracksMon::bookHistograms()
+//======================================================================================//
+{
+ ATH_MSG_DEBUG("In bookHistograms()");
+
+ if(!(m_environment == AthenaMonManager::tier0 ||
+ m_environment == AthenaMonManager::tier0ESD ||
+ m_environment == AthenaMonManager::online ||
+ m_environment == AthenaMonManager::AOD)){
+
+ return StatusCode::SUCCESS;
+ }
+
+ MgmtAttr_t attr = ATTRIB_MANAGED;
+
+ //set the path with trigger chain name
+ std::string rootpath = "MuonPhysics/";
+
+ if(newRunFlag()) {
+
+ //example of how to register a new histogram
+ m_hNEvent = new TH1F("Overview_nEvent", "Number of Events;LumiBlock;Nevents", 2000, -0.5, 1999.5);
+
+ std::string dirpath;
+ dirpath = rootpath + m_MuonTriggerChainName + "/Overview";
+
+ MonGroup mongroup_gen_overview(this, dirpath, run, attr );
+ bookInMongroup(m_hNEvent, mongroup_gen_overview).ignore();
+
+ if (m_MuonTriggerChainName != ""){
+ //book lumi associated info
+ dirpath = m_MuonTriggerChainName + "Overview/" + m_sources[SOURCE::CBMUONS];//redefine for hist name
+ MonGroup mongroup_overview2(this, rootpath + dirpath, run, attr);
+ m_oRecoLumiPlots.push_back(new RecoLumiPlots(0, dirpath + "_", m_sources[SOURCE::CBMUONS]));
+ bookInMongroup(*m_oRecoLumiPlots[0], mongroup_overview2, m_sources[SOURCE::CBMUONS]).ignore();
+
+ dirpath = m_MuonTriggerChainName + "Overview/" + m_sources[SOURCE::NONCBMUONS];//redefine for hist name
+ MonGroup mongroup_overview3(this, rootpath + dirpath, run, attr);
+ m_oRecoLumiPlots.push_back(new RecoLumiPlots(0, dirpath + "_", m_sources[SOURCE::NONCBMUONS]));
+ bookInMongroup(*m_oRecoLumiPlots[1], mongroup_overview3, m_sources[SOURCE::NONCBMUONS]).ignore();
+
+ dirpath = m_MuonTriggerChainName + "Overview/" + m_sources[SOURCE::CONTAINER];//redefine for hist name
+ MonGroup mongroup_overview(this, rootpath + dirpath, run, attr);
+ m_oRecoLumiPlots.push_back(new RecoLumiPlots(0, dirpath + "_", m_sources[SOURCE::CONTAINER]));
+ bookInMongroup(*m_oRecoLumiPlots[2], mongroup_overview, m_sources[SOURCE::CONTAINER]).ignore();
+
+ //book segments
+ dirpath = m_MuonTriggerChainName + "Segments/" + m_sources[SOURCE::CBMUONS];
+ MonGroup mongroup_segments2(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonSegmentPlots.push_back(new RecoMuonSegmentPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonSegmentPlots[0], mongroup_segments2, m_sources[SOURCE::CBMUONS]).ignore();
+
+ dirpath = m_MuonTriggerChainName + "Segments/" + m_sources[SOURCE::NONCBMUONS];
+ MonGroup mongroup_segments3(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonSegmentPlots.push_back(new RecoMuonSegmentPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonSegmentPlots[1], mongroup_segments3, m_sources[SOURCE::NONCBMUONS]).ignore();
+
+ dirpath = m_MuonTriggerChainName + "Segments/" + m_sources[SOURCE::CONTAINER];
+ MonGroup mongroup_segments(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonSegmentPlots.push_back(new RecoMuonSegmentPlots(0, dirpath, true));
+ bookInMongroup(*m_oRecoMuonSegmentPlots[2], mongroup_segments, m_sources[SOURCE::CONTAINER]).ignore();
+
+ //book MS tracks
+ dirpath = m_MuonTriggerChainName + "TracksMS/" + m_sources[SOURCE::CONTAINER];
+ MonGroup mongroup_mstracks(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonMSTrackPlots.push_back(new RecoMuonTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonMSTrackPlots[0], mongroup_mstracks, m_sources[SOURCE::CONTAINER], "MS").ignore();
+
+ //book muons
+ dirpath = m_MuonTriggerChainName + "Muons/" + m_sources[SOURCE::CBMUONS];
+ MonGroup mongroup_mutracks(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonPlots.push_back(new RecoMuonPlots(0, dirpath, true));
+ bookInMongroup(*m_oRecoMuonPlots[0], mongroup_mutracks, m_sources[SOURCE::CBMUONS], "").ignore();
+
+ dirpath = m_MuonTriggerChainName + "Muons/" + m_sources[SOURCE::NONCBMUONS];
+ MonGroup mongroup_mutracks2(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonPlots.push_back(new RecoMuonPlots(0, dirpath, false));
+ bookInMongroup(*m_oRecoMuonPlots[1], mongroup_mutracks2, m_sources[SOURCE::NONCBMUONS], "NonCB").ignore();
+
+ //book id tracks
+ dirpath = m_MuonTriggerChainName + "TracksID/" + m_sources[SOURCE::CBMUONS];
+ MonGroup mongroup_idtracks(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonIDTrackPlots.push_back(new RecoMuonIDTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonIDTrackPlots[0], mongroup_idtracks, m_sources[SOURCE::CBMUONS], "ID").ignore();
+
+ dirpath = m_MuonTriggerChainName + "TracksID/" + m_sources[SOURCE::NONCBMUONS];
+ MonGroup mongroup_idtracks2(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonIDTrackPlots.push_back(new RecoMuonIDTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonIDTrackPlots[1], mongroup_idtracks2, m_sources[SOURCE::NONCBMUONS], "ID").ignore();
+
+ dirpath = m_MuonTriggerChainName + "TracksME/" + m_sources[SOURCE::CBMUONS];
+ MonGroup mongroup_metracks(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonMETrackPlots.push_back(new RecoMuonTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonMETrackPlots[0], mongroup_metracks, m_sources[SOURCE::CBMUONS], "ME").ignore();
+
+ dirpath = m_MuonTriggerChainName + "TracksME/" + m_sources[SOURCE::NONCBMUONS];
+ MonGroup mongroup_metracks2(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonMETrackPlots.push_back(new RecoMuonTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonMETrackPlots[1], mongroup_metracks2, m_sources[SOURCE::NONCBMUONS], "ME").ignore();
+
+ dirpath = m_MuonTriggerChainName + "MSVertices/";
+ MonGroup mongroup_msvertices(this, rootpath + dirpath, run, attr);
+ m_oRecoVertexPlots.push_back(new RecoVertexPlots(0, dirpath));
+ bookInMongroup(*m_oRecoVertexPlots[0], mongroup_msvertices, m_sources[SOURCE::CONTAINER]).ignore();
+
+ }
+ else{
+ for (int i = 0; i < SOURCE::N_SOURCE; i++) {
+ dirpath = "Overview/" + m_sources[i];//redefine for hist name
+ MonGroup mongroup_overview(this, rootpath + dirpath, run, attr);
+ m_oRecoLumiPlots.push_back(new RecoLumiPlots(0, dirpath + "_", m_sources[i]));
+ bookInMongroup(*m_oRecoLumiPlots[i], mongroup_overview, m_sources[i]).ignore();
+
+ dirpath = "Segments/" + m_sources[i];
+ MonGroup mongroup_segments(this, rootpath + dirpath, run, attr);
+
+ if(i == SOURCE::CBMUONS || i == SOURCE::CONTAINER){
+ m_oRecoMuonSegmentPlots.push_back(new RecoMuonSegmentPlots(0, dirpath, true));
+ }
+ else{
+ m_oRecoMuonSegmentPlots.push_back(new RecoMuonSegmentPlots(0, dirpath, false));
+ }
+
+ bookInMongroup(*m_oRecoMuonSegmentPlots[i], mongroup_segments, m_sources[i]).ignore();
+
+ if(i > SOURCE::CBMUONS){//for MS tracks, only do not CB muons, since it overlaps with ME
+ dirpath = "TracksMS/" + m_sources[i];
+ MonGroup mongroup_mstracks(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonMSTrackPlots.push_back(new RecoMuonTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonMSTrackPlots[i - 3], mongroup_mstracks, m_sources[i], "MS").ignore();
+ }
+
+ if(i != SOURCE::CONTAINER){//for IDME tracks and Muon, do not do container
+ dirpath = "Muons/" + m_sources[i];
+ MonGroup mongroup_mutracks(this, rootpath + dirpath, run, attr);
+ if(i > SOURCE::CBMUONS){
+ m_oRecoMuonPlots.push_back(new RecoMuonPlots(0, dirpath, false));
+ }
+ else{
+ m_oRecoMuonPlots.push_back(new RecoMuonPlots(0, dirpath, true));
+ }
+ bookInMongroup(*m_oRecoMuonPlots[i], mongroup_mutracks, m_sources[i], "").ignore();
+
+ dirpath = "TracksME/" + m_sources[i];
+ MonGroup mongroup_metracks(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonMETrackPlots.push_back(new RecoMuonTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonMETrackPlots[i], mongroup_metracks, m_sources[i], "ME").ignore();
+
+ dirpath = "TracksID/" + m_sources[i];
+ MonGroup mongroup_idtracks(this, rootpath + dirpath, run, attr);
+ m_oRecoMuonIDTrackPlots.push_back(new RecoMuonIDTrackPlots(0, dirpath));
+ bookInMongroup(*m_oRecoMuonIDTrackPlots[i], mongroup_idtracks, m_sources[i], "ID").ignore();
+ }
+
+ if(i == SOURCE::Z){
+ dirpath = rootpath + "/MuonTrkPhys/" + m_sources[i];
+ MonGroup mongroup_Zsignal(this, dirpath, run, attr);
+ m_oRecoPhysPlots.push_back(new RecoPhysPlots(0, "", m_sources[i]));//the naming for res is slightly diff
+ bookInMongroup(*m_oRecoPhysPlots[i], mongroup_Zsignal, m_sources[i]).ignore();
+ }
+ if(i == SOURCE::JPSI){
+ dirpath = rootpath + "/MuonTrkPhys/" + m_sources[i];
+ MonGroup mongroup_Jpsisignal(this, dirpath, run, attr);
+ m_oRecoPhysPlots.push_back(new RecoPhysPlots(0, "", m_sources[i]));//the naming for res is slightly diff
+ bookInMongroup(*m_oRecoPhysPlots[i], mongroup_Jpsisignal, m_sources[i]).ignore();
+ }
+ }//end of loopoing over different m_sources
+ }//end of different trigger situations
+ }//end of new run condition
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode MuonGenericTracksMon::bookInMongroup(TH1* hist, MonGroup& mongroup)
+{
+ ATH_MSG_DEBUG ("Initializing " << hist << " " << hist->GetName() << "...");
+ return (mongroup.regHist(hist));
+}
+
+StatusCode MuonGenericTracksMon::bookInMongroup(HistData& hist, MonGroup& mongroup, std::string source)
+{
+ ATH_MSG_INFO ("Initializing " << hist.first << " " << hist.first->GetName() << " " << hist.second << "...");
+ //change hist title
+ TString sHistTitle = hist.first->GetTitle();
+ source = m_MuonTriggerChainName + source;//add trig titles here
+ std::replace( source.begin(), source.end(), '/', ' ');//name clean
+ sHistTitle = sHistTitle.Insert(0, (source + ": ").c_str());
+ hist.first->SetTitle(sHistTitle);
+
+ ATH_CHECK(mongroup.regHist(hist.first));
+ return StatusCode::SUCCESS;
+}
+
+StatusCode MuonGenericTracksMon::bookInMongroup(PlotBase& valPlots, MonGroup& mongroup, std::string source)
+{
+ valPlots.initialize();
+ std::vector<HistData> hists = valPlots.retrieveBookedHistograms(); // HistData -> std::pair<TH1*, std::string>
+ for (auto hist: hists){
+ bookInMongroup(hist, mongroup, source).ignore();
+ }
+ return StatusCode::SUCCESS;
+}
+
+StatusCode MuonGenericTracksMon::bookInMongroup(PlotBase& valPlots, MonGroup& mongroup, std::string source, TString Montype)
+{
+ valPlots.initialize();
+ std::vector<HistData> hists = valPlots.retrieveBookedHistograms(); // HistData -> std::pair<TH1*, std::string>
+ for (auto hist: hists) {
+
+ TString sHistName = hist.first->GetName();
+ TString sHistTitle = hist.first->GetTitle();
+
+ // rebin and/or change the axis range label
+ // move rebin of all 2D eta_phi plots to post processing
+
+ if (sHistName.Contains("_eta_phi")){
+ hist.first->GetXaxis()->SetTitle("#eta");
+ hist.first->GetYaxis()->SetTitle("#phi");
+ }
+ else if (sHistName.EndsWith("_eta_pt")){
+ hist.first->GetYaxis()->SetTitle("p_{T} [GeV]");
+ hist.first->GetXaxis()->SetTitle("#eta");
+ }
+ else if (sHistName.EndsWith("_eta")){
+ hist.first->RebinX(2);
+ hist.first->GetXaxis()->SetTitle("#eta");
+ }
+ else if (sHistName.EndsWith("_phi")){
+ hist.first->RebinX(2);
+ hist.first->GetXaxis()->SetTitle("#phi");
+ }
+ else if (sHistName.EndsWith("_pt")){
+ hist.first->RebinX(2);
+ hist.first->GetXaxis()->SetLimits(0, 100);//consider repace with SetLimits(0, 100)
+ hist.first->GetXaxis()->SetTitle("p_{T} [GeV]");
+ }
+ else if (sHistName.EndsWith("_ddpt")){
+ hist.first->RebinX(3);
+ }
+ else if (sHistName.EndsWith("_z0")){
+ hist.first->RebinX(2);
+ }
+ else if (sHistName.EndsWith("_d0")){
+ hist.first->RebinX(2);
+ }
+
+ // for ID track hits, special treatment
+ if (sHistName.Contains("HitContent")){
+ hist.first->SetName(pathToHistName(m_MuonTriggerChainName) + "Tracks" + Montype + "_" + source + "_" + sHistName);
+ }
+
+ // change histogram title
+ if (Montype != ""){//do this only for tracks
+ if (sHistTitle.Contains("Track")) {
+ sHistTitle = sHistTitle.Replace(0, 6, Montype + " Track ");
+ hist.first->SetTitle(sHistTitle);
+ }
+ else if (sHistTitle.Contains("Reco Muon")) {
+ sHistTitle = sHistTitle.Replace(0, 9, Montype + " Track ");
+ hist.first->SetTitle(sHistTitle);
+ }
+ else hist.first->SetTitle(Montype + " Track " + sHistTitle);
+ }
+
+ bookInMongroup(hist, mongroup, source).ignore();
+ }
+ return StatusCode::SUCCESS;
+}
+
+//======================================================================================//
+StatusCode MuonGenericTracksMon::fillHistograms()
+{
+ ATH_MSG_DEBUG("In fillHistograms()");
+ const xAOD::EventInfo* eventInfo=nullptr;
+ ATH_CHECK(evtStore()->retrieve(eventInfo));
+
+ if(!(m_environment == AthenaMonManager::tier0 ||
+ m_environment == AthenaMonManager::tier0ESD ||
+ m_environment == AthenaMonManager::online ||
+ m_environment == AthenaMonManager::AOD)){
+
+ return StatusCode::SUCCESS;
+ }
+
+ ATH_MSG_DEBUG("LB " << eventInfo->lumiBlock() <<
+ " instant " << ManagedMonitorToolBase::lbLuminosityPerBCID() <<
+ " average " << ManagedMonitorToolBase::lbAverageLuminosity() <<
+ " duration " << ManagedMonitorToolBase::lbDuration() <<
+ " lbint " << ManagedMonitorToolBase::lbInteractionsPerCrossing()
+ );
+ m_current_lb = eventInfo->lumiBlock();
+ m_hNEvent->Fill(m_current_lb, 1);
+
+ m_inst_lumi_bcid = ManagedMonitorToolBase::lbLuminosityPerBCID();
+ if(m_inst_lumi_bcid < 0){
+ ATH_MSG_DEBUG("Weird instantaneous luminosity per bcid. Setting to 0.");
+ m_inst_lumi_bcid = 0;
+ }
+ m_inst_lumi_lb = ManagedMonitorToolBase::lbAverageLuminosity();
+ if(m_inst_lumi_lb < 0){
+ ATH_MSG_DEBUG("Weird instantaneous luminosity per lb. Setting to 0.");
+ m_inst_lumi_lb = 0;
+ }
+
+ // retrieve containers
+ const xAOD::MuonSegmentContainer* MuonSegments=nullptr;
+ ATH_CHECK(evtStore()->retrieve(MuonSegments, m_muonSegmentsName));
+ const xAOD::TrackParticleContainer* tracksMS=nullptr;
+ ATH_CHECK(evtStore()->retrieve(tracksMS, m_muonTracksName));
+ const xAOD::MuonContainer* Muons=nullptr;
+ ATH_CHECK(evtStore()->retrieve(Muons, m_muonsName));
+ const xAOD::VertexContainer* MSVertices=nullptr;
+ ATH_CHECK(evtStore()->retrieve(MSVertices, m_msVertexCollection));
+
+ // check validity
+ if (!MuonSegments){
+ ATH_MSG_WARNING ("Couldn't retrieve MuonSegments container: " << m_muonSegmentsName);
+ return StatusCode::SUCCESS;
+ }
+ if (!tracksMS) {
+ ATH_MSG_WARNING ("Couldn't retrieve MS tracks container: " << m_muonTracksName);
+ return StatusCode::SUCCESS;
+ }
+ if (!Muons){
+ ATH_MSG_WARNING ("Couldn't retrieve Muons container: " << m_muonsName);
+ return StatusCode::SUCCESS;
+ }
+ if (!MSVertices){
+ ATH_MSG_WARNING ("Couldn't retrieve MS vertex container: " << m_msVertexCollection);
+ return StatusCode::SUCCESS;
+ }
+
+ // fill the histograms
+ if (m_MuonTriggerChainName != ""){
+ // plot luminosity related plots
+ plot_lumi_notrig(Muons, tracksMS, MuonSegments);
+
+ // plot segments container
+ for (const xAOD::MuonSegment* segment : *MuonSegments)
+ {
+ plot_segment(*segment, 2);//be consistent!
+ }
+
+ // plot tracks (MS) container
+ for (const xAOD::TrackParticle* track: *tracksMS)
+ {
+ plot_track(*track, 0);
+ }
+
+ // plot Muon container
+ for (const xAOD::Muon* muon: *Muons)
+ {
+ if(muon->muonType() == xAOD::Muon::Combined) {
+ plot_muon_notrig(*muon, 0);
+ }
+ else {
+ plot_muon_notrig(*muon, 1);
+ }
+ }
+ // plot ms vertices
+ for (const xAOD::Vertex* aVx: *MSVertices)
+ {
+ plot_vertex(*aVx, 0);
+ }
+ }
+ else{
+ // select muons from Jpsi & Z
+ auto muons_jpsi = m_JpsimumuResonanceSelectionTool->selectMuons(Muons, false, CP::SystematicSet());
+ auto muons_Z = m_ZmumuResonanceSelectionTool->selectMuons(Muons, false, CP::SystematicSet());
+
+ // find J/psi & Z candidates
+ auto resonances_jpsi = m_JpsimumuResonancePairingTool->buildPairs(muons_jpsi);
+ auto resonances_Z = m_ZmumuResonancePairingTool->buildPairs(muons_Z);
+ // plot luminosity related plots
+ plot_lumi(resonances_Z, resonances_jpsi, Muons, tracksMS, MuonSegments);
+
+ // plot muons, Z and Jpsi, only for collisions
+ if (m_dataType != AthenaMonManager::cosmics){
+ for (auto resonance: resonances_Z)
+ {
+ plot_muon(*resonance.first, SOURCE::Z);
+ plot_muon(*resonance.second, SOURCE::Z);
+ }
+ plot_resonances(resonances_Z, SOURCE::Z);
+
+ // plot muons, J/Psi
+ for (auto resonance: resonances_jpsi)
+ {
+ plot_muon(*resonance.first, SOURCE::JPSI);
+ plot_muon(*resonance.second, SOURCE::JPSI);
+ }
+ plot_resonances(resonances_jpsi, SOURCE::JPSI);
+ }
+
+ // plot muons, all
+ for (const xAOD::Muon* muon: *Muons)
+ {
+ if(muon->muonType() == xAOD::Muon::Combined) {
+ plot_muon(*muon, SOURCE::CBMUONS);
+ }
+ else {
+ plot_muon(*muon, SOURCE::NONCBMUONS);
+ }
+ }
+
+ // plot segments container
+ for (const xAOD::MuonSegment* segment : *MuonSegments)
+ {
+ plot_segment(*segment, SOURCE::CONTAINER);
+ }
+
+ // plot tracks (MS) container
+ for (const xAOD::TrackParticle* track: *tracksMS)
+ {
+ plot_track(*track, SOURCE::CONTAINER - 3);
+ }
+ //clean the resonance candidates
+ for (const xAOD::Muon* muon : muons_jpsi.first) delete muon;
+ for (const xAOD::Muon* muon : muons_jpsi.second) delete muon;
+ for (const xAOD::Muon* muon : muons_Z.first) delete muon;
+ for (const xAOD::Muon* muon : muons_Z.second) delete muon;
+ }//end of different trigger situations
+ //finish all the plotting
+ return StatusCode::SUCCESS;
+}
+
+//======================================================================================//
+void MuonGenericTracksMon::plot_lumi(
+ std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances_Z,
+ std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances_jpsi,
+ const xAOD::MuonContainer* Muons,
+ const xAOD::TrackParticleContainer* tracksMS,
+ const xAOD::MuonSegmentContainer* MuonSegments)
+//======================================================================================//
+{
+ //fill all the luminoisty related plot
+ m_oRecoLumiPlots[SOURCE::Z]->fill(resonances_Z, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[SOURCE::JPSI]->fill(resonances_jpsi, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[SOURCE::CBMUONS]->fill_CB(Muons, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[SOURCE::NONCBMUONS]->fill_Other(Muons, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[SOURCE::CONTAINER]->fill(tracksMS, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[SOURCE::CONTAINER]->fill(MuonSegments, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+}
+
+
+//======================================================================================//
+void MuonGenericTracksMon::plot_lumi_notrig(
+ const xAOD::MuonContainer* Muons,
+ const xAOD::TrackParticleContainer* tracksMS,
+ const xAOD::MuonSegmentContainer* MuonSegments)
+//======================================================================================//
+{
+ //fill all the luminoisty related plot
+ m_oRecoLumiPlots[0]->fill_CB(Muons, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[1]->fill_Other(Muons, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[2]->fill(tracksMS, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+ m_oRecoLumiPlots[2]->fill(MuonSegments, m_current_lb, m_inst_lumi_bcid, m_inst_lumi_lb);
+}
+
+//======================================================================================//
+void MuonGenericTracksMon::plot_muon(const xAOD::Muon& muon, int source)
+//======================================================================================//
+{
+
+
+ xAOD::Muon::Quality my_quality = m_muonSelectionTool->getQuality(muon);
+ ATH_MSG_DEBUG ("Muon quality value: " << my_quality << " default value " << muon.quality());
+
+ m_oRecoMuonPlots[source]->fill(muon);
+ if (source == SOURCE::NONCBMUONS) m_oRecoMuonMSTrackPlots[source - 3]->fill(muon, MUON_COMPONENT::TRACK_MS);
+ m_oRecoMuonMETrackPlots[source]->fill(muon, MUON_COMPONENT::TRACK_ME);
+ m_oRecoMuonIDTrackPlots[source]->fill(muon, MUON_COMPONENT::TRACK_ID);
+ m_oRecoMuonSegmentPlots[source]->fill(muon);
+ m_oRecoMuonPlots[source]->fill(muon, my_quality);
+}
+
+//======================================================================================//
+void MuonGenericTracksMon::plot_muon_notrig(const xAOD::Muon& muon, int source)
+//======================================================================================//
+{
+ xAOD::Muon::Quality my_quality = m_muonSelectionTool->getQuality(muon);
+ ATH_MSG_DEBUG ("Muon quality value: " << my_quality << " default value " << muon.quality());
+
+ m_oRecoMuonPlots[source]->fill(muon);
+ m_oRecoMuonPlots[source]->fill(muon, my_quality);
+ m_oRecoMuonIDTrackPlots[source]->fill(muon, MUON_COMPONENT::TRACK_ID);
+ m_oRecoMuonMETrackPlots[source]->fill(muon, MUON_COMPONENT::TRACK_ME);
+ m_oRecoMuonSegmentPlots[source]->fill(muon);
+}
+
+//======================================================================================//
+void MuonGenericTracksMon::plot_segment(const xAOD::MuonSegment& segment, int source)
+//======================================================================================//
+{
+
+ m_oRecoMuonSegmentPlots[source]->fill(segment);
+}
+
+//======================================================================================//
+void MuonGenericTracksMon::plot_track(const xAOD::TrackParticle& track, int source)
+//======================================================================================//
+{
+
+ m_oRecoMuonMSTrackPlots[source]->fill(track);
+}
+//======================================================================================//
+void MuonGenericTracksMon::plot_vertex(const xAOD::Vertex& aVx, int source)
+//======================================================================================//
+{
+
+ m_oRecoVertexPlots[source]->fill(aVx);
+}
+
+//======================================================================================//
+void MuonGenericTracksMon::plot_resonances(std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances, int source)
+//======================================================================================//
+{
+ m_oRecoPhysPlots[source]->fill(resonances);
+
+}
+
+//======================================================================================//
+StatusCode MuonGenericTracksMon::procHistograms()
+//======================================================================================//
+{
+ if(!(m_environment == AthenaMonManager::tier0 ||
+ m_environment == AthenaMonManager::tier0ESD ||
+ m_environment == AthenaMonManager::online ||
+ m_environment == AthenaMonManager::AOD)){
+
+ return StatusCode::SUCCESS;
+ }
+
+ ATH_MSG_DEBUG("MuonTrackMonitoring procHistograms()");
+
+ if(endOfRunFlag()) {
+
+ //finish the post processing
+
+ //remove all the pointers
+ for (auto plots : m_oRecoLumiPlots) delete plots;
+ for (auto plots : m_oRecoMuonSegmentPlots) delete plots;
+ for (auto plots : m_oRecoMuonMSTrackPlots) delete plots;
+ for (auto plots : m_oRecoMuonMETrackPlots) delete plots;
+ for (auto plots : m_oRecoMuonIDTrackPlots) delete plots;
+ for (auto plots : m_oRecoMuonPlots) delete plots;
+ for (auto plots : m_oRecoPhysPlots) delete plots;
+ for (auto plots : m_oRecoVertexPlots) delete plots;
+
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+//======================================================================================//
+StatusCode MuonGenericTracksMon::setupTools()
+//======================================================================================//
+{
+ ATH_CHECK(m_ZmumuResonanceSelectionTool.retrieve());
+ ATH_MSG_DEBUG( "Retrieved " << m_ZmumuResonanceSelectionTool );
+
+ ATH_CHECK(m_ZmumuResonancePairingTool.retrieve());
+ ATH_MSG_DEBUG( "Retrieved " << m_ZmumuResonancePairingTool );
+
+ ATH_CHECK(m_JpsimumuResonanceSelectionTool.retrieve());
+ ATH_MSG_DEBUG( "Retrieved " << m_JpsimumuResonanceSelectionTool );
+
+ ATH_CHECK(m_JpsimumuResonancePairingTool.retrieve());
+ ATH_MSG_DEBUG( "Retrieved " << m_JpsimumuResonancePairingTool );
+
+ ATH_CHECK(m_muonSelectionTool.retrieve());
+ ATH_MSG_DEBUG( "Retrieved " << m_muonSelectionTool );
+
+ return StatusCode::SUCCESS;
+}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
index 732e53a50c501a28ab3682ca828eb570a7b49f66..fc7a344c1d6232e9375468df4c942652ea7dd242 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
@@ -3,7 +3,7 @@
2020 Matthias Schott - Uni Mainz
*/
-#include "MuonTrackMonitorAlgorithm.h"
+#include "MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h"
MuonTrackMonitorAlgorithm::MuonTrackMonitorAlgorithm (const std::string& name, ISvcLocator* pSvcLocator)
:AthMonitorAlgorithm(name,pSvcLocator){}
@@ -413,10 +413,8 @@ StatusCode MuonTrackMonitorAlgorithm::fillHistograms(const EventContext& ctx) co
ATH_CHECK( analyseLowLevelMuonFeatures(*Muons, lumiBlockID) );
ATH_CHECK( analyseCombinedTracks(*Muons, lumiBlockID) );
- if (dataType() != DataType_t::cosmics) {
- ATH_CHECK( analyseZBosonCandidates(*Muons, lumiBlockID) );
- ATH_CHECK( analyseJPsiCandidates(*Muons, lumiBlockID) );
- }
+ ATH_CHECK( analyseZBosonCandidates(*Muons, lumiBlockID) );
+ ATH_CHECK( analyseJPsiCandidates(*Muons, lumiBlockID) );
return StatusCode::SUCCESS;
}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/PlotMuons.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/PlotMuons.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..2686219f6b16108a03e259c0db1f40288c389f0b
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/PlotMuons.cxx
@@ -0,0 +1,21 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/PlotMuons.h"
+
+PlotMuons::PlotMuons(PlotBase* pParent, std::string sDir):PlotBase(pParent, sDir),
+ m_plots_All(this, "/", "Plot Muons"),
+ m_plots_RecoInfo(this, "/"),
+ m_plots_MomentumPull(this, "/"),
+ m_plots_MuonHitSummary(this, "/")
+{}
+
+void PlotMuons::fill(const xAOD::Muon& muon){
+
+ m_plots_All.fill(muon);
+ m_plots_RecoInfo.fill(muon);
+ m_plots_MomentumPull.fill(muon);
+ m_plots_MuonHitSummary.fill(muon);
+
+}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoLumiPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoLumiPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..012a689904b7efdbea3c938c255af5ca2e263dcf
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoLumiPlots.cxx
@@ -0,0 +1,119 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/RecoLumiPlots.h"
+
+RecoLumiPlots::RecoLumiPlots(PlotBase* pParent, std::string sDir, std::string recObj):PlotBase(pParent, sDir),
+
+ m_hNSegment_LB_1D(nullptr),
+ m_hNMuonTrack_LB_1D(nullptr),
+ m_hNMuon_LB_1D(nullptr),
+ m_hNResonance_LB_1D(nullptr),
+
+ m_hNSegment_LB(nullptr),
+ m_hNMuonTrack_LB(nullptr),
+ m_hNMuon_LB(nullptr),
+ m_hNResonance_LB(nullptr),
+
+ type(recObj),
+ name("other")
+{}
+
+void RecoLumiPlots::initializePlots()
+{
+
+ //Specify the names for different resonances
+ std::string Zsig("Z");
+ std::string Jsig("Jpsi");
+ std::string CBMuons("CBMuons");
+ std::string OtherMuons("NonCBMuons");
+
+ if (!type.compare(Zsig)) {name = "Z"; }
+ else if (!type.compare(Jsig)) {name = "J/#psi"; }
+ else if (!type.compare(CBMuons)) {name = "CBMuons"; }
+ else if (!type.compare(OtherMuons)) {name = "NonCBMuons";}
+ else {name = "other"; }
+
+ n_lbs = 2500;
+
+ //Make sure the 1D hists has the same dimension as the 2D!
+ if (name == "other"){
+ m_hNSegment_LB = Book2D("nSegment_LB_2D", "Number of Muon Segments Per LumiBlock;LumiBlock;Number of Segments", n_lbs, -0.5, (float)(n_lbs)-0.5, 100, 0.5, 101.5);
+ m_hNMuonTrack_LB = Book2D("nMuonTrack_LB_2D", "Number of Muon MS Tracks Per LumiBlock;LumiBlock;Number of Tracks", n_lbs, -0.5, (float)(n_lbs)-0.5, 21, 0.5, 21.5);
+ m_hNSegment_LB_1D = Book1D("nSegment_LB", "Number of Muon Segments Per LumiBlock;LumiBlock;Number of Segments", n_lbs, -0.5, (float)(n_lbs)-0.5);
+ m_hNMuonTrack_LB_1D = Book1D("nMuonTrack_LB", "Number of Muon MS Tracks Per LumiBlock;LumiBlock;Number of Tracks", n_lbs, -0.5, (float)(n_lbs)-0.5);
+ }
+ else if (name == "CBMuons"){
+ m_hNMuon_LB = Book2D("nMuon_LB_2D", "Number of Muons Per LumiBlock;LumiBlock;Nmuons", n_lbs, -0.5, (float)(n_lbs)-0.5, 21, 0.5, 21.5);
+ m_hNMuon_LB_1D = Book1D("nMuon_LB", "Number of Muons Per LumiBlock;LumiBlock;Nmuons", n_lbs, -0.5, (float)(n_lbs)-0.5);
+ }
+ else if (name == "NonCBMuons"){
+ m_hNMuon_LB = Book2D("nMuon_LB_2D", "Number of non-CB Muons Per LumiBlock;LumiBlock;Nmuons", n_lbs, -0.5, (float)(n_lbs)-0.5, 21, 0.5, 21.5);
+ m_hNMuon_LB_1D = Book1D("nMuon_LB", "Number of non-CB Muons Per LumiBlock;LumiBlock;Nmuons", n_lbs, -0.5, (float)(n_lbs)-0.5);
+ }
+ else if (name == "Z" || name == "J/#psi"){
+ m_hNResonance_LB = Book2D("n" + type + "_LB_2D", "Number of " + name + " Per LumiBlock;LumiBlock;Number of " + name, n_lbs, -0.5, (float)(n_lbs)-0.5, 5, 0.5, 5.5);
+ m_hNResonance_LB_1D = Book1D("n" + type + "_LB", "Number of " + name + " Per LumiBlock;LumiBlock;Number of " + name, n_lbs, -0.5, (float)(n_lbs)-0.5);
+ }
+
+}
+
+//fill Segment related lb plots
+void RecoLumiPlots::fill(const xAOD::MuonSegmentContainer* MuonSegments, int current_lb, float inst_lumi_bcid, float inst_lumi_lb) {
+
+ m_hNSegment_LB->Fill(current_lb, MuonSegments->size() + inst_lumi_bcid - inst_lumi_bcid + inst_lumi_lb - inst_lumi_lb);
+
+}
+
+//fill Track related plots
+void RecoLumiPlots::fill(const xAOD::TrackParticleContainer* MSTracks, int current_lb, float inst_lumi_bcid, float inst_lumi_lb){
+
+ m_hNMuonTrack_LB->Fill(current_lb, MSTracks->size() + inst_lumi_bcid - inst_lumi_bcid + inst_lumi_lb - inst_lumi_lb);
+
+}
+
+//fill CB muon related plots
+void RecoLumiPlots::fill_CB(const xAOD::MuonContainer* Muons, int current_lb, float inst_lumi_bcid, float inst_lumi_lb){
+
+ int NMuIDco = 0;
+
+ for(const auto mu : *Muons) {
+
+ //do a muon quality cut: 0 tight, 1 medium, 2 loss
+ if(mu->muonType() == xAOD::Muon::Combined){NMuIDco++;}
+
+ }
+
+ //only do this for combined muons
+ m_hNMuon_LB->Fill(current_lb, NMuIDco + inst_lumi_bcid - inst_lumi_bcid + inst_lumi_lb - inst_lumi_lb);
+
+}
+
+//fill other muon related plots
+void RecoLumiPlots::fill_Other(const xAOD::MuonContainer* Muons, int current_lb, float inst_lumi_bcid, float inst_lumi_lb){
+
+ int NMuIDco = 0;
+
+ for(const auto mu : *Muons) {
+
+ //do a muon quality cut: 0 tight, 1 medium, 2 loss
+ if(mu->muonType() != xAOD::Muon::Combined){NMuIDco++;}
+
+ }
+
+ //only do this for combined muons
+ m_hNMuon_LB->Fill(current_lb, NMuIDco + inst_lumi_bcid - inst_lumi_bcid + inst_lumi_lb - inst_lumi_lb);
+
+}
+
+//fill muon related plots
+void RecoLumiPlots::fill(std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > resonances, int current_lb, float inst_lumi_bcid, float inst_lumi_lb){
+
+ int Nresonance = resonances.size();
+
+ //only do this for combined muons
+ m_hNResonance_LB->Fill(current_lb, Nresonance + inst_lumi_bcid - inst_lumi_bcid + inst_lumi_lb - inst_lumi_lb);//playing really dumb here
+
+}
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonIDTrackPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonIDTrackPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..8721581deea9fba3da71004c59323fd0d3244463
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonIDTrackPlots.cxx
@@ -0,0 +1,50 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/RecoMuonIDTrackPlots.h"
+
+RecoMuonIDTrackPlots::RecoMuonIDTrackPlots(PlotBase* pParent, std::string sDir):PlotBase(pParent, sDir),
+m_oAllPlots(this, "/", "Reco Muon"),
+m_oImpactPlots(this, "/"),
+m_oTrkRecoInfoPlots(this, "/"),
+m_oIDHitPlots(this,"/"),
+m_pt_broad(nullptr),
+m_eta_phi_broad(nullptr)
+{}
+
+void RecoMuonIDTrackPlots::initializePlots(){
+ //booking histograms
+ m_pt_broad = Book1D("_pt_broad", "High p_{T} Distribution", 70, 100, 1500);
+ m_eta_phi_broad = Book2D("_eta_phi_broad", "High p_{T} Muon #eta #phi Distribution;;#eta;#phi", 52, -2.6, 2.6, 64, -3.2, 3.2);
+}
+
+//when the plot function called with a Muon Container
+//loop through each muon, get the corresponding link and fill it
+
+//when the plot function called with a Muon
+//get's the corresponding link and fill it
+void RecoMuonIDTrackPlots::fill(const xAOD::Muon& mu, int component){
+ if (component == 2 ){
+ ElementLink<xAOD::TrackParticleContainer> Mu_idtrack = mu.inDetTrackParticleLink();
+ if(Mu_idtrack.isValid()){
+ const xAOD::TrackParticle* trk = *Mu_idtrack;
+ fill(*trk);
+ }
+ }
+}
+
+
+void RecoMuonIDTrackPlots::fill(const xAOD::TrackParticle& muTP){
+ m_oAllPlots.fill(muTP);
+ m_oImpactPlots.fill(muTP);
+ m_oTrkRecoInfoPlots.fill(muTP);
+ m_oIDHitPlots.fill(muTP);
+ if (muTP.pt()/1000.0 > 100) {//ony for high pt muons
+ m_pt_broad->Fill(muTP.pt()/1000.0);
+ m_eta_phi_broad->Fill(muTP.eta(), muTP.phi());
+ }
+
+}
+
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..3567138624c20015302fe3e4b20b27b0404fcfb7
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonPlots.cxx
@@ -0,0 +1,188 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/RecoMuonPlots.h"
+#include "MuonHistUtils/MuonEnumDefs.h"
+typedef ElementLink< xAOD::TrackParticleContainer > TrackLink;
+typedef ElementLink< xAOD::MuonContainer > MuonLink;
+
+RecoMuonPlots::RecoMuonPlots(PlotBase* pParent, std::string sDir, bool detail):PlotBase(pParent, sDir)
+
+, m_oAllPlots(this, "/", "Reco Muon")
+, m_oMuRecoInfoPlots(this, "/")
+, m_oImpactPlots(this, "/")
+, m_oMomentumPullPlots(this, "/")
+, m_origin_eta_phi(nullptr)
+, m_eff_tight(nullptr)
+, m_eff_medium(nullptr)
+, m_tight_eta_phi(nullptr)
+, m_medium_eta_phi(nullptr)
+, m_pt_broad(nullptr)
+, m_eta_phi_broad(nullptr)
+, m_eff_nPrec(nullptr)
+, m_eff_nPhi(nullptr)
+, m_eff_nTrigEta(nullptr)
+, m_eff_ndof(nullptr)
+, m_eff_chi2(nullptr)
+, m_ID_eff_ndof(nullptr)
+, m_ID_eff_chi2(nullptr)
+, m_MS_eff_ndof(nullptr)
+, m_MS_eff_chi2(nullptr)
+{
+ Detail = detail;
+}
+
+void RecoMuonPlots::initializePlots(){
+ //be very careful here, bin size is the same as the defult value
+ std::vector<HistData> hists = m_oAllPlots.retrieveBookedHistograms(); // HistData -> std::pair<TH1*, std::string>
+ int xbins = 52;
+ int ybins = 64;
+ float xmin = -2.6;
+ float xmax = 2.6;
+ float ymin = -3.2;
+ float ymax = 3.2;
+
+ //now register!
+ m_origin_eta_phi= Book2D("_Origin_eta_phi", "Original Distribution;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_eff_tight = Book2D("_Tight_eff", "Tight Quality Efficiency;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_eff_medium = Book2D("_Medium_eff", "Medium Quality Efficiency;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_tight_eta_phi = Book2D("_Tight_eta_phi", "Tight Muon #eta #phi Distribution;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_medium_eta_phi = Book2D("_Medium_eta_phi", "Medium Muon #eta #phi Distribution;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ if (Detail){
+ m_pt_broad = Book1D("_pt_broad", "High p_{T} Distribution;p_{T} [GeV]", 70, 100, 1500);
+ m_eta_phi_broad = Book2D("_eta_phi_broad", "High p_{T} Muon #eta #phi Distribution;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+
+ m_eff_nPrec = Book2D("_eff_nPrec", "average number of Precision Layers;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_eff_nPhi = Book2D("_eff_nPhi", "average number of Phi Layers;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_eff_nTrigEta = Book2D("_eff_nTrigEta","average number of Trigger Eta Layers;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_eff_ndof = Book2D("_eff_ndof", "average number of hits;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_eff_chi2 = Book2D("_eff_chi2", "average #chi^{2} per DOF;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_ID_eff_ndof = Book2D("_ID_eff_ndof", "ID track average number of hits;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_ID_eff_chi2 = Book2D("_ID_eff_chi2", "ID track average #chi^{2} per DOF;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_MS_eff_ndof = Book2D("_MS_eff_ndof", "MS track average number of hits;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_MS_eff_chi2 = Book2D("_MS_eff_chi2", "MS track average #chi^{2} per DOF;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+
+ m_avg_hits_precision_inner = Book2D("_avg_hits_precision_inner", "avg. precision hits, inner;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_precision_middle = Book2D("_avg_hits_precision_middle", "avg. precision hits, middle;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_precision_outer = Book2D("_avg_hits_precision_outer", "avg. precision hits, outer;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_precision_extended = Book2D("_avg_hits_precision_extended", "avg. precision hits, extended;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+
+ m_avg_hits_trigger_layer1 = Book2D("_avg_hits_trigger_layer1", "avg. trigger hits, layer 1;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_trigger_layer2 = Book2D("_avg_hits_trigger_layer2", "avg. trigger hits, layer 2;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_trigger_layer3 = Book2D("_avg_hits_trigger_layer3", "avg. trigger hits, layer 3;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_trigger_layer4 = Book2D("_avg_hits_trigger_layer4", "avg. trigger hits, layer 4;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+
+ m_avg_hits_ibl = Book2D("_avg_hits_ibl", "avg. IBL hits;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_pix = Book2D("_avg_hits_pix", "avg. Pix hits;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_sct = Book2D("_avg_hits_sct", "avg. SCT hits;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_hits_trt = Book2D("_avg_hits_trt", "avg. TRT hits;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+
+ m_avg_ddpt_idme = Book2D("_avg_ddpt_idme", "avg. |pt_{ID} - pt_{ME}| / pt_{CB};#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+ m_avg_dptsignif = Book2D("_avg_dptsignif", "avg. momentum diff. signif.;#eta;#phi", xbins, xmin, xmax, ybins, ymin, ymax);
+
+ }
+}
+
+void RecoMuonPlots::fill(const xAOD::Muon& mu){
+ //General Plots
+ m_oAllPlots.fill(mu);
+ m_oMuRecoInfoPlots.fill(mu);
+ m_oMomentumPullPlots.fill(mu);
+
+ const xAOD::TrackParticle* primaryTrk = mu.trackParticle(xAOD::Muon::Primary);
+ // tracking related plots
+ if (!primaryTrk) return;
+ m_oImpactPlots.fill(*primaryTrk);
+ //m_oMSHitPlots.fill(*primaryTrk);
+
+}
+
+void RecoMuonPlots::fill(const xAOD::Muon& mu, xAOD::Muon::Quality my_quality){
+
+ //always fill the origin plot
+ m_origin_eta_phi->Fill(mu.eta(), mu.phi());
+
+ //General Plots; inclusive
+ if (my_quality <= xAOD::Muon::Tight) m_tight_eta_phi->Fill(mu.eta(), mu.phi());
+ if (my_quality <= xAOD::Muon::Medium) m_medium_eta_phi->Fill(mu.eta(), mu.phi());
+
+ if(!Detail) return;
+ if (mu.pt()/1000.0 > 100) {//ony for high pt muons
+ m_pt_broad->Fill(mu.pt()/1000.0);
+ m_eta_phi_broad->Fill(mu.eta(), mu.phi());
+ }
+ const xAOD::TrackParticle* primaryTrk = mu.trackParticle(xAOD::Muon::Primary);
+ const xAOD::TrackParticle* inDetTrk = mu.trackParticle(xAOD::Muon::InnerDetectorTrackParticle);
+ int correctEnum = (int) xAOD::Muon::MuonSpectrometerTrackParticle;
+ if (mu.isAvailable< ElementLink<xAOD::TrackParticleContainer> >("extrapolatedMuonSpectrometerTrackParticleLink") && (mu.auxdata< ElementLink<xAOD::TrackParticleContainer> >("extrapolatedMuonSpectrometerTrackParticleLink")).isValid()) correctEnum+=2; //check correct numbering in Muon.h
+ const xAOD::TrackParticle* msExtrapTrk = mu.trackParticle((xAOD::Muon::TrackParticleType) correctEnum);
+
+ //fill the ndof and chi2 as eta phi map; to calculate efficiencies in post processing
+ //if necessary, can use a quality cut here
+ if (primaryTrk) {
+ m_eff_ndof->Fill(primaryTrk->eta(), primaryTrk->phi(), primaryTrk->numberDoF());
+ m_eff_chi2->Fill(primaryTrk->eta(), primaryTrk->phi(), primaryTrk->chiSquared()/(primaryTrk->numberDoF() * 1.0));
+ }
+ if (inDetTrk) {
+ m_ID_eff_ndof->Fill(inDetTrk->eta(), inDetTrk->phi(), inDetTrk->numberDoF());
+ m_ID_eff_chi2->Fill(inDetTrk->eta(), inDetTrk->phi(), inDetTrk->chiSquared()/(inDetTrk->numberDoF() * 1.0));
+ }
+ if (msExtrapTrk) {
+ m_MS_eff_ndof->Fill(msExtrapTrk->eta(), msExtrapTrk->phi(), msExtrapTrk->numberDoF());
+ m_MS_eff_chi2->Fill(msExtrapTrk->eta(), msExtrapTrk->phi(), msExtrapTrk->chiSquared()/(msExtrapTrk->numberDoF() * 1.0));
+ }
+
+ if (!primaryTrk->summaryValue(hitval_numberOfPrecisionLayers, xAOD::numberOfPrecisionLayers)) return;
+ if (!primaryTrk->summaryValue(hitval_numberOfPhiLayers, xAOD::numberOfPhiLayers)) return;
+ if (!primaryTrk->summaryValue(hitval_numberOfTriggerEtaLayers, xAOD::numberOfTriggerEtaLayers)) return;
+
+ if (!mu.summaryValue(hitval_innerSmallHits, xAOD::MuonSummaryType::innerSmallHits)) return;
+ if (!mu.summaryValue(hitval_innerLargeHits, xAOD::MuonSummaryType::innerLargeHits)) return;
+ if (!mu.summaryValue(hitval_middleSmallHits, xAOD::MuonSummaryType::middleSmallHits)) return;
+ if (!mu.summaryValue(hitval_middleLargeHits, xAOD::MuonSummaryType::middleLargeHits)) return;
+ if (!mu.summaryValue(hitval_outerSmallHits, xAOD::MuonSummaryType::outerSmallHits)) return;
+ if (!mu.summaryValue(hitval_outerLargeHits, xAOD::MuonSummaryType::outerLargeHits)) return;
+ if (!mu.summaryValue(hitval_extendedSmallHits, xAOD::MuonSummaryType::extendedSmallHits)) return;
+ if (!mu.summaryValue(hitval_extendedLargeHits, xAOD::MuonSummaryType::extendedLargeHits)) return;
+
+ if (!mu.summaryValue(hitval_etaLayer1Hits, xAOD::MuonSummaryType::etaLayer1Hits)) return;
+ if (!mu.summaryValue(hitval_etaLayer2Hits, xAOD::MuonSummaryType::etaLayer2Hits)) return;
+ if (!mu.summaryValue(hitval_etaLayer3Hits, xAOD::MuonSummaryType::etaLayer3Hits)) return;
+ if (!mu.summaryValue(hitval_etaLayer4Hits, xAOD::MuonSummaryType::etaLayer4Hits)) return;
+
+ if (!mu.summaryValue(hitval_numberOfBLayerHits, xAOD::SummaryType::numberOfInnermostPixelLayerHits)) return;
+ if (!mu.summaryValue(hitval_numberOfPixelHits, xAOD::SummaryType::numberOfPixelHits)) return;
+ if (!mu.summaryValue(hitval_numberOfSCTHits, xAOD::SummaryType::numberOfSCTHits)) return;
+ if (!mu.summaryValue(hitval_numberOfTRTHits, xAOD::SummaryType::numberOfTRTHits)) return;
+
+ m_eff_nPrec -> Fill(mu.eta(), mu.phi(), hitval_numberOfPrecisionLayers);
+ m_eff_nPhi -> Fill(mu.eta(), mu.phi(), hitval_numberOfPhiLayers);
+ m_eff_nTrigEta -> Fill(mu.eta(), mu.phi(), hitval_numberOfTriggerEtaLayers);
+
+ m_avg_hits_precision_inner -> Fill(mu.eta(), mu.phi(), hitval_innerSmallHits + hitval_innerLargeHits);
+ m_avg_hits_precision_middle -> Fill(mu.eta(), mu.phi(), hitval_middleSmallHits + hitval_middleLargeHits);
+ m_avg_hits_precision_outer -> Fill(mu.eta(), mu.phi(), hitval_outerSmallHits + hitval_outerLargeHits);
+ m_avg_hits_precision_extended -> Fill(mu.eta(), mu.phi(), hitval_extendedSmallHits + hitval_extendedLargeHits);
+
+ m_avg_hits_trigger_layer1 -> Fill(mu.eta(), mu.phi(), hitval_etaLayer1Hits);
+ m_avg_hits_trigger_layer2 -> Fill(mu.eta(), mu.phi(), hitval_etaLayer2Hits);
+ m_avg_hits_trigger_layer3 -> Fill(mu.eta(), mu.phi(), hitval_etaLayer3Hits);
+ m_avg_hits_trigger_layer4 -> Fill(mu.eta(), mu.phi(), hitval_etaLayer4Hits);
+
+ m_avg_hits_ibl -> Fill(mu.eta(), mu.phi(), hitval_numberOfBLayerHits);
+ m_avg_hits_pix -> Fill(mu.eta(), mu.phi(), hitval_numberOfPixelHits);
+ m_avg_hits_sct -> Fill(mu.eta(), mu.phi(), hitval_numberOfSCTHits);
+ m_avg_hits_trt -> Fill(mu.eta(), mu.phi(), hitval_numberOfTRTHits);
+
+ if (primaryTrk && inDetTrk && msExtrapTrk) {
+ qoverp_diff = fabs(inDetTrk->qOverP() - msExtrapTrk->qOverP());
+ qoverp_sigma = sqrt(inDetTrk->definingParametersCovMatrix()(4,4) + msExtrapTrk->definingParametersCovMatrix()(4,4));
+ qoverp_signif = (qoverp_sigma > 0) ? (qoverp_diff / qoverp_sigma) : -999;
+ ddpt_idme = (primaryTrk->pt() > 0) ? fabs(inDetTrk->pt() - msExtrapTrk->pt()) / primaryTrk->pt() : -999;
+
+ m_avg_ddpt_idme -> Fill(mu.eta(), mu.phi(), ddpt_idme);
+ m_avg_dptsignif -> Fill(mu.eta(), mu.phi(), qoverp_signif);
+ }
+
+}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonSegmentPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonSegmentPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..da495e1c3cdb9fbd780346b427e254c59e44ca7e
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonSegmentPlots.cxx
@@ -0,0 +1,56 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/RecoMuonSegmentPlots.h"
+
+RecoMuonSegmentPlots::RecoMuonSegmentPlots(PlotBase* pParent, std::string sDir, bool detail):PlotBase(pParent, sDir)
+ , m_oMuonSegmentPlots(nullptr)
+ , m_oMuonSegmentSlimPlots(nullptr)
+ //declare the histograms
+{
+ Detail = detail;
+ if(Detail) m_oMuonSegmentPlots = new Muon::MuonSegmentPlots(this,"/");
+ else m_oMuonSegmentSlimPlots = new Muon::MuonSegmentSlimPlots(this,"/");
+}
+
+//when the plot function called with a Muon Container
+//loop through each muon, get the corresponding link and fill it
+void RecoMuonSegmentPlots::fill(const xAOD::MuonContainer& muContainer){
+ for (const auto mu : muContainer) {
+ fill(*mu);
+ }
+}
+
+//when the plot function called with a Muon
+//get's the corresponding link and fill it
+//Tony 2015.9.21: fix to go around the segment link problem for now
+void RecoMuonSegmentPlots::fill(const xAOD::Muon& mu){
+ const std::vector<ElementLink<DataVector<xAOD::MuonSegment_v1>>> Mu_Segments = mu.muonSegmentLinks();
+ fill(Mu_Segments);
+}
+
+//use the link to fill
+void RecoMuonSegmentPlots::fill(const std::vector<ElementLink<DataVector<xAOD::MuonSegment_v1>>> Mu_Segments){
+
+ for(const auto Mu_Segment : Mu_Segments){
+ const ElementLink<DataVector<xAOD::MuonSegment_v1>> Mu_seg = Mu_Segment;
+ if(Mu_seg.isValid()){
+ const xAOD::MuonSegment* seg = *Mu_seg;
+ fill(*seg);
+ }
+ }
+}
+
+
+void RecoMuonSegmentPlots::fill(const xAOD::MuonSegment& muonSeg) {
+ //General Plots
+ if (Detail) m_oMuonSegmentPlots->fill(muonSeg);
+ else m_oMuonSegmentSlimPlots->fill(muonSeg);
+}
+
+void RecoMuonSegmentPlots::initializePlots()
+{
+ //initialize temp plots
+}
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonTrackPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonTrackPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..9b7b4b5991f5a106e273c1f2494e4c01202e404b
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonTrackPlots.cxx
@@ -0,0 +1,59 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/RecoMuonTrackPlots.h"
+
+RecoMuonTrackPlots::RecoMuonTrackPlots(PlotBase* pParent, std::string sDir):PlotBase(pParent, sDir),
+m_oAllPlots(this, "/", "Reco Muon"),
+m_oImpactPlots(this, "/"),
+m_oTrkRecoInfoPlots(this, "/"),
+m_pt_broad(nullptr),
+m_eta_phi_broad(nullptr)
+{}
+
+void RecoMuonTrackPlots::initializePlots(){
+ //booking histograms
+ m_pt_broad = Book1D("_pt_broad", "High p_{T} Distribution", 70, 100, 1500);
+ m_eta_phi_broad = Book2D("_eta_phi_broad", "High p_{T} Muon #eta #phi Distribution;#eta;#phi", 52, -2.6, 2.6, 64, -3.2, 3.2);
+}
+
+//when the plot function called with a Muon Container
+//loop through each muon, get the corresponding link and fill it
+
+//when the plot function called with a Muon
+//get's the corresponding link and fill it
+void RecoMuonTrackPlots::fill(const xAOD::Muon& mu, int component){
+
+ if (component == 0 ) {
+ ElementLink<xAOD::TrackParticleContainer> Mu_MStrack = mu.muonSpectrometerTrackParticleLink();
+ if(Mu_MStrack.isValid()){
+ const xAOD::TrackParticle* trk = *Mu_MStrack;
+ fill(*trk);
+ }
+ }
+
+ if (component == 1 ){
+
+ ElementLink<xAOD::TrackParticleContainer> Mu_metrack = mu.trackParticleLink(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ if(Mu_metrack.isValid()){
+ const xAOD::TrackParticle* trk = *Mu_metrack;
+ fill(*trk);
+ }
+ }
+}
+
+
+void RecoMuonTrackPlots::fill(const xAOD::TrackParticle& muTP){
+ m_oAllPlots.fill(muTP);
+ m_oImpactPlots.fill(muTP);
+ m_oTrkRecoInfoPlots.fill(muTP);
+
+ if (muTP.pt()/1000.0 > 100) {//ony for high pt muons
+ m_pt_broad->Fill(muTP.pt()/1000.0);
+ m_eta_phi_broad->Fill(muTP.eta(), muTP.phi());
+ }
+
+}
+
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoPhysPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoPhysPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..9601fcf74ca7801017bb0ef1a70b9884816f64b8
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoPhysPlots.cxx
@@ -0,0 +1,257 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/RecoPhysPlots.h"
+
+
+RecoPhysPlots::RecoPhysPlots(PlotBase *pParent, std::string sDir, std::string recObj):PlotBase(pParent, sDir),
+ m_Mass(0),
+ m_occupancy(0),
+ m_2occupancy(0),
+ m_M_Mean(0),
+ m_M_Sigma(0),
+ m_M_EA_EA(0),
+ m_M_EA_BA(0),
+ m_M_EA_BC(0),
+ m_M_EA_EC(0),
+ m_M_BA_EA(0),
+ m_M_BA_BA(0),
+ m_M_BA_BC(0),
+ m_M_BA_EC(0),
+ m_M_BC_EA(0),
+ m_M_BC_BA(0),
+ m_M_BC_BC(0),
+ m_M_BC_EC(0),
+ m_M_EC_EA(0),
+ m_M_EC_BA(0),
+ m_M_EC_BC(0),
+ m_M_EC_EC(0),
+ type(recObj)
+{}
+
+void RecoPhysPlots::initializePlots(){
+
+ std::string Zsig("Z");
+ std::string Jsig("Jpsi");
+ std::string name;
+ bool doZ = false; bool doJ = false;
+
+ if (!type.compare(Zsig)) { name="Z"; doZ = true; }
+ else if (!type.compare(Jsig)) { name="J/#psi"; doJ = true; }
+ else { name="other"; }
+
+ int nBins = 100;
+ double minBin = 0.0;
+ double maxBin = 1000.0;
+
+ /// Error check for doZ and doJ both true here;
+
+ if (doZ) {
+ nBins = 100;
+ minBin = 60.0;
+ maxBin = 120.0;
+ }
+ else if (doJ) {
+ nBins = 30;
+ minBin = 2.5;
+ maxBin = 3.5;
+ }
+ //resonance mass distributuioin
+ m_Mass = Book1D("m_"+type+"_Mass", "m_Mass: M_{"+name+"} Mass;Mass [GeV];", nBins, minBin, maxBin);
+ //resonance two muon distribution
+ m_occupancy = Book1D("m_"+type+"_occupancy", "m_occupancy: M_{"+name+"} Track Occupancy;;N_{#mu}", 8, 0.0, 8.0);
+ m_2occupancy = Book1D("m_"+type+"_2occupancy", "m_2occupancy: M_{"+name+"} Two Track Occupancy;;N_{#mu}", 16, 0.5, 16.5);
+
+ //resonance mass distribution in each mass range
+ m_M_EA_EA = Book1D("m_"+type+"_M_EA_EA", "m_M_EA_EAM_{"+name+"} EA_{+} - EA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_EA_BA = Book1D("m_"+type+"_M_EA_BA", "m_M_EA_BAM_{"+name+"} EA_{+} - BA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_EA_BC = Book1D("m_"+type+"_M_EA_BC", "m_M_EA_BCM_{"+name+"} EA_{+} - BC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_EA_EC = Book1D("m_"+type+"_M_EA_EC", "m_M_EA_ECM_{"+name+"} EA_{+} - EC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BA_EA = Book1D("m_"+type+"_M_BA_EA", "m_M_BA_EAM_{"+name+"} BA_{+} - EA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BA_BA = Book1D("m_"+type+"_M_BA_BA", "m_M_BA_BAM_{"+name+"} BA_{+} - BA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BA_BC = Book1D("m_"+type+"_M_BA_BC", "m_M_BA_BCM_{"+name+"} BA_{+} - BC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BA_EC = Book1D("m_"+type+"_M_BA_EC", "m_M_BA_ECM_{"+name+"} BA_{+} - EC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BC_EA = Book1D("m_"+type+"_M_BC_EA", "m_M_BC_EAM_{"+name+"} BC_{+} - EA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BC_BA = Book1D("m_"+type+"_M_BC_BA", "m_M_BC_BAM_{"+name+"} BC_{+} - BA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BC_BC = Book1D("m_"+type+"_M_BC_BC", "m_M_BC_BCM_{"+name+"} BC_{+} - BC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_BC_EC = Book1D("m_"+type+"_M_BC_EC", "m_M_BC_ECM_{"+name+"} BC_{+} - EC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_EC_EA = Book1D("m_"+type+"_M_EC_EA", "m_M_EC_EAM_{"+name+"} EC_{+} - EA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_EC_BA = Book1D("m_"+type+"_M_EC_BA", "m_M_EC_BAM_{"+name+"} EC_{+} - BA_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_EC_BC = Book1D("m_"+type+"_M_EC_BC", "m_M_EC_BCM_{"+name+"} EC_{+} - BC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ m_M_EC_EC = Book1D("m_"+type+"_M_EC_EC", "m_M_EC_ECM_{"+name+"} EC_{+} - EC_{-}; M_{"+name+"}[GeV];", nBins, minBin, maxBin);
+ //for compare mass mean and sigma, done in post processing
+ m_M_Mean = Book1D("m_"+type+"_M_Mean", "m_M_Mean: M_{"+name+"} Mean;;M_{"+name+"}[GeV]", 16, 1.0, 17.0);
+ m_M_Sigma = Book1D("m_"+type+"_M_Sigma", "m_M_Sigma: #sigma(M_{"+name+"});;#sigma(M_{"+name+"})[GeV]", 16, 1.0, 17.0);
+
+ //label the plots
+ LabelCombinedEtaRegions(m_M_Mean->GetXaxis());
+ LabelCombinedEtaRegions(m_M_Sigma->GetXaxis());
+ LabelCombinedEtaRegions(m_2occupancy->GetXaxis());
+ LabelLargeEtaRegions(m_occupancy->GetXaxis());
+}
+
+void RecoPhysPlots::fill(std::vector<std::pair<const xAOD::Muon*, const xAOD::Muon*> > mumucandidates){
+ for (auto mumu: mumucandidates){
+ const float invariant_mass = (mumu.first->p4() + mumu.second->p4()).M();
+ fill(mumu.first->eta(), mumu.second->eta(), invariant_mass);
+ }
+}
+
+void RecoPhysPlots::fill(const float eta_mu_plus, const float eta_mu_minus, const float invariant_mass){
+
+ float etaRegionCoarsePlus = EtaRegionCoarse(eta_mu_plus);
+ float etaRegionCoarseMinus = EtaRegionCoarse(eta_mu_minus);
+ float etaRegionFinePlus = EtaRegionFine(eta_mu_plus);
+ float etaRegionFineMinus = EtaRegionFine(eta_mu_minus);
+
+ if((etaRegionCoarsePlus == 3.5 && etaRegionCoarseMinus == 3.5)) {m_M_EA_EA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(16);}
+ if((etaRegionCoarsePlus == 3.5 && etaRegionCoarseMinus == 2.5)) {m_M_EA_BA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(15);}
+ if((etaRegionCoarsePlus == 3.5 && etaRegionCoarseMinus == 1.5)) {m_M_EA_BC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(14);}
+ if((etaRegionCoarsePlus == 3.5 && etaRegionCoarseMinus == 0.5)) {m_M_EA_EC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(13);}
+
+ if((etaRegionCoarsePlus == 2.5 && etaRegionCoarseMinus == 3.5)) {m_M_BA_EA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(12);}
+ if((etaRegionCoarsePlus == 2.5 && etaRegionCoarseMinus == 2.5)) {m_M_BA_BA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(11);}
+ if((etaRegionCoarsePlus == 2.5 && etaRegionCoarseMinus == 1.5)) {m_M_BA_BC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(10);}
+ if((etaRegionCoarsePlus == 2.5 && etaRegionCoarseMinus == 0.5)) {m_M_BA_EC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(9);}
+
+ if((etaRegionCoarsePlus == 1.5 && etaRegionCoarseMinus == 3.5)) {m_M_BC_EA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(8);}
+ if((etaRegionCoarsePlus == 1.5 && etaRegionCoarseMinus == 2.5)) {m_M_BC_BA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(7);}
+ if((etaRegionCoarsePlus == 1.5 && etaRegionCoarseMinus == 1.5)) {m_M_BC_BC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(6);}
+ if((etaRegionCoarsePlus == 1.5 && etaRegionCoarseMinus == 0.5)) {m_M_BC_EC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(5);}
+
+ if((etaRegionCoarsePlus == 0.5 && etaRegionCoarseMinus == 3.5)) {m_M_EC_EA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(4);}
+ if((etaRegionCoarsePlus == 0.5 && etaRegionCoarseMinus == 2.5)) {m_M_EC_BA->Fill(invariant_mass/1000.0); m_2occupancy->Fill(3);}
+ if((etaRegionCoarsePlus == 0.5 && etaRegionCoarseMinus == 1.5)) {m_M_EC_BC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(2);}
+ if((etaRegionCoarsePlus == 0.5 && etaRegionCoarseMinus == 0.5)) {m_M_EC_EC->Fill(invariant_mass/1000.0); m_2occupancy->Fill(1);}
+
+ m_Mass->Fill(invariant_mass/1000.0);
+ m_occupancy->Fill(etaRegionFinePlus);
+ m_occupancy->Fill(etaRegionFineMinus);
+
+}
+
+void RecoPhysPlots::finalizeRecoPlots(){
+ SetResultsBin( 1, m_M_EC_EC);
+ SetResultsBin( 2, m_M_EC_BC);
+ SetResultsBin( 3, m_M_EC_BA);
+ SetResultsBin( 4, m_M_EC_EA);
+ SetResultsBin( 5, m_M_BC_EC);
+ SetResultsBin( 6, m_M_BC_BC);
+ SetResultsBin( 7, m_M_BC_BA);
+ SetResultsBin( 8, m_M_BC_EA);
+ SetResultsBin( 9, m_M_BA_EC);
+ SetResultsBin(10, m_M_BA_BC);
+ SetResultsBin(11, m_M_BA_BA);
+ SetResultsBin(12, m_M_BA_EA);
+ SetResultsBin(13, m_M_EA_EC);
+ SetResultsBin(14, m_M_EA_BC);
+ SetResultsBin(15, m_M_EA_BA);
+ SetResultsBin(16, m_M_EA_EA);
+}
+
+float RecoPhysPlots::EtaRegionFine(double eta)
+{
+ if (eta < -2.50) {return -1.;} // underflow
+ if (eta < -2.00) {return 0.5;} // CSC C
+ if (eta < -1.70) {return 1.5;} // ENDCAP C
+ if (eta < -1.05) {return 2.5;} // Trans C
+ if (eta < 0.00) {return 3.5;} // Barrel C
+ if (eta > 2.50) {return 8.5;} // OverFlow
+ if (eta > 2.00) {return 7.5;} // CSC A
+ if (eta > 1.70) {return 6.5;} // ENDCAP A
+ if (eta > 1.05) {return 5.5;} // Trans A
+ if (eta > 0.00) {return 4.5;} // Barrel A
+ return -1.;
+}
+
+float RecoPhysPlots::EtaRegionCoarse(double eta)
+{
+
+ if(eta < -2.50) {return -1.;} // underflow
+ if(eta < -1.05) {return 0.5;} // EC
+ if(eta < 0.00) {return 1.5;} // BC
+ if(eta < 1.05) {return 2.5;} // BA
+ if(eta < 2.50) {return 3.5;} // BC
+ return 4.5; // Overflow
+
+}
+bool RecoPhysPlots::LabelLargeEtaRegions(TAxis * axis)
+{
+ axis->SetBinLabel(1, "CSC C");
+ axis->SetBinLabel(2, "EC C");
+ axis->SetBinLabel(3, "TRANS C");
+ axis->SetBinLabel(4, "BARR C");
+ axis->SetBinLabel(5, "BARR A");
+ axis->SetBinLabel(6, "TRANS A");
+ axis->SetBinLabel(7, "EC A");
+ axis->SetBinLabel(8," CSC A");
+ axis->SetTitle("Detector #eta Regions");
+
+ return true;
+}
+
+bool RecoPhysPlots::LabelCombinedEtaRegions(TAxis * axis)
+{
+ axis->SetBinLabel( 1, "EC-EC");
+ axis->SetBinLabel( 2, "EC-BC");
+ axis->SetBinLabel( 3, "EC-BA");
+ axis->SetBinLabel( 4, "EC-EA");
+ axis->SetBinLabel( 5, "BC-EC");
+ axis->SetBinLabel( 6, "BC-BC");
+ axis->SetBinLabel( 7, "BC-BA");
+ axis->SetBinLabel( 8, "BC-EA");
+ axis->SetBinLabel( 9, "BA-EC");
+ axis->SetBinLabel(10, "BA-BC");
+ axis->SetBinLabel(11, "BA-BA");
+ axis->SetBinLabel(12, "BA-EA");
+ axis->SetBinLabel(13, "EA-EC");
+ axis->SetBinLabel(14, "EA-BC");
+ axis->SetBinLabel(15, "EA-BA");
+ axis->SetBinLabel(16, "EA-EA");
+
+ axis->SetTitle("#eta Region Permutations [+#mu, -#mu]");
+
+ return true;
+}
+
+bool RecoPhysPlots::LabelSectorAxis(TAxis * axis){
+
+ axis->SetTitle("#phi Sectors 1-16");
+ if(axis->GetNbins() == 16) axis->CenterLabels(kTRUE);
+
+ // Sector Axis Label Error, not a multiple of 16 bins
+ if(axis->GetNbins()%16){
+ return false;
+ }
+
+ int nSectorDevisions = axis->GetNbins()/16;
+ int skip_counter = 1;
+
+ axis->SetNdivisions(16,nSectorDevisions,0,kFALSE);
+
+
+ for (int i = 1; i <= axis->GetNbins(); i++) {
+
+ if (skip_counter == nSectorDevisions) {
+ axis->SetBinLabel(i,Form("%d",i/nSectorDevisions));
+ skip_counter = 1;
+ }else {
+ axis->SetBinLabel(i," ");
+ skip_counter++;
+ }
+
+ }
+
+ return true;
+}
+
+void RecoPhysPlots::SetResultsBin(int iBin, TH1* pInputHist){
+
+ m_M_Mean-> SetBinContent(iBin, pInputHist->GetMean(1));
+ m_M_Mean-> SetBinError( iBin, pInputHist->GetMeanError(1));
+ m_M_Sigma->SetBinContent(iBin, pInputHist->GetRMS(1));
+
+}
+
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoVertexPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoVertexPlots.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..046299c950cc497a7f575da81425f35a81f4975e
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoVertexPlots.cxx
@@ -0,0 +1,34 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTrackMonitoring/RecoVertexPlots.h"
+
+
+RecoVertexPlots::RecoVertexPlots(PlotBase *pParent, std::string sDir):PlotBase(pParent, sDir),
+ m_nMDT(nullptr),
+ m_nRPC(nullptr),
+ m_nTGC(nullptr),
+ m_nTracklets(nullptr),
+ m_VertexEtaPhi(nullptr)
+{}
+
+void RecoVertexPlots::initializePlots(){
+
+ m_nMDT = Book1D("m_MSVx_nMDT", "m MSVx nMDT: M MSVx MDT Hits;;N_{MDT}", 100, 0.0, 3000.);
+ m_nRPC = Book1D("m_MSVx_nRPC", "m MSVx nRPC: M MSVx RPC Hits;;N_{RPC}", 100, 0.0, 1000.);
+ m_nTGC = Book1D("m_MSVx_nTGC", "m MSVx nTGC: M MSVx TGC Hits;;N_{TGC}", 100, 0.0, 1000.);
+
+ m_nTracklets = Book1D("m_MSVx_nTracklets", "MSVx nTracklets: M MSVx Number of Tracklets; N_{trackletS}", 20, 0.0, 20.);
+ m_VertexEtaPhi = Book2D("m_VertexEtaPhi", "Vertex Eta Phi: M MSVx #eta vs. #phi; #eta; #phi", 25, -2.5, 25, 32, -3.2, 3.2);
+
+}
+
+void RecoVertexPlots::fill(const xAOD::Vertex& msVx){
+ TVector3 tmp_vx; tmp_vx.SetXYZ(msVx.x(),msVx.y(),msVx.z());
+ m_nMDT->Fill(msVx.auxdata< int >( "nMDT" ));
+ m_nRPC->Fill(msVx.auxdata< int >( "nRPC" ));
+ m_nTGC->Fill(msVx.auxdata< int >( "nTGC" ));
+ m_nTracklets->Fill(msVx.numberDoF()+1.);
+ m_VertexEtaPhi->Fill(tmp_vx.Eta(),tmp_vx.Phi());
+}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx
index 0d32f41b0e62f165d58d649f40d45f3989e57538..f6db046970432c6c5a7028f52743abc0344be152 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx
@@ -3,6 +3,9 @@
2020 Matthias Schott - Uni Mainz
*/
-#include "../MuonTrackMonitorAlgorithm.h"
+#include "MuonTrackMonitoring/MuonTrackMonitorAlgorithm.h"
+#include "MuonTrackMonitoring/MuonGenericTracksMon.h"
+
+DECLARE_COMPONENT( MuonGenericTracksMon )
DECLARE_COMPONENT( MuonTrackMonitorAlgorithm )
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTPRDValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTPRDValAlg.cxx
index 58ff142d121afd7061b0f4c910c9c658c1038dd1..b3dce30d5df7408742e1bff6a0133ab2b221e8bf 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTPRDValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTPRDValAlg.cxx
@@ -529,7 +529,7 @@ void MDTPRDValAlg::addSimHits( MDTPRDValAlg::MuonMdtHitMap& muonMdtHitMap, MDTPR
}
- MdtHitIdHelper* mdthelper = MdtHitIdHelper::GetHelper();
+ MdtHitIdHelper* mdthelper = MdtHitIdHelper::GetHelper(m_idHelperSvc->mdtIdHelper().tubeMax());
for(MDTSimHitCollection::const_iterator i_hit=p_collection->begin(); i_hit!=p_collection->end(); ++i_hit) {
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTSimHitVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTSimHitVariables.cxx
index d543f0ad34c570e9756f427165a160b0e7c44ad0..39303b5ad312c38c874936d05251628131cd879f 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTSimHitVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MDTSimHitVariables.cxx
@@ -27,7 +27,7 @@ StatusCode MDTSimHitVariables::fillVariables(const MuonGM::MuonDetectorManager*
CHECK( m_evtStore->retrieve(mdtContainer, m_ContainerName.c_str() ) );
// Get the MDT Id hit helper
- MdtHitIdHelper* mdthhelper = MdtHitIdHelper::GetHelper();
+ MdtHitIdHelper* mdthhelper = MdtHitIdHelper::GetHelper(m_MdtIdHelper->tubeMax());
if(mdtContainer->size()==0) ATH_MSG_WARNING(" MdtSimHit empty ");
for( auto it : *mdtContainer ) {
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h
index 50df447893fa03b765a021bac14a4d08ee35fba9..64a4f28a794b1e6f672bd0bf44dcbbac32eaca80 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h
@@ -13,7 +13,7 @@
#include <list>
// Framework include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "AnaAlgorithm/AnaAlgorithm.h"
#include "SystematicsHandles/SysListHandle.h"
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h
index d845bedb3bf74b782b01b4e77b790ade1ddf70b6..366a5d6ac13f8320b0abb83fdd0f117791bf5cdb 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h
@@ -13,7 +13,7 @@
#include <list>
// Framework include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "AnaAlgorithm/AnaAlgorithm.h"
#include "SystematicsHandles/SysListHandle.h"
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx
index 068697fa1fb374f1216c17e5d169b00576b85d35..6fb2cc9e74091aa2b61c9f5edebaf22ad26066b0 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx
@@ -13,7 +13,7 @@
#include <AsgAnalysisAlgorithms/SysListLoaderAlg.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <PATInterfaces/MakeSystematicsVector.h>
#include <PATInterfaces/SystematicRegistry.h>
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
index fc0bb65d980884f80fa2b420cde208fc1379ee59..7bb96fef87b52c85dbae5d1ed8185b9d1e55d37d 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
@@ -41,24 +41,27 @@ atlas_install_joboptions( share/*_jobOptions.py )
atlas_install_scripts( share/*_eljob.py )
if( XAOD_STANDALONE )
- atlas_add_test( testJobDataEMTopo
- SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type data --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobDataPFlow
- SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type data --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFullSimEMTopo
- SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type mc --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFullSimPFlow
- SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type mc --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFastSimEMTopo
- SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type afii --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFastSimPFlow
- SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type afii --unit-test
- PROPERTIES TIMEOUT 600 )
+ #TODO: These tests are temporarily disabled AnalysisBase for migration from R21 to R22.
+ # They need to be updated to Python 3 to be re-ennabled.
+ #
+ # atlas_add_test( testJobDataEMTopo
+ # SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type data --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobDataPFlow
+ # SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type data --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFullSimEMTopo
+ # SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type mc --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFullSimPFlow
+ # SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type mc --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFastSimEMTopo
+ # SCRIPT JetAnalysisAlgorithmsTest_EMTopo_eljob.py --data-type afii --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFastSimPFlow
+ # SCRIPT JetAnalysisAlgorithmsTest_PFlow_eljob.py --data-type afii --unit-test
+ # PROPERTIES TIMEOUT 600 )
else()
atlas_add_test( testJobDataEMTopo
SCRIPT athena.py
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h
index 61a745b581ca356d5ddba1d5cff8cc38e5de5a5a..311f8c5a1fde6f32936eb0079c503f1cff4e8124 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h
@@ -10,8 +10,6 @@
#include <AnaAlgorithm/AnaAlgorithm.h>
#include <JetCalibTools/IJetCalibrationTool.h>
-#include <SelectionHelpers/OutOfValidityHelper.h>
-#include <SelectionHelpers/SelectionReadHandle.h>
#include <SystematicsHandles/SysCopyHandle.h>
#include <SystematicsHandles/SysListHandle.h>
@@ -47,15 +45,6 @@ namespace CP
private:
SysCopyHandle<xAOD::JetContainer> m_jetHandle {
this, "jets", "AntiKt4EMTopoJets", "the jet collection to run on"};
-
- /// \brief the preselection we apply to our input
- private:
- SelectionReadHandle m_preselection {
- this, "preselection", "", "the preselection to apply"};
-
- /// \brief the helper for OutOfValidity results
- private:
- OutOfValidityHelper m_outOfValidity {this};
};
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx
index 3f820c72a55a216a44e3f77cf45ce9cf7631d353..4052ee82225a0dcc2dd95aa174f3885051eeb1e3 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetCalibrationAlg.cxx
@@ -34,8 +34,6 @@ namespace CP
ANA_CHECK (m_calibrationTool.retrieve());
m_systematicsList.addHandle (m_jetHandle);
ANA_CHECK (m_systematicsList.initialize());
- ANA_CHECK (m_preselection.initialize());
- ANA_CHECK (m_outOfValidity.initialize());
return StatusCode::SUCCESS;
}
@@ -47,13 +45,7 @@ namespace CP
return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
xAOD::JetContainer *jets = nullptr;
ANA_CHECK (m_jetHandle.getCopy (jets, sys));
- for (xAOD::Jet *jet : *jets)
- {
- if (m_preselection.getBool (*jet))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_calibrationTool->applyCorrection (*jet));
- }
- }
+ ANA_CHECK (m_calibrationTool->applyCalibration(*jets));
return StatusCode::SUCCESS;
});
}
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt
index 8705936bbbe40b9a13e33611ae1c9c68a8bf841b..6070963b23c23cea2ae1944b6538e22aa8e32a66 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/CMakeLists.txt
@@ -41,15 +41,18 @@ atlas_install_joboptions( share/*_jobOptions.py )
atlas_install_scripts( share/*_eljob.py )
if( XAOD_STANDALONE )
- atlas_add_test( testJobData
- SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFullSim
- SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFastSim
- SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
- PROPERTIES TIMEOUT 600 )
+ #TODO: These tests are temporarily disabled AnalysisBase for migration from R21 to R22.
+ # They need to be updated to Python 3 to be re-ennabled.
+ #
+ # atlas_add_test( testJobData
+ # SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFullSim
+ # SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFastSim
+ # SCRIPT MetAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
+ # PROPERTIES TIMEOUT 600 )
elseif( NOT "${CMAKE_PROJECT_NAME}" STREQUAL "AthDerivation" )
atlas_add_test( testJobData
SCRIPT athena.py
diff --git a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
index 6a4a76279d69e025523424b746adde48afcdb1ff..c5e0191f2e24906412c46369447e5436c00ba90f 100644
--- a/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/Root/MetMakerAlg.cxx
@@ -13,6 +13,7 @@
#include <MetAnalysisAlgorithms/MetMakerAlg.h>
#include <xAODMissingET/MissingETAuxContainer.h>
+#include <xAODMissingET/MissingETAssociationHelper.h>
//
// method implementations
@@ -69,17 +70,20 @@ namespace CP
const xAOD::MissingETAssociationMap* metMap {nullptr};
ANA_CHECK (evtStore()->retrieve(metMap, m_metAssociationName));
+ // Helper keeps track of object selection flags for this map
+ xAOD::MissingETAssociationHelper metHelper(&(*metMap));
+
return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
auto met = std::make_unique<xAOD::MissingETContainer> ();
auto aux = std::make_unique<xAOD::MissingETAuxContainer> ();
met->setStore (aux.get());
- metMap->resetObjSelectionFlags();
+ metHelper.resetObjSelectionFlags();
if (m_invisHandle) {
const xAOD::IParticleContainer* invisible = nullptr;
ATH_CHECK( m_invisHandle.retrieve(invisible, sys) );
- ATH_CHECK( m_makerTool->markInvisible(invisible, metMap, met.get() ) );
+ ATH_CHECK( m_makerTool->markInvisible(invisible, &metHelper, met.get() ) );
}
// Lambda helping with calculating the MET terms coming from the leptons
@@ -94,7 +98,7 @@ namespace CP
const xAOD::IParticleContainer* particles = nullptr;
ANA_CHECK (handle.retrieve (particles, sys));
ANA_CHECK (m_makerTool->rebuildMET (term, type, met.get(),
- particles, metMap));
+ particles, &metHelper));
return StatusCode::SUCCESS;
};
@@ -112,10 +116,10 @@ namespace CP
if (m_doTrackMet)
{
- ANA_CHECK (m_makerTool->rebuildTrackMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, metMap, m_doJetJVT));
+ ANA_CHECK (m_makerTool->rebuildTrackMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, &metHelper, m_doJetJVT));
} else
{
- ANA_CHECK (m_makerTool->rebuildJetMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, metMap, m_doJetJVT));
+ ANA_CHECK (m_makerTool->rebuildJetMET (m_jetsKey, m_softTermKey, met.get(), jets, metcore, &metHelper, m_doJetJVT));
}
ANA_CHECK (m_metHandle.record (std::move (met), std::move (aux), sys));
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx
index d3c2ecb7743795111968eef1b2b09428a45d6407..3c926e8d439ecdb895a747549ac6afcb928adbf2 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx
@@ -11,7 +11,7 @@
#include <SelectionHelpers/ISelectionAccessor.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <SelectionHelpers/SelectionAccessorBits.h>
#include <SelectionHelpers/SelectionAccessorChar.h>
#include <SelectionHelpers/SelectionAccessorInvert.h>
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
index 5eaa8d02501ee2db70daf6547c73d242fb604201..cc240e15ba9991f5ca9d07406fc3f7f57741464c 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
@@ -11,8 +11,8 @@
#include <SelectionHelpers/OutOfValidityEventHelper.h>
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
#include <PATInterfaces/CorrectionCode.h>
//
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
index 3069eb56eb09b4f6699369da3b29ef55f6a0de98..805032cd80bca88b0aaecda13923a420c0cf68f3 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
@@ -11,8 +11,8 @@
#include <SelectionHelpers/OutOfValidityHelper.h>
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
#include <PATInterfaces/CorrectionCode.h>
//
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
index 80a95355b81966379d46615809db102d2ab4b282..060281362576337099247b963a1eccfc2ec7552e 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
@@ -11,8 +11,8 @@
#include <SelectionHelpers/SelectionReadHandle.h>
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
//
// method implementations
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h
index 4fcc1f49c8fc29fadeba584edfe4edb9ef19f7ac..356a60ebb4864939926da28fbbc1fed565442a9e 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityEventHelper.h
@@ -8,7 +8,7 @@
#ifndef SELECTION_HELPERS__OUT_OF_VALIDITY_EVENT_HELPER_H
#define SELECTION_HELPERS__OUT_OF_VALIDITY_EVENT_HELPER_H
-#include <AsgTools/MsgStream.h>
+#include <AsgMessaging/MsgStream.h>
#include <AthContainers/AuxElement.h>
#include <SelectionHelpers/ISelectionAccessor.h>
#include <SelectionHelpers/OutOfValidityHelper.h>
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h
index 97787061e61164fa61c67e6f54e9b92712b00645..1f59b150806e59bf1d4d25aad422eab863722c9e 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/OutOfValidityHelper.h
@@ -8,7 +8,7 @@
#ifndef SELECTION_HELPERS__OUT_OF_VALIDITY_HELPER_H
#define SELECTION_HELPERS__OUT_OF_VALIDITY_HELPER_H
-#include <AsgTools/MsgStream.h>
+#include <AsgMessaging/MsgStream.h>
#include <AthContainers/AuxElement.h>
#include <SelectionHelpers/ISelectionAccessor.h>
#include <xAODBase/IParticle.h>
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h
index 076dd2fcb7697a2117c1206e48bf15c5d42cd123..579ad0ec0013a5750f87de1d36bdbf0b2ce63ccb 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h
@@ -8,7 +8,7 @@
#ifndef SELECTION_HELPERS__SELECTION_HELPERS_H
#define SELECTION_HELPERS__SELECTION_HELPERS_H
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <cstdint>
namespace asg
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionReadHandle.h b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionReadHandle.h
index 3ad43fc265e24799bf12a9c7a56857db42b51dc1..876f46e3415e4f0c85455e71f3241915c5355f95 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionReadHandle.h
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionReadHandle.h
@@ -9,7 +9,7 @@
#define SELECTION_HELPERS_SELECTION_READ_HANDLE_H
#include <AthContainers/AuxElement.h>
-#include <AsgTools/MsgStream.h>
+#include <AsgMessaging/MsgStream.h>
#include <memory>
class StatusCode;
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx
index 58b44391d3888f147cfae218c8ef6f5590f0e7b1..38b2b7c78a89ba53d4e3531485ad8f365ffa81f6 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx
@@ -15,7 +15,7 @@
#include <SelectionHelpers/SelectionAccessorBits.h>
#include <SelectionHelpers/SelectionAccessorList.h>
#include <SelectionHelpers/SelectionAccessorNull.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <AsgTesting/UnitTest.h>
#include <xAODJet/Jet.h>
#include <gtest/gtest.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx b/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
index ccd200164bc7c0d63bc160d19b8689f570932a72..3e1bc1dff0e60908c4666a1748e6fe603b489cea 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
@@ -11,8 +11,8 @@
#include <SystematicsHandles/SysListHandle.h>
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
#include <PATInterfaces/SystematicSet.h>
#include <SystematicsHandles/ISysHandleBase.h>
#include <regex>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
index c2eb45959410e9c270828132d1dc2da2ae38582f..29d8179f726cf438061520e18b3901e011bb11c3 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
@@ -9,8 +9,8 @@
#define SYSTEMATICS_HANDLES__COPY_HELPERS_H
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
#include <xAODBase/IParticleContainer.h>
#include <xAODBase/IParticleHelpers.h>
#include <xAODCore/ShallowCopy.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h
index 7f7e5f62705e922410d366cb6ead68fe31ecf60b..eff0a36901e6602ffecb29e1b5353ff2afea8fc5 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h
@@ -9,7 +9,7 @@
#define SYSTEMATICS_HANDLES__SYS_COPY_HANDLE_H
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
#include <PATInterfaces/SystematicSet.h>
#include <SystematicsHandles/ISysHandleBase.h>
#include <string>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc
index e41dd1c55ca1af023168ac5525cfddab231d3101..5abbda5cc25494343442188c8042cce9e7144587 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc
@@ -9,7 +9,7 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <SystematicsHandles/CopyHelpers.h>
#include <SystematicsHandles/Helpers.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h
index 5c736c3aaf41a9b2b2f690b12a0d018aede58a77..df90f77764a198ffdb5fd54eccd9c4bbef3987d2 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h
@@ -9,7 +9,7 @@
#define SYSTEMATICS_HANDLES__SYS_DECORATION_HANDLE_H
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
#include <AthContainers/AuxElement.h>
#include <PATInterfaces/SystematicSet.h>
#include <SystematicsHandles/ISysHandleBase.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
index 13a59deed6ecdfac643b907c3b40cab0634437d8..c0acdbff906f0a8acca417ae087e6bcaa1f7f0ca 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
@@ -9,8 +9,8 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
#include <SystematicsHandles/Helpers.h>
#include <regex>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
index 53ec9d7a325a7c329637ad0b715b528836274d7a..37e1a352225dc7642b529f0b04565090d5ad4b8e 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
@@ -9,7 +9,7 @@
#define SYSTEMATICS_HANDLES__SYS_LIST_HANDLE_H
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
#include <PATInterfaces/SystematicSet.h>
#include <SystematicsHandles/SysListType.h>
#include <functional>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h
index ae7c304c77fea2f4a96e6b83e282b833a198a1e1..6ed8323bac197f842035fff054d123e6e6e60d25 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h
@@ -9,7 +9,7 @@
#define SYSTEMATICS_HANDLES__SYS_READ_HANDLE_H
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
#include <PATInterfaces/SystematicSet.h>
#include <SystematicsHandles/ISysHandleBase.h>
#include <string>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
index 690580cc971379baad805984ccf345cc1a4970e9..86f59f5aed4ff25d4db05a4ca9c1daeaa7c88dc0 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
@@ -9,8 +9,8 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
#include <SystematicsHandles/Helpers.h>
//
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h
index 614541e0cf96dd3da47b3a790266be34487c7985..2d6c23ac32cbccf91d12dd9e567c813a0b9cefc6 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h
@@ -9,7 +9,7 @@
#define SYSTEMATICS_HANDLES__SYS_READ_HANDLE_ARRAY_H
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
#include <PATInterfaces/SystematicSet.h>
#include <SystematicsHandles/ISysHandleBase.h>
#include <boost/functional/hash.hpp>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
index 89cbde7909719e76e745ac27a27947b89d8d36fd..8ab1d17b0dcd70f043ccd9ba4f270238410ebfc2 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
@@ -9,8 +9,8 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/StatusCode.h>
#include <SystematicsHandles/Helpers.h>
//
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h
index 81d7a20202b29a3f51388592f83c0efd301e94df..ce28b3dc8ca2feaaada23174cd9a12ac30d62055 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h
@@ -9,7 +9,7 @@
#define SYSTEMATICS_HANDLES__SYS_WRITE_HANDLE_H
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
#include <PATInterfaces/SystematicSet.h>
#include <SystematicsHandles/ISysHandleBase.h>
#include <memory>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc
index 74ba4964619dbf002cbfda78d76cc5ce04f47a74..8371a02aefba9790554282d964c540e71f144fd1 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc
@@ -9,7 +9,7 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <SystematicsHandles/Helpers.h>
//
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx b/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx
index 284efb0108095bb2731cbf369f43e537db8b942f..f35fe2f9dac9431a6eeb45a5765df980e26e5ed4 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx
@@ -11,8 +11,8 @@
#include "xAODRootAccess/TEvent.h"
#include "xAODRootAccess/TStore.h"
#include "xAODRootAccess/Init.h"
-#include "AsgTools/MsgStream.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MsgStream.h"
+#include "AsgMessaging/MessageCheck.h"
#include "AsgTools/SgTEvent.h"
// EDM include(s):
diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
index 25126a762396acb1aaf9d156ad217444026464a6..c46755354baa3a84fbefda471fafd19b93baf567 100644
--- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
@@ -27,9 +27,6 @@ atlas_install_joboptions( share/*_jobOptions.py )
atlas_install_scripts( share/*_eljob.py )
if( XAOD_STANDALONE )
- # FIX ME: temporarily disabled as part of the migration of AnalysisBase
- # to master
-
atlas_add_test( TriggerAlgorithmsTestJobData
SCRIPT TriggerAlgorithmsTest_eljob.py --data-type data --unit-test
PROPERTIES TIMEOUT 600 )
diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py
index 4ac99cd0b355a9b992f3f3080329de19f92a7fe9..9dfbaa71e841e56c6e7fadd31c5850f04aba1a0f 100755
--- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py
+++ b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/share/TriggerAlgorithmsTest_eljob.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# @author Tadej Novak
@@ -24,6 +24,11 @@ parser.add_option( '-u', '--unit-test', dest='unit_test',
import ROOT
ROOT.xAOD.Init().ignore()
+# Force-load some xAOD dictionaries. To avoid issues from ROOT-10940.
+ROOT.xAOD.CaloClusterContainer()
+ROOT.xAOD.MuonContainer()
+ROOT.xAOD.TauJetContainer()
+
# ideally we'd run over all of them, but we don't have a mechanism to
# configure per-sample right now
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
index 2576ccd5a3876af8050825b5f30d89d431409cdf..585b8271c772c6ece9dcace9e74a99e086b6e294 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AnalysisTools/AANTupleStream.h"
@@ -9,17 +9,17 @@
#include "AthenaPoolUtilities/AthenaAttributeList.h"
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IAddressCreator.h"
#include "GaudiKernel/IOpaqueAddress.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/ServiceHandle.h"
-
#include "GaudiKernel/IIoComponentMgr.h"
+
#include "StoreGate/StoreGateSvc.h"
#include "SGTools/DataProxy.h"
#include "PersistentDataModel/DataHeader.h"
@@ -766,9 +766,9 @@ AANTupleStream::io_reinit()
return StatusCode::FAILURE;
}
- ServiceHandle<IJobOptionsSvc> josvc ("JobOptionsSvc", this->name());
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> josvc ("JobOptionsSvc", this->name());
if ( !josvc.retrieve().isSuccess() ) {
- ATH_MSG_ERROR ("Could not retrieve IJobOptionsSvc/JobOptionsSvc !");
+ ATH_MSG_ERROR ("Could not retrieve IOptionsSvc/JobOptionsSvc !");
return StatusCode::FAILURE;
}
@@ -791,12 +791,8 @@ AANTupleStream::io_reinit()
}
// recreate the proper property value...
- std::vector<std::string> outvec(1);
- outvec[0] = "AANT DATAFILE='" + m_fileName + "' OPT='RECREATE'";
- StringArrayProperty prop ("Output", outvec);
- if ( !josvc->addPropertyToCatalogue ("THistSvc", prop).isSuccess() ) {
- ATH_MSG_ERROR ("Could not update THistSvc.Output property with new name !");
- }
+ std::vector<std::string> outvec = {"AANT DATAFILE='" + m_fileName + "' OPT='RECREATE'"};
+ josvc->set("THistSvc.Output", Gaudi::Utils::toString(outvec));
// handle schema...
if (!m_schemaDone) {
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h
index 8521da074f86dfbdc2b02302378b5a3f42710d76..c9fd620ced8b2a3654e4d875cfdb24c57142f9fa 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MacroChecks.h
@@ -5,7 +5,7 @@
#ifndef ASSOCIATIONUTILS_MACROCHECKS_H
#define ASSOCIATIONUTILS_MACROCHECKS_H
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
// Checks that pointer is non-null, prints error.
// Can only be used in context where the ATH_MSG_XXX macros work
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
index e174c3254514163cb7a45359ba5ca6ed8dec148b..447c0c31892d14a80f94b2c947f5cca76b588914 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
@@ -9,7 +9,7 @@
#include <memory>
// Infrastructure includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// Local includes
#include "AssociationUtils/IObjectAssociator.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
index 890514a262ff131a56593aba156fcb5a0b561d3e..83b92609c7c74a87e05720d1483686b26f5f526f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
@@ -6,7 +6,7 @@
#define ASSOCIATIONUTILS_OVERLAPLINKHELPER_H
// Framework includes
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
// EDM includes
#include "xAODBase/IParticleContainer.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
index b29235d471231c7bd3914a5484924b6a359bcf67..2105c76bfb6914713133caf5f52e89d795c0a655 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
@@ -14,7 +14,7 @@
#include <string>
// ASG includes
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
// Local includes
#include "AssociationUtils/ToolBox.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
index f3bad7e5d13a27ffd1e660cbf9cce2b2f2b08ee4..a97b6c6cf66024c59d48290a1d701b64cd37ba51 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
@@ -6,7 +6,7 @@
#define ASSOCIATIONUTILS_TOOLBOX_H
// Framework includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "AsgTools/AnaToolHandle.h"
// Local includes
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
index f34dfe50ef808903b58dac14cebe18e56dc4f9c7..b6bb4f6acebf95b216b045e52b61d325236a614d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
@@ -6,7 +6,7 @@
*/
#include "AsgTesting/UnitTest.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
#include "gtest/gtest.h"
#ifdef ROOTCORE
#include "xAODRootAccess/Init.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
index 0b6305b170e09855f971df2cb233ef8385aeb13b..763e0c0efbe44ec217a530d1df95175afb51538e 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
@@ -12,7 +12,7 @@
// Infrastructure
#include "AsgTools/UnitTest.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
#include "gtest/gtest.h"
#ifdef ROOTCORE
#include "xAODRootAccess/Init.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
index ccb6afcb888794881f53254e27e84ee8a210f31f..1145bef13c1251ae24cadd89af305993758dcbd5 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
@@ -7,7 +7,7 @@
// Infrastructure
#include "AsgTools/UnitTest.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
#include "gtest/gtest.h"
#ifdef ROOTCORE
#include "xAODRootAccess/Init.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/FsrUtils/Root/FsrPhotonTool.cxx b/PhysicsAnalysis/AnalysisCommon/FsrUtils/Root/FsrPhotonTool.cxx
index 201e9d8c49bac3578bfb0569533549bb9f0e2b3d..be9e98552cf99de9198a1a15fa0d96ada899463f 100644
--- a/PhysicsAnalysis/AnalysisCommon/FsrUtils/Root/FsrPhotonTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/FsrUtils/Root/FsrPhotonTool.cxx
@@ -7,7 +7,7 @@
// Local include(s):
#include "FsrUtils/FsrPhotonTool.h"
#include "IsolationSelection/IsolationSelectionTool.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
namespace FSR {
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/CMakeLists.txt
index 3c0e7f91eca3c500a3b5ee3294f51b4b440039d8..2e938137e965946f2ac6c2e99457e7689f18ae3b 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/CMakeLists.txt
@@ -1,18 +1,8 @@
-# $Id: CMakeLists.txt 744627 2016-05-03 18:51:43Z krasznaa $
-################################################################################
-# Package: PATInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PATInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- PRIVATE
- PhysicsAnalysis/D3PDTools/RootCoreUtils )
-
# External dependencies:
find_package( Boost COMPONENTS regex )
find_package( ROOT COMPONENTS Core MathCore )
@@ -23,7 +13,7 @@ atlas_add_root_dictionary( PATInterfaces _dictionary
ROOT_HEADERS PATInterfaces/SystematicVariation.h
PATInterfaces/SystematicSet.h PATInterfaces/SystematicRegistry.h
PATInterfaces/SystematicsUtil.h PATInterfaces/StreamTestWrapper.h
- Root/LinkDef.h
+ PATInterfaces/CorrectionCode.h Root/LinkDef.h
EXTERNAL_PACKAGES ROOT )
# Component(s) in the package:
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h
index cc248b9c02d55cf5257e9c1140613d2d62469c35..aa4f3fe9b4ee002a5753aad3955927cd663db90a 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionCode.h
@@ -32,7 +32,7 @@ namespace CP {
/// $Revision: 719663 $
/// $Date: 2016-01-25 21:27:50 +0100 (Mon, 25 Jan 2016) $
///
- class CorrectionCode {
+ class [[nodiscard]] CorrectionCode {
public:
/// Possible values for the correction code
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
index e33960d1a1493abe6a69012768894106669be9b6..e55718a966461ecd31f6b3043c7df87f6d54b524 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
@@ -9,7 +9,7 @@
#define PAT_INTERFACES__MESSAGE_CHECK_H
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
namespace CP
{
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h
index 600ba6e1b953041b4b8d705b3a66278aea7052c5..3665c6bdbbfbd07eccd2c894088ba8132dc76c36 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicCode.h
@@ -34,7 +34,7 @@ namespace CP {
/// $Revision: 717600 $
/// $Date: 2016-01-13 18:48:13 +0100 (Wed, 13 Jan 2016) $
///
- class SystematicCode {
+ class [[nodiscard]] SystematicCode {
public:
/// Possible values for the systematic code
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/LinkDef.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/LinkDef.h
index 1acce08e71f7bb894cb129b9a782602eafe57e6d..aae5f73330b40dedfabfbc2f908a32fe80fa8803 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/LinkDef.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/LinkDef.h
@@ -1,14 +1,22 @@
-// $Id: LinkDef.h 726905 2016-02-29 20:49:20Z sfarrell $
// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+//
+#ifndef PATINTERFACES_LINKDEF_H
+#define PATINTERFACES_LINKDEF_H
-#include <vector>
-
+// Local include(s).
+#include "PATInterfaces/CorrectionCode.h"
#include "PATInterfaces/SystematicVariation.h"
#include "PATInterfaces/SystematicSet.h"
#include "PATInterfaces/SystematicRegistry.h"
#include "PATInterfaces/SystematicsUtil.h"
#include "PATInterfaces/StreamTestWrapper.h"
+// System include(s).
+#include <set>
+#include <vector>
+
#ifdef __CINT__
#pragma link off all globals;
@@ -17,6 +25,7 @@
#pragma link C++ nestedclass;
#pragma link C++ namespace CP;
+#pragma link C++ class CP::CorrectionCode+;
#pragma link C++ class CP::SystematicVariation+;
#pragma link C++ class std::set<CP::SystematicVariation>+;
#pragma link C++ class CP::SystematicSet+;
@@ -29,4 +38,5 @@
#pragma link C++ namespace SysStreamTest;
#pragma link C++ class SysStreamTest::StreamTestWrapper+;
-#endif
+#endif // __CINT__
+#endif // not PATINTERFACES_LINKDEF_H
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx
index 7398015984b708c78e708ffe948ed2c8bd41cbf9..5a6eef69ed4a549ce040756a6ef6ae239da2bbb9 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx
@@ -10,7 +10,7 @@
// EDM includes
#include "AsgTools/AnaToolHandle.h"
-#include "AsgTools/MessageCheck.h" // for messaging
+#include "AsgMessaging/MessageCheck.h" // for messaging
#include "POOLRootAccess/TEvent.h" // event looping
#include "xAODJet/JetContainer.h" // for jet studies
#include "GaudiKernel/ToolHandle.h" // for better working with tools
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx
index a4bfec7a5ca437e7596170ea065b1ed51408de9e..7cf8129077802d0ed22d79c60ebda83a1ba5ee81 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx
@@ -8,7 +8,7 @@
/// @author: James Robinson
// EDM include(s):
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
#include "AsgTools/AnaToolHandle.h"
// Project dependent include(s)
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx
index 3cf158009215a96dbe24eaf7233fcc94c214c888..067c435ce0bc0d8d94a1865bb804c27f07195184 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx
@@ -12,7 +12,7 @@
#include "AthContainers/ConstDataVector.h"
#include "AsgDataHandles/ReadHandle.h"
#include "AsgDataHandles/WriteHandle.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#ifndef XAOD_STANDALONE
// Usage of metadata is for now only possible in Athena...
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx
index dc75e27f179b9c4b53c499ba4059d151c3cff04f..5ed4b0e4ab56577cb9aa7dacd6097fc966dac405 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx
@@ -5,7 +5,7 @@
#include "ParticleJetTools/CopyTruthParticles.h"
#include <memory>
#include "TruthUtils/PIDHelpers.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "AsgDataHandles/ReadHandle.h"
#include "AsgDataHandles/WriteHandle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleCenterOfMassAssociation.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleCenterOfMassAssociation.cxx
index 5a10c0c6ba5e032e0e71d0ec6fea1984471a15c5..c5a3d0433c6713efbcf9819dc2f27ed779d668e5 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleCenterOfMassAssociation.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleCenterOfMassAssociation.cxx
@@ -5,7 +5,7 @@
// author: jie.yu@cern.ch
#include "ParticleJetTools/JetParticleCenterOfMassAssociation.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "TLorentzVector.h"
using namespace std;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleShrinkingConeAssociation.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleShrinkingConeAssociation.cxx
index 400438a62ce87ffa4fa5aec605c9c6f743370562..11635ea0119feb1368fab5d2496797f27e900b49 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleShrinkingConeAssociation.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleShrinkingConeAssociation.cxx
@@ -5,7 +5,7 @@
// author: cpollard@cern.ch
#include "ParticleJetTools/JetParticleShrinkingConeAssociation.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
using namespace std;
using namespace xAOD;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetDeltaRLabelTool.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetDeltaRLabelTool.cxx
index 27040971a9f2fa4993b6d715ba22f0a3b4e99a55..5ab3ad66a01711625cfa74fb1d8dd1c3393e540f 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetDeltaRLabelTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetDeltaRLabelTool.cxx
@@ -6,7 +6,7 @@
#include "ParticleJetTools/ParticleJetLabelCommon.h"
#include "xAODJet/JetContainer.h"
#include "AsgDataHandles/ReadHandle.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
using namespace std;
using namespace xAOD;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetGhostLabelTool.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetGhostLabelTool.cxx
index 2a022fd3f80f683fa026a7b6382a77cbfa4e100b..ed216f05070378f7d39595c83cb985305eb01ee5 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetGhostLabelTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetGhostLabelTool.cxx
@@ -5,7 +5,7 @@
#include "ParticleJetTools/ParticleJetGhostLabelTool.h"
#include "ParticleJetTools/ParticleJetLabelCommon.h"
#include "xAODJet/JetContainer.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
using namespace std;
using namespace xAOD;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/python/ParticleJetToolsConfig.py b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/python/ParticleJetToolsConfig.py
index 92496227ae2d930d2e177e8326dbd592de4d20b9..c35dfe4c54ec01bb43cf2309acb25da35d95deb1 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/python/ParticleJetToolsConfig.py
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/python/ParticleJetToolsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
########################################################################
# #
@@ -36,18 +36,21 @@ truthpartoptions = {
"FlavourLabel":{"ToolType":CompFactory.CopyFlavorLabelTruthParticles,"ptmin":5000},
}
def getCopyTruthLabelParticles(truthtype):
- truthcategory = ""
+ toolProperties = {}
if truthtype == "Partons":
truthcategory = "Partons"
- if truthtype in ["WBosons", "ZBosons", "HBosons", "TQuarksFinal"]:
+ elif truthtype in ["WBosons", "ZBosons", "HBosons", "TQuarksFinal"]:
truthcategory = "BosonTop"
else:
truthcategory = "FlavourLabel"
+ toolProperties['ParticleType'] = truthtype
+
tooltype = truthpartoptions[truthcategory]["ToolType"]
- ptmin = truthpartoptions[truthcategory]["ptmin"]
- ctp = tooltype("truthpartcopy_{0}".format(truthtype),
- PtMin = ptmin,
- OutputName = "TruthLabel{0}".format(truthtype))
+ toolProperties.update( PtMin = truthpartoptions[truthcategory]["ptmin"],
+ OutputName = "TruthLabel"+truthtype)
+ ctp = tooltype("truthpartcopy_"+truthtype,
+ **toolProperties
+ )
return ctp
# Generates input truth particle containers for truth jets
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/CMakeLists.txt
index 203f5d62669c0b5bce447ed6629c7517ae097fd4..2b29bf114cdc00516cc2d88f7ac3457efd45041d 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/CMakeLists.txt
@@ -5,26 +5,6 @@
# Declare the package name:
atlas_subdir( PileupReweighting )
-# Extra dependencies based on the environment:
-set( extra_dep )
-if( XAOD_STANDALONE )
- set( extra_dep PhysicsAnalysis/AnalysisCommon/ReweightUtils )
-else()
- set( extra_Dep GaudiKernel Control/AthenaBaseComps )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
- Trigger/TrigEvent/TrigDecisionInterface
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- PRIVATE
- Event/xAOD/xAODEventInfo
- Tools/PathResolver
- ${extra_dep} )
-
# External dependencies:
find_package( ROOT COMPONENTS MathCore RIO Core Tree Hist )
@@ -92,4 +72,4 @@ atlas_add_test( ut_PRWDataWeightExample_test
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
-atlas_install_scripts( scripts/PURW_create_actual_mu_profile.py )
+atlas_install_runtime( scripts/*.py )
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/python/__init__.py b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..74583d364ec2ca794156596c7254d9b234a940c6
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/python/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/PileupReweightingProvider.h b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/PileupReweightingProvider.h
index 7be829d5e557d3ee965efb08df305eb07e8dfd46..03f7434f53f8ca8584761611115351256f7163b4 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/PileupReweightingProvider.h
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/PileupReweightingProvider.h
@@ -23,6 +23,7 @@ class PileupReweightingProvider : public AthAlgorithm {
declareProperty("Input",m_inputKey="","Specify a specific EventInfo object");
declareProperty("Output",m_outputKey="","Specify an output EventInfo object. If differs from input, will create a clone of EventInfo and decorate that");
declareProperty("ConfigOutputStream",m_configStream="","Specify the stream to output config file to");
+ declareProperty("RunSystematics",m_systematics=true,"Enable systematics during run");
}
~PileupReweightingProvider() { }
@@ -69,15 +70,17 @@ class PileupReweightingProvider : public AthAlgorithm {
//here's an example of systematic variations
- for(auto& syst : m_allSysts) {
- ATH_MSG_VERBOSE("Doing systematic : " << syst.name());
- if(! m_tool->isAffectedBySystematic( syst )) continue;
- CP::SystematicSet tmp; tmp.insert( syst );
- if( m_tool->applySystematicVariation( tmp ) != CP::SystematicCode::Ok ) continue;
- CHECK( m_tool->apply(*evtInfo) );
+ if (m_systematics){
+ for(auto& syst : m_allSysts) {
+ ATH_MSG_VERBOSE("Doing systematic : " << syst.name());
+ if(! m_tool->isAffectedBySystematic( syst )) continue;
+ CP::SystematicSet tmp; tmp.insert( syst );
+ if( m_tool->applySystematicVariation( tmp ) != CP::SystematicCode::Ok ) continue;
+ CHECK( m_tool->apply(*evtInfo) );
+ }
+ //make sure we leave the tool in the nominal mode
+ if( m_tool->applySystematicVariation( CP::SystematicSet() ) != CP::SystematicCode::Ok ) return StatusCode::FAILURE;
}
- //make sure we leave the tool in the nominal mode
- if( m_tool->applySystematicVariation( CP::SystematicSet() ) != CP::SystematicCode::Ok ) return StatusCode::FAILURE;
return StatusCode::SUCCESS;
}
@@ -89,6 +92,8 @@ class PileupReweightingProvider : public AthAlgorithm {
CP::SystematicSet m_allSysts;
+ bool m_systematics;
+
};
} //end of CP namespace
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/testPRWTool.C b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/testPRWTool.C
deleted file mode 100644
index e329b8bf8719df3a106026872a559e24ecbdf082..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/testPRWTool.C
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include "PileupReweighting/PileupReweightingTool.h"
-#include "TTree.h"
-
-void testValue(double v1, double v2) {
- if( (!v1 && v2) || (!v2 && v1) ) throw std::runtime_error("zero-non-zero mismatch");
- if( fabs(v1-v2)/v1 > 0.001 ) throw std::runtime_error("mismatch > 0.1% in values");
-}
-
-
-int main() {
- //create a 'dummy' lumicalc file, with only a few runs, with a few lumiblocks
- TFile l("dummy.None.lumicalc.root","RECREATE");
- TTree *t = new TTree("LumiMetaData","LumiMetaData");
- UInt_t runNbr=0;Float_t ps1=1;Float_t ps2=1; Float_t ps3=1;UInt_t lbn=0;Float_t intLumi=0;Float_t mu=0;
- t->Branch("RunNbr",&runNbr);t->Branch("L1Presc",&ps1);t->Branch("L2Presc",&ps2);t->Branch("L3Presc",&ps3);t->Branch("LBStart",&lbn);t->Branch("IntLumi",&intLumi);t->Branch("AvergeInteractionPerXing",&mu);
-
- runNbr=1;lbn=1;intLumi=5;mu=0.5;t->Fill();
- runNbr=1;lbn=2;intLumi=10;mu=1.5;t->Fill();
- runNbr=2;lbn=1;intLumi=3;mu=1.5;t->Fill();
- runNbr=3;lbn=1;intLumi=7;mu=1.5;t->Fill();
- runNbr=3;lbn=2;intLumi=2;mu=2.5;t->Fill(); //will be unrepresented data in the setup in channel 2000
-
- t->Write();delete t;
- l.Close();
-
- //make some trigger lumicalcs... only the prescale numbers are important!
- TFile l2("dummy.TriggerA.lumicalc.root","RECREATE");
- t = new TTree("LumiMetaData","LumiMetaData");
- t->Branch("RunNbr",&runNbr);t->Branch("L1Presc",&ps1);t->Branch("L2Presc",&ps2);t->Branch("L3Presc",&ps3);t->Branch("LBStart",&lbn);t->Branch("IntLumi",&intLumi);t->Branch("AvergeInteractionPerXing",&mu);
-
- runNbr=1;lbn=1;ps1=2;mu=0.5;t->Fill();
- runNbr=1;lbn=2;ps1=3;mu=1.5;t->Fill();
- runNbr=2;lbn=1;ps1=3;mu=1.5;t->Fill();
- runNbr=3;lbn=1;ps1=4;mu=1.5;t->Fill();
- runNbr=3;lbn=2;ps1=2;mu=2.5;t->Fill();
-
- t->Write();delete t;
- l2.Close();
-
- TFile l3("dummy.TriggerB.lumicalc.root","RECREATE");
- t = new TTree("LumiMetaData","LumiMetaData");
- t->Branch("RunNbr",&runNbr);t->Branch("L1Presc",&ps1);t->Branch("L2Presc",&ps2);t->Branch("L3Presc",&ps3);t->Branch("LBStart",&lbn);t->Branch("IntLumi",&intLumi);t->Branch("AvergeInteractionPerXing",&mu);
-
- runNbr=1;lbn=1;ps1=4;mu=0.5;t->Fill();
- runNbr=1;lbn=2;ps1=6;mu=1.5;t->Fill();
- runNbr=2;lbn=1;ps1=6;mu=1.5;t->Fill();
- runNbr=3;lbn=1;ps1=8;mu=1.5;t->Fill();
- runNbr=3;lbn=2;ps1=4;mu=2.5;t->Fill();
-
- t->Write();delete t;
- l3.Close();
-
- //now create a config file ... this test config file generating
-
- CP::TPileupReweighting g;
- g.AddPeriod(100,1,2);
- g.AddPeriod(101,3,3);
- g.SetUniformBinning(10,0,10);
- g.Initialize();
-
- g.Fill(100,2002,1,0.5);
- g.Fill(100,2002,1,1.5);
- g.Fill(101,2002,1,1.5);
- g.Fill(101,2002,1,2.5);
- g.Fill(101,2002,1,3.5);
-
- g.WriteToFile("dummy1.prw.root");
-
- CP::TPileupReweighting* genConfig = new CP::TPileupReweighting("genConfig");
- genConfig->AddPeriod(100,1,2);
- genConfig->AddPeriod(101,3,3);
- genConfig->SetUniformBinning(10,0,10);
- genConfig->Initialize();
-
- genConfig->Fill(100,2000/*channel number*/,1/*evt_weight*/,0.5);
- genConfig->Fill(100,2000,1,1.5);
- genConfig->Fill(101,2000,1,1.5);genConfig->Fill(101,2000,1,1.5);genConfig->Fill(101,2000,1,1.5); //three times stats in this bin
-
- genConfig->Fill(100,2001,0.5,1.5);
- genConfig->Fill(101,2001,2,1.5);
- genConfig->Fill(101,2001,1,2.5);
-
- genConfig->WriteToFile("dummy2.prw.root");
-
-
- std::vector<std::string> configFiles = {"dummy2.prw.root"};
- std::vector<std::string> lumicalcFiles = {"dummy.None.lumicalc.root"};
-
- //check multi period failure
- CP::IPileupReweightingTool* prw_bad = new CP::PileupReweightingTool("prw_bad");
- asg::setProperty(prw_bad,"ConfigFiles",configFiles).ignore();
- asg::setProperty(prw_bad,"LumiCalcFiles",lumicalcFiles).ignore();
-
- try {
- prw_bad->initialize().ignore();
- } catch(const std::runtime_error& e) {
- std::cout << "correctly caught:" << e.what() << std::endl;
- }
-
-
-
- //repeat with action=3 ...
- CP::IPileupReweightingTool* prw = new CP::PileupReweightingTool("prw");
- asg::setProperty(prw,"ConfigFiles",configFiles).ignore();
- asg::setProperty(prw,"LumiCalcFiles",lumicalcFiles).ignore();
- asg::setProperty(prw,"UseMultiPeriods",true).ignore(); //channel 2000 has periods 100 and 101
- prw->initialize().ignore();
-
-
-
- prw->expert()->SetUnrepresentedDataAction(3,1);
-
- std::cout << "prw channel2000 combined weights: " << prw->expert()->GetCombinedWeight(100,2000,0.5) << " (expected 0.0) " << prw->expert()->GetCombinedWeight(100,2000,1.5) << " (expected 3.33333) " << prw->expert()->GetCombinedWeight(101,2000,1.5) << " (expected=0.555555) " << std::endl;
- std::cout << "prw channel2000 'sum of weights': " << prw->expert()->GetCombinedWeight(100,2000,0.5)+prw->expert()->GetCombinedWeight(100,2000,1.5)+3*prw->expert()->GetCombinedWeight(101,2000,1.5) << " from 5 events (sum of evtweights=5)" << std::endl;
-
- std::cout << "prw channel2001 combined weights: " << prw->expert()->GetCombinedWeight(100,2001,1.5) << " (expected 4.66666) " << prw->expert()->GetCombinedWeight(101,2001,1.5) << " (expected 0.58333) " << prw->expert()->GetCombinedWeight(101,2001,2.5) << " (expected=0.259259) " << std::endl;
- std::cout << "prw channel2001 'sum of weights': " << 0.5*prw->expert()->GetCombinedWeight(100,2001,1.5)+2.*prw->expert()->GetCombinedWeight(101,2001,1.5)+1.*prw->expert()->GetCombinedWeight(101,2001,2.5) << " from 3 events (of various weights, sum of evtweights=3.5)" << std::endl;
-
-
-
-
- CP::IPileupReweightingTool* prw1 = new CP::PileupReweightingTool("prw1");
- std::vector<std::string> configFiles1 = {"dummy1.prw.root"};
- std::vector<std::string> lumicalcFiles1 = {"dummy.None.lumicalc.root","dummy.TriggerA.lumicalc.root:TriggerA","dummy.TriggerB.lumicalc.root:TriggerB"};
- asg::setProperty(prw1, "ConfigFiles",configFiles1).ignore();
- asg::setProperty(prw1, "LumiCalcFiles",lumicalcFiles1).ignore();
- asg::setProperty(prw1,"UseMultiPeriods",true).ignore(); //channel 2000 has periods 100 and 101
- prw1->initialize().ignore();
-
- std::cout << "prw1 Integrated lumi = " << prw1->GetIntegratedLumi() << " (expected=2.7e-5) " << std::endl; testValue(prw1->GetIntegratedLumi(),2.7e-5);
- std::cout << "prw1 periodWeights : " << prw1->expert()->GetPeriodWeight(100,2002) << " (expected=1.6666) " << prw1->expert()->GetPeriodWeight(101,2002) << " (expected=0.5555)" << std::endl; testValue(prw1->expert()->GetPeriodWeight(100,2002),1.6666);
- std::cout << "prw1 primaryWeights : " << prw1->expert()->GetPrimaryWeight(100,2002,0.5) << " (expected=0.5555) " << prw1->expert()->GetPrimaryWeight(100,2002,1.5) << " (expected=1.4444) " << prw1->expert()->GetPrimaryWeight(101,2002,0.5) << " (expected=inf .. no MC) " << prw1->expert()->GetPrimaryWeight(101,2002,1.5) << " (expected=2.3333) " << prw1->expert()->GetPrimaryWeight(101,2002,2.5) << " (expected=0.6666) " << prw1->expert()->GetPrimaryWeight(101,2002,3.5) << " (expected=0.) " << std::endl;
- testValue(prw1->expert()->GetPrimaryWeight(100,2002,0.5),0.5555);
- testValue(prw1->expert()->GetPrimaryWeight(100,2002,1.5),1.4444);
- testValue(prw1->expert()->GetPrimaryWeight(101,2002,1.5),2.3333);
- testValue(prw1->expert()->GetPrimaryWeight(101,2002,2.5),0.6666);
- testValue(prw1->expert()->GetPrimaryWeight(101,2002,3.5),0);
-
- //test the random run number and lumiblock number generating
- int num1(0); int lnum1(0);
- for(int i=0;i<1000000;i++) {
- if(prw1->expert()->GetRandomRunNumber(100)==1) { //returns 1 or 2 in this test case .. should give 1 about 15/18ths of the time
- num1++;
- if(prw1->expert()->GetRandomLumiBlockNumber(1)==1) lnum1++;
- }
- }
- std::cout << "prw1 fraction of run1 = " << float(num1)/1000000 << " (expected=0.833333) " << " fraction of these with lbn1 = " << float(lnum1)/num1 << " (expected=0.333333) " << std::endl;
- testValue(float(num1)/1000000,0.8333333);
- testValue(float(lnum1)/num1,0.333333);
-
- //test the DataWeights functionality .. first test the IntegratedLumi ...
- std::cout << "prw1 TriggerA lumi = " << prw1->expert()->GetIntegratedLumi("TriggerA") << " (expected=9.58333e-6) " << std::endl; testValue(prw1->expert()->GetIntegratedLumi("TriggerA"),9.58333e-6);
- std::cout << "prw1 TriggerB lumi = " << prw1->expert()->GetIntegratedLumi("TriggerB") << " (expected=4.79166e-6) " << std::endl; testValue(prw1->expert()->GetIntegratedLumi("TriggerB"),4.79166e-6);
- std::cout << "prw1 TriggerA&&TriggerB lumi = " << prw1->expert()->GetIntegratedLumi("TriggerA&&TriggerB") << " (expected=1.81597e-6) " << std::endl;testValue(prw1->expert()->GetIntegratedLumi("TriggerA&&TriggerB"),1.81597e-6);
-
- //now check the dataweight .. remember the runNumber is converted into a periodNumber (i.e. the weights aren't unique to a runNumber, they are unique to the periodNumber)
- std::cout << "prw1 TriggerA DataWeights (mu independent): " << prw1->expert()->GetDataWeight(1,"TriggerA") << " (expected=2.63415) " << prw1->expert()->GetDataWeight(2,"TriggerA") << " (expected=2.63415) " << prw1->expert()->GetDataWeight(3,"TriggerA") << " (expected=3.2727)" << std::endl;
- std::cout << "prw1 TriggerA DataWeights (mu dependent): " << prw1->expert()->GetDataWeight(1,"TriggerA",0.5) << " (expected=2) " << prw1->expert()->GetDataWeight(1,"TriggerA",1.5) << " (expected=3) " << prw1->expert()->GetDataWeight(2,"TriggerA",1.5) << " (expected=3.0000) " << prw1->expert()->GetDataWeight(3,"TriggerA",1.5) << " (expected=4) " << prw1->expert()->GetDataWeight(3,"TriggerA",2.5) << " (expected=2) " << std::endl;
-
- try {
- prw1->expert()->GetDataWeight(3,"TriggerA",3.5);
- } catch(...) {
- std::cout << "correctly threw exception for out of range mu" << std::endl;
- }
-
- testValue(prw1->expert()->GetDataWeight(1,"TriggerA"),2.63415);
- testValue(prw1->expert()->GetDataWeight(2,"TriggerA"),2.63415);
- testValue(prw1->expert()->GetDataWeight(3,"TriggerA"),3.2727);
- testValue(prw1->expert()->GetDataWeight(1,"TriggerA",0.5),2.);
- testValue(prw1->expert()->GetDataWeight(2,"TriggerA",1.5),3.);
- testValue(prw1->expert()->GetDataWeight(3,"TriggerA",1.5),4);
- testValue(prw1->expert()->GetDataWeight(3,"TriggerA",2.5),2);
- //testValue(prw1->expert()->GetDataWeight(3,"TriggerA",3.5),nan);
-
-
- //CP::TPileupReweighting t;
-
- //t.AddLumiCalcFile("/usera/will/testareas/ZZ8TeV/ZZAnalysis/share/GRL_v61.None.lumicalc.root");
-
-
-
-
- return 0;
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
index 6ee792ac79c52ec444240dce22d39b4877352e62..8b98cbffd072569eebb5ead05926e6d60feaacc0 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ThinCaloCellsAlg.cxx
@@ -16,7 +16,6 @@
// FrameWork includes
#include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
@@ -86,20 +85,19 @@ StatusCode ThinCaloCellsAlg::initialize()
ATH_MSG_DEBUG( "Got the full name of the tool: " << fullToolName );
// Now, set all properties of the private skimTool that were acutally configured
- ATH_MSG_DEBUG( "Setting property" << m_streamName
+ ATH_MSG_DEBUG( "Setting property" << m_streamName
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue ( fullToolName,
- StringProperty("StreamName",m_streamName) ) );
+ m_jos->set (fullToolName + ".StreamName", m_streamName.value());
if (m_setCaloCellKey) {
ATH_MSG_DEBUG( "Setting property" << m_caloCellKey
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_caloCellKey) );
+ m_jos->set (fullToolName + "." + m_caloCellKey.name(), m_caloCellKey.value() );
}
if (m_setInCollKey) {
ATH_MSG_DEBUG( "Setting property" << m_inCollKeyList
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_inCollKeyList) );
+ m_jos->set (fullToolName + "." + m_inCollKeyList.name(), m_inCollKeyList.toString());
}
ATH_MSG_DEBUG( "Done setting properties of the tool");
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
index 4fbe27324280b532c9e5a7983ea80e5661e70bc9..462a55ce358c9ed48b9171dc763a60c92d08ff04 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,13 +23,13 @@
#include <string>
// FrameWork includes
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
// forward declarations
-class IJobOptionsSvc;
namespace DerivationFramework {
class IThinningTool;
}
@@ -73,7 +73,7 @@ private:
private:
/// The job options service (will be used to forward this algs properties to
/// the private tool)
- ServiceHandle<IJobOptionsSvc> m_jos;
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_jos;
StringProperty m_streamName
{ this, "StreamName", "", "Name of the stream being thinned" };
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
index 56028209af2cf0c22565cbc01780a7f6e98c51cb..db99028ed4d2c38d2181959ab19b757f61192733 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ThinCaloClustersAlg.cxx
@@ -16,7 +16,6 @@
// FrameWork includes
#include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
@@ -94,23 +93,22 @@ StatusCode ThinCaloClustersAlg::initialize()
// Now, set all properties of the private skimTool that were acutally configured
ATH_MSG_DEBUG( "Setting property" << m_streamName
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue ( fullToolName,
- StringProperty("StreamName",m_streamName) ) );
+ m_jos->set (fullToolName + ".StreamName", m_streamName);
if (m_setCaloClusKey) {
ATH_MSG_DEBUG( "Setting property" << m_caloClusKey
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_caloClusKey) );
+ m_jos->set (fullToolName + "." + m_caloClusKey.name(), m_caloClusKey.value());
}
if (m_setInCollKey) {
ATH_MSG_DEBUG( "Setting property" << m_inCollKeyList
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_inCollKeyList) );
+ m_jos->set (fullToolName + "." + m_inCollKeyList.name(), m_inCollKeyList.toString());
}
if (m_setSelection) {
ATH_MSG_DEBUG( "Setting property" << m_selection
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_selection) );
+ m_jos->set (fullToolName + "." + m_selection.name(), m_selection.value());
}
ATH_MSG_DEBUG( "Done setting properties of the tool");
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
index db6d844fd80aac7eb752a657115bd8f639d6360f..f95b232b6dff8f22857513ddd294a6a65a750284 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -25,13 +25,13 @@
#include <string>
// FrameWork includes
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
// forward declarations
-class IJobOptionsSvc;
namespace DerivationFramework {
class IThinningTool;
}
@@ -78,7 +78,7 @@ private:
private:
/// The job options service (will be used to forward this algs properties to
/// the private tool)
- ServiceHandle<IJobOptionsSvc> m_jos;
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_jos;
StringProperty m_streamName
{ this, "StreamName", "", "Name of the stream being thinned" };
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
index 223e8d9b520bc98a53f3453a344fb61786ae9f9d..ac72ea70a1b1d8af83372d73350d10956d33c9a1 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ThinIParticlesAlg.cxx
@@ -16,7 +16,6 @@
// FrameWork includes
#include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
@@ -94,23 +93,22 @@ StatusCode ThinIParticlesAlg::initialize()
// Now, set all properties of the private skimTool that were acutally configured
ATH_MSG_DEBUG( "Setting property" << m_streamName
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue ( fullToolName,
- StringProperty("StreamName",m_streamName) ) );
+ m_jos->set (fullToolName + ".StreamName", m_streamName.value());
if (m_setIPartKey) {
ATH_MSG_DEBUG( "Setting property" << m_ipartKey
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_ipartKey) );
+ m_jos->set (fullToolName + "." + m_ipartKey.name(), m_ipartKey.value());
}
if (m_setInCollKey) {
ATH_MSG_DEBUG( "Setting property" << m_inCollKeyList
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_inCollKeyList) );
+ m_jos->set (fullToolName + "." + m_inCollKeyList.name(), m_inCollKeyList.toString());
}
if (m_setSelection) {
ATH_MSG_DEBUG( "Setting property" << m_selection
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_selection) );
+ m_jos->set (fullToolName + "." + m_selection.name(), m_selection.value());
}
ATH_MSG_DEBUG( "Done setting properties of the tool");
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
index 794cae00b620cb150dbdabb30ba16618ecd90e60..b55cb51ae66475bed812f8e8e062040fb62f9d7e 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -25,13 +25,13 @@
#include <string>
// FrameWork includes
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
// forward declarations
-class IJobOptionsSvc;
namespace DerivationFramework {
class IThinningTool;
}
@@ -78,7 +78,7 @@ private:
private:
/// The job options service (will be used to forward this algs properties to
/// the private tool)
- ServiceHandle<IJobOptionsSvc> m_jos;
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_jos;
StringProperty m_streamName
{ this, "StreamName", "", "Name of the stream for which thinning is done" };
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
index 1f06f106c17e82e9849acb08a7c7a1ce23a072d5..a95bd23513c372c07f077d0c19eb72916bd04420 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ThinTrackParticlesAlg.cxx
@@ -16,7 +16,6 @@
// FrameWork includes
#include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
@@ -119,43 +118,42 @@ StatusCode ThinTrackParticlesAlg::initialize()
// Now, set all properties of the private skimTool that were acutally configured
ATH_MSG_DEBUG( "Setting property" << m_streamName
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue ( fullToolName,
- StringProperty("StreamName",m_streamName) ) );
+ m_jos->set (fullToolName + ".StreamName", m_streamName.value());
if (m_setTrackPartKey) {
ATH_MSG_DEBUG( "Setting property" << m_trackParticleKey
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_trackParticleKey) );
+ m_jos->set (fullToolName + "." + m_trackParticleKey.name(), m_trackParticleKey.value());
}
if (m_setInCollKey) {
ATH_MSG_DEBUG( "Setting property" << m_inCollKeyList
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_inCollKeyList) );
+ m_jos->set (fullToolName + "." + m_inCollKeyList.name(), m_inCollKeyList.toString());
}
if (m_setSelection) {
ATH_MSG_DEBUG( "Setting property" << m_selection
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_selection) );
+ m_jos->set (fullToolName + "." + m_selection.name(), m_selection.value() );
}
if (m_setTauConv) {
ATH_MSG_DEBUG( "Setting property" << m_tauConversion
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_tauConversion) );
+ m_jos->set (fullToolName + "." + m_tauConversion.name(), m_tauConversion.toString());
}
if (m_setTauWide) {
ATH_MSG_DEBUG( "Setting property" << m_tauWide
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_tauWide) );
+ m_jos->set (fullToolName + "." + m_tauWide.name(), m_tauWide.toString());
}
if (m_setTauOther) {
ATH_MSG_DEBUG( "Setting property" << m_tauOther
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_tauOther) );
+ m_jos->set (fullToolName + "." + m_tauOther.name(), m_tauOther.toString());
}
if (m_setNEleTPMax) {
ATH_MSG_DEBUG( "Setting property" << m_nElectronPTMax
<< " of private tool with name: '" << fullToolName << "'" );
- ATH_CHECK( m_jos->addPropertyToCatalogue (fullToolName,m_nElectronPTMax) );
+ m_jos->set (fullToolName + "." + m_nElectronPTMax.name(), m_nElectronPTMax.toString());
}
ATH_MSG_DEBUG( "Done setting properties of the tool");
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
index 1b0b65eecbaa06ddc48755ea9d4dc58abaebf93c..0769bceaf3c300f5b53b2efd9971bfade601ef58 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -25,13 +25,13 @@
#include <string>
// FrameWork includes
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
// forward declarations
-class IJobOptionsSvc;
namespace DerivationFramework {
class IThinningTool;
}
@@ -90,7 +90,7 @@ private:
private:
/// The job options service (will be used to forward this algs properties to
/// the private tool)
- ServiceHandle<IJobOptionsSvc> m_jos;
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_jos;
StringProperty m_streamName
{ this, "StreamName", "", "Name of the stream being thinned" };
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcDigitsFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcDigitsFillerTool.cxx
index 6663e3e52c03faed9a891d566b250ed49a914a92..0e6d0320879f7b3151870420f4b6888d395b8dba 100644
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcDigitsFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcDigitsFillerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: ZdcDigitsFillerTool.cxx 524378 2012-11-04 10:06:03Z ssnyder $
@@ -55,9 +55,6 @@ namespace D3PD {
*/
CHECK( detStore()->retrieve( m_zdcID ) );
- // Initialize the singleton:
- ZdcCablingService::getInstance()->setZdcID( m_zdcID );
-
ATH_MSG_INFO( "ZdcDigitsFillerTool---> Initialized" );
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcFillerTool.cxx
index e054c088648bb210d21a0e9d908eb73041673b8b..763322fa5365a0927d90b080a3f3e416cecc7620 100644
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcFillerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: ZdcFillerTool.cxx 524378 2012-11-04 10:06:03Z ssnyder $
@@ -60,9 +60,6 @@ namespace D3PD {
*/
CHECK( detStore()->retrieve( m_zdcID ) );
- // Configure the singleton:
- ZdcCablingService::getInstance()->setZdcID( m_zdcID );
-
//Prepare the calibration objects
fillCalibrationConstants();
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcRecoFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcRecoFillerTool.cxx
index 8fc8076b1e18ed5e5d3d9b21ed62fa55d2a2a855..e579d8bc4f3c99ab1ccfe38b010ddfc888290935 100644
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcRecoFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/ZdcRecoFillerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: ZdcRecoFillerTool.cxx 538890 2013-02-25 04:49:38Z leite $
@@ -61,9 +61,6 @@ namespace D3PD {
//Get mapping from detector store
CHECK( detStore()->retrieve( m_zdcID ) );
- // Configure the singleton:
- ZdcCablingService::getInstance()->setZdcID( m_zdcID );
-
//Prepare the calibration objects
fillCalibrationConstants();
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/__init__.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/__init__.py
index 21a086f03bcb5fcd0ef8f50c13d9b892a69f48c4..18b5e91cbf2cd5e8614f53d9570d3c07f7b149bf 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/__init__.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/__init__.py
@@ -16,6 +16,3 @@ for k, v in egammaD3PDAnalysisConf.__dict__.items():
if k.startswith ('D3PD__'):
globals()[k[6:]] = v
-# Bring this into this scope.
-from .egammaShowerDepthAlg import egammaShowerDepthAlg
-
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaShowerDepthAlg.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaShowerDepthAlg.py
deleted file mode 100644
index a0bbe1380d6df385b643504156b358c971654b73..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaShowerDepthAlg.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# $Id$
-#
-# @file egammaD3PDMakerAnalysis/python/egammaShowerDepthAlg.py
-# @author scott snyder <snyder@bnl.gov>
-# @date Aug, 2010
-# @brief Configure the shower depth algorithm.
-#
-
-
-from egammaD3PDAnalysis import egammaD3PDAnalysisConf
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from AthenaCommon.GlobalFlags import globalflags
-
-def egammaShowerDepthAlg (name, **kwin):
- # Set up database access.
- if globalflags.DataSource() == 'data':
- folder = '/CALO/CaloSwClusterCorrections/calhits'
- else:
- folder = '/CALO/Ofl/CaloSwClusterCorrections/calhits'
- tag = D3PDMakerFlags.EgammaShowerDepthTag()
- if not tag:
- tag = '@GLOBAL'
-
- # Create the algorithm.
- kw = {'prefix' : 'ele55.'}
- kw.update (kwin)
- alg = egammaD3PDAnalysisConf.D3PD__egammaShowerDepthAlg (name, **kw)
-
- from CaloClusterCorrection.common import config_from_cool
- config_from_cool (alg, folder, tag)
-
- return alg
-
-
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaShowerDepthConfig.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaShowerDepthConfig.py
deleted file mode 100644
index d28fb244266bf4c1d39f2dd26db6ab67681d76dd..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/python/egammaShowerDepthConfig.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# $Id$
-#
-# @file egammaD3PDAnalysis/python/egammaShowerDepthConfig.py
-# @author scott snyder <snyder@bnl.gov>
-# @date Nov, 2011
-# @brief Configure egammaShowerDepthAlg to fill UserData.
-#
-
-
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from D3PDMakerCoreComps.resolveSGKey import resolveSGKey
-from AthenaCommon.AlgSequence import AlgSequence
-import D3PDMakerCoreComps
-import egammaD3PDAnalysis
-
-
-def egammaShowerDepthConfig \
- (seq = AlgSequence(D3PDMakerFlags.PreD3PDAlgSeqName()),
- prefix = '',
- sgkey = D3PDMakerFlags.ElectronSGKey(),
- typeName = 'DataVector<xAOD::Electron_v1>',
- allowMissing = False):
- """Configure egammaShowerDepthAlg for D3PD making.
-
- SEQ is the Gaudi sequence to which the algorithm should be added.
- Default is that given by PreD3PDAlgSeqName.
-
- PREFIX is a prefix to add to the name of the algorithm scheduled.
-
- SGKEY/TYPENAME is the StoreGate key of the input electron container
- and the name of its type.
-
- If ALLOWMISSING is true, don't fail if the SG key doesn't exist.
-"""
-
- if (not D3PDMakerFlags.MakeEgammaUserData() or
- D3PDMakerFlags.HaveEgammaUserData()):
- return
-
- DVGetter = D3PDMakerCoreComps.SGDataVectorGetterTool
- resolved_sgkey = resolveSGKey (typeName, sgkey)
- auxprefix = (D3PDMakerFlags.EgammaUserDataPrefix() + '_' +
- resolved_sgkey + '_')
-
- depthname = 'egammaShowerDepthAlg_' + resolved_sgkey
- if not hasattr (seq, depthname):
- seq += egammaD3PDAnalysis.egammaShowerDepthAlg \
- (depthname,
- Getter = DVGetter
- (prefix + 'egammaShowerDepthGetter',
- TypeName = typeName,
- SGKey = sgkey),
- AllowMissing = allowMissing,
- AuxPrefix = auxprefix
- )
-
- return
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
index 51a82d7f0521ce5cf3ad10f72b97010051faa418..8ab296c25ee9fb1fc3bf4dc050f7e2f22de9ef02 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
@@ -1,5 +1,4 @@
#include "../egammaDeltaEmax2Alg.h"
-#include "../egammaShowerDepthAlg.h"
#include "../PhotonTruthAlg.h"
#include "../ElectronRedoOQAlg.h"
#include "../PhotonRedoOQAlg.h"
@@ -16,7 +15,6 @@
DECLARE_COMPONENT( D3PD::egammaDeltaEmax2Alg )
-DECLARE_COMPONENT( D3PD::egammaShowerDepthAlg )
DECLARE_COMPONENT( D3PD::PhotonTruthAlg )
DECLARE_COMPONENT( D3PD::ElectronRedoOQAlg )
DECLARE_COMPONENT( D3PD::PhotonRedoOQAlg )
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/egammaShowerDepthAlg.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/egammaShowerDepthAlg.cxx
deleted file mode 100644
index 3a832b914c27eda39ac10987a1188ae5fce633ae..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/egammaShowerDepthAlg.cxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-/**
- * @file egammaD3PDAnalysis/src/egammaShowerDepthAlg.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Jul, 2010
- * @brief Store in UserData the shower depth for an egamma object.
- */
-
-
-#include "egammaShowerDepthAlg.h"
-#include "D3PDMakerInterfaces/ICollectionGetterTool.h"
-#include "xAODEgamma/Egamma.h"
-#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/ThreadLocalContext.h"
-
-
-namespace D3PD {
-
-
-/**
- * @brief Standard Gaudi @c initialize method.
- */
-StatusCode egammaShowerDepthAlg::initialize()
-{
- CHECK( base_class::initialize() );
- CHECK( m_getter.retrieve() );
- CHECK( m_getter->configureD3PD<xAOD::Egamma>() );
-
- return StatusCode::SUCCESS;
-}
-
-
-/**
- * @brief Standard Gaudi @c execute method.
- */
-StatusCode egammaShowerDepthAlg::execute()
-{
- Context myctx = context (Gaudi::Hive::currentContext());
-
- xAOD::Egamma::Decorator<float> depth (m_auxPrefix + "calibHitsShowerDepth");
-
- // FIXME: Using the adjusted eta value isn't implemented.
- if (!m_use_raw_eta(myctx)) {
- REPORT_MESSAGE (MSG::WARNING) << "use_raw_eta==false is not implemented.";
- }
-
- CHECK( m_getter->reset (m_allowMissing) );
- while (const xAOD::Egamma* eg = m_getter->next<xAOD::Egamma>())
- {
- const xAOD::CaloCluster* cl = eg->caloCluster();
- depth(*eg) = -999;
- if (cl)
- depth(*eg) = m_depthCalc.depth (std::abs (cl->etaBE(2)),
- m_eta_start_crack(myctx),
- m_eta_end_crack(myctx),
- m_sampling_depth(myctx),
- m_etamax(myctx),
- cl, msg());
- }
-
- return StatusCode::SUCCESS;
-}
-
-
-} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/egammaShowerDepthAlg.h b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/egammaShowerDepthAlg.h
deleted file mode 100644
index d14db8596d68f2e7ae790179fb9c1feee06bf149..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/egammaShowerDepthAlg.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-/**
- * @file egammaD3PDAnalysis/src/egammaShowerDepthAlg.h
- * @author scott snyder <snyder@bnl.gov>
- * @date Jul, 2010
- * @brief Store in UserData the shower depth for an egamma object.
- */
-
-
-#ifndef EGAMMAD3PDANALYSIS_EGAMMASHOWERDEPTHALG_H
-#define EGAMMAD3PDANALYSIS_EGAMMASHOWERDEPTHALG_H
-
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "CaloClusterCorrection/CaloSwCalibHitsShowerDepth.h"
-#include "CaloUtils/ToolWithConstants.h"
-#include "GaudiKernel/ToolHandle.h"
-
-
-namespace D3PD {
-
-
-class ICollectionGetterTool;
-
-
-/**
- * @brief Store in UserData the shower depth for an egamma object.
- */
-class egammaShowerDepthAlg
- : public CaloUtils::ToolWithConstants<AthAlgorithm>
-{
-public:
- /// Inherit constructor.
- using base_class::base_class;
-
-
- /// Standard Gaudi @c initialize method.
- virtual StatusCode initialize() override;
-
-
- /// Standard Gaudi @c execute method.
- virtual StatusCode execute() override;
-
-
-private:
- /// Property: Prefix to add to aux data items.
- StringProperty m_auxPrefix
- { this, "AuxPrefix", "", "Prefix to add to aux data items." };
-
- /// Property: Getter for input egamma objects.
- ToolHandle<ICollectionGetterTool> m_getter
- { this, "Getter", "", "Getter instance for the input egamma objects." };
-
- /// Property: If true, don't complain if input objects are missing.
- BooleanProperty m_allowMissing
- { this, "AllowMissing", false, "If true, don't complain if input objects are missing." };
-
- /// Property: Table of sampling depth weights.
- Constant<CxxUtils::Array<2> > m_sampling_depth { this, "sampling_depth" };
-
- /// Property: Eta of the start of the crack.
- Constant<float> m_eta_start_crack { this, "eta_start_crack" };
-
- /// Property: Eta of the end of the crack.
- Constant<float> m_eta_end_crack { this, "eta_end_crack" };
-
- /// Property: Maximum eta range of the depth weight table.
- Constant<float> m_etamax { this, "etamax" };
-
- /// Property: Use raw eta value for region comparisons?
- // FIXME: The false setting of this is not implemented.
- Constant<bool> m_use_raw_eta { this, "use_raw_eta" };
-
- /// Depth calculator.
- CaloClusterCorr::CaloSwCalibHitsShowerDepth m_depthCalc;
-};
-
-
-} // namespace D3PD
-
-
-#endif // not EGAMMAD3PDANALYSIS_EGAMMASHOWERDEPTHALG_H
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py
index 70032fc0ce29104ac7b354e043f3a9f462e7a874..a7327726cea8d7cb11c1e2544c06a84a2066f954 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/ElectronD3PDObject.py
@@ -358,16 +358,6 @@ if D3PDMakerFlags.HaveEgammaUserData() or D3PDMakerFlags.MakeEgammaUserData():
# ])
- defineBlockAndAlg \
- (ElectronD3PDObject,
- 1, 'UDShowerDepth',
- D3PDMakerCoreComps.AuxDataFillerTool,
- 'egammaShowerDepthConfig',
- AuxPrefix = auxprefix,
- Vars = ['calibHitsShowerDepth #Shower depth as defined by the calib hits cluster correction',
- ])
-
-
# `target' arg needs to be passed in from the caller;
# otherwise, we don't make this block.
def _jetAssocLevel (reqlev, args):
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py
index 7ff696c52cc4314e7ccdad478ae5ac204931efe2..8362699959afc550a148bc67a4b6ab73cfc4d246 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/python/PhotonD3PDObject.py
@@ -370,14 +370,6 @@ if D3PDMakerFlags.HaveEgammaUserData() or D3PDMakerFlags.MakeEgammaUserData():
AuxPrefix = auxprefix,
Vars = ['deltaEmax2',
])
- defineBlockAndAlg \
- (PhotonD3PDObject,
- 1, 'UDShowerDepth',
- D3PDMakerCoreComps.AuxDataFillerTool,
- 'egammaShowerDepthConfig',
- AuxPrefix = auxprefix,
- Vars = ['calibHitsShowerDepth #Shower depth as defined by the calib hits cluster correction',
- ])
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
index 670fc9aff2cbf014a12af69e9e95d569b7435e03..84cc10421356fe87a9ff613ce1c05c8163af2b8b 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
@@ -20,7 +20,7 @@
#include <vector>
#else
#include <AthenaBaseComps/AthHistogramAlgorithm.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <StoreGate/StoreGateSvc.h>
#include <GaudiKernel/IIncidentListener.h>
#include <GaudiKernel/ServiceHandle.h>
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h
index 38c9cc6da44a4e18163542e7dc711e8a25fb1530..c60c200183e5941c3c6fa3c618f1d9209a16dec4 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h
@@ -14,7 +14,7 @@
#include <string>
// Framework include(s):
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
// Local include(s):
#include "AnaAlgorithm/Global.h"
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h
index 42f4197683e97c0681fadec8e8ba2b47ea5919cb..dee0b97469377aa822ac2347be26b5ab6535aba2 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h
@@ -11,7 +11,7 @@
#include <AnaAlgorithm/Global.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
namespace EL
{
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx
index f8dbe6068fd9d24ea6bdb6554dae50f8f163c70c..c58ead977a41f3a0f92830e82c62b303ccc873ed 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx
@@ -12,7 +12,7 @@
#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <RootCoreUtils/Assert.h>
#include <TH1.h>
#include <TH2.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h
index 841d94708e59e69985d7113dad1e9bd926374f76..355599a218a93f28619f3300219af6d699ad5b36 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Algorithm.h
@@ -24,7 +24,7 @@
#include <EventLoop/Global.h>
#include <TNamed.h>
-#include <AsgTools/INamedInterface.h>
+#include <AsgMessaging/INamedInterface.h>
#include <AsgTools/SgTEvent.h>
#include <EventLoop/StatusCode.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h
index 81c2639d850aa5814b99b1d64b83f5d29672c8bd..ecdb8f11ffdca35644db7577796f2a70a02636f8 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h
@@ -11,7 +11,7 @@
#include <EventLoop/Global.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
namespace EL
{
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h
index 10d782ab9a784332c1068f8964102e3e7cbed4c5..47ee245888bff28bc85b68778e1027e7bba0ead6 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h
@@ -11,7 +11,7 @@
#include <EventLoop/Global.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
namespace EL
{
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx
index 51b26d8b9fe11af1f33bc4d99d6ed1fe5090bd6f..08344c08f9a070e8e22d4cb94979d10bbca9d3f4 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/Algorithm.cxx
@@ -23,8 +23,8 @@
#include <RootCoreUtils/ThrowMsg.h>
#include <TH1.h>
-#include <AsgTools/MsgLevel.h>
-#include <AsgTools/MsgStream.h>
+#include <AsgMessaging/MsgLevel.h>
+#include <AsgMessaging/MsgStream.h>
//
// method implementations
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx
index 528a2d35999a2361bdd4e3a218804b52a64bb5b5..8e50845014325a6b3dd3fc90d288b3dba189cec2 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx
@@ -12,7 +12,7 @@
#include <EventLoop/BaseManager.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/ManagerOrder.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
index f6f90279f83bf96179c5f504840361612a099156..94e0f318787d406d44de3d2563bb43fa621cc4c7 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
@@ -11,7 +11,7 @@
#include <EventLoop/CondorDriver.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/BatchJob.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx
index 1c8e46b6863e6af4e8db66a28426b07718a9ed2e..43deeada99363e95fc42d1ca9e29c038c9d1905f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx
@@ -12,7 +12,7 @@
#include <EventLoop/DriverManager.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Driver.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/ManagerOrder.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
index 48e796f860082f22043d375e8f9a8f747a47f083..1d1b231102b1359f41d28c3fb3cd07df0e40197b 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
@@ -11,7 +11,7 @@
#include <EventLoop/GEDriver.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx
index c476764c38d359337c2f0ede7a130fca13940905..f5fa5621d922df5594563960613221ef01efcc6a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx
@@ -14,7 +14,7 @@
#include <fstream>
#include <sstream>
#include <TSystem.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
index 0f65ca5cb118bbd900e10b027c2c7502739a8e1e..ca1f30aa8c2bc81b1884ce64bd68864c9c63b9b9 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
@@ -12,7 +12,7 @@
#include <EventLoop/LLDriver.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
index ad2326640be4c38f0364b82f886cfed350957cd4..7ebcaf77b94687ea6a5b06c0228a4e06e24ca65d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
@@ -11,7 +11,7 @@
#include <EventLoop/LSFDriver.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
index b794680c99c856fbe43c66cfba8dc2860752e4dc..d539774682cc6ba422790e4048ff1f261dbb6370 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
@@ -13,7 +13,7 @@
#include <sstream>
#include <TSystem.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx
index 91a5eafb77b55cdba959bddca0b8059486582d10..984596c1ea002d0ac21b5617e9b97caa29f68168 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx
@@ -12,7 +12,7 @@
#include <EventLoop/OutputStreamData.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <RootCoreUtils/Assert.h>
#include <RootCoreUtils/RootUtils.h>
#include <TH1.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx
index b9051ca92c6cc6c8be1ac965fe072439ccc00637..cfb91757649b037e7a600cbfe7d1fbc3d9b41d1f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx
@@ -12,7 +12,7 @@
#include <EventLoop/RetrieveManager.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Driver.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/ManagerOrder.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
index 33cf2ade5e151d31faae7623116fb94a3e75a71d..6d5a721ca7a125a01937183656e6ad497cef7824 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
@@ -11,7 +11,7 @@
#include <EventLoop/SlurmDriver.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/BatchJob.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
index 9afb0b6bd672699e030e833ff8329728e78e3dce..0df351060d7322078fd03c2c995b64255c4ceed3 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
@@ -12,7 +12,7 @@
#include <EventLoop/SoGEDriver.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx
index 4540f4f17197bb1ce35308289370fca2d87bdca0..7bb0fae28f433a3079fd3b67acbe78a4da8445b1 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx
@@ -12,7 +12,7 @@
#include <EventLoop/SubmitManager.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Driver.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
index 6b3700c8c517cea5ae72e9f1736e4c569b8e100d..830ff568d3af979f12be471fc06b8ad088232407 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
@@ -26,7 +26,7 @@
#include <xAODCore/tools/ReadStats.h>
#include <xAODCore/tools/PerfStats.h>
#include <xAODCore/tools/IOStats.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <TList.h>
//
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
index 5543001b1b47bf060dd30cc7b1693f42002399bc..97d813735de27533c5957fde26d4c059380fe3d7 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
@@ -11,7 +11,7 @@
#include <EventLoop/TorqueDriver.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <EventLoop/Job.h>
#include <EventLoop/ManagerData.h>
#include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
index fabb1f416eed973c8328070db26df8f3c1cd905a..296934b6cae7aae2b5b948aed3d49525303d08af 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
@@ -17,7 +17,7 @@
#include <EventLoop/VomsProxySvc.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <RootCoreUtils/Assert.h>
#include <RootCoreUtils/ThrowMsg.h>
#include <SampleHandler/GridTools.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx
index 316a881e5bf753ef4f6783d90aa7869a2d139681..1e4975ce17a360bd6327409eb75b6a65f1a791ac 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx
@@ -4,7 +4,7 @@
#include <EventLoop/Worker.h>
#include <xAODRootAccess/Init.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
int main (int argc, char **argv)
{
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx
index 3c273885c6e3a8b8ad17f564e03aa0c88e157bff..bda4443de458935162e31518cb6cfdd5dcdf079c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/DuplicateChecker.cxx
@@ -12,7 +12,7 @@
#include <EventLoopAlgs/DuplicateChecker.h>
#include <EventLoopAlgs/Global.h>
-#include <AsgTools/MsgStream.h>
+#include <AsgMessaging/MsgStream.h>
#include <EventLoop/Job.h>
#include <EventLoop/IWorker.h>
#include <RootCoreUtils/Assert.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx
index 0131805b9781dc2baa92efeed850a1e08ac2f7aa..f8a03eb14289bb19b6010e078785a7c1e3b4d2a7 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx
@@ -13,7 +13,7 @@
#include <EventLoopAlgs/Global.h>
#include <AsgTesting/UnitTest.h>
#include <AthContainers/AuxStoreStandalone.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <RootCoreUtils/Assert.h>
#include <RootCoreUtils/ShellExec.h>
#include <SampleHandler/SampleLocal.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx
index b61e4a0bcc843290b4b0def1ae92c950ca4268b5..0ca9a18270560ecc2a425b80211e8223a32d0e82 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx
@@ -5,7 +5,7 @@
#include <EventLoop/OutputStream.h>
#include <RootCoreUtils/ThrowMsg.h>
#include <xAODRootAccess/Init.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <TList.h>
#include <TSystem.h>
#include <TFile.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx
index ee2595835c2962d880ac9531da3a723312fe05a6..cbfa8d05110ba2b1b7ed5232c66494379cdc8458 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx
@@ -7,7 +7,7 @@
#include <iostream>
#include <string>
#include <xAODRootAccess/Init.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
int main (int argc, char **argv)
{
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/EventLoopTest/IUnitTestTool.h b/PhysicsAnalysis/D3PDTools/EventLoopTest/EventLoopTest/IUnitTestTool.h
index 108529600c9e384fd4100c1463af07270efe0e48..60457732f5fc8bee02b1ecee3bc42335864af2d7 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/EventLoopTest/IUnitTestTool.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/EventLoopTest/IUnitTestTool.h
@@ -10,7 +10,7 @@
#define EVENT_LOOP_TEST__I_UNIT_TEST_TOOL_H
#include <AsgTools/IAsgTool.h>
-#include <AsgTools/MsgLevel.h>
+#include <AsgMessaging/MsgLevel.h>
namespace EL
{
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg.cxx
index d92256a3d118f12f9875a2878a87b930d1dde45f..8a946d5001ea86ff201efba7aafe122c7803a59d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg.cxx
@@ -27,8 +27,8 @@
#include <TTree.h>
#include <TObjString.h>
-#include <AsgTools/MsgStream.h>
-#include <AsgTools/MsgStreamMacros.h>
+#include <AsgMessaging/MsgStream.h>
+#include <AsgMessaging/MsgStreamMacros.h>
//
// method implementations
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg1.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg1.cxx
index e44d142c08e416f820e127148389f2326be6df76..f8ed016609c4a71e900c6239dd6ef7133cc74410 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg1.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg1.cxx
@@ -27,8 +27,8 @@
#include <TTree.h>
#include <TObjString.h>
-#include <AsgTools/MsgStream.h>
-#include <AsgTools/MsgStreamMacros.h>
+#include <AsgMessaging/MsgStream.h>
+#include <AsgMessaging/MsgStreamMacros.h>
//
// method implementations
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg2.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg2.cxx
index 5746aeff0f5888c92e4840686ab9f50efc52ca0c..f36ba2659dd00c0085a390274d8d720c031f5b31 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg2.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlg2.cxx
@@ -27,8 +27,8 @@
#include <TTree.h>
#include <TObjString.h>
-#include <AsgTools/MsgStream.h>
-#include <AsgTools/MsgStreamMacros.h>
+#include <AsgMessaging/MsgStream.h>
+#include <AsgMessaging/MsgStreamMacros.h>
//
// method implementations
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx
index 4c6018d9db020810183a976271b2fcd49029b02b..4776e1e41e4e39eeab1e67831032f6f30eded490 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx
@@ -16,13 +16,13 @@
#include <EventLoop/Worker.h>
#include <RootCoreUtils/Assert.h>
#include <RootCoreUtils/ThrowMsg.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <TFile.h>
#include <TH1.h>
#include <TTree.h>
-#include <AsgTools/MsgStream.h>
-#include <AsgTools/MsgStreamMacros.h>
+#include <AsgMessaging/MsgStream.h>
+#include <AsgMessaging/MsgStreamMacros.h>
#include <xAODEventInfo/EventInfo.h>
//
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
index c2aad48ce445db989537c4a7ccdf9d53a78daa0d..683a7c7a404e47d4adab227526401fb3ece82737 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
@@ -11,7 +11,7 @@
#include <EventLoopTest/UnitTestFixture.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <EventLoop/Driver.h>
#include <AnaAlgorithm/AnaAlgorithmConfig.h>
#include <EventLoopTest/UnitTestAlg1.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx
index 101fbee1ac949bc44cb2942984abc1048378ae59..55bcfe6aae4bc5f03306d940664a023cf24c9932 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx
@@ -11,9 +11,9 @@
//
#include <AsgTools/AnaToolHandle.h>
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/IMessagePrinter.h>
-#include <AsgTools/MessagePrinterOverlay.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/IMessagePrinter.h>
+#include <AsgMessaging/MessagePrinterOverlay.h>
#include <AsgTesting/UnitTest.h>
#include <AsgTesting/MessagePrinterMock.h>
#include <cmath>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx
index 8fb58d5ff965f04ec510d301961dd59ce466ee1d..ba2bd4da18904ee2ba66ccaedb3badbd6d3de224 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx
@@ -16,7 +16,7 @@
#include <AnaAlgorithm/AlgorithmWorkerData.h>
#include <EventLoopTest/UnitTestAlg5.h>
#include <AsgTools/ToolHandle.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <AsgTesting/UnitTest.h>
#include <cmath>
#include <gtest/gtest.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx
index 505a3db852c523051b8c84075eab9e2fa76d22d7..7475862cd8185395355a9fe5ca7d56aa63deea5c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx
@@ -9,7 +9,7 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <EventLoop/DirectDriver.h>
#include <EventLoopTest/UnitTestConfig.h>
#include <EventLoopTest/UnitTestFixture.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx
index 3b1cbfed930ad115a07c541541b1a0ea21d7dd89..973e6ee43bbf867be462dabea62b04e4e962655e 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx
@@ -9,7 +9,7 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <EventLoop/Job.h>
#include <EventLoop/LSFDriver.h>
#include <EventLoopTest/UnitTestConfig.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx
index 0abd349b2141ff53f0691e09984bce820f3e8085..b931f11e673fee82742375cfa96033ed1df76524 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx
@@ -9,7 +9,7 @@
// includes
//
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <EventLoop/LocalDriver.h>
#include <EventLoopTest/UnitTestConfig.h>
#include <EventLoopTest/UnitTestFixture.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx
index 8e8f0cd5ad4be96e0f0bd4b03b73e539bef69b66..a0110a2c15f174872ecaaa9c7f7a0a9877b01932 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx
@@ -13,7 +13,7 @@
#include <EventLoopTest/UnitTestAlgXAOD.h>
#include <AsgTesting/UnitTest.h>
#include <AthContainers/AuxStoreStandalone.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
#include <RootCoreUtils/Assert.h>
#include <RootCoreUtils/ShellExec.h>
#include <SampleHandler/SampleLocal.h>
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
index 284b8678216ca1cf53e468bc8c3022101b594f06..fa87a2a107006996c2e0c3478b0b1eb93adca897 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
@@ -11,7 +11,7 @@
#include <SampleHandler/GridTools.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <RootCoreUtils/Assert.h>
#include <RootCoreUtils/ShellExec.h>
#include <RootCoreUtils/StringUtil.h>
@@ -497,10 +497,10 @@ namespace SH
RucioDownloadResult result;
result.did = readLine (output, "DID ");
- result.totalFiles = readLineUnsigned (output, "Total files : ");
- result.downloadedFiles = readLineUnsigned (output, "Downloaded files : ");
- result.alreadyLocal = readLineUnsigned (output, "Files already found locally : ");
- result.notDownloaded = readLineUnsigned (output, "Files that cannot be downloaded : ");
+ result.totalFiles = readLineUnsigned (output, "Total files: ");
+ result.downloadedFiles = readLineUnsigned (output, "Downloaded files: ");
+ result.alreadyLocal = readLineUnsigned (output, "Files already found locally: ");
+ result.notDownloaded = readLineUnsigned (output, "Files that cannot be downloaded: ");
return result;
}
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
index 3d21460c5369bda9543fb0a6746505a2dd0564bc..61fd10549b6bc1047cb6e6a6ca208ff4c9cb2aa6 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
@@ -7,7 +7,7 @@
#include <SampleHandler/Global.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#include <map>
#include <memory>
#include <set>
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h
index d82c4cecca975b9efc64b66fc94356e42166243e..b9e2e17995037184e943eb4b0ed9d40671ba41d8 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h
@@ -11,7 +11,7 @@
#include <SampleHandler/Global.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
namespace SH
{
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/CompulsoryContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/CompulsoryContent.py
index cea6c9fca0bf35e313ba4bc3b6f6c91f05945097..ef0be61df36e91462828a66e215244437f35b355 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/CompulsoryContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/CompulsoryContent.py
@@ -11,4 +11,7 @@ CompulsoryContent = [
CompulsoryTriggerNavigation = [
'xAOD::TrigNavigation#*',
'xAOD::TrigNavigationAuxInfo#*',
+# Run 3 navigation:
+'xAOD::TrigCompositeContainer#HLTNav*',
+'xAOD::TrigCompositeAuxContainer#HLTNav*'
]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
index 06e568d75917a54708321e155ca08d79d8f55f59..9ca72cb748a521400fdf4fcb27cd13a8b0e3fcd5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/DerivationFrameworkProdFlags.py
@@ -92,7 +92,7 @@ class WriteDAOD_TRIGStream(JobProperty):
StreamName = "StreamDAOD_TRIG"
FileName = ""
isVirtual = False
- DPDMakerScript = "DerivationFrameworkExamples/TRIG.py"
+ DPDMakerScript = "DerivationFrameworkTrigger/TRIG.py"
pass
jobproperties.DerivationFrameworkProdFlags.add_JobProperty(WriteDAOD_TRIGStream)
listAODtoDPD.append(WriteDAOD_TRIGStream.StreamName)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/JetTauEtMissTriggerContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/JetTauEtMissTriggerContent.py
index fa4564cb277ddc95f8f27296de20ff2caa72d97a..54a2c67b2b4d5de387422db6f2e35187035f34d3 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/JetTauEtMissTriggerContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/JetTauEtMissTriggerContent.py
@@ -14,5 +14,10 @@ JetTauEtMissTriggerContent = [
'xAOD::JetContainer#HLT_xAOD__JetContainer_SplitJet',
'xAOD::JetTrigAuxContainer#HLT_xAOD__JetContainer_SplitJetAux.',
'xAOD::TauJetContainer#HLT_xAOD__TauJetContainer_TrigTauRecMerged',
-'xAOD::TauJetAuxContainer#HLT_xAOD__TauJetContainer_TrigTauRecMergedAux.'
+'xAOD::TauJetAuxContainer#HLT_xAOD__TauJetContainer_TrigTauRecMergedAux.',
+# Run 3 collections
+'xAOD::JetContainer#HLT_bJets',
+'xAOD::JetAuxContainer#HLT_bJetsAux.btaggingLink',
+'xAOD::BTaggingContainer#HLT_BTagging',
+'xAOD::BTaggingAuxContainer#HLT_BTaggingAux.'
]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py
index 5cdf213f488dc8cf7887052581eef0c7e1ac23e7..699f15cf6ff181d34b212af4bab24b1692cb1506 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/share/IDTIDE1.py
@@ -234,7 +234,8 @@ if idDxAOD_doPix:
IDTIDESequence += PixelChargeToTConversionSetter
_info("Add Pixel xAOD ToTConversionSetter: %s Properties: %s", PixelChargeToTConversionSetter, PixelChargeToTConversionSetter.properties())
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import PixelPrepDataToxAOD
- xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD")
+ xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD",
+ ClusterSplitProbabilityName = InDetRecExample.TrackingCommon.pixelClusterSplitProbName())
xAOD_PixelPrepDataToxAOD.OutputLevel=INFO
xAOD_PixelPrepDataToxAOD.UseTruthInfo=IsMonteCarlo
_info( "Add Pixel xAOD TrackMeasurementValidation: %s", xAOD_PixelPrepDataToxAOD)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
index 2b68f07cc31679c15d15a96211f4f0505145d216..0e35be7ce88393740fc086d1928d17bc3f083faf 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/share/PHYS.py
@@ -8,14 +8,14 @@
# It requires the reductionConf flag PHYS in Reco_tf.py
#====================================================================
-from DerivationFrameworkCore.DerivationFrameworkMaster import *
-from DerivationFrameworkInDet.InDetCommon import *
-from DerivationFrameworkJetEtMiss.JetCommon import *
-from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
-from DerivationFrameworkJetEtMiss.METCommon import *
-from DerivationFrameworkEGamma.EGammaCommon import *
-from DerivationFrameworkEGamma.ElectronsCPDetailedContent import *
-from DerivationFrameworkMuons.MuonsCommon import *
+from DerivationFrameworkCore.DerivationFrameworkMaster import buildFileName, DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob
+from DerivationFrameworkInDet import InDetCommon
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets
+from DerivationFrameworkJetEtMiss.ExtendedJetCommon import replaceAODReducedJets, addDefaultTrimmedJets, addJetTruthLabel, addQGTaggerTool
+from DerivationFrameworkJetEtMiss import METCommon
+from DerivationFrameworkEGamma import EGammaCommon
+from DerivationFrameworkEGamma import ElectronsCPDetailedContent
+from DerivationFrameworkMuons import MuonsCommon
from TriggerMenu.api.TriggerAPI import TriggerAPI
from TriggerMenu.api.TriggerEnums import TriggerPeriod, TriggerType
@@ -68,7 +68,7 @@ if (DerivationFrameworkIsMonteCarlo):
# SUSY signal
from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
if IsSUSYSignal():
- from DerivationFrameworkSUSY.SUSYWeightMetadata import *
+ from DerivationFrameworkSUSY import SUSYWeightMetadata
# Add sumOfWeights metadata for LHE3 multiweights =======
#from DerivationFrameworkCore.LHE3WeightMetadata import *
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG.py
new file mode 100644
index 0000000000000000000000000000000000000000..027573b26ecc8206be9c4b251fbd3a44b32d5559
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTrigger/share/TRIG.py
@@ -0,0 +1,355 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#====================================================================
+# DAOD_TRIG.py
+# This defines DAOD_TRIG, a (skimmed) DAOD format for Run 3 trigger studies.
+# It is supposed to contain sufficiently complete trigger information for understanding
+# and developing trigger.
+# It requires the reductionConf flag TRIG in Reco_tf.py
+#====================================================================
+
+from DerivationFrameworkCore.DerivationFrameworkMaster import buildFileName, DerivationFrameworkIsMonteCarlo, DerivationFrameworkJob
+from DerivationFrameworkInDet import InDetCommon
+from DerivationFrameworkJetEtMiss.JetCommon import OutputJets
+from DerivationFrameworkJetEtMiss.ExtendedJetCommon import replaceAODReducedJets, addDefaultTrimmedJets, addJetTruthLabel, addQGTaggerTool
+from DerivationFrameworkJetEtMiss import METCommon
+from DerivationFrameworkEGamma import EGammaCommon
+from DerivationFrameworkEGamma import ElectronsCPDetailedContent
+from DerivationFrameworkMuons import MuonsCommon
+from TriggerMenu.api.TriggerAPI import TriggerAPI
+from TriggerMenu.api.TriggerEnums import TriggerPeriod, TriggerType
+
+#====================================================================
+# SET UP STREAM
+#====================================================================
+streamName = derivationFlags.WriteDAOD_TRIGStream.StreamName
+fileName = buildFileName( derivationFlags.WriteDAOD_TRIGStream )
+TRIGStream = MSMgr.NewPoolRootStream( streamName, fileName )
+TRIGStream.AcceptAlgs(["TRIGKernel"])
+
+### Thinning and augmentation tools lists
+thinningTools = []
+AugmentationTools = []
+
+# Special sequence
+SeqTRIG = CfgMgr.AthSequencer("SeqTRIG")
+
+#====================================================================
+# MONTE CARLO TRUTH
+#====================================================================
+if (DerivationFrameworkIsMonteCarlo):
+ from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents,addMiniTruthCollectionLinks,addHFAndDownstreamParticles,addPVCollection
+ #import DerivationFrameworkHiggs.TruthCategories
+ # Add charm quark collection
+ from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthCollectionMaker
+ TRIGTruthCharmTool = DerivationFramework__TruthCollectionMaker(name = "TRIGTruthCharmTool",
+ NewCollectionName = "TruthCharm",
+ KeepNavigationInfo = False,
+ ParticleSelectionString = "(abs(TruthParticles.pdgId) == 4)",
+ Do_Compress = True)
+ ToolSvc += TRIGTruthCharmTool
+ #from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__CommonAugmentation
+ SeqTRIG += CfgMgr.DerivationFramework__CommonAugmentation("TRIGTruthCharmKernel",AugmentationTools=[TRIGTruthCharmTool])
+ # Add HF particles
+ addHFAndDownstreamParticles(SeqTRIG)
+ # Add standard truth
+ addStandardTruthContents(SeqTRIG,prefix='TRIG_')
+ # Update to include charm quarks and HF particles - require a separate instance to be train safe
+ from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthNavigationDecorator
+ TRIGTruthNavigationDecorator = DerivationFramework__TruthNavigationDecorator( name="TRIGTruthNavigationDecorator",
+ InputCollections=["TruthElectrons", "TruthMuons", "TruthPhotons", "TruthTaus", "TruthNeutrinos", "TruthBSM", "TruthBottom", "TruthTop", "TruthBoson","TruthCharm","TruthHFWithDecayParticles"])
+ ToolSvc += TRIGTruthNavigationDecorator
+ SeqTRIG.TRIG_MCTruthNavigationDecoratorKernel.AugmentationTools = [TRIGTruthNavigationDecorator]
+ # Re-point links on reco objects
+ addMiniTruthCollectionLinks(SeqTRIG)
+ addPVCollection(SeqTRIG)
+ # Set appropriate truth jet collection for tau truth matching
+ ToolSvc.DFCommonTauTruthMatchingTool.TruthJetContainerName = "AntiKt4TruthDressedWZJets"
+ # SUSY signal
+ from DerivationFrameworkSUSY.DecorateSUSYProcess import IsSUSYSignal
+ if IsSUSYSignal():
+ from DerivationFrameworkSUSY import SUSYWeightMetadata
+ # Add sumOfWeights metadata for LHE3 multiweights =======
+ #from DerivationFrameworkCore.LHE3WeightMetadata import *
+
+
+
+#====================================================================
+# TRIGGER CONTENT
+#====================================================================
+## Lines commented out temporarily 29th July 2020 to allow validation to proceed. Will need a new MR to fix.
+## See https://twiki.cern.ch/twiki/bin/view/Atlas/TriggerAPI
+## Get single and multi mu, e, photon triggers
+## Jet, tau, multi-object triggers not available in the matching code
+#allperiods = TriggerPeriod.y2015 | TriggerPeriod.y2016 | TriggerPeriod.y2017 | TriggerPeriod.y2018 | TriggerPeriod.future2e34
+#trig_el = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, livefraction=0.8)
+#trig_mu = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.mu, livefraction=0.8)
+#trig_g = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.g, livefraction=0.8)
+#trig_tau = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.tau, livefraction=0.8)
+## Add cross-triggers for some sets
+#trig_em = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, additionalTriggerType=TriggerType.mu, livefraction=0.8)
+#trig_et = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.el, additionalTriggerType=TriggerType.tau, livefraction=0.8)
+#trig_mt = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.mu, additionalTriggerType=TriggerType.tau, livefraction=0.8)
+## Note that this seems to pick up both isolated and non-isolated triggers already, so no need for extra grabs
+#trig_txe = TriggerAPI.getLowestUnprescaledAnyPeriod(allperiods, triggerType=TriggerType.tau, additionalTriggerType=TriggerType.xe, livefraction=0.8)
+#
+## Merge and remove duplicates
+#trigger_names_full_notau = list(set(trig_el+trig_mu+trig_g+trig_em+trig_et+trig_mt))
+#trigger_names_full_tau = list(set(trig_tau+trig_txe))
+#
+## Now reduce the list...
+#from RecExConfig.InputFilePeeker import inputFileSummary
+#trigger_names_notau = []
+#trigger_names_tau = []
+#for trig_item in inputFileSummary['metadata']['/TRIGGER/HLT/Menu']:
+# if not 'ChainName' in trig_item: continue
+# if trig_item['ChainName'] in trigger_names_full_notau: trigger_names_notau += [ trig_item['ChainName'] ]
+# if trig_item['ChainName'] in trigger_names_full_tau: trigger_names_tau += [ trig_item['ChainName'] ]
+
+
+#====================================================================
+# INNER DETECTOR TRACK THINNING
+#====================================================================
+# See recommedations here:
+# https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/DaodRecommendations
+
+# Inner detector group recommendations for indet tracks in analysis
+TRIG_thinning_expression = "InDetTrackParticles.DFCommonTightPrimary && abs(DFCommonInDetTrackZ0AtPV)*sin(InDetTrackParticles.theta) < 3.0*mm && InDetTrackParticles.pt > 10*GeV"
+from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning
+TRIGTrackParticleThinningTool = DerivationFramework__TrackParticleThinning(name = "TRIGTrackParticleThinningTool",
+ StreamName = TRIGStream.Name,
+ SelectionString = TRIG_thinning_expression,
+ InDetTrackParticlesKey = "InDetTrackParticles")
+
+ToolSvc += TRIGTrackParticleThinningTool
+thinningTools.append(TRIGTrackParticleThinningTool)
+
+# Include inner detector tracks associated with muons
+from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__MuonTrackParticleThinning
+TRIGMuonTPThinningTool = DerivationFramework__MuonTrackParticleThinning(name = "TRIGMuonTPThinningTool",
+ StreamName = TRIGStream.Name,
+ MuonKey = "Muons",
+ InDetTrackParticlesKey = "InDetTrackParticles")
+
+ToolSvc += TRIGMuonTPThinningTool
+thinningTools.append(TRIGMuonTPThinningTool)
+
+# TauJets thinning
+tau_thinning_expression = "(TauJets.ptFinalCalib >= 13.*GeV) && (TauJets.nTracks>=1) && (TauJets.nTracks<=3) && (TauJets.RNNJetScoreSigTrans>0.01)"
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__GenericObjectThinning
+TRIGTauJetsThinningTool = DerivationFramework__GenericObjectThinning(name = "TRIGTauJetsThinningTool",
+ StreamName = TRIGStream.Name,
+ ContainerName = "TauJets",
+ SelectionString = tau_thinning_expression)
+ToolSvc += TRIGTauJetsThinningTool
+thinningTools.append(TRIGTauJetsThinningTool)
+
+# Only keep tau tracks (and associated ID tracks) classified as charged tracks
+from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TauTrackParticleThinning
+TRIGTauTPThinningTool = DerivationFramework__TauTrackParticleThinning(name = "TRIGTauTPThinningTool",
+ StreamName = TRIGStream.Name,
+ TauKey = "TauJets",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ SelectionString = tau_thinning_expression,
+ DoTauTracksThinning = True,
+ TauTracksKey = "TauTracks")
+ToolSvc += TRIGTauTPThinningTool
+thinningTools.append(TRIGTauTPThinningTool)
+
+# ID tracks associated with high-pt di-tau
+from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__DiTauTrackParticleThinning
+TRIGDiTauTPThinningTool = DerivationFramework__DiTauTrackParticleThinning(name = "TRIGDiTauTPThinningTool",
+ StreamName = TRIGStream.Name,
+ DiTauKey = "DiTauJets",
+ InDetTrackParticlesKey = "InDetTrackParticles")
+ToolSvc += TRIGDiTauTPThinningTool
+thinningTools.append(TRIGDiTauTPThinningTool)
+
+#====================================================================
+# JET/MET
+#====================================================================
+
+OutputJets["TRIG"] = ["AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets"]
+reducedJetList = ["AntiKt2PV0TrackJets","AntiKt4PV0TrackJets"]
+
+if (DerivationFrameworkIsMonteCarlo):
+ OutputJets["TRIG"].append("AntiKt10TruthTrimmedPtFrac5SmallR20Jets")
+
+replaceAODReducedJets(reducedJetList,SeqTRIG,"TRIG")
+add_largeR_truth_jets = DerivationFrameworkIsMonteCarlo and not hasattr(SeqTRIG,'jetalgAntiKt10TruthTrimmedPtFrac5SmallR20')
+addDefaultTrimmedJets(SeqTRIG,"TRIG",dotruth=add_largeR_truth_jets)
+
+# Add large-R jet truth labeling
+if (DerivationFrameworkIsMonteCarlo):
+ addJetTruthLabel(jetalg="AntiKt10LCTopoTrimmedPtFrac5SmallR20",sequence=SeqTRIG,algname="JetTruthLabelingAlg",labelname="R10TruthLabel_R21Consolidated")
+
+addQGTaggerTool(jetalg="AntiKt4EMTopo",sequence=SeqTRIG,algname="QGTaggerToolAlg")
+addQGTaggerTool(jetalg="AntiKt4EMPFlow",sequence=SeqTRIG,algname="QGTaggerToolPFAlg")
+
+# fJVT
+# getPFlowfJVT(jetalg='AntiKt4EMPFlow',sequence=SeqTRIG, algname='TRIGJetForwardPFlowJvtToolAlg')
+
+#====================================================================
+# EGAMMA
+#====================================================================
+
+if DerivationFrameworkIsMonteCarlo:
+ # Schedule the two energy density tools for running after the pseudojets are created.
+ for alg in ['EDTruthCentralAlg', 'EDTruthForwardAlg']:
+ if hasattr(topSequence, alg):
+ edtalg = getattr(topSequence, alg)
+ delattr(topSequence, alg)
+ SeqTRIG += edtalg
+
+#====================================================================
+# Add our sequence to the top sequence
+#====================================================================
+# Ideally, this should come at the end of the job
+DerivationFrameworkJob += SeqTRIG
+
+#====================================================================
+# Tau
+#====================================================================
+# Add low-pt di-tau reconstruction
+from DerivationFrameworkTau.TauCommon import addDiTauLowPt
+addDiTauLowPt(Seq=SeqTRIG)
+
+# Low-pt di-tau thinning
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__GenericObjectThinning
+TRIGDiTauLowPtThinningTool = DerivationFramework__GenericObjectThinning(name = "TRIGDiTauLowPtThinningTool",
+ StreamName = TRIGStream.Name,
+ ContainerName = "DiTauJetsLowPt",
+ SelectionString = "DiTauJetsLowPt.nSubjets > 1")
+ToolSvc += TRIGDiTauLowPtThinningTool
+thinningTools.append(TRIGDiTauLowPtThinningTool)
+
+# ID tracks associated with low-pt ditau
+TRIGDiTauLowPtTPThinningTool = DerivationFramework__DiTauTrackParticleThinning(name = "TRIGDiTauLowPtTPThinningTool",
+ StreamName = TRIGStream.Name,
+ DiTauKey = "DiTauJetsLowPt",
+ InDetTrackParticlesKey = "InDetTrackParticles",
+ SelectionString = "DiTauJetsLowPt.nSubjets > 1")
+ToolSvc += TRIGDiTauLowPtTPThinningTool
+thinningTools.append(TRIGDiTauLowPtTPThinningTool)
+
+#====================================================================
+# CREATE THE DERIVATION KERNEL ALGORITHM
+#====================================================================
+# Add the kernel for thinning (requires the objects be defined)
+#from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__DerivationKernel
+SeqTRIG += CfgMgr.DerivationFramework__DerivationKernel("TRIGKernel",
+ ThinningTools = thinningTools)
+
+
+#====================================================================
+# FLAVOUR TAGGING
+#====================================================================
+
+from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollection
+
+FtagJetCollection('AntiKt4EMPFlowJets',SeqTRIG)
+
+
+#====================================================================
+# TC-LVT Vertices
+#====================================================================
+
+# from SoftBVrtClusterTool.SoftBVrtConfig import addSoftBVrt
+# addSoftBVrt(SeqTRIG,'Loose')
+# addSoftBVrt(SeqTRIG,'Medium')
+# addSoftBVrt(SeqTRIG,'Tight')
+
+#====================================================================
+# CONTENTS
+#====================================================================
+from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
+TRIGSlimmingHelper = SlimmingHelper("TRIGSlimmingHelper")
+
+TRIGSlimmingHelper.SmartCollections = ["Electrons",
+ "Photons",
+ "Muons",
+ "PrimaryVertices",
+ "InDetTrackParticles",
+ "AntiKt4EMTopoJets",
+ "AntiKt4EMPFlowJets",
+ "BTagging_AntiKt4EMPFlow",
+ #"MET_Baseline_AntiKt4EMTopo",
+ #"MET_Baseline_AntiKt4EMPFlow",
+ "TauJets",
+ "DiTauJets",
+ "DiTauJetsLowPt",
+ "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets",
+ #"AntiKtVR30Rmax4Rmin02TrackJets_BTagging201903",
+ #"BTagging_AntiKtVR30Rmax4Rmin02Track_201903"
+ ]
+
+excludedVertexAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
+StaticContent = []
+StaticContent += ["xAOD::VertexContainer#SoftBVrtClusterTool_Tight_Vertices"]
+StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Tight_VerticesAux." + excludedVertexAuxData]
+StaticContent += ["xAOD::VertexContainer#SoftBVrtClusterTool_Medium_Vertices"]
+StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Medium_VerticesAux." + excludedVertexAuxData]
+StaticContent += ["xAOD::VertexContainer#SoftBVrtClusterTool_Loose_Vertices"]
+StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Loose_VerticesAux." + excludedVertexAuxData]
+
+TRIGSlimmingHelper.StaticContent = StaticContent
+
+# Trigger content
+TRIGSlimmingHelper.IncludeTriggerNavigation = True
+TRIGSlimmingHelper.IncludeJetTriggerContent = True
+TRIGSlimmingHelper.IncludeMuonTriggerContent = True
+TRIGSlimmingHelper.IncludeEGammaTriggerContent = True
+TRIGSlimmingHelper.IncludeJetTauEtMissTriggerContent = True
+TRIGSlimmingHelper.IncludeTauTriggerContent = True
+TRIGSlimmingHelper.IncludeEtMissTriggerContent = True
+TRIGSlimmingHelper.IncludeBJetTriggerContent = True
+TRIGSlimmingHelper.IncludeBPhysTriggerContent = True
+TRIGSlimmingHelper.IncludeMinBiasTriggerContent = True
+
+# Add the jet containers to the stream (defined in JetCommon if import needed)
+#addJetOutputs(TRIGSlimmingHelper,["TRIG"])
+
+# Truth containers
+if DerivationFrameworkIsMonteCarlo:
+ TRIGSlimmingHelper.AppendToDictionary = {'TruthEvents':'xAOD::TruthEventContainer','TruthEventsAux':'xAOD::TruthEventAuxContainer',
+ 'MET_Truth':'xAOD::MissingETContainer','MET_TruthAux':'xAOD::MissingETAuxContainer',
+ 'TruthElectrons':'xAOD::TruthParticleContainer','TruthElectronsAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthMuons':'xAOD::TruthParticleContainer','TruthMuonsAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthPhotons':'xAOD::TruthParticleContainer','TruthPhotonsAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthTaus':'xAOD::TruthParticleContainer','TruthTausAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthNeutrinos':'xAOD::TruthParticleContainer','TruthNeutrinosAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthBSM':'xAOD::TruthParticleContainer','TruthBSMAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthBoson':'xAOD::TruthParticleContainer','TruthBosonAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthTop':'xAOD::TruthParticleContainer','TruthTopAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthForwardProtons':'xAOD::TruthParticleContainer','TruthForwardProtonsAux':'xAOD::TruthParticleAuxContainer',
+ 'BornLeptons':'xAOD::TruthParticleContainer','BornLeptonsAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthBosonsWithDecayParticles':'xAOD::TruthParticleContainer','TruthBosonsWithDecayParticlesAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthBosonsWithDecayVertices':'xAOD::TruthVertexContainer','TruthBosonsWithDecayVerticesAux':'xAOD::TruthVertexAuxContainer',
+ 'TruthBSMWithDecayParticles':'xAOD::TruthParticleContainer','TruthBSMWithDecayParticlesAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthBSMWithDecayVertices':'xAOD::TruthVertexContainer','TruthBSMWithDecayVerticesAux':'xAOD::TruthVertexAuxContainer',
+ 'HardScatterParticles':'xAOD::TruthParticleContainer','HardScatterParticlesAux':'xAOD::TruthParticleAuxContainer',
+ 'HardScatterVertices':'xAOD::TruthVertexContainer','HardScatterVerticesAux':'xAOD::TruthVertexAuxContainer',
+ 'TruthHFWithDecayParticles':'xAOD::TruthParticleContainer','TruthHFWithDecayParticlesAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthHFWithDecayVertices':'xAOD::TruthVertexContainer','TruthHFWithDecayVerticesAux':'xAOD::TruthVertexAuxContainer',
+ 'TruthCharm':'xAOD::TruthParticleContainer','TruthCharmAux':'xAOD::TruthParticleAuxContainer',
+ 'TruthPrimaryVertices':'xAOD::TruthVertexContainer','TruthPrimaryVerticesAux':'xAOD::TruthVertexAuxContainer',
+ 'AntiKt10TruthTrimmedPtFrac5SmallR20Jets':'xAOD::JetContainer', 'AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux':'xAOD::JetAuxContainer'
+ }
+
+ from DerivationFrameworkMCTruth.MCTruthCommon import addTruth3ContentToSlimmerTool
+ addTruth3ContentToSlimmerTool(TRIGSlimmingHelper)
+ TRIGSlimmingHelper.AllVariables += ['TruthHFWithDecayParticles','TruthHFWithDecayVertices','TruthCharm']
+
+TRIGSlimmingHelper.ExtraVariables += ["AntiKt10TruthTrimmedPtFrac5SmallR20Jets.Tau1_wta.Tau2_wta.Tau3_wta.D2.GhostBHadronsFinalCount",
+ "Electrons.TruthLink",
+ "Muons.TruthLink",
+ "Photons.TruthLink",
+ "AntiKt2PV0TrackJets.pt.eta.phi.m",
+ "AntiKt4EMTopoJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.PartonTruthLabelID",
+ "AntiKt4EMPFlowJets.DFCommonJets_QGTagger_truthjet_nCharged.DFCommonJets_QGTagger_truthjet_pt.DFCommonJets_QGTagger_truthjet_eta.DFCommonJets_QGTagger_NTracks.DFCommonJets_QGTagger_TracksWidth.DFCommonJets_QGTagger_TracksC1.PartonTruthLabelID.DFCommonJets_fJvt",
+ "TruthPrimaryVertices.t.x.y.z"]
+
+
+# Final construction of output stream
+TRIGSlimmingHelper.AppendContentToStream(TRIGStream)
+
diff --git a/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx b/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx
index b2dc23c91721b918fd9ff42a407638946aee4b9e..099e380af8bac7f4b6b04d6dd7aa3bb58049e65f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx
@@ -6,7 +6,7 @@
#include "xAODEgamma/Photon.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// ==================================================================
bool PhotonHelpers::passOQquality(const xAOD::Photon *ph){
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h
index d24ab74ecbc9b32f583045d737ecb6e37e376555..8fe95146257f60a0ba921df354c3bb65fe499891 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h
@@ -31,7 +31,7 @@ class TH2;
#include "TObjArray.h"
// Core includes
#include "PATCore/PATCoreEnums.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
namespace Root {
class TElectronEfficiencyCorrectionTool : public asg::AsgMessaging
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h
index 05dc33a68142dc436dc50b5e885ed2b02d07459b..959526833ab01d7c757d02342944e031b311a63a 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h
@@ -11,7 +11,7 @@
#ifdef ROOTCORE
#include "xAODRootAccess/TEvent.h"
#include "xAODRootAccess/TStore.h"
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
#endif // ROOTCORE
StatusCode getElectrons(const std::vector<std::pair<double,double> >& pt_eta, int runNumber,
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
index 0022cd08130e7249eda5e119a8e775d1a4da8da1..48888242fb22163e1d58e2bf67e559acab77ffba 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
@@ -16,7 +16,7 @@ http://valgrind.org/docs/manual/faq.html#faq.deflost
#include <string>
#include <vector>
#include "EgammaAnalysisInterfaces/IAsgElectronEfficiencyCorrectionTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "AsgTools/AnaToolHandle.h"
#ifdef XAOD_STANDALONE
// xAOD include(s):
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h
index 536fde840aa1aaf93b76b4beebfee8c213fd4928..a53260c4aff65582699516d43efadb62a2dbbbf9 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h
@@ -4,7 +4,7 @@
#ifndef __ELECTRONEFFICIENCYCORRECTIONMESSAGING__
#define __ELECTRONEFFICIENCYCORRECTIONMESSAGING__
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
namespace MSGHELPERS{
const asg::AsgMessaging& getMsgStream();
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
index daf62201577d1e64a50b9e4ea5fc3c2cfeedfa51..b7b392ab1cea5f926478d99fd39dbc597a58cb72 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
@@ -27,7 +27,7 @@
#include "xAODCore/ShallowCopy.h"
//Asg includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "PATCore/AcceptData.h"
#include "PATInterfaces/SystematicsUtil.h"
@@ -94,12 +94,12 @@ int main( int argc, char* argv[] ) {
CHECK( myEgCorrections.setProperty("DefaultRandomRunNumber", (unsigned int)311481 ) );
CHECK( myEgCorrections.setProperty("UseRandomRunNumber",false) );
- myEgCorrections.initialize();
+ CHECK( myEgCorrections.initialize() );
AsgElectronLikelihoodTool * m_LHToolTight = new AsgElectronLikelihoodTool("m_LHToolTight");
CHECK (m_LHToolTight->setProperty("primaryVertexContainer","PrimaryVertices") );
m_LHToolTight->setProperty("ConfigFile","ElectronPhotonSelectorTools/offline/mc15_20160512/ElectronLikelihoodLooseOfflineConfig2016_CutBL_Smooth.conf").ignore();
- m_LHToolTight->initialize();
+ CHECK ( m_LHToolTight->initialize() );
// Get a list of systematics
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
index 9e3818e3435496420a255ce53b032ee44d1aa86a..9be0c21f18002ec2bea751c1d2688bcc9043ce9d 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
@@ -16,7 +16,7 @@
#include "EgammaAnalysisInterfaces/IEgammaCalibrationAndSmearingTool.h"
#include "AsgTools/AsgTool.h"
#include "AsgTools/AsgMetadataTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "PATInterfaces/ISystematicsTool.h"
#include "PATInterfaces/SystematicSet.h"
#include "xAODEgamma/Electron.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h
index f8ff2c91bf3727180e47f7f6d3a4b9ed54cfb46b..250038eb298b0a79513eec0b8f6c5b84a9c0f186 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h
@@ -15,7 +15,7 @@
#include <array>
#include <memory>
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
#include <xAODRootAccess/TEvent.h>
#include <xAODRootAccess/TStore.h>
#include <xAODEgamma/Electron.h>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h
index ae355993f4e129dbc4cbf09a8775d5b1217a7267..4dd53f2ec5adbe8a587a10a7304b44948efd9629 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h
@@ -5,7 +5,7 @@
#ifndef ELECTRONPHOTONFOURMOMENTUMCORRECTION_GAINUNCERTAINTYY_H
#define ELECTRONPHOTONFOURMOMENTUMCORRECTION_GAINUNCERTAINTYY_H
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
#include <PATCore/PATCoreEnums.h>
#include <memory>
#include <string>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h
index 928f8d91fb1602e7efb0cef108aa9957b709e25e..adea579b920e4ea3aa22beba42108ac357dc9dbe 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h
@@ -26,7 +26,7 @@
#include <map>
#include <memory>
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
#include <TFile.h>
#include <TTree.h>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h
index e3c6401512f16c5022bac88d4f29c8eeb2fa6183..7abd7c637fccdf897cd6dc98ecf4b2315fcfbe3e 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h
@@ -25,7 +25,7 @@
// PAT includes
#include "PATCore/PATCoreEnums.h"
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
// ROOT includes
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h
index e0b56da73c7fe628c619257fd15d1c83cf2827dd..9991efa21dacab3f044bfe66e0c3b9ca3ad613d2 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h
@@ -8,7 +8,7 @@
#include <math.h>
#include <memory>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "TH1.h"
#include "TH2D.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/Root/EgammaCalibrationAndSmearingTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/Root/EgammaCalibrationAndSmearingTool.cxx
index 93ed52f4e4bae3ea62bfb916c9157cb6319046cd..82397858f7f3491adba774df87a9d38c0e54558b 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/Root/EgammaCalibrationAndSmearingTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/Root/EgammaCalibrationAndSmearingTool.cxx
@@ -702,7 +702,7 @@ CP::CorrectionCode EgammaCalibrationAndSmearingTool::correctedCopy(const xAOD::P
double EgammaCalibrationAndSmearingTool::getEnergy(const xAOD::Photon& input)
{
xAOD::Photon* new_particle = nullptr;
- correctedCopy(input, new_particle);
+ ANA_CHECK_THROW (correctedCopy(input, new_particle));
const double e = new_particle->e();
delete new_particle;
return e;
@@ -711,7 +711,7 @@ double EgammaCalibrationAndSmearingTool::getEnergy(const xAOD::Photon& input)
double EgammaCalibrationAndSmearingTool::getEnergy(const xAOD::Electron& input)
{
xAOD::Electron* new_particle = nullptr;
- correctedCopy(input, new_particle);
+ ANA_CHECK_THROW (correctedCopy(input, new_particle));
const double e = new_particle->e();
delete new_particle;
return e;
@@ -854,7 +854,7 @@ CP::CorrectionCode EgammaCalibrationAndSmearingTool::applyCorrection(xAOD::Egamm
double EgammaCalibrationAndSmearingTool::getEnergy(xAOD::Egamma* p, const xAOD::EventInfo* event_info)
{
- applyCorrection(*p, *event_info);
+ ANA_CHECK_THROW (applyCorrection(*p, *event_info));
ATH_MSG_DEBUG("returning " << p->e());
return p->e();
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/CalibratedEgammaProvider.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/CalibratedEgammaProvider.cxx
index 6e5f468aa9733d1c3c5a7a8d4b2589ebacbcc9fe..f749e11c625e8e5f36dc0a6a5138e9f49d7feaf5 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/CalibratedEgammaProvider.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/CalibratedEgammaProvider.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// EDM include(s):
@@ -11,7 +11,7 @@
#include "xAODBase/IParticleHelpers.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
+#include "Gaudi/Interfaces/IOptionsSvc.h"
namespace CP {
@@ -30,10 +30,8 @@ StatusCode CalibratedEgammaProvider::initialize() {
if(m_tool.empty()) { //set up a default tool with the es2012c calibration
m_tool.setTypeAndName("CP::EgammaCalibrationAndSmearingTool/AutoConfiguredEgammaCalibTool");
- ServiceHandle<IJobOptionsSvc> josvc("JobOptionsSvc",name());
- std::string fullToolName = "ToolSvc.AutoConfiguredEgammaCalibTool";
- StringProperty pESModel("esModel","es2012c");
- CHECK( josvc->addPropertyToCatalogue(fullToolName,pESModel) );
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> josvc("JobOptionsSvc",name());
+ josvc->set("ToolSvc.AutoConfiguredEgammaCalibTool.esModel", "es2012c");
}
ATH_CHECK(m_tool.retrieve());
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testEgammaCalibTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testEgammaCalibTool.cxx
index 95f7e6ea9cb64ab96e62837616cd72f58321387e..905ebc3c195ebd914ea8d3c0f0c3c5ae468008ac 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testEgammaCalibTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testEgammaCalibTool.cxx
@@ -96,8 +96,8 @@ int main( int argc, char* argv[] ) {
// Create the tool
std::unique_ptr<CP::IEgammaCalibrationAndSmearingTool> tool(new CP::EgammaCalibrationAndSmearingTool("EgammaCalibrationAndSmearingTool"));
- asg::setProperty(tool.get(), "ESModel", "es2017_R21_PRE");
- asg::setProperty(tool.get(), "randomRunNumber", 123456);
+ RETURN_CHECK(APP_NAME, asg::setProperty(tool.get(), "ESModel", "es2017_R21_PRE"));
+ RETURN_CHECK(APP_NAME, asg::setProperty(tool.get(), "randomRunNumber", 123456));
RETURN_CHECK(APP_NAME, tool->initialize());
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx
index 21313bfdb626957b97d2503f4d14c54db88bd9b4..a0f88eb024100e42e0f771acc4ba092275f8ace9 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx
@@ -4,7 +4,7 @@
#include "AsgElectronPhotonIsEMSelectorConfigHelper.h"
#include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "TEnv.h"
#include <iostream>
#include <sstream>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx
index 50b7483a74e44f5e1b83fea39482ca57253bdc3d..133edf56e0fc37d923654300618e4a67a2fa76ce 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx
@@ -6,7 +6,7 @@
#include "xAODEgamma/Electron.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackParticleContainer.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// ==================================================================
std::size_t ElectronSelectorHelpers::numberOfPixelHitsAndDeadSensors(const xAOD::TrackParticle *tp){
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h
index eeb4de30338178c1ecb46ebcbee7f46f3b7cc723..e4711ac0b7940321f2562b01c79a45105e04c3ed 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h
@@ -21,7 +21,8 @@
#include "PATCore/AcceptInfo.h"
#include "PATCore/AcceptData.h"
#include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
#include <vector>
#include <string>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
index f8b4137ab614ef94e3ef5213e233ded86ca833b9..cc7a6066388d2717a7336f185973b7921672d702 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
@@ -20,7 +20,8 @@ June 2011
#define TELECTRONLIKELIHOODTOOL_H
// Include the return objects and the base class
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgTools/IAsgTool.h"
#include "PATCore/AcceptData.h"
#include "PATCore/AcceptInfo.h"
//
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
index 1ee2cb9f585c75953497a4d8069a16376f3b88fb..65ab7be7afc6ba6e205a11ecf7b9dcdd482fd37d 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
@@ -20,7 +20,8 @@
// ROOT includes
// Include the return object and the base class
#include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
#include "PATCore/AcceptInfo.h"
#include "PATCore/AcceptData.h"
#include <vector>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h
index a598d76e450b50e6888f72c33f14c264b11bc568..e00cdebbf343cf562ff902f7a711b8907acc5c97 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h
@@ -26,7 +26,8 @@
#include "PATCore/AcceptInfo.h"
#include "PATCore/AcceptData.h"
#include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
#include <vector>
#include <string>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx
index 1913574a2aca3026f256d9b4abc16ecb8b57da6e..755f04a978ca276ec978e772b20b2687d09e7f35 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx
@@ -16,7 +16,7 @@ http://valgrind.org/docs/manual/faq.html#faq.deflost
#include "EgammaAnalysisInterfaces/IAsgElectronIsEMSelector.h"
#include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h"
#include "AsgTools/AnaToolHandle.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
int main(){
using namespace asg::msgUserCode;
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx
index ba1c723f13e55eea20c7f377374e8229716e7174..8e279eb9418b379407f696590df4b315536fb824 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx
@@ -22,7 +22,7 @@
#include "ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h"
#include "ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h"
#include "ElectronPhotonSelectorTools/AsgElectronChargeIDSelectorTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// Derivation include
#include "xAODCore/tools/IOStats.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
index 05461c362b7fdf27b6349efff7f7e440b4ae2b0c..de8d330181cc6c17d7c307630b0d19c5d33bb050 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
@@ -25,8 +25,8 @@
#include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h"
#include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
//
-#include "AsgTools/MessageCheck.h"
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MessageCheck.h"
+#include "AsgMessaging/MsgStream.h"
// Derivation include
#include "xAODCore/tools/IOStats.h"
#include "xAODCore/tools/ReadStats.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
index e066ad1b6ad563ef1d0238342aa41d9446693509..069c8e49a048c94e73a70edb3f51a13f00380297 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
@@ -6,7 +6,7 @@
#define ISOLATIONCORRECTION_ISOLATIONCORRECTION_H
#include "AsgTools/AsgTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "TGraph.h"
#include "TObject.h"
#include "TF1.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
index 97db502c9e028ac908b9b402794e4c115d9d2a6f..717d48646fc355b46b243b2e819c70a361473d2c 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
@@ -7,7 +7,7 @@
#include "AsgTools/AsgTool.h"
#include "AsgTools/AsgMetadataTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "IsolationCorrections/IIsolationCorrectionTool.h"
#include "IsolationCorrections/IsolationCorrection.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
index 360ebdf48ab3eec5e45faa897c5374c657bff6ec..03a6d01115cce93170b3bea1bcaba06718243287 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/CMakeLists.txt
@@ -1,29 +1,8 @@
-################################################################################
-# Package: PhotonVertexSelection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PhotonVertexSelection )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthenaBaseComps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTracking
- PRIVATE
- Control/AthContainers
- PhysicsAnalysis/ElectronPhotonID/IsolationCorrections
- Tools/PathResolver
- ${extra_deps} )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Hist RIO Physics TMVA )
@@ -49,10 +28,5 @@ atlas_add_dictionary( PhotonVertexSelectionDict
LINK_LIBRARIES PhotonVertexSelectionLib )
# Test(s) in the package:
-if( XAOD_STANDALONE )
- # FIX ME: temporarily disabled as part of the migration of
- # AnalysisBase to master
-
- # atlas_add_test( PhotonVertexSelection_test
- # SCRIPT test/testPhotonVertexSelection.py )
-endif()
+atlas_add_test( PhotonVertexSelection_test
+ SCRIPT test/testPhotonVertexSelection.py )
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py
index 7c3478866c7fd4ecb4b8bd4bbeb01b3a86285241..a5fbaa361b4adc07240ed2973560f90853418053 100755
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/test/testPhotonVertexSelection.py
@@ -21,7 +21,7 @@ def getViewContainer(container):
return x.author() not in [xAOD.EgammaParameters.AuthorCaloTopo35, xAOD.EgammaParameters.AuthorFwdElectron]
egammas = container.__class__(ROOT.SG.VIEW_ELEMENTS)
- for eg in filter(filterAuthor, container)[:2]:
+ for eg in list(filter(filterAuthor, container))[:2]:
egammas.push_back( eg )
return egammas
@@ -128,17 +128,10 @@ else:
# Initialize the xAOD infrastructure:
ROOT.xAOD.Init().ignore()
- ROOT.xAOD.TruthParticleContainer()
- ROOT.xAOD.MuonRoIContainer()
- ROOT.xAOD.CaloClusterContainer()
- ROOT.xAOD.TrackParticleContainer()
- ROOT.xAOD.ElectronContainer()
- ROOT.xAOD.MuonContainer()
- ROOT.xAOD.JetContainer()
- ROOT.xAOD.TauJetContainer()
- ROOT.xAOD.PFOContainer()
- ROOT.xAOD.TrigElectronContainer()
ROOT.xAOD.L2CombinedMuonContainer()
+ ROOT.xAOD.TrigElectronContainer()
+ ROOT.xAOD.MuonContainer()
+ ROOT.xAOD.ParticleContainer()
# Setup the tools
vertexTool = ROOT.CP.PhotonVertexSelectionTool("PhotonVertexSelectionTool")
@@ -154,7 +147,7 @@ else:
sys.exit( 1 )
pass
- for entry in xrange(options.nEvents):
+ for entry in range(options.nEvents):
print ('*** Analysing entry %s ***' % entry)
_ = t.GetEntry(entry)
container = getattr(t, options.container)
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h
index 12a56cc6829855903bdacba94b1f5a5c1c25fb1a..f74249559a6549ac8711f544de37a90cee0b781a 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h
@@ -14,7 +14,7 @@
#include <TString.h>
#include <TObject.h>
#include <TFile.h>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
class TTreeFormula;
class TList;
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h
index 2723ea295ea4159b1d855c6d9c3546a1e5ad56a5..feba6d672a1d67f346ccc701320ea674048a0b8f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h
@@ -25,7 +25,7 @@
#include <TTree.h>
#include <TLorentzVector.h>
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
#include "egammaMVACalib/egammaMVALayerDepth.h"
#include "egammaMVACalib/egammaMVAFunctions.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
index 683cbbae93d8dec11cb741fa8f7c911c10db35dd..863b786a29db591015c05aec3d7894a06617fb59 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
@@ -27,7 +27,7 @@
#include "xAODCore/AuxContainerBase.h"
#include "egammaMVACalibAnalysis/egammaMVATool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// Infrastructure include(s):
#ifdef ROOTCORE
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIVertexSelectionTool.cxx b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIVertexSelectionTool.cxx
index 92b76af96e91eb027f2c7513357510df92febfda..d4ee7fdcd35fc620d7b7bba855bdfd3cd665e5cb 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIVertexSelectionTool.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIVertexSelectionTool.cxx
@@ -5,7 +5,7 @@
#include "HIEventUtils/HIVertexSelectionTool.h"
#include "xAODTracking/TrackParticleContainer.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
using std::string;
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_evtselection_tool_test.cxx b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_evtselection_tool_test.cxx
index 44279687d21bc2675d586dbe677fa745e663feb3..652c5e1e474acdebcc0fd62f4fd4ce3dcf725ced 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_evtselection_tool_test.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_evtselection_tool_test.cxx
@@ -7,7 +7,7 @@
#include <string>
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/TEvent.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "CxxUtils/make_unique.h"
#include "HIEventUtils/HIVertexSelectionTool.h"
#include "HIEventUtils/HIEventSelectionTool.h"
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_vertex_tool_test.cxx b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_vertex_tool_test.cxx
index dd74fa66ee80a97696709a027852d0f7587c45c0..a5641fce53a9a194aee4c30b80a4eadbcf37c76d 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_vertex_tool_test.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/util/run_vertex_tool_test.cxx
@@ -7,7 +7,7 @@
#include <string>
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/TEvent.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "CxxUtils/make_unique.h"
#include "HIEventUtils/HIVertexSelectionTool.h"
#include "xAODTracking/VertexContainer.h"
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/CMakeLists.txt b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/CMakeLists.txt
index ba259f88001401325770aa9f0bab2fc5d8e4cd9b..883aa2eda34ce67caea8394002244638ce9f26e6 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/CMakeLists.txt
+++ b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/CMakeLists.txt
@@ -14,8 +14,8 @@ atlas_add_library( JetMissingEtTagToolsLib
PUBLIC_HEADERS JetMissingEtTagTools
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities xAODJet GaudiKernel TagEvent AnalysisUtilsLib JetSelectorToolsLib FTagAnalysisInterfacesLib JetCalibToolsLib
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers xAODCore xAODMissingET xAODParticleEvent JetUtils METInterface )
+ LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities xAODJet GaudiKernel TagEvent AnalysisUtilsLib JetSelectorToolsLib FTagAnalysisInterfacesLib JetCalibToolsLib METUtilitiesLib
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers xAODCore xAODMissingET xAODParticleEvent JetUtils METInterface)
atlas_add_component( JetMissingEtTagTools
src/components/*.cxx
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtTagTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtTagTool.cxx
index 991639ebcae9eba94e3d98f1a6186f017372808c..0f5bcd812db056264d80cda2d81d57eb27c48bd0 100755
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtTagTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtTagTool.cxx
@@ -40,6 +40,7 @@ Purpose : create a collection of JetMissingEtJetTag
#include "JetInterface/IJetUpdateJvt.h"
#include "METInterface/IMETMaker.h"
+#include "METUtilities/METHelpers.h"
#include "AnalysisUtils/AnalysisMisc.h"
#include "AthenaPoolUtilities/AthenaAttributeSpecification.h"
@@ -683,14 +684,14 @@ StatusCode JetMetTagTool::recomputeMissingEt() {
// compute Track soft term
MissingETBase::Types::bitmask_t trksource = MissingETBase::Source::Track;
if((*newMet)[m_metPVSoftTrkName]) trksource = (*newMet)[m_metPVSoftTrkName]->source();
- if( m_metmaker->buildMETSum("FinalTrk", newMet, trksource).isFailure() ){
+ if( met::buildMETSum("FinalTrk", newMet, trksource).isFailure() ){
ATH_MSG_WARNING("Building MET FinalTrk sum failed.");
}
// compute cluster soft term
MissingETBase::Types::bitmask_t clsource = MissingETBase::Source::LCTopo;
if((*newMet)[m_metSoftClusName]) clsource = (*newMet)[m_metSoftClusName]->source();
- if( m_metmaker->buildMETSum("FinalClus", newMet, clsource).isFailure() ) {
+ if( met::buildMETSum("FinalClus", newMet, clsource).isFailure() ) {
ATH_MSG_WARNING("Building MET FinalClus sum failed.");
}
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/JetSelectorTools/Helpers.h b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/JetSelectorTools/Helpers.h
index ca6a055c77c329fc04964a3aa5a940a0b02af405..210197872d770c0b19333a19b7a10484d79a0539 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/JetSelectorTools/Helpers.h
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/JetSelectorTools/Helpers.h
@@ -15,7 +15,7 @@
#include "TObjArray.h"
#include "TFile.h"
-#include "AsgTools/MsgStreamMacros.h"
+#include "AsgMessaging/MsgStreamMacros.h"
namespace JCT
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx
index 5e7cdad30b0a6ed6f401643f86549bbf49a3ce08..679ad8518d90b33fb04c4cd271d5947c7b8fc41d 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx
@@ -21,7 +21,7 @@ Description: Class for selecting events that pass recommended jet cleaning proce
#include "xAODEventInfo/EventInfo.h"
// xAOD/ASG includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// STL includes
#include <iostream>
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx
index b67461f54688c64a8b51282fd5716ac94bd9aa8c..1824091d138dc118a1327ca7f832fee3aaefe5ad 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx
@@ -16,7 +16,7 @@ Description: Class for selecting jets that pass some cleaning cuts
#include "JetSelectorTools/Helpers.h"
// xAOD/ASG includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// STL includes
#include <iostream>
diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/CMakeLists.txt b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/CMakeLists.txt
index 581b605e8f371a4fd4deb2d07137ff91f22e27a9..e0e65ea6713c567f88f789c5303434784cd3a58c 100644
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/CMakeLists.txt
+++ b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/CMakeLists.txt
@@ -5,25 +5,6 @@
# Declare the package name:
atlas_subdir( MissingEtDQA )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthToolSupport/AsgTools
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
- PhysicsAnalysis/MuonID/MuonSelectorTools
- PhysicsAnalysis/TauID/TauAnalysisTools
- Reconstruction/Jet/JetInterface
- Reconstruction/MET/METInterface )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -32,5 +13,5 @@ atlas_add_component( MissingEtDQA
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AsgTools AthenaBaseComps AthenaMonitoringLib xAODEgamma xAODJet xAODMissingET xAODMuon xAODTau xAODTracking EgammaAnalysisInterfacesLib MuonSelectorToolsLib JetInterface METInterface )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel AsgTools AthenaBaseComps AthenaMonitoringLib xAODEgamma xAODJet xAODMissingET xAODMuon xAODTau xAODTracking EgammaAnalysisInterfacesLib MuonSelectorToolsLib JetInterface METInterface METUtilitiesLib TauAnalysisToolsLib)
diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
index 006e48bcdde6f5d55f6debf72ec371c8b9bf4b62..c2764db47d260ba09e3b82f2f13be12ca2291454 100644
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/PhysValMET.cxx
@@ -39,6 +39,7 @@
#include "xAODTracking/VertexContainer.h"
#include "xAODTracking/TrackParticle.h"
#include "PATCore/AcceptData.h"
+#include "METUtilities/METHelpers.h"
using namespace xAOD;
@@ -906,7 +907,7 @@ namespace MissingEtDQA {
}
MissingETBase::Types::bitmask_t trksource = MissingETBase::Source::Track;
if((*met_Reb)["PVSoftTrk"]) trksource = (*met_Reb)["PVSoftTrk"]->source();
- if( (*m_metmaker)->buildMETSum("FinalTrk", met_Reb, trksource).isFailure() ){
+ if( met::buildMETSum("FinalTrk", met_Reb, trksource).isFailure() ){
ATH_MSG_WARNING("Building MET FinalTrk sum failed.");
}
MissingETBase::Types::bitmask_t clsource;
@@ -914,7 +915,7 @@ namespace MissingEtDQA {
else clsource = MissingETBase::Source::UnknownSignal;
if((*met_Reb)["SoftClus"]) clsource = (*met_Reb)["SoftClus"]->source();
- if( (*m_metmaker)->buildMETSum("FinalClus", met_Reb, clsource).isFailure() ) {
+ if( met::buildMETSum("FinalClus", met_Reb, clsource).isFailure() ) {
ATH_MSG_WARNING("Building MET FinalClus sum failed.");
}
@@ -1271,7 +1272,7 @@ namespace MissingEtDQA {
}
if((*met_Calo)["SoftClus"]) clsource = (*met_Calo)["SoftClus"]->source();
- if( (*m_metmaker)->buildMETSum("FinalClus", met_Calo, clsource).isFailure() ) {
+ if( met::buildMETSum("FinalClus", met_Calo, clsource).isFailure() ) {
ATH_MSG_WARNING("Building MET FinalClus sum failed.");
}
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagSecVertexingConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagSecVertexingConfig.py
index d5a24bec5980b51ee95dad940462d48666296814..4ead25cf3a3d98fe9dcfe8b1acdbcd342794727d 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagSecVertexingConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagSecVertexingConfig.py
@@ -2,7 +2,8 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from BTagging.NewJetFitterVxFinderConfig import NewJetFitterVxFinderCfg
+#from BTagging.NewJetFitterVxFinderConfig import NewJetFitterVxFinderCfg
+from BTagging.InDetImprovedJetFitterVxFinderConfig import InDetImprovedJetFitterVxFinderCfg
from BTagging.InDetVKalVxInJetToolConfig import InDetVKalVxInJetToolCfg
from JetTagTools.JetFitterVariablesFactoryConfig import JetFitterVariablesFactoryCfg
from BTagging.MSVVariablesFactoryConfig import MSVVariablesFactoryCfg
@@ -29,7 +30,7 @@ def BTagSecVtxToolCfg(flags, Name, JetCollection, TimeStamp = "", **options):
if TimeStamp:
TimeStamp = '_' + TimeStamp
- newJetFitterVxFinder = acc.popToolsAndMerge(NewJetFitterVxFinderCfg(flags, 'JFVxFinder'))
+ newJetFitterVxFinder = acc.popToolsAndMerge(InDetImprovedJetFitterVxFinderCfg(flags, 'JFVxFinder'))
secVtxFinderList.append(newJetFitterVxFinder)
secVtxFinderTrackNameList.append('BTagTrackToJetAssociator')
secVtxFinderxAODBaseNameList.append('JetFitter')
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterCollection.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterCollection.py
index f74a576c645fd240767972e7b47c4457c1b9ddcf..16d1741f74048150e78d366551cb8d4f1ed0cacc 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterCollection.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterCollection.py
@@ -167,7 +167,7 @@ def toolVxInternalEdmFactory_SV(name, useBTagFlagsDefaults = True, **options):
if useBTagFlagsDefaults:
jetFitterFullLinearizedTrackFactory = toolJetFitterFullLinearizedTrackFactory('JetFitterFullLinearizedTrackFactory')
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
- 'LinearizedTrackFactory' : jetFitterFullLinearizedTrackFactory, }
+ 'LinearizedTrackFactory' : jetFitterFullLinearizedTrackFactory }
for option in defaults:
options.setdefault(option, defaults[option])
options['name'] = name
@@ -382,110 +382,7 @@ def toolInDetJetFitterUtils_SV(name, useBTagFlagsDefaults = True, **options):
#--------------------------------------------------------------------------
-metaNewJetFitterVxFinder = { 'IsAVertexFinder' : True,
- 'VertexFinderxAODBaseName' : 'JetFitter',
- 'VertexFinderPassByPointer': {'JetFitterVariableFactory' : 'JetFitterVariablesFactory' },
- 'DependsOn' : ['BTagTrackToVertexTool',
- 'InDetJetFitterUtils',
- 'ImprovedJetFitterRoutines',
- 'TrkDistanceFinderNeutralCharged',
- 'TrkDistanceFinderNeutralNeutral',
- 'ImprovedJetFitterInitializationHelper',
- 'JetFitterSequentialVertexFitter',
- 'JetFitterSequentialVertexSmoother',
- 'JetFitterMode3dTo1dFinder',
- 'InDetImprovedJetFitterTrackSelectorTool',
- 'JetFitterExtrapolator',
- 'JetFitterFullLinearizedTrackFactory',
- 'JetFitterVariablesFactory',
- 'VxInternalEdmFactory'],
- 'PassByPointer' : { 'Mode3dFinder' : 'JetFitterMode3dTo1dFinder',
- 'JetFitterInitializationHelper' : 'ImprovedJetFitterInitializationHelper',
- 'TrackSelector' : 'InDetImprovedJetFitterTrackSelectorTool',
- 'InDetJetFitterUtils' : 'InDetJetFitterUtils',
- 'Extrapolator' : 'JetFitterExtrapolator',
- 'SequentialVertexFitter' : 'JetFitterSequentialVertexFitter',
- 'JetFitterRoutines' : 'ImprovedJetFitterRoutines',
- 'VertexEdmFactory' : 'VxInternalEdmFactory' },
- 'ToolCollection' : 'JetFitterCollection' }
-
-def toolNewJetFitterVxFinder(name, useBTagFlagsDefaults = True, **options):
- """Sets up a NewJetFitterVxFinder tool and returns it.
-
- The following options have BTaggingFlags defaults:
-
- OutputLevel default: BTaggingFlags.OutputLevel
- VxPrimaryContainer default: BTaggingFlags.PrimaryVertexCollectionName
- MaxNumDeleteIterations default: 30
- VertexProbCut default: 0.001
- MaxClusteringIterations default: 30
- VertexClusteringProbabilityCut default: 0.005
-
- input: name: The name of the tool (should be unique).
- useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
- **options: Python dictionary with options for the tool.
- output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
- if useBTagFlagsDefaults:
- if not 'InDetKeys' in dir():
- from InDetRecExample.InDetKeys import InDetKeys
- defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
- 'VxPrimaryContainer' : BTaggingFlags.PrimaryVertexCollectionName,
- 'MaxNumDeleteIterations' : 30,
- 'VertexProbCut' : 0.001,
- 'MaxClusteringIterations' : 30,
- 'VertexClusteringProbabilityCut' : 0.005 }
- for option in defaults:
- options.setdefault(option, defaults[option])
- options['name'] = name
- from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
- return InDet__InDetImprovedJetFitterVxFinder(**options)
-
-def toolNewJetFitterVxFinder_SV(name, suffix = "", useBTagFlagsDefaults = True, **options):
- """Sets up a NewJetFitterVxFinder tool and returns it.
-
- The following options have BTaggingFlags defaults:
- OutputLevel default: BTaggingFlags.OutputLevel
- VxPrimaryContainer default: BTaggingFlags.PrimaryVertexCollectionName
- MaxNumDeleteIterations default: 30
- VertexProbCut default: 0.001
- MaxClusteringIterations default: 30
- VertexClusteringProbabilityCut default: 0.005
-
- input: name: The name of the tool (should be unique).
- useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
- **options: Python dictionary with options for the tool.
- output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
- if useBTagFlagsDefaults:
- if not 'InDetKeys' in dir():
- from InDetRecExample.InDetKeys import InDetKeys
- inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
- improvedJetFitterRoutines = toolImprovedJetFitterRoutines('ImprovedJFRoutines'+suffix)
- jetFitterMode3dTo1dFinder = toolJetFitterMode3dTo1dFinder('JFMode3dTo1dFinder'+suffix)
- inDetImprovedJetFitterTrackSelectorTool = toolInDetImprovedJetFitterTrackSelectorTool('InDetImprovedJFTrackSelTool'+suffix)
- jetFitterSequentialVertexFitter = toolJetFitterSequentialVertexFitter_SV('JFSeqVxFitter'+suffix)
- jetFitterExtrapolator = toolJetFitterExtrapolator('JFExtrapolator'+suffix)
- improvedJetFitterInitializationHelper = toolImprovedJetFitterInitializationHelper('ImprovedJFInitHelper'+suffix)
- vertexEdmFactory = toolVxInternalEdmFactory_SV('VxInternalEdmFactory'+suffix)
- defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
- 'VxPrimaryContainer' : BTaggingFlags.PrimaryVertexCollectionName,
- 'MaxNumDeleteIterations' : 30,
- 'VertexProbCut' : 0.001,
- 'MaxClusteringIterations' : 30,
- 'VertexClusteringProbabilityCut' : 0.005 ,
- 'VertexEdmFactory' : vertexEdmFactory,
- 'JetFitterInitializationHelper' : improvedJetFitterInitializationHelper,
- 'InDetJetFitterUtils' : inDetJetFitterUtils,
- 'Extrapolator' : jetFitterExtrapolator,
- 'JetFitterRoutines' : improvedJetFitterRoutines,
- 'TrackSelector' : inDetImprovedJetFitterTrackSelectorTool,
- 'Mode3dFinder' : jetFitterMode3dTo1dFinder,
- 'SequentialVertexFitter' : jetFitterSequentialVertexFitter}
- for option in defaults:
- options.setdefault(option, defaults[option])
- options['name'] = name + suffix
- from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
- return InDet__InDetImprovedJetFitterVxFinder(**options)
#--------------------------------------------------------------------------
@@ -796,3 +693,310 @@ def toolJetFitterTagCOMBNN(name, useBTagFlagsDefaults = True, **options):
options['name'] = name
from JetTagTools.JetTagToolsConf import Analysis__JetFitterTag
return Analysis__JetFitterTag(**options)
+
+#--------------------------------------------------------------------------
+# new jf track selector tool for hackathon 2019
+metaJetFitterTrackSelectorTool = {'VertexFinderxAODBaseName' : 'JetFitter',
+ 'VertexFinderPassByPointer': {'JetFitterVariableFactory' : 'JetFitterVariablesFactory' },
+ 'DependsOn' : ['InDetJetFitterUtils',
+ 'InDetImprovedJetFitterTrackSelectorTool',
+ 'JetFitterExtrapolator'],
+ 'PassByPointer' : {'TrackSelector' : 'InDetImprovedJetFitterTrackSelectorTool',
+ 'InDetJetFitterUtils' : 'InDetJetFitterUtils',
+ 'Extrapolator' : 'JetFitterExtrapolator' },
+ 'ToolCollection' : 'JetFitterCollection' }
+
+def toolJetFitterTrackSelectorTool(name, useBTagFlagsDefaults = True, **options):
+ """Sets up a InDetJetFitterUtils tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTrackSelectorTool
+ return InDet__JetFitterTrackSelectorTool(**options)
+
+def toolJetFitterTrackSelectorTool_SV(name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up a InDetJetFitterUtils tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
+ ImprovedJetFitterTrackSelectorTool = toolInDetImprovedJetFitterTrackSelectorTool('ImprovedJFTrackSelTool'+suffix)
+ jetFitterExtrapolator = toolJetFitterExtrapolator('JFExtrapolator'+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'TrackSelector' : ImprovedJetFitterTrackSelectorTool,
+ 'Extrapolator' : jetFitterExtrapolator }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTrackSelectorTool
+ return InDet__JetFitterTrackSelectorTool(**options)
+
+#--------------------------------------------------------------------------
+
+
+metaJetFitterMultiStageFit = { 'DependsOn' : ['InDetJetFitterUtils',
+ 'ImprovedJetFitterRoutines',
+ 'ImprovedJetFitterInitializationHelper'],
+ 'PassByPointer' : {'JetFitterInitializationHelper' : 'ImprovedJetFitterInitializationHelper',
+ 'InDetJetFitterUtils' : 'InDetJetFitterUtils',
+ 'JetFitterRoutines' : 'ImprovedJetFitterRoutines'},
+ 'ToolCollection' : 'JetFitterCollection'}
+
+def toolJetFitterMultiStageFit(name, useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitterMultiStageFit tool and returns it.
+
+
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'MaxNumDeleteIterations' : 30,
+ 'VertexProbCut' : 0.001,
+ 'MaxClusteringIterations' : 30,
+ 'VertexClusteringProbabilityCut' : 0.005 }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterMultiStageFit
+ return InDet__JetFitterMultiStageFit(**options)
+
+def toolJetFitterMultiStageFit_SV(name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitterMultiStageFit tool and returns it.
+
+
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ improvedJetFitterInitializationHelper = toolImprovedJetFitterInitializationHelper('ImprovedJFInitHelper'+suffix)
+ inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
+ inDetJetFitterRoutines = toolImprovedJetFitterRoutines('ImprovedJetFitterRoutines'+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'MaxNumDeleteIterations' : 30,
+ 'VertexProbCut' : 0.001,
+ 'MaxClusteringIterations' : 30,
+ 'VertexClusteringProbabilityCut' : 0.005,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'JetFitterInitializationHelper': improvedJetFitterInitializationHelper,
+ 'JetFitterRoutines': inDetJetFitterRoutines }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterMultiStageFit
+ return InDet__JetFitterMultiStageFit(**options)
+
+#--------------------------------------------------------------------------
+metaNewJetFitterVxFinder = { 'IsAVertexFinder' : True,
+ 'VertexFinderxAODBaseName' : 'JetFitter',
+ 'VertexFinderPassByPointer': {'JetFitterVariableFactory' : 'JetFitterVariablesFactory' },
+ 'DependsOn' : ['BTagTrackToVertexTool',
+ 'TrkDistanceFinderNeutralCharged',
+ 'TrkDistanceFinderNeutralNeutral',
+ 'JetFitterSequentialVertexSmoother',
+ 'JetFitterFullLinearizedTrackFactory',
+ 'JetFitterVariablesFactory',
+ 'JetFitterTrackSelectorTool',
+ 'JetFitterTwoTrackVtxFinderTool',
+ 'JetFitterV0FinderTool',
+ 'JetFitterMultiStageFit'],
+ 'PassByPointer' : { 'JetFitterTrackSelectorTool' : 'JetFitterTrackSelectorTool',
+ 'JetFitterTwoTrackVtxFinderTool': 'JetFitterTwoTrackVtxFinderTool',
+ 'JetFitterV0FinderTool' : 'JetFitterV0FinderTool',
+ 'JetFitterMultiStageFit' : 'JetFitterMultiStageFit'},
+ 'ToolCollection' : 'JetFitterCollection' }
+
+def toolNewJetFitterVxFinder(name, useBTagFlagsDefaults = True, **options):
+ """Sets up a NewJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ if not 'InDetKeys' in dir():
+ from InDetRecExample.InDetKeys import InDetKeys
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
+ return InDet__InDetImprovedJetFitterVxFinder(**options)
+
+#--------------------------------------------------------------------------
+
+metaJetFitterTwoTrackVtxFinderTool = { 'DependsOn': ['JetFitterSequentialVertexFitter'],
+ 'PassByPointer': {'SequentialVertexFitter' : 'JetFitterSequentialVertexFitter'},
+ 'ToolCollection' : 'JetFitterCollection'}
+
+def toolJetFitterTwoTrackVtxFinderTool(name , useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter TwoTrack Vtx Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTwoTrackVtxFinderTool
+ return InDet__JetFitterTwoTrackVtxFinderTool(**options)
+
+def toolJetFitterTwoTrackVtxFinderTool_SV(name, suffix="" , useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter TwoTrack Vtx Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ inDetJetFitterSequentialVertexFitter = toolJetFitterSequentialVertexFitter_SV("toolJetFitterSequentialVertexFitter"+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'SequentialVertexFitter' : inDetJetFitterSequentialVertexFitter }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTwoTrackVtxFinderTool
+ return InDet__JetFitterTwoTrackVtxFinderTool(**options)
+
+
+#--------------------------------------------------------------------------
+
+metaJetFitterV0FinderTool = { 'DependsOn': ['JetFitterMode3dTo1dFinder','InDetJetFitterUtils'],
+ 'PassByPointer': { 'Mode3dFinder' : 'JetFitterMode3dTo1dFinder',
+ 'InDetJetFitterUtils' : 'InDetJetFitterUtils' },
+ 'ToolCollection' : 'JetFitterCollection'}
+
+def toolJetFitterV0FinderTool(name , useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter V0 Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterV0FinderTool
+ return InDet__JetFitterV0FinderTool(**options)
+
+def toolJetFitterV0FinderTool_SV(name , suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter V0 Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
+ inDetMode3dTo1dFinder = toolJetFitterMode3dTo1dFinder('Mode3dTo1dFinder'+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'Mode3dFinder': inDetMode3dTo1dFinder }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterV0FinderTool
+ return InDet__JetFitterV0FinderTool(**options)
+
+
+#--------------------------------------------------------------------------
+
+def toolNewJetFitterVxFinder(name, useBTagFlagsDefaults = True, **options):
+ """Sets up a NewJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ if not 'InDetKeys' in dir():
+ from InDetRecExample.InDetKeys import InDetKeys
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
+ return InDet__InDetImprovedJetFitterVxFinder(**options)
+
+#--------------------------------------------------------------------------
+
+def toolNewJetFitterVxFinder_SV(name, suffix = "", useBTagFlagsDefaults = True, **options):
+ """Sets up a NewJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+ VxPrimaryContainer default: BTaggingFlags.PrimaryVertexCollectionName
+ MaxNumDeleteIterations default: 30
+ VertexProbCut default: 0.001
+ MaxClusteringIterations default: 30
+ VertexClusteringProbabilityCut default: 0.005
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ if not 'InDetKeys' in dir():
+ from InDetRecExample.InDetKeys import InDetKeys
+ inDetImprovedJetFitterTrackSelectorTool = toolJetFitterTrackSelectorTool_SV('InDetImprovedJFTrackSelTool'+suffix,suffix)
+ inDetJetFitterTwoTrackVtxFinderTool = toolJetFitterTwoTrackVtxFinderTool_SV('inDetJetFitterTwoTrackVtxFinderTool'+suffix,suffix)
+ inDetImprovedJFV0FinderTool = toolJetFitterV0FinderTool_SV('inDetImprovedJFV0FinderTool'+suffix,suffix)
+ inDetJetFitterMultiStageFit = toolJetFitterMultiStageFit_SV('inDetJetFitterMultiStageFit'+suffix,suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'JetFitterTwoTrackVtxFinderTool' : inDetJetFitterTwoTrackVtxFinderTool,
+ 'JetFitterTrackSelectorTool' : inDetImprovedJetFitterTrackSelectorTool,
+ 'JetFitterV0FinderTool' : inDetImprovedJFV0FinderTool,
+ 'JetFitterMultiStageFit' : inDetJetFitterMultiStageFit
+ }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
+ return InDet__InDetImprovedJetFitterVxFinder(**options)
+
+#--------------------------------------------------------------------------
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterTrigCollection.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterTrigCollection.py
index 075dc6e487522fcc7c647f802f89001268a93c70..5f18cc36fda18ba5dad013f1be1179d05501c744 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterTrigCollection.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_NewJetFitterTrigCollection.py
@@ -167,7 +167,7 @@ def toolVxInternalEdmFactory_SV(name, useBTagFlagsDefaults = True, **options):
if useBTagFlagsDefaults:
jetFitterFullLinearizedTrackFactory = toolJetFitterFullLinearizedTrackFactory('JetFitterFullLinearizedTrackFactory')
defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
- 'LinearizedTrackFactory' : jetFitterFullLinearizedTrackFactory, }
+ 'LinearizedTrackFactory' : jetFitterFullLinearizedTrackFactory }
for option in defaults:
options.setdefault(option, defaults[option])
options['name'] = name
@@ -382,110 +382,7 @@ def toolInDetJetFitterUtils_SV(name, useBTagFlagsDefaults = True, **options):
#--------------------------------------------------------------------------
-metaNewJetFitterVxFinder = { 'IsAVertexFinder' : True,
- 'VertexFinderxAODBaseName' : 'JetFitter',
- 'VertexFinderPassByPointer': {'JetFitterVariableFactory' : 'JetFitterVariablesFactory' },
- 'DependsOn' : ['BTagTrackToVertexTool',
- 'InDetJetFitterUtils',
- 'ImprovedJetFitterRoutines',
- 'TrkDistanceFinderNeutralCharged',
- 'TrkDistanceFinderNeutralNeutral',
- 'ImprovedJetFitterInitializationHelper',
- 'JetFitterSequentialVertexFitter',
- 'JetFitterSequentialVertexSmoother',
- 'JetFitterMode3dTo1dFinder',
- 'InDetImprovedJetFitterTrackSelectorTool',
- 'JetFitterExtrapolator',
- 'JetFitterFullLinearizedTrackFactory',
- 'JetFitterVariablesFactory',
- 'VxInternalEdmFactory'],
- 'PassByPointer' : { 'Mode3dFinder' : 'JetFitterMode3dTo1dFinder',
- 'JetFitterInitializationHelper' : 'ImprovedJetFitterInitializationHelper',
- 'TrackSelector' : 'InDetImprovedJetFitterTrackSelectorTool',
- 'InDetJetFitterUtils' : 'InDetJetFitterUtils',
- 'Extrapolator' : 'JetFitterExtrapolator',
- 'SequentialVertexFitter' : 'JetFitterSequentialVertexFitter',
- 'JetFitterRoutines' : 'ImprovedJetFitterRoutines',
- 'VertexEdmFactory' : 'VxInternalEdmFactory' },
- 'ToolCollection' : 'JetFitterCollection' }
-
-def toolNewJetFitterVxFinder(name, useBTagFlagsDefaults = True, **options):
- """Sets up a NewJetFitterVxFinder tool and returns it.
-
- The following options have BTaggingFlags defaults:
-
- OutputLevel default: BTaggingFlags.OutputLevel
- VxPrimaryContainer default: BTaggingFlags.PrimaryVertexCollectionName
- MaxNumDeleteIterations default: 30
- VertexProbCut default: 0.001
- MaxClusteringIterations default: 30
- VertexClusteringProbabilityCut default: 0.005
-
- input: name: The name of the tool (should be unique).
- useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
- **options: Python dictionary with options for the tool.
- output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
- if useBTagFlagsDefaults:
- if not 'InDetKeys' in dir():
- from InDetRecExample.InDetKeys import InDetKeys
- defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
- 'VxPrimaryContainer' : BTaggingFlags.PrimaryVertexCollectionName,
- 'MaxNumDeleteIterations' : 30,
- 'VertexProbCut' : 0.001,
- 'MaxClusteringIterations' : 30,
- 'VertexClusteringProbabilityCut' : 0.005 }
- for option in defaults:
- options.setdefault(option, defaults[option])
- options['name'] = name
- from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
- return InDet__InDetImprovedJetFitterVxFinder(**options)
-
-def toolNewJetFitterVxFinder_SV(name, suffix = "", useBTagFlagsDefaults = True, **options):
- """Sets up a NewJetFitterVxFinder tool and returns it.
-
- The following options have BTaggingFlags defaults:
- OutputLevel default: BTaggingFlags.OutputLevel
- VxPrimaryContainer default: BTaggingFlags.PrimaryVertexCollectionName
- MaxNumDeleteIterations default: 30
- VertexProbCut default: 0.001
- MaxClusteringIterations default: 30
- VertexClusteringProbabilityCut default: 0.005
-
- input: name: The name of the tool (should be unique).
- useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
- **options: Python dictionary with options for the tool.
- output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
- if useBTagFlagsDefaults:
- if not 'InDetKeys' in dir():
- from InDetRecExample.InDetKeys import InDetKeys
- inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
- improvedJetFitterRoutines = toolImprovedJetFitterRoutines('ImprovedJFRoutines'+suffix)
- jetFitterMode3dTo1dFinder = toolJetFitterMode3dTo1dFinder('JFMode3dTo1dFinder'+suffix)
- inDetImprovedJetFitterTrackSelectorTool = toolInDetImprovedJetFitterTrackSelectorTool('InDetImprovedJFTrackSelTool'+suffix)
- jetFitterSequentialVertexFitter = toolJetFitterSequentialVertexFitter_SV('JFSeqVxFitter'+suffix)
- jetFitterExtrapolator = toolJetFitterExtrapolator('JFExtrapolator'+suffix)
- improvedJetFitterInitializationHelper = toolImprovedJetFitterInitializationHelper('ImprovedJFInitHelper'+suffix)
- vertexEdmFactory = toolVxInternalEdmFactory_SV('VxInternalEdmFactory'+suffix)
- defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
- 'VxPrimaryContainer' : BTaggingFlags.PrimaryVertexCollectionName,
- 'MaxNumDeleteIterations' : 30,
- 'VertexProbCut' : 0.001,
- 'MaxClusteringIterations' : 30,
- 'VertexClusteringProbabilityCut' : 0.005 ,
- 'VertexEdmFactory' : vertexEdmFactory,
- 'JetFitterInitializationHelper' : improvedJetFitterInitializationHelper,
- 'InDetJetFitterUtils' : inDetJetFitterUtils,
- 'Extrapolator' : jetFitterExtrapolator,
- 'JetFitterRoutines' : improvedJetFitterRoutines,
- 'TrackSelector' : inDetImprovedJetFitterTrackSelectorTool,
- 'Mode3dFinder' : jetFitterMode3dTo1dFinder,
- 'SequentialVertexFitter' : jetFitterSequentialVertexFitter}
- for option in defaults:
- options.setdefault(option, defaults[option])
- options['name'] = name + suffix
- from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
- return InDet__InDetImprovedJetFitterVxFinder(**options)
#--------------------------------------------------------------------------
@@ -796,3 +693,310 @@ def toolJetFitterTagCOMBNN(name, useBTagFlagsDefaults = True, **options):
options['name'] = name
from JetTagTools.JetTagToolsConf import Analysis__JetFitterTag
return Analysis__JetFitterTag(**options)
+
+#--------------------------------------------------------------------------
+# new jf track selector tool for hackathon 2019
+metaJetFitterTrackSelectorTool = {'VertexFinderxAODBaseName' : 'JetFitter',
+ 'VertexFinderPassByPointer': {'JetFitterVariableFactory' : 'JetFitterVariablesFactory' },
+ 'DependsOn' : ['InDetJetFitterUtils',
+ 'InDetImprovedJetFitterTrackSelectorTool',
+ 'JetFitterExtrapolator'],
+ 'PassByPointer' : {'TrackSelector' : 'InDetImprovedJetFitterTrackSelectorTool',
+ 'InDetJetFitterUtils' : 'InDetJetFitterUtils',
+ 'Extrapolator' : 'JetFitterExtrapolator' },
+ 'ToolCollection' : 'JetFitterCollection' }
+
+def toolJetFitterTrackSelectorTool(name, useBTagFlagsDefaults = True, **options):
+ """Sets up a InDetJetFitterUtils tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTrackSelectorTool
+ return InDet__JetFitterTrackSelectorTool(**options)
+
+def toolJetFitterTrackSelectorTool_SV(name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up a InDetJetFitterUtils tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
+ ImprovedJetFitterTrackSelectorTool = toolInDetImprovedJetFitterTrackSelectorTool('ImprovedJFTrackSelTool'+suffix)
+ jetFitterExtrapolator = toolJetFitterExtrapolator('JFExtrapolator'+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'TrackSelector' : ImprovedJetFitterTrackSelectorTool,
+ 'Extrapolator' : jetFitterExtrapolator }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTrackSelectorTool
+ return InDet__JetFitterTrackSelectorTool(**options)
+
+#--------------------------------------------------------------------------
+
+
+metaJetFitterMultiStageFit = { 'DependsOn' : ['InDetJetFitterUtils',
+ 'ImprovedJetFitterRoutines',
+ 'ImprovedJetFitterInitializationHelper'],
+ 'PassByPointer' : {'JetFitterInitializationHelper' : 'ImprovedJetFitterInitializationHelper',
+ 'InDetJetFitterUtils' : 'InDetJetFitterUtils',
+ 'JetFitterRoutines' : 'ImprovedJetFitterRoutines'},
+ 'ToolCollection' : 'JetFitterCollection'}
+
+def toolJetFitterMultiStageFit(name, useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitterMultiStageFit tool and returns it.
+
+
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'MaxNumDeleteIterations' : 30,
+ 'VertexProbCut' : 0.001,
+ 'MaxClusteringIterations' : 30,
+ 'VertexClusteringProbabilityCut' : 0.005 }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterMultiStageFit
+ return InDet__JetFitterMultiStageFit(**options)
+
+def toolJetFitterMultiStageFit_SV(name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitterMultiStageFit tool and returns it.
+
+
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ improvedJetFitterInitializationHelper = toolImprovedJetFitterInitializationHelper('ImprovedJFInitHelper'+suffix)
+ inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
+ inDetJetFitterRoutines = toolImprovedJetFitterRoutines('ImprovedJetFitterRoutines'+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'MaxNumDeleteIterations' : 30,
+ 'VertexProbCut' : 0.001,
+ 'MaxClusteringIterations' : 30,
+ 'VertexClusteringProbabilityCut' : 0.005,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'JetFitterInitializationHelper': improvedJetFitterInitializationHelper,
+ 'JetFitterRoutines': inDetJetFitterRoutines }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterMultiStageFit
+ return InDet__JetFitterMultiStageFit(**options)
+
+#--------------------------------------------------------------------------
+metaNewJetFitterVxFinder = { 'IsAVertexFinder' : True,
+ 'VertexFinderxAODBaseName' : 'JetFitter',
+ 'VertexFinderPassByPointer': {'JetFitterVariableFactory' : 'JetFitterVariablesFactory' },
+ 'DependsOn' : ['BTagTrackToVertexTool',
+ 'TrkDistanceFinderNeutralCharged',
+ 'TrkDistanceFinderNeutralNeutral',
+ 'JetFitterSequentialVertexSmoother',
+ 'JetFitterFullLinearizedTrackFactory',
+ 'JetFitterVariablesFactory',
+ 'JetFitterTrackSelectorTool',
+ 'JetFitterTwoTrackVtxFinderTool',
+ 'JetFitterV0FinderTool',
+ 'JetFitterMultiStageFit'],
+ 'PassByPointer' : { 'JetFitterTrackSelectorTool' : 'JetFitterTrackSelectorTool',
+ 'JetFitterTwoTrackVtxFinderTool': 'JetFitterTwoTrackVtxFinderTool',
+ 'JetFitterV0FinderTool' : 'JetFitterV0FinderTool',
+ 'JetFitterMultiStageFit' : 'JetFitterMultiStageFit'},
+ 'ToolCollection' : 'JetFitterCollection' }
+
+def toolNewJetFitterVxFinder(name, useBTagFlagsDefaults = True, **options):
+ """Sets up a NewJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ if not 'InDetKeys' in dir():
+ from InDetRecExample.InDetKeys import InDetKeys
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
+ return InDet__InDetImprovedJetFitterVxFinder(**options)
+
+#--------------------------------------------------------------------------
+
+metaJetFitterTwoTrackVtxFinderTool = { 'DependsOn': ['JetFitterSequentialVertexFitter'],
+ 'PassByPointer': {'SequentialVertexFitter' : 'JetFitterSequentialVertexFitter'},
+ 'ToolCollection' : 'JetFitterCollection'}
+
+def toolJetFitterTwoTrackVtxFinderTool(name , useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter TwoTrack Vtx Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTwoTrackVtxFinderTool
+ return InDet__JetFitterTwoTrackVtxFinderTool(**options)
+
+def toolJetFitterTwoTrackVtxFinderTool_SV(name, suffix="" , useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter TwoTrack Vtx Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ inDetJetFitterSequentialVertexFitter = toolJetFitterSequentialVertexFitter_SV("toolJetFitterSequentialVertexFitter"+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'SequentialVertexFitter' : inDetJetFitterSequentialVertexFitter }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterTwoTrackVtxFinderTool
+ return InDet__JetFitterTwoTrackVtxFinderTool(**options)
+
+
+#--------------------------------------------------------------------------
+
+metaJetFitterV0FinderTool = { 'DependsOn': ['JetFitterMode3dTo1dFinder','InDetJetFitterUtils'],
+ 'PassByPointer': { 'Mode3dFinder' : 'JetFitterMode3dTo1dFinder',
+ 'InDetJetFitterUtils' : 'InDetJetFitterUtils' },
+ 'ToolCollection' : 'JetFitterCollection'}
+
+def toolJetFitterV0FinderTool(name , useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter V0 Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterV0FinderTool
+ return InDet__JetFitterV0FinderTool(**options)
+
+def toolJetFitterV0FinderTool_SV(name , suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up the new JetFitter V0 Finder Tool and returns it.
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ inDetJetFitterUtils = toolInDetJetFitterUtils_SV('InDetJFUtils'+suffix)
+ inDetMode3dTo1dFinder = toolJetFitterMode3dTo1dFinder('Mode3dTo1dFinder'+suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'Mode3dFinder': inDetMode3dTo1dFinder }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__JetFitterV0FinderTool
+ return InDet__JetFitterV0FinderTool(**options)
+
+
+#--------------------------------------------------------------------------
+
+def toolNewJetFitterVxFinder(name, useBTagFlagsDefaults = True, **options):
+ """Sets up a NewJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ if not 'InDetKeys' in dir():
+ from InDetRecExample.InDetKeys import InDetKeys
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
+ return InDet__InDetImprovedJetFitterVxFinder(**options)
+
+#--------------------------------------------------------------------------
+
+def toolNewJetFitterVxFinder_SV(name, suffix = "", useBTagFlagsDefaults = True, **options):
+ """Sets up a NewJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ OutputLevel default: BTaggingFlags.OutputLevel
+ VxPrimaryContainer default: BTaggingFlags.PrimaryVertexCollectionName
+ MaxNumDeleteIterations default: 30
+ VertexProbCut default: 0.001
+ MaxClusteringIterations default: 30
+ VertexClusteringProbabilityCut default: 0.005
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ if useBTagFlagsDefaults:
+ if not 'InDetKeys' in dir():
+ from InDetRecExample.InDetKeys import InDetKeys
+ inDetImprovedJetFitterTrackSelectorTool = toolJetFitterTrackSelectorTool_SV('InDetImprovedJFTrackSelTool'+suffix,suffix)
+ inDetJetFitterTwoTrackVtxFinderTool = toolJetFitterTwoTrackVtxFinderTool_SV('inDetJetFitterTwoTrackVtxFinderTool'+suffix,suffix)
+ inDetImprovedJFV0FinderTool = toolJetFitterV0FinderTool_SV('inDetImprovedJFV0FinderTool'+suffix,suffix)
+ inDetJetFitterMultiStageFit = toolJetFitterMultiStageFit_SV('inDetJetFitterMultiStageFit'+suffix,suffix)
+ defaults = { 'OutputLevel' : BTaggingFlags.OutputLevel,
+ 'JetFitterTwoTrackVtxFinderTool' : inDetJetFitterTwoTrackVtxFinderTool,
+ 'JetFitterTrackSelectorTool' : inDetImprovedJetFitterTrackSelectorTool,
+ 'JetFitterV0FinderTool' : inDetImprovedJFV0FinderTool,
+ 'JetFitterMultiStageFit' : inDetJetFitterMultiStageFit
+ }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+ options['name'] = name + suffix
+ from InDetSecVxFinderTool.InDetSecVxFinderToolConf import InDet__InDetImprovedJetFitterVxFinder
+ return InDet__InDetImprovedJetFitterVxFinder(**options)
+
+#--------------------------------------------------------------------------
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetImprovedJetFitterVxFinderConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetImprovedJetFitterVxFinderConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..7e19f3bd2527eba7587cf73041d8f3f11ea31e21
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetImprovedJetFitterVxFinderConfig.py
@@ -0,0 +1,41 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from BTagging.JetFitterMultiStageFitConfig import InDetJetFitterMultiStageFitCfg
+from BTagging.JetFitterTrackSelectorToolConfig import InDetJetFitterTrackSelectorToolCfg
+from BTagging.JetFitterTwoTrackVtxFinderToolConfig import InDetJetFitterTwoTrackVtxFinderToolCfg
+from BTagging.JetFitterV0FinderToolConfig import JetFitterV0FinderToolCfg
+
+# import the InDetDetailedTrackSelectorTool configurable
+InDet__InDetImprovedJetFitterVxFinder=CompFactory.InDet.InDetImprovedJetFitterVxFinder
+
+def InDetImprovedJetFitterVxFinderCfg(flags, name, suffix = "", useBTagFlagsDefaults = True, **options):
+ """Sets up a InDetJetFitterTrackSelectorTool tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ acc = ComponentAccumulator()
+ if useBTagFlagsDefaults:
+ InDetJetFitterMultiStageFit = acc.popToolsAndMerge( InDetJetFitterMultiStageFitCfg(flags,"JetFitterMultiStageFit"+suffix,suffix) )
+ InDetJetFitterTrackSelectorTool = acc.popToolsAndMerge( InDetJetFitterTrackSelectorToolCfg(flags,"JetFitterTrackSelectorTool"+suffix,suffix) )
+ InDetJetFitterTwoTrackVtxFinderTool = acc.popToolsAndMerge( InDetJetFitterTwoTrackVtxFinderToolCfg("InDetJetFitterTwoTrackVtxFinderTool"+suffix,suffix) )
+ InDetJetFitterV0FinderTool = acc.popToolsAndMerge( JetFitterV0FinderToolCfg(flags,"JetFitterV0FinderTool"+suffix,suffix) )
+ defaults = { 'JetFitterTrackSelectorTool' : InDetJetFitterTrackSelectorTool ,
+ 'JetFitterTwoTrackVtxFinderTool' : InDetJetFitterTwoTrackVtxFinderTool ,
+ 'JetFitterV0FinderTool' : InDetJetFitterV0FinderTool ,
+ 'JetFitterMultiStageFit' : InDetJetFitterMultiStageFit }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ acc.setPrivateTools( InDet__InDetImprovedJetFitterVxFinder(**options) )
+ return acc
+
+
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py
index 243a4d6e655b668a8c8e65c569e19e527067e3b7..0bc47ec0e4045038e3aee793783fd1d816b3fe40 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterUtilsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from JetTagTools.BTagFullLinearizedTrackFactoryConfig import BTagFullLinearizedTrackFactoryCfg
from AthenaConfiguration.ComponentFactory import CompFactory
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterVxFinderConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterVxFinderConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..f3950a6886968db1bd07b94f82fd6bd01078dbea
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetJetFitterVxFinderConfig.py
@@ -0,0 +1,53 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from BTagging.ImprovedJetFitterInitializationHelperConfig import ImprovedJetFitterInitializationHelperCfg
+from BTagging.ImprovedJetFitterRoutinesConfig import ImprovedJetFitterRoutinesCfg
+from BTagging.InDetImprovedJetFitterTrackSelectorToolConfig import InDetImprovedJetFitterTrackSelectorToolCfg
+
+# import the InDetDetailedTrackSelectorTool configurable
+InDet__InDetJetFitterVxFinder=CompFactory.InDet.InDetJetFitterVxFinder
+
+def InDetInDetJetFitterVxFinderCfg(name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up a InDetJetFitterVxFinder tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ MaxNumDeleteIterations default: 30
+ VertexProbCut default: 0.001
+ MaxClusteringIterations default: 30
+ VertexClusteringProbabilityCut default: 0.005
+ UseFastClustering default: False
+ MaxTracksToFitAtOnce default: 15
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ acc = ComponentAccumulator()
+ if useBTagFlagsDefaults:
+ improvedJetFitterInitializationHelper = acc.popToolsAndMerge(ImprovedJetFitterInitializationHelperCfg('ImprovedJFInitHelper'+suffix))
+ improvedJetFitterRoutines = acc.popToolsAndMerge(ImprovedJetFitterRoutinesCfg('ImprovedJFRoutines'+suffix))
+ inDetImprovedJetFitterTrackSelectorTool = acc.popToolsAndMerge(InDetImprovedJetFitterTrackSelectorToolCfg('InDetImprovedJFTrackSelTool'+suffix))
+ defaults = { 'MaxNumDeleteIterations' : 30,
+ 'VertexProbCut' : 0.001,
+ 'MaxClusteringIterations' : 30,
+ 'VertexClusteringProbabilityCut' : 0.005 ,
+ 'UseFastClustering' : False,
+ 'MaxTracksToFitAtOnce' : 15,
+ 'JetFitterInitializationHelper' : improvedJetFitterInitializationHelper,
+# 'JetFitterHelper' : ,
+ 'JetFitterRoutines' : improvedJetFitterRoutines,
+ 'TrackSelector' : inDetImprovedJetFitterTrackSelectorTool }
+
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ acc.setPrivateTools( InDet__InDetJetFitterVxFinder(**options) )
+ return acc
+
+
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterMultiStageFitConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterMultiStageFitConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..1826bbfd5f7d5147f4d3848a45e290a47fbed1ed
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterMultiStageFitConfig.py
@@ -0,0 +1,73 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from BTagging.InDetJetFitterUtilsConfig import InDetJetFitterUtilsCfg
+from BTagging.ImprovedJetFitterInitializationHelperConfig import ImprovedJetFitterInitializationHelperCfg
+from BTagging.ImprovedJetFitterRoutinesConfig import ImprovedJetFitterRoutinesCfg
+
+# import the InDetDetailedTrackSelectorTool configurable
+InDet__JetFitterMultiStageFit = CompFactory.InDet.JetFitterMultiStageFit
+
+def InDetJetFitterMultiStageFitCfg(flags, name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up a JetFitterMultiStageFit tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ MaxNumDeleteIterations default:30
+ VertexProbCut default: 0.001
+ MaxClusteringIterations default: 30
+ UseFastClustering default: False
+ maxTracksForDetailedClustering default:25
+ VertexClusteringProbabilityCut default:0.005
+ VertexClusteringProbabilityCutWithMass default:0.05
+ VertexClusteringProbabilityCutWithMass0010 default:0.002
+ VertexClusteringProbabilityCutWithMass1015 default:0.002
+ VertexClusteringProbabilityCutWithMass1520 default:0.050
+ VertexClusteringProbabilityCutWithMass2025 default: 0.100
+ VertexClusteringProbabilityCutWithMass2530 default:0.200
+ VertexClusteringProbabilityCutWithMass3040 default:0.500
+ VertexClusteringProbabilityCutWithMass4050 default:0.700
+ VertexClusteringProbabilityCutWithMass5060 default:0.900
+ VertexClusteringProbabilityCutWithMass6070 default:0.900
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+
+ acc = ComponentAccumulator()
+ if useBTagFlagsDefaults:
+ improvedJetFitterRoutines = acc.popToolsAndMerge(ImprovedJetFitterRoutinesCfg('ImprovedJFRoutines'+suffix))
+ inDetJetFitterUtils = acc.popToolsAndMerge(InDetJetFitterUtilsCfg(flags,'InDetJFUtils'+suffix))
+ improvedJetFitterInitializationHelper = acc.popToolsAndMerge(ImprovedJetFitterInitializationHelperCfg('ImprovedJFInitHelper'+suffix))
+ defaults = { 'MaxNumDeleteIterations' : 30 ,
+ 'VertexProbCut' : 0.001 ,
+ 'MaxClusteringIterations' : 30 ,
+ 'UseFastClustering' : False ,
+ 'maxTracksForDetailedClustering' : 25 ,
+ 'VertexClusteringProbabilityCut' : 0.005 ,
+ 'VertexClusteringProbabilityCutWithMass' : 0.05 ,
+ 'VertexClusteringProbabilityCutWithMass0010' : 0.002 ,
+ 'VertexClusteringProbabilityCutWithMass1015' : 0.002 ,
+ 'VertexClusteringProbabilityCutWithMass1520' : 0.050 ,
+ 'VertexClusteringProbabilityCutWithMass2025' : 0.100 ,
+ 'VertexClusteringProbabilityCutWithMass2530' : 0.200 ,
+ 'VertexClusteringProbabilityCutWithMass3040' : 0.500 ,
+ 'VertexClusteringProbabilityCutWithMass4050' : 0.700 ,
+ 'VertexClusteringProbabilityCutWithMass5060' : 0.900 ,
+ 'VertexClusteringProbabilityCutWithMass6070' : 0.900 ,
+ 'JetFitterInitializationHelper' : improvedJetFitterInitializationHelper,
+# 'JetFitterHelper' : ,
+ 'JetFitterRoutines' : improvedJetFitterRoutines,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ acc.setPrivateTools( InDet__JetFitterMultiStageFit(**options) )
+ return acc
+
+
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterTrackSelectorToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterTrackSelectorToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..7c5727752ecc815ef450bbf2411f7badb7619beb
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterTrackSelectorToolConfig.py
@@ -0,0 +1,45 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from BTagging.InDetJetFitterUtilsConfig import InDetJetFitterUtilsCfg
+from BTagging.InDetImprovedJetFitterTrackSelectorToolConfig import InDetImprovedJetFitterTrackSelectorToolCfg
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+
+# import the InDetDetailedTrackSelectorTool configurable
+InDet__JetFitterTrackSelectorTool=CompFactory.InDet.JetFitterTrackSelectorTool
+
+def InDetJetFitterTrackSelectorToolCfg(flags, name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up a InDetJetFitterTrackSelectorTool tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ revertFromPositiveToNegativeTags default: False
+ cutCompPrimaryVertexForPosLifetimeTracks default: 1e-1
+ cutCompPrimaryVertexForNegLifetimeTracks default: 5e-2
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ acc = ComponentAccumulator()
+ if useBTagFlagsDefaults:
+ jetFitterExtrapolator= acc.popToolsAndMerge(AtlasExtrapolatorCfg(flags,'JFExtrapolator'+suffix))
+ inDetJetFitterUtils = acc.popToolsAndMerge(InDetJetFitterUtilsCfg(flags,'InDetJFUtils'+suffix))
+ inDetImprovedJetFitterTrackSelectorTool = acc.popToolsAndMerge(InDetImprovedJetFitterTrackSelectorToolCfg('InDetImprovedJFTrackSelTool'+suffix))
+ defaults = { 'revertFromPositiveToNegativeTags' : False,
+ 'cutCompPrimaryVertexForPosLifetimeTracks' : 0.1,
+ 'cutCompPrimaryVertexForNegLifetimeTracks' : 0.05,
+ 'Extrapolator' : jetFitterExtrapolator ,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'TrackSelector' : inDetImprovedJetFitterTrackSelectorTool }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ acc.setPrivateTools( InDet__JetFitterTrackSelectorTool(**options) )
+ return acc
+
+
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterTwoTrackVtxFinderToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterTwoTrackVtxFinderToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..7d8cff80bb4916b029512e0288ba0dbac2d13a1e
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterTwoTrackVtxFinderToolConfig.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from BTagging.JetFitterSequentialVertexFitterConfig import JetFitterSequentialVertexFitterCfg
+
+# import the InDetDetailedTrackSelectorTool configurable
+InDet__JetFitterTwoTrackVtxFinderTool=CompFactory.InDet.JetFitterTwoTrackVtxFinderTool
+
+def InDetJetFitterTwoTrackVtxFinderToolCfg(name, suffix="", useBTagFlagsDefaults = True, **options):
+
+ """Sets up a InDetJetFitterTwoTrackVtxFinderTool tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ ID_maxR default: 1150.
+ ID_maxZ default: 2727.
+ twoVertexProbabilityCut default: 3.4e-2
+ revertFromPositiveToNegativeTags default: False
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ acc = ComponentAccumulator()
+ if useBTagFlagsDefaults:
+ jetFitterSequentialVertexFitter = acc.popToolsAndMerge(JetFitterSequentialVertexFitterCfg('JFSeqVxFitter'+suffix))
+ defaults = { 'ID_maxR' : 1150.,
+ 'ID_maxZ' : 2727.,
+ 'twoVertexProbabilityCut' : 0.034,
+ 'revertFromPositiveToNegativeTags' : False,
+# 'CrossDistancesSeedFinder' : ,
+ 'SequentialVertexFitter' : jetFitterSequentialVertexFitter }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ acc.setPrivateTools( InDet__JetFitterTwoTrackVtxFinderTool(**options) )
+ return acc
+
+
+
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterV0FinderToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterV0FinderToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..50568fbc3a320626e51f7bce54407f852c09a161
--- /dev/null
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetFitterV0FinderToolConfig.py
@@ -0,0 +1,90 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from BTagging.InDetJetFitterUtilsConfig import InDetJetFitterUtilsCfg
+from BTagging.JetFitterMode3dTo1dFinderConfig import JetFitterMode3dTo1dFinderCfg
+
+# import the InDetDetailedTrackSelectorTool configurable
+InDet__JetFitterV0FinderTool=CompFactory.InDet.JetFitterV0FinderTool
+
+def JetFitterV0FinderToolCfg(flags, name, suffix="", useBTagFlagsDefaults = True, **options):
+ """Sets up a JetFitterV0FinderTool tool and returns it.
+
+ The following options have BTaggingFlags defaults:
+
+ revertFromPositiveToNegativeTags default: False
+ cutTwoTrkVtxVtxProbForBFirstSelectCriteriumA default: 0.05
+ cutTwoTrkVtxVtxProbForBFirstSelectCriteriumB default: 0.034
+ cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection default: 1e-1
+ cutCompatibilityPrimaryVertexBothTracksForBFirstSelection default: 1e-2
+ cutIPD0BothTracksForBFirstSelection default: 3.5
+ cutIPZ0BothTracksForBFirstSelection default: 5.
+ cutPtBothTracksForBFirstSelection default: 500.
+ cutTwoTrkVtxLifeSignForBFirstSelectCriteriumA default: 1.
+ cutTwoTrkVtxLifeSignForBFirstSelectCriteriumB default: 1.5
+ cutCompToPrimarySingleTrackForMatInterac default: 1e-4
+ cutCompToPrimaryBothTracksForMatInterac default: 1e-6
+ firstBeam_min default: 23
+ firstBeam_max default: 25
+ secondBeam_min default: 23
+ secondBeam_max default: 24
+ firstLayer_min default: 34.0-2.5
+ firstLayer_max default: 34.0+2.5
+ secondLayer_min default: 51.5-3
+ secondLayer_max default: 51.5+3
+ cutCompPVSinglePosLifeTrackForBSecondSelect default: 5e-2
+ cutCompPVSingleNegLifeTrackForBSecondSelect default: 1e-2
+ cutIPD0SigBoxSingleTrackForBSecondSelection default: 2.
+ cutIPZ0SigBoxSingleTrackForBSecondSelection default: 5.
+ cutIPD0SingleTrackForBSecondSelection default: 1.5
+ cutIPZ0SingleTrackForBSecondSelection default: 3.
+ cutPtSingleTrackForBSecondSelection default: 750
+
+ input: name: The name of the tool (should be unique).
+ useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified.
+ **options: Python dictionary with options for the tool.
+ output: The actual tool, which can then by added to ToolSvc via ToolSvc += output."""
+ acc = ComponentAccumulator()
+ if useBTagFlagsDefaults:
+ inDetJetFitterUtils = acc.popToolsAndMerge(InDetJetFitterUtilsCfg(flags,'InDetJFUtils'+suffix))
+ jetFitterMode3dTo1dFinder = acc.popToolsAndMerge(JetFitterMode3dTo1dFinderCfg('JFMode3dTo1dFinder'+suffix))
+ defaults = { 'revertFromPositiveToNegativeTags' : False ,
+ 'cutTwoTrkVtxVtxProbForBFirstSelectCriteriumA' : 0.05 ,
+ 'cutTwoTrkVtxVtxProbForBFirstSelectCriteriumB' : 0.034 ,
+ 'cutCompatibilityPrimaryVertexSingleTrackForBFirstSelection' : 1e-1 ,
+ 'cutCompatibilityPrimaryVertexBothTracksForBFirstSelection' : 1e-2 ,
+ 'cutIPD0BothTracksForBFirstSelection' : 3.5 ,
+ 'cutIPZ0BothTracksForBFirstSelection' : 5. ,
+ 'cutPtBothTracksForBFirstSelection' : 500. ,
+ 'cutTwoTrkVtxLifeSignForBFirstSelectCriteriumA' : 1. ,
+ 'cutTwoTrkVtxLifeSignForBFirstSelectCriteriumB' : 1.5 ,
+ 'cutCompToPrimarySingleTrackForMatInterac' : 1e-4 ,
+ 'cutCompToPrimaryBothTracksForMatInterac' : 1e-6 ,
+ 'firstBeam_min' : 23 ,
+ 'firstBeam_max' : 25 ,
+ 'secondBeam_min' : 23 ,
+ 'secondBeam_max' : 24 ,
+ 'firstLayer_min' : 34.0-2.5 ,
+ 'firstLayer_max' : 34.0+2.5 ,
+ 'secondLayer_min' : 51.5-3 ,
+ 'secondLayer_max' : 51.5+3 ,
+ 'cutCompPVSinglePosLifeTrackForBSecondSelect' : 5e-2 ,
+ 'cutCompPVSingleNegLifeTrackForBSecondSelect' : 1e-2 ,
+ 'cutIPD0SigBoxSingleTrackForBSecondSelection' : 2. ,
+ 'cutIPZ0SigBoxSingleTrackForBSecondSelection' : 5. ,
+ 'cutIPD0SingleTrackForBSecondSelection' : 1.5 ,
+ 'cutIPZ0SingleTrackForBSecondSelection' : 3. ,
+ 'cutPtSingleTrackForBSecondSelection' : 750,
+ 'InDetJetFitterUtils' : inDetJetFitterUtils,
+ 'Mode3dFinder' : jetFitterMode3dTo1dFinder }
+ for option in defaults:
+ options.setdefault(option, defaults[option])
+
+ options['name'] = name
+ acc.setPrivateTools( InDet__JetFitterV0FinderTool(**options) )
+ return acc
+
+
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py
index 277acf5ed53424b9a103b95ee90e9cab29959c06..034740715cf4e6cc1073eddb18079672c802dd8b 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py
@@ -2,7 +2,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from BTagging.NewJetFitterVxFinderConfig import NewJetFitterVxFinderCfg
+from BTagging.InDetImprovedJetFitterVxFinderConfig import InDetImprovedJetFitterVxFinderCfg
from BTagging.InDetVKalVxInJetToolConfig import InDetVKalVxInJetToolCfg
Analysis__JetSecVtxFindingAlg=CompFactory.Analysis.JetSecVtxFindingAlg
@@ -21,7 +21,7 @@ def JetSecVtxFindingAlgCfg(ConfigFlags, JetCollection, PrimaryVertexCollectionNa
jetcol = JetCollection
if SVFinder == 'JetFitter':
- secVtxFinder = acc.popToolsAndMerge(NewJetFitterVxFinderCfg(ConfigFlags, 'JFVxFinder'))
+ secVtxFinder = acc.popToolsAndMerge(InDetImprovedJetFitterVxFinderCfg(ConfigFlags, 'JFVxFinder'))
elif SVFinder == 'SV1':
secVtxFinder = acc.popToolsAndMerge(InDetVKalVxInJetToolCfg("IDVKalVxInJet"))
elif SVFinder == 'MSV':
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/util/BTaggingSelectionToolTester.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/util/BTaggingSelectionToolTester.cxx
index bf874a431880c19fe8e5dcece468cab222a67245..d4a739656cbfa36935f6bdc3e5d35682b268323e 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/util/BTaggingSelectionToolTester.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/util/BTaggingSelectionToolTester.cxx
@@ -8,19 +8,24 @@
#include "xAODJet/JetContainer.h"
#include "xAODBTagging/BTaggingAuxContainer.h"
+#include "AsgMessaging/MessageCheck.h"
+
#include <string>
#include <iomanip>
int main() {
+ using namespace asg::msgUserCode;
+ ANA_CHECK_SET_TYPE (int);
+
BTaggingSelectionTool * tool = new BTaggingSelectionTool("BTagSelecTest");
- tool->setProperty( "MaxEta", 2.5 );
- tool->setProperty( "MinPt", 20000. );
- // tool->setProperty( "FlvTagCutDefinitionsFileName","xAODBTaggingEfficiency/13TeV/2016-20_7-13TeV-MC15-CDI-May31_v1.root" );
- tool->setProperty( "FlvTagCutDefinitionsFileName","xAODBTaggingEfficiency/share/AntiKt2TrackJets_20160615.root" );
- tool->setProperty("TaggerName", "MV2c00_MV2c100" );
- tool->setProperty("OperatingPoint", "2DFixedCutBEff_85" );
- tool->setProperty("JetAuthor", "AntiKt2PV0TrackJets" );
+ ANA_CHECK (tool->setProperty( "MaxEta", 2.5 ));
+ ANA_CHECK (tool->setProperty( "MinPt", 20000. ));
+ // ANA_CHECK (tool->setProperty( "FlvTagCutDefinitionsFileName","xAODBTaggingEfficiency/13TeV/2016-20_7-13TeV-MC15-CDI-May31_v1.root" ));
+ ANA_CHECK (tool->setProperty( "FlvTagCutDefinitionsFileName","xAODBTaggingEfficiency/share/AntiKt2TrackJets_20160615.root" ));
+ ANA_CHECK (tool->setProperty("TaggerName", "MV2c00_MV2c100" ));
+ ANA_CHECK (tool->setProperty("OperatingPoint", "2DFixedCutBEff_85" ));
+ ANA_CHECK (tool->setProperty("JetAuthor", "AntiKt2PV0TrackJets" ));
// A successful initialisation ought to be checked for
StatusCode code = tool->initialize();
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsSFFileTester.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsSFFileTester.cxx
index 8d7a5cbeffb8e66aa76ec3a3637932fab729d961..a0f19d6653655316317501679c1a0aef01dcc8dd 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsSFFileTester.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsSFFileTester.cxx
@@ -23,7 +23,7 @@
# include "xAODRootAccess/Init.h"
# include "xAODRootAccess/TEvent.h"
# include "xAODRootAccess/tools/ReturnCheck.h"
-# include "AsgTools/Check.h"
+# include "AsgMessaging/Check.h"
#endif // ROOTCORE
// EDM include(s):
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsTest.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsTest.cxx
index 104a54d90197f73321a4c50a4005e74235dad2cd..f832caa314b0a78e92cbe2d88799575e887188d5 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsTest.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonEfficiencyScaleFactorsTest.cxx
@@ -22,7 +22,7 @@
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/TEvent.h"
#include "xAODRootAccess/tools/ReturnCheck.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
// EDM include(s):
#include "xAODEventInfo/EventInfo.h"
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonTriggerSFRootCoreTest.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonTriggerSFRootCoreTest.cxx
index 385c7da2c52537b6b9e36e62d3b212004d6eb1a7..d349a3502000f96a34695e16952f3918eaa22611 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonTriggerSFRootCoreTest.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/util/MuonTriggerSFRootCoreTest.cxx
@@ -18,7 +18,7 @@
# include "xAODRootAccess/Init.h"
# include "xAODRootAccess/TEvent.h"
# include "xAODRootAccess/tools/ReturnCheck.h"
-# include "AsgTools/Check.h"
+# include "AsgMessaging/Check.h"
#endif // ROOTCORE
// EDM include(s):
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/util/MCAST_Tester.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/util/MCAST_Tester.cxx
index 29458e8218ee131dc1fd688bb3416a0914027f3c..863372fbd7e0674e3c507159efbbbb89fcbb80c6 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/util/MCAST_Tester.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/util/MCAST_Tester.cxx
@@ -28,7 +28,7 @@
#include "PATInterfaces/SystematicRegistry.h"
#include "xAODCore/tools/IOStats.h"
#include "xAODCore/tools/ReadStats.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "AsgTools/AnaToolHandle.h"
#include "PATInterfaces/SystematicCode.h"
@@ -41,6 +41,10 @@ ANA_MSG_HEADER(msgMMC)
int main( int argc, char* argv[] ) {
+ // setup for ANA_CHECK()
+ using namespace msgMMC;
+ ANA_CHECK_SET_TYPE (int);
+
bool useCorrectedCopy = false;
// The application's name:
@@ -92,7 +96,7 @@ int main( int argc, char* argv[] ) {
////////////////////////////////////////////////////
//::: initialize the application and get the event
////////////////////////////////////////////////////
- xAOD::Init( APP_NAME );
+ ANA_CHECK (xAOD::Init( APP_NAME ));
xAOD::TReturnCode::enableFailure();
//::: Open the input file:
@@ -221,14 +225,14 @@ int main( int argc, char* argv[] ) {
// Print some event information
const xAOD::EventInfo* evtInfo = 0;
- event.retrieve( evtInfo, "EventInfo" );
+ ANA_CHECK( event.retrieve( evtInfo, "EventInfo" ));
if(Ievent!=-1 && static_cast <int> (evtInfo->eventNumber())!=Ievent) {
continue;
}
//::: Get the Muons from the event:
const xAOD::MuonContainer* muons = 0;
- event.retrieve( muons, "Muons" );
+ ANA_CHECK( event.retrieve( muons, "Muons" ));
// create a shallow copy of the muons container
std::pair< xAOD::MuonContainer*, xAOD::ShallowAuxContainer* > muons_shallowCopy = xAOD::shallowCopyContainer( *muons );
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonanceSelectionTool.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonanceSelectionTool.cxx
index 3b0abe7c171f6fbf9c2da54e941712917f5fd554..605ec43afa9bea56f3fa1407b8058be5c94c0ad5 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonanceSelectionTool.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonanceSelectionTool.cxx
@@ -15,20 +15,20 @@ MuonResonanceSelectionTool::MuonResonanceSelectionTool(std::string myname)
m_highMassWindow(110000.0),
m_lowMassWindow(90000.0),
#ifndef ROOTCORE
- m_seliTool("CP::MuonSelectionTool/MuonSelectionTool", this),
+ m_seliTool("CP::MuonSelectionTool/MuonSelectionTool", this),
m_sfTool("CP::MuonEfficiencyScaleFactors/MuonEfficiencyScaleFactors", this ),
m_calibTool("CP::MuonCalibrationAndSmearingTool/MuonCalibrationAndSmearingTool", this ),
m_matchTool(""),
m_trigTool("")
-#else
- m_seliTool("CP::MuonSelectionTool/MuonSelectionTool"),
+#else
+ m_seliTool("CP::MuonSelectionTool/MuonSelectionTool"),
m_sfTool("CP::MuonEfficiencyScaleFactors/MuonEfficiencyScaleFactors" ),
m_calibTool("CP::MuonCalibrationAndSmearingTool/MuonCalibrationAndSmearingTool" ),
m_matchTool("Trig::TrigMuonMatching/TrigMuonMatching"),
m_trigTool("Trig::TrigDecisionTool/TrigDecisionTool")
#endif
{
-
+
declareProperty("PtCut", m_ptCut = 20000.0);
declareProperty("EtaCut", m_etaCut = 2.5);
declareProperty("IsoCaloCut", m_isoCaloCut = 0.12);
@@ -44,19 +44,19 @@ MuonResonanceSelectionTool::MuonResonanceSelectionTool(std::string myname)
declareProperty("MuonSelectionTool", m_seliTool );
declareProperty("ScaleFactorTool", m_sfTool );
declareProperty("MuonCalibrationTool", m_calibTool );
- declareProperty("TriggerDecisionTool", m_trigTool );
- declareProperty("TriggerMatchingTool", m_matchTool );
-
+ declareProperty("TriggerDecisionTool", m_trigTool );
+ declareProperty("TriggerMatchingTool", m_matchTool );
+
}
StatusCode MuonResonanceSelectionTool::initialize()
{
-
+
ATH_CHECK( m_seliTool.retrieve() );
if (m_doEff) ATH_CHECK( m_sfTool.retrieve() );
if (m_doCalib) ATH_CHECK( m_calibTool.retrieve() );
if (!m_trigTool.empty()) ATH_CHECK( m_trigTool.retrieve() );
- if (!m_matchTool.empty()) ATH_CHECK( m_matchTool.retrieve() );
+ if (!m_matchTool.empty()) ATH_CHECK( m_matchTool.retrieve() );
ATH_MSG_INFO("Tools initialized:" );
ATH_MSG_INFO("SelectionTool :: \t" << m_seliTool );
@@ -75,8 +75,8 @@ StatusCode MuonResonanceSelectionTool::initialize()
ATH_MSG_INFO("Max_d0 = " << m_Abs_d0Cut );
ATH_MSG_INFO("Max_z0 = " << m_Abs_z0Cut );
ATH_MSG_INFO("Calibrate = " << m_doCalib );
- ATH_MSG_INFO("Eff. Corr = " << m_doEff );
-
+ ATH_MSG_INFO("Eff. Corr = " << m_doEff );
+
return StatusCode::SUCCESS;
}
@@ -84,7 +84,7 @@ StatusCode MuonResonanceSelectionTool::initialize()
std::pair<std::vector<const xAOD::Muon*>,std::vector<const xAOD::Muon*> > MuonResonanceSelectionTool::selectMuons(const xAOD::MuonContainer* tags, bool isMC, CP::SystematicSet sys) {
- ATH_MSG_DEBUG("Number of found Muons :"<< tags->size() );
+ ATH_MSG_DEBUG("Number of found Muons :"<< tags->size() );
std::pair<std::vector<const xAOD::Muon*>,std::vector<const xAOD::Muon*> > goodMuons = std::make_pair(std::vector<const xAOD::Muon*>(), std::vector<const xAOD::Muon*>());
const xAOD::EventInfo* info = 0;
@@ -98,19 +98,19 @@ std::pair<std::vector<const xAOD::Muon*>,std::vector<const xAOD::Muon*> > MuonRe
return goodMuons;
}
- if (m_doCalib) {
- if( m_calibTool->applySystematicVariation( sys ) != CP::SystematicCode::Ok )
- ATH_MSG_WARNING( "Cannot configure muon calibration tool for systematic " << sys.name() );
+ if (m_doCalib) {
+ if( m_calibTool->applySystematicVariation( sys ) != CP::SystematicCode::Ok )
+ ATH_MSG_WARNING( "Cannot configure muon calibration tool for systematic " << sys.name() );
}
if (m_doEff) {
- if( m_sfTool->applySystematicVariation( sys ) != CP::SystematicCode::Ok )
+ if( m_sfTool->applySystematicVariation( sys ) != CP::SystematicCode::Ok )
ATH_MSG_WARNING( "Cannot configure muon efficiency corrections for systematic " << sys.name() );
}
-
+
// loop over muon container
for(auto tag : *tags) {
-
+
// select muon type (Combined = 0)
if(tag->muonType() != xAOD::Muon::MuonType::Combined) continue;
@@ -119,32 +119,32 @@ std::pair<std::vector<const xAOD::Muon*>,std::vector<const xAOD::Muon*> > MuonRe
// correct muon
xAOD::Muon* mu = 0;
- if(m_doCalib){
- try{ m_calibTool->correctedCopy( *tag, mu );}
+ if(m_doCalib){
+ try{ m_calibTool->correctedCopy( *tag, mu ).ignore();}
catch(SG::ExcBadAuxVar&){
ATH_MSG_WARNING( "Cannot retrieve aux-item - rejecting muon" );
delete mu;
continue;
}
}
- else{
+ else{
try{ mu = copy(*tag);}
- catch(SG::ExcBadAuxVar&){
+ catch(SG::ExcBadAuxVar&){
ATH_MSG_WARNING( "Cannot retrieve aux-item - rejecting muon" );
delete mu;
continue;
}
}
- ATH_MSG_DEBUG("Selected muon TLV Pt|Eta|Phi|E :: "
+ ATH_MSG_DEBUG("Selected muon TLV Pt|Eta|Phi|E :: "
<< mu->p4().Pt() << " | " << mu->p4().Eta() << " | " << mu->p4().Phi() << " | " << mu->p4().E() );
ATH_MSG_DEBUG("pT(corr)/pT : " << mu->pt()/tag->pt() );
// apply efficiency SF
if(m_doEff) applySF(*mu, isMC);
-
+
// pass MuonSelectionTool
- if(!m_seliTool->accept(*mu)){
+ if(!m_seliTool->accept(*mu)){
ATH_MSG_DEBUG("Muon rejected by " << m_seliTool );
delete mu;
continue;
@@ -163,11 +163,11 @@ std::pair<std::vector<const xAOD::Muon*>,std::vector<const xAOD::Muon*> > MuonRe
// TriggerMatching
applyTriggerMatch(*mu);
- if( mu->trackParticle(xAOD::Muon::Primary)->charge()>0) goodMuons.first.push_back(mu);
+ if( mu->trackParticle(xAOD::Muon::Primary)->charge()>0) goodMuons.first.push_back(mu);
else goodMuons.second.push_back(mu);
}
-
+
ATH_MSG_DEBUG("Number of selected Muons : " << goodMuons.first.size()<< " "<< goodMuons.second.size() );
return goodMuons;
@@ -175,7 +175,7 @@ std::pair<std::vector<const xAOD::Muon*>,std::vector<const xAOD::Muon*> > MuonRe
// apply efficiency scale factors
void MuonResonanceSelectionTool::applySF(const xAOD::Muon& mu, bool isMC) const{
-
+
float sf = 1.;
if(isMC){
if( m_sfTool->applyEfficiencyScaleFactor(mu) == CP::CorrectionCode::Error ){
@@ -228,7 +228,7 @@ bool MuonResonanceSelectionTool::IPCut(const xAOD::Muon& mu, float z0cut, float
if (IP_d0<d0cut && IP_z0<z0cut) return true;
else return false;
}
- else{
+ else{
ATH_MSG_DEBUG("no associated track found, rejecting muon" );
return false;
}
@@ -236,11 +236,11 @@ bool MuonResonanceSelectionTool::IPCut(const xAOD::Muon& mu, float z0cut, float
// apply cut on total values of IPs
bool MuonResonanceSelectionTool::IPCutAbs(const xAOD::Muon& mu, float Abs_z0, float Abs_d0) const{
-
+
const xAOD::TrackParticle* tp = mu.primaryTrackParticle();
if( mu.muonType() == xAOD::Muon::Combined && !tp )
tp = *mu.inDetTrackParticleLink();
-
+
if(tp){
const xAOD::VertexContainer* primVertices = 0;
const xAOD::Vertex* vx = 0;
@@ -256,7 +256,7 @@ bool MuonResonanceSelectionTool::IPCutAbs(const xAOD::Muon& mu, float Abs_z0, fl
if(tp->d0()<Abs_d0 && delta_z0<Abs_z0) return true;
else return false;
}
- else{
+ else{
ATH_MSG_DEBUG("no associated track found, rejecting muon" );
return false;
}
@@ -264,7 +264,7 @@ bool MuonResonanceSelectionTool::IPCutAbs(const xAOD::Muon& mu, float Abs_z0, fl
// creates uncorrected copy of muon
xAOD::Muon* MuonResonanceSelectionTool::copy(const xAOD::Muon& mu) const{
-
+
xAOD::Muon *mu_c = 0;
if(mu.m()<=0) return mu_c;
mu_c = new xAOD::Muon();
@@ -391,7 +391,7 @@ if (runNb == 284154){
if (runNb == 284213){
if ((lumiBL >=43 && lumiBL <=164) || (lumiBL >=166 && lumiBL <=303) || (lumiBL >=306 && lumiBL <=433) || (lumiBL >=438 && lumiBL <=490) || (lumiBL >=492 && lumiBL <=776) || (lumiBL >=779 && lumiBL <=930) || (lumiBL >=932 && lumiBL <=962) || (lumiBL >=965 && lumiBL <=1033)) return true;
}
-if (runNb == 284420){
+if (runNb == 284420){
if ((lumiBL >=126 && lumiBL <=131) || (lumiBL >=133 && lumiBL <=165) || (lumiBL >=167 && lumiBL <=189) || (lumiBL >=191 && lumiBL <=230) || (lumiBL >=232 && lumiBL <=274) || (lumiBL >=277 && lumiBL <=277) || (lumiBL >=279 && lumiBL <=290) || (lumiBL >=292 && lumiBL <=348) || (lumiBL >=352 && lumiBL <=364) || (lumiBL >=367 && lumiBL <=377)) return true;
}
if (runNb == 284427){
@@ -409,28 +409,27 @@ if (runNb == 284484){
bool MuonResonanceSelectionTool::isTriggered (void) const{
ATH_MSG_DEBUG("Selected triggers " << (int)m_triggerList.size() << "\t Triggers found by tool " << (int)m_trigTool->getListOfTriggers().size() );
- if (m_triggerList.size() == 0 || m_trigTool->getListOfTriggers().size() == 0) return true;
+ if (m_triggerList.size() == 0 || m_trigTool->getListOfTriggers().size() == 0) return true;
for (auto trigger : m_triggerList){
- ATH_MSG_DEBUG("Asking trigger "<< trigger);
- if ( m_trigTool->isPassed(trigger) ) return true;
- }
- return false;
+ ATH_MSG_DEBUG("Asking trigger "<< trigger);
+ if ( m_trigTool->isPassed(trigger) ) return true;
+ }
+ return false;
}
// trigger matching
void MuonResonanceSelectionTool::applyTriggerMatch(xAOD::Muon& mu) {
- if(m_triggerList.size() == 0 || m_trigTool->getListOfTriggers().size() == 0 ){
+ if(m_triggerList.size() == 0 || m_trigTool->getListOfTriggers().size() == 0 ){
mu.auxdata< bool >("isTriggered") = true;
return;
- }
+ }
bool isTriggered = false;
for (auto trigger : m_triggerList) {
- ATH_MSG_DEBUG("Matching on " << trigger << " : \t" << m_matchTool->match(mu.eta(), mu.phi(), trigger) );
+ ATH_MSG_DEBUG("Matching on " << trigger << " : \t" << m_matchTool->match(mu.eta(), mu.phi(), trigger) );
if( m_matchTool->match(mu.eta(), mu.phi(), trigger) ) isTriggered = true;
}
mu.auxdata< bool >("isTriggered") = isTriggered;
return;
}
-
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx
index 512e4958664ca192730fa26a1378b8c1f2a8f131..76bf009555467cfbf9f5502914a3f7234eb55cf3 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx
@@ -5,7 +5,7 @@
#include <iostream>
#include <cstdlib>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
int main()
{
diff --git a/PhysicsAnalysis/POOLRootAccess/CMakeLists.txt b/PhysicsAnalysis/POOLRootAccess/CMakeLists.txt
index a3df8865960ffcd199da203eac951243e5336e84..25a1ba2324ace7b875644ce7d9db5f6f5ac507a7 100644
--- a/PhysicsAnalysis/POOLRootAccess/CMakeLists.txt
+++ b/PhysicsAnalysis/POOLRootAccess/CMakeLists.txt
@@ -38,7 +38,7 @@ atlas_add_dictionary( POOLRootAccessDict
atlas_add_executable( ut_basicRead_test
test/ut_basicRead_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} POOLRootAccessLib xAODEventInfo )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} POOLRootAccessLib xAODEventInfo AsgMessagingLib )
atlas_add_executable( ut_basicxAODRead_test
test/ut_basicxAODRead_test.cxx
diff --git a/PhysicsAnalysis/POOLRootAccess/POOLRootAccess/TEvent.h b/PhysicsAnalysis/POOLRootAccess/POOLRootAccess/TEvent.h
index bf993e129448ac47226d9f991143805439072127..2627451a5640a5052224bb7cf874a73aca0db051 100644
--- a/PhysicsAnalysis/POOLRootAccess/POOLRootAccess/TEvent.h
+++ b/PhysicsAnalysis/POOLRootAccess/POOLRootAccess/TEvent.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
+#include "Gaudi/Interfaces/IOptionsSvc.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
#include "AthenaKernel/IEventSeek.h"
@@ -60,12 +60,14 @@ namespace POOL {
ServiceHandle<StoreGateSvc>& evtStore() { return m_evtStore; }
ServiceHandle<StoreGateSvc>& inputMetaStore() { return m_inputMetaStore; }
- template<typename T> void setEvtLoopProperty( const char* name, const T& val ) {
- m_joSvc->addPropertyToCatalogue( m_evtLoop.name() , StringProperty( name, Gaudi::Utils::toString ( val ) ) ).ignore();
- }
-
template<typename T> void setEvtSelProperty( const char* name, const T& val ) {
- m_joSvc->addPropertyToCatalogue( m_evtSelect.name() , StringProperty( name, Gaudi::Utils::toString ( val ) ) ).ignore();
+ if constexpr (std::is_convertible_v<T, std::string>) {
+ // Gaudi::Utils::toString adds extra quotes, don't do this for strings:
+ m_joSvc->set(m_evtSelect.name() + "." + name, std::string(val));
+ }
+ else {
+ m_joSvc->set(m_evtSelect.name() + "." + name, Gaudi::Utils::toString(val));
+ }
}
//forward retrieve calls to the evtStore
@@ -112,7 +114,7 @@ namespace POOL {
long m_size = -1; //cache of the event size, filled on first call to getEntries
IEventProcessor* m_evtProcessor;
- ServiceHandle<IJobOptionsSvc> m_joSvc;
+ ServiceHandle<Gaudi::Interfaces::IOptionsSvc> m_joSvc;
ServiceHandle<IEventSeek> m_evtLoop; //the AthenaEventLoopMgr
ServiceHandle<IEvtSelectorSeek> m_evtSelect; //the EventSelectorAthenaPool
diff --git a/PhysicsAnalysis/POOLRootAccess/src/TEvent.cxx b/PhysicsAnalysis/POOLRootAccess/src/TEvent.cxx
index ec3dba1c77eb1df37d40f0a96d63bb9aa26aa58b..c0a458457ff91c232344011437eae40ba70218a6 100644
--- a/PhysicsAnalysis/POOLRootAccess/src/TEvent.cxx
+++ b/PhysicsAnalysis/POOLRootAccess/src/TEvent.cxx
@@ -78,11 +78,8 @@ TEvent::TEvent(EReadMode mode, const std::string& name) :
//check if a SelectorType has been specified in the joSvc
//should retire this code at some point (hangover from basicxAOD.opts)
- auto properties = m_joSvc->getProperties("TEvent");
- if(properties) {
- for(auto prop : *properties) {
- if(prop->name()=="EventSelectorType") m_evtSelect.setTypeAndName(prop->toString() + "/" + m_evtSelect.name());
- }
+ if (m_joSvc->has("TEvent.EventSelectorType")) {
+ m_evtSelect.setTypeAndName(m_joSvc->get("TEvent.EventSelectorType") + "/" + m_evtSelect.name());
}
AAH::setProperty( m_evtLoop , "ClearStorePolicy", "BeginEvent" ).ignore(); //for interactive use of storegate
diff --git a/PhysicsAnalysis/POOLRootAccess/test/ut_basicRead_test.cxx b/PhysicsAnalysis/POOLRootAccess/test/ut_basicRead_test.cxx
index 758bbda257258a5a4b1a104030922aeb17e0c31c..8ebdc70d712ce27bda306aa2d09ca123ceb39f47 100644
--- a/PhysicsAnalysis/POOLRootAccess/test/ut_basicRead_test.cxx
+++ b/PhysicsAnalysis/POOLRootAccess/test/ut_basicRead_test.cxx
@@ -12,10 +12,16 @@
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/TEvent.h"
+#include "AsgMessaging/MessageCheck.h"
+
#include "AthAnalysisBaseComps/AthAnalysisHelper.h"
int main(int argc, char* argv[]) {
+ ANA_CHECK_SET_TYPE (int);
+ using namespace asg::msgUserCode;
+
+
std::string whatToRead = "$ASG_TEST_FILE_MC";
if(argc>1) whatToRead = argv[1];
@@ -24,18 +30,18 @@ int main(int argc, char* argv[]) {
const xAOD::EventInfo_v1* evtInfo = 0;
- xAOD::Init();
- TChain* c = new TChain("CollectionTree");
- c->Add(whatToRead.c_str());
- xAOD::TEvent evt2;
- evt2.readFrom(c);
+ ANA_CHECK (xAOD::Init());
+ TChain* c = new TChain("CollectionTree");
+ c->Add(whatToRead.c_str());
+ xAOD::TEvent evt2;
+ ANA_CHECK (evt2.readFrom(c));
int maxEvt2 = evt2.getEntries();
TStopwatch st2;
st2.Start();
for(int i=0; i< maxEvt2; i++) {
evt2.getEntry(i);
- evt2.retrieve( evtInfo , "EventInfo" );
+ ANA_CHECK (evt2.retrieve( evtInfo , "EventInfo" ));
evtInfo->eventNumber();
}
st2.Stop();
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py
index a3dadd6ae12e87aaed63748c020884b7199edb81..fe45b83eaf037ed09497d1fe3c491fa41fa27787 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py
@@ -7,6 +7,7 @@ from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags
import InDetPhysValMonitoring.InDetPhysValMonitoringTool as InDetPhysValMonitoringTool
mons=[ (True , InDetPhysValMonitoringTool.getInDetPhysValMonitoringTool),
+ (InDetPhysValFlags.doValidateLargeD0Tracks() , InDetPhysValMonitoringTool.getInDetLargeD0PhysValMonitoringTool),
(InDetPhysValFlags.doValidateLooseTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolLoose),
(InDetPhysValFlags.doValidateTightPrimaryTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolTightPrimary),
(InDetPhysValFlags.doValidateDBMTracks() , InDetPhysValMonitoringTool.getInDetPhysValMonitoringToolDBM),
@@ -17,7 +18,6 @@ for enabled, creator in mons :
if enabled :
monMan.AthenaMonTools += [ creator() ]
-
from InDetPhysValMonitoring.InDetPhysValMonitoringTool import getInDetPhysValMonitoringTool
from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags
from InDetPhysValMonitoring.ConfigUtils import extractCollectionPrefix
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
index 44c99a5e76eff26d8732fbf18a6165c6c9a2eabd..e67aa8c518ce4fc90c245b771ba439776ffbbf3f 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
@@ -8,9 +8,9 @@ tool1 = MuonPhysValMonitoring__MuonPhysValMonitoringTool( name = 'muphysval' )
tool1.IsData = not recFlags.doTruth()
#
-tool1.MuonContainerName = 'Muons';
-tool1.SlowMuonContainerName = '';
-tool1.MuonTruthParticleContainerName = 'MuonTruthParticles';
+tool1.MuonContainerName = 'Muons'
+tool1.SlowMuonContainerName = ''
+tool1.MuonTruthParticleContainerName = 'MuonTruthParticles'
tool1.DoBinnedResolutionPlots = True
#comment out if you don't need any of the following containers
@@ -55,7 +55,7 @@ tool1.SelectMuonAuthors = [ 1, 2, 4 ,5, 6, 8, 9 ]
#Select Muon Categories... (origin of muons, empty: all categories, 0: ALL, 1: PROMPT, 2: IN-FLIGHT, 3: NON-ISOLATED, 4: REST)
#tool1.SelectMuonCategories = [ 0, 1, 2, 3, 4 ] # all possible categories
-tool1.SelectMuonCategories = [ 0, 1 ] # lighter version, good for official validation tasks; overriden when in data mode
+tool1.SelectMuonCategories = [ 0, 1 ] # lighter version, good for official validation tasks overriden when in data mode
from IsolationSelection.IsolationSelectionConf import CP__IsolationSelectionTool
IsolationTool = CP__IsolationSelectionTool( "IsolationSelectionTool",
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
index 1137f9a01bd4bb0b4b6e646e65bab26edc36ead9..bde8beb00ab826cd7818ae7fef32edf8008f5350 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
@@ -325,6 +325,21 @@ class WriteRAWPerfDPD_ZMUMU(JobProperty):
jobproperties.PrimaryDPDFlags.add_JobProperty(WriteRAWPerfDPD_ZMUMU)
listRAWtoDPD.append(WriteRAWPerfDPD_ZMUMU.StreamName)
+class WriteRAWPerfDPD_DIMU(JobProperty):
+ """ Produce the primary DPD DiMu in Byte Stream format."""
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+ StreamName = "StreamDRAW_DIMU"
+ FileName = ""
+ Prescale = 1
+ isVirtual = False
+ DPDMakerScript = "PrimaryDPDMaker/DRAW_DIMU.py"
+ pass
+jobproperties.PrimaryDPDFlags.add_JobProperty(WriteRAWPerfDPD_DIMU)
+listRAWtoDPD.append(WriteRAWPerfDPD_DIMU.StreamName)
+
+
class WriteDRAW_EGZ(JobProperty):
""" Produce the DRAW for EGamma calibration in Z events."""
statusOn = True
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py
index 15d0452613e74b9847b05d22fbd72c531e093325..1f4d84655c236e9abfea54c62b2180fd8ee72476 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDNCB.py
@@ -130,8 +130,10 @@ if dumpSctInfo:
print(xAOD_SCT_PrepDataToxAOD.properties())
if dumpPixInfo:
+ import InDetRecExample.TrackingCommon as TrackingCommon
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import PixelPrepDataToxAOD
- xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "NCBxAOD_PixelPrepDataToxAOD")
+ xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "NCBxAOD_PixelPrepDataToxAOD",
+ ClusterSplitProbabilityName = TrackingCommon.combinedClusterSplitProbName())
## Content steering Properties (default value shown as comment)
xAOD_PixelPrepDataToxAOD.OutputLevel = INFO
xAOD_PixelPrepDataToxAOD.UseTruthInfo = dumpTruthInfo
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDPIXLUMI.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDPIXLUMI.py
index 73a2fecc20e04d910cfdac064ad81f6898e95e00..3f78f5fb1d500f26d29287f23a9260a2ec806220 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDPIXLUMI.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDPIXLUMI.py
@@ -35,8 +35,10 @@ if dumpPixInfo:
if dumpPixInfo:
+ import InDetRecExample.TrackingCommon as TrackingCommon
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import PixelPrepDataToxAOD
- xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD")
+ xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD",
+ ClusterSplitProbabilityName = TrackingCommon.pixelClusterSplitProbName())
## Content steering Properties (default value shown as comment)
xAOD_PixelPrepDataToxAOD.OutputLevel = INFO
xAOD_PixelPrepDataToxAOD.UseTruthInfo = False
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDTRKLUMI.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDTRKLUMI.py
index 036a1b11728bdda2212a3022f91ae9e302f88aa5..c6584dca4c6570796ab5d6b61125106bc72e79fe 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDTRKLUMI.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DAOD_IDTRKLUMI.py
@@ -82,8 +82,10 @@ if dumpSctInfo:
print(xAOD_SCT_PrepDataToxAOD.properties())
if dumpPixInfo:
+ import InDetRecExample.TrackingCommon as TrackingCommon
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import PixelPrepDataToxAOD
- xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD")
+ xAOD_PixelPrepDataToxAOD = PixelPrepDataToxAOD( name = "xAOD_PixelPrepDataToxAOD",
+ ClusterSplitProbabilityName = TrackingCommon.pixelClusterSplitProbName())
## Content steering Properties (default value shown as comment)
xAOD_PixelPrepDataToxAOD.OutputLevel = INFO
xAOD_PixelPrepDataToxAOD.UseTruthInfo = dumpTruthInfo
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_DIMU.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_DIMU.py
new file mode 100644
index 0000000000000000000000000000000000000000..5543f21739cfa3812b753973fd3d16f957b6ed3a
--- /dev/null
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_DIMU.py
@@ -0,0 +1,108 @@
+####################################################
+### Setup:
+### sequencer
+### derivation framework / event selection
+####################################################
+
+# needed for dynamic determination of lowest-unprescaled single-muon and dimuon triggers
+from TriggerMenu.api.TriggerAPI import TriggerAPI
+from TriggerMenu.api.TriggerEnums import TriggerPeriod, TriggerType
+
+# Sequence
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+DRAW_DIMU_Seq = CfgMgr.AthSequencer("DRAW_DIMU_Seq")
+
+# Object selection strings
+sel_muon1 = 'Muons.pt > 3.5*GeV'
+sel_muon2 = 'Muons.pt > 3.5*GeV'
+
+# Event selection string
+dimuonMassString = '( count ( DRDiMuMass > 0.1*GeV && DRDiMuMass < 20*GeV ) >= 1 )'
+
+# Invariant masses in various configurations
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__InvariantMassTool
+DRDiMuMassTool = DerivationFramework__InvariantMassTool(name = "DRDiMuMassTool",
+ ContainerName = "Muons",
+ ObjectRequirements = sel_muon1,
+ SecondObjectRequirements = sel_muon2,
+ MassHypothesis = 105.66,
+ SecondMassHypothesis = 105.66,
+ StoreGateEntryName = "DRDiMuMass")
+ToolSvc += DRDiMuMassTool
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
+dimuonMassSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "DRAW_DIMU_DiMuonMass_SkimmingTool",
+ expression = dimuonMassString)
+ToolSvc += dimuonMassSkimmingTool
+
+# Muon selector tool
+from MuonSelectorTools.MuonSelectorToolsConf import CP__MuonSelectionTool
+goodMuonTool = CP__MuonSelectionTool(name = "DRAW_DIMU_MuonsSelector")
+goodMuonTool.MaxEta = 3.
+goodMuonTool.MuQuality = 3
+# turn of the momentum correction which is not needed for IDHits cut and Preselection
+goodMuonTool.TurnOffMomCorr = True
+ToolSvc += goodMuonTool
+print(goodMuonTool)
+from PrimaryDPDMaker.PrimaryDPDMakerConf import DerivationFramework__DRAW_ZMUMUSkimmingTool
+goodMuonSkimmingTool = DerivationFramework__DRAW_ZMUMUSkimmingTool(name = "DRAW_DIMU_GoodMuon_SkimmingTool",
+ MuonContainerKey = "Muons",
+ MuonSelectorTool = goodMuonTool,
+ MinimumNumberOfMuons = 1,
+ MuonPtCut = 3.5)
+ToolSvc += goodMuonSkimmingTool
+
+periods = TriggerPeriod.future | TriggerPeriod.y2015 | TriggerPeriod.y2016 | TriggerPeriod.y2017 | TriggerPeriod.y2018
+allUnprescaledTriggers = TriggerAPI.getLowestUnprescaledAnyPeriod(periods, TriggerType.mu)
+print("DRAW_DIMU: will skim on an OR of the following muon triggers (list provided at run-time by the TriggerAPI):")
+print(allUnprescaledTriggers)
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__TriggerSkimmingTool
+triggerSkimmingTool = DerivationFramework__TriggerSkimmingTool(name = "DRAWDIMUTriggerSkimmingTool",
+ TriggerListOR = allUnprescaledTriggers)
+ToolSvc += triggerSkimmingTool
+
+# Event selection tool
+from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__FilterCombinationAND
+DRAW_DIMU_SkimmingTool = DerivationFramework__FilterCombinationAND( name = "DRAW_DIMU_FinalFilter",
+ FilterList=[dimuonMassSkimmingTool,
+ goodMuonSkimmingTool] )
+ToolSvc += DRAW_DIMU_SkimmingTool
+print(DRAW_DIMU_SkimmingTool)
+
+# Kernel algorithm
+from DerivationFrameworkCore.DerivationFrameworkCoreConf import DerivationFramework__DerivationKernel
+DRAW_DIMU_Seq += CfgMgr.DerivationFramework__DerivationKernel("DRAW_DIMUKernel",
+ AugmentationTools = [DRDiMuMassTool],
+ SkimmingTools = [DRAW_DIMU_SkimmingTool]
+ )
+topSequence += DRAW_DIMU_Seq
+
+##################
+### Output stream
+##################
+from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
+from D2PDMaker.D2PDHelpers import buildFileName
+from PrimaryDPDMaker.PrimaryDPDFlags import primDPD
+streamName = primDPD.WriteRAWPerfDPD_DIMU.StreamName
+fileName = buildFileName( primDPD.WriteRAWPerfDPD_DIMU )
+#streamName = primDPD.WriteDRAW_DIMU.StreamName
+#fileName = buildFileName( primDPD.WriteDRAW_DIMU )
+# Remove the .pool.root ending in the file name, this is a RAW file!
+if fileName.endswith(".pool.root") :
+ fileName = fileName.rstrip(".pool.root")
+ pass
+StreamDRAW_DIMU = MSMgr.NewByteStream( streamName, fileName )
+StreamDRAW_DIMU.AddRequireAlgs(["DRAW_DIMUKernel"])
+
+# Don't write an output RAW file if it is empty
+StreamDRAW_DIMU.bsOutputSvc.WriteEventlessFiles = primDPD.WriteEventlessFiles()
+
+
+#########################################
+# Add the containers to the output stream
+#########################################
+from PrimaryDPDMaker import PrimaryDPD_OutputDefinitions as dpdOutput
+
+# Take everything from the input
+ExcludeList=[]
+dpdOutput.addAllItemsFromInputExceptExcludeList(streamName,ExcludeList)
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ExtraDescriptionPatterns.h b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ExtraDescriptionPatterns.h
index 8d0781737a992cf4895f221d51d0bd1b11bedc19..417c51383c2177049071cba9af99aecfe77298e6 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ExtraDescriptionPatterns.h
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ExtraDescriptionPatterns.h
@@ -8,7 +8,7 @@
#define RINGERSELECTORTOOLS_EXTRADESCRIPTIONPATTERNS_H
// Asg includes:
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
// std includes:
#include <bitset>
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/procedures/Normalizations.icc b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/procedures/Normalizations.icc
index edf637d2f0441e2085d3aea6ffbfb37acb52c2fc..1bfe2a7098661a26e43e7477221f97dcfb1bc035 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/procedures/Normalizations.icc
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/procedures/Normalizations.icc
@@ -9,7 +9,7 @@
#include "Normalizations.h"
#include <cmath>
#include <limits>
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
/**
* @brief Namespace dedicated for Ringer utilities
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h
index fcf799b0a67aec20395183143322235f711dd8b2..e26d1371d36d326f90c294b6041399f3e2b346d1 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h
@@ -10,8 +10,8 @@
// without C++11 enum class.
#if !defined(RINGER_STANDALONE)
// Asg includes:
-# include "AsgTools/MsgStream.h"
-# include "AsgTools/MsgStreamMacros.h"
+# include "AsgMessaging/MsgStream.h"
+# include "AsgMessaging/MsgStreamMacros.h"
//#pragma message "ASGTOOL or XAOD_STANDALONE"
#else
# include <iostream>
diff --git a/PhysicsAnalysis/RingerSelectorTools/Root/procedures/Normalizations.cxx b/PhysicsAnalysis/RingerSelectorTools/Root/procedures/Normalizations.cxx
index 43151182bad830a7185b76ea30adf74c575d7d21..410db30f0ea26c88b96b8c0b88dd04c056507603 100644
--- a/PhysicsAnalysis/RingerSelectorTools/Root/procedures/Normalizations.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/Root/procedures/Normalizations.cxx
@@ -4,7 +4,7 @@
// $Id: Normalizations.cxx 770805 2016-08-30 14:03:33Z ssnyder $
#include "RingerSelectorTools/procedures/Normalizations.icc"
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
#include <algorithm>
diff --git a/PhysicsAnalysis/RingerSelectorTools/util/testRead.cxx b/PhysicsAnalysis/RingerSelectorTools/util/testRead.cxx
index 6a72c4b678d808080afc4b159388ebd0214dc41f..1a87b9947192ec936a2dee39a77de2f7f17c7046 100644
--- a/PhysicsAnalysis/RingerSelectorTools/util/testRead.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/util/testRead.cxx
@@ -32,7 +32,7 @@ Ringer::AsgElectronRingerSelector __AsgRingerSel__("testRead");
MsgStream &msg = __AsgRingerSel__.msg();
#else
#include "RingerSelectorTools/AsgElectronRingerSelector.h"
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
MsgStream msg("testRead");
#endif
diff --git a/PhysicsAnalysis/RingerSelectorTools/util/testWrite.cxx b/PhysicsAnalysis/RingerSelectorTools/util/testWrite.cxx
index f04b806f52180ecf5afc0a3cf248c51741bead09..cf804d9706b39f025d5101bb2d803c7fee7104f9 100644
--- a/PhysicsAnalysis/RingerSelectorTools/util/testWrite.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/util/testWrite.cxx
@@ -35,7 +35,7 @@ Ringer::AsgElectronRingerSelector __AsgRingerSel__("testWrite");
MsgStream &msg = __AsgRingerSel__.msg();
#else
#include "RingerSelectorTools/AsgElectronRingerSelector.h"
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
MsgStream msg("testWrite");
#endif
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/src/TauAnalysisToolsExampleAthena.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/src/TauAnalysisToolsExampleAthena.cxx
index 1ba23c7ad51f191060c9cea6128a8de74847f4e0..f705e02402b6ac83a6d6a02e38c76bc6f5682167 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/src/TauAnalysisToolsExampleAthena.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/src/TauAnalysisToolsExampleAthena.cxx
@@ -71,11 +71,11 @@ StatusCode TauAnalysisToolsExampleAthena::execute()
tau = new xAOD::TauJet();
tau->makePrivateStore( **tau_itr );
- m_effTool->applyEfficiencyScaleFactor(*tau);
+ ATH_CHECK (m_effTool->applyEfficiencyScaleFactor(*tau));
ATH_MSG_INFO( " sf = " << tau->auxdata< double >( "TauScaleFactorJetID" ) );
- m_smearTool->applyCorrection(*tau);
+ ATH_CHECK (m_smearTool->applyCorrection(*tau));
ATH_MSG_INFO( "Unsmeared tau pt " << tau->pt() << " Smeared tau pt: " << tau->p4().Pt());
}
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
index adfe484461b5894946b6d84cdff565d520d09997..576cfbf840cc49fc0cafa8192dab5e46600cb865 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
@@ -13,7 +13,7 @@
#include "POOLRootAccess/TEvent.h" //event looping
#include "GaudiKernel/ToolHandle.h" //for better working with tools
-#include "AsgTools/MessageCheck.h" //messaging
+#include "AsgMessaging/MessageCheck.h" //messaging
using namespace asg::msgUserCode; //messaging
//ROOT includes
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx
index 9dcb4fd03f12696d59330a4a852161df6ddbb842..3bfe9af4e9e103647638674b13bc970811e32afd 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx
@@ -365,7 +365,7 @@ int main( int argc, char* argv[] )
// }
}
if (xTauJetContainer->empty())
- T2MT.retrieveTruthTaus();
+ CHECK (T2MT.retrieveTruthTaus());
xEvent.fill();
}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/test/McParticleUtils.sh b/PhysicsAnalysis/TruthParticleID/McParticleUtils/test/McParticleUtils.sh
deleted file mode 100755
index 408b03eebb4fa5c104e7a833e923eeeb8a446a17..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/test/McParticleUtils.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# This just selects the directory to run cmt commands
-# But with project builds and as this package (McParticleUtils) can be moved
-# from some project to another, we wildcard the AtlasXyzRelease directory
-cd ${NIGHTLYAREA}/Atlas*Release/cmt
-#
-cmt broadcast -select=McParticleUtils make CppUnit
-stat=$?
-if [ "$stat" != "0" ]; then
- echo " -------------------------------- "
- echo " FAILURE : test McParticleUtils "
- echo " -------------------------------- "
-fi
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/test/McVtxFilterTest_CppUnit.cxx b/PhysicsAnalysis/TruthParticleID/McParticleUtils/test/McVtxFilterTest_CppUnit.cxx
index f205bc92ffaef5f81966b0844caff46ba536a1dd..ed34b698b8977e574466a222b50283ba5804c38f 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/test/McVtxFilterTest_CppUnit.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/test/McVtxFilterTest_CppUnit.cxx
@@ -66,7 +66,9 @@ public:
{
const int signalProcessId = 1000082;
const int evtNbr = 1;
- m_evt = new HepMC::GenEvent( signalProcessId, evtNbr );
+ m_evt = new HepMC::GenEvent();
+ HepMC::set_signal_process_id(m_evt,signalProcessId);
+ m_evt->set_event_number(evtNbr );
m_evt->set_event_scale( -1 );
m_evt->set_alphaQCD( -1 );
m_evt->set_alphaQED( -1 );
@@ -81,29 +83,29 @@ public:
m_evt->set_random_states( rdmStates );
// Add 2 vertices
- HepMC::GenVertex * v1 = new HepMC::GenVertex();
+ HepMC::GenVertexPtr v1 = HepMC::newGenVertexPtr();
m_evt->add_vertex( v1 );
- v1->add_particle_in( new HepMC::GenParticle( HLV_t(0,0,
+ v1->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector(0,0,
7000*GeV,
7000*GeV),
2212, 3 ) );
- HepMC::GenVertex* v2 = new HepMC::GenVertex;
+ HepMC::GenVertexPtr v2 = HepMC::newGenVertexPtr();
m_evt->add_vertex( v2 );
- v2->add_particle_in( new HepMC::GenParticle( HLV_t(0,0,
+ v2->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector(0,0,
-7000*GeV,
+7000*GeV),
2212, 3 ) );
//
// create the outgoing particles of v1 and v2
- HepMC::GenParticle* p3 =
- new HepMC::GenParticle( HLV_t(.750*GeV,
+ HepMC::GenParticlePtr p3 =
+ HepMC::newGenParticlePtr( HepMC::FourVector(.750*GeV,
-1.569*GeV,
32.191*GeV,
32.238*GeV), 1, 3 );
v1->add_particle_out( p3 );
- HepMC::GenParticle* p4 =
- new HepMC::GenParticle( HLV_t( -3.047*GeV,
+ HepMC::GenParticlePtr p4 =
+ HepMC::newGenParticlePtr( HepMC::FourVector( -3.047*GeV,
-19.*GeV,
-54.629*GeV,
57.920*GeV), -2, 3 );
@@ -111,16 +113,16 @@ public:
//
// create v3
- HepMC::GenVertex* v3 = new HepMC::GenVertex();
+ HepMC::GenVertexPtr v3 = HepMC::newGenVertexPtr();
m_evt->add_vertex( v3 );
v3->add_particle_in( p3 );
v3->add_particle_in( p4 );
v3->add_particle_out(
- new HepMC::GenParticle( HLV_t(-3.813,0.113,-1.833,4.233 ),
+ HepMC::newGenParticlePtr( HepMC::FourVector(-3.813,0.113,-1.833,4.233 ),
22, 1 )
);
- HepMC::GenParticle* p5 =
- new HepMC::GenParticle( HLV_t(1.517,-20.68,-20.605,85.925),
+ HepMC::GenParticlePtr p5 =
+ HepMC::newGenParticlePtr( HepMC::FourVector(1.517,-20.68,-20.605,85.925),
-24,3);
v3->add_particle_out( p5 );
@@ -134,39 +136,39 @@ public:
HepMC::GenVertex * vZgee = new HepMC::GenVertex;
m_evt->add_vertex( vZgee );
// Z0
- vZgee->add_particle_in( new HepMC::GenParticle( HLV_t( -4.49e+04,
+ vZgee->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( -4.49e+04,
+8.36e+03,
-2.70e+05,
+2.89e+05 ),
23, 2 ) );
// Gammas
- vZgee->add_particle_out( new HepMC::GenParticle( HLV_t( -1.28e+03,
+ vZgee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -1.28e+03,
+1.03e+03,
-5.47e+03,
+5.71e+03 ),
22, 1 ) );
- vZgee->add_particle_out( new HepMC::GenParticle( HLV_t( +3.89e+02,
+ vZgee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( +3.89e+02,
-3.16e+02,
-6.69e+03,
+6.70e+03 ),
22, 1 ) );
- vZgee->add_particle_out( new HepMC::GenParticle( HLV_t( +7.34e+00,
+ vZgee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( +7.34e+00,
-2.71e+01,
-4.12e+01,
+4.98e+01 ),
22, 1 ) );
- vZgee->add_particle_out( new HepMC::GenParticle( HLV_t( -1.36e+02,
+ vZgee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -1.36e+02,
+9.38e+01,
-5.62e+02,
+5.86e+02 ),
22, 1 ) );
// Electrons
- vZgee->add_particle_out( new HepMC::GenParticle( HLV_t( +8.01e+03,
+ vZgee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( +8.01e+03,
-2.96e+04,
-4.50e+04,
+5.44e+04 ),
-11, 1 ) );
- vZgee->add_particle_out( new HepMC::GenParticle( HLV_t( -5.19e+04,
+ vZgee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -5.19e+04,
+3.72e+04,
-2.13e+05,
+2.22e+05 ),
@@ -176,20 +178,20 @@ public:
//
// Add a Z->e+e-
- HepMC::GenVertex * vZee = new HepMC::GenVertex;
+ HepMC::GenVertexPtr vZee = HepMC::newGenVertexPtr();
m_evt->add_vertex( vZee );
- vZee->add_particle_in( new HepMC::GenParticle( HLV_t( +7.29e+03,
+ vZee->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( +7.29e+03,
+2.34e+04,
+2.81e+05,
+2.96e+05 ),
23, 2 ) );
- vZee->add_particle_out( new HepMC::GenParticle( HLV_t( +2.74e+04,
+ vZee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( +2.74e+04,
-1.83e+04,
+4.70e+04,
+5.74e+04 ),
11, 1 ) );
- vZee->add_particle_out( new HepMC::GenParticle( HLV_t( -2.01e+04,
+ vZee->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -2.01e+04,
+4.17e+04,
+2.34e+05,
+2.38e+05 ),
@@ -198,32 +200,32 @@ public:
//
// Add a t->W+bgg
- HepMC::GenVertex * vtWbgg = new HepMC::GenVertex;
+ HepMC::GenVertexPtr vtWbgg = HepMC::newGenVertexPtr();
m_evt->add_vertex( vtWbgg );
// top
- vtWbgg->add_particle_in(new HepMC::GenParticle(HLV_t(-2.35e+05,
+ vtWbgg->add_particle_in(HepMC::newGenParticlePtr(HLV_t(-2.35e+05,
+7.34e+04,
+3.60e+04,
+3.04e+05),
6, 3 ) );
// Wbgg
- vtWbgg->add_particle_out(new HepMC::GenParticle(HLV_t(-1.09e+05,
+ vtWbgg->add_particle_out(HepMC::newGenParticlePtr(HLV_t(-1.09e+05,
+6.99e+04,
-3.86e+04,
+1.57e+05),
24, 2 ) );
- vtWbgg->add_particle_out(new HepMC::GenParticle(HLV_t(-9.23e+04,
+ vtWbgg->add_particle_out(HepMC::newGenParticlePtr(HLV_t(-9.23e+04,
+2.54e+03,
+5.32e+04,
+1.07e+05),
5, 2 ) );
- vtWbgg->add_particle_out(new HepMC::GenParticle(HLV_t(-4.76e+03,
+ vtWbgg->add_particle_out(HepMC::newGenParticlePtr(HLV_t(-4.76e+03,
+6.72e+02,
+2.90e+03,
+5.62e+03),
21, 2 ) );
- vtWbgg->add_particle_out(new HepMC::GenParticle(HLV_t(-2.93e+04,
+ vtWbgg->add_particle_out(HepMC::newGenParticlePtr(HLV_t(-2.93e+04,
+2.13e+02,
+1.85e+04,
+3.46e+04),
@@ -457,14 +459,14 @@ public:
/// Test full vtx
void testFullVtx()
{
- HepMC::GenVertex * vtx = new HepMC::GenVertex;
+ HepMC::GenVertexPtr vtx = HepMC::newGenVertexPtr();
m_evt->add_vertex( vtx );
- vtx->add_particle_in( new HepMC::GenParticle( HLV_t( -2.45e+04,
+ vtx->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( -2.45e+04,
+1.88e+04,
-8.65e+05,
+8.65e+05 ),
22, 3 ) );
- vtx->add_particle_out( new HepMC::GenParticle( HLV_t( -2.45e+04,
+ vtx->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -2.45e+04,
+1.88e+04,
-8.65e+05,
+8.65e+05 ),
@@ -507,7 +509,7 @@ public:
McVtxFilter filter;
filter.setDecayPattern( "23 -> -11 + 11" );
- const HepMC::GenVertex * vtx = m_evt->barcode_to_vertex(m_bcZee);
+ auto vtx = HepMC::barcode_to_vertex(m_evt,m_bcZee);
CPPUNIT_ASSERT( 0 != vtx );
CPPUNIT_ASSERT( filter.isAccepted(vtx) );
@@ -544,7 +546,7 @@ public:
/// Test some vertices
void testTopWbggVertices()
{
- const HepMC::GenVertex * vtx = m_evt->barcode_to_vertex(m_bcTopWbgg);
+ auto vtx = HepMC::barcode_to_vertex(m_evt,m_bcTopWbgg);
CPPUNIT_ASSERT( 0 != vtx );
{
@@ -573,20 +575,20 @@ public:
void testWlnuVertices()
{
- HepMC::GenVertex * vtx = new HepMC::GenVertex;
+ HepMC::GenVertexPtr vtx = HepMC::newGenVertexPtr();
m_evt->add_vertex( vtx );
- vtx->add_particle_in( new HepMC::GenParticle( HLV_t( -6.76e+04,
+ vtx->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( -6.76e+04,
+4.85e+03,
-1.46e+03,
+9.51e+04 ),
-24, 2 ) );
- vtx->add_particle_out( new HepMC::GenParticle( HLV_t( -7.14e+04,
+ vtx->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -7.14e+04,
-6.17e+03,
+1.67e+04,
+7.36e+04 ),
13, 1 ) );
- vtx->add_particle_out( new HepMC::GenParticle( HLV_t( +3.75e+03,
+ vtx->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( +3.75e+03,
+1.10e+04,
-1.81e+04,
+2.15e+04 ),
@@ -625,45 +627,45 @@ GenVertex: -39 ID: 0 (X,cT):0
void testQuarkVertices()
{
// create a b->g+b vertex
- HepMC::GenVertex * vtxgb = new HepMC::GenVertex;
+ HepMC::GenVertexPtr vtxgb = HepMC::newGenVertexPtr();
m_evt->add_vertex( vtxgb );
- vtxgb->add_particle_in( new HepMC::GenParticle( HLV_t( -3.21e+04,
+ vtxgb->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( -3.21e+04,
-6.19e+03,
+5.05e+04,
+6.38e+04 ),
-5, 2 ) );
- vtxgb->add_particle_out( new HepMC::GenParticle( HLV_t( -1.29e+04,
+ vtxgb->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -1.29e+04,
+1.12e+03,
+3.50e+04,
+3.77e+04 ),
-5, 2 ) );
- vtxgb->add_particle_out( new HepMC::GenParticle( HLV_t( -1.92e+04,
+ vtxgb->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -1.92e+04,
-7.30e+03,
+1.55e+04,
+2.61e+04 ),
21, 2 ) );
// create a gg->b+bbar vertex
- HepMC::GenVertex * vtxbb = new HepMC::GenVertex;
+ HepMC::GenVertex * vtxbb = HepMC::newGenVertexPtr();
m_evt->add_vertex( vtxbb );
- vtxbb->add_particle_in( new HepMC::GenParticle( HLV_t( +1.23e+04,
+ vtxbb->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( +1.23e+04,
-4.79e+03,
+6.52e+04,
+6.65e+04 ),
21, 3 ) );
- vtxbb->add_particle_in( new HepMC::GenParticle( HLV_t( +1.14e+02,
+ vtxbb->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( +1.14e+02,
+1.35e+04,
-6.42e+04,
+6.56e+04 ),
21, 3 ) );
- vtxbb->add_particle_out( new HepMC::GenParticle( HLV_t( +4.56e+04,
+ vtxbb->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( +4.56e+04,
+1.53e+04,
-5.08e+04,
+7.01e+04 ),
5, 3 ) );
- vtxbb->add_particle_out( new HepMC::GenParticle( HLV_t( -3.32e+04,
+ vtxbb->add_particle_out( HepMC::newGenParticlePtr( HepMC::FourVector( -3.32e+04,
-6.56e+03,
+5.18e+04,
+6.20e+04 ),
@@ -703,15 +705,15 @@ GenVertex: -39 ID: 0 (X,cT):0
/// Test Stable particles (no end_vertex)
void testStableParticle()
{
- HepMC::GenVertex * vtx = new HepMC::GenVertex;
+ HepMC::GenVertexPtr vtx = HepMC::newGenVertexPtr();
m_evt->add_vertex( vtx );
- vtx->add_particle_in( new HepMC::GenParticle( HLV_t( -2.45e+04,
+ vtx->add_particle_in( HepMC::newGenParticlePtr( HepMC::FourVector( -2.45e+04,
+1.88e+04,
-8.65e+05,
+8.65e+05 ),
23, 3 ) );
HepMC::GenParticle * photon = 0;
- photon = new HepMC::GenParticle( HLV_t( -2.45e+04,
+ photon = HepMC::newGenParticlePtr( HepMC::FourVector( -2.45e+04,
+1.88e+04,
-8.65e+05,
+8.65e+05 ),
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 042f340bf18b8af525eeaecc7d293a0ff82af286..d9419a10e2c756a416c2058fbbb31a696937be9b 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.78
+AnalysisBaseExternalsVersion = 2.0.80
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index f3cc47a2acbc95d1e8a8293816990a7738d6d134..6c7c2e836e82bf94d99461e507bbdfd51c0b8b30 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -2,17 +2,6 @@
# Packages to build as part of AnalysisBase:
#
-# These packages were picked up by patterns below, but don't compile
-# in AnalysisBase yet. Most likely these are packages that still need
-# to be fixed up. These lines should either be removed as the
-# packages get fixed up, or moved to the main list if these packages
-# are not intended for analysis.
-
-- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
-- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
-
-
-
# these packages existed in 21.2, but no longer exist in master.
# remove these lines if you are confident that these packages have
# been retired.
diff --git a/Projects/AnalysisBase/version.txt b/Projects/AnalysisBase/version.txt
index c0b885324f71e1eac612d6a61c4f01370140ddca..44e031ba9ba43444a4a4413b5755e21a977f3470 100644
--- a/Projects/AnalysisBase/version.txt
+++ b/Projects/AnalysisBase/version.txt
@@ -1 +1 @@
-22.0.18
+22.2.0
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index d94fd24c8789a0c18e1805194484772a1ec2be21..a2864e7a31e27bbc6ff6954b62a103a5e4d9c1c1 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
-AtlasExternalsVersion = 2.0.78
+AtlasExternalsVersion = 2.0.80
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index 9e3fc448673e196c76123f63660a76eb7c81e22d..a292c3838aa945ef29f9b9df92172cd6044809f8 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.78
+AthGenerationExternalsVersion = 2.0.80
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.004
+GaudiVersion = v34r0.005
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index cc1aa0a4b08c847adeea2bd5f11f4035b750cc5a..7cf39f8d516e69c0c82af585404c76bacd9622f3 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.78
+AthSimulationExternalsVersion = 2.0.80
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.004
+GaudiVersion = v34r0.005
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 9e7ac7acb89a71d11350e45723d7d3445a65d656..717087ee48431922fed2224e5f36c3f75da10df4 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -144,6 +144,8 @@
+ Event/xAOD/xAODCoreAthenaPool
+ Event/xAOD/xAODCoreCnv
+ Event/xAOD/xAODEventFormat
++ Event/xAOD/xAODEventFormatAthenaPool
++ Event/xAOD/xAODEventFormatCnv
+ Event/xAOD/xAODEventInfo
+ Event/xAOD/xAODEventInfoAthenaPool
+ Event/xAOD/xAODEventInfoCnv
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 7955b584ecacbf2f3a4b1c076dd37ae7af813849..6d393e4147f4f29261d488a41bbdbfe8e79f8764 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.78
+AthenaExternalsVersion = 2.0.80
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.004
+GaudiVersion = v34r0.005
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index 9a10110a4df8d70642210e464d02531b5a417ef4..dd4978a56e770aa338c71f69a32825bff8def876 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -19,7 +19,6 @@
# Temporary VP1 compilation issues
- graphics/VP1/VP1Systems/VP1TriggerSystems
-- graphics/VP1/VP1Systems/VP12DGeometrySystems
- graphics/VP1/VP1Systems/VP1MCSystems
- graphics/VP1/VP1Systems/VP1TriggerDecisionSystems
+ graphics/VP1/.*
@@ -38,7 +37,6 @@
- PhysicsAnalysis/D3PDTools/MultiDraw
- PhysicsAnalysis/D3PDTools/SampleHandler
- PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection
-- PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection
- PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
- PhysicsAnalysis/JetPhys/SemileptonicCorr
- PhysicsAnalysis/SUSYPhys/SUSYTools
@@ -64,4 +62,3 @@
# Old packages that don't work with AthenaMT
- LArCalorimeter/LArSim
- PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils
-
diff --git a/Projects/Athena/version.txt b/Projects/Athena/version.txt
index c0b885324f71e1eac612d6a61c4f01370140ddca..e7efe3421ba225a99d20587239c44dea5f11e0db 100644
--- a/Projects/Athena/version.txt
+++ b/Projects/Athena/version.txt
@@ -1 +1 @@
-22.0.18
+22.0.19
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 52c304c08b24d3e66e59e3e191e71fba3b576148..88576ad8aa72b507a5965019fe5267165eaa0bed 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.78
+VP1LightExternalsVersion = 2.0.80
diff --git a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
index 8d419d0281c61eab7d2594460e0abbbdc53ded7c..eecaa96de3b5304889fab734672e53056199464d 100644
--- a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
+++ b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
@@ -160,7 +160,8 @@ def getJetCalibToolPrereqs(modspec,jetdef):
prereqs = []
prereqs.append("mod:ConstitFourMom")
if "JetArea" in calibseq: # Will not insert a prefix here
- prereqs.append("input:EventDensity")
+ if calibcontext.startswith("Trig"): prereqs.append("input:HLT_EventDensity")
+ else: prereqs.append("input:EventDensity")
if "GSC" in calibseq:
prereqs += ["mod:CaloEnergies"]
if calibcontext != "TrigRun2": # No track/MS GSC for trigger w/o FTK
diff --git a/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx b/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
index 9f5b17169784b648fd367c8e144c83e27ef249da..9dee8c4636c7e5c025ea53b01d366694e046116a 100644
--- a/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
+++ b/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
@@ -25,7 +25,7 @@
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/TEvent.h"
#include "xAODRootAccess/TStore.h"
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
#else
#include "POOLRootAccess/TEvent.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py b/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py
index 28628be137b85d0a44e8032d57b70437839719b3..dd0b7083e55c2e4b29e3b265d31dd5b8ad1a2756 100644
--- a/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py
+++ b/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py
@@ -74,7 +74,7 @@ def getConstitFourMomTool(jetdef):
cfourmom = CompFactory.JetConstitFourMomTool("constitfourmom_{0}".format(jetdef.basename))
if "LCTopo" in jetdef.basename or "EMTopo" in jetdef.basename:
cfourmom.JetScaleNames = ["DetectorEtaPhi"]
- if "HLT_" in jetdef.inputdef.inputname:
+ if "HLT_" in jetdef.fullname():
cfourmom.AltConstitColls = [""]
cfourmom.AltConstitScales = [0]
cfourmom.AltJetScales = ["JetConstitScaleMomentum"]
@@ -104,6 +104,7 @@ def getJVFTool(modspec=""):
TrackParticleContainer = trackcollectionmap[modspec]["Tracks"],
TrackSelector = jettrackselloose,
)
+ print('aaaa', modspec, jvf.VertexContainer)
return jvf
diff --git a/Reconstruction/Jet/JetMonitoring/CMakeLists.txt b/Reconstruction/Jet/JetMonitoring/CMakeLists.txt
index 6ef9d0c3051a5653820c291991c68ca7d1969c24..e577342bc483726b36b1d1e17a41533fb9b93da8 100644
--- a/Reconstruction/Jet/JetMonitoring/CMakeLists.txt
+++ b/Reconstruction/Jet/JetMonitoring/CMakeLists.txt
@@ -24,6 +24,13 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+atlas_add_library( JetMonitoringLib
+ JetMonitoring/*.h
+ INTERFACE
+ PUBLIC_HEADERS JetMonitoring
+ LINK_LIBRARIES xAODJet GaudiKernel AthenaMonitoringLib )
+
+
# Component(s) in the package:
atlas_add_component( JetMonitoring
src/*.cxx
diff --git a/Reconstruction/Jet/JetMonitoring/src/JetMonitoringAlg.cxx b/Reconstruction/Jet/JetMonitoring/src/JetMonitoringAlg.cxx
index 7d4f2ef4ab7b28251dee4f1be06fdbb879787cd3..39b27484ecda7bf4027fa82a7e5dca16d1958e3c 100644
--- a/Reconstruction/Jet/JetMonitoring/src/JetMonitoringAlg.cxx
+++ b/Reconstruction/Jet/JetMonitoring/src/JetMonitoringAlg.cxx
@@ -52,7 +52,7 @@ StatusCode JetMonitoringAlg::fillHistograms( const EventContext& ctx ) const {
const xAOD::Jet *trigjet = dynamic_cast<const xAOD::Jet*>(*j);
tmpList.push_back( trigjet );
}
- auto sort = [this] (const xAOD::Jet * j1, const xAOD::Jet * j2) {return j1->p4().Et() > j2->p4().Et(); } ;
+ auto sort = [] (const xAOD::Jet * j1, const xAOD::Jet * j2) {return j1->p4().Et() > j2->p4().Et(); } ;
tmpList.sort( sort );
ConstDataVector< xAOD::JetContainer > tmpCont(SG::VIEW_ELEMENTS);
for(const xAOD::Jet* jet : tmpList ) tmpCont.push_back(jet);
diff --git a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
index 5a1750857ffcf48949bc0eea67a82c3d7728f32a..d1b4f4ac84ed3d97fde527e4bc6ef93c5f775bda 100644
--- a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
+++ b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
@@ -1,11 +1,12 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-########################################################################
-# #
-# ConstModUtils: A module for configuring constituent modifiers #
-# Author: TJ Khoo #
-# #
-########################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+"""
+ #
+ConstModUtils: A module for configuring constituent modifiers #
+Author: TJ Khoo #
+ #
+"""
+
import cppyy
try:
cppyy.load_library('libxAODBaseObjectTypeDict')
@@ -19,86 +20,121 @@ constmodlog = Logging.logging.getLogger('ConstModHelpers')
from AthenaConfiguration.ComponentFactory import CompFactory
-# Tool types and configs can be expanded if the user
-# wishes to add their own custom definitions
-
-# Maybe we need a config class in JetDefinition?
-ConstModTools = {
- # Topoclusters
- "Origin": CompFactory.CaloClusterConstituentsOrigin,
- "EM": CompFactory.ClusterAtEMScaleTool,
- # Particle flow
- "CorrectPFO":
- CompFactory.CorrectPFOTool,
- "CHS": CompFactory.ChargedHadronSubtractionTool,
- # Pileup suppression
- "Vor": CompFactory.VoronoiWeightTool,
- "CS": CompFactory.ConstituentSubtractorTool,
- "SK": CompFactory.SoftKillerWeightTool
-}
-
-ConstModConfigs = {
- # Topoclusters
- "Origin": {},
- "EM": {},
- # Particle flow
- "CorrectPFO":
- {"WeightPFOTool": CompFactory.getComp("CP::WeightPFOTool")("weightPFO")},
- "CHS": {},
- # Pileup suppression
- "Vor": {"doSpread":False, "nSigma":0},
- "CS": {"MaxEta":5.},
- "SK": {}
-}
-
-def getConstitModAlg(constit,suffix="",tvaKey="JetTrackVtxAssoc",vtxKey="PrimaryVertices",monTool=None):
- inputtype = constit.basetype
- # Need to extend to TCC
- if inputtype not in [xAODType.CaloCluster, xAODType.ParticleFlow]:
- constmodlog.error("Only ParticleFlow and CaloCluster currently supported!")
- raise TypeError("Unsupported input type {0}".format(inputtype))
+from .StandardJetConstits import jetconstitdic, jetinputdefdic, jetconstitmoddic
+from .JetDefinition import JetConstitSeq, JetInputDef, JetConstitSource
+
+class _dummyJetDef:
+ def __init__(self):
+ self._prereqDic = {}
+ self._prereqOrder = []
+
+
+def aliasToInputDef(alias, parentjetdef=None):
+ """convert a string alias to a full config object, either a JetConstitSeq or a JetInputDef according to the alias.
+
+ This also recursively translate all aliases which are dependencies of this aliases. All these dependencies are
+ collected into the 'parentjetdef' (JetDefinition ).
+ """
+ parentjetdef = parentjetdef or _dummyJetDef()
+ # ----------------
+ # support the cases where alias is not a string but directly a config object
+ if isinstance(alias, JetConstitSource):
+ instantiateJetConstitAliases(alias, parentjetdef)
+ return alias
+ if isinstance(alias, JetInputDef):
+ instantiateJetInputDefAliases(alias, parentjetdef)
+ return alias
+
+ # else assume it's a string
+
+ if alias in jetinputdefdic:
+ inputdef = jetinputdefdic[alias].clone()
+ instantiateJetInputDefAliases(inputdef, parentjetdef)
+ return inputdef
+ else:
+ constitseq = jetconstitdic[alias].clone( )
+ instantiateJetConstitAliases(constitseq, parentjetdef)
+ return constitseq
+
+def instantiateJetConstitAliases(constitseq, parentjetdef):
+ """Reccursively translate all aliases appearing in the prereqs of constitseq into proper config objects.
+ All are collected into the parentjetdef for which this JetConstitSeq is being configured.
+ Then instantiates all aliases for JetConstitModifier
+ """
+
+ # we technically need a JetInputDef for constitseq.inputname : conveniently declare it if not existing :
+ jetinputdefdic.setdefault( constitseq.inputname, JetInputDef( constitseq.inputname, constitseq.basetype) )
+ # we re-use the instantiateJetInputDefAliases to instantiate the prereqs
+ instantiateJetInputDefAliases( constitseq, parentjetdef,pre_prereqs=['input:'+constitseq.inputname])
+
+ # JetConstitSource don't have modifiers, we can return immediately
+ if not hasattr( constitseq, "modifiers") : return
+
+ # instantiate the JetConstitModifier (those don't have dependencies)
+ for mod in constitseq.modifiers:
+ modInstance = jetconstitmoddic[ mod ].clone()
+ constitseq._instanceMap[mod] = modInstance
+
+def instantiateJetInputDefAliases(jetinputdef, parentjetdef, pre_prereqs=[]):
+ """Reccursively translate all aliases appearing in the prereqs of jetinputdef into proper config objects.
+ All are collected into the parentjetdef for which this JetConstitSeq is being configured.
+ """
+ prereqs = jetinputdef.prereqs(parentjetdef) if callable(jetinputdef.prereqs) else jetinputdef.prereqs
+ prereqs = pre_prereqs + prereqs
+ for prereq in prereqs :
+ reqInstance = parentjetdef._prereqDic.get( prereq, None)
+ if reqInstance is None:
+ _ , inputkey = prereq.split(':') # always in the form "input:XXX"
+ reqInstance = aliasToInputDef(inputkey, parentjetdef)
+ parentjetdef._prereqDic[prereq] = reqInstance
+ parentjetdef._prereqOrder.append(prereq)
+
+
- sequence = list(constit.modifiers) # Copy, as we may make some additions
- typename = {xAODType.CaloCluster: "TopoCluster",
- xAODType.ParticleFlow: "EMPFlow"
- }[inputtype]
- if inputtype == xAODType.ParticleFlow:
- # Always do 4mom corrections first and CHS last
- sequence = ["CorrectPFO"] + sequence + ["CHS"]
- # If no mods are needed, don't give back a tool
- if sequence == []: return None
+def getConstitModAlg(constit, monTool=None):
+ """returns a configured JetConstituentModSequence or None if constit.modifiers == [] """
+
+ # JetConstitSource do not need any JetConstituentModSequence
+ # (they are only needed to trigger the building of the source container and a PJ algo)
+ if not isinstance(constit, JetConstitSeq): return
+
+ inputtype = constit.basetype
+
+ sequence = constit.modifiers
+
modlist = []
+
+ #if modlist == []: return
+ if constit.inputname == constit.containername: return
+
for step in sequence:
- if step == "LC":
- continue # Nothing to do for LC clusters
- tool = None
-
- toolname = "ConstitMod{0}_{1}{2}".format(typename,step,suffix)
- tool = ConstModTools[step](toolname,**ConstModConfigs[step])
-
- # May want to set also for cluster origin correction
- # but so far unused
- if step=="CorrectPFO":
- tool.VertexContainerKey = vtxKey
- if step=="CHS":
- tool.TrackVertexAssociation = tvaKey
- tool.VertexContainerKey = vtxKey
+ modInstance = constit._instanceMap[ step ]
+ if not modInstance.tooltype: continue
+
+ toolclass = getattr( CompFactory, modInstance.tooltype)
+
+ # update the properties : if some of them are function, just replace by calling this func :
+ for k,v in modInstance.properties.items():
+ if callable(v) :
+ modInstance.properties[k ] = v( constit )
- if inputtype == xAODType.ParticleFlow and step not in ["CorrectPFO","CHS"]:
+ tool = toolclass(modInstance.name,**modInstance.properties)
+
+ if inputtype == xAODType.ParticleFlow and modInstance.tooltype not in ["CorrectPFOTool","ChargedHadronSubtractionTool"]:
tool.IgnoreChargedPFO=True
tool.ApplyToChargedPFO=False
tool.InputType = inputtype
modlist.append(tool)
sequenceshort = "".join(sequence)
- seqname = "ConstitMod{0}_{1}{2}".format(sequenceshort,typename,suffix)
- inputcontainer = str(constit.rawname)
- outputcontainer = str(constit.inputname)
+ seqname = "ConstitMod{0}_{1}".format(sequenceshort,constit.name)
+ inputcontainer = str(constit.inputname)
+ outputcontainer = str(constit.containername)
if inputtype==xAODType.ParticleFlow:
# Tweak PF names because ConstModSequence needs to work with
# up to 4 containers
@@ -111,14 +147,45 @@ def getConstitModAlg(constit,suffix="",tvaKey="JetTrackVtxAssoc",vtxKey="Primary
outputcontainer = chopPFO(outputcontainer)
modseq = CompFactory.JetConstituentModSequence(seqname,
- InputType=inputtype,
- OutputContainer = outputcontainer,
- InputContainer= inputcontainer,
- Modifiers = modlist,
- MonTool = monTool
+ InputType=inputtype,
+ OutputContainer = outputcontainer,
+ InputContainer= inputcontainer,
+ Modifiers = modlist,
+ MonTool = monTool,
)
constitmodalg = CompFactory.JetAlgorithm("jetalg_{0}".format(modseq.getName()))
constitmodalg.Tools = [modseq]
return constitmodalg
+
+
+
+
+
+def constitModWithAlternateTrk(mod, trkopt):
+ """Generates a new JetConstitModifier cloned from mod and stores it in the standard jetconstitmoddic.
+ The cloned JetConstitModifier has all its track related properties changed according to trackcollectionmap[trkopt]
+ This is mainly useful to configure trigger algs.
+ """
+ from JetRecTools.JetRecToolsConfig import trackcollectionmap
+ from JetRecConfig.StandardJetConstits import jetconstitmoddic
+ newmod = mod+trkopt
+
+ if newmod in jetconstitmoddic:
+ return jetconstitmoddic[newmod]
+
+ newmodInstance = jetconstitmoddic[mod].clone()
+
+ trackproperties = trackcollectionmap[trkopt]
+
+ if mod == "CorrectPFO":
+ newmodInstance.properties.update(VertexContainerKey=trackproperties["Vertices"])
+ elif mod=="CHS":
+ newmodInstance.properties.update(VertexContainerKey=trackproperties["Vertices"],
+ TrackVertexAssociation=trackproperties["TVA"])
+ jetconstitmoddic[newmod] = newmodInstance
+
+ return newmodInstance
+
+
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py b/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
index cdfafdd6e15595914a9db2dc14f777a17753ed09..b762ff297842b864349f9ce082c153b932f3a04d 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
@@ -1,19 +1,21 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-########################################################################
-# #
-# JetDefinition: A module for classes encoding definitions of jets and #
-# related objects for configuring jet reconstruction #
-# Author: TJ Khoo #
-# #
-########################################################################
+"""
+
+JetDefinition: A module for classes encoding definitions of jets and
+related objects for configuring jet reconstruction
+
+Author: TJ Khoo, P-A Delsart
+
+"""
-__all__ = ["JetConstit", "JetGhost", "JetDefinition","xAODType"]
+__all__ = [ "JetDefinition","xAODType", "JetModifier", "JetConstitModifier" , "JetConstitSeq", "JetInputDef"]
from AthenaCommon import Logging
jetlog = Logging.logging.getLogger('JetDefinition')
from xAODBase.xAODType import xAODType
+from .Utilities import make_lproperty, onlyAttributesAreProperties, clonable, make_alias
# Code from JetRecUtils
# define the convention that we write R truncating the decimal point
@@ -36,171 +38,15 @@ def buildJetAlgName(finder, mainParam, variableRMassScale=None, variableRMinRadi
return finder + "VR" + str(int(variableRMassScale/1000)) + "Rmax" + rmaxstr + "Rmin" + rminstr
return finder + formatRvalue(mainParam)
-# A class that defines the type of object used to build a jet
-# Normally defaults to standard offline input containers, but
-# can be overridden.
-class JetConstit(object):
- def __init__(self,
- objtype, # The type of xAOD object from which to build the jets
- modifiers=[], # Modifications to be applied to constituents prior to jet finding
- rawname=None, # Override the default input collection
- inputname=None, # Override the default output collection (not to be used with modifiers)
- prefix=None): # Optional prefix for the inputname (mainly for trigger)
- self.__basetype = objtype
- self.__modifiers = modifiers
- # Override for unmodified container name
- self.__rawname = rawname
- # Override for final container name
- self.__inputname = inputname
- # Prefix for inputname
- self.__prefix = prefix
-
- self.defineLabelAndContainerNames()
- pass
-
- def __hash__(self):
- return hash((self.__basetype,str(self.__modifiers)))
-
- def __eq__(self,rhs):
- return self.__hash__() == rhs.__hash__()
- def __ne__(self,rhs):
- return (not self.__eq__(rhs))
- # Define type and modifiers as properties, with
- # custom setter/getter such that if changed, these
- # force resetting of the label and container name
- @property
- def basetype(self):
- return self.__basetype
- @basetype.setter
- def basetype(self,basetype):
- self.__basetype = basetype
- self.defineLabelAndContainerNames()
-
- @property
- def prefix(self):
- return self.__prefix
-
- @property
- def modifiers(self):
- return self.__modifiers
- @modifiers.setter
- def modifiers(self,modifiers):
- self.__modifiers = modifiers
- self.defineLabelAndContainerNames()
-
- def defineLabelAndContainerNames(self):
- labelnames = {
- xAODType.CaloCluster: "Topo",
- xAODType.ParticleFlow: "EMPFlow",
- xAODType.TrackParticle: "Track",
- xAODType.TruthParticle: "Truth",
- xAODType.TrackCaloCluster: "TrackCaloCluster",
- xAODType.Jet: "Jet",
- }
-
- # Need capability to override label?
- self.label = ""
- self.rawname = ""
- self.inputname = ""
-
- # Truth "modifiers" specify the selection tool config
- # e.g. WZ, WZDressed, DarkHadrons, ...
- # Track "modifiers" specifiy the vertex association
- # Other "modifiers" determine the constit mods e.g.
- # origin correction, PU suppression etc
- # Topoclusters should also specify EM or LC
- # Jets could specify a filter e.g. pt cut or JVT??
- modstring = ""
- if self.__modifiers:
- for mod in self.__modifiers:
- # Handle special case of topocluster state
- if mod in ["EM","LC"]:
- self.label += mod
- else:
- modstring += mod
-
- self.label += labelnames[self.basetype]
- if self.basetype!=xAODType.Jet:
- self.label += modstring
- if self.basetype==xAODType.TruthParticle:
- self.label = self.label.replace("NoWZ","WZ")
-
- containernames = {
- xAODType.CaloCluster: "TopoClusters",
- xAODType.ParticleFlow: "ParticleFlowObjects",
- xAODType.TrackParticle: "JetSelectedTracks",
- xAODType.TruthParticle: "JetInputTruthParticles",
- xAODType.TrackCaloCluster: "TrackCaloClusters",
- xAODType.Jet: "Jets",
- }
- # Sometimes the unmodified container name is longer
- defaultaffixesraw = {
- xAODType.CaloCluster: "CaloCal",
- xAODType.ParticleFlow: "JetETMiss",
- xAODType.TrackCaloCluster: "CombinedAndNeutral",
- }
- # Sometimes the standard contstit container has default mods not in modlist
- defaultaffixesinput = {
- xAODType.ParticleFlow: "CHS",
- }
-
- # User-specified override
- if self.__rawname:
- self.rawname = self.__rawname
- else: # Default to standard container
- if self.basetype in defaultaffixesraw.keys():
- self.rawname = defaultaffixesraw[self.basetype]
- self.rawname += containernames[self.basetype]
-
- # User-specified override
- if self.__inputname:
- self.inputname = self.__inputname
- else: # Default to naming with modifiers if requested, else default container
- if not modstring and self.basetype in defaultaffixesinput.keys():
- modstring = defaultaffixesinput[self.basetype]
- modslast = [xAODType.TruthParticle, xAODType.TrackCaloCluster]
- if self.basetype in modslast:
- self.inputname = containernames[self.basetype]+modstring
- else:
- self.inputname = modstring+containernames[self.basetype]
-
- if self.__prefix:
- self.inputname = self.__prefix+self.inputname
- pass
-
- # Define a string conversion for printing
- def __str__(self):
- return "JetConstit({0}: {1})".format(self.label,self.inputname)
- # Need to override __repr__ for printing in lists etc
- __repr__ = __str__
-
-# Not too clear at this point what other info is needed
-# In principle one might want to state the truth types etc
-class JetGhost(object):
- def __init__(self, inputtype):
- self.inputtype = inputtype
- self.label = "Ghost"+inputtype
- pass
-
- def __hash__(self):
- return hash(self.inputtype)
-
- def __eq__(self,rhs):
- return self.__hash__() == rhs.__hash__()
-
- def __ne__(self,rhs):
- return (not self.__eq__(rhs))
-
- # Define a string conversion for printing
- def __str__(self):
- return "JetGhost(Ghost{0})".format(self.inputtype)
- # Need to override __repr__ for printing in lists etc
- __repr__ = __str__
+def _condAlwaysPass(condflags):
+ return True,""
from AthenaCommon.SystemOfUnits import MeV
+@clonable
+@onlyAttributesAreProperties
class JetDefinition(object):
def __init__(self,
algorithm, # The fastjet clustering algorithm
@@ -210,19 +56,27 @@ class JetDefinition(object):
ptminfilter=5e3*MeV, # The minimum pt to retain xAOD jets after calibration in MeV
ghostdefs=[], # The list of JetGhosts to ghost-associate
modifiers=[], # The list of JetModifiers to execute after jet finding
- extrainputs=[]): # The list of additional input types needed for jet finding
-
+ extrainputs=[], # The list of additional input types needed for jet finding
+ standardRecoMode = False, #
+ prefix = "", # allows to tune the full JetContainer name
+ suffix = "", # allows to tune the full JetContainer name
+ lock = False, # lock the properties of this instance to avoid accidental overwrite after __init__
+ ):
+
+ self._locked = False # unlock during init
# Should add some type checking here
# Could use JetContainerInfo conversion
- self.__algorithm = algorithm
- if self.__algorithm not in ["Kt","AntiKt","CamKt"]:
+ if algorithm not in ["Kt","AntiKt","CamKt"]:
jetlog.error("FastJet algorithm specification was not one of Kt, AntiKt, CamKt!")
raise KeyError("Invalid fastjet algorithm choice: {0}".format(self.algorithm))
-
- self.__radius = radius
- self.__inputdef = inputdef
- self.__defineName()
-
+ self._algorithm = algorithm
+
+ self._radius = radius
+ self._inputdef = inputdef
+ self._prefix = prefix
+ self._suffix = suffix
+ self._defineName()
+
self.ptmin = ptmin # The pt down to which FastJet is run
self.ptminfilter = ptminfilter # The pt above which xAOD::Jets are kept, may include calibration
if ptmin<1000.*MeV or ptminfilter<1000.*MeV:
@@ -232,12 +86,19 @@ class JetDefinition(object):
self.modifiers = modifiers # Tools to modify the jet
self.extrainputs = extrainputs # Any extra input dependencies
+ self.standardRecoMode = standardRecoMode
+
# These should probably go in a derived class
self.VRMinRadius = None
self.VRMassScale = None
- pass
+
+ # used internally to resolve dependencies
+ self._prereqDic = {}
+ self._prereqOrder = []
+ self._locked = lock
+
def __hash__(self):
return hash((self.__radius,self.__inputdef,self.ptmin,self.ptminfilter,str(self.ghostdefs),str(self.modifiers),str(self.extrainputs)))
@@ -250,37 +111,79 @@ class JetDefinition(object):
# Define core attributes as properties, with
# custom setter/getter such that if changed, these
# force resetting of the jet name
- @property
- def algorithm(self):
- return self.__algorithm
- @algorithm.setter
+ @make_lproperty
+ def algorithm(self): pass
+
+ @algorithm.lsetter
def algorithm(self,algorithm):
- self.__algorithm = algorithm
- self.__defineName()
+ self._algorithm = algorithm
+ self._defineName()
- @property
- def radius(self):
- return self.__radius
- @radius.setter
+ @make_lproperty
+ def radius(self): pass
+
+ @radius.lsetter
def radius(self,radius):
- self.__radius = radius
- self.__defineName()
+ self._radius = radius
+ self._defineName()
- @property
- def inputdef(self):
- return self.__inputdef
- @inputdef.setter
+ @make_lproperty
+ def inputdef(self): pass
+
+ @inputdef.lsetter
def inputdef(self,inputdef):
- self.__inputdef = inputdef
- self.__defineName()
-
- def __defineName(self):
- self.basename = buildJetAlgName(self.__algorithm,self.__radius)+self.__inputdef.label
+ self._inputdef = inputdef
+ self._defineName()
+
+ @make_lproperty
+ def prefix(self): pass
+
+ @prefix.lsetter
+ def prefix(self,p):
+ self._prefix = p
+ self._defineName()
+
+ @make_lproperty
+ def suffix(self): pass
+
+ @suffix.lsetter
+ def suffix(self,p):
+ self._suffix = p
+ self._defineName()
+
+ @make_lproperty
+ def basename(self): pass
+
+ @basename.lsetter
+ def basename(self,v):
+ raise Exception("Can NOT set property basename of JetDefinition ",self," Change prefix or suffix instead.")
+
+
+ @make_lproperty
+ def ghostdefs(self): pass
+ @make_lproperty
+ def modifiers(self): pass
+ @make_lproperty
+ def extrainputs(self): pass
+ @make_lproperty
+ def standardRecoMode(self): pass
+
+ @make_lproperty
+ def VRMinRadius(self): pass
+ @make_lproperty
+ def VRMassScale(self): pass
+
+
+ def fullname(self):
+ return self.prefix+self.basename+"Jets"+self.suffix
+
+ def _defineName(self):
+ self._basename = buildJetAlgName(self.algorithm,self.radius)+self.inputdef.label # .label
if self.inputdef.basetype == xAODType.CaloCluster:
# Omit cluster origin correction from jet name
# Keep the origin correction explicit because sometimes we may not
# wish to apply it, whereas PFlow corrections are applied implicitly
- self.basename = self.basename.replace("Origin","")
+ self._basename = self.basename.replace("Origin","")
pass
# Define a string conversion for printing
@@ -291,14 +194,19 @@ class JetDefinition(object):
########################################################################
-# Helper to instantiate a generic jet modifier
-# Tools that typically have more complex properties set should have
-# their own dedicated helper functions defined
+@clonable
+@onlyAttributesAreProperties
class JetModifier(object):
+ """Helper to instantiate a generic jet modifier
+ Tools that typically have more complex properties set should have
+ their own dedicated helper 'createfn' functions defined"""
+
def __init__(self,tooltype,toolname,
- helperfn=None,
- prereqs=[],modspec=None,passJetDef=False):
+ createfn=None,
+ filterfn=_condAlwaysPass,
+ prereqs=[],modspec=None,passJetDef=False,
+ ):
# For the easy cases where no helper function is needed.
# They will be ignored in the case of a helper,
# but are still required such that it's obvious what
@@ -315,10 +223,10 @@ class JetModifier(object):
# modifier, and a ComponentAccumulator instance,
# in case additional supporting tools/services
# need to be set up.
- if helperfn is None:
- self.helperfn = self.getGenericModifier
+ if createfn is None:
+ self.createfn = self.getGenericModifier
else:
- self.helperfn = helperfn
+ self.createfn = createfn
self.modspec = modspec
self.passJetDef = passJetDef
@@ -328,8 +236,35 @@ class JetModifier(object):
# in which case a helper function can be defined.
self.prereqs = prereqs
+ # a function taking a CondFlags as argument and deciding if this JetModifier is compatible
+ # with the conditions.
+ # The function must return a tuple : (bool, "reason of failure")
+ self.filterfn = filterfn
+
+ self._instanceMap = {}
+ #self._locked = lock
+
+
+
+ @make_lproperty
+ def tooltype(self):pass
+ @make_lproperty
+ def toolname(self):pass
+ @make_lproperty
+ def createfn(self):pass
+ @make_lproperty
+ def modspec(self):pass
+ @make_lproperty
+ def passJetDef(self):pass
+ @make_lproperty
+ def prereqs(self):pass
+ @make_lproperty
+ def filterfn(self):pass
+
+
+
def __hash__(self):
- return hash((self.toolname,self.tooltype,self.helperfn.__name__,self.modspec,self.passJetDef,str(self.prereqs)))
+ return hash((self.toolname,self.tooltype,self.createfn.__name__,self.modspec,self.passJetDef,str(self.prereqs)))
def __eq__(self,rhs):
return self.__hash__() == rhs.__hash__()
@@ -348,12 +283,194 @@ class JetModifier(object):
tool = CompFactory.getComp(self.tooltype)(self.toolname)
return tool
- def getPrereqs(self,modspec="",jetdef=None):
- prereqs = []
- if self.prereqs.__class__ == list:
- prereqs += self.prereqs
- else:
- prereqs += self.prereqs(modspec,jetdef)
- jetlog.verbose("Prereqs for {0}: [{1}]".format(self.toolname,", ".join(prereqs)))
- return prereqs
+
+
+########################################################################
+
+@clonable
+@onlyAttributesAreProperties
+class JetInputDef(object):
+ """This describes an input source to jet finding, typically a container build outside the jet domain.
+ Sources can be container of constituents or ghost constituents (ex: clusters, tracks,...) but also
+ other object needed by JetModifier (ex: EventDensity or track-vertex association map).
+
+ Currently this class is mainly here to hold a helper (algoBuilder) function in charge of creating an algorithm to build the source.
+ If this function is None, then we expect the container pre-exists in the evt store.
+
+ Arguments to the constructor :
+ - name : container name in event store
+ - objtype : the xAODType (ex: xAODType.TruthParticle, xAODType.CaloCluster, ...)
+ - algoBuilder [optional] : a function returning a configured algorithm which build the container
+ the function is called as algoBuilder(parentjetdef, specs) where
+ parentjetdef is the JetDefinition for which this input building is called.
+ specs is self.specs
+ If omitted, it is assumed the container pre-exists in the event store.
+ - specs [optional] : a string (or anything) which specifies some options, and passed to the algoBuilder function
+ - filterfn : a function taking a CondFlags as argument and deciding if this JetModifier is compatible
+ with the conditions (same as JetModifier.filterfn )
+ The function must return a tuple : (bool, "reason of failure")
+ - prereqs : a list of prerequisites for this input definition.
+ """
+ def __init__(self, name, objtype, algoBuilder=None, specs=None, filterfn= _condAlwaysPass, prereqs=[]):
+ self.name = name
+ self.basetype = objtype
+ self.algoBuilder = algoBuilder
+ self.specs = specs
+ self.filterfn = filterfn
+ self.prereqs = prereqs
+
+ # # make outputname an alias of name, so JetInputDef shares an interface with JetConstitSeq.
+ # # we set the hidden attribute because the real one is unsettable (see below)
+ # self._outputname = name # Set outputname as an alias to name.
+
+
+ @make_lproperty
+ def name(self): pass
+ @make_lproperty
+ def algoBuilder(self): pass
+ @make_lproperty
+ def basetype(self): pass
+ @make_lproperty
+ def specs(self): pass
+ @make_lproperty
+ def filterfn(self):pass
+ @make_lproperty
+ def prereqs(self):pass
+
+ # make outputname an alias of name so JetInputDef shares an interface with JetConstitSeq.
+ outputname = make_alias("name")
+ # @make_lproperty
+ # def outputname(self): pass
+ # @outputname.setter
+ # def outputname(self,v):
+ # raise Exception("Can not set the 'outputname' attribute of a JetInputDef, set its 'name' instead")
+
+
+########################################################################
+
+@clonable
+@onlyAttributesAreProperties
+class JetConstitModifier(object):
+ """Configuration for a constituent modifier tool to be used in a JetConstituentModSequence.
+ See StandardJetConstits.py for usage of this class.
+
+ the properties argument in __init__ defines directly the properties of the final tool :
+ if the tool has the property "PtMin" then passing 'dict(PtMin=10*GeV)' will result in 'tool.PtMin = 10*GeV'
+ IMPORTANT : If a property is itself an other tool, we can pass a function returning the tool like in 'dict(TheSubTool = mySubToolFunc)'
+ The function will be called only when appropriate in the form 'tool.TheSubTool = mySubToolFunc(constitseq)'
+ """
+ def __init__(self,
+ name,
+ tooltype,
+ properties={}):
+ self.name = name
+ self.tooltype = tooltype
+ self.properties = properties
+
+ @make_lproperty
+ def name(self): pass
+ @make_lproperty
+ def tooltype(self): pass
+ @make_lproperty
+ def properties(self): pass
+
+
+@clonable
+@onlyAttributesAreProperties
+class JetConstitSource(object):
+ """Configuration for simplest constituents (or ghost constituents) to jets.
+ This describes what can be the input to a PseudoJetAlgorithm.
+ The containername attribute must correspond to an existing JetInputDef so the system knows how to build this
+ source container (if necessary).
+ """
+ def __init__(self,
+ name, # identifies this constit source, must be unique.
+ objtype, # The type of xAOD object from which to build the jets
+ containername, # The key of the source container in the event store.
+ prereqs = [], # will contain references to JetInputDef
+ label = None, # used to describe a category for these constits. if None, will default to name
+ filterfn=_condAlwaysPass,
+ lock = False, # lock all properties of this instance
+ ):
+
+ self.name = name
+ self.containername = containername
+ #self.inputname = containername # will act as an alias to containername (and immutable since it's not a property)
+ self.prereqs = prereqs
+ self.label = label or name
+
+ self.basetype = objtype
+ self.filterfn = filterfn
+
+ self._locked = lock
+
+ @make_lproperty
+ def basetype(self): pass
+
+ @make_lproperty
+ def containername(self): pass
+
+ @make_lproperty
+ def prereqs(self): pass
+
+ @make_lproperty
+ def filterfn(self):pass
+
+ # make an alias on containername so JetConstitSource and JetConstitSeq share an interface
+ inputname = make_alias("containername")
+
+@clonable
+@onlyAttributesAreProperties
+class JetConstitSeq(JetConstitSource):
+ """Configuration for JetConstituentModSequence.
+ Describes the constituents which need to be build with a JetConstituentModSequence.
+ Uses a list of aliases to JetConstitModifier to describe the modif steps.
+ """
+ def __init__(self,
+ name,
+ objtype, # The type of xAOD object from which to build the jets
+ modifiers=[], # Modifications to be applied to constituents prior to jet finding
+ inputname=None, # input collection which will be transformed into the source constituents
+ outputname=None, # output collection, will be set to self.containername
+ prereqs = [], # will contain references to JetInputDef
+ label = None,
+ filterfn=_condAlwaysPass,
+ lock = False, # lock all properties of this instance
+ ):
+
+ JetConstitSource.__init__(self,name, objtype, outputname, prereqs=prereqs, filterfn=filterfn,label=label,lock=False, finalinit=False, )
+ self.inputname = inputname or name
+ self.modifiers = modifiers
+
+ self._instanceMap = dict() # internal maps of modifier to actual configuration object
+
+ self._locked = lock
+
+ @make_lproperty
+ def modifiers(self): pass
+
+ @make_lproperty
+ def inputname(self): pass
+ @make_lproperty
+ def label(self): pass
+
+
+
+ def __hash__(self):
+ return hash((self._basetype,str(self._modifiers)))
+
+ def __eq__(self,rhs):
+ return self.__hash__() == rhs.__hash__()
+
+ def __ne__(self,rhs):
+ return (not self.__eq__(rhs))
+
+
+
+ # Define a string conversion for printing
+ def __str__(self):
+ return "JetConstitSeq({0}: {1})".format(self.name,self.inputname)
+ # Need to override __repr__ for printing in lists etc
+ __repr__ = __str__
+
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetGroomConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetGroomConfig.py
index 4c90abb5bccdefdf8ad5c719705dcb5b34b63726..b12202360b7bc2ec715635f66874f1b7303c79d9 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetGroomConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetGroomConfig.py
@@ -13,8 +13,29 @@ jetlog = Logging.logging.getLogger('JetGroomConfig')
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
+import JetRecConfig.JetModConfig as modH
+from JetRecConfig.JetRecConfig import instantiateAliases, buildJetModifierList
+
import six
+
+def instantiateGroomingAliases( groomdef ):
+ """ Instantiate all the modifier aliases contained in this groomdef.
+ At the same time fills the internal _prereqDic and _prereqOrder containers.
+
+ This functions
+ * assumes jetdef is not 'locked'
+ * implies calls to recursives function constH.aliasToInputDef and modH.aliasToModDef
+ """
+
+ instantiateAliases(groomdef.ungroomeddef)
+
+ for mod in groomdef.modifiers:
+ modInstance = modH.aliasToModDef(mod, groomdef)
+ groomdef._prereqDic['mod:'+mod] = modInstance
+ groomdef._prereqOrder.append('mod:'+mod)
+
+
########################################################################
# Get a jet groomer class given a tool name and the grooming definition object
# The pjsin argument is for forwards compatibility when we switch to
@@ -30,7 +51,7 @@ def getJetGroomer(groomdef,pjsin):
# Function for configuring the jet algorithm and groomers, given the
# set of dependencies
#
-def getJetGroomAlg(jetname,groomdef,pjsin,modlist,monTool=None):
+def getJetGroomAlg(jetname,groomdef,pjsin,monTool=None):
jetlog.debug("Configuring JetAlgorithm \"jetalg_{0}\"".format(jetname))
from . import JetRecConfig
@@ -39,16 +60,11 @@ def getJetGroomAlg(jetname,groomdef,pjsin,modlist,monTool=None):
groomer = getJetGroomer(groomdef,pjsin)
groomer.JetBuilder = builder
- from . import JetModConfig
- mods = []
- # Dependency resolution should be done externally
- for moddef,modspec in modlist:
- mod = JetModConfig.getModifier(groomdef,moddef,modspec)
- mods.append(mod)
+ mods = buildJetModifierList(groomdef)
rectool = CompFactory.JetRecTool(jetname,
JetGroomer=groomer,
- InputContainer=groomdef.ungroomedname,
+ InputContainer=groomdef.ungroomeddef.fullname(),
OutputContainer=jetname,
JetPseudojetRetriever=CompFactory.JetPseudojetRetriever("jpjretriever"),
JetModifiers=mods)
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py b/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
index 578e105bdd1e3ab7ab7a5f6003b05c560ff53d75..2d5aa6bdd27811a8fd06a2edd9ca5470f32421a1 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
@@ -11,29 +11,38 @@
__all__ = ["GroomingDefinition","JetTrimming","JetSoftDrop"]
from AthenaCommon import Logging
+from .Utilities import make_lproperty, onlyAttributesAreProperties, clonable
jetlog = Logging.logging.getLogger('JetGrooming')
+@clonable
+@onlyAttributesAreProperties
class GroomingDefinition(object):
def __init__(self,
ungroomeddef, # Ungroomed JetDefinition
- ungroomedname, # Input collection name (cannot be determined uniquely from inputdef)
+ #ungroomedname, # Input collection name (cannot be determined uniquely from inputdef)
groomspec, # Dict describing the grooming settings
- modifiers=[]): # JetModifiers to run after grooming
+ modifiers=[], # JetModifiers to run after grooming
+ lock=False,
+ ):
- self.ungroomedname = ungroomedname
+ #self.ungroomedname = ungroomedname
# Dedicated setter/getter
- self.__ungroomeddef = ungroomeddef
- self.__groomspec = groomspec
+ self._ungroomeddef = ungroomeddef.clone() # to avoid messing with external jetdef
+ self._groomspec = groomspec
- self.__checkGroomSpec(groomspec)
- self.__groomspec = groomspec
+ self._checkGroomSpec(groomspec)
+ self._groomspec = groomspec
- self.__defineName()
+ self._defineName()
self.modifiers = modifiers # Tools to modify the jet
- pass
+ # used internally to resolve dependencies
+ self._prereqDic = {}
+ self._prereqOrder = []
+ self._locked = lock
+
def __hash__(self):
return hash("")
@@ -47,15 +56,34 @@ class GroomingDefinition(object):
# Define core attributes as properties, with
# custom setter/getter such that if changed, these
# force resetting of the jet name
- @property
- def ungroomeddef(self):
- return self.__ungroomeddef
- @ungroomeddef.setter
+ @make_lproperty
+ def ungroomeddef(self): pass
+ @ungroomeddef.lsetter
def ungroomeddef(self,ungroomeddef):
- self.__ungroomeddef = ungroomeddef
- self.defineName()
+ self._ungroomeddef = ungroomeddef.clone()
+ self._defineName()
+
+
+ @make_lproperty
+ def modifiers(self): pass
+
+ @make_lproperty
+ def groomspec(self):
+ return self.__groomspec
+ @groomspec.lsetter
+ def groomspec(self,groomspec):
+ self._checkGroomSpec(groomspec)
+ self._groomspec = groomspec
+ self._defineName()
+
+ # To override in derived classes
+ def groomSpecAsStr(self):
+ return "Groomed"
- def __checkGroomSpec(self,groomspec):
+ def fullname(self):
+ return self.ungroomeddef.prefix+self.basename+"Jets"
+
+ def _checkGroomSpec(self,groomspec):
# Check if options are supported (implemented)
groomalg = groomspec["groomalg"]
supportedGrooming = ["Trim","SoftDrop"]
@@ -64,33 +92,20 @@ class GroomingDefinition(object):
for groomalg in supportedGrooming:
jetlog.error(groomalg)
raise KeyError("Invalid grooming algorithm choice: {0}".format(groomalg))
+
+ # @property
+ # def inputdef(self):
+ # return self.__inputdef
+ # @inputdef.setter
+ # def inputdef(self,inputdef):
+ # self.__inputdef = inputdef
+ # self._defineName()
- @property
- def groomspec(self):
- return self.__groomspec
- @groomspec.setter
- def groomspec(self,groomspec):
- self.__groomspec = groomspec
- self.defineName()
-
- @property
- def inputdef(self):
- return self.__inputdef
- @inputdef.setter
- def inputdef(self,inputdef):
- self.__inputdef = inputdef
- self.defineName()
-
- # To override in derived classes
- def groomSpecAsStr(self):
- return "Groomed"
- def __defineName(self):
- ungroomedNameBase = self.ungroomeddef.basename
+ def _defineName(self):
# chop the label off so we can insert the trimming spec
- groomedName = ungroomedNameBase + self.groomSpecAsStr()
+ groomedName = self.ungroomeddef.basename + self.groomSpecAsStr()
self.basename = groomedName
- pass
# Define a string conversion for printing
def __str__(self):
@@ -99,13 +114,17 @@ class GroomingDefinition(object):
__repr__ = __str__
+@clonable
+@onlyAttributesAreProperties
class JetTrimming(GroomingDefinition):
def __init__(self,
ungroomeddef, # Ungroomed JetDefinition
- ungroomedname, # Input collection name (cannot be determined uniquely from inputdef)
+ #ungroomedname, # Input collection name (cannot be determined uniquely from inputdef)
smallR, # Subjet radius
ptfrac, # Minimum subjet pt fraction
- modifiers=[]): # JetModifiers to run after grooming
+ modifiers=[], # JetModifiers to run after grooming
+ lock=False,
+ ):
# Apart from groomalg and ToolType, these correspond to the
# grooming tool property values
@@ -122,7 +141,7 @@ class JetTrimming(GroomingDefinition):
"PtFrac": ptfrac,
}
- super(JetTrimming,self).__init__(ungroomeddef,ungroomedname,groomspec,modifiers)
+ super(JetTrimming,self).__init__(ungroomeddef,groomspec,modifiers,lock=lock,finalinit=False)
def groomSpecAsStr(self):
ptfrac = self.groomspec["PtFrac"]
@@ -134,13 +153,16 @@ class JetTrimming(GroomingDefinition):
groomstr = "TrimmedPtFrac{}SmallR{}".format(ptfracstr,smallRstr)
return groomstr
+@clonable
+@onlyAttributesAreProperties
class JetSoftDrop(GroomingDefinition):
def __init__(self,
ungroomeddef, # Ungroomed JetDefinition
- ungroomedname, # Input collection name (cannot be determined uniquely from inputdef)
+ #ungroomedname, # Input collection name (cannot be determined uniquely from inputdef)
zcut, # ZCut
beta, # Beta
- modifiers=[]): # JetModifiers to run after grooming
+ modifiers=[], # JetModifiers to run after grooming
+ lock=False):
# Apart from groomalg and ToolType, these correspond to the
# grooming tool property values
@@ -156,7 +178,7 @@ class JetSoftDrop(GroomingDefinition):
"Beta": beta,
}
- super(JetSoftDrop,self).__init__(ungroomeddef,ungroomedname,groomspec,modifiers)
+ super(JetSoftDrop,self).__init__(ungroomeddef,groomspec,modifiers, lock=lock, finalinit=False)
def groomSpecAsStr(self):
beta = self.groomspec["Beta"]
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetInputConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetInputConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..6c9e48d3f667d7b99fbc0c362c43d4721eb04ac7
--- /dev/null
+++ b/Reconstruction/Jet/JetRecConfig/python/JetInputConfig.py
@@ -0,0 +1,72 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+# JetInputConfig: A helper module providing function to setup algorithms
+# in charge of preparing input sources to jets (ex: EventDensity algo, track
+# or truth selection,...)
+#
+# Author: P-A Delsart #
+"""
+
+
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+def _buildJetAlgForInput(suffix, tools ):
+ jetalg = CompFactory.JetAlgorithm("jetalg_"+suffix,
+ Tools = tools,
+ )
+ return jetalg
+
+def buildJetSelectedTracks( parentjetdef, inputspec ):
+ from JetRecTools import JetRecToolsConfig
+ # Jet track selection
+ t = JetRecToolsConfig.getTrackSelTool(doWriteTracks=True)
+ return _buildJetAlgForInput("JetSelectedTrack",
+ tools = [ t ]
+ )
+
+
+def buildJetTrackVertexAssoc( parentjetdef, inputspec ):
+ from JetRecTools import JetRecToolsConfig
+ # Jet track selection
+ return _buildJetAlgForInput("JetTVA",
+ tools = [ JetRecToolsConfig.getTrackVertexAssocTool() ]
+ )
+
+
+
+
+def buildJetInputTruth(parentjetdef, truthmod):
+ truthmod = truthmod or ""
+ from ParticleJetTools.ParticleJetToolsConfig import getCopyTruthJetParticles
+ return _buildJetAlgForInput("truthpartcopy_"+truthmod,
+ tools = [ getCopyTruthJetParticles(truthmod) ]
+ )
+
+def buildLabelledTruth(parentjetdef, truthmod):
+ from ParticleJetTools.ParticleJetToolsConfig import getCopyTruthLabelParticles
+ tool = getCopyTruthLabelParticles(truthmod)
+ return _buildJetAlgForInput("truthlabelcopy_"+truthmod,
+ tools = [ tool ]
+ )
+
+
+
+########################################################################
+def buildEventShapeAlg( parentjetdef, inputspec ):
+ """Function producing an EventShapeAlg to calculate
+ median energy density for pileup correction"""
+
+ nameprefix = inputspec or ""
+ label = parentjetdef.inputdef.label
+ rhokey = nameprefix+"Kt4"+label+"EventShape"
+ rhotoolname = "EventDensity_"+nameprefix+"Kt4"+label
+
+ rhotool = CompFactory.EventDensityTool(rhotoolname)
+ rhotool.InputContainer = "PseudoJet"+label # same as in PseudoJet algs
+ rhotool.OutputContainer = rhokey
+
+ eventshapealg = CompFactory.EventDensityAthAlg("{0}{1}Alg".format(nameprefix,rhotoolname))
+ eventshapealg.EventDensityTool = rhotool
+
+ return eventshapealg
+
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py
index 8c6478b8f47a65c19a2d1889e8975e56843da335..9d157f17c2bb1831518bbfeceba3b35e50b502b6 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py
@@ -1,79 +1,18 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-########################################################################
-# #
-# JetModConfig: A helper module for configuring jet modifier tools #
-# Author: TJ Khoo #
-# #
-########################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+ #
+JetModConfig: A helper module for configuring jet modifier tools #
+Author: TJ Khoo #
+ #
+"""
from AthenaCommon import Logging
+from .JetDefinition import JetModifier
+import JetRecConfig.ConstModHelpers as constHelper
modlog = Logging.logging.getLogger('JetModConfig')
-########################################################################
-# Function for generating a list of JetModifier tools
-# Keep a default empty modstrings as we might want to actually
-# specify some defaults (e.g. calib/filter/sort) for specific configs
-#
-# First incarnation is "dumb" but we want this to be "smart" and set up
-# the right tools in order, propagating dependencies.
-#
-def getFinalModifierListAndPrereqs(mods_initial, jetdef):
- if len(mods_initial)==0: return [], set()
- mods_final = []
- # By the end of the recursion, all mods should have been applied already.
- prereqs = set()
-
- modlog.verbose("Initial mod list: " + str(mods_initial))
-
- # Loop over the initial list
- # Extract the concrete definition and specifier string
- # Then grab any prereqs, and expand if the list contains mods
- for mod in mods_initial:
- moddef, modspec = getModDefAndSpec( mod )
- modreqs = moddef.getPrereqs(modspec,jetdef)
- prereqmods = []
- for req in modreqs:
- reqtype, reqspec = req.split(':',1)
- if reqtype == "mod":
- prereqmods.append(reqspec)
- else:
- prereqs.add( req )
- # Recursion happens here
- prereqmods_final, moreprereqs = getFinalModifierListAndPrereqs( prereqmods, jetdef )
- prereqs.update( moreprereqs )
- mods_final += prereqmods_final + [(moddef,modspec)]
-
- modlog.verbose("Current input prereqs: {0}".format(prereqs))
- modlog.verbose("Final modlist: {0}".format(mods_final))
- return mods_final, prereqs
-
-# [Optional] Args are:
-# 1. Tool Type (may be ignored if the helper is a custom one)
-# 2. Tool Name (may be ignored if the helper is a custom one)
-# [3.] Config helper
-# [4.] Prereqs (default to []). If "None", will try to get from the function.
-# [5.] Flag passJetDef specifying if the helper needs the jet definition
-# We use a helper class to encapsulate the modifier configuration
-
-# Translate modifier string into JetModifier if necessary
-# Extracts the modspec from the string or the config object
-def getModDefAndSpec(mod):
- from .StandardJetMods import jetmoddict
- moddef = mod
- modspec = ""
- if mod.__class__ == type("str"):
- modkey = mod
- if ":" in mod:
- modkey, modspec = mod.split(':',1)
- moddef = jetmoddict[modkey]
- else:
- modspec = moddef.modspec
- modlog.verbose("Interpreted modifier string {0} as {1} with specification \"{2}\"".format(mod,moddef,modspec))
- return moddef, modspec
-
-# Translate JetModifier into a concrete tool
def getModifier(jetdef, moddef, modspec):
+ """Translate JetModifier into a concrete tool"""
modtool = None
modlog.verbose("Retrieving modifier {0}".format(str(moddef)))
@@ -86,11 +25,80 @@ def getModifier(jetdef, moddef, modspec):
# Get the modifier tool
try:
- modtool = moddef.helperfn(**kwargs)
+ modtool = moddef.createfn(**kwargs)
except Exception as e:
modlog.error( "Unhandled modifier specification {0} for mod {1} acting on jet def {2}!".format(modspec,moddef,jetdef.basename) )
modlog.error( "Received exception \"{0}\"".format(e) )
- modlog.error( "Helper function is \"{0}\"".format(moddef.helperfn) )
+ modlog.error( "Helper function is \"{0}\"".format(moddef.createfn) )
raise ValueError( "JetModConfig unable to handle mod {0} with spec \"{1}\"".format(moddef,modspec) )
return modtool
+
+
+
+def prereqToDef(prereq, parentjetdef):
+ """translate a prereq string in the form 'type:alias' into a known config object.
+ """
+ reqtype, reqkey = prereq.split(':',1)
+ if reqtype=='mod':
+ reqInstance = aliasToModDef(reqkey, parentjetdef)
+ else:
+ reqInstance = constHelper.aliasToInputDef(reqkey, parentjetdef)
+ return reqInstance
+
+def aliasToModDef(alias, parentjetdef ):
+ """return an alias into a JetModifier config object, recursively instatiating all aliases in the dependencies of this JetModifier."""
+ if isinstance(alias, JetModifier):
+ return alias
+ # else assume it's a string
+
+ # split it, to extract the optional specifiers
+ modL = alias.split(":")
+ modkey = modL[0]
+ modspec = ':'.join(modL[1:])
+
+ # retrieve an instance from the known modifiers in StandardJetMods :
+ from .StandardJetMods import jetmoddict
+ moddef = jetmoddict[modkey].clone( modspec = modspec)
+
+
+ if callable(moddef.prereqs):
+ moddef.prereqs = moddef.prereqs( modspec, parentjetdef )
+
+ for prereq in moddef.prereqs:
+ reqInstance = parentjetdef._prereqDic.get( prereq, None)
+ if reqInstance is None:
+ reqInstance = prereqToDef(prereq, parentjetdef)
+
+ if prereq.startswith('ghost:'):
+ # then it is also an input : register this requirement also as an input
+ prereqN = prereq.split(':')[1]
+ parentjetdef._prereqOrder.append('input:'+prereqN)
+ parentjetdef._prereqDic['input:'+prereqN] = reqInstance # the input config instance is identical for input and ghost (only the PseudoJet will differ)
+
+ parentjetdef._prereqOrder.append(prereq)
+ parentjetdef._prereqDic[prereq] = reqInstance
+
+ return moddef
+
+
+
+def jetModWithAlternateTrk(jetdef, trkopt):
+ """ Update all the track-related JetModifier in jetdef._prereqOrder so that they have their optional specification
+ ('modspec') set to trkopt.
+ This is needed when some prereq JetModifier are generated without the specification. The main use case is trigger where the Track and vertex container name are different than the standard.
+ IMPORTANT : this must be called after instantiateAliases() .
+ """
+
+ from JetRecTools.JetRecToolsConfig import trackcollectionmap
+
+ def changeJetModSpec( mod ):
+ if mod in ['mod:JVT','mod:JVF', 'mod:TrackMoments', 'mod:TrackSumMoments']:
+ return mod+':'+trkopt
+ return mod
+
+ for i in range(len(jetdef._prereqOrder)):
+ jetdef._prereqOrder[i] = changeJetModSpec( jetdef._prereqOrder[i] )
+
+ # Deduplicate the prereq (with python > 3.6 dict is ordered so the trick is guaranteed to work) :
+ jetdef._prereqOrder[:] = list(dict.fromkeys(jetdef._prereqOrder) )
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
index aabff57aeaab8760497ef7d29a2a7402a89e41f8..4ba2d6d7e5be0ff1e36fe393b24f6252a6b4b911 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
@@ -1,55 +1,48 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-########################################################################
-# #
-# JetRecConfig: A helper module for configuring jet reconstruction #
-# Author: TJ Khoo #
-# #
+"""
+JetRecConfig: A helper module for configuring jet reconstruction
+
+Author: TJ Khoo, P-A Delsart
+"""
+
########################################################################
from AthenaCommon import Logging
jetlog = Logging.logging.getLogger('JetRecConfig')
-from xAODBase.xAODType import xAODType
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
+import JetRecConfig.ConstModHelpers as constH
+import JetRecConfig.JetModConfig as modH
+
-def propertiesOf(comp):
- """ Obtain properties irrespectively of the config system"""
- try:
- propNames = comp._descriptors
- return propNames
- except Exception:
- pass
- return comp.properties()
-__all__ = ["JetRecCfg", "resolveDependencies", "JetInputCfg"]
+__all__ = ["JetRecCfg", "JetInputCfg"]
+
+
########################################################################
-# Top-level function for running jet finding
-# (i.e. clustering from inputs)
-# This returns a ComponentAccumulator that can be merged with others
-# from elsewhere in the job, but will provide everything needed to
-# reconstruct one jet collection.
-# This could still be modularised further into the subcomponents of the
-# jet reconstruction job. For now, based on public tools, as private
-# tool migration has not been completed.
-#
-# Receives the jet definition and input flags, mainly for input file
-# peeking such that we don't attempt to reproduce stuff that's already
-# in the input file
-def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", evsprefix="", jetnameoverride=None):
- # Ordinarily we want to have jet collection names be descriptive and derived from
- # the configured reconstruction.
- # Nevertheless, we allow an explicit specification when necessary
- # e.g. to ensure that the correct name is used in grooming operations
- if jetnameoverride:
- jetsfullname = jetnameoverride
- else:
- jetsfullname = jetnameprefix+jetdef.basename+"Jets"+jetnamesuffix
+
+def JetRecCfg(jetdef0, configFlags):
+ """Top-level function for running jet finding
+ (i.e. clustering from inputs)
+ This returns a ComponentAccumulator that can be merged with others
+ from elsewhere in the job, but will provide everything needed to
+ reconstruct one jet collection.
+ This could still be modularised further into the subcomponents of the
+ jet reconstruction job.
+ Receives the jet definition and input flags, mainly for input file
+ peeking such that we don't attempt to reproduce stuff that's already
+ in the input file
+ """
+ # we clone the jetdef, so we're sure we're not using a 'locked' one
+ jetdef = jetdef0.clone()
+
+ jetsfullname = jetdef.fullname()
jetlog.info("Setting up to find {0}".format(jetsfullname))
sequencename = jetsfullname
@@ -58,328 +51,101 @@ def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", evsprefix=
from AthenaCommon.CFElements import parOR
components.addSequence( parOR(sequencename) )
- deps = resolveDependencies( jetdef )
+ # create proper config instances for each input and ghost aliases in this jetdef
+ # this implicitely calculates and adds the dependencies.
+ instantiateAliases(jetdef)
+
+ # check if the conditions are compatible with the inputs & modifiers of this jetdef.
+ # if in standardRecoMode we will remove whatever is incompatible and still try to run
+ # if not, we raise an exception
+ removeComponentFailingConditions(jetdef, configFlags, raiseOnFailure= not jetdef.standardRecoMode)
+
# Schedule the various input collections.
# We don't have to worry about ordering, as the scheduler
# will handle the details. Just merge the components.
- #
- # To facilitate running in serial mode, we also prepare
- # the constituent PseudoJetAlgorithm here (needed for rho)
- inputcomps = JetInputCfg(deps["inputs"], configFlags, sequenceName=jetsfullname, evsprefix=evsprefix)
- constitpjalg = inputcomps.getPrimary()
+ inputcomps = JetInputCfg(jetdef, configFlags, sequenceName=jetsfullname)
+ components.merge(inputcomps)
+
+ # Schedule the constituent PseudoJetAlg
+ constitpjalg = getConstitPJGAlg( jetdef.inputdef )
constitpjkey = constitpjalg.OutputContainer
+ components.addEventAlgo( constitpjalg, jetsfullname )
- components.merge(inputcomps)
- pjs = [constitpjkey]
+ pjContNames = [constitpjkey]
# Schedule the ghost PseudoJetAlgs
- for ghostdef in deps["ghosts"]:
+ ghostlist = [ key for key in jetdef._prereqOrder if key.startswith('ghost:')]
+ for ghostkey in ghostlist:
+ ghostdef = jetdef._prereqDic[ghostkey]
ghostpjalg = getGhostPJGAlg( ghostdef )
components.addEventAlgo( ghostpjalg, sequencename )
ghostpjkey = ghostpjalg.OutputContainer
- pjs.append( ghostpjkey )
+ pjContNames.append( ghostpjkey )
# Generate a JetAlgorithm to run the jet finding and modifiers
# (via a JetRecTool instance).
- mergepjalg = CompFactory.PseudoJetMerger(
- "pjmergealg_"+jetsfullname,
- InputPJContainers = pjs,
- OutputContainer = "PseudoJetMerged_"+jetsfullname)
-
- components.addEventAlgo(mergepjalg, sequencename)
-
- jetrecalg = getJetRecAlg(jetsfullname, jetdef, "PseudoJetMerged_"+jetsfullname, deps["mods"])
-
+ jetrecalg = getJetAlgorithm(jetsfullname, jetdef, pjContNames)
components.addEventAlgo(jetrecalg, sequencename)
jetlog.info("Scheduled JetAlgorithm instance \"jetalg_{0}\"".format(jetsfullname))
return components
-########################################################################
-# The real workhorse -- establishes the full sequence of jet reco,
-# recursively expanding the prerequisites
-#
-# Avoids constructing any configurables at this stage, the goal being
-# to produce a human-readable job description.
-def resolveDependencies(jetdef):
-
- jetlog.info("Resolving dependencies for {0} definition".format(jetdef.basename))
-
- # Accumulate prerequisites of the base constituent type
- # We just collect everything and sort out the types later
- prereqs = set() # Resolve duplication as we go
- prereqs.update( getConstitPrereqs( jetdef.inputdef ) )
- prereqs.update( set( ["input:"+dep for dep in jetdef.extrainputs] ) )
-
- # Add the Filter modifier if desired (usually it is)
- # It might be simpler to just eliminate ptminfilter
- # and always make this an explicit modifier
- mods_initial = list(jetdef.modifiers)
- if jetdef.ptminfilter>1e-9:
- filtstr = "Filter:{0:.0f}".format(jetdef.ptminfilter)
- # Insert pt filter after calibration if present
- idx=-1
- for imod, mod in enumerate(mods_initial):
- if mod.startswith("Calib"):
- idx = imod+1
- break
- mods_initial.insert(idx,filtstr)
-
- # Accumulate prerequisites of the modifiers, as these are
- # the most extensive. Internally resolves modifier chains,
- # returning an updated modifiers list
- # Need to use a list, as the order matters.
- # The elements of the "final" list are tuples extracting
- # the modifier specification.
- from . import JetModConfig
- mods_final, modprereqs = JetModConfig.getFinalModifierListAndPrereqs( mods_initial, jetdef )
-
- # Remove the duplicates in the mod list -- just do this
- # once at the end and preserve ordering.
- def dedupe(mylist):
- outlist = []
- usedset = set()
- for item in mylist:
- if not (item in usedset):
- outlist.append(item)
- usedset.add(item)
- return outlist
- mods_final = dedupe( mods_final )
-
- prereqs.update( modprereqs )
-
- # Ghost prerequisites are only of type input, so we can
- # afford to sort now.
- prereqdict = {"ghost":set(), "input":set()}
- prereqdict.update( classifyPrereqs(prereqs) )
-
- # Copy the explicitly requested ghost defs and add to
- # these those required by modifiers.
- ghostdefs = set(jetdef.ghostdefs).union(prereqdict["ghost"])
- # Expand from strings to JetGhost objects where needed.
- ghostdefs = expandPrereqs( "ghost",ghostdefs )
-
- # Accumulate prerequisites of the ghost-associated types
- jetlog.info(" Full list of ghosts: ")
- for ghostdef in sorted(list(ghostdefs), key=lambda g: g.inputtype):
- jetlog.info(" " + str(ghostdef))
- gprereqs = getGhostPrereqs(ghostdef)
- prereqdict["input"].update( [req.split(':',1)[1] for req in gprereqs] )
-
- jetlog.info(" Full list of mods: ")
- for mod, modspec in mods_final:
- jetlog.info(" " + str(mod) + ("" if not modspec else ": \"{0}\"".format(modspec)))
-
- # Return a dict of the dependencies, converting sets to lists.
- # May want to further separate input deps.
- dependencies = {
- "inputs": [jetdef.inputdef] + sorted(list( prereqdict["input"] )),
- "ghosts": list( ghostdefs ),
- "mods": mods_final
- }
-
- # We don't expand the inputs at this stage, as they are diverse
- # and don't have a dedicated config class.
- # Doing so may trigger another level of expansion if the inputs
- # include a jet collection.
- return dependencies
-
-########################################################################
-# Function for classifying prerequisites
-#
-def classifyPrereqs(prereqs):
- prereqdict = {}
- for req in prereqs:
- key,val = req.split(":",1)
- jetlog.verbose( "Interpreted prereqs: {0} --> {1}".format(key,val) )
- if key not in prereqdict.keys():
- prereqdict[key] = set()
- prereqdict[key].add(val)
-
- return prereqdict
-
-########################################################################
-# Function for expanding prerequisites into definitions
-# Only supporting ghosts for now, but could be extended
-#
-def expandPrereqs(reqtype,prereqs):
- reqdefs = set()
- from .JetDefinition import JetGhost
- for req in prereqs:
- if reqtype=="ghost":
- if req.__class__ == JetGhost:
- reqdefs.add( req )
- else:
- ghostdef = JetGhost(req)
- reqdefs.add( ghostdef )
- jetlog.debug("Expanded prereq {0} to {1}".format(req,ghostdef))
- else:
- jetlog.error("Prereqs \"{0}\" unsupported!".format(reqtype))
- return None
- return reqdefs
-
-########################################################################
-# For each modifier in the given list with a configurable input container
-# name ("JetContainer"), configure it to containerName.
-# Also handle any container-specific configuration needed.
-def autoconfigureModifiers(modifiers, containerName):
- for mod in modifiers:
- if "JetContainer" in propertiesOf( mod ):
- mod.JetContainer = containerName
- if "DoPFlowMoments" in propertiesOf( mod ):
- mod.DoPFlowMoments = ("PFlow" in containerName)
########################################################################
-# Function producing an EventShapeAlg to calculate
-# medaian energy density for pileup correction
-#
-def getEventShapeAlg( constit, constitpjkey, evsprefix="" ):
-
- rhokey = evsprefix+"Kt4"+constit.label+"EventShape"
- rhotoolname = "EventDensity_{}Kt4{}".format(evsprefix,constit.label)
-
- rhotool = CompFactory.EventDensityTool(rhotoolname)
- rhotool.InputContainer = constitpjkey
- rhotool.OutputContainer = rhokey
+def JetInputCfg(jetdef, configFlags, sequenceName):
+ """Function for setting up inputs to jet finding
- eventshapealg = CompFactory.EventDensityAthAlg("{0}{1}Alg".format(evsprefix,rhotoolname))
- eventshapealg.EventDensityTool = rhotool
+ This includes constituent modifications, track selection, copying of
+ input truth particles and event density calculations
+ """
- return eventshapealg
-
-########################################################################
-# Function for setting up inputs to jet finding
-#
-# This includes constituent modifications, track selection, copying of
-# input truth particles and event density calculations
-def JetInputCfg(inputdeps, configFlags, sequenceName, evsprefix=""):
jetlog.info("Setting up jet inputs.")
components = ComponentAccumulator(sequenceName)
jetlog.info("Inspecting input file contents")
- filecontents = [i for i in configFlags.Input.Collections]
-
- constit = inputdeps[0]
- # Truth and track particle inputs are handled later
- if constit.basetype not in [xAODType.TruthParticle, xAODType.TrackParticle] and constit.inputname!=constit.rawname:
- # Protection against reproduction of existing containers
- if constit.inputname in filecontents:
- jetlog.debug("Input container {0} for label {1} already in input file.".format(constit.inputname, constit.label))
- else:
- jetlog.debug("Preparing Constit Mods for label {0} from {1}".format(constit.label,constit.inputname))
- # May need to generate constituent modifier sequences to
- # produce the input collection
- from . import ConstModHelpers
- constitalg = ConstModHelpers.getConstitModAlg(constit)
- if constitalg:
- components.addEventAlgo(constitalg)
+ filecontents = configFlags.Input.Collections
- # Schedule the constituent PseudoJetAlg
- constitpjalg = getConstitPJGAlg( constit )
- constitpjkey = constitpjalg.OutputContainer
- # Mark the constit PJGAlg as the primary so that the caller
- # can access the output container name
- components.addEventAlgo( constitpjalg, primary=True )
-
- # Track selection and vertex association kind of go hand in hand, though it's not
- # completely impossible that one might want one and not the other
- if "JetSelectedTracks" in inputdeps or "JetTrackVtxAssoc" in inputdeps:
- jetlog.debug("Setting up input track containers and track-vertex association")
- from JetRecTools import JetRecToolsConfig
- # Jet track selection
- jettrackselloose = JetRecToolsConfig.getTrackSelTool(doWriteTracks=True)
- jettvassoc = JetRecToolsConfig.getTrackVertexAssocTool()
-
- jettrkprepalg = CompFactory.JetAlgorithm("jetalg_TrackPrep")
- jettrkprepalg.Tools = [ jettrackselloose, jettvassoc ]
- components.addEventAlgo( jettrkprepalg )
-
- # Resolve the rest of the input dependencies
- for dep in inputdeps[1:]:
- # Generate prequisite truth particle collections
- # There may be more than one.
- if dep.startswith("JetInputTruthParticles"):
- # Special conditions e.g. "WZ" are set as a suffix preceded by ":"
- truthmod = ''
- if ":" in dep:
- truthmod = dep.split(':')[1]
- tpcname = "truthpartcopy"+truthmod
- jetlog.debug("Setting up input truth particle container JetInputTruthParticles{0}".format(truthmod))
-
- from ParticleJetTools.ParticleJetToolsConfig import getCopyTruthJetParticles
- tpc = getCopyTruthJetParticles(truthmod)
-
- tpcalg = CompFactory.JetAlgorithm("jetalg_{0}".format(tpcname))
- tpcalg.Tools = [tpc]
- components.addEventAlgo(tpcalg)
-
- # Truth particles specifically for truth labels
- elif dep.startswith("TruthLabel"):
- truthlabel = dep[10:]
- tpcname = "truthpartcopy_"+truthlabel
-
- jetlog.debug("Setting up input truth particle container TruthLabel{0}".format(truthlabel))
- from ParticleJetTools.ParticleJetToolsConfig import getCopyTruthLabelParticles
- tpc = getCopyTruthLabelParticles(truthlabel)
-
- tpcalg = CompFactory.JetAlgorithm("jetalg_{0}".format(tpcname))
- tpcalg.Tools = [tpc]
- components.addEventAlgo(tpcalg)
-
- # Calculate the event density for jet area subtraction taking the
- # jet constituents as input
- # Possibly not needed if constituent suppression has been applied.
- # Will want to update the standalone ED python for other uses,
- # e.g. isolation or rho from constituents that are not used to
- # build a particular jet collection (e.g. neutral PFOs)
- #
- # Needs protection against reproduction of existing containers
- elif dep == "EventDensity":
- rhokey = "Kt4"+constit.label+"EventShape"
- if rhokey in filecontents:
- jetlog.info("Event density {0} for label {1} already in input file.".format(rhokey, constit.label))
+ inputdeps = [ inputkey for inputkey in jetdef._prereqOrder if inputkey.startswith('input:')]
+
+ for inputfull in inputdeps:
+ #inputkey = inputfull[6:] # remove 'input:'
+ inputInstance = jetdef._prereqDic[inputfull]
+ from .JetDefinition import JetConstitSource
+
+ if isinstance(inputInstance, JetConstitSource):
+ if inputInstance.containername in filecontents:
+ jetlog.debug("Input container {0} for label {1} already in input file.".format(inputInstance.containername, inputInstance.name))
else:
- components.addEventAlgo( getEventShapeAlg(constit,constitpjkey,evsprefix) )
-
+ jetlog.debug("Preparing Constit Mods for label {0} from {1}".format(inputInstance.name,inputInstance.inputname))
+ # May need to generate constituent modifier sequences to
+ # produce the input collection
+ from . import ConstModHelpers
+ constitalg = ConstModHelpers.getConstitModAlg(inputInstance)
+ if constitalg:
+ components.addEventAlgo(constitalg)
+ else:
+ jetlog.debug("Requesting input {} with function {} and specs {}".format(inputInstance.name, inputInstance.algoBuilder, inputInstance.specs) )
+ # inputInstance must be a JetInputDef
+ if inputInstance.algoBuilder:
+ components.addEventAlgo( inputInstance.algoBuilder( jetdef, inputInstance.specs ) )
+ else:
+ # for now just hope the input will be present...
+ pass
return components
-########################################################################
-# Functions for generating PseudoJetAlgorithms, including determining
-# the prerequisites for their operation
-#
-def getConstitPrereqs(basedef):
- prereqs = []
- if basedef.basetype==xAODType.TrackParticle:
- prereqs = ["input:JetSelectedTracks","input:JetTrackVtxAssoc"]
- elif basedef.basetype==xAODType.TruthParticle:
- prereqs = ["input:JetInputTruthParticles:"+basedef.inputname[22:]]
- return prereqs
-
-def getGhostPrereqs(ghostdef):
- jetlog.verbose("Getting ghost PseudoJets of type {0}".format(ghostdef.inputtype))
-
- prereqs = []
- if ghostdef.inputtype=="Track":
- prereqs = ["input:JetSelectedTracks","input:JetTrackVtxAssoc"]
- elif ghostdef.inputtype.startswith("TruthLabel"):
- truthsuffix = ghostdef.inputtype[5:]
- prereqs = ["input:TruthLabel"+truthsuffix]
- elif ghostdef.inputtype == "Truth":
- prereqs = ["input:JetInputTruthParticles"]
- return prereqs
-
-def getConstitPJGAlg(basedef):
- jetlog.debug("Getting PseudoJetAlg for label {0} from {1}".format(basedef.label,basedef.inputname))
- #
- full_label = basedef.label
- if basedef.basetype == xAODType.Jet:
- full_label += "_"+basedef.inputname
+def getConstitPJGAlg(constitdef):
+ """returns a configured PseudoJetAlgorithm which converts the inputs defined by constitdef into fastjet::PseudoJet"""
+
+ jetlog.debug("Getting PseudoJetAlg for label {0} from {1}".format(constitdef.name,constitdef.inputname))
+
+ full_label = constitdef.label
+
pjgalg = CompFactory.PseudoJetAlgorithm(
- "pjgalg_"+basedef.label,
- InputContainer = basedef.inputname,
+ "pjgalg_"+constitdef.label,
+ InputContainer = constitdef.containername,
OutputContainer = "PseudoJet"+full_label,
Label = full_label,
SkipNegativeEnergy=True
@@ -387,44 +153,50 @@ def getConstitPJGAlg(basedef):
return pjgalg
def getGhostPJGAlg(ghostdef):
- label = "Ghost"+ghostdef.inputtype
- kwargs = {
- "OutputContainer": "PseudoJet"+label,
- "Label": label,
- "SkipNegativeEnergy": True
- }
+ """returns a configured PseudoJetAlgorithm which converts the inputs defined by constitdef into fastjet::PseudoJet
+
+ The difference for the above is this is dedicated to ghosts which need variations for the Label and the muon segment cases.
+ """
+ label = "Ghost"+ghostdef.label # IMPORTANT !! "Ghost" in the label will be interpreted by teh C++ side !
+
+ kwargs = dict(
+ InputContainer = ghostdef.containername,
+ OutputContainer= "PseudoJet"+label,
+ Label= label,
+ SkipNegativeEnergy= True,
+ #OutputLevel = 3,
+ )
pjaclass = CompFactory.PseudoJetAlgorithm
- if ghostdef.inputtype=="MuonSegment":
+ if ghostdef.basetype=="MuonSegment":
# Muon segments have a specialised type
pjaclass = CompFactory.MuonSegmentPseudoJetAlgorithm
- kwargs = {
- "InputContainer":"MuonSegments",
- "OutputContainer":"PseudoJet"+label,
- "Label":label,
- "Pt":1e-20
- }
- elif ghostdef.inputtype=="Track":
- kwargs["InputContainer"] = "JetSelectedTracks"
- elif ghostdef.inputtype.startswith("TruthLabel"):
- truthsuffix = ghostdef.inputtype[5:]
- kwargs["InputContainer"] = "TruthLabel"+truthsuffix
- elif ghostdef.inputtype == "Truth":
- kwargs["InputContainer"] = "JetInputTruthParticles"
- else:
- raise ValueError("Unhandled ghost type {0} received!".format(ghostdef.inputtype))
-
- pjgalg = pjaclass(
- "pjgalg_"+label,
- **kwargs
- )
+ kwargs.update( Pt =1e-20 ) # ??,)
+ kwargs.pop('SkipNegativeEnergy')
+
+ pjgalg = pjaclass( "pjgalg_"+label, **kwargs )
return pjgalg
-########################################################################
-# Function for configuring the jet algorithm and builders, given the
-# set of dependencies
-#
-def getJetAlgorithm(jetname, jetdef, pjs, modlist, monTool = None):
+
+def buildJetModifierList( jetdef ):
+ """returns the list of configured JetModifier tools needed by this jetdef.
+ This is done by instantiating the actual C++ tool as ordered in jetdef._prereqOrder
+ """
+ modlist = [ key for key in jetdef._prereqOrder if key.startswith('mod:')]
+
+ from . import JetModConfig
+ mods = []
+ for modkey in modlist:
+ moddef = jetdef._prereqDic[modkey]
+ modkey = modkey[4:] # remove 'mod:'
+ modspec = '' if ':' not in modkey else modkey.split(':',1)[1]
+ mod = JetModConfig.getModifier(jetdef,moddef,modspec)
+ mods.append(mod)
+
+ return mods
+
+def getJetAlgorithm(jetname, jetdef, pjContNames, monTool = None):
+ """returns a configured JetAlgorithm """
jetlog.debug("Configuring JetAlgorithm \"jetalg_{0}\"".format(jetname))
builder = getJetBuilder()
@@ -432,25 +204,72 @@ def getJetAlgorithm(jetname, jetdef, pjs, modlist, monTool = None):
finder = getJetFinder(jetname, jetdef)
finder.JetBuilder = builder
+ mods = buildJetModifierList(jetdef)
+
+ rectool = getJetRecTool(jetname,finder,pjContNames,mods)
+ if monTool: rectool.MonTool = monTool
+
+ jetalg = CompFactory.JetAlgorithm("jetalg_"+jetname)
+ jetalg.Tools = [rectool]
+
+ return jetalg
+
+########################################################################
+# Function that substitues JetRecTool + JetAlgorithm
+#
+def getJetRecAlg(jetname, jetdef, pjContNames, modlist):
+
+ jclust = CompFactory.JetClusterer("builder")
+ jclust.JetAlgorithm = jetdef.algorithm
+ jclust.JetRadius = jetdef.radius
+ jclust.PtMin = jetdef.ptmin
+ jclust.InputPseudoJets = pjContNames
+ jclust.GhostArea = 0.01 # In which cases do we not want areas?
+ jclust.JetInputType = jetdef.inputdef.basetype
+
from . import JetModConfig
mods = []
for moddef,modspec in modlist:
mod = JetModConfig.getModifier(jetdef,moddef,modspec)
mods.append(mod)
- rectool = getJetRecTool(jetname,finder,pjs,mods)
- if monTool: rectool.MonTool = monTool
+ jra = CompFactory.JetRecAlg(
+ "jetrecalg_"+jetname,
+ Provider = jclust,
+ Modifiers = mods,
+ OutputContainer = jetname)
- jetalg = CompFactory.JetAlgorithm("jetalg_"+jetname)
- jetalg.Tools = [rectool]
+ autoconfigureModifiers(jra.Modifiers, jetname)
+
+ return jra
- return jetalg
########################################################################
-# Function for generating a jet builder, i.e. converter from
-# fastjet EDM to xAOD EDM
-#
+# For each modifier in the given list with a configurable input container
+# name ("JetContainer"), configure it to containerName.
+# Also handle any container-specific configuration needed.
+def autoconfigureModifiers(modifiers, containerName):
+ for mod in modifiers:
+ if "JetContainer" in propertiesOf( mod ):
+ mod.JetContainer = containerName
+ if "DoPFlowMoments" in propertiesOf( mod ):
+ mod.DoPFlowMoments = ("PFlow" in containerName)
+
+
+def propertiesOf(comp):
+ """ Obtain properties irrespectively of the config system"""
+ try:
+ propNames = comp._descriptors
+ return propNames
+ except Exception:
+ pass
+ return comp.properties()
+
+########################################################################
def getJetBuilder(doArea=True):
+ """Returns a jet builder (JetFromPseudojet) , i.e. converter from
+ fastjet EDM to xAOD EDM
+ """
# Do we have any reasons for not using the area one?
# Maybe CPU reduction if we don't need areas for calibration
builder = CompFactory.JetFromPseudojet("jetbuild")
@@ -459,9 +278,9 @@ def getJetBuilder(doArea=True):
return builder
########################################################################
-# Function for generating a jet finder, i.e. interface to fastjet
#
def getJetFinder(jetname, jetdef):
+ """Creates a jet finder, i.e. interface to fastjet"""
finder = CompFactory.JetFinder("jetfind_"+jetname,
JetAlgorithm = jetdef.algorithm,
JetRadius = jetdef.radius,
@@ -485,6 +304,107 @@ def getJetRecTool(jetname, finder, pjs, mods):
return jetrec
+
+def instantiateAliases( jetdef ):
+ """ Instantiate all the aliases contained in this jetdef : modifiers, ghosts and prereqs.
+ At the same time fills the internal _prereqDic and _prereqOrder containers.
+
+ This functions
+ * assumes jetdef is not 'locked'
+ * implies calls to recursives function constH.aliasToInputDef and modH.aliasToModDef
+ """
+
+ # start with the inputdef (replacing the jetdef attribute to ensure it really is an instance, not only a str)
+ jetdef.inputdef = constH.aliasToInputDef(jetdef.inputdef, jetdef)
+
+ jetdef._prereqDic['input:'+jetdef.inputdef.name] = jetdef.inputdef
+ jetdef._prereqOrder.append('input:'+jetdef.inputdef.name)
+
+ for g in jetdef.extrainputs:
+ gInstance = constH.aliasToInputDef( g , jetdef)
+ jetdef._prereqDic['input:'+g] = gInstance
+ jetdef._prereqOrder.append('input:'+g)
+
+ for g in jetdef.ghostdefs:
+ gInstance = constH.aliasToInputDef( g , jetdef)
+ jetdef._prereqDic['input:'+g] = gInstance
+ jetdef._prereqOrder.append('input:'+g)
+ jetdef._prereqDic['ghost:'+g] = gInstance
+ jetdef._prereqOrder.append('ghost:'+g)
+
+ for mod in jetdef.modifiers:
+ modInstance = modH.aliasToModDef(mod, jetdef)
+ jetdef._prereqDic['mod:'+mod] = modInstance
+ jetdef._prereqOrder.append('mod:'+mod)
+
+ # Deduplicate the prereq (with python > 3.6 dict is ordered so the trick is guaranteed to work) :
+ jetdef._prereqOrder[:] = list(dict.fromkeys(jetdef._prereqOrder) )
+
+
+
+
+def removeComponentFailingConditions(jetdef, configflags, raiseOnFailure=True):
+ """Filters the lists jetdef.modifiers and jetdef.ghosts (and jetdef._prereqOrder), so only the components
+ comptatible with configflags are selected.
+ The compatibility is ultimately tested using the component 'filterfn' attributes.
+ Internally calls the function isComponentPassingConditions() (see below)
+ """
+ jetlog.info("******************")
+ jetlog.info("Standard Reco mode : filtering components in "+str(jetdef))
+
+
+ ## TODO :
+ ## do not raise an exceptin immediately. Instead collect all failure
+ ## then report all of them, then raise
+
+ # define a helper function returning a filtered list of components.
+ def filterList(inList, compType):
+ nOut=0
+ outList=[]
+ # loop over components in the list to be filtered
+ for comp in inList:
+ fullkey = compType+':'+comp
+ cInstance = jetdef._prereqDic[fullkey]
+ ok, reason = isComponentPassingConditions(cInstance, configflags, jetdef._prereqDic)
+ if not ok :
+ if raiseOnFailure:
+ raise Exception("JetDefinition {} can NOT be scheduled. Failure of {} {} reason={}".format(
+ jetdef, compType, comp, reason) )
+
+ nOut+=1
+ jetlog.info("IMPORTANT : removing {} {} reason={} ".format(compType, comp, reason))
+ jetdef._prereqOrder.remove(fullkey)
+ else:
+ outList.append(comp)
+ jetlog.info(" *** Number of {} filtered components = {} final list={}".format(compType, nOut, outList) )
+ return outList
+ # ---------
+
+ # call the helper function to perform filtering :
+ jetdef.ghostdefs = filterList( jetdef.ghostdefs, "ghost")
+ jetdef.modifiers = filterList( jetdef.modifiers, "mod")
+
+def isComponentPassingConditions(component, configflags, prereqDic):
+ """Test if component is compatible with configflags.
+ This is done by calling component.filterfn AND testing all its prereqs.
+ """
+ from .JetDefinition import JetModifier, JetConstitModifier
+ if isinstance(component, (JetModifier, JetConstitModifier)):
+ for req in component.prereqs:
+ if req not in prereqDic:
+ return False, "prereq "+req+" not available"
+ reqInstance = prereqDic[req]
+ ok, reason = isComponentPassingConditions(reqInstance, configflags, prereqDic)
+ if not ok :
+ return False, "prereq "+str(component)+" failed."
+
+ ok, reason = component.filterfn(configflags)
+ return ok, reason
+
+
+
+
+
if __name__=="__main__":
# Setting needed for the ComponentAccumulator to do its thing
@@ -518,32 +438,3 @@ if __name__=="__main__":
import sys
sys.exit(0)
-
-########################################################################
-# Function that substitues JetRecTool + JetAlgorithm
-#
-def getJetRecAlg(jetname, jetdef, pjs, modlist):
-
- jclust = CompFactory.JetClusterer("builder")
- jclust.JetAlgorithm = jetdef.algorithm
- jclust.JetRadius = jetdef.radius
- jclust.PtMin = jetdef.ptmin
- jclust.InputPseudoJets = pjs
- jclust.GhostArea = 0.01 # In which cases do we not want areas?
- jclust.JetInputType = jetdef.inputdef.basetype
-
- from . import JetModConfig
- mods = []
- for moddef,modspec in modlist:
- mod = JetModConfig.getModifier(jetdef,moddef,modspec)
- mods.append(mod)
-
- jra = CompFactory.JetRecAlg(
- "jetrecalg_"+jetname,
- Provider = jclust,
- Modifiers = mods,
- OutputContainer = jetname)
-
- autoconfigureModifiers(jra.Modifiers, jetname)
-
- return jra
diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardJetConstits.py b/Reconstruction/Jet/JetRecConfig/python/StandardJetConstits.py
new file mode 100644
index 0000000000000000000000000000000000000000..13005ce8aa2e3a15bd1f89ccf5a055a2f91a7e4b
--- /dev/null
+++ b/Reconstruction/Jet/JetRecConfig/python/StandardJetConstits.py
@@ -0,0 +1,204 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+"""
+ StandardJetConstits: A module defining standard definitions for jet constituents.
+ These can be copied and modified by users who want something a bit
+ different from what is provided.
+
+ Author: TJ Khoo, P-A Delsart
+ * Written for the time being to work in R21, but with R22 in mind
+
+
+"""
+
+########################################################################
+from .JetDefinition import xAODType, JetConstitSeq, JetInputDef, JetConstitModifier, JetConstitSource
+
+
+# Prepare dictionnaries to hold all of our standard definitions.
+# They will be filled from the list below
+from .Utilities import ldict
+jetconstitdic = ldict()
+jetconstitmoddic = ldict()
+jetinputdefdic = ldict()
+
+
+# This module contains the helper functions needed to instantiate the input container external
+# to Jet domain
+import JetRecConfig.JetInputConfig as inputcfg
+
+def _isMCTrue(flags):
+ """A simple filter function for testing if we're running in MC
+ (probably worth re-allocating somehere else)"""
+ return flags.Input.isMC, "Not MC input"
+
+
+########################################################################
+## List of standard input sources for jets.
+
+_stdInputList = [
+ # Format is :
+ # JetInputDef( containername , containerType, ...optionnal parameters... )
+
+ # *****************************
+ JetInputDef("CaloCalTopoClusters", xAODType.CaloCluster),
+
+ # *****************************
+ JetInputDef("JetETMissParticleFlowObjects", xAODType.ParticleFlow),
+
+ # *****************************
+ JetInputDef("JetSelectedTracks", xAODType.TrackParticle, algoBuilder = inputcfg.buildJetSelectedTracks),
+ JetInputDef("JetTrackVtxAssoc", xAODType.TrackParticle, algoBuilder = inputcfg.buildJetTrackVertexAssoc),
+
+ # *****************************
+ JetInputDef("EventDensity", "EventShape", algoBuilder = inputcfg.buildEventShapeAlg,
+ prereqs = lambda jetdef : ["input:"+jetdef.inputdef.name] # this will force the input to be build *before* the EventDensity alg.
+ ),
+ JetInputDef("HLT_EventDensity", "EventShape", algoBuilder = inputcfg.buildEventShapeAlg,
+ prereqs = lambda jetdef : ["input:"+jetdef.inputdef.name], # this will force the input to be build *before* the EventDensity alg.
+ specs = 'HLT_'
+ ),
+
+ # *****************************
+ JetInputDef("MuonSegments", "MuonSegment",),
+
+
+ # *****************************
+ # Truth particles from the hard scatter vertex prior to Geant4 simulation.
+ # Neutrinos and muons are omitted; all other stable particles are included.
+ JetInputDef("JetInputTruthParticles", xAODType.TruthParticle,
+ algoBuilder = inputcfg.buildJetInputTruth, filterfn=_isMCTrue ),
+
+ # Truth particles from the hard scatter vertex prior to Geant4 simulation.
+ # Prompt electrons, muons and neutrinos are excluded, all other stable particles
+ # are included, in particular leptons and neutrinos from hadron decays.
+ JetInputDef("JetInputTruthParticlesNoWZ", xAODType.TruthParticle,
+ algoBuilder = inputcfg.buildJetInputTruth, filterfn=_isMCTrue,specs="NoWZ"),
+]
+
+
+_truthFlavours = ["BHadronsInitial", "BHadronsFinal", "BQuarksFinal",
+ "CHadronsInitial", "CHadronsFinal", "CQuarksFinal",
+ "TausFinal",
+ "WBosons", "ZBosons", "HBosons", "TQuarksFinal",
+ "Partons",]
+for label in _truthFlavours:
+ # re-use the main truth input definition :
+ _stdInputList.append( JetInputDef("TruthLabel"+label, xAODType.TruthParticle,
+ algoBuilder = inputcfg.buildLabelledTruth,
+ filterfn=_isMCTrue, specs = label ) )
+
+
+
+# Fill the jetinputdefdic from the above list
+for ji in _stdInputList:
+ ji._locked = True # lock the definitions so we have unmutable references !
+ jetinputdefdic[ji.name] = ji
+
+
+
+
+
+########################################################################
+## List of standard constituent modifiers
+
+def _getPFOTool(constitSeq):
+ """One Property of the CorrectPFO constit modifier is a tool.
+ we use this function as a placeholder, allowing to delay the intantiation of this property tool
+ to the time the modifier itself is instantiated.
+ """
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ return CompFactory.getComp("CP::WeightPFOTool")("weightPFO")
+
+
+vtxKey = "PrimaryVertices"
+tvaKey = "JetTrackVtxAssoc"
+_stdModList = [
+ # Format is :
+ # JetConstitModifier( name , toolType, dictionnary_of_tool_properties )
+ # (see JetDefinition.py for more details)
+
+ JetConstitModifier("Origin", "CaloClusterConstituentsOrigin", ),
+ JetConstitModifier("EM", "ClusterAtEMScaleTool", ),
+ JetConstitModifier("LC", "", ),
+ # Particle flow
+ JetConstitModifier("CorrectPFO", "CorrectPFOTool",
+ dict(VertexContainerKey=vtxKey,
+ WeightPFOTool= _getPFOTool ) ),
+
+ JetConstitModifier("CHS", "ChargedHadronSubtractionTool",
+ dict(VertexContainerKey=vtxKey, TrackVertexAssociation=tvaKey) ),
+
+ # Pileup suppression
+ JetConstitModifier("Vor", "VoronoiWeightTool", dict(doSpread=False, nSigma=0) ),
+ JetConstitModifier("CS", "ConstituentSubtractorTool", dict(MaxEta=5. ) ),
+ JetConstitModifier("SK", "SoftKillerWeightTool",),
+
+]
+
+# Fill the jetconstitmoddic from the above list
+for ji in _stdModList:
+ ji._locked = True
+ jetconstitmoddic[ji.name] = ji
+
+
+
+
+
+
+## ***************************************
+## List of standard constituent sequences
+## This sequences uses the above constit modifiers
+_stdSeqList = [
+ # Format is :
+ # JetConstitSeq( name , input_cont_type, list_of_modifiers, inputcontainer, outputcontainer )
+ # or
+ # JetConstitSource( name, input_cont_type, containername)
+ # see JetDefinition.py for details.
+
+ # *****************************
+ # Cluster constituents
+ JetConstitSeq("EMTopoOrigin", xAODType.CaloCluster, ["EM","Origin"], "CaloCalTopoClusters", "EMOriginTopoClusters"),
+ JetConstitSeq("LCTopoOrigin",xAODType.CaloCluster, ["LC","Origin"],"CaloCalTopoClusters", "LCOriginTopoClusters"),
+ JetConstitSeq("LCTopoCSSK", xAODType.CaloCluster, ["LC","Origin","CS","SK"],"CaloCalTopoClusters", "LCOriginTopoCSSK"),
+
+
+
+
+ # *****************************
+ # EM-scale particle flow objects with charged hadron subtraction
+ # For now we don't specify a scale, as only one works well, but
+ # this could be incorporated into the naming scheme and config
+ JetConstitSeq("EMPFlow", xAODType.ParticleFlow,["CorrectPFO", "CHS"] , 'JetETMissParticleFlowObjects', 'CHSParticleFlowObjects'),
+
+ # Particle Flow Objects with Constituent Subtraction + SoftKiller
+ JetConstitSeq("EMPFlowCSSK", xAODType.ParticleFlow,["CorrectPFO", "CS","SK", "CHS"] , 'JetETMissParticleFlowObjects', 'CSSKParticleFlowObjects'),
+
+
+ # *****************************
+ # Track constituents
+ JetConstitSource("Track", xAODType.TrackParticle,'JetSelectedTracks'),
+
+ # Track particles from the primary vertex
+ JetConstitSeq("PV0Track", xAODType.TrackParticle,["PV0"],'JetSelectedTracks', 'PV0JetSelectedTracks',
+ prereqs= ["input:JetTrackVtxAssoc"], ),
+
+ # *****************************
+ # Muon segments. Only used as ghosts
+ JetConstitSource("MuonSegment", "MuonSegment", "MuonSegments" ),
+
+
+ # *****************************
+ # Truth particles (see JetInputDef declarations above for more details)
+ JetConstitSource("Truth", xAODType.TruthParticle, "JetInputTruthParticles" ),
+
+ JetConstitSource("TruthWZ", xAODType.TruthParticle, "JetInputTruthParticlesNoWZ" ),
+]
+
+for label in _truthFlavours:
+ _stdSeqList.append( JetConstitSource(label, xAODType.TruthParticle, "TruthLabel"+label ) )
+
+# Fill the jetconstitdic from the above list
+for jc in _stdSeqList:
+ jc._locked = True
+ jetconstitdic[jc.name] = jc
diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py b/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py
index 3606cd15440f36f7ccc7a6c68edf9b652acabd90..a0f3d4017a991a8e6d2bee6041a9a4eb871c5d1b 100644
--- a/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py
+++ b/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py
@@ -1,25 +1,28 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+This module defines the standard JetModifier tools used in jet reco
+Definitions are grouped in a dictionary of tool configurations using the helpers defined
+in package configs.
+This dict maps a modifier alias to the JetModifier config object
+that in turn will be responsible for generating a configured tool.
+
+The JetModifier config class is defined in JetDefinition.py
+[Optional] Args to the JetModifier constructor are:
+ 1. Tool Type (ignored if the helper is a custom one)
+ 2. Tool Name (ignored if the helper is a custom one)
+ [3.] Config helper
+ [4.] Prereqs (default to []). Can also be a function.
+ [5.] Flag passJetDef specifying if the helper needs the jet definition
+ --> should this be by default? prefer to avoid ignored args
+"""
from .JetDefinition import JetModifier
-########################################################################
-# Define the dictionary of tool configurations using the helpers defined
-# in package configs.
-# This dict maps a modifier alias to the JetModifier config object
-# that in turn will be responsible for generating a configured tool.
-#
-# [Optional] Args to the JetModifier constructor are:
-# 1. Tool Type (ignored if the helper is a custom one)
-# 2. Tool Name (ignored if the helper is a custom one)
-# [3.] Config helper
-# [4.] Prereqs (default to []). Can also be a function.
-# [5.] Flag passJetDef specifying if the helper needs the jet definition
-# --> should this be by default? prefer to avoid ignored args
jetmoddict = {}
########################################################################
# Define the simple modifier setups here -- those defined in JetRec.
-#from JetRec import JetRecConf
+
from AthenaConfiguration.ComponentFactory import CompFactory
def getJetFilterTool(modspec):
threshold = int(modspec)
@@ -28,7 +31,7 @@ def getJetFilterTool(modspec):
return jetptfilter
jetrecmods = {
"Sort": JetModifier("JetSorter","jetsort"),
- "Filter": JetModifier("JetFilterTool","jetptfilter",helperfn=getJetFilterTool),
+ "Filter": JetModifier("JetFilterTool","jetptfilter",createfn=getJetFilterTool),
}
jetmoddict.update (jetrecmods)
@@ -42,7 +45,7 @@ jetmoddict.update (jetrecmods)
from JetCalibTools import JetCalibToolsConfig
jetcalibmods = {
"Calib": JetModifier("JetCalibrationTool","jetcalib_jetcoll_calibseq",
- helperfn=JetCalibToolsConfig.getJetCalibToolFromString,
+ createfn=JetCalibToolsConfig.getJetCalibToolFromString,
prereqs=JetCalibToolsConfig.getJetCalibToolPrereqs,passJetDef=True)
}
jetmoddict.update(jetcalibmods)
@@ -55,6 +58,7 @@ jetmoddict.update(jetcalibmods)
# Standard jet moments
from JetMomentTools import JetMomentToolsConfig
jetmomentmods = {
+
# Easy cases, no special config or prereqs, just default tool config
"ClusterMoments": JetModifier("JetClusterMomentsTool", "clsmoms"),
"ECPSFrac": JetModifier("JetECPSFractionTool", "ecpsfrac"),
@@ -62,32 +66,34 @@ jetmomentmods = {
# More complex cases here
"CaloEnergies": JetModifier("JetCaloEnergies", "jetens",
- prereqs=["mod:EMScaleMom"]),
+ prereqs=["mod:EMScaleMom"]
+ ),
"CaloQuality": JetModifier("JetCaloQualityTool", "caloqual",
- helperfn=JetMomentToolsConfig.getCaloQualityTool),
+ createfn=JetMomentToolsConfig.getCaloQualityTool),
"ConstitFourMom": JetModifier("JetConstitFourMomTool", "constitfourmom_basename",
- helperfn=JetMomentToolsConfig.getConstitFourMomTool,
+ createfn=JetMomentToolsConfig.getConstitFourMomTool,
passJetDef=True),
"EMScaleMom": JetModifier("JetEMScaleMomTool", "emscalemom_basename",
- helperfn=JetMomentToolsConfig.getEMScaleMomTool,
+ createfn=JetMomentToolsConfig.getEMScaleMomTool,
passJetDef=True),
"JVF": JetModifier("JetVertexFractionTool", "jvf",
- helperfn=JetMomentToolsConfig.getJVFTool,
+ createfn=JetMomentToolsConfig.getJVFTool,
prereqs = ["mod:TrackMoments"] ),
"JVT": JetModifier("JetVertexTaggerTool", "jvt",
- helperfn=JetMomentToolsConfig.getJVTTool,
+ createfn=JetMomentToolsConfig.getJVTTool,
prereqs = [ "mod:JVF" ]),
"LArHVCorr": JetModifier("JetLArHVTool", "larhvcorr",
prereqs = ["mod:EMScaleMom"]),
"OriginSetPV": JetModifier("JetOriginCorrectionTool", "origin_setpv",
prereqs = [ "mod:JVF" ]),
"TrackMoments": JetModifier("JetTrackMomentsTool", "trkmoms",
- helperfn=JetMomentToolsConfig.getTrackMomentsTool,
- prereqs = [ "input:JetSelectedTracks","input:JetTrackVtxAssoc","ghost:Track" ]),
+ createfn=JetMomentToolsConfig.getTrackMomentsTool,
+ prereqs = [ "input:JetTrackVtxAssoc","ghost:Track" ]),
+
"TrackSumMoments": JetModifier("JetTrackSumMomentsTool", "trksummoms",
- helperfn=JetMomentToolsConfig.getTrackSumMomentsTool,
- prereqs = [ "input:JetSelectedTracks","input:JetTrackVtxAssoc","ghost:Track" ]),
- }
+ createfn=JetMomentToolsConfig.getTrackSumMomentsTool,
+ prereqs = [ "input:JetTrackVtxAssoc","ghost:Track" ]),
+}
jetmoddict.update(jetmomentmods)
# Truth labelling moments
@@ -95,16 +101,16 @@ from ParticleJetTools import ParticleJetToolsConfig
particlejetmods = {
# Easy cases, no special config or prereqs, just default tool config
"PartonTruthLabel": JetModifier("Analysis::JetPartonTruthLabel","partontruthlabel",
- prereqs=["ghost:TruthLabelPartons"]),
+ prereqs=["ghost:Partons"]),
# More complex cases here
"TruthPartonDR": JetModifier("Analysis::JetConeLabeling","truthpartondr",
- helperfn=ParticleJetToolsConfig.getJetConeLabeling),
+ createfn=ParticleJetToolsConfig.getJetConeLabeling),
"JetDeltaRLabel": JetModifier("ParticleJetDeltaRLabelTool","jetdrlabeler_jetptmin",
- helperfn=ParticleJetToolsConfig.getJetDeltaRLabelTool,
- prereqs=["input:TruthLabelBHadronsFinal",
- "input:TruthLabelCHadronsFinal",
- "input:TruthLabelTausFinal"])
+ createfn=ParticleJetToolsConfig.getJetDeltaRLabelTool,
+ prereqs=["ghost:BHadronsFinal",
+ "ghost:CHadronsFinal",
+ "ghost:TausFinal"])
}
jetmoddict.update(particlejetmods)
@@ -112,3 +118,15 @@ jetmoddict.update(particlejetmods)
# This can also be expanded by users if they would rather do this than
# pass in JetModifier instances in the JetDefinition
+
+
+## TEMPORARY HACK (change the names of ghost tracks )
+from JetRecTools.JetRecToolsConfig import trackcollectionmap
+trackcollectionmap[""] = {
+ "Tracks": "InDetTrackParticles",
+ "JetTracks": "JetSelectedTracks",
+ "Vertices": "PrimaryVertices",
+ "TVA": "JetTrackVtxAssoc",
+ "GhostTracks": "PseudoJetGhostTrack",
+ "GhostTracksLabel": "GhostTrack",
+ }
diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py b/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py
new file mode 100644
index 0000000000000000000000000000000000000000..54f83e59704ad74e8a4d5b0245a580f87cf5a451
--- /dev/null
+++ b/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py
@@ -0,0 +1,79 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from JetRecConfig.StandardJetConstits import jetconstitdic as cst
+from .JetDefinition import JetDefinition
+from xAODBase.xAODType import xAODType
+
+
+
+# *********************************************************
+# Ghost-associated particles for the standard small R jets
+# *********************************************************
+standardghosts = ["Track","MuonSegment","Truth"]
+
+
+flavourghosts = ["TruthLabel"+ghosttype for ghosttype in [
+ "BHadronsInitial", "BHadronsFinal", "BQuarksFinal",
+ "CHadronsInitial", "CHadronsFinal", "CQuarksFinal",
+ "TausFinal",
+ "WBosons", "ZBosons", "HBosons", "TQuarksFinal",
+ "Partons",]
+]
+
+
+
+
+# *********************************************************
+# Modifiers for the standard small R jets
+# *********************************************************
+# (use tuples rather than lists to prevent accidental modification)
+standardrecomods = ( "Filter:10000","Width","TrackMoments","TrackSumMoments","JVF","JVT","OriginSetPV",
+ "CaloEnergies", )
+clustermods = ("ECPSFrac","ClusterMoments",)# "LArHVCorr" )
+truthmods = ("PartonTruthLabel","TruthPartonDR","JetDeltaRLabel:5000" ) # not working well yet ?
+pflowmods = ()
+
+
+
+# *********************************************************
+# Standard small R jets definitions
+# *********************************************************
+
+
+AntiKt4EMPFlow = JetDefinition("AntiKt",0.4,cst.EMPFlow,
+ ghostdefs = standardghosts , # not working well yet : flavourghosts,
+ modifiers = ("Calib:T0:mc",)+standardrecomods+truthmods,
+ standardRecoMode = True,
+ lock = True
+)
+
+
+
+
+
+AntiKt4LCTopo = JetDefinition("AntiKt",0.4,cst.LCTopoOrigin,
+ ghostdefs = standardghosts, # not working well yet : flavourghosts,,
+ modifiers = standardrecomods+truthmods+clustermods,
+ standardRecoMode = True,
+ lock = True,
+)
+
+
+AntiKt4EMTopo = JetDefinition("AntiKt",0.4,cst.EMTopoOrigin,
+ ghostdefs = standardghosts, # not working well yet : flavourghosts,,
+ modifiers = standardrecomods+truthmods+clustermods,
+ standardRecoMode = True,
+ lock = True,
+)
+
+AntiKt4Truth = JetDefinition("AntiKt",0.4, cst.Truth,
+ modifiers = [],
+ standardRecoMode = True,
+ lock = True,
+)
+
+AntiKt4TruthWZ = JetDefinition("AntiKt",0.4, cst.TruthWZ,
+ modifiers = [],
+ standardRecoMode = True,
+ lock = True,
+)
diff --git a/Reconstruction/Jet/JetRecConfig/python/Utilities.py b/Reconstruction/Jet/JetRecConfig/python/Utilities.py
new file mode 100644
index 0000000000000000000000000000000000000000..9769877e09a9b3830fbd146364fb48c6ac392182
--- /dev/null
+++ b/Reconstruction/Jet/JetRecConfig/python/Utilities.py
@@ -0,0 +1,137 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+
+"""
+This module defines utilities for the jet config.
+These are mainly to allow to "lock" the standard, reference definitions so
+they are not accidentally changed by some user scripts.
+"""
+
+class lproperty(property):
+ """Build on the standard property to allow a property to be locked if the holding class has its _locked attribute set to True """
+ def lsetter(self, func):
+ def lockedfunc(self, v):
+ if self._locked:
+ raise Exception("Error "+func.__name__+" is locked. Either clone or unlock",self)
+ func(self,v)
+
+ return self.setter(lockedfunc)
+
+def make_lproperty( func ):
+ """creates a property from a class method (or a str) which can be locked if the holding class has its _locked attribute set to True
+
+ usage :
+ class A:
+ # simple locked property
+ x = make_lproperty('x')
+
+ # same but using decorator
+ @make_lproperty
+ def y(self): pass
+
+ # same but now with customized setter :
+ @make_lproperty
+ def z(self): pass
+ @z.lsetter
+ def z(self, v):
+ print("setting z to ",v)
+ self._z = v
+
+ """
+ if isinstance(func, str):
+ pname = func
+ else:
+ pname = func.__name__
+ pname_i = '_'+pname
+
+ def _getter(self):
+ return getattr(self,pname_i, None)
+ def _setter(self, v):
+ if self._locked:
+ raise AttributeError("Error property '"+pname+"' is locked. Either clone or unlock",self)
+ setattr(self, pname_i, v)
+ return lproperty(_getter, _setter)
+
+def make_alias( prop ):
+ """Returns a property which act as a read-only alias to existing prop """
+ def _getter(self):
+ return getattr(self,prop,None)
+ def _setter(self,v):
+ raise AttributeError("Cannot set alias "+pname+" from "+str(self) )
+ return property(_getter, _setter)
+
+def listClassLProperties(cls):
+ lprops = [k for (k,v) in cls.__dict__.items() if isinstance(v,lproperty) ]
+ lprops +=[ '_'+k for k in lprops]
+ for base in cls.__bases__:
+ lprops += listClassLProperties(base)
+ return lprops
+
+def onlyAttributesAreProperties(cls):
+ """Transforms the input class cls so the only attributes which can be set are the lproperty of the class.
+ Best used as a decorator. Ex :
+ @onlyAttributesAreProperties
+ class A:
+ myprop0 = make_lproperty('myprop0')
+
+ a = A()
+ a.myprop0 = 0 # ok
+ a.mypropO = 3 # impossible
+ """
+ # build the list of attributes allowed to be set : these are the properties and _locked
+ #cls._allowedattributes = [k for (k,v) in cls.__dict__.items() if isinstance(v,lproperty) ]
+ #cls._allowedattributes +=[ '_'+k for k in cls._allowedattributes]
+ cls._allowedattributes = listClassLProperties( cls )
+ cls._allowedattributes += ['_locked']
+
+ # flag to activate the prevention of adding new attributes. we set it at the end of __init__
+ cls._nomoreattributes=False
+ cls._locked = False
+
+ cls.__init__origin = cls.__init__
+
+ # define a new __init__ for this class.
+ # the 'finalinit' argument allows to avoid locking the allowed attribute : this is to be used when a derived class wants to call the init of it's base class.
+ def initwraper(self, *l,finalinit=True, **args):
+ cls.__init__origin(self, *l,**args)
+ self._nomoreattributes = finalinit
+ cls.__init__ = initwraper
+
+ # define a __setattr__ for this class
+ def setattr(self, k, v):
+ if self._nomoreattributes and k not in self._allowedattributes:
+ raise AttributeError("Setting attribute "+k+" on "+str(self)+" not allowed")
+ super(cls,self).__setattr__(k,v)
+ cls.__setattr__ = setattr
+
+ return cls
+
+def clonable(cls):
+ """Transforms the input class cls by adding a clone() method.
+ This clone() method returns a clone instance with a _locked attribute set to False by default (so the clone is modifiable) """
+ def clone(self, lock=False, **args):
+ from copy import deepcopy
+ o = deepcopy(self)
+ o._locked = False # unlock so we can modfiy the clone with user given arguments
+ for k,v in args.items():
+ setattr(o,k,v)
+ o._locked = lock
+ return o
+ cls.clone = clone
+ return cls
+
+
+class ldict(dict):
+ """A dictionnary which items can not be modified once set.
+
+ Also its items are attributes (Main/only motivation : easier interactive inspection)
+ """
+ def __setitem__(self, k, v):
+ if k in self:
+ raise KeyError("Can't override key "+k)
+ super().__setitem__(k,v)
+ super().__setattr__(k,v)
+
+ def update(self, **args): # we need to redefine it
+ for k,v in args.items():
+ self[k]=v
diff --git a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
index 11f94e75234cb42d359ec614e7ff2b6599b574b8..7e9d703797e9a4023b0291f6bee11d78ad198842 100755
--- a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
+++ b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
@@ -20,7 +20,7 @@ def JetRecTestCfg(jetdefs,configFlags,args):
jetlog.info("Printing component accumulators for each jet collection")
jetcas = []
for jetdef in jetdefs:
- jetcomps = JetRecConfig.JetRecCfg(jetdef,configFlags,jetnameprefix="New")
+ jetcomps = JetRecConfig.JetRecCfg(jetdef,configFlags)
if args.printAccumulators:
jetcomps.printConfig(withDetails=args.verboseAccumulators,summariseProps=True)
jetcas.append(jetcomps)
@@ -35,75 +35,62 @@ def JetRecTestCfg(jetdefs,configFlags,args):
def DefineJetCollections(configFlags):
- # Here we define the jet configurations we want to build
- # These mod and ghost lists should go in a common module
- standardrecomods = ["Width","TrackMoments","TrackSumMoments","JVF","JVT","OriginSetPV",
- "CaloEnergies","LArHVCorr"]
- clustermods = ["ECPSFrac","ClusterMoments"]
- truthmods = ["PartonTruthLabel","TruthPartonDR","JetDeltaRLabel:5000"] if configFlags.Input.isMC else []
-
- from JetRecConfig.JetDefinition import JetGhost
- ghostlist = ["Track","MuonSegment","Truth"]
- standardghosts = [JetGhost(ghosttype) for ghosttype in ghostlist]
- flavourghostlist = ["BHadronsInitial", "BHadronsFinal", "BQuarksFinal",
- "CHadronsInitial", "CHadronsFinal", "CQuarksFinal",
- "TausFinal",
- "WBosons", "ZBosons", "HBosons", "TQuarksFinal",
- "Partons",
- ]
- flavourghosts = [JetGhost("TruthLabel"+ghosttype) for ghosttype in flavourghostlist]
- standardghosts += flavourghosts
-
########################################################################
# First a demonstration of just building jets using standard definitions
- from JetRecConfig.StandardJetDefs import AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4Truth, AntiKt4TruthWZ
+ from JetRecConfig.StandardSmallRJets import AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4Truth, AntiKt4TruthWZ
- # This updates the original jet definitions, so might be a little risky
- # in derivation code. Safer would be to always deepcopy into a local variable.
- AntiKt4EMTopo.ptminfilter = 15e3
- AntiKt4EMTopo.modifiers = ["Calib:T0:mc","Sort"] + standardrecomods + clustermods + truthmods
- AntiKt4EMTopo.ghostdefs = standardghosts
- #AntiKt4EMTopo.modifiers = ["Calib:AnalysisLatest:mc"]
- AntiKt4EMPFlow.ptminfilter = 10e3
- AntiKt4EMPFlow.modifiers = ["Calib:T0:mc","Sort"] + standardrecomods + truthmods
- AntiKt4EMPFlow.ghostdefs = standardghosts
- #AntiKt4EMPFlow.modifiers = ["Calib:AnalysisLatest:mc"]
+ # ************************
+ # TEMPORARY : comment out jet def modifications
+
+ # # This updates the original jet definitions, so might be a little risky
+ # # in derivation code. Safer would be to always deepcopy into a local variable.
+ # #AntiKt4EMTopo.ptminfilter = 15e3
+ # AntiKt4EMTopo.modifiers = ["Calib:T0:mc","Sort"] + standardrecomods + clustermods + truthmods
- AntiKt4Truth.ptminfilter = 2e3
- AntiKt4Truth.extrainputs = ["EventDensity"]
+ # AntiKt4EMPFlow.ptminfilter = 10e3
+ # AntiKt4EMPFlow.modifiers = ["Calib:T0:mc","Sort"] + standardrecomods + truthmods
+ # AntiKt4EMPFlow.ghostdefs = standardghosts
+ # #AntiKt4EMPFlow.modifiers = ["Calib:AnalysisLatest:mc"]
- AntiKt4TruthWZ.ptminfilter = 2e3
- AntiKt4TruthWZ.extrainputs = ["EventDensity"]
+ # AntiKt4Truth.ptminfilter = 2e3
+ # AntiKt4Truth.extrainputs = ["EventDensity"]
- ########################################################################
- # Now we define our own definitions
- from JetRecConfig.JetDefinition import JetConstit, JetDefinition, xAODType
- EMTopoCSSK = JetConstit(xAODType.CaloCluster, ["EM","Origin","CS","SK"])
- AntiKt4EMTopoCSSK = JetDefinition("AntiKt",0.4,EMTopoCSSK,ptmin=2e3,ptminfilter=2e3)
- AntiKt4EMTopoCSSK.modifiers = ["ConstitFourMom"] + standardrecomods + clustermods + truthmods
- AntiKt4EMTopoCSSK.ghostdefs = standardghosts
- AntiKt4EMTopoCSSK.extrainputs = ["EventDensity"]
+ # AntiKt4TruthWZ.ptminfilter = 2e3
+ # AntiKt4TruthWZ.extrainputs = ["EventDensity"]
########################################################################
- # We can also copy and modify the standard ones
- from copy import deepcopy
- from JetRecConfig.StandardJetDefs import CHSPFlow
-
- CSSKPFlow = deepcopy(CHSPFlow)
- CSSKPFlow.modifiers = ["CS","SK"]
- AntiKt4EMPFlowCSSK = deepcopy(AntiKt4EMPFlow)
- AntiKt4EMPFlowCSSK.inputdef = CSSKPFlow
- AntiKt4EMPFlowCSSK.modifiers = ["ConstitFourMom"] + standardrecomods + truthmods
- AntiKt4EMPFlowCSSK.ptmin = 2e3
- AntiKt4EMPFlowCSSK.ptminfilter = 2e3
- AntiKt4EMPFlowCSSK.ghostdefs = standardghosts
- AntiKt4EMPFlowCSSK.extrainputs = ["EventDensity"]
-
- jetdefs = [AntiKt4EMTopo,
- AntiKt4EMPFlow,
- AntiKt4EMTopoCSSK,
- AntiKt4EMPFlowCSSK]
+ # ************************
+ # TEMPORARY : comment out custom CSSK definitions
+ # # Now we define our own definitions
+ # from JetRecConfig.JetDefinition import JetConstit, JetDefinition, xAODType
+ # EMTopoCSSK = JetConstit(xAODType.CaloCluster, ["EM","Origin","CS","SK"])
+ # AntiKt4EMTopoCSSK = JetDefinition("AntiKt",0.4,EMTopoCSSK,ptmin=2e3,ptminfilter=2e3)
+ # AntiKt4EMTopoCSSK.modifiers = ["ConstitFourMom"] + standardrecomods + clustermods + truthmods
+ # AntiKt4EMTopoCSSK.ghostdefs = standardghosts
+ # AntiKt4EMTopoCSSK.extrainputs = ["EventDensity"]
+
+ # ########################################################################
+ # # We can also copy and modify the standard ones
+ # from copy import deepcopy
+ # from JetRecConfig.StandardJetDefs import CHSPFlow
+
+ # CSSKPFlow = deepcopy(CHSPFlow)
+ # CSSKPFlow.modifiers = ["CS","SK"]
+ # AntiKt4EMPFlowCSSK = deepcopy(AntiKt4EMPFlow)
+ # AntiKt4EMPFlowCSSK.inputdef = CSSKPFlow
+ # AntiKt4EMPFlowCSSK.modifiers = ["ConstitFourMom"] + standardrecomods + truthmods
+ # AntiKt4EMPFlowCSSK.ptmin = 2e3
+ # AntiKt4EMPFlowCSSK.ptminfilter = 2e3
+ # AntiKt4EMPFlowCSSK.ghostdefs = standardghosts
+ # AntiKt4EMPFlowCSSK.extrainputs = ["EventDensity"]
+
+ jetdefs = [
+ AntiKt4EMTopo.clone(prefix="New"),
+ AntiKt4EMPFlow.clone(prefix="New"),
+ # AntiKt4EMTopoCSSK,
+ # AntiKt4EMPFlowCSSK,
+ ]
if configFlags.Input.isMC:
jetdefs += [AntiKt4Truth,
AntiKt4TruthWZ]
diff --git a/Reconstruction/Jet/JetRecConfig/share/test_StandardSmallRJets.py b/Reconstruction/Jet/JetRecConfig/share/test_StandardSmallRJets.py
new file mode 100644
index 0000000000000000000000000000000000000000..e815f191100d7992b215a866f8f97f4da2e082a8
--- /dev/null
+++ b/Reconstruction/Jet/JetRecConfig/share/test_StandardSmallRJets.py
@@ -0,0 +1,108 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from JetRecConfig.StandardSmallRJets import AntiKt4EMPFlow, AntiKt4LCTopo
+from JetRecConfig.JetRecConfig import JetRecCfg, jetlog
+
+jetlog.setLevel(2)
+
+from pprint import pprint, pformat
+
+if __name__=="__main__":
+ from argparse import ArgumentParser
+ parser = ArgumentParser(prog="StandardTests: runs standard jet reconstruction from an ESD",
+ usage="Call with an input file, pass -n=0 to skip execution, -t 0 for serial or 1 for threaded execution.")
+ #
+ parser.add_argument("-H", "--Help", default=False, action="store_true", help="Evidently pyROOT interferes with help :(")
+ #
+ parser.add_argument("-f", "--filesIn", type=str, help="Comma-separated list of input files")
+ parser.add_argument("-M", "--msgLvl", default="INFO", help="The message verbosity")
+ parser.add_argument("-n", "--nEvents", default=0, type=int, help="The number of events to run. 0 skips execution")
+ #
+ parser.add_argument("-t", "--nThreads", default=1, type=int, help="The number of concurrent threads to run. 0 uses serial Athena.")
+ parser.add_argument("-D", "--dumpSG", default=False, action="store_true", help="Toggle StoreGate dump on each event")
+ #
+ args = parser.parse_args()
+
+ if args.Help:
+ parser.print_help()
+ import sys
+ sys.exit(0)
+
+ # Setting needed for the ComponentAccumulator to do its thing
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior=True
+
+ # Set message levels
+ from AthenaCommon import Constants
+ msgLvl = getattr(Constants,args.msgLvl)
+ from AthenaCommon.Logging import log
+ log.setLevel(msgLvl)
+
+ # Config flags steer the job at various levels
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ ConfigFlags.Input.Files = args.filesIn.split(",")
+
+ # Flags relating to multithreaded execution
+ ConfigFlags.Concurrency.NumThreads = args.nThreads
+ if args.nThreads>0:
+ ConfigFlags.Scheduler.ShowDataDeps = True
+ ConfigFlags.Scheduler.ShowDataFlow = True
+ ConfigFlags.Scheduler.ShowControlFlow = True
+ ConfigFlags.Concurrency.NumConcurrentEvents = args.nThreads
+
+ # Prevent the flags from being modified
+ ConfigFlags.lock()
+
+
+
+ # Get a ComponentAccumulator setting up the fundamental Athena job
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ cfg=MainServicesCfg(ConfigFlags)
+
+ # Add the components for reading in pool files
+ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+ cfg.merge(PoolReadCfg(ConfigFlags))
+
+ # Nowadays the jet calibration tool requires the EventInfo
+ # to be decorated with lumi info, which is not in Run 2 AODs
+ from LumiBlockComps.LuminosityCondAlgConfig import LuminosityCondAlgCfg
+ cfg.merge(LuminosityCondAlgCfg(ConfigFlags))
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ muWriter = CompFactory.LumiBlockMuWriter("LumiBlockMuWriter",LumiDataKey="LuminosityCondData")
+ cfg.addEventAlgo(muWriter,"AthAlgSeq")
+
+
+
+ # Add the components from our jet reconstruction job
+ jetdefs = [AntiKt4EMPFlow.clone(prefix="New") , AntiKt4LCTopo.clone(prefix="New") ]
+ for jetdef in jetdefs:
+ cfg.merge( JetRecCfg(jetdef,ConfigFlags) )
+
+ # Write what we produced to AOD
+ # First define the output list
+ outputlist = ["EventInfo#*"]
+ originaljets = ["AntiKt4EMPFlowJets","AntiKt4EMTopoJets"]
+ for jetcoll in originaljets:
+ outputlist += ["xAOD::JetContainer#"+jetcoll,
+ "xAOD::JetAuxContainer#"+jetcoll+"Aux."]
+ for jetdef in jetdefs:
+ key = jetdef.fullname()
+ outputlist += ["xAOD::JetContainer#"+key,
+ "xAOD::JetAuxContainer#"+key+"Aux."]
+
+ # Now get the output stream components
+ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ cfg.merge(OutputStreamCfg(ConfigFlags,"xAOD",ItemList=outputlist))
+ pprint( cfg.getEventAlgo("OutputStreamxAOD").ItemList )
+
+ # Optionally, print the contents of the store every event
+ cfg.getService("StoreGateSvc").Dump = args.dumpSG
+
+ # Save this configuration to a pickle file
+ f=open("JetRecTest.pkl","wb")
+ cfg.store(f)
+ f.close()
+
+ # Run the job
+ cfg.run(maxEvents=args.nEvents)
diff --git a/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h b/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h
index effd9033b0c5c042d97688f55074fd266e984117..e033e5228a9b3860fa136cf7c90fe39c695f91d2 100644
--- a/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h
+++ b/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h
@@ -12,9 +12,9 @@
#include "AsgTools/AsgTool.h"
-#include <AsgTools/MessageCheck.h>
-#include <AsgTools/MsgStream.h>
-#include <AsgTools/MsgStreamMacros.h>
+#include <AsgMessaging/MessageCheck.h>
+#include <AsgMessaging/MsgStream.h>
+#include <AsgMessaging/MsgStreamMacros.h>
#include "JetInterface/IJetExecuteTool.h"
diff --git a/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx b/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx
index 24e73d996bdfa88cf23ff84ea519b7345099f72d..62622b1c2eaf6c1ed09485f289b975ec2ac7f4ca 100644
--- a/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx
+++ b/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx
@@ -17,7 +17,7 @@
#include <EventLoop/OutputStream.h>
// ANA_CHECK macro
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
// this is needed to distribute the algorithm to the workers
ClassImp(JetReclusteringAlgo)
diff --git a/Reconstruction/Jet/JetReclustering/Root/JetReclusteringTool.cxx b/Reconstruction/Jet/JetReclustering/Root/JetReclusteringTool.cxx
index 633038a1508b4f532a7435fdd8558bafbacca8b2..da4de0b6f7af1178153d39e5ae59020c04a6e8ea 100644
--- a/Reconstruction/Jet/JetReclustering/Root/JetReclusteringTool.cxx
+++ b/Reconstruction/Jet/JetReclustering/Root/JetReclusteringTool.cxx
@@ -3,7 +3,7 @@
*/
#include "JetReclustering/JetReclusteringTool.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "JetInterface/IJetModifier.h"
#include "JetInterface/IJetFromPseudojet.h"
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/Root/BoostedXbbTagTool.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/Root/BoostedXbbTagTool.cxx
index 7616c7b740619f461c2bf06637488f19a50aeaf1..bba03ef63b2016f125bf76c77c0714b2e906f597 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/Root/BoostedXbbTagTool.cxx
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/Root/BoostedXbbTagTool.cxx
@@ -5,7 +5,7 @@
#include "JetSubStructureMomentTools/BoostedXbbTagTool.h"
#include "JetSubStructureUtils/BoostedXbbTag.h"
#include "xAODMuon/Muon.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
using namespace std;
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h
index f62e05744d34a9f068fcde56751036451eef145a..6796dc875bc9f645515ba443986cb63f8dad89a4 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h
@@ -7,7 +7,8 @@
#include "JetUncertainties/UncertaintyEnum.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
#include "TString.h"
class TEnv;
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h
index 1d8e62e488ca495524dc07a38fbd3c71ba1fc42a..963e89bcf76a84a914e9bfac4dc90e60186d2ef4 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h
@@ -5,7 +5,7 @@
#ifndef JETUNCERTAINTIES_CORRELATIONMATRIX_H
#define JETUNCERTAINTIES_CORRELATIONMATRIX_H
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "JetUncertainties/JetUncertaintiesTool.h"
#include "xAODJet/Jet.h"
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/Helpers.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/Helpers.h
index c676176f34420dc455daa84d9b59ef6abb8cd8ea..62aad5b1ac40ec6c1e540f1fff1a838fea3361ee 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/Helpers.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/Helpers.h
@@ -15,7 +15,7 @@
#include "TObjArray.h"
#include "TFile.h"
-#include "AsgTools/MsgStreamMacros.h"
+#include "AsgMessaging/MsgStreamMacros.h"
#include "xAODJet/Jet.h"
#include "xAODJet/JetAccessors.h"
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h
index cb409649b31a55f8e115a0edff06612564dba580..d2b63963b4845331ffbd63ef6ba34f81021c2369 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h
@@ -12,7 +12,7 @@
#include "xAODJet/Jet.h"
#include "xAODEventInfo/EventInfo.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "TString.h"
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h
index 691379a9141654b401bce7ee0c63cb15d1707970..aeaa5ea3f869001d19bcb9affe0b44bbf9fb6e3d 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h
@@ -12,7 +12,7 @@
#include "xAODJet/Jet.h"
#include "xAODEventInfo/EventInfo.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "TString.h"
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h
index 513e88073ebd2c32c40380fa59d68b61505201ce..33afa2969a190a9127f1999c729f03763bb3c720 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h
@@ -5,7 +5,8 @@
#ifndef JETUNCERTAINTIES_UNCERTAINTYHISTOGRAM_H
#define JETUNCERTAINTIES_UNCERTAINTYHISTOGRAM_H
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
#include "TString.h"
#include "TH1.h"
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h
index cc8b53f49e1d538f5a5cfe2936b71f0e56ccdead..172cba68143abd096aca1e548be835a2c9e357dc 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h
@@ -11,7 +11,8 @@
#include "xAODEventInfo/EventInfo.h"
#include "PATInterfaces/SystematicSet.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgTools/IAsgTool.h"
#include <string>
#include <vector>
diff --git a/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h b/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h
index 7f6a0c0cb2da5107eeaee69b944f22c426fd9d30..c415a417180043806acb195d0b9a5fc71abf20c7 100644
--- a/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h
+++ b/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h
@@ -5,7 +5,7 @@
#ifndef JETUNCERTAINTIES_OPTIONHELPER_H
#define JETUNCERTAINTIES_OPTIONHELPER_H
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include <vector>
#include <utility>
#include "TString.h"
diff --git a/Reconstruction/MET/METInterface/METInterface/IMETMaker.h b/Reconstruction/MET/METInterface/METInterface/IMETMaker.h
index c8859cbeeec459832a3c4c8007c4496596c235bb..70b147082fb0e94fc965741f0152f42d781f6447 100644
--- a/Reconstruction/MET/METInterface/METInterface/IMETMaker.h
+++ b/Reconstruction/MET/METInterface/METInterface/IMETMaker.h
@@ -109,10 +109,6 @@ public:
virtual StatusCode markInvisible(const xAOD::IParticleContainer* collection,
xAOD::MissingETAssociationHelper* helper,
xAOD::MissingETContainer* metCont) = 0;
-
- virtual StatusCode buildMETSum(const std::string& totalName,
- xAOD::MissingETContainer* metCont,
- MissingETBase::Types::bitmask_t softTermsSource) = 0;
};
#endif
diff --git a/Reconstruction/MET/METInterface/METInterface/IMETRebuilder.h b/Reconstruction/MET/METInterface/METInterface/IMETRebuilder.h
index 2a9d4042af507ef862fa4557946cde126dbd15dd..689a4979ec24f2136cea0fc57580e31986b18c14 100644
--- a/Reconstruction/MET/METInterface/METInterface/IMETRebuilder.h
+++ b/Reconstruction/MET/METInterface/METInterface/IMETRebuilder.h
@@ -86,11 +86,6 @@ class IMETRebuilder : virtual public asg::IAsgTool {
const std::string& softJetScale,
float& stvf,
const xAOD::MissingETComponent* comp_softtrk) = 0;
-
- ///
-
- virtual StatusCode buildMETSum(const std::string& totalName,
- xAOD::MissingETContainer* metCont) = 0;
};
#endif
diff --git a/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h b/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h
index d48121f03cfdf6584c4cfd1c4458fb0b57ce9d7c..65dd8664581ac55a43145988bec2ec1c5626bebd 100644
--- a/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h
+++ b/Reconstruction/MET/METInterface/METInterface/IMETSignificance.h
@@ -1,6 +1,6 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// IMETSignificance.h
// Header file for interface IMETSignificance
@@ -21,6 +21,24 @@
#include "xAODMissingET/MissingETAssociationMap.h"
#include "xAODJet/JetContainer.h"
+namespace met {
+ // Soft term parameterizations
+ enum SoftTermParams{
+ Random = 0,
+ PthardParam = 1,
+ TSTParam = 2
+ };
+ enum METSignificanceResoTerms{
+ ResoNone = 0,
+ ResoJet = 1,
+ ResoSoft = 2,
+ ResoEle = 3,
+ ResoMuo = 4,
+ ResoPho = 5,
+ ResoTau = 6
+ };
+}
+
class IMETSignificance : virtual public asg::IAsgTool {
ASG_TOOL_INTERFACE(IMETSignificance)
@@ -33,13 +51,28 @@ public:
// Convenience methods that creates MET terms internally
// Version with single soft term
- virtual StatusCode varianceMET(xAOD::MissingETContainer* metCont)=0;
+ virtual StatusCode varianceMET(xAOD::MissingETContainer* metCont, float avgmu, std::string jetTermName, std::string softTermName, std::string totalMETName) = 0;
+ // Rotates the phi direction of the object resolutions & recomputes the MET significance
+ virtual StatusCode RotateToPhi(float phi) = 0;
+
+ // Subtracts the vector lambda from the MET & recomputes the MET signficance in new MET - lambda direction
+ virtual StatusCode SetLambda(const float px, const float py, const bool GeV=true) = 0;
///////////////////////////////////////////////////////////////////
// Additional utility commands
///////////////////////////////////////////////////////////////////
+ virtual double GetMETOverSqrtSumET() const = 0 ;
+ virtual double GetMETOverSqrtHT () const = 0 ;
+ virtual double GetSignificance() const = 0 ;
+ virtual double GetSigDirectional() const = 0 ;
+ virtual double GetRho() const = 0 ;
+ virtual double GetVarL() const = 0 ;
+ virtual double GetVarT() const = 0 ;
+ virtual double GetTermVarL(const int term) const = 0 ;
+ virtual double GetTermVarT(const int term) const = 0 ;
+
};
#endif
diff --git a/Reconstruction/MET/METReconstruction/METReconstruction/METAssociator.h b/Reconstruction/MET/METReconstruction/METReconstruction/METAssociator.h
index b2cb63946697b822d394b779153dc6028247250b..9619c27fde221005683bd374e7f884698d369e53 100644
--- a/Reconstruction/MET/METReconstruction/METReconstruction/METAssociator.h
+++ b/Reconstruction/MET/METReconstruction/METReconstruction/METAssociator.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// METAssociator.h
@@ -90,12 +90,11 @@ namespace met {
std::string m_pvcoll;
std::string m_trkcoll;
std::string m_clcoll;
- std::string m_pfcoll;
SG::ReadHandleKey<xAOD::VertexContainer> m_pvcollKey;
SG::ReadHandleKey<xAOD::IParticleContainer> m_clcollKey;
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_trkcollKey;
- SG::ReadHandleKey<xAOD::PFOContainer> m_pfcollKey;
+ SG::ReadHandleKey<xAOD::PFOContainer> m_pfcollKey{this,"PFlowColl","CHSParticleFlowObjects","PFO Collection"};
SG::ReadHandleKey<xAOD::IParticleContainer> m_forcollKey;
SG::ReadHandleKey<xAOD::IParticleContainer> m_hybridContKey;
diff --git a/Reconstruction/MET/METReconstruction/Root/METAssociator.cxx b/Reconstruction/MET/METReconstruction/Root/METAssociator.cxx
index 268096e589115107de45c9e994449abb449cfe55..20b1a7a925a7243bdcd78f74a52d3887a9a84856 100644
--- a/Reconstruction/MET/METReconstruction/Root/METAssociator.cxx
+++ b/Reconstruction/MET/METReconstruction/Root/METAssociator.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// METAssociator.cxx
@@ -54,15 +54,13 @@ namespace met {
m_caloIsolationTool(this,""),
m_pvcollKey(""),
m_clcollKey(""),
- m_trkcollKey(""),
- m_pfcollKey("")
+ m_trkcollKey("")
{
ATH_MSG_INFO("METAssoc constructor");
declareProperty( "InputCollection", m_input_data_key );
declareProperty( "PrimVxColl", m_pvcoll = "PrimaryVertices" );
declareProperty( "TrkColl", m_trkcoll = "InDetTrackParticles" );
declareProperty( "ClusColl", m_clcoll = "CaloCalTopoClusters" );
- declareProperty( "PFlowColl", m_pfcoll = "CHSParticleFlowObjects" );
declareProperty( "UseModifiedClus", m_useModifiedClus = false );
declareProperty( "UseTracks", m_useTracks = true );
declareProperty( "PFlow", m_pflow = false );
@@ -109,13 +107,6 @@ namespace met {
}
}
- if(m_pfcoll == "JetETMissParticleFlowObjects") {
- ATH_MSG_ERROR("Configured to use standard pflow collection \"" << m_pfcoll << "\".");
- ATH_MSG_ERROR("This is no longer supported -- please use the CHSParticleFlowObjects collection, which has the four-vector corrections built in.");
- return StatusCode::FAILURE;
- } else {
- ATH_MSG_INFO("Configured to use PFlow collection \"" << m_pfcoll << "\".");
- }
//initialise read handle keys
if(m_useTracks){
ATH_CHECK( m_pvcollKey.assign(m_pvcoll));
@@ -124,8 +115,14 @@ namespace met {
ATH_CHECK( m_trkcollKey.initialize());
}
if(m_pflow){
- ATH_CHECK( m_pfcollKey.assign(m_pfcoll));
ATH_CHECK( m_pfcollKey.initialize());
+ if(m_pfcollKey.key() == "JetETMissParticleFlowObjects") {
+ ATH_MSG_ERROR("Configured to use standard pflow collection \"" << m_pfcollKey.key() << "\".");
+ ATH_MSG_ERROR("This is no longer supported -- please use the CHSParticleFlowObjects collection, which has the four-vector corrections built in.");
+ return StatusCode::FAILURE;
+ } else {
+ ATH_MSG_INFO("Configured to use PFlow collection \"" << m_pfcollKey.key() << "\".");
+ }
}
if(!m_skipconst || m_forcoll.empty()){
ATH_CHECK( m_clcollKey.assign(m_clcoll));
@@ -263,7 +260,7 @@ namespace met {
constits.trkCont=trCont.cptr();
if(m_pflow) {
- ATH_MSG_DEBUG("Retrieving PFlow collection " << m_pfcoll);
+ ATH_MSG_DEBUG("Retrieving PFlow collection " << m_pfcollKey.key());
constits.pfoCont = 0;
SG::ReadHandle<PFOContainer> pfCont(m_pfcollKey);
if (!pfCont.isValid()) {
diff --git a/Reconstruction/MET/METReconstruction/Root/METTruthAssociator.cxx b/Reconstruction/MET/METReconstruction/Root/METTruthAssociator.cxx
index 58af810cba3d597efc5a3ab0fe0de2feea2f931d..3f43e510b311f38f0795ada3f6218387cd504b14 100644
--- a/Reconstruction/MET/METReconstruction/Root/METTruthAssociator.cxx
+++ b/Reconstruction/MET/METReconstruction/Root/METTruthAssociator.cxx
@@ -40,7 +40,7 @@ namespace met {
using namespace xAOD;
- static SG::AuxElement::ConstAccessor<std::vector<ElementLink<IParticleContainer> > > cacc_ghosttruth("GhostTruth");
+ static const SG::AuxElement::ConstAccessor<std::vector<ElementLink<IParticleContainer> > > cacc_ghosttruth("GhostTruth");
// Constructors
////////////////
diff --git a/Reconstruction/MET/METReconstruction/python/LegacyRunII/__init__.py b/Reconstruction/MET/METReconstruction/python/LegacyRunII/__init__.py
old mode 100644
new mode 100755
diff --git a/Reconstruction/MET/METUtilities/CMakeLists.txt b/Reconstruction/MET/METUtilities/CMakeLists.txt
index 87d5220ad7f46bf77598f65880fbefba984a5165..0761e7e20ee1e36d696f4c71d74130b31ffa90eb 100644
--- a/Reconstruction/MET/METUtilities/CMakeLists.txt
+++ b/Reconstruction/MET/METUtilities/CMakeLists.txt
@@ -21,29 +21,6 @@ else()
Control/AthenaBaseComps )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- Reconstruction/MET/METInterface
- PRIVATE
- Event/EventPrimitives
- Event/FourMomUtils
- Event/xAOD/xAODCore
- PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
- PhysicsAnalysis/MuonID/MuonSelectorTools
- PhysicsAnalysis/TauID/TauAnalysisTools
- Tools/PathResolver
- ${extra_deps} )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
find_package( GTest )
@@ -55,6 +32,7 @@ atlas_add_library( METUtilitiesLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODJet xAODMissingET
xAODMuon xAODTau xAODTracking InDetTrackSelectionToolLib PATInterfaces
+ EgammaAnalysisInterfacesLib MuonAnalysisInterfacesLib JetCalibToolsLib ElectronPhotonFourMomentumCorrectionLib tauRecToolsLib
METInterface AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES EventPrimitives FourMomUtils xAODCore PathResolver )
@@ -62,8 +40,8 @@ if( NOT XAOD_STANDALONE )
atlas_add_component( METUtilities
src/*.h src/*.cxx src/components/*.cxx
LINK_LIBRARIES GaudiKernel AthenaBaseComps METInterface xAODEgamma
- xAODMuon xAODTau xAODMissingET xAODJet MuonSelectorToolsLib
- EgammaAnalysisInterfacesLib TauAnalysisToolsLib METUtilitiesLib )
+ xAODMuon xAODTau xAODMissingET xAODJet JetCalibToolsLib ElectronPhotonFourMomentumCorrectionLib MuonSelectorToolsLib tauRecToolsLib
+ TauAnalysisToolsLib METUtilitiesLib )
endif()
atlas_add_dictionary( METUtilitiesDict
diff --git a/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h b/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h
index fc45f1c2489de70bd4c006ed89af2e1ba3168f27..f11446c397e52aba7760885d6ba51c32199fcbe4 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h
@@ -10,7 +10,7 @@
// Author: Russell Smith <rsmith@cern.ch>
///////////////////////////////////////////////////////////////////
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
#include "xAODTau/TauJet.h"
#include "xAODEgamma/Electron.h"
diff --git a/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h b/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
new file mode 100644
index 0000000000000000000000000000000000000000..84b9f18eac77278c67dc91da8a00cafa43d8210e
--- /dev/null
+++ b/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
@@ -0,0 +1,45 @@
+///////////////////////// -*- C++ -*- /////////////////////////////
+
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// METHelpers.h
+// Header file for METHelpers functions
+// Author: T.J.Khoo<khoo@cern.ch>
+// Author: Bill Balunas <bill.balunas@cern.ch>
+///////////////////////////////////////////////////////////////////
+#ifndef METUTILITIES_MET_METHELPERS_H
+#define METUTILITIES_MET_METHELPERS_H 1
+
+// Framework includes
+#include "AsgMessaging/MessageCheck.h"
+#include "AsgMessaging/StatusCode.h"
+
+#include "xAODMuon/MuonContainer.h"
+#include "xAODJet/JetContainer.h"
+#include "xAODMissingET/MissingETContainer.h"
+
+namespace met {
+
+ ANA_MSG_HEADER (msgMET)
+
+ const static MissingETBase::Types::bitmask_t invisSource = 0x100000; // doesn't overlap with any other
+
+ void addGhostMuonsToJets(const xAOD::MuonContainer& muons, xAOD::JetContainer& jets);
+
+ StatusCode buildMETSum(const std::string& totalName,
+ xAOD::MissingETContainer* metCont);
+
+ StatusCode buildMETSum(const std::string& totalName,
+ xAOD::MissingETContainer* metCont,
+ MissingETBase::Types::bitmask_t softTermsSource);
+
+ StatusCode fillMET(xAOD::MissingET *& met,
+ xAOD::MissingETContainer * metCont,
+ const std::string& metKey,
+ const MissingETBase::Types::bitmask_t metSource);
+
+}
+
+#endif
diff --git a/Reconstruction/MET/METUtilities/METUtilities/METMaker.h b/Reconstruction/MET/METUtilities/METUtilities/METMaker.h
index 5d92d554aed9c2fc794f5baac5f93401bab29174..dc6bb7484510e0a76c02d7dafb6cc76f59de1228 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/METMaker.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/METMaker.h
@@ -123,10 +123,6 @@ namespace met {
xAOD::MissingETAssociationHelper* helper,
xAOD::MissingETContainer* metCont);
- StatusCode buildMETSum(const std::string& totalName,
- xAOD::MissingETContainer* metCont,
- MissingETBase::Types::bitmask_t softTermsSource);
-
///////////////////////////////////////////////////////////////////
// Const methods:
///////////////////////////////////////////////////////////////////
@@ -140,10 +136,6 @@ namespace met {
///////////////////////////////////////////////////////////////////
private:
- StatusCode fillMET(xAOD::MissingET *& met,
- xAOD::MissingETContainer * metCont,
- const std::string& metKey,
- const MissingETBase::Types::bitmask_t metSource);
bool acceptTrack(const xAOD::TrackParticle* trk, const xAOD::Vertex* vx) const;
const xAOD::Vertex* getPV() const;
diff --git a/Reconstruction/MET/METUtilities/METUtilities/METRebuilder.h b/Reconstruction/MET/METUtilities/METUtilities/METRebuilder.h
index 5973a835985dcb060227db572b6b55b85ca8e89d..c667289839b7a74cc808908228770171e76b7012 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/METRebuilder.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/METRebuilder.h
@@ -135,9 +135,6 @@ namespace met {
float& stvf,
const xAOD::MissingETComponent* comp_softtrk=0);
- StatusCode buildMETSum(const std::string& totalName,
- xAOD::MissingETContainer* metCont);
-
///////////////////////////////////////////////////////////////////
// Const methods:
///////////////////////////////////////////////////////////////////
@@ -153,12 +150,6 @@ namespace met {
bool acceptTrack(const xAOD::TrackParticle* trk,
const xAOD::Vertex* pv) const;
void associateTracks(const xAOD::IParticle* obj);
- StatusCode fillMET(xAOD::MissingET *& met,
- xAOD::MissingETContainer * metCont,
- const std::string& metKey,
- const MissingETBase::Types::bitmask_t metSource);
-
-
/// Default constructor:
METRebuilder();
diff --git a/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h b/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h
index e4f1560d591e8f7f14138d60e0c2f92820d83d95..fc9fdd87b7decb0ddfa8c52b8abb220066980f03 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/METSignificance.h
@@ -1,19 +1,25 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// METSignificance.h
// Header file for class METSignificance
// Author: P. Francavilla<francav@cern.ch>
+// Author: D. Schaefer <schae@cern.ch>
///////////////////////////////////////////////////////////////////
#ifndef METUTILITIES_MET_METSIGNIFICANCE_H
#define METUTILITIES_MET_METSIGNIFICANCE_H 1
// STL includes
#include <string>
+#include <tuple>
+
+// ROOT includes
+#include "TH2F.h"
+#include "TFile.h"
// FrameWork includes
-#include "AsgTools/ToolHandle.h"
+#include "AsgTools/AnaToolHandle.h"
#include "AsgTools/AsgTool.h"
// METInterface includes
@@ -22,10 +28,12 @@
// EDM includes
#include "xAODJet/JetContainer.h"
-// Tracking Tool
+// Tool interfaces
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h"
-
-// Forward declaration
+#include "EgammaAnalysisInterfaces/IEgammaCalibrationAndSmearingTool.h"
+#include "MuonAnalysisInterfaces/IMuonCalibrationAndSmearingTool.h"
+#include "JetCalibTools/IJetCalibrationTool.h"
+#include "tauRecTools/ITauToolBase.h"
namespace met {
@@ -40,9 +48,6 @@ namespace met {
// This macro defines the constructor with the interface declaration
ASG_TOOL_CLASS(METSignificance, IMETSignificance)
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
public:
// Copy constructor:
@@ -56,26 +61,123 @@ namespace met {
// Athena algtool's Hooks
StatusCode initialize();
StatusCode finalize();
-
- StatusCode varianceMET(xAOD::MissingETContainer* metCont);
+ StatusCode varianceMET(xAOD::MissingETContainer* metCont, float avgmu, std::string jetTermName, std::string softTermName, std::string totalMETName);
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
+ // Rotates the phi direction of the object resolutions & recomputes the MET significance
+ StatusCode RotateToPhi(float phi);
+
+ // Subtracts the vector lambda from the MET & recomputes the MET signficance in new MET - lambda direction
+ StatusCode SetLambda(const float px, const float py, const bool GeV=true);
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
+ double GetMETOverSqrtSumET() const { if(m_sumet>0.0) return (m_met/sqrt(m_sumet)); return -1.0; }
+ double GetMETOverSqrtHT () const { if(m_ht>0.0) return (m_met/sqrt(m_ht)); return -1.0; }
+ double GetSignificance() const { if(m_significance>0.0) return sqrt(m_significance); return -1.0; }
+ double GetSigDirectional() const { if(m_VarL>0.0) return m_met/sqrt(m_VarL); return -1.0; }
+ double GetRho() const { return m_rho; }
+ double GetVarL() const { return m_VarL; }
+ double GetVarT() const { return m_VarT; }
+ double GetTermVarL(const int term) const { if(m_term_VarL.find(term)!=m_term_VarL.end()) return m_term_VarL.find(term)->second; return -1.0e3; }
+ double GetTermVarT(const int term) const { if(m_term_VarT.find(term)!=m_term_VarT.end()) return m_term_VarT.find(term)->second; return -1.0e3; }
- ///////////////////////////////////////////////////////////////////
- // Private data:
- ///////////////////////////////////////////////////////////////////
private:
/// Default constructor:
METSignificance();
+ asg::AnaToolHandle<IJetCalibrationTool> m_jetCalibTool;
+ asg::AnaToolHandle<CP::IMuonCalibrationAndSmearingTool> m_muonCalibrationAndSmearingTool;
+ asg::AnaToolHandle<CP::IEgammaCalibrationAndSmearingTool> m_egammaCalibTool;
+ asg::AnaToolHandle<ITauToolBase> m_tCombinedP4FromRecoTaus;
+
+ StatusCode AddMuon (const xAOD::IParticle* obj, float &pt_reso, float &phi_reso, float avgmu);
+ StatusCode AddElectron(const xAOD::IParticle* obj, float &pt_reso, float &phi_reso, float avgmu);
+ StatusCode AddPhoton (const xAOD::IParticle* obj, float &pt_reso, float &phi_reso);
+ StatusCode AddJet (const xAOD::IParticle* obj, float &pt_reso, float &phi_reso, float &avgmu);
+ void AddTau (const xAOD::IParticle* obj, float &pt_reso, float &phi_reso);
+ void AddSoftTerm(const xAOD::MissingET* soft, const TVector3 &met_vect, double (&particle_sum)[2][2]);
+
+ double GetPUProb(double jet_eta, double jet_phi,double jet_pt, double jet_jvt, double jet_fjvt, float avgmu);
+ double GetPhiUnc(double jet_eta, double jet_phi,double jet_pt);
+ static unsigned int getEtaBin(double jet_eta);
+
+ std::tuple<double,double,double> CovMatrixRotation(double var_x, double var_y, double cv_xy, double Phi);
+
+ double Significance_LT(double Numerator, double var_parall, double var_perpen, double cov);
+
+ void InvertMatrix(double (&mat)[2][2], double (&m)[2][2]);
+ void AddMatrix(double (&X)[2][2],double (&Y)[2][2], double (&mat_new)[2][2]);
+ void RotateXY(const double (&mat)[2][2], double (&mat_new)[2][2], double phi);
+
+ // soft term bias
+ double BiasPtSoftdir(const double PtSoft);
+ double VarparPtSoftdir(const double PtSoft, const double SoftSumet);
+
+ // pthard - parameterization
+ double Bias_PtSoftParall(const double PtSoft_Parall);
+ double Var_Ptsoft(const double PtSoft);
+
+ // Fill Reso map
+ void AddResoMap(const double varL, const double varT, const double CvTV, const int term);
+
+ double m_GeV;
+
+ TVector3 m_met_vect;
+ TVector3 m_soft_vect;
+ TVector3 m_pthard_vect;
+ TVector3 m_lamda_vect;
+
+ int m_softTermParam;
+ double m_softTermReso;
+ bool m_treatPUJets;
+ bool m_doPhiReso;
+ bool m_applyBias;
+ bool m_jerForEMu;
+
+ bool m_isDataJet;
+ bool m_isDataMuon;
+ bool m_isAFII;
+
+ // set limits
+ float m_jetPtThr;
+ float m_jetEtaThr;
+
+ double m_scalarBias;
+ double m_significance;
+ double m_rho;
+ double m_VarL;
+ double m_VarT;
+ double m_CvLT;
+
+ double m_met_VarL;
+ double m_met_VarT;
+ double m_met_CvLT;
+
+ std::map<int, double> m_term_VarL;
+ std::map<int, double> m_term_VarT;
+ std::map<int, double> m_term_CvLT;
+
+ double m_met;
+ double m_metx;
+ double m_mety;
+ double m_metphi;
+ double m_metsoft;
+ double m_metsoftphi;
+ double m_ht;
+ double m_sumet;
+
+ // Jet Uncertainties
+ TFile *m_file;
+ TH2F *m_phi_reso_pt20;
+ TH2F *m_phi_reso_pt50;
+ TH2F *m_phi_reso_pt100;
+
+ std::string m_configPrefix;
+ std::string m_configJetPhiResoFile;
+ std::string m_JetResoAux;
+ std::string m_EMuResoAux;
+ std::string m_JetCollection;
+
};
} //> end namespace met
diff --git a/Reconstruction/MET/METUtilities/Root/METHelpers.cxx b/Reconstruction/MET/METUtilities/Root/METHelpers.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..7a1083a59b9bb78f6c74fe4e37fc4639b202198c
--- /dev/null
+++ b/Reconstruction/MET/METUtilities/Root/METHelpers.cxx
@@ -0,0 +1,145 @@
+///////////////////////// -*- C++ -*- /////////////////////////////
+
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// METHelpers.cxx
+// Implementation file for standalone METHelpers functions
+// Author: T.J.Khoo<khoo@cern.ch>
+// Author: Bill Balunas <bill.balunas@cern.ch>
+///////////////////////////////////////////////////////////////////
+
+// METUtilities includes
+#include "METUtilities/METHelpers.h"
+
+// Muon EDM
+#include "xAODMuon/MuonContainer.h"
+
+// Electron EDM
+#include "xAODEgamma/ElectronContainer.h"
+#include "xAODEgamma/EgammaxAODHelpers.h"
+
+// Jet EDM
+#include "xAODJet/JetContainer.h"
+
+#include "FourMomUtils/xAODP4Helpers.h"
+
+#include <iostream>
+
+namespace met {
+
+ ANA_MSG_SOURCE (msgMET, "METUtilities")
+
+ void addGhostMuonsToJets(const xAOD::MuonContainer& muons, xAOD::JetContainer& jets)
+ {
+ std::vector<const xAOD::TrackParticle*> jet_tracks;
+ for (const auto& jet: jets) {
+ // Fill this with muons to be associated
+ std::vector<const xAOD::Muon*> muons_in_jet;
+ // Get the tracks associated to the jet
+ jet_tracks.clear();
+ if ( jet->getAssociatedObjects("GhostTrack", jet_tracks) ) {
+
+ for(const auto& muon : muons) {
+ const xAOD::TrackParticle* idtrack = muon->trackParticle( xAOD::Muon::InnerDetectorTrackParticle );
+ if(!idtrack) continue;
+ // check if this is ghost associated to a jet
+ // make sure the jet is close first
+ if(xAOD::P4Helpers::deltaR2(*jet,*muon)>0.36) continue;
+
+ for(unsigned jtrk=0; jtrk<jet_tracks.size(); ++jtrk) {
+ // check if the track pointers match
+ if(jet_tracks.at(jtrk)==idtrack) {
+ muons_in_jet.push_back(muon);
+ break;
+ }
+ } // loop over jet tracks
+ } // loop over muons
+ } // jet has associated tracks
+ jet->setAssociatedObjects( "GhostMuon", muons_in_jet) ;
+ } // loop over jets
+ }
+
+ StatusCode buildMETSum(const std::string& totalName,
+ xAOD::MissingETContainer* metCont)
+ {
+ using namespace msgMET;
+ ANA_MSG_DEBUG("Build MET total: " << totalName);
+
+ xAOD::MissingET* metFinal = nullptr;
+ if(fillMET(metFinal, metCont, totalName, MissingETBase::Source::total()) != StatusCode::SUCCESS){
+ ANA_MSG_ERROR("failed to fill MET term");
+ return StatusCode::FAILURE;
+ }
+
+ for(xAOD::MissingETContainer::const_iterator iMET=metCont->begin(); iMET!=metCont->end(); ++iMET) {
+ if(*iMET==metFinal) continue;
+ *metFinal += **iMET;
+ }
+
+ ANA_MSG_DEBUG( "Rebuilt MET Final --"
+ << " mpx: " << metFinal->mpx()
+ << " mpy: " << metFinal->mpy()
+ );
+
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode buildMETSum(const std::string& totalName,
+ xAOD::MissingETContainer* metCont,
+ MissingETBase::Types::bitmask_t softTermsSource)
+ {
+ using namespace msgMET;
+ ANA_MSG_DEBUG("Build MET total: " << totalName);
+
+ xAOD::MissingET* metFinal = nullptr;
+ if( fillMET(metFinal, metCont, totalName, MissingETBase::Source::total()) != StatusCode::SUCCESS) {
+ ANA_MSG_ERROR("failed to fill MET term \"" << totalName << "\"");
+ return StatusCode::FAILURE;
+ }
+
+ for(const auto& met : *metCont) {
+ if(MissingETBase::Source::isTotalTerm(met->source())) continue;
+ if(met->source()==invisSource) continue;
+ if(softTermsSource && MissingETBase::Source::isSoftTerm(met->source())) {
+ if(!MissingETBase::Source::hasPattern(met->source(),softTermsSource)) continue;
+ }
+ ANA_MSG_VERBOSE("Add MET term " << met->name() );
+ *metFinal += *met;
+ }
+
+ ANA_MSG_DEBUG( "Rebuilt MET Final --"
+ << " mpx: " << metFinal->mpx()
+ << " mpy: " << metFinal->mpy()
+ );
+
+ return StatusCode::SUCCESS;
+ }
+
+ // This is used to avoid creating a private store
+ // It puts the given new MET object into the container
+ StatusCode fillMET(xAOD::MissingET *& met,
+ xAOD::MissingETContainer * metCont,
+ const std::string& metKey,
+ const MissingETBase::Types::bitmask_t metSource){
+ using namespace msgMET;
+ if(met != nullptr){
+ ANA_MSG_ERROR("You can't fill a filled MET value");
+ return StatusCode::FAILURE;
+ }
+ if(metCont->find(metKey)!=metCont->end()){
+ ANA_MSG_ERROR("Attempted to add a duplicate MET term: " << metKey);
+ return StatusCode::FAILURE;
+ }
+
+ met = new xAOD::MissingET();
+ metCont->push_back(met);
+
+ met->setName (metKey);
+ met->setSource(metSource);
+
+ return StatusCode::SUCCESS;
+ }
+
+}
diff --git a/Reconstruction/MET/METUtilities/Root/METMaker.cxx b/Reconstruction/MET/METUtilities/Root/METMaker.cxx
index 8cf2a1da64f1dd5277f9e68b3d7a7d7ffbc4a4c6..18bfcb87fa9d993a65e8e1a6b51094ae8f2e139c 100644
--- a/Reconstruction/MET/METUtilities/Root/METMaker.cxx
+++ b/Reconstruction/MET/METUtilities/Root/METMaker.cxx
@@ -11,6 +11,7 @@
// METUtilities includes
#include "METUtilities/METMaker.h"
+#include "METUtilities/METHelpers.h"
// MET EDM
#include "xAODMissingET/MissingETContainer.h"
@@ -79,8 +80,6 @@ namespace met {
// Implement dphi as well if we start correcting the jet phi.
// static const SG::AuxElement::Decorator< std::vector<float> > dec_constitObjDphis("ConstitObjectDphis");
- const static MissingETBase::Types::bitmask_t invisSource = 0x100000; // doesn't overlap with any other
-
///////////////////////////////////////////////////////////////////
// Public methods:
///////////////////////////////////////////////////////////////////
@@ -1058,59 +1057,6 @@ namespace met {
return rebuildMET(met,collection,helper,MissingETBase::UsageHandler::PhysicsObject);
}
- // **** Sum up MET terms ****
-
- StatusCode METMaker::buildMETSum(const std::string& totalName,
- xAOD::MissingETContainer* metCont,
- MissingETBase::Types::bitmask_t softTermsSource)
- {
- ATH_MSG_DEBUG("Build MET total: " << totalName);
-
- MissingET* metFinal = nullptr;
- if( fillMET(metFinal, metCont, totalName, MissingETBase::Source::total()) != StatusCode::SUCCESS) {
- ATH_MSG_ERROR("failed to fill MET term \"" << totalName << "\"");
- return StatusCode::FAILURE;
- }
-
- for(const auto& met : *metCont) {
- if(MissingETBase::Source::isTotalTerm(met->source())) continue;
- if(met->source()==invisSource) continue;
- if(softTermsSource && MissingETBase::Source::isSoftTerm(met->source())) {
- if(!MissingETBase::Source::hasPattern(met->source(),softTermsSource)) continue;
- }
- ATH_MSG_VERBOSE("Add MET term " << met->name() );
- *metFinal += *met;
- }
-
- ATH_MSG_DEBUG( "Rebuilt MET Final --"
- << " mpx: " << metFinal->mpx()
- << " mpy: " << metFinal->mpy()
- );
-
- return StatusCode::SUCCESS;
- }
-
- //this is used to not create a private store
- //it puts the given new MET object into the container
- StatusCode METMaker::fillMET(xAOD::MissingET *& met,
- xAOD::MissingETContainer * metCont,
- const std::string& metKey,
- const MissingETBase::Types::bitmask_t metSource){
- if(met != nullptr){
- ATH_MSG_ERROR("You can't fill a filled MET value");
- return StatusCode::FAILURE;
- }
- metCont->reserve(10);
-
- met = new xAOD::MissingET();
- metCont->push_back(met);
-
- met->setName (metKey);
- met->setSource(metSource);
-
- return StatusCode::SUCCESS;
- }
-
// Accept Track
////////////////
bool METMaker::acceptTrack(const xAOD::TrackParticle* trk, const xAOD::Vertex* vx) const
diff --git a/Reconstruction/MET/METUtilities/Root/METRebuilder.cxx b/Reconstruction/MET/METUtilities/Root/METRebuilder.cxx
index ce42fe26085b41f4fe5a582efbe45e68d725e59c..f3d6e99536eeebd0f68bc9c16c244bf623493e14 100644
--- a/Reconstruction/MET/METUtilities/Root/METRebuilder.cxx
+++ b/Reconstruction/MET/METUtilities/Root/METRebuilder.cxx
@@ -11,6 +11,7 @@
// METUtilities includes
#include "METUtilities/METRebuilder.h"
+#include "METUtilities/METHelpers.h"
// MET EDM
#include "xAODMissingET/MissingETContainer.h"
@@ -684,34 +685,6 @@ namespace met {
return StatusCode::SUCCESS;
}
- // **** Sum up MET terms ****
-
- StatusCode METRebuilder::buildMETSum(const std::string& totalName,
- xAOD::MissingETContainer* metCont)
- {
- ATH_MSG_DEBUG("Build MET total: " << totalName);
-
- MissingET* metFinal = nullptr; // new MissingET(0.,0.,0.,"Final",MissingETBase::Source::total());
- if(fillMET(metFinal, metCont, totalName, MissingETBase::Source::total()) != StatusCode::SUCCESS){
- ATH_MSG_ERROR("failed to fill MET term");
- return StatusCode::FAILURE;
- }
- // metCont->push_back(metFinal);
-
- for(MissingETContainer::const_iterator iMET=metCont->begin();
- iMET!=metCont->end(); ++iMET) {
- if(*iMET==metFinal) continue;
- *metFinal += **iMET;
- }
-
- ATH_MSG_DEBUG( "Rebuilt MET Final --"
- << " mpx: " << metFinal->mpx()
- << " mpy: " << metFinal->mpy()
- );
-
- return StatusCode::SUCCESS;
- }
-
///////////////////////////////////////////////////////////////////
// Const methods:
///////////////////////////////////////////////////////////////////
@@ -802,23 +775,5 @@ namespace met {
///////////////////////////////////////////////////////////////////
// Non-const methods:
///////////////////////////////////////////////////////////////////
- StatusCode METRebuilder::fillMET(xAOD::MissingET *& met,
- xAOD::MissingETContainer * metCont,
- const std::string& metKey,
- const MissingETBase::Types::bitmask_t metSource){
- if(met){
- ATH_MSG_ERROR("You can't fill a filled MET value");
- return StatusCode::FAILURE;
- }
-
- met = new xAOD::MissingET;
- metCont->push_back(met);
-
- met->setName (metKey);
- met->setSource(metSource);
-
- return StatusCode::SUCCESS;
-}
-
} //> end namespace met
diff --git a/Reconstruction/MET/METUtilities/Root/METSignificance.cxx b/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
index 548d39233c55123367ff1e173ceb19091da199f2..e1a0fce43ebc4ec8bdede04f331292f3017fbf38 100644
--- a/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
+++ b/Reconstruction/MET/METUtilities/Root/METSignificance.cxx
@@ -1,10 +1,11 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// METSignificance.cxx
// Implementation file for class METSignificance
// Author: P.Francavilla<francav@cern.ch>
+// Author: D.Schaefer<schae@cern.ch>
///////////////////////////////////////////////////////////////////
// METUtilities includes
@@ -14,140 +15,1030 @@
#include "xAODMissingET/MissingETContainer.h"
#include "xAODMissingET/MissingETComposition.h"
#include "xAODMissingET/MissingETAuxContainer.h"
-#include "xAODMissingET/MissingETAssociationMap.h"
// Jet EDM
#include "xAODJet/JetAttributes.h"
-// Tracking EDM
-#include "xAODTracking/TrackParticle.h"
-#include "xAODTracking/VertexContainer.h"
+// Other xAOD EDM
+#include "xAODTruth/TruthParticle.h"
+#include "xAODMuon/MuonContainer.h"
+#include "xAODEgamma/ElectronContainer.h"
+#include "xAODEgamma/PhotonContainer.h"
+#include "xAODTau/TauJetContainer.h"
-// Shallow copy
-#include "xAODCore/ShallowCopy.h"
+#include "tauRecTools/CombinedP4FromRecoTaus.h"
+#include "PathResolver/PathResolver.h"
-// Muon EDM
-#include "xAODMuon/MuonContainer.h"
+// Needed for xAOD::get_eta_calo() function
-namespace met {
-
- using std::vector;
-
- using xAOD::MissingET;
- using xAOD::MissingETContainer;
- using xAOD::MissingETAssociation;
- using xAOD::MissingETAssociationMap;
- using xAOD::MissingETAuxContainer;
- using xAOD::MissingETComposition;
- //
- using xAOD::IParticle;
- using xAOD::IParticleContainer;
- //
- using xAOD::JetContainer;
- using xAOD::JetConstituentVector;
- //
- using xAOD::TrackParticle;
- // using xAOD::VertexContainer;
- // using xAOD::Vertex;
-
- typedef ElementLink<xAOD::IParticleContainer> iplink_t;
+#include "ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h"
+#ifdef XAOD_STANDALONE
+#include "JetCalibTools/JetCalibrationTool.h"
+#endif
+
+namespace met {
- static const SG::AuxElement::ConstAccessor<float> acc_varX("varX");
- static const SG::AuxElement::ConstAccessor<float> acc_varY("varY");
- static const SG::AuxElement::ConstAccessor<float> acc_covXY("covXY");
-
- static const SG::AuxElement::Decorator< std::vector<iplink_t > > dec_constitObjLinks("ConstitObjectLinks");
+ typedef ElementLink<xAOD::IParticleContainer> iplink_t;
- const static MissingETBase::Types::bitmask_t invisSource = 0x100000; // doesn't overlap with any other
+ static const SG::AuxElement::ConstAccessor<float> acc_varX("varX");
+ static const SG::AuxElement::ConstAccessor<float> acc_varY("varY");
+ static const SG::AuxElement::ConstAccessor<float> acc_covXY("covXY");
+ static const SG::AuxElement::ConstAccessor<float> acc_jvt("Jvt");
+ static const SG::AuxElement::ConstAccessor<float> acc_fjvt("fJvt");
+ static const SG::AuxElement::ConstAccessor<float> acc_fjvt_der("DFCommonJets_fJvt");
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
+ static const SG::AuxElement::ConstAccessor< std::vector<iplink_t > > dec_constitObjLinks("ConstitObjectLinks");
+ const static MissingETBase::Types::bitmask_t invisSource = 0x100000; // doesn't overlap with any other
- // Constructors
- ////////////////
- METSignificance::METSignificance(const std::string& name) :
- AsgTool(name)
- {
- //
- // Property declaration
- //
- //declareProperty("TrackSelectorTool", m_trkseltool );
+ METSignificance::METSignificance(const std::string& name) :
+ AsgTool(name),
+ m_jetCalibTool(""),
+ m_muonCalibrationAndSmearingTool(""),
+ m_egammaCalibTool(""),
+ m_tCombinedP4FromRecoTaus(""),
+ m_GeV(1.0e3),
+ m_softTermParam(met::Random),
+ m_jerForEMu(false),
+ m_jetPtThr(-1.0),
+ m_jetEtaThr(-1.0),
+ m_significance(0.0),
+ m_rho(0.0),
+ m_VarL(0.0),
+ m_VarT(0.0),
+ m_CvLT(0.0),
+ m_met_VarL(0.0),
+ m_met_VarT(0.0),
+ m_met_CvLT(0.0),
+ m_met(0.0),
+ m_metphi(0.0),
+ m_ht(0.0),
+ m_sumet(0.0),
+ m_file(0),
+ m_phi_reso_pt20(0),
+ m_phi_reso_pt50(0),
+ m_phi_reso_pt100(0)
+ {
+ declareProperty("SoftTermParam", m_softTermParam = met::Random );
+ declareProperty("SoftTermReso", m_softTermReso = 10.0 );
+ declareProperty("TreatPUJets", m_treatPUJets = true );
+ declareProperty("DoPhiReso", m_doPhiReso = false );
+ declareProperty("ApplyBias", m_applyBias = false );
+ declareProperty("DoJerForEMu", m_jerForEMu = false ); // run jet resolution for all electrons and muons
+ declareProperty("ScalarBias", m_scalarBias = 0.0 );
+ declareProperty("JetPtThr", m_jetPtThr = -1.0 );
+ declareProperty("JetEtaThr", m_jetEtaThr = -1.0 );
+ declareProperty("ConfigPrefix", m_configPrefix = "METUtilities/data17_13TeV/metsig_Aug15/");
+ declareProperty("ConfigJetPhiResoFile", m_configJetPhiResoFile = "jet_unc.root" );
+ declareProperty("JetResoAux", m_JetResoAux = "" ); // relative pT resolution in addition to normal JES
+ declareProperty("EMuResoAux", m_EMuResoAux = "" ); // aux string sets a bool for the leptons to run the jet resolation
+ declareProperty("JetCollection", m_JetCollection = "AntiKt4EMTopo" );
+
+ // properties to delete eventually
+ declareProperty("IsDataJet", m_isDataJet = false );
+ declareProperty("IsDataMuon", m_isDataMuon = false );
+ declareProperty("IsAFII", m_isAFII = false );
+
+ // Phi resolution
+ std::string configpath = PathResolverFindCalibFile(m_configPrefix+m_configJetPhiResoFile);
+ m_file = TFile::Open(configpath.c_str());
+ if(m_file){
+ m_phi_reso_pt20 = static_cast<TH2F *>(m_file->Get("phi_reso_pt20"));
+ if(!m_phi_reso_pt20) ATH_MSG_ERROR("PU Jet Uncertainty Histogram not valid");
+ m_phi_reso_pt50 = static_cast<TH2F *>(m_file->Get("phi_reso_pt50"));
+ if(!m_phi_reso_pt50) ATH_MSG_ERROR("PU Jet Uncertainty Histogram not valid");
+ m_phi_reso_pt100 = static_cast<TH2F *>(m_file->Get("phi_reso_pt100"));
+ if(!m_phi_reso_pt100) ATH_MSG_ERROR("PU Jet Uncertainty Histogram not valid");
}
-
- // Destructor
- ///////////////
- METSignificance::~METSignificance()
- {}
-
- // Athena algtool's Hooks
- ////////////////////////////
- StatusCode METSignificance::initialize()
- {
- ATH_MSG_INFO ("Initializing " << name() << "...");
-
- return StatusCode::SUCCESS;
+ else{
+ ATH_MSG_ERROR("PU Jet Uncertainty TFile is not valid: " << configpath);
}
+ }
+
+ METSignificance::~METSignificance(){}
+
+ StatusCode METSignificance::initialize(){
+
+ ATH_MSG_INFO ("Initializing " << name() << "...");
+ ATH_MSG_INFO("Set up JER tools");
+ std::string toolName;
+ std::string jetcoll = "AntiKt4EMTopoJets";
+ toolName = "JetCalibrationTool/jetCalibTool_"+m_JetCollection;
+ ATH_MSG_INFO("Set up jet resolution tool");
+ m_jetCalibTool.setTypeAndName(toolName);
+
+ if( !m_jetCalibTool.isUserConfigured() ){
+
+ std::string config = "JES_data2017_2016_2015_Recommendation_Aug2018_rel21.config";
+ std::string calibSeq = "JetArea_Residual_EtaJES_GSC_Smear";
+ std::string calibArea = "00-04-81";
+ if(m_JetCollection=="AntiKt4EMPFlow"){
+ config = "JES_data2017_2016_2015_Recommendation_PFlow_Aug2018_rel21.config";
+ calibSeq = "JetArea_Residual_EtaJES_GSC_Smear";
+ calibArea = "00-04-81";
+ }
- StatusCode METSignificance::finalize()
- {
- ATH_MSG_INFO ("Finalizing " << name() << "...");
-
+ ANA_CHECK( ASG_MAKE_ANA_TOOL(m_jetCalibTool, JetCalibrationTool) );
+ ANA_CHECK( m_jetCalibTool.setProperty("JetCollection",m_JetCollection) );
+ ANA_CHECK( m_jetCalibTool.setProperty("ConfigFile",config) );
+ ANA_CHECK( m_jetCalibTool.setProperty("CalibSequence",calibSeq) );
+ ANA_CHECK( m_jetCalibTool.setProperty("CalibArea",calibArea) );
+ ANA_CHECK( m_jetCalibTool.setProperty("IsData",false) ); // configure for MC due to technical reasons. Both data and MC smearing are available with this setting.
+ ANA_CHECK( m_jetCalibTool.retrieve() );
+ }
+
+ ATH_MSG_INFO("Set up MuonCalibrationAndSmearing tools");
+ toolName = "MuonCalibrationAndSmearingTool";
+ m_muonCalibrationAndSmearingTool.setTypeAndName("CP::MuonCalibrationAndSmearingTool/METSigAutoConf_"+toolName);
+ ATH_CHECK(m_muonCalibrationAndSmearingTool.retrieve());
+
+ ATH_MSG_DEBUG( "Initialising EgcalibTool " );
+ toolName = "EgammaCalibrationAndSmearingTool";
+ m_egammaCalibTool.setTypeAndName("CP::EgammaCalibrationAndSmearingTool/METSigAutoConf_" + toolName);
+ ATH_CHECK(m_egammaCalibTool.setProperty("ESModel", "es2017_R21_v0"));
+ ATH_CHECK(m_egammaCalibTool.setProperty("decorrelationModel", "1NP_v1"));
+ if(m_isAFII) ATH_CHECK(m_egammaCalibTool.setProperty("useAFII", 1));
+ else ATH_CHECK(m_egammaCalibTool.setProperty("useAFII", 0));
+ ATH_CHECK( m_egammaCalibTool.retrieve() );
+
+ toolName = "TauPerfTool";
+ m_tCombinedP4FromRecoTaus.setTypeAndName("CombinedP4FromRecoTaus/METSigAutoConf_" + toolName);
+ ATH_CHECK(m_tCombinedP4FromRecoTaus.setProperty("WeightFileName", "CalibLoopResult_v04-04.root"));
+ ATH_CHECK( m_tCombinedP4FromRecoTaus.retrieve() );
+
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode METSignificance::finalize(){
+
+ ATH_MSG_INFO ("Finalizing " << name() << "...");
+ delete m_phi_reso_pt20;
+ delete m_phi_reso_pt50;
+ delete m_phi_reso_pt100;
+
+ return StatusCode::SUCCESS;
+ }
+
+ // **** Rebuild generic MET term ****
+ StatusCode METSignificance::varianceMET(xAOD::MissingETContainer* metCont, float avgmu, std::string jetTermName, std::string softTermName, std::string totalMETName){
+
+ // reset variables
+ m_VarL = 0.0;
+ m_VarT = 0.0;
+ m_CvLT = 0.0;
+
+ int metTerm = 0;
+ double particle_sum[2][2] = {{0.0,0.0}, {0.0,0.0}};
+ m_metphi = 0.0; //Angle for rotation of the cov matrix
+ m_met = -1.0; // Numerator
+ m_metsoft = 0.0;
+ m_metsoftphi = 0.0;
+ m_sumet=-1.0;
+ m_ht=0.0;
+ m_term_VarL.clear();
+ m_term_VarT.clear();
+ m_term_CvLT.clear();
+
+ unsigned nIterSoft=0;
+ double softSumET=0.0;
+
+ // first fill the total MET
+ if(metCont->find(totalMETName)!=metCont->end()){
+ const auto &tot_met = static_cast<xAOD::MissingET*>(*(metCont->find(totalMETName)));
+ if(!MissingETBase::Source::isTotalTerm(tot_met->source())){
+ ATH_MSG_ERROR("NOT the total MET with name:" <<totalMETName);
return StatusCode::SUCCESS;
+ }
+ m_met = tot_met->met()/m_GeV;
+ m_metx = tot_met->mpx()/m_GeV;
+ m_mety = tot_met->mpy()/m_GeV;
+ m_metphi = tot_met->phi();
+ m_sumet = tot_met->sumet()/m_GeV;
+ m_ht = m_sumet;
+ ATH_MSG_VERBOSE("total MET: " << m_met << " phi: " << m_metphi << " name: " << tot_met->name());
}
-
-
- // **** Rebuild generic MET term ****
-
-
-
- StatusCode METSignificance::varianceMET(xAOD::MissingETContainer* metCont)
- {
- float varx=0;
- float vary=0;
- float covxy=0;
- for(const auto& met : *metCont) {
- if(MissingETBase::Source::isTotalTerm(met->source())) continue;
- if(met->source()==invisSource) continue;
- if(MissingETBase::Source::isSoftTerm(met->source())) continue;
- ATH_MSG_VERBOSE("Add MET term " << met->name() );
- for(const auto& el : dec_constitObjLinks(*met)) {
- const IParticle* obj(*el);
- //const xAOD::Jet* jet(*el);
- //xAOD::Jet* jet(*el)
- if(acc_varX.isAvailable(*obj) && acc_varY.isAvailable(*obj) && acc_covXY.isAvailable(*obj)) {
- ATH_MSG_VERBOSE("Add object with vars " << acc_varX(*obj)<<","<<acc_varY(*obj)<<","<<acc_covXY(*obj));
- varx+=acc_varX(*obj);
- vary+=acc_varY(*obj);
- covxy+=acc_covXY(*obj);
- //met->add(acc_varX(*el),acc_varY(*el),acc_covXY(*el));
- }
- }
+ else{
+ ATH_MSG_ERROR("Could not find the total MET with name:" <<totalMETName);
+ return StatusCode::SUCCESS;
+ }
+ m_met_vect.SetXYZ(m_metx, m_mety, 0);
+
+ // Fill the remaining terms
+ for(const auto& met : *metCont) {
+
+ // skip the invisible and total MET
+ if(MissingETBase::Source::isTotalTerm(met->source())){
+ ATH_MSG_VERBOSE("Total: " << met->name() << " val: " << met->met());
+ continue;
+ }
+ if(met->source()==invisSource) continue;
+
+ // Soft term collection
+ if(MissingETBase::Source::isSoftTerm(met->source())){
+
+ if(!MissingETBase::Source::hasPattern(met->source(),MissingETBase::Source::Track)) continue;
+ ATH_MSG_VERBOSE("Soft Name: " << met->name());
+ // make sure the container name matches
+ if(met->name()!=softTermName || nIterSoft>0){
+ if(nIterSoft>0) ATH_MSG_ERROR("Found multiple soft terms with the name:" <<softTermName << ". Your MET configuration is wrong!!!");
+ continue;
}
- return StatusCode::SUCCESS;
+ ++nIterSoft;
+ softSumET=(met->sumet()/m_GeV);
+
+ AddSoftTerm(met, m_met_vect, particle_sum);
+ m_metsoft = met->met()/m_GeV;
+ m_metsoftphi = met->phi();
+ metTerm = 2; // this is actually filled in AddSoftTerm
+ // done with the soft term. go to the next term.
+ continue;
+ }
+ ATH_MSG_VERBOSE("Add MET term " << met->name() );
+ for(const auto& el : dec_constitObjLinks(*met)) {
+ const xAOD::IParticle* obj(*el);
+ float pt_reso=0.0, phi_reso=0.0;
+ if(!obj){
+ ATH_MSG_ERROR("Particle pointer is not valid. This will likely result in a crash " << obj);
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_VERBOSE("pT: " << obj->pt() << " type: " << obj->type() << " truth: " << (obj->type()==xAOD::Type::TruthParticle));
+ if(obj->type()==xAOD::Type::Muon || (obj->type()==xAOD::Type::TruthParticle && fabs(static_cast<const xAOD::TruthParticle*>(obj)->pdgId())==13)){
+ ATH_CHECK(AddMuon(obj, pt_reso, phi_reso, avgmu));
+ metTerm=4;
+ }
+ else if(obj->type()==xAOD::Type::Jet){
+ // make sure the container name matches
+ if(met->name()!=jetTermName) continue;
+ ATH_CHECK(AddJet(obj, pt_reso, phi_reso, avgmu));
+ metTerm=1;
+ }
+ else if(obj->type()==xAOD::Type::Electron || (obj->type()==xAOD::Type::TruthParticle && fabs(static_cast<const xAOD::TruthParticle*>(obj)->pdgId())==11)){
+ ATH_CHECK(AddElectron(obj, pt_reso, phi_reso, avgmu));
+ metTerm=3;
+ }
+ else if(obj->type()==xAOD::Type::Photon || (obj->type()==xAOD::Type::TruthParticle && fabs(static_cast<const xAOD::TruthParticle*>(obj)->pdgId())==22)){
+ ATH_CHECK(AddPhoton(obj, pt_reso, phi_reso));
+ metTerm=5;
+ }
+ else if(obj->type()==xAOD::Type::Tau || (obj->type()==xAOD::Type::TruthParticle && fabs(static_cast<const xAOD::TruthParticle*>(obj)->pdgId())==15)){
+ AddTau(obj, pt_reso, phi_reso);
+ metTerm=6;
+ }
+
+ // compute NEW
+ double particle_u[2][2] = {{pt_reso*pt_reso*obj->pt()*obj->pt()/m_GeV/m_GeV,0.0},
+ {0.0,phi_reso*phi_reso/m_GeV/m_GeV}};
+ double particle_u_rot[2][2] = {{pt_reso*pt_reso*obj->pt()*obj->pt()/m_GeV/m_GeV,0.0},
+ {0.0,phi_reso*phi_reso/m_GeV/m_GeV}};
+ RotateXY(particle_u, particle_u_rot,m_met_vect.DeltaPhi(obj->p4().Vect()));
+ m_VarL+=particle_u_rot[0][0];
+ m_VarT+=particle_u_rot[1][1];
+ m_CvLT+=particle_u_rot[0][1];
+
+ // Save the resolutions separated for each object type
+ AddResoMap(particle_u_rot[0][0],
+ particle_u_rot[1][1],
+ particle_u_rot[0][1],
+ metTerm);
+
+ RotateXY (particle_u, particle_u_rot, obj->p4().Phi()); // positive phi rotation
+ AddMatrix(particle_sum, particle_u_rot, particle_sum);
+ // END compute NEW
+
+ ATH_MSG_VERBOSE("Resolution: " << pt_reso << " phi reso: " << phi_reso );
+ }
}
+ // setting the MET directed variables for later phi rotations if requested
+ m_met_VarL=m_VarL;
+ m_met_VarT=m_VarT;
+ m_met_CvLT=m_CvLT;
+
+ if( m_VarL != 0 ){
+
+ if(m_applyBias){
+ TVector3 met_vect = m_met_vect;
+ TVector3 soft_vect = m_soft_vect;
+
+ // should be done to reset the phi as well...
+ if(m_softTermParam==met::TSTParam){
+ Double_t Bias_TST = BiasPtSoftdir(m_metsoft);
+ Double_t MEx = m_met * cos(m_metphi) - Bias_TST * cos(m_metsoftphi);
+ Double_t MEy = m_met * sin(m_metphi) - Bias_TST * sin(m_metsoftphi);
+ met_vect.SetXYZ(MEx,MEy,0.0);
+ }
+ else if(m_softTermParam==met::PthardParam){
+ m_soft_vect.SetPtEtaPhi(m_metsoft, 0.0, m_metsoftphi);
+ m_pthard_vect = m_soft_vect - m_met_vect;
+ Double_t PtSoftparaPH = m_pthard_vect.Mag()>0.0 ? (m_soft_vect.Dot(m_pthard_vect))/m_pthard_vect.Mag() : 0.0;
+ Double_t Bias_pthard = Bias_PtSoftParall(PtSoftparaPH);
+ Double_t MEx = m_met * cos(m_metphi) - Bias_pthard * cos(m_metsoftphi);
+ Double_t MEy = m_met * sin(m_metphi) - Bias_pthard * sin(m_metsoftphi);
+ met_vect.SetXYZ(MEx,MEy,0.0);
+ }
+ // Rotate & compute
+ ATH_CHECK(RotateToPhi(met_vect.Phi()));
+ m_significance = Significance_LT(met_vect.Pt(), m_VarL, m_VarT, m_CvLT);
+ m_rho = m_CvLT / sqrt( m_VarL * m_VarT ) ;
+ }
+ else{
+ // standard calculation
+ m_significance = Significance_LT(m_met, m_VarL, m_VarT, m_CvLT);
+ m_rho = m_CvLT / sqrt( m_VarL * m_VarT ) ;
+ }
+ m_ht-=softSumET;
+ ATH_MSG_VERBOSE(" Significance (squared): " << m_significance << " rho: " << GetRho()
+ << " MET: " << m_met << " phi: " << m_metphi << " SUMET: " << m_sumet << " HT: " << m_ht << " sigmaL: " << GetVarL()
+ << " sigmaT: " << GetVarT() << " MET/sqrt(SumEt): " << GetMETOverSqrtSumET()
+ << " MET/sqrt(HT): " << GetMETOverSqrtHT()
+ << " sqrt(signif): " << GetSignificance()
+ << " sqrt(signifDirectional): " << GetSigDirectional());
+ }
+ else
+ ATH_MSG_DEBUG("Var_L is 0");
+
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode METSignificance::RotateToPhi(float phi){
+
+ // Rotation (components)
+ std::tie(m_VarL, m_VarT, m_CvLT) = CovMatrixRotation(m_met_VarL , m_met_VarT, m_met_CvLT, (phi-m_metphi));
+
+ if( m_VarL != 0 ){
+ m_significance = Significance_LT(m_met,m_VarL,m_VarT,m_CvLT );
+ m_rho = m_CvLT / sqrt( m_VarL * m_VarT ) ;
+ }
+ ATH_MSG_DEBUG(" Significance (squared) at new phi: " << m_significance
+ << " rho: " << GetRho()
+ << " MET: " << m_met
+ << " sigmaL: " << GetVarL()
+ << " sigmaT: " << GetVarT() );
+
+ return StatusCode::SUCCESS;
+ }
+
+ StatusCode METSignificance::SetLambda(const float px, const float py, const bool GeV){
+
+ // compute the new direction
+ double GeVConv = GeV ? 1.0 : m_GeV;
+ m_lamda_vect.SetXYZ(px/GeVConv, py/GeVConv, 0.0);
+ m_lamda_vect = (m_met_vect - m_lamda_vect);
+ const double met_m_lamda = m_lamda_vect.Pt();
+
+ // Rotation (components)
+ std::tie(m_VarL, m_VarT, m_CvLT) = CovMatrixRotation(m_met_VarL , m_met_VarT, m_met_CvLT, (m_lamda_vect.Phi()-m_metphi));
+
+ if( m_VarL != 0 ){
+ m_significance = Significance_LT(met_m_lamda,m_VarL,m_VarT,m_CvLT );
+ m_rho = m_CvLT / sqrt( m_VarL * m_VarT ) ;
+ }
+ ATH_MSG_DEBUG(" Significance (squared) at new phi: " << m_significance
+ << " rho: " << GetRho()
+ << " MET: " << m_met
+ << " sigmaL: " << GetVarL()
+ << " sigmaT: " << GetVarT() );
+
+ return StatusCode::SUCCESS;
+ }
+
+ // Muon propagation of resolution
+ StatusCode METSignificance::AddMuon(const xAOD::IParticle* obj, float &pt_reso, float &phi_reso, float avgmu){
+
+ int dettype = 0;
+ bool DoEMuReso = false;
+ ATH_MSG_VERBOSE("Particle type: " << obj->type());
+
+ if(obj->type()==xAOD::Type::TruthParticle){
+ pt_reso =0.01;
+ if(obj->pt()>0.5e6) pt_reso=0.03;
+ if(obj->pt()>1.0e6) pt_reso=0.1;// this is just a rough estimate for the time being until the interface can handle truth muons
+ }
+ else{
+ const xAOD::Muon* muon(static_cast<const xAOD::Muon*>(obj));
+ if(muon->muonType()==0){//Combined
+ dettype=3;//CB
+ }
+ else if(muon->muonType()==1){//MuonStandAlone
+ dettype=1;//MS
+ }
+ else if(muon->muonType()>1){//Segment, Calo, Silicon
+ dettype=2;//ID
+ }
+ else{
+ ATH_MSG_VERBOSE("This muon had none of the normal muon types (ID,MS,CB) - check this in detail");
+ return StatusCode::FAILURE;
+ }
+ pt_reso=m_muonCalibrationAndSmearingTool->expectedResolution(dettype,*muon,!m_isDataMuon);
+ if(m_doPhiReso) phi_reso = muon->pt()*0.001;
+ // run the jet resolution for muons. for validation region extrapolation
+ if(m_EMuResoAux!=""){
+ SG::AuxElement::ConstAccessor<bool> acc_EMReso(m_EMuResoAux);
+ DoEMuReso = acc_EMReso.isAvailable(*muon) ? acc_EMReso(*muon) : false;
+ }
+ ATH_MSG_VERBOSE("muon: " << pt_reso << " dettype: " << dettype << " " << muon->pt() << " " << muon->p4().Eta() << " " << muon->p4().Phi());
+ }// end reco setup
+
+ // Common setup
+ if(m_doPhiReso) phi_reso = obj->pt()*0.001;
+ ATH_MSG_VERBOSE("muon: " << pt_reso << " dettype: " << dettype << " " << obj->pt() << " " << obj->p4().Eta() << " " << obj->p4().Phi());
+
+ if(m_jerForEMu || DoEMuReso){
+ bool treatPUJets = m_treatPUJets;
+ m_treatPUJets=false; //turn off pileup jet treatement for this electron
+ ATH_CHECK(AddJet(obj, pt_reso, phi_reso, avgmu));
+ m_treatPUJets = treatPUJets; // reset value
+ }
+
+ return StatusCode::SUCCESS;
+ }
+
+ // Electron propagation of resolution
+ StatusCode METSignificance::AddElectron(const xAOD::IParticle* obj, float &pt_reso, float &phi_reso, float avgmu){
+
+ bool DoEMuReso = false;
+ if(obj->type()==xAOD::Type::TruthParticle){
+ pt_reso=m_egammaCalibTool->resolution(obj->e(),obj->eta(),obj->eta(),PATCore::ParticleType::Electron);
+ if(m_doPhiReso) phi_reso = obj->pt()*0.004;
+ }
+ else{
+ const xAOD::Electron* ele(static_cast<const xAOD::Electron*>(obj));
+ const auto cl_etaCalo = xAOD::get_eta_calo(*(ele->caloCluster()), ele->author());
+ pt_reso=m_egammaCalibTool->resolution(ele->e(),ele->caloCluster()->eta(),cl_etaCalo,PATCore::ParticleType::Electron);
+ if(m_doPhiReso) phi_reso = ele->pt()*0.004;
+ ATH_MSG_VERBOSE("el: " << pt_reso << " " << ele->pt() << " " << ele->p4().Eta() << " " << ele->p4().Phi());
+
+ // run the jet resolution for muons. for validation region extrapolation
+ if(m_EMuResoAux!=""){
+ SG::AuxElement::ConstAccessor<bool> acc_EMReso(m_EMuResoAux);
+ DoEMuReso = acc_EMReso.isAvailable(*ele) ? acc_EMReso(*ele) : false;
+ }
+ }
+
+ if(m_jerForEMu || DoEMuReso){
+ bool treatPUJets = m_treatPUJets;
+ m_treatPUJets=false; //turn off pileup jet treatement for this electron
+ ATH_CHECK(AddJet(obj, pt_reso, phi_reso, avgmu));
+ m_treatPUJets = treatPUJets; // reset value
+ }
+ return StatusCode::SUCCESS;
+ }
+
+ // Photon propagation of resolution
+ StatusCode METSignificance::AddPhoton(const xAOD::IParticle* obj, float &pt_reso, float &phi_reso){
+
+ if(obj->type()==xAOD::Type::TruthParticle){
+ pt_reso=m_egammaCalibTool->resolution(obj->e(),obj->eta(),obj->eta(),PATCore::ParticleType::Electron); // leaving as an electron for the truth implementation rather than declaring a reco photon
+ if(m_doPhiReso) phi_reso = obj->pt()*0.004;
+ }
+ else{
+ const xAOD::Egamma* pho(static_cast<const xAOD::Egamma*>(obj));
+ pt_reso=m_egammaCalibTool->getResolution(*pho);
+ if(m_doPhiReso) phi_reso = pho->pt()*0.004;
+ ATH_MSG_VERBOSE("pho: " << pt_reso << " " << pho->pt() << " " << pho->p4().Eta() << " " << pho->p4().Phi());
+ }
+ return StatusCode::SUCCESS;
+ }
+
+ // Jet propagation of resolution. returns the relative pT and phi resolution.
+ StatusCode METSignificance::AddJet(const xAOD::IParticle* obj, float &pt_reso, float &phi_reso, float &avgmu){
+
+ const xAOD::Jet* jet(static_cast<const xAOD::Jet*>(obj));
+ double pt_reso_dbl_data=0.0, pt_reso_dbl_mc=0.0, pt_reso_dbl_max=0.0;
+
+ // setting limits on jets if requested
+ if(m_jetPtThr>0.0 && m_jetPtThr>jet->pt()) return StatusCode::SUCCESS;
+ if(m_jetEtaThr>0.0 && m_jetEtaThr<fabs(jet->eta())) return StatusCode::SUCCESS;
+
+ ATH_CHECK(m_jetCalibTool->getNominalResolutionData(*jet, pt_reso_dbl_data));
+ ATH_CHECK(m_jetCalibTool->getNominalResolutionMC(*jet, pt_reso_dbl_mc));
+ pt_reso_dbl_max = std::max(pt_reso_dbl_data,pt_reso_dbl_mc);
+ pt_reso = pt_reso_dbl_max;
+
+ ATH_MSG_VERBOSE("jet: " << pt_reso << " jetpT: " << jet->pt() << " " << jet->p4().Eta() << " " << jet->p4().Phi());
+
+ // Add extra uncertainty for PU jets based on JVT
+ if(m_treatPUJets){
+ double jet_pu_unc = 0.;
+ if(acc_fjvt.isAvailable(*jet))
+ jet_pu_unc = GetPUProb(jet->eta(), jet->phi(),jet->pt()/m_GeV, acc_jvt(*jet), acc_fjvt(*jet), avgmu);
+ else if(acc_fjvt_der.isAvailable(*jet))
+ jet_pu_unc = GetPUProb(jet->eta(), jet->phi(),jet->pt()/m_GeV, acc_jvt(*jet), acc_fjvt_der(*jet), avgmu);
+ else{
+ ATH_MSG_ERROR("No fJVT decoration available - must have treat pileup jets set to off or provide fJVT!");
+ return StatusCode::FAILURE;
+ }
+ pt_reso = sqrt(jet_pu_unc*jet_pu_unc + pt_reso*pt_reso);
+ ATH_MSG_VERBOSE("jet_pu_unc: " << jet_pu_unc);
+ }
+
+ // Use the phi resolution of the jets
+ // needs to be finished
+ if(m_doPhiReso){
+ double jet_phi_unc = fabs(GetPhiUnc(jet->eta(), jet->phi(),jet->pt()/m_GeV));
+ phi_reso = jet->pt()*jet_phi_unc;
+ }
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Protected methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
+ // Add user defined additional resolutions. For example, b-tagged jets
+ if(m_JetResoAux!=""){
+ SG::AuxElement::ConstAccessor<float> acc_extra(m_JetResoAux);
+ if(acc_extra.isAvailable(*jet)){
+ float extra_relative_pt_reso = acc_extra(*jet);
+ pt_reso = sqrt(pt_reso*pt_reso + extra_relative_pt_reso*extra_relative_pt_reso);
+ }
+ }
+
+ return StatusCode::SUCCESS;
+ }
+
+ // Tau propagation of resolution
+ void METSignificance::AddTau(const xAOD::IParticle* obj, float &pt_reso, float &phi_reso){
+
+ // tau objects
+ if(obj->type()==xAOD::Type::TruthParticle){
+ pt_reso= 0.1;
+ if(m_doPhiReso) phi_reso = obj->pt()*0.01;
+ }
+ else{
+ const xAOD::TauJet* tau(static_cast<const xAOD::TauJet*>(obj));
+ pt_reso = dynamic_cast<CombinedP4FromRecoTaus*>(m_tCombinedP4FromRecoTaus.get())->getCaloResolution(*tau);
+
+ if(m_doPhiReso) phi_reso = tau->pt()*0.01;
+ ATH_MSG_VERBOSE("tau: " << pt_reso << " " << tau->pt() << " " << tau->p4().Eta() << " " << tau->p4().Phi() << " phi reso: " << phi_reso);
+ }
+ }
+
+ //
+ // Soft term propagation of resolution
+ //
+ void METSignificance::AddSoftTerm(const xAOD::MissingET* soft, const TVector3 &met_vect, double (&particle_sum)[2][2]){
+
+ if(m_softTermParam==met::Random){
+
+ ATH_MSG_VERBOSE("Resolution Soft term set to 10GeV");
+
+ m_soft_vect.SetXYZ(soft->mpx()/m_GeV, soft->mpy()/m_GeV, 0);
+
+ double particle_u[2][2] = {{m_softTermReso*m_softTermReso,0.0},
+ {0.0,m_softTermReso*m_softTermReso}};
+ double particle_u_rot[2][2] = {{m_softTermReso*m_softTermReso,0.0},
+ {0.0,m_softTermReso*m_softTermReso}};
+
+ RotateXY(particle_u, particle_u_rot,met_vect.DeltaPhi(m_soft_vect));
+ m_VarL+=particle_u_rot[0][0];
+ m_VarT+=particle_u_rot[1][1];
+ m_CvLT+=particle_u_rot[0][1];
+
+ // Save the resolutions separated for each object type
+ AddResoMap(particle_u_rot[0][0],
+ particle_u_rot[1][1],
+ particle_u_rot[0][1],
+ met::ResoSoft);
+
+ RotateXY (particle_u, particle_u_rot,-1.0*soft->phi()); // negative phi rotation
+ AddMatrix(particle_sum, particle_u_rot, particle_sum);
+
+ ATH_MSG_VERBOSE("SOFT " << soft->name() <<" - pt_reso: " << m_softTermReso << " soft: " << soft->met() << " phi: " << soft->phi()
+ << " Var_L: " << particle_u_rot[0][0] << " Var_T: " << particle_u_rot[1][1]
+ << " " << particle_u_rot[0][1]);
+ }
+ else if (m_softTermParam==met::PthardParam){
+
+ ATH_MSG_VERBOSE("Resolution Soft term parameterized in pthard direction");
+
+ m_soft_vect.SetXYZ(soft->mpx()/m_GeV, soft->mpy()/m_GeV, 0);
+
+ m_pthard_vect = m_soft_vect - met_vect;
+
+ double varTST = Var_Ptsoft(soft->met()/m_GeV);
+
+ double particle_u[2][2] = {{varTST,0.0},
+ {0.0,varTST}};
+ double particle_u_rot[2][2] = {{varTST,0.0},
+ {0.0,varTST}};
+
+ RotateXY(particle_u, particle_u_rot,met_vect.DeltaPhi(m_pthard_vect));
+ m_VarL+=particle_u_rot[0][0];
+ m_VarT+=particle_u_rot[1][1];
+ m_CvLT+=particle_u_rot[0][1];
+
+ // Save the resolutions separated for each object type
+ AddResoMap(particle_u_rot[0][0],
+ particle_u_rot[1][1],
+ particle_u_rot[0][1],
+ met::ResoSoft);
+
+ RotateXY (particle_u, particle_u_rot,-1.0*m_pthard_vect.Phi()); // negative phi rotation
+ AddMatrix(particle_sum, particle_u_rot, particle_sum);
+
+ }
+ else if (m_softTermParam==met::TSTParam){
+
+ ATH_MSG_VERBOSE("Resolution Soft term parameterized in TST");
+
+ m_soft_vect.SetXYZ(soft->mpx()/m_GeV, soft->mpy()/m_GeV, 0);
+
+ double varTST = VarparPtSoftdir(soft->met()/m_GeV, soft->sumet()/m_GeV);
+
+ double particle_u[2][2] = {{varTST,0.0},
+ {0.0,varTST}};
+ double particle_u_rot[2][2] = {{varTST,0.0},
+ {0.0,varTST}};
+
+ RotateXY(particle_u, particle_u_rot,met_vect.DeltaPhi(m_soft_vect));
+ m_VarL+=particle_u_rot[0][0];
+ m_VarT+=particle_u_rot[1][1];
+ m_CvLT+=particle_u_rot[0][1];
+
+ // Save the resolutions separated for each object type
+ AddResoMap(particle_u_rot[0][0],
+ particle_u_rot[1][1],
+ particle_u_rot[0][1],
+ met::ResoSoft);
+
+ RotateXY (particle_u, particle_u_rot,-1.0*soft->phi()); // negative phi rotation
+ AddMatrix(particle_sum, particle_u_rot, particle_sum);
+
+ }
+ else{
+ ATH_MSG_ERROR("Soft term parameterization is NOT defined for:" << m_softTermParam);
+ }
+
+ }
+
+ double METSignificance::GetPUProb(double jet_eta, double /*jet_phi*/,
+ double jet_pt, double jet_jvt,
+ double jet_fjvt,
+ float avgmu) {
+
+ double unc=0.0;
+
+ // Coefficients from Doug Schaefer <schae@cern.ch> and the MET subgroup
+ if(m_JetCollection == "AntiKt4EMTopoJets"){
+ if(jet_eta<2.4){
+ if(jet_pt<30){
+ if(jet_jvt<0.11) unc = 1;
+ else if(jet_jvt<0.25) unc = 0.0730 + 0.0024 * avgmu + 0.00001 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.0995 + 0.0031 * avgmu + 0.00005 * avgmu * avgmu;
+ else if(jet_jvt<0.95) unc = 0.0311 + 0.0025 * avgmu + 0.00005 * avgmu * avgmu;
+ else unc = 0.0308 -0.0010 * avgmu + 0.00006 * avgmu * avgmu ;
+ }else if(jet_pt<40){
+ if(jet_jvt<0.11) unc = 1.;
+ else if(jet_jvt<0.25) unc = 1.;
+ else if(jet_jvt<0.85) unc = -0.0188 + 0.0039 * avgmu + 0.00002 * avgmu * avgmu;
+ else if(jet_jvt<0.95) unc = 0.0252 -0.0009 * avgmu + 0.00006 * avgmu * avgmu ;
+ else unc = 0.0085 -0.0003 * avgmu + 0.00002 * avgmu * avgmu ;
+ }else if(jet_pt<50){
+ if(jet_jvt<0.11) unc = 1;
+ else if(jet_jvt<0.25) unc = 0.0345 -0.0006 * avgmu + 0.00004 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 0.1078 -0.0051 * avgmu + 0.00011 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = -0.0026 + 0.0005 * avgmu + 0.00002 * avgmu * avgmu;
+ else unc = 0.0090 -0.0004 * avgmu + 0.00001 * avgmu * avgmu ;
+ }else if(jet_pt<60){
+ if(jet_jvt<0.11) unc = 1;
+ else if(jet_jvt<0.25) unc = -0.0321 + 0.0030 * avgmu -0.00002 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.0260 -0.0007 * avgmu + 0.00003 * avgmu * avgmu ;
+ else unc = -0.0040 + 0.0003 * avgmu;
+ }else if(jet_pt<100){
+ unc = 0.9492 -2.0757 * jet_jvt + 1.13328 * jet_jvt * jet_jvt;
+ }else if(jet_pt<150){
+ unc = 0.7888 -1.8372 * jet_jvt + 1.05539 * jet_jvt * jet_jvt;
+ }
+ }else if(jet_eta<2.6){
+ if(jet_pt<30){
+ if(jet_jvt<0.11) unc = 0.2633 + 0.0091 * avgmu + -0.00009 * avgmu * avgmu;
+ else if(jet_jvt<0.25) unc = 0.1841 + 0.0144 * avgmu + -0.00008 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.1401 + 0.0048 * avgmu + 0.00006 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = -0.0118 + 0.0076 * avgmu + 0.00003 * avgmu * avgmu;
+ else unc = 0.0534 + -0.0011 * avgmu + 0.00010 * avgmu * avgmu;
+ }else if(jet_pt<40){
+ if(jet_jvt<0.11) unc = 0.1497 + 0.0133 * avgmu + -0.00015 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = -0.2260 + 0.0276 * avgmu + -0.00021 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 0.2743 + -0.0093 * avgmu + 0.00022 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = 0.0604 + 0.0006 * avgmu + 0.00006 * avgmu * avgmu ;
+ else unc = 0.0478 + -0.0009 * avgmu + 0.00004 * avgmu * avgmu ;
+ }else if(jet_pt<50){
+ if(jet_jvt<0.11) unc = -0.2187 + 0.0317 * avgmu + -0.00037 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = 0.0964 + 0.0053 * avgmu + 0.00002 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 1.1730 + -0.0624 * avgmu + 0.00088 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = -0.2011 + 0.0151 * avgmu + -0.00018 * avgmu * avgmu ;
+ else unc = 0.0145 + -0.0003 * avgmu + 0.00002 * avgmu * avgmu ;
+ }else if(jet_pt<60){
+ if(jet_jvt<0.11) unc = 0.0051 + 0.0113 * avgmu + -0.00008 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = -0.1024 + 0.0109 * avgmu + -0.00006 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 1.2491 + -0.0501 * avgmu + 0.00052 * avgmu * avgmu ;
+ else unc = 0.0267 + -0.0014 * avgmu + 0.00003 * avgmu * avgmu ;
+ }else if(jet_pt<100){
+ unc = 0.8951 -2.4995 * jet_jvt + 1.63229 * jet_jvt * jet_jvt;
+ }else if(jet_pt<150){
+ unc = 0.9998 -1.7319 * jet_jvt + 0.72680 * jet_jvt * jet_jvt;
+ }
+ }else if(jet_eta<2.7){
+ if(jet_pt<30){
+ if(jet_jvt<0.11) unc = 0.3001 + 0.0054 * avgmu -0.00004 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = 0.0663 + 0.0198 * avgmu -0.00013 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = -0.0842 + 0.0163 * avgmu -0.00008 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = -0.0219 + 0.0080 * avgmu + 0.00003 * avgmu * avgmu;
+ else unc = 0.0461 -0.0003 * avgmu + 0.00012 * avgmu * avgmu ;
+ }else if(jet_pt<40){
+ if(jet_jvt<0.11) unc = 0.1885 + 0.0083 * avgmu -0.00006 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = -0.0286 + 0.0150 * avgmu -0.00007 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.0152 + 0.0028 * avgmu + 0.00005 * avgmu * avgmu;
+ else if(jet_jvt<0.95) unc = 0.1815 -0.0076 * avgmu + 0.00018 * avgmu * avgmu ;
+ else unc = 0.0192 -0.0003 * avgmu + 0.00007 * avgmu * avgmu ;
+ }else if(jet_pt<50){
+ if(jet_jvt<0.11) unc = 0.1257 + 0.0074 * avgmu -0.00004 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = -0.0276 + 0.0080 * avgmu + 0.00000 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.1403 -0.0051 * avgmu + 0.00009 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = 0.2078 -0.0101 * avgmu + 0.00017 * avgmu * avgmu ;
+ else unc = 0.2597 -0.0132 * avgmu + 0.00020 * avgmu * avgmu ;
+ }else if(jet_pt<60){
+ if(jet_jvt<0.11) unc = 0.1111 + 0.0045 * avgmu -0.00000 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = 0.0975 -0.0011 * avgmu + 0.00008 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 0.0920 -0.0053 * avgmu + 0.00013 * avgmu * avgmu ;
+ else unc = -0.0071 + 0.0016 * avgmu -0.00001 * avgmu * avgmu;
+ }else if(jet_pt<100){
+ unc = 0.4660 -1.2116 * jet_jvt + 0.78807 * jet_jvt * jet_jvt;
+ }else if(jet_pt<150){
+ unc = 0.2254 -0.5476 * jet_jvt + 0.32617 * jet_jvt * jet_jvt;
+ }
+ }// end eta 2.7
+ else{//forward jets
+ float fjvt = jet_fjvt>0.6 ? 0.6 : jet_fjvt; // the pileup more or less plateaus at 0.6
+ if(jet_pt<30) unc = 0.5106 + 1.2566 * fjvt -1.15060 * fjvt * fjvt;
+ else if(jet_pt<40) unc = 0.2972 + 1.9418 * fjvt -1.82694 * fjvt * fjvt;
+ else if(jet_pt<50) unc = 0.1543 + 1.9864 * fjvt -1.48429 * fjvt * fjvt;
+ else if(jet_pt<60) unc = 0.1050 + 1.3196 * fjvt + 0.03554 * fjvt * fjvt;
+ else if(jet_pt<120) unc = 0.0400 + 0.5653 * fjvt + 1.96323 * fjvt * fjvt;
+ // max of 0.9 seems reasonable
+ if(jet_fjvt>0.6) unc = 0.9;
+ }
+ // end emtopo
+ }else{//p-flow inputs
+ if(jet_eta<2.4){
+ if(jet_pt<30){
+ if(jet_jvt<0.11) unc = 1;
+ else if(jet_jvt<0.25) unc = 0.2494 + 0.0076 * avgmu -0.00001 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 0.0626 + 0.0037 * avgmu + 0.00004 * avgmu * avgmu;
+ else if(jet_jvt<0.95) unc = 0.0192 + 0.0017 * avgmu + 0.00005 * avgmu * avgmu;
+ else unc = 0.0147 -0.0003 * avgmu + 0.00004 * avgmu * avgmu ;
+ }else if(jet_pt<40){
+ if(jet_jvt<0.11) unc = 1;
+ else if(jet_jvt<0.25) unc = 0.1979 + 0.0034 * avgmu + 0.00003 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.0731 -0.0022 * avgmu + 0.00009 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = 0.0281 -0.0012 * avgmu + 0.00006 * avgmu * avgmu ;
+ else unc = 0.0086 -0.0003 * avgmu + 0.00002 * avgmu * avgmu ;
+ }else if(jet_pt<50){
+ if(jet_jvt<0.11) unc = 1;
+ else if(jet_jvt<0.25) unc = 0.2242 -0.0010 * avgmu + 0.00006 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 0.0568 -0.0019 * avgmu + 0.00006 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = -0.0050 + 0.0008 * avgmu + 0.00001 * avgmu * avgmu;
+ else unc = 0.0037 -0.0000 * avgmu + 0.00000 * avgmu * avgmu ;
+ }else if(jet_pt<60){
+ if(jet_jvt<0.11) unc = 1;
+ else if(jet_jvt<0.25) unc = 0.0027 + 0.0058 * avgmu -0.00001 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = -0.0143 + 0.0008 * avgmu + 0.00001 * avgmu * avgmu;
+ else unc = -0.0012 + 0.0001 * avgmu + 0.00000 * avgmu * avgmu;
+ }else if(jet_pt<100){
+ unc = 0.8558 -1.8519 * jet_jvt + 1.00208 * jet_jvt * jet_jvt;
+ }else if(jet_pt<150){
+ unc = 0.6474 -1.4491 * jet_jvt + 0.80591 * jet_jvt * jet_jvt;
+ }
+ }else if(jet_eta<2.6){
+ if(jet_pt<30){
+ if(jet_jvt<0.11) unc = 0.2633 + 0.0091 * avgmu + -0.00009 * avgmu * avgmu;
+ else if(jet_jvt<0.25) unc = 0.1841 + 0.0144 * avgmu + -0.00008 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.1401 + 0.0048 * avgmu + 0.00006 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = -0.0118 + 0.0076 * avgmu + 0.00003 * avgmu * avgmu;
+ else unc = 0.0534 + -0.0011 * avgmu + 0.00010 * avgmu * avgmu;
+ }else if(jet_pt<40){
+ if(jet_jvt<0.11) unc = 0.1497 + 0.0133 * avgmu + -0.00015 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = -0.2260 + 0.0276 * avgmu + -0.00021 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 0.2743 + -0.0093 * avgmu + 0.00022 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = 0.0604 + 0.0006 * avgmu + 0.00006 * avgmu * avgmu ;
+ else unc = 0.0478 + -0.0009 * avgmu + 0.00004 * avgmu * avgmu ;
+ }else if(jet_pt<50){
+ if(jet_jvt<0.11) unc = -0.2187 + 0.0317 * avgmu + -0.00037 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = 0.0964 + 0.0053 * avgmu + 0.00002 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 1.1730 + -0.0624 * avgmu + 0.00088 * avgmu * avgmu ;
+ else if(jet_jvt<0.95) unc = -0.2011 + 0.0151 * avgmu + -0.00018 * avgmu * avgmu ;
+ else unc = 0.0145 + -0.0003 * avgmu + 0.00002 * avgmu * avgmu ;
+ }else if(jet_pt<60){
+ if(jet_jvt<0.11) unc = 0.0051 + 0.0113 * avgmu + -0.00008 * avgmu * avgmu ;
+ else if(jet_jvt<0.25) unc = -0.1024 + 0.0109 * avgmu + -0.00006 * avgmu * avgmu ;
+ else if(jet_jvt<0.85) unc = 1.2491 + -0.0501 * avgmu + 0.00052 * avgmu * avgmu ;
+ else unc = 0.0267 + -0.0014 * avgmu + 0.00003 * avgmu * avgmu ;
+ }else if(jet_pt<100){
+ unc = 0.8802 -1.6233 * jet_jvt + 0.74604 * jet_jvt * jet_jvt;
+ }else if(jet_pt<150){
+ unc = 0.9762 -2.4160 * jet_jvt + 1.45763 * jet_jvt * jet_jvt;
+ }
+ }else if(jet_eta<2.7){
+ if(jet_pt<30){
+ if(jet_jvt<0.11) unc = 0.2877 + 0.0056 * avgmu -0.00004 * avgmu * avgmu;
+ else if(jet_jvt<0.25) unc = 0.0353 + 0.0196 * avgmu -0.00012 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = -0.1616 + 0.0188 * avgmu -0.00009 * avgmu * avgmu;
+ else if(jet_jvt<0.95) unc = 0.0373 + 0.0048 * avgmu + 0.00006 * avgmu * avgmu;
+ else unc = 0.0666 -0.0007 * avgmu + 0.00013 * avgmu * avgmu;
+ }else if(jet_pt<40){
+ if(jet_jvt<0.11) unc = 0.1331 + 0.0098 * avgmu -0.00007 * avgmu * avgmu;
+ else if(jet_jvt<0.25) unc = 0.0570 + 0.0096 * avgmu -0.00000 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.2338 -0.0094 * avgmu + 0.00019 * avgmu * avgmu;
+ else if(jet_jvt<0.95) unc = 0.2930 -0.0127 * avgmu + 0.00023 * avgmu * avgmu;
+ else unc = 0.0152 -0.0003 * avgmu + 0.00007 * avgmu * avgmu;
+ }else if(jet_pt<50){
+ if(jet_jvt<0.11) unc = 0.1582 + 0.0060 * avgmu -0.00003 * avgmu * avgmu;
+ else if(jet_jvt<0.25) unc = -0.0079 + 0.0057 * avgmu + 0.00003 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.1865 -0.0081 * avgmu + 0.00013 * avgmu * avgmu;
+ else if(jet_jvt<0.95) unc = 0.9103 -0.0405 * avgmu + 0.00049 * avgmu * avgmu;
+ else unc = 0.1183 -0.0048 * avgmu + 0.00009 * avgmu * avgmu;
+ }else if(jet_pt<60){
+ if(jet_jvt<0.11) unc = 0.0859 + 0.0047 * avgmu -0.00000 * avgmu * avgmu;
+ else if(jet_jvt<0.25) unc = 0.0249 + 0.0027 * avgmu + 0.00004 * avgmu * avgmu;
+ else if(jet_jvt<0.85) unc = 0.1865 -0.0087 * avgmu + 0.00012 * avgmu * avgmu;
+ else unc = 0.2069 -0.0087 * avgmu + 0.00011 * avgmu * avgmu;
+ }else if(jet_pt<100){
+ unc = 0.4281 -1.1109 * jet_jvt + 0.71551 * jet_jvt * jet_jvt;
+ }else if(jet_pt<150){
+ unc = 0.2033 -0.5162 * jet_jvt + 0.33810 * jet_jvt * jet_jvt;
+ }
+ }// end eta 2.7
+ else{//forward jets
+ float fjvt = jet_fjvt>0.6 ? 0.6 : jet_fjvt; // the pileup more or less plateaus at 0.6
+ if(jet_pt<30) unc = 0.5295 + 1.2467 * fjvt -1.13946 * fjvt * fjvt;
+ else if(jet_pt<40) unc = 0.3118 + 1.9951 * fjvt -1.86882 * fjvt * fjvt;
+ else if(jet_pt<50) unc = 0.1347 + 2.3884 * fjvt -1.96891 * fjvt * fjvt;
+ else if(jet_pt<60) unc = 0.0872 + 1.5718 * fjvt + 0.02135 * fjvt * fjvt;
+ else if(jet_pt<120) unc = 0.0303 + 0.8560 * fjvt + 1.89537 * fjvt * fjvt;
+ // max of 0.9 seems reasonable
+ if(jet_fjvt>0.6) unc = 0.9;
+ }
+ }// end pflow
+
+ unc = std::min(unc, 1.0);
+ unc = std::max(unc, 0.0);
+
+ return unc;
+ }
+
+ double METSignificance::GetPhiUnc(double jet_eta, double jet_phi,double jet_pt){
+
+ unsigned int xbin = getEtaBin(jet_eta);
+ unsigned int ybin = jet_phi>0.0 ? int(jet_phi/0.4)+9 : int(jet_phi/0.4)+8;
+
+ // Stored as bin content = Mean, error = RMS, we want to use the RMS.
+ if(!m_phi_reso_pt20 || !m_phi_reso_pt50 || !m_phi_reso_pt100){
+ ATH_MSG_ERROR("Jet Phi Resolution histograms are invalid.");
+ return 0.0;
+ }
+
+ // Collect the phi resolution
+ if(jet_pt<50.0)
+ return m_phi_reso_pt20->GetBinError(xbin, ybin);
+ else if(jet_pt<100.0)
+ return m_phi_reso_pt50->GetBinError(xbin, ybin);
+ return m_phi_reso_pt100->GetBinError(xbin, ybin);
+ }
+
+ unsigned int METSignificance::getEtaBin(double jet_eta){
+ // For the phi uncertainty lookup
+ if(-4.5<jet_eta && -3.8>=jet_eta) return 1;
+ else if(-3.8<jet_eta && -3.5>=jet_eta) return 2;
+ else if(-3.5<jet_eta && -3.0>=jet_eta) return 3;
+ else if(-3.0<jet_eta && -2.7>=jet_eta) return 4;
+ else if(-2.7<jet_eta && -2.4>=jet_eta) return 5;
+ else if(-2.4<jet_eta && -1.5>=jet_eta) return 6;
+ else if(-1.5<jet_eta && -0.5>=jet_eta) return 7;
+ else if(-0.5<jet_eta && 0.0>=jet_eta) return 8;
+ else if(0.0<jet_eta && 0.5>=jet_eta) return 9;
+ else if(0.5<jet_eta && 1.5>=jet_eta) return 10;
+ else if(1.5<jet_eta && 2.4>=jet_eta) return 11;
+ else if(2.4<jet_eta && 2.7>=jet_eta) return 12;
+ else if(2.7<jet_eta && 3.0>=jet_eta) return 13;
+ else if(3.0<jet_eta && 3.5>=jet_eta) return 14;
+ else if(3.5<jet_eta && 3.8>=jet_eta) return 15;
+ else if(3.8<jet_eta ) return 16;
+ return 0;
+ }
+
+ std::tuple<double,double,double> METSignificance::CovMatrixRotation(double var_x, double var_y, double cv_xy, double Phi){
+ // Covariance matrix parallel and transverse to the Phi direction
+ Double_t V11 = pow(cos(Phi),2)*var_x + 2*sin(Phi)*cos(Phi)*cv_xy + pow(sin(Phi),2)*var_y;
+ Double_t V22 = pow(sin(Phi),2)*var_x - 2*sin(Phi)*cos(Phi)*cv_xy + pow(cos(Phi),2)*var_y;
+ Double_t V12 = pow(cos(Phi),2)*cv_xy -sin(Phi)*cos(Phi)*var_x + sin(Phi)*cos(Phi)*var_y - pow(sin(Phi),2)*cv_xy; // rho is equal to one for just one jet
+ return std::make_tuple( V11, V22, V12);
+ }
+
+ double METSignificance::Significance_LT(double Numerator, double var_parall, double var_perpen, double cov){
+
+ Double_t rho = cov / sqrt( var_parall * var_perpen ) ;
+ Double_t Significance = 0;
+ if (fabs( rho ) >= 0.9 ){ //Cov Max not invertible -> Significance diverges
+ ATH_MSG_VERBOSE("rho is large: " << rho);
+ Significance = pow( Numerator - m_scalarBias , 2 ) / ( var_parall ) ;
+ }
+ else
+ Significance = pow( Numerator - m_scalarBias , 2 ) / ( var_parall * ( 1 - pow(rho,2) ) ) ;
+
+ if( fabs(Significance) >= 10e+15)
+ ATH_MSG_WARNING("warning -->"<< Significance);
+
+ return Significance;
+ }
+
+ void METSignificance::InvertMatrix(double (&mat)[2][2], double (&m)[2][2]){
+
+ // determinant
+ double det = mat[0][0]*mat[1][1]-mat[0][1]*mat[1][0];
+
+ m[0][0]=0.0;
+ m[0][1]=0.0;
+ m[1][0]=0.0;
+ m[1][1]=0.0;
+
+ if(det==0.0) return;
+
+ m[0][0]= 1.0/det*(mat[1][1]);
+ m[1][0]=-1.0/det*(mat[1][0]);
+ m[0][1]=-1.0/det*(mat[0][1]);
+ m[1][1]= 1.0/det*(mat[0][0]);
+ }
+
+ void METSignificance::AddMatrix(double (&X)[2][2],double (&Y)[2][2], double (&mat_new)[2][2]){
+ mat_new[0][0]=X[0][0]+Y[0][0];
+ mat_new[0][1]=X[0][1]+Y[0][1];
+ mat_new[1][0]=X[1][0]+Y[1][0];
+ mat_new[1][1]=X[1][1]+Y[1][1];
+ }
+
+ void METSignificance::RotateXY(const double (&mat)[2][2], double (&mat_new)[2][2], double phi){
+
+ double c = cos(phi);
+ double s = sin(phi);
+ double cc = c*c;
+ double ss = s*s;
+ double cs = c*s;
+
+ double V11 = mat[0][0]*cc + mat[1][1]*ss - cs*(mat[1][0] + mat[0][1]);
+ double V12 = mat[0][1]*cc - mat[1][0]*ss + cs*(mat[0][0] - mat[1][1]);
+ double V21 = mat[1][0]*cc - mat[0][1]*ss + cs*(mat[0][0] - mat[1][1]);
+ double V22 = mat[0][0]*ss + mat[1][1]*cc + cs*(mat[1][0] + mat[0][1]);
+
+ mat_new[0][0]=V11;
+ mat_new[0][1]=V12;
+ mat_new[1][0]=V21;
+ mat_new[1][1]=V22;
+ }
+
+ /// Parameterization with PtSoft Direction //
+ // Coefficients from Doug Schaefer <schae@cern.ch> and the MET subgroup
+ double METSignificance::BiasPtSoftdir(const double PtSoft){
+ if (PtSoft<60.) return (0.145)+(-0.45)*PtSoft;
+ else return (0.145)+(-0.45)*(60.);
+ }
+
+ // variation in ptsoft direction
+ // Coefficients from Doug Schaefer <schae@cern.ch> and the MET subgroup
+ double METSignificance::VarparPtSoftdir(const double PtSoft, const double SoftSumet){
+ if (SoftSumet<25){
+ if (PtSoft<50.) return 41.9+3.8*PtSoft+0.1*pow(PtSoft,2)-12.7+ 1.39*SoftSumet-0.03*pow(SoftSumet,2);
+ else return 41.9+3.8*50.+0.1*pow(50.,2)-12.7+ 1.39*SoftSumet-0.03*pow(SoftSumet,2);
+ }
+ else{
+ if (PtSoft<50.) return 41.9+3.8*PtSoft+0.1*pow(PtSoft,2);
+ else return (40.5614)+(4.10965)*50.+(0.0955044)*pow(50.,2);
+ }
+ }
+
+ // Coefficients from Doug Schaefer <schae@cern.ch> and the MET subgroup
+ double METSignificance::Var_Ptsoft(const double PtSoft){
+ if (PtSoft<45.) return 40. + 2*PtSoft + 0.1*pow(PtSoft,2);
+ else return 40. + 2*45 + 0.1*pow(45,2);
+ }
+
+ // Coefficients from Doug Schaefer <schae@cern.ch> and the MET subgroup
+ double METSignificance::Bias_PtSoftParall(const double PtSoft_Parall)
+ {
+ if (-60.<=PtSoft_Parall && PtSoft_Parall<0.) return -8. -0.4*PtSoft_Parall;
+ if (-60.>PtSoft_Parall) return -8. -0.4 * (-60.);
+ if( PtSoft_Parall>=0. && PtSoft_Parall<60.) return -8. -PtSoft_Parall;
+ if(PtSoft_Parall>60.) return -8. -60.;
+ return 0.0;
+ }
+
+ void METSignificance::AddResoMap(const double varL, const double varT, const double CvLT, const int term){
+
+ if(m_term_VarL.find(term)==m_term_VarL.end()){
+ m_term_VarL[term] = 0.0;
+ m_term_VarT[term] = 0.0;
+ m_term_CvLT[term] = 0.0;
+ }
+
+ m_term_VarL[term] += varL;
+ m_term_VarT[term] += varT;
+ m_term_CvLT[term] += CvLT;
+ }
+
} //> end namespace met
diff --git a/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx b/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx
index c8eca7407a178eb88104af920753166d4670104e..7a8ee06bd60107c2f8912c7c1e2e7b5fb82964b6 100644
--- a/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx
+++ b/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx
@@ -4,6 +4,7 @@
#include "METMakerAlg.h"
#include "METInterface/IMETMaker.h"
+#include "METUtilities/METHelpers.h"
#include "xAODMissingET/MissingETAuxContainer.h"
#include "xAODMissingET/MissingETComposition.h"
@@ -262,12 +263,12 @@ namespace met {
MissingETBase::Types::bitmask_t trksource = MissingETBase::Source::Track;
if((*newMet)[m_softtrkname]) trksource = (*newMet)[m_softtrkname]->source();
- if( m_metmaker->buildMETSum("FinalTrk", newMet, trksource).isFailure() ){
+ if( buildMETSum("FinalTrk", newMet, trksource).isFailure() ){
ATH_MSG_WARNING("Building MET FinalTrk sum failed.");
}
MissingETBase::Types::bitmask_t clsource = MissingETBase::Source::LCTopo;
if((*newMet)[m_softclname]) clsource = (*newMet)[m_softclname]->source();
- if( m_metmaker->buildMETSum("FinalClus", newMet, clsource).isFailure() ) {
+ if( buildMETSum("FinalClus", newMet, clsource).isFailure() ) {
ATH_MSG_WARNING("Building MET FinalClus sum failed.");
}
diff --git a/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx b/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx
index 149b0bc9eebdd21555bf2d12ec049a7165e6cafe..d0f753c3d7c2ad8174936becfe64ffb9acc56558 100644
--- a/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx
+++ b/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx
@@ -23,7 +23,7 @@ int main() {
#endif
// FrameWork includes
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
#include "AsgTools/AnaToolHandle.h"
#include "xAODMissingET/MissingETAuxContainer.h"
@@ -279,8 +279,8 @@ int main( int argc, char* argv[]) {std::cout << __PRETTY_FUNCTION__ << std::endl
//this builds the final track or cluster met sums, using systematic varied container
//In the future, you will be able to run both of these on the same container to easily output CST and TST
- ANA_CHECK( metMaker->buildMETSum("FinalTrk" , newMetContainer, MissingETBase::Source::Track ) );
- //ANA_CHECK( metMaker->buildMETSum("FinalClus", newMetContainer, MissingETBase::Source::LCTopo) );
+ ANA_CHECK( met::buildMETSum("FinalTrk" , newMetContainer, MissingETBase::Source::Track ) );
+ //ANA_CHECK( met::buildMETSum("FinalClus", newMetContainer, MissingETBase::Source::LCTopo) );
//we record the container to the store, with a systematic indicated name
ANA_CHECK( store->record( newMetContainer, "FinalMETContainer_" + iSysSet.name() ));
diff --git a/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx b/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx
index 12efe7893a1cba8a5271a0cfc63f00c88ec710c9..33e2574eb49abb839039de762ed53fc35efef930 100644
--- a/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx
+++ b/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx
@@ -22,7 +22,7 @@ int main() {
#endif
// FrameWork includes
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
#include "AsgTools/AnaToolHandle.h"
#include "xAODMissingET/MissingETAuxContainer.h"
@@ -244,8 +244,8 @@ int main( int argc, char* argv[] ){std::cout << __PRETTY_FUNCTION__ << std::endl
//this builds the final track and cluster met sums, using systematic varied container
- ANA_CHECK( metMaker->buildMETSum("FinalTrk" , newMetContainer, MissingETBase::Source::Track ) );
- ANA_CHECK( metMaker->buildMETSum("FinalClus", newMetContainer, MissingETBase::Source::LCTopo) );
+ ANA_CHECK( met::buildMETSum("FinalTrk" , newMetContainer, MissingETBase::Source::Track ) );
+ ANA_CHECK( met::buildMETSum("FinalClus", newMetContainer, MissingETBase::Source::LCTopo) );
ANA_CHECK(store->record( newMetContainer, "FinalMETContainer" ));
ANA_CHECK(store->record( newMetAuxContainer, "FinalMETContainerAux."));
diff --git a/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx b/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
index 293cb9d8199c85a6e363658ef9aec7032e08c590..78d20550210c2d9e4f67b8821118cb939d211d83 100644
--- a/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
+++ b/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
@@ -22,7 +22,7 @@ int main() {
#endif
// FrameWork includes
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
#include "AsgTools/AnaToolHandle.h"
#include "xAODMissingET/MissingETAuxContainer.h"
@@ -50,6 +50,7 @@ int main() {
#include "METUtilities/METSystematicsTool.h"
#include "METUtilities/METMaker.h"
+#include "METUtilities/METHelpers.h"
#include "PATInterfaces/SystematicRegistry.h"
@@ -59,8 +60,10 @@ int main() {
using namespace asg::msgUserCode;
int main( int argc, char* argv[]) {std::cout << __PRETTY_FUNCTION__ << std::endl;
+ ANA_CHECK_SET_TYPE (int);
+
#ifdef XAOD_STANDALONE
- xAOD::Init() ;
+ ANA_CHECK (xAOD::Init()) ;
//enable status code failures
CP::CorrectionCode::enableFailure();
CP::SystematicCode::enableFailure();
@@ -247,8 +250,8 @@ int main( int argc, char* argv[]) {std::cout << __PRETTY_FUNCTION__ << std::endl
//this builds the final track or cluster met sums, using systematic varied container
//In the future, you will be able to run both of these on the same container to easily output CST and TST
- ANA_CHECK( metMaker->buildMETSum("FinalTrk" , newMetContainer, MissingETBase::Source::Track ) );
- //ANA_CHECK( metMaker->buildMETSum("FinalClus", newMetContainer, MissingETBase::Source::LCTopo) );
+ ANA_CHECK( met::buildMETSum("FinalTrk" , newMetContainer, MissingETBase::Source::Track ) );
+ //ANA_CHECK( met::buildMETSum("FinalClus", newMetContainer, MissingETBase::Source::LCTopo) );
//we record the container to the store, with a systematic indicated name
ANA_CHECK( store->record( newMetContainer, "FinalMETContainer_" + iSysSet.name() ));
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx
index c8b2873eca0138d4883847d918c1e21d440a2846..e66d0fdc6aafec09ebd3f64f2c5d94f30348f1f5 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCreatorAlg.cxx
@@ -56,6 +56,17 @@ StatusCode MuonCreatorAlg::initialize()
if ( not m_monTool.name().empty() ) {
ATH_CHECK( m_monTool.retrieve() );
}
+ ATH_MSG_DEBUG("MuonCreatorAlg has been setup successfully");
+ ATH_MSG_DEBUG(" *** SegmentTrackContainer: "<<m_segTrkContainerName);
+ ATH_MSG_DEBUG(" *** SegmentContainer: "<<m_segContainerName);
+ ATH_MSG_DEBUG(" *** CombinedTrackContainer: "<<m_combinedTrkCollectionName);
+ ATH_MSG_DEBUG(" *** xAOD::CombinedTrackContainer: "<<m_combinedCollectionName);
+
+ ATH_MSG_DEBUG(" *** xAOD::ExtrpolatedTrackContainer: "<<m_extrapolatedCollectionName);
+ ATH_MSG_DEBUG(" *** ExtrpolatedTrackContainer: "<<m_extrapolatedTrkCollectionName);
+ ATH_MSG_DEBUG(" *** xAOD::MSOnlyTrackContainer: "<<m_msOnlyExtrapolatedCollectionName);
+ ATH_MSG_DEBUG(" *** ExtrpolatedTackContainer: "<<m_msOnlyExtrapolatedTrkCollectionName);
+
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
index f1ef41a24cba8202dca6f93d345982b0855268c5..f6a12406972d2e8b29d94900556b2b482c564eab 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
@@ -59,6 +59,7 @@ namespace MuonCombined {
ATH_CHECK(m_printer.retrieve());
ATH_CHECK(m_muonPrinter.retrieve());
ATH_CHECK(m_caloExtTool.retrieve());
+ ATH_CHECK(m_caloExtToolID.retrieve());
ATH_CHECK(m_edmHelperSvc.retrieve());
ATH_CHECK(m_particleCreator.retrieve());
ATH_CHECK(m_ambiguityProcessor.retrieve());
@@ -274,7 +275,7 @@ namespace MuonCombined {
// skip all muons without extrapolated track
if( !candidate.extrapolatedTrack() ) {
ATH_MSG_DEBUG("MuonCreatorTool::create(...) No extrapolated track - aborting. Will not create Muon.");
- return 0; // Do we really want to do this?
+ return nullptr; // Do we really want to do this?
}
// Create the xAOD object:
@@ -291,13 +292,13 @@ namespace MuonCombined {
if(!muon->extrapolatedMuonSpectrometerTrackParticleLink().isValid()){
ATH_MSG_DEBUG("Creation of track particle for SA muon failed, removing it");
outputData.muonContainer->pop_back();
- return 0;
+ return nullptr;
}
if( !dressMuon(*muon) ){
ATH_MSG_WARNING("Failed to dress muon");
outputData.muonContainer->pop_back();
- return 0;
+ return nullptr;
}
//make sure we can extrapolate the track back through the calo, otherwise it's not a muon
@@ -308,17 +309,24 @@ namespace MuonCombined {
if(!caloExtension){
ATH_MSG_DEBUG("failed to get a calo extension for this SA muon, discard it");
outputData.muonContainer->pop_back();
- return 0;
+ return nullptr;
}
if( caloExtension->caloLayerIntersections().empty()){
ATH_MSG_DEBUG("failed to retrieve any calo layers for this SA muon, discard it");
outputData.muonContainer->pop_back();
- return 0;
+ return nullptr;
}
// check if there is a cluster container, if yes collect the cells around the muon and fill
// Etcore variables for muon
- if(m_useCaloCells) collectCells(*muon,outputData.clusterContainer);
+ if(m_useCaloCells) collectCells(*muon,outputData.clusterContainer,caloExtension.get());
+ if (m_requireIDTracks){
+ if (!muon->trackParticle(xAOD::Muon::TrackParticleType:: InnerDetectorTrackParticle)){
+ ATH_MSG_DEBUG("The muon does not have any associated ID track although it should have. Discard it");
+ outputData.muonContainer->pop_back();
+ return nullptr;
+ }
+ }
return muon;
}
@@ -1606,7 +1614,7 @@ namespace MuonCombined {
if (problem) ATH_MSG_VERBOSE("Dumping problematic muon: "<<m_muonPrinter->print(muon));
}
- void MuonCreatorTool::collectCells( xAOD::Muon& muon, xAOD::CaloClusterContainer* clusterContainer ) const {
+ void MuonCreatorTool::collectCells( xAOD::Muon& muon, xAOD::CaloClusterContainer* clusterContainer, Trk::CaloExtension* inputCaloExt ) const {
muon.auxdata< float >("ET_Core") = 0;
muon.auxdata< float >("ET_EMCore") = 0;
muon.auxdata< float >("ET_TileCore") = 0;
@@ -1621,18 +1629,29 @@ namespace MuonCombined {
// get ParticleCellAssociation
ATH_MSG_DEBUG(" Selected track: pt " << tp->pt() << " eta " << tp->eta() << " phi " << tp->phi());
- std::unique_ptr<Trk::CaloExtension> caloExtension =m_caloExtTool->caloExtension(*tp);
- if(!caloExtension){
- ATH_MSG_WARNING("Can not get caloExtension.");
- return;
- };
+ xAOD::CaloCluster* cluster=nullptr;
+ SG::ReadHandle<CaloCellContainer> container(m_cellContainerName);
- if( caloExtension->caloLayerIntersections().empty())
- ATH_MSG_DEBUG( "Received a caloExtension object without track extrapolation");
+ if(!inputCaloExt){ //need to make one
+ //for some reason, ID tracks need to be extrapolated from the ID exit, and combined from the perigee
+ std::unique_ptr<Trk::CaloExtension> caloExtension;
+ if(muon.muonType()==xAOD::Muon::SegmentTagged || muon.muonType()==xAOD::Muon::CaloTagged){
+ ATH_MSG_DEBUG("use the ID track extension tool");
+ caloExtension=m_caloExtToolID->caloExtension(*tp);
+ }
+ else caloExtension=m_caloExtTool->caloExtension(*tp);
+ if(!caloExtension){
+ ATH_MSG_WARNING("Can not get caloExtension.");
+ return;
+ }
- SG::ReadHandle<CaloCellContainer> container(m_cellContainerName);
+ if( caloExtension->caloLayerIntersections().empty())
+ ATH_MSG_DEBUG( "Received a caloExtension object without track extrapolation");
+
+ cluster = m_cellCollector.collectCells( *caloExtension, *container, *clusterContainer );
+ }
+ else cluster = m_cellCollector.collectCells( *inputCaloExt, *container, *clusterContainer );
- xAOD::CaloCluster* cluster = m_cellCollector.collectCells( *caloExtension, *container, *clusterContainer );
if( !cluster ){
ATH_MSG_WARNING("Failed to create cluster from ParticleCellAssociation");
return;
@@ -1641,7 +1660,7 @@ namespace MuonCombined {
}
// create element links
- ElementLink< xAOD::CaloClusterContainer > clusterLink(*clusterContainer,clusterContainer->size()-1);
+ ElementLink< xAOD::CaloClusterContainer > clusterLink(*clusterContainer,clusterContainer->size()-1);
muon.setClusterLink(clusterLink);
const CaloNoise* caloNoise = nullptr;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h
index 2fca9f99a2116ff5490a6e9dcf861fb5cbaf5673..3762e97b4f21d06c967ed1a7c7a6c167fdb880b3 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h
@@ -130,7 +130,7 @@ namespace MuonCombined {
void setP4( xAOD::Muon& muon, const xAOD::TrackParticle& tp ) const;
- void collectCells( xAOD::Muon& muon, xAOD::CaloClusterContainer* clusterContainer ) const;
+ void collectCells( xAOD::Muon& muon, xAOD::CaloClusterContainer* clusterContainer, Trk::CaloExtension* inputCaloExt = nullptr ) const;
void getRpcTiming(const xAOD::TrackParticle& tp,
std::vector<unsigned int>& rpcHitIdentifier,
@@ -151,6 +151,7 @@ namespace MuonCombined {
ToolHandle<Muon::MuonEDMPrinterTool> m_printer {this, "Printer", "Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"};
ToolHandle<Rec::IMuonPrintingTool> m_muonPrinter {this, "MuonPrinter", "Rec::MuonPrintingTool/MuonPrintingTool"};
ToolHandle<Trk::IParticleCaloExtensionTool> m_caloExtTool {this, "ParticleCaloExtensionTool", "Trk::ParticleCaloExtensionTool/ParticleCaloExtensionTool"};
+ ToolHandle<Trk::IParticleCaloExtensionTool> m_caloExtToolID {this, "ParticleCaloExtensionToolID", "Trk::ParticleCaloExtensionTool/ParticleCaloExtensionTool"};
ToolHandle<Trk::ITrackParticleCreatorTool> m_particleCreator {this, "TrackParticleCreator", "Trk::TrackParticleCreatorTool/MuonCombinedTrackParticleCreator"};
ToolHandle<Trk::ITrackAmbiguityProcessorTool> m_ambiguityProcessor {this, "AmbiguityProcessor", "Trk::TrackSelectionProcessorTool/MuonAmbiProcessor"};
ToolHandle<Trk::IPropagator> m_propagator {this, "Propagator", "Trk::RungeKuttaPropagator/AtlasRungeKuttaPropagator"};
@@ -182,6 +183,10 @@ namespace MuonCombined {
Gaudi::Property<bool> m_segLowBeta {this, "AssociateSegmentsToLowBetaMuons", false, "associate segments to MuGirlLowBeta muons"};
Gaudi::Property<bool> m_useCaloCells {this, "UseCaloCells", true};
Gaudi::Property<bool> m_doSA {this, "MakeSAMuons", false};
+ /// In case of running the muon reconstruction with LRT tracks this property
+ /// removes the overlap of muons in the container in which in any case
+ /// no ID track is available
+ Gaudi::Property<bool> m_requireIDTracks{this,"RequireIDTrack", false};
Gaudi::Property<float> m_sigmaCaloNoiseCut {this, "SigmaCaloNoiseCut", 3.4};
};
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index 4df13ee9e279d412d0dd9479f97e0805a1cc762a..a18ec42c6a3e1c2c7c83163e23941b7329fe50e9 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -228,6 +228,10 @@ def MuonCreatorToolCfg(flags, name="MuonCreatorTool", **kwargs):
kwargs.setdefault("ParticleCaloExtensionTool", acc.getPrimary() )
result.merge(acc)
+ acc = ParticleCaloExtensionToolCfg(flags)
+ kwargs.setdefault("ParticleCaloExtensionToolID", acc.getPrimary() )
+ result.merge(acc)
+
from MuonConfig.MuonRecToolsConfig import MuonAmbiProcessorCfg, MuonTrackSummaryToolCfg
acc = MuonAmbiProcessorCfg(flags)
kwargs.setdefault("AmbiguityProcessor", acc.popPrivateTools())
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
index b63e6870ff1c0e4037d91d93633f7ff87dd0c356..89e0c5caf066fc17a27f19854f227f00ca9ae44f 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
@@ -71,8 +71,14 @@ ToolSvc += InDet__InDetTrackSummaryHelperTool( \
HoleSearch = ToolSvc.CombinedMuonIDHoleSearch,
usePixel = DetFlags.haveRIO.pixel_on(),
useSCT = DetFlags.haveRIO.SCT_on(),
- useTRT = DetFlags.haveRIO.TRT_on() )
-
+ useTRT = DetFlags.haveRIO.TRT_on(),
+ ClusterSplitProbabilityName = TrackingCommon.combinedClusterSplitProbName())
+
+#@TODO the value of the ClusterSplitProbabilityName depends on the input ID tracks that have been used
+# for the combined muons. So, this tool is not universally usable. For example online muons are
+# based on tracks for which the cluster splitting probabilities are not computed. For such cases
+# the property should be set to an empty string.
+
# default CombinedMuonTrackSummary
# @TODO doHolesMuon = False correct ?
from TrkTrackSummaryTool.TrkTrackSummaryToolConf import Trk__TrackSummaryTool
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
index 955b15c1d02e38054efcdcb536109131911f9723..171470ad2ac3accddf03a48906887f11659738e1 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
from AthenaCommon.CfgGetter import getPublicTool, getAlgorithm,getPublicToolClone
@@ -11,6 +11,9 @@ from AthenaCommon import CfgMgr
from AthenaCommon.BeamFlags import jobproperties
from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+from MuonCombinedRecExample.MuonCombinedKeys import MuonCombinedKeys as MuonCbKeys
+from InDetRecExample.InDetKeys import InDetKeys
+from InDetRecExample.InDetJobProperties import InDetFlags
from TriggerJobOpts.TriggerFlags import TriggerFlags
def MuonCombinedInDetExtensionAlg(name="MuonCombinedInDetExtensionAlg",**kwargs):
@@ -36,13 +39,34 @@ def MuonCaloTagAlg(name="MuonCaloTagAlg",**kwargs):
kwargs.setdefault("HasMM", MuonGeometryFlags.hasMM() )
return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
+def MuonCaloTagAlg_LRT(name="MuonCaloTagAlg_LRT", **kwargs):
+ tools = [getPublicTool("MuonCaloTagTool")]
+ kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
+ kwargs.setdefault("TagMap","caloTagMap_LRT")
+ kwargs.setdefault("InDetCandidateLocation",MuonCbKeys.InDetTrackParticlesLargeD0())
+ kwargs.setdefault("CombinedTrackCollection","")
+ kwargs.setdefault("METrackCollection","")
+ kwargs.setdefault("SegmentCollection","")
+ kwargs.setdefault("HasCSC", MuonGeometryFlags.hasCSC() )
+ kwargs.setdefault("HasSTgc", MuonGeometryFlags.hasSTGC() )
+ kwargs.setdefault("HasMM", MuonGeometryFlags.hasMM() )
+ return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
+
+
def MuonSegmentTagAlg( name="MuonSegmentTagAlg", **kwargs ):
kwargs.setdefault("MuonSegmentTagTool", getPublicTool("MuonSegmentTagTool") )
return CfgMgr.MuonSegmentTagAlg(name,**kwargs)
+def MuonSegmentTagAlg_LRT( name="MuonSegmentTagAlg_LRT", **kwargs ):
+ kwargs.setdefault("MuonSegmentTagTool", getPublicTool("MuonSegmentTagTool") )
+ kwargs.setdefault("InDetCandidateLocation", MuonCbKeys.InDetTrackParticlesLargeD0())
+ kwargs.setdefault("TagMap","segmentTagMap_LRT")
+ kwargs.setdefault("MuonSegmentLocation","MuonSegments")
+ return CfgMgr.MuonSegmentTagAlg(name,**kwargs)
+
+
def MuonInsideOutRecoAlg( name="MuonInsideOutRecoAlg", **kwargs ):
tools = [getPublicTool("MuonInsideOutRecoTool") ]
-
kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
kwargs.setdefault("usePRDs",True)
kwargs.setdefault("HasCSC", MuonGeometryFlags.hasCSC() )
@@ -51,6 +75,25 @@ def MuonInsideOutRecoAlg( name="MuonInsideOutRecoAlg", **kwargs ):
kwargs.setdefault("TagMap","muGirlTagMap")
return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
+
+def MuGirlAlg_LRT( name="MuGirlAlg_LRT", **kwargs ):
+ tools = [getPublicTool("MuonInsideOutRecoTool") ]
+ kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
+ kwargs.setdefault("usePRDs",True)
+ kwargs.setdefault("HasCSC", MuonGeometryFlags.hasCSC() )
+ kwargs.setdefault("HasSTgc", MuonGeometryFlags.hasSTGC() )
+ kwargs.setdefault("HasMM", MuonGeometryFlags.hasMM() )
+ kwargs.setdefault("TagMap","MuGirlMap_LRT")
+ kwargs.setdefault("METrackCollection","MuGirlMETracks_LRT")
+ kwargs.setdefault("SegmentCollection","MuGirlSegments_LRT")
+ kwargs.setdefault("CombinedTrackCollection",MuonCbKeys.MuGirlMuonsLargeD0())
+ kwargs.setdefault("InDetCandidateLocation",MuonCbKeys.InDetTrackParticlesLargeD0())
+ return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
+
+
+
+
+
def MuGirlStauAlg(name="MuGirlStauAlg",**kwargs):
tools = [getPublicTool("MuonStauRecoTool")]
kwargs.setdefault("MuonCombinedInDetExtensionTools", tools )
@@ -63,17 +106,26 @@ def MuGirlStauAlg(name="MuGirlStauAlg",**kwargs):
kwargs.setdefault("SegmentCollection","MuGirlStauSegments")
return CfgMgr.MuonCombinedInDetExtensionAlg(name,**kwargs)
-def MuonCombinedInDetCandidateAlg( name="MuonCombinedInDetCandidateAlg",**kwargs ):
- from InDetRecExample.InDetJobProperties import InDetFlags
+def MuonCombinedInDetCandidateAlg( name="MuonCombinedInDetCandidateAlg",**kwargs ):
kwargs.setdefault("TrackSelector",getPublicTool("MuonCombinedInDetDetailedTrackSelectorTool") )
if muonCombinedRecFlags.doSiAssocForwardMuons() and InDetFlags.doForwardTracks():
kwargs.setdefault("DoSiliconAssocForwardMuons", True )
kwargs.setdefault("InDetForwardTrackSelector", getPublicTool("MuonCombinedInDetDetailedForwardTrackSelectorTool") )
kwargs.setdefault("MuonSystemExtensionTool", getPublicTool("MuonSystemExtensionTool"))
+ return CfgMgr.MuonCombinedInDetCandidateAlg(name,**kwargs)
+def MuonCombinedInDetCandidateAlg_LRT( name="MuonCombinedInDetCandidateAlg_LRT",**kwargs ):
+ kwargs.setdefault("TrackSelector",getPublicTool("MuonCombinedInDetDetailedTrackSelectorTool_LRT") )
+ kwargs.setdefault("MuonSystemExtensionTool", getPublicTool("MuonSystemExtensionTool"))
+ kwargs.setdefault("TrackParticleLocation",[InDetKeys.xAODLargeD0TrackParticleContainer()])
+ kwargs.setdefault("InDetCandidateLocation",MuonCbKeys.InDetTrackParticlesLargeD0())
+ kwargs.setdefault("DoSiliconAssocForwardMuons", False)
+ kwargs.setdefault("InDetForwardTrackSelector", getPublicTool("MuonCombinedInDetDetailedForwardTrackSelectorTool") )
return CfgMgr.MuonCombinedInDetCandidateAlg(name,**kwargs)
+
+
def MuonCombinedMuonCandidateAlg( name="MuonCombinedMuonCandidateAlg", **kwargs ):
kwargs.setdefault("MuonCandidateTool",getPublicTool("MuonCandidateTool"))
return CfgMgr.MuonCombinedMuonCandidateAlg(name,**kwargs)
@@ -91,6 +143,14 @@ def MuonCombinedAlg( name="MuonCombinedAlg",**kwargs ):
kwargs.setdefault("CombinedTagMaps", tagmaps)
return CfgMgr.MuonCombinedAlg(name,**kwargs)
+def MuonCombinedAlg_LRT( name="MuonCombinedAlg_LRT",**kwargs ):
+ kwargs.setdefault("MuonCombinedTool",getPublicTool("MuonCombinedTool"))
+ kwargs.setdefault("InDetCandidateLocation",MuonCbKeys.InDetTrackParticlesLargeD0())
+ kwargs.setdefault("CombinedTagMaps", ["muidcoTagMap_LRT","stacoTagMap_LRT"])
+ kwargs.setdefault("MuidCombinedTracksLocation", "MuidCombinedTracks_LRT")
+ kwargs.setdefault("MuidMETracksLocation", "MuidMETracks_LRT")
+ return CfgMgr.MuonCombinedAlg(name,**kwargs)
+
def recordMuonCreatorAlgObjs (kw):
Alg = CfgMgr.MuonCreatorAlg
def val (prop):
@@ -126,6 +186,26 @@ def MuonCreatorAlg( name="MuonCreatorAlg",**kwargs ):
kwargs.setdefault("ClusterContainerName", "")
return CfgMgr.MuonCreatorAlg(name,**kwargs)
+
+def MuonCreatorAlg_LRT( name="MuonCreatorAlg_LRT",**kwargs ):
+ kwargs.setdefault("MuonCreatorTool",getPublicTool("MuonCreatorTool_LRT"))
+ recordMuonCreatorAlgObjs (kwargs)
+ kwargs.setdefault("TagMaps",["muidcoTagMap_LRT","stacoTagMap_LRT","segmentTagMap_LRT","MuGirlMap_LRT","caloTagMap_LRT"])
+ kwargs.setdefault("MuonContainerLocation", MuonCbKeys.FinalMuonsLargeD0())
+ kwargs.setdefault("InDetCandidateLocation", MuonCbKeys.InDetTrackParticlesLargeD0())
+ kwargs.setdefault("ExtrapolatedLocation", "ExtraPolated"+MuonCbKeys.FinalMuonsLargeD0())
+ kwargs.setdefault("MSOnlyExtrapolatedLocation", "MSOnlyExtraPolated"+MuonCbKeys.FinalMuonsLargeD0())
+ kwargs.setdefault("CombinedLocation", "Combined"+MuonCbKeys.FinalMuonsLargeD0())
+ kwargs.setdefault("SegmentContainerName", "MuonSegments_LRT")
+ kwargs.setdefault("TrackSegmentContainerName", "TrackMuonSegments_LRT")
+ kwargs.setdefault("BuildSlowMuon", False)
+ kwargs.setdefault("MakeClusters", False)
+ kwargs.setdefault("ClusterContainerName", "")
+ return CfgMgr.MuonCreatorAlg(name,**kwargs)
+
+
+
+
def StauCreatorAlg( name="StauCreatorAlg", **kwargs ):
kwargs.setdefault("MuonCreatorTool",getPublicTool("StauCreatorTool"))
kwargs.setdefault("MuonContainerLocation","Staus")
@@ -156,27 +236,38 @@ class MuonCombinedReconstruction(ConfiguredMuonRec):
# creates input collections for ID and MS candidates
topSequence += getAlgorithm("MuonCombinedInDetCandidateAlg")
topSequence += getAlgorithm("MuonCombinedMuonCandidateAlg")
+
+ if InDetFlags.doR3LargeD0(): topSequence += getAlgorithm("MuonCombinedInDetCandidateAlg_LRT")
- # runs ID+MS combinations (fit, staco, mugirl, ID-taggers)
+ # runs ID+MS combinations (fit, staco, mugirl, ID-taggers)
if muonCombinedRecFlags.doStatisticalCombination() or muonCombinedRecFlags.doCombinedFit():
topSequence += getAlgorithm("MuonCombinedAlg")
+ if InDetFlags.doR3LargeD0(): topSequence += getAlgorithm("MuonCombinedAlg_LRT")
+
+
if muonCombinedRecFlags.doMuGirl():
topSequence += getAlgorithm("MuonInsideOutRecoAlg")
if muonCombinedRecFlags.doMuGirlLowBeta():
topSequence += getAlgorithm("MuGirlStauAlg")
+ if InDetFlags.doR3LargeD0(): topSequence += getAlgorithm("MuGirlAlg_LRT")
if muonCombinedRecFlags.doCaloTrkMuId():
topSequence += getAlgorithm("MuonCaloTagAlg")
+ if InDetFlags.doR3LargeD0(): topSequence += getAlgorithm("MuonCaloTagAlg_LRT")
if muonCombinedRecFlags.doMuonSegmentTagger():
getPublicTool("MuonSegmentTagTool")
topSequence += getAlgorithm("MuonSegmentTagAlg")
+ if InDetFlags.doR3LargeD0(): topSequence += getAlgorithm("MuonSegmentTagAlg_LRT")
# runs over outputs and create xAODMuon collection
topSequence += getAlgorithm("MuonCreatorAlg")
+ if InDetFlags.doR3LargeD0(): topSequence += getAlgorithm("MuonCreatorAlg_LRT")
+
# setting this here, in the new configuration it will be easier to do
topSequence.MuonCreatorAlg.MuonCreatorTool.ParticleCaloExtensionTool.StartFromPerigee=True
+ topSequence.MuonCreatorAlg.MuonCreatorTool.ParticleCaloExtensionToolID.StartFromPerigee=False
if muonCombinedRecFlags.doMuGirl() and muonCombinedRecFlags.doMuGirlLowBeta():
topSequence += getAlgorithm("StauCreatorAlg")
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py
index cb1d3aa86397671701becdb9999de96b161c77fa..c89df613f4d2d4c0ef30d61f5a6d336649d52827 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedCalibConfig.py
@@ -9,14 +9,20 @@ beamFlags = jobproperties.Beam
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
from MuonRecExample.MuonRecFlags import muonRecFlags
-#from MuonCalibAlgs.MuonCalibFlags import muonCalibFlags
from MuonCnvExample.MuonCalibFlags import muonCalibFlags
-
from RecExConfig.RecFlags import rec
-
# configure calib algs for standalone
-from MuonRecExample import MuonCalibConfig
+if muonRecFlags.doCalibNtuple():
+ from MuonRecExample import MuonAlignConfig
+ from MuonCnvExample import setupMuonCalibNtuple
+ setupMuonCalibNtuple()
+elif muonRecFlags.doCalib():
+ from MuonRecExample import MuonAlignConfig
+ from MuonCnvExample import setupMuonCalib
+ setupMuonCalib()
+else:
+ logMuon.warning("Loading %s but not setting up any MuonCalibration or Ntuple" % __name__ )
# NB. call setDefaults *after* import MuonCalibConfig
muonCalibFlags.setDefaults()
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py
index ae52c1b1df0c745f2c88b39762f5c58d2f63e31b..e7b4c7306cafa0d89c3572222cd572b31643b70a 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedKeys.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
##
## @file MuonCombinedRecExample/python/MuonCombinedKeys.py
@@ -36,11 +36,11 @@ class InDetTrackParticles(JobProperty):
allowedTypes = ['str']
StoredValue = 'TrackParticleCandidate'
-class ExtrapolatedInDetParticles(JobProperty):
- """StoreGate key for association object of ID particles plus vector of extrpolated TrackPars"""
+class InDetTrackParticlesLargeD0(JobProperty):
+ """StoreGate key for ID track particles with large radius tracking"""
statusOn = True
allowedTypes = ['str']
- StoredValue = 'MuonCandidateTracks'
+ StoredValue = 'TrackParticleCandidateLRT'
## classes for track collections
class SpectrometerTracks(JobProperty): # clarify with MS if to be replaced by jobPr. in MuonRecExample
@@ -148,6 +148,12 @@ class MuGirlMuons(JobProperty):
allowedTypes = ['str']
StoredValue = 'MuGirlCombinedMuonContainer'
+class MuGirlMuonsLargeD0(JobProperty):
+ """StoreGate key for muon container from MuGirl algorithm"""
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = 'MuGirlCombinedMuonContainerLRT'
+
## final muon collections
class ESD_Muons(JobProperty):
@@ -162,6 +168,13 @@ class FinalMuons(JobProperty):
allowedTypes = ['str']
StoredValue = 'Muons'
+class FinalMuonsLargeD0(JobProperty):
+ """StoreGate key for final muon collection with large radius InDetTracks after overlap removal and dressing"""
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = 'MuonsLRT'
+
+
class FinalCaloMuons(JobProperty):
"""StoreGate key for final muon collection from calorimeter tagging"""
statusOn = True
@@ -210,6 +223,8 @@ class InternalMuTagTracksContainer(JobProperty):
allowedTypes = ['str']
StoredValue = 'InternalMuTagTracksContainer'
+
+
##-----------------------------------------------------------------------------
## 2nd step
## Definition of the MuonCombined flag container
@@ -222,7 +237,7 @@ class MuonCombinedContainerKeys(JobPropertyContainer):
print("MuonCombinedKeys: Locking all keys except one thing")
# MuonCombinedKeys.lock_JobProperties()
[k.lock() for k in MuonCombinedKeys.__dict__.values() if hasattr(k,'is_locked') and not isinstance(k,type(MuonCombinedKeys.OneThing))]
- return
+ return
pass
##-----------------------------------------------------------------------------
@@ -234,7 +249,6 @@ jobproperties.add_Container(MuonCombinedContainerKeys)
## 4th step
## adding ID flags to the MuonCombinedContainerKeys container
jobproperties.MuonCombinedContainerKeys.add_JobProperty(InDetTrackParticles)
-jobproperties.MuonCombinedContainerKeys.add_JobProperty(ExtrapolatedInDetParticles)
jobproperties.MuonCombinedContainerKeys.add_JobProperty(SpectrometerTracks)
jobproperties.MuonCombinedContainerKeys.add_JobProperty(ExtrapolatedMSTracks)
jobproperties.MuonCombinedContainerKeys.add_JobProperty(CombinedFitTracks)
@@ -262,6 +276,13 @@ jobproperties.MuonCombinedContainerKeys.add_JobProperty(SegmentTagMuons)
jobproperties.MuonCombinedContainerKeys.add_JobProperty(SegmentTagMuonSegments)
jobproperties.MuonCombinedContainerKeys.add_JobProperty(InternalMuTagTracksContainer)
jobproperties.MuonCombinedContainerKeys.add_JobProperty(ExtrapolatedMSOnlyTracks)
+# Large d0 tracking muons
+jobproperties.MuonCombinedContainerKeys.add_JobProperty(FinalMuonsLargeD0)
+jobproperties.MuonCombinedContainerKeys.add_JobProperty(InDetTrackParticlesLargeD0)
+jobproperties.MuonCombinedContainerKeys.add_JobProperty(MuGirlMuonsLargeD0)
+
+
+
##-----------------------------------------------------------------------------
## 5th step
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
index a961d6ff4a81053ca32cfad4b5a74b0606101143..0a3cd804794cc3e402e9513341ee2070d65f86fe 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorithm, \
addTypesToExcludeIfDefaultValue, addNamesToExcludeIfDefaultValue, addFullNamesToExcludeIfDefaultValue, \
@@ -7,10 +7,8 @@ from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorit
addTypesOnlyToSkip
from AthenaCommon.Constants import * # FATAL,ERROR etc.
-
# combined tools
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedTool","MuonCombinedTool")
-addTool("MuonCombinedRecExample.MuonCombinedTools.InDetCandidateTool","InDetCandidateTool")
addTool("MuonCombinedRecExample.MuGirlTagTool.MuonInsideOutRecoTool","MuonInsideOutRecoTool")
addTool("MuonCombinedRecExample.MuGirlTagTool.MuonCandidateTrackBuilderTool","MuonCandidateTrackBuilderTool")
@@ -36,16 +34,30 @@ addTool("Rec::MuonScatteringAngleSignificanceTool","MuonScatteringAngleSignifica
addTool( "Muon::MuonSystemExtensionTool", "MuonSystemExtensionTool", ParticleCaloExtensionTool = "MuonParticleCaloExtensionTool", Extrapolator = "AtlasExtrapolator")
addTool("MuonCombinedRecExample.MuonCombinedFitTools.MuonMaterialProviderTool","MuonMaterialProviderTool")
-addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuGirlAlg","MuGirlAlg")
+
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCaloTagAlg","MuonCaloTagAlg")
+addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCaloTagAlg_LRT","MuonCaloTagAlg_LRT")
+
+
+
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonInsideOutRecoAlg","MuonInsideOutRecoAlg")
+addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuGirlAlg_LRT","MuGirlAlg_LRT")
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuGirlStauAlg","MuGirlStauAlg")
+
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCombinedInDetCandidateAlg","MuonCombinedInDetCandidateAlg")
+addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCombinedInDetCandidateAlg_LRT","MuonCombinedInDetCandidateAlg_LRT")
+
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCombinedMuonCandidateAlg","MuonCombinedMuonCandidateAlg")
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCombinedAlg","MuonCombinedAlg")
-addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCombinedInDetExtensionAlg","MuonCombinedInDetExtensionAlg")
+addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCombinedAlg_LRT", "MuonCombinedAlg_LRT")
+
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonSegmentTagAlg","MuonSegmentTagAlg")
+addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonSegmentTagAlg_LRT","MuonSegmentTagAlg_LRT")
+
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCreatorAlg","MuonCreatorAlg")
+addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCreatorAlg_LRT","MuonCreatorAlg_LRT" )
+
+
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.StauCreatorAlg","StauCreatorAlg")
# tracking tools
@@ -58,12 +70,17 @@ addTool("MuonCombinedRecExample.MuonSegmentTaggerTools.MuTagAmbiguitySolverTool"
addTool("MuonCombinedRecExample.MuonSegmentTaggerTools.MuonSegmentTagTool","MuonSegmentTagTool")
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedInDetDetailedTrackSelectorTool","MuonCombinedInDetDetailedTrackSelectorTool")
+
+addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedInDetDetailedTrackSelectorTool_LRT", "MuonCombinedInDetDetailedTrackSelectorTool_LRT")
+
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedInDetDetailedTrackSelectorTool","MuonCombinedInDetDetailedForwardTrackSelectorTool", nHitSct=0)
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonInDetForwardCandidateTool","MuonInDetForwardCandidateTool")
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedParticleCreator","MuonCombinedParticleCreator")
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCaloParticleCreator","MuonCaloParticleCreator")
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCreatorTool","MuonCreatorTool")
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCreatorTool","StauCreatorTool",BuildStauContainer=True)
+addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCreatorTool_LRT","MuonCreatorTool_LRT")
+
addTool("MuonCombinedRecExample.MuonCombinedTools.ExtrapolateMuonToIPTool","ExtrapolateMuonToIPTool")
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCandidateTool","MuonCandidateTool")
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedTrackSummaryTool","MuonCombinedTrackSummaryTool")
@@ -106,5 +123,3 @@ addTool("MuonCombinedRecExample.MuonCombinedFitTools.MuonTrackQuery","MuonTrackQ
addTool("MuonCombinedRecExample.MuonCombinedFitTools.MuidSegmentRegionRecoveryTool","MuidSegmentRegionRecoveryTool")
addTool("MuonCombinedRecExample.MuonCombinedFitTools.CombinedMuonTrackBuilder","CombinedMuonTrackBuilder")
addTool("MuonCombinedRecExample.MuonCombinedFitTools.CombinedMuonTrackBuilderFit","CombinedMuonTrackBuilderFit")
-
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
index d607015e791442da3788c04182a2951d8c31569f..a86481d3335fceba6555e2e95d41eeb0da0c17db 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecFlags.py
@@ -109,7 +109,6 @@ class doxAOD(JobProperty):
allowedTypes=['bool']
StoredValue=True
-
# @brief run truth-matching on tracks to evaluate tracking performance
#
# It will enable matching for the Combined Muon algorithms that are running
@@ -165,6 +164,7 @@ class createScaleCalibrationInput(JobProperty):
allowedTypes=['bool']
StoredValue=False
+
## The container with all the flags to steer MuonCombined reconstruction
class MuonCombinedRec(JobPropertyContainer):
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
index bb6f1691087a67dd8111deb6412e6bf23df67647..bb283fb4241af9a521e34a36331cc1c51a8dfc89 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
@@ -41,6 +41,26 @@ def MuonCombinedInDetDetailedTrackSelectorTool( name='MuonCombinedInDetDetailedT
kwargs.setdefault("Extrapolator", getPublicTool("AtlasExtrapolator") )
return CfgMgr.InDet__InDetDetailedTrackSelectorTool(name,**kwargs)
+
+def MuonCombinedInDetDetailedTrackSelectorTool_LRT(name='MuonCombinedInDetDetailedTrackSelectorTool_LRT', **kwargs):
+ kwargs.setdefault("pTMin", 2000 )
+ kwargs.setdefault("IPd0Max", 1.e4 )
+ kwargs.setdefault("IPz0Max", 1.e4 )
+ kwargs.setdefault("z0Max", 1.e4 )
+ kwargs.setdefault("useTrackSummaryInfo", True )
+ kwargs.setdefault("nHitBLayer", 0 )
+ kwargs.setdefault("nHitPix", 0 )
+ kwargs.setdefault("nHitBLayerPlusPix", 0 )
+ kwargs.setdefault("nHitSct", 4 )
+ kwargs.setdefault("nHitSi", 4 )
+ kwargs.setdefault("nHitTrt", 0 )
+ kwargs.setdefault("useTrackQualityInfo", False )
+ kwargs.setdefault("TrackSummaryTool", getPublicTool("AtlasTrackSummaryTool") )
+ kwargs.setdefault("Extrapolator", getPublicTool("AtlasExtrapolator") )
+ return CfgMgr.InDet__InDetDetailedTrackSelectorTool(name,**kwargs)
+
+
+
def MuonInDetForwardCandidateTool( name = 'MuonInDetForwardCandidateTool', **kwargs):
#import pdb ; pdb.set_trace()
idCandTool = getPublicToolClone("InDetForwardCandidateTool","InDetCandidateTool", TrackSelector = getPublicTool("MuonCombinedInDetDetailedForwardTrackSelectorTool") )
@@ -92,10 +112,37 @@ def MuonCreatorTool(name="MuonCreatorTool",**kwargs):
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
+ kwargs.setdefault("TrackParticleCreator", getPublicTool("MuonCombinedParticleCreator") )
+ kwargs.setdefault("ParticleCaloExtensionTool", getPublicTool("MuonParticleCaloExtensionTool") )
+ kwargs.setdefault("ParticleCaloExtensionToolID", getPublicTool("MuonParticleCaloExtensionTool") )
+ kwargs.setdefault("MuonPrinter", getPublicTool("MuonPrintingTool") )
+ return CfgMgr.MuonCombined__MuonCreatorTool(name,**kwargs)
+
+def MuonCreatorTool_LRT(name="MuonCreatorTool_LRT",**kwargs):
+ kwargs.setdefault("CaloMaterialProvider", getPublicTool("MuonMaterialProviderTool"))
+ if TriggerFlags.MuonSlice.doTrigMuonConfig:
+ kwargs.setdefault('MakeTrackAtMSLink',True)
+ kwargs.setdefault("FillTimingInformation",False)
+ kwargs.setdefault("MuonSelectionTool", "")
+ kwargs.setdefault("UseCaloCells", False)
+ kwargs.setdefault("TrackSegmentAssociationTool", "")
+ else:
+ getPublicTool("MuonMomentumBalanceSignificanceTool")
+ getPublicTool("MuonScatteringAngleSignificanceTool")
+ getPublicTool("MuonCaloParticleCreator")
+ import MuonCombinedRecExample.CombinedMuonTrackSummary
+ from AthenaCommon.AppMgr import ToolSvc
+ kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
+
kwargs.setdefault("TrackParticleCreator", getPublicTool("MuonCombinedParticleCreator") )
kwargs.setdefault("ParticleCaloExtensionTool", getPublicTool("MuonParticleCaloExtensionTool") )
kwargs.setdefault("MuonPrinter", getPublicTool("MuonPrintingTool") )
+ kwargs.setdefault("RequireIDTrack", True)
return CfgMgr.MuonCombined__MuonCreatorTool(name,**kwargs)
+
+
+
+
def ExtrapolateMuonToIPTool(name="ExtrapolateMuonToIPTool",**kwargs):
if TriggerFlags.MuonSlice.doTrigMuonConfig:
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
index 9576e4a910a2ea2c870d5bc7e98a06b4ca2102b5..047e7b238216c9a49f52244b3974c9b09d6a02aa 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
@@ -3,8 +3,10 @@ MuonCombinedAODList = []
from MuonCombinedRecExample.MuonCombinedKeys import MuonCombinedKeys as MuonCbKeys
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
+from InDetRecExample.InDetJobProperties import InDetFlags
from RecExConfig.RecFlags import rec as rec
+
if DetFlags.detdescr.Calo_on(): # FIXME - check if the objects below still make sense. EJWM
MuonCombinedAODList+=["xAOD::CaloClusterContainer#MuonClusterCollection"]
MuonCombinedAODList+=["xAOD::CaloClusterAuxContainer#MuonClusterCollectionAux."]
@@ -23,6 +25,19 @@ if DetFlags.detdescr.Muon_on():
MuonCombinedAODList+=[ "xAOD::TrackParticleAuxContainer#"+MuonCbKeys.SpectrometerParticles()+"Aux." + excludedAuxData ]
MuonCombinedAODList+=[ "xAOD::MuonContainer#Muons" ]
MuonCombinedAODList+=[ "xAOD::MuonAuxContainer#MuonsAux.-DFCommonMuonsTight.-DFCommonGoodMuon.-DFCommonMuonsMedium.-DFCommonMuonsLoose" ] # See note
+ if InDetFlags.doR3LargeD0():
+ MuonCombinedAODList+=[ "xAOD::MuonContainer#"+MuonCbKeys.FinalMuonsLargeD0() ]
+ MuonCombinedAODList+=[ "xAOD::MuonAuxContainer#"+MuonCbKeys.FinalMuonsLargeD0()+"Aux.-DFCommonMuonsTight.-DFCommonGoodMuon.-DFCommonMuonsMedium.-DFCommonMuonsLoose" ] # See note
+
+ ### Combined muon track particles
+ MuonCombinedAODList+=[ "xAOD::TrackParticleContainer#Combined"+MuonCbKeys.FinalMuonsLargeD0()+"TrackParticles"]
+ MuonCombinedAODList+=[ "xAOD::TrackParticleAuxContainer#Combined"+MuonCbKeys.FinalMuonsLargeD0()+"TrackParticlesAux." + excludedAuxData]
+ ### ME trackParticles
+ MuonCombinedAODList+=[ "xAOD::TrackParticleContainer#ExtraPolated"+MuonCbKeys.FinalMuonsLargeD0()+"TrackParticles"]
+ MuonCombinedAODList+=[ "xAOD::TrackParticleAuxContainer#ExtraPolated"+MuonCbKeys.FinalMuonsLargeD0()+"TrackParticlesAux." + excludedAuxData]
+ MuonCombinedAODList+=[ "xAOD::TrackParticleContainer#MSOnlyExtraPolated"+MuonCbKeys.FinalMuonsLargeD0()+"TrackParticles"]
+ MuonCombinedAODList+=[ "xAOD::TrackParticleAuxContainer#MSOnlyExtraPolated"+MuonCbKeys.FinalMuonsLargeD0()+"TrackParticlesAux." + excludedAuxData]
+
# Note: hack to remove derivation framework variables that are added by DRAW building and are supposed to be transient
### stau
@@ -37,5 +52,3 @@ if DetFlags.detdescr.Muon_on():
#Slimmed Track Collection
#MuonCombinedAODList+=["TrackCollection#MuonSlimmedTrackCollection"]
-
-
diff --git a/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h b/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
index 834be475c3db086271e863fa1a63eb7fb93ddef2..85edf36a9dcd758ad8c97ce5e52ce39baad3dbb1 100644
--- a/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
+++ b/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
@@ -11,7 +11,7 @@
#include <string>
#include <iostream>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "AsgTools/ToolHandle.h"
#include "xAODTau/TauJet.h"
diff --git a/Reconstruction/PanTau/PanTauAlgs/Root/PanTauProcessor.cxx b/Reconstruction/PanTau/PanTauAlgs/Root/PanTauProcessor.cxx
index 053aa4e064703262e0e69b7f12ec7c61f6ddb5ff..4b2ea4de6ae64c23e759580f3e14567f3b78ec13 100644
--- a/Reconstruction/PanTau/PanTauAlgs/Root/PanTauProcessor.cxx
+++ b/Reconstruction/PanTau/PanTauAlgs/Root/PanTauProcessor.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -246,8 +246,9 @@ StatusCode PanTau::PanTauProcessor::executePanTau(xAOD::TauJet& pTau, xAOD:
void PanTau::PanTauProcessor::fillDefaultValuesToTau(xAOD::TauJet* tauJet) {
-
- tauJet->setP4(xAOD::TauJetParameters::PanTauCellBased, -1111., -1111., -1111., -1111.);
+ //default four momentum set to previous calibration state: TauEtaCalib
+ TLorentzVector defaultP4 = tauJet->p4(xAOD::TauJetParameters::TauEtaCalib);
+ tauJet->setP4(xAOD::TauJetParameters::PanTauCellBased, defaultP4.Pt(), defaultP4.Eta(), defaultP4.Phi(), defaultP4.M());
//charged
std::vector< ElementLink< xAOD::PFOContainer > > chrgPFOLinks = tauJet->protoChargedPFOLinks();
@@ -263,20 +264,3 @@ void PanTau::PanTauProcessor::fillDefaultValuesToTau(xAOD::TauJet* tauJet) {
return;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Reconstruction/RecExample/RecExCommission/share/CombinedMuonFit_jobOptions.py b/Reconstruction/RecExample/RecExCommission/share/CombinedMuonFit_jobOptions.py
index 4a8ddf9e80d68e3dc8d7448c53c98e2f09f6b204..0fbf5498db6d3776037ccbc8e93faef780e542c9 100644
--- a/Reconstruction/RecExample/RecExCommission/share/CombinedMuonFit_jobOptions.py
+++ b/Reconstruction/RecExample/RecExCommission/share/CombinedMuonFit_jobOptions.py
@@ -11,7 +11,7 @@ GlobalChi2FitterComb=Trk__GlobalChi2Fitter(name='GlobalChi2FitterComb',
ToolSvc += GlobalChi2FitterComb
-print GlobalChi2FitterComb
+print(GlobalChi2FitterComb)
from CombinedMuonRefit.CombinedMuonRefitConf import ReFitMuon
MuonReFitTrack2 = ReFitMuon (name = "CombMuonRefit",
@@ -25,7 +25,7 @@ MuonReFitTrack2 = ReFitMuon (name = "CombMuonRefit",
OutputLevel=3)
topSequence += MuonReFitTrack2
-print MuonReFitTrack2
+print(MuonReFitTrack2)
#GlobalChi2FitterBarrel.OutputLevel=1
#GlobalChi2FitterBarrel.NumericalDerivs=True
diff --git a/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup-HLT.py b/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup-HLT.py
index cea26177768b702c8cd3ccbd75bee6f24c10faa6..6a6c1e12d9b4f75f992979ea2246fb15a17c6243 100644
--- a/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup-HLT.py
+++ b/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup-HLT.py
@@ -31,26 +31,26 @@ if globalflags.DetDescrVersion.get_Value().find('ATLAS-GEONSF-') >= 0 :
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(True)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(True)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMCT-00-00-00')
- print 'configuring reco with solenoid off, toroid on from DetDescrVersion:',globalflags.DetDescrVersion.get_Value()
+ print('configuring reco with solenoid off, toroid on from DetDescrVersion:',globalflags.DetDescrVersion.get_Value())
if globalflags.DetDescrVersion.get_Value().find('ATLAS-GEO-') >= 0 :
jobproperties.BField.solenoidOn.set_Value_and_Lock(True)
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(True)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(True)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMCST-00-00-00')
- print 'configuring reco with solenoid on, toroid on from DetDescrVersion:',globalflags.DetDescrVersion.get_Value()
+ print('configuring reco with solenoid on, toroid on from DetDescrVersion:',globalflags.DetDescrVersion.get_Value())
if globalflags.DetDescrVersion.get_Value().find('ATLAS-GEONF-') >= 0 :
jobproperties.BField.solenoidOn.set_Value_and_Lock(False)
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(False)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(False)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMC-00-00-00')
- print 'configuring reco with solenoid off, toroid off from DetDescrVersion:',globalflags.DetDescrVersion.get_Value()
+ print('configuring reco with solenoid off, toroid off from DetDescrVersion:',globalflags.DetDescrVersion.get_Value())
if globalflags.DetDescrVersion.get_Value().find('ATLAS-GEONTF-') >= 0 :
jobproperties.BField.solenoidOn.set_Value_and_Lock(True)
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(False)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(False)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMCS-00-00-00')
- print 'configuring reco with solenoid on, toroid off from DetDescrVersion:',globalflags.DetDescrVersion.get_Value()
+ print('configuring reco with solenoid on, toroid off from DetDescrVersion:',globalflags.DetDescrVersion.get_Value())
diff --git a/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup.py b/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup.py
index 23ceee70140ee7ef4bc463b654f1b20af7c3d044..0065ac4c43541643a9ecac53527ffbccb9512af1 100644
--- a/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup.py
+++ b/Reconstruction/RecExample/RecExCommission/share/CosmicSimulationRecoSetup.py
@@ -36,28 +36,28 @@ if globalflags.DetDescrVersion=='ATLAS-GEONSF-07-00-00':
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(True)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(True)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMCT-00-00-00')
- print 'configuring reco with solenoid off, toroid on from DetDescrVersion: ATLAS-GEONSF-07-00-00'
+ print('configuring reco with solenoid off, toroid on from DetDescrVersion: ATLAS-GEONSF-07-00-00')
if globalflags.DetDescrVersion=='ATLAS-GEO-07-00-00':
jobproperties.BField.solenoidOn.set_Value_and_Lock(True)
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(True)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(True)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMCST-00-00-00')
- print 'configuring reco with solenoid on, toroid on from DetDescrVersion: ATLAS-GEO-07-00-00'
+ print('configuring reco with solenoid on, toroid on from DetDescrVersion: ATLAS-GEO-07-00-00')
if globalflags.DetDescrVersion=='ATLAS-GEONF-07-00-00':
jobproperties.BField.solenoidOn.set_Value_and_Lock(False)
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(False)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(False)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMC-00-00-00')
- print 'configuring reco with solenoid off, toroid off from DetDescrVersion: ATLAS-GEONF-07-00-00'
+ print('configuring reco with solenoid off, toroid off from DetDescrVersion: ATLAS-GEONF-07-00-00')
if globalflags.DetDescrVersion=='ATLAS-GEONTF-07-00-00':
jobproperties.BField.solenoidOn.set_Value_and_Lock(True)
jobproperties.BField.barrelToroidOn.set_Value_and_Lock(False)
jobproperties.BField.endcapToroidOn.set_Value_and_Lock(False)
globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-SIMCS-00-00-00')
- print 'configuring reco with solenoid on, toroid off from DetDescrVersion: ATLAS-GEONTF-07-00-00'
+ print('configuring reco with solenoid on, toroid off from DetDescrVersion: ATLAS-GEONTF-07-00-00')
diff --git a/Reconstruction/RecExample/RecExCommission/share/GetInputFiles.py b/Reconstruction/RecExample/RecExCommission/share/GetInputFiles.py
index 7258685207ef6b6c73b22100bb853632e09ab7d2..a1528d067bc3949e2daaa25fa69679cce279128f 100644
--- a/Reconstruction/RecExample/RecExCommission/share/GetInputFiles.py
+++ b/Reconstruction/RecExample/RecExCommission/share/GetInputFiles.py
@@ -1,7 +1,7 @@
from os import popen
def GetInputFiles(inputPath,filePattern):
- print "Searching for files with pattern '",filePattern,"' in ",inputPath
+ print("Searching for files with pattern '",filePattern,"' in ",inputPath)
fileList=[]
if (inputPath[0:8]=='/castor/'):
cmd='nsls'
@@ -13,7 +13,7 @@ def GetInputFiles(inputPath,filePattern):
if f[len(f)-1:]=='\n':
f=f[0:len(f)-1]
fileList+=[inputPath+'/'+f]
- print "Found ",len(fileList), " files"
+ print("Found ",len(fileList), " files")
return fileList
diff --git a/Reconstruction/RecExample/RecExCommission/share/RecExCommissionCommonFlags_jobOptions.py b/Reconstruction/RecExample/RecExCommission/share/RecExCommissionCommonFlags_jobOptions.py
index 4d374d8542c72427106c8fc383636da428174700..d08ce74f2f95f2befd5268406faa51e63801e316 100644
--- a/Reconstruction/RecExample/RecExCommission/share/RecExCommissionCommonFlags_jobOptions.py
+++ b/Reconstruction/RecExample/RecExCommission/share/RecExCommissionCommonFlags_jobOptions.py
@@ -194,7 +194,7 @@ if not 'InDetKeys' in dir():
#
# --- setup StoreGate keys (JobProperties!)
#
- print "InDetRec_jobOptions: InDetKeys not set before - I import them now"
+ print("InDetRec_jobOptions: InDetKeys not set before - I import them now")
from InDetRecExample.InDetKeys import InDetKeys
# InDetKeys.lock_JobProperties()
diff --git a/Reconstruction/RecExample/RecExCommon/share/AllDet_detDescr.py b/Reconstruction/RecExample/RecExCommon/share/AllDet_detDescr.py
index f9357b8839eb3bb5bb7f2ac6ff7a34a418adfb29..77a0b489e4359d03f3728bea825636cd8eeb87e9 100755
--- a/Reconstruction/RecExample/RecExCommon/share/AllDet_detDescr.py
+++ b/Reconstruction/RecExample/RecExCommon/share/AllDet_detDescr.py
@@ -1,4 +1,4 @@
include.block("RecExCommon/AllDet_detDescr.py")
# AllDet_detDescr now moved to RecExCond in AtlasConditions
-print "OBSOLETE WARNING please use RecExCond/AllDet_detDescr.py"
+print("OBSOLETE WARNING please use RecExCond/AllDet_detDescr.py")
include ("RecExCond/AllDet_detDescr.py")
diff --git a/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py
index 016939583cb57e63861776be56b0fa272ec210a6..af8117f22ff0efa77531b03f773fdc4844790dd8 100644
--- a/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/AnalysisCommon_topOptions.py
@@ -214,8 +214,8 @@ elif rec.readAOD():
if rec.OutputLevel() <= DEBUG:
- print " Initial content of objKeyStore "
- print objKeyStore
+ print(" Initial content of objKeyStore ")
+ print(objKeyStore)
pass
# typical objKeyStore usage
@@ -333,24 +333,6 @@ if rec.doFileMetaData():
#pdr.flag_domain('aod')
-if rec.doWriteAOD() or rec.doWriteESD(): #For xAOD writing:
- try:
- if rec.doFileMetaData(): #needed to have xAOD readable outside athena
- theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
- if rec.doWriteAOD():
- StreamAOD_Augmented.AddMetaDataItem("xAOD::EventFormat#EventFormat")
- pass
- if rec.doWriteESD():
- StreamESD_Augmented.AddMetaDataItem("xAOD::EventFormat#EventFormat")
- pass
- pass
- pass
- except Exception:
- treatException("Problem with extra attributes for xAOD output")
- pass
- pass
-
-
#########
## DPD ##
#########
diff --git a/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py b/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py
index b788aea37e9dd2965714154125f6907b7d68c925..de94e226c5f13d9d9d59b2d46b5147942341ecdf 100755
--- a/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py
+++ b/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py
@@ -22,14 +22,14 @@ AODFix_Init()
from CaloRec.CaloRecFlags import jobproperties
#
-# functionality : CaloExtensionBuilder setup
-# to be used in tau, pflow, e/gamma
+# functionality : CaloExtensionBuilder setup
+# to be used in tau, pflow, e/gamma
#
pdr.flag_domain('CaloExtensionBuilder')
if (rec.doESD()) and (recAlgs.doEFlow() or rec.doTau() or rec.doEgamma()) : # or rec.readESD()
- try:
+ try:
from TrackToCalo.CaloExtensionBuilderAlgConfig import CaloExtensionBuilder
- CaloExtensionBuilder()
+ CaloExtensionBuilder()
except Exception:
treatException("Cannot include CaloExtensionBuilder !")
@@ -55,7 +55,7 @@ if rec.doMuonCombined() and DetFlags.Muon_on() and DetFlags.ID_on():
rec.doMuonCombined = False
#
-# functionality : add cells crossed by high pt ID tracks
+# functionality : add cells crossed by high pt ID tracks
#
if rec.doESD() and recAlgs.doTrackParticleCellAssociation() and DetFlags.ID_on() and DetFlags.Muon_on() and DetFlags.Calo_on():
from AthenaCommon.CfgGetter import getPublicTool
@@ -65,13 +65,13 @@ if rec.doESD() and recAlgs.doTrackParticleCellAssociation() and DetFlags.ID_on()
pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = pcExtensionTool)
- topSequence += CfgMgr.TrackParticleCellAssociationAlg("TrackParticleCellAssociationAlg",
+ topSequence += CfgMgr.TrackParticleCellAssociationAlg("TrackParticleCellAssociationAlg",
ParticleCaloCellAssociationTool=caloCellAssociationTool)
#
# functionality : energy flow
-#
+#
pdr.flag_domain('eflow')
if recAlgs.doEFlow() and (rec.readESD() or (DetFlags.haveRIO.ID_on() and DetFlags.haveRIO.Calo_allOn() and rec.doMuonCombined())):
try:
@@ -115,7 +115,7 @@ if (rec.doESD() and (rec.doMuonCombined() or rec.doEgamma()) and
if jetOK and recAlgs.doMuonSpShower() and DetFlags.detdescr.Muon_on() and DetFlags.haveRIO.Calo_on() :
try:
include("MuonSpShowerBuilderAlgs/MuonSpShowerBuilder_jobOptions.py")
- except Exception:
+ except Exception:
treatException("Could not set up MuonSpShower. Switched off !")
recAlgs.doMuonSpShower=False
else:
@@ -141,7 +141,14 @@ if jetOK and rec.doTau():
protectedInclude ("tauRec/tauRec_config.py")
AODFix_posttauRec()
-
+#
+# functionality: Flow element tau links
+#
+if recAlgs.doEFlow():
+ try:
+ include( "eflowRec/tauFELinkConfig.py" )
+ except Exception:
+ treatException("Could not set up tau-FE links")
@@ -155,7 +162,7 @@ if recAlgs.doMissingET() and DetFlags.Calo_on() and DetFlags.ID_on() and DetFlag
except Exception:
treatException("Could not set up MissingET. Switched off !")
recAlgs.doMissingET=False
-
+
else:
recAlgs.doMissingET=False
AODFix_postMissingETRec()
@@ -175,6 +182,3 @@ else:
pdr.flag_domain('caloringer')
if rec.doCaloRinger:
include('CaloRingerAlgs/CaloRinger_jobOptions.py')
-
-
-
diff --git a/Reconstruction/RecExample/RecExCommon/share/DumpDbFolders.py b/Reconstruction/RecExample/RecExCommon/share/DumpDbFolders.py
index 51aa6ff703d3c18377b25aff49597fccb1525946..417647b0c72ebcc2d72652444db1971b33f4f1fa 100644
--- a/Reconstruction/RecExample/RecExCommon/share/DumpDbFolders.py
+++ b/Reconstruction/RecExample/RecExCommon/share/DumpDbFolders.py
@@ -14,7 +14,7 @@ except:
pass
if len(substep)==0:
- print "Failed to obtain substep, will use PID for file with db folder list"
+ print("Failed to obtain substep, will use PID for file with db folder list")
substep=str(getpid())
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_condDb.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_condDb.py
index d499a423fb42fa8c766638c468cab913ef312d6b..62dfbbe688c60baf0d93df56b8ffefe791d82e85 100755
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_condDb.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_condDb.py
@@ -1,3 +1,3 @@
-print "WARNING RecExCommon_condDb.py forwarded to IOVDbSvc/IOVRecExCommon.py"
-print "WARNING ...please update to use directly IOVRecExCommon.py"
+print("WARNING RecExCommon_condDb.py forwarded to IOVDbSvc/IOVRecExCommon.py")
+print("WARNING ...please update to use directly IOVRecExCommon.py")
include ("IOVDbSvc/IOVRecExCommon.py")
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_flags.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_flags.py
index a7b08dcff25b503723cb869f52005316b648e6df..41b070d46dbc6fb31e5dd88f98bc063b03e7f0a6 100755
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_flags.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_flags.py
@@ -1,4 +1,4 @@
include.block("RecExCommon/RecExCommon_flags.py")
# RecExCommon_flags moved to RecExCond package in AtlasConditions
-print "OBSOLETE WARNING please use RecExCond/RecExCommon_flags.py"
+print("OBSOLETE WARNING please use RecExCond/RecExCommon_flags.py")
include ("RecExCond/RecExCommon_flags.py")
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index 2fd95abd9dc0f196b3cbe862719f8a876ca36fd5..0fe51f4a91002c57d78daa3f30bb3c839dc79a3e 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -1407,21 +1407,6 @@ if rec.doAOD() or rec.doWriteAOD():
protectedInclude ("HIRecExample/heavyion_postOptionsAOD.py")
-if rec.doWriteAOD() or rec.doWriteESD(): #For xAOD writing:
- try:
- if rec.doFileMetaData(): #needed to have xAOD readable outside athena
- theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
- if rec.doWriteAOD():
- StreamAOD_Augmented.AddMetaDataItem("xAOD::EventFormat#EventFormat")
- pass
- if rec.doWriteESD():
- StreamESD_Augmented.AddMetaDataItem("xAOD::EventFormat#EventFormat")
- pass
- pass
- pass
- except Exception:
- treatException("Problem with extra attributes for xAOD output")
-
try:
# event dumper at the very end
if rec.doPyDump():
diff --git a/Reconstruction/RecExample/RecExCommon/share/postIncludeForBLSStream.py b/Reconstruction/RecExample/RecExCommon/share/postIncludeForBLSStream.py
index 918d30348e4e10d3f8f9cca4787311023d3eebb6..ecb7680d30eba9e1f0402d5cbdf62f3e6cb27a92 100644
--- a/Reconstruction/RecExample/RecExCommon/share/postIncludeForBLSStream.py
+++ b/Reconstruction/RecExample/RecExCommon/share/postIncludeForBLSStream.py
@@ -25,7 +25,7 @@ for item in CILMergeAOD.list():
CILMergeAOD.removeItem(removed_items)
StreamAOD.ItemList=CILMergeAOD()
-print CILMergeAOD.list()
+print(CILMergeAOD.list())
diff --git a/Reconstruction/RecExample/RecExCond/share/testRecExCommonFlags.py b/Reconstruction/RecExample/RecExCond/share/testRecExCommonFlags.py
index c22ea63f6756a5cfad0a67e14749405e3a278b29..8e88a36a599a9aec201e6131c8f223a09e78f729 100755
--- a/Reconstruction/RecExample/RecExCond/share/testRecExCommonFlags.py
+++ b/Reconstruction/RecExample/RecExCond/share/testRecExCommonFlags.py
@@ -15,18 +15,18 @@ include ("RecExCommon/RecExCommon_flags.py")
from AthenaCommon.GlobalFlags import globalflags
#if globalflags.InputFormat()=='bytestream': # jobproperties.GlobalFlags.InputFormat() is equivalent
# dosomething
-print globalflags.DetDescrVersion()
+print(globalflags.DetDescrVersion())
if globalflags.DetDescrVersion()[0:3]=="DC2":
- print " this is DC2 "
+ print(" this is DC2 ")
else:
- print " this is not DC2 "
+ print(" this is not DC2 ")
from RecExConfig.RecFlags import recAlgs
if recAlgs.doTrigger() ^ doTrigger:
- print "recAlgs.doTrigger() and doTrigger inconsistent"
+ print("recAlgs.doTrigger() and doTrigger inconsistent")
else:
- print "recAlgs.doTrigger() and doTrigger consistent"
+ print("recAlgs.doTrigger() and doTrigger consistent")
# stop the hard way
diff --git a/Reconstruction/RecExample/RecExConfig/share/topOptions.py b/Reconstruction/RecExample/RecExConfig/share/topOptions.py
index 1b2fce302485167a040e60ea3cb649d59a1bd71c..f264e1ce4998d731332cbf12d6285d27c89be59d 100755
--- a/Reconstruction/RecExample/RecExConfig/share/topOptions.py
+++ b/Reconstruction/RecExample/RecExConfig/share/topOptions.py
@@ -60,12 +60,12 @@ aPhotonMaker=PhotonMaker(driving=True)
bPhotonMaker=PhotonMaker()
thebPMAlg=bPhotonMaker.PhotonBuilderHandle()
-print "Py:top output ",bPhotonMaker.outputTypeKey()
+print("Py:top output ",bPhotonMaker.outputTypeKey())
# can modify the al property as follow
# bPhotonMaker.PhotonBuilderHandle().egammaContainer = "egammaContainerTruc"
-print "Py: top instance property", thebPMAlg.egammaContainer
+print("Py: top instance property", thebPMAlg.egammaContainer)
@@ -74,10 +74,10 @@ print "Py: top instance property", thebPMAlg.egammaContainer
#topSequence.setup()
#exec 'topSequence.__self= []'
#algorithms with property mods
-print topSequence
+print(topSequence)
# only list algorithms
-print topSequence.sequence()
+print(topSequence.sequence())
-print "Py:top print again list of top algorithms"
-print theApp.TopAlg
+print("Py:top print again list of top algorithms")
+print(theApp.TopAlg)
diff --git a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_met_fromESD.py b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_met_fromESD.py
index ac65568b6b332055a0a720663723a82fc185552a..8c30a3c0d03f3590dd656a62f3b62a01f23eb002 100644
--- a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_met_fromESD.py
+++ b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_met_fromESD.py
@@ -27,7 +27,15 @@ jobproperties.InDetJobProperties.doxAOD.set_Value_and_Lock(False)
rec.doFileMetaData.set_Value_and_Lock(False)
athenaCommonFlags.EvtMax=10
+
UserAlgs=["RecExRecoTest/RecExRecoTests_setupReadID.py"]
UserAlgs+=["RecExRecoTest/RecExRecoTest_setupJetEtMissPFlow.py"]
UserAlgs+=["METReconstruction/METReconstruction_jobOptions.py"]
include ("RecExCommon/RecExCommon_topOptions.py")
+
+import AthenaCommon.PropertiesManip as manip
+
+manip.appendItemsToList(StreamAOD,'ItemList','xAOD::PFOContainer_v1#CHSParticleFlowObjects')
+manip.appendItemsToList(StreamAOD,'ItemList','xAOD::PFOAuxContainer_v1#CHSParticleFlowObjectsAux.')
+
+
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_newJobConfig.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_newJobConfig.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5bf6a5d4ed3e5ccf0d04e34dbd0ba364a726081e
--- /dev/null
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_jets_fromesd_newJobConfig.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# art-description: Athena runs jet reconstruction, using the new job configuration for Run 3, from an ESD file
+# art-type: local
+# art-athena-mt
+# art-include: master/Athena
+
+python $WorkDir_DIR/jobOptions/JetRecConfig/test_StandardSmallRJets.py --filesIn /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root -n 50 | tee temp.log
+echo "art-result: ${PIPESTATUS[0]}"
+
+test_postProcessing_Errors.sh temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh
index 25ebd8b04f99c4cb22e335d91276116db6f326ed..26fc9a25146e04aa2aeba5c7b78c2668644f7253 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_tau_fromesd_compareSerialThreadings.sh
@@ -11,4 +11,4 @@
export ATHENA_CORE_NUMBER=8
-test_compare_SerialAndThreadedAthenas.sh tauRec/tau_standalone_ESDtoAOD.py
+test_compare_SerialAndThreadedAthenas.sh tauRec/tau_standalone_LCTopo_ESDtoAOD.py
diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py
index 3bccfe6bd3a51a68543db093fe9553f5d0d052bd..86b2cc75ed96e8ccadc9f5d62d0028173a664331 100755
--- a/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py
+++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_Combined_2004_jobOptions.py
@@ -571,10 +571,10 @@ if doLAr or doTile:
x.find("/CALO/HadCalibration/CaloOutOfCluster") == -1 and \
x.find("/CALO/HadCalibration/CaloOutOfClusterPi0") == -1 and \
x.find("/CALO/HadCalibration/CaloDMCorr2") == -1:
- print "adding ",x," to IOVDbSvc.Folders"
+ print("adding ",x," to IOVDbSvc.Folders")
myIOVDbFolders += [x]
else:
- print "removing ",x," from IOVDbSvc.Folders"
+ print("removing ",x," from IOVDbSvc.Folders")
iovdbsvc.Folders = myIOVDbFolders
if not doCaloTopoLocalCalibDb or doSim:
@@ -584,7 +584,7 @@ if doLAr or doTile:
iovdbsvc.Folders+=["/CALO/HadCalibration/CaloOutOfCluster"+"<dbConnection>sqlite://X;schema=myOOC05BERT200.db;dbname=OFLP200</dbConnection>"+"<tag>CaloHadOOCCorr-CSC05-BERT</tag>"]
iovdbsvc.Folders+=["/CALO/HadCalibration/CaloOutOfClusterPi0"+"<dbConnection>sqlite://X;schema=myOOCPi005BERT200.db;dbname=OFLP200</dbConnection>"+"<tag>CaloHadOOCCorrPi0-CSC05-BERT</tag>"]
iovdbsvc.Folders+=["/CALO/HadCalibration/CaloDMCorr2"+"<dbConnection>sqlite://X;schema=myDBHadDMCoeff200.db;dbname=OFLP200</dbConnection>"+"<tag>CaloHadDMCorr-002-00</tag>"]
- print iovdbsvc.Folders
+ print(iovdbsvc.Folders)
if not os.access('myEMFrac05BERT200.db',os.R_OK):
os.system('cp -f /afs/cern.ch/user/m/menke/public/AtlasOffline-14.2.21/myEMFrac05BERT200.db .')
if not os.access('myInvWeight05BERT200.db',os.R_OK):
diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py
index 9caf645baf206e6e4e8b3f93189a269364087f50..b355c882632a47f0a47baa425c80931c041e091d 100644
--- a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py
+++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_esdtoesd.py
@@ -63,7 +63,7 @@ include("LArConditionsCommon/LArConditionsCommon_H6G4_jobOptions.py")
include( "LArConditionsCommon/LArIdMap_H6_jobOptions.py" )
include( "CaloCondAthenaPool/CaloCondAthenaPool_joboptions.py")
PoolSvc.ReadCatalog += [ "prfile:PoolCat_H6_tbcond.xml" ]
-print "FileCatalog: ", PoolSvc.ReadCatalog
+print("FileCatalog: ", PoolSvc.ReadCatalog)
# - GeoModel ---
@@ -127,7 +127,7 @@ for x in topSequence.CaloTopoCluster.ClusterCorrectionTools:
if x.find("BadChan") == -1:
tlist += [x]
else:
- print "Removing: ",x," from CaloTopoCluster.ClusterCorrectionTools"
+ print("Removing: ",x," from CaloTopoCluster.ClusterCorrectionTools")
topSequence.CaloTopoCluster.ClusterCorrectionTools = tlist
@@ -167,8 +167,8 @@ lcPerf.doRecoEfficiency = True
lcPerf.isTestbeam = True
-print "topSequence",topSequence
-print "dumpMasterSequence"
+print("topSequence",topSequence)
+print("dumpMasterSequence")
from AthenaCommon.AlgSequence import dumpMasterSequence
dumpMasterSequence()
diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py
index 7c764d1a050a182e8caa0326bcd459f2bd8f63a9..db2360ac3bf9cbb68d7c655d61f546ec34be0901 100755
--- a/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py
+++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_H6_jobOptions.py
@@ -273,7 +273,7 @@ if doLAr:
include( "CaloCondAthenaPool/CaloCondAthenaPool_joboptions.py")
PoolSvc.ReadCatalog += [ "prfile:PoolCat_H6_tbcond.xml" ]
- print "FileCatalog: ", PoolSvc.ReadCatalog
+ print("FileCatalog: ", PoolSvc.ReadCatalog)
DetectorStore.OutputLevel = ERROR
@@ -827,7 +827,7 @@ if doMakeTopoCluster:
if x.find("BadChan") == -1:
tlist += [x]
else:
- print "Removing: ",x," from CaloTopoCluster.ClusterCorrectionTools"
+ print("Removing: ",x," from CaloTopoCluster.ClusterCorrectionTools")
topSequence.CaloTopoCluster.ClusterCorrectionTools = tlist
# remove CaloCellNeighborsAverageCorr from CaloCellMaker
clist=[]
@@ -835,7 +835,7 @@ if doMakeTopoCluster:
if y.getName().find("NeighborsAverageCorr") == -1:
clist += [y]
else:
- print "Removing: ",y," from CaloCellMaker.CaloCellMakerToolNames"
+ print("Removing: ",y," from CaloCellMaker.CaloCellMakerToolNames")
topSequence.CaloCellMaker.CaloCellMakerToolNames = clist
# Configuring LArBadChanTool
@@ -1103,11 +1103,9 @@ if doSim:
conddb.iovdbsvc.forceRunNumber = RunNumber
conddb.blockFolder("/LAR/LArElecCalibEC04/LArShapeComplete/LArPhysWave")
conddb.blockFolder("/LAR/CellCorrOfl/deadOTX")
-print conddb.iovdbsvc.Folders
+print(conddb.iovdbsvc.Folders)
-#print "qqq1> topSequence",topSequence
-#print "qqq2> dumpMasterSequence"
#from AthenaCommon.AlgSequence import dumpMasterSequence
#dumpMasterSequence()
diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_SetFlags_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_SetFlags_jobOptions.py
index 0f8319fc8fb9d5135f7a82521d27d90de19e4874..2c0f1a02e2619a8195c56fc74b82ef5c5684224c 100755
--- a/Reconstruction/RecExample/RecExTB/share/RecExTB_SetFlags_jobOptions.py
+++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_SetFlags_jobOptions.py
@@ -6,7 +6,7 @@ dataPathList.insert(0, os.curdir)
from AthenaCommon.Utils.unixtools import FindFile
filename = FindFile( 'prefix.txt', dataPathList, os.R_OK )
if filename is None:
- print 'ERROR: SetFlags.py could not find list of file prefixes, prefix.txt'
+ print('ERROR: SetFlags.py could not find list of file prefixes, prefix.txt')
text = open(filename,'r')
for line in text.readlines():
words = string.split(line)
@@ -15,4 +15,4 @@ for line in text.readlines():
if string.atoi(Run) == RunNumber:
FilePrefix = words[1]
text.close()
-print 'Prefix ', FilePrefix
+print('Prefix ', FilePrefix)
diff --git a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
index 287a1249f5f92b6744d901eb9d96727b77713f9c..ed01a5bded1c4e2fbe692a35aef49824b7817bde 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
+++ b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
@@ -135,14 +135,14 @@ StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
StreamESD.ItemList+=CaloESDList
-print StreamESD.ItemList
+print(StreamESD.ItemList)
#---------------------------------------------------------------------------------#
# MT-specific code
if nThreads >=1 :
include ( "CaloHiveEx/CaloHiveDeps.py" )
-print "==========================================================================================\n"
+print("==========================================================================================\n")
#
## set which Algorithms can be cloned
diff --git a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_MuonRec_myTopOptions_MT.py b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_MuonRec_myTopOptions_MT.py
index 01b64f1749c0eac45fd0a0deed4627dbb48729f7..5b072a4141611b7ba3b075fb9a2f4b4398999196 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_MuonRec_myTopOptions_MT.py
+++ b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_MuonRec_myTopOptions_MT.py
@@ -104,7 +104,7 @@ try:
except:
# print the stacktrace (saving could fail, and would then obscure the real problem)
import traceback
- print traceback.format_exc().rstrip()
+ print(traceback.format_exc().rstrip())
# always write config so far for debugging
from AthenaCommon.ConfigurationShelve import saveToAscii
diff --git a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
index 1bf9061ef8288a19ac3122a47bc48c9015e51614..391666c9bd3d4df8367b7f0776f37c31fb1034e4 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
+++ b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
@@ -183,14 +183,14 @@ StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
StreamESD.ItemList+=CaloESDList
-print StreamESD.ItemList
+print(StreamESD.ItemList)
#---------------------------------------------------------------------------------#
# MT-specific code
if nThreads >=1 :
include ( "RecJobTransformTests_PFlowHiveDeps.py" )
-print "==========================================================================================\n"
+print("==========================================================================================\n")
#
## set which Algorithms can be cloned
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
index c334ef91543981f66ff826cd1ad9a236eff882a1..c8c0af161901c922adfe0fd2650425f9267b0778 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
@@ -1,12 +1,13 @@
#!/bin/sh
#
# art-description: Run reco with a latest (September 2020) MC setup with pileup
+# art-output: log.*
# art-athena-mt: 4
# art-type: grid
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/eos/atlas/atlascerngroupdisk/data-art/grid-input/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_PhysValAll.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_PhysValAll.sh
new file mode 100755
index 0000000000000000000000000000000000000000..53937603459de9b0407b7c5aa41da845d370f04b
--- /dev/null
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_PhysValAll.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# art-description: Run PhysicaValidation code from all domains. Uses AOD produced from test_mcLatest_13teV.sh on 7 October 2020.
+# art-output: log.*
+# art-athena-mt: 4
+# art-type: grid
+# art-include: master/Athena
+
+export TRF_ECHO=True;
+Reco_tf.py --inputAODFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mcLatest/mcLatest_13TeV_AOD.pool.root --outputNTUP_PHYSVALFile physval.root --validationFlags 'doExample,doMET,doPFlow,doTau,doEgamma,doBtag,doZee,doJet,doTopoCluster,doMuon,doTrigMinBias,doTrigIDtrk,doTrigBphys,doTrigMET,doTrigJet,doTrigTau, doTrigEgamma,doTrigMuon,doTrigBjet,doTrigHLTResult'
+RES=$?
+echo "art-result: $RES Reco"
+if [ $RES -ne 0 ];then
+return $RES
+fi
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_PhysValExample.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_PhysValExample.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f86865001e68bf95ea6cbcc5a90d300309156225
--- /dev/null
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_PhysValExample.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# art-description: Run PhysicaValidation Example code. Uses AOD produced from test_mcLatest_13teV.sh on 7 October 2020.
+# art-output: log.*
+# art-athena-mt: 4
+# art-type: grid
+# art-include: master/Athena
+
+export TRF_ECHO=True;
+Reco_tf.py --inputAODFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mcLatest/mcLatest_13TeV_AOD.pool.root --outputNTUP_PHYSVALFile physval.root --validationFlags doExample
+RES=$?
+echo "art-result: $RES Reco"
+if [ $RES -ne 0 ];then
+return $RES
+fi
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
index e3238a254e27e8d6f713ad9eea1a55eea20aa484..acaae2dd55c79becd36633d639f940c4b7cfa801 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/eos/atlas/atlascerngroupdisk/data-art/grid-input/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
index f802a4492c0176a880466b31d6547bbc0b124a10..8f58826b79aa98bc47490d5749011d05992bc892 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
@@ -1,12 +1,13 @@
#!/bin/sh
#
# art-description: Run latest (Sep 2020) MC setup without pileup and with stdcmalloc enabled.
+# art-output: log.*
# art-athena-mt: 4
# art-type: grid
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/eos/atlas/atlascerngroupdisk/data-art/grid-input/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts="--stdcmalloc"
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts="--stdcmalloc"
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
index b31ce24acd7b3ccd7142d9b9061cf437ae8df1ea..9603a7832b76ae046b34ede7d043f06305e61100 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
@@ -50,6 +50,13 @@ if hasattr(runArgs,"outputAODFile"):
athenaCommonFlags.PoolAODOutput.set_Value_and_Lock( runArgs.outputAODFile )
# Begin temporary trigger block
if TriggerFlags.doMT():
+ # Lock DQ configuration to prevent downstream override
+ from AthenaMonitoring.DQMonFlags import DQMonFlags
+ print('DQMonFlags override')
+ if not rec.doTrigger():
+ DQMonFlags.useTrigger.set_Value_and_Lock(False)
+ if DQMonFlags.useTrigger() and rec.doTrigger():
+ DQMonFlags.useTrigger.set_Value_and_Lock(True)
# Don't run any trigger - only pass the HLT contents from ESD to AOD
from RecExConfig.RecAlgsFlags import recAlgs
recAlgs.doTrigger.set_Value_and_Lock( False )
@@ -80,7 +87,6 @@ if hasattr(runArgs,"tmpAOD"):
if hasattr(runArgs,"outputHIST_AOD_INTFile"):
rec.doMonitoring.set_Value_and_Lock(True)
- from AthenaMonitoring.DQMonFlags import DQMonFlags
DQMonFlags.histogramFile.set_Value_and_Lock( runArgs.outputHIST_AOD_INTFile )
if hasattr(runArgs,"outputNTUP_BTAGFile"):
@@ -154,9 +160,9 @@ if hasattr(runArgs,"outputDESDM_BEAMSPOTFile"):
include("InDetBeamSpotFinder/DESDM_BEAMSPOTFragment.py")
#==========================================================
-# Use LZIB for compression of temporary outputs of AthenaMP
+# Use ZLIB for compression of all temporary outputs
#==========================================================
-if hasattr(runArgs, "outputAODFile") and '_000' in runArgs.outputAODFile:
+if hasattr(runArgs, "outputAODFile") and ('_000' in runArgs.outputAODFile or 'tmp.' in runArgs.outputAODFile):
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ]
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_LEVEL = '1'" ]
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py
index 2cf64f9b22e42ad4ad70678bb72a7d4d5982521b..ccf0cbd7d94adf16801b90dafefa34c60aae0d2c 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoALL_tf.py
@@ -146,13 +146,13 @@ if hasattr(runArgs,"inputRDO_TRIGFile") and rec.doFileMetaData():
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.TriggerMenuMetaDataTool ]
#==========================================================
-# Use LZIB for compression of temporary outputs of AthenaMP
+# Use ZLIB for compression of all temporary outputs
#==========================================================
-if hasattr(runArgs, "outputESDFile") and '_000' in runArgs.outputESDFile:
+if hasattr(runArgs, "outputESDFile") and ('_000' in runArgs.outputESDFile or 'tmp.' in runArgs.outputESDFile):
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ]
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_LEVEL = '1'" ]
-if hasattr(runArgs, "outputAODFile") and '_000' in runArgs.outputAODFile:
+if hasattr(runArgs, "outputAODFile") and ('_000' in runArgs.outputAODFile or 'tmp.' in runArgs.outputAODFile):
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ]
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolAODOutput()+ "'; COMPRESSION_LEVEL = '1'" ]
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
index 5353261f7e73613e93e3a5cdb2b38f7ee399d416..62236d0468778075c2ef45b5ab401bf3a2f71e31 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
@@ -207,9 +207,9 @@ if hasattr(runArgs,"inputRDO_TRIGFile") and rec.doFileMetaData():
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.TriggerMenuMetaDataTool ]
#==========================================================
-# Use LZIB for compression of temporary outputs of AthenaMP
+# Use ZLIB for compression of all temporary outputs
#==========================================================
-if hasattr(runArgs, "outputESDFile") and '_000' in runArgs.outputESDFile:
+if hasattr(runArgs, "outputESDFile") and ('_000' in runArgs.outputESDFile or 'tmp.' in runArgs.outputESDFile):
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ]
ServiceMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolESDOutput()+ "'; COMPRESSION_LEVEL = '1'" ]
diff --git a/Reconstruction/RecoTools/ITrackToVertex/ITrackToVertex/ITrackToVertexAssociator.h b/Reconstruction/RecoTools/ITrackToVertex/ITrackToVertex/ITrackToVertexAssociator.h
deleted file mode 100644
index ff13095c2b1f8ac4c21caaed80a7915e1b2eba3c..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/ITrackToVertex/ITrackToVertex/ITrackToVertexAssociator.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-///////////////////////////////////////////////////////////////////
-// ITrackToVertexAssociator.h, (c) ATLAS Detector software 2010
-///////////////////////////////////////////////////////////////////
-
-#ifndef TRACKTOVERTEX_ITRACKTOVERTEXASSOCIATOR_H
-#define TRACKTOVERTEX_ITRACKTOVERTEXASSOCIATOR_H
-
-// Gaudi
-#include "GaudiKernel/IAlgTool.h"
-// Trk
-#include "TrkDetDescrUtils/SharedObject.h"
-
-// (Track/Neutral)Parameters
-#include "TrkParameters/TrackParameters.h"
-#include "TrkNeutralParameters/NeutralParameters.h"
-
-namespace Trk {
- class Track;
- class TrackParticleBase;
- class VxCandidate;
-
-}
-
-namespace Reco {
-
- /**
- @class TrackToVertexAssociation
- -- this is a container class with reference counting for the private members
- NEVER DELETE A RETURN OBJECT !
- */
- class TrackToVertexAssociation {
- public :
- /** Constructor */
- TrackToVertexAssociation(const Trk::VxCandidate* vertex,
- const Amg::Vector3D& vertexPositionBLFrame,
- Trk::SharedObject<const Amg::Vector2D> impactParameterBLFrame,
- Trk::SharedObject<const Amg::MatrixX> covarianceMatrixBlFrame
- ) :
- m_vertex(vertex),
- m_impactParameterBLFrame(impactParameterBLFrame),
- m_covarianceMatrixBlFrame(covarianceMatrixBlFrame)
- {
- m_longitudinalDistance = (*impactParameterBLFrame)[Trk::z0] - vertexPositionBLFrame.z();
- m_transverseDistance = (*impactParameterBLFrame)[Trk::d0] - vertexPositionBLFrame.perp();
- }
-
- //** Destructor */
- ~TrackToVertexAssociation(){}
-
- // Copy constructor
- TrackToVertexAssociation(const TrackToVertexAssociation& ttva) :
- m_vertex(ttva.m_vertex),
- m_impactParameterBLFrame(ttva.m_impactParameterBLFrame),
- m_covarianceMatrixBlFrame(ttva.m_covarianceMatrixBlFrame),
- m_longitudinalDistance(ttva.m_longitudinalDistance),
- m_transverseDistance(ttva.m_transverseDistance)
- {}
-
- // Assignment operator
- TrackToVertexAssociation& operator=(const TrackToVertexAssociation& ttva ){
- if (&ttva != this){
- m_vertex = ttva.m_vertex;
- m_impactParameterBLFrame = ttva.m_impactParameterBLFrame;
- m_covarianceMatrixBlFrame = ttva.m_covarianceMatrixBlFrame;
- m_longitudinalDistance = ttva.m_longitudinalDistance;
- m_transverseDistance = ttva.m_transverseDistance;
- }
- return (*this);
- }
-
- // define the smaller operator for this object
- bool operator<(const TrackToVertexAssociation& b) const
- { return m_longitudinalDistance*m_longitudinalDistance < b.longitudinalDistance()*b.longitudinalDistance(); }
-
- // Return the vertex -- original frame
- const Trk::VxCandidate* vertex() const { return m_vertex; }
-
- // Return the local position
- const Amg::Vector2D* impactParameterBeamLineFrame() const { return (m_impactParameterBLFrame.get()); };
-
- // Return the Covariance Matrix*
- const Amg::MatrixX* covarianceMatrixBeamLineFrame() const { return (m_covarianceMatrixBlFrame.get()); }
-
- // distances (1) : transverse
- double transverseDistance() const { return m_transverseDistance; }
-
- // distances (2) : longitudinal
- double longitudinalDistance() const { return m_longitudinalDistance; }
-
-
- private :
- // Default constructor is private
- TrackToVertexAssociation() {};
-
- // the vertices in original frame in beam-line frame
- const Trk::VxCandidate* m_vertex;
- // the local position and error to the BL, to do : add Covariance matrix
- Trk::SharedObject<const Amg::Vector2D> m_impactParameterBLFrame;
- Trk::SharedObject<const Amg::MatrixX> m_covarianceMatrixBlFrame;
- // for the sorting
- double m_longitudinalDistance;
- double m_transverseDistance;
- };
-
-
- static const InterfaceID IID_ITrackToVertexAssociator("ITrackToVertexAssociator", 1, 0);
-
- /**
- @class ITrackToVertexAssociator
-
- @author Andreas.Salzburger@cern.ch
- */
-
-
- class ITrackToVertexAssociator : virtual public IAlgTool {
-
- public:
- /** Virtual destructor */
- virtual ~ITrackToVertexAssociator(){};
-
- /** AlgTool interface methods */
- static const InterfaceID& interfaceID() { return IID_ITrackToVertexAssociator; };
-
- /** Interface method for use with TrackParticle - AOD */
- virtual const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::TrackParticleBase& part) const = 0;
-
- /** Interface method for use with Track - ESD */
- virtual const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::Track& trk) const = 0;
-
- /** Interface method for use with charged TPs - work horse */
- virtual const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::TrackParameters& pars) const = 0;
-
- /** Interface method for use with neutral TPs */
- virtual const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::NeutralParameters& pars) const = 0;
- };
-
-}
-
-#endif // TRACKTOVERTEX_ITRACKTOVERTEXASSOCIATOR_H
-
diff --git a/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h b/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h
index 6109d6865a6907407865def9a98b0a03295a6cdc..a5a057dd481eebd874aa61a47d3bb0c273cd8061 100644
--- a/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h
+++ b/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h
@@ -89,18 +89,17 @@ namespace xAOD {
// This never seems to have more than one entry???
typedef std::map<const IParticle*, const IParticle*> derefMap_t;
- /** cast for TrackParticle (etcone muon) */
- bool caloCellIsolation( CaloIsolation& result,
+ /** cast for Muon (etcone muon) */
+ bool caloCellIsolation( CaloIsolation& result,
#ifndef XAOD_ANALYSIS
- const TrackParticle& tp,
+ const Muon& muon,
#endif
- const std::vector<Iso::IsolationType>& cones, CaloCorrection corrections
+ const std::vector<Iso::IsolationType>& cones, CaloCorrection corrections
#ifndef XAOD_ANALYSIS
- , const CaloCellContainer* container
- , double coneCoreSize
- , const derefMap_t& derefMap
+ , double coneCoreSize
+ , const derefMap_t& derefMap
#endif
- ) const;
+ ) const;
/** cast for egamma (etcone egamma)*/
bool caloCellIsolation( CaloIsolation& result, const Egamma& tp, const std::vector<Iso::IsolationType>& cones, CaloCorrection corrections
@@ -153,6 +152,14 @@ namespace xAOD {
double coneCoreSize,
const derefMap_t& derefMap) const;
#endif
+
+ // etcone computation for TrackParticle
+#ifndef XAOD_ANALYSIS
+ bool etConeIsolation( CaloIsolation& result, const Muon& muon,
+ const std::vector<Iso::IsolationType>& isoTypes,
+ double coneCoreSize,
+ const derefMap_t& derefMap) const;
+#endif
// etcone computation for Egamma
#ifndef XAOD_ANALYSIS
diff --git a/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx b/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx
index e48ac9c1f8cf9ef1053c0b5696f62da53077c066..af610bb51f00badf21c15c062801d41798d5b5ed 100644
--- a/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx
+++ b/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx
@@ -154,14 +154,14 @@ namespace xAOD {
coneCoreSize = m_coneCoreSizeMu;
// muon etcone isolation
- const TrackParticle* trkp = dynamic_cast<const TrackParticle*>(ip);
- if( trkp ) return caloCellIsolation(result,*trkp,cones,corrlist,container,coneCoreSize, derefMap);
+ const Muon* muon = dynamic_cast<const Muon*>(&particle);
+ if(muon) return caloCellIsolation(result,*muon,cones,corrlist,coneCoreSize, derefMap);
// egamma etcone isolation
const Egamma* egam = dynamic_cast<const Egamma*>(ip);
if( egam ) return caloCellIsolation(result,*egam,cones,corrlist,container);
- ATH_MSG_WARNING("CaloCellIsolation only supported for TrackParticles and Egamma");
+ ATH_MSG_WARNING("CaloCellIsolation only supported for Muons and Egamma");
return true;
#endif // not XAOD_ANALYSIS
@@ -238,18 +238,17 @@ namespace xAOD {
}
- // casted interface for TrackParticle cell-based isolation (etcone)
+ // casted interface for Muon cell-based isolation (etcone)
bool CaloIsolationTool::caloCellIsolation( CaloIsolation& result,
#ifndef XAOD_ANALYSIS
- const TrackParticle& tp,
+ const Muon& muon,
#endif
- const std::vector<Iso::IsolationType>& isoTypes, CaloCorrection corrlist
+ const std::vector<Iso::IsolationType>& isoTypes, CaloCorrection corrlist
#ifndef XAOD_ANALYSIS
- , const CaloCellContainer* container
- , double coneCoreSize
- , const derefMap_t& derefMap
+ , double coneCoreSize
+ , const derefMap_t& derefMap
#endif
- ) const {
+ ) const {
if( isoTypes.empty() ) {
ATH_MSG_WARNING("Empty list passed, failing calculation");
return false;
@@ -263,13 +262,13 @@ namespace xAOD {
if (theFlavour == Iso::etcone)
#ifndef XAOD_ANALYSIS
- return etConeIsolation(result, tp, isoTypes, container, coneCoreSize, derefMap);
+ return etConeIsolation(result, muon, isoTypes, coneCoreSize, derefMap);
#else
- return true;
+ return true;
#endif
ATH_MSG_WARNING("Unsupported isolation flavour passed, cannot calculate isolation " <<
- static_cast<int>(theFlavour));
+ static_cast<int>(theFlavour));
return false;
}
@@ -702,6 +701,93 @@ namespace xAOD {
}
#endif
+#ifndef XAOD_ANALYSIS
+ // etcone implementation for Muon
+ bool CaloIsolationTool::etConeIsolation( CaloIsolation& result, const Muon& muon,
+ const std::vector<Iso::IsolationType>& isoTypes,
+ double coneCoreSize,
+ const derefMap_t& derefMap) const {
+
+ std::vector<double> conesf;
+ double maxConeSize = -1;
+ for( auto isoType : isoTypes ){
+ if( Iso::isolationFlavour(isoType) != Iso::etcone ) {
+ ATH_MSG_WARNING("Unsupported isolation type passed, cannot calculate isolation " << static_cast<int>(isoType));
+ return false;
+ }
+ double cone = Iso::coneSize(isoType);
+ conesf.push_back(cone);
+ if(cone>maxConeSize) maxConeSize = cone;
+ }
+
+ const xAOD::CaloCluster* muonCluster=*muon.clusterLink();
+ if(!muonCluster){//have to figure this part out
+ ATH_MSG_WARNING("muon has no cluster, cannot calculate etcone isolation");
+ return false;
+ }
+ /// add coreCone if asked -- make sure it's the last one! or a better
+ const double coreConeDR = coneCoreSize;
+ bool doCoreCone = (!m_saveOnlyRequestedCorrections || result.corrlist.calobitset.test(static_cast<unsigned int>(Iso::coreCone)));
+ if(doCoreCone && maxConeSize<coreConeDR) maxConeSize = coreConeDR;
+ /// start the calculation
+ ATH_MSG_DEBUG("calculating etcone for # " << conesf.size() << " cones");
+ Trk::CaloCellSelectorLayerdR selector(maxConeSize);
+ selector.preSelectAction(*muonCluster);
+ ATH_MSG_DEBUG("looping over cells " << muonCluster->size());
+ for(unsigned int i=0; i<conesf.size(); i++){
+ double totE = 0.;
+ selector.setConeSize(conesf[i]);
+ xAOD::CaloCluster::const_cell_iterator cell_itr=muonCluster->begin();
+ for(; cell_itr!=muonCluster->end(); ++cell_itr){
+ if( !selector.select(**cell_itr) ) continue;
+ if (m_ExcludeTG3 && CaloCell_ID::TileGap3 == (*cell_itr)->caloDDE()->getSampling()) continue;
+ totE += (*cell_itr)->et();
+ }
+ result.etcones[i] = totE;
+ ATH_MSG_DEBUG("etcone raw: coneSize = " << conesf[i] << "; etcone = " << result.etcones[i]);
+ }
+ ATH_MSG_DEBUG("done looping over cells ");
+ /// do coreCone
+ if(doCoreCone){
+ ATH_MSG_DEBUG("starting etcone, coreCone");
+ double totE = 0.;
+ selector.setConeSize(coreConeDR);
+ xAOD::CaloCluster::const_cell_iterator cell_itr=muonCluster->begin();
+ for(; cell_itr!=muonCluster->end(); ++cell_itr){
+ if( !selector.select(**cell_itr) ) continue;
+ if (m_ExcludeTG3 && CaloCell_ID::TileGap3 == (*cell_itr)->caloDDE()->getSampling()) continue;
+ totE += (*cell_itr)->et();
+ }
+ std::map<Iso::IsolationCorrectionParameter,float> corecorr;
+ corecorr[Iso::coreEnergy] = totE;
+ corecorr[Iso::coreArea] = coreConeDR*coreConeDR*M_PI;
+ result.coreCorrections[Iso::coreCone] = corecorr;
+ ATH_MSG_DEBUG("done etcone, coreCone");
+
+ /// apply the correction if required.
+ if(result.corrlist.calobitset.test(static_cast<unsigned int>(Iso::coreCone))){
+ double ecore = totE;
+ ATH_MSG_DEBUG("Applying coreCone correction for trackParticle etcone isolation.");
+ for( unsigned int i=0;i<result.etcones.size();++i ) {
+ result.etcones[i] -= ecore;
+ ATH_MSG_DEBUG("i: " << i << " cone [before] " << result.etcones[i]+ecore << " cone [after] " << result.etcones[i]);
+ }
+ }
+ }
+
+ // calculate etcore
+ if(!m_saveOnlyRequestedCorrections ||
+ result.corrlist.calobitset.test(static_cast<unsigned int>(Iso::coreMuon))){
+ const TrackParticle* tp = nullptr;
+ if(muon.primaryTrackParticleLink().isValid() && muon.author()!=2) tp = *muon.primaryTrackParticleLink();
+ if( !tp) tp = *muon.inDetTrackParticleLink();
+ correctIsolationEnergy_MuonCore(result, *tp, derefMap);
+ }
+
+ return true;
+ }
+#endif
+
#ifndef XAOD_ANALYSIS
// etcone implementation for Egamma
bool CaloIsolationTool::etConeIsolation( CaloIsolation& result, const Egamma& eg,
@@ -1221,8 +1307,8 @@ bool CaloIsolationTool::correctIsolationEnergy_pflowCore(CaloIsolation& result,
if(muI!=derefMap.end() && muI->second->isAvailable<float>("ET_Core")){
ecore = muI->second->auxdataConst<float>("ET_Core");
}else{
- ATH_MSG_WARNING("ET_Core of muon not found! coreMuon isolation correction will not be applied!!!");
- return false;
+ ATH_MSG_WARNING("ET_Core of muon not found! coreMuon isolation correction will not be applied!!!");
+ return false;
}
std::map<Iso::IsolationCorrectionParameter,float> corecorr;
diff --git a/Reconstruction/RecoTools/TrackToCalo/TrackToCalo/CaloCellSelectorLayerdR.h b/Reconstruction/RecoTools/TrackToCalo/TrackToCalo/CaloCellSelectorLayerdR.h
index b4ecc4d4aee1d377ffebc787b6fe3853b01bf52d..8f3130a1b57e5b987bc6f5e673d8f66643046ceb 100644
--- a/Reconstruction/RecoTools/TrackToCalo/TrackToCalo/CaloCellSelectorLayerdR.h
+++ b/Reconstruction/RecoTools/TrackToCalo/TrackToCalo/CaloCellSelectorLayerdR.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -12,6 +12,7 @@
#include "TrkParametersIdentificationHelpers/TrackParametersIdHelper.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "TrkCaloExtension/CaloExtensionHelpers.h"
+#include "xAODCaloEvent/CaloCluster.h"
namespace Trk
{
@@ -31,6 +32,7 @@ namespace Trk
void setConeSize( double coneSize ) { m_coneSize2 = coneSize*coneSize; }
bool preSelectAction( const Trk::CaloExtension& caloExtension );
+ bool preSelectAction( const xAOD::CaloCluster& caloCluster );
bool select( const CaloCell& cell ) const; // select or reject the cell
private:
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/CaloCellSelectorLayerdR.cxx b/Reconstruction/RecoTools/TrackToCalo/src/CaloCellSelectorLayerdR.cxx
index 0eb73e0173b370f7a0740a659316ba625442fe56..c9a7f690c9c72aeccf487c8137d5a58ff8503a57 100644
--- a/Reconstruction/RecoTools/TrackToCalo/src/CaloCellSelectorLayerdR.cxx
+++ b/Reconstruction/RecoTools/TrackToCalo/src/CaloCellSelectorLayerdR.cxx
@@ -20,32 +20,34 @@ namespace Trk
CaloCellSelectorLayerdR::~CaloCellSelectorLayerdR(){}
bool CaloCellSelectorLayerdR::preSelectAction( const Trk::CaloExtension& caloExtension ){
-
- //std::cout << "CaloCellSelectorLayerdR p00" << std::endl;
if( caloExtension.caloLayerIntersections().empty() ) return false;
- //std::cout << "CaloCellSelectorLayerdR p01" << std::endl;
CaloExtensionHelpers::midPointEtaPhiHashLookupVector( caloExtension, m_midPoints );
return true;
}
+ bool CaloCellSelectorLayerdR::preSelectAction( const xAOD::CaloCluster& caloCluster ){
+ m_midPoints.clear();
+ m_midPoints.resize(CaloSampling::getNumberOfSamplings());
+ for(unsigned int i=0; i<CaloSampling::Unknown; i++){
+ auto s = static_cast<CaloSampling::CaloSample>(i);
+ if(!caloCluster.hasSampling(s)) m_midPoints.push_back(std::make_tuple(false,0.,0.));
+ else m_midPoints.push_back(std::make_tuple(true,caloCluster.etaSample(s),caloCluster.phiSample(s)));
+ }
+ return true;
+ }
+
+
bool CaloCellSelectorLayerdR::select( const CaloCell& cell )const {
// select cell within dR from the midPoint of the same calo layer
const CaloDetDescrElement* dde = cell.caloDDE();
- //std::cout << "CaloCellSelectorLayerdR p1" << std::endl;
if(!dde) return false;
int samplingID = dde->getSampling();
- //std::cout << "CaloCellSelectorLayerdR p2 " << samplingID << std::endl;
- //for (auto entry : m_midPoints){
- // std::cout << std::get<0>(entry) << std::endl;
- //}
if ( !std::get<0>(m_midPoints[samplingID]) ) return false;
double dr = Utils::deltaR2( std::get<1>(m_midPoints[samplingID]),dde->eta(),std::get<2>(m_midPoints[samplingID]),dde->phi());
if( dr < m_coneSize2){
- //std::cout << "CaloCellSelectorLayerdR p3" << std::endl;
return true;
}
- //std::cout << "CaloCellSelectorLayerdR p4" << std::endl;
return false;
}
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h b/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h
index 6c0afda2355607f11b715a00c5d012688e501931..13ec089aa7d2bb95e492a491a130b700df18c758 100644
--- a/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h
+++ b/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h
@@ -32,7 +32,7 @@ namespace Rec {
* as it still uses the old style caching
* to be updated if needed
*/
- class ATLAS_NOT_THREAD_SAFE ParticleCaloClusterAssociationTool :
+ class ParticleCaloClusterAssociationTool :
virtual public IParticleCaloClusterAssociationTool, public AthAlgTool {
public:
diff --git a/Reconstruction/RecoTools/TrackToVertex/TrackToVertex/TrackToVertexAssociator.h b/Reconstruction/RecoTools/TrackToVertex/TrackToVertex/TrackToVertexAssociator.h
deleted file mode 100644
index 69c01f9cd08ae4b7c58a1a8fd74216bd6f4d1f59..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/TrackToVertex/TrackToVertex/TrackToVertexAssociator.h
+++ /dev/null
@@ -1,172 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-// TrackToVertexAssociator.h
-// Header file for class TrackToVertexAssociator
-// Author: Andreas.Salzburger -at- cern.ch
-///////////////////////////////////////////////////////////////////
-#ifndef TRACKTOVERTEX_TRACKTOVERTEXASSOCIATOR_H
-#define TRACKTOVERTEX_TRACKTOVERTEXASSOCIATOR_H 1
-
-// STL includes
-#include <string>
-
-// FrameWork includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/IIncidentListener.h"
-
-// ITrackToVertex includes
-#include "ITrackToVertex/ITrackToVertexAssociator.h"
-
-// Tracking includes
-#include "TrkEventPrimitives/ParticleHypothesis.h"
-#include "TrkExInterfaces/IExtrapolator.h"
-#include "TrkParameters/TrackParameters.h"
-#include "TrkNeutralParameters/NeutralParameters.h"
-#include "GeoPrimitives/GeoPrimitives.h"
-#include "EventPrimitives/EventPrimitives.h"
-#include "BeamSpotConditionsData/BeamSpotData.h"
-#include "CxxUtils/checker_macros.h"
-
-// Forward declaration
-class StoreGateSvc;
-class IIncidentSvc;
-class VxContainer;
-
-namespace Trk {
- class Track;
- class TrackParticleBase;
- class StraightLineSurface;
- class StraightLineSurface;
-}
-
-
-namespace Reco {
-
- class ATLAS_NOT_THREAD_SAFE TrackToVertexAssociator
- : virtual public ITrackToVertexAssociator,
- public AthAlgTool, virtual public IIncidentListener {
-
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
- public:
-
- // Copy constructor:
-
- /// Constructor with parameters:
- TrackToVertexAssociator( const std::string& type,
- const std::string& name,
- const IInterface* parent );
-
- /// Destructor:
- virtual ~TrackToVertexAssociator();
-
- // Athena algtool's Hooks
- StatusCode initialize();
- StatusCode finalize();
-
- /** handle for incident service */
- void handle(const Incident& inc) ;
-
- /** Interface method for use with TrackParticle - AOD */
- const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::TrackParticleBase& part) const;
-
- /** Interface method for use with Track - ESD */
- const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::Track& trk) const;
-
- /** Interface method for use with ParametersBase - parameters */
- const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::TrackParameters& pbase) const;
-
- /** Interface method for use with neutral TPs */
- const std::vector<TrackToVertexAssociation>* associateTrack ATLAS_NOT_THREAD_SAFE (const Trk::NeutralParameters& pars) const;
- private:
-
- template < class T > const std::vector<TrackToVertexAssociation>* runAssociation ATLAS_NOT_THREAD_SAFE (const T& input) const;
-
- // Default constructor:
- TrackToVertexAssociator();
-
- // private methods
- StatusCode updateCache ATLAS_NOT_THREAD_SAFE () const;
- StatusCode cleanCache ATLAS_NOT_THREAD_SAFE () const;
-
- // Services
- ServiceHandle<StoreGateSvc> m_storeGate; //!< Event store
- SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" }; //!< BeamCondSvc to get the beam parameters
- ServiceHandle<IIncidentSvc> m_incidentSvc; //!< IncidentSvc to catch begin of event and end of envent
-
- // Tools
- ToolHandle<Trk::IExtrapolator> m_extrapolator; //!< Extrapolation engine for estimation of the impact
-
- std::string m_primaryVertexContainer;
- mutable const VxContainer* m_primaryVertices;
- mutable std::vector<const Trk::VxCandidate*> m_primaryVerticesWoDummy;
- mutable std::vector<Amg::Vector3D> m_primaryVerticesBLFrame;
-
- mutable Trk::StraightLineSurface* m_beamLine;
- bool m_particleHypo;
- double m_cut;
-
-
- };
-
- ///////////////////////////////////////////////////////////////////
- // Inline methods:
- ///////////////////////////////////////////////////////////////////
-
- /** Interface method for use with ParametersBase - work horse */
- template < class T > const std::vector<TrackToVertexAssociation>* TrackToVertexAssociator::runAssociation(const T& tinput) const
- {
- if (!m_primaryVerticesBLFrame.size() && updateCache().isFailure()){
- ATH_MSG_DEBUG("No primary vertices for this event, return 0.");
- return 0;
- }
- // extrapolate to the beam line, can we use a data pool for this ?
- const Trk::TrackParameters* ataLine = m_extrapolator->extrapolate(tinput,*m_beamLine,Trk::anyDirection,(Trk::ParticleHypothesis)m_particleHypo);
- if (!ataLine) {
- ATH_MSG_DEBUG("Extrapolation to beamline did not succeed, return 0.");
- return 0;
- }
-
- Trk::SharedObject<const Amg::Vector2D> localImpactParameter(new Amg::Vector2D(ataLine->localPosition()));
- Amg::MatrixX* cov = 0;
- if (ataLine->covariance()){
- // d0, z0
- double covD0 = (*ataLine->covariance())(Trk::d0,Trk::d0);
- double covZ0 = (*ataLine->covariance())(Trk::z0,Trk::z0);
- // covariance matrix
- cov = new Amg::MatrixX(2,2);
- cov->setZero();
- (*cov)(Trk::d0,Trk::d0) = covD0;
- (*cov)(Trk::z0,Trk::z0) = covZ0;
- }
- Trk::SharedObject<const Amg::MatrixX> localCovariance(cov);
- // create the return vector and reserve the maximum you could possibly need
- std::vector< Reco::TrackToVertexAssociation>* tvaVector = new std::vector< Reco::TrackToVertexAssociation >();
- tvaVector->reserve(m_primaryVerticesBLFrame.size());
- // loop and build the associations
- std::vector<Amg::Vector3D>::const_iterator vBLIter = m_primaryVerticesBLFrame.begin();
- std::vector<Amg::Vector3D>::const_iterator vBLIterEnd = m_primaryVerticesBLFrame.end();
- std::vector<const Trk::VxCandidate*>::const_iterator vIter = m_primaryVerticesWoDummy.begin();
- std::vector<const Trk::VxCandidate*>::const_iterator vIterEnd = m_primaryVerticesWoDummy.end();
- // loop over and build the TrackToVertex associations
- for ( ; vBLIter!= vBLIterEnd && vIter != vIterEnd; ++vBLIter, ++vIter )
- tvaVector->push_back(Reco::TrackToVertexAssociation(*vIter,*vBLIter,localImpactParameter,localCovariance));
- // memory cleanup
- delete ataLine;
- // sort the vector before returning, using operator< defined for TrackToVertexAssociation
- std::sort(tvaVector->begin(),tvaVector->end());
- // return what you have
- return tvaVector;
- }
-
-
-}
-
-#endif //> !TRACKTOVERTEX_TRACKTOVERTEXASSOCIATOR_H
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertexAssociator.cxx b/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertexAssociator.cxx
deleted file mode 100644
index 03b295970ba3817a7bd8c5177a8337779fa99f90..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertexAssociator.cxx
+++ /dev/null
@@ -1,170 +0,0 @@
-///////////////////////// -*- C++ -*- /////////////////////////////
-
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-// TrackToVertexAssociator.cxx
-// Implementation file for class TrackToVertexAssociator
-///////////////////////////////////////////////////////////////////
-
-// TrackToVertex includes
-#include "TrackToVertex/TrackToVertexAssociator.h"
-// Tracking includes
-#include "TrkTrack/Track.h"
-#include "TrkParticleBase/TrackParticleBase.h"
-#include "TrkSurfaces/StraightLineSurface.h"
-#include "VxVertex/VxContainer.h"
-#include "VxVertex/VxCandidate.h"
-
-//#include "CLHEP/Units/SystemOfUnits.h"
-// StoreGate
-#include "StoreGate/StoreGateSvc.h"
-
-
-
-/////////////////
-// Constructors
-////////////////
-Reco::TrackToVertexAssociator::TrackToVertexAssociator( const std::string& type,
- const std::string& name,
- const IInterface* parent ) :
- ::AthAlgTool ( type, name, parent ),
- m_storeGate( "StoreGateSvc", name ),
- m_incidentSvc("IncidentSvc", name),
- m_extrapolator("Trk::Extrapolator/AtlasExtrapolator"),
- m_primaryVertexContainer("VxPrimaryVertices"),
- m_primaryVertices(nullptr),
- m_beamLine(nullptr),
- m_particleHypo(2),
- m_cut(0)
-{
- declareInterface< Reco::ITrackToVertexAssociator >(this);
- // Property declaration
- // Services
- declareProperty( "EventStore", m_storeGate );
- declareProperty( "IncidentService", m_incidentSvc );
- // Tools
- declareProperty( "Extrapolator", m_extrapolator );
- declareProperty( "ParticleHypothesis", m_particleHypo );
- // input / output vertex collection
- declareProperty( "PrimaryVertexCollection", m_primaryVertexContainer);
-
-}
-
-// Destructor
-///////////////
-Reco::TrackToVertexAssociator::~TrackToVertexAssociator()
-{}
-
-// Athena algtool's Hooks
-////////////////////////////
-StatusCode Reco::TrackToVertexAssociator::initialize()
-{
- if (m_storeGate.retrieve().isFailure()){
- ATH_MSG_WARNING("Can not retrieve " << m_storeGate << ". Exiting.");
- return StatusCode::FAILURE;
- }
- ATH_CHECK(m_beamSpotKey.initialize());
- if (m_incidentSvc.retrieve().isFailure()){
- ATH_MSG_WARNING("Can not retrieve " << m_incidentSvc << ". Exiting.");
- return StatusCode::FAILURE;
- }
- // register to the incident service: EndEvent needed for memory cleanup
- m_incidentSvc->addListener( this, IncidentType::EndEvent );
-
- return StatusCode::SUCCESS;
-}
-
-void Reco::TrackToVertexAssociator::handle(const Incident& inc) {
-
- if ( inc.type() == IncidentType::EndEvent ){
- ATH_MSG_VERBOSE("'EndEvent' incident caught. Refreshing Cache.");
- if (cleanCache().isFailure())
- ATH_MSG_WARNING("Failure triggered while refreshing Cache.");
- }
-}
-
-/** Interface method for use with TrackParticle - AOD - hiding templated method*/
-const std::vector<Reco::TrackToVertexAssociation>* Reco::TrackToVertexAssociator::associateTrack(const Trk::TrackParticleBase& /*particle*/) const
-{
- ATH_MSG_WARNING("Method not implemented");
- return nullptr;
- //return runAssociation<Trk::TrackParticleBase>(particle);
-}
-
-/** Interface method for use with Track - ESD - hiding templated method*/
-const std::vector<Reco::TrackToVertexAssociation>* Reco::TrackToVertexAssociator::associateTrack(const Trk::Track& track) const
-{
- return runAssociation<Trk::Track>(track);
-}
-
-/** Interface method for use with Parameters - ESD/AOD - hiding templated method*/
-const std::vector<Reco::TrackToVertexAssociation>* Reco::TrackToVertexAssociator::associateTrack(const Trk::TrackParameters& parameters) const
-{
- return runAssociation<Trk::TrackParameters>(parameters);
-}
-
-
-/** Interface method for use with TrackParticle - AOD - hiding templated method*/
-const std::vector<Reco::TrackToVertexAssociation>* Reco::TrackToVertexAssociator::associateTrack(const Trk::NeutralParameters& /*particle*/) const
-{
- ATH_MSG_WARNING("Method not implemented");
- return nullptr;
- //return runAssociation<Trk::NeutralParameters>(particle);
-}
-
-StatusCode Reco::TrackToVertexAssociator::cleanCache() const
-{
- // clean out what you have
- // delete the beam line
- delete m_beamLine; m_beamLine = nullptr;
- // set primary vertices to 0 - memory handled by storegate
- m_primaryVertices = nullptr;
- m_primaryVerticesWoDummy.clear();
- m_primaryVerticesBLFrame.clear();
- // return SUCCESS
- return StatusCode::SUCCESS;
-}
-
-StatusCode Reco::TrackToVertexAssociator::updateCache() const
-{
-
- if (m_storeGate->retrieve(m_primaryVertices, m_primaryVertexContainer).isFailure() || m_primaryVertices->size() == 1){
- ATH_MSG_DEBUG("Could not retrieve Primary Vertex Container, or only dummy vertex in event. Doing nothing.");
- return StatusCode::RECOVERABLE;
- }
-
-
- delete m_beamLine; m_beamLine = nullptr;
-
- // get the transform
- SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
- Amg::Transform3D* beamTransform = new Amg::Transform3D(Amg::AngleAxis3D(beamSpotHandle->beamTilt(0),Amg::Vector3D(0.,1.,0.)));
- (*beamTransform) *= Amg::AngleAxis3D(beamSpotHandle->beamTilt(1),Amg::Vector3D(1.,0.,0.));
- beamTransform->pretranslate(beamSpotHandle->beamPos());
- m_beamLine = new Trk::StraightLineSurface(beamTransform);
-
-
- Amg::Transform3D invBeamTransform = beamTransform->inverse();
- // fill in the Vertices w/o dummy vertex and transform the position
- m_primaryVerticesWoDummy.reserve(m_primaryVertices->size());
- m_primaryVerticesBLFrame.reserve(m_primaryVertices->size());
- VxContainer::const_iterator vxIter = m_primaryVertices->begin();
- VxContainer::const_iterator vxIterEnd = m_primaryVertices->end();
- for ( ; vxIter != vxIterEnd-1; ++vxIter ){
- m_primaryVerticesWoDummy.push_back(*vxIter);
- m_primaryVerticesBLFrame.push_back(invBeamTransform*((*vxIter)->recVertex().position()));
- }
- return StatusCode::SUCCESS;
-}
-
-
-StatusCode Reco::TrackToVertexAssociator::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-
-
-
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
index 3ccfa2fd0c2971af3bb663168daaa778bec34efe..eb0ef654ec78261091c1fb93209a781d7e242768 100644
--- a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
+++ b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
@@ -1,8 +1,6 @@
#include "TrackToVertex/TrackToVertex.h"
-#include "TrackToVertex/TrackToVertexAssociator.h"
using namespace Reco;
DECLARE_COMPONENT( TrackToVertex )
-DECLARE_COMPONENT( TrackToVertexAssociator )
diff --git a/Reconstruction/TRT_Rec/TRT_Rec/TRT_Predictor.h b/Reconstruction/TRT_Rec/TRT_Rec/TRT_Predictor.h
index a105d5edcfb2513b59c67c6c5dadcae773710237..32c4d3de0f0a6b5ea0ab5ff78ad72a761778815f 100755
--- a/Reconstruction/TRT_Rec/TRT_Rec/TRT_Predictor.h
+++ b/Reconstruction/TRT_Rec/TRT_Rec/TRT_Predictor.h
@@ -14,7 +14,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "iPatInterfaces/ITRT_Predictor.h"
//<<<<<< CLASS DECLARATIONS >>>>>>
@@ -59,7 +59,7 @@ private:
// helpers, managers, tools
// SurfaceIntersector* m_intersector;
- ServiceHandle<IRegSelSvc> m_regionSelector;
+ ToolHandle<IRegSelTool> m_regionSelector { this, "RegSelTool", "RegSelTool/RegSetTool_TRT" };
ToolHandle<Trk::IIntersector> m_rungeKuttaIntersector;
const InDetDD::TRT_DetectorManager* m_manager;
diff --git a/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx b/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx
index d82abe5479dedd3264f6b11acf458bdac603849c..1e58c807ba289d82656483b888c42ebb562373fd 100755
--- a/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx
+++ b/Reconstruction/TRT_Rec/src/TRT_Predictor.cxx
@@ -40,7 +40,6 @@ TRT_Predictor::TRT_Predictor (const std::string& type,
const std::string& name,
const IInterface* parent)
: AthAlgTool (type, name, parent),
- m_regionSelector ("RegSelSvc", name),
m_rungeKuttaIntersector ("Trk::RungeKuttaIntersector/RungeKuttaIntersector"),
m_manager (nullptr),
m_barrelAcceptance (0.55),
@@ -684,7 +683,7 @@ TRT_Predictor::setRegion(const TrackParameters& parameters)
// get the detector element hashIDs from the RegionSelector.
RoiDescriptor roi( etaMin, etaMax, phiMin, phiMax );
- m_regionSelector->DetHashIDList(TRT, roi, *m_hashIds);
+ m_regionSelector->HashIDList( roi, *m_hashIds);
}
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/CMakeLists.txt b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/CMakeLists.txt
deleted file mode 100644
index f8c76278261675a6a7c5e74e526d54db3bb4d67e..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-# Package: TrackCaloClusterRecAlgs
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TrackCaloClusterRecAlgs )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Tracking/TrkEvent/TrkParametersIdentificationHelpers
- DetectorDescription/AtlasDetDescr
- PUBLIC
- GaudiKernel
- Event/xAOD/xAODBase
- Event/xAOD/xAODTracking
- Event/xAOD/xAODAssociations
- Event/xAOD/xAODPFlow
- Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools)
-
-find_package( FastJet )
-find_package( FastJetContrib )
-
-# Component(s) in the package:
-atlas_add_component( TrackCaloClusterRecAlgs
- src/*.cxx
- src/components/*.cxx
- INCLUDE_DIRS ${FASTJET_INCLUDE_DIRS} ${FASTJETCONTRIB_INCLUDE_DIRS}
- LINK_LIBRARIES ${FASTJET_LIBRARIES} ${FASTJETCONTRIB_LIBRARIES} AthenaBaseComps GaudiKernel AtlasDetDescr xAODBase
- xAODTracking xAODAssociations xAODPFlow TrackCaloClusterRecToolsLib TrkParametersIdentificationHelpers )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h
deleted file mode 100644
index b1a19fc3145abca0e90e79f26c1d54ceab6d1717..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECALGS_TRACKCALOCLUSTERRECALG_H
-#define TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECALGS_TRACKCALOCLUSTERRECALG_H
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ToolHandle.h" //included under assumption you'll want to use some tools! Remove if you don't!
-#include "xAODBase/IParticle.h"
-#include "xAODPFlow/TrackCaloClusterContainer.h"
-#include "xAODTracking/TrackParticleContainer.h"
-
-#include "TrackCaloClusterRecTools/TrackCaloClusterWeightsTool.h"
-#include "TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h"
-
-class TrackCaloClusterRecAlg: public ::AthAlgorithm {
-public:
- TrackCaloClusterRecAlg( const std::string& name, ISvcLocator* pSvcLocator );
- virtual ~TrackCaloClusterRecAlg();
-
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
-
- /// Definition of the 4-momentum type.
- typedef xAOD::IParticle::FourMom_t FourMom_t;
-
-private:
-
- // Get a data container; implementation at end of this header file
- template<class T> const T* getContainer( const std::string & containerName);
-
- /// fill the maps
- void fillMaps(std::multimap <const xAOD::CaloCluster*, const xAOD::TrackParticle*>& clusterToTracksMap, std::map <const xAOD::TrackParticle*, FourMom_t>& TrackTotalClusterPt, std::map <const xAOD::CaloCluster*, FourMom_t>& clusterToTracksWeightMap );
-
- ToolHandle <TrackCaloClusterWeightsTool> m_trackCaloClusterWeightsTool;
- ToolHandle <TrackCaloClusterCreatorTool> m_trackCaloClusterCreatorTool;
-
- ///TrackParticle container's name
- std::string m_trkParticleName;
-
- ///Output Collection container's name postfix
- std::string m_outputPostFix;
-
- ///Cluster Collection container
- std::string m_caloClusters;
-
- ///Cluster Collection container
- std::string m_trackCaloClusterContainerName;
-
-};
-
-template<class T>
-inline const T* TrackCaloClusterRecAlg::getContainer(const std::string & containerName){
- const T * ptr = evtStore()->retrieve< const T >( containerName );
- if (!ptr) {
- ATH_MSG_WARNING("Container '"<<containerName<<"' could not be retrieved");
- }
- return ptr;
-}
-
-#endif //> !TRACKCALOCLUSTERREC_TRACKCALOCLUSTERRECALGS_TRACKCALOCLUSTERRECALG_H
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/share/TrackCaloClusterReco_Standalone.py b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/share/TrackCaloClusterReco_Standalone.py
deleted file mode 100644
index 36128571be535330f95fb933b34ec4ee5c8c75a8..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/share/TrackCaloClusterReco_Standalone.py
+++ /dev/null
@@ -1,552 +0,0 @@
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-from AthenaCommon import CfgMgr
-
-InputFiles = ["/eos/user/r/rjansky/TCCTestFiles/mc15_13TeV.301282.Pythia8EvtGen_A14NNPDF23LO_Wprime_WZqqqq_m4000.merge.AOD.e3743_s2608_s2183_r7772_r7676/AOD.08110078._000001.pool.root.1"]
-
-svcMgr.EventSelector.InputCollections = InputFiles
-
-# Name = Sample
-Name = "WprimeCovMatch"
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput = svcMgr.EventSelector.InputCollections
-
-from AthenaCommon.GlobalFlags import globalflags
-DetDescrVersion = 'ATLAS-R2-2015-03-01-00'
-globalflags.DetDescrVersion = DetDescrVersion
-
-from IOVDbSvc.CondDB import conddb
-conddb.setGlobalTag('OFLCOND-MC15c-SDR-09')
-
-print "globalflags.DetDescrVersion = ", globalflags.DetDescrVersion
-# Set up geometry and BField
-include("RecExCond/AllDet_detDescr.py")
-
-from JetRec.JetRecConf import JetAlgorithm
-#from JetRecTools.JetRecToolsConf import JetConstituentModSequence, CaloClusterConstituentsOrigin, ClusterTimeCutTool
-from JetRecTools.JetRecToolsConf import JetConstituentModSequence, CaloClusterConstituentsOrigin
-ccco = CaloClusterConstituentsOrigin("JetConstit_LCOrigin")
-ToolSvc += ccco
-
-#ctct = ClusterTimeCutTool("JetConstit_Timecut")
-#ToolSvc += ctct
-
-PFSequence = JetConstituentModSequence("JetConstitSeq_LCOriginAndTime",
- InputContainer = "CaloCalTopoClusters",
- OutputContainer = "TimedCaloCalTopoClusters",
- InputType = "CaloCluster",
- Modifiers = [ccco],
- SaveAsShallow = False
- )
-ToolSvc += PFSequence
-
-#Configure the extrapolator
-from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
-theAtlasExtrapolator=AtlasExtrapolator("AtlasExtrapolator")
-ToolSvc += theAtlasExtrapolator
-
-from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import ParticleToCaloExtrapolationTool
-ParticleToCaloExtrapolationTool = ParticleToCaloExtrapolationTool(name = "ParticleToCaloExtrapolationTool",
- Extrapolator = theAtlasExtrapolator,
- ParticleType = "pion" )
-#ParticleToCaloExtrapolationTool.OutputLevel = DEBUG
-ToolSvc += ParticleToCaloExtrapolationTool
-
-print ParticleToCaloExtrapolationTool
-
-from ParticlesInConeTools.ParticlesInConeToolsConf import xAOD__CaloClustersInConeTool
-CaloClustersInCone = xAOD__CaloClustersInConeTool(name = "CaloClustersInCone",
- CaloClusterLocation = "TimedCaloCalTopoClusters")
-# CaloClustersInCone.OutputLevel = DEBUG
-ToolSvc += CaloClustersInCone
-
-print CaloClustersInCone
-
-from TrackToCalo.TrackToCaloConf import Rec__ParticleCaloClusterAssociationTool
-ParticleCaloCellAssociation = Rec__ParticleCaloClusterAssociationTool(name = "ParticleCaloCellAssociationInDet",
- ParticleCaloExtensionTool = ParticleToCaloExtrapolationTool,
-
- CaloClusterLocation = "TimedCaloCalTopoClusters",
- ClustersInConeTool = CaloClustersInCone,
- ConeSize = 0.1,
- UseCovariance = True )
-ParticleCaloCellAssociation.OutputLevel = DEBUG
-ToolSvc+=ParticleCaloCellAssociation
-print ParticleCaloCellAssociation
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Add the algorithm.
-jetalg = JetAlgorithm("JetAlg_OriginAndTime")
-jetalg.OutputLevel = INFO
-jetalg.Tools += [PFSequence]
-topSequence += jetalg
-
-from TrackParticleAssociationAlgs.TrackParticleAssociationAlgsConf import TrackParticleClusterAssociationAlg
-TrackParticleClusterAssociation = TrackParticleClusterAssociationAlg(name = "TrackParticleClusterAssociationInDet",
- ParticleCaloClusterAssociationTool = ParticleCaloCellAssociation,
- TrackParticleContainerName = "InDetTrackParticles",
- PtCut = 400.,
- OutputCollectionPostFix = "Test",
- CaloClusterLocation = "TimedCaloCalTopoClusters")
-# TrackParticleClusterAssociation.OutputLevel = DEBUG
-topSequence += TrackParticleClusterAssociation
-
-print TrackParticleClusterAssociation
-
-from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import TrackCaloClusterWeightsTool
-TrackCaloClusterWeights = TrackCaloClusterWeightsTool(name = "TrackCaloClusterWeights" )
-# TrackCaloClusterWeights.OutputLevel = VERBOSE
-ToolSvc+=TrackCaloClusterWeights
-print TrackCaloClusterWeights
-
-trackvertexassotool=CfgMgr.CP__TrackVertexAssociationTool("TrackVertexAssociationTool", WorkingPoint="Nominal")
-ToolSvc+=trackvertexassotool
-
-from JetRecTools.JetRecToolsConf import TrackVertexAssociationTool
-jettva = TrackVertexAssociationTool( name = "tvassoc",
- TrackParticleContainer = "InDetTrackParticles",
- TrackVertexAssociation = "JetTrackVtxAssoc",
- VertexContainer = "PrimaryVertices",
- TrackVertexAssoTool = trackvertexassotool
- )
-ToolSvc+=jettva
-print jettva
-
-#from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import ClusterFilterTool
-#clusterfiltertool = ClusterFilterTool(name = "clusterfiltertool",
-# LooseTrackVertexAssoTool = trackvertexassotool,
-# TrackParticleContainerName = "InDetTrackParticles",
-# ConeSize = 0.2,
-# StoreParameters = False)
-
-#ToolSvc+=clusterfiltertool
-#clusterfiltertool.OutputLevel = VERBOSE
-#print clusterfiltertool
-
-from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import TrackCaloClusterCreatorTool
-TrackCaloClusterCreator = TrackCaloClusterCreatorTool(name = "TrackCaloClusterCreator",
- VertexContainerName = "PrimaryVertices",
- LooseTrackVertexAssoTool = trackvertexassotool,
- ApplyClusterFilter = False )
-# TrackCaloClusterCreator.OutputLevel = VERBOSE
-ToolSvc+=TrackCaloClusterCreator
-print TrackCaloClusterCreator
-
-from TrackCaloClusterRecAlgs.TrackCaloClusterRecAlgsConf import TrackCaloClusterRecAlg
-ParticleToCaloExtrapolation = TrackCaloClusterRecAlg(name = "TrackCaloClusterRecAlg",
- OutputCollectionPostFix = "Test",
- CaloClustersLocation = "TimedCaloCalTopoClusters",
- TrackCaloClusterContainerName = "TrackCaloClusters",
- TrackCaloClusterWeightsTool = TrackCaloClusterWeights,
- TrackCaloClusterCreatorTool = TrackCaloClusterCreator)
-# ParticleToCaloExtrapolation.OutputLevel = VERBOSE
-topSequence += ParticleToCaloExtrapolation
-
-print ParticleToCaloExtrapolation
-
-theApp.EvtMax = -1
-
-### Jet Stuff
-if 1:
- from JetRec.JetRecConf import JetFromPseudojet
- jetFromPseudojet = JetFromPseudojet("jetFromPseudojet",Attributes = [] )
- ToolSvc += jetFromPseudojet
-
- from JetRec.JetRecConf import JetTrimmer
- groomer = JetTrimmer("JetGroomer")
- groomer.RClus = 0.2
- groomer.PtFrac = 0.05
- groomer.JetBuilder = jetFromPseudojet
- ToolSvc += groomer
-
- # Add filter for copied jets.
- #from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import NSubjettinessTool
- #ToolSvc += NSubjettinessTool("nsubjettiness")
- #nsubjettiness = ToolSvc.nsubjettiness
-
- #from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import NSubjettinessRatiosTool
- #ToolSvc += NSubjettinessRatiosTool("nsubjettinessratios")
- #nsubjettinessratios = ToolSvc.nsubjettinessratios
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import KTSplittingScaleTool
- # ToolSvc += KTSplittingScaleTool("ktsplittingscale")
- # ktsplittingscale = ToolSvc.ktsplittingscale
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import DipolarityTool
- # ToolSvc += DipolarityTool("dipolarity")
- # dipolarity = ToolSvc.dipolarity
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import AngularityTool
- # ToolSvc += AngularityTool("angularity")
- # angularity = ToolSvc.angularity
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import KtDeltaRTool
- # ToolSvc += KtDeltaRTool("ktdr")
- # ktdr = ToolSvc.ktdr
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import KtMassDropTool
- # ToolSvc += KtMassDropTool("ktmassdrop")
- # ktmassdrop = ToolSvc.ktmassdrop
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import PlanarFlowTool
- # ToolSvc += PlanarFlowTool("planarflow")
- # planarflow = ToolSvc.planarflow
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import CenterOfMassShapesTool
- # ToolSvc += CenterOfMassShapesTool("centerofmassshapes")
- # centerofmassshapes = ToolSvc.centerofmassshapes
-
- #from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import EnergyCorrelatorTool
- #ToolSvc += EnergyCorrelatorTool("energycorrelator")
- #energycorrelator = ToolSvc.energycorrelator
-
- #from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import EnergyCorrelatorRatiosTool
- #ToolSvc += EnergyCorrelatorRatiosTool("energycorrelatorratios")
- #energycorrelatorratios = ToolSvc.energycorrelatorratios
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import JetPullTool
- # ToolSvc += JetPullTool("pull")
- # pull = ToolSvc.pull
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import JetChargeTool
- # ToolSvc += JetChargeTool("charge")
- # charge = ToolSvc.charge
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import VolatilityTool
- # ToolSvc += VolatilityTool("volatility")
- # volatility = ToolSvc.volatility
- # volatility.TruncationFactor = 0.0
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import SubjetMakerTool
- # ToolSvc += SubjetMakerTool("subjetmaker")
- # subjetmaker = ToolSvc.subjetmaker
- # subjetmaker.type = "Kt"
- # subjetmaker.R = 0.2
- # subjetmaker.PtCut = 5000;
-
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import SubjetFinderTool
- # ToolSvc += SubjetFinderTool("subjetfinder")
- # subjetfinder = ToolSvc.subjetfinder
- # from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import SubjetRecorderTool
- # ToolSvc += SubjetRecorderTool("subjetrecorder")
- # subjetrecorder = ToolSvc.subjetrecorder
- # subjetfinder.JetAlgorithm = "Kt"
- # subjetfinder.JetRadius = 0.2
- # subjetrecorder.SubjetLabel = "Kt2Subjets"
- # subjetrecorder.SubjetContainerName = "Kt2TrackCaloClusterSubJets"
- # subjetfinder.SubjetRecorder = subjetrecorder
-
- clname = "TrackCaloClustersCombined"
-# clname1 = "TrackCaloClustersCombinedAndNeutral"
-# clname2 = "TrackCaloClustersCombinedAndCharged"
- clname3 = "TrackCaloClustersAll"
-
-# clnames = [clname, clname1, clname2, clname3]
- clnames = [clname, clname3]
-
- from JetRec.JetRecConf import JetPseudojetRetriever
- from JetRec.JetRecConf import JetRecTool
-
- for name in clnames:
- #--------------------------------------------------------------
- # Configure tools.
- #--------------------------------------------------------------
-
- # Find jet inputs.
- from JetRecTools.JetRecToolsConf import TCCPseudoJetGetter
- psjget = TCCPseudoJetGetter("TCCPseudoJetGetter_"+name)
- psjget.InputContainer = name
- psjget.Label = "TrackCaloCluster"
- psjget.OutputContainer = "PseudoJetClusters"+name
- # psjget.OutputLevel = INFO
- psjget.SkipNegativeEnergy = True
- ToolSvc += psjget
-
- # Find jets.
- from JetRec.JetRecConf import JetFinder
- jfind = JetFinder("JetFinder_"+name)
- jfind.JetAlgorithm = "AntiKt"
- jfind.JetRadius = 1.0
- jfind.GhostArea = 0.01;
- jfind.PtMin = 200000.0
- # jfind.OutputLevel = VERBOSE
- ToolSvc += jfind
-
- # JetRec tool for finding.
- jetrec = JetRecTool("JetRecTool_"+name)
- jetrec.OutputContainer = "AntiKt10"+name+"Jets"
- # jetrec.OutputLevel = INFO
- jetrec.PseudoJetGetters += [psjget]
- jetrec.JetFinder = jfind
- #jetrec.JetModifiers += [nsubjettiness]
- #jetrec.JetModifiers += [nsubjettinessratios]
- # jetrec.JetModifiers += [ktsplittingscale]
- # jetrec.JetModifiers += [dipolarity]
- # jetrec.JetModifiers += [angularity]
- # jetrec.JetModifiers += [ktdr]
- # jetrec.JetModifiers += [ktmassdrop]
- # jetrec.JetModifiers += [planarflow]
- # jetrec.JetModifiers += [centerofmassshapes]
- #jetrec.JetModifiers += [energycorrelator]
- #jetrec.JetModifiers += [energycorrelatorratios]
- # jetrec.JetModifiers += [pull]
- # jetrec.JetModifiers += [charge]
- # jetrec.JetModifiers += [subjetmaker]
- # jetrec.JetModifiers += [subjetfinder]
- ToolSvc += jetrec
-
- jetPseudojetRetriever = JetPseudojetRetriever("JetPseudojetRetriever_"+name)
- ToolSvc += jetPseudojetRetriever
-
- # JetRec tool for finding.
- jetrec_trimm = JetRecTool("JetRecTool_"+name+"Trimm")
- jetrec_trimm.JetGroomer = groomer
- jetrec_trimm.InputContainer = "AntiKt10"+name+"Jets"
- jetrec_trimm.OutputContainer = "AntiKt10"+name+"TrimmedJets"
- jetrec_trimm.JetPseudojetRetriever = jetPseudojetRetriever
- #jetrec_trimm.JetModifiers += [nsubjettiness]
- #jetrec_trimm.JetModifiers += [nsubjettinessratios]
- # jetrec_trimm.JetModifiers += [ktsplittingscale]
- # jetrec_trimm.JetModifiers += [dipolarity]
- # jetrec_trimm.JetModifiers += [angularity]
- # jetrec_trimm.JetModifiers += [ktdr]
- # jetrec_trimm.JetModifiers += [ktmassdrop]
- # jetrec_trimm.JetModifiers += [planarflow]
- # jetrec_trimm.JetModifiers += [centerofmassshapes]
- #jetrec_trimm.JetModifiers += [energycorrelator]
- #jetrec_trimm.JetModifiers += [energycorrelatorratios]
- # jetrec_trimm.JetModifiers += [pull]
- # jetrec_trimm.JetModifiers += [charge]
- # jetrec_trimm.JetModifiers += [subjetmaker]
- # jetrec_trimm.JetModifiers += [subjetfinder]
- ToolSvc += jetrec_trimm
-
- # Add the algorithm. It runs the demo tools.
- jetalg = JetAlgorithm("JetAlg_"+name)
- # jetalg.OutputLevel = INFO
- jetalg.Tools += [jetrec, jetrec_trimm]
- topSequence += jetalg
-
- # Find jet inputs.
- from JetRec.JetRecConf import PseudoJetGetter
- psjget = PseudoJetGetter("PseudoJetGetter")
- psjget.InputContainer = "TimedCaloCalTopoClusters"
- psjget.Label = "LCTopoOrigin"
- psjget.OutputContainer = "PseudoJetLCTopoOrigin"
- # psjget.OutputLevel = INFO
- psjget.SkipNegativeEnergy = True
- ToolSvc += psjget
-
- psjget2 = PseudoJetGetter("cget_ghost")
- psjget2.InputContainer = "InDetTrackParticles"
- psjget2.Label = "GhostTrack"
- psjget2.OutputContainer = "PseudoJetGhostTrack"
- # psjget.OutputLevel = INFO
- psjget2.GhostScale = 1e-40
- ToolSvc += psjget2
-
- # Find jets.
- from JetRec.JetRecConf import JetFinder
- jfind = JetFinder("JetFinder")
- jfind.JetAlgorithm = "AntiKt"
- jfind.JetRadius = 1.0
- jfind.GhostArea = 0.01;
- jfind.PtMin = 200000.0
- # jfind.OutputLevel = VERBOSE
- ToolSvc += jfind
-
- from JetMomentTools.JetMomentToolsConf import JetTrackSumMomentsTool
- TrackSumMomentsTool = JetTrackSumMomentsTool( name = "trksummoms",
- VertexContainer = "PrimaryVertices",
- AssociatedTracks = "GhostTrack",
- TrackVertexAssociation = jettva.TrackVertexAssociation,
- RequireTrackPV = True)
- # TrackSumMomentsTool.OutputLevel = DEBUG
- ToolSvc += TrackSumMomentsTool
-
- # JetRec tool for finding.
- jetrec = JetRecTool("JetRecTool")
- jetrec.OutputContainer = "MyAntiKt10LCTopoJets"
- # jetrec.OutputLevel = INFO
- jetrec.PseudoJetGetters += [psjget, psjget2]
- jetrec.JetFinder = jfind
- #jetrec.JetModifiers += [nsubjettiness]
- #jetrec.JetModifiers += [nsubjettinessratios]
- # jetrec.JetModifiers += [ktsplittingscale]
- # jetrec.JetModifiers += [dipolarity]
- # jetrec.JetModifiers += [angularity]
- # jetrec.JetModifiers += [ktdr]
- # jetrec.JetModifiers += [ktmassdrop]
- # jetrec.JetModifiers += [planarflow]
- # jetrec.JetModifiers += [centerofmassshapes]
- #jetrec.JetModifiers += [energycorrelator]
- #jetrec.JetModifiers += [energycorrelatorratios]
- # jetrec.JetModifiers += [pull]
- # jetrec.JetModifiers += [charge]
- # jetrec.JetModifiers += [subjetmaker]
- # jetrec.JetModifiers += [subjetfinder]
- # jetrec.JetModifiers += [TrackSumMomentsTool]
- ToolSvc += jetrec
-
- from JetCalibTools.JetCalibToolsConf import JetCalibrationTool
- calib_tool=JetCalibrationTool('JetCalibTool',JetCollection="AntiKt10LCTopoTrimmedPtFrac5SmallR20",ConfigFile='JES_MC15recommendation_FatJet_Nov2016_QCDCombinationUncorrelatedWeights.config',CalibSequence='EtaJES_JMS',IsData=False)
- ToolSvc += calib_tool
- print calib_tool
-
- jetPseudojetRetriever = JetPseudojetRetriever("JetPseudojetRetriever")
- ToolSvc += jetPseudojetRetriever
-
- # JetRec tool for finding.
- jetrec_trimm = JetRecTool("JetRecToolTrimm")
- jetrec_trimm.JetGroomer = groomer
- jetrec_trimm.InputContainer = "MyAntiKt10LCTopoJets"
- jetrec_trimm.OutputContainer = "MyAntiKt10LCTopoTrimmedJets"
- jetrec_trimm.JetPseudojetRetriever = jetPseudojetRetriever
- #jetrec_trimm.JetModifiers += [nsubjettiness]
- #jetrec_trimm.JetModifiers += [nsubjettinessratios]
- # jetrec_trimm.JetModifiers += [ktsplittingscale]
- # jetrec_trimm.JetModifiers += [dipolarity]
- # jetrec_trimm.JetModifiers += [angularity]
- # jetrec_trimm.JetModifiers += [ktdr]
- # jetrec_trimm.JetModifiers += [ktmassdrop]
- # jetrec_trimm.JetModifiers += [planarflow]
- # jetrec_trimm.JetModifiers += [centerofmassshapes]
- #jetrec_trimm.JetModifiers += [energycorrelator]
- #jetrec_trimm.JetModifiers += [energycorrelatorratios]
- # jetrec_trimm.JetModifiers += [pull]
- # jetrec_trimm.JetModifiers += [charge]
- # jetrec_trimm.JetModifiers += [subjetmaker]
- # jetrec_trimm.JetModifiers += [subjetfinder]
- jetrec_trimm.JetModifiers += [TrackSumMomentsTool]
- jetrec_trimm.JetModifiers += [calib_tool]
- ToolSvc += jetrec_trimm
-
-
- # Add the algorithm. It runs the demo tools.
- jetalg = JetAlgorithm("JetAlg")
- # jetalg.OutputLevel = INFO
- jetalg.Tools += [jetrec, jettva, jetrec_trimm]
- topSequence += jetalg
-
- from MCTruthClassifier.MCTruthClassifierConf import MCTruthClassifier
- truth_classifier_name='JetMCTruthClassifier'
- truthClassifier = MCTruthClassifier(name = truth_classifier_name,
- ParticleCaloExtensionTool="")
- ToolSvc += truthClassifier
-
- from ParticleJetTools.ParticleJetToolsConf import CopyTruthJetParticles
- copytruth = CopyTruthJetParticles(name = "truthpartcopy", OutputName="JetInputTruthParticles",
- MCTruthClassifier=truthClassifier)
- ToolSvc += copytruth
-
- # Find jet inputs.
- from JetRec.JetRecConf import PseudoJetGetter
- psjget = PseudoJetGetter("PseudoTruthJetGetter")
- psjget.InputContainer = "JetInputTruthParticles"
- psjget.Label = "Truth"
- psjget.OutputContainer = "PseudoJetTruth"
- # psjget.OutputLevel = INFO
- psjget.GhostScale = 0.0
- psjget.SkipNegativeEnergy = True
- ToolSvc += psjget
-
- # Find jets.
- jfind = JetFinder("JetFinderTruth")
- jfind.JetAlgorithm = "AntiKt"
- jfind.JetRadius = 1.0
- jfind.GhostArea = 0.0;
- jfind.PtMin = 150000.0
- # jfind.OutputLevel = VERBOSE
- ToolSvc += jfind
-
- # JetRec tool for finding.
- jetrec = JetRecTool("JetRecToolTruth")
- jetrec.OutputContainer = "MyAntiKt10TruthJets"
- # jetrec.OutputLevel = INFO
- jetrec.PseudoJetGetters += [psjget]
- jetrec.JetFinder = jfind
- #jetrec.JetModifiers += [nsubjettiness]
- #jetrec.JetModifiers += [nsubjettinessratios]
- # jetrec.JetModifiers += [ktsplittingscale]
- # jetrec.JetModifiers += [dipolarity]
- # jetrec.JetModifiers += [angularity]
- # jetrec.JetModifiers += [ktdr]
- # jetrec.JetModifiers += [ktmassdrop]
- # jetrec.JetModifiers += [planarflow]
- # jetrec.JetModifiers += [centerofmassshapes]
- #jetrec.JetModifiers += [energycorrelator]
- #jetrec.JetModifiers += [energycorrelatorratios]
- # jetrec.JetModifiers += [pull]
- # jetrec.JetModifiers += [charge]
- # jetrec.JetModifiers += [subjetmaker]
- # jetrec.JetModifiers += [subjetfinder]
- # jetrec.JetModifiers += [TrackSumMomentsTool]
- ToolSvc += jetrec
-
- # JetRec tool for finding.
- jetrec_trimm = JetRecTool("JetRecToolTruthTrimm")
- jetrec_trimm.JetGroomer = groomer
- jetrec_trimm.InputContainer = "MyAntiKt10TruthJets"
- jetrec_trimm.OutputContainer = "MyAntiKt10TruthTrimmedJets"
- jetrec_trimm.JetPseudojetRetriever = jetPseudojetRetriever
- #jetrec_trimm.JetModifiers += [nsubjettiness]
- #jetrec_trimm.JetModifiers += [nsubjettinessratios]
- # jetrec_trimm.JetModifiers += [ktsplittingscale]
- # jetrec_trimm.JetModifiers += [dipolarity]
- # jetrec_trimm.JetModifiers += [angularity]
- # jetrec_trimm.JetModifiers += [ktdr]
- # jetrec_trimm.JetModifiers += [ktmassdrop]
- # jetrec_trimm.JetModifiers += [planarflow]
- # jetrec_trimm.JetModifiers += [centerofmassshapes]
- #jetrec_trimm.JetModifiers += [energycorrelator]
- #jetrec_trimm.JetModifiers += [energycorrelatorratios]
- # jetrec_trimm.JetModifiers += [pull]
- # jetrec_trimm.JetModifiers += [charge]
- # jetrec_trimm.JetModifiers += [subjetmaker]
- # jetrec_trimm.JetModifiers += [subjetfinder]
- ToolSvc += jetrec_trimm
-
-
- # Add the algorithm. It runs the demo tools.
- jetalg = JetAlgorithm("JetAlgTruth")
-
- # jetalg.OutputLevel = INFO
- jetalg.Tools += [copytruth, jetrec, jetrec_trimm]
- topSequence += jetalg
-
-
-
-
-###end jet stuff
-
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolRootStream( "StreamAOD", "XAOD_"+Name+".pool.root" )
-# xaodStream.Stream.TakeItemsFromInput = True #this will only work for the event-by-event items. MetadataItems must still be specified
-xaodStream.AddItem("xAOD::EventInfo#*")
-xaodStream.AddItem("xAOD::EventAuxInfo#*")
-xaodStream.AddItem("xAOD::EventShape#*")
-xaodStream.AddItem("xAOD::EventShapeAuxInfo#*")
-xaodStream.AddItem("xAOD::VertexContainer#*")
-xaodStream.AddItem("xAOD::VertexAuxContainer#*")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterContainer#TrackCaloClusters")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterAuxContainer#TrackCaloClustersAux.")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterContainer#TrackCaloClustersCombined")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterAuxContainer#TrackCaloClustersCombinedAux.")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterContainer#TrackCaloClustersAll")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterAuxContainer#TrackCaloClustersAllAux.")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterContainer#TrackCaloClustersAllTrack")
-# xaodStream.AddItem( "xAOD::TrackCaloClusterAuxContainer#TrackCaloClustersAllTrackAux.")
-xaodStream.AddItem( "xAOD::JetContainer#My*")
-xaodStream.AddItem( "xAOD::JetAuxContainer#My*")
-xaodStream.AddItem( "xAOD::JetContainer#*TrackCaloClusters*")
-xaodStream.AddItem( "xAOD::JetAuxContainer#*TrackCaloClusters*")
-# xaodStream.AddItem( "xAOD::CaloClusterContainer#*")
-# xaodStream.AddItem( "xAOD::CaloClusterAuxContainer#*")
-
-#from PerfMonComps.PerfMonFlags import jobproperties as pmon_properties
-#pmon_properties.PerfMonFlags.doSemiDetailedMonitoring=True
-
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/share/TrackCaloClusterReco_TrackClusterInfo.py b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/share/TrackCaloClusterReco_TrackClusterInfo.py
deleted file mode 100644
index 62443724a5e46d7a7f1a87515f8c3b32aa4b3813..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/share/TrackCaloClusterReco_TrackClusterInfo.py
+++ /dev/null
@@ -1,170 +0,0 @@
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-from AthenaCommon import CfgMgr
-
-##InputFiles = ["/eos/user/r/rjansky/TCCTestFiles/mc15_13TeV.301282.Pythia8EvtGen_A14NNPDF23LO_Wprime_WZqqqq_m4000.merge.AOD.e3743_s2608_s2183_r7772_r7676/AOD.08110078._000001.pool.root.1"]
-##InputFiles = ["root://eosatlas.cern.ch//eos/atlas/user/n/ncalace/Samples_Physics/WPrime_4000/DAOD_JETM8.09331772._000001.pool.root.1"]
-#InputFiles = ["/eos/atlas/user/r/rjansky/mc15_13TeV.301282.Pythia8EvtGen_A14NNPDF23LO_Wprime_WZqqqq_m4000.merge.AOD.e3743_s2608_s2183_r7772_r7676/AOD.08110078._000001.pool.root.1"]
-InputFiles = ["/afs/cern.ch/user/n/ncalace/work/public/mc15_13TeV/AOD.08110078._000001.pool.root.1"]
-
-svcMgr.EventSelector.InputCollections = InputFiles
-
-# Name = Sample
-Name = "WprimeCovMatch_AllTests_TCC"
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput = svcMgr.EventSelector.InputCollections
-
-from AthenaCommon.GlobalFlags import globalflags
-DetDescrVersion = 'ATLAS-R2-2015-03-01-00'
-globalflags.DetDescrVersion = DetDescrVersion
-
-from IOVDbSvc.CondDB import conddb
-conddb.setGlobalTag('OFLCOND-MC15c-SDR-09')
-
-print "globalflags.DetDescrVersion = ", globalflags.DetDescrVersion
-# Set up geometry and BField
-include("RecExCond/AllDet_detDescr.py")
-
-from JetRec.JetRecConf import JetAlgorithm
-from JetRecTools.JetRecToolsConf import JetConstituentModSequence, CaloClusterConstituentsOrigin, ClusterTimeCutTool
-ccco = CaloClusterConstituentsOrigin("JetConstit_LCOrigin")
-ToolSvc += ccco
-
-ctct = ClusterTimeCutTool("JetConstit_Timecut")
-ToolSvc += ctct
-
-PFSequence = JetConstituentModSequence("JetConstitSeq_LCOriginAndTime",
- InputContainer = "CaloCalTopoClusters",
- OutputContainer = "TimedCaloCalTopoClusters",
- InputType = "CaloCluster",
- Modifiers = [ctct, ccco],
- SaveAsShallow = True)
-ToolSvc += PFSequence
-
-#Configure the extrapolator
-from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
-theAtlasExtrapolator=AtlasExtrapolator("AtlasExtrapolator")
-ToolSvc += theAtlasExtrapolator
-
-from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import ParticleToCaloExtrapolationTool
-ParticleToCaloExtrapolationTool = ParticleToCaloExtrapolationTool(name = "ParticleToCaloExtrapolationTool",
- Extrapolator = theAtlasExtrapolator,
- ParticleType = "pion",
- StoreParameters=True)
-# ParticleToCaloExtrapolationTool.OutputLevel = DEBUG
-ToolSvc += ParticleToCaloExtrapolationTool
-
-print ParticleToCaloExtrapolationTool
-
-from ParticlesInConeTools.ParticlesInConeToolsConf import xAOD__CaloClustersInConeTool
-CaloClustersInCone = xAOD__CaloClustersInConeTool(name = "CaloClustersInCone",
- CaloClusterLocation = "TimedCaloCalTopoClusters")
-# CaloClustersInCone.OutputLevel = DEBUG
-ToolSvc += CaloClustersInCone
-
-print CaloClustersInCone
-
-from TrackToCalo.TrackToCaloConf import Rec__ParticleCaloClusterAssociationTool
-ParticleCaloCellAssociation = Rec__ParticleCaloClusterAssociationTool(name = "ParticleCaloCellAssociationInDet",
- ParticleCaloExtensionTool = ParticleToCaloExtrapolationTool,
- CaloClusterLocation = "TimedCaloCalTopoClusters",
- ClustersInConeTool = CaloClustersInCone,
- ConeSize = 0.1,
- UseCovariance = True,
- StoreParameters = True)
-#ParticleCaloCellAssociation.OutputLevel = DEBUG
-ToolSvc+=ParticleCaloCellAssociation
-print ParticleCaloCellAssociation
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Add the algorithm.
-jetalg = JetAlgorithm("JetAlg_OriginAndTime")
-#jetalg.OutputLevel = INFO
-jetalg.Tools += [PFSequence]
-topSequence += jetalg
-
-from TrackParticleAssociationAlgs.TrackParticleAssociationAlgsConf import TrackParticleClusterAssociationAlg
-TrackParticleClusterAssociation = TrackParticleClusterAssociationAlg(name = "TrackParticleClusterAssociationInDet",
- ParticleCaloClusterAssociationTool = ParticleCaloCellAssociation,
- TrackParticleContainerName = "InDetTrackParticles",
- PtCut = 400.,
- OutputCollectionPostFix = "Test",
- CaloClusterLocation = "TimedCaloCalTopoClusters")
-#TrackParticleClusterAssociation.OutputLevel = DEBUG
-topSequence += TrackParticleClusterAssociation
-
-print TrackParticleClusterAssociation
-
-from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import TrackCaloClusterWeightsTool
-TrackCaloClusterWeights = TrackCaloClusterWeightsTool(name = "TrackCaloClusterWeights")
-# TrackCaloClusterWeights.OutputLevel = VERBOSE
-ToolSvc+=TrackCaloClusterWeights
-print TrackCaloClusterWeights
-
-trackvertexassotool=CfgMgr.CP__TrackVertexAssociationTool("TrackVertexAssociationTool", WorkingPoint="Nominal")
-ToolSvc+=trackvertexassotool
-
-from JetRecTools.JetRecToolsConf import TrackVertexAssociationTool
-jettva = TrackVertexAssociationTool( name = "tvassoc",
- TrackParticleContainer = "InDetTrackParticles",
- TrackVertexAssociation = "JetTrackVtxAssoc",
- VertexContainer = "PrimaryVertices",
- TrackVertexAssoTool = trackvertexassotool
- )
-ToolSvc+=jettva
-print jettva
-
-from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import ClusterFilterTool
-clusterfiltertool = ClusterFilterTool(name = "clusterfiltertool",
- LooseTrackVertexAssoTool = trackvertexassotool,
- TrackParticleContainerName = "InDetTrackParticles",
- ConeSize = 0.2,
- PtFractionAtPV0 = 0.1,
- StoreParameters = True)
-
-ToolSvc+=clusterfiltertool
-#clusterfiltertool.OutputLevel = VERBOSE
-print clusterfiltertool
-
-from TrackCaloClusterRecTools.TrackCaloClusterRecToolsConf import TrackCaloClusterCreatorTool
-TrackCaloClusterCreator = TrackCaloClusterCreatorTool(name = "TrackCaloClusterCreator",
- VertexContainerName = "PrimaryVertices",
- LooseTrackVertexAssoTool = trackvertexassotool,
- ApplyClusterFilter = False,
- ClusterFilterTool = clusterfiltertool)
-#TrackCaloClusterCreator.OutputLevel = VERBOSE
-ToolSvc+=TrackCaloClusterCreator
-print TrackCaloClusterCreator
-
-from TrackCaloClusterRecAlgs.TrackCaloClusterRecAlgsConf import TrackCaloClusterRecAlg
-ParticleToCaloExtrapolation = TrackCaloClusterRecAlg(name = "TrackCaloClusterRecAlg",
- OutputCollectionPostFix = "Test",
- CaloClustersLocation = "TimedCaloCalTopoClusters",
- TrackCaloClusterContainerName = "TrackCaloClusters",
- TrackCaloClusterWeightsTool = TrackCaloClusterWeights,
- TrackCaloClusterCreatorTool = TrackCaloClusterCreator,
- StoreStatistics = True )
-#ParticleToCaloExtrapolation.OutputLevel = VERBOSE
-topSequence += ParticleToCaloExtrapolation
-
-print ParticleToCaloExtrapolation
-
-theApp.EvtMax = 1000
-
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-xaodStream = MSMgr.NewPoolRootStream( "StreamAOD", "XAOD_"+Name+".pool.root" )
-xaodStream.AddItem( "xAOD::CaloClusterContainer#TimedCaloCalTopoClusters")
-xaodStream.AddItem( "xAOD::ShallowAuxContainer#TimedCaloCalTopoClustersAux.")
-xaodStream.AddItem( "xAOD::TrackParticleContainer#InDetTrackParticles")
-xaodStream.AddItem( "xAOD::TrackParticleAuxContainer#InDetTrackParticlesAux.")
-xaodStream.AddItem( "xAOD::TrackCaloClusterContainer#*")
-xaodStream.AddItem( "xAOD::TrackCaloClusterAuxContainer#*")
-xaodStream.AddItem( "xAOD::TruthParticleContainer#TruthParticles")
-xaodStream.AddItem( "xAOD::TruthParticleAuxContainer#TruthParticlesAux.")
-
-ServiceMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#ServiceMgr.StoreGateSvc.Dump=True
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/TrackCaloClusterRecAlg.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/TrackCaloClusterRecAlg.cxx
deleted file mode 100644
index 10b6be51ea13adb6fdaf8c0caf508a366c67ec0c..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/TrackCaloClusterRecAlg.cxx
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-// TrackCaloClusterRecAlgs includes
-#include "TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h"
-
-#include "TrkParametersIdentificationHelpers/TrackParametersIdHelper.h"
-#include "AtlasDetDescr/AtlasDetectorID.h"
-
-#include "xAODAssociations/TrackParticleClusterAssociationContainer.h"
-#include "xAODPFlow/TrackCaloClusterAuxContainer.h"
-
-TrackCaloClusterRecAlg::TrackCaloClusterRecAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
- AthAlgorithm( name, pSvcLocator ),
- m_trackCaloClusterWeightsTool("TrackCaloClusterRecTools/TrackCaloClusterWeightsTool"),
- m_trackCaloClusterCreatorTool("TrackCaloClusterRecTools/TrackCaloClusterCreatorTool") {
-
- declareProperty("TrackParticleContainerName" , m_trkParticleName = "InDetTrackParticles" );
- declareProperty("OutputCollectionPostFix" , m_outputPostFix = "" );
- declareProperty("CaloClustersLocation" , m_caloClusters = "CaloCalTopoClusters" );
- declareProperty("TrackCaloClusterContainerName", m_trackCaloClusterContainerName = "TrackCaloClusters" );
- declareProperty("TrackCaloClusterWeightsTool" , m_trackCaloClusterWeightsTool );
- declareProperty("TrackCaloClusterCreatorTool" , m_trackCaloClusterCreatorTool );
- }
-
-TrackCaloClusterRecAlg::~TrackCaloClusterRecAlg() {}
-
-StatusCode TrackCaloClusterRecAlg::initialize() {
- ATH_MSG_INFO ("Initializing " << name() << "...");
- ATH_CHECK(m_trackCaloClusterWeightsTool.retrieve());
- ATH_CHECK(m_trackCaloClusterCreatorTool.retrieve());
- return StatusCode::SUCCESS;
-}
-
-StatusCode TrackCaloClusterRecAlg::finalize() {
- ATH_MSG_INFO ("Finalizing " << name() << "...");
- return StatusCode::SUCCESS;
-}
-
-StatusCode TrackCaloClusterRecAlg::execute() {
- ATH_MSG_DEBUG ("Executing " << name() << "...");
- // Create cluster-to-tracks map
- std::multimap <const xAOD::CaloCluster*, const xAOD::TrackParticle*> clusterToTracksMap;
- std::map <const xAOD::TrackParticle*, FourMom_t> TrackTotalClusterPt;
- std::map <const xAOD::CaloCluster*, FourMom_t> clusterToTracksWeightMap;
-
- // Combined
- xAOD::TrackCaloClusterContainer* tccContainer = new xAOD::TrackCaloClusterContainer();
- ATH_CHECK( evtStore()->record( tccContainer, m_trackCaloClusterContainerName + "Combined" ) );
-
- xAOD::TrackCaloClusterAuxContainer* tccContainerAux = new xAOD::TrackCaloClusterAuxContainer();
- ATH_CHECK( evtStore()->record( tccContainerAux, m_trackCaloClusterContainerName + "Combined" + "Aux." ) );
- tccContainer->setStore( tccContainerAux );
- ATH_MSG_DEBUG( "Recorded TrackCaloClusterContainer with key: " << m_trackCaloClusterContainerName + "Combined" );
-
- // Look at associated clusters
- if ( !evtStore()->contains<xAOD::TrackParticleClusterAssociationContainer>( m_trkParticleName+"ClusterAssociations"+m_outputPostFix) ) {
- ATH_MSG_WARNING ("Couldn't retrieve TrackParticleClusterAssociations with key: " << m_trkParticleName+"ClusterAssociations"+m_outputPostFix );
- return StatusCode::SUCCESS;
- }
-
- const auto associatedClusters = getContainer<xAOD::TrackParticleClusterAssociationContainer>(m_trkParticleName+"ClusterAssociations"+m_outputPostFix);
-
- // Look at all clusters
- if ( !evtStore()->contains<xAOD::CaloClusterContainer>( m_caloClusters) ) {
- ATH_MSG_WARNING ("Couldn't retrieve CaloClusterContainer with key: " << m_caloClusters );
- return StatusCode::SUCCESS;
- }
-
- const auto allClusters = getContainer<xAOD::CaloClusterContainer>(m_caloClusters);
-
- // Look at all tracks
- if ( !evtStore()->contains<xAOD::TrackParticleContainer>( m_trkParticleName) ) {
- ATH_MSG_WARNING ("Couldn't retrieve TrackParticleContainer with key: " << m_trkParticleName );
- return StatusCode::SUCCESS;
- }
-
- const auto allTracks = getContainer<xAOD::TrackParticleContainer>(m_trkParticleName);
-
- // Create the weights
- m_trackCaloClusterWeightsTool->fillWeightMaps(associatedClusters, &clusterToTracksMap, &TrackTotalClusterPt, &clusterToTracksWeightMap);
-
- // Create Combined xAOD::TCC
- m_trackCaloClusterCreatorTool->createCombinedTCCs(tccContainer, associatedClusters, &TrackTotalClusterPt, &clusterToTracksWeightMap);
-
- // Combined + Neutral
- xAOD::TrackCaloClusterContainer* tccContainer1 = new xAOD::TrackCaloClusterContainer;
- ATH_CHECK( evtStore()->record( tccContainer1, m_trackCaloClusterContainerName + "CombinedAndNeutral" ) );
-
- xAOD::TrackCaloClusterAuxContainer* tccContainerAux1 = new xAOD::TrackCaloClusterAuxContainer();
- ATH_CHECK( evtStore()->record( tccContainerAux1, m_trackCaloClusterContainerName + "CombinedAndNeutral" + "Aux." ) );
- tccContainer1->setStore( tccContainerAux1 );
- ATH_MSG_DEBUG( "Recorded TrackCaloClusterContainer with key: " << m_trackCaloClusterContainerName );
-
- for (xAOD::TrackCaloCluster* combined: *tccContainer) {
- tccContainer1->push_back(new xAOD::TrackCaloCluster);
- *tccContainer1->back() = *combined;
- }
-
- // Create neutral xAOD::TCC
- m_trackCaloClusterCreatorTool->createNeutralTCCs(tccContainer1, allClusters, &clusterToTracksWeightMap);
-
- // Combined + Neutral + Charged
- xAOD::TrackCaloClusterContainer* tccContainer2 = new xAOD::TrackCaloClusterContainer;
- ATH_CHECK( evtStore()->record( tccContainer2, m_trackCaloClusterContainerName + "All" ) );
-
- xAOD::TrackCaloClusterAuxContainer* tccContainerAux2 = new xAOD::TrackCaloClusterAuxContainer();
- ATH_CHECK( evtStore()->record( tccContainerAux2, m_trackCaloClusterContainerName + "All" + "Aux." ) );
- tccContainer2->setStore( tccContainerAux2 );
- ATH_MSG_DEBUG( "Recorded TrackCaloClusterContainer with key: " << m_trackCaloClusterContainerName + "All" );
-
- for (xAOD::TrackCaloCluster* combinedAndNeutral: *tccContainer1) {
- tccContainer2->push_back(new xAOD::TrackCaloCluster);
- *tccContainer2->back() = *combinedAndNeutral;
- }
-
- // Create trackonly xAOD::TCC
- m_trackCaloClusterCreatorTool->createChargedTCCs(tccContainer2, allTracks, &TrackTotalClusterPt);
-
- // Combined + Charged
- xAOD::TrackCaloClusterContainer* tccContainer3 = new xAOD::TrackCaloClusterContainer;
- ATH_CHECK( evtStore()->record( tccContainer3, m_trackCaloClusterContainerName + "CombinedAndCharged" ) );
-
- xAOD::TrackCaloClusterAuxContainer* tccContainerAux3 = new xAOD::TrackCaloClusterAuxContainer();
- ATH_CHECK( evtStore()->record( tccContainerAux3, m_trackCaloClusterContainerName + "CombinedAndCharged" + "Aux." ) );
- tccContainer3->setStore( tccContainerAux3 );
- ATH_MSG_DEBUG( "Recorded TrackCaloClusterContainer with key: " << m_trackCaloClusterContainerName + "AllTrack" );
-
- for (xAOD::TrackCaloCluster* combined: *tccContainer) {
- tccContainer3->push_back(new xAOD::TrackCaloCluster);
- *tccContainer3->back() = *combined;
- }
-
- // Create trackonly xAOD::TCC
- m_trackCaloClusterCreatorTool->createChargedTCCs(tccContainer3, allTracks, &TrackTotalClusterPt);
-
- return StatusCode::SUCCESS;
-}
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
deleted file mode 100644
index e73f0a474803f8963c5266b0729e2c839e9d4a81..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h"
-
-DECLARE_COMPONENT( TrackCaloClusterRecAlg )
-
-
-
diff --git a/Reconstruction/eflowRec/CMakeLists.txt b/Reconstruction/eflowRec/CMakeLists.txt
index 5b114201644658bc3bcc2933903bdb68dca23200..2c73f643b8df0964ea035081f5e3982f5a382f80 100644
--- a/Reconstruction/eflowRec/CMakeLists.txt
+++ b/Reconstruction/eflowRec/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
################################################################################
# Package: eflowRec
################################################################################
@@ -17,11 +19,12 @@ atlas_depends_on_subdirs( PUBLIC
Control/CxxUtils
DetectorDescription/GeoPrimitives
Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODCore
+ Event/xAOD/xAODCore
Event/xAOD/xAODEgamma
Event/xAOD/xAODMuon
Event/xAOD/xAODPFlow
Event/xAOD/xAODTracking
+ Event/xAOD/xAODTau
GaudiKernel
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
@@ -48,11 +51,10 @@ atlas_add_component( eflowRec
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloIdentifier CaloRecLib AthContainers AthLinks AthenaBaseComps CxxUtils AthenaKernel GeoPrimitives xAODCaloEvent xAODCore xAODEgamma xAODMuon xAODPFlow xAODTracking GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry TrackVertexAssociationToolLib Particle RecoToolInterfaces TrkParameters CaloDetDescrLib CaloUtilsLib StoreGateLib SGtests FourMomUtils PathResolver TrkCaloExtension TrkParametersIdentificationHelpers InDetTrackSelectionToolLib AthenaMonitoringKernelLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloIdentifier CaloRecLib AthContainers AthLinks AthenaBaseComps CxxUtils AthenaKernel GeoPrimitives xAODCaloEvent xAODCore xAODEgamma xAODMuon xAODPFlow xAODTau xAODTracking GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry TrackVertexAssociationToolLib Particle RecoToolInterfaces TrkParameters CaloDetDescrLib CaloUtilsLib StoreGateLib SGtests FourMomUtils PathResolver TrkCaloExtension TrkParametersIdentificationHelpers InDetTrackSelectionToolLib AthenaMonitoringKernelLib )
# Install files from the package:
atlas_install_headers( eflowRec )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/rmsvsdr.dat )
-
diff --git a/Reconstruction/eflowRec/eflowRec/PFTauFlowElementAssoc.h b/Reconstruction/eflowRec/eflowRec/PFTauFlowElementAssoc.h
new file mode 100644
index 0000000000000000000000000000000000000000..28cf78794a07185f7707b6c447accef93b8c1864
--- /dev/null
+++ b/Reconstruction/eflowRec/eflowRec/PFTauFlowElementAssoc.h
@@ -0,0 +1,67 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*
+ * PFTauFlowElementAssoc.h
+ * Header file for class PFTauFlowElementAssoc
+ *
+ * Created on: 24.09.20
+ * Author: L. Miller
+ */
+
+#ifndef PFTAUFLOWELEMENTASSOC_H
+#define PFTAUFLOWELEMENTASSOC_H
+
+#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/DataHandle.h"
+#include "StoreGate/WriteDecorHandle.h"
+
+#include "xAODPFlow/FlowElementContainer.h"
+#include "xAODTau/TauJetContainer.h"
+
+/**
+This is the algorithm, which inherits from AthReentrantAlgorithm, that adds element links
+between FlowElements (FEs) and Tau objects. Charged FEs are associated with core tau
+tracks and neutral FEs are associated with tau clusters.
+Decorations are added to the TauJet container consisting of a vector of ElementLinks
+to the charged and neutral FlowElement container.
+Similarly, decorations are added to the charged and neutral FlowElement containers
+(JetETMissChargedFlowElements and JetETMissNeutralFlowElements) which contain a
+vector of ElementLinks to the associated TauJets.
+*/
+
+class PFTauFlowElementAssoc : public AthReentrantAlgorithm {
+
+public:
+ using AthReentrantAlgorithm::AthReentrantAlgorithm;
+
+ PFTauFlowElementAssoc(const std::string& name, ISvcLocator* pSvcLocator);
+
+ virtual ~PFTauFlowElementAssoc();
+
+ virtual StatusCode initialize();
+ virtual StatusCode execute(const EventContext &ctx) const;
+
+private:
+
+ // ReadHandle for the tau jets
+ SG::ReadHandleKey<xAOD::TauJetContainer> m_tauJetReadHandleKey{this,"TauJetContainer","TauJets","ReadHandleKey for TauJet Container"};
+ // ReadHandles for FlowElements
+ SG::ReadHandleKey<xAOD::FlowElementContainer> m_neutralFEReadHandleKey{this,"JetETMissNeutralFlowElementContainer","JetETMissNeutralFlowElements","ReadHandleKey for neutral FlowElements"};
+ SG::ReadHandleKey<xAOD::FlowElementContainer> m_chargedFEReadHandleKey{this,"JetETMissChargedFlowElementContainer","JetETMissChargedFlowElements","ReadHandleKey for charged FlowElements"};
+
+ /** The write key for adding Neutral Flow Element links to the taus */
+ SG::WriteDecorHandleKey<xAOD::TauJetContainer> m_tauNeutralFEWriteDecorKey{this,"TauNeutralFEDecorKey","TauJets.neutralFELinks","WriteDecorHandleKey for adding neutral FE links to taus"};
+ /** The write key for adding Charged Flow Element links to the taus */
+ SG::WriteDecorHandleKey<xAOD::TauJetContainer> m_tauChargedFEWriteDecorKey{this,"TauChargedFEDecorKey","TauJets.chargedFELinks","WriteDecorHandleKey for adding charged FE links to taus"};
+ /** The write key for adding tau element links to the Neutral Flow Elements */
+ SG::WriteDecorHandleKey<xAOD::FlowElementContainer> m_neutralFETauWriteDecorKey{this,"NeutralFETauDecorKey","JetETMissNeutralFlowElements.FE_TauLinks","WriteDecorHandleKey for adding tau links to neutral FEs"};
+ /** The write key for adding tau element links to the Charged Flow Elements */
+ SG::WriteDecorHandleKey<xAOD::FlowElementContainer> m_chargedFETauWriteDecorKey{this,"ChargedFETauDecorKey","JetETMissChargedFlowElements.FE_TauLinks","WriteDecorHandleKey for adding tau links to charged FEs"};
+
+};
+
+#endif // PFTAUFLOWELEMENTASSOC_H
diff --git a/Reconstruction/eflowRec/python/eflowRecFlags.py b/Reconstruction/eflowRec/python/eflowRecFlags.py
index a204bf9ffb1b755d36d82b697c66161f8583316c..eb2c341c3968eb4b4a9913746d93302daa7d3423 100644
--- a/Reconstruction/eflowRec/python/eflowRecFlags.py
+++ b/Reconstruction/eflowRec/python/eflowRecFlags.py
@@ -46,7 +46,7 @@ class useEEtaFirstInt(JobProperty):
""" Whether to bin E/P in E,Eta and layer of First Interaction
or just E,Eta
"""
-
+
statusOn = True
allowedTypes = ['bool']
StoredValue = True
@@ -121,6 +121,13 @@ class usePFEGammaPFOAssoc(JobProperty):
allowedTypes = ['bool']
StoredValue = False
+class usePFTauFlowElementAssoc(JobProperty):
+ """ Flag to toggle use of linking between tau objects and flow elements
+ """
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+
class provideShowerSubtractedClusters(JobProperty):
""" Flag to toggle provision of ElementLink to charged shower subtracted calorimeter clusters. Such links are added to
neutral PFO and we write out the relevant CaloClusterContainer to AOD such that the links remain valid """
@@ -140,14 +147,13 @@ class eflowRecFlags(JobPropertyContainer):
""" The eflowRec flag property container
"""
pass
-
-# add the flags container to the top container
+
+# add the flags container to the top container
jobproperties.add_Container(eflowRecFlags)
-eflowJobProperties = [eflowAlgType,CalType,useLocalHadWeightsOOCC,useOverLapShowerCells,useSplitShowers,useEEtaFirstInt,recoverIsolatedTracks,UseElectronHadronID,runTauMode, useLeptons,storeLeptonCells, useLCInput, useUpdated2015ChargedShowerSubtraction,useAODReductionClusterMomentList,useCalibHitTruth,usePFEGammaPFOAssoc,provideShowerSubtractedClusters, useFlowElements]
+eflowJobProperties = [eflowAlgType,CalType,useLocalHadWeightsOOCC,useOverLapShowerCells,useSplitShowers,useEEtaFirstInt,recoverIsolatedTracks,UseElectronHadronID,runTauMode, useLeptons,storeLeptonCells, useLCInput, useUpdated2015ChargedShowerSubtraction,useAODReductionClusterMomentList,useCalibHitTruth,usePFEGammaPFOAssoc,usePFTauFlowElementAssoc,provideShowerSubtractedClusters, useFlowElements]
for i in eflowJobProperties :
jobproperties.eflowRecFlags.add_JobProperty(i)
del eflowJobProperties
-
diff --git a/Reconstruction/eflowRec/share/PFlowMTConfig.py b/Reconstruction/eflowRec/share/PFlowMTConfig.py
index 93ab416343a7db1864ee4f0d624d7963851df389..f47e5e1aa725c8fddfde3294d39de75dbe0416c0 100644
--- a/Reconstruction/eflowRec/share/PFlowMTConfig.py
+++ b/Reconstruction/eflowRec/share/PFlowMTConfig.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
from eflowRec.eflowRecConf import PFLeptonSelector
PFLeptonSelector=PFLeptonSelector("PFLeptonSelector")
topSequence += PFLeptonSelector
@@ -28,7 +30,7 @@ from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
CaloNoiseCondAlg()
TrackSelectionTool.CutLevel = "TightPrimary"
-TrackSelectionTool.minPt = 500.0
+TrackSelectionTool.minPt = 500.0
PFTrackSelector.trackSelectionTool = TrackSelectionTool
@@ -82,7 +84,7 @@ if jobproperties.eflowRecFlags.eflowAlgType == "EOverP":
MatchingTool.ClusterPositionType = 'PlainEtaPhi' # str
MatchingTool.DistanceType = 'EtaPhiSquareDistance'
MatchingTool.MatchCut = 0.2*0.2 # float
-
+
PFAlgorithm.SubtractionToolList += [PFCellLevelSubtractionTool]
from eflowRec.eflowRecConf import PFRecoverSplitShowersTool
@@ -94,7 +96,7 @@ PFRecoverSplitShowersTool.eflowCellEOverPTool=CellEOverPTool_Recover
if jobproperties.eflowRecFlags.recoverIsolatedTracks == True:
PFRecoverSplitShowersTool.RecoverIsolatedTracks = True
-
+
if jobproperties.eflowRecFlags.useUpdated2015ChargedShowerSubtraction == False:
PFRecoverSplitShowersTool.useUpdated2015ChargedShowerSubtraction = False
@@ -110,18 +112,18 @@ PFClusterMomentsMaker = CaloClusterMomentsMaker("PFClusterMomentsMaker")
from CaloRec.CaloTopoClusterFlags import jobproperties
PFClusterMomentsMaker.MaxAxisAngle = 20*deg
-PFClusterMomentsMaker.WeightingOfNegClusters = jobproperties.CaloTopoClusterFlags.doTreatEnergyCutAsAbsolute()
+PFClusterMomentsMaker.WeightingOfNegClusters = jobproperties.CaloTopoClusterFlags.doTreatEnergyCutAsAbsolute()
PFClusterMomentsMaker.MinBadLArQuality = 4000
PFClusterMomentsMaker.TwoGaussianNoise = jobproperties.CaloTopoClusterFlags.doTwoGaussianNoise()
PFClusterMomentsMaker.OutputLevel = INFO
PFClusterMomentsMaker.MomentsNames = [
- "FIRST_PHI"
+ "FIRST_PHI"
,"FIRST_ETA"
- ,"SECOND_R"
+ ,"SECOND_R"
,"SECOND_LAMBDA"
,"DELTA_PHI"
,"DELTA_THETA"
- ,"DELTA_ALPHA"
+ ,"DELTA_ALPHA"
,"CENTER_X"
,"CENTER_Y"
,"CENTER_Z"
@@ -129,11 +131,11 @@ PFClusterMomentsMaker.MomentsNames = [
,"CENTER_LAMBDA"
,"LATERAL"
,"LONGITUDINAL"
- ,"FIRST_ENG_DENS"
- ,"ENG_FRAC_EM"
- ,"ENG_FRAC_MAX"
- ,"ENG_FRAC_CORE"
- ,"FIRST_ENG_DENS"
+ ,"FIRST_ENG_DENS"
+ ,"ENG_FRAC_EM"
+ ,"ENG_FRAC_MAX"
+ ,"ENG_FRAC_CORE"
+ ,"FIRST_ENG_DENS"
,"SECOND_ENG_DENS"
,"ISOLATION"
,"EM_PROBABILITY"
@@ -184,8 +186,8 @@ if jobproperties.eflowRecFlags.useCalibHitTruth:
PFMomentCalculatorTool.CaloCalibClusterMomentsMaker2=PFCalibClusterMomentsMaker
-
-
+
+
from eflowRec.eflowRecConf import PFClusterCollectionTool
PFClusterCollectionTool_default = PFClusterCollectionTool("PFClusterCollectionTool")
@@ -234,7 +236,7 @@ from eflowRec.eflowRecConf import PFONeutralCreatorAlgorithm
PFONeutralCreatorAlgorithm = PFONeutralCreatorAlgorithm("PFONeutralCreatorAlgorithm")
if jobproperties.eflowRecFlags.useCalibHitTruth:
PFONeutralCreatorAlgorithm.UseCalibHitTruth=True
-
+
if jobproperties.eflowRecFlags.eflowAlgType == "EOverP":
PFONeutralCreatorAlgorithm.PFOOutputName="EOverPNeutralParticleFlowObjects"
PFONeutralCreatorAlgorithm.EOverPMode=True
@@ -248,7 +250,7 @@ jobproperties.eflowRecFlags.usePFEGammaPFOAssoc.set_Value_and_Lock(True)
if jobproperties.eflowRecFlags.usePFEGammaPFOAssoc:
-
+
from eflowRec.eflowRecConf import PFEGammaPFOAssoc
PFEGammaPFOAssoc=PFEGammaPFOAssoc("PFEGammaPFOAssoc")
topSequence += PFEGammaPFOAssoc
@@ -256,18 +258,18 @@ if jobproperties.eflowRecFlags.usePFEGammaPFOAssoc:
jobproperties.eflowRecFlags.useFlowElements.set_Value_and_Lock(True)
#Add new FlowElement creators
-if jobproperties.eflowRecFlags.useFlowElements:
+if jobproperties.eflowRecFlags.useFlowElements:
from eflowRec.eflowRecConf import PFChargedFlowElementCreatorAlgorithm
PFChargedFlowElementCreatorAlgorithm = PFChargedFlowElementCreatorAlgorithm("PFChargedFlowElementCreatorAlgorithm")
- topSequence += PFChargedFlowElementCreatorAlgorithm
+ topSequence += PFChargedFlowElementCreatorAlgorithm
from eflowRec.eflowRecConf import PFNeutralFlowElementCreatorAlgorithm
PFNeutralFlowElementCreatorAlgorithm = PFNeutralFlowElementCreatorAlgorithm("PFNeutralFlowElementCreatorAlgorithm")
- topSequence += PFNeutralFlowElementCreatorAlgorithm
+ topSequence += PFNeutralFlowElementCreatorAlgorithm
from eflowRec.eflowRecConf import PFLCNeutralFlowElementCreatorAlgorithm
PFLCNeutralFlowElementCreatorAlgorithm = PFLCNeutralFlowElementCreatorAlgorithm("PFLCNeutralFlowElementCreatorAlgorithm")
- topSequence += PFLCNeutralFlowElementCreatorAlgorithm
+ topSequence += PFLCNeutralFlowElementCreatorAlgorithm
# Electron/Photon linkers to flow elements
from eflowRec.eflowRecConf import PFEGamFlowElementAssoc
diff --git a/Reconstruction/eflowRec/share/tauFELinkConfig.py b/Reconstruction/eflowRec/share/tauFELinkConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..fb0d78316e26d37c58a22a1b4c60e9a7bc4787ff
--- /dev/null
+++ b/Reconstruction/eflowRec/share/tauFELinkConfig.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from eflowRec.eflowRecFlags import jobproperties
+
+if jobproperties.eflowRecFlags.usePFTauFlowElementAssoc and jobproperties.eflowRecFlags.useFlowElements :
+ from eflowRec.eflowRecConf import PFTauFlowElementAssoc
+ PFTauFlowElementAssoc=PFTauFlowElementAssoc("PFTauFlowElementAssoc")
+ topSequence += PFTauFlowElementAssoc
diff --git a/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx b/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
index 00dd296913bb947fc4285cd56c7f52c63ee85313..c2075141e6d4a9939a9a5dc7dbaab132a430634e 100644
--- a/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
+++ b/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
@@ -4,37 +4,36 @@
#include "eflowRec/PFONeutralCreatorAlgorithm.h"
-#include <algorithm>
+
#include "eflowRec/eflowCaloObject.h"
#include "eflowRec/eflowRecCluster.h"
#include "eflowRec/eflowTrackClusterLink.h"
#include "xAODPFlow/PFOAuxContainer.h"
+#include <algorithm>
+#include <cmath>
+#include <array>
+#include <utility> //for std::pair
+
PFONeutralCreatorAlgorithm::PFONeutralCreatorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator) :
- AthReentrantAlgorithm(name, pSvcLocator)
-{
+ AthReentrantAlgorithm(name, pSvcLocator){
}
StatusCode PFONeutralCreatorAlgorithm::initialize(){
-
ATH_CHECK(m_eflowCaloObjectContainerReadHandleKey.initialize());
ATH_CHECK(m_neutralPFOContainerWriteHandleKey.initialize());
if(!m_LCMode) {
ATH_CHECK(m_neutralPFOContainerWriteHandleKey_nonModified.initialize());
}
return StatusCode::SUCCESS;
-
}
StatusCode PFONeutralCreatorAlgorithm::execute(const EventContext& ctx) const {
-
ATH_MSG_DEBUG("Executing");
-
/* Create Neutral PFOs from all eflowCaloObjects */
SG::ReadHandle<eflowCaloObjectContainer> eflowCaloObjectContainerReadHandle(m_eflowCaloObjectContainerReadHandleKey,ctx);
-
// Always create at least one PFO container & aux
auto neutralPFOContainer = std::make_unique<xAOD::PFOContainer>();
auto neutralPFOContainerAux = std::make_unique<xAOD::PFOAuxContainer>();
@@ -47,7 +46,6 @@ StatusCode PFONeutralCreatorAlgorithm::execute(const EventContext& ctx) const {
neutralPFOContainerAux_nonModified = std::make_unique<xAOD::PFOAuxContainer>();
neutralPFOContainer->setStore(neutralPFOContainerAux_nonModified.get());
}
-
ATH_MSG_DEBUG("Looping over eflowCaloObjects");
// Create PFOs and fill the containers
for (auto thisEflowCaloObject : *eflowCaloObjectContainerReadHandle) {
@@ -56,7 +54,6 @@ StatusCode PFONeutralCreatorAlgorithm::execute(const EventContext& ctx) const {
return StatusCode::SUCCESS;
}
}
-
// Record the output containers
SG::WriteHandle<xAOD::PFOContainer> neutralPFOContainerWriteHandle(m_neutralPFOContainerWriteHandleKey,ctx);
std::sort(neutralPFOContainer->begin(), neutralPFOContainer->end(), [] (const xAOD::PFO* pfo1, const xAOD::PFO* pfo2) {return pfo1->pt()>pfo2->pt();});
@@ -66,20 +63,16 @@ StatusCode PFONeutralCreatorAlgorithm::execute(const EventContext& ctx) const {
SG::WriteHandle<xAOD::PFOContainer> neutralPFOContainerWriteHandle_nonModified(m_neutralPFOContainerWriteHandleKey,ctx);
ATH_CHECK( neutralPFOContainerWriteHandle_nonModified.record(std::move(neutralPFOContainer_nonModified),std::move(neutralPFOContainerAux_nonModified)) );
}
-
return StatusCode::SUCCESS;
}
StatusCode PFONeutralCreatorAlgorithm::finalize(){ return StatusCode::SUCCESS; }
StatusCode PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& energyFlowCaloObject, xAOD::PFOContainer* neutralPFOContainer, xAOD::PFOContainer* neutralPFOContainer_nonModified) const {
-
unsigned int nClusters = energyFlowCaloObject.nClusters();
-
ATH_MSG_VERBOSE(" eflowCaloObject with " << nClusters << " clusters");
for (unsigned int iCluster = 0; iCluster < nClusters; ++iCluster){
eflowRecCluster* thisEfRecCluster = energyFlowCaloObject.efRecCluster(iCluster);
-
/* Skip empty clusters (presumably subtraction remnants) */
const CaloClusterCellLink* theCellLink = energyFlowCaloObject.efRecCluster(iCluster)->getCluster()->getCellLinks();
CaloClusterCellLink::const_iterator it=theCellLink->begin();
@@ -89,26 +82,23 @@ StatusCode PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& e
}
//this vetoes rare examples where only two cells are left, and they have equal and opposite energy
if (0.0 == energyFlowCaloObject.efRecCluster(iCluster)->getCluster()->e() ) continue;
-
/* Create the efo, add the cluster and set the four-momentum, charge and type */
-
ATH_MSG_VERBOSE(" Creating PFO");
xAOD::PFO* thisPFO = new xAOD::PFO();
if (m_LCMode) {
if (thisEfRecCluster->isTouchable()) {
neutralPFOContainer->push_back(thisPFO);
} else {
- if(neutralPFOContainer_nonModified) {
- neutralPFOContainer_nonModified->push_back(thisPFO);
- } else {
- ATH_MSG_WARNING("Got a nullptr for non-modified nPFO container!");
- return StatusCode::FAILURE;
- }
+ if(neutralPFOContainer_nonModified) {
+ neutralPFOContainer_nonModified->push_back(thisPFO);
+ } else {
+ ATH_MSG_WARNING("Got a nullptr for non-modified nPFO container!");
+ return StatusCode::FAILURE;
+ }
}
} else {
neutralPFOContainer->push_back(thisPFO);
}
-
ATH_MSG_VERBOSE(" Get original cluster link");
ElementLink<xAOD::CaloClusterContainer> theOriginalClusterLink = thisEfRecCluster->getOriginalClusElementLink();
ATH_MSG_VERBOSE(" Get sister cluster link");
@@ -120,191 +110,140 @@ StatusCode PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& e
bool isSet = thisPFO->setClusterLink(theOriginalClusterLink);
if (!isSet) { ATH_MSG_WARNING( "Could not set Cluster in PFO " ); }
}
-
- if (true == m_addShowerSubtractedClusters) thisPFO->setAttribute("PFOShowerSubtractedClusterLink",thisEfRecCluster->getClusElementLink());
-
+ if (m_addShowerSubtractedClusters) thisPFO->setAttribute("PFOShowerSubtractedClusterLink",thisEfRecCluster->getClusElementLink());
ATH_MSG_VERBOSE(" Sucessfully set cluster link");
-
const xAOD::CaloCluster* cluster = thisEfRecCluster->getCluster();
ATH_MSG_VERBOSE(" Got CaloCluster from EfRecCluster");
//be careful here - cluster p4 methods do not store sign. Thus -ve energy clusters have +ve pt and hence +ve energy
if (!m_LCMode) {
//in EM->EM/LC mode we use eta,phi at EM scale for both 4-vectors
thisPFO->setP4(cluster->pt(), cluster->rawEta(), cluster->rawPhi(), cluster->m());
- thisPFO->setP4EM(cluster->rawE()/cosh(cluster->rawEta()), cluster->rawEta(),cluster->rawPhi(),cluster->rawM());
- }
- else{
+ thisPFO->setP4EM(cluster->rawE()/std::cosh(cluster->rawEta()), cluster->rawEta(),cluster->rawPhi(),cluster->rawM());
+ } else {
//in LC-> mode we use the LC 4-vector for the LC scale
thisPFO->setP4(cluster->pt(), cluster->eta(), cluster->phi(), cluster->m());
//we cannot access geometric weights for LC clusters, so we make an approximation of the EM energy by looping over the calocells
//Then the EM 4-vector uses the energy/pt at this EM scale + eta,phi from LC 4-vector
const CaloClusterCellLink* theCellLink = cluster->getCellLinks();
float emPt = 0.0;
- for (auto thisCaloCell : *theCellLink) emPt += thisCaloCell->e()/cosh(thisCaloCell->eta());
-
+ for (auto thisCaloCell : *theCellLink) emPt += thisCaloCell->e()/std::cosh(thisCaloCell->eta());
thisPFO->setP4EM(emPt,cluster->eta(),cluster->phi(),0.0);//mass is always zero at EM scale
-
}
-
ATH_MSG_DEBUG("Created neutral PFO with E, pt, eta and phi of " << thisPFO->e() << ", " << thisPFO->pt() << ", " << thisPFO->eta() << " and " << thisPFO->phi());
-
thisPFO->setCharge(0);
-
//Set the CENTER_MAG moment. This has its own dedicated getter in the PFO EDM, and so is not dealt with by the generic addMoment function.
double center_mag = 0.0;
bool isRetrieved = cluster->retrieveMoment(xAOD::CaloCluster::CENTER_MAG, center_mag );
- if (true == isRetrieved) thisPFO->setCenterMag(center_mag);
+ if (isRetrieved) thisPFO->setCenterMag(center_mag);
else ATH_MSG_WARNING("Could not retreve CENTER_MAG from xAOD::CaloCluster");
-
if(m_doClusterMoments) {
-
+ //definitions to reduce verbosity
+ using Cluster = xAOD::CaloCluster;
+ using Attributes = xAOD::PFODetails::PFOAttributes;
//now set the moments for touchable clusters (i.e. ones we modify) in LC mode or all clusters in EM mode
if ( (m_LCMode && thisEfRecCluster->isTouchable()) || !m_LCMode) {
- this->addMoment(xAOD::CaloCluster::SECOND_R,xAOD::PFODetails::PFOAttributes::eflowRec_SECOND_R,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::CENTER_LAMBDA,xAOD::PFODetails::PFOAttributes::eflowRec_CENTER_LAMBDA,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::ENG_BAD_CELLS,xAOD::PFODetails::PFOAttributes::eflowRec_ENG_BAD_CELLS,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::N_BAD_CELLS,xAOD::PFODetails::PFOAttributes::eflowRec_N_BAD_CELLS,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::BADLARQ_FRAC,xAOD::PFODetails::PFOAttributes::eflowRec_BADLARQ_FRAC,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::ENG_POS,xAOD::PFODetails::PFOAttributes::eflowRec_ENG_POS,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::AVG_LAR_Q,xAOD::PFODetails::PFOAttributes::eflowRec_AVG_LAR_Q,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::AVG_TILE_Q,xAOD::PFODetails::PFOAttributes::eflowRec_AVG_TILE_Q,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::ISOLATION,xAOD::PFODetails::PFOAttributes::eflowRec_ISOLATION,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::SECOND_LAMBDA,xAOD::PFODetails::PFOAttributes::eflowRec_SECOND_LAMBDA,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::EM_PROBABILITY,xAOD::PFODetails::PFOAttributes::eflowRec_EM_PROBABILITY,*cluster, *thisPFO);
- if (m_useCalibHitTruth){
- this->addMoment(xAOD::CaloCluster::ENG_CALIB_TOT,xAOD::PFODetails::PFOAttributes::eflowRec_ENG_CALIB_TOT,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::ENG_CALIB_FRAC_EM,xAOD::PFODetails::PFOAttributes::eflowRec_ENG_CALIB_FRAC_EM,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::ENG_CALIB_FRAC_HAD,xAOD::PFODetails::PFOAttributes::eflowRec_ENG_CALIB_FRAC_HAD,*cluster, *thisPFO);
- this->addMoment(xAOD::CaloCluster::ENG_CALIB_FRAC_REST,xAOD::PFODetails::PFOAttributes::eflowRec_ENG_CALIB_FRAC_REST,*cluster, *thisPFO);
- }
+ //Block of code to set moments/attributes
+ auto conciseAddMoment = [&cluster, &thisPFO, this](const Cluster::MomentType & c, const Attributes & a){
+ return this->addMoment(c, a, *cluster, *thisPFO);
+ };
+ const std::array< std::pair<Cluster::MomentType, Attributes>, 11> momentAttributePairs{{ //tricky: one more brace than expected, and is necessary
+ {Cluster::SECOND_R, Attributes::eflowRec_SECOND_R},
+ {Cluster::CENTER_LAMBDA, Attributes::eflowRec_CENTER_LAMBDA},
+ {Cluster::ENG_BAD_CELLS, Attributes::eflowRec_ENG_BAD_CELLS},
+ {Cluster::N_BAD_CELLS, Attributes::eflowRec_N_BAD_CELLS},
+ {Cluster::BADLARQ_FRAC, Attributes::eflowRec_BADLARQ_FRAC},
+ {Cluster::ENG_POS, Attributes::eflowRec_ENG_POS},
+ {Cluster::AVG_LAR_Q, Attributes::eflowRec_AVG_LAR_Q},
+ {Cluster::AVG_TILE_Q, Attributes::eflowRec_AVG_TILE_Q},
+ {Cluster::ISOLATION, Attributes::eflowRec_ISOLATION},
+ {Cluster::SECOND_LAMBDA, Attributes::eflowRec_SECOND_LAMBDA},
+ {Cluster::EM_PROBABILITY, Attributes::eflowRec_EM_PROBABILITY}
+ }};
+ for (const auto & [moment,attribute]:momentAttributePairs) conciseAddMoment(moment, attribute);
+ if (m_useCalibHitTruth){
+ const std::array< std::pair<Cluster::MomentType, Attributes>, 4> momentAttributeTruthPairs{{
+ {Cluster::ENG_CALIB_TOT, Attributes::eflowRec_ENG_CALIB_TOT},
+ {Cluster::ENG_CALIB_FRAC_EM, Attributes::eflowRec_ENG_CALIB_FRAC_EM},
+ {Cluster::ENG_CALIB_FRAC_HAD, Attributes::eflowRec_ENG_CALIB_FRAC_HAD},
+ {Cluster::ENG_CALIB_FRAC_REST, Attributes::eflowRec_ENG_CALIB_FRAC_REST}
+ }};
+ for (const auto & [moment,attribute]:momentAttributeTruthPairs) conciseAddMoment(moment, attribute);
+ }
}
-
- //First set all the layer energies
- float layerEnergy_preSamplerB = cluster->eSample(xAOD::CaloCluster::CaloSample::PreSamplerB);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_PreSamplerB = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_PreSamplerB;
- thisPFO->setAttribute( myAttribute_layerEnergy_PreSamplerB, layerEnergy_preSamplerB);
-
- float layerEnergy_EMB1 = cluster->eSample(xAOD::CaloCluster::CaloSample::EMB1);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EMB1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EMB1;
- thisPFO->setAttribute( myAttribute_layerEnergy_EMB1, layerEnergy_EMB1);
-
- float layerEnergy_EMB2 = cluster->eSample(xAOD::CaloCluster::CaloSample::EMB2);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EMB2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EMB2;
- thisPFO->setAttribute( myAttribute_layerEnergy_EMB2, layerEnergy_EMB2);
-
- float layerEnergy_EMB3 = cluster->eSample(xAOD::CaloCluster::CaloSample::EMB3);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EMB3 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EMB3;
- thisPFO->setAttribute( myAttribute_layerEnergy_EMB3, layerEnergy_EMB3);
-
- float layerEnergy_preSamplerE = cluster->eSample(xAOD::CaloCluster::CaloSample::PreSamplerE);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_PreSamplerE = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_PreSamplerE;
- thisPFO->setAttribute( myAttribute_layerEnergy_PreSamplerE, layerEnergy_preSamplerE);
-
- float layerEnergy_EME1 = cluster->eSample(xAOD::CaloCluster::CaloSample::EME1);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EME1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EME1;
- thisPFO->setAttribute( myAttribute_layerEnergy_EME1, layerEnergy_EME1);
-
- float layerEnergy_EME2 = cluster->eSample(xAOD::CaloCluster::CaloSample::EME2);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EME2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EME2;
- thisPFO->setAttribute( myAttribute_layerEnergy_EME2, layerEnergy_EME2);
-
- float layerEnergy_EME3 = cluster->eSample(xAOD::CaloCluster::CaloSample::EME3);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EME3 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EME3;
- thisPFO->setAttribute( myAttribute_layerEnergy_EME3, layerEnergy_EME3);
-
- float layerEnergy_HEC0 = cluster->eSample(xAOD::CaloCluster::CaloSample::HEC0);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_HEC0 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_HEC0;
- thisPFO->setAttribute( myAttribute_layerEnergy_HEC0, layerEnergy_HEC0);
-
- float layerEnergy_HEC1 = cluster->eSample(xAOD::CaloCluster::CaloSample::HEC1);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_HEC1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_HEC1;
- thisPFO->setAttribute( myAttribute_layerEnergy_HEC1, layerEnergy_HEC1);
-
- float layerEnergy_HEC2 = cluster->eSample(xAOD::CaloCluster::CaloSample::HEC2);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_HEC2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_HEC2;
- thisPFO->setAttribute( myAttribute_layerEnergy_HEC2, layerEnergy_HEC2);
-
- float layerEnergy_HEC3 = cluster->eSample(xAOD::CaloCluster::CaloSample::HEC3);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_HEC3 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_HEC3;
- thisPFO->setAttribute( myAttribute_layerEnergy_HEC3, layerEnergy_HEC3);
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileBar0 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileBar0;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileBar0, cluster->eSample(xAOD::CaloCluster::CaloSample::TileBar0));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileBar1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileBar1;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileBar1, cluster->eSample(xAOD::CaloCluster::CaloSample::TileBar1));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileBar2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileBar2;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileBar2, cluster->eSample(xAOD::CaloCluster::CaloSample::TileBar2));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileGap1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileGap1;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileGap1, cluster->eSample(xAOD::CaloCluster::CaloSample::TileGap1));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileGap2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileGap2;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileGap2, cluster->eSample(xAOD::CaloCluster::CaloSample::TileGap2));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileGap3 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileGap3;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileGap3, cluster->eSample(xAOD::CaloCluster::CaloSample::TileGap3));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileExt0 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileExt0;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileExt0, cluster->eSample(xAOD::CaloCluster::CaloSample::TileExt0));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileExt1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileExt1;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileExt1, cluster->eSample(xAOD::CaloCluster::CaloSample::TileExt1));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_TileExt2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_TileExt2;
- thisPFO->setAttribute( myAttribute_layerEnergy_TileExt2, cluster->eSample(xAOD::CaloCluster::CaloSample::TileExt2));
-
- float layerEnergy_FCAL0 = cluster->eSample(xAOD::CaloCluster::CaloSample::FCAL0);
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_FCAL0 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_FCAL0;
- thisPFO->setAttribute( myAttribute_layerEnergy_FCAL0, layerEnergy_FCAL0);
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_FCAL1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_FCAL1;
- thisPFO->setAttribute( myAttribute_layerEnergy_FCAL1, cluster->eSample(xAOD::CaloCluster::CaloSample::FCAL1));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_FCAL2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_FCAL2;
- thisPFO->setAttribute( myAttribute_layerEnergy_FCAL2, cluster->eSample(xAOD::CaloCluster::CaloSample::FCAL2));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_MINIFCAL0 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_MINIFCAL0;
- thisPFO->setAttribute( myAttribute_layerEnergy_MINIFCAL0, cluster->eSample(xAOD::CaloCluster::CaloSample::MINIFCAL0));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_MINIFCAL1 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_MINIFCAL1;
- thisPFO->setAttribute( myAttribute_layerEnergy_MINIFCAL1, cluster->eSample(xAOD::CaloCluster::CaloSample::MINIFCAL1));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_MINIFCAL2 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_MINIFCAL2;
- thisPFO->setAttribute( myAttribute_layerEnergy_MINIFCAL2, cluster->eSample(xAOD::CaloCluster::CaloSample::MINIFCAL2));
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_MINIFCAL3 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_MINIFCAL3;
- thisPFO->setAttribute( myAttribute_layerEnergy_MINIFCAL3, cluster->eSample(xAOD::CaloCluster::CaloSample::MINIFCAL3));
-
+ //
+ //block of code to calculate and set the layer energies
+ auto setLayerEnergy = [&cluster, &thisPFO](const Cluster::CaloSample &layer, const Attributes & a){
+ const auto layerEnergy{cluster->eSample(layer)};
+ thisPFO->setAttribute(a, layerEnergy);
+ return layerEnergy;
+ };
+ enum LayerEnergyIndices{preSamplerB, EMB1, EMB2, EMB3, preSamplerE, EME1, EME2, EME3, HEC0, HEC1, HEC2, HEC3,FCAL0, NumberOfLayerEnergies};
+ std::array<float, NumberOfLayerEnergies> layerEnergies{};
+ const std::array< std::pair<Cluster::CaloSample, Attributes>, NumberOfLayerEnergies> sampleAttributePairs{{
+ {Cluster::CaloSample::PreSamplerB, Attributes::eflowRec_LAYERENERGY_PreSamplerB},
+ {Cluster::CaloSample::EMB1, Attributes::eflowRec_LAYERENERGY_EMB1},
+ {Cluster::CaloSample::EMB2, Attributes::eflowRec_LAYERENERGY_EMB2},
+ {Cluster::CaloSample::EMB3, Attributes::eflowRec_LAYERENERGY_EMB3},
+ {Cluster::CaloSample::PreSamplerE, Attributes::eflowRec_LAYERENERGY_PreSamplerE},
+ {Cluster::CaloSample::EME1, Attributes::eflowRec_LAYERENERGY_EME1},
+ {Cluster::CaloSample::EME2, Attributes::eflowRec_LAYERENERGY_EME2},
+ {Cluster::CaloSample::EME3, Attributes::eflowRec_LAYERENERGY_EME3},
+ {Cluster::CaloSample::HEC0, Attributes::eflowRec_LAYERENERGY_HEC0},
+ {Cluster::CaloSample::HEC1, Attributes::eflowRec_LAYERENERGY_HEC1},
+ {Cluster::CaloSample::HEC2, Attributes::eflowRec_LAYERENERGY_HEC2},
+ {Cluster::CaloSample::HEC3, Attributes::eflowRec_LAYERENERGY_HEC3},
+ {Cluster::CaloSample::FCAL0, Attributes::eflowRec_LAYERENERGY_FCAL0}
+ }};
+ size_t layerIndex{0};
+ for (const auto & [sample, attribute]: sampleAttributePairs) {
+ layerEnergies[layerIndex++] = setLayerEnergy(sample, attribute);
+ }
+ //
+ //block of code purely to set attributes of the PFO
+ auto setPfoAttribute = [&thisPFO, &cluster](const Cluster::CaloSample &layer, const Attributes & a){
+ thisPFO->setAttribute( a, cluster->eSample(layer));
+ };
+ //
+ constexpr size_t numberOfSampleAttributePairs{15};
+ const std::array< std::pair<Cluster::CaloSample, Attributes>, numberOfSampleAttributePairs> sampleAttributePairsTileFcal{{
+ {Cluster::CaloSample::TileBar0, Attributes::eflowRec_LAYERENERGY_TileBar0},
+ {Cluster::CaloSample::TileBar1, Attributes::eflowRec_LAYERENERGY_TileBar1},
+ {Cluster::CaloSample::TileBar2, Attributes::eflowRec_LAYERENERGY_TileBar2},
+ {Cluster::CaloSample::TileGap1, Attributes::eflowRec_LAYERENERGY_TileGap1},
+ {Cluster::CaloSample::TileGap2, Attributes::eflowRec_LAYERENERGY_TileGap2},
+ {Cluster::CaloSample::TileGap3, Attributes::eflowRec_LAYERENERGY_TileGap3},
+ {Cluster::CaloSample::TileExt0, Attributes::eflowRec_LAYERENERGY_TileExt0},
+ {Cluster::CaloSample::TileExt1, Attributes::eflowRec_LAYERENERGY_TileExt1},
+ {Cluster::CaloSample::TileExt2, Attributes::eflowRec_LAYERENERGY_TileExt2},
+ {Cluster::CaloSample::FCAL1, Attributes::eflowRec_LAYERENERGY_FCAL1},
+ {Cluster::CaloSample::FCAL2, Attributes::eflowRec_LAYERENERGY_FCAL2},
+ {Cluster::CaloSample::MINIFCAL0, Attributes::eflowRec_LAYERENERGY_MINIFCAL0},
+ {Cluster::CaloSample::MINIFCAL1, Attributes::eflowRec_LAYERENERGY_MINIFCAL1},
+ {Cluster::CaloSample::MINIFCAL2, Attributes::eflowRec_LAYERENERGY_MINIFCAL2},
+ {Cluster::CaloSample::MINIFCAL3, Attributes::eflowRec_LAYERENERGY_MINIFCAL3}
+ }};
+ for (const auto & [sample, attribute]: sampleAttributePairsTileFcal){
+ setPfoAttribute(sample, attribute);
+ }
+ //
//now set the layer energies for EMB3 and Tile0 - these are needed if we want to run a GSC style jet calibration, which is binned in EMB3 and Tile0 layer energies
-
- float layerEnergy_EM3 = layerEnergy_EMB3 + layerEnergy_EME3;
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EM3 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EM3;
- thisPFO->setAttribute( myAttribute_layerEnergy_EM3, layerEnergy_EM3);
-
- float layerEnergy_TileBar0 = cluster->eSample(xAOD::CaloCluster::CaloSample::TileBar0);
- float layerEnergy_TileExt0 = cluster->eSample(xAOD::CaloCluster::CaloSample::TileExt0);
+ float layerEnergy_EM3 = layerEnergies[EMB3] + layerEnergies[EME3];
+ thisPFO->setAttribute( Attributes::eflowRec_LAYERENERGY_EM3, layerEnergy_EM3);
+ //
+ float layerEnergy_TileBar0 = cluster->eSample(Cluster::CaloSample::TileBar0);
+ float layerEnergy_TileExt0 = cluster->eSample(Cluster::CaloSample::TileExt0);
float layerEnergy_Tile0 = layerEnergy_TileBar0 + layerEnergy_TileExt0;
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_Tile0 = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_Tile0;
- thisPFO->setAttribute(myAttribute_layerEnergy_Tile0, layerEnergy_Tile0);
-
+ thisPFO->setAttribute(Attributes::eflowRec_LAYERENERGY_Tile0, layerEnergy_Tile0);
+ //
//now set properties that are required for jet cleaning
- float layerEnergy_HEC = layerEnergy_HEC0 + layerEnergy_HEC1 + layerEnergy_HEC2 + layerEnergy_HEC3;
-
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_HEC = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_HEC;
- thisPFO->setAttribute(myAttribute_layerEnergy_HEC, layerEnergy_HEC);
-
- float layerEnergy_EM = layerEnergy_preSamplerB + layerEnergy_preSamplerE + layerEnergy_EMB1 + layerEnergy_EMB2 + layerEnergy_EMB3 + layerEnergy_EME1 + layerEnergy_EME2 + layerEnergy_EME3 + layerEnergy_FCAL0;
- xAOD::PFODetails::PFOAttributes myAttribute_layerEnergy_EM = xAOD::PFODetails::PFOAttributes::eflowRec_LAYERENERGY_EM;
- thisPFO->setAttribute(myAttribute_layerEnergy_EM, layerEnergy_EM);
-
- float clusterTiming = cluster->time();
-
- xAOD::PFODetails::PFOAttributes myAttribute_TIMING = xAOD::PFODetails::PFOAttributes::eflowRec_TIMING;
- thisPFO->setAttribute(myAttribute_TIMING, clusterTiming);
+ const float layerEnergy_HEC = layerEnergies[HEC0] + layerEnergies[HEC1] + layerEnergies[HEC2] + layerEnergies[HEC3];
+ thisPFO->setAttribute(Attributes::eflowRec_LAYERENERGY_HEC, layerEnergy_HEC);
+ //
+ const float layerEnergy_EM = layerEnergies[preSamplerB] + layerEnergies[preSamplerE] + layerEnergies[EMB1] + layerEnergies[EMB2] + layerEnergies[EMB3] + layerEnergies[EME1] + layerEnergies[EME2] + layerEnergies[EME3] + layerEnergies[FCAL0];
+ thisPFO->setAttribute(Attributes::eflowRec_LAYERENERGY_EM, layerEnergy_EM);
+ //
+ const float clusterTiming = cluster->time();
+ thisPFO->setAttribute(Attributes::eflowRec_TIMING, clusterTiming);
}
}
return StatusCode::SUCCESS;
@@ -314,7 +253,7 @@ void PFONeutralCreatorAlgorithm::addMoment(const xAOD::CaloCluster::MomentType&
double moment = 0.0;
bool isRetrieved = theCluster.retrieveMoment(momentType, moment);
- if (true == isRetrieved) {
+ if (isRetrieved) {
xAOD::PFODetails::PFOAttributes myAttribute = pfoAttribute;
float float_moment = static_cast<float>(moment);
thePFO.setAttribute(myAttribute, float_moment);
diff --git a/Reconstruction/eflowRec/src/PFTauFlowElementAssoc.cxx b/Reconstruction/eflowRec/src/PFTauFlowElementAssoc.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..cdd60bc234dee10b815fe4e95485e2d024c0fff8
--- /dev/null
+++ b/Reconstruction/eflowRec/src/PFTauFlowElementAssoc.cxx
@@ -0,0 +1,140 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "eflowRec/PFTauFlowElementAssoc.h"
+#include "xAODTau/TauJetContainer.h"
+#include "xAODTau/TauTrack.h"
+#include "xAODPFlow/FlowElementContainer.h"
+#include "xAODPFlow/FlowElement.h"
+
+typedef ElementLink<xAOD::TauJetContainer> TauJetLink_t;
+typedef ElementLink<xAOD::FlowElementContainer> FELink_t;
+
+PFTauFlowElementAssoc::PFTauFlowElementAssoc(const std::string& name,
+ ISvcLocator* pSvcLocator): AthReentrantAlgorithm(name, pSvcLocator)
+{}
+
+PFTauFlowElementAssoc::~PFTauFlowElementAssoc() {}
+
+StatusCode PFTauFlowElementAssoc::initialize() {
+
+ ATH_MSG_DEBUG("Initializing" << name() << "...");
+
+ ATH_CHECK(m_tauNeutralFEWriteDecorKey.initialize());
+ ATH_CHECK(m_tauChargedFEWriteDecorKey.initialize());
+ ATH_CHECK(m_neutralFETauWriteDecorKey.initialize());
+ ATH_CHECK(m_chargedFETauWriteDecorKey.initialize());
+
+ ATH_CHECK(m_tauJetReadHandleKey.initialize());
+ ATH_CHECK(m_neutralFEReadHandleKey.initialize());
+ ATH_CHECK(m_chargedFEReadHandleKey.initialize());
+
+ ATH_MSG_DEBUG("Initialization completed successfully");
+
+ return StatusCode::SUCCESS;
+}
+
+/**
+ This algorithm:
+ 1) Accesses the relevant FlowElement and TauJet containers
+ 2) Loops over the neutral FEs and matches them to the corresponding TauJet clusters, creating the ElementLinks
+ and adding them to the JetETMissNeutralFlowElements container as a decoration
+ 3) Loops over the charged FEs and matches them to the corresponding TauJet tracks, creating the ElementLinks
+ and adding them to the JetETMissChargedFlowElements container as a decoration
+ 4) Adds the decoration to the TauJet container containing a vector of ElementLinks to corresponding FEs
+**/
+
+StatusCode PFTauFlowElementAssoc::execute(const EventContext &ctx) const {
+
+ // Write decoration handles for linking the TauJet container with the FlowElement container and vice versa
+ SG::WriteDecorHandle< xAOD::TauJetContainer, std::vector<FELink_t> > tauNeutralFEWriteDecorHandle (m_tauNeutralFEWriteDecorKey,ctx);
+ SG::WriteDecorHandle< xAOD::FlowElementContainer, std::vector<TauJetLink_t> > neutralFETauWriteDecorHandle (m_neutralFETauWriteDecorKey,ctx);
+ SG::WriteDecorHandle< xAOD::TauJetContainer, std::vector<FELink_t> > tauChargedFEWriteDecorHandle (m_tauChargedFEWriteDecorKey,ctx);
+ SG::WriteDecorHandle< xAOD::FlowElementContainer, std::vector<TauJetLink_t> > chargedFETauWriteDecorHandle (m_chargedFETauWriteDecorKey,ctx);
+ // Read handles for the TauJet container and the FlowElement container
+ SG::ReadHandle<xAOD::TauJetContainer> tauJetReadHandle (m_tauJetReadHandleKey,ctx);
+ SG::ReadHandle<xAOD::FlowElementContainer> neutralFEReadHandle (m_neutralFEReadHandleKey,ctx);
+ SG::ReadHandle<xAOD::FlowElementContainer> chargedFEReadHandle (m_chargedFEReadHandleKey,ctx);
+
+ // Initialize flow element link containers
+ std::vector<std::vector<FELink_t>> tauNeutralFEVec(tauJetReadHandle->size());
+ std::vector<std::vector<FELink_t>> tauChargedFEVec(tauJetReadHandle->size());
+
+ ////////////////////////////////////////////
+ // Loop over the neutral flow elements
+ ////////////////////////////////////////////
+ for (const xAOD::FlowElement* FE : *neutralFETauWriteDecorHandle) {
+ // Get the index of the flow element cluster
+ size_t FEClusterIndex = FE->otherObjects().at(0)->index();
+
+ std::vector<TauJetLink_t> FETauJetLinks;
+
+ // Loop over the taus
+ for (const xAOD::TauJet* tau : *tauNeutralFEWriteDecorHandle) {
+ // Get the clusters associated to the tau
+ std::vector< ElementLink<xAOD::IParticleContainer> > tauClusters = tau->clusterLinks();
+ for (auto clusLink : tauClusters) {
+ const xAOD::IParticle* clus = *clusLink;
+ // Get the index of the cluster associated to the tau
+ size_t tauClusterIndex = clus->index();
+
+ // Link the tau and the neutral FE if the cluster indices match
+ if (tauClusterIndex == FEClusterIndex) {
+ FETauJetLinks.push_back( TauJetLink_t(*tauJetReadHandle,tau->index()) );
+ tauNeutralFEVec.at(tau->index()).push_back( FELink_t(*neutralFEReadHandle, FE->index()) );
+ }
+
+ } // end tau cluster loop
+ } // end tau loop
+
+ // Add vector of elements links to the tau jets as a decoration to the FE container
+ neutralFETauWriteDecorHandle (*FE) = FETauJetLinks;
+
+ } // end neutral FE loop
+
+ ////////////////////////////////////////////
+ // Loop over the charged flow elements
+ ////////////////////////////////////////////
+ for (const xAOD::FlowElement* FE : *chargedFETauWriteDecorHandle) {
+ // Get the index of the flow element track
+ size_t FETrackIndex = FE->chargedObjects().at(0)->index();
+
+ std::vector<TauJetLink_t> FETauJetLinks;
+
+ // Loop over the taus
+ for (const xAOD::TauJet* tau : *tauChargedFEWriteDecorHandle) {
+ // Get tau tracks associated to the tau
+ std::vector<const xAOD::TauTrack*> tauTracks = tau->tracks(xAOD::TauJetParameters::coreTrack);
+ for (auto tauTrack : tauTracks) {
+ // Get track associated to the tau track to use for matching
+ const xAOD::TrackParticle* tauIDTrack = tauTrack->track();
+ // Get the index of the track associated to the tau
+ size_t tauIDTrackIndex = tauIDTrack->index();
+
+ // Link the tau and the charged FE if the track indices match
+ if (tauIDTrackIndex == FETrackIndex) {
+ FETauJetLinks.push_back( TauJetLink_t(*tauJetReadHandle,tau->index()) );
+ tauChargedFEVec.at(tau->index()).push_back( FELink_t(*chargedFEReadHandle, FE->index()) );
+ }
+ } // end tau track loop
+ } // end tau loop
+
+ // Add vector of elements links to the tau jets as a decoration to the FE container
+ chargedFETauWriteDecorHandle (*FE) = FETauJetLinks;
+
+ } // end charged FE loop
+
+ ////////////////////////////////////////////
+ // Write decorations to TauJet container
+ ////////////////////////////////////////////
+ // Add vectors of Flow Element (FE) Links as decorations to the TauJet container
+ for (const xAOD::TauJet* tau : *tauNeutralFEWriteDecorHandle) {
+ tauNeutralFEWriteDecorHandle (*tau) = tauNeutralFEVec.at(tau->index());
+ tauChargedFEWriteDecorHandle (*tau) = tauChargedFEVec.at(tau->index());
+ }
+
+ ATH_MSG_DEBUG("Execute completed successfully");
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx b/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
index b509db7d488f838e62e2817f6ebd89152d4df120..a399ea6da1f2b4bb42dac6ad40ea474bc1a31415 100644
--- a/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
+++ b/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
@@ -1,3 +1,7 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
#include "eflowRec/eflowTrackCaloExtensionTool.h"
#include "eflowRec/eflowTrackCaloDummyExtensionTool.h"
#include "eflowRec/PFTrackClusterMatchingTool.h"
@@ -22,6 +26,7 @@
#include "eflowRec/PFEGammaPFOAssoc.h"
#include "eflowRec/PFMuonFlowElementAssoc.h"
#include "eflowRec/PFEGamFlowElementAssoc.h"
+#include "eflowRec/PFTauFlowElementAssoc.h"
DECLARE_COMPONENT( eflowOverlapRemoval )
DECLARE_COMPONENT( PFLeptonSelector )
@@ -47,4 +52,4 @@ DECLARE_COMPONENT( eflowCellEOverPTool_mc12_HLLHC)
DECLARE_COMPONENT( eflowCellEOverPTool_mc12_LC)
DECLARE_COMPONENT( PFMuonFlowElementAssoc )
DECLARE_COMPONENT( PFEGamFlowElementAssoc )
-
+DECLARE_COMPONENT( PFTauFlowElementAssoc )
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
index ea5cdced8e0dfed0cc5fa1a51ff31d4ce0ccd2f3..54fd5b468b6b006069d83dcce95257268552b74f 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilder.py
@@ -86,6 +86,7 @@ class egammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder):
HoleSearch=None,
PixelToTPIDTool=GSFBuildPixelToTPIDTool,
TestBLayerTool=GSFBuildTestBLayerTool,
+ ClusterSplitProbabilityName=TrackingCommon.combinedClusterSplitProbName(),
DoSharedHits=False,
private=True)
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx
index fedb6bc04bac98e87824543b9e7d805598c396f1..bd9cc982d7d646d2c68ce38164b59f379c23b0b0 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx
@@ -32,7 +32,7 @@
EMBremCollectionBuilder::EMBremCollectionBuilder(const std::string& name,
ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator)
+ : AthReentrantAlgorithm(name, pSvcLocator)
{
}
@@ -66,7 +66,7 @@ StatusCode EMBremCollectionBuilder::EMBremCollectionBuilder::finalize(){
}
StatusCode
-EMBremCollectionBuilder::execute_r(const EventContext& ctx) const
+EMBremCollectionBuilder::execute(const EventContext& ctx) const
{
/*
* Read in the input
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h
index 8dbb3cf1a1f1559c3958094f074ee4fc05ca62a5..8c2bd549be06c64c72ec718ac827ecd85eff8f17 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.h
@@ -16,7 +16,7 @@
#include "TrkToolInterfaces/ITrackSlimmingTool.h"
#include "TrkToolInterfaces/ITrackSummaryTool.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/EventContext.h"
#include "StoreGate/ReadHandleKey.h"
@@ -30,7 +30,7 @@
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include <memory>
-class EMBremCollectionBuilder : public AthAlgorithm
+class EMBremCollectionBuilder : public AthReentrantAlgorithm
{
public:
@@ -39,13 +39,7 @@ public:
virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
- virtual StatusCode execute() override final
- {
- return execute_r(Algorithm::getContext());
- }
- // This will become the normal execute when
- // inheriting from AthReentrantAlgorithm
- StatusCode execute_r(const EventContext& ctx) const;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
struct TrackWithIndex
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx
index ac8170d3284fbc9dc6343eeeaa4b5c944634fd3b..c7afddd8e11b450569c5d03b86720549e34cc5bb 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx
@@ -25,7 +25,7 @@ PURPOSE: Performs Calo Extension for all GSF tracks
EMGSFCaloExtensionBuilder::EMGSFCaloExtensionBuilder(const std::string& name,
ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator)
+ : AthReentrantAlgorithm(name, pSvcLocator)
{}
StatusCode
@@ -52,7 +52,7 @@ EMGSFCaloExtensionBuilder::EMGSFCaloExtensionBuilder::finalize()
}
StatusCode
-EMGSFCaloExtensionBuilder::execute_r(const EventContext& ctx) const
+EMGSFCaloExtensionBuilder::execute(const EventContext& ctx) const
{
SG::ReadHandle<xAOD::TrackParticleContainer> tracks(m_GSFTrkPartContainerKey, ctx);
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.h b/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.h
index 501353144e7928623f361bd7cb2ecf6096cca109..a9b957110194f965cdaddba26bc0edb9baf262e0 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.h
@@ -9,7 +9,7 @@
Algorithm which creates calo extension for all GSF
Track Particles
*/
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/ToolHandle.h"
#include "RecoToolInterfaces/IParticleCaloExtensionTool.h"
@@ -18,7 +18,7 @@
#include "TrkCaloExtension/CaloExtensionCollection.h"
#include "xAODTracking/TrackParticleContainerFwd.h"
-class EMGSFCaloExtensionBuilder : public AthAlgorithm
+class EMGSFCaloExtensionBuilder : public AthReentrantAlgorithm
{
public:
/** @brief Default constructor*/
@@ -26,12 +26,7 @@ public:
virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
- virtual StatusCode execute() override final {
- return execute_r(Algorithm::getContext());
- }
- // This will become the normal execute when
- // inheriting from AthReentrantAlgorithm
- StatusCode execute_r(const EventContext& ctx) const;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
private:
/** @brief the Calo Extension tool*/
@@ -41,11 +36,12 @@ private:
"Trk::ParticleCaloExtensionTool/EMLastCaloExtensionTool"
};
- ToolHandle<Trk::IParticleCaloExtensionTool> m_perigeeParticleCaloExtensionTool{
- this,
- "PerigeeCaloExtensionTool",
- "Trk::ParticleCaloExtensionTool/EMParticleCaloExtensionTool"
- };
+ ToolHandle<Trk::IParticleCaloExtensionTool>
+ m_perigeeParticleCaloExtensionTool{
+ this,
+ "PerigeeCaloExtensionTool",
+ "Trk::ParticleCaloExtensionTool/EMParticleCaloExtensionTool"
+ };
// Cache collections for GSF Track Particle extrapolation Perigee
SG::WriteHandleKey<CaloExtensionCollection> m_GSFPerigeeCacheKey{
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
index 1ec141ad9be4dc1401fb6ff8bca50821105130ae..c9b19ab18a16d09dbe1462356d439f5d62bab007 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
@@ -21,32 +21,23 @@
egammaRecBuilder::egammaRecBuilder(const std::string& name,
ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator)
+ : AthReentrantAlgorithm(name, pSvcLocator)
{}
-// =================================================================
StatusCode
egammaRecBuilder::initialize()
{
- // initialize method
-
- ATH_MSG_DEBUG("Initializing egammaRecBuilder");
-
// First the data handle keys
ATH_CHECK(m_inputTopoClusterContainerKey.initialize());
ATH_CHECK(m_egammaRecContainerKey.initialize());
-
//////////////////////////////////////////////////
// retrieve track match builder
CHECK(RetrieveEMTrackMatchBuilder());
// retrieve conversion builder
CHECK(RetrieveEMConversionBuilder());
-
- ATH_MSG_DEBUG("Initialization completed successfully");
return StatusCode::SUCCESS;
}
-// ====================================================================
StatusCode
egammaRecBuilder::RetrieveEMTrackMatchBuilder()
{
@@ -66,7 +57,6 @@ egammaRecBuilder::RetrieveEMTrackMatchBuilder()
ATH_MSG_ERROR("Unable to retrieve " << m_trackMatchBuilder);
return StatusCode::FAILURE;
}
- ATH_MSG_DEBUG("Retrieved Tool " << m_trackMatchBuilder);
return StatusCode::SUCCESS;
}
@@ -74,9 +64,7 @@ egammaRecBuilder::RetrieveEMTrackMatchBuilder()
StatusCode
egammaRecBuilder::RetrieveEMConversionBuilder()
{
- //
// retrieve EMConversionBuilder tool
- //
if (!m_doConversions) {
m_conversionBuilder.disable();
return StatusCode::SUCCESS;
@@ -89,20 +77,11 @@ egammaRecBuilder::RetrieveEMConversionBuilder()
ATH_MSG_ERROR("Unable to retrieve " << m_conversionBuilder);
return StatusCode::FAILURE;
}
- ATH_MSG_DEBUG("Retrieved Tool " << m_conversionBuilder);
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-egammaRecBuilder::finalize()
-{
- // finalize method
return StatusCode::SUCCESS;
}
StatusCode
-egammaRecBuilder::execute_r(const EventContext& ctx) const
+egammaRecBuilder::execute(const EventContext& ctx) const
{
// athena execute method
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.h b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.h
index 9a45787f9563d5cd74628f2be31420cb88c6076e..a26e4f897a469d8cf7f883aae148a391c2f9948a 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.h
@@ -5,7 +5,7 @@
#ifndef EGAMMAALGS_EGAMMARECBUILDER_H
#define EGAMMAALGS_EGAMMARECBUILDER_H
/**
- @class egammaRecBuilder
+ @class egammaRecBuilder
This is algorithm produces the initial egammaRecs as a step of the
egamma supercluster algorithms.
@@ -13,81 +13,85 @@
*/
// INCLUDE HEADER FILES:
-#include <vector>
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ToolHandle.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ToolHandle.h"
+#include <vector>
-#include "xAODCaloEvent/CaloClusterContainer.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
#include "egammaRecEvent/egammaRecContainer.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
class IEMTrackMatchBuilder;
class IEMConversionBuilder;
-class egammaRecBuilder : public AthAlgorithm
+class egammaRecBuilder : public AthReentrantAlgorithm
{
- public:
-
+public:
/** @brief Default constructor*/
egammaRecBuilder(const std::string& name, ISvcLocator* pSvcLocator);
/** @brief initialize method*/
- StatusCode initialize() override final;
- /** @brief finalize method*/
- StatusCode finalize() override final;
+ virtual StatusCode initialize() override final;
/** @brief execute method*/
- virtual StatusCode execute() override final
- {
- return execute_r(Algorithm::getContext());
- }
- // This will become the normal execute when
- // inheriting from AthReentrantAlgorithm
- StatusCode execute_r(const EventContext& ctx) const;
-
-
- private:
+ virtual StatusCode execute(const EventContext& ctx) const override final;
+private:
/** @brief retrieve EMTrackMatchBuilder **/
StatusCode RetrieveEMTrackMatchBuilder();
/** @brief retrieve EMConversionBuilder **/
StatusCode RetrieveEMConversionBuilder();
/** @brief Key for the topo cluster input collection */
- SG::ReadHandleKey<xAOD::CaloClusterContainer> m_inputTopoClusterContainerKey {this,
- "InputTopoClusterContainerName", "egammaTopoCluster",
- "Name of input cluster container"};
+ SG::ReadHandleKey<xAOD::CaloClusterContainer> m_inputTopoClusterContainerKey{
+ this,
+ "InputTopoClusterContainerName",
+ "egammaTopoCluster",
+ "Name of input cluster container"
+ };
/** @brief Key for egammaRec container */
- SG::WriteHandleKey<EgammaRecContainer> m_egammaRecContainerKey {this,
- "egammaRecContainer", "egammaRecCollection",
- "Output container for egammaRec objects"};
+ SG::WriteHandleKey<EgammaRecContainer> m_egammaRecContainerKey{
+ this,
+ "egammaRecContainer",
+ "egammaRecCollection",
+ "Output container for egammaRec objects"
+ };
//
// The tools
//
/** @brief Tool to perform track matching*/
/** @brief Tool to perform track matching*/
- ToolHandle<IEMTrackMatchBuilder> m_trackMatchBuilder {this,
- "TrackMatchBuilderTool", "EMTrackMatchBuilder",
- "Tool that matches tracks to egammaRecs"};
+ ToolHandle<IEMTrackMatchBuilder> m_trackMatchBuilder{
+ this,
+ "TrackMatchBuilderTool",
+ "EMTrackMatchBuilder",
+ "Tool that matches tracks to egammaRecs"
+ };
/** @brief Tool to perfrom conversion vertex matching*/
- ToolHandle<IEMConversionBuilder> m_conversionBuilder {this,
- "ConversionBuilderTool", "EMConversionBuilder",
- "Tool that matches conversion vertices to egammaRecs"};
+ ToolHandle<IEMConversionBuilder> m_conversionBuilder{
+ this,
+ "ConversionBuilderTool",
+ "EMConversionBuilder",
+ "Tool that matches conversion vertices to egammaRecs"
+ };
//
// All booleans
//
/** @brief private member flag to do the track matching */
- Gaudi::Property<bool> m_doTrackMatching {this, "doTrackMatching", true,
- "Boolean to do track matching"};
+ Gaudi::Property<bool> m_doTrackMatching{ this,
+ "doTrackMatching",
+ true,
+ "Boolean to do track matching" };
/** @brief private member flag to do the conversion matching */
- Gaudi::Property<bool> m_doConversions {this, "doConversions", true,
- "Boolean to do conversion matching"};
-
+ Gaudi::Property<bool> m_doConversions{ this,
+ "doConversions",
+ true,
+ "Boolean to do conversion matching" };
};
#endif
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
index 91446362a14bc827aa66c94b10467f006278cdcf..c4478c1ea393c7ab4c8b785f039ef21036cc211c 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaSuperClusterBuilder.cxx
@@ -183,11 +183,11 @@ egammaSuperClusterBuilder::matchesInWindow(const xAOD::CaloCluster* ref,
float dEta(fabs(ref->eta() - clus->eta()));
float dPhi(fabs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
return (dEta < m_searchWindowEtaBarrel && dPhi < m_searchWindowPhiBarrel);
- }
+ }
float dEta(fabs(ref->eta() - clus->eta()));
float dPhi(fabs(P4Helpers::deltaPhi(ref->phi(), clus->phi())));
return (dEta < m_searchWindowEtaEndcap && dPhi < m_searchWindowPhiEndcap);
-
+
}
std::unique_ptr<xAOD::CaloCluster>
diff --git a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h
index 6458fd3d190617f25cec565e5a4e6ab281fc83eb..db81295d23d0e4a114b0da05cfb0869776995cd7 100644
--- a/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/electronSuperClusterBuilder.h
@@ -60,7 +60,7 @@ private:
Gaudi::Property<std::size_t> m_numberOfPixelHits{
this,
"NumberOfReqPixelHits",
- 1,
+ 0,
"Number of required pixel hits for electrons"
};
diff --git a/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h b/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h
index 7ce654111324675bd2aab160cacababf4c4624f4..5f8b1338290510388fb5ed3d3a07f6689c39adb3 100644
--- a/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h
+++ b/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h
@@ -26,7 +26,7 @@
#include <memory>
#include "AsgTools/AsgTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "xAODEgamma/Egamma.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h b/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
index 900f75b92f18b277dba65537a83411f452f1ac4f..754e4858141ce3885a910a4bf1e8297532d63388 100644
--- a/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
+++ b/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
@@ -14,7 +14,7 @@
#include "egammaMVALayerDepth.h"
// for the ConversionHelper (deprecated?)
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
#include "TLorentzVector.h"
diff --git a/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py b/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py
index 18ec6fe20db9f2f4d002c9bdadfaf359020cdc94..d65f219d642c4df446fed7e3cebe140e50e09270 100755
--- a/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py
+++ b/Reconstruction/iPat/iPatRecExample/share/iPatRec_jobOptions.py
@@ -92,10 +92,10 @@ if DetFlags.detdescr.ID_on() and (DetFlags.haveRIO.pixel_on() or DetFlags.haveRI
# include the RegionSelector service
if DetFlags.haveRIO.TRT_on():
from AthenaCommon.AppMgr import ServiceMgr
- from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
- iPatRegSelSvc = RegSelSvcDefault()
- iPatRegSelSvc.enableTRT = True
- ServiceMgr += iPatRegSelSvc
+ # from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
+ # iPatRegSelSvc = RegSelSvcDefault()
+ # iPatRegSelSvc.enableTRT = True
+ # ServiceMgr += iPatRegSelSvc
# -------------------------------------------------------------
# Algorithm Private Options: iPatRec
diff --git a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
index 07e39297516a446d35092f0aff4b8a2fc26f1867..52eb4bf8acc1a8d3e646812fdd909acc9fd7179b 100644
--- a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
+++ b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
@@ -176,8 +176,11 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
for (const auto& tau : *shallowTaus) {
- TLorentzVector calibratedVec = tau->p4(xAOD::TauJetParameters::FinalCalib);
- tau->setP4(calibratedVec.Pt(), calibratedVec.Eta(), calibratedVec.Phi(), calibratedVec.M());
+ // avoid unphysical tau calibration
+ if (abs(tau->etaFinalCalib()) < 5) {
+ TLorentzVector calibratedVec = tau->p4(xAOD::TauJetParameters::FinalCalib);
+ tau->setP4(calibratedVec.Pt(), calibratedVec.Eta(), calibratedVec.Phi(), calibratedVec.M());
+ }
tauEta = tau->eta();
tauPhi = tau->phi();
@@ -270,9 +273,9 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
if (
(m_kinGroupName != "tauMonKinGroupTauTrig" && m_kinGroupName != "tauMonKinGroupEleTrig" && m_kinGroupName != "tauMonKinGroupJetTrig") ||
- (m_kinGroupName == "tauMonKinGroupTauTrig" && trigDecTool !=0 && trigDecTool->isPassed("HLT_tau[2-9][0-9]_.*")) ||
- (m_kinGroupName == "tauMonKinGroupEleTrig" && trigDecTool !=0 && trigDecTool->isPassed("HLT_e[2-9][0-9]_.*")) ||
- (m_kinGroupName == "tauMonKinGroupJetTrig" && trigDecTool !=0 && trigDecTool->isPassed("HLT_j[2-9][0-9]_.*"))
+ (m_kinGroupName == "tauMonKinGroupTauTrig" && !trigDecTool.empty() && trigDecTool->isPassed("HLT_tau[2-9][0-9]_.*")) ||
+ (m_kinGroupName == "tauMonKinGroupEleTrig" && !trigDecTool.empty() && trigDecTool->isPassed("HLT_e[2-9][0-9]_.*")) ||
+ (m_kinGroupName == "tauMonKinGroupJetTrig" && !trigDecTool.empty() && trigDecTool->isPassed("HLT_j[2-9][0-9]_.*"))
){
if(m_kinGroupName != "tauMonKinGroupGlobal" && tauEt > lowerEtThreshold && tauBDTLoose){
diff --git a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
index 91d668a8f2bad33c38ff9eeb895bfe67999ee3f9..080de883f7f8e4aa29fa7a48b4d2a22f8ceb40e1 100644
--- a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
+++ b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
@@ -79,7 +79,7 @@ def getTauAxis():
ClusterCone = 0.2,
VertexCorrection = True,
TauVertexCorrection = getTauVertexCorrection(),
- IncShowerSubtr = tauFlags.useShowerSubClusters() )
+ UseSubtractedCluster = tauFlags.useSubtractedCluster() )
cached_instances[_name] = TauAxisSetter
return TauAxisSetter
@@ -124,7 +124,7 @@ def getCellVariables(cellConeSize=0.2, prefix=''):
StripEthreshold = 0.2*GeV,
CellCone = cellConeSize,
VertexCorrection = True,
- IncShowerSubtr = tauFlags.useShowerSubClusters() )
+ UseSubtractedCluster = tauFlags.useSubtractedCluster() )
cached_instances[_name] = TauCellVariables
return TauCellVariables
@@ -291,7 +291,6 @@ def getTauVertexVariables():
from tauRecTools.tauRecToolsConf import TauVertexVariables
TauVertexVariables = TauVertexVariables( name = _name,
- TrackToVertexIPEstimator = getTauTrackToVertexIPEstimator(),
VertexFitter = getTauAdaptiveVertexFitter(),
SeedFinder = getTauCrossDistancesSeedFinder(),
)
@@ -311,7 +310,7 @@ def getTauSubstructure():
from tauRecTools.tauRecToolsConf import TauSubstructureVariables
TauSubstructureVariables = TauSubstructureVariables( name = _name,
TauVertexCorrection = getTauVertexCorrection(),
- IncShowerSubtr = tauFlags.useShowerSubClusters()
+ UseSubtractedCluster = tauFlags.useSubtractedCluster()
)
cached_instances[_name] = TauSubstructureVariables
@@ -330,7 +329,7 @@ def getElectronVetoVars():
VertexCorrection = True,
ParticleCaloExtensionTool = getParticleCaloExtensionTool(),
tauEVParticleCache = getParticleCache(),
- IncShowerSubtr = tauFlags.useShowerSubClusters() )
+ UseSubtractedCluster = tauFlags.useSubtractedCluster() )
cached_instances[_name] = TauElectronVetoVariables
return TauElectronVetoVariables
@@ -389,7 +388,7 @@ def getPi0ClusterCreator():
from tauRecTools.tauRecToolsConf import TauPi0ClusterCreator
TauPi0ClusterCreator = TauPi0ClusterCreator(name = _name,
TauVertexCorrection = getTauVertexCorrection(),
- IncShowerSubtr = tauFlags.useShowerSubClusters()
+ UseSubtractedCluster = tauFlags.useSubtractedCluster()
)
cached_instances[_name] = TauPi0ClusterCreator
@@ -665,6 +664,7 @@ def getTauTrackFinder(removeDuplicateTracks=True):
tauParticleCache = getParticleCache(),
removeDuplicateCoreTracks = removeDuplicateTracks,
Key_trackPartInputContainer = _DefaultTrackContainer,
+ TrackToVertexIPEstimator = getTauTrackToVertexIPEstimator(),
#maxDeltaZ0wrtLeadTrk = 2, #in mm
#removeTracksOutsideZ0wrtLeadTrk = True
)
@@ -680,7 +680,7 @@ def getMvaTESVariableDecorator():
MvaTESVariableDecorator = MvaTESVariableDecorator(name = _name,
Key_vertexInputContainer=_DefaultVertexContainer,
TauVertexCorrection = getTauVertexCorrection(),
- IncShowerSubtr = tauFlags.useShowerSubClusters() )
+ UseSubtractedCluster = tauFlags.useSubtractedCluster() )
cached_instances[_name] = MvaTESVariableDecorator
return MvaTESVariableDecorator
@@ -894,7 +894,7 @@ def getTauJetRNNEvaluator(_n, NetworkFile0P="", NetworkFile1P="", NetworkFile3P=
OutputLayer=OutputLayer,
OutputNode=OutputNode,
TauVertexCorrection = getTauVertexCorrection(),
- IncShowerSubtr = tauFlags.useShowerSubClusters() )
+ UseSubtractedCluster = tauFlags.useSubtractedCluster() )
cached_instances[_name] = myTauJetRNNEvaluator
return myTauJetRNNEvaluator
@@ -917,7 +917,7 @@ def getTauIDVarCalculator():
from tauRecTools.tauRecToolsConf import TauIDVarCalculator
myTauIDVarCalculator = TauIDVarCalculator(name=_name,
- IncShowerSubtr = tauFlags.useShowerSubClusters(),
+ UseSubtractedCluster = tauFlags.useSubtractedCluster(),
TauVertexCorrection = getTauVertexCorrection())
cached_instances[_name] = myTauIDVarCalculator
return myTauIDVarCalculator
@@ -944,7 +944,7 @@ def getTauEleRNNEvaluator(_n,
OutputLayer=OutputLayer,
OutputNode=OutputNode,
TauVertexCorrection = getTauVertexCorrection(),
- IncShowerSubtr = tauFlags.useShowerSubClusters())
+ UseSubtractedCluster = tauFlags.useSubtractedCluster())
cached_instances[_name] = tool
return tool
diff --git a/Reconstruction/tauRec/python/TauRecBuilder.py b/Reconstruction/tauRec/python/TauRecBuilder.py
index d7ae84c0b8b9fbd1022f6fc8e4973351aa4fcbec..cdab5f3e925a016e0ad897c3a02412181076a8f6 100644
--- a/Reconstruction/tauRec/python/TauRecBuilder.py
+++ b/Reconstruction/tauRec/python/TauRecBuilder.py
@@ -47,16 +47,12 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
'CaloCellContainer' : 'TauCommonPi0Cells',
}
- # drop TauCommonPi0Cells container from nominal xAODs, too heavy
- _outputAOD = _output.copy()
- _outputAOD.pop('CaloCellContainer')
-
def __init__(self, name = "TauCoreBuilder",doPi0Clus=False, doTJVA=False):
self.name = name
self.doPi0Clus = doPi0Clus
self.do_TJVA = doTJVA
- TauRecConfigured.__init__(self, name)
+ TauRecConfigured.__init__(self, name, doPi0Clus)
@@ -69,8 +65,8 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
from RecExConfig.ObjKeyStore import objKeyStore
objKeyStore.addManyTypesStreamESD(self._output)
- objKeyStore.addManyTypesStreamAOD(self._outputAOD)
- objKeyStore.addManyTypesTransient(self._output)
+ objKeyStore.addManyTypesStreamAOD(self._output)
+ objKeyStore.addManyTypesTransient(self._output)
import tauRec.TauAlgorithmsHolder as taualgs
from tauRec.tauRecFlags import tauFlags
@@ -99,9 +95,11 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
tools.append(taualgs.getTauTrackRNNClassifier())
if jobproperties.Beam.beamType()!="cosmics":
tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=True, correctAxis=False, postfix='_onlyEnergy'))
+
tools.append(taualgs.getCellVariables())
tools.append(taualgs.getElectronVetoVars())
tools.append(taualgs.getTauShotFinder())
+
if self.doPi0Clus:
tools.append(taualgs.getPi0ClusterFinder())
@@ -127,181 +125,4 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
def outputType(self):
return self._outputType
-
-# No longer used
-################################################################################
-## @class TauRecPi0EflowProcessor
-# Calculate eflow information and run the Pi0 finder algorithms
-################################################################################
-class TauRecPi0EflowProcessor ( TauRecConfigured ) :
- """Calculate eflow information and run the Pi0 finder algorithms.
- This needs to be done in a separate step, because first special cluster and cell container have to be build.
- """
-
- def __init__(self, name = "TauProcessorPi0EflowTools",doPi0Clus=False):
- self.name = name
- self.doPi0Clus = doPi0Clus
- TauRecConfigured.__init__(self, name)
-
- def configure(self):
- mlog = logging.getLogger ('TauRecPi0EflowProcessor::configure:')
- mlog.info('entering')
-
-
- import tauRec.TauAlgorithmsHolder as taualgs
-
- ########################################################################
- # Tau Modifier Algos
- ########################################################################
- try:
- from tauRecTools.tauRecToolsConf import TauProcessorTool
- self._TauProcessorToolHandle = TauProcessorTool(
- name = self.name,
- TauContainer = _outputKey,
- TauAuxContainer = _outputAuxKey,
- )
- except Exception:
- mlog.error("could not get handle to TauProcessor")
- traceback.print_exc()
- return False
-
- tools = []
- try:
- #tools.append(taualgs.getTauEflowTrackMatchCells())
- #tools.append(taualgs.getTauEflowAddCaloInfo())
- #tools.append(taualgs.getTauEflowVariables())
-
- if self.doPi0Clus: tools.append(taualgs.getPi0ClusterCreator())
-
- TauRecConfigured.AddToolsToToolSvc(self, tools)
- self.TauProcessorToolHandle().Tools = tools
-
- except Exception:
- mlog.error("could not append tools to TauProcessor")
- traceback.print_exc()
- return False
-
- TauRecConfigured.WrapTauRecToolExecHandle(self, self.TauProcessorToolHandle())
-
- return True
-
- # Helpers
- def TauProcessorToolHandle(self):
- return self._TauProcessorToolHandle
-
-# No longer used
-################################################################################
-## @class TauRecVariablesProcessor
-# Calculate remaining Tau variables and properties
-################################################################################
-class TauRecVariablesProcessor ( TauRecConfigured ) :
- """Calculate remaining Tau variables and properties.
- Use informations available also in AODs, so no cell level is needed.
- """
-
- def __init__(self, name = "TauRecVariablesProcessor", inAODmode=False, doPi0Clus=False):
- self.name = name
- self.doPi0Clus = doPi0Clus
- self.AODmode = inAODmode
- TauRecConfigured.__init__(self, name)
-
-
- def configure(self):
- mlog = logging.getLogger ('TauRecVariablesProcessor::configure:')
- mlog.info('entering')
-
-
- import tauRec.TauAlgorithmsHolder as taualgs
-
- ########################################################################
- # Tau Modifier Algos
- ########################################################################
- try:
- from tauRecTools.tauRecToolsConf import TauProcessorTool
- self._TauProcessorToolHandle = TauProcessorTool(
- name = self.name,
- TauContainer = _outputKey,
- TauAuxContainer = _outputAuxKey,
- runOnAOD = self.AODmode)
-
- except Exception:
- mlog.error("could not get handle to TauProcessorTool")
- traceback.print_exc()
- return False
-
- tools = []
- try:
- #tools.append(taualgs.getEnergyCalibrationEM())
- # run vertex finder only in case vertexing is available. This check can also be done in TauAlgorithmsHolder instead doing it here.
- from InDetRecExample.InDetJobProperties import InDetFlags
- if InDetFlags.doVertexFinding():
- tools.append(taualgs.getTauVertexVariables())
- tools.append(taualgs.getTauCommonCalcVars())
- tools.append(taualgs.getTauSubstructure())
- if self.doPi0Clus:
- tools.append(taualgs.getPi0ClusterScaler())
- tools.append(taualgs.getPi0ScoreCalculator())
- # SWITCHED OFF SELECTOR< SINCE NO CHARGED PFOS AVAILABLE ATM
- tools.append(taualgs.getPi0Selector())
- tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=False, correctAxis=True, postfix='_onlyAxis'))
- #
- ## for testing purpose
- #tools.append(taualgs.getTauTestDump())
- #
-
- from tauRec.tauRecFlags import tauFlags
-
- # PanTau:
- if tauFlags.doPanTau() :
- import PanTauAlgs.JobOptions_Main_PanTau as pantau
- tools.append(pantau.getPanTau())
-
- #these tools need pantau info
- tools.append(taualgs.getCombinedP4FromRecoTaus())
- if jobproperties.Beam.beamType()!="cosmics":
- tools.append(taualgs.getMvaTESVariableDecorator())
- tools.append(taualgs.getMvaTESEvaluator())
-
- if tauFlags.doRunTauDiscriminant():
- tools.append(taualgs.getTauIDVarCalculator())
- tools.append(taualgs.getTauJetBDTEvaluator("TauJetBDT1P", weightsFile="vars2016_pt_gamma_1p_isofix.root", minNTracks=0, maxNTracks=1)) #update config?
- tools.append(taualgs.getTauJetBDTEvaluator("TauJetBDT3P", weightsFile="vars2016_pt_gamma_3p_isofix.root", minNTracks=2, maxNTracks=1000)) #update config?
- tools.append(taualgs.getTauWPDecoratorJetBDT())
- tools.append(taualgs.getTauJetBDTEvaluator("TauEleBDT_def", weightsFile="", outputVarName="BDTEleScore"))#just inits values
- tools.append(taualgs.getTauJetBDTEvaluator("TauEleBDT_bar",
- weightsFile="EleBDT1PBar.root", minNTracks=1, maxAbsTrackEta=1.37,
- outputVarName="BDTEleScore")) #update config?
- tools.append(taualgs.getTauJetBDTEvaluator("TauEleBDT_end1",
- weightsFile="EleBDT1PEnd1.root", minNTracks=1, minAbsTrackEta=1.37,
- maxAbsTrackEta=2.0, outputVarName="BDTEleScore")) #update config?
- tools.append(taualgs.getTauJetBDTEvaluator("TauEleBDT_end23",
- weightsFile="EleBDT1PEnd23.root", minNTracks=1, minAbsTrackEta=2.0,
- maxAbsTrackEta=3.0, outputVarName="BDTEleScore")) #update config?
- tools.append(taualgs.getTauWPDecoratorEleBDT())
- tools.append(taualgs.getTauEleOLRDecorator())
- pass
-
- tools+=tauFlags.tauRecToolsDevToolListProcessor()
- ## lock tau containers -> must be the last tau tool!!
- #tools.append(taualgs.getContainerLock())
- TauRecConfigured.AddToolsToToolSvc(self, tools)
- self.TauProcessorToolHandle().Tools = tools
-
- except Exception:
- mlog.error("could not append tools to TauProcessor")
- traceback.print_exc()
- return False
-
- self
-
- TauRecConfigured.WrapTauRecToolExecHandle(self, self.TauProcessorToolHandle())
-
-
- return True
-
-
- #helpers
- def TauProcessorToolHandle(self):
- return self._TauProcessorToolHandle
-
#end
diff --git a/Reconstruction/tauRec/python/TauRecConfigured.py b/Reconstruction/tauRec/python/TauRecConfigured.py
index 40ae35427c91ea5c7404621935ed40a3c81e1edf..3f304e835bdbfadba75e95ddb99dbd4744870996 100644
--- a/Reconstruction/tauRec/python/TauRecConfigured.py
+++ b/Reconstruction/tauRec/python/TauRecConfigured.py
@@ -26,7 +26,7 @@ class TauRecConfigured ( Configured ) :
into a tauRec/TauProcessorAlg algorithm
"""
- def __init__(self, name = "TauRecConfigured", msglevel=3, ignoreExistingDataObject=True) :
+ def __init__(self, name = "TauRecConfigured", doPi0Clus = True, msglevel=3, ignoreExistingDataObject=True) :
self.name = name
self.msglevel = msglevel
from tauRec.tauRecConf import TauProcessorAlg
@@ -42,7 +42,7 @@ class TauRecConfigured ( Configured ) :
Key_tauTrackOutputContainer="TauTracks",
Key_tauShotClusOutputContainer="TauShotClusters",
Key_tauShotPFOOutputContainer="TauShotParticleFlowObjects",
- Key_tauPi0CellOutputContainer="TauCommonPi0Cells",
+ Key_tauPi0CellOutputContainer = "TauCommonPi0Cells" if doPi0Clus else "",
MaxEta = tauFlags.tauRecSeedMaxEta(),
MinPt = tauFlags.tauRecSeedMinPt(),
CellMakerTool = TauCellContainerFinalizer)
diff --git a/Reconstruction/tauRec/python/TauRecRunConfigured.py b/Reconstruction/tauRec/python/TauRecRunConfigured.py
index e43f0143ed5f00a3a28c82719d743c729bcb3f99..b31874fd000c18ab6c1bedee7c787161a0041434 100644
--- a/Reconstruction/tauRec/python/TauRecRunConfigured.py
+++ b/Reconstruction/tauRec/python/TauRecRunConfigured.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
################################################################################
##
@@ -14,7 +14,6 @@
################################################################################
from RecExConfig.Configured import Configured
-from AthenaCommon.SystemOfUnits import *
################################################################################
## @class TauRecRunConfigured
@@ -57,13 +56,8 @@ class TauRecRunConfigured ( Configured ) :
from AthenaCommon.AppMgr import ToolSvc
from tauRec.tauRecFlags import tauFlags
for tool in tools :
- # if tool.__slots__['calibFolder'].count('TauDiscriminant'):
- # tool.calibFolder = tauFlags.TauDiscriminantCVMFSPath()
- # else :
- # tool.calibFolder = tauFlags.tauRecToolsCVMFSPath()
tool.calibFolder = tauFlags.tauRecToolsCVMFSPath()
if tool not in ToolSvc : ToolSvc += tool
- pass
def TauRunnerAlgHandle(self):
return self._TauRunnerAlgHandle
diff --git a/Reconstruction/tauRec/python/TauRecRunner.py b/Reconstruction/tauRec/python/TauRecRunner.py
index 42613a673f93231b430ff386d9576abe8a37ece2..04cc5c067417f579f731679ef27fe102aabee0ca 100644
--- a/Reconstruction/tauRec/python/TauRecRunner.py
+++ b/Reconstruction/tauRec/python/TauRecRunner.py
@@ -42,10 +42,8 @@ class TauRecRunner ( TauRecRunConfigured ) :
_output = { _outputType:_outputKey , _outputAuxType:_outputAuxKey }
- def __init__(self, name = "TauRecRunner",doPi0Clus=False, doTJVA=False):
+ def __init__(self, name = "TauRecRunner"):
self.name = name
- self.doPi0Clus = doPi0Clus
- self.do_TJVA = doTJVA # not used in the TauRecRunner?
TauRecRunConfigured.__init__(self, name)
@@ -68,26 +66,18 @@ class TauRecRunner ( TauRecRunConfigured ) :
tools = []
- ### TauRecPi0EflowProcessor ###
- # Tools in this section were originally in TauRecPi0EflowProcessor
- if self.doPi0Clus: tools.append(taualgs.getPi0ClusterCreator())
-
- ###############################
+ tools.append(taualgs.getPi0ClusterCreator())
+ tools.append(taualgs.getPi0ClusterScaler())
+ tools.append(taualgs.getPi0ScoreCalculator())
+ tools.append(taualgs.getPi0Selector())
- ### TauRecVariablesProcessor ###
from InDetRecExample.InDetJobProperties import InDetFlags
- # Tools in this section were originally in TauRecVariablesProcessor
if tauFlags.isStandalone() or InDetFlags.doVertexFinding():
tools.append(taualgs.getTauVertexVariables())
tools.append(taualgs.getTauCommonCalcVars())
tools.append(taualgs.getTauSubstructure())
- if self.doPi0Clus:
- tools.append(taualgs.getPi0ClusterScaler())
- tools.append(taualgs.getPi0ScoreCalculator())
- tools.append(taualgs.getPi0Selector())
-
tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=False, correctAxis=True, postfix='_onlyAxis'))
# PanTau:
diff --git a/Reconstruction/tauRec/python/tauRecFlags.py b/Reconstruction/tauRec/python/tauRecFlags.py
index d416d01efc70a305b2f39efdeeaeecdc71d2b2d4..c7f4f6ca7f399798c6fbf2d9b9bace061112e265 100644
--- a/Reconstruction/tauRec/python/tauRecFlags.py
+++ b/Reconstruction/tauRec/python/tauRecFlags.py
@@ -209,7 +209,7 @@ class useOldVertexFitterAPI(JobProperty):
allowedTypes=['bool']
StoredValue=False
-class useShowerSubClusters(JobProperty):
+class useSubtractedCluster(JobProperty):
""" switch on use of shower subtracted clusters
"""
statusOn=True
@@ -224,7 +224,7 @@ class tauRecFlags(JobPropertyContainer):
jobproperties.add_Container(tauRecFlags)
# I want always the following flags in the Rec container
-_list_tau=[Enabled,doTauRec,isStandalone,tauRecSeedJetCollection,tauRecToolsCVMFSPath,doTJVA,TauDiscriminantCVMFSPath,tauRecMVATrackClassification,tauRecRNNTrackClassification,tauRecMVATrackClassificationConfig,tauRecRNNTrackClassificationConfig,tauRecDecayModeNNClassifierConfig,tauRecSeedMinPt,tauRecSeedMaxEta,tauRecToolsDevToolList,tauRecToolsDevToolListProcessor,doRunTauDiscriminant,useVertexBasedConvFinder,useNewPIDBasedConvFinder,doPanTau,doPi0,pi0EtCuts,pi0MVACuts_1prong,pi0MVACuts_mprong,shotPtCut_1Photon,shotPtCut_2Photons,useOldVertexFitterAPI,useShowerSubClusters]
+_list_tau=[Enabled,doTauRec,isStandalone,tauRecSeedJetCollection,tauRecToolsCVMFSPath,doTJVA,TauDiscriminantCVMFSPath,tauRecMVATrackClassification,tauRecRNNTrackClassification,tauRecMVATrackClassificationConfig,tauRecRNNTrackClassificationConfig,tauRecDecayModeNNClassifierConfig,tauRecSeedMinPt,tauRecSeedMaxEta,tauRecToolsDevToolList,tauRecToolsDevToolListProcessor,doRunTauDiscriminant,useVertexBasedConvFinder,useNewPIDBasedConvFinder,doPanTau,doPi0,pi0EtCuts,pi0MVACuts_1prong,pi0MVACuts_mprong,shotPtCut_1Photon,shotPtCut_2Photons,useOldVertexFitterAPI,useSubtractedCluster]
for j in _list_tau:
jobproperties.tauRecFlags.add_JobProperty(j)
del _list_tau
diff --git a/Reconstruction/tauRec/share/TauAODList.py b/Reconstruction/tauRec/share/TauAODList.py
index e86c77b4f020923561ef73678e4c53f61ff5b1fa..0df44446948e96f2e21c0a5eb0996d31412c70d5 100644
--- a/Reconstruction/tauRec/share/TauAODList.py
+++ b/Reconstruction/tauRec/share/TauAODList.py
@@ -10,33 +10,21 @@
#------------------------------------------------------------------------------
TauAODList = []
-#------------------------------------------------------------------------------
-# Tau1P3P cell cluster
-#------------------------------------------------------------------------------
-#TauAODList += [ "CaloClusterContainer#Tau1P3PCellCluster" ]
-
-#------------------------------------------------------------------------------
-# TauRec cell cluster
-#------------------------------------------------------------------------------
-#TauAODList += [ "CaloClusterContainer#TauRecCellCluster" ]
-
#------------------------------------------------------------------------------
# Tau Pi0 cluster
#------------------------------------------------------------------------------
-TauAODList += [ "xAOD::CaloClusterContainer#TauPi0Clusters" ]
-TauAODList += [ "xAOD::CaloClusterAuxContainer#TauPi0ClustersAux." ]
+#TauAODList += [ "xAOD::CaloClusterContainer#TauPi0Clusters" ]
+#TauAODList += [ "xAOD::CaloClusterAuxContainer#TauPi0ClustersAux." ]
-#------------------------------------------------------------------------------
-# Tau1P3P cell EM012 cluster
-#------------------------------------------------------------------------------
-#TauAODList += [ "CaloClusterContainer#Tau1P3PCellEM012ClusterContainer" ]
+TauAODList += [ "xAOD::CaloClusterContainer#TauPi0SubtractedClusters" ]
+TauAODList += [ "xAOD::CaloClusterAuxContainer#TauPi0SubtractedClustersAux." ]
+TauAODList += [ "CaloClusterCellLinkContainer#TauPi0SubtractedClusters_links" ]
#------------------------------------------------------------------------------
# TauRec main xAOD containers
#------------------------------------------------------------------------------
TauAODList += [ "xAOD::TauJetContainer#TauJets" ]
-#TauAODList += [ "xAOD::TauJetAuxContainer#TauJetsAux.-ABS_ETA_LEAD_TRACK.-CORRCENTFRAC.-CORRFTRK.-EMFRACTIONATEMSCALE_MOVEE3.-HADLEAKET.-NUMTRACK.-TAU_ABSDELTAETA.-TAU_ABSDELTAPHI.-TAU_SEEDTRK_SECMAXSTRIPETOVERPT.-TAU_TRT_NHT_OVER_NLT.-NUMVERTICES" ]
-TauAODList += [ "xAOD::TauJetAuxContainer#TauJetsAux.-mu.-nVtx.-NUMTRACK.-NUMVERTICES.-nVtxPU.-MU" ]
+TauAODList += [ "xAOD::TauJetAuxContainer#TauJetsAux.-mu.-nVtxPU.-ABS_ETA_LEAD_TRACK.-TAU_ABSDELTAPHI.-TAU_ABSDELTAETA.-absipSigLeadTrk" ]
#------------------------------------------------------------------------------
# TauRec tauTrack xAOD containers
@@ -84,7 +72,6 @@ from DiTauRec.DiTauRecFlags import jobproperties
if jobproperties.DiTauRecFlags.doDiTauRec():
include("DiTauRec/DiTauAODList.py")
TauAODList += DiTauAODList
- pass
#-------------------------------------------------------------------------
diff --git a/Reconstruction/tauRec/share/tauRec_jobOptions.py b/Reconstruction/tauRec/share/tauRec_jobOptions.py
index 7523c60066c9d03320841f9c11780d5c344b6468..e3b237dd66d0474fb8849ce2f0204cd112e7d9e5 100644
--- a/Reconstruction/tauRec/share/tauRec_jobOptions.py
+++ b/Reconstruction/tauRec/share/tauRec_jobOptions.py
@@ -7,17 +7,13 @@
#@author Felix Friedrich <felix.friedrich@cern.ch>
################################################################################
-#TODO: everything needed here?
from RecExConfig.RecFlags import rec
-from AthenaCommon.BeamFlags import jobproperties
-from AthenaCommon.GlobalFlags import globalflags
-import AthenaCommon.SystemOfUnits as Units
from tauRec.tauRecFlags import tauFlags
# use Tau Jet Vertex Association Tool
_doTJVA = tauFlags.doTJVA()
-# Pi0-finding algorithm
+# Pi0 cell RoI making and topoclustering
_doPi0Clus = tauFlags.doPi0()
from tauRec.TauRecBuilder import TauRecCoreBuilder
@@ -27,4 +23,4 @@ if _doPi0Clus:
include("tauRec/Pi0ClusterMaker_jobOptions.py")
from tauRec.TauRecRunner import TauRecRunner
-TauRecRunner(doPi0Clus=_doPi0Clus, doTJVA=_doTJVA)
+TauRecRunner()
diff --git a/Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py b/Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py
new file mode 100644
index 0000000000000000000000000000000000000000..6db4f8ab4bcd399c9ef4983d0bbd4ec51b2dfd25
--- /dev/null
+++ b/Reconstruction/tauRec/share/tau_standalone_EMPFlow_ESDtoAOD.py
@@ -0,0 +1,42 @@
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+athenaCommonFlags.FilesInput=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input/standalone.ESD.pool.root"]
+
+from RecExConfig.RecFlags import rec
+rec.doEgamma.set_Value_and_Lock(False)
+rec.doMuon.set_Value_and_Lock(False)
+
+from CaloRec.CaloRecFlags import jobproperties
+jobproperties.CaloRecFlags.Enabled.set_Value_and_Lock(False)
+jobproperties.CaloRecFlags.doCaloCluster.set_Value_and_Lock(False)
+jobproperties.CaloRecFlags.doCaloTopoCluster.set_Value_and_Lock(False)
+
+#this turns off CaloCluster2xAOD
+rec.doWritexAOD.set_Value_and_Lock(False)
+#nothing to say on these
+rec.doWriteTAG.set_Value_and_Lock(False)
+rec.doTruth.set_Value_and_Lock(True)
+rec.doAODCaloCells.set_Value_and_Lock(False)
+rec.doTrigger.set_Value_and_Lock(False)
+#Turns off xAODRingSetConfWriter
+rec.doCaloRinger.set_Value_and_Lock(False)
+
+#disables VertexCnvAlg
+from InDetRecExample.InDetJobProperties import jobproperties
+jobproperties.InDetJobProperties.doxAOD.set_Value_and_Lock(False)
+#Disables AllExecutedEvents
+rec.doFileMetaData.set_Value_and_Lock(False)
+
+athenaCommonFlags.EvtMax=10
+
+# Run TauVertexFinder with TJVA on
+from tauRec.tauRecFlags import tauFlags
+tauFlags.isStandalone.set_Value_and_Lock(True)
+tauFlags.tauRecSeedJetCollection.set_Value_and_Lock("AntiKt4EMPFlowJets")
+
+UserAlgs = ["tauRec/tauRec_jobOptions.py"]
+
+include ("RecExCommon/RecExCommon_topOptions.py")
+
+condSeq = AthSequencer("AthCondSeq")
+if not hasattr( condSeq, "LumiBlockMuWriter" ):
+ include ("LumiBlockComps/LumiBlockMuWriter_jobOptions.py")
diff --git a/Reconstruction/tauRec/share/tau_standalone_ESDtoAOD.py b/Reconstruction/tauRec/share/tau_standalone_LCTopo_ESDtoAOD.py
similarity index 100%
rename from Reconstruction/tauRec/share/tau_standalone_ESDtoAOD.py
rename to Reconstruction/tauRec/share/tau_standalone_LCTopo_ESDtoAOD.py
diff --git a/Reconstruction/tauRec/src/TauProcessorAlg.cxx b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
index 3a8ce013473ac1b99d02342588fd800da346d8e9..00fc38816f67c3775a4a1b932feb72ddb3fb3310 100644
--- a/Reconstruction/tauRec/src/TauProcessorAlg.cxx
+++ b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
@@ -3,22 +3,17 @@
*/
#include "tauRec/TauProcessorAlg.h"
-
#include "xAODJet/Jet.h"
#include "xAODJet/JetContainer.h"
-
-#include "xAODTau/TauJetContainer.h"
#include "xAODTau/TauJetAuxContainer.h"
#include "xAODTau/TauDefs.h"
#include "xAODTau/TauTrackContainer.h"
#include "xAODTau/TauTrackAuxContainer.h"
-
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-
-#include "CaloInterface/ICaloCellMakerTool.h"
#include "NavFourMom/INavigable4MomentumCollection.h"
+#include <boost/dynamic_bitset.hpp>
using Gaudi::Units::GeV;
@@ -40,16 +35,18 @@ TauProcessorAlg::~TauProcessorAlg() {
// Initializer
//-----------------------------------------------------------------------------
StatusCode TauProcessorAlg::initialize() {
- ATH_CHECK( detStore()->retrieve(m_cellID) );
ATH_CHECK( m_jetInputContainer.initialize() );
ATH_CHECK( m_tauOutputContainer.initialize() );
ATH_CHECK( m_tauTrackOutputContainer.initialize() );
ATH_CHECK( m_tauShotClusOutputContainer.initialize() );
ATH_CHECK( m_tauShotPFOOutputContainer.initialize() );
- ATH_CHECK( m_tauPi0CellOutputContainer.initialize() );
-
- ATH_CHECK( m_cellMakerTool.retrieve() );
+ ATH_CHECK( m_tauPi0CellOutputContainer.initialize(SG::AllowEmpty) );
+
+ if(!m_tauPi0CellOutputContainer.empty()) {
+ ATH_CHECK( detStore()->retrieve(m_cellID) );
+ ATH_CHECK( m_cellMakerTool.retrieve() );
+ }
//-------------------------------------------------------------------------
// No tools allocated!
@@ -98,24 +95,28 @@ StatusCode TauProcessorAlg::execute(const EventContext& ctx) const {
ATH_CHECK(tauShotPFOHandle.record(std::make_unique<xAOD::PFOContainer>(), std::make_unique<xAOD::PFOAuxContainer>()));
xAOD::PFOContainer* tauShotPFOContainer = tauShotPFOHandle.ptr();
- SG::WriteHandle<CaloCellContainer> tauPi0CellHandle( m_tauPi0CellOutputContainer, ctx );
- ATH_CHECK(tauPi0CellHandle.record(std::make_unique<CaloCellContainer>()));
- CaloCellContainer* Pi0CellContainer = tauPi0CellHandle.ptr();
+ CaloCellContainer* Pi0CellContainer = nullptr;
+ boost::dynamic_bitset<> addedCellsMap;
+
+ if(!m_tauPi0CellOutputContainer.empty()) {
+ SG::WriteHandle<CaloCellContainer> tauPi0CellHandle( m_tauPi0CellOutputContainer, ctx );
+ ATH_CHECK(tauPi0CellHandle.record(std::make_unique<CaloCellContainer>()));
+ Pi0CellContainer = tauPi0CellHandle.ptr();
- /// retrieve the input jet seed container
+ // Initialize the cell map per event, used to avoid dumplicate cell in TauPi0CreateROI
+ IdentifierHash hashMax = m_cellID->calo_cell_hash_max();
+ ATH_MSG_DEBUG("CaloCell Hash Max: " << hashMax);
+ addedCellsMap.resize(hashMax,false);
+ }
+
+ // retrieve the input jet seed container
SG::ReadHandle<xAOD::JetContainer> jetHandle( m_jetInputContainer, ctx );
if (!jetHandle.isValid()) {
ATH_MSG_ERROR ("Could not retrieve HiveDataObj with key " << jetHandle.key());
return StatusCode::FAILURE;
}
const xAOD::JetContainer *pSeedContainer = jetHandle.cptr();
-
- /// Initialize the cell map per event, used to avoid dumplicate cell in TauPi0CreateROI
- IdentifierHash hashMax = m_cellID->calo_cell_hash_max();
- ATH_MSG_DEBUG("CaloCell Hash Max: " << hashMax);
- std::vector<CaloCell*> addedCellsMap;
- addedCellsMap.resize(hashMax,NULL);
-
+
//---------------------------------------------------------------------
// Loop over seeds
//---------------------------------------------------------------------
@@ -157,10 +158,10 @@ StatusCode TauProcessorAlg::execute(const EventContext& ctx) const {
else if ( tool->type() == "tauRecTools::TauTrackClassifier" || tool->type() == "tauRecTools::TauTrackRNNClassifier" ) {
sc = tool->executeTrackClassifier(*pTau, *pTauTrackCont);
}
- else if ( tool->type() == "TauShotFinder"){
+ else if ( tool->type() == "TauShotFinder") {
sc = tool->executeShotFinder(*pTau, *tauShotClusContainer, *tauShotPFOContainer);
}
- else if ( tool->type() == "TauPi0CreateROI"){
+ else if ( tool->type() == "TauPi0CreateROI") {
sc = tool->executePi0CreateROI(*pTau, *Pi0CellContainer, addedCellsMap);
}
else {
@@ -183,11 +184,13 @@ StatusCode TauProcessorAlg::execute(const EventContext& ctx) const {
}// loop through seeds
// Check this is needed for the cell container?
- // symlink as INavigable4MomentumCollection (as in CaloRec/CaloCellMaker)
- ATH_CHECK(evtStore()->symLink(Pi0CellContainer, static_cast<INavigable4MomentumCollection*> (0)));
-
- // sort the cell container by hash
- ATH_CHECK( m_cellMakerTool->process(static_cast<CaloCellContainer*> (Pi0CellContainer), ctx) );
+ if(Pi0CellContainer) {
+ // symlink as INavigable4MomentumCollection (as in CaloRec/CaloCellMaker)
+ ATH_CHECK(evtStore()->symLink(Pi0CellContainer, static_cast<INavigable4MomentumCollection*> (0)));
+
+ // sort the cell container by hash
+ ATH_CHECK( m_cellMakerTool->process(static_cast<CaloCellContainer*> (Pi0CellContainer), ctx) );
+ }
ATH_MSG_VERBOSE("The tau candidate container has been modified");
diff --git a/Reconstruction/tauRec/test/test_tau_standalone_EMPFlow_serial.sh b/Reconstruction/tauRec/test/test_tau_standalone_EMPFlow_serial.sh
new file mode 100755
index 0000000000000000000000000000000000000000..75abe15b5b8245f49e8961a619b5f405799e01ac
--- /dev/null
+++ b/Reconstruction/tauRec/test/test_tau_standalone_EMPFlow_serial.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# art-description: standalone tau reconstruction on MC in serial mode
+# art-type: grid
+# art-include: master/Athena
+# art-output: *.root
+# art-output: *.log
+# art-output: *.ps
+# art-output: dcube
+# art-html: dcube
+
+NEVENTS=1000
+REF_DIR="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/reference/standalone"
+
+# run the reconstruction
+athena.py --evtMax ${NEVENTS} tauRec/tau_standalone_EMPFlow_ESDtoAOD.py >> tau_standalone.log 2>&1
+echo "art-result: $? Reconstrution"
+
+# compare the AOD file
+art.py compare ref --entries ${NEVENTS} --mode detailed --order-trees --diff-root AOD.pool.root ${REF_DIR}/EMPFlow_AOD.pool.root >> AOD_diff_root.log 2>&1
+echo "art-result: $? diff-root"
+
+# run the physics validation
+Reco_tf.py --maxEvents ${NEVENTS} --validationFlags 'noExample,doTau' --inputAODFile AOD.pool.root --outputNTUP_PHYSVALFile NTUP_PHYSVAL.root
+echo "art-result: $? PhysVal"
+
+# compare the histograms
+rootcomp.py NTUP_PHYSVAL.root ${REF_DIR}/NTUP_PHYSVAL.root >> rootcomp.log 2>&1
+echo "art-result: $? rootcomp"
+
+# run dcube
+INPUT_DIR="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/input"
+$ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
+ --plot --output dcube \
+ --config ${INPUT_DIR}/config_mc.xml \
+ --reference ${REF_DIR}/NTUP_PHYSVAL.root \
+ NTUP_PHYSVAL.root
+echo "art-result: $? dcube"
diff --git a/Reconstruction/tauRec/test/test_tau_standalone_multithread.sh b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh
similarity index 83%
rename from Reconstruction/tauRec/test/test_tau_standalone_multithread.sh
rename to Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh
index 6e2de893c5172a1f1fb4a99400465a854da52e4d..0d4cd79d42e761f0ce7ce209a2dc5bcd66173df3 100755
--- a/Reconstruction/tauRec/test/test_tau_standalone_multithread.sh
+++ b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_multithread.sh
@@ -14,11 +14,11 @@ NEVENTS=1000
REF_DIR="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/reference/standalone"
# run the reconstruction
-athena.py --threads 4 --evtMax ${NEVENTS} tauRec/tau_standalone_ESDtoAOD.py >> tau_standalone.log 2>&1
+athena.py --threads 4 --evtMax ${NEVENTS} tauRec/tau_standalone_LCTopo_ESDtoAOD.py >> tau_standalone.log 2>&1
echo "art-result: $? Reconstrution"
# compare the AOD file
-art.py compare ref --entries ${NEVENTS} --mode semi-detailed --excluded-vars=mc_event_number --order-trees --diff-root AOD.pool.root ${REF_DIR}/AOD.pool.root >> AOD_diff_root.log 2>&1
+art.py compare ref --entries ${NEVENTS} --mode detailed --excluded-vars=mc_event_number --order-trees --diff-root AOD.pool.root ${REF_DIR}/LCTopo_AOD.pool.root >> AOD_diff_root.log 2>&1
echo "art-result: $? diff-root"
# run the physics validation
diff --git a/Reconstruction/tauRec/test/test_tau_standalone_serial.sh b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh
similarity index 81%
rename from Reconstruction/tauRec/test/test_tau_standalone_serial.sh
rename to Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh
index 1dbaf0c82c2f3259c4c97e2bffc9419360fd9711..bd8d31d55a5560229f12b82bb1444f0bc4ee4fd1 100755
--- a/Reconstruction/tauRec/test/test_tau_standalone_serial.sh
+++ b/Reconstruction/tauRec/test/test_tau_standalone_LCTopo_serial.sh
@@ -13,11 +13,11 @@ NEVENTS=1000
REF_DIR="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/tauRec/reference/standalone"
# run the reconstruction
-athena.py --evtMax ${NEVENTS} tauRec/tau_standalone_ESDtoAOD.py >> tau_standalone.log 2>&1
+athena.py --evtMax ${NEVENTS} tauRec/tau_standalone_LCTopo_ESDtoAOD.py >> tau_standalone.log 2>&1
echo "art-result: $? Reconstrution"
# compare the AOD file
-art.py compare ref --entries ${NEVENTS} --mode semi-detailed --order-trees --diff-root AOD.pool.root ${REF_DIR}/AOD.pool.root >> AOD_diff_root.log 2>&1
+art.py compare ref --entries ${NEVENTS} --mode detailed --order-trees --diff-root AOD.pool.root ${REF_DIR}/LCTopo_AOD.pool.root >> AOD_diff_root.log 2>&1
echo "art-result: $? diff-root"
# run the physics validation
diff --git a/Reconstruction/tauRecTools/Root/CaloClusterVariables.cxx b/Reconstruction/tauRecTools/Root/CaloClusterVariables.cxx
index 166f13a549db40f77f9f7aefc32250807c6212b1..40b79ac312d472947e8049314b5ad80edad7210b 100644
--- a/Reconstruction/tauRecTools/Root/CaloClusterVariables.cxx
+++ b/Reconstruction/tauRecTools/Root/CaloClusterVariables.cxx
@@ -22,7 +22,7 @@ m_totMass(DEFAULT),
m_effMass(DEFAULT),
m_totEnergy(DEFAULT),
m_effEnergy(DEFAULT),
-m_incShowerSubtr(true){
+m_useSubtractedCluster(true){
}
//*******************************************
@@ -40,7 +40,7 @@ bool CaloClusterVariables::update(const xAOD::TauJet& pTau, const ToolHandle<ITa
if (pTau.vertexLink().isValid()) tauVertex = pTau.vertex();
std::vector<const xAOD::CaloCluster*> clusterList;
- StatusCode sc = tauRecTools::GetJetClusterList(jetSeed, clusterList, m_incShowerSubtr);
+ StatusCode sc = tauRecTools::GetJetClusterList(jetSeed, clusterList, m_useSubtractedCluster);
std::vector<TLorentzVector> clusterP4Vector;
for (const xAOD::CaloCluster* cluster : clusterList) {
diff --git a/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx b/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx
index 88d6d9c988df12b07fe4ce134aa92179c52c3379..bf27a5976c9409bf3caaecb85d1d6d0aee0e54ff 100644
--- a/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx
+++ b/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx
@@ -2,525 +2,448 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// local include(s)
#include "tauRecTools/CombinedP4FromRecoTaus.h"
-//Root includes(s)
#include "TFile.h"
-//C++ includes
#include <cmath>
-#include <string.h>
-//_____________________________________________________________________________
+
+
CombinedP4FromRecoTaus::CombinedP4FromRecoTaus(const std::string& name) :
TauRecToolBase(name) {
-
declareProperty("addCalibrationResultVariables", m_addCalibrationResultVariables = false);
- declareProperty("addUseCaloPtFlag", m_addUseCaloPtFlag = false);
- declareProperty("WeightFileName", m_sWeightFileName = "");
+ declareProperty("WeightFileName", m_calFileName = "");
}
-//_____________________________________________________________________________
-StatusCode CombinedP4FromRecoTaus::initialize() {
-
- m_correlationHists.resize(m_modeNames.size());
- m_meanTGraph_CellBased2PanTau.resize(m_etaBinNames.size());
- m_resTGraph_CellBased2PanTau.resize(m_etaBinNames.size());
- m_meanTGraph_tauRec.resize(m_etaBinNames.size());
- m_resTGraph_tauRec.resize(m_etaBinNames.size());
-
- for (size_t i=0; i<m_etaBinNames.size(); ++i) {
- m_meanTGraph_CellBased2PanTau[i].resize(m_modeNames.size());
- m_resTGraph_CellBased2PanTau[i].resize(m_modeNames.size());
- m_meanTGraph_tauRec[i].resize(m_modeNames.size());
- m_resTGraph_tauRec[i].resize(m_modeNames.size());
- }
-
- std::string calibFilePath = find_file(m_sWeightFileName);
- std::unique_ptr<TFile> file(TFile::Open(calibFilePath.c_str(), "READ"));
- m_Nsigma_compatibility=std::make_unique<TF1>("Nsigma_compatibility", "pol1", 0, 500000); // needs to go beyond ~420 where it crosses y=0
- m_Nsigma_compatibility->SetParameter(0, 3.809); // derived from fit
- m_Nsigma_compatibility->SetParameter(1, -9.58/1000000.); // derived from fit
- //retrieve correlation histgram
- TH1F* histogram(nullptr);
- std::string histname="";
-
- //loop over decay modes
- for(size_t imode=0; imode < m_modeNames.size(); ++imode){
-
- ATH_MSG_DEBUG("mode = " << imode);
-
- histname="CorrelationCoeff_tauRec_" + m_modeNames[imode];
- histogram = dynamic_cast<TH1F*> (file->Get(histname.c_str()));
- if(histogram){
- histogram->SetDirectory(0);
- m_correlationHists[imode] = std::unique_ptr<TH1F>(histogram);
- ATH_MSG_DEBUG("Adding corr hist: " << histname);
+StatusCode CombinedP4FromRecoTaus::initialize() {
+ // It would be better to retrieve the function from calibration file
+ m_nSigmaCompatibility=std::make_unique<TF1>("nSigmaCompatibility", "pol1", 0, 500000);
+ m_nSigmaCompatibility->SetParameter(0, 3.809); // derived from fit
+ m_nSigmaCompatibility->SetParameter(1, -9.58/1000000.); // derived from fit
+
+ std::string calFilePath = find_file(m_calFileName);
+ std::unique_ptr<TFile> calFile(TFile::Open(calFilePath.c_str(), "READ"));
+
+ // 1D array with decay mode as index
+ TH1F* hist = nullptr;
+ std::string histName = "";
+ for (size_t decayModeIndex = 0; decayModeIndex < DecayModeBinning; ++ decayModeIndex) {
+ histName="CorrelationCoeff_tauRec_" + m_decayModeNames[decayModeIndex];
+ hist = dynamic_cast<TH1F*> (calFile->Get(histName.c_str()));
+ if(hist){
+ hist->SetDirectory(0);
+ m_correlationHists[decayModeIndex] = std::unique_ptr<TH1F>(hist);
+ ATH_MSG_DEBUG("Adding corr hist: " << histName);
}
else {
- ATH_MSG_FATAL("Failed to get an object with name " << histname);
+ ATH_MSG_FATAL("Failed to get an object with name " << histName);
return StatusCode::FAILURE;
}
}
-
- //retrieve mean and resolution graph
- TGraph* Graph(nullptr);
- std::string Graphname="";
-
- //loop over eta bins
- for(size_t ietaBin=0; ietaBin < m_etaBinNames.size(); ++ietaBin){
- //loop over decay modes
- for(size_t imode=0; imode < m_modeNames.size(); ++imode){
-
- ATH_MSG_DEBUG("eta bin = " << ietaBin << " / mode = " << imode );
-
- // retrieve resolution graph
- Graphname = "tauRec/Graph_from_ResolutionEt_tauRec_" + m_modeNames[imode] + "_" + m_etaBinNames[ietaBin];
- Graph = dynamic_cast<TGraph*> (file->Get(Graphname.c_str()));
- if(Graph){
- m_resTGraph_tauRec[ietaBin][imode] = std::unique_ptr<TGraph>(Graph);
- ATH_MSG_DEBUG("Adding graph: " << Graphname);
+ // 2D array with (eta, decay mode) as index
+ TGraph* graph = nullptr;
+ std::string graphName="";
+ for (size_t decayModeIndex = 0; decayModeIndex < DecayModeBinning; ++decayModeIndex) {
+ for (size_t etaIndex = 0; etaIndex < EtaBinning; ++etaIndex) {
+ // Calo TES: relative bias
+ graphName = "tauRec/Graph_from_MeanEt_tauRec_" + m_decayModeNames[decayModeIndex] + "_" + m_etaBinNames[etaIndex];
+ graph = dynamic_cast<TGraph*> (calFile->Get(graphName.c_str()));
+ if(graph) {
+ m_caloRelBiasMaxEt[decayModeIndex][etaIndex] = TMath::MaxElement(graph->GetN(), graph->GetX());
+ m_caloRelBias[decayModeIndex][etaIndex] = std::unique_ptr<TGraph>(graph);
+ ATH_MSG_DEBUG("Adding graph: " << graphName);
}
else {
- ATH_MSG_FATAL("Failed to get an object with name " << Graphname);
- return StatusCode::FAILURE;
+ ATH_MSG_FATAL("Failed to get an object with name " << graphName);
+ return StatusCode::FAILURE;
}
-
- // retrieve mean graph
- Graphname = "tauRec/Graph_from_MeanEt_tauRec_" + m_modeNames[imode] + "_" + m_etaBinNames[ietaBin];
- Graph = dynamic_cast<TGraph*> (file->Get(Graphname.c_str()));
- if(Graph) {
- m_meanTGraph_tauRec[ietaBin][imode] = std::unique_ptr<TGraph>(Graph);
- ATH_MSG_DEBUG("Adding graph: " << Graphname);
+
+ // Calo TES: resolution
+ graphName = "tauRec/Graph_from_ResolutionEt_tauRec_" + m_decayModeNames[decayModeIndex] + "_" + m_etaBinNames[etaIndex];
+ graph = dynamic_cast<TGraph*> (calFile->Get(graphName.c_str()));
+ if(graph){
+ m_caloResMaxEt[decayModeIndex][etaIndex] = TMath::MaxElement(graph->GetN(), graph->GetX());
+ m_caloRes[decayModeIndex][etaIndex] = std::unique_ptr<TGraph>(graph);
+ ATH_MSG_DEBUG("Adding graph: " << graphName);
}
else {
- ATH_MSG_FATAL("Failed to get an object with name " << Graphname);
- return StatusCode::FAILURE;
+ ATH_MSG_FATAL("Failed to get an object with name " << graphName);
+ return StatusCode::FAILURE;
}
-
- Graphname = "ConstituentEt/Graph_from_ResolutionEt_ConstituentEt_" + m_modeNames[imode] + "_" + m_etaBinNames[ietaBin];
- Graph = dynamic_cast<TGraph*> (file->Get(Graphname.c_str()));
- if(Graph){
- m_resTGraph_CellBased2PanTau[ietaBin][imode] = std::unique_ptr<TGraph>(Graph);
- ATH_MSG_DEBUG("Adding graph: " << Graphname);
+
+ // PanTau: relative bias
+ graphName = "ConstituentEt/Graph_from_MeanEt_ConstituentEt_" + m_decayModeNames[decayModeIndex] + "_" + m_etaBinNames[etaIndex];
+ graph = dynamic_cast<TGraph*> (calFile->Get(graphName.c_str()));
+ if(graph){
+ m_panTauRelBiasMaxEt[decayModeIndex][etaIndex] = TMath::MaxElement(graph->GetN(), graph->GetX());
+ m_panTauRelBias[decayModeIndex][etaIndex] = std::unique_ptr<TGraph>(graph);
+ ATH_MSG_DEBUG("Adding graph: " << graphName);
}
else {
- ATH_MSG_FATAL("Failed to get an object with name " << Graphname);
+ ATH_MSG_FATAL("Failed to get an object with name " << graphName);
return StatusCode::FAILURE;
}
-
- Graphname = "ConstituentEt/Graph_from_MeanEt_ConstituentEt_" + m_modeNames[imode] + "_" + m_etaBinNames[ietaBin];
- Graph = dynamic_cast<TGraph*> (file->Get(Graphname.c_str()));
- if(Graph){
- m_meanTGraph_CellBased2PanTau[ietaBin][imode] = std::unique_ptr<TGraph>(Graph);
- ATH_MSG_DEBUG("Adding graph: " << Graphname);
+
+ // PanTau: resolution
+ graphName = "ConstituentEt/Graph_from_ResolutionEt_ConstituentEt_" + m_decayModeNames[decayModeIndex] + "_" + m_etaBinNames[etaIndex];
+ graph = dynamic_cast<TGraph*> (calFile->Get(graphName.c_str()));
+ if(graph){
+ m_panTauResMaxEt[decayModeIndex][etaIndex] = TMath::MaxElement(graph->GetN(), graph->GetX());
+ m_panTauRes[decayModeIndex][etaIndex] = std::unique_ptr<TGraph>(graph);
+ ATH_MSG_DEBUG("Adding graph: " << graphName);
}
else {
- ATH_MSG_FATAL("Failed to get an object with name " << Graphname);
+ ATH_MSG_FATAL("Failed to get an object with name " << graphName);
return StatusCode::FAILURE;
}
}
}
- file->Close();
+ calFile->Close();
return StatusCode::SUCCESS;
}
-//_____________________________________________________________________________
-StatusCode CombinedP4FromRecoTaus::execute(xAOD::TauJet& xTau) const {
+
+StatusCode CombinedP4FromRecoTaus::execute(xAOD::TauJet& tau) const {
+ TLorentzVector combinedP4(tau.p4(xAOD::TauJetParameters::TauEtaCalib));
+
+ // used to store immediate results
Variables variables;
+ // Parameterization is only valid for |eta| < 2.5, and decay modes of 1p0n, 1p1n, 1pXn, 3p0n, 3pXn
+ // If these variables of the given tau candidate are outside the range, we just use calo TES
+ if(isValid(tau)) {
+ combinedP4 = getCombinedP4(tau, variables);
+ }
+
static const SG::AuxElement::Decorator<float> decPtCombined("pt_combined");
static const SG::AuxElement::Decorator<float> decEtaCombined("eta_combined");
static const SG::AuxElement::Decorator<float> decPhiCombined("phi_combined");
static const SG::AuxElement::Decorator<float> decMCombined("m_combined");
- decPtCombined(xTau) = 0.;
- decEtaCombined(xTau) = 0.;
- decPhiCombined(xTau) = 0.;
- decMCombined(xTau) = 0.;
-
- TLorentzVector CombinedP4(xTau.p4());
- int tmpDecayMode;
- //Needs to be proto, by default PanTau_DecyMode==0 for invalid
- //(pan)taus which is "valid"
- //maybe we should initialize PanTau_DecyMode to NotSet
- //Do we want to apply to Mode_Other? 2,4,5 prongs, I think yes
- xTau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_DecayModeProto, tmpDecayMode);
- if(tmpDecayMode>=xAOD::TauJetParameters::Mode_1p0n && tmpDecayMode<=xAOD::TauJetParameters::Mode_Other) CombinedP4=getCombinedP4(xTau, variables);
-
- // create xAOD variables and fill:
- decPtCombined(xTau) = CombinedP4.Pt();
- decEtaCombined(xTau) = CombinedP4.Eta();
- decPhiCombined(xTau) = CombinedP4.Phi();
- decMCombined(xTau) = CombinedP4.M();
-
- if (m_addUseCaloPtFlag){
- static const SG::AuxElement::Decorator<char> decUseCaloPtFlag("UseCaloPtFlag");
- decUseCaloPtFlag(xTau) = getUseCaloPtFlag(xTau);
- }
+ decPtCombined(tau) = combinedP4.Pt();
+ decEtaCombined(tau) = combinedP4.Eta();
+ decPhiCombined(tau) = combinedP4.Phi();
+ decMCombined(tau) = combinedP4.M();
if (m_addCalibrationResultVariables){
-
static const SG::AuxElement::Decorator<float> decPtConstituent("pt_constituent");
static const SG::AuxElement::Decorator<float> decPtTauRecCalibrated("pt_tauRecCalibrated");
static const SG::AuxElement::Decorator<float> decPtWeighted("pt_weighted");
- decPtConstituent(xTau) = variables.et_cb2PT_postcalib;
- decPtTauRecCalibrated(xTau) = variables.et_postcalib;
- decPtWeighted(xTau) = variables.et_weighted;
-
static const SG::AuxElement::Decorator<float> decWeightWeighted("weight_weighted");
static const SG::AuxElement::Decorator<float> decSigmaCombined("sigma_combined");
static const SG::AuxElement::Decorator<float> decSigmaTaurec("sigma_tauRec");
static const SG::AuxElement::Decorator<float> decSigmaConstituent("sigma_constituent");
static const SG::AuxElement::Decorator<float> decCorrelationCoefficient("correlation_coefficient");
- decWeightWeighted(xTau) = variables.weight;
- decSigmaCombined(xTau) = variables.combined_res;
- decSigmaTaurec(xTau) = variables.sigma_tauRec;
- decSigmaConstituent(xTau) = variables.sigma_constituent;
- decCorrelationCoefficient(xTau) = variables.corrcoeff;
+
+ decPtConstituent(tau) = variables.pt_constituent;
+ decPtTauRecCalibrated(tau) = variables.pt_tauRecCalibrated;
+ decPtWeighted(tau) = variables.pt_weighted;
+ decWeightWeighted(tau) = variables.weight;
+ decSigmaCombined(tau) = variables.sigma_combined;
+ decSigmaTaurec(tau) = variables.sigma_tauRec;
+ decSigmaConstituent(tau) = variables.sigma_constituent;
+ decCorrelationCoefficient(tau) = variables.corrcoeff;
}
return StatusCode::SUCCESS;
}
-//_____________________________________________________________________________
-// it would be better to retrieve eta bins from the calibration file, e.g. for upgrade studies!
-int CombinedP4FromRecoTaus::getIndexEta(const float& eta) const {
- if( std::abs(eta) < 0.3 ) {
+
+bool CombinedP4FromRecoTaus::getUseCaloPtFlag(const xAOD::TauJet& tau) const {
+ if (! isValid(tau)) return true;
+
+ xAOD::TauJetParameters::DecayMode decayMode = getDecayMode(tau);
+ int decayModeIndex = getDecayModeIndex(decayMode);
+
+ int etaIndex = getEtaIndex(tau.etaTauEtaCalib());
+
+ double caloSigma = tau.ptTauEtaCalib() * getCaloResolution(tau.ptTauEtaCalib(), decayModeIndex, etaIndex);
+ double deltaEt = tau.ptFinalCalib() - tau.ptTauEtaCalib();
+
+ bool useCaloPt = false;
+
+ // FIXME: should we use combinedSigma here ??
+ if (std::abs(deltaEt) > 5 * caloSigma) {
+ useCaloPt = true;
+ }
+
+ return useCaloPt;
+}
+
+
+
+int CombinedP4FromRecoTaus::getEtaIndex(const float& eta) const {
+ // It would be better to retrieve eta bins from the calibration file, e.g. for upgrade studies!
+ if (std::abs(eta) < 0.3) {
return 0;
}
- if( std::abs(eta) < 0.8 ) {
+ if (std::abs(eta) < 0.8) {
return 1;
}
- if( std::abs(eta) < 1.3 ) {
+ if (std::abs(eta) < 1.3) {
return 2;
}
- if( std::abs(eta) < 1.6 ) {
+ if (std::abs(eta) < 1.6) {
return 3;
}
- if( std::abs(eta) < 2.7 ) {
+ if (std::abs(eta) < 2.5) {
return 4;
}
return 99;
}
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getCorrelationCoefficient(const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const {
+
+
+xAOD::TauJetParameters::DecayMode CombinedP4FromRecoTaus::getDecayMode(const xAOD::TauJet& tau) const{
+ int decayMode = xAOD::TauJetParameters::DecayMode::Mode_Error;
- ATH_MSG_DEBUG("Entering getCorrelationCoefficient!");
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_WARNING("Warning! decay mode not defined!");
- return 0.;
+ // When PanTau fails, the decay mode will be set to 1p0n !
+ int isPanTauCandidate;
+ tau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_isPanTauCandidate, isPanTauCandidate);
+ if (isPanTauCandidate) {
+ tau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_DecayMode, decayMode);
}
-
- return m_correlationHists[mode]->GetBinContent(etaIndex);
+
+ return static_cast<xAOD::TauJetParameters::DecayMode>(decayMode);
}
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getWeightedEt(const double& et_tauRec,
- const double& et_cb2PT,
- const int& etaIndex,
- const xAOD::TauJetParameters::DecayMode& mode,
- Variables& variables) const {
- ATH_MSG_DEBUG("Entering CombinedP4FromRecoTaus::getWeightedEt!");
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_WARNING("Warning! decay mode not defined!");
- return et_tauRec;
- }
- float res_tauRec = getResolutionTaurec( et_tauRec, etaIndex, mode );
- float res_substruct = getResolutionCellBased2PanTau( et_cb2PT, etaIndex, mode );
-
- if( res_tauRec == 0. || res_substruct == 0. ) {
- ATH_MSG_WARNING( "Warning! res_tauRec or res_substruct is 0!" );
- ATH_MSG_WARNING( "bin_taurec = " << et_tauRec );
- ATH_MSG_WARNING( "bin_substruct = " << et_cb2PT );
- m_resTGraph_tauRec[etaIndex][mode]->Print("all");
- m_resTGraph_CellBased2PanTau[etaIndex][mode]->Print("all");
- return 0.;
- }
+int CombinedP4FromRecoTaus::getDecayModeIndex(const xAOD::TauJetParameters::DecayMode& decayMode) const {
+ return static_cast<int>(decayMode);
+}
- variables.weight=( std::pow(res_substruct, 2) - getCorrelationCoefficient(etaIndex, mode )*res_tauRec*res_substruct )
- / ( std::pow(res_tauRec, 2) + std::pow(res_substruct, 2) - 2*getCorrelationCoefficient(etaIndex, mode )*res_tauRec*res_substruct );
- variables.et_weighted = variables.weight*getTauRecEt( et_tauRec, etaIndex, mode, variables.et_postcalib ) + (1 - variables.weight)*getCellbased2PantauEt( et_cb2PT, etaIndex, mode, variables.et_cb2PT_postcalib );
- return variables.et_weighted;
-}
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getResolutionTaurec(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const {
- ATH_MSG_DEBUG("Entering GetResolution_tauRec!");
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_WARNING("Warning! decay mode not defined!");
- return 0.;
+bool CombinedP4FromRecoTaus::isValid(const xAOD::TauJet& tau) const {
+ xAOD::TauJetParameters::DecayMode decayMode = getDecayMode(tau);
+ if (decayMode < xAOD::TauJetParameters::Mode_1p0n || decayMode > xAOD::TauJetParameters::Mode_3pXn) {
+ ATH_MSG_DEBUG("Decay mode is not supported !");
+ return false;
}
-
- double MaxEt = TMath::MaxElement(m_resTGraph_tauRec[etaIndex][mode]->GetN(),m_resTGraph_tauRec[etaIndex][mode]->GetX());
- if (et > MaxEt){
- return m_resTGraph_tauRec[etaIndex][mode]->Eval(MaxEt) * et;
+
+ // FIXME: At which calibration state ???
+ int etaIndex = getEtaIndex(tau.eta());
+ if (etaIndex > 4) {
+ ATH_MSG_DEBUG("Eta is out of the supported range !");
+ return false;
}
- return m_resTGraph_tauRec[etaIndex][mode]->Eval(et) * et;
+ return true;
}
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getResolutionCellBased2PanTau(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const {
- ATH_MSG_DEBUG("Entering GetResolution_CellBased2Pantau!");
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_WARNING("Warning! decay mode not defined!");
- return 0.;
- }
-
- double MaxEt = TMath::MaxElement(m_resTGraph_CellBased2PanTau[etaIndex][mode]->GetN(),m_resTGraph_CellBased2PanTau[etaIndex][mode]->GetX());
- if (et > MaxEt){
- return m_resTGraph_CellBased2PanTau[etaIndex][mode]->Eval(MaxEt) * et;
- }
- return m_resTGraph_CellBased2PanTau[etaIndex][mode]->Eval(et) * et;
-}
-
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getMeanCellBased2PanTau(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const {
-
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_WARNING( "Warning! decay mode not defined!" );
- return 0.;
- }
- double MaxEt = TMath::MaxElement(m_meanTGraph_CellBased2PanTau[etaIndex][mode]->GetN(),m_meanTGraph_CellBased2PanTau[etaIndex][mode]->GetX());
- if (et > MaxEt){
- return 0.;
- }
+double CombinedP4FromRecoTaus::getCorrelation(const int& decayModeIndex, const int& etaIndex) const {
+ return m_correlationHists[decayModeIndex]->GetBinContent(etaIndex);
+}
- return m_meanTGraph_CellBased2PanTau[etaIndex][mode]->Eval(et) * et;
-}
-
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getMeanTauRec(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const {
-
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_WARNING( "Warning! decay mode not defined!" );
- return 0.;
- }
-
- double MaxEt = TMath::MaxElement(m_meanTGraph_tauRec[etaIndex][mode]->GetN(),m_meanTGraph_tauRec[etaIndex][mode]->GetX());
- if (et > MaxEt){
- return 0;
- }
- return m_meanTGraph_tauRec[etaIndex][mode]->Eval(et) * et;
-}
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getCombinedResolution(const double& et_tauRec,
- const double& et_cb2PT,
- const int& etaIndex,
- const xAOD::TauJetParameters::DecayMode& mode,
- Variables& variables) const {
-
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_WARNING( "Warning! decay mode not defined!" );
- return 0.;
+double CombinedP4FromRecoTaus::getCaloCalEt(const double& caloEt,
+ const int& decayModeIndex,
+ const int& etaIndex) const {
+ // ratio stored in the calibration graph equals (caloEt-truthEt)/caloEt
+ double ratio = 0.0;
+
+ // FIXME: If caloEt is larger then max et, could we use the ratio at
+ // max et, instead of setting it to zero
+ if (caloEt <= m_caloRelBiasMaxEt[decayModeIndex][etaIndex]) {
+ ratio = m_caloRelBias[decayModeIndex][etaIndex]->Eval(caloEt);
}
-
- double sigma_tauRec = getResolutionTaurec( et_tauRec, etaIndex, mode );
- double sigma_cb2PT = getResolutionCellBased2PanTau( et_cb2PT, etaIndex, mode );
-
- variables.sigma_tauRec = sigma_tauRec;
- variables.sigma_constituent = sigma_cb2PT;
- variables.corrcoeff = getCorrelationCoefficient(etaIndex, mode );
+
+ double caloCalEt = caloEt - ratio * caloEt;
- double combined_res = std::sqrt( std::pow( variables.sigma_tauRec, 2)
- + std::pow( sigma_cb2PT, 2)
- - 2 * getCorrelationCoefficient(etaIndex, mode ) * variables.sigma_tauRec * sigma_cb2PT );
-
- return combined_res;
+ return caloCalEt;
}
-//_____________________________________________________________________________
-// WARNING! likely unexpected behaviour for et_cb2PT_postcalib in case of non-supported DecayMode, FIXME
-double CombinedP4FromRecoTaus::getCellbased2PantauEt(const double& et_cb2PT,
- const int& etaIndex,
- const xAOD::TauJetParameters::DecayMode& mode,
- double& et_cb2PT_postcalib) const {
+
+
+double CombinedP4FromRecoTaus::getPanTauCalEt(const double& panTauEt,
+ const int& decayModeIndex,
+ const int& etaIndex) const {
+ // ratio stored in the calibration graph equals (panTauEt-truthEt)/panTauEt
+ double ratio = 0.0;
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- return et_cb2PT;
+ // Substructure is bad determined at high pt, as track momentum is pooryly measured
+ if (panTauEt <= m_panTauRelBiasMaxEt[decayModeIndex][etaIndex]) {
+ ratio = m_panTauRelBias[decayModeIndex][etaIndex]->Eval(panTauEt);
}
- et_cb2PT_postcalib = et_cb2PT - getMeanCellBased2PanTau(et_cb2PT,etaIndex, mode);
+ double panTauCalEt = panTauEt - ratio * panTauEt;
- return et_cb2PT_postcalib;
+ return panTauCalEt;
}
-//_____________________________________________________________________________
-// WARNING! likely unexpected behaviour for et_cb2PT_postcalib in case of non-supported DecayMode, FIXME
-double CombinedP4FromRecoTaus::getTauRecEt(const double& et,
- const int& etaIndex,
- const xAOD::TauJetParameters::DecayMode& mode,
- double& et_postcalib) const {
-
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- return et;
- }
-
- et_postcalib = et - getMeanTauRec(et, etaIndex, mode);
- return et_postcalib;
-}
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getCombinedEt(const double& et_tauRec,
- const double& et_substructure,
- const float& eta,
- const xAOD::TauJetParameters::DecayMode& mode,
- Variables& variables) const {
- ATH_MSG_DEBUG("Entering CombinedP4FromRecoTaus::getCombinedEt");
+double CombinedP4FromRecoTaus::getCaloResolution(const xAOD::TauJet& tau) const {
+ // Assume the resolution to be 100% when no calibraction is available
+ if (! isValid(tau)) return 1.0;
+
+ xAOD::TauJetParameters::DecayMode decayMode = getDecayMode(tau);
+ int decayModeIndex = getDecayModeIndex(decayMode);
- int etaIndex = getIndexEta(eta);
- ATH_MSG_DEBUG("Eta = " << eta << " , eta bin = " << etaIndex );
+ // FIXME: At which calibration state ???
+ int etaIndex = getEtaIndex(tau.eta());
+
+ // FIXME: At which calibration state ???
+ return getCaloResolution(tau.pt(), etaIndex, decayModeIndex);
+}
- double et_reco = getWeightedEt( et_tauRec, et_substructure, etaIndex, mode, variables);
- ATH_MSG_DEBUG( "getWeightedEt: " << et_reco );
- variables.combined_res = getCombinedResolution( et_tauRec, et_substructure, etaIndex, mode, variables );
- ATH_MSG_DEBUG( "Combined_resolution: " << variables.combined_res );
- ATH_MSG_DEBUG( getNsigmaCompatibility(et_tauRec) << "*Combined_resolution: " << getNsigmaCompatibility(et_tauRec)*variables.combined_res);
- double et_diff = getTauRecEt( et_tauRec, etaIndex, mode, variables.et_postcalib ) - getCellbased2PantauEt( et_substructure, etaIndex, mode, variables.et_cb2PT_postcalib );
- ATH_MSG_DEBUG( "et_diff (getTauRecEt - GetCellb2PEt): " << et_diff );
- if( std::abs( et_diff ) > getNsigmaCompatibility(et_tauRec)*variables.combined_res) {
- et_reco = et_tauRec;
- }
- return et_reco;
+double CombinedP4FromRecoTaus::getCaloResolution(const double& et, const int& decayModeIndex, const int& etaIndex) const {
+ double x = std::min(et, m_caloResMaxEt[decayModeIndex][etaIndex]);
+ double resolution = m_caloRes[decayModeIndex][etaIndex]->Eval(x);
+
+ return resolution;
}
-//_____________________________________________________________________________
-TLorentzVector CombinedP4FromRecoTaus::getCombinedP4(const xAOD::TauJet& tau, Variables& variables) const {
- ATH_MSG_DEBUG( "In CombinedP4FromRecoTaus::getCombinedP4..." );
- const TLorentzVector& tauRecP4 = tau.p4();
- const TLorentzVector& substructureP4 = tau.p4(xAOD::TauJetParameters::PanTauCellBased);
-
- ATH_MSG_DEBUG( "TauRecET: " << tauRecP4.Et() );
- ATH_MSG_DEBUG( "ConstituentET: " << substructureP4.Et() );
- xAOD::TauJetParameters::DecayMode decayMode = xAOD::TauJetParameters::DecayMode::Mode_Error;
- int tmpDecayMode;
- if (tau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_DecayMode, tmpDecayMode)) {
- decayMode = static_cast< xAOD::TauJetParameters::DecayMode>(tmpDecayMode);
- }
+double CombinedP4FromRecoTaus::getPanTauResolution(const double& et, const int& decayModeIndex, const int& etaIndex) const {
+ double x = std::min(et, m_panTauResMaxEt[decayModeIndex][etaIndex]);
+ double resolution = m_panTauRes[decayModeIndex][etaIndex]->Eval(x);
+
+ return resolution;
+}
- //Return tauRec P4 if tau is no pantau candidate or pantau decay mode is unequal 1P or 3P
- int isPanTauCandidate;
- tau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_isPanTauCandidate, isPanTauCandidate);
- int DecayMode;
- tau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_DecayMode, DecayMode);
- ATH_MSG_DEBUG( "tau IsPanTauCandidate = " << isPanTauCandidate );
- if (isPanTauCandidate == 0 || DecayMode>xAOD::TauJetParameters::Mode_3pXn || std::abs(tauRecP4.Eta()) > 2.5) {
- variables.et_cb2PT_postcalib = substructureP4.Et();
- variables.et_postcalib = tauRecP4.Et();
- variables.et_weighted = tauRecP4.Et();
- return tauRecP4;
- }
+double CombinedP4FromRecoTaus::getWeight(const double& caloSigma,
+ const double& panTauSigma,
+ const double& correlation) const {
+ double cov = correlation * caloSigma * panTauSigma;
+ double caloWeight = std::pow(panTauSigma, 2) - cov;
+ double panTauWeight = std::pow(caloSigma, 2) - cov;
- double combinedEt = getCombinedEt(tauRecP4.Et(), substructureP4.Et(), tauRecP4.Eta(), decayMode, variables);
- ATH_MSG_DEBUG( "combinedET: " << combinedEt );
+ return caloWeight/(caloWeight + panTauWeight);
+}
- TLorentzVector combinedP4;
-
- //double combinedM = 0;
- //double combinedPt = std::sqrt(std::pow(combinedEt,2) - std::pow(combinedM,2));
- //combinedP4.SetPtEtaPhiM(combinedPt, substructureP4.Eta(), substructureP4.Phi(), combinedM);
- combinedP4.SetPtEtaPhiM(combinedEt, substructureP4.Eta(), substructureP4.Phi(), 0.);
- return combinedP4;
+double CombinedP4FromRecoTaus::getCombinedSigma(const double& caloSigma,
+ const double& panTauSigma,
+ const double& correlation) const {
+ // FIXME: the calculation seems not right
+ double combinedSigma2 = std::pow(caloSigma, 2) + std::pow(panTauSigma, 2)
+ - 2 * correlation * caloSigma * panTauSigma;
+
+ return std::sqrt(combinedSigma2);
}
-//_____________________________________________________________________________
-float CombinedP4FromRecoTaus::getNsigmaCompatibility(const float& et_TauRec) const {
- float nsigma = m_Nsigma_compatibility->Eval(et_TauRec);
- if(nsigma<0) return 0.;
+double CombinedP4FromRecoTaus::getNsigmaCompatibility(const double& et) const {
+ double nsigma = m_nSigmaCompatibility->Eval(et);
+
+ if (nsigma < 0.) return 0.;
return nsigma;
}
-//_____________________________________________________________________________
-double CombinedP4FromRecoTaus::getCaloResolution(const xAOD::TauJet& tau) const {
- ATH_MSG_DEBUG("Entering getCaloResolution!");
-
- double et = tau.pt();
- xAOD::TauJetParameters::DecayMode mode = xAOD::TauJetParameters::DecayMode::Mode_Error;
- int tmpDecayMode;
- if (tau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_DecayMode, tmpDecayMode)) {
- mode = static_cast< xAOD::TauJetParameters::DecayMode>(tmpDecayMode);
+double CombinedP4FromRecoTaus::getCombinedEt(const double& caloEt,
+ const double& panTauEt,
+ const xAOD::TauJetParameters::DecayMode& decayMode,
+ const float& eta,
+ Variables& variables) const {
+ // Obtain the index of calibration graph
+ int decayModeIndex = getDecayModeIndex(decayMode);
+ int etaIndex = getEtaIndex(eta);
+
+ // Obtain the calibration parameter based on the index
+ // -- Correlation between calo TES and PanTau
+ double correlation = getCorrelation(decayModeIndex, etaIndex);
+
+ // -- Sigma of the difference between reconstruted et and truth et at calo TES
+ double caloSigma = caloEt * getCaloResolution(caloEt, decayModeIndex, etaIndex);
+ if (0. == caloSigma) {
+ ATH_MSG_WARNING("Calo TES: Et resolution at " << caloEt << " is 0");
+ m_caloRes[decayModeIndex][etaIndex]->Print("all");
+ return 0.;
}
-
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_DEBUG("PanTau decay mode > 3PXN! Return false");
- // need to derive 2p parametrisation, undefined behaviour, for now return Et
- return et;
+
+ // -- Sigma of the difference between reconstruted et and truth et at PanTau
+ double panTauSigma = panTauEt * getPanTauResolution(panTauEt, decayModeIndex, etaIndex);
+ if (0. == panTauSigma) {
+ ATH_MSG_WARNING("PanTau: Et resolution at " << panTauEt << " is 0");
+ m_panTauRes[decayModeIndex][etaIndex]->Print("all");
+ return 0.;
}
+
+ // -- Et at calo TES with bias corrected
+ double caloCalEt = getCaloCalEt(caloEt, decayModeIndex, etaIndex);
+
+ // -- Et at PanTau with bias corrected
+ double panTauCalEt = getPanTauCalEt(panTauEt, decayModeIndex, etaIndex);
+
+ // Combination of calo TES and PanTau
+ // FIXME: A more consistent way would be calculating the weight use bias corrected Et as input
+ double weight = getWeight(caloSigma, panTauSigma, correlation);
+ double weightedEt = weight * caloCalEt + (1 - weight) * panTauCalEt;
+ double combinedSigma = getCombinedSigma(caloSigma, panTauSigma, correlation);
+
+ // FIXME: weighteEt will be updated in case the difference of calo TES and PanTau is too large
+ variables.pt_weighted = weightedEt;
+
+ // If the difference of calo TES and PanTau is too large, the combined result
+ // may not be reliable
+ // FIXME: A more consistent way would be calculating the NsigmaCompatibility use caloCalEt
+ double deltaEt = caloCalEt - panTauCalEt;
+ if (std::abs(deltaEt) > getNsigmaCompatibility(caloEt) * combinedSigma) {
+ // FIXME: Why not use caloCalEt here ?
+ weightedEt = caloEt;
+ }
+
+ // Store the results
+ variables.corrcoeff = correlation;
+ variables.sigma_tauRec = caloSigma;
+ variables.sigma_constituent = panTauSigma;
+ variables.pt_tauRecCalibrated = caloCalEt;
+ variables.pt_constituent = panTauCalEt;
+ variables.weight = weight;
+ variables.sigma_combined = combinedSigma;
+
+ ATH_MSG_DEBUG("Intermediate results\n" <<
+ "coff: " << correlation << " sigma(calo): " << caloSigma << " sigma(constituent): " << panTauSigma <<
+ "\ncalibrated et(calo): " << caloCalEt << " calibrated et(constituent): " << panTauCalEt <<
+ "\nweight:" << weight << " combined et: " << weightedEt << " combined sigma: " << combinedSigma);
+
+ return weightedEt;
+}
- int etaIndex = getIndexEta(tau.eta());
- if( etaIndex > 4 ){
- ATH_MSG_DEBUG("eta > 2.7. Return false");
- // not upgrade-friendly, undefined behaviour, for now return Et
- return et;
- }
- double MaxEt = TMath::MaxElement(m_resTGraph_tauRec[etaIndex][mode]->GetN(),m_resTGraph_tauRec[etaIndex][mode]->GetX());
- if (et > MaxEt){
- return m_resTGraph_tauRec[etaIndex][mode]->Eval(MaxEt) * et;
- }
- return m_resTGraph_tauRec[etaIndex][mode]->Eval(et) * et;
-}
+TLorentzVector CombinedP4FromRecoTaus::getCombinedP4(const xAOD::TauJet& tau, Variables& variables) const {
+ const TLorentzVector& caloP4 = tau.p4(xAOD::TauJetParameters::TauEtaCalib);
+ const TLorentzVector& panTauP4 = tau.p4(xAOD::TauJetParameters::PanTauCellBased);
+
+ ATH_MSG_DEBUG("Four momentum at calo TES, pt: " << caloP4.Pt() << " eta: " << caloP4.Eta() <<
+ " phi: " << caloP4.Phi() << " mass: " << caloP4.M());
+ ATH_MSG_DEBUG("Four momentum at PanTau, pt: " << panTauP4.Pt() << " eta: " << panTauP4.Eta() <<
+ " phi: " << panTauP4.Phi() << " mass: " << panTauP4.M());
-//_____________________________________________________________________________
-bool CombinedP4FromRecoTaus::getUseCaloPtFlag(const xAOD::TauJet& tau) const {
- ATH_MSG_DEBUG("Entering getUseCaloPtFlag!");
+ xAOD::TauJetParameters::DecayMode decayMode = getDecayMode(tau);
- xAOD::TauJetParameters::DecayMode mode = xAOD::TauJetParameters::DecayMode::Mode_Error;
- int tmpDecayMode;
- if (tau.panTauDetail(xAOD::TauJetParameters::PanTauDetails::PanTau_DecayMode, tmpDecayMode)) {
- mode = static_cast< xAOD::TauJetParameters::DecayMode>(tmpDecayMode);
- }
-
- if( mode < xAOD::TauJetParameters::Mode_1p0n || mode > xAOD::TauJetParameters::Mode_3pXn ){
- ATH_MSG_DEBUG("PanTau decay mode > 3PXN! Return false");
- return false;
- }
+ double combinedEt = getCombinedEt(caloP4.Et(), panTauP4.Et(), decayMode, caloP4.Eta(), variables);
- int etaIndex = getIndexEta(tau.eta());
- if( etaIndex > 4 ){
- ATH_MSG_DEBUG("eta > 2.7. Return false");
- return false;
- }
-
- double tauRec_res = getCaloResolution(tau);
- double et_diff = tau.ptFinalCalib() - tau.pt();
-
- bool UseCaloPt = false;
- if( et_diff > 5*tauRec_res) {
- UseCaloPt = true;
- }
+ // Et is the combination of calo TES and PanTau, but eta and phi is from PanTau
+ TLorentzVector combinedP4;
+ combinedP4.SetPtEtaPhiM(combinedEt, panTauP4.Eta(), panTauP4.Phi(), 0.);
- return UseCaloPt;
+ ATH_MSG_DEBUG("Combined four momentum, pt: " << combinedP4.Pt() << " eta: " << combinedP4.Eta() <<
+ " phi: " << combinedP4.Phi() << " mass: " << combinedP4.M());
+
+ return combinedP4;
}
diff --git a/Reconstruction/tauRecTools/Root/HelperFunctions.cxx b/Reconstruction/tauRecTools/Root/HelperFunctions.cxx
index 354236c3b8a1b60b7c098b23cdc038ca6c6feee6..b77abacca7598aca734a4b9ec6bd91a5ba596e53 100644
--- a/Reconstruction/tauRecTools/Root/HelperFunctions.cxx
+++ b/Reconstruction/tauRecTools/Root/HelperFunctions.cxx
@@ -148,7 +148,7 @@ std::unique_ptr<MVAUtils::BDT> tauRecTools::configureMVABDT(std::vector<TString>
-const StatusCode tauRecTools::GetJetClusterList(const xAOD::Jet* jet, std::vector<const xAOD::CaloCluster*> &clusterList, bool incShowerSubtracted) {
+const StatusCode tauRecTools::GetJetClusterList(const xAOD::Jet* jet, std::vector<const xAOD::CaloCluster*> &clusterList, bool useSubtractedCluster) {
using namespace tauRecTools::msgHelperFunction;
// If using subtracted clusters, need to store unmodified to check if charged are duplicates
@@ -176,7 +176,7 @@ const StatusCode tauRecTools::GetJetClusterList(const xAOD::Jet* jet, std::vecto
continue;
}
- if (incShowerSubtracted){
+ if (useSubtractedCluster){
ElementLink<xAOD::CaloClusterContainer> subClusLink;
pfo->attribute("PFOShowerSubtractedClusterLink", subClusLink);
if ( !subClusLink.isValid() ){
@@ -185,7 +185,6 @@ const StatusCode tauRecTools::GetJetClusterList(const xAOD::Jet* jet, std::vecto
}
else {
clusterList.push_back( (*subClusLink) );
- dupList.push_back( pfo->cluster(0) );
}
}
else {
@@ -198,10 +197,7 @@ const StatusCode tauRecTools::GetJetClusterList(const xAOD::Jet* jet, std::vecto
}
}
- // Get clusters from charged PFOs
- std::vector<const xAOD::CaloCluster*> checkList;
- if (incShowerSubtracted) checkList = dupList;
- else checkList = clusterList;
+ if (useSubtractedCluster) return StatusCode::SUCCESS;
for (const xAOD::JetConstituent* constituent : constituents){
if ( constituent->type() != xAOD::Type::ParticleFlow ) break;
@@ -212,9 +208,8 @@ const StatusCode tauRecTools::GetJetClusterList(const xAOD::Jet* jet, std::vecto
for (u_int index=0; index<pfo->nCaloCluster(); index++){
const xAOD::CaloCluster* cluster = pfo->cluster(index);
// check it is not duplicate of one in neutral list
- if ( std::find(checkList.begin(), checkList.end(), cluster) == checkList.end() ) {
+ if ( std::find(clusterList.begin(), clusterList.end(), cluster) == clusterList.end() ) {
clusterList.push_back(cluster);
- checkList.push_back(cluster);
}
}
}
diff --git a/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx b/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
index 292e8e2fc3a90fce14eb49699f4a05a1ccbcd9ae..169ead2075a75e9036262e953e0d52ba177b707d 100644
--- a/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
+++ b/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
@@ -14,7 +14,7 @@
//_____________________________________________________________________________
MvaTESVariableDecorator::MvaTESVariableDecorator(const std::string& name)
: TauRecToolBase(name) {
- declareProperty("IncShowerSubtr", m_incShowerSubtr = true, "use shower subtracted clusters in calo calculations");
+ declareProperty("UseSubtractedCluster", m_useSubtractedCluster = true, "use shower subtracted clusters in calo calculations");
}
//_____________________________________________________________________________
@@ -94,7 +94,7 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
// Loop through jets, get links to clusters
std::vector<const xAOD::CaloCluster*> clusterList;
- ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, clusterList, m_incShowerSubtr));
+ ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, clusterList, m_useSubtractedCluster));
// Loop through clusters and jet constituents
for (const xAOD::CaloCluster* cluster : clusterList){
@@ -153,6 +153,8 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) const {
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanEMProbability, (float) mean_em_probability);
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanSecondLambda, (float) mean_second_lambda);
xTau.setDetail(xAOD::TauJetParameters::ClustersMeanPresamplerFrac, (float) mean_presampler_frac);
+ SG::AuxElement::Accessor<float> acc_ClusterTotalEnergy("ClusterTotalEnergy");
+ acc_ClusterTotalEnergy(xTau) = (float) Etot;
// online-specific, not defined in TauDefs enum
SG::AuxElement::Accessor<float> acc_LeadClusterFrac("LeadClusterFrac");
diff --git a/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx b/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx
index 6df31f25c0a60e67ceec2290f361eaebfee63204..b2606be19621dc043ebb987a7cfcb939ab2e9e1c 100644
--- a/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx
@@ -21,9 +21,9 @@ const float TauIDVarCalculator::LOW_NUMBER = -1111.;
TauIDVarCalculator::TauIDVarCalculator(const std::string& name):
TauRecToolBase(name),
- m_incShowerSubtr(true)
+ m_useSubtractedCluster(true)
{
- declareProperty("IncShowerSubtr", m_incShowerSubtr);
+ declareProperty("UseSubtractedCluster", m_useSubtractedCluster);
}
StatusCode TauIDVarCalculator::initialize()
@@ -35,10 +35,8 @@ StatusCode TauIDVarCalculator::initialize()
StatusCode TauIDVarCalculator::execute(xAOD::TauJet& tau) const
{
static const SG::AuxElement::Accessor<float> acc_absipSigLeadTrk("absipSigLeadTrk");
- float ipSigLeadTrk=0.;
- if(!tau.detail(xAOD::TauJetParameters::ipSigLeadTrk, ipSigLeadTrk))
- return StatusCode::FAILURE;
- acc_absipSigLeadTrk(tau) = std::abs(ipSigLeadTrk);
+
+ acc_absipSigLeadTrk(tau) = (tau.nTracks()>0) ? std::abs(tau.track(0)->d0SigTJVA()) : 0.;
if(inTrigger()) return StatusCode::SUCCESS;
@@ -95,7 +93,7 @@ StatusCode TauIDVarCalculator::execute(xAOD::TauJet& tau) const
TLorentzVector tauAxis = m_tauVertexCorrection->getTauAxis(tau);
std::vector<const xAOD::CaloCluster*> clusterList;
- ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, clusterList, m_incShowerSubtr));
+ ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, clusterList, m_useSubtractedCluster));
float eEMAtEMScaleFixed = 0.;
float eHadAtEMScaleFixed = 0.;
diff --git a/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx b/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx
index e5ca38e7aa873a7dd34fe7a615117422dfb62c13..347086ea491597b146ba40547114855e9cbba0b3 100644
--- a/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx
@@ -32,7 +32,7 @@ TauJetRNNEvaluator::TauJetRNNEvaluator(const std::string &name):
declareProperty("OutputLayer", m_output_layer = "rnnid_output");
declareProperty("OutputNode", m_output_node = "sig_prob");
- declareProperty("IncShowerSubtr", m_incShowerSubtr = true, "use shower subtracted clusters in calo calculations");
+ declareProperty("UseSubtractedCluster", m_useSubtractedCluster = true, "use shower subtracted clusters in calo calculations");
}
TauJetRNNEvaluator::~TauJetRNNEvaluator() {}
@@ -194,7 +194,7 @@ StatusCode TauJetRNNEvaluator::get_clusters(
TLorentzVector tauAxis = m_tauVertexCorrection->getTauAxis(tau);
std::vector<const xAOD::CaloCluster*> clusters;
- ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, clusters, m_incShowerSubtr));
+ ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, clusters, m_useSubtractedCluster));
// remove clusters that do not meet dR requirement
auto cItr = clusters.begin();
diff --git a/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx b/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx
index 317104d80a8167035e75727cdaefc3b20fafdd50..5418e2a5db42b42019b6e1447df5de3225d5b738 100644
--- a/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx
+++ b/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx
@@ -187,10 +187,9 @@ bool innerTrkAvgDist(const xAOD::TauJet &tau, double &out) {
}
bool absipSigLeadTrk(const xAOD::TauJet &tau, double &out) {
- float ipSigLeadTrk;
- const auto success = tau.detail(TauDetail::ipSigLeadTrk, ipSigLeadTrk);
- out = std::min(TMath::Abs(ipSigLeadTrk), 30.0f);
- return success;
+ float ipSigLeadTrk = (tau.nTracks()>0) ? tau.track(0)->d0SigTJVA() : 0.;
+ out = std::min(std::abs(ipSigLeadTrk), 30.0f);
+ return true;
}
bool SumPtTrkFrac(const xAOD::TauJet &tau, double &out) {
@@ -360,13 +359,13 @@ bool pt_jetseed_log(const xAOD::TauJet &tau, const xAOD::TauTrack& /*track*/,
bool d0_abs_log(const xAOD::TauJet& /*tau*/, const xAOD::TauTrack &track,
double &out) {
- out = std::log10(TMath::Abs(track.track()->d0()) + 1e-6);
+ out = std::log10(TMath::Abs(track.d0TJVA()) + 1e-6);
return true;
}
-bool z0sinThetaTJVA_abs_log(const xAOD::TauJet& tau, const xAOD::TauTrack &track,
+bool z0sinThetaTJVA_abs_log(const xAOD::TauJet& /*tau*/, const xAOD::TauTrack &track,
double &out) {
- out = std::log10(TMath::Abs(track.z0sinThetaTJVA(tau)) + 1e-6);
+ out = std::log10(TMath::Abs(track.z0sinthetaTJVA()) + 1e-6);
return true;
}
@@ -496,7 +495,7 @@ bool CENTER_LAMBDA(const xAOD::TauJet& /*tau*/, const xAOD::CaloCluster &cluster
return success;
}
-bool SECOND_LAMBDAOverClustersMeanSecondLambda (const xAOD::TauJet &tau, const xAOD::CaloCluster &cluster, double &out){
+bool SECOND_LAMBDAOverClustersMeanSecondLambda(const xAOD::TauJet &tau, const xAOD::CaloCluster &cluster, double &out) {
float ClustersMeanSecondLambda = tau.auxdata<float>("ClustersMeanSecondLambda");
double secondLambda(0);
@@ -507,7 +506,7 @@ bool SECOND_LAMBDAOverClustersMeanSecondLambda (const xAOD::TauJet &tau, const
return success;
}
-bool CENTER_LAMBDAOverClustersMeanCenterLambda (const xAOD::TauJet &tau, const xAOD::CaloCluster &cluster, double &out){
+bool CENTER_LAMBDAOverClustersMeanCenterLambda(const xAOD::TauJet &tau, const xAOD::CaloCluster &cluster, double &out) {
float ClustersMeanCenterLambda = tau.auxdata<float>("ClustersMeanCenterLambda");
double centerLambda(0);
@@ -524,49 +523,20 @@ bool CENTER_LAMBDAOverClustersMeanCenterLambda (const xAOD::TauJet &tau, const
}
-bool FirstEngDensOverClustersMeanFirstEngDens (const xAOD::TauJet &tau, const xAOD::CaloCluster &cluster, double &out){
- if (!tau.jetLink().isValid()){
- return false;
- }
- const xAOD::Jet *jetSeed = tau.jet();
-
- std::vector<const xAOD::CaloCluster *> clusters;
- bool incShowerSubtracted(true);
- auto check_tauClusters = tauRecTools::GetJetClusterList(jetSeed, clusters, incShowerSubtracted);
-
- std::size_t nClustersTotal = clusters.size();
-
- // Number of tracks to save
- std::size_t nClustersSave = nClustersTotal;
- std::size_t n_clusterMax(6);
- if (n_clusterMax > 0) {
- nClustersSave = std::min((n_clusterMax),nClustersTotal);
- }
- // Sort clusters in descending et order
- auto et_cmp = [](const xAOD::CaloCluster *lhs,
- const xAOD::CaloCluster *rhs) {
- return lhs->et() > rhs->et();
- };
- std::sort(clusters.begin(), clusters.end(), et_cmp);
-
- float Etot(0.);
- using MomentType = xAOD::CaloCluster::MomentType;
- const xAOD::CaloCluster *cls(0);
- for (std::size_t i = 0; i < nClustersSave; ++i) {
- cls = clusters[i];
-
- TLorentzVector cluster_P4 = cls->p4(xAOD::CaloCluster::State::CALIBRATED);
- Etot += cls->calE();
- }
-
+bool FirstEngDensOverClustersMeanFirstEngDens(const xAOD::TauJet &tau, const xAOD::CaloCluster &cluster, double &out) {
// the ClustersMeanFirstEngDens is the log10 of the energy weighted average of the First_ENG_DENS
// divided by ETot to make it dimension-less,
- // so we need to evaluate the differance of log10(cluster_firstEngDens) and the ClustersMeanFirstEngDens
- float min_FirstEng = 1e-10;
- float cluster_FirstEngDens = std::max(cluster.getMomentValue(MomentType::FIRST_ENG_DENS), (double)min_FirstEng);
- out = std::log10(cluster_FirstEngDens/std::max(Etot, min_FirstEng)) - tau.auxdata<float>("ClustersMeanFirstEngDens");
+ // so we need to evaluate the differance of log10(clusterFirstEngDens/clusterTotalEnergy) and the ClustersMeanFirstEngDens
+ double clusterFirstEngDens = 0.0;
+ bool status = cluster.retrieveMoment(MomentType::FIRST_ENG_DENS, clusterFirstEngDens);
+ if (clusterFirstEngDens < 1e-6) clusterFirstEngDens = 1e-6;
+
+ float clusterTotalEnergy = tau.auxdata<float>("ClusterTotalEnergy");
+ if (clusterTotalEnergy < 1e-6) clusterTotalEnergy = 1e-6;
+
+ out = std::log10(clusterFirstEngDens/clusterTotalEnergy) - tau.auxdata<float>("ClustersMeanFirstEngDens");
- return true;
+ return status;
}
} // namespace Cluster
diff --git a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
index a0d2165874ae9b134f8288faa915fa2a2623cdd9..a7a912ba553dd89ba69384f008ccec0e4bdb9c3c 100644
--- a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
+++ b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
@@ -148,7 +148,7 @@ StatusCode TauRecToolBase::executeDev(xAOD::TauJet&) {
return StatusCode::FAILURE;
}
#else
-StatusCode TauRecToolBase::executePi0CreateROI(xAOD::TauJet& /*pTau*/, CaloCellContainer& /*caloCellContainer*/, std::vector<CaloCell*>& /*map*/ ) const {
+StatusCode TauRecToolBase::executePi0CreateROI(xAOD::TauJet& /*pTau*/, CaloCellContainer& /*caloCellContainer*/, boost::dynamic_bitset<>& /*map*/ ) const {
ATH_MSG_ERROR("function not implemented");
return StatusCode::FAILURE;
}
diff --git a/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx b/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx
index dd0f79b48d9e9eeaa3658c6bc8166160a048b222..e15156219c4c5c7e285d4cdb2af650c5b24392be 100644
--- a/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx
+++ b/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx
@@ -27,7 +27,7 @@ const float TauSubstructureVariables::DEFAULT = -1111.;
TauSubstructureVariables::TauSubstructureVariables( const std::string& name )
: TauRecToolBase(name) {
- declareProperty("IncShowerSubtr", m_incShowerSubtr = true);
+ declareProperty("UseSubtractedCluster", m_useSubtractedCluster = true);
}
@@ -47,7 +47,7 @@ StatusCode TauSubstructureVariables::initialize() {
StatusCode TauSubstructureVariables::execute(xAOD::TauJet& pTau) const {
CaloClusterVariables CaloClusterVariablesTool;
- CaloClusterVariablesTool.setIncSub(m_incShowerSubtr);
+ CaloClusterVariablesTool.setIncSub(m_useSubtractedCluster);
bool isFilled = CaloClusterVariablesTool.update(pTau, m_tauVertexCorrection);
@@ -98,7 +98,7 @@ StatusCode TauSubstructureVariables::execute(xAOD::TauJet& pTau) const {
TLorentzVector tauAxis = m_tauVertexCorrection->getTauAxis(pTau);
std::vector<const xAOD::CaloCluster*> vClusters;
- ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, vClusters, m_incShowerSubtr));
+ ATH_CHECK(tauRecTools::GetJetClusterList(jetSeed, vClusters, m_useSubtractedCluster));
for (auto cluster : vClusters){
totalEnergy += cluster->e();
diff --git a/Reconstruction/tauRecTools/Root/TauTrackClassifier.cxx b/Reconstruction/tauRecTools/Root/TauTrackClassifier.cxx
index d669aabd04fa6695c9deea0a0e6180e28b20efa4..f320f1f94a764c0769bfe4cafe43bd7455d0373e 100644
--- a/Reconstruction/tauRecTools/Root/TauTrackClassifier.cxx
+++ b/Reconstruction/tauRecTools/Root/TauTrackClassifier.cxx
@@ -81,7 +81,6 @@ StatusCode TauTrackClassifier::executeTrackClassifier(xAOD::TauJet& xTau, xAOD::
}
xTau.setDetail(xAOD::TauJetParameters::nModifiedIsolationTracks, (int) xTau.nTracks(xAOD::TauJetParameters::modifiedIsolationTrack));
-
return StatusCode::SUCCESS;
}
@@ -198,14 +197,14 @@ StatusCode TrackMVABDT::calculateVariables(const xAOD::TauTrack& xTrack, const x
valueMap["TracksAuxDyn.jetSeedPt"] = xTau.ptJetSeed();
valueMap["TracksAuxDyn.tauPt"] = xTau.ptIntermediateAxis();
valueMap["TracksAuxDyn.tauEta"] = xTau.etaIntermediateAxis();
- valueMap["TracksAuxDyn.z0sinThetaTJVA"] = xTrack.z0sinThetaTJVA(xTau);
- valueMap["TracksAuxDyn.rConv"] = xTrack.rConv(xTau);
- valueMap["TracksAuxDyn.rConvII"] = xTrack.rConvII(xTau);
- valueMap["TauTracksAuxDyn.rConv/TauTracksAuxDyn.rConvII"] = xTrack.rConv(xTau)/xTrack.rConvII(xTau);
+ valueMap["TracksAuxDyn.z0sinThetaTJVA"] = xTrack.z0sinthetaTJVA();
+ valueMap["TracksAuxDyn.rConv"] = xTrack.rConv();
+ valueMap["TracksAuxDyn.rConvII"] = xTrack.rConvII();
+ valueMap["TauTracksAuxDyn.rConv/TauTracksAuxDyn.rConvII"] = xTrack.rConv()/xTrack.rConvII();
valueMap["TracksAuxDyn.DRJetSeedAxis"] = xTrack.dRJetSeedAxis(xTau);
valueMap["TracksAuxDyn.dRJetSeedAxis"] = xTrack.dRJetSeedAxis(xTau);
valueMap["TracksAuxDyn.trackEta"] = xTrackParticle->eta();
- valueMap["TracksAux.d0"] = xTrackParticle->d0();
+ valueMap["TracksAux.d0"] = xTrack.d0TJVA();
valueMap["TracksAux.qOverP"] = xTrackParticle->qOverP();
valueMap["TracksAux.theta"] = xTrackParticle->theta();
valueMap["TracksAux.eProbabilityHT"] = fTracksEProbabilityHT;
@@ -224,13 +223,13 @@ StatusCode TrackMVABDT::calculateVariables(const xAOD::TauTrack& xTrack, const x
valueMap["TauTracksAuxDyn.jetSeedPt"] = xTau.ptJetSeed();
valueMap["TauTracksAuxDyn.tauPt"] = xTau.ptIntermediateAxis();
valueMap["TauTracksAuxDyn.tauEta"] = xTau.etaIntermediateAxis();
- valueMap["TauTracksAuxDyn.z0sinThetaTJVA"] = xTrack.z0sinThetaTJVA(xTau);
- valueMap["TauTracksAuxDyn.rConv"] = xTrack.rConv(xTau);
- valueMap["TauTracksAuxDyn.rConvII"] = xTrack.rConvII(xTau);
- valueMap["TauTracksAuxDyn.rConv/TauTracksAuxDyn.rConvII"] = xTrack.rConv(xTau)/xTrack.rConvII(xTau);
+ valueMap["TauTracksAuxDyn.z0sinThetaTJVA"] = xTrack.z0sinthetaTJVA();
+ valueMap["TauTracksAuxDyn.rConv"] = xTrack.rConv();
+ valueMap["TauTracksAuxDyn.rConvII"] = xTrack.rConvII();
+ valueMap["TauTracksAuxDyn.rConv/TauTracksAuxDyn.rConvII"] = xTrack.rConv()/xTrack.rConvII();
valueMap["TauTracksAuxDyn.dRJetSeedAxis"] = xTrack.dRJetSeedAxis(xTau);
valueMap["TauTracksAuxDyn.trackEta"] = xTrackParticle->eta();
- valueMap["TauTracksAuxDyn.d0"] = xTrackParticle->d0();
+ valueMap["TauTracksAuxDyn.d0"] = xTrack.d0TJVA();
valueMap["TauTracksAuxDyn.qOverP"] = xTrackParticle->qOverP();
valueMap["TauTracksAuxDyn.theta"] = xTrackParticle->theta();
valueMap["TauTracksAuxDyn.eProbabilityHT"] = fTracksEProbabilityHT;
diff --git a/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx b/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx
index 71b34dc43e82131b42d9f4264c24e79f73ec576c..d779e8d230dedf83747954545f10c70fb0dcd53c 100644
--- a/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx
+++ b/Reconstruction/tauRecTools/Root/TauTrackRNNClassifier.cxx
@@ -272,11 +272,11 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks, c
double fTrackPt = xTrackParticle->pt();
double fTrackEta = xTrackParticle->eta();
double fTrackCharge = xTrackParticle->charge();
- double fZ0SinthetaTJVA = xTrack->z0sinThetaTJVA(xTau);
- double fRConv = xTrack->rConv(xTau);
- double fRConvII = xTrack->rConvII(xTau);
+ double fZ0SinthetaTJVA = xTrack->z0sinthetaTJVA();
+ double fRConv = xTrack->rConv();
+ double fRConvII = xTrack->rConvII();
double fDRJetSeedAxis = xTrack->dRJetSeedAxis(xTau);
- double fD0 = xTrackParticle->d0();
+ double fD0 = xTrack->d0TJVA();
double fQoverP = xTrackParticle->qOverP();
uint8_t iTracksNumberOfInnermostPixelLayerHits = 0; ATH_CHECK( xTrackParticle->summaryValue(iTracksNumberOfInnermostPixelLayerHits, xAOD::numberOfInnermostPixelLayerHits) );
@@ -306,7 +306,7 @@ StatusCode TrackRNN::calulateVars(const std::vector<xAOD::TauTrack*>& vTracks, c
valueMap["log(rConv)"][i] = std::log(fRConv);
valueMap["tanh(rConvII/500)"][i] = std::tanh(fRConvII/500.0);
valueMap["dRJetSeedAxis"][i] = fDRJetSeedAxis;
- valueMap["tanh(d0/10)"][i] = std::tanh(fD0/10);
+ valueMap["tanh(d0/10)"][i] = std::tanh(fD0/10.);
valueMap["qOverP*1000"][i] = fQoverP*1000.0;
valueMap["numberOfInnermostPixelLayerHits"][i] = (float) iTracksNumberOfInnermostPixelLayerHits;
valueMap["numberOfPixelSharedHits"][i] = (float) iTracksNPixelSharedHits;
diff --git a/Reconstruction/tauRecTools/Root/TauVertexCorrection.cxx b/Reconstruction/tauRecTools/Root/TauVertexCorrection.cxx
index 56365e41b8dfbebe4f8143c59f99dac44b6bfd10..e0d01671503ec63adb5110c90ae81bff8732beff 100644
--- a/Reconstruction/tauRecTools/Root/TauVertexCorrection.cxx
+++ b/Reconstruction/tauRecTools/Root/TauVertexCorrection.cxx
@@ -16,16 +16,15 @@ TauVertexCorrection::TauVertexCorrection(const std::string& name):
StatusCode TauVertexCorrection::initialize() {
-
ATH_MSG_INFO("in initialize");
if (m_seedJet == "AntiKt4LCTopoJets") {
m_isPFO = false;
- m_isEMScale = false;
+ m_clusterState = xAOD::CaloCluster::State::CALIBRATED;
}
else if (m_seedJet == "AntiKt4EMPFlowJets") {
m_isPFO = true;
- m_isEMScale = true;
+ m_clusterState = xAOD::CaloCluster::State::UNCALIBRATED;
}
else {
ATH_MSG_ERROR("Seed jet " << m_seedJet << " not supported !");
@@ -36,7 +35,7 @@ StatusCode TauVertexCorrection::initialize() {
ATH_MSG_INFO("JetVertexCorrection: " << m_doJetVertexCorrection);
ATH_MSG_INFO("SeedJet: " << m_seedJet);
ATH_MSG_INFO("PFO: " << m_isPFO);
- ATH_MSG_INFO("EMScale: " << m_isEMScale);
+ ATH_MSG_INFO("Cluster Calibraction State: " << m_clusterState);
return StatusCode::SUCCESS;
}
@@ -77,13 +76,15 @@ TLorentzVector TauVertexCorrection::getTauAxis(const xAOD::TauJet& tau) const {
TLorentzVector TauVertexCorrection::getVertexCorrectedP4(const xAOD::CaloCluster& cluster,
const Amg::Vector3D& position) const {
- TLorentzVector vertexCorrectedP4 = xAOD::CaloVertexedTopoCluster(cluster, position).p4();
+ TLorentzVector vertexCorrectedP4 = xAOD::CaloVertexedTopoCluster(cluster, m_clusterState, position).p4();
ATH_MSG_DEBUG("Cluster: " << &cluster);
- ATH_MSG_DEBUG("Original cluster four momentum, pt: " << cluster.pt() <<
- " eta: " << cluster.eta() << " phi: " << cluster.phi() << " e: " << cluster.e());
+ ATH_MSG_DEBUG("Original cluster four momentum, pt: " << cluster.pt(m_clusterState) <<
+ " eta: " << cluster.eta(m_clusterState) << " phi: " << cluster.phi(m_clusterState) <<
+ " e: " << cluster.e(m_clusterState));
ATH_MSG_DEBUG("Vertex corrected four momentum, pt: " << vertexCorrectedP4.Pt() <<
- " eta: " << vertexCorrectedP4.Eta() << " phi: " << vertexCorrectedP4.Phi() << " e: " << vertexCorrectedP4.E());
+ " eta: " << vertexCorrectedP4.Eta() << " phi: " << vertexCorrectedP4.Phi() <<
+ " e: " << vertexCorrectedP4.E());
return vertexCorrectedP4;
}
@@ -96,27 +97,25 @@ TLorentzVector TauVertexCorrection::getVertexCorrectedP4(const xAOD::PFO& pfo,
if (!pfo.isCharged()) {
TVector3 pos(position.x(), position.y(), position.z());
-
- if (m_isEMScale) {
- vertexCorrectedP4 = pfo.GetVertexCorrectedEMFourVec(pos);
+
+ // If there is a vertex correction in jet reconstruction, then pfo.p4() is the four momentum
+ // at EM scale. Otherwise, pfo.p4() is at LC scale (not clear), and pfo.p4EM() is the four
+ // momentum at EM scale.
+ // TODO: May need further modifications, depending on how the jet reconstruction fix ATLJETMET-1280
+ // The strategy only works for PFlow at EM scale.
+ if (m_doJetVertexCorrection) {
+ vertexCorrectedP4 = pfo.GetVertexCorrectedFourVec(pos);
}
else {
- vertexCorrectedP4 = pfo.GetVertexCorrectedFourVec(pos);
+ vertexCorrectedP4 = pfo.GetVertexCorrectedEMFourVec(pos);
}
}
else {
vertexCorrectedP4 = pfo.p4();
}
- if (m_isEMScale) {
- ATH_MSG_DEBUG("Original pfo four momentum, pt: " << pfo.ptEM() <<
- " eta: " << pfo.etaEM() << " phi: " << pfo.phiEM() << " e: " << pfo.eEM());
- }
- else {
- ATH_MSG_DEBUG("Original pfo four momentum, pt: " << pfo.pt() <<
+ ATH_MSG_DEBUG("Original pfo four momentum, pt: " << pfo.pt() <<
" eta: " << pfo.eta() << " phi: " << pfo.phi() << " e: " << pfo.e());
- }
-
ATH_MSG_DEBUG("Vertex corrected four momentum, pt: " << vertexCorrectedP4.Pt() <<
" eta: " << vertexCorrectedP4.Eta() << " phi: " << vertexCorrectedP4.Phi() << " e: " << vertexCorrectedP4.E());
@@ -128,7 +127,7 @@ TLorentzVector TauVertexCorrection::getVertexCorrectedP4(const xAOD::PFO& pfo,
TLorentzVector TauVertexCorrection::getVertexCorrectedP4(const xAOD::CaloCluster& cluster,
const xAOD::Vertex* tauVertex,
const xAOD::Vertex* jetVertex) const {
- TLorentzVector vertexCorrectedP4 = cluster.p4();
+ TLorentzVector vertexCorrectedP4 = cluster.p4(m_clusterState);
Amg::Vector3D position;
// In jet reconstruction:
@@ -139,13 +138,20 @@ TLorentzVector TauVertexCorrection::getVertexCorrectedP4(const xAOD::CaloCluster
// for PFlow jets, while the relative position of the tau vertex and default vertex for Topo jets
// If not, use the default vertex to correct clusters from PFlow jets
if (m_doVertexCorrection) {
- if (m_isPFO) { // use the position of tau vertex
+ if (m_isPFO) {
+ // use the position of tau vertex if we want to correct to tau vertex and seed is PFO jets
if (tauVertex) {
position = tauVertex->position();
vertexCorrectedP4 = getVertexCorrectedP4(cluster, position);
}
+ // use the position of jet vertex if tau vertex not available
+ else if (m_doJetVertexCorrection && jetVertex) {
+ position = jetVertex->position();
+ vertexCorrectedP4 = getVertexCorrectedP4(cluster, position);
+ }
}
- else { // use the relative position of tau vertex and default vertex
+ else {
+ // use the relative position of tau vertex and default vertex for Topo jets
if (tauVertex && tauVertex != jetVertex) {
position = tauVertex->position();
if (m_doJetVertexCorrection && jetVertex) {
@@ -155,7 +161,8 @@ TLorentzVector TauVertexCorrection::getVertexCorrectedP4(const xAOD::CaloCluster
}
}
}
- else if (m_doJetVertexCorrection && m_isPFO) { // use the position of default vertex
+ else if (m_doJetVertexCorrection && m_isPFO) {
+ // use the position of jet vertex for PFO jets when no tau vertex correction is requried
if (jetVertex) {
position = jetVertex->position();
vertexCorrectedP4 = getVertexCorrectedP4(cluster, position);
@@ -182,7 +189,7 @@ TLorentzVector TauVertexCorrection::getVertexCorrectedP4(const xAOD::PFO& pfo,
if (m_doVertexCorrection) {
// use the relative position of tau vertex and default vertex
- if (tauVertex) {
+ if (tauVertex) {
position = tauVertex->position();
if (m_doJetVertexCorrection && jetVertex) {
position -= jetVertex->position();
diff --git a/Reconstruction/tauRecTools/src/TauAxisSetter.h b/Reconstruction/tauRecTools/src/TauAxisSetter.h
index f6d7e7caca63aa564e2f1f2b038b25db92a15a32..b62c2478aa5390f89915176d86532265990bf7d7 100644
--- a/Reconstruction/tauRecTools/src/TauAxisSetter.h
+++ b/Reconstruction/tauRecTools/src/TauAxisSetter.h
@@ -45,7 +45,7 @@ class TauAxisSetter : public TauRecToolBase {
Gaudi::Property<double> m_clusterCone {this, "ClusterCone", 0.2, "cone of tau candidate"};
Gaudi::Property<bool> m_doVertexCorrection {this, "VertexCorrection", true, "switch of tau vertex correction"};
- Gaudi::Property<bool> m_incShowerSubtr {this, "IncShowerSubtr", true, "use shower subtracted clusters in calo calculations"};
+ Gaudi::Property<bool> m_useSubtractedCluster {this, "UseSubtractedCluster", true, "use shower subtracted clusters in calo calculations"};
ToolHandle<ITauVertexCorrection> m_tauVertexCorrection { this,
"TauVertexCorrection", "TauVertexCorrection", "Tool to perform the vertex correction"};
diff --git a/Reconstruction/tauRecTools/src/TauCellVariables.cxx b/Reconstruction/tauRecTools/src/TauCellVariables.cxx
index 3584cce767a3a361aa176bd4a8169ab40c69eef0..51caf877e02e895109b4cd7e137b27d491cadada 100644
--- a/Reconstruction/tauRecTools/src/TauCellVariables.cxx
+++ b/Reconstruction/tauRecTools/src/TauCellVariables.cxx
@@ -52,7 +52,7 @@ StatusCode TauCellVariables::execute(xAOD::TauJet& pTau) const {
std::vector<double> cellRingEnergys(7,0.);
std::vector<const xAOD::CaloCluster*> clusterList;
- ATH_CHECK(tauRecTools::GetJetClusterList(pJetSeed, clusterList, m_incShowerSubtr));
+ ATH_CHECK(tauRecTools::GetJetClusterList(pJetSeed, clusterList, m_useSubtractedCluster));
int numCells = 0;
std::bitset<200000> cellSeen;
diff --git a/Reconstruction/tauRecTools/src/TauCellVariables.h b/Reconstruction/tauRecTools/src/TauCellVariables.h
index 0d2c2336a454a3f6a76dcfd8a38f344ec8d77193..ba548d0c63ee8809cd64f27fff075bc3212d1718 100644
--- a/Reconstruction/tauRecTools/src/TauCellVariables.h
+++ b/Reconstruction/tauRecTools/src/TauCellVariables.h
@@ -40,7 +40,7 @@ class TauCellVariables : public TauRecToolBase {
Gaudi::Property<double> m_stripEthr {this, "StripEthreshold", 0.2 * Gaudi::Units::GeV, "energy threshould for strip cell"};
Gaudi::Property<double> m_cellCone {this, "CellCone", 0.2, "outer cone for cells used in calculation"};
Gaudi::Property<bool> m_doVertexCorrection {this, "VertexCorrection", true, "switch of vertex correction"};
- Gaudi::Property<bool> m_incShowerSubtr {this, "IncShowerSubtr", true, "use shower subtracted clusters in calo calculations"};
+ Gaudi::Property<bool> m_useSubtractedCluster {this, "UseSubtractedCluster", true, "use shower subtracted clusters in calo calculations"};
};
//______________________________________________________________________________
diff --git a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx
index 0dc129375acd90ce8d510d803c243506279e615b..9816326736b008a9988da4e162ccd5b4db0f441c 100644
--- a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx
+++ b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.cxx
@@ -4,9 +4,7 @@
#ifndef XAOD_ANALYSIS
-#include <algorithm>
-#include <cmath>
-#include <sstream>
+
#include "GaudiKernel/SystemOfUnits.h"
#include "CaloUtils/CaloVertexedCell.h"
@@ -19,7 +17,10 @@
#include "TrkParametersIdentificationHelpers/TrackParametersIdHelper.h"
#include "RecoToolInterfaces/IParticleCaloExtensionTool.h"
#include "TauElectronVetoVariables.h"
-
+#include <algorithm>
+#include <cmath>
+#include <unordered_map>
+#include <array>
using Gaudi::Units::GeV;
//-------------------------------------------------------------------------
@@ -40,10 +41,11 @@ TauElectronVetoVariables::~TauElectronVetoVariables() { }
StatusCode TauElectronVetoVariables::initialize()
{
ATH_CHECK( m_caloExtensionTool.retrieve() );
-
- if (!m_ParticleCacheKey.key().empty()) {ATH_CHECK(m_ParticleCacheKey.initialize());}
- else {m_useOldCalo = true;}
-
+ if (!m_ParticleCacheKey.key().empty()) {
+ ATH_CHECK(m_ParticleCacheKey.initialize());
+ } else {
+ m_useOldCalo = true;
+ }
return StatusCode::SUCCESS;
}
@@ -55,14 +57,11 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) const
if (pTau.nTracks() < 1) {
return StatusCode::SUCCESS;
}
-
ATH_MSG_DEBUG("in execute()");
-
float detPhiTrk = 0.;
float detEtaTrk = 0.;
float clEtaTrk = 0.;
float distEtaTrk = 0.;
-
float energy_3phi[101] = {0.0};
float eta[101] = {0.0};
int max1 = 0;
@@ -74,9 +73,7 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) const
float etamaxcut = 0.158;
float phimaxcut = 0.1;
float signum_eta = 0.;
-
signum_eta = pTau.track(0)->eta() / std::abs(pTau.track(0)->eta());
-
float sumETCellsLAr = 0.;
float eta0cut = 0.075;
float eta1cut = 0.0475;
@@ -93,31 +90,26 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) const
float sumETCellsHad1 = 0.;
float etahadcut = 0.2;
float phihadcut = 0.2;
-
const CaloCell *pCell;
-
int trackIndex = -1;
//---------------------------------------------------------------------
// Calculate eta, phi impact point of leading track at calorimeter layers EM 0,1,2,3
//---------------------------------------------------------------------
Trk::TrackParametersIdHelper parsIdHelper;
-
- const int numOfsampEM = 4;
- double eta_extrapol[4];
- double phi_extrapol[4];
-
- for (int i = 0; i < numOfsampEM; ++i) {
- eta_extrapol[i] = -11111.;
- phi_extrapol[i] = -11111.;
- }
-
+ constexpr size_t numberOfEM_Layers{4};
+ constexpr double invalidCoordinate{-11111.};
+ constexpr double invalidCoordinateThreshold{-11110.};
+ std::array<double, numberOfEM_Layers> extrapolatedEta{};
+ std::array<double, numberOfEM_Layers> extrapolatedPhi{};
+ extrapolatedEta.fill(invalidCoordinate);
+ extrapolatedPhi.fill(invalidCoordinate);
+
/*get the CaloExtension object*/
const Trk::CaloExtension * caloExtension = nullptr;
std::unique_ptr<Trk::CaloExtension> uniqueExtension ;
const xAOD::TrackParticle *orgTrack = pTau.track(0)->track();
trackIndex = orgTrack->index();
-
if (m_useOldCalo) {
/* If CaloExtensionBuilder is unavailable, use the calo extension tool */
ATH_MSG_VERBOSE("Using the CaloExtensionTool");
@@ -135,20 +127,15 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) const
caloExtension = uniqueExtension.get();
}
}
-
const std::vector<const Trk::CurvilinearParameters*>& clParametersVector = caloExtension->caloLayerIntersections();
-
if( not caloExtension || clParametersVector.empty() ){
ATH_MSG_WARNING("extrapolation of leading track to calo surfaces failed : caloLayerIntersection is empty" );
return StatusCode::SUCCESS;
}
-
// loop over calo layers
for( const Trk::CurvilinearParameters * cur : clParametersVector ){
-
// only use entry layer
if( !parsIdHelper.isEntryToVolume(cur->cIdentifier()) ) continue;
-
CaloSampling::CaloSample sample = parsIdHelper.caloSample(cur->cIdentifier());
int index = -1;
if( sample == CaloSampling::PreSamplerE || sample == CaloSampling::PreSamplerB ) index = 0;
@@ -156,91 +143,68 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) const
else if( sample == CaloSampling::EME2 || sample == CaloSampling::EMB2 ) index = 2;
else if( sample == CaloSampling::EME3 || sample == CaloSampling::EMB3 ) index = 3;
if( index < 0 ) continue;
- eta_extrapol[index] = cur->position().eta();
- phi_extrapol[index] = cur->position().phi();
+ extrapolatedEta[index] = cur->position().eta();
+ extrapolatedPhi[index] = cur->position().phi();
}
-
- for (int i = 0; i < numOfsampEM; ++i) {
- if ( eta_extrapol[i] < -11110. || phi_extrapol[i] < -11110. )
- {
+ for (size_t i = 0; i < numberOfEM_Layers; ++i) {
+ if ( extrapolatedEta[i] < invalidCoordinateThreshold || extrapolatedPhi[i] < invalidCoordinateThreshold ){
ATH_MSG_DEBUG("extrapolation of leading track to calo surfaces failed for sampling : " << i );
return StatusCode::SUCCESS;
}
}
-
if (! pTau.jetLink().isValid()) {
ATH_MSG_ERROR("tau does not have jet seed for electron veto cell variable calculation");
return StatusCode::FAILURE;
}
const xAOD::Jet* pJetSeed = pTau.jet();
-
// Loop through jets, get links to clusters
std::vector<const xAOD::CaloCluster*> clusterList;
- ATH_CHECK(tauRecTools::GetJetClusterList(pJetSeed, clusterList, m_incShowerSubtr));
-
- std::bitset<200000> cellSeen;
-
+ ATH_CHECK(tauRecTools::GetJetClusterList(pJetSeed, clusterList, m_useSubtractedCluster));
+ std::bitset<200000> cellSeen{};
+ const std::unordered_map<int, int> samplingLookup{
+ {4,0}, {5,1}, {6,2}, {7,3}, {8,12},
+ {15, 12}, {16,13}, {17,14}, {18,12}, {19, 13}, {20,14}
+ };
+ const auto notFound{samplingLookup.end()};
for (auto cluster : clusterList){
-
CaloClusterCellLink::const_iterator pCellIter = cluster->getCellLinks()->begin();
CaloClusterCellLink::const_iterator pCellIterE = cluster->getCellLinks()->end();
-
- for (; pCellIter != pCellIterE; pCellIter++) {
-
- double cellEta, cellPhi, cellET;
-
+ for (; pCellIter != pCellIterE; ++pCellIter) {
+ double cellEta{}, cellPhi{}, cellET{};
pCell = *pCellIter;
- if (cellSeen.test(pCell->caloDDE()->calo_hash())) continue;
- else cellSeen.set(pCell->caloDDE()->calo_hash());
-
+ if (cellSeen.test(pCell->caloDDE()->calo_hash())) continue;
+ else cellSeen.set(pCell->caloDDE()->calo_hash());
if (m_doVertexCorrection && pTau.vertexLink().isValid()) {
CaloVertexedCell vxCell (*pCell, pTau.vertex()->position());
cellPhi = vxCell.phi();
cellEta = vxCell.eta();
cellET = vxCell.et();
- }
- else {
+ } else {
cellPhi = pCell->phi();
cellEta = pCell->eta();
cellET = pCell->et();
}
-
int sampling = pCell->caloDDE()->getSampling();
- if (sampling == 4) sampling = 0;
- if (sampling == 5) sampling = 1;
- if (sampling == 6) sampling = 2;
- if (sampling == 7) sampling = 3;
- if (sampling == 18) sampling = 12;
- if (sampling == 8) sampling = 12;
- if (sampling == 15) sampling = 12;
- if (sampling == 19) sampling = 13;
- if (sampling == 16) sampling = 13;
- if (sampling == 20) sampling = 14;
- if (sampling == 17) sampling = 14;
-
+ if (const auto & pElement {samplingLookup.find(sampling)};pElement != notFound){
+ sampling = pElement->second;
+ }
int i = 2;
if (sampling < 4) i = sampling;
if (sampling == 12 || sampling == 13 || sampling == 14) i = 3;
-
- detPhiTrk = Tau1P3PKineUtils::deltaPhi( cellPhi, phi_extrapol[i] );
- detEtaTrk = std::abs( cellEta - eta_extrapol[i] );
- clEtaTrk = eta_extrapol[i];
- distEtaTrk = cellEta - eta_extrapol[i];
-
+ detPhiTrk = Tau1P3PKineUtils::deltaPhi( cellPhi, extrapolatedPhi[i] );
+ detEtaTrk = std::abs( cellEta - extrapolatedEta[i] );
+ clEtaTrk = extrapolatedEta[i];
+ distEtaTrk = cellEta - extrapolatedEta[i];
if ((sampling == 0 && detEtaTrk < eta0cut && detPhiTrk < phi0cut) ||
(sampling == 1 && detEtaTrk < eta1cut && detPhiTrk < phi1cut) ||
(sampling == 2 && detEtaTrk < eta2cut && detPhiTrk < phi2cut) ||
(sampling == 3 && detEtaTrk < eta3cut && detPhiTrk < phi3cut)) {
-
sumETCellsLAr += cellET;
}
-
if (sampling == 12 && detEtaTrk < etahadcut && detPhiTrk < phihadcut) sumETCellsHad1 += cellET;
-
if (std::abs(cellEta) > 0.8 && std::abs(cellEta) <= 1.2 && (sampling == 13 || sampling == 14) && detEtaTrk < etahadcut && detPhiTrk < phihadcut) {
sumETCellsHad1 += cellET;
}
-
if (std::abs(pTau.track(0)->eta()) <= 1.7) {
if (sampling == 1 && detEtaTrk < etamaxcut && detPhiTrk <= phimaxcut) {
if ((std::abs(cellEta) < 1.37 || std::abs(cellEta) > 1.52) && std::abs(cellEta) < 1.85) {
@@ -261,82 +225,62 @@ StatusCode TauElectronVetoVariables::execute(xAOD::TauJet& pTau) const
energy_3phi[n] = 0;
eta[n] = 0;
}
-
if (std::abs(cellEta) <= etacase1) {
etareg = 0.00315;
} else {
etareg = 0.00415;
}
-
} //end cell loop
-
}// end jet constituent loop
-
for (int m1 = 0; m1 < 101; m1++) {
if ((energy_3phi[m1] > Emax1)) {
Emax1 = energy_3phi[m1];
max1 = m1;
}
}
-
for (int m2 = 1; m2 < 100; m2++) {
if (m2 == max1) continue;
-
if ((energy_3phi[m2] > Emax2) && (energy_3phi[m2] > energy_3phi[m2 - 1]) && (energy_3phi[m2] > energy_3phi[m2 + 1])) {
Emax2 = energy_3phi[m2];
max2 = m2;
}
}
-
if (std::abs(eta[max1]) >= etareg) {
max = max1;
} else {
max = max2;
}
-
float TRTratio = -9999.0;
- uint8_t TRTHTHits;
- uint8_t TRTHTOutliers;
- uint8_t TRTHits;
- uint8_t TRTOutliers;
-
+ uint8_t TRTHTHits{0};
+ uint8_t TRTHTOutliers{0};
+ uint8_t TRTHits{0};
+ uint8_t TRTOutliers{0};
const xAOD::TrackParticle* leadTrack = pTau.track(0)->track();
-
- if ( !leadTrack->summaryValue( TRTHits, xAOD::SummaryType::numberOfTRTHits ) )
- {
+ if ( !leadTrack->summaryValue( TRTHits, xAOD::SummaryType::numberOfTRTHits ) ){
ATH_MSG_DEBUG("retrieval of track summary value failed. Not filling electron veto variables for this one prong candidate");
return StatusCode::SUCCESS;
}
- if ( !leadTrack->summaryValue( TRTHTHits, xAOD::SummaryType::numberOfTRTHighThresholdHits ) )
- {
+ if ( !leadTrack->summaryValue( TRTHTHits, xAOD::SummaryType::numberOfTRTHighThresholdHits ) ){
ATH_MSG_DEBUG("retrieval of track summary value failed. Not filling electron veto variables for this one prong candidate");
return StatusCode::SUCCESS;
}
- if ( !leadTrack->summaryValue( TRTOutliers, xAOD::SummaryType::numberOfTRTOutliers ) )
- {
+ if ( !leadTrack->summaryValue( TRTOutliers, xAOD::SummaryType::numberOfTRTOutliers ) ){
ATH_MSG_DEBUG("retrieval of track summary value failed. Not filling electron veto variables for this one prong candidate");
return StatusCode::SUCCESS;
}
- if ( !leadTrack->summaryValue( TRTHTOutliers, xAOD::SummaryType::numberOfTRTHighThresholdOutliers ) )
- {
+ if ( !leadTrack->summaryValue( TRTHTOutliers, xAOD::SummaryType::numberOfTRTHighThresholdOutliers ) ) {
ATH_MSG_DEBUG("retrieval of track summary value failed. Not filling electron veto variables for this one prong candidate");
return StatusCode::SUCCESS;
}
-
-
if (TRTHits + TRTOutliers != 0) {
TRTratio = float( TRTHTHits + TRTHTOutliers) / float( TRTHits + TRTOutliers );
- }
- else {
+ } else {
TRTratio = 0.0;
}
-
pTau.setDetail(xAOD::TauJetParameters::TRT_NHT_OVER_NLT , TRTratio );
pTau.setDetail(xAOD::TauJetParameters::secMaxStripEt , energy_3phi[max] );
pTau.setDetail(xAOD::TauJetParameters::hadLeakEt , static_cast<float>( sumETCellsHad1 / ( pTau.track(0)->pt() ) ) );
pTau.setDetail(xAOD::TauJetParameters::sumEMCellEtOverLeadTrkPt , static_cast<float>( ( sumETCellsLAr / ( pTau.track(0)->pt() ) ) ) );
-
-
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h
index 335aa6f8ec30d73b489af5fa35d2e1b80e00174b..d31230f6cf3972488f1d98fa20424fa667c8b1af 100644
--- a/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h
+++ b/Reconstruction/tauRecTools/src/TauElectronVetoVariables.h
@@ -35,7 +35,7 @@ public:
private:
Gaudi::Property<bool> m_doVertexCorrection {this, "VertexCorrection", true, "switch of vertex correction"};
Gaudi::Property<bool> m_useOldCalo{this,"useOldCalo",false,"If true, it uses the CaloExtensionTool for calculating track extrapolation. Otherwise, it allows the code to read from the cache created by CaloExtensionBuilderalg."};
- Gaudi::Property<bool> m_incShowerSubtr {this, "IncShowerSubtr", true, "use shower subtracted clusters in calo calculations"};
+ Gaudi::Property<bool> m_useSubtractedCluster {this, "UseSubtractedCluster", true, "use shower subtracted clusters in calo calculations"};
ToolHandle<Trk::IParticleCaloExtensionTool> m_caloExtensionTool {this,
"ParticleCaloExtensionTool", "Trk::ParticleCaloExtensionTool/ParticleCaloExtensionTool", "Tool for calculating track extrapolation"};
SG::ReadHandleKey<CaloExtensionCollection> m_ParticleCacheKey{this,
diff --git a/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.cxx b/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.cxx
index 59a1e7c708da24654dfcd20eb4ed5fc39daac51d..bc13e4c2d3c8b155f9ace57619479f9ce705131e 100644
--- a/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.cxx
+++ b/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.cxx
@@ -440,7 +440,7 @@ bool TauPi0ClusterCreator::setHadronicClusterPFOs(xAOD::TauJet& pTau, xAOD::PFOC
TLorentzVector tauAxis = m_tauVertexCorrection->getTauAxis(pTau);
std::vector<const xAOD::CaloCluster*> clusterList;
- StatusCode sc = tauRecTools::GetJetClusterList(jetSeed, clusterList, m_incShowerSubtr);
+ StatusCode sc = tauRecTools::GetJetClusterList(jetSeed, clusterList, m_useSubtractedCluster);
if (!sc) return false;
for (const xAOD::CaloCluster* cluster : clusterList){
diff --git a/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.h b/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.h
index 49c3bc0da56b00c774cecf64d84f491a75a69563..e9d0770a80c150f7deee8f6aa69aedc62804ea25 100644
--- a/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.h
+++ b/Reconstruction/tauRecTools/src/TauPi0ClusterCreator.h
@@ -67,7 +67,7 @@ private:
bool setHadronicClusterPFOs(xAOD::TauJet& pTau, xAOD::PFOContainer& pHadronicClusterContainer) const;
Gaudi::Property<double> m_clusterEtCut {this, "ClusterEtCut", 0.5 * Gaudi::Units::GeV, "Et threshould for pi0 candidate clusters"};
- Gaudi::Property<bool> m_incShowerSubtr {this, "IncShowerSubtr", true, "use shower subtracted clusters in calo calculations"};
+ Gaudi::Property<bool> m_useSubtractedCluster {this, "UseSubtractedCluster", true, "use shower subtracted clusters in calo calculations"};
ToolHandle<ITauVertexCorrection> m_tauVertexCorrection { this,
"TauVertexCorrection", "TauVertexCorrection", "Tool to perform the vertex correction"};
diff --git a/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx b/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx
index 6611aea2e5f765431cba6e9e42adf42947ebf5ba..586d7b68d0d155b12ec07c856b90803de7b40f8d 100644
--- a/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx
+++ b/Reconstruction/tauRecTools/src/TauPi0CreateROI.cxx
@@ -33,16 +33,13 @@ TauPi0CreateROI::~TauPi0CreateROI() {
StatusCode TauPi0CreateROI::initialize() {
- // retrieve tools
- ATH_MSG_DEBUG( "Retrieving tools" );
-
ATH_CHECK( m_caloCellInputContainer.initialize() );
return StatusCode::SUCCESS;
}
//______________________________________________________________________________
-StatusCode TauPi0CreateROI::executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& pPi0CellContainer, std::vector<CaloCell*>& addedCellsMap) const {
+StatusCode TauPi0CreateROI::executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& pPi0CellContainer, boost::dynamic_bitset<>& addedCellsMap) const {
//---------------------------------------------------------------------
// only run on 1-5 prong taus
@@ -84,12 +81,11 @@ StatusCode TauPi0CreateROI::executePi0CreateROI(xAOD::TauJet& pTau, CaloCellCont
// Store cell in output container
const IdentifierHash cellHash = cell->caloDDE()->calo_hash();
- bool isNewCell = (addedCellsMap.at(cellHash)==NULL);
- if(isNewCell){
+ if(!addedCellsMap.test(cellHash)) {
CaloCell* copyCell = cell->clone();
pPi0CellContainer.push_back(copyCell);
- addedCellsMap[cellHash] = copyCell;
+ addedCellsMap.set(cellHash);
}
}
diff --git a/Reconstruction/tauRecTools/src/TauPi0CreateROI.h b/Reconstruction/tauRecTools/src/TauPi0CreateROI.h
index 61413ebbab5f39d74c43a168e974be396c243e16..ee9e0ea640ae615e95a55282a14045012bd9fdf4 100644
--- a/Reconstruction/tauRecTools/src/TauPi0CreateROI.h
+++ b/Reconstruction/tauRecTools/src/TauPi0CreateROI.h
@@ -7,6 +7,7 @@
#include <string>
#include <vector>
+#include <boost/dynamic_bitset.hpp>
#include "GaudiKernel/ToolHandle.h"
#include "tauRecTools/TauRecToolBase.h"
@@ -31,11 +32,10 @@ public:
virtual ~TauPi0CreateROI();
virtual StatusCode initialize() override;
- virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& Pi0CellContainer, std::vector<CaloCell*>& map) const override;
+ virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& Pi0CellContainer, boost::dynamic_bitset<>& map) const override;
private:
SG::ReadHandleKey<CaloCellContainer> m_caloCellInputContainer{this,"Key_caloCellInputContainer", "AllCalo", "input vertex container key"};
-
};
#endif /* TAUPI0CREATEROI_H */
diff --git a/Reconstruction/tauRecTools/src/TauTrackFinder.cxx b/Reconstruction/tauRecTools/src/TauTrackFinder.cxx
index 7819dcef8aa05844bcb2feec8e85f9c9bd08eeb5..829ba59ab80c080cb78c031304f04e4b2951e69e 100644
--- a/Reconstruction/tauRecTools/src/TauTrackFinder.cxx
+++ b/Reconstruction/tauRecTools/src/TauTrackFinder.cxx
@@ -30,13 +30,18 @@ StatusCode TauTrackFinder::initialize() {
ATH_CHECK( m_trackSelectorTool_tau.retrieve() );
ATH_CHECK( m_trackToVertexTool.retrieve() );
ATH_CHECK( m_caloExtensionTool.retrieve() );
-
+ ATH_CHECK( m_trackToVertexIPEstimator.retrieve() );
+
// initialize ReadHandleKey
// allow empty for trigger
ATH_CHECK( m_trackPartInputContainer.initialize(SG::AllowEmpty) );
// use CaloExtensionTool when key is empty
ATH_CHECK( m_ParticleCacheKey.initialize(SG::AllowEmpty) );
+ if (inTrigger()) {
+ ATH_CHECK(m_beamSpotKey.initialize());
+ }
+
return StatusCode::SUCCESS;
}
@@ -198,6 +203,53 @@ StatusCode TauTrackFinder::executeTrackFinder(xAOD::TauJet& pTau, xAOD::TauTrack
ATH_MSG_DEBUG("numTrack: " << "/" << pTau.nTracks());
ATH_MSG_DEBUG("charge: " << "/" << pTau.charge());
+ // impact parameter variables w.r.t. tau vertex
+ const xAOD::Vertex* vxcand = nullptr;
+
+ xAOD::Vertex theBeamspot;
+ theBeamspot.makePrivateStore();
+
+ if (inTrigger()) { // online: use beamspot
+ SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
+ if(beamSpotHandle.isValid()) {
+ theBeamspot.setPosition(beamSpotHandle->beamPos());
+ const auto& cov = beamSpotHandle->beamVtx().covariancePosition();
+ theBeamspot.setCovariancePosition(cov);
+ vxcand = &theBeamspot;
+ }
+ else {
+ ATH_MSG_DEBUG("No Beamspot object in tau candidate");
+ }
+ }
+ else if (pTau.vertexLink().isValid() && pTau.vertex()->vertexType() != xAOD::VxType::NoVtx) {
+ vxcand = pTau.vertex();
+ }
+
+ static const SG::AuxElement::Decorator<float> dec_d0TJVA("d0TJVA");
+ static const SG::AuxElement::Decorator<float> dec_z0sinthetaTJVA("z0sinthetaTJVA");
+ static const SG::AuxElement::Decorator<float> dec_d0SigTJVA("d0SigTJVA");
+ static const SG::AuxElement::Decorator<float> dec_z0sinthetaSigTJVA("z0sinthetaSigTJVA");
+
+ for(auto track : pTau.allTracks()) {
+ dec_d0TJVA(*track) = track->track()->d0();
+ dec_z0sinthetaTJVA(*track) = track->z0sinThetaTJVA(pTau);
+ dec_d0SigTJVA(*track) = -999.;
+ dec_z0sinthetaSigTJVA(*track) = -999.;
+
+ // in the trigger, z0sintheta and corresponding significance are meaningless if we use the beamspot
+ if(vxcand) {
+ std::unique_ptr<const Trk::ImpactParametersAndSigma> myIPandSigma
+ = std::unique_ptr<const Trk::ImpactParametersAndSigma>(m_trackToVertexIPEstimator->estimate(track->track(), vxcand));
+
+ if(myIPandSigma) {
+ dec_d0TJVA(*track) = myIPandSigma->IPd0;
+ dec_z0sinthetaTJVA(*track) = myIPandSigma->IPz0SinTheta;
+ dec_d0SigTJVA(*track) = (myIPandSigma->sigmad0 != 0.) ? (float)( myIPandSigma->IPd0 / myIPandSigma->sigmad0 ) : -999.;
+ dec_z0sinthetaSigTJVA(*track) = (myIPandSigma->sigmaz0SinTheta != 0.) ? (float)( myIPandSigma->IPz0SinTheta / myIPandSigma->sigmaz0SinTheta ) : -999.;
+ }
+ }
+ }
+
// extrapolate core tracks to calorimeter surface
// store information only in ExtraDetailsContainer
if(!m_bypassExtrapolator)
diff --git a/Reconstruction/tauRecTools/src/TauTrackFinder.h b/Reconstruction/tauRecTools/src/TauTrackFinder.h
index 42888b9073833d5985a4689dedb7aa273e40fade..0850ce3b5f3ab278801a985f1abd963ed0957e79 100644
--- a/Reconstruction/tauRecTools/src/TauTrackFinder.h
+++ b/Reconstruction/tauRecTools/src/TauTrackFinder.h
@@ -16,11 +16,11 @@
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackParticleContainer.h"
-#include "VxVertex/RecVertex.h"
-
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
#include "RecoToolInterfaces/IParticleCaloExtensionTool.h"
+#include "TrkVertexFitterInterfaces/ITrackToVertexIPEstimator.h"
+#include "BeamSpotConditionsData/BeamSpotData.h"
/////////////////////////////////////////////////////////////////////////////
@@ -95,23 +95,22 @@ private:
ToolHandle<Trk::IParticleCaloExtensionTool> m_caloExtensionTool {this, "ParticleCaloExtensionTool", "Trk::ParticleCaloExtensionTool/ParticleCaloExtensionTool", "Tool for the extrapolation of charged tracks"};
ToolHandle<Trk::ITrackSelectorTool> m_trackSelectorTool_tau {this, "TrackSelectorToolTau", "", "Tool for track selection"};
ToolHandle<Reco::ITrackToVertex> m_trackToVertexTool {this, "TrackToVertexTool", "Reco::TrackToVertex"};
- //output particle calo extension collection
- SG::ReadHandleKey<CaloExtensionCollection> m_ParticleCacheKey{this,
- "tauParticleCache", "ParticleCaloExtension", "Name of the particle measurement extrapolation cache for TauTrackFinder"};
+ ToolHandle<Trk::ITrackToVertexIPEstimator> m_trackToVertexIPEstimator {this, "TrackToVertexIPEstimator", ""};
Gaudi::Property<double> m_maxJetDr_tau {this, "MaxJetDrTau", 0.2};
- Gaudi::Property<double> m_maxJetDr_wide {this, "MaxJetDrWide", 0.4};
-
+ Gaudi::Property<double> m_maxJetDr_wide {this, "MaxJetDrWide", 0.4};
Gaudi::Property<bool> m_applyZ0cut {this, "removeTracksOutsideZ0wrtLeadTrk", false};
- Gaudi::Property<float> m_z0maxDelta {this, "maxDeltaZ0wrtLeadTrk", 1000};
-
+ Gaudi::Property<float> m_z0maxDelta {this, "maxDeltaZ0wrtLeadTrk", 1000};
Gaudi::Property<bool> m_storeInOtherTrks {this, "StoreRemovedCoreWideTracksInOtherTracks", true};
Gaudi::Property<bool> m_removeDuplicateCoreTracks {this, "removeDuplicateCoreTracks", true};
Gaudi::Property<bool> m_bypassSelector {this, "BypassSelector", false};
Gaudi::Property<bool> m_bypassExtrapolator {this, "BypassExtrapolator", false};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_trackPartInputContainer{this,"Key_trackPartInputContainer", "InDetTrackParticles", "input track particle container key"};
+ SG::ReadHandleKey<CaloExtensionCollection> m_ParticleCacheKey{this,"tauParticleCache", "ParticleCaloExtension", "Name of the particle measurement extrapolation cache for TauTrackFinder"};
+ SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" };
+
std::set<CaloSampling::CaloSample> m_EMSamplings;
std::set<CaloSampling::CaloSample> m_HadSamplings;
};
diff --git a/Reconstruction/tauRecTools/src/TauVertexVariables.cxx b/Reconstruction/tauRecTools/src/TauVertexVariables.cxx
index 92ba975c10edddcc4f4b267f4e454e2dcb270b1d..5af776c5628a26c60d9132f9b4969193806c65ba 100644
--- a/Reconstruction/tauRecTools/src/TauVertexVariables.cxx
+++ b/Reconstruction/tauRecTools/src/TauVertexVariables.cxx
@@ -35,14 +35,9 @@ TauVertexVariables::~TauVertexVariables() {
StatusCode TauVertexVariables::initialize() {
- ATH_CHECK( m_trackToVertexIPEstimator.retrieve() );
ATH_CHECK( m_fitTool.retrieve() );
ATH_CHECK( m_SeedFinder.retrieve() );
- if (inTrigger()) {
- ATH_CHECK(m_beamSpotKey.initialize());
- }
-
return StatusCode::SUCCESS;
}
@@ -51,97 +46,53 @@ StatusCode TauVertexVariables::initialize() {
//-----------------------------------------------------------------------------
StatusCode TauVertexVariables::executeVertexVariables(xAOD::TauJet& pTau, xAOD::VertexContainer& pSecVtxContainer) const {
- // impact parameter variables for standard tracks
- if (pTau.nTracks() > 0) {
-
- std::unique_ptr<const Trk::ImpactParametersAndSigma> myIPandSigma;
- const xAOD::Vertex* vxcand = nullptr;
-
- xAOD::Vertex theBeamspot;
- theBeamspot.makePrivateStore();
-
- if (inTrigger()) { // online: use beamspot
- SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
- if(beamSpotHandle.isValid()){
- theBeamspot.setPosition(beamSpotHandle->beamPos());
- const auto& cov = beamSpotHandle->beamVtx().covariancePosition();
- theBeamspot.setCovariancePosition(cov);
- vxcand = &theBeamspot;
-
- myIPandSigma = std::unique_ptr<const Trk::ImpactParametersAndSigma>(m_trackToVertexIPEstimator->estimate(pTau.track(0)->track(), vxcand));
- }
- else {
- ATH_MSG_DEBUG("No Beamspot object in tau candidate");
- }
- }
- else if (pTau.vertexLink().isValid()) { // offline: obtain tau vertex by link
- vxcand = pTau.vertex() ;
- //check if vertex has a valid type (skip if vertex has type NoVtx)
- if (vxcand->vertexType() != xAOD::VxType::NoVtx) {
- myIPandSigma = std::unique_ptr<const Trk::ImpactParametersAndSigma>(m_trackToVertexIPEstimator->estimate(pTau.track(0)->track(), vxcand));
- }
- }
-
- if (myIPandSigma) {
- // kept for now, but will be discontinued as we now store these for all tracks, not only the leading one
- pTau.setDetail(xAOD::TauJetParameters::ipSigLeadTrk, (float)( myIPandSigma->IPd0 / myIPandSigma->sigmad0 ));
- pTau.setDetail(xAOD::TauJetParameters::ipZ0SinThetaSigLeadTrk, (float)( myIPandSigma->IPz0SinTheta / myIPandSigma->sigmaz0SinTheta ));
- }
- else {
- ATH_MSG_DEBUG("trackToVertexIPestimator failed for a standard track!");
- pTau.setDetail(xAOD::TauJetParameters::ipSigLeadTrk, (float)(-999.));
- pTau.setDetail(xAOD::TauJetParameters::ipZ0SinThetaSigLeadTrk, (float)(-999.));
- }
-
- // in the trigger, z0sintheta IP and corresponding significance are meaningless if we use the beamspot
- if(vxcand && (inTrigger() || (!inTrigger() && vxcand->vertexType() != xAOD::VxType::NoVtx))) {
- static const SG::AuxElement::Decorator<float> dec_d0IPsig("d0IPsig");
- static const SG::AuxElement::Decorator<float> dec_z0sinthetaIPsig("z0sinthetaIPsig");
-
- for(auto track : pTau.allTracks()) {
- myIPandSigma = std::unique_ptr<const Trk::ImpactParametersAndSigma>(m_trackToVertexIPEstimator->estimate(track->track(), vxcand));
- if(myIPandSigma) {
- dec_d0IPsig(*track) = (myIPandSigma->sigmad0 != 0.) ? (float)( myIPandSigma->IPd0 / myIPandSigma->sigmad0 ) : -999.;
- dec_z0sinthetaIPsig(*track) = (myIPandSigma->sigmaz0SinTheta != 0.) ? (float)( myIPandSigma->IPz0SinTheta / myIPandSigma->sigmaz0SinTheta ) : -999.;
- }
- else {
- dec_d0IPsig(*track) = -999.;
- dec_z0sinthetaIPsig(*track) = -999.;
- }
- }
- }
- }
- else {
- ATH_MSG_DEBUG("Tau has no tracks");
- }
-
pTau.setDetail(xAOD::TauJetParameters::trFlightPathSig, (float)(-1111.));
- //try to find secondary vertex if more than 1 track and the tau vertex is available
+ // try to find secondary vertex if more than 1 track and the tau vertex is available
if ( pTau.nTracks() < 2 || !pTau.vertexLink().isValid() ) {
return StatusCode::SUCCESS;
}
- // get xAOD TrackParticles and Trk::Tracks
+ // xAOD TrackParticles
std::vector<const xAOD::TrackParticle*> xaodTracks;
+ // standard reconstruction uses Trk::Tracks in SeedFinder
std::vector<const Trk::Track*> origTracks;
- for (unsigned i = 0; i < pTau.nTracks(); ++i) {
- xaodTracks.push_back(pTau.track(i)->track());
- ATH_MSG_VERBOSE("xAOD::TrackParticle " <<i<<": "<< pTau.track(i)->pt() << " " << pTau.track(i)->eta() << " " << pTau.track(i)->phi());
- if (pTau.track(i)->track()) {
- origTracks.push_back(pTau.track(i)->track()->track());
+ // reconstruction from xAOD uses Trk::TrackParameters (Trk::Track not available)
+ std::vector<const Trk::TrackParameters*> origTrackParameters;
+
+ for (const xAOD::TauTrack* track : pTau.tracks()) {
+ xaodTracks.push_back(track->track());
+
+ if(track->track()->track()) {
+ origTracks.push_back(track->track()->track());
}
else {
- ATH_MSG_WARNING("no Trk::Track for xAOD::TrackParticle");
+ const Trk::Perigee& perigee = track->track()->perigeeParameters();
+ origTrackParameters.push_back(static_cast<const Trk::TrackParameters*>(&perigee));
}
}
- // get the starting point for the fit using Trk::Tracks
- const Amg::Vector3D& seedPoint = m_SeedFinder->findSeed(origTracks);
- ATH_MSG_VERBOSE("seedPoint x/y/perp=" << seedPoint.x() << " " << seedPoint.y() << " "<< seedPoint.z() << " " << std::sqrt(seedPoint.x()*seedPoint.x()+seedPoint.y()+seedPoint.y()));
+ // origTrackParameters should be empty in standard reconstruction, origTracks should be empty when re-running from xAOD
+ if(origTracks.size()>0 && origTrackParameters.size()>0) {
+ ATH_MSG_ERROR("Inconsistent mix of Trk::Track and Trk::TrackParameter");
+ return StatusCode::FAILURE;
+ }
+
+ xAOD::Vertex* xAODvertex = nullptr;
+
+ if(origTracks.size() > 0) {
+ // get the starting point for the fit using Trk::Tracks
+ const Amg::Vector3D& seedPoint = m_SeedFinder->findSeed(origTracks);
+ // fitting the vertex
+ xAODvertex = m_fitTool->fit(xaodTracks, seedPoint);
+ }
+ else if (origTrackParameters.size() > 0) {
+ // get the starting point for the fit using Trk::TrackParameters
+ const Amg::Vector3D& seedPoint = m_SeedFinder->findSeed(origTrackParameters);
+ // fitting the vertex
+ xAODvertex = m_fitTool->fit(xaodTracks, seedPoint);
+ }
- // fitting the vertex itself
- xAOD::Vertex* xAODvertex = m_fitTool->fit(xaodTracks, seedPoint);
if (!xAODvertex) {
ATH_MSG_WARNING("no secondary vertex found!");
return StatusCode::SUCCESS;
@@ -157,7 +108,7 @@ StatusCode TauVertexVariables::executeVertexVariables(xAOD::TauJet& pTau, xAOD::
ATH_MSG_VERBOSE("secondary vertex recorded! x="<<xAODvertex->position().x()<< ", y="<<xAODvertex->position().y()<<", perp="<<xAODvertex->position().perp());
pSecVtxContainer.push_back(xAODvertex);
xAODvertex->setVertexType(xAOD::VxType::NotSpecified);
- pTau.setSecondaryVertex(&pSecVtxContainer, xAODvertex); // set the link to the vertex
+ pTau.setSecondaryVertex(&pSecVtxContainer, xAODvertex);
}
else {
delete xAODvertex; // delete the vertex when in trigger mode, because we can not save it
diff --git a/Reconstruction/tauRecTools/src/TauVertexVariables.h b/Reconstruction/tauRecTools/src/TauVertexVariables.h
index a54aadb3ad39dbc09b47520b8099d5bb1a7e97c7..469cee574aa4d71b3ec641e2633ae9c6c39a6919 100644
--- a/Reconstruction/tauRecTools/src/TauVertexVariables.h
+++ b/Reconstruction/tauRecTools/src/TauVertexVariables.h
@@ -10,8 +10,6 @@
#include "tauRecTools/TauRecToolBase.h"
#include "GaudiKernel/ToolHandle.h"
-#include "BeamSpotConditionsData/BeamSpotData.h"
-#include "TrkVertexFitterInterfaces/ITrackToVertexIPEstimator.h"
#include "TrkVertexFitterInterfaces/IVertexFitter.h"
#include "TrkVertexFitterInterfaces/IVertexSeedFinder.h"
@@ -41,11 +39,8 @@ public:
double trFlightPathSig(const xAOD::TauJet& pTau, const xAOD::Vertex& secVertex) const;
private:
- ToolHandle<Trk::ITrackToVertexIPEstimator> m_trackToVertexIPEstimator {this, "TrackToVertexIPEstimator", ""};
ToolHandle<Trk::IVertexFitter> m_fitTool {this, "VertexFitter", "Trk::AdaptiveVertexFitter"};
ToolHandle<Trk::IVertexSeedFinder> m_SeedFinder {this, "SeedFinder", "Trk::CrossDistancesSeedFinder"};
-
- SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" };
};
#endif /* TAUREC_TAUVERTEXVARIABLES_H */
diff --git a/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h b/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
index fdf0ca111238da1ec1060a3d5210fe73dce11618..73dfa99f46666b1183e59396ec38111620efc10c 100644
--- a/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
+++ b/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
@@ -5,8 +5,8 @@
#ifndef TAURECTOOLS_BDTHELPER_H
#define TAURECTOOLS_BDTHELPER_H
-#include "AsgTools/AsgMessaging.h"
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
#include "xAODTau/TauJet.h"
#include "MVAUtils/BDT.h"
diff --git a/Reconstruction/tauRecTools/tauRecTools/CaloClusterVariables.h b/Reconstruction/tauRecTools/tauRecTools/CaloClusterVariables.h
index cad3ea1d67893239d70369a897aeea56f402a0e2..8a55a68489b305b5275ff7eb6d9eff4c30cb29bd 100644
--- a/Reconstruction/tauRecTools/tauRecTools/CaloClusterVariables.h
+++ b/Reconstruction/tauRecTools/tauRecTools/CaloClusterVariables.h
@@ -28,7 +28,7 @@ public:
bool update(const xAOD::TauJet& pTau, const ToolHandle<ITauVertexCorrection>& handle); //!< update the internal variables for the given tau
- void setIncSub(bool flag) {m_incShowerSubtr=flag;}
+ void setIncSub(bool flag) {m_useSubtractedCluster=flag;}
// ID Variables
unsigned int numConstituents() { return (unsigned int) m_numConstit; }
@@ -61,7 +61,7 @@ private:
TLorentzVector calculateTauCentroid(int nConst, const std::vector<TLorentzVector>& clusterP4Vector);
// use shower subtracted clusters with PFlow jet seeds
- bool m_incShowerSubtr;
+ bool m_useSubtractedCluster;
};
//-------------------------------------------------------------------------
diff --git a/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h b/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h
index bf5cd25b290b446a44e27ee61d6f16e34b037a4d..8057e25b46f42af307e688b9f448af55bd479aa2 100644
--- a/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h
+++ b/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h
@@ -5,114 +5,135 @@
#ifndef TAURECTOOLS_COMBINEDP4FROMRECOTAUS_H
#define TAURECTOOLS_COMBINEDP4FROMRECOTAUS_H
-//Root include(s)
+#include "tauRecTools/TauRecToolBase.h"
+
+#include "xAODTau/TauJet.h"
+
#include "TH1F.h"
#include "TF1.h"
#include "TGraph.h"
-//tauRecTools include(s)
-#include "tauRecTools/TauRecToolBase.h"
-
-//xAOD include(s)
-#include "xAODTau/TauJet.h"
+#include <array>
+#include <string>
-class CombinedP4FromRecoTaus
-: public TauRecToolBase
-{
+class CombinedP4FromRecoTaus : public TauRecToolBase {
public:
ASG_TOOL_CLASS2( CombinedP4FromRecoTaus, TauRecToolBase, ITauToolBase )
- //standard constructor
CombinedP4FromRecoTaus(const std::string& name="CombinedP4FromRecoTaus");
- //function where variables are computed and decorated
virtual StatusCode initialize() override;
-
+
virtual StatusCode execute(xAOD::TauJet& xTau) const override;
+ /** Whether to use calo pt, invoked by TauSmearing tool */
bool getUseCaloPtFlag(const xAOD::TauJet& tau) const;
+
+ /** Get the resolution of Et at the calo TES, invoked by METSignificance */
+ double getCaloResolution(const xAOD::TauJet& tau) const;
private:
struct Variables
{
+ double pt_constituent{0.0};
+ double pt_tauRecCalibrated{0.0};
+ double pt_weighted{0.0};
double weight{-1111.0};
- double combined_res{-1111.};
+ double sigma_combined{-1111.};
double sigma_tauRec{-1111.0};
double sigma_constituent{-1111.0};
double corrcoeff{-1111.0};
- double et_weighted{0.0};
- double et_cb2PT_postcalib{0.0};
- double et_postcalib{0.0};
};
- // Get correlation coefficient for the given decay mode
- double getCorrelationCoefficient(const int& etaIndex, const xAOD::TauJetParameters::DecayMode& decayMode) const;
-
- double getWeightedEt(const double& et_tauRec,
- const double& et_cb2PT,
- const int& etaIndex,
- const xAOD::TauJetParameters::DecayMode& mode,
- Variables& variables) const;
-
- double getResolutionTaurec(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const;
+ /** Get the weighted four momentum of calo TES and PanTau */
+ TLorentzVector getCombinedP4(const xAOD::TauJet& tau, Variables& variables) const;
- double getResolutionCellBased2PanTau(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const;
+ /** Whether the tau candidate is valid for the calculation */
+ bool isValid(const xAOD::TauJet& tau) const;
- double getMeanTauRec(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const;
+ /** Get the index of eta in the calibration histogram */
+ int getEtaIndex(const float& eta) const;
- double getMeanCellBased2PanTau(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode) const;
-
- double getCombinedResolution(const double& et_tauRec,
- const double& et_cb2PT,
- const int& etaIndex,
- const xAOD::TauJetParameters::DecayMode& mode,
- Variables& variables) const;
-
- double getTauRecEt(const double& et, const int& etaIndex, const xAOD::TauJetParameters::DecayMode& mode, double& et_postcalib) const;
-
- double getCellbased2PantauEt(const double& et_cb2PT,
- const int& etaIndex,
- const xAOD::TauJetParameters::DecayMode& mode,
- double& et_cb2PT_postcalib) const;
+ /** Get the decay mode of the tau candidate */
+ xAOD::TauJetParameters::DecayMode getDecayMode(const xAOD::TauJet& tau) const;
+
+ /** Get the index of decay mode in the calibration histogram */
+ int getDecayModeIndex(const xAOD::TauJetParameters::DecayMode& decayMode) const;
- //Calculates the optimal tau Et
- double getCombinedEt(const double& et_tauRec,
- const double& et_substructure,
- const float& eta,
- const xAOD::TauJetParameters::DecayMode& mode,
+ /** Get correlation coefficient between the calo TES and PanTau */
+ double getCorrelation(const int& decayModeIndex, const int& etaIndex) const;
+
+ /** Get the resolution of Et at the calo TES */
+ double getCaloResolution(const double& et, const int& decayModeIndex, const int& etaIndex) const;
+
+ /** Get the resolution of Et at PanTau */
+ double getPanTauResolution(const double& et, const int& decayModeIndex, const int& etaIndex) const;
+
+ /** Get the Et at the calo TES after calibration correction */
+ double getCaloCalEt(const double& et, const int& decayModeIndex, const int& etaIndex) const;
+
+ /** Get the Et at PanTau after calibration correction */
+ double getPanTauCalEt(const double& panTauEt, const int& decayModeIndex,
+ const int& etaIndex) const;
+
+ /** Get the weight of calo TES */
+ double getWeight(const double& caloSigma, const double& panTauSigma, const double& correlatioon) const;
+
+ /** Get the combined sigma of calo TES and PanTau */
+ double getCombinedSigma(const double& caloSigma, const double& panTauSigma, const double& correlation) const;
+
+ /** Get the combined Et of calo TES and PanTau */
+ double getCombinedEt(const double& caloEt, const double& et_substructure,
+ const xAOD::TauJetParameters::DecayMode& decayMode, const float& eta,
Variables& variables) const;
+
+ /** Get the allowed difference between calo TES and PanTau */
+ double getNsigmaCompatibility(const double& caloEt) const;
+ /// Switch of adding the intermediate results
+ bool m_addCalibrationResultVariables;
+
+ /// Name of the calibration file
+ std::string m_calFileName;
+
+ /// Binning in the calibraction graph/hist
+ enum Binning {DecayModeBinning = 5, EtaBinning = 5};
- //Calculates the optimal tau 4-vector
- TLorentzVector getCombinedP4(const xAOD::TauJet& tau,
- Variables& variables) const;
+ /// Decay mode binning in the calibration graph/hist
+ const std::array<std::string, DecayModeBinning> m_decayModeNames = {"1p0n","1p1n","1pXn","3p0n","3pXn"}; //!
+
+ /// Eta binning in the calibration graph
+ const std::array<std::string, EtaBinning> m_etaBinNames = {"0", "1", "2", "3", "4"}; //!
+
+ /// Calibration graph: mean of bias/caloEt as a function of caloEt
+ std::array<std::array<std::unique_ptr<TGraph>, DecayModeBinning>, EtaBinning> m_caloRelBias; //!
- // Get the enum-value for eta corresponding to the eta value
- int getIndexEta(const float& eta) const;
+ /// Maximum Et of m_caloRelBias
+ std::array<std::array<double, DecayModeBinning>, EtaBinning> m_caloRelBiasMaxEt; //!
- float getNsigmaCompatibility(const float& et_TauRec) const;
+ /// Calibration graph: resolution at Calo TES as a function of caloEt
+ std::array<std::array<std::unique_ptr<TGraph>, DecayModeBinning>, EtaBinning> m_caloRes; //!
- //high pt flag
- double getCaloResolution(const xAOD::TauJet& tau) const;
+ /// Maximum Et of m_caloRes
+ std::array<std::array<double, DecayModeBinning>, EtaBinning> m_caloResMaxEt; //!
- const std::vector<std::string> m_modeNames = {"1p0n","1p1n","1pXn","3p0n","3pXn"};
- const std::vector<std::string> m_etaBinNames = {"0", "1", "2", "3", "4"};//("<0.3"), ("<0.8"), ("<1.3"), ("<1.6"), ("<2.5")
+ /// Calibration graph: mean of bias/panTauEt as a funtion of panTauEt
+ std::array<std::array<std::unique_ptr<TGraph>, DecayModeBinning>, EtaBinning> m_panTauRelBias; //!
- /// row: size of m_etaBinNames, column: size of m_modeNames
- std::vector<std::vector<std::unique_ptr<TGraph>>> m_meanTGraph_CellBased2PanTau;
- std::vector<std::vector<std::unique_ptr<TGraph>>> m_resTGraph_CellBased2PanTau;
-
- std::vector<std::vector<std::unique_ptr<TGraph>>> m_meanTGraph_tauRec;
- std::vector<std::vector<std::unique_ptr<TGraph>>> m_resTGraph_tauRec;
-
- /// size of m_modeNames
- std::vector<std::unique_ptr<TH1F>> m_correlationHists;
+ /// Maximum Et of m_panTauRelBias
+ std::array<std::array<double, DecayModeBinning>, EtaBinning> m_panTauRelBiasMaxEt; //!
- bool m_addCalibrationResultVariables;
- bool m_addUseCaloPtFlag;
- std::string m_sWeightFileName;
+ /// Calibration graph: resolution at PanTau as a function of panTauEt
+ std::array<std::array<std::unique_ptr<TGraph>, DecayModeBinning>, EtaBinning> m_panTauRes; //!
+
+ /// Maximum Et of m_panTauRes
+ std::array<std::array<double, DecayModeBinning>, EtaBinning> m_panTauResMaxEt; //!
- std::unique_ptr<TF1> m_Nsigma_compatibility; //!
+ /// Calibration histogram: correlation coefficient of calo TES and PanTau
+ std::array<std::unique_ptr<TH1F>, DecayModeBinning> m_correlationHists; //!
+
+ /// Calibration histogram: maximum tolerence in unit of combined sigma
+ std::unique_ptr<TF1> m_nSigmaCompatibility; //!
};
#endif // TAURECTOOLS_COMBINEDP4FROMRECOTAUS_H
diff --git a/Reconstruction/tauRecTools/tauRecTools/HelperFunctions.h b/Reconstruction/tauRecTools/tauRecTools/HelperFunctions.h
index 7768759f70106b283adea6c6489f23d358eab07b..67abf144f3896d46299a44c4101349e732915d8f 100644
--- a/Reconstruction/tauRecTools/tauRecTools/HelperFunctions.h
+++ b/Reconstruction/tauRecTools/tauRecTools/HelperFunctions.h
@@ -24,7 +24,7 @@ namespace tauRecTools
{
ANA_MSG_HEADER(msgHelperFunction)
- const StatusCode GetJetClusterList(const xAOD::Jet* jet, std::vector<const xAOD::CaloCluster*> &clusterList, bool incShowerSubtracted);
+ const StatusCode GetJetClusterList(const xAOD::Jet* jet, std::vector<const xAOD::CaloCluster*> &clusterList, bool useSubtractedCluster);
xAOD::TauTrack::TrackFlagType isolateClassifiedBits(xAOD::TauTrack::TrackFlagType flag);
bool sortTracks(const ElementLink<xAOD::TauTrackContainer> &l1, const ElementLink<xAOD::TauTrackContainer> &l2);
diff --git a/Reconstruction/tauRecTools/tauRecTools/ITauToolBase.h b/Reconstruction/tauRecTools/tauRecTools/ITauToolBase.h
index 24c33d823fb3b29532a31b0a32e0d05aafcee310..17df4edfe2e3b450379ef5c8dfafda1a825a12f8 100644
--- a/Reconstruction/tauRecTools/tauRecTools/ITauToolBase.h
+++ b/Reconstruction/tauRecTools/tauRecTools/ITauToolBase.h
@@ -6,13 +6,13 @@
#define ITOOLBASE_TAU_H
#include "AsgTools/IAsgTool.h"
-
#include "xAODTau/TauJet.h"
#include "xAODTracking/TrackParticleContainer.h"
#include "xAODTracking/VertexContainer.h"
#include "xAODPFlow/PFOContainer.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
#include "xAODParticleEvent/ParticleContainer.h"
+#include <boost/dynamic_bitset.hpp>
#ifndef XAOD_ANALYSIS
#include "CaloEvent/CaloCellContainer.h"
@@ -68,7 +68,7 @@ class ITauToolBase : virtual public asg::IAsgTool
virtual StatusCode executeDev(xAOD::TauJet& pTau) = 0;
#else
// CaloCellContainer not available in AnalysisBase
- virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& caloCellContainer, std::vector<CaloCell*>& map ) const = 0;
+ virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& caloCellContainer, boost::dynamic_bitset<>& map ) const = 0;
#endif
//-----------------------------------------------------------------
diff --git a/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h b/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
index 2ca20797ba6276727435aeaf9ef84cbd13ea4b28..346f0621e155e0fbcfb3d27ea033cfe06951353f 100644
--- a/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
@@ -29,7 +29,7 @@ class MvaTESVariableDecorator
private:
- bool m_incShowerSubtr;
+ bool m_useSubtractedCluster;
SG::ReadDecorHandleKey<xAOD::EventInfo> m_aveIntPerXKey {this,
"AveIntPerXKey",
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h b/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h
index aba97746476e7a106ce79f6614f21d9e56cf0045..1afa6101d677c0a839950f981f3c1f227d0e05b3 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h
@@ -35,7 +35,7 @@ class TauIDVarCalculator: public TauRecToolBase
private:
- bool m_incShowerSubtr;
+ bool m_useSubtractedCluster;
ToolHandle<ITauVertexCorrection> m_tauVertexCorrection { this,
"TauVertexCorrection", "TauVertexCorrection", "Tool to perform the vertex correction"};
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h b/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h
index 53842ed3d0f34e7a9bf928edaaacf56ad04e07f0..6db5ee4a8cc2dae37ff19895d03244a02bad0c91 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "xAODTau/TauJet.h"
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h
index 18eac022bc2e5e52442105bbfe4146f655d09659..0898241c9e7e993f79ffcb23c196666c90fd3b0e 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h
@@ -70,7 +70,7 @@ private:
std::unique_ptr<TauJetRNN> m_net_1p; //!
std::unique_ptr<TauJetRNN> m_net_3p; //!
- bool m_incShowerSubtr;
+ bool m_useSubtractedCluster;
ToolHandle<ITauVertexCorrection> m_tauVertexCorrection { this,
"TauVertexCorrection", "TauVertexCorrection", "Tool to perform the vertex correction"};
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h
index 1b5b3665864c0a24705c8aa448a3030d6100acc7..f53752499a62b0af53fbe6fb975fb8a0749940b3 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h
@@ -7,7 +7,7 @@
#include <unordered_map>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "xAODTau/TauJet.h"
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauRecToolBase.h b/Reconstruction/tauRecTools/tauRecTools/TauRecToolBase.h
index b762e5252867bb961b4c40336029da68e9b6f4b6..b5d404ea695f8b4f4ac0f35169e98702bd6cb858 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauRecToolBase.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauRecToolBase.h
@@ -43,7 +43,7 @@ class TauRecToolBase : public asg::AsgTool, virtual public ITauToolBase {
#ifdef XAOD_ANALYSIS
virtual StatusCode executeDev(xAOD::TauJet& pTau) override;
#else
- virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& caloCellContainer, std::vector<CaloCell*>& map ) const override;
+ virtual StatusCode executePi0CreateROI(xAOD::TauJet& pTau, CaloCellContainer& caloCellContainer, boost::dynamic_bitset<>& map) const override;
#endif
virtual StatusCode executeVertexFinder(xAOD::TauJet& pTau,
const xAOD::VertexContainer* vertexContainer = nullptr,
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h b/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h
index c515d3bf61070ba54257d1d62b626be54223f809..11012f49bfea8080121f4ac68540576fbd76cdbf 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h
@@ -34,7 +34,7 @@ class TauSubstructureVariables : public TauRecToolBase
private:
// use shower subtracted clusters with PFlow jet seeds
- bool m_incShowerSubtr;
+ bool m_useSubtractedCluster;
ToolHandle<ITauVertexCorrection> m_tauVertexCorrection { this,
"TauVertexCorrection", "TauVertexCorrection", "Tool to perform the vertex correction"};
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauVertexCorrection.h b/Reconstruction/tauRecTools/tauRecTools/TauVertexCorrection.h
index d28681b59d854c8a3253396c8e76d68fe0a78d59..4b4d53d4bcaedfdfd62923bd825a272d2cc3b34e 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauVertexCorrection.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauVertexCorrection.h
@@ -88,11 +88,12 @@ private:
/// Switch of the jet vertex correction
bool m_doJetVertexCorrection;
- /// Whether the seed jet is at EM scale
- bool m_isEMScale = false; //!
-
/// Whehter the seed jet is PFO
bool m_isPFO = false; //!
+
+ /// Calibration state of cluster
+ xAOD::CaloCluster::State m_clusterState; //!
+
};
#endif // ITAUVERTEXCORRECTION_H
diff --git a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
index baae1d130d89e10398dea878de53319f8aed74df..5d6eb8d20bac9f602c7377ce769aab0328ee2765 100755
--- a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
+++ b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
@@ -102,7 +102,7 @@ def BeamEffectsAlgBasicCfg(ConfigFlags, **kwargs):
alg = Simulation__BeamEffectsAlg(name="BeamEffectsAlg", **kwargs)
# Set default properties
- alg.ISFRun = False
+ alg.ISFRun = ConfigFlags.Sim.ISFRun
alg.InputMcEventCollection = "GEN_EVENT"
alg.OutputMcEventCollection = "BeamTruthEvent"
@@ -170,7 +170,7 @@ if __name__ == "__main__":
#included to stop segmentation error - TODO see why it's failing
ConfigFlags.Input.isMC = True
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-14" #conditions tag for conddb (which one to use - old one for simulation)
- ConfigFlags.Input.RunNumber = 284500 # run test job with and without run number and 222510
+ ConfigFlags.Input.RunNumber = [284500] # run test job with and without run number and 222510
# Finalize
ConfigFlags.lock()
diff --git a/Simulation/BeamEffects/src/BeamEffectsAlg.cxx b/Simulation/BeamEffects/src/BeamEffectsAlg.cxx
index 6ea0fb81b47f2f8664fb7bc300605acb54f2663c..3896ca65118d31382c343b8656d97db7c123fd72 100644
--- a/Simulation/BeamEffects/src/BeamEffectsAlg.cxx
+++ b/Simulation/BeamEffects/src/BeamEffectsAlg.cxx
@@ -83,19 +83,19 @@ namespace Simulation
{
//Ensure that we have a valid signal_process_vertex
#ifdef HEPMC3
- if( !HepMC::signal_process_vertex(ge) ) {
+ if( !HepMC::signal_process_vertex(&ge) ) {
if(m_ISFRun) {
ATH_MSG_DEBUG("No signal_process_vertex found - creating a dummy GenVertex.");
HepMC::FourVector signalPos( 0.0, 0.0, 0.0, 0.0);
HepMC::GenVertexPtr signalVertex = HepMC::newGenVertexPtr( signalPos );
// ge will now take ownership of the signal process vertex
- HepMC::set_signal_process_vertex(ge, signalVertex );
+ HepMC::set_signal_process_vertex(&ge, signalVertex );
}
else {
- if (!ge.vertices_empty()) {
+ if (!ge.vertices().empty()) {
ATH_MSG_DEBUG("No signal_process_vertex found - using the first GenVertex in the event.");
HepMC::GenVertexPtr signalVertex = ge.vertices().front();
- HepMC::set_signal_process_vertex(ge,signalVertex );
+ HepMC::set_signal_process_vertex(&ge,signalVertex );
}
}
if( !HepMC::signal_process_vertex(&ge) ) { // Insanity check
diff --git a/Simulation/BeamEffects/src/BeamSpotReweightingAlg.cxx b/Simulation/BeamEffects/src/BeamSpotReweightingAlg.cxx
index fc8a8c89f806f496d8fa7985a3e6400ccbbc665d..381722b61e741250bb547898e8c20156e7871152 100644
--- a/Simulation/BeamEffects/src/BeamSpotReweightingAlg.cxx
+++ b/Simulation/BeamEffects/src/BeamSpotReweightingAlg.cxx
@@ -76,7 +76,7 @@ namespace Simulation
ATH_MSG_WARNING("No first event found in the McEventCollection input collection, use default weight="<<weight);
break;
}
- HepMC::GenVertex *signalVertex = GetSignalProcessVertex(*currentGenEvent);
+ auto signalVertex = GetSignalProcessVertex(*currentGenEvent);
if(signalVertex) {
//now calculate weight
@@ -130,17 +130,17 @@ namespace Simulation
return StatusCode::SUCCESS;
}
- HepMC::GenVertex* BeamSpotReweightingAlg::GetSignalProcessVertex(const HepMC::GenEvent& ge) const
+ HepMC::ConstGenVertexPtr BeamSpotReweightingAlg::GetSignalProcessVertex(const HepMC::GenEvent& ge) const
{
//Ensure that we have a valid signal_process_vertex
#ifdef HEPMC3
- if( !HepMC::signal_process_vertex(ge) ) {
- if (!ge.vertices_empty()) {
+ if( !HepMC::signal_process_vertex(&ge) ) {
+ if (!ge.vertices().empty()) {
ATH_MSG_DEBUG("No signal_process_vertex found - using the first GenVertex in the event.");
- HepMC::GenVertexPtr signalVertex = ge.vertices().front();
+ auto signalVertex = ge.vertices().front();
return signalVertex;
}
- if( !HepMC::signal_process_vertex(ge) ) { // Insanity check
+ if( !HepMC::signal_process_vertex(&ge) ) { // Insanity check
if (!ge.vertices().empty()) {
ATH_MSG_ERROR("Failed to set signal_process_vertex for GenEvent!!");
return nullptr;
@@ -151,7 +151,7 @@ namespace Simulation
}
else {
ATH_MSG_DEBUG("signal_process_vertex set by Generator.");
- return HepMC::signal_process_vertex(ge);
+ return HepMC::signal_process_vertex(&ge);
}
#else
if( !ge.signal_process_vertex() ) {
diff --git a/Simulation/BeamEffects/src/BeamSpotReweightingAlg.h b/Simulation/BeamEffects/src/BeamSpotReweightingAlg.h
index 83c1f4141be18cf7cf2c8c186261f6477cddd6db..5a53f6b27b25d3a2556bf8b091b988e6f07b3be0 100644
--- a/Simulation/BeamEffects/src/BeamSpotReweightingAlg.h
+++ b/Simulation/BeamEffects/src/BeamSpotReweightingAlg.h
@@ -24,11 +24,7 @@
// Forward declarations
#include "AtlasHepMC/GenEvent_fwd.h"
-
-namespace HepMC
-{
- class GenVertex;
-}
+#include "AtlasHepMC/GenVertex_fwd.h"
namespace Simulation
{
@@ -57,7 +53,7 @@ namespace Simulation
private:
/** Ensure that the GenEvent::signal_process_vertex has been set */
- HepMC::GenVertex* GetSignalProcessVertex(const HepMC::GenEvent& ge) const;
+ HepMC::ConstGenVertexPtr GetSignalProcessVertex(const HepMC::GenEvent& ge) const;
SG::ReadHandleKey<McEventCollection> m_inputMcEventCollection { this, "InputMcEventCollection", "TruthEvent", "The name of the input McEventCollection" };
diff --git a/Simulation/BeamEffects/src/ZeroLifetimePositioner.cxx b/Simulation/BeamEffects/src/ZeroLifetimePositioner.cxx
index ba6588c726880469163682dbd3e8a5e4708d38a8..218d91e783df1a18c485d354955ba2b3f394cb51 100644
--- a/Simulation/BeamEffects/src/ZeroLifetimePositioner.cxx
+++ b/Simulation/BeamEffects/src/ZeroLifetimePositioner.cxx
@@ -82,35 +82,35 @@ StatusCode Simulation::ZeroLifetimePositioner::manipulate(HepMC::GenEvent& ge, b
ATH_MSG_DEBUG("Found a vertex to correct with incoming PDG code = " << pdgIn);
ATH_MSG_VERBOSE("Next Vertex:");
if (ATH_UNLIKELY(this->msgLvl (MSG::VERBOSE))) {
- nextVtx->print();
+ HepMC::Print::line(nextVtx);
}
const HepMC::FourVector &nextVec = nextVtx->position();
const CLHEP::HepLorentzVector nextPos( nextVec.x(), nextVec.y(), nextVec.z(), nextVec.t() );
ATH_MSG_VERBOSE("Current Vertex:");
if (ATH_UNLIKELY(this->msgLvl (MSG::VERBOSE))) {
- curVtx->print();
+ HepMC::Print::line(curVtx);
}
if (applyPatch) {
HepMC::GenVertexPtr prevVtx = curVtx->particles_in().front()->production_vertex();
ATH_MSG_VERBOSE("Previous Vertex:");
if (ATH_UNLIKELY(this->msgLvl (MSG::VERBOSE))) {
- prevVtx->print();
+ HepMC::Print::line(prevVtx);
}
const HepMC::FourVector &prevVec = prevVtx->position();
const CLHEP::HepLorentzVector prevPos( prevVec.x(), prevVec.y(), prevVec.z(), prevVec.t() );
CLHEP::HepLorentzVector newPos = 0.5*(prevPos+nextPos);
- curVtx->set_position(newPos);
+ curVtx->set_position(HepMC::FourVector(newPos.x(),newPos.y(),newPos.z(),newPos.t()));
ATH_MSG_DEBUG("Revised current Vertex");
if (ATH_UNLIKELY(this->msgLvl (MSG::VERBOSE))) {
- curVtx->print();
+ HepMC::Print::line(curVtx);
}
}
if (removePatch) {
CLHEP::HepLorentzVector newPos = nextPos;
- curVtx->set_position(newPos);
+ curVtx->set_position(HepMC::FourVector(newPos.x(),newPos.y(),newPos.z(),newPos.t()));
ATH_MSG_DEBUG("Revised current Vertex");
if (ATH_UNLIKELY(this->msgLvl (MSG::VERBOSE))) {
- curVtx->print();
+ HepMC::Print::line(curVtx);
}
}
}
diff --git a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
index a6f12833eb2eace2f4b2ba35e84545051883b03f..4a7ac7cb8306a1e7eaa59e694a2c936ca99be7a1 100644
--- a/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
+++ b/Simulation/BeamEffects/test/BeamEffectsAlg_test.cxx
@@ -20,6 +20,7 @@
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenVertex.h"
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Operators.h"
// CLHEP includes
#include "CLHEP/Vector/LorentzVector.h"
@@ -94,41 +95,49 @@ namespace SimTesting {
TEST_F(BeamEffectsAlg_test, patchSignalProcessVertex_empty_GenEvent) {
HepMC::GenEvent ge;
ASSERT_TRUE( patchSignalProcessVertex(ge).isSuccess() );
- ASSERT_TRUE( ge.signal_process_vertex()==nullptr );
+ ASSERT_TRUE( HepMC::signal_process_vertex(&ge)==nullptr );
}
TEST_F(BeamEffectsAlg_test, signal_process_vertex_exists) {
HepMC::GenEvent ge;
CLHEP::HepLorentzVector myPos( 1.0, 1.0, 1.0, 1.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
- ge.set_signal_process_vertex( myVertex );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
+ HepMC::set_signal_process_vertex(&ge, myVertex );
ASSERT_TRUE( patchSignalProcessVertex(ge).isSuccess() );
- ASSERT_TRUE( ge.signal_process_vertex()==myVertex );
+ ASSERT_TRUE( HepMC::signal_process_vertex(&ge)==myVertex );
}
TEST_F(BeamEffectsAlg_test, add_signal_process_vertex_atlasG4) {
HepMC::GenEvent ge;
CLHEP::HepLorentzVector myPos( 1.0, 1.0, 1.0, 1.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
ge.add_vertex( myVertex );
- ASSERT_TRUE( ge.signal_process_vertex()==nullptr );
+ ASSERT_TRUE( HepMC::signal_process_vertex(&ge)==nullptr );
ASSERT_TRUE( m_alg->setProperty( "ISFRun", false).isSuccess() );
ASSERT_TRUE( patchSignalProcessVertex(ge).isSuccess() );
- ASSERT_TRUE( ge.signal_process_vertex()==myVertex );
- ASSERT_EQ( *ge.signal_process_vertex(), *myVertex );
+ ASSERT_TRUE( HepMC::signal_process_vertex(&ge)==myVertex );
+#ifdef HEPMC3
+//Not needed for HepMC3
+#else
+ ASSERT_EQ( *HepMC::signal_process_vertex(&ge), *myVertex );
+#endif
}
TEST_F(BeamEffectsAlg_test, add_signal_process_vertex_isfG4) {
HepMC::GenEvent ge;
CLHEP::HepLorentzVector myPos( 1.0, 1.0, 1.0, 1.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
HepMC::GenVertexPtr dummyVertex = HepMC::newGenVertexPtr();
ge.add_vertex( myVertex );
- ASSERT_TRUE( ge.signal_process_vertex()==nullptr );
+ ASSERT_TRUE( HepMC::signal_process_vertex(&ge)==nullptr );
ASSERT_TRUE( m_alg->setProperty( "ISFRun", true).isSuccess() );
ASSERT_TRUE( patchSignalProcessVertex(ge).isSuccess() );
- ASSERT_TRUE( ge.signal_process_vertex()!=myVertex );
- ASSERT_EQ( *ge.signal_process_vertex(), *dummyVertex );
+ ASSERT_TRUE( HepMC::signal_process_vertex(&ge)!=myVertex );
+#ifdef HEPMC3
+//Not needed for HepMC3
+#else
+ ASSERT_EQ( *HepMC::signal_process_vertex(&ge), *dummyVertex );
+#endif
}
TEST_F(BeamEffectsAlg_test, execute_pass_through) {
@@ -142,7 +151,7 @@ namespace SimTesting {
inputTestDataHandle->push_back(new HepMC::GenEvent());
HepMC::GenEvent& ge = *(inputTestDataHandle->at(0));
CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, 2, 10);
myVertex->add_particle_in(inParticle1);
@@ -156,7 +165,7 @@ namespace SimTesting {
HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, -2, 10);
myVertex->add_particle_out(inParticle4);
ge.add_vertex( myVertex );
- ge.set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex(&ge, myVertex );
ge.set_beam_particles(inParticle1,inParticle2);
//
ASSERT_TRUE( m_alg->initialize().isSuccess() );
@@ -165,10 +174,17 @@ namespace SimTesting {
ASSERT_TRUE( outputTestDataKey.initialize().isSuccess() );
SG::ReadHandle<McEventCollection> outputTestDataHandle{outputTestDataKey,ctx};
ASSERT_TRUE( outputTestDataHandle.isValid() );
+#ifdef HEPMC3
+ ASSERT_EQ(HepMC::signal_process_vertex(outputTestDataHandle->at(0)), HepMC::signal_process_vertex(inputTestDataHandle->at(0)));
+ ASSERT_EQ(outputTestDataHandle->at(0)->vertices().begin(), ((const HepMC::GenEvent*)inputTestDataHandle->at(0))->vertices().begin());
+ ASSERT_EQ(outputTestDataHandle->at(0)->beams().at(0), inputTestDataHandle->at(0)->beams().at(0));
+ ASSERT_EQ(outputTestDataHandle->at(0)->beams().at(1),inputTestDataHandle->at(0)->beams().at(1));
+#else
ASSERT_EQ(*(outputTestDataHandle->at(0)->signal_process_vertex()), *(inputTestDataHandle->at(0)->signal_process_vertex()));
ASSERT_EQ(**(outputTestDataHandle->at(0)->vertices_begin()), **(inputTestDataHandle->at(0)->vertices_begin()));
ASSERT_EQ(*(outputTestDataHandle->at(0)->beam_particles().first), *(inputTestDataHandle->at(0)->beam_particles().first));
ASSERT_EQ(*(outputTestDataHandle->at(0)->beam_particles().second), *(inputTestDataHandle->at(0)->beam_particles().second));
+#endif
}
} // <-- namespace SimTesting
diff --git a/Simulation/Digitization/python/PileUpConfigNew.py b/Simulation/Digitization/python/PileUpConfigNew.py
index 3e820245dd08627e16249fc6bd4792aa243290cb..9f4a8c8fd0035a35805b38c2ead06ad2cb27adcb 100644
--- a/Simulation/Digitization/python/PileUpConfigNew.py
+++ b/Simulation/Digitization/python/PileUpConfigNew.py
@@ -5,14 +5,19 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from RngComps.RandomServices import RNG
+from RngComps.RandomServices import dSFMT
from Digitization import PileUpEventType
from Digitization.RunDependentConfigNew import (
- MaxNevtsPerXing,
+ maxNevtsPerXing,
LumiProfileSvcCfg, NoProfileSvcCfg,
)
+def PileUpConfigdSFMT(name):
+ """Local wrapper for dSFMT RNG service"""
+ return dSFMT(name + " OFFSET 340 123 345")
+
+
def StepArrayBMCfg(flags, name="StepArrayBM", **kwargs):
acc = ComponentAccumulator()
kwargs.setdefault("IntensityPattern", flags.Digitization.PU.BeamIntensityPattern)
@@ -32,8 +37,8 @@ def FixedArrayBMCfg(flags, name="FixedArrayBM", **kwargs):
def ArrayBMCfg(flags, name="ArrayBM", **kwargs):
acc = ComponentAccumulator()
kwargs.setdefault("IntensityPattern", flags.Digitization.PU.BeamIntensityPattern)
- acc.merge(RNG())
- kwargs.setdefault("RandomSvc", acc.getService("AthRNGSvc"))
+ acc.merge(PileUpConfigdSFMT("PileUpCollXingStream"))
+ kwargs.setdefault("RandomSvc", acc.getService("AtDSFMTGenSvc"))
acc.addService(CompFactory.ArrayBM(name, **kwargs))
return acc
@@ -81,6 +86,7 @@ def BeamHaloEventSelectorCfg(flags, name="BeamHaloEventSelector", **kwargs):
return acc
+
def MinBiasCacheCfg(flags, name="MinBiasCache", **kwargs):
acc = ComponentAccumulator()
kwargs.setdefault("CollPerXing", flags.Digitization.PU.NumberOfLowPtMinBias + flags.Digitization.PU.NumberOfHighPtMinBias)
@@ -98,9 +104,10 @@ def MinBiasCacheCfg(flags, name="MinBiasCache", **kwargs):
kwargs.setdefault("OccupationFraction", (float(flags.Digitization.PU.BunchSpacing)/
float(flags.Beam.BunchSpacing)))
+
RndmStreamName = "PileUpCollXingStream"
- acc.merge(RNG(name=RndmStreamName))
- kwargs.setdefault("RndmGenSvc", acc.getService(RndmStreamName))
+ acc.merge(PileUpConfigdSFMT(RndmStreamName))
+ kwargs.setdefault("RndmGenSvc", acc.getService("AtDSFMTGenSvc"))
kwargs.setdefault("RndmStreamName", RndmStreamName)
# FIXME migrated, but SplitBkgStreamsCache does not exist
@@ -120,9 +127,10 @@ def LowPtMinBiasCacheCfg(flags, name="LowPtMinBiasCache", **kwargs):
kwargs.setdefault("OccupationFraction", (float(flags.Digitization.PU.BunchSpacing)/
float(flags.Beam.BunchSpacing)))
+
RndmStreamName = "PileUpCollXingStream"
- acc.merge(RNG(name=RndmStreamName))
- kwargs.setdefault("RndmGenSvc", acc.getService(RndmStreamName))
+ acc.merge(PileUpConfigdSFMT(RndmStreamName))
+ kwargs.setdefault("RndmGenSvc", acc.getService("AtDSFMTGenSvc"))
kwargs.setdefault("RndmStreamName", RndmStreamName)
# Use BkgStreamsStepCaches when using the StepArrayBM and BkgStreamsCache otherwise
@@ -146,9 +154,10 @@ def HighPtMinBiasCacheCfg(flags, name="HighPtMinBiasCache", **kwargs):
kwargs.setdefault("EventSelector", acc.getService("HighPtMinBiasEventSelector"))
kwargs.setdefault("OccupationFraction", (float(flags.Digitization.PU.BunchSpacing)/
float(flags.Beam.BunchSpacing)))
+
RndmStreamName = "PileUpCollXingStream"
- acc.merge(RNG(name=RndmStreamName))
- kwargs.setdefault("RndmGenSvc", acc.getService(RndmStreamName))
+ acc.merge(PileUpConfigdSFMT(RndmStreamName))
+ kwargs.setdefault("RndmGenSvc", acc.getService("AtDSFMTGenSvc"))
kwargs.setdefault("RndmStreamName", RndmStreamName)
# Use BkgStreamsStepCaches when using the StepArrayBM and BkgStreamsCache otherwise
@@ -179,9 +188,10 @@ def CavernCacheCfg(flags, name="CavernCache", **kwargs):
kwargs.setdefault("OccupationFraction", OccupationFraction)
acc.merge(CavernEventSelectorCfg(flags))
kwargs.setdefault("EventSelector", acc.getService("cavernEventSelector"))
+
RndmStreamName = "PileUpCollXingStream"
- acc.merge(RNG(name=RndmStreamName))
- kwargs.setdefault("RndmGenSvc", acc.getService(RndmStreamName))
+ acc.merge(PileUpConfigdSFMT(RndmStreamName))
+ kwargs.setdefault("RndmGenSvc", acc.getService("AtDSFMTGenSvc"))
kwargs.setdefault("RndmStreamName", RndmStreamName)
# Use BkgStreamsStepCaches when using the StepArrayBM and BkgStreamsCache otherwise
@@ -206,8 +216,8 @@ def BeamGasCacheCfg(flags, name="BeamGasCache", **kwargs):
kwargs.setdefault("EventSelector", acc.getService("BeamGasEventSelector"))
RndmStreamName = "PileUpCollXingStream"
- acc.merge(RNG(name=RndmStreamName))
- kwargs.setdefault("RndmGenSvc", acc.getService(RndmStreamName))
+ acc.merge(PileUpConfigdSFMT(RndmStreamName))
+ kwargs.setdefault("RndmGenSvc", acc.getService("AtDSFMTGenSvc"))
kwargs.setdefault("RndmStreamName", RndmStreamName)
# Use BkgStreamsStepCaches when using the StepArrayBM and BkgStreamsCache otherwise
@@ -233,8 +243,8 @@ def BeamHaloCacheCfg(flags, name="BeamHaloCache", **kwargs):
kwargs.setdefault("EventSelector", acc.getService("BeamHaloEventSelector"))
RndmStreamName = "PileUpCollXingStream"
- acc.merge(RNG(name=RndmStreamName))
- kwargs.setdefault("RndmGenSvc", acc.getService(RndmStreamName))
+ acc.merge(PileUpConfigdSFMT(RndmStreamName))
+ kwargs.setdefault("RndmGenSvc", acc.getService("AtDSFMTGenSvc"))
kwargs.setdefault("RndmStreamName", RndmStreamName)
#Use BkgStreamsStepCaches when using the StepArrayBM and BkgStreamsCache otherwise
@@ -295,7 +305,7 @@ def PileUpEventLoopMgrCfg(flags, name="PileUpEventLoopMgr", **kwargs):
kwargs.setdefault("lastXing", flags.Digitization.PU.FinalBunchCrossing)
if flags.Digitization.PU.RunAndLumiOverrideList:
- kwargs.setdefault("MaxMinBiasCollPerXing", MaxNevtsPerXing(flags))
+ kwargs.setdefault("MaxMinBiasCollPerXing", maxNevtsPerXing(flags))
acc.merge(LumiProfileSvcCfg(flags))
kwargs.setdefault("BeamLuminosity", acc.getService("LumiProfileSvc"))
else:
diff --git a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
index c224fe37e8f4bc52d431094c8eee8e05a2c63bdf..74545bff07333b3b15196f3829c88466c493d4b1 100755
--- a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
@@ -17,43 +17,91 @@ from Digitization.DigitizationParametersConfig import writeDigitizationMetadata
from MCTruthSimAlgs.RecoTimingConfig import MergeRecoTimingObjCfg
from AthenaConfiguration.JobOptsDumper import JobOptsDumperCfg
from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
+from Digitization.PileUpConfigNew import PileUpEventLoopMgrCfg
from DigitizationPUConfigNew_test_setup import (
- test_HighPtMinbiasHitsFile,
- test_LowPtMinbiasHitsFile,
test_BeamIntensityPattern,
test_fragment,
pileUpCalc,
makeBkgInputCol,
)
+from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
+from SCT_Digitization.SCT_DigitizationConfigNew import SCT_DigitizationCfg
+from TRT_Digitization.TRT_DigitizationConfigNew import TRT_DigitizationCfg
+from PixelDigitization.PixelDigitizationConfigNew import PixelDigitizationCfg
+from LArDigitization.LArDigitizationConfigNew import LArTriggerDigitizationCfg
+from TileSimAlgs.TileDigitizationConfig import TileDigitizationCfg, TileTriggerDigitizationCfg
+from MuonConfig.MDT_DigitizationConfig import MDT_DigitizationDigitToRDOCfg
+from MuonConfig.TGC_DigitizationConfig import TGC_DigitizationDigitToRDOCfg
+from MuonConfig.RPC_DigitizationConfig import RPC_DigitizationDigitToRDOCfg
+from MuonConfig.CSC_DigitizationConfig import CSC_DigitizationDigitToRDOCfg
+
+def EvtIdModifierSvc_add_modifier(svc,
+ run_nbr=None, evt_nbr=None, time_stamp=None, lbk_nbr=None,
+ nevts=1):
+ if run_nbr is None:
+ modify_run_nbr = 0
+ run_nbr = 0
+ else:
+ modify_run_nbr = 1
+
+ if evt_nbr is None:
+ modify_evt_nbr = 0
+ evt_nbr = 0
+ else:
+ modify_evt_nbr = 1
+
+ if time_stamp is None:
+ modify_time_stamp = 0
+ time_stamp = 0
+ else:
+ modify_time_stamp = 1
+
+ if lbk_nbr is None:
+ modify_lbk_nbr = 0
+ lbk_nbr = 0
+ else:
+ modify_lbk_nbr = 1
+
+ mod_bit = int(0b0000
+ | (modify_run_nbr << 0)
+ | (modify_evt_nbr << 1)
+ | (modify_time_stamp << 2)
+ | (modify_lbk_nbr << 3))
+
+ svc.Modifiers += [run_nbr, evt_nbr, time_stamp, lbk_nbr,
+ nevts, mod_bit]
+
# Set up logging and new style config
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
-evtMax = 4
+ConfigFlags.Exec.MaxEvents = 4
-# Configure
ConfigFlags.Input.Files = defaultTestFiles.HITS
-ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-20"
+ConfigFlags.Output.RDOFileName = "mc16d_ttbar.CA.RDO.pool.root"
+ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
+
ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Concurrency.NumThreads = 1
-ConfigFlags.Concurrency.NumConcurrentEvents = 1
+ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
ConfigFlags.Beam.BunchSpacing = 25
-# TODO deduplicate NumberOfCollisions?
ConfigFlags.Beam.NumberOfCollisions = 20.
-ConfigFlags.Exec.MaxEvents = evtMax
-
ConfigFlags.LAr.ROD.NumberOfCollisions = 20
ConfigFlags.LAr.ROD.nSamples = 4
ConfigFlags.LAr.ROD.DoOFCPileupOptimization = True
ConfigFlags.LAr.ROD.FirstSample = 0
ConfigFlags.LAr.ROD.UseHighestGainAutoCorr = True
-ConfigFlags.Digitization.DoXingByXingPileUp = True
+ConfigFlags.Digitization.Pileup = False
+ConfigFlags.Digitization.DoDigiTruth = True
+ConfigFlags.Digitization.TruthOutput = True
+ConfigFlags.Digitization.RandomSeedOffset = 170
+
+ConfigFlags.Digitization.DoXingByXingPileUp = True # TODO get success with this flag enabled
ConfigFlags.Digitization.HighGainEMECIW = False
+
ConfigFlags.Digitization.PU.BunchSpacing = 25
ConfigFlags.Digitization.PU.CavernIgnoresBeamInt = True
ConfigFlags.Digitization.PU.NumberOfCavern = 0.0
@@ -62,14 +110,18 @@ ConfigFlags.Digitization.PU.NumberOfLowPtMinBias = 80.290021063135
ConfigFlags.Digitization.PU.BeamIntensityPattern = test_BeamIntensityPattern
ConfigFlags.Digitization.PU.RunAndLumiOverrideList = test_fragment
-cols = makeBkgInputCol(ConfigFlags, [test_HighPtMinbiasHitsFile],
+cols = makeBkgInputCol(ConfigFlags, defaultTestFiles.HITS_MINBIAS_HIGH,
ConfigFlags.Digitization.PU.NumberOfHighPtMinBias, True)
ConfigFlags.Digitization.PU.HighPtMinBiasInputCols = cols
-cols = makeBkgInputCol(ConfigFlags, [test_LowPtMinbiasHitsFile],
+cols = makeBkgInputCol(ConfigFlags, defaultTestFiles.HITS_MINBIAS_LOW,
ConfigFlags.Digitization.PU.NumberOfLowPtMinBias, True)
ConfigFlags.Digitization.PU.LowPtMinBiasInputCols = cols
+ConfigFlags.Concurrency.NumThreads = 1
+ConfigFlags.Concurrency.NumConcurrentEvents = 1
+ConfigFlags.Tile.BestPhaseFromCOOL = False
+ConfigFlags.Tile.correctTime = False
ConfigFlags.lock()
@@ -80,17 +132,10 @@ ConfigFlags.Sim.RunToTimestampDict
acc = MainServicesCfg(ConfigFlags)
acc.merge(PoolReadCfg(ConfigFlags))
acc.merge(PoolWriteCfg(ConfigFlags))
-acc.merge(writeDigitizationMetadata(ConfigFlags))
-
-# Old EventInfo conversion
-if "EventInfo" not in ConfigFlags.Input.Collections:
- acc.merge(EventInfoCnvAlgCfg(ConfigFlags,
- inputKey="McEventInfo",
- outputKey="EventInfo"))
-from Digitization.RunDependentConfigNew import EvtIdModifierSvcCfg
-acc.merge(EvtIdModifierSvcCfg(ConfigFlags))
+acc.merge(writeDigitizationMetadata(ConfigFlags))
+# Signal-only truth information
from Digitization.PileUpToolsConfig import PileUpToolsCfg
from MCTruthSimAlgs.MCTruthSimAlgsConfigNew import (
SignalOnlyMcEventCollCfg,
@@ -99,27 +144,69 @@ from MCTruthSimAlgs.MCTruthSimAlgsConfigNew import (
MergeCalibHitsCfg,
)
+acc.merge(PileUpEventLoopMgrCfg(ConfigFlags))
+
acc.merge(SignalOnlyMcEventCollCfg(ConfigFlags))
acc.merge(MergeTruthJetsCfg(ConfigFlags))
acc.merge(MergeMuonEntryLayerCfg(ConfigFlags))
acc.merge(MergeCalibHitsCfg(ConfigFlags))
-
-# Migration of --digiSteeringConf
-# TODO configure output
-#acc.getEventAlgo("OutputStreamRDO").AcceptAlgs = ["StandardPileUpToolsAlg"]
+# Inner Detector
+acc.merge(BCM_DigitizationCfg(ConfigFlags))
+acc.merge(PixelDigitizationCfg(ConfigFlags))
+acc.merge(SCT_DigitizationCfg(ConfigFlags))
+acc.merge(TRT_DigitizationCfg(ConfigFlags))
+
+# Calorimeter
+acc.merge(LArTriggerDigitizationCfg(ConfigFlags))
+acc.merge(TileDigitizationCfg(ConfigFlags))
+acc.merge(TileTriggerDigitizationCfg(ConfigFlags))
+
+# Muon Spectrometer
+acc.merge(MDT_DigitizationDigitToRDOCfg(ConfigFlags))
+acc.merge(TGC_DigitizationDigitToRDOCfg(ConfigFlags))
+acc.merge(RPC_DigitizationDigitToRDOCfg(ConfigFlags))
+acc.merge(CSC_DigitizationDigitToRDOCfg(ConfigFlags))
+
+# Timing
+acc.merge(MergeRecoTimingObjCfg(ConfigFlags))
+
+# FIXME hack to match to buggy behaviour in old style configuration
+OutputStreamRDO = acc.getEventAlgo("OutputStreamRDO")
+OutputStreamRDO.ItemList += ["EventInfo#*"]
+OutputStreamRDO.ItemList.remove("xAOD::EventInfo#EventInfo")
+OutputStreamRDO.ItemList.remove("xAOD::EventAuxInfo#EventInfoAux.")
+# FIXME this is marked "# Temporary for debugging MBTSHits" in DigiOutput.py
+OutputStreamRDO.ItemList += ["TileHitVector#MBTSHits"]
+# for Tile
+# new style configures these, but they are left default in old config
+TilePulseForTileMuonReceiver = acc.getEventAlgo("TilePulseForTileMuonReceiver")
+TilePulseForTileMuonReceiver.TileRawChannelBuilderMF.TimeMaxForAmpCorrection = 25.
+TilePulseForTileMuonReceiver.TileRawChannelBuilderMF.TimeMinForAmpCorrection = -25.
+TileRChMaker = acc.getEventAlgo("TileRChMaker")
+TileRChMaker.TileRawChannelBuilderFitOverflow.TimeMaxForAmpCorrection = 25.
+TileRChMaker.TileRawChannelBuilderFitOverflow.TimeMinForAmpCorrection = -25.
# Dump config
-acc.merge(JobOptsDumperCfg(ConfigFlags, FileName="DigiPUConfig.txt"))
+acc.merge(JobOptsDumperCfg(ConfigFlags, FileName="DigiPUConfigCA.txt"))
acc.getService("StoreGateSvc").Dump = True
acc.getService("ConditionStore").Dump = True
-acc.printConfig(withDetails=True)
+acc.printConfig(withDetails=True, summariseProps=True)
ConfigFlags.dump()
+# print services
+from AthenaConfiguration.ComponentAccumulator import filterComponents
+for s, _ in filterComponents(acc._services):
+ acc._msg.info(s)
+# print conditions
+for s in acc._conditionsAlgs:
+ acc._msg.info(s)
+
+# dump pickle
+with open("DigiPUConfigCA.pkl", "wb") as f:
+ acc.store(f)
-# Was not merged; this prevents errors
-acc.wasMerged()
# TODO uncomment running in the test once successful
# Execute and finish
-#sc = acc.run(maxEvents=evtMax)
+#sc = acc.run(maxEvents=ConfigFlags.Exec.MaxEvents)
# Success should be 0
#sys.exit(not sc.isSuccess())
diff --git a/Simulation/Digitization/test/DigitizationPUConfigNew_test_setup.py b/Simulation/Digitization/test/DigitizationPUConfigNew_test_setup.py
index 7b91471cc89dccaa2cd480ab2d3a999f1ab7cf85..87f5c3ed5ba1899031ad503fb977d972eb495515 100644
--- a/Simulation/Digitization/test/DigitizationPUConfigNew_test_setup.py
+++ b/Simulation/Digitization/test/DigitizationPUConfigNew_test_setup.py
@@ -3,10 +3,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
-test_HighPtMinbiasHitsFile = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/*"
-test_LowPtMinbiasHitsFile = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
-
-
# lifted from preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py
test_BeamIntensityPattern = [0.0, # bunch crossing zero is always empty
0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,
@@ -342,8 +338,9 @@ JobMaker=[
]
import math
+# TODO this should be integrated into the test (ConfigFlags.Exec.MaxEvents?)
trfJobNumber = 1
-trfMaxEvents = 25
+trfMaxEvents = 4
corrMaxEvents = float(trfMaxEvents)
#We may need to repeat this run for long production jobs.
@@ -406,6 +403,7 @@ def makeBkgInputCol(flags, initialList, nBkgEvtsPerCrossing, correctForEmptyBunc
nBkgEventsPerFile = 5000
try:
from PyUtils.MetaReader import read_metadata
+ # TODO fix traceback messages generated here
metadata = read_metadata(initialList[0])
metadata = metadata[initialList[0]] # promote all keys one level up
nBkgEventsPerFile = int(metadata["nentries"])
diff --git a/Simulation/G4Atlas/G4AtlasTests/src/MDTHitsTestTool.cxx b/Simulation/G4Atlas/G4AtlasTests/src/MDTHitsTestTool.cxx
index 86f4359a4e084002e696617986f3b71d23defa71..ae2873aa66ad09ebb14a00db4e68b2dbef0a3a66 100644
--- a/Simulation/G4Atlas/G4AtlasTests/src/MDTHitsTestTool.cxx
+++ b/Simulation/G4Atlas/G4AtlasTests/src/MDTHitsTestTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MDTHitsTestTool.h"
@@ -40,7 +40,7 @@ using namespace MuonGM;
Identifier MDTHitsTestTool::getIdentifier(HitID mdthit)
{
- MdtHitIdHelper* mdthelper = MdtHitIdHelper::GetHelper();
+ MdtHitIdHelper* mdthelper = MdtHitIdHelper::GetHelper(m_pMdtIdHelper->tubeMax());
std::string mdt_stname = mdthelper->GetStationName(mdthit);
int mdt_steta = mdthelper->GetZSector(mdthit);
int mdt_stphi = mdthelper->GetPhiSector(mdthit);
diff --git a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
index ed856ea9949a496db7b0a2a0994e08fbdb6397ad..8f143bf38c42fdf952214e7a5fbdb827f7aeef6c 100644
--- a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
@@ -21,7 +21,7 @@ atlas_add_library( G4AtlasToolsLib
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${TBB_LIBRARIES} AthenaBaseComps G4AtlasInterfaces SubDetectorEnvelopesLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CxxUtils GaudiKernel )
atlas_add_component( G4AtlasTools
src/components/*.cxx
diff --git a/Simulation/G4Atlas/G4AtlasTools/G4AtlasTools/ATLAS_CHECK_THREAD_SAFETY b/Simulation/G4Atlas/G4AtlasTools/G4AtlasTools/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..0f83ad2b32e375317b6197f05b5a7f7ce9537bbe
--- /dev/null
+++ b/Simulation/G4Atlas/G4AtlasTools/G4AtlasTools/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Simulation/G4Atlas/G4AtlasTools
diff --git a/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.cxx b/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.cxx
index c9716c25046aebab2584af83689986a4c3f929c3..1d7cb7f3cc5837b537251057e34babcaadde9975 100644
--- a/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.cxx
+++ b/Simulation/G4Atlas/G4AtlasTools/src/G4ThreadInitTool.cxx
@@ -1,9 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// Main header include
#include "G4ThreadInitTool.h"
+#include "CxxUtils/checker_macros.h"
// Geant4 includes
#include "G4WorkerRunManager.hh"
@@ -69,15 +70,17 @@ void G4ThreadInitTool::initThread()
// Share detector from master with worker.
ATH_MSG_INFO("Assigning detector construction");
- const G4VUserDetectorConstruction* detector =
- masterRM->GetUserDetectorConstruction();
// I don't want to const-cast here, but this is what they do in G4's
// StartThread function, so there is likely no alternative.
- wrm->G4RunManager::SetUserInitialization
- (const_cast<G4VUserDetectorConstruction*>(detector));
+ // Should not be a problem for threading.
+ G4VUserDetectorConstruction* detector ATLAS_THREAD_SAFE =
+ const_cast<G4VUserDetectorConstruction*> (masterRM->GetUserDetectorConstruction());
+ wrm->G4RunManager::SetUserInitialization (detector);
// Share physics list from master with worker.
- const G4VUserPhysicsList* physicslist = masterRM->GetUserPhysicsList();
- wrm->SetUserInitialization(const_cast<G4VUserPhysicsList*>(physicslist));
+ // Should not be a problem for threading.
+ G4VUserPhysicsList* physicslist ATLAS_THREAD_SAFE =
+ const_cast<G4VUserPhysicsList*>(masterRM->GetUserPhysicsList());
+ wrm->SetUserInitialization(physicslist);
// Build thread-local user actions - NOT CURRENTLY USED.
if(masterRM->GetUserActionInitialization()) {
diff --git a/Simulation/G4Atlas/G4AtlasTools/src/TightMuonElseNoFieldManager.cxx b/Simulation/G4Atlas/G4AtlasTools/src/TightMuonElseNoFieldManager.cxx
index 2838d13fe21612a60166d2b34a3a6666d1b6bd6c..97bccab6d462b9e7349c047a5ee9b5b5931c2850 100644
--- a/Simulation/G4Atlas/G4AtlasTools/src/TightMuonElseNoFieldManager.cxx
+++ b/Simulation/G4Atlas/G4AtlasTools/src/TightMuonElseNoFieldManager.cxx
@@ -1,8 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TightMuonElseNoFieldManager.h"
+#include "CxxUtils/checker_macros.h"
#include "G4Track.hh"
#include "G4MuonPlus.hh"
#include "G4MuonMinus.hh"
@@ -24,7 +25,13 @@ void TightMuonElseNoFieldManager::ConfigureForTrack(const G4Track * track)
{
// If they have not been set yet, get the settings for the global field manager
if (nullptr==m_globalField){
- m_globalField = const_cast<G4Field*>(GetDetectorField());
+ // Ok, we're just holding it and giving it back to the base class,
+ // and this method is not const.
+ // But the G4 base class interface makes this impossible to avoid
+ // (We could avoid it if G4FieldManager also had a non-const
+ // GetDetectorField.)
+ G4Field* field_nc ATLAS_THREAD_SAFE = const_cast<G4Field*>(GetDetectorField());
+ m_globalField = field_nc;
}
// If this is a muon, move it in the magnetic field; otherwise turn off the stepping
diff --git a/Simulation/G4Extensions/ExtraParticles/python/ExtraParticlesConfigDb.py b/Simulation/G4Extensions/ExtraParticles/python/ExtraParticlesConfigDb.py
index 044372cae7a6e73d102671e7d332ded4861dd4b5..0d2b14e65916916e7264ead57efde736ca495b3f 100644
--- a/Simulation/G4Extensions/ExtraParticles/python/ExtraParticlesConfigDb.py
+++ b/Simulation/G4Extensions/ExtraParticles/python/ExtraParticlesConfigDb.py
@@ -1,4 +1,5 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.CfgGetter import addTool
-addTool("ExtraParticles.ExtraParticlesConfig.getExtraParticlesPhysicsTool", "ExtraParticlesPhysicsTool" )
+addTool("ExtraParticles.ExtraParticlesConfig.getExtraParticlesPhysicsTool",
+ "ExtraParticlesPhysicsTool")
diff --git a/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py b/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py
index 4de1f36931fdf87d98359073756ba5077359486b..1ea091ff8eb0e75960eb5af281508a898dc43931 100644
--- a/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py
+++ b/Simulation/G4Extensions/ExtraParticles/python/PDGParser.py
@@ -131,7 +131,8 @@ class PDGParser(object):
prop = 'width'
else:
raise ValueError(
- 'Unidentified symbol %s for particle %s' % (symbol, baseName))
+ 'Unidentified symbol %s for particle %s' % (
+ symbol, baseName))
pdgs = splitLine[1:1+len(charges)]
value = float(splitLine[1+len(charges)])
@@ -149,8 +150,14 @@ class PDGParser(object):
self.extraParticles[name] = ExtraParticle(**kwargs)
else:
if getattr(self.extraParticles[name], prop) != -1:
- self.log.warning("Property %s is already set for particle %s. Current value is %s and incoming value is %s." ,
- (prop, name, getattr(self.extraParticles[name], prop), value))
+ self.log.warning(
+ "Property %s is already"
+ "set for particle %s."
+ "Current value is %s and"
+ "incoming value is %s.",
+ prop, name,
+ getattr(self.extraParticles[name], prop),
+ value)
continue
setattr(self.extraParticles[name], prop, value)
@@ -189,7 +196,7 @@ class PDGParser(object):
def createList(self):
- # make a new whitelist for GenParticleSimWhiteList (only pdgId is needed)
+ # make a new whitelist for GenParticleSimWhiteList
with open('G4particle_whitelist_ExtraParticles.txt', 'w') as writer:
for name in self.extraParticles:
writer.write('%s\n' % self.extraParticles[name].pdg)
diff --git a/Simulation/G4Sim/MCTruth/src/TrackInformation.cxx b/Simulation/G4Sim/MCTruth/src/TrackInformation.cxx
index fcaa59ba654156430121eb730b89a20a43e1cf97..a983733076c4cc575cf5847627260bd272f6916a 100644
--- a/Simulation/G4Sim/MCTruth/src/TrackInformation.cxx
+++ b/Simulation/G4Sim/MCTruth/src/TrackInformation.cxx
@@ -4,6 +4,8 @@
#include "MCTruth/TrackInformation.h"
#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
TrackInformation::TrackInformation():m_regenerationNr(0),m_theParticle(0),m_theBaseISFParticle(0),m_returnedToISF(false)
{
@@ -28,7 +30,7 @@ const ISF::ISFParticle* TrackInformation::GetBaseISFParticle() const
int TrackInformation::GetParticleBarcode() const
{
- return ( m_theParticle ? m_theParticle->barcode() : 0 );
+ return ( m_theParticle ? HepMC::barcode(m_theParticle) : 0 );
}
void TrackInformation::SetParticle(HepMC::ConstGenParticlePtr p)
diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx
index acc9cd35f9db2bec38c7ab640caa961fa173a232..df81bf59ce08e50b2353286dcdc710ebb0c617d5 100644
--- a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx
@@ -46,10 +46,15 @@ namespace G4UA
{
// Why a const_cast???
// This is an ugly way to communicate the GenParticle...
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part =
+ std::const_pointer_cast<HepMC3::GenParticle>( trackHelper.GetTrackInformation()->
+ GetHepMCParticle() );
+#else
HepMC::GenParticlePtr part =
const_cast<HepMC::GenParticlePtr>( trackHelper.GetTrackInformation()->
GetHepMCParticle() );
-
+#endif
// Assign the GenParticle to the AtlasG4EventUserInfo.
AtlasG4EventUserInfo* atlasG4EvtUserInfo = static_cast<AtlasG4EventUserInfo*>
(G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx
index 262a6f240acf722b7cf38e2fed115960f377b338..e91a39b74fe6ea5ccedf7a29e5f5001a3f6796c7 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx
@@ -449,7 +449,7 @@ StatusCode MergeMcEventCollTool::processUnfilteredEvent(const McEventCollection
const HepMC::GenEvent& currentBackgroundEvent(**(pMcEvtColl->begin())); //background event
//handle the slimming case
//ATH_MSG_VERBOSE( "The MB Event Number is " << currentBkgEventIndex << ". m_nBkgEventsReadSoFar = " << m_nBkgEventsReadSoFar );
- HepMC::GenVertex *pCopyOfGenVertex(NULL);
+ HepMC::GenVertexPtr pCopyOfGenVertex(NULL);
if ( currentBackgroundEvent.signal_process_vertex() ) pCopyOfGenVertex = new HepMC::GenVertex ( *currentBackgroundEvent.signal_process_vertex() );
//insert the GenEvent into the overlay McEventCollection.
m_pOvrlMcEvColl->at(m_startingIndexForBackground+m_nBkgEventsReadSoFar) = new HepMC::GenEvent(currentBackgroundEvent.signal_process_id(), currentBkgEventIndex, pCopyOfGenVertex );
@@ -462,9 +462,9 @@ StatusCode MergeMcEventCollTool::processUnfilteredEvent(const McEventCollection
ATH_MSG_VERBOSE( "Starting a vertex loop ... " );
//cout << "Starting a vertex loop ... " <<endl;
for (; currentVertexIter != endOfCurrentListOfVertices; ++currentVertexIter) {
- const HepMC::GenVertex *pCurrentVertex(*currentVertexIter);
- HepMC::GenVertex *pCopyOfVertexForClassification[NOPUTYPE];
- for (int type(INTIME); type<NOPUTYPE; ++type) pCopyOfVertexForClassification[type]=(HepMC::GenVertex*)0;
+ const HepMC::GenVertexPtr pCurrentVertex(*currentVertexIter);
+ HepMC::GenVertexPtr pCopyOfVertexForClassification[NOPUTYPE];
+ for (int type(INTIME); type<NOPUTYPE; ++type) pCopyOfVertexForClassification[type]=(HepMC::GenVertexPtr )0;
//check for collision vertices for in-time events
bool isCollisionVertex(false);
@@ -480,8 +480,8 @@ StatusCode MergeMcEventCollTool::processUnfilteredEvent(const McEventCollection
const HepMC::GenVertex::particles_out_const_iterator endOfListOfParticlesFromCurrentVertex(pCurrentVertex->particles_out_const_end());
for (; currentVertexParticleIter != endOfListOfParticlesFromCurrentVertex; ++currentVertexParticleIter) {
ATH_MSG_VERBOSE( "Found a particle at location " << std::hex << *currentVertexParticleIter << std::dec << " with PDG ID = " << (*currentVertexParticleIter)->pdg_id() );
- const HepMC::GenParticle *pCurrentVertexParticle(*currentVertexParticleIter);
- const HepMC::GenVertex *pCurrentParticleProductionVertex(pCurrentVertexParticle->production_vertex());
+ const HepMC::GenParticlePtr pCurrentVertexParticle(*currentVertexParticleIter);
+ const HepMC::GenVertexPtr pCurrentParticleProductionVertex(pCurrentVertexParticle->production_vertex());
puType particleClassification(classifyVertex(pCurrentVertexParticle, pCurrentParticleProductionVertex,currentEventTime));
//hack to keep the complete vertex information for the interaction vertices of in-time background events
if(isCollisionVertex && NOPUTYPE==particleClassification) {
@@ -525,11 +525,11 @@ StatusCode MergeMcEventCollTool::processUnfilteredEvent(const McEventCollection
return StatusCode::SUCCESS;
}
-bool MergeMcEventCollTool::isInitialCollisionVertex(const HepMC::GenVertex *pCurrentVertex) const {
+bool MergeMcEventCollTool::isInitialCollisionVertex(const HepMC::GenVertexPtr pCurrentVertex) const {
HepMC::GenVertex::particles_in_const_iterator currentVertexParticleIter(pCurrentVertex->particles_in_const_begin());
const HepMC::GenVertex::particles_in_const_iterator endOfListOfParticlesFromCurrentVertex(pCurrentVertex->particles_in_const_end());
while(currentVertexParticleIter != endOfListOfParticlesFromCurrentVertex) {
- const HepMC::GenParticle *pCurrentVertexParticle(*currentVertexParticleIter);
+ const HepMC::GenParticlePtr pCurrentVertexParticle(*currentVertexParticleIter);
// FIXME: Nasty kludge will only work for Pythia minbias currently
// Eventually just look for beam particles with status 4, but this
// requires an update to the HepMC version used by ATLAS.
@@ -543,7 +543,7 @@ bool MergeMcEventCollTool::isInitialCollisionVertex(const HepMC::GenVertex *pCur
return false;
}
-MergeMcEventCollTool::puType MergeMcEventCollTool::classifyVertex(const HepMC::GenParticle *pCurrentVertexParticle, const HepMC::GenVertex *pCurrentParticleProductionVertex, double currentEventTime) {
+MergeMcEventCollTool::puType MergeMcEventCollTool::classifyVertex(const HepMC::GenParticlePtr pCurrentVertexParticle, const HepMC::GenVertexPtr pCurrentParticleProductionVertex, double currentEventTime) {
//=======================================================================
//handle the slimming case
//=======================================================================
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
index 038b9aefa9285373060744f0e1c14690d6d6a6cc..0fff5864e4553f4fc5253a80b08a5086044c1469 100755
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
@@ -67,9 +67,9 @@ private:
//** Ensure that any GenEvent::HeavyIon info is stored in the signal GenEvent.
StatusCode saveHeavyIonInfo(const McEventCollection *pMcEvtColl);
//** Classify the current GenParticle according to the MC Truth Taskforce requirements
- MergeMcEventCollTool::puType classifyVertex(const HepMC::GenParticle *pCurrentVertexParticle, const HepMC::GenVertex *pCurrentParticleProductionVertex, double currentEventTime);
+ MergeMcEventCollTool::puType classifyVertex(const HepMC::GenParticlePtr pCurrentVertexParticle, const HepMC::GenVertexPtr pCurrentParticleProductionVertex, double currentEventTime);
//** Check if the current GenVertex contains beam particles
- bool isInitialCollisionVertex(const HepMC::GenVertex *pCurrentVertex) const;
+ bool isInitialCollisionVertex(const HepMC::GenVertexPtr pCurrentVertex) const;
//** Check whether the current McEventCollection has already been truth-filtered
bool isTruthFiltertedMcEventCollection(const McEventCollection *pMcEvtColl) const;
//** Map from GenEvent to puType FIXME: Simpler to key the map on GenEvent* ?
diff --git a/Simulation/ISF/ISF_Config/python/ISF_MainConfigNew.py b/Simulation/ISF/ISF_Config/python/ISF_MainConfigNew.py
index d7da235d5aba8660917d735b6802ff121aaf1ee0..d93468092c307e1db6c9b497e5fd3056b8e36f4e 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_MainConfigNew.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_MainConfigNew.py
@@ -87,9 +87,8 @@ def Kernel_FullG4MTCfg(flags, name="ISF_Kernel_FullG4MT", **kwargs):
acc = ComponentAccumulator()
acc.merge(ParticleKillerToolCfg(flags))
- acc.merge(FullGeant4ToolCfg(flags))
+ Fulltool = acc.popToolsAndMerge(FullGeant4ToolCfg(flags))
PKtool = acc.getPublicTool("ISF_ParticleKillerTool")
- Fulltool = acc.getPublicTool("ISF_FullGeant4Tool")
kwargs.setdefault("SimulationTools", [PKtool, Fulltool])
acc.merge(Kernel_GenericG4OnlyMTCfg(flags, name, **kwargs))
diff --git a/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py b/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py
index 441273c0e6424dff4bad5335fc072fd16f4cf7e8..eba37944670f66c483e6193f160d2b90cf522e59 100644
--- a/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py
+++ b/Simulation/ISF/ISF_Config/test/ISF_MainConfigNew_Test.py
@@ -15,6 +15,7 @@ def EvtIdModifierSvc_add_modifier(svc,
else:
modify_run_nbr = 1
+
if evt_nbr is None:
modify_evt_nbr = 0
evt_nbr = 0
@@ -64,12 +65,12 @@ if __name__ == '__main__':
from AthenaConfiguration.TestDefaults import defaultTestFiles
inputDir = defaultTestFiles.d
ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1'] #defaultTestFiles.EVNT
- ConfigFlags.Output.HITSFileName = "myHITSnew1106_2.pool.root"
+ ConfigFlags.Output.HITSFileName = "myHITSnew.pool.root"
#Sim ConfigFlags
#ConfigFlags.Sim.WorldRRange = 15000
#ConfigFlags.Sim.WorldZRange = 27000 #change defaults?
- ConfigFlags.Sim.CalibrationRun = "Off"
+ ConfigFlags.Sim.CalibrationRun = "Off" #"DeadLAr"
ConfigFlags.Sim.RecordStepInfo = False
ConfigFlags.Sim.CavernBG = "Signal"
ConfigFlags.Sim.BeamPipeSimMode = 'FastSim'
@@ -130,6 +131,10 @@ if __name__ == '__main__':
ConfigFlags.Detector.SimulateFwdRegion = False
ConfigFlags.Detector.SimulateForward = False
+ #Frozen showers OFF = 0
+ ConfigFlags.Sim.LArParameterization = 2
+
+ ConfigFlags.Sim.TruthStrategy = "MC15aPlus"
# Finalize
ConfigFlags.lock()
@@ -143,7 +148,7 @@ if __name__ == '__main__':
myRunNumber = 284500
myFirstLB = 1
myInitialTimeStamp = 1446539185
- evtMax = 4
+ evtMax = 1
from AthenaConfiguration.ComponentFactory import CompFactory
evtIdModifierSvc = CompFactory.EvtIdModifierSvc(EvtStoreName="StoreGateSvc")
iovDbMetaDataTool = CompFactory.IOVDbMetaDataTool()
@@ -171,6 +176,72 @@ if __name__ == '__main__':
from TileGeoG4SD.TileGeoG4SDToolConfig import TileGeoG4SDCalcCfg
cfg.merge(TileGeoG4SDCalcCfg(ConfigFlags))
+
+
+ #Add to item list
+ #TODO - make a separate function (combine with G4AtlasAlg one?)
+ ItemList = ["EventInfo#*",
+ "McEventCollection#TruthEvent",
+ "JetCollection#*"]
+
+ if ConfigFlags.Sim.IncludeParentsInG4Event:
+ ItemList += ["McEventCollection#GEN_EVENT"]
+
+ ItemList += ["xAOD::JetContainer#*",
+ "xAOD::JetAuxContainer#*"]
+
+ if ConfigFlags.Detector.SimulateID:
+ ItemList += ["SiHitCollection#*",
+ "TRTUncompressedHitCollection#*",
+ "TrackRecordCollection#CaloEntryLayer"]
+
+ if ConfigFlags.Detector.SimulateITk:
+ ItemList += ["SiHitCollection#*",
+ "TrackRecordCollection#CaloEntryLayer"]
+
+ if ConfigFlags.Detector.SimulateCalo:
+ ItemList += ["CaloCalibrationHitContainer#*",
+ "LArHitContainer#*",
+ "TileHitVector#*",
+ "TrackRecordCollection#MuonEntryLayer"]
+
+ if ConfigFlags.Detector.SimulateMuon:
+ ItemList += ["RPCSimHitCollection#*",
+ "TGCSimHitCollection#*",
+ "MDTSimHitCollection#*",
+ "TrackRecordCollection#MuonExitLayer"]
+ if ConfigFlags.Detector.GeometryCSC:
+ ItemList += ["CSCSimHitCollection#*"]
+ if ConfigFlags.Detector.GeometrysTGC:
+ ItemList += ["sTGCSimHitCollection#*"]
+ if ConfigFlags.Detector.GeometryMM:
+ ItemList += ["MMSimHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateLucid:
+ ItemList += ["LUCID_SimHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateFwdRegion:
+ ItemList += ["SimulationHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateZDC:
+ ItemList += ["ZDC_SimPixelHit_Collection#*",
+ "ZDC_SimStripHit_Collection#*"]
+
+ if ConfigFlags.Detector.SimulateALFA:
+ ItemList += ["ALFA_HitCollection#*",
+ "ALFA_ODHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateAFP:
+ ItemList += ["AFP_TDSimHitCollection#*",
+ "AFP_SIDSimHitCollection#*"]
+
+ # TimingAlg
+ ItemList += ["RecoTimingObj#EVNTtoHITS_timings"]
+
+ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=ItemList, disableEventTag=True) )
+
+
# FIXME hack to match to buggy behaviour in old style configuration
OutputStreamHITS = cfg.getEventAlgo("OutputStreamHITS")
OutputStreamHITS.ItemList.remove("xAOD::EventInfo#EventInfo")
@@ -193,7 +264,7 @@ if __name__ == '__main__':
sc = cfg.run(maxEvents=evtMax)
b = time.time()
- log.info("Run G4AtlasAlg in " + str(b-a) + " seconds")
+ log.info("Run ISF_MainConfigNew_Test in " + str(b-a) + " seconds")
# Success should be 0
#os.sys.exit(not sc.isSuccess())
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimHitTreeCreator.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimHitTreeCreator.cxx
index 5ecfb37021a044d45d641e23c00dcc1e2a474c93..e8d4d417193d920bf935324c64fed6b5b5042182 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimHitTreeCreator.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimHitTreeCreator.cxx
@@ -309,7 +309,8 @@ StatusCode ISF::SimHitTreeCreator::fillSimHitsTree()
//** Add information from HepMcParticleLink to TTree - common for all SimHit types */
void ISF::SimHitTreeCreator::addHepMcParticleLinkInfoToTree(HepMcParticleLink &HMPL) {
if (HMPL.isValid()) {
- m_momentum = (HMPL.cptr())->momentum().rho();
+ auto t_mom=(HMPL.cptr())->momentum();
+ m_momentum = std::sqrt( t_mom.x()*t_mom.x()+t_mom.y()*t_mom.y()+t_mom.z()*t_mom.z());
m_eta= (HMPL.cptr())->momentum().eta();
m_theta= (HMPL.cptr())->momentum().theta();
m_phi = (HMPL.cptr())->momentum().phi();
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
index e5d3ea91ee6b0e96e771313847839fdb2dfa7e25..bb5bf49a7643574cf7dbaef9276c920b4c93c970 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
@@ -385,10 +385,17 @@ protected:
// checks if the two given HepMC::GenEvent instances are equal.
// returns true if they are equal, false otherwise
bool GenEventsEq(const HepMC::GenEvent& a, const HepMC::GenEvent& b) {
+#ifdef HEPMC3
+ auto aVertexIterator = a.vertices().begin();
+ auto bVertexIterator = b.vertices().begin();
+ auto aVertexIteratorEnd = a.vertices().end();
+ auto bVertexIteratorEnd = b.vertices().end();
+#else
HepMC::GenEvent::vertex_const_iterator aVertexIterator = a.vertices_begin();
HepMC::GenEvent::vertex_const_iterator bVertexIterator = b.vertices_begin();
const auto& aVertexIteratorEnd = a.vertices_end();
const auto& bVertexIteratorEnd = b.vertices_end();
+#endif
bool eventsAreEqual = true;
@@ -399,7 +406,11 @@ protected:
break;
}
+#ifdef HEPMC3
+ eventsAreEqual = *aVertexIterator == *bVertexIterator;
+#else
eventsAreEqual = **aVertexIterator == **bVertexIterator;
+#endif
++aVertexIterator;
++bVertexIterator;
@@ -509,12 +520,12 @@ protected:
TEST_F(SimKernelMT_test, filledInputCollection_expectFullConversion) {
auto* genEvent = new HepMC::GenEvent{};
- HepMC::GenParticlePtr genPart = new HepMC::GenParticle{};
+ HepMC::GenParticlePtr genPart = HepMC::newGenParticlePtr();
HepMC::FourVector mom{12.3, 45.6, 78.9, 0.12};
- HepMC::GenParticlePtr genPart2 = new HepMC::GenParticle{mom,
+ HepMC::GenParticlePtr genPart2 = HepMC::newGenParticlePtr(mom,
11, // pdg id (e-)
1 // status
- };
+ );
auto* genVertex = new HepMC::GenVertex{};
genVertex->add_particle_out(genPart);
genVertex->add_particle_out(genPart2);
@@ -726,10 +737,10 @@ protected:
TEST_F(SimKernelMT_test, filledInputCollectionAndEmptySimulationTools_expectConvertedParticleSentToParticleKiller) {
auto* genEvent = new HepMC::GenEvent{};
HepMC::FourVector mom{12.3, 45.6, 78.9, 1234.5};
- HepMC::GenParticlePtr genPart = new HepMC::GenParticle{mom,
+ HepMC::GenParticlePtr genPart = HepMC::newGenParticlePtr(mom,
11, // pdg id (e-)
1 // status
- };
+ );
HepMC::FourVector pos{9., 8., 7., 678.9};
auto* genVertex = new HepMC::GenVertex{pos};
genVertex->add_particle_out(genPart);
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
index 9b64379cba7ff9a57d945eef28f72b87c5aa1e25..f9cebdddb05d9df617e133ab416b210ef7d5ced5 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Event/CMakeLists.txt
@@ -15,10 +15,10 @@ atlas_add_library( ISF_Event
PUBLIC_HEADERS ISF_Event
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} TestTools AthenaBaseComps AtlasDetDescr BarcodeEventLib GeoPrimitives GeneratorObjects GaudiKernel )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AtlasHepMCsearchLib ${EIGEN_LIBRARIES} TestTools AthenaBaseComps AtlasDetDescr BarcodeEventLib GeoPrimitives GeneratorObjects GaudiKernel )
atlas_add_test( ISFParticle_test
SOURCES
test/ISFParticle_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} TestTools AthenaBaseComps AtlasDetDescr GeoPrimitives GeneratorObjects GaudiKernel ISF_Event )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AtlasHepMCsearchLib ${EIGEN_LIBRARIES} TestTools AthenaBaseComps AtlasDetDescr GeoPrimitives GeneratorObjects GaudiKernel ISF_Event )
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.h
index 69ed5994ff622a12c444542562173c303716e3d9..d1b54866a0d72de7a4ae7d41c762a0e94f3b524f 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.h
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -18,6 +18,7 @@
// HepMC includes
#include "AtlasHepMC/GenRanges.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/IteratorRange.h"
// forward declarations
#include "AtlasHepMC/GenParticle_fwd.h"
@@ -51,7 +52,7 @@ namespace ISF {
at least one particle with one of the given PDG codes appears.
returns pointer to first found particle that matches any of the
given PDG codes in relativesPDG */
- static inline HepMC::ConstGenParticlePtr findRealtiveWithPDG( const HepMC::GenParticle &genParticle,
+ static inline HepMC::ConstGenParticlePtr findRealtiveWithPDG( HepMC::ConstGenParticlePtr genParticle,
const HepMC::IteratorRange &relation,
const std::set<int> &relativesPDG );
};
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.icc b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.icc
index ba477d1d70cebcb551e5bdcf5bc51c7b1735609b..f14a71ede0e1c2f513fdf808aac486d448180fe9 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.icc
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/HepMCHelper.icc
@@ -12,6 +12,9 @@
// @TODO: probably replace this by an enum some day
#define ISF_UNDEF_CHARGE -99999.
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/IteratorRange.h"
+#include "AtlasHepMC/Relatives.h"
/** constructor */
ISF::HepMCHelper::HepMCHelper() {
}
@@ -29,12 +32,54 @@ HepMC::IteratorRange ISF::HepMCHelper::convertIteratorRange( int intItRange ) {
else return ( HepMC::parents );
}
-HepMC::ConstGenParticlePtr ISF::HepMCHelper::findRealtiveWithPDG( const HepMC::GenParticle &genParticle,
+#ifdef HEPMC3
+HepMC::ConstGenParticlePtr ISF::HepMCHelper::findRealtiveWithPDG( HepMC::ConstGenParticlePtr genParticle,
+ const HepMC::IteratorRange &relation,
+ const std::set<int> &relativesPDG ) {
+ // get range of relative particles
+ std::vector<HepMC::ConstGenParticlePtr> relativesRng;
+ switch(relation) {
+ case HepMC::parents: {
+ if (genParticle->production_vertex()) relativesRng= genParticle->production_vertex()->particles_in();
+ break;
+ }
+ case HepMC::family: {
+ if (genParticle->production_vertex()) relativesRng= genParticle->production_vertex()->particles_in();
+ std::vector<HepMC::ConstGenParticlePtr> temp;
+ if (genParticle->end_vertex()) temp=genParticle->end_vertex()->particles_out();
+ relativesRng.insert(relativesRng.end(),temp.begin(),temp.end());
+ break;
+ }
+ case HepMC::ancestors: {
+ relativesRng= HepMC::ancestor_particles(genParticle);
+ break;
+ }
+ case HepMC::relatives: {
+ relativesRng= HepMC::ancestor_particles(genParticle);
+ std::vector<HepMC::ConstGenParticlePtr> temp=HepMC::descendant_particles(genParticle);
+ relativesRng.insert(relativesRng.end(),temp.begin(),temp.end());
+ break;
+ }
+ default: {
+ if (genParticle->production_vertex()) relativesRng= genParticle->production_vertex()->particles_in();
+ break;
+ }
+ }
+ // loop over relatives
+ for (auto curRelative: relativesRng) {
+ if (relativesPDG.count( curRelative->pdg_id() ) != 0) return curRelative;
+ }
+
+ return nullptr;
+}
+#else
+HepMC::ConstGenParticlePtr ISF::HepMCHelper::findRealtiveWithPDG( HepMC::ConstGenParticlePtr genParticle,
const HepMC::IteratorRange &relation,
const std::set<int> &relativesPDG ) {
+ if (!genParticle) return 0;
// get range of relative particles
- HepMC::ConstGenParticleProductionRange relativesRng = genParticle.particles_in( relation );
+ HepMC::ConstGenParticleProductionRange relativesRng = genParticle->particles_in( relation );
// loop over relatives
HepMC::GenVertex::particle_iterator partIt = relativesRng.begin();
@@ -49,4 +94,5 @@ HepMC::ConstGenParticlePtr ISF::HepMCHelper::findRealtiveWithPDG( const HepMC::G
return (found ? curRelative : 0);
}
+#endif
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ITruthIncident.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ITruthIncident.h
index 843d0645c6f6b747c12d90c0551d196121b8b69a..27254707a2edffda8635034f49c8d85822551a08 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ITruthIncident.h
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ITruthIncident.h
@@ -17,7 +17,7 @@
// forward declarations
#include "AtlasHepMC/GenParticle_fwd.h"
-#include "AtlasHepMC/SimpleVector_fwd.h"
+#include "AtlasHepMC/SimpleVector.h"
namespace ISF {
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/TruthBinding.icc b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/TruthBinding.icc
index 91c73a6f98b9244429b0e80eb907e607b97d062f..0206becfa45c434dda2b9282d28c9140d0ba3f80 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/TruthBinding.icc
+++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/TruthBinding.icc
@@ -59,21 +59,33 @@ namespace ISF {
const auto rhsTruth = rhs.getTruthParticle();
if (m_truthParticle && rhsTruth) {
+#ifdef HEPMC3
+ pass &= (m_truthParticle == rhsTruth);
+#else
pass &= *m_truthParticle == *rhsTruth;
+#endif
} else {
return false;
}
const auto rhsPrimary = rhs.getPrimaryTruthParticle();
if (m_primaryTruthParticle && rhsPrimary) {
+#ifdef HEPMC3
+ pass &= (m_primaryTruthParticle == rhsPrimary);
+#else
pass &= *m_primaryTruthParticle == *rhsPrimary;
+#endif
} else {
return false;
}
const auto rhsGenZero = rhs.getGenerationZeroTruthParticle();
if (m_generationZeroTruthParticle && rhsGenZero) {
+#ifdef HEPMC3
+ pass &= (m_generationZeroTruthParticle == rhsGenZero);
+#else
pass &= *m_generationZeroTruthParticle == *rhsGenZero;
+#endif
} else {
return false;
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Event/src/ISFTruthIncident.cxx b/Simulation/ISF/ISF_Core/ISF_Event/src/ISFTruthIncident.cxx
index 4c8aa3f2b174d8212a787254c2141a54cc5e74c7..68b924af61e8479986ab2c2968f5bfa80f5b6c6b 100644
--- a/Simulation/ISF/ISF_Core/ISF_Event/src/ISFTruthIncident.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Event/src/ISFTruthIncident.cxx
@@ -164,13 +164,17 @@ void ISF::ISFTruthIncident::setAllChildrenBarcodes(Barcode::ParticleBarcode bc)
/** return attached truth particle */
HepMC::GenParticlePtr ISF::ISFTruthIncident::getHepMCTruthParticle( const ISF::ISFParticle& particle ) const {
auto* truthBinding = particle.getTruthBinding();
- auto* hepTruthParticle = truthBinding ? truthBinding->getTruthParticle() : nullptr;
+ HepMC::GenParticlePtr hepTruthParticle = truthBinding ? truthBinding->getTruthParticle() : nullptr;
// HepMC::GenParticle not in TruthBinding -> see if the HepMcParticleLink can retrieve it
if (!hepTruthParticle) {
const HepMcParticleLink* oldHMPL = particle.getParticleLink();
if (oldHMPL && oldHMPL->cptr())
+#ifdef HEPMC3
+ hepTruthParticle = std::shared_ptr<HepMC3::GenParticle>(const_cast<HepMC3::GenParticle*>(oldHMPL->cptr()));
+#else
hepTruthParticle = const_cast<HepMC::GenParticlePtr>(oldHMPL->cptr());
+#endif
}
return hepTruthParticle;
@@ -181,14 +185,14 @@ HepMC::GenParticlePtr ISF::ISFTruthIncident::getHepMCTruthParticle( const ISF::I
HepMC::GenParticlePtr ISF::ISFTruthIncident::updateHepMCTruthParticle( ISF::ISFParticle& particle,
const ISF::ISFParticle* parent ) const {
auto* truthBinding = particle.getTruthBinding();
- auto* hepTruthParticle = ParticleHelper::convert( particle );
+ HepMC::GenParticlePtr hepTruthParticle = ParticleHelper::convert( particle );
if (truthBinding) {
truthBinding->setTruthParticle(hepTruthParticle);
} else {
- auto* parentTruthBinding = parent ? parent->getTruthBinding() : nullptr;
- auto* hepPrimaryParticle = parentTruthBinding ? parentTruthBinding->getPrimaryTruthParticle() : nullptr;
- auto* hepGenZeroParticle = hepTruthParticle;
+ auto parentTruthBinding = parent ? parent->getTruthBinding() : nullptr;
+ auto hepPrimaryParticle = parentTruthBinding ? parentTruthBinding->getPrimaryTruthParticle() : nullptr;
+ auto hepGenZeroParticle = hepTruthParticle;
truthBinding = new TruthBinding( hepTruthParticle, hepPrimaryParticle, hepGenZeroParticle );
particle.setTruthBinding(truthBinding);
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
index d1fb4dbc389630b7fe49c9e46b07db1fd702eb91..7b8a496748fc578a345e21e9b7dd1d38c4da95cd 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
@@ -154,7 +154,7 @@ ISF::InputConverter::convert(const McEventCollection& inputGenEvents,
const auto passedGenParticles = getSelectedParticles(*eventPtr, legacyOrdering);
for ( auto& genPartPtr : passedGenParticles ) {
- ATH_MSG_VERBOSE("Picking up following GenParticle for conversion to ISFParticle: " << *genPartPtr);
+ ATH_MSG_VERBOSE("Picking up following GenParticle for conversion to ISFParticle: " << genPartPtr);
auto simParticlePtr = convertParticle(genPartPtr, kindOfCollection);
if (!simParticlePtr) {
ATH_MSG_ERROR("Error while trying to convert input generator particles. Aborting.");
@@ -187,6 +187,39 @@ StatusCode ISF::InputConverter::convertHepMCToG4Event(McEventCollection& inputGe
/** get all generator particles which pass filters */
+#ifdef HEPMC3
+std::vector<HepMC::ConstGenParticlePtr>
+ISF::InputConverter::getSelectedParticles(const HepMC::GenEvent& evnt, bool legacyOrdering) const {
+ auto allGenPartBegin = evnt.particles().begin();
+ auto allGenPartEnd = evnt.particles().end();
+
+ // reserve destination container with maximum size, i.e. number of particles in input event
+ std::vector<HepMC::ConstGenParticlePtr> passedGenParticles{};
+ size_t maxParticles = std::distance(allGenPartBegin, allGenPartEnd);
+ passedGenParticles.reserve(maxParticles);
+
+ if (legacyOrdering) {
+ // FIXME: remove this block and the 'legacyOrdering' flag
+ // once we don't need the legacy order any longer
+ for (auto vtx: evnt.vertices() ) {
+ std::copy_if(vtx->particles_out().begin(),
+ vtx->particles_out().end(),
+ std::back_inserter(passedGenParticles),
+ [this](HepMC::ConstGenParticlePtr p){return this->passesFilters(p);});
+ }
+ }
+ else {
+ std::copy_if(allGenPartBegin,
+ allGenPartEnd,
+ std::back_inserter(passedGenParticles),
+ [this](HepMC::ConstGenParticlePtr p){return this->passesFilters(p);});
+ }
+
+ passedGenParticles.shrink_to_fit();
+
+ return passedGenParticles;
+}
+#else
std::vector<HepMC::GenParticlePtr>
ISF::InputConverter::getSelectedParticles(const HepMC::GenEvent& evnt, bool legacyOrdering) const {
auto allGenPartBegin = evnt.particles_begin();
@@ -221,56 +254,64 @@ ISF::InputConverter::getSelectedParticles(const HepMC::GenEvent& evnt, bool lega
return passedGenParticles;
}
+#endif
/** get all generator particles which pass filters */
ISF::ISFParticle*
+#ifdef HEPMC3
+ISF::InputConverter::convertParticle(HepMC::ConstGenParticlePtr genPartPtr, EBC_EVCOLL kindOfCollection) const {
+#else
ISF::InputConverter::convertParticle(HepMC::GenParticlePtr genPartPtr, EBC_EVCOLL kindOfCollection) const {
+#endif
if (!genPartPtr) { return nullptr; }
- auto& genPart = *genPartPtr;
-
- // @FIXME: set the bunch-crossing identifier for pile-up dynamically
- // rather than a constant '1' (e.g. could use GenEvent index for that?)
- const int bcid = (kindOfCollection==EBC_MAINEVCOLL) ? 0 : 1;
- HepMC::GenVertexPtr pVertex = genPart.production_vertex();
+ auto pVertex = genPartPtr->production_vertex();
if (!pVertex) {
- ATH_MSG_ERROR("Unable to convert following generator particle due to missing "
- << "production vertex: " << genPart);
+ ATH_MSG_ERROR("Unable to convert following generator particle due to missing production vertex for: " << genPartPtr);
+ return nullptr;
+ }
+ auto parentEvent = genPartPtr->parent_event();
+ if(!parentEvent) {
+ ATH_MSG_ERROR("Cannot convert a GenParticle without a parent GenEvent into an ISFParticle!!!");
return nullptr;
}
-
const Amg::Vector3D pos(pVertex->position().x(), pVertex->position().y(), pVertex->position().z());
- const auto& pMomentum(genPart.momentum());
+ const auto& pMomentum(genPartPtr->momentum());
const Amg::Vector3D mom(pMomentum.px(), pMomentum.py(), pMomentum.pz());
- const double pMass = this->getParticleMass(genPart);
-
+#ifdef HEPMC3
+ const double pMass = this->getParticleMass(genPartPtr);
+#else
+ const double pMass = this->getParticleMass(*genPartPtr);
+#endif
double e=pMomentum.e();
if(e>1) { //only test for >1 MeV in momentum
double px=pMomentum.px();
double py=pMomentum.py();
double pz=pMomentum.pz();
- double teste=sqrt(px*px + py*py + pz*pz + pMass*pMass);
- if(std::abs(e-teste)/e>0.01) {
- ATH_MSG_WARNING("Difference in energy for: " << genPart<<" Morg="<<pMomentum.m()<<" Mmod="<<pMass<<" Eorg="<<e<<" Emod="<<teste);
+ double teste=std::sqrt(px*px + py*py + pz*pz + pMass*pMass);
+ if(std::abs(e-teste)>0.01*e) {
+ ATH_MSG_WARNING("Difference in energy for: " << genPartPtr<<" Morg="<<pMomentum.m()<<" Mmod="<<pMass<<" Eorg="<<e<<" Emod="<<teste);
}
}
- const int pPdgId = genPart.pdg_id();
+ const int pPdgId = genPartPtr->pdg_id();
const double charge = HepPDT::ParticleID(pPdgId).charge();
const double pTime = pVertex->position().t() / Gaudi::Units::c_light;
/// particle origin (TODO: add proper GeoID, collision/cosmics)
DetRegionSvcIDPair origin(AtlasDetDescr::fUndefinedAtlasRegion, ISF::fEventGeneratorSimID);
- const auto pBarcode = HepMC::barcode(genPart);
+ const auto pBarcode = HepMC::barcode(genPartPtr);
+#ifdef HEPMC3
+ auto tBinding = std::make_unique<ISF::TruthBinding>(std::const_pointer_cast<HepMC3::GenParticle>(genPartPtr));
+#else
auto tBinding = std::make_unique<ISF::TruthBinding>(genPartPtr);
+#endif
+ // @FIXME: set the bunch-crossing identifier for pile-up dynamically
+ // rather than a constant '1' (e.g. could use GenEvent index for that?)
+ const int bcid = (kindOfCollection==EBC_MAINEVCOLL) ? 0 : 1;
- auto *parentEvent = genPart.parent_event();
- if(!parentEvent) {
- ATH_MSG_ERROR("Cannot convert a GenParticle without a parent GenEvent into an ISFParticle!!!");
- return nullptr;
- }
- auto hmpl = std::make_unique<HepMcParticleLink>(&genPart, parentEvent->event_number(), kindOfCollection);
+ auto hmpl = std::make_unique<HepMcParticleLink>(genPartPtr, parentEvent->event_number(), kindOfCollection);
auto sParticle = std::make_unique<ISF::ISFParticle>( std::move(pos),
std::move(mom),
pMass,
@@ -287,6 +328,30 @@ ISF::InputConverter::convertParticle(HepMC::GenParticlePtr genPartPtr, EBC_EVCOL
/** get right GenParticle mass */
+#ifdef HEPMC3
+double
+ISF::InputConverter::getParticleMass(HepMC::ConstGenParticlePtr part) const{
+ // default value: generated particle mass
+ double mass = part->generated_mass();
+ ATH_MSG_VERBOSE("part->generated_mass, mass="<<mass);
+
+ // 1. use PDT mass?
+ if ( !m_useGeneratedParticleMass ) {
+ const int absPDG = std::abs(part->pdg_id());
+ HepPDT::ParticleData const *pData = (m_particleDataTable)
+ ? m_particleDataTable->particle(absPDG)
+ : nullptr;
+ if (pData) {
+ mass = pData->mass();
+ ATH_MSG_VERBOSE("using pData mass, mass="<<mass);
+ }
+ else {
+ ATH_MSG_WARNING( "Unable to find mass of particle with PDG ID '" << absPDG << "' in ParticleDataTable. Will set mass to generated_mass: " << mass);
+ }
+ }
+ return mass;
+}
+#else
double
ISF::InputConverter::getParticleMass(const HepMC::GenParticle &part) const
{
@@ -310,9 +375,36 @@ ISF::InputConverter::getParticleMass(const HepMC::GenParticle &part) const
}
return mass;
}
+#endif
/** check if the given particle passes all filters */
+#ifdef HEPMC3
+bool
+ISF::InputConverter::passesFilters(HepMC::ConstGenParticlePtr part) const
+{
+ // TODO: implement this as a std::find_if with a lambda function
+ for ( const auto& filter : m_genParticleFilters ) {
+ // determine if the particle passes current filter
+ bool passFilter = filter->pass(part);
+ ATH_MSG_VERBOSE("GenParticleFilter '" << filter.typeAndName() << "' returned: "
+ << (passFilter ? "true, will keep particle."
+ : "false, will remove particle."));
+ const auto& momentum = part->momentum();
+ ATH_MSG_VERBOSE("Particle: ("
+ <<momentum.px()<<", "
+ <<momentum.py()<<", "
+ <<momentum.pz()<<"), pdgCode: "
+ <<part->pdg_id() );
+
+ if (!passFilter) {
+ return false;
+ }
+ }
+
+ return true;
+}
+#else
bool
ISF::InputConverter::passesFilters(const HepMC::GenParticle& part) const
{
@@ -337,6 +429,7 @@ ISF::InputConverter::passesFilters(const HepMC::GenParticle& part) const
return true;
}
+#endif
//________________________________________________________________________
@@ -397,6 +490,78 @@ const G4ParticleDefinition* ISF::InputConverter::getG4ParticleDefinition(int pdg
}
//________________________________________________________________________
+#ifdef HEPMC3
+G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(HepMC::ConstGenParticlePtr genpart) const{
+ ATH_MSG_VERBOSE("Creating G4PrimaryParticle from GenParticle.");
+
+ const G4ParticleDefinition *particleDefinition = this->getG4ParticleDefinition(genpart->pdg_id());
+
+ if(particleDefinition==nullptr) {
+ ATH_MSG_ERROR("ISF_to_G4Event particle conversion failed. ISF_Particle PDG code = " << genpart->pdg_id() <<
+ "\n This usually indicates a problem with the evgen step.\n" <<
+ "Please report this to the Generators group, mentioning the release and generator used for evgen and the PDG code above." );
+ return nullptr;
+ }
+
+ // create new primaries and set them to the vertex
+ // G4double mass = particleDefinition->GetPDGMass();
+ auto &genpartMomentum = genpart->momentum();
+ G4double px = genpartMomentum.x();
+ G4double py = genpartMomentum.y();
+ G4double pz = genpartMomentum.z();
+
+ std::unique_ptr<G4PrimaryParticle> g4particle = std::make_unique<G4PrimaryParticle>(particleDefinition,px,py,pz);
+
+ if (genpart->end_vertex()) {
+ // Set the lifetime appropriately - this is slow but rigorous, and we
+ // don't want to end up with something like vertex time that we have
+ // to validate for every generator on earth...
+ const auto& prodVtx = genpart->production_vertex()->position();
+ const auto& endVtx = genpart->end_vertex()->position();
+ const G4LorentzVector lv0 ( prodVtx.x(), prodVtx.y(), prodVtx.z(), prodVtx.t() );
+ const G4LorentzVector lv1 ( endVtx.x(), endVtx.y(), endVtx.z(), endVtx.t() );
+ g4particle->SetProperTime( (lv1-lv0).mag()/Gaudi::Units::c_light );
+
+ if(m_quasiStableParticlesIncluded) {
+ ATH_MSG_VERBOSE( "Detected primary particle with end vertex." );
+ ATH_MSG_VERBOSE( "Will add the primary particle set on." );
+ ATH_MSG_VERBOSE( "Primary Particle: " << genpart );
+ ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size() );
+ }
+ else {
+ ATH_MSG_WARNING( "Detected primary particle with end vertex." );
+ ATH_MSG_WARNING( "Will add the primary particle set on." );
+ ATH_MSG_WARNING( "Primary Particle: " << genpart );
+ ATH_MSG_WARNING( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size() );
+ }
+ // Add all necessary daughter particles
+ for ( auto daughter: genpart->end_vertex()->particles_out() ) {
+ if(m_quasiStableParticlesIncluded) {
+ ATH_MSG_VERBOSE ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
+ }
+ else {
+ ATH_MSG_WARNING ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
+ }
+ G4PrimaryParticle *daughterG4Particle = this->getG4PrimaryParticle( daughter );
+ if(!daughterG4Particle) {
+ ATH_MSG_ERROR("Bailing out of loop over daughters of particle with barcode: "<<HepMC::barcode(genpart) <<
+ " due to errors - will not return G4Particle.");
+ return nullptr;
+ }
+ g4particle->SetDaughter( daughterG4Particle );
+ }
+ }
+
+ // Set the user information for this primary to point to the HepMcParticleLink...
+ PrimaryParticleInformation* ppi = new PrimaryParticleInformation(genpart);
+ ppi->SetParticle(genpart);
+ ppi->SetRegenerationNr(0);
+ g4particle->SetUserInformation(ppi);
+ ATH_MSG_VERBOSE("Making primary down the line with barcode " << ppi->GetParticleBarcode());
+
+ return g4particle.release();
+}
+#else
G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const HepMC::GenParticle& genpart) const
{
ATH_MSG_VERBOSE("Creating G4PrimaryParticle from GenParticle.");
@@ -469,6 +634,7 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const HepMC::GenPar
return g4particle.release();
}
+#endif
//________________________________________________________________________
@@ -540,8 +706,12 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const ISF::ISFParti
ATH_MSG_VERBOSE( "Detected primary particle with end vertex." );
ATH_MSG_VERBOSE( "Will add the primary particle set on." );
ATH_MSG_VERBOSE( "ISF Particle: " << isp );
- ATH_MSG_VERBOSE( "Primary Particle: " << *genpart );
- ATH_MSG_VERBOSE( "Number of daughters of "<<genpart->barcode()<<": " << genpart->end_vertex()->particles_out_size() );
+ ATH_MSG_VERBOSE( "Primary Particle: " << genpart );
+#ifdef HEPMC3
+ ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size() );
+#else
+ ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out_size() );
+#endif
}
else {
ATH_MSG_WARNING( "Detected primary particle with end vertex. This should only be the case if" );
@@ -549,19 +719,26 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const ISF::ISFParti
ATH_MSG_WARNING( "yet validated - you'd better know what you're doing. Will add the primary" );
ATH_MSG_WARNING( "particle set on." );
ATH_MSG_WARNING( "ISF Particle: " << isp );
- ATH_MSG_WARNING( "Primary Particle: " << *genpart );
- ATH_MSG_WARNING( "Number of daughters of "<<genpart->barcode()<<": " << genpart->end_vertex()->particles_out_size() );
+ ATH_MSG_WARNING( "Primary Particle: " << genpart );
+#ifdef HEPMC3
+ ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size() );
+#else
+ ATH_MSG_WARNING( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out_size() );
+#endif
}
// Add all necessary daughter particles
- for ( auto daughterIter=genpart->end_vertex()->particles_out_const_begin();
- daughterIter!=genpart->end_vertex()->particles_out_const_end(); ++daughterIter ) {
+ for ( auto daughter: *(genpart->end_vertex())) {
if(m_quasiStableParticlesIncluded) {
- ATH_MSG_VERBOSE ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << **daughterIter );
+ ATH_MSG_VERBOSE ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
}
else {
- ATH_MSG_WARNING ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << **daughterIter );
+ ATH_MSG_WARNING ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
}
- G4PrimaryParticle *daughterG4Particle = this->getG4PrimaryParticle( **daughterIter );
+#ifdef HEPMC3
+ G4PrimaryParticle *daughterG4Particle = this->getG4PrimaryParticle( daughter );
+#else
+ G4PrimaryParticle *daughterG4Particle = this->getG4PrimaryParticle( *daughter );
+#endif
if(!daughterG4Particle) {
ATH_MSG_ERROR("Bailing out of loop over daughters of particle with barcode: "<<HepMC::barcode(genpart) <<
" due to errors - will not return G4Particle.");
@@ -616,7 +793,7 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const ISF::ISFParti
}
}
- genpart->set_momentum(CLHEP::HepLorentzVector(px,py,pz,pe));
+ genpart->set_momentum(HepMC::FourVector(px,py,pz,pe));
} // Truth was detected
ATH_MSG_VERBOSE("PrimaryParticleInformation:");
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h
index 562aa431070c168dc7246dee13e5a79bf4a10def..21c747f2d67b9f695c71b194e1b8bab2e2c190f4 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h
@@ -83,7 +83,11 @@ namespace ISF {
const G4ParticleDefinition* getG4ParticleDefinition(int pdgcode) const;
+#ifdef HEPMC3
+ G4PrimaryParticle* getG4PrimaryParticle(HepMC::ConstGenParticlePtr gp) const;
+#else
G4PrimaryParticle* getG4PrimaryParticle(const HepMC::GenParticle& gp) const;
+#endif
G4PrimaryParticle* getG4PrimaryParticle(const ISF::ISFParticle& isp, bool useHepMC) const;
@@ -93,16 +97,32 @@ namespace ISF {
bool isInsideG4WorldVolume(const ISF::ISFParticle& isp, const G4VSolid* worldSolid) const;
/** get right GenParticle mass */
+#ifdef HEPMC3
+ double getParticleMass(HepMC::ConstGenParticlePtr p) const;
+#else
double getParticleMass(const HepMC::GenParticle& p) const;
+#endif
/** get all generator particles which pass filters */
+#ifdef HEPMC3
+ std::vector<HepMC::ConstGenParticlePtr > getSelectedParticles(const HepMC::GenEvent& evnt, bool legacyOrdering=false) const;
+#else
std::vector<HepMC::GenParticlePtr > getSelectedParticles(const HepMC::GenEvent& evnt, bool legacyOrdering=false) const;
+#endif
/** check if the given particle passes all filters */
+#ifdef HEPMC3
+ bool passesFilters(HepMC::ConstGenParticlePtr p) const;
+#else
bool passesFilters(const HepMC::GenParticle& p) const;
+#endif
/** convert GenParticle to ISFParticle */
+#ifdef HEPMC3
+ ISF::ISFParticle* convertParticle(HepMC::ConstGenParticlePtr genPartPtr, EBC_EVCOLL kindOfCollection=EBC_MAINEVCOLL) const;
+#else
ISF::ISFParticle* convertParticle(HepMC::GenParticlePtr genPartPtr, EBC_EVCOLL kindOfCollection=EBC_MAINEVCOLL) const;
+#endif
/** ParticlePropertyService and ParticleDataTable */
ServiceHandle<IPartPropSvc> m_particlePropSvc; //!< particle properties svc to retrieve PDT
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/TruthSvc.cxx b/Simulation/ISF/ISF_Core/ISF_Services/src/TruthSvc.cxx
index 5ae0ceca71c4b4cb42a7c03db70c66f167f1ed80..289dc593a5d4b83d0756a8e34283ba04face3707 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/TruthSvc.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/TruthSvc.cxx
@@ -25,6 +25,7 @@
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/Relatives.h"
// CLHEP includes
#include "CLHEP/Geometry/Point3D.h"
@@ -132,6 +133,15 @@ StatusCode ISF::TruthSvc::initializeTruthCollection()
}
/** Delete child vertex */
+#ifdef HEPMC3
+void ISF::TruthSvc::deleteChildVertex(HepMC::GenVertexPtr vertex) const {
+ HepMC::GenEvent* parent=vertex->parent_event();
+ std::vector<HepMC::GenVertexPtr> verticesToDelete=HepMC::descendant_vertices(vertex);
+ for (auto v: verticesToDelete) parent->remove_vertex(v);
+ verticesToDelete.clear();
+ return;
+}
+#else
void ISF::TruthSvc::deleteChildVertex(HepMC::GenVertexPtr vertex) const {
std::vector<HepMC::GenVertexPtr> verticesToDelete;
verticesToDelete.resize(0);
@@ -148,6 +158,7 @@ void ISF::TruthSvc::deleteChildVertex(HepMC::GenVertexPtr vertex) const {
}
return;
}
+#endif
StatusCode ISF::TruthSvc::releaseEvent() {
@@ -277,7 +288,7 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti) const {
HepMC::GenParticlePtr parentBeforeIncident = ti.parentParticle();
HepMC::GenParticlePtr parentAfterIncident = ti.parentParticleAfterIncident( newPrimBC ); // This call changes ti.parentParticle() output
if(parentAfterIncident) {
- ATH_MSG_VERBOSE ( "Parent After Incident: " << *parentAfterIncident);
+ ATH_MSG_VERBOSE ( "Parent After Incident: " << parentAfterIncident);
if (classification==ISF::QS_SURV_VTX) {
// Special case when a particle with a pre-defined decay
// interacts and survives.
@@ -286,7 +297,11 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti) const {
parentAfterIncident->set_status(2);
// 2) A new GenVertex for the intermediate interaction should be
// added.
+#ifdef HEPMC3
+ auto newVtx = HepMC::newGenVertexPtr( vtx->position(), vtx->id());
+#else
std::unique_ptr<HepMC::GenVertex> newVtx = std::make_unique<HepMC::GenVertex>( vtx->position(), vtx->id(), vtx->weights() );
+#endif
#ifdef DEBUG_TRUTHSVC
ATH_MSG_INFO("New GenVertex 1: " << *(newVtx.get()) );
ATH_MSG_INFO("New QS GenVertex 1: " << *(newVtx.get()) );
@@ -296,14 +311,24 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti) const {
#ifdef DEBUG_TRUTHSVC
ATH_MSG_INFO("New QSGenVertex 2: " << *(newVtx.get()) );
#endif
+#ifdef HEPMC3
+ auto tmpVtx = newVtx;
+#else
auto tmpVtx = newVtx.get();
+#endif
#ifdef DEBUG_TRUTHSVC
ATH_MSG_INFO("New QS GenVertex 3: " << (*tmpVtx) );
#endif
+#ifdef HEPMC3
+ mcEvent->add_vertex( newVtx);
+ auto vtx_weights=newVtx->attribute<HepMC3::VectorDoubleAttribute>("weights");
+ if (vtx_weights) newVtx->add_attribute("weights",std::make_shared<HepMC3::VectorDoubleAttribute>(vtx_weights->value()));
+#else
if(!mcEvent->add_vertex( newVtx.release() )) {
ATH_MSG_FATAL("Failed to add GenVertex to GenEvent.");
abort();
}
+#endif
tmpVtx->add_particle_in( parentBeforeIncident );
tmpVtx->add_particle_out( parentAfterIncident );
vtx->add_particle_in( parentAfterIncident );
@@ -323,7 +348,11 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti) const {
// FIXME should probably make this part a separate function and
// also check if the pdgids of the child particles are the same
// too.
+#ifdef HEPMC3
+ unsigned short nVertexChildren=vtx->particles_out().size();
+#else
unsigned short nVertexChildren=vtx->particles_out_size();
+#endif
if(parentAfterIncident) { nVertexChildren-=1; }
if(nVertexChildren!=numSec) {
ATH_MSG_WARNING("Existing vertex has " << nVertexChildren << " children. " <<
@@ -347,7 +376,7 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti) const {
for(auto childParticle : childParticleVector) {
if( (childParticle->pdg_id() == childPDGcode) && std::count(matchedChildParticles.begin(),matchedChildParticles.end(),childParticle)==0) {
noMatch=false;
- ATH_MSG_VERBOSE("Found a matching Quasi-stable GenParticle with PDGcode " << childPDGcode << ":\n\t" << *childParticle );
+ ATH_MSG_VERBOSE("Found a matching Quasi-stable GenParticle with PDGcode " << childPDGcode << ":\n\t" << childParticle );
matchedChildParticles.push_back(childParticle);
// FIXME There is a weakness in the code here for
// vertices with multiple children with the same
@@ -382,7 +411,7 @@ void ISF::TruthSvc::recordIncidentToMCTruth( ISF::ITruthIncident& ti) const {
// add particle to vertex
vtx->add_particle_out( p);
}
- ATH_MSG_VERBOSE ( "Writing out " << i << "th child particle: " << *p);
+ ATH_MSG_VERBOSE ( "Writing out " << i << "th child particle: " << p);
} // <-- if write out child particle
else {
ATH_MSG_VERBOSE ( "Not writing out " << i << "th child particle." );
@@ -429,7 +458,11 @@ HepMC::GenVertexPtr ISF::TruthSvc::createGenVertexFromTruthIncident( ISF::ITrut
}
}
int vtxID = 1000 + static_cast<int>(processCode);
+#ifdef HEPMC3
+ auto vtx = HepMC::newGenVertexPtr( ti.position(),vtxID);
+#else
std::unique_ptr<HepMC::GenVertex> vtx = std::make_unique<HepMC::GenVertex>( ti.position(), vtxID, weights );
+#endif
HepMC::suggest_barcode( vtx.get(), vtxbcode );
if (parent->end_vertex()){
@@ -439,23 +472,32 @@ HepMC::GenVertexPtr ISF::TruthSvc::createGenVertexFromTruthIncident( ISF::ITrut
ATH_MSG_WARNING("is not yet validated in ISF, so you'd better know what you're doing.");
ATH_MSG_WARNING("Will delete the old vertex and swap in the new one.");
}
- auto* oldVertex = parent->end_vertex();
+ auto oldVertex = parent->end_vertex();
#ifdef DEBUG_TRUTHSVC
ATH_MSG_VERBOSE("createGVfromTI Existing QS GenVertex 1: " << *oldVertex );
ATH_MSG_VERBOSE("createGVfromTI QS Parent 1: " << *parent);
#endif
if(replaceExistingGenVertex) {
vtx->add_particle_in( parent );
- ATH_MSG_VERBOSE("createGVfromTI Replacement QS GenVertex: " << *(vtx.get()) );
+ ATH_MSG_VERBOSE("createGVfromTI Replacement QS GenVertex: " << vtx.get() );
+#ifdef HEPMC3
+ mcEvent->add_vertex(vtx);
+ vtx->add_attribute("weights",std::make_shared<HepMC3::VectorDoubleAttribute>(weights));
+#else
mcEvent->add_vertex( vtx.release() );
+#endif
// Delete oldVertex and children here
this->deleteChildVertex(oldVertex);
}
else {
- //oldVertex->suggest_barcode( vtxbcode );
oldVertex->set_position( ti.position() );
+#ifdef HEPMC3
+ oldVertex->set_status( vtxID );
+ oldVertex->add_attribute("weights",std::make_shared<HepMC3::VectorDoubleAttribute>(weights));
+#else
oldVertex->set_id( vtxID );
oldVertex->weights() = weights;
+#endif
#ifdef DEBUG_TRUTHSVC
ATH_MSG_VERBOSE("createGVfromTI Existing QS GenVertex 2: " << *oldVertex );
#endif
@@ -474,7 +516,12 @@ HepMC::GenVertexPtr ISF::TruthSvc::createGenVertexFromTruthIncident( ISF::ITrut
ATH_MSG_VERBOSE ( "createGVfromTI End Vertex representing process: " << processCode << ", for parent with barcode "<<parentBC<<". Creating." );
ATH_MSG_VERBOSE ( "createGVfromTI Parent 2: " << *parent);
#endif
+#ifdef HEPMC3
+ mcEvent->add_vertex(vtx);
+ vtx->add_attribute("weights",std::make_shared<HepMC3::VectorDoubleAttribute>(weights));
+#else
mcEvent->add_vertex( vtx.release() );
+#endif
}
return parent->end_vertex();
@@ -500,11 +547,8 @@ void ISF::TruthSvc::setSharedChildParticleBarcode( ISF::ITruthIncident& ti) cons
int ISF::TruthSvc::maxGeneratedParticleBarcode(HepMC::GenEvent *genEvent) const {
int maxBarcode=0;
const int firstSecondaryParticleBarcode(m_barcodeSvc->secondaryParticleBcOffset());
- HepMC::GenEvent::particle_const_iterator currentGenParticleIter;
- for (currentGenParticleIter= genEvent->particles_begin();
- currentGenParticleIter!= genEvent->particles_end();
- ++currentGenParticleIter) {
- const int barcode((*currentGenParticleIter)->barcode());
+ for (auto currentGenParticle: *genEvent) {
+ const int barcode=HepMC::barcode(currentGenParticle);
if(barcode > maxBarcode && barcode < firstSecondaryParticleBarcode) { maxBarcode=barcode; }
}
return maxBarcode;
@@ -512,6 +556,13 @@ int ISF::TruthSvc::maxGeneratedParticleBarcode(HepMC::GenEvent *genEvent) const
int ISF::TruthSvc::maxGeneratedVertexBarcode(HepMC::GenEvent *genEvent) const {
int maxBarcode=0;
+#ifdef HEPMC3
+ const int firstSecondaryVertexBarcode(m_barcodeSvc->secondaryVertexBcOffset());
+ for (auto currentGenVertex: genEvent->vertices()) {
+ const int barcode=HepMC::barcode(currentGenVertex);
+ if(barcode < maxBarcode && barcode > firstSecondaryVertexBarcode) { maxBarcode=barcode; }
+ }
+#else
const int firstSecondaryVertexBarcode(m_barcodeSvc->secondaryVertexBcOffset());
HepMC::GenEvent::vertex_const_iterator currentGenVertexIter;
for (currentGenVertexIter= genEvent->vertices_begin();
@@ -520,5 +571,6 @@ int ISF::TruthSvc::maxGeneratedVertexBarcode(HepMC::GenEvent *genEvent) const {
const int barcode((*currentGenVertexIter)->barcode());
if(barcode < maxBarcode && barcode > firstSecondaryVertexBarcode) { maxBarcode=barcode; }
}
+#endif
return maxBarcode;
}
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
index 17813c67825ba28e507970a03bd22fb37ae5ef1d..a5323da69977a4e5773baaae2d83c2b6df30878f 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
@@ -39,6 +39,7 @@
// HepMC
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/Operators.h"
#include "GeneratorObjects/HepMcParticleLink.h"
#include "GeneratorObjects/McEventCollection.h"
@@ -62,7 +63,11 @@ class MockFilterTool : public AthAlgTool,
virtual ~MockFilterTool() {};
// mock method which will be called by tested code
+#ifdef HEPMC3
+ MOCK_CONST_METHOD1(pass, bool(HepMC::ConstGenParticlePtr));
+#else
MOCK_CONST_METHOD1(pass, bool(const HepMC::GenParticle&));
+#endif
};
DECLARE_COMPONENT( MockFilterTool )
@@ -165,7 +170,11 @@ TEST_F(InputConverter_test, convertParticle_without_production_vertex) {
);
ISF::ISFParticle* expected = nullptr;
ASSERT_EQ( expected, convertParticle(genPart, EBC_FIRSTPUEVCOLL) );
+#ifdef HEPMC3
+ //When compiled with HepMC3, genPart is smart pointer
+#else
delete genPart;
+#endif
}
@@ -177,16 +186,16 @@ TEST_F(InputConverter_test, convertParticle_using_generated_mass) {
HepMC::FourVector mom(12.3, 45.6, 78.9, 0.12);
// dynamic allocation necessary as particle ownership is
// handed over to a HepMC::GenVertex later
- HepMC::GenParticlePtr genPart = new HepMC::GenParticle(mom,
+ HepMC::GenParticlePtr genPart = HepMC::newGenParticlePtr(mom,
11, // pdg id (e-)
1 // status
);
genPart->set_generated_mass(1234.56);
- genPart->suggest_barcode(particleBarcode);
+ HepMC::suggest_barcode(genPart,particleBarcode);
HepMC::FourVector pos(9.8, 7.65, 4.3, 0.321); // NB: 4th component is time*c
int vtx_id = -123;
- HepMC::GenVertexPtr prodVtx = new HepMC::GenVertex(pos, vtx_id);
+ HepMC::GenVertexPtr prodVtx = HepMC::newGenVertexPtr(pos, vtx_id);
prodVtx->add_particle_out(genPart);
// create dummy input McEventCollection containing a dummy GenEvent
@@ -237,7 +246,7 @@ TEST_F(InputConverter_test, convertParticle_using_particleDataTable_photon) {
1 // status
);
genPart->set_generated_mass(1234.56); // should be ignored later on
- genPart->suggest_barcode(particleBarcode);
+ HepMC::suggest_barcode(genPart,particleBarcode);
HepMC::FourVector pos(9.8, 7.65, 4.3, 0.321); // NB: 4th component is time*c
int vtx_id = -123;
@@ -291,7 +300,7 @@ TEST_F(InputConverter_test, convertParticle_using_particleDataTable_electron) {
1 // status
);
genPart->set_generated_mass(1234.56); // should be ignored later on
- genPart->suggest_barcode(particleBarcode);
+ HepMC::suggest_barcode(genPart,particleBarcode);
HepMC::FourVector pos(9.8, 7.65, 4.3, 0.321); // NB: 4th component is time*c
int vtx_id = -123;
@@ -337,7 +346,11 @@ TEST_F(InputConverter_test, convertParticle_using_particleDataTable_electron) {
TEST_F(InputConverter_test, passesFilters_empty_filters_defaultconstructed_genpart) {
ASSERT_TRUE( m_svc->initialize().isSuccess() );
+#ifdef HEPMC3
+ auto genPart=HepMC::newGenParticlePtr();
+#else
const HepMC::GenParticle genPart{};
+#endif
ASSERT_TRUE( passesFilters(genPart) );
}
@@ -347,15 +360,24 @@ TEST_F(InputConverter_test, passesFilters_empty_filters) {
const int particleBarcode(546);
HepMC::FourVector mom(12.3, 45.6, 78.9, 0.12);
+#ifdef HEPMC3
+ //It seems this test makes no sense for HepMC3
+ HepMC::GenParticlePtr genPart=HepMC::newGenParticlePtr(mom,
+ 11, // pdg id (e-)
+ 1 // status
+ );
+ ASSERT_TRUE( true );
+#else
HepMC::GenParticle genPart(mom,
11, // pdg id (e-)
1 // status
);
genPart.set_generated_mass(1234.56);
- genPart.suggest_barcode(particleBarcode);
+ HepMC::suggest_barcode( genPart,particleBarcode);
const HepMC::GenParticle constGenPart(std::move(genPart));
ASSERT_TRUE( passesFilters(constGenPart) );
+#endif
}
@@ -368,7 +390,11 @@ TEST_F(InputConverter_test, passesFilters_one_pass_filter) {
ASSERT_EQ (genParticleFilters.size(), expectedSize);
MockFilterTool* filterTool = dynamic_cast<MockFilterTool*>(&*(genParticleFilters[0]));
ASSERT_TRUE( filterTool );
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genPart{};
+#else
const HepMC::GenParticle genPart{};
+#endif
HepMC::FourVector mom(12.3, 45.6, 78.9, 0.12);
HepMC::GenParticle genPart2(mom,
11, // pdg id (e-)
@@ -392,7 +418,11 @@ TEST_F(InputConverter_test, passesFilters_one_nonpass_filter) {
MockFilterTool* filterTool = dynamic_cast<MockFilterTool*>(&*(genParticleFilters[0]));
ASSERT_TRUE( filterTool );
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genPart{};
+#else
const HepMC::GenParticle genPart{};
+#endif
HepMC::FourVector mom(12.3, 45.6, 78.9, 0.12);
HepMC::GenParticle genPart2(mom,
11, // pdg id (e-)
@@ -418,7 +448,11 @@ TEST_F(InputConverter_test, passesFilters_two_filters) {
MockFilterTool* filterTool2 = dynamic_cast<MockFilterTool*>(&*(genParticleFilters[1]));
ASSERT_TRUE( filterTool2 );
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr genPart{};
+#else
const HepMC::GenParticle genPart{};
+#endif
HepMC::FourVector mom(12.3, 45.6, 78.9, 0.12);
HepMC::GenParticle genPart2(mom,
11, // pdg id (e-)
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
index d84da3d267a51187176bfb48ca71c8c40dd9d843..f3d593c8f8dfd7b1d935265dd8db399ef5d8b76c 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx
@@ -272,9 +272,11 @@ namespace ISFTesting {
const int event_number1(17);
const int pdgid1(-13);
const int pdgid2(13);
- std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>(process_id1, event_number1);
+ std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>();
+ anEvent->set_event_number(event_number1);
+ HepMC::set_signal_process_id(anEvent.get(),process_id1);
const CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
const HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, pdgid1, 2);
myVertex->add_particle_in(inParticle1);
@@ -288,7 +290,7 @@ namespace ISFTesting {
HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, pdgid2, 1);
myVertex->add_particle_out(inParticle4);
anEvent->add_vertex( myVertex );
- anEvent->set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex(anEvent.get(), myVertex );
anEvent->set_beam_particles(inParticle1,inParticle2);
MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
@@ -298,7 +300,7 @@ namespace ISFTesting {
.WillOnce(::testing::Return(21));
EXPECT_CALL(ti, parentBarcode())
.Times(1)
- .WillOnce(::testing::Return(inParticle3->barcode()));
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
EXPECT_CALL(ti, parentParticle())
.Times(1)
.WillOnce(::testing::Return(inParticle3));
@@ -306,10 +308,16 @@ namespace ISFTesting {
ASSERT_EQ( vtxPosition, generated->position() );
ASSERT_EQ( 1021, generated->id() );
- ASSERT_EQ( -200001, generated->barcode() );
+ ASSERT_EQ( -200001, HepMC::barcode(generated) );
+#ifdef HEPMC3
+ ASSERT_EQ( 1, generated->particles_in().size());
+ ASSERT_EQ( 0, generated->particles_out().size());
+ ASSERT_EQ( inParticle3, *(generated->particles_in().cbegin()));
+#else
ASSERT_EQ( 1, generated->particles_in_size());
ASSERT_EQ( 0, generated->particles_out_size());
ASSERT_EQ( inParticle3, *(generated->particles_in_const_begin()));
+#endif
}
@@ -320,9 +328,11 @@ namespace ISFTesting {
const int event_number1(17);
const int pdgid1(-13);
const int pdgid2(13);
- std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>(process_id1, event_number1);
+ std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>();
+ anEvent->set_event_number(event_number1);
+ HepMC::set_signal_process_id(anEvent.get(),process_id1);
const CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
const HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, pdgid1, 2);
myVertex->add_particle_in(inParticle1);
@@ -336,7 +346,7 @@ namespace ISFTesting {
HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, pdgid2, 1);
myVertex->add_particle_out(inParticle4);
anEvent->add_vertex( myVertex );
- anEvent->set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex(anEvent.get(), myVertex );
anEvent->set_beam_particles(inParticle1,inParticle2);
MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
@@ -347,8 +357,8 @@ namespace ISFTesting {
.WillOnce(::testing::Return(21));
EXPECT_CALL(ti, parentBarcode())
.Times(2)
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()));
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
EXPECT_CALL(ti, parentParticle())
.Times(2)
.WillOnce(::testing::Return(inParticle3))
@@ -358,13 +368,19 @@ namespace ISFTesting {
.WillOnce(::testing::Return(nullptr));
recordIncidentToMCTruth(ti);
- HepMC::GenVertexPtr generated = anEvent->barcode_to_vertex(-200001); //Find a nicer way to get this.
+ HepMC::GenVertexPtr generated = HepMC::barcode_to_vertex(anEvent.get(),-200001); //Find a nicer way to get this.
ASSERT_EQ( vtxPosition, generated->position() );
ASSERT_EQ( 1021, generated->id() );
- ASSERT_EQ( -200001, generated->barcode() ); // by construction at the moment
+ ASSERT_EQ( -200001, HepMC::barcode(generated) ); // by construction at the moment
+#ifdef HEPMC3
+ ASSERT_EQ( 1, generated->particles_in().size());
+ ASSERT_EQ( 0, generated->particles_out().size());
+ ASSERT_EQ( inParticle3, *(generated->particles_in().cbegin()));
+#else
ASSERT_EQ( 1, generated->particles_in_size());
ASSERT_EQ( 0, generated->particles_out_size());
ASSERT_EQ( inParticle3, *(generated->particles_in_const_begin()));
+#endif
}
@@ -375,9 +391,11 @@ namespace ISFTesting {
const int event_number1(17);
const int pdgid1(-13);
const int pdgid2(13);
- std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>(process_id1, event_number1);
+ std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>();
+ anEvent->set_event_number(event_number1);
+ HepMC::set_signal_process_id(anEvent.get(),process_id1);
const CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
const HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, pdgid1, 2);
myVertex->add_particle_in(inParticle1);
@@ -391,7 +409,7 @@ namespace ISFTesting {
HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, pdgid2, 1);
myVertex->add_particle_out(inParticle4);
anEvent->add_vertex( myVertex );
- anEvent->set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex(anEvent.get(), myVertex );
anEvent->set_beam_particles(inParticle1,inParticle2);
MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
@@ -400,11 +418,11 @@ namespace ISFTesting {
.WillOnce(::testing::Return(21));
EXPECT_CALL(ti, parentBarcode())
.Times(2)
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()));
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
registerTruthIncident(ti);
- HepMC::GenVertexPtr generated = anEvent->barcode_to_vertex(-200001); //Find a nicer way to get this.
+ HepMC::GenVertexPtr generated = HepMC::barcode_to_vertex(anEvent.get(),-200001); //Find a nicer way to get this.
HepMC::GenVertexPtr expectedVtx(nullptr);
ASSERT_EQ( expectedVtx, generated);
}
@@ -419,9 +437,11 @@ namespace ISFTesting {
const int event_number1(17);
const int pdgid1(-13);
const int pdgid2(13);
- std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>(process_id1, event_number1);
+ std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>();
+ anEvent->set_event_number(event_number1);
+ HepMC::set_signal_process_id(anEvent.get(),process_id1);
const CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
const HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, pdgid1, 2);
myVertex->add_particle_in(inParticle1);
@@ -435,7 +455,7 @@ namespace ISFTesting {
HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, pdgid2, 1);
myVertex->add_particle_out(inParticle4);
anEvent->add_vertex( myVertex );
- anEvent->set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex(anEvent.get(), myVertex );
anEvent->set_beam_particles(inParticle1,inParticle2);
MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
@@ -446,21 +466,27 @@ namespace ISFTesting {
.WillOnce(::testing::Return(21));
EXPECT_CALL(ti, parentBarcode())
.Times(3)
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()));
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
EXPECT_CALL(ti, parentParticle())
.Times(1)
.WillOnce(::testing::Return(inParticle3));
registerTruthIncident(ti);
- HepMC::GenVertexPtr generated = anEvent->barcode_to_vertex(-200001); //Find a nicer way to get this.
+ HepMC::GenVertexPtr generated = HepMC::barcode_to_vertex(anEvent.get(),-200001); //Find a nicer way to get this.
ASSERT_EQ( vtxPosition, generated->position() );
ASSERT_EQ( 1021, generated->id() );
- ASSERT_EQ( -200001, generated->barcode() ); // by construction at the moment
+ ASSERT_EQ( -200001, HepMC::barcode(generated) ); // by construction at the moment
+#ifdef HEPMC3
+ ASSERT_EQ( 1, generated->particles_in().size());
+ ASSERT_EQ( 0, generated->particles_out().size());
+ ASSERT_EQ( inParticle3, *(generated->particles_in().cbegin()));
+#else
ASSERT_EQ( 1, generated->particles_in_size());
ASSERT_EQ( 0, generated->particles_out_size());
ASSERT_EQ( inParticle3, *(generated->particles_in_const_begin()));
+#endif
}
@@ -482,9 +508,11 @@ namespace ISFTesting {
const int event_number1(17);
const int pdgid1(-13);
const int pdgid2(13);
- std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>(process_id1, event_number1);
+ std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>();
+ anEvent->set_event_number(event_number1);
+ HepMC::set_signal_process_id(anEvent.get(),process_id1);
const CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
const HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, pdgid1, 2);
myVertex->add_particle_in(inParticle1);
@@ -498,7 +526,7 @@ namespace ISFTesting {
HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, pdgid2, 1);
myVertex->add_particle_out(inParticle4);
anEvent->add_vertex( myVertex );
- anEvent->set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex(anEvent.get(), myVertex );
anEvent->set_beam_particles(inParticle1,inParticle2);
@@ -510,9 +538,9 @@ namespace ISFTesting {
.WillOnce(::testing::Return(21));
EXPECT_CALL(ti, parentBarcode())
.Times(3)
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()));
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
EXPECT_CALL(ti, parentParticle())
.Times(1)
.WillOnce(::testing::Return(inParticle3));
@@ -524,13 +552,19 @@ namespace ISFTesting {
.WillOnce(::testing::Return(false));
registerTruthIncident(ti);
- HepMC::GenVertexPtr generated = anEvent->barcode_to_vertex(-200001); //Find a nicer way to get this.
+ HepMC::GenVertexPtr generated = HepMC::barcode_to_vertex(anEvent.get(),-200001); //Find a nicer way to get this.
ASSERT_EQ( vtxPosition, generated->position() );
ASSERT_EQ( 1021, generated->id() );
- ASSERT_EQ( -200001, generated->barcode() ); // by construction at the moment
+ ASSERT_EQ( -200001, HepMC::barcode(generated) ); // by construction at the moment
+#ifdef HEPMC3
+ ASSERT_EQ( 1, generated->particles_in().size());
+ ASSERT_EQ( 0, generated->particles_out().size());
+ ASSERT_EQ( inParticle3, *(generated->particles_in().cbegin()));
+#else
ASSERT_EQ( 1, generated->particles_in_size());
ASSERT_EQ( 0, generated->particles_out_size());
ASSERT_EQ( inParticle3, *(generated->particles_in_const_begin()));
+#endif
}
@@ -549,9 +583,11 @@ namespace ISFTesting {
const int event_number1(17);
const int pdgid1(-13);
const int pdgid2(13);
- std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>(process_id1, event_number1);
+ std::unique_ptr<HepMC::GenEvent> anEvent = std::make_unique<HepMC::GenEvent>();
+ anEvent->set_event_number(event_number1);
+ HepMC::set_signal_process_id(anEvent.get(),process_id1);
const CLHEP::HepLorentzVector myPos( 0.0, 0.0, 0.0, 0.0);
- HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( myPos, -1 );
+ HepMC::GenVertexPtr myVertex = HepMC::newGenVertexPtr( HepMC::FourVector(myPos.x(),myPos.y(),myPos.z(),myPos.t()), -1 );
const HepMC::FourVector fourMomentum1( 0.0, 0.0, 1.0, 1.0*CLHEP::TeV);
HepMC::GenParticlePtr inParticle1 = HepMC::newGenParticlePtr(fourMomentum1, pdgid1, 2);
myVertex->add_particle_in(inParticle1);
@@ -565,10 +601,10 @@ namespace ISFTesting {
HepMC::GenParticlePtr inParticle4 = HepMC::newGenParticlePtr(fourMomentum4, pdgid2, 1);
myVertex->add_particle_out(inParticle4);
anEvent->add_vertex( myVertex );
- anEvent->set_signal_process_vertex( myVertex );
+ HepMC::set_signal_process_vertex(anEvent.get(), myVertex );
anEvent->set_beam_particles(inParticle1,inParticle2);
HepMC::GenParticlePtr inParticle5 = HepMC::newGenParticlePtr(fourMomentum3, pdgid1, 1);
- inParticle5->suggest_barcode(1010003);
+ HepMC::suggest_barcode(inParticle5,1010003);
inParticle5->set_status(1);
MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
@@ -579,9 +615,9 @@ namespace ISFTesting {
.WillOnce(::testing::Return(21));
EXPECT_CALL(ti, parentBarcode())
.Times(3)
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()))
- .WillOnce(::testing::Return(inParticle3->barcode()));
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+ .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
EXPECT_CALL(ti, parentParticle())
.Times(2)
.WillOnce(::testing::Return(inParticle3))
@@ -597,14 +633,21 @@ namespace ISFTesting {
.WillOnce(::testing::Return(true));
registerTruthIncident(ti);
- HepMC::GenVertexPtr generated = anEvent->barcode_to_vertex(-200001); //Find a nicer way to get this.
+ HepMC::GenVertexPtr generated = HepMC::barcode_to_vertex(anEvent.get(),-200001); //Find a nicer way to get this.
ASSERT_EQ( vtxPosition, generated->position() );
ASSERT_EQ( 1021, generated->id() );
- ASSERT_EQ( -200001, generated->barcode() ); // by construction at the moment
+ ASSERT_EQ( -200001, HepMC::barcode(generated) ); // by construction at the moment
+#ifdef HEPMC3
+ ASSERT_EQ( 1, generated->particles_in().size());
+ ASSERT_EQ( inParticle3, *(generated->particles_in().cbegin()));
+ ASSERT_EQ( 1, generated->particles_out().size());
+ ASSERT_EQ( inParticle5, *(generated->particles_out().cbegin()));
+#else
ASSERT_EQ( 1, generated->particles_in_size());
ASSERT_EQ( inParticle3, *(generated->particles_in_const_begin()));
ASSERT_EQ( 1, generated->particles_out_size());
ASSERT_EQ( inParticle5, *(generated->particles_out_const_begin()));
+#endif
}
//TODO Add tests for the following cases:
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunction.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunction.h
index e9cb7cf1e13279e0ff78003408e17d94a69afc35..02c6d47b620a53d141d3a743947d46bae5036383 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunction.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunction.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMEVENT_TFCS1DFunction_h
@@ -28,6 +28,10 @@ class TFCS1DFunction:public TFCSFunction
///Function gets random number rnd in the range [0,1) as argument and returns function value
virtual double rnd_to_fct(double rnd) const = 0;
+ ///The == operator compares the content of instances.
+ ///The implementation in the base class only returns true for a comparison with itself
+ virtual bool operator==(const TFCS1DFunction& ref) const {return this==&ref;};
+
static double get_maxdev(TH1* , TH1* );
static double CheckAndIntegrate1DHistogram(const TH1* hist, std::vector<double>& integral_vec,int& first,int& last);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunctionInt32Histogram.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunctionInt32Histogram.h
index a839f69d23c126ae50cd3475f49d4ab6232b2acc..1d55b0c178f4d413f5a9a787d1101344cdf9bd46 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunctionInt32Histogram.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCS1DFunctionInt32Histogram.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMEVENT_TFCS1DFunctionInt32Histogram_h
@@ -27,6 +27,8 @@ class TFCS1DFunctionInt32Histogram:public TFCS1DFunction
///and returns function value according to a histogram distribution
virtual double rnd_to_fct(double rnd) const;
+ virtual bool operator==(const TFCS1DFunction& ref) const;
+
const std::vector<float>& get_HistoBordersx() const {return m_HistoBorders;};
std::vector<float>& get_HistoBordersx() {return m_HistoBorders;};
const std::vector<HistoContent_t>& get_HistoContents() const {return m_HistoContents;};
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMapping.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMapping.h
index 969fa90398d5a95929a954cd734c90e7da6eeb7e..03e474460fa6941774f92d99b0ffc11d380e79a1 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMapping.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMapping.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TFCSHitCellMapping_h
@@ -19,6 +19,8 @@ public:
/// fills all hits into calorimeter cells
virtual FCSReturnCode simulate_hit(Hit& hit,TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) override;
+ virtual bool operator==(const TFCSParametrizationBase& ref) const override;
+
void Print(Option_t *option) const override;
protected:
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMappingWiggle.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMappingWiggle.h
index a21538c9cf90b46c54bc8a7df1ce2a9288038258..a369f4112cb7b15e96918fef128f8c2e1abdf77b 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMappingWiggle.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSHitCellMappingWiggle.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TFCSHitCellMappingWiggle_h
@@ -34,10 +34,15 @@ public:
/// and then fills all hits into calorimeter cells
virtual FCSReturnCode simulate_hit(Hit& hit,TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) override;
+ virtual bool operator==(const TFCSParametrizationBase& ref) const override;
+
void Print(Option_t *option="") const override;
static void unit_test(TFCSSimulationState* simulstate=nullptr,TFCSTruthState* truth=nullptr, TFCSExtrapolationState* extrapol=nullptr);
+protected:
+ bool compare(const TFCSParametrizationBase& ref) const;
+
private:
//** Function for the hit-to-cell assignment accordion structure fix (wiggle) **//
//** To be moved to the conditions database at some point **//
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrization.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrization.h
index 41f9dd401878e316c6946f8d1c5e0d9ea896e522..6de914a1107a001a5512160457ade13d1e935793 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrization.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrization.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TFCSLateralShapeParametrization_h
@@ -26,6 +26,10 @@ public:
virtual void set_pdgid_Ekin_eta_Ekin_bin_calosample(const TFCSLateralShapeParametrization& ref);
void Print(Option_t *option = "") const override;
+
+protected:
+ bool compare(const TFCSParametrizationBase& ref) const;
+
private:
int m_Ekin_bin;
int m_calosample;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitChain.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitChain.h
index bfb84fbfd781e4789d90d4814628d45766495abc..4cd1818b2011c33ea0a3c911558e9881c94bbfa7 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitChain.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitChain.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TFCSLateralShapeParametrizationHitChain_h
@@ -16,12 +16,11 @@ public:
virtual FCSReturnCode simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) const override;
- virtual void set_geometry(ICaloGeometry* geo) override;
-
typedef std::vector< TFCSLateralShapeParametrizationHitBase* > Chain_t;
- virtual unsigned int size() const override {return m_chain.size();};
- virtual const TFCSParametrizationBase* operator[](unsigned int ind) const override {return m_chain[ind];};
- virtual TFCSParametrizationBase* operator[](unsigned int ind) override {return m_chain[ind];};
+ virtual unsigned int size() const override;
+ virtual const TFCSParametrizationBase* operator[](unsigned int ind) const override;
+ virtual TFCSParametrizationBase* operator[](unsigned int ind) override;
+ virtual void set_daughter(unsigned int ind,TFCSParametrizationBase* param) override;
const Chain_t& chain() const {return m_chain;};
Chain_t& chain() {return m_chain;};
void push_back( const Chain_t::value_type& value ) {m_chain.push_back(value);};
@@ -48,15 +47,6 @@ public:
void Print(Option_t *option = "") const override;
-#if defined(__FastCaloSimStandAlone__)
- /// Update outputlevel
- virtual void setLevel(int level,bool recursive=false) override {
- TFCSLateralShapeParametrization::setLevel(level,recursive);
- if(recursive) if(m_number_of_hits_simul) m_number_of_hits_simul->setLevel(level,recursive);
- }
-#endif
-
-
protected:
Chain_t m_chain;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitNumberFromE.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitNumberFromE.h
index 8614caf117ff862f5ddc0000cf02c996b8558896..4f37a5736bef08c78891959a6d0d60c48ac789a2 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitNumberFromE.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSLateralShapeParametrizationHitNumberFromE.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TFCSLateralShapeParametrizationHitNumberFromE_h
@@ -33,7 +33,13 @@ public:
int get_number_of_hits(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) const override;
+ virtual bool operator==(const TFCSParametrizationBase& ref) const override;
+
void Print(Option_t *option = "") const override;
+
+protected:
+ bool compare(const TFCSParametrizationBase& ref) const;
+
private:
// Information for the fluctuation terms
// The variation is calculated as:
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrization.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrization.h
index 70c9098dccb3c818204a39931ae6f87b87773930..fe1a8d2dfcf0df51ddb329471d2762041efd68e7 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrization.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrization.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMEVENT_TFCSParametrization_h
@@ -45,6 +45,9 @@ public:
virtual void set_eta(const TFCSParametrizationBase& ref);
virtual void set_Ekin_eta(const TFCSParametrizationBase& ref);
virtual void set_pdgid_Ekin_eta(const TFCSParametrizationBase& ref);
+
+protected:
+ bool compare(const TFCSParametrizationBase& ref) const;
private:
std::set< int > m_pdgid;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h
index 5debb60d7c9e7bf39d019f6e92c1d6cf048bdfa6..6cbd89e4faba9c36636384caf956aab765dbd952 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMEVENT_TFCSParametrizationBase_h
@@ -7,6 +7,7 @@
#include <TNamed.h>
#include <set>
+#include <map>
class ICaloGeometry;
class TFCSSimulationState;
@@ -130,6 +131,15 @@ public:
///The size() and operator[] methods give general access to these daughters
virtual TFCSParametrizationBase* operator[](unsigned int /*ind*/) {return nullptr;};
+ ///Some derived classes have daughter instances of TFCSParametrizationBase objects
+ ///The set_daughter method allows to change these daughters - expert use only!
+ ///The original element at this position is not deleted
+ virtual void set_daughter(unsigned int /*ind*/,TFCSParametrizationBase* /*param*/) {};
+
+ ///The == operator compares the content of instances.
+ ///The implementation in the base class only returns true for a comparison with itself
+ virtual bool operator==(const TFCSParametrizationBase& ref) const {return compare(ref);};
+
///Method in all derived classes to do some simulation
virtual FCSReturnCode simulate(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) const;
@@ -139,6 +149,17 @@ public:
///Deletes all objects from the s_cleanup_list.
///This list can get filled during streaming operations, where an immediate delete is not possible
static void DoCleanup();
+
+ struct Duplicate_t {
+ TFCSParametrizationBase* replace=nullptr;
+ std::vector< TFCSParametrizationBase* > mother;
+ std::vector< unsigned int > index;
+ };
+ typedef std::map< TFCSParametrizationBase* , Duplicate_t > FindDuplicates_t;
+ typedef std::map< std::string , FindDuplicates_t > FindDuplicateClasses_t;
+ void FindDuplicates(FindDuplicateClasses_t& dup);
+ void RemoveDuplicates();
+ void RemoveNameTitle();
protected:
static constexpr double init_Ekin_nominal=0;//! Do not persistify!
@@ -149,6 +170,8 @@ protected:
static constexpr double init_eta_max=100;//! Do not persistify!
static std::vector< TFCSParametrizationBase* > s_cleanup_list;
+
+ bool compare(const TFCSParametrizationBase& ref) const;
#if defined(__FastCaloSimStandAlone__)
public:
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationChain.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationChain.h
index 6f708e44a8936dfecb9d2d189e2bde0a20ad5bfb..5736404088bf3aec7a8ec712a916d9938f1fc3f1 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationChain.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationChain.h
@@ -30,6 +30,7 @@ public:
virtual unsigned int size() const override {return m_chain.size();};
virtual const TFCSParametrizationBase* operator[](unsigned int ind) const override {return m_chain[ind];};
virtual TFCSParametrizationBase* operator[](unsigned int ind) override {return m_chain[ind];};
+ virtual void set_daughter(unsigned int ind,TFCSParametrizationBase* param) override {m_chain.at(ind)=param;};
const Chain_t& chain() const {return m_chain;};
Chain_t& chain() {return m_chain;};
void push_back(const Chain_t::value_type& param) {m_chain.push_back(param);recalc();};
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionInt32Histogram.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionInt32Histogram.cxx
index 1402bd4277fb76d4263bfe430679cb2e0cd9be65..d9433fb4c05f26004121219c11cd70cd4f3eb893 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionInt32Histogram.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCS1DFunctionInt32Histogram.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ISF_FastCaloSimEvent/TFCS1DFunctionInt32Histogram.h"
@@ -10,6 +10,7 @@
#include "TH2F.h"
#include "TRandom.h"
#include "TFile.h"
+#include "TClass.h"
//=============================================
//======= TFCS1DFunctionInt32Histogram =========
@@ -78,6 +79,16 @@ double TFCS1DFunctionInt32Histogram::rnd_to_fct(double rnd) const
}
}
+bool TFCS1DFunctionInt32Histogram::operator==(const TFCS1DFunction& ref) const
+{
+ if(IsA()!=ref.IsA()) return false;
+ const TFCS1DFunctionInt32Histogram& ref_typed=static_cast<const TFCS1DFunctionInt32Histogram&>(ref);
+
+ if(m_HistoBorders!=ref_typed.m_HistoBorders) return false;
+ if(m_HistoContents!=ref_typed.m_HistoContents) return false;
+ return true;
+}
+
void TFCS1DFunctionInt32Histogram::unit_test(TH1* hist)
{
int nbinsx;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMapping.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMapping.cxx
index ce5eac7bc731de0cf8f32ecbd8cd53f76e66b400..6748d47fb1b9f6530d6eeeab464c36d7192cdb3b 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMapping.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMapping.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ISF_FastCaloSimEvent/TFCSHitCellMapping.h"
@@ -31,6 +31,15 @@ FCSReturnCode TFCSHitCellMapping::simulate_hit(Hit& hit,TFCSSimulationState& sim
}
}
+bool TFCSHitCellMapping::operator==(const TFCSParametrizationBase& ref) const
+{
+ if(TFCSParametrizationBase::compare(ref)) return true;
+ if(!TFCSParametrization::compare(ref)) return false;
+ if(!TFCSLateralShapeParametrization::compare(ref)) return false;
+
+ return true;
+}
+
void TFCSHitCellMapping::Print(Option_t *option) const
{
TString opt(option);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMappingWiggle.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMappingWiggle.cxx
index 94a6db4f3eca14c3d096f26c720b47f0154980d4..9bb98d634b89ede708c630fcf4589354879dc804 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMappingWiggle.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSHitCellMappingWiggle.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "CLHEP/Random/RandFlat.h"
@@ -13,10 +13,7 @@
#include "TH1.h"
#include "TVector2.h"
#include "TMath.h"
-
-#if 0 //defined(__FastCaloSimStandAlone__)
-#include "CaloGeometryFromFile.h"
-#endif
+#include <TClass.h>
//=============================================
//======= TFCSHitCellMappingWiggle =========
@@ -116,6 +113,16 @@ FCSReturnCode TFCSHitCellMappingWiggle::simulate_hit(Hit& hit,TFCSSimulationStat
return TFCSHitCellMapping::simulate_hit(hit,simulstate,truth,extrapol);
}
+bool TFCSHitCellMappingWiggle::operator==(const TFCSParametrizationBase& ref) const
+{
+ if(TFCSParametrizationBase::compare(ref)) return true;
+ if(!TFCSParametrization::compare(ref)) return false;
+ if(!TFCSLateralShapeParametrization::compare(ref)) return false;
+ if(!TFCSHitCellMappingWiggle::compare(ref)) return false;
+
+ return true;
+}
+
void TFCSHitCellMappingWiggle::Print(Option_t *option) const
{
TFCSHitCellMapping::Print(option);
@@ -131,6 +138,40 @@ void TFCSHitCellMappingWiggle::Print(Option_t *option) const
}
}
+bool TFCSHitCellMappingWiggle::compare(const TFCSParametrizationBase& ref) const
+{
+ if(IsA()!=ref.IsA()) {
+ ATH_MSG_DEBUG("compare(): different class types "<<IsA()->GetName()<<" != "<<ref.IsA()->GetName());
+ return false;
+ }
+ const TFCSHitCellMappingWiggle& ref_typed=static_cast<const TFCSHitCellMappingWiggle&>(ref);
+
+ if(m_bin_low_edge != ref_typed.m_bin_low_edge ) {
+ ATH_MSG_DEBUG("operator==(): different bin edges");
+ return false;
+ }
+
+ for (unsigned int i=0;i<get_number_of_bins();++i) {
+ const TFCS1DFunction* f1=get_function(i);
+ const TFCS1DFunction* f2=ref_typed.get_function(i);
+ if(!f1 && !f2) continue;
+ if((f1 && !f2) || (!f1 && f2)) {
+ ATH_MSG_DEBUG("compare(): different only one function pointer is nullptr");
+ return false;
+ }
+ if(f1->IsA()!=f2->IsA()) {
+ ATH_MSG_DEBUG("compare(): different class types for function "<<i<<": "<<f1->IsA()->GetName()<<" != "<<f2->IsA()->GetName());
+ return false;
+ }
+ if(!(*f1==*f2)) {
+ ATH_MSG_DEBUG("compare(): difference in functions "<<i);
+ return false;
+ }
+ }
+
+ return true;
+}
+
void TFCSHitCellMappingWiggle::unit_test(TFCSSimulationState* simulstate,TFCSTruthState* truth, TFCSExtrapolationState* extrapol)
{
if(!simulstate) simulstate=new TFCSSimulationState();
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrization.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrization.cxx
index 83d2e7fdb931eaece91f69b68f3804ce98898882..a12ca4b84c48d14eaf55950cf1626a40d39fcd76 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrization.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrization.cxx
@@ -1,9 +1,10 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ISF_FastCaloSimEvent/TFCSLateralShapeParametrization.h"
#include "ISF_FastCaloSimEvent/FastCaloSim_CaloCell_ID.h"
+#include <TClass.h>
//=============================================
//======= TFCSLateralShapeParametrization =========
@@ -30,6 +31,25 @@ void TFCSLateralShapeParametrization::set_pdgid_Ekin_eta_Ekin_bin_calosample(con
set_pdgid_Ekin_eta(ref);
}
+bool TFCSLateralShapeParametrization::compare(const TFCSParametrizationBase& ref) const
+{
+ if(IsA()!=ref.IsA()) {
+ ATH_MSG_DEBUG("compare(): different class types "<<IsA()->GetName()<<" != "<<ref.IsA()->GetName());
+ return false;
+ }
+ const TFCSLateralShapeParametrization& ref_typed=static_cast<const TFCSLateralShapeParametrization&>(ref);
+ if(Ekin_bin()!=ref_typed.Ekin_bin()) {
+ ATH_MSG_DEBUG("compare(): different Ekin bin");
+ return false;
+ }
+ if(calosample()!=ref_typed.calosample()) {
+ ATH_MSG_DEBUG("compare(): different calosample");
+ return false;
+ }
+
+ return true;
+}
+
void TFCSLateralShapeParametrization::Print(Option_t *option) const
{
TString opt(option);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx
index 969c3cfdb20fbe0117cc0dc61646974fa4721969..0543c4b891e30d4ad33a932a7eec92d3a38fb2bd 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitChain.cxx
@@ -7,6 +7,7 @@
#include "ISF_FastCaloSimEvent/TFCSSimulationState.h"
#include "TMath.h"
+#include <TClass.h>
//=============================================
//======= TFCSLateralShapeParametrizationHitChain =========
@@ -23,10 +24,47 @@ TFCSLateralShapeParametrizationHitChain::TFCSLateralShapeParametrizationHitChain
m_chain.push_back(hitsim);
}
-void TFCSLateralShapeParametrizationHitChain::set_geometry(ICaloGeometry* geo)
+unsigned int TFCSLateralShapeParametrizationHitChain::size() const
{
- TFCSLateralShapeParametrization::set_geometry(geo);
- if(m_number_of_hits_simul) m_number_of_hits_simul->set_geometry(geo);
+ if(m_number_of_hits_simul) return m_chain.size()+1;
+ else return m_chain.size();
+}
+
+const TFCSParametrizationBase* TFCSLateralShapeParametrizationHitChain::operator[](unsigned int ind) const
+{
+ if(m_number_of_hits_simul) {
+ if(ind==0) return m_number_of_hits_simul;
+ return m_chain[ind-1];
+ } else {
+ return m_chain[ind];
+ }
+}
+
+TFCSParametrizationBase* TFCSLateralShapeParametrizationHitChain::operator[](unsigned int ind) {
+ if(m_number_of_hits_simul) {
+ if(ind==0) return m_number_of_hits_simul;
+ return m_chain[ind-1];
+ } else {
+ return m_chain[ind];
+ }
+}
+
+void TFCSLateralShapeParametrizationHitChain::set_daughter(unsigned int ind,TFCSParametrizationBase* param)
+{
+ TFCSLateralShapeParametrizationHitBase* param_typed=nullptr;
+ if(param!=nullptr) {
+ if(!param->InheritsFrom(TFCSLateralShapeParametrizationHitBase::Class())) {
+ ATH_MSG_ERROR("Wrong class type "<<param->IsA()->GetName());
+ return;
+ }
+ param_typed=static_cast<TFCSLateralShapeParametrizationHitBase*>(param);
+ }
+ if(m_number_of_hits_simul) {
+ if(ind==0) m_number_of_hits_simul=param_typed;
+ else m_chain.at(ind-1)=param_typed;
+ } else {
+ m_chain.at(ind)=param_typed;
+ }
}
int TFCSLateralShapeParametrizationHitChain::get_number_of_hits(TFCSSimulationState& simulstate,const TFCSTruthState* truth, const TFCSExtrapolationState* extrapol) const
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitNumberFromE.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitNumberFromE.cxx
index c1bdcd00c14faa0a646e0289b36261931e254afb..aa785ff785d3bb1e86d84f51f3ab17e058f35a64 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitNumberFromE.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSLateralShapeParametrizationHitNumberFromE.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "CLHEP/Random/RandPoisson.h"
@@ -8,6 +8,7 @@
#include "ISF_FastCaloSimEvent/TFCSSimulationState.h"
#include "TMath.h"
+#include <TClass.h>
//=============================================
//======= TFCSHistoLateralShapeParametrization =========
@@ -68,6 +69,30 @@ int TFCSLateralShapeParametrizationHitNumberFromE::get_number_of_hits(TFCSSimula
return hits;
}
+bool TFCSLateralShapeParametrizationHitNumberFromE::operator==(const TFCSParametrizationBase& ref) const
+{
+ if(TFCSParametrizationBase::compare(ref)) return true;
+ if(!TFCSParametrization::compare(ref)) return false;
+ if(!TFCSLateralShapeParametrization::compare(ref)) return false;
+ if(!TFCSLateralShapeParametrizationHitNumberFromE::compare(ref)) return false;
+ return true;
+}
+
+bool TFCSLateralShapeParametrizationHitNumberFromE::compare(const TFCSParametrizationBase& ref) const
+{
+ if(IsA()!=ref.IsA()) {
+ ATH_MSG_DEBUG("compare(): different class types "<<IsA()->GetName()<<" != "<<ref.IsA()->GetName());
+ return false;
+ }
+ const TFCSLateralShapeParametrizationHitNumberFromE& ref_typed=static_cast<const TFCSLateralShapeParametrizationHitNumberFromE&>(ref);
+ if(m_stochastic!=ref_typed.m_stochastic || m_stochastic_hadron!=ref_typed.m_stochastic_hadron || m_constant!=ref_typed.m_constant) {
+ ATH_MSG_DEBUG("operator==(): different fluctuation model sigma^2=["<<m_stochastic<<"/sqrt(E/GeV)]^2 + ["<<m_constant<<" + "<<m_stochastic_hadron<<"/sqrt(E/GeV)]^2 != sigma^2=["<<ref_typed.m_stochastic<<"/sqrt(E/GeV)]^2 + ["<<ref_typed.m_constant<<" + "<<ref_typed.m_stochastic_hadron<<"/sqrt(E/GeV)]^2");
+ return false;
+ }
+
+ return true;
+}
+
void TFCSLateralShapeParametrizationHitNumberFromE::Print(Option_t *option) const
{
TString opt(option);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrization.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrization.cxx
index dcadb6cd758c1ebef06b72b27642f61379d77c53..4a411f333c9c22cd7b26eeeab666610bd95727fc 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrization.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrization.cxx
@@ -1,8 +1,9 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ISF_FastCaloSimEvent/TFCSParametrization.h"
+#include <TClass.h>
//=============================================
//======= TFCSParametrization =========
@@ -101,3 +102,35 @@ void TFCSParametrization::set_pdgid_Ekin_eta(const TFCSParametrizationBase& ref)
set_pdgid(ref.pdgid());
}
+bool TFCSParametrization::compare(const TFCSParametrizationBase& ref) const
+{
+ if(IsA()!=ref.IsA()) {
+ ATH_MSG_DEBUG("compare(): different class types "<<IsA()->GetName()<<" != "<<ref.IsA()->GetName());
+ return false;
+ }
+ std::string name(GetName());
+ if(name!=ref.GetName()) {
+ ATH_MSG_DEBUG("compare(): different names "<<GetName()<<" != "<<ref.GetName());
+ return false;
+ }
+ std::string title(GetTitle());
+ if(title!=ref.GetTitle()) {
+ ATH_MSG_DEBUG("compare(): different titles "<<GetTitle()<<" != "<<ref.GetTitle());
+ return false;
+ }
+ if(is_match_all_pdgid()!=ref.is_match_all_pdgid() || pdgid()!=ref.pdgid()) {
+ ATH_MSG_DEBUG("compare(): different pdgids");
+ return false;
+ }
+ if(Ekin_nominal()!=ref.Ekin_nominal() || Ekin_min()!=ref.Ekin_min() || Ekin_max()!=ref.Ekin_max()) {
+ ATH_MSG_DEBUG("compare(): different Ekin range");
+ return false;
+ }
+ if(eta_nominal()!=ref.eta_nominal() || eta_min()!=ref.eta_min() || eta_max()!=ref.eta_max()) {
+ ATH_MSG_DEBUG("compare(): different eta range");
+ return false;
+ }
+
+ return true;
+}
+
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBase.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBase.cxx
index 8879727dd640b6c480946c2a39b51dbad29b0672..1d55f9e7eb29677f01c382bb2d2f4c1c0dc73d4a 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBase.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSParametrizationBase.cxx
@@ -46,6 +46,15 @@ FCSReturnCode TFCSParametrizationBase::simulate(TFCSSimulationState& /*simulstat
return (FCSReturnCode)(FCSRetry+1);
}
+bool TFCSParametrizationBase::compare(const TFCSParametrizationBase& ref) const
+{
+ if(this==&ref) {
+ ATH_MSG_DEBUG("compare(): identical instances "<< this <<" == " << &ref);
+ return true;
+ }
+ return false;
+}
+
///If called with argument "short", only a one line summary will be printed
void TFCSParametrizationBase::Print(Option_t *option) const
{
@@ -89,3 +98,104 @@ void TFCSParametrizationBase::DoCleanup()
}
s_cleanup_list.resize(0);
}
+
+void TFCSParametrizationBase::FindDuplicates(FindDuplicateClasses_t& dupclasses)
+{
+ for(unsigned int i=0;i<size();++i) if((*this)[i]) {
+ TFCSParametrizationBase* param=(*this)[i];
+ FindDuplicates_t& dup=dupclasses[param->GetName()];
+ //If param is already in the duplication list, skip over
+ auto checkexist=dup.find(param);
+ if(checkexist!=dup.end()) {
+ ATH_MSG_DEBUG("Found duplicate pointer for: "<<param<<"="<<param->GetName());
+ if(checkexist->second.replace) {
+ TFCSParametrizationBase* refparam=checkexist->second.replace;
+ ATH_MSG_DEBUG("Found duplicate pointer: "<<refparam<<"="<<refparam->GetName()<<", duplicate is "<<param<<"="<<param->GetName()<<" index "<<i<<" of "<<this);
+ dup[refparam].mother.push_back(this);
+ dup[refparam].index.push_back(i);
+ }
+ continue;
+ }
+ //Add param to duplication list
+ dup[param]=Duplicate_t();
+ for(auto& ref : dup) {
+ TFCSParametrizationBase* refparam=ref.first;
+ //skip itself, as this just added above
+ if(param==refparam) continue;
+ //skip nullptr reference
+ if(refparam==nullptr) continue;
+ //skip reference that is itself going to get replaced
+ if(ref.second.replace) continue;
+ //Check for objects with identical content
+ if(*param==*refparam) {
+ ATH_MSG_DEBUG("Found duplicate: "<<refparam<<"="<<refparam->GetName()<<", duplicate is "<<param<<"="<<param->GetName()<<" index "<<i<<" of "<<this);
+ dup[param].replace=refparam;
+ dup[refparam].mother.push_back(this);
+ dup[refparam].index.push_back(i);
+ break;
+ }
+ }
+ //Continue for child objects in param
+ param->FindDuplicates(dupclasses);
+ }
+}
+
+void TFCSParametrizationBase::RemoveDuplicates()
+{
+ FindDuplicateClasses_t dupclasses;
+ FindDuplicates(dupclasses);
+
+ std::set< TFCSParametrizationBase* > dellist;
+ for(auto& dupiter : dupclasses) {
+ FindDuplicates_t& dup=dupiter.second;
+ for(auto onedup : dup) {
+ if(onedup.second.mother.size()==0) continue;
+ TFCSParametrizationBase* ref=onedup.first;
+ ATH_MSG_DEBUG("Main object "<<ref<<"="<<ref->GetName());
+ for(unsigned int i=0;i<onedup.second.mother.size();++i) {
+ int index=onedup.second.index[i];
+ TFCSParametrizationBase* mother=onedup.second.mother[i];
+ TFCSParametrizationBase* delparam=mother->operator[](index);
+ unsigned int delcount=dup[delparam].mother.size();
+ if(delcount==0) {
+ ATH_MSG_DEBUG(" - Delete object "<<delparam<<"="<<delparam->GetName()<<" index "<<index<<" of "<<mother<<", has "<<delcount<<" other replacements attached. Deleting");
+ mother->set_daughter(index,ref);
+ dellist.insert(delparam);
+ } else {
+ ATH_MSG_WARNING(" - Delete object "<<delparam<<"="<<delparam->GetName()<<" index "<<index<<" of "<<mother<<", has "<<delcount<<" other replacements attached. Skipping");
+ }
+ }
+ }
+ }
+
+ ATH_MSG_INFO("RERUNNING DUPLICATE FINDING");
+ FindDuplicateClasses_t dupclasses2;
+ FindDuplicates(dupclasses2);
+
+ std::map<std::string,int> ndel;
+ for(auto delparam : dellist) {
+ FindDuplicates_t& dup2=dupclasses2[delparam->GetName()];
+ bool present=dup2.find(delparam) != dup2.end();
+ if(present) {
+ ATH_MSG_WARNING("- Delete object "<<delparam<<"="<<delparam->GetName()<<" still referenced somewhere!");
+ } else {
+ ATH_MSG_DEBUG("- Delete object "<<delparam<<"="<<delparam->GetName());
+ ++ndel[delparam->ClassName()];
+ delete delparam;
+ }
+ }
+ for(auto& del : ndel) ATH_MSG_INFO("Deleted "<<del.second<<" duplicate objects of class "<<del.first);
+}
+
+void TFCSParametrizationBase::RemoveNameTitle()
+{
+ for(unsigned int i=0;i<size();++i) if((*this)[i]) {
+ TFCSParametrizationBase* param=(*this)[i];
+ param->SetName("");
+ param->SetTitle("");
+
+ //Continue for child objects in param
+ param->RemoveNameTitle();
+ }
+}
+
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py
index ba648ab2c18aa8111b0d8caa2ef4367a3c21f497..1bd9e55073d836115e75be035438eac6aa2a104e 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/skeleton.ESDtoNTUP_FCS.py
@@ -35,8 +35,8 @@ from GaudiSvc.GaudiSvcConf import THistSvc
ServiceMgr += THistSvc()
## Output NTUP_FCS File
if hasattr(runArgs,"outputNTUP_FCSFile"):
- print "Output is"
- print runArgs.outputNTUP_FCSFile
+ print("Output is")
+ print(runArgs.outputNTUP_FCSFile)
ServiceMgr.THistSvc.Output +=["ISF_HitAnalysis DATAFILE='"+runArgs.outputNTUP_FCSFile+"' OPT='RECREATE'"] # FIXME top level directory name
else:
fcsntuplog.warning('No output file set')
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.cxx
index 63051909e0ca2f1a2bb7c6c41fd9978e1879ed2f..607c2e9c5a7be8adab7fe3d3f92c8b00fd34b3e3 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.cxx
@@ -2,19 +2,29 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+/* Athena includes */
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/IPartPropSvc.h"
+
+/* Header include */
#include "FastCaloSimCaloExtrapolation.h"
+/* ISF includes */
+#include "ISF_FastCaloSimEvent/FastCaloSim_CaloCell_ID.h"
+#include "ISF_FastCaloSimParametrization/IFastCaloSimGeometryHelper.h"
#include "ISF_FastCaloSimEvent/TFCSTruthState.h"
-
-#include "TrkParameters/TrackParameters.h"
+/* Tracking includes */
#include "TrkGeometry/TrackingGeometry.h"
-#include "HepPDT/ParticleData.hh"
+
+/* Geometry primitives */
+#include "GeoPrimitives/GeoPrimitivesHelpers.h"
+
+/* Particle data */
#include "HepPDT/ParticleDataTable.hh"
-#include "CaloDetDescr/ICaloCoordinateTool.h"
-#include "GaudiKernel/IPartPropSvc.h"
-#include "GaudiKernel/ListItem.h"
+
FastCaloSimCaloExtrapolation::FastCaloSimCaloExtrapolation(const std::string& t, const std::string& n, const IInterface* p)
: AthAlgTool(t,n,p)
@@ -30,13 +40,13 @@ FastCaloSimCaloExtrapolation::FastCaloSimCaloExtrapolation(const std::string& t,
m_surfacelist.push_back(CaloCell_ID_FCS::EME2);
m_surfacelist.push_back(CaloCell_ID_FCS::FCAL0);
- declareProperty("CaloBoundaryR", m_CaloBoundaryR);
- declareProperty("CaloBoundaryZ", m_CaloBoundaryZ);
- declareProperty("CaloMargin", m_calomargin);
- declareProperty("Surfacelist", m_surfacelist );
- declareProperty("Extrapolator", m_extrapolator );
- declareProperty("CaloEntrance", m_caloEntranceName );
- declareProperty("CaloGeometryHelper", m_CaloGeometryHelper );
+ declareProperty("CaloBoundaryR", m_CaloBoundaryR);
+ declareProperty("CaloBoundaryZ", m_CaloBoundaryZ);
+ declareProperty("CaloMargin", m_calomargin);
+ declareProperty("Surfacelist", m_surfacelist);
+ declareProperty("Extrapolator", m_extrapolator);
+ declareProperty("CaloEntrance", m_caloEntranceName);
+ declareProperty("CaloGeometryHelper", m_CaloGeometryHelper);
}
FastCaloSimCaloExtrapolation::~FastCaloSimCaloExtrapolation()
@@ -51,29 +61,25 @@ StatusCode FastCaloSimCaloExtrapolation::initialize()
ATH_CHECK(m_CaloGeometryHelper.retrieve());
// Get PDG table
- IPartPropSvc* p_PartPropSvc=nullptr;
+ IPartPropSvc* p_PartPropSvc = nullptr;
ATH_CHECK(service("PartPropSvc",p_PartPropSvc));
- if(!p_PartPropSvc)
- {
- ATH_MSG_ERROR("could not find PartPropService");
- return StatusCode::FAILURE;
- }
+ if(!p_PartPropSvc){
+ ATH_MSG_ERROR("could not find PartPropService");
+ return StatusCode::FAILURE;
+ }
m_particleDataTable = (HepPDT::ParticleDataTable*) p_PartPropSvc->PDT();
- if(!m_particleDataTable)
- {
- ATH_MSG_ERROR("PDG table not found");
- return StatusCode::FAILURE;
- }
- //#########################
+ if(!m_particleDataTable){
+ ATH_MSG_ERROR("PDG table not found");
+ return StatusCode::FAILURE;
+ }
// Get TimedExtrapolator
- if(!m_extrapolator.empty())
- {
+ if(!m_extrapolator.empty()){
ATH_CHECK(m_extrapolator.retrieve());
ATH_MSG_INFO("Extrapolator retrieved "<< m_extrapolator);
- }
+ }
ATH_MSG_INFO("m_CaloBoundaryR="<<m_CaloBoundaryR<<" m_CaloBoundaryZ="<<m_CaloBoundaryZ<<" m_caloEntranceName "<<m_caloEntranceName);
@@ -81,71 +87,118 @@ StatusCode FastCaloSimCaloExtrapolation::initialize()
}
-StatusCode FastCaloSimCaloExtrapolation::finalize()
-{
+
+StatusCode FastCaloSimCaloExtrapolation::finalize(){
ATH_MSG_INFO( "Finalizing FastCaloSimCaloExtrapolation" );
return StatusCode::SUCCESS;
}
+bool FastCaloSimCaloExtrapolation::getCaloSurface(TFCSExtrapolationState& result, std::vector<Trk::HitInfo>* hitVector) const{
+ ATH_MSG_DEBUG("Start getCaloSurface()");
-void FastCaloSimCaloExtrapolation::extrapolate(TFCSExtrapolationState& result,const TFCSTruthState* truth) const
-{
+ //used to identify ID-Calo boundary in tracking tools
+ int IDCaloBoundary = 3000;
+
+ result.set_CaloSurface_sample(CaloCell_ID_FCS::noSample);
+ result.set_CaloSurface_eta(-999);
+ result.set_CaloSurface_phi(-999);
+ result.set_CaloSurface_r(0);
+ result.set_CaloSurface_z(0);
+ double min_calo_surf_dist=1000;
- //UPDATE EXTRAPOLATION
- ATH_MSG_DEBUG("Start FastCaloSimCaloExtrapolation::extrapolate");
- std::vector<Trk::HitInfo>* hitVector = caloHits(truth);
- ATH_MSG_DEBUG("Done FastCaloSimCaloExtrapolation::extrapolate: caloHits");
+ for(unsigned int i=0;i<m_surfacelist.size();++i){
- //////////////////////////////////////
- // Start calo extrapolation
- // First: get entry point into first calo sample
- //////////////////////////////////////
- ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate:*** Get calo surface ***");
- get_calo_surface(result,hitVector);
+ int sample=m_surfacelist[i];
+ std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
- ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate:*** Do extrapolation to ID-calo boundary ***");
- extrapolate_to_ID(result,truth,hitVector);
+ while (it != hitVector->end() && it->detID != (IDCaloBoundary+sample)) it++;
- ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate:*** Do extrapolation ***");
- extrapolate(result,truth,hitVector);
+ if(it==hitVector->end()) continue;
- ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate: Truth extrapolation done");
+ Amg::Vector3D hitPos = (*it).trackParms->position();
+
+ //double offset = 0.;
+ double etaCalo = hitPos.eta();
+
+ if(std::abs(etaCalo)<900){
+
+ double phiCalo = hitPos.phi();
+ double distsamp =deta(sample,etaCalo);
+
+ if(distsamp<min_calo_surf_dist && min_calo_surf_dist>=0){
+
+ //hitVector is ordered in r, so if first surface was hit, keep it
+ result.set_CaloSurface_sample(sample);
+ result.set_CaloSurface_eta(etaCalo);
+ result.set_CaloSurface_phi(phiCalo);
+ double rcalo = rent(sample,etaCalo);
+ double zcalo = zent(sample,etaCalo);
+ result.set_CaloSurface_r(rcalo);
+ result.set_CaloSurface_z(zcalo);
+ min_calo_surf_dist = distsamp;
+ msg(MSG::DEBUG)<<" r="<<rcalo<<" z="<<zcalo;
- for(std::vector<Trk::HitInfo>::iterator it = hitVector->begin();it < hitVector->end();++it)
- {
- if((*it).trackParms)
- {
- delete (*it).trackParms;
- (*it).trackParms=0;
- }
+ if(distsamp<0){
+ msg(MSG::DEBUG)<<endmsg;
+ break;
+ }
+ }
+ msg(MSG::DEBUG)<<endmsg;
+ }
+ else
+ msg(MSG::DEBUG)<<": eta > 900, not using this"<<endmsg;
}
- delete hitVector;
- ATH_MSG_DEBUG("Done FastCaloSimCaloExtrapolation::extrapolate");
+
+ if(result.CaloSurface_sample() == CaloCell_ID_FCS::noSample){
+ // first intersection with sensitive calo layer
+ std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
+
+ while(it < hitVector->end() && (*it).detID != 3) it++; // to be updated
+
+ if (it == hitVector->end()) return false; // no calo intersection, abort
+
+ Amg::Vector3D surface_hitPos = (*it).trackParms->position();
+
+ result.set_CaloSurface_eta(surface_hitPos.eta());
+ result.set_CaloSurface_phi(surface_hitPos.phi());
+ result.set_CaloSurface_r(surface_hitPos.perp());
+ result.set_CaloSurface_z(surface_hitPos[Amg::z]);
+
+ double pT=(*it).trackParms->momentum().perp();
+ if(std::abs(result.CaloSurface_eta())>4.9 || pT<500 || (std::abs(result.CaloSurface_eta())>4 && pT<1000))
+ ATH_MSG_DEBUG("only entrance to calo entrance layer found, no surface : eta="<<result.CaloSurface_eta()<<" phi="<<result.CaloSurface_phi()<<" r="<<result.CaloSurface_r()<<" z="<<result.CaloSurface_z()<<" pT="<<pT);
+ else
+ ATH_MSG_WARNING("only entrance to calo entrance layer found, no surface : eta="<<result.CaloSurface_eta()<<" phi="<<result.CaloSurface_phi()<<" r="<<result.CaloSurface_r()<<" z="<<result.CaloSurface_z()<<" pT="<<pT);
+
+ } //sample
+ else ATH_MSG_DEBUG("entrance to calo surface : sample="<<result.CaloSurface_sample()<<" eta="<<result.CaloSurface_eta()<<" phi="<<result.CaloSurface_phi()<<" r="<<result.CaloSurface_r()<<" z="<<result.CaloSurface_z()<<" deta="<<min_calo_surf_dist);
+
+ ATH_MSG_DEBUG("End getCaloSurface()");
+ return true;
}
-std::vector<Trk::HitInfo>* FastCaloSimCaloExtrapolation::caloHits(const TFCSTruthState* truth, bool forceNeutral) const
-{
+
+std::unique_ptr<std::vector<Trk::HitInfo>> FastCaloSimCaloExtrapolation::caloHits(const TFCSTruthState* truth, bool forceNeutral) const{
// Start calo extrapolation
ATH_MSG_DEBUG ("[ fastCaloSim transport ] processing particle "<<truth->pdgid() );
- std::vector<Trk::HitInfo>* hitVector = new std::vector<Trk::HitInfo>;
+ auto hitVector = std::make_unique<std::vector<Trk::HitInfo>>();
int pdgId = truth->pdgid();
double charge = HepPDT::ParticleID(pdgId).charge();
if (forceNeutral) charge = 0.;
// particle Hypothesis for the extrapolation
+ Trk::ParticleHypothesis pHypothesis = m_pdgToParticleHypothesis.convert(pdgId, charge);
- Trk::ParticleHypothesis pHypothesis = m_pdgToParticleHypothesis.convert(pdgId,charge);
-
- ATH_MSG_DEBUG ("particle hypothesis "<< pHypothesis );
+ ATH_MSG_DEBUG ("particle hypothesis "<< pHypothesis);
// geantinos not handled by PdgToParticleHypothesis - fix there
- if ( pdgId == 999 ) pHypothesis = Trk::geantino;
+ if (pdgId == 999) pHypothesis = Trk::geantino;
- Amg::Vector3D pos = Amg::Vector3D( truth->vertex().X(), truth->vertex().Y(), truth->vertex().Z());
+ Amg::Vector3D pos = Amg::Vector3D(truth->vertex().X(), truth->vertex().Y(), truth->vertex().Z());
- Amg::Vector3D mom(truth->X(),truth->Y(),truth->Z());
+ Amg::Vector3D mom(truth->X(), truth->Y(), truth->Z());
ATH_MSG_DEBUG( "[ fastCaloSim transport ] x from position eta="<<pos.eta()<<" phi="<<pos.phi()<<" d="<<pos.mag()<<" pT="<<mom.perp() );
@@ -173,7 +226,7 @@ std::vector<Trk::HitInfo>* FastCaloSimCaloExtrapolation::caloHits(const TFCSTrut
}
*/
- Trk::TimeLimit timeLim(tDec,0.,decayProc); // TODO: set vertex time info
+ Trk::TimeLimit timeLim(tDec, 0., decayProc); // TODO: set vertex time info
// prompt decay ( uncomment if unstable particles used )
//if ( freepath>0. && freepath<0.01 ) {
@@ -185,677 +238,916 @@ std::vector<Trk::HitInfo>* FastCaloSimCaloExtrapolation::caloHits(const TFCSTrut
//}
// presample interactions - ADAPT FOR FASTCALOSIM
- Trk::PathLimit pathLim(-1.,0);
- //if (absPdg!=999 && pHypothesis<99) pathLim = m_samplingTool->sampleProcess(mom,isp.charge(),pHypothesis);
+ Trk::PathLimit pathLim(-1., 0);
Trk::GeometrySignature nextGeoID=Trk::Calo;
// first extrapolation to reach the ID boundary
-
ATH_MSG_DEBUG( "[ fastCaloSim transport ] before calo entrance ");
// get CaloEntrance if not done already
- if(!m_caloEntrance)
- {
- m_caloEntrance = m_extrapolator->trackingGeometry()->trackingVolume(m_caloEntranceName);
-
- if(!m_caloEntrance)
- ATH_MSG_WARNING("CaloEntrance not found");
- else
- ATH_MSG_DEBUG("CaloEntrance found");
- }
+ if(!m_caloEntrance){
+ m_caloEntrance = m_extrapolator->trackingGeometry()->trackingVolume(m_caloEntranceName);
+ if(!m_caloEntrance)
+ ATH_MSG_WARNING("CaloEntrance not found");
+ else
+ ATH_MSG_DEBUG("CaloEntrance found");
+ }
ATH_MSG_DEBUG( "[ fastCaloSim transport ] after calo entrance ");
const Trk::TrackParameters* caloEntry = 0;
- if(m_caloEntrance && m_caloEntrance->inside(pos,0.001) && !m_extrapolator->trackingGeometry()->atVolumeBoundary(pos,m_caloEntrance,0.001))
- {
+ if(m_caloEntrance && m_caloEntrance->inside(pos, 0.001) && !m_extrapolator->trackingGeometry()->atVolumeBoundary(pos,m_caloEntrance, 0.001)){
std::vector<Trk::HitInfo>* dummyHitVector = 0;
- if( charge==0 )
- {
- caloEntry = m_extrapolator->transportNeutralsWithPathLimit(inputPar,pathLim,timeLim,
- Trk::alongMomentum,pHypothesis,dummyHitVector,nextGeoID,m_caloEntrance);
-
- }
- else
- {
- caloEntry = m_extrapolator->extrapolateWithPathLimit(inputPar,pathLim,timeLim,
- Trk::alongMomentum,pHypothesis,dummyHitVector,nextGeoID,m_caloEntrance);
- }
- }
- else
- caloEntry=&inputPar;
-
- if(caloEntry==&inputPar) {
- ATH_MSG_DEBUG("Use clone of inputPar as caloEntry");
- caloEntry=inputPar.clone();
+ if(charge==0) caloEntry = m_extrapolator->transportNeutralsWithPathLimit(inputPar,pathLim, timeLim, Trk::alongMomentum, pHypothesis, dummyHitVector, nextGeoID, m_caloEntrance);
+ else caloEntry = m_extrapolator->extrapolateWithPathLimit(inputPar, pathLim, timeLim, Trk::alongMomentum, pHypothesis, dummyHitVector, nextGeoID, m_caloEntrance);
}
+ else caloEntry=&inputPar;
ATH_MSG_DEBUG( "[ fastCaloSim transport ] after calo caloEntry ");
- if(caloEntry)
- {
+ if(caloEntry){
const Trk::TrackParameters* eParameters = 0;
// save Calo entry hit (fallback info)
- hitVector->push_back(Trk::HitInfo(caloEntry,timeLim.time,nextGeoID,0.));
+ hitVector->push_back(Trk::HitInfo(caloEntry->clone(), timeLim.time, nextGeoID, 0.));
ATH_MSG_DEBUG( "[ fastCaloSim transport ] starting Calo transport from position eta="<<caloEntry->position().eta()<<" phi="<<caloEntry->position().phi()<<" d="<<caloEntry->position().mag() );
-
- if(charge==0)
- {
- eParameters = m_extrapolator->transportNeutralsWithPathLimit(*caloEntry,pathLim,timeLim,
- Trk::alongMomentum,pHypothesis,hitVector,nextGeoID);
- }
- else
- {
- eParameters = m_extrapolator->extrapolateWithPathLimit(*caloEntry,pathLim,timeLim,
- Trk::alongMomentum,pHypothesis,hitVector,nextGeoID);
- }
+
+ std::vector<Trk::HitInfo>* rawHitVector = hitVector.get();
+ if(charge == 0) eParameters = m_extrapolator->transportNeutralsWithPathLimit(*caloEntry,pathLim,timeLim, Trk::alongMomentum, pHypothesis, rawHitVector, nextGeoID);
+ else eParameters = m_extrapolator->extrapolateWithPathLimit(*caloEntry, pathLim, timeLim, Trk::alongMomentum, pHypothesis, rawHitVector, nextGeoID);
// save Calo exit hit (fallback info)
- if(eParameters) hitVector->push_back(Trk::HitInfo(eParameters,timeLim.time,nextGeoID,0.));
- //delete eParameters; // HitInfo took ownership
+ if(eParameters) hitVector->push_back(Trk::HitInfo(eParameters, timeLim.time, nextGeoID, 0.));
} //if caloEntry
- if(msgLvl(MSG::DEBUG))
- {
- std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
- while (it < hitVector->end() )
- {
- int sample=(*it).detID;
- Amg::Vector3D hitPos = (*it).trackParms->position();
- ATH_MSG_DEBUG(" HIT: layer="<<sample<<" sample="<<sample-3000<<" eta="<<hitPos.eta()<<" phi="<<hitPos.phi()<<" d="<<hitPos.mag());
- ++it;
- }
+ //used to identify ID-Calo boundary in tracking tools
+ int IDCaloBoundary = 3000;
+
+ if(msgLvl(MSG::DEBUG)){
+ std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
+ while (it < hitVector->end()){
+ int sample=(*it).detID;
+ Amg::Vector3D hitPos = (*it).trackParms->position();
+ ATH_MSG_DEBUG(" HIT: layer="<<sample<<" sample="<<sample-IDCaloBoundary<<" eta="<<hitPos.eta()<<" phi="<<hitPos.phi()<<" d="<<hitPos.mag());
+ it++;
}
+ }
std::vector<Trk::HitInfo>::iterator it2 = hitVector->begin();
- while(it2 < hitVector->end() )
- {
- int sample=(*it2).detID;
- Amg::Vector3D hitPos = (*it2).trackParms->position();
- ATH_MSG_DEBUG(" HIT: layer="<<sample<<" sample="<<sample-3000<<" eta="<<hitPos.eta()<<" phi="<<hitPos.phi()<<" r="<<hitPos.perp()<<" z="<<hitPos[Amg::z]);
- ++it2;
- }
+ while(it2 < hitVector->end()){
+ int sample=(*it2).detID;
+ Amg::Vector3D hitPos = (*it2).trackParms->position();
+ ATH_MSG_DEBUG(" HIT: layer="<<sample<<" sample="<<sample-IDCaloBoundary<<" eta="<<hitPos.eta()<<" phi="<<hitPos.phi()<<" r="<<hitPos.perp()<<" z="<<hitPos[Amg::z]);
+ it2++;
+ }
// Extrapolation may fail for very low pT charged particles. Enforce charge 0 to prevent this
- if (not forceNeutral and hitVector->empty())
- {
+ if (!forceNeutral && hitVector->empty()){
ATH_MSG_DEBUG("forcing neutral charge in FastCaloSimCaloExtrapolation::caloHits");
return caloHits(truth, true);
- }
+ }
// Don't expect this ever to happen. Nevertheless, error handling should be improved.
// This may require changes in periphery (adjustments after setting function type to StatusCode)
else if(hitVector->empty()) ATH_MSG_ERROR("Empty hitVector even after forcing neutral charge. This may cause a segfault soon.");
-
return hitVector;
}
-//#######################################################################
-void FastCaloSimCaloExtrapolation::extrapolate(TFCSExtrapolationState& result,const TFCSTruthState* truth,std::vector<Trk::HitInfo>* hitVector) const
-{
- ATH_MSG_DEBUG("Start extrapolate()");
- double ptruth_eta=truth->Eta();
- double ptruth_phi=truth->Phi();
- double ptruth_pt =truth->Pt();
- double ptruth_p =truth->P();
- int pdgid =truth->pdgid();
+void FastCaloSimCaloExtrapolation::extrapolateToID(TFCSExtrapolationState& result, std::vector<Trk::HitInfo>* hitVector) const{
+
+
+ ATH_MSG_DEBUG("Start extrapolateToID()");
+
+
+ //initialize values
+ result.set_IDCaloBoundary_eta(-999.);
+ result.set_IDCaloBoundary_phi(-999.);
+ result.set_IDCaloBoundary_r(0);
+ result.set_IDCaloBoundary_z(0);
+ result.set_IDCaloBoundary_AngleEta(-999.);
+ result.set_IDCaloBoundary_Angle3D(-999.);
+
+ //magnitude of extrapolated position
+ double extPosDist = -1;
+
+ for (unsigned int surfID = 0; surfID<3; surfID++){
+
+ double R = m_CaloBoundaryR.at(surfID);
+ double Z = m_CaloBoundaryZ.at(surfID);
+
+ ATH_MSG_DEBUG("[ExtrapolateToID] Extrapolating to ID-Calo boundary with ID="<<surfID<<" R="<<R<<" Z="<<Z);
+
+ //extrapolated position and momentum direction at IDCaloBoundary
+ Amg::Vector3D extPos, momDir;
+
+ //main extrapolation call
+ if(!extrapolateToCylinder(hitVector, R, Z, extPos, momDir)) continue;
+
+ double tolerance = 0.001;
+ //test if z inside previous cylinder within some tolerance
+ if(surfID > 0 && std::abs(extPos[Amg::z]) < m_CaloBoundaryZ[surfID-1] - tolerance) continue;
+
+ //test if r inside next cylinder within some tolerance
+ if(surfID < m_CaloBoundaryR.size()-1 && extPos.perp() < m_CaloBoundaryR[surfID + 1] - tolerance) continue;
+
+ if(extPosDist >= 0 && extPos.mag() > extPosDist) continue;
+
+ extPosDist = extPos.mag();
+
+ result.set_IDCaloBoundary_eta(extPos.eta());
+ result.set_IDCaloBoundary_phi(extPos.phi());
+ result.set_IDCaloBoundary_r(extPos.perp());
+ result.set_IDCaloBoundary_z(extPos[Amg::z]);
+
+ //compute angle between extrapolated position vector and momentum at IDCaloBoundary
+ //can be used to correct shower shapes for particles which do not originate from {0,0,0}
+ double Angle3D = Amg::angle(extPos, momDir);
+ double AngleEta = extPos.theta() - momDir.theta();
+ result.set_IDCaloBoundary_AngleEta(AngleEta);
+ result.set_IDCaloBoundary_Angle3D(Angle3D);
+
+ } //end of loop over surfaces
+
+ if(result.IDCaloBoundary_eta() == -999) ATH_MSG_DEBUG("Failed extrapolation to ID-Calo boundary!");
+
+ ATH_MSG_DEBUG("[ExtrapolateToID] End extrapolateToID()");
+
+}
+
+void FastCaloSimCaloExtrapolation::extrapolate(TFCSExtrapolationState& result, const TFCSTruthState* truth) const{
+
+
+ ATH_MSG_DEBUG("Start FastCaloSimCaloExtrapolation::extrapolate");
+ auto hitVector = caloHits(truth);
+
+ ATH_MSG_DEBUG("Done FastCaloSimCaloExtrapolation::extrapolate: caloHits");
+
+ ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate:*** Get calo surface ***");
+ getCaloSurface(result, hitVector.get());
+
+ ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate:*** Do extrapolation to ID-calo boundary ***");
+ extrapolateToID(result, hitVector.get());
+
+ ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate:*** Do extrapolation ***");
+ extrapolateToLayers(result, hitVector.get());
+
+ ATH_MSG_DEBUG("FastCaloSimCaloExtrapolation::extrapolate: Truth extrapolation done");
+
+ ATH_MSG_DEBUG("Done FastCaloSimCaloExtrapolation::extrapolate");
+
+ //trackParms needs to be manually deleted as ownership is given to FastCaloSimCaloExtrapolation
+ for(std::vector<Trk::HitInfo>::iterator it = hitVector.get()->begin(); it != hitVector.get()->end(); ++it) {
+ auto ptr = (*it).trackParms;
+ if(ptr) delete ptr;
+ }
+
+}
+
+
+void FastCaloSimCaloExtrapolation::extrapolateToLayers(TFCSExtrapolationState& result, std::vector<Trk::HitInfo>* hitVector) const
+{
+ ATH_MSG_DEBUG("[extrapolateToLayers] Start extrapolate");
//////////////////////////////////////
// Start calo extrapolation
//////////////////////////////////////
- std::vector< std::vector<double> > eta_safe(3);
- std::vector< std::vector<double> > phi_safe(3);
- std::vector< std::vector<double> > r_safe(3);
- std::vector< std::vector<double> > z_safe(3);
- for(int subpos=SUBPOS_MID;subpos<=SUBPOS_EXT;++subpos)
- {
- eta_safe[subpos].resize(CaloCell_ID_FCS::MaxSample,-999.0);
- phi_safe[subpos].resize(CaloCell_ID_FCS::MaxSample,-999.0);
- r_safe[subpos].resize(CaloCell_ID_FCS::MaxSample,-999.0);
- z_safe[subpos].resize(CaloCell_ID_FCS::MaxSample,-999.0);
- }
+ //only continue if inside the calo
+ if(std::abs(result.IDCaloBoundary_eta()) < 6){
+ //now try to extrapolate to all calo layers that contain energy
+ for(int sample=CaloCell_ID_FCS::FirstSample; sample<CaloCell_ID_FCS::MaxSample; ++sample){
+ for(int subpos=SUBPOS_MID; subpos<=SUBPOS_EXT; ++subpos){
+
+ float cylR, cylZ;
+ if(isCaloBarrel(sample)){
+ cylR = std::abs(rpos(sample, result.CaloSurface_eta(), subpos));
+ //EMB0 - EMB3 use z position of EME1 front end surface for extrapolation
+ //else extrapolate to cylinder with symmetrized maximum Z bounds
+ //set eta to a dummy value of 1000 and -1000 to force detector side
+ if(sample < 4) cylZ = result.CaloSurface_eta() > 0 ? std::abs(zpos(5, 1000, 1)) : std::abs(zpos(5, -1000, 1));
+ else cylZ = 0.5*(std::abs(zpos(sample, 1000, subpos)) + std::abs(zpos(sample, -1000, subpos)));
+ }
+ else{
+ //if we are not at barrel surface, extrapolate to cylinder with maximum R to reduce extrapolation length
+ cylZ = std::abs(zpos(sample, result.CaloSurface_eta(), subpos));
+ //calculate radius of cylinder we will extrapolate to
+ double mineta, maxeta, eta;
+ minmaxeta(sample, result.CaloSurface_eta(), mineta, maxeta);
+ //get eta where we will look up the layer radius
+ eta = result.CaloSurface_eta() > 0 ? mineta : maxeta;
+ //calculate azimuthal angle from pseudorapidity
+ double theta = 2*std::atan(std::exp(-eta));
+ //calculate maximum R of last cell of layer from z and theta
+ cylR = std::abs(cylZ*std::sqrt((1/(std::cos(theta)*std::cos(theta))) - 1));
+ }
- // only continue if inside the calo
- if( fabs(result.IDCaloBoundary_eta())<6 )
- {
- // now try to extrpolate to all calo layers, that contain energy
- ATH_MSG_DEBUG("Calo position for particle id "<<pdgid<<", trutheta= " << ptruth_eta <<", truthphi= "<<ptruth_phi<<", truthp="<<ptruth_p<<", truthpt="<<ptruth_pt);
- for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample)
- {
- for(int subpos=SUBPOS_MID;subpos<=SUBPOS_EXT;++subpos)
- {
- if(get_calo_etaphi(result,hitVector,sample,subpos))
- ATH_MSG_DEBUG( "Result in sample "<<sample<<"."<<subpos<<": eta="<<result.eta(sample,subpos)<<" phi="<<result.phi(sample,subpos)<<" r="<<result.r(sample,subpos)<<" z="<<result.z(sample,subpos)<<" (ok="<<result.OK(sample,subpos)<<")");
- else
- ATH_MSG_DEBUG( "Extrapolation to sample "<<sample<<" failed (ok="<<result.OK(sample,subpos)<<")");
- } //for pos
+ Amg::Vector3D extPos, momDir;
+ if(extrapolateToCylinder(hitVector, cylR, cylZ, extPos, momDir)){
+
+ //scale the extrapolation to fit the radius of the cylinder in the case of barrel and scale extrapolation to fit z component in case of endcap layer
+ //scale is only non-unitary in case we extrapolate to the endcaps of the cylinder for barrel and in case we extrapolate to cover for endcaps
+ //this will keep phi, eta intact and only scale r and z to fit a sensible position on the cylinder
+ double scale = isCaloBarrel(sample) ? cylR / extPos.perp(): cylZ / std::abs(extPos.z());
+ extPos = scale * extPos;
+
+ result.set_OK(sample, subpos, true);
+ result.set_phi(sample, subpos, extPos.phi());
+ result.set_z (sample, subpos, extPos.z());
+ result.set_eta(sample, subpos, extPos.eta());
+ result.set_r (sample, subpos, extPos.perp());
+ }
+ else{
+ //in case that something goes wrong, use CaloSurface as extrapolation result
+ //not expected to happen
+ result.set_OK (sample, subpos, false);
+ result.set_phi(sample, subpos, result.CaloSurface_phi());
+ result.set_eta(sample, subpos, result.CaloSurface_eta());
+ result.set_z (sample, subpos, zpos(sample, result.CaloSurface_eta(), subpos));
+ result.set_r (sample, subpos, rpos(sample, result.CaloSurface_eta(), subpos));
+ }
+ } //for pos
} //for sample
} //inside calo
- else
- ATH_MSG_WARNING( "Ups. Not inside calo. result.IDCaloBoundary_eta()="<<result.IDCaloBoundary_eta());
+
+ else ATH_MSG_WARNING( "[extrapolateToLayers] Ups. Not inside calo. result.IDCaloBoundary_eta()="<<result.IDCaloBoundary_eta());
- ATH_MSG_DEBUG("End extrapolate()");
+ ATH_MSG_DEBUG("[extrapolateToLayers] End extrapolateToLayers()");
}
-void FastCaloSimCaloExtrapolation::extrapolate_to_ID(TFCSExtrapolationState& result,const TFCSTruthState* /*truth*/,std::vector<Trk::HitInfo>* hitVector) const
-{
- ATH_MSG_DEBUG("Start extrapolate_to_ID()");
+bool FastCaloSimCaloExtrapolation::extrapolateToCylinder(std::vector<Trk::HitInfo> * hitVector, float cylR, float cylZ, Amg::Vector3D& extPos, Amg::Vector3D& momDir) const{
- result.set_IDCaloBoundary_eta(-999.);
- result.set_IDCaloBoundary_phi(-999.);
- result.set_IDCaloBoundary_r(0);
- result.set_IDCaloBoundary_z(0);
- double result_dist=-1;
- Amg::Vector3D result_hitpos(0,0,0);
- Amg::Vector3D result_hitmom(0,0,0);
- for(unsigned int i=0;i<m_CaloBoundaryR.size();++i) {
- Amg::Vector3D hitpos;
- Amg::Vector3D hitmom;
- if(rz_cylinder_get_calo_etaphi(hitVector,m_CaloBoundaryR[i],m_CaloBoundaryZ[i],hitpos,hitmom)) {
- // test if z within previous cylinder
- ATH_MSG_DEBUG("BOUNDARY ID-CALO r="<<m_CaloBoundaryR[i]<<" z="<<m_CaloBoundaryZ[i]<<": eta="<<hitpos.eta()<<" phi="<<hitpos.phi()<<" r="<<hitpos.perp()<<" z="<<hitpos[Amg::z]<<" theta="<<hitpos.theta()<<" ; momentum eta="<<hitmom.eta()<<" phi="<<hitmom.phi()<<" theta="<<hitmom.theta());
- if(i>0) {
- if(hitpos[Amg::z]>=0) if(hitpos[Amg::z]< m_CaloBoundaryZ[i-1]) continue;
- if(hitpos[Amg::z]<0 ) if(hitpos[Amg::z]>-m_CaloBoundaryZ[i-1]) continue;
- }
+ if(hitVector->size() == 1){
+ Amg::Vector3D hitPos = hitVector->at(0).trackParms->position();
+ ATH_MSG_DEBUG("[extrapolateWithPCA(R="<<cylR<<",Z="<<cylZ<<")] Extrapolating single hit position to surface.");
+ extPos = projectOnCylinder(cylR, cylZ, hitPos);
+ momDir = hitVector->at(0).trackParms->momentum();
+ return true;
+ }
+
+ //if we do not find any good intersections, extrapolate to closest point on surface
+ bool foundHit = extrapolateWithIntersection(hitVector, cylR, cylZ, extPos, momDir) ? true : extrapolateWithPCA(hitVector, cylR, cylZ, extPos, momDir);
+
+ if(foundHit){
+ ATH_MSG_DEBUG("[extrapolateToCylinder(R="<<cylR<<",Z="<<cylZ<<")::END] Extrapolated to cylinder with R="<<cylR<<" and Z="<<cylZ<<" at ("<< extPos[Amg::x]<<","<<extPos[Amg::y]<<","<<extPos[Amg::z]<<")");
+ }
+ else{
+ //this is not expected to ever happen
+ ATH_MSG_DEBUG("(R="<<cylR<<", Z="<<cylZ<<"::END) Extrapolation to cylinder surface failed!");
+ }
+
+
+ return foundHit;
+
+}
+
+
+bool FastCaloSimCaloExtrapolation::extrapolateWithIntersection(std::vector<Trk::HitInfo> * hitVector, float cylR, float cylZ, Amg::Vector3D& extPos, Amg::Vector3D& momDir) const{
- // test if r within next cylinder
- if(i<m_CaloBoundaryR.size()-1) if(hitpos.perp()<m_CaloBoundaryR[i+1]) continue;
+ ATH_MSG_DEBUG("[extrapolateWithIntersection(R="<<cylR<<",Z="<<cylZ<<")] Checking for cylinder intersections of line segments.");
+
+ //counter for number of computed extrapolations, does not count cases of rejected extrapolations due to close by hit positions
+ unsigned int nExtrapolations = 0;
+ for (size_t hitID = 1; hitID < hitVector->size(); hitID++){
+ //initialize intersection result variables
+ //get current and consecutive hit position and build hitLine
+ Amg::Vector3D hitPos1 = hitVector->at(hitID-1).trackParms->position();
+ Amg::Vector3D hitPos2 = hitVector->at(hitID).trackParms->position();
+ Amg::Vector3D hitDir = hitPos2 - hitPos1;
+
+ ATH_MSG_DEBUG("[extrapolateWithIntersection(R="<<cylR<<",Z="<<cylZ<<")] Considering line segment between ("<<hitPos1[Amg::x]<<","<<hitPos1[Amg::y]<<","<<hitPos1[Amg::z]<<") and ("
+ <<hitPos2[Amg::x]<<","<<hitPos2[Amg::y]<<","<<hitPos2[Amg::z]<<")");
+ //get position of the hit positions on the cylinder
+ HITPOSITION cylPosHit1 = whereOnCylinder(cylR, cylZ, hitPos1);
+ HITPOSITION cylPosHit2 = whereOnCylinder(cylR, cylZ, hitPos2);
+
+ //check if one of the hit positions already lays on the cylinder surface
+ if(cylPosHit1 == ON || cylPosHit2 == ON){
+ extPos = cylPosHit1 == ON ? hitPos1 : hitPos2;
+ momDir = cylPosHit1 == ON ? hitVector->at(hitID-1).trackParms->momentum() : hitVector->at(hitID).trackParms->momentum();
+ ATH_MSG_DEBUG("[extrapolateWithIntersection(R="<<cylR<<",Z="<<cylZ<<")] Hit position already on cylinder surface.");
+ return true;
+ }
+
+ //do not try to extrapolate with intersections if the hit position are very close together
+ if(hitDir.norm() < 0.01) continue;
+
+ //get intersections through cylinder
+ CylinderIntersections intersections = getCylinderIntersections(cylR, cylZ, hitPos1, hitPos2);
+ nExtrapolations++;
+
+ Amg::Vector3D selectedIntersection(0, 0, 0);
+
+ //select the best intersection
+ if(intersections.number == 1) selectedIntersection = intersections.first;
+ else if(intersections.number > 1) selectedIntersection = whichIntersection(cylR, cylZ, hitPos1, hitPos2, intersections.first, intersections.second) == 0 ?
+ intersections.first : intersections.second;
+
+ if(intersections.number > 0){
- // test if previous found cylinder crossing is closer to (0,0,0) than this crossing
- if(result_dist>=0) {
- if(hitpos.mag() > result_dist) continue;
- }
+ bool isForwardExtrapolation = (selectedIntersection[Amg::x] - hitPos1[Amg::x]) / (hitPos2[Amg::x] - hitPos1[Amg::x]) >= 0;
+ bool travelThroughSurface = doesTravelThroughSurface(cylR, cylZ, hitPos1, hitPos2);
+
+ //do not allow for backward extrapolation except in the case of first two (distinguishable) hit positions outside cylinder
+ //and in the case we detect a travel though the surface
+ if(nExtrapolations > 1 && !isForwardExtrapolation && !travelThroughSurface) continue;
- result.set_IDCaloBoundary_eta(hitpos.eta());
- result.set_IDCaloBoundary_phi(hitpos.phi());
- result.set_IDCaloBoundary_r(hitpos.perp());
- result.set_IDCaloBoundary_z(hitpos[Amg::z]);
- result_dist=hitpos.mag();
- result_hitpos=hitpos;
- result_hitmom=hitmom;
- ATH_MSG_DEBUG("BOUNDARY ID-CALO r="<<m_CaloBoundaryR[i]<<" z="<<m_CaloBoundaryZ[i]<<" accepted");
+ //check if the intersection between infinite line and cylinder lays on segment spanned by hit positions
+ bool intersectionOnSegment = isOnSegment(selectedIntersection, hitPos1, hitPos2);
+ //check if both hit positions lay outside of the cylinder
+ bool hitPosOutside = cylPosHit1 == OUTSIDE && cylPosHit2 == OUTSIDE;
+
+ //we found our extrapolated hit position in case that either
+ //we detect that the line segment crosses the surface of the cylinder
+ //the intersection between the infinite lines and the cylinder lays on the line segment
+ //both hit positions are outside of the cylinder and there is a backwards extrapolation for the first two hit positions
+ //if this is not the case for any of the hit position pairs we will use the last two hit position for the linear extrapolation
+ //if these do not have any intersection, then we will pass back to extrapolateWithPCA
+ if(travelThroughSurface || intersectionOnSegment || (hitPosOutside && !isForwardExtrapolation && nExtrapolations == 1) || hitVector->size()-1 == hitID){
+ //take momentum direction of hit position closest to cylinder surface
+ //alternatively one could also take the extrapolated direction normDir = hitPos2 - hitPos1
+ double distHitPos1 = (hitPos1 - projectOnCylinder(cylR, cylZ, hitPos1)).norm();
+ double distHitPos2 = (hitPos2 - projectOnCylinder(cylR, cylZ, hitPos2)).norm();
+ momDir = distHitPos1 < distHitPos2 ? hitVector->at(hitID-1).trackParms->momentum() : hitVector->at(hitID).trackParms->momentum();
+ extPos = selectedIntersection;
+ return true;
+ }
+ ATH_MSG_DEBUG("[extrapolateWithIntersection(R="<<cylR<<",Z="<<cylZ<<")] Extrapolated position at ("<<selectedIntersection[Amg::x]<<","<<selectedIntersection[Amg::y]<<","<<selectedIntersection[Amg::z]<<")");
}
- }
-
- if(result_dist<0) {
- ATH_MSG_WARNING("Extrapolation to IDCaloBoundary failed");
- } else {
- ATH_MSG_DEBUG("FINAL BOUNDARY ID-CALO eta="<<result_hitpos.eta()<<" phi="<<result_hitpos.phi()<<" r="<<result_hitpos.perp()<<" z="<<result_hitpos[Amg::z]<<" theta="<<result_hitpos.theta()<<" ; momentum eta="<<result_hitmom.eta()<<" phi="<<result_hitmom.phi()<<" theta="<<result_hitmom.theta());
+ } //end of loop over hit positions
- }
+ return false;
+}
+
+
+bool FastCaloSimCaloExtrapolation::extrapolateWithPCA(std::vector<Trk::HitInfo> * hitVector, float cylR, float cylZ, Amg::Vector3D& extPos, Amg::Vector3D& momDir) const{
+
+ bool foundHit = false;
+ ATH_MSG_DEBUG("[extrapolateWithPCA(R="<<cylR<<",Z="<<cylZ<<")] No forward intersections with cylinder surface. Extrapolating to closest point on surface.");
+
+ //here we also need to consider distances from line segments to the cylinder
+ double minDistToSurface = 100000;
+ for (size_t hitID = 1; hitID < hitVector->size(); hitID++){
+
+ Amg::Vector3D hitPos1 = hitVector->at(hitID-1).trackParms->position();
+ Amg::Vector3D hitPos2 = hitVector->at(hitID).trackParms->position();
+
+ ATH_MSG_DEBUG("[extrapolateWithPCA(R="<<cylR<<",Z="<<cylZ<<")] Considering line segment between ("<<hitPos1[Amg::x]<<","<<hitPos1[Amg::y]<<","<<hitPos1[Amg::z]<<") and ("<<hitPos2[Amg::x]<<","<<hitPos2[Amg::y]<<","<<hitPos2[Amg::z]<<")");
+
+ Amg::Vector3D PCA;
+ //find the point of closest approach (PCA) to the cylinder on the line segment
+ findPCA(cylR, cylZ, hitPos1, hitPos2, PCA);
+ //compute distance between PCA and cylinder
+ Amg::Vector3D cylinderSurfacePCA = projectOnCylinder(cylR, cylZ, PCA);
+ double tmpMinDistToSurface = (PCA - cylinderSurfacePCA).norm();
+
+ ATH_MSG_DEBUG("[extrapolateWithPCA(R="<<cylR<<",Z="<<cylZ<<")] Extrapolated line segment to ("<<cylinderSurfacePCA[Amg::x]<<","<<cylinderSurfacePCA[Amg::y]<<","<<cylinderSurfacePCA[Amg::z]<<") with distance "<<tmpMinDistToSurface);
+
+ if(tmpMinDistToSurface < minDistToSurface){
+ foundHit = true;
+ extPos = cylinderSurfacePCA;
+ //take momentum direction of hit position closest to cylinder surface
+ //alternatively one could also take the extrapolated direction normDir = hitPos2 - hitPos1
+ double distHitPos1 = (hitPos1 - projectOnCylinder(cylR, cylZ, hitPos1)).norm();
+ double distHitPos2 = (hitPos2 - projectOnCylinder(cylR, cylZ, hitPos2)).norm();
+ momDir = distHitPos1 < distHitPos2 ? hitVector->at(hitID-1).trackParms->momentum() : hitVector->at(hitID).trackParms->momentum();
+
+ minDistToSurface = tmpMinDistToSurface;
+ }
+ } //end over loop of hit postions
+
+ return foundHit;
+}
- TVector3 vec(result_hitpos[Amg::x],result_hitpos[Amg::y],result_hitpos[Amg::z]);
- //get the tangentvector on this interaction point:
- //GlobalMomentum* mom=params_on_surface_ID->TrackParameters::momentum().unit() ;
- //Trk::GlobalMomentum* trackmom=params_on_surface_ID->Trk::TrackParameters::momentum();
- if(result_hitmom.mag()>0)
- {
- //angle between vec and trackmom:
- TVector3 Trackmom(result_hitmom[Amg::x],result_hitmom[Amg::y],result_hitmom[Amg::z]);
- double angle3D=Trackmom.Angle(vec); //isn't this the same as TVector3 vec?
- ATH_MSG_DEBUG(" 3D ANGLE "<<angle3D);
+void FastCaloSimCaloExtrapolation::findPCA(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2, Amg::Vector3D& PCA) const{
+ //in the following we will try to find the closest point-of-approach (PCA) to the cylinder on the line segment
+ //hit direction
+ Amg::Vector3D hitDir = hitPos2 - hitPos1;
- double angleEta=vec.Theta()-Trackmom.Theta();
- ATH_MSG_DEBUG(" ANGLE dTHEA"<<angleEta);
+ //project both hit positions onto the cylinder
+ Amg::Vector3D projCylinderHitPos1 = projectOnCylinder(cylR, cylZ, hitPos1);
+ Amg::Vector3D projCylinderHitPos2 = projectOnCylinder(cylR, cylZ, hitPos2);
+ //direction of line spanned by the two projected points on the cylinder surface
+ Amg::Vector3D cylinderProjDir = projCylinderHitPos2 - projCylinderHitPos1;
- result.set_IDCaloBoundary_AngleEta(angleEta);
- result.set_IDCaloBoundary_Angle3D(angle3D);
+ //CASE A: projections on the cylinder are close enough, take one of the hit positions as PCA
+ if(cylinderProjDir.norm() < 0.0001) {PCA = hitPos1; return;};
+
+ //CASE B: we are outside the Z bounds of the cylinder
+ if((hitPos1[Amg::z] > cylZ || hitPos1[Amg::z] < -cylZ) || (hitPos2[Amg::z] > cylZ || hitPos2[Amg::z] < -cylZ)){
+
+ //calculate PCA to point on endcap
+ Amg::Vector3D cylZEndcap(0, 0, cylZ);
+ bool isParallelToEndcap = std::abs(hitPos1[Amg::z] - hitPos2[Amg::z]) < 0.00001;
+
+ //Check if parallel to endcap plane
+ if(isParallelToEndcap){
+
+ //if both inside there are infinite solutions take one in the middle
+ Amg::Vector3D intersectA, intersectB;
+ intersectA.setZero();
+ intersectB.setZero();
+ int nIntersections = circleLineIntersection2D(cylR, hitPos1, hitPos2, intersectA, intersectB);
+
+ if(nIntersections == 2){
+
+ bool IntAOnSegment = isOnSegment(intersectA, hitPos1, hitPos2);
+ bool IntBOnSegment = isOnSegment(intersectB, hitPos1, hitPos2);
+
+ if(IntAOnSegment && IntBOnSegment) PCA = intersectA + 0.5*(intersectB-intersectA);
+ else if(IntAOnSegment) PCA = hitPos1.perp() <= cylR ? intersectA + 0.5*(hitPos1 - intersectA) : intersectA + 0.5*(hitPos2 - intersectA);
+ else if(IntBOnSegment) PCA = hitPos1.perp() <= cylR ? intersectB + 0.5*(hitPos1 - intersectB) : intersectB + 0.5*(hitPos2 - intersectB);
+ //intersections are not on line segment, i.e. line segment is within extended cylinder
+ else PCA = hitPos1 + 0.5*hitDir;
+
+ }
+ else if(!intersectA.isZero() || !intersectB.isZero()){
+ //this can only happen if the extended line is tangetial to the cylinder
+ //if intersection lays on segment PCA will be intersection, if not it will be the corresponding end points
+ Amg::Vector3D intersect = intersectA.isZero() ? intersectB : intersectA;
+ Amg::Vector3D hitPos = (hitPos1 - intersect).norm() < (hitPos2 - intersect).norm() ? hitPos1 : hitPos2;
+ bool IntOnSegment = isOnSegment(intersectA, hitPos1, hitPos2);
+ PCA = IntOnSegment ? intersect : hitPos;
+
+ }
+ else{
+ //line segment is outside extended cylinder
+ //PCA corresponds to closest distance to center {0, 0, cylZ}
+ Amg::Vector3D infLinePCA = hitPos1 + ((cylZEndcap-hitPos1).dot(hitDir)/hitDir.dot(hitDir))*(hitDir);
+
+ if(isOnSegment(infLinePCA, hitPos1, hitPos2)) PCA = infLinePCA;
+ else PCA = (hitPos1 - infLinePCA).norm() < (hitPos2 - infLinePCA).norm() ? hitPos1 : hitPos2;
+
+ }
}
- else
- {
- result.set_IDCaloBoundary_AngleEta(-999.);
- result.set_IDCaloBoundary_Angle3D(-999.);
+
+ else{
+
+ //figure out all other cases iteratively beginning with BoundA and BoundB
+ Amg::Vector3D BoundA, BoundB;
+ //this is point on line closest to {0, 0, cylZ}, always on segment
+ double t = ((cylZEndcap-hitPos1).dot(hitDir)/hitDir.dot(hitDir));
+ BoundA = t <= 0 ? hitPos1 : (t >= 1 ? hitPos2 : hitPos1 + t*hitDir);
+
+ //calculate intersection point of line segment and endcap plane and project intersection onto cylinder
+ //check if t is between 0 and 1, if not, take hitpos as starting bound
+ t = (cylZ-hitPos1[Amg::z]) / hitDir[Amg::z];
+ BoundB = t <= 0 ? hitPos1 : (t >= 1 ? hitPos2 : hitPos1 + t*hitDir);
+ //looks for the PCA iteratively in cases there is no easy analytical solution
+ getIterativePCA(cylR, cylZ, BoundA, BoundB, PCA);
+
}
- ATH_MSG_DEBUG("End extrapolate_to_ID()");
+ return;
+ }
-} //extrapolate_to_ID
+ //CASE C: we are inside the Z bounds of the cylinder
+ //construct Z axis as straight line surface
+ Trk::StraightLineSurface line(new Amg::Transform3D(Trk::s_idTransform), 0, cylZ);
+ //compute point of closest approach to z axis
+ //this is analogous to finding the PCA of two 3D lines
+ Trk::Intersection PCACylBounds = line.straightLineIntersection(hitPos1, hitDir.unit(), false, true);
-bool FastCaloSimCaloExtrapolation::get_calo_surface(TFCSExtrapolationState& result,std::vector<Trk::HitInfo>* hitVector) const
-{
- ATH_MSG_DEBUG("Start get_calo_surface()");
+ double distSurfHit1 = (projCylinderHitPos1 - hitPos1).norm();
+ double distSurfHit2 = (projCylinderHitPos2 - hitPos2).norm();
+
+ //take PCA on line in case it lays on segment, otherwise take closest hit position to surface
+ PCA = isOnSegment(PCACylBounds.position, hitPos1, hitPos2) ? PCACylBounds.position : (distSurfHit1 < distSurfHit2 ? hitPos1 : hitPos2);
+
+}
- result.set_CaloSurface_sample(CaloCell_ID_FCS::noSample);
- result.set_CaloSurface_eta(-999);
- result.set_CaloSurface_phi(-999);
- result.set_CaloSurface_r(0);
- result.set_CaloSurface_z(0);
- double min_calo_surf_dist=1000;
- for(unsigned int i=0;i<m_surfacelist.size();++i)
- {
+void FastCaloSimCaloExtrapolation::getIterativePCA(float cylR, float cylZ, Amg::Vector3D& BoundA, Amg::Vector3D& BoundB, Amg::Vector3D& PCA) const{
- int sample=m_surfacelist[i];
- std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
+ ATH_MSG_DEBUG("[getIterativePCA] Finding PCA iteratively.");
+
+ Amg::Vector3D boundDir = BoundB - BoundA;
+ double distBounds = boundDir.norm();
- while (it != hitVector->end() && it->detID != (3000+sample) )
- ++it;
-
- if(it==hitVector->end()) continue;
-
- Amg::Vector3D hitPos = (*it).trackParms->position();
-
- //double offset = 0.;
- double etaCalo = hitPos.eta();
-
- if(fabs(etaCalo)<900)
- {
- double phiCalo = hitPos.phi();
- double distsamp =deta(sample,etaCalo);
-
- if(distsamp<min_calo_surf_dist && min_calo_surf_dist>=0)
- {
- //hitVector is ordered in r, so if first surface was hit, keep it
- result.set_CaloSurface_sample(sample);
- result.set_CaloSurface_eta(etaCalo);
- result.set_CaloSurface_phi(phiCalo);
- double rcalo=rent(sample,etaCalo);
- double zcalo=zent(sample,etaCalo);
- result.set_CaloSurface_r(rcalo);
- result.set_CaloSurface_z(zcalo);
- min_calo_surf_dist=distsamp;
- msg(MSG::DEBUG)<<" r="<<rcalo<<" z="<<zcalo;
-
- if(distsamp<0)
- {
- msg(MSG::DEBUG)<<endmsg;
- break;
- }
- }
- msg(MSG::DEBUG)<<endmsg;
- }
- else
- msg(MSG::DEBUG)<<": eta > 900, not using this"<<endmsg;
+ //if bounds are close enough together, there is nothing to do.
+ if (distBounds < 0.001){ PCA = BoundA; return;}
+
+ //this sets the precision of the iterative finding procedure
+ double stepSize = 0.01;
+
+ Amg::Vector3D tmpBoundA, tmpBoundB, tmpOnCylinderBoundA, tmpOnCylinderBoundB;
+ Amg::Vector3D resBoundA, resBoundB, resOnCylinderBoundA, resOnCylinderBoundB;
+
+ //initial positions on cylinder and distance to line segment
+ Amg::Vector3D OnCylinderBoundA = projectOnCylinder(cylR, cylZ, BoundA);
+ Amg::Vector3D OnCylinderBoundB = projectOnCylinder(cylR, cylZ, BoundB);
+
+ double minDistA = (BoundA - OnCylinderBoundA).norm();
+ double minDistB = (BoundB - OnCylinderBoundB).norm();
+
+ double tmpMinDistA, tmpMinDistB;
+ unsigned int nHalfDivisions = (distBounds/stepSize)/2;
+
+ for(unsigned int step = 0; step < nHalfDivisions; step++){
+
+ //temporary bounds on line segment
+ tmpBoundA = BoundA + (step+1)*stepSize*(boundDir/distBounds);
+ tmpBoundB = BoundB - (step+1)*stepSize*(boundDir/distBounds);
+
+ //temporary projected bounds on cylinder
+ tmpOnCylinderBoundA = projectOnCylinder(cylR, cylZ, tmpBoundA);
+ tmpOnCylinderBoundB = projectOnCylinder(cylR, cylZ, tmpBoundB);
+
+ //temporary minimum distance between bound on segment and bound on cylinder
+ tmpMinDistA = (tmpBoundA - tmpOnCylinderBoundA).norm();
+ tmpMinDistB = (tmpBoundB - tmpOnCylinderBoundB).norm();
+
+ if(minDistA >= tmpMinDistA){
+ minDistA = tmpMinDistA;
+ }
+ else{
+ double t = (step*stepSize)/distBounds;
+ resBoundA = BoundA + t*boundDir;
+ resBoundB = tmpBoundA;
+ break;
+ }
+
+ if(minDistB >= tmpMinDistB){
+ minDistB = tmpMinDistB;
+ }
+ else{
+ double t = (step*stepSize)/distBounds;
+ resBoundB = BoundB - t*boundDir;
+ resBoundA = tmpBoundB;
+ break;
+ }
}
- if(result.CaloSurface_sample()==CaloCell_ID_FCS::noSample)
- {
- // first intersection with sensitive calo layer
- std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
+ //return middle of best bounds
+ PCA = resBoundA + 0.5*(resBoundB - resBoundA);
- while( it < hitVector->end() && (*it).detID != 3 )
- ++it; // to be updated
+}
- if (it==hitVector->end())
- return false; // no calo intersection, abort
- Amg::Vector3D surface_hitPos = (*it).trackParms->position();
+int FastCaloSimCaloExtrapolation::circleLineIntersection2D(float circR, Amg::Vector3D& pointA, Amg::Vector3D& pointB, Amg::Vector3D& intersectA, Amg::Vector3D& intersectB) const{
+ //find intersections intA and intB with line spanned by pointA and pointB
+ //returns number of intersections
+ //assumes circle lays in xy plane
- result.set_CaloSurface_eta(surface_hitPos.eta());
- result.set_CaloSurface_phi(surface_hitPos.phi());
- result.set_CaloSurface_r(surface_hitPos.perp());
- result.set_CaloSurface_z(surface_hitPos[Amg::z]);
+ double dx, dy, A, B, C, det, t;
- double pT=(*it).trackParms->momentum().perp();
- if(TMath::Abs(result.CaloSurface_eta())>4.9 || pT<500 || (TMath::Abs(result.CaloSurface_eta())>4 && pT<1000) )
- ATH_MSG_DEBUG("only entrance to calo entrance layer found, no surface : eta="<<result.CaloSurface_eta()<<" phi="<<result.CaloSurface_phi()<<" r="<<result.CaloSurface_r()<<" z="<<result.CaloSurface_z()<<" pT="<<pT);
- else
- ATH_MSG_WARNING("only entrance to calo entrance layer found, no surface : eta="<<result.CaloSurface_eta()<<" phi="<<result.CaloSurface_phi()<<" r="<<result.CaloSurface_r()<<" z="<<result.CaloSurface_z()<<" pT="<<pT);
- } //sample
- else
- {
- ATH_MSG_DEBUG("entrance to calo surface : sample="<<result.CaloSurface_sample()<<" eta="<<result.CaloSurface_eta()<<" phi="<<result.CaloSurface_phi()<<" r="<<result.CaloSurface_r()<<" z="<<result.CaloSurface_z()<<" deta="<<min_calo_surf_dist);
+ dx = pointB[Amg::x] - pointA[Amg::x];
+ dy = pointB[Amg::y] - pointA[Amg::y];
+
+ A = dx * dx + dy * dy;
+ B = 2 * (dx * pointA[Amg::x] + dy * pointA[Amg::y]);
+ C = pointA[Amg::x] * pointA[Amg::x] + pointA[Amg::y] * pointA[Amg::y] - circR * circR;
+
+ det = B * B - 4 * A * C;
+
+ if (A <= 0.0000001 || det < 0){
+ ATH_MSG_DEBUG("[circleLineIntersection2D] No intersections.");
+ return 0;
+ }
+ else if (std::abs(det) < 0.00001){
+ //one solution, tangential case.
+ t = -B / (2 * A);
+ intersectA = {pointA[Amg::x] + t * dx, pointA[Amg::y] + t * dy, pointA[Amg::z]};
+ ATH_MSG_DEBUG("[circleLineIntersection2D] One intersection at ("<<intersectA[Amg::x]<<","<<intersectA[Amg::y]<<","<<intersectA[Amg::z]<<").");
+ return 1;
+ }
+ else{
+ // two solutions
+ t = (-B + std::sqrt(det)) / (2 * A);
+ intersectA = {pointA[Amg::x] + t * dx, pointA[Amg::y] + t * dy, pointA[Amg::z]};
+ t = (-B - std::sqrt(det)) / (2 * A);
+ intersectB = {pointA[Amg::x] + t * dx, pointA[Amg::y] + t * dy, pointB[Amg::z]};
+ ATH_MSG_DEBUG("[circleLineIntersection2D] Two intersections at ("<<intersectA[Amg::x]<<","<<intersectA[Amg::y]<<","<<intersectA[Amg::z]<<") and at ("<<intersectB[Amg::x]<<","<<intersectB[Amg::y]<<","<<intersectB[Amg::z]<<").");
+ return 2;
}
- ATH_MSG_DEBUG("End get_calo_surface()");
- return true;
+
}
-//UPDATED
-bool FastCaloSimCaloExtrapolation::get_calo_etaphi(TFCSExtrapolationState& result,std::vector<Trk::HitInfo>* hitVector, int sample,int subpos) const
-{
- result.set_OK(sample,subpos,false);
- result.set_eta(sample,subpos,result.CaloSurface_eta());
- result.set_phi(sample,subpos,result.CaloSurface_phi());
- result.set_r(sample,subpos,rpos(sample,result.CaloSurface_eta(),subpos));
- result.set_z(sample,subpos,zpos(sample,result.CaloSurface_eta(),subpos));
-
- double distsamp =deta(sample,result.CaloSurface_eta());
- double lrzpos =rzpos(sample,result.CaloSurface_eta(),subpos);
- double hitdist=0;
- bool best_found=false;
- double best_target=0;
-
- std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
-
- while( it!= hitVector->end() && it->detID != (3000+sample) )
- ++it;
-
- //while ((*it).detID != (3000+sample) && it < hitVector->end() ) it++;
-
- if(it!=hitVector->end())
- {
-
- Amg::Vector3D hitPos1 = (*it).trackParms->position();
- int sid1=(*it).detID;
- int sid2=-1;
- Amg::Vector3D hitPos;
- Amg::Vector3D hitPos2;
-
- std::vector<Trk::HitInfo>::iterator itnext = it;
- ++itnext;
- if(itnext!=hitVector->end())
- {
- hitPos2 = (*itnext).trackParms->position();
- sid2=(*itnext).detID;
- double eta_avg=0.5*(hitPos1.eta()+hitPos2.eta());
- double t;
-
- if(isCaloBarrel(sample))
- {
- double r=rpos(sample,eta_avg,subpos);
- double r1=hitPos1.perp();
- double r2=hitPos2.perp();
- t=(r-r1)/(r2-r1);
- best_target=r;
- }
- else
- {
- double z=zpos(sample,eta_avg,subpos);
- double z1=hitPos1[Amg::z];
- double z2=hitPos2[Amg::z];
- t=(z-z1)/(z2-z1);
- best_target=z;
- }
- hitPos=t*hitPos2+(1-t)*hitPos1;
+Amg::Vector3D FastCaloSimCaloExtrapolation::projectOnCylinder(float cylR, float cylZ, Amg::Vector3D& hitPos) const {
+
+ Amg::Vector3D closestPointOnCylinder;
+ Amg::Vector3D cylAxis(0, 0, cylZ);
+
+ //positive side
+ if(hitPos[Amg::z] >= cylZ){
+ //project hit position on x-y plane at positive side
+ Amg::Vector3D projHitPos(hitPos[Amg::x], hitPos[Amg::y], cylZ);
+
+ //if r of hit position outside cylinder, closest hit is always on edge
+ if(hitPos.perp() > cylR) closestPointOnCylinder = cylAxis + cylR * (projHitPos - cylAxis).unit();
+ else closestPointOnCylinder = cylAxis + hitPos.perp() * (projHitPos - cylAxis).unit();
+
+ }
+ //negative side
+ else if (hitPos[Amg::z] <= -cylZ){
+ //project hit position on x-y plane at negative side
+ Amg::Vector3D projHitPos(hitPos[Amg::x], hitPos[Amg::y], -cylZ);
+
+ if(hitPos.perp() > cylR) closestPointOnCylinder = -cylAxis + cylR * (projHitPos + cylAxis).unit();
+ else closestPointOnCylinder = -cylAxis + hitPos.perp() * (projHitPos + cylAxis).unit();
+
+ }
+ else{
+ Amg::Vector3D hitPosZ(0, 0, hitPos[Amg::z]);
+ closestPointOnCylinder = hitPosZ + cylR * (hitPos - hitPosZ).unit();
+ }
+
+ return closestPointOnCylinder;
+
+}
+
- }
- else
- {
- hitPos=hitPos1;
- hitPos2=hitPos1;
- }
-
- double etaCalo = hitPos.eta();
- double phiCalo = hitPos.phi();
- result.set_OK(sample,subpos,true);
- result.set_eta(sample,subpos,etaCalo);
- result.set_phi(sample,subpos,phiCalo);
- result.set_r(sample,subpos,hitPos.perp());
- result.set_z(sample,subpos,hitPos[Amg::z]);
- hitdist=hitPos.mag();
- lrzpos=rzpos(sample,etaCalo,subpos);
- distsamp=deta(sample,etaCalo);
- best_found=true;
-
- ATH_MSG_DEBUG("extrapol with layer hit for sample="<<sample<<" : id="<<sid1<<" -> "<<sid2<<" target r/z="<<best_target<<" r1="<<hitPos1.perp()<<" z1="<<hitPos1[Amg::z]<<
- " r2="<<hitPos2.perp()<<" z2="<<hitPos2[Amg::z]<<" result.r="<<result.r(sample,subpos)<<" result.z="<<result.z(sample,subpos));
+CylinderIntersections FastCaloSimCaloExtrapolation::getCylinderIntersections(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const{
+ //calculates intersection of infinite line with cylinder --> can have 0 or 2 intersections
+ CylinderIntersections intersections;
+
+ //look for intersections with the cover of the cylinder
+ unsigned int nCoverIntersections = cylinderLineIntersection(cylR, cylZ, hitPos1, hitPos2, intersections.first, intersections.second);
+ if(nCoverIntersections == 2){
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found two cylinder intersections through cylinder cover.");
+ intersections.number = 2;
+ return intersections;
+ }
+ else if (nCoverIntersections == 1){
+
+ Amg::Vector3D positiveEndcapIntersection, negativeEndcapIntersection;
+ bool IsPositiveEndcapIntersection = cylinderEndcapIntersection(cylR, cylZ, true, hitPos1, hitPos2, positiveEndcapIntersection);
+ bool IsNegativeEndcapIntersection = cylinderEndcapIntersection(cylR, cylZ, false, hitPos1, hitPos2, negativeEndcapIntersection);
+
+ if(IsPositiveEndcapIntersection && IsNegativeEndcapIntersection){
+ //if we have a cover intersection we only expect one additional endcap intersection
+ //both endcap intersections can be valid in case the intersection is at the edge of the cylinder cover and endcap
+ //in that case take the endcap intersection which is further away from the cylinder cover intersection to prevent taking the same intersection twice
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found intersection through cylinder cover and both endcaps. Intersection seems to be at edge of cover and endcap.");
+ intersections.second = (positiveEndcapIntersection - intersections.first).norm() > (negativeEndcapIntersection - intersections.first).norm() ? positiveEndcapIntersection : negativeEndcapIntersection;
+ intersections.number = 2;
+ }
+ else if(IsPositiveEndcapIntersection) {
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found intersection through cylinder cover and positive endcap.");
+ intersections.second = positiveEndcapIntersection;
+ intersections.number = 2;
+ }
+ else if(IsNegativeEndcapIntersection) {
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found intersection through cylinder cover and negative endcap.");
+ intersections.second = negativeEndcapIntersection;
+ intersections.number = 2;
+ }
+ else{
+ //line is tangential to cylinder cover
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found single intersection through cylinder cover.");
+ intersections.number = 1;
}
- if(!best_found)
- {
- it = hitVector->begin();
- double best_dist=0.5;
- bool best_inside=false;
- int best_id1,best_id2;
- Amg::Vector3D best_hitPos=(*it).trackParms->position();
- while (it < hitVector->end()-1 )
- {
- Amg::Vector3D hitPos1 = (*it).trackParms->position();
- int sid1=(*it).detID;
- ++it;
- Amg::Vector3D hitPos2 = (*it).trackParms->position();
- int sid2=(*it).detID;
- double eta_avg=0.5*(hitPos1.eta()+hitPos2.eta());
- double t;
- double tmp_target=0;
- if(isCaloBarrel(sample))
- {
- double r=rpos(sample,eta_avg,subpos);
- double r1=hitPos1.perp();
- double r2=hitPos2.perp();
- t=(r-r1)/(r2-r1);
- tmp_target=r;
- }
- else
- {
- double z=zpos(sample,eta_avg,subpos);
- double z1=hitPos1[Amg::z];
- double z2=hitPos2[Amg::z];
- t=(z-z1)/(z2-z1);
- tmp_target=z;
- }
- Amg::Vector3D hitPos=t*hitPos2+(1-t)*hitPos1;
- double dist=TMath::Min(TMath::Abs(t-0),TMath::Abs(t-1));
- bool inside=false;
- if(t>=0 && t<=1) inside=true;
- if(!best_found || inside)
- {
- if(!best_inside || dist<best_dist)
- {
- best_dist=dist;
- best_hitPos=hitPos;
- best_inside=inside;
- best_found=true;
- best_id1=sid1;
- best_id2=sid2;
- best_target=tmp_target;
- }
- }
- else
- {
- if(!best_inside && dist<best_dist)
- {
- best_dist=dist;
- best_hitPos=hitPos;
- best_inside=inside;
- best_found=true;
- best_id1=sid1;
- best_id2=sid2;
- best_target=tmp_target;
- }
- }
- ATH_MSG_DEBUG("extrapol without layer hit for sample="<<sample<<" : id="<<sid1<<" -> "<<sid2<<" dist="<<dist<<" mindist="<<best_dist<<
- " t="<<t<<" best_inside="<<best_inside<<" target r/z="<<tmp_target<<
- " r1="<<hitPos1.perp()<<" z1="<<hitPos1[Amg::z]<<" r2="<<hitPos2.perp()<<" z2="<<hitPos2[Amg::z]<<
- " re="<<hitPos.perp()<<" ze="<<hitPos[Amg::z]<<
- " rb="<<best_hitPos.perp()<<" zb="<<best_hitPos[Amg::z]);
- if(best_found)
- {
- double etaCalo = best_hitPos.eta();
- result.set_OK(sample,subpos,true);
- result.set_eta(sample,subpos,etaCalo);
- result.set_phi(sample,subpos,best_hitPos.phi());
- result.set_r(sample,subpos,best_hitPos.perp());
- result.set_z(sample,subpos,best_hitPos[Amg::z]);
- hitdist=best_hitPos.mag();
- lrzpos=rzpos(sample,etaCalo,subpos);
- distsamp=deta(sample,etaCalo);
- }
- } //while hit vector
-
- if(best_found)
- {
- ATH_MSG_DEBUG("extrapol without layer hit: id="<<best_id1<<" -> "<<best_id2<<" mindist="<<best_dist<<
- " best_inside="<<best_inside<<" target r/z="<<best_target<<
- " rb="<<best_hitPos.perp()<<" zb="<<best_hitPos[Amg::z] );
- }
+ }
+ else{
+ //no cylinder cover intersections
+ Amg::Vector3D positiveEndcapIntersection, negativeEndcapIntersection;
+ bool IsPositiveEndcapIntersection = cylinderEndcapIntersection(cylR, cylZ, true, hitPos1, hitPos2, positiveEndcapIntersection);
+ bool IsNegativeEndcapIntersection = cylinderEndcapIntersection(cylR, cylZ, false, hitPos1, hitPos2, negativeEndcapIntersection);
+
+ if(IsPositiveEndcapIntersection && IsNegativeEndcapIntersection){
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found intersections through both endcaps.");
+ intersections.first = positiveEndcapIntersection;
+ intersections.second = negativeEndcapIntersection;
+ intersections.number = 2;
+ }
+ else if(IsPositiveEndcapIntersection) {
+ //dont expect this to ever happen
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found single intersection through positive endcap. This should not happen.");
+ intersections.first = positiveEndcapIntersection;
+ intersections.number = 1;
+ }
+ else if(IsNegativeEndcapIntersection) {
+ //dont expect this to ever happen
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found single intersection through negative endcap. This should not happen.");
+ intersections.first = negativeEndcapIntersection;
+ intersections.number = 1;
}
+ else{
+ ATH_MSG_DEBUG("[getCylinderIntersections(R="<<cylR<<",Z="<<cylZ<<")] Found no cylinder intersections.");
+ //no intersections at all
+ intersections.number = 0;
- if(isCaloBarrel(sample))
- lrzpos*=cosh(result.eta(sample,subpos));
- else
- lrzpos= fabs(lrzpos/tanh(result.eta(sample,subpos)));
+ }
+ }
- result.set_d(sample,subpos,lrzpos);
- result.set_detaBorder(sample,subpos,distsamp);
+ return intersections;
- ATH_MSG_DEBUG("Final TTC result for sample "<<sample<<" subpos="<<subpos<<" OK() "<<result.OK(sample,subpos)<<" eta="<<result.eta(sample,subpos)<<" phi="<<result.phi(sample,subpos)<<" dCalo="<<result.d(sample,subpos)<<" dist(hit)="<<hitdist);
- return result.OK(sample,subpos);
}
-//UPDATED
-bool FastCaloSimCaloExtrapolation::rz_cylinder_get_calo_etaphi(std::vector<Trk::HitInfo>* hitVector, double cylR, double cylZ, Amg::Vector3D& pos, Amg::Vector3D& mom) const
-{
- bool best_found=false;
- double best_dist=10000;
- bool best_inside=false;
- int best_id1,best_id2;
-
- std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
- Amg::Vector3D best_hitPos=(*it).trackParms->position();
- for(int rz=0;rz<=1;++rz) {
- it = hitVector->begin();
- while (it < hitVector->end()-1 ) {
- Amg::Vector3D hitPos1 = (*it).trackParms->position();
- Amg::Vector3D hitMom1 = (*it).trackParms->momentum();
- int sid1=(*it).detID;
- ++it;
- Amg::Vector3D hitPos2 = (*it).trackParms->position();
- Amg::Vector3D hitMom2 = (*it).trackParms->momentum();
- int sid2=(*it).detID;
-
- double t;
- if(rz==1) {
- double r=cylR;
- double r1=hitPos1.perp();
- double r2=hitPos2.perp();
- t=(r-r1)/(r2-r1);
- } else {
- double z1=hitPos1[Amg::z];
- double z2=hitPos2[Amg::z];
- double z;
- if(z1<0) z=-cylZ;
- else z=cylZ;
- t=(z-z1)/(z2-z1);
- }
- Amg::Vector3D hitPos=t*hitPos2+(1-t)*hitPos1;
+//calculates the intersection between the line defined by pointA and pointB and the cylinder cover definded by cylR and cylZ
+int FastCaloSimCaloExtrapolation::cylinderLineIntersection(float cylR, float cylZ, Amg::Vector3D& pointA, Amg::Vector3D& pointB, Amg::Vector3D& intersectA, Amg::Vector3D& intersectB) const{
+
+ //projections of points spanning the line onto the xy plane
+ Amg::Vector3D projPointA(pointA[Amg::x], pointA[Amg::y], 0);
+ Amg::Vector3D projPointB(pointB[Amg::x], pointB[Amg::y], 0);
+ Amg::Vector3D projDiff = projPointA - projPointB;
+
+ //calculate distance from (0,0,0) to line spanned by projPointA and projPointB
+ double t = (projPointA.dot(projDiff))/(projDiff).dot(projDiff);
+ double d = std::sqrt(projPointA.dot(projPointA) - t*t*(projDiff).dot(projDiff));
+
+ //if distance larger than cylinder radius then there are no intersection and we are done
+ if(d > cylR) return 0;
+
+ double k = std::sqrt((cylR*cylR - d*d)/(projDiff.dot(projDiff)));
+
+ intersectA = pointA + (t+k)*(pointB - pointA);
+ intersectB = pointA + (t-k)*(pointB - pointA);
+
+ //check if intersection is outside z bounds
+ bool IntAisValid = (intersectA[Amg::z] <= cylZ && intersectA[Amg::z] >= -cylZ);
+ bool IntBisValid = (intersectB[Amg::z] <= cylZ && intersectB[Amg::z] >= -cylZ);
+
+
+ if(IntAisValid && IntBisValid) return 2;
+ else if(IntAisValid) return 1;
+ else if(IntBisValid){
+ intersectA = intersectB;
+ return 1;
+ }
+
+
+ return 0;
+
+}
+
+
+bool FastCaloSimCaloExtrapolation::cylinderEndcapIntersection(float cylR, float cylZ, bool positiveEndcap, Amg::Vector3D& pointA, Amg::Vector3D& pointB, Amg::Vector3D& intersection) const{
+
+ //normal and point on endcap defines the plane
+ Amg::Vector3D pointOnEndcap;
+ Amg::Vector3D normal(0, 0, 1);
+ positiveEndcap ? pointOnEndcap = {0, 0, cylZ} : pointOnEndcap = {0, 0, -cylZ};
+ Amg::Vector3D hitDir = (pointB - pointA);
+
+ double denom = normal.dot(hitDir);
+ if (std::abs(denom) > 1e-6) {
+ double t = normal.dot(pointOnEndcap - pointB)/denom;
+ //compute intersection regardless of direction (t>0 or t<0)
+ intersection = pointB + t*hitDir;
+ Amg::Vector3D v = intersection - pointOnEndcap;
+
+ //check if intersection is within cylR bounds
+ return std::sqrt(v.dot(v)) <= cylR;
- double dist=hitPos.mag();
- bool inside=false;
-
- const float down_frac=-0.001;
- const float up_frac=1.001;
- if(t>=down_frac && t<=up_frac) {
- if(hitPos.perp()<=cylR*up_frac && fabs(hitPos[Amg::z])<=cylZ*up_frac) inside=true;
- }
-
- if(!best_found || inside) {
- if(!best_inside || dist<best_dist) {
- best_dist=dist;
- best_hitPos=hitPos;
- best_inside=inside;
- best_found=true;
- best_id1=sid1;
- best_id2=sid2;
- mom=t*hitMom2+(1-t)*hitMom1;
- }
- } else {
- if(!best_inside && dist<best_dist) {
- best_dist=dist;
- best_hitPos=hitPos;
- best_inside=inside;
- best_found=true;
- best_id1=sid1;
- best_id2=sid2;
- mom=t*hitMom2+(1-t)*hitMom1;
- }
- }
- ATH_MSG_DEBUG(" extrapol without layer hit to r="<<cylR<<" z=+-"<<cylZ<<" : id="<<sid1<<" -> "<<sid2<<" dist="<<dist<<" bestdist="<<best_dist<<
- " t="<<t<<" inside="<<inside<<" best_inside="<<best_inside<<
- " r1="<<hitPos1.perp()<<" z1="<<hitPos1[Amg::z]<<" r2="<<hitPos2.perp()<<" z2="<<hitPos2[Amg::z]<<
- " re="<<hitPos.perp()<<" ze="<<hitPos[Amg::z]<<
- " rb="<<best_hitPos.perp()<<" zb="<<best_hitPos[Amg::z]
- );
- }
}
- if(best_found) {
- ATH_MSG_DEBUG(" extrapol to r="<<cylR<<" z="<<cylZ<<": id="<<best_id1<<" -> "<<best_id2<<" dist="<<best_dist<<
- " best_inside="<<best_inside<<
- " rb="<<best_hitPos.perp()<<" zb="<<best_hitPos[Amg::z]
- );
+ return false;
+
}
- pos=best_hitPos;
+int FastCaloSimCaloExtrapolation::whichIntersection(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2, Amg::Vector3D& intersectionA, Amg::Vector3D intersectionB) const{
+
+ //check if the hit positions are outside or inside the cylinder surface
+ HITPOSITION cylPosHit1 = whereOnCylinder(cylR, cylZ, hitPos1);
+ HITPOSITION cylPosHit2 = whereOnCylinder(cylR, cylZ, hitPos2);
+
+ if((cylPosHit1 == INSIDE) ^ (cylPosHit2 == INSIDE)){
+ /* CASE A: one hit position inside and one outside of the cylinder (travel through surface),
+ one intersection is on cylinder, take intersection closest to line segment */
+ ATH_MSG_DEBUG("[whichIntersection] Travel through surface.");
+ return getPointLineSegmentDistance(intersectionA, hitPos1, hitPos2) > getPointLineSegmentDistance(intersectionB, hitPos1, hitPos2);
+ }
+ else if(cylPosHit1 == INSIDE && cylPosHit2 == INSIDE){
+ /* CASE B: both hit position inside, take intersection which points towards travel direction of particle */
+ Amg::Vector3D directionA = intersectionA - hitPos2;
+ Amg::Vector3D directionB = intersectionB - hitPos2;
+ Amg::Vector3D hitDir = hitPos2 - hitPos1;
+ ATH_MSG_DEBUG("[whichIntersection] Both hit positions inside.");
+ return directionA.dot(hitDir) < directionB.dot(hitDir);
+ }
+ else{
+ // /* CASE C: both hit position outside and the intersections lay on the segment, take intersection closest to second hit position */
+ // /* CASE D: both hit positions are outside and the intersections are not on the line segment, take intersection closest to one of the hit positions */
+ double distHitPosIntersectA = (hitPos2 - intersectionA).norm();
+ double distHitPosIntersectB = (hitPos2 - intersectionB).norm();
+ ATH_MSG_DEBUG("[whichIntersection] Both hit positions outside.");
+ return distHitPosIntersectA > distHitPosIntersectB;
+ }
+}
+
+double FastCaloSimCaloExtrapolation::getPointLineSegmentDistance(Amg::Vector3D& point, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const{
+
+ Amg::Vector3D hitDir = hitPos2 - hitPos1;
+ Amg::Vector3D w = point - hitPos1;
+
+ double c1 = w.dot(hitDir);
+ if(c1 <= 0) return Amg::distance(point, hitPos1);
+ double c2 = hitDir.dot(hitDir);
+ if(c2 <= c1) return Amg::distance(point, hitPos2);
+ double t = c1/c2;
+ Amg::Vector3D vec = hitPos1 + t*hitDir;
+ return Amg::distance(point, vec);
- return best_found;
}
+enum FastCaloSimCaloExtrapolation::HITPOSITION FastCaloSimCaloExtrapolation::whereOnCylinder(float cylR, float cylZ, Amg::Vector3D& hitPos) const{
+ //set a 1mm tolerance within which the hit position is considered to be on the cylinder surface
+ //setting this higher can lead to extrapolation failures around truth particle eta ~4
+ float tolerance = 1;
+
+ bool isOnEndcap = hitPos.perp() <= cylR + tolerance && (hitPos[Amg::z] > 0 ? std::abs(hitPos[Amg::z] - cylZ) < tolerance : std::abs(hitPos[Amg::z] + cylZ) < tolerance);
+ bool isOnCover = std::abs(hitPos.perp() - cylR) < tolerance && hitPos[Amg::z] < cylZ && hitPos[Amg::z] > -cylZ;
+
+ //check if hit position is on endcap or cover of cylinder
+ if(isOnEndcap || isOnCover) return HITPOSITION::ON;
+
+ //check if hit position is inside cover
+ if(hitPos[Amg::z] < cylZ && hitPos[Amg::z] > -cylZ && hitPos.perp() < cylR) return HITPOSITION::INSIDE;
+
+ return HITPOSITION::OUTSIDE;
+}
+
+bool FastCaloSimCaloExtrapolation::doesTravelThroughSurface(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const{
+ //travel through surface in case one hit position is outside and the other outside of cylinder surface
+ return (whereOnCylinder(cylR, cylZ, hitPos1) == INSIDE) ^ (whereOnCylinder(cylR, cylZ, hitPos2) == INSIDE);
+}
+
+bool FastCaloSimCaloExtrapolation::isOnSegment(Amg::Vector3D& point, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const{
+ return getPointLineSegmentDistance(point, hitPos1, hitPos2) < 0.001;
+}
bool FastCaloSimCaloExtrapolation::isCaloBarrel(int sample) const
{
return GetCaloGeometry()->isCaloBarrel(sample);
}
-double FastCaloSimCaloExtrapolation::deta(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::deta(int sample, double eta) const
{
- return GetCaloGeometry()->deta(sample,eta);
+ return GetCaloGeometry()->deta(sample, eta);
}
-void FastCaloSimCaloExtrapolation::minmaxeta(int sample,double eta,double& mineta,double& maxeta) const
+void FastCaloSimCaloExtrapolation::minmaxeta(int sample, double eta, double& mineta, double& maxeta) const
{
- GetCaloGeometry()->minmaxeta(sample,eta,mineta,maxeta);
+ GetCaloGeometry()->minmaxeta(sample, eta, mineta, maxeta);
}
-double FastCaloSimCaloExtrapolation::rmid(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::rmid(int sample, double eta) const
{
- return GetCaloGeometry()->rmid(sample,eta);
+ return GetCaloGeometry()->rmid(sample, eta);
}
-double FastCaloSimCaloExtrapolation::zmid(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::zmid(int sample, double eta) const
{
- return GetCaloGeometry()->zmid(sample,eta);
+ return GetCaloGeometry()->zmid(sample, eta);
}
-double FastCaloSimCaloExtrapolation::rzmid(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::rzmid(int sample, double eta) const
{
- return GetCaloGeometry()->rzmid(sample,eta);
+ return GetCaloGeometry()->rzmid(sample, eta);
}
-double FastCaloSimCaloExtrapolation::rent(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::rent(int sample, double eta) const
{
- return GetCaloGeometry()->rent(sample,eta);
+ return GetCaloGeometry()->rent(sample, eta);
}
-double FastCaloSimCaloExtrapolation::zent(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::zent(int sample, double eta) const
{
- return GetCaloGeometry()->zent(sample,eta);
+ return GetCaloGeometry()->zent(sample, eta);
}
-double FastCaloSimCaloExtrapolation::rzent(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::rzent(int sample, double eta) const
{
- return GetCaloGeometry()->rzent(sample,eta);
+ return GetCaloGeometry()->rzent(sample, eta);
}
-double FastCaloSimCaloExtrapolation::rext(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::rext(int sample, double eta) const
{
- return GetCaloGeometry()->rext(sample,eta);
+ return GetCaloGeometry()->rext(sample, eta);
}
-double FastCaloSimCaloExtrapolation::zext(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::zext(int sample, double eta) const
{
- return GetCaloGeometry()->zext(sample,eta);
+ return GetCaloGeometry()->zext(sample, eta);
}
-double FastCaloSimCaloExtrapolation::rzext(int sample,double eta) const
+double FastCaloSimCaloExtrapolation::rzext(int sample, double eta) const
{
- return GetCaloGeometry()->rzext(sample,eta);
+ return GetCaloGeometry()->rzext(sample, eta);
}
-double FastCaloSimCaloExtrapolation::rpos(int sample,double eta,int subpos) const
+double FastCaloSimCaloExtrapolation::rpos(int sample, double eta, int subpos) const
{
- return GetCaloGeometry()->rpos(sample,eta,subpos);
+ return GetCaloGeometry()->rpos(sample, eta, subpos);
}
-double FastCaloSimCaloExtrapolation::zpos(int sample,double eta,int subpos) const
+double FastCaloSimCaloExtrapolation::zpos(int sample, double eta, int subpos) const
{
- return GetCaloGeometry()->zpos(sample,eta,subpos);
+ return GetCaloGeometry()->zpos(sample, eta, subpos);
}
-double FastCaloSimCaloExtrapolation::rzpos(int sample,double eta,int subpos) const
+double FastCaloSimCaloExtrapolation::rzpos(int sample, double eta, int subpos) const
{
- return GetCaloGeometry()->rzpos(sample,eta,subpos);
+ return GetCaloGeometry()->rzpos(sample, eta, subpos);
}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.h
index 43ce44e0e8a2fda7657c35d7ec44dc0bc9f93029..3f884aca152be5ca761e31a1932ae8057a07b603 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/FastCaloSimCaloExtrapolation.h
@@ -1,96 +1,148 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef FastCaloSimCaloExtrapolation_H
#define FastCaloSimCaloExtrapolation_H
-// Athena includes
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
+#include "ISF_FastCaloSimParametrization/IFastCaloSimCaloExtrapolation.h"
+#include "ISF_FastCaloSimEvent/TFCSExtrapolationState.h"
+
+#include "TrkExInterfaces/ITimedExtrapolator.h"
+#include "TrkEventPrimitives/PdgToParticleHypothesis.h"
-#include <vector>
+class IFastCaloSimGeometryHelper;
+class ITimedExtrapolator;
+class TFCSTruthState;
namespace Trk
{
class TrackingVolume;
}
-#include "TrkExInterfaces/ITimedExtrapolator.h"
-#include "TrkEventPrimitives/PdgToParticleHypothesis.h"
-
namespace HepPDT
{
class ParticleDataTable;
}
-#include "ISF_FastCaloSimParametrization/IFastCaloSimCaloExtrapolation.h"
-#include "ISF_FastCaloSimEvent/FastCaloSim_CaloCell_ID.h"
-#include "ISF_FastCaloSimEvent/TFCSExtrapolationState.h"
-#include "ISF_FastCaloSimParametrization/IFastCaloSimGeometryHelper.h"
+struct CylinderIntersections
+{
+ Amg::Vector3D first;
+ Amg::Vector3D second;
+ unsigned int number;
+
+};
-class FastCaloSimCaloExtrapolation:public AthAlgTool, virtual public IFastCaloSimCaloExtrapolation
+class FastCaloSimCaloExtrapolation: public AthAlgTool, virtual public IFastCaloSimCaloExtrapolation
{
public:
- FastCaloSimCaloExtrapolation( const std::string& t, const std::string& n, const IInterface* p );
+
+ FastCaloSimCaloExtrapolation(const std::string& t, const std::string& n, const IInterface* p);
~FastCaloSimCaloExtrapolation();
virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
- enum SUBPOS { SUBPOS_MID = TFCSExtrapolationState::SUBPOS_MID, SUBPOS_ENT = TFCSExtrapolationState::SUBPOS_ENT, SUBPOS_EXT = TFCSExtrapolationState::SUBPOS_EXT}; //MID=middle, ENT=entrance, EXT=exit of cal layer
+ enum SUBPOS {
+ SUBPOS_MID = TFCSExtrapolationState::SUBPOS_MID, //MID=middle of calo layer
+ SUBPOS_ENT = TFCSExtrapolationState::SUBPOS_ENT, //ENT=entrance of calo layer
+ SUBPOS_EXT = TFCSExtrapolationState::SUBPOS_EXT //EXT=exit of calo layer
+ };
+
+ enum HITPOSITION{
+ INSIDE, //hit position is inside cylinder bounds
+ OUTSIDE, //hit position is outside cylinder bounds
+ ON //hit position is on cylinder bounds
+ };
virtual void extrapolate(TFCSExtrapolationState& result,const TFCSTruthState* truth) const override final;
protected:
+
const IFastCaloSimGeometryHelper* GetCaloGeometry() const {return &(*m_CaloGeometryHelper);};
- // extrapolation through Calo
- std::vector<Trk::HitInfo>* caloHits(const TFCSTruthState* truth, bool forceNeutral=false) const;
- void extrapolate(TFCSExtrapolationState& result,const TFCSTruthState* truth,std::vector<Trk::HitInfo>* hitVector) const;
- void extrapolate_to_ID(TFCSExtrapolationState& result,const TFCSTruthState* truth,std::vector<Trk::HitInfo>* hitVector) const;
- bool get_calo_etaphi(TFCSExtrapolationState& result,std::vector<Trk::HitInfo>* hitVector,int sample,int subpos=SUBPOS_MID) const;
- bool get_calo_surface(TFCSExtrapolationState& result,std::vector<Trk::HitInfo>* hitVector) const;
- bool rz_cylinder_get_calo_etaphi(std::vector<Trk::HitInfo>* hitVector, double cylR, double cylZ, Amg::Vector3D& pos, Amg::Vector3D& mom) const;
-
+ ///Returns vector of hits used for the extrapolation
+ std::unique_ptr<std::vector<Trk::HitInfo>> caloHits(const TFCSTruthState* truth, bool forceNeutral = false) const;
+
+ /*Main extrapolation methods*/
+
+ bool getCaloSurface(TFCSExtrapolationState& result, std::vector<Trk::HitInfo>* hitVector) const;
+ ///Finds best extrapolation extPos from the hitVector for a cylinder defined by radius cylR and half-length cylZ as well as corresponding momentum direction
+ bool extrapolateToCylinder(std::vector<Trk::HitInfo>* hitVector, float cylR, float cylZ, Amg::Vector3D& extPos, Amg::Vector3D& momDir) const;
+ ///Extrapolates to ID using three uniquely defined cylinder surfaces
+ void extrapolateToID(TFCSExtrapolationState& result, std::vector<Trk::HitInfo>* hitVector) const;
+ ///Extrapolates to all other layers of the calorimeter
+ void extrapolateToLayers(TFCSExtrapolationState& result, std::vector<Trk::HitInfo>* hitVector) const;
+
+ /*Extrapolator helper methods*/
+
+ ///Finds Point of Closest Approach (PCA) on the cylinder defined by radius cylR and half-length cylZ of a line segment spanned by two hit positions to a cylinder
+ void findPCA(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2, Amg::Vector3D& PCA) const;
+ ///Computes the distance between a point and the line segment spanned by hitPos1 and hitPos2
+ double getPointLineSegmentDistance(Amg::Vector3D& point, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const;
+ ///Finds PCA iteratively given two bounds A and B on a line segment, used for (rare) cases with no easy analytical solutions
+ void getIterativePCA(float cylR, float cylZ, Amg::Vector3D& BoundA, Amg::Vector3D& BoundB, Amg::Vector3D& PCA) const;
+ ///Returns true if point lies on the line segment spanned by hitPos1 and hitPos2, otherwise returns false
+ bool isOnSegment(Amg::Vector3D& point, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const;
+ ///Computes intersection between the (infinite) line spanned by pointA and pointB with the positive (negative) endcap of a cylinder, returns true if intersection is found
+ bool cylinderEndcapIntersection(float cylR, float cylZ, bool positiveEndcap, Amg::Vector3D& pointA, Amg::Vector3D& pointB, Amg::Vector3D& intersection) const;
+ /*!Extrapolates position on cylinder by finding intersections of subsequent hit positions, intersection is considered if we detect a travel through the surface with
+ the line segment or we find a forward intersection (in the travel direction of the particle) which lies on the line segment, returns false if no such postion is found*/
+ bool extrapolateWithIntersection(std::vector<Trk::HitInfo> * hitVector, float cylR, float cylZ, Amg::Vector3D& extPos, Amg::Vector3D& momDir) const;
+ ///Extrapolates to the cylinder using the PCA to the polygon spanned by the individual line segments from the hitVector
+ bool extrapolateWithPCA(std::vector<Trk::HitInfo> * hitVector, float cylR, float cylZ, Amg::Vector3D& extPos, Amg::Vector3D& momDir) const;
+ ///Returns true if the line segment spanned by hitPos1 and hitPos2 crosses the cylinder surface, false otherwise
+ bool doesTravelThroughSurface(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const;
+ ///Returns ID of more sensible intersection between line segment spanned by hitPos1 and hitPos2 and cylinder
+ int whichIntersection(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2, Amg::Vector3D& intersectionA, Amg::Vector3D intersectionB) const;
+ ///Analytically computes 2D intersections between circle of radius circR and (infinite) line spanned by pointA nad pointB
+ int circleLineIntersection2D(float circR, Amg::Vector3D& pointA, Amg::Vector3D& pointB, Amg::Vector3D& intersectA, Amg::Vector3D& intersectB) const;
+ ///Analytically computes the intersection between the (infinite) line defined by pointA and pointB and the cylinder cover (without endcaps)
+ int cylinderLineIntersection(float cylR, float cylZ, Amg::Vector3D& pointA, Amg::Vector3D& pointB, Amg::Vector3D& intersectA, Amg::Vector3D& intersectB) const;
+ ///Checks if position of hitPos is inside, outside or on the cylinder bounds
+ enum HITPOSITION whereOnCylinder(float cylR, float cylZ, Amg::Vector3D& hitPos) const;
+ ///Projects position hitPos onto the cylinder surface and returns projected position
+ Amg::Vector3D projectOnCylinder(float cylR, float cylZ, Amg::Vector3D& hitPos) const;
+ ///Analytically computes the intersection between the (infinite) line spanned by hitPos1 and hitPos2 with a cylinder
+ CylinderIntersections getCylinderIntersections(float cylR, float cylZ, Amg::Vector3D& hitPos1, Amg::Vector3D& hitPos2) const;
+
+ //helper methods for calo geometry
+ void minmaxeta(int sample, double eta, double& mineta, double& maxeta) const;
bool isCaloBarrel(int sample) const;
- double deta(int sample,double eta) const;
- void minmaxeta(int sample,double eta,double& mineta,double& maxeta) const;
- double rzmid(int sample,double eta) const;
- double rzent(int sample,double eta) const;
- double rzext(int sample,double eta) const;
- double rmid(int sample,double eta) const;
- double rent(int sample,double eta) const;
- double rext(int sample,double eta) const;
- double zmid(int sample,double eta) const;
- double zent(int sample,double eta) const;
- double zext(int sample,double eta) const;
- double rpos(int sample,double eta,int subpos = CaloSubPos::SUBPOS_MID) const;
- double zpos(int sample,double eta,int subpos = CaloSubPos::SUBPOS_MID) const;
- double rzpos(int sample,double eta,int subpos = CaloSubPos::SUBPOS_MID) const;
+ double deta (int sample, double eta) const;
+ double rzmid(int sample, double eta) const;
+ double rzent(int sample, double eta) const;
+ double rzext(int sample, double eta) const;
+ double rmid (int sample, double eta) const;
+ double rent (int sample, double eta) const;
+ double rext (int sample, double eta) const;
+ double zmid (int sample, double eta) const;
+ double zent (int sample, double eta) const;
+ double zext (int sample, double eta) const;
+ double rpos (int sample, double eta, int subpos = CaloSubPos::SUBPOS_MID) const;
+ double zpos (int sample, double eta, int subpos = CaloSubPos::SUBPOS_MID) const;
+ double rzpos(int sample, double eta, int subpos = CaloSubPos::SUBPOS_MID) const;
HepPDT::ParticleDataTable* m_particleDataTable{nullptr};
- //Define ID-CALO surface to be used for AFII
- //TODO: this should eventually extrapolate to a uniquly defined surface!
- std::vector<double> m_CaloBoundaryR{1148.0,120.0,41.0};
- std::vector<double> m_CaloBoundaryZ{3550.0,4587.0,4587.0};
+ //uniquely defined ID-Calo surfaces
+ std::vector<float> m_CaloBoundaryR{1148.0,120.0,41.0};
+ std::vector<float> m_CaloBoundaryZ{3550.0,4587.0,4587.0};
double m_calomargin{100};
- std::vector< int > m_surfacelist;
+ std::vector<int> m_surfacelist;
- // The new Extrapolator setup
- ToolHandle<Trk::ITimedExtrapolator> m_extrapolator;
- mutable const Trk::TrackingVolume* m_caloEntrance{nullptr};
- std::string m_caloEntranceName{""};
+ ToolHandle<Trk::ITimedExtrapolator> m_extrapolator;
+ mutable const Trk::TrackingVolume* m_caloEntrance{nullptr};
+ std::string m_caloEntranceName{""};
- Trk::PdgToParticleHypothesis m_pdgToParticleHypothesis;
+ Trk::PdgToParticleHypothesis m_pdgToParticleHypothesis;
- // The FastCaloSimGeometryHelper tool
ToolHandle<IFastCaloSimGeometryHelper> m_CaloGeometryHelper;
+
};
#endif // FastCaloSimCaloExtrapolation_H
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.cxx
index fbb7c48d085273d3ca23291b5f0148de35ff1278..4b9f1ccc93d23f5fa3cfa7da363f6a0ef1ff148b 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// class header include
@@ -46,6 +46,7 @@ ISF::FastCaloSimV2ParamSvc::FastCaloSimV2ParamSvc(const std::string& name, ISvcL
declareProperty("ParamsInputFilename" , m_paramsFilename);
declareProperty("ParamsInputObject" , m_paramsObject);
declareProperty("PrintParametrization" , m_printParametrization);
+ declareProperty("CompressMemory" , m_CompressMemory);
}
/** framework methods */
@@ -79,11 +80,13 @@ StatusCode ISF::FastCaloSimV2ParamSvc::initialize()
paramsFile->Close();
- m_param->set_geometry(m_caloGeo.get());
+ if(m_CompressMemory) m_param->RemoveDuplicates();
+ m_param->set_geometry(m_caloGeo.get()); /// does not take ownership
m_param->setLevel(msg().level());
if (m_printParametrization) {
m_param->Print("short");
}
+ if(m_CompressMemory) m_param->RemoveNameTitle();
return StatusCode::SUCCESS;
}
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.h
index a1ccfcf8f4509fc127cb6498423786a5063d58c9..b85093a869b4c720514485a8337b0004fbfd695d 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2ParamSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ISF_FASTCALOSIMV2PARAMSVC_H
@@ -48,6 +48,7 @@ namespace ISF {
std::unique_ptr<CaloGeometryFromCaloDDM> m_caloGeo{};
bool m_printParametrization{false};
+ bool m_CompressMemory{true};
};
}
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/ISF_FatrasRecoTools/PRD_PlanarTruthTrajectoryBuilder.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/ISF_FatrasRecoTools/PRD_PlanarTruthTrajectoryBuilder.h
index 274be6f77222800a8ac8a27289213f62ff896b8a..eaecaae9ae4ccdfb030c77825559b12ff4d534f8 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/ISF_FatrasRecoTools/PRD_PlanarTruthTrajectoryBuilder.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/ISF_FatrasRecoTools/PRD_PlanarTruthTrajectoryBuilder.h
@@ -57,7 +57,7 @@ namespace iFatras {
StatusCode finalize();
/** return a vector of PrepRawData trajectories - uses internal cache**/
- const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& truthTrajectories() const;
+ const std::map< HepMC::ConstGenParticlePtr , Trk::PRD_TruthTrajectory >& truthTrajectories() const;
/** Event refresh - can't be an IIncident, because it has to run after PRD creation and PRD truth creation */
StatusCode refreshEvent();
@@ -83,7 +83,7 @@ namespace iFatras {
//!< Track geantinos or not
bool m_geantinos;
//!< the cache for the return (cleared by Incident)
- mutable std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory > m_gpPrdTruthTrajectories;
+ mutable std::map<HepMC::ConstGenParticlePtr , Trk::PRD_TruthTrajectory > m_gpPrdTruthTrajectories;
};
} // end of namespace
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PRD_PlanarTruthTrajectoryBuilder.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PRD_PlanarTruthTrajectoryBuilder.cxx
index 0e31e6c0261fcda6ed5b53c0f54c6b1e80cf691d..2e03f261a8b5888bc71bcdfb4e10ecb733649464 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PRD_PlanarTruthTrajectoryBuilder.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PRD_PlanarTruthTrajectoryBuilder.cxx
@@ -105,7 +105,7 @@ StatusCode iFatras::PRD_PlanarTruthTrajectoryBuilder::refreshEvent() {
}
-const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& iFatras::PRD_PlanarTruthTrajectoryBuilder::truthTrajectories() const {
+const std::map< HepMC::ConstGenParticlePtr , Trk::PRD_TruthTrajectory >& iFatras::PRD_PlanarTruthTrajectoryBuilder::truthTrajectories() const {
// ndof
size_t ndofTotal = 0;
size_t ndof = 0;
@@ -125,7 +125,7 @@ const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& iFatras::
for ( ; prdMtCIter != prdMtCIterE; ++ prdMtCIter ){
ATH_MSG_VERBOSE(" 2-Count " << second_count++ );
// check if entry exists and if
- const HepMC::GenParticle* curGenP = (*prdMtCIter).second;
+ auto curGenP = (*prdMtCIter).second;
Identifier curIdentifier = (*prdMtCIter).first;
// apply the min pT cut
if ( curGenP->momentum().perp() < m_minPt ) continue;
@@ -139,7 +139,7 @@ const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& iFatras::
if (prd){
ATH_MSG_VERBOSE(" I got the PRD for Id = " << curIdentifier );
// try to find the entry for this GenParticle
- std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >::iterator prdTrajIter = m_gpPrdTruthTrajectories.find(curGenP);
+ std::map< HepMC::ConstGenParticlePtr , Trk::PRD_TruthTrajectory >::iterator prdTrajIter = m_gpPrdTruthTrajectories.find(curGenP);
if ( prdTrajIter == m_gpPrdTruthTrajectories.end() ){
// first PRD associated to this: create PRD_TruthTrajectory object
Trk::PRD_TruthTrajectory newPrdTruthTrajectory;
@@ -164,8 +164,8 @@ const std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >& iFatras::
// PART 2 --------------------------------------------------------------------------------------------------------
// loop through the provided list of manipulators ( sorter is included )
- std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >::iterator prdTruthTrajIter = m_gpPrdTruthTrajectories.begin();
- std::map< const HepMC::GenParticle*, Trk::PRD_TruthTrajectory >::iterator prdTruthTrajIterE = m_gpPrdTruthTrajectories.end();
+ std::map< HepMC::ConstGenParticlePtr , Trk::PRD_TruthTrajectory >::iterator prdTruthTrajIter = m_gpPrdTruthTrajectories.begin();
+ std::map< HepMC::ConstGenParticlePtr , Trk::PRD_TruthTrajectory >::iterator prdTruthTrajIterE = m_gpPrdTruthTrajectories.end();
for ( ; prdTruthTrajIter != prdTruthTrajIterE; ++prdTruthTrajIter ){
if ( m_prdTruthTrajectoryManipulators.size() ){
ToolHandleArray<Trk::IPRD_TruthTrajectoryManipulator>::const_iterator prdTTMIter = m_prdTruthTrajectoryManipulators.begin();
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
index 2217cade89a52814a888dc32056a43c1a0d73a96..45c752072f738ac15da5fa068c2e6da19374e796 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
@@ -93,7 +93,7 @@ StatusCode iFatras::SimHitCreatorMS::initialize()
// Get IdHelper from ToolService
ATH_CHECK(m_idHelperSvc.retrieve());
// the MS helpers for the different technologies
- m_mdtHitIdHelper = MdtHitIdHelper::GetHelper();
+ m_mdtHitIdHelper = MdtHitIdHelper::GetHelper(m_idHelperSvc->mdtIdHelper().tubeMax());
m_rpcHitIdHelper = RpcHitIdHelper::GetHelper(m_idHelperSvc->rpcIdHelper().gasGapMax());
m_tgcHitIdHelper = TgcHitIdHelper::GetHelper();
m_cscHitIdHelper = CscHitIdHelper::GetHelper();
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx
index f84bbcf0bade9cb204721a8f0c9cfb3abf0bd62e..33f155a795ca2757468cec3526657ea7b3ab494c 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx
@@ -43,7 +43,11 @@ iGeant4::ISFG4Helper::convertG4TrackToISFParticle(const G4Track& aTrack,
double charge = particleDefinition.GetPDGCharge();
int pdgID = particleDefinition.GetPDGEncoding();
+#ifdef HEPMC3
+ HepMC::GenParticlePtr genParticle = (truth) ? truth->getTruthParticle(): nullptr;
+#else
auto* genParticle = (truth) ? truth->getTruthParticle(): nullptr;
+#endif
Barcode::ParticleBarcode barcode = (genParticle) ? HepMC::barcode(genParticle) : Barcode::fUndefinedBarcode;
ISF::ISFParticle *isp = new ISF::ISFParticle( position,
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigNew.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigNew.py
index a3dccf52b7a660d7561f400e782c8cbbace98de9..480d0a898236be71e60de48fac4c120af267ed1f 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigNew.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigNew.py
@@ -4,7 +4,9 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentFactory import CompFactory
from RngComps.RandomServices import RNG
-from G4AtlasServices.G4AtlasServicesConfigNew import DetectorGeometrySvcCfg
+from G4AtlasServices.G4AtlasServicesConfigNew import (
+ DetectorGeometrySvcCfg, PhysicsListSvcCfg
+)
from G4AtlasServices.G4AtlasUserActionConfigNew import (
ISFUserActionSvcCfg, ISFFullUserActionSvcCfg,
ISFPassBackUserActionSvcCfg, ISF_AFIIUserActionSvcCfg,
@@ -19,7 +21,7 @@ from ISF_FatrasServices.ISF_FatrasConfig import G4RunManagerHelperCfg
def Geant4ToolCfg(flags, name="ISF_Geant4Tool", **kwargs):
- acc = RNG(flags.Random.Engine)
+ acc = RNG(flags.Random.Engine, name="AthRNGSvc")
kwargs.setdefault("RandomNumberService", acc.getService("AthRNGSvc"))
acc.merge(DetectorGeometrySvcCfg(flags))
@@ -28,8 +30,11 @@ def Geant4ToolCfg(flags, name="ISF_Geant4Tool", **kwargs):
acc.merge(InputConverterCfg(flags))
kwargs.setdefault("InputConverter", acc.getService("ISF_InputConverter"))
- acc.merge(ISFUserActionSvcCfg(flags))
- kwargs.setdefault("UserActionSvc", acc.getService("G4UA::ISFUserActionSvc"))
+ #Only add it if it's not added already
+ if "UserActionSvc" not in kwargs.keys():
+ acc.merge(ISFUserActionSvcCfg(flags))
+ kwargs.setdefault("UserActionSvc", acc.getService("G4UA::ISFUserActionSvc"))
+
kwargs.setdefault("RecordFlux", flags.Sim.RecordFlux)
kwargs.setdefault("MultiThreading", flags.Concurrency.NumThreads > 0)
@@ -42,20 +47,26 @@ def Geant4ToolCfg(flags, name="ISF_Geant4Tool", **kwargs):
acc.merge(FastSimulationMasterToolCfg(flags))
tool = acc.getPublicTool("FastSimulationMasterTool")
kwargs.setdefault("FastSimMasterTool", tool)
+
+ #PhysicsListSvc
+ acc.merge( PhysicsListSvcCfg(flags) )
+ kwargs.setdefault("PhysicsListSvc", acc.getService( "PhysicsListSvc") )
+
# Workaround to keep other simulation flavours working while we migrate everything to be AthenaMT-compatible.
if flags.Sim.ISF.Simulator in ["FullG4", "FullG4MT", "PassBackG4", "PassBackG4MT", "G4FastCalo", "G4FastCaloMT"]:
- acc.addPublicTool(CompFactory.iGeant4.G4TransportTool(name, **kwargs))
+ acc.setPrivateTools(CompFactory.iGeant4.G4TransportTool(name, **kwargs))
else:
acc.merge(G4RunManagerHelperCfg(flags))
kwargs.setdefault("G4RunManagerHelper", acc.getPublicTool("ISF_G4RunManagerHelper"))
- acc.addPublicTool(CompFactory.iGeant4.G4LegacyTransportTool(name, **kwargs))
+ acc.setPrivateTools(CompFactory.iGeant4.G4LegacyTransportTool(name, **kwargs))
return acc
def FullGeant4ToolCfg(flags, name="ISF_FullGeant4Tool", **kwargs):
acc = ISFFullUserActionSvcCfg(flags)
kwargs.setdefault("UserActionSvc", acc.getService("G4UA::ISFFullUserActionSvc"))
- acc.merge(Geant4ToolCfg(flags, name, **kwargs))
+ FullGeant4Tool = acc.popToolsAndMerge(Geant4ToolCfg(flags, name, **kwargs))
+ acc.setPrivateTools(FullGeant4Tool)
return acc
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx
index ae443c2c671facec8b09193eb53644b850ea0411..a4bcb087f9768c8e9581b7ea4288df929e99f7d8 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx
@@ -113,7 +113,7 @@ void iGeant4::ISFTrajectory::AppendStep(const G4Step* aStep)
// make sure that the TruthBinding of the ISFParticle points to the newest
// HepMC::GenParticle instance in case it got updated by the
// ITruthSvc::registerTruthIncident call above
- auto* currentGenPart = atlasG4EvtUserInfo->GetCurrentlyTraced();
+ auto currentGenPart = atlasG4EvtUserInfo->GetCurrentlyTraced();
baseIsp->getTruthBinding()->setTruthParticle( currentGenPart );
Barcode::ParticleBarcode newBarcode = HepMC::barcode(currentGenPart);
baseIsp->setBarcode( newBarcode );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx
index 17e8a0fb8ef22330d152d7c083005dc364dd931b..94959767cfeced39bcff975f2269339210eac0b6 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx
@@ -240,16 +240,27 @@ namespace G4UA{
m_scIn = creation? creation->GetProcessSubType() : -1;
VTrackInformation * trackInfo= static_cast<VTrackInformation*>(track->GetUserInformation());
+#ifdef HEPMC3
+ HepMC::GenParticlePtr genpart=trackInfo ? std::const_pointer_cast<HepMC3::GenParticle>(trackInfo->GetHepMCParticle()):nullptr;
+#else
HepMC::GenParticlePtr genpart= trackInfo ? const_cast<HepMC::GenParticlePtr>(trackInfo->GetHepMCParticle()):0;
- HepMC::GenVertex* vtx = genpart ? genpart->production_vertex() : 0;
+#endif
+ HepMC::GenVertexPtr vtx = genpart ? genpart->production_vertex() : 0;
m_gen = genpart? 0 : -1;
if (genpart) { // mc truth known
while (genpart && vtx ) {
int pdgID=genpart->pdg_id();
+#ifdef HEPMC3
+ HepMC::GenParticlePtr genmom = vtx->particles_in().size()>0 ? vtx->particles_in().front() : nullptr;
+ if ( genmom && pdgID!=genmom->pdg_id() ) m_gen++;
+ else if (vtx->particles_out().size()>0 && genpart!=vtx->particles_out().front()) m_gen++;
+
+#else
HepMC::GenParticlePtr genmom = vtx->particles_in_size()>0 ? *(vtx->particles_in_const_begin()) : 0;
if ( genmom && pdgID!=genmom->pdg_id() ) m_gen++;
else if (vtx->particles_out_size()>0 && genpart!=*(vtx->particles_out_const_begin())) m_gen++;
+#endif
vtx = genmom ? genmom->production_vertex() : 0;
genpart = genmom;
}
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx
index dab4b903e4322dbf9843578bf08f789080e64b0b..6e496908dd31cabe19f632359e954b9f67d2c569 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx
@@ -166,9 +166,15 @@ void TrackProcessorUserActionBase::setupPrimary(G4Track& aTrack)
}
int regenerationNr = ppInfo->GetRegenerationNr();
+#ifdef HEPMC3
+ auto primaryTruthParticle = truthBinding->getGenerationZeroTruthParticle();
+ auto generationZeroTruthParticle = truthBinding->getGenerationZeroTruthParticle();
+ auto currentlyTracedHepPart = truthBinding->getTruthParticle();
+#else
auto* primaryTruthParticle = truthBinding->getGenerationZeroTruthParticle();
auto* generationZeroTruthParticle = truthBinding->getGenerationZeroTruthParticle();
auto* currentlyTracedHepPart = truthBinding->getTruthParticle();
+#endif
auto classification = classify(primaryTruthParticle,
generationZeroTruthParticle,
currentlyTracedHepPart,
@@ -191,11 +197,19 @@ void TrackProcessorUserActionBase::setupSecondary(const G4Track& aTrack)
auto* trackInfo = ::iGeant4::ISFG4Helper::getISFTrackInfo(aTrack);
// why does TrackInformation return *const* GenParticle and ISFParticle objects!?
+#ifdef HEPMC3
+ HepMC::GenParticlePtr currentlyTracedTruthParticle = std::const_pointer_cast<HepMC3::GenParticle>( trackInfo->GetHepMCParticle() );
+ HepMC::GenParticlePtr primaryTruthParticle = std::const_pointer_cast<HepMC3::GenParticle>( trackInfo->GetPrimaryHepMCParticle() );
+ auto* baseISFParticle = const_cast<ISF::ISFParticle*>( trackInfo->GetBaseISFParticle() );
+
+ setCurrentParticle(baseISFParticle, primaryTruthParticle, currentlyTracedTruthParticle);
+#else
HepMC::GenParticlePtr currentlyTracedTruthParticle = const_cast<HepMC::GenParticlePtr>( trackInfo->GetHepMCParticle() );
HepMC::GenParticlePtr primaryTruthParticle = const_cast<HepMC::GenParticlePtr>( trackInfo->GetPrimaryHepMCParticle() );
auto* baseISFParticle = const_cast<ISF::ISFParticle*>( trackInfo->GetBaseISFParticle() );
setCurrentParticle(baseISFParticle, primaryTruthParticle, currentlyTracedTruthParticle);
+#endif
return;
}
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx
index 1fdfb5dbe154f816eb4b5fc403f3dc5122e61a83..d7877b97ee4c8d3977d05372a98e1aa0ae610f8d 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx
@@ -241,9 +241,14 @@ namespace G4UA {
G4Exception("iGeant4::TrackProcessorUserActionPassBack", "NoTrackInformation", FatalException, description);
return nullptr; //The G4Exception call above should abort the job, but Coverity does not seem to pick this up.
}
+#ifdef HEPMC3
+ HepMC::GenParticlePtr primaryHepParticle = std::const_pointer_cast<HepMC3::GenParticle>(trackInfo->GetPrimaryHepMCParticle());
+ HepMC::GenParticlePtr generationZeroHepParticle = std::const_pointer_cast<HepMC3::GenParticle>(trackInfo->GetHepMCParticle());
+#else
HepMC::GenParticlePtr primaryHepParticle = const_cast<HepMC::GenParticlePtr>(trackInfo->GetPrimaryHepMCParticle());
HepMC::GenParticlePtr generationZeroHepParticle = const_cast<HepMC::GenParticlePtr>(trackInfo->GetHepMCParticle());
+#endif
ISF::TruthBinding* tBinding = new ISF::TruthBinding(truthParticle, primaryHepParticle, generationZeroHepParticle);
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/ISF_HepMC_Interfaces/IGenParticleFilter.h b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/ISF_HepMC_Interfaces/IGenParticleFilter.h
index a982785281580ae4db0a0837817e3c4ffcc9cae6..ef30901c0889be01d4a901763cf28b8ff6342f09 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/ISF_HepMC_Interfaces/IGenParticleFilter.h
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Interfaces/ISF_HepMC_Interfaces/IGenParticleFilter.h
@@ -37,8 +37,13 @@ namespace ISF {
/// Creates the InterfaceID and interfaceID() method
DeclareInterfaceID(IGenParticleFilter, 1, 0);
+#ifdef HEPMC3
+ /** Returns a boolean if the particle has passed or not */
+ virtual bool pass(HepMC::ConstGenParticlePtr particle) const = 0;
+#else
/** Returns a boolean if the particle has passed or not */
virtual bool pass(const HepMC::GenParticle& particle) const = 0;
+#endif
};
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/CylinderVolumeTruthStrategy.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/CylinderVolumeTruthStrategy.cxx
index 846a7cd4e812c781e28f6df05d133c23b54ac53a..be3a1e46c50b2e70e86231743cdd710330079459 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/CylinderVolumeTruthStrategy.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/CylinderVolumeTruthStrategy.cxx
@@ -59,7 +59,8 @@ StatusCode ISF::CylinderVolumeTruthStrategy::finalize()
bool ISF::CylinderVolumeTruthStrategy::pass( ITruthIncident& ti) const
{
// the current truth incident radius
- double r = ti.position().rho();
+ auto t_pos=ti.position();
+ double r = std::sqrt(t_pos.x()*t_pos.x()+t_pos.y()*t_pos.y()+t_pos.z()*t_pos.z());
// is the current radius on the surface?
bool onSurf = (r>m_ri) && (r<m_ro);
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx
index 7ce0aa81d86ca7ba0ba4b21994e8bc12cc0f5334..954e498d03e153e8f970955ef8ed8c5048259db1 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.cxx
@@ -39,6 +39,17 @@ StatusCode ISF::GenParticleFinalStateFilter::initialize()
/** returns true if the the particle is considered stable */
+#ifdef HEPMC3
+bool ISF::GenParticleFinalStateFilter::pass(HepMC::ConstGenParticlePtr particle) const
+{
+ bool passFilter = true;
+ passFilter &= isFinalState(particle);
+ passFilter &= (!m_checkGenSimStable) || MC::isSimStable(particle);
+ passFilter &= (!m_checkGenInteracting) || MC::isSimInteracting(particle);
+ return passFilter;
+}
+
+#else
bool ISF::GenParticleFinalStateFilter::pass(const HepMC::GenParticle& particle) const
{
bool passFilter = true;
@@ -48,6 +59,7 @@ bool ISF::GenParticleFinalStateFilter::pass(const HepMC::GenParticle& particle)
return passFilter;
}
+#endif
StatusCode ISF::GenParticleFinalStateFilter::finalize()
@@ -57,9 +69,18 @@ StatusCode ISF::GenParticleFinalStateFilter::finalize()
}
/** checks if the particle is in its final state (no end vertex) */
+#ifdef HEPMC3
+bool ISF::GenParticleFinalStateFilter::isFinalState(HepMC::ConstGenParticlePtr p) const {
+ // particle is in its final state if both:
+ // * no end_vertex
+ // * status==1
+ return ( !p->end_vertex() && p->status()==1 );
+}
+#else
bool ISF::GenParticleFinalStateFilter::isFinalState(const HepMC::GenParticle &p) const {
// particle is in its final state if both:
// * no end_vertex
// * status==1
return ( !p.end_vertex() && p.status()==1 );
}
+#endif
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.h b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.h
index 1e6e3dceb61d493ac4a4d48a138e224568724e02..b00e661f55ac82284557c1bbe9d1575687149045 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.h
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleFinalStateFilter.h
@@ -42,12 +42,21 @@ namespace ISF {
StatusCode initialize();
StatusCode finalize();
+#ifdef HEPMC3
+ /** Returns the Particle Stack, should register truth */
+ bool pass(HepMC::ConstGenParticlePtr particle) const;
+ private:
+ /** checks if the particle is in its final state (no end vertex) */
+ bool isFinalState( HepMC::ConstGenParticlePtr p) const;
+#else
+
/** Returns the Particle Stack, should register truth */
bool pass(const HepMC::GenParticle& particle) const;
private:
/** checks if the particle is in its final state (no end vertex) */
bool isFinalState( const HepMC::GenParticle& p) const;
+#endif
bool m_checkGenSimStable; //!< boolean switch to check on sim stable
bool m_checkGenInteracting; //!< boolean switch to check on gen interacting
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx
index f4a54d5845c4ca7d9078e81d47da90a3a465a8ab..efee0b2b74bbc92fdc02c9532837fd07a173a282 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.cxx
@@ -81,17 +81,29 @@ StatusCode ISF::GenParticleGenericFilter::finalize()
/** Returns whether the given particle passes all cuts or not */
+#ifdef HEPMC3
+bool ISF::GenParticleGenericFilter::pass(HepMC::ConstGenParticlePtr particle) const
+#else
bool ISF::GenParticleGenericFilter::pass(const HepMC::GenParticle& particle) const
+#endif
{
bool pass = true;
+#ifdef HEPMC3
+ HepMC::ConstGenVertexPtr productionVertex = particle->production_vertex();
+#else
HepMC::ConstGenVertexPtr productionVertex = particle.production_vertex();
+#endif
const auto* position = productionVertex ? &productionVertex->position() : nullptr;
if (!position || position->perp()<=m_maxApplicableRadius) {
pass = check_cuts_passed(particle);
}
+#ifdef HEPMC3
+ const auto& momentum = particle->momentum();
+#else
const auto& momentum = particle.momentum();
+#endif
ATH_MSG_VERBOSE( "GenParticle '" << particle << "' with "
<< (position ? "pos: r=" + std::to_string(position->perp()) : "")
<< ", mom: eta=" << momentum.eta() << " phi=" << momentum.phi()
@@ -102,12 +114,18 @@ bool ISF::GenParticleGenericFilter::pass(const HepMC::GenParticle& particle) con
/** Check whether the given particle passes all configure cuts or not */
+#ifdef HEPMC3
+bool ISF::GenParticleGenericFilter::check_cuts_passed(HepMC::ConstGenParticlePtr particle) const {
+ const auto momentum = particle->momentum();
+ int pdg = particle->pdg_id();
+#else
bool ISF::GenParticleGenericFilter::check_cuts_passed(const HepMC::GenParticle &particle) const {
const auto& momentum = particle.momentum();
+ int pdg = particle.pdg_id();
+#endif
double mom = std::sqrt(momentum.x()*momentum.x()+momentum.y()*momentum.y()+momentum.z()*momentum.z());
double eta = momentum.eta();
double phi = momentum.phi();
- int pdg = particle.pdg_id();
// check the particle pdg code
if( m_pdgs.size() && std::find(std::begin(m_pdgs), std::end(m_pdgs), pdg) == std::end(m_pdgs) ) {
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.h b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.h
index b4c7129bcac638e5e794fe3ae6f0f250b26032a6..ed77e642c0e77e2ea7f4ce9a7276609a7ae7a16c 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.h
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleGenericFilter.h
@@ -52,11 +52,19 @@ typedef std::vector<int> PDGCodes;
StatusCode finalize();
/// Interface method that returns whether the given particle passes all cuts or not
+#ifdef HEPMC3
+ bool pass(HepMC::ConstGenParticlePtr particle) const;
+#else
bool pass(const HepMC::GenParticle& particle) const;
+#endif
private:
/// Check whether the given particle passes all configure cuts or not
+#ifdef HEPMC3
+ bool check_cuts_passed(HepMC::ConstGenParticlePtr particle) const;
+#else
bool check_cuts_passed(const HepMC::GenParticle& particle) const;
+#endif
/// the cuts defined by the use
double m_minEta; //!< min pseudorapidity cut
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx
index dbf3eff7450518947215361baa8f25e2e23b0dd5..c5d93d002fd25b912d1562ce5ec5bf743be0e6a0 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.cxx
@@ -11,6 +11,7 @@
// HepMC includes
#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Flow.h"
// Helper function
#include "TruthUtils/HepMCHelpers.h"
@@ -67,6 +68,19 @@ StatusCode ISF::GenParticleInteractingFilter::initialize()
}
/** passes through to the private version of the filter */
+#ifdef HEPMC3
+bool ISF::GenParticleInteractingFilter::pass(HepMC::ConstGenParticlePtr particle) const
+{
+ const int pdg_id = particle->pdg_id();
+ const bool isInteracting = find(m_additionalInteractingParticleTypes.begin(),
+ m_additionalInteractingParticleTypes.end(),
+ pdg_id) != m_additionalInteractingParticleTypes.end();
+ const bool isNonInteracting = find(m_additionalNonInteractingParticleTypes.begin(),
+ m_additionalNonInteractingParticleTypes.end(),
+ pdg_id) != m_additionalNonInteractingParticleTypes.end();
+ return !(MC::isNonInteracting( particle ) || isNonInteracting) || isInteracting;
+}
+#else
bool ISF::GenParticleInteractingFilter::pass(const HepMC::GenParticle& particle) const
{
const int& pdg_id = particle.pdg_id();
@@ -78,4 +92,5 @@ bool ISF::GenParticleInteractingFilter::pass(const HepMC::GenParticle& particle)
pdg_id) != m_additionalNonInteractingParticleTypes.end();
return !(MC::isNonInteracting( &particle ) || isNonInteracting) || isInteracting;
}
+#endif
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.h b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.h
index 97f0011043c85df66ccbcbabcbe3737547953f16..ea2f829f04770bedbc1074b1a1fa818f95676012 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.h
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleInteractingFilter.h
@@ -18,6 +18,7 @@
// STL includes
#include <string>
+#include "AtlasHepMC/GenParticle.h"
namespace ISF {
class ISFParticle;
@@ -40,9 +41,14 @@ namespace ISF {
/** Framework methods */
virtual StatusCode initialize() override;
+#ifdef HEPMC3
+ /** passes through to the private version */
+ virtual bool pass(HepMC::ConstGenParticlePtr particle ) const override;
+#else
/** passes through to the private version */
virtual bool pass(const HepMC::GenParticle& particle ) const override;
+#endif
/** Additional PDG codes to classify as interacting */
std::vector<int> m_additionalInteractingParticleTypes;
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.cxx
index dd4edc16bdb1fb559a6aad539a3f5d2087d2ec3c..10891c17de6a4ccf1e8c73f869677f40c3d69611 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.cxx
@@ -27,10 +27,18 @@ ISF::GenParticleLifetimeFilter::GenParticleLifetimeFilter( const std::string& t,
/** does the given particle pass the filter? */
+#ifdef HEPMC3
+bool ISF::GenParticleLifetimeFilter::pass(HepMC::ConstGenParticlePtr particle) const
+#else
bool ISF::GenParticleLifetimeFilter::pass(const HepMC::GenParticle& particle) const
+#endif
{
// the GenParticle end vertex
+#ifdef HEPMC3
+ auto endVtx = particle->end_vertex();
+#else
auto endVtx = particle.end_vertex();
+#endif
// no production vertex?
if (!endVtx) {
ATH_MSG_DEBUG("GenParticle does not have an end vertex, this is fine");
@@ -40,7 +48,11 @@ bool ISF::GenParticleLifetimeFilter::pass(const HepMC::GenParticle& particle) co
const auto& end4Vec = endVtx->position();
// the GenParticle production vertex
+#ifdef HEPMC3
+ auto prodVtx = particle->production_vertex();
+#else
auto prodVtx = particle.production_vertex();
+#endif
// no production vertex?
if (!prodVtx) {
ATH_MSG_DEBUG("GenParticle does not have a production vertex, filtering it out");
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.h b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.h
index f5629f8adde5119f4db87219932a1a8d47362f4b..b434bb8c10d976a97dcf8a07e98a2c47a459ec16 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.h
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleLifetimeFilter.h
@@ -34,7 +34,11 @@ namespace ISF {
~GenParticleLifetimeFilter(){}
/** does the given particle pass the filter? */
+#ifdef HEPMC3
+ bool pass(HepMC::ConstGenParticlePtr particle) const;
+#else
bool pass(const HepMC::GenParticle& particle) const;
+#endif
private:
double m_minLifetime{0.000001}; //units of c*ns
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.cxx
index 597933ec224e891d99c7fe75bb8bc64755828033..33031f1e66d1d7c4a2f81428e299483298e8785b 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.cxx
@@ -12,6 +12,7 @@
// HepMC includes
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
/** Constructor **/
ISF::GenParticlePositionFilter::GenParticlePositionFilter( const std::string& t,
@@ -48,10 +49,17 @@ StatusCode ISF::GenParticlePositionFilter::initialize()
/** does the given particle pass the filter? */
+#ifdef HEPMC3
+bool ISF::GenParticlePositionFilter::pass(HepMC::ConstGenParticlePtr particle) const
+{
+ // the GenParticle production vertex
+ auto vtx = particle->production_vertex();
+#else
bool ISF::GenParticlePositionFilter::pass(const HepMC::GenParticle& particle) const
{
// the GenParticle production vertex
HepMC::GenVertexPtr vtx = particle.production_vertex();
+#endif
// no production vertex?
if (!vtx) {
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.h b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.h
index 18b0c3201542fab123b18be0dc50150b42fd8818..8bbe7b4c06228ec50d71d71e122a56e39facde4c 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.h
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticlePositionFilter.h
@@ -45,7 +45,11 @@ namespace ISF {
StatusCode finalize();
/** does the given particle pass the filter? */
+#ifdef HEPMC3
+ bool pass(HepMC::ConstGenParticlePtr particle) const;
+#else
bool pass(const HepMC::GenParticle& particle) const;
+#endif
private:
ServiceHandle<IGeoIDSvc> m_geoIDSvc;
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx
index c4fefcb3daf6369f5a2641e073cd7c9a61cdc0e0..dcffa77c2c0c17d36803f7abff92f52f8e433721 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx
@@ -72,6 +72,33 @@ StatusCode ISF::GenParticleSimWhiteList::initialize()
}
/** passes through to the private version of the filter */
+#ifdef HEPMC3
+bool ISF::GenParticleSimWhiteList::pass(HepMC::ConstGenParticlePtr particle) const
+{
+
+ ATH_MSG_VERBOSE( "Checking whether " << particle << " passes the filter." );
+
+ static std::vector<int> vertices(500);
+ vertices.clear();
+ bool so_far_so_good = pass( particle , vertices );
+
+ // Test all parent particles
+ if (so_far_so_good && particle->production_vertex() && m_qs){
+ for (auto pit: particle->production_vertex()->particles_in()){
+ // Loop breaker
+ if ( HepMC::barcode(pit) == HepMC::barcode(particle) ) continue;
+ // Check this particle
+ vertices.clear();
+ bool parent_all_clear = pass( pit , vertices );
+ ATH_MSG_VERBOSE( "Parent all clear: " << parent_all_clear <<
+ "\nIf true, will not pass the daughter because it should have been picked up through the parent already (to avoid multi-counting)." );
+ so_far_so_good = so_far_so_good && !parent_all_clear;
+ } // Loop over parents
+ } // particle had parents
+
+ return so_far_so_good;
+}
+#else
bool ISF::GenParticleSimWhiteList::pass(const HepMC::GenParticle& particle) const
{
@@ -98,8 +125,42 @@ bool ISF::GenParticleSimWhiteList::pass(const HepMC::GenParticle& particle) cons
return so_far_so_good;
}
+#endif
/** returns true if the the particle and all daughters are on the white list */
+#ifdef HEPMC3
+bool ISF::GenParticleSimWhiteList::pass(HepMC::ConstGenParticlePtr particle , std::vector<int> & used_vertices ) const
+{
+ // See if the particle is in the white list
+ bool passFilter = std::binary_search( m_pdgId.begin() , m_pdgId.end() , particle->pdg_id() ) || MC::PID::isNucleus( particle->pdg_id() );
+ // Remove documentation particles
+ passFilter = passFilter && particle->status()<3;
+ // Test all daughter particles
+ if (particle->end_vertex() && m_qs && passFilter){
+ // Break loops
+ if ( std::find( used_vertices.begin() , used_vertices.end() , HepMC::barcode(particle->end_vertex()) )==used_vertices.end() ){
+ used_vertices.push_back( HepMC::barcode(particle->end_vertex()) );
+ for (auto pit: particle->end_vertex()->particles_out()){
+ passFilter = passFilter && pass( pit , used_vertices );
+ if (!passFilter) {
+ ATH_MSG_VERBOSE( "Daughter particle " << pit << " does not pass." );
+ break;
+ }
+ } // Loop over daughters
+ } // Break loops
+ } // particle had daughters
+ else if (!particle->end_vertex() && !passFilter && particle->status()<3) { // no daughters... No end vertex... Check if this isn't trouble
+ ATH_MSG_ERROR( "Found a particle with no end vertex that does not appear in the white list." );
+ ATH_MSG_ERROR( "This is VERY likely pointing to a problem with either the configuration you ");
+ ATH_MSG_ERROR( "are using, or a bug in the generator. Either way it should be fixed. The");
+ ATH_MSG_ERROR( "particle will come next, and then we will throw.");
+ ATH_MSG_ERROR( particle );
+ throw;
+ }
+
+ return passFilter;
+}
+#else
bool ISF::GenParticleSimWhiteList::pass(const HepMC::GenParticle& particle , std::vector<int> & used_vertices ) const
{
// See if the particle is in the white list
@@ -132,6 +193,7 @@ bool ISF::GenParticleSimWhiteList::pass(const HepMC::GenParticle& particle , std
return passFilter;
}
+#endif
StatusCode ISF::GenParticleSimWhiteList::finalize()
{
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.h b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.h
index bcd25eebef1da8bf59e7b2571b9a84810a3919a0..9dd60edc95a351016f5ef48c895030660a558002 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.h
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.h
@@ -19,6 +19,7 @@
#include <string>
#include <vector>
+#include "AtlasHepMC/GenParticle.h"
namespace ISF {
class ISFParticle;
@@ -44,11 +45,19 @@ namespace ISF {
StatusCode finalize();
/** passes through to the private version */
+#ifdef HEPMC3
+ bool pass(HepMC::ConstGenParticlePtr particle ) const;
+#else
bool pass(const HepMC::GenParticle& particle ) const;
+#endif
private:
/** returns true if the the particle and all daughters are on the white list */
+#ifdef HEPMC3
+ bool pass(HepMC::ConstGenParticlePtr particle , std::vector<int> & used_vertices ) const;
+#else
bool pass(const HepMC::GenParticle& particle , std::vector<int> & used_vertices ) const;
+#endif
std::vector<std::string> m_whiteLists; //!< The location of the white lists
std::vector<long int> m_pdgId; //!< Allowed PDG IDs
bool m_qs; //!< Switch for quasi-stable particle simulation
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleGenericFilter_test.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleGenericFilter_test.cxx
index 2988dfbf80678dbc267547a7d5da3f274b65a460..bd44aadecf473169fdc7f32e5be1d626629901b6 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleGenericFilter_test.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleGenericFilter_test.cxx
@@ -27,6 +27,7 @@
// Truth related includes
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
namespace ISFTesting {
@@ -108,7 +109,11 @@ protected:
TEST_F(GenParticleGenericFilter_test, allPropertiesUnset_expectParticlePass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
+#ifdef HEPMC3
+ HepMC::ConstGenParticlePtr part{};
+#else
const HepMC::GenParticle part{};
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -118,7 +123,11 @@ TEST_F(GenParticleGenericFilter_test, minEtaGreaterThanParticleEta_expectNoPass)
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -129,7 +138,11 @@ TEST_F(GenParticleGenericFilter_test, minEtaSmallerThanParticleEta_expectPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(135.*M_PI/180.), 0.0, 1.0*cos(135.*M_PI/180.), 1.0); // rho=1, eta=-0.88
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -140,7 +153,11 @@ TEST_F(GenParticleGenericFilter_test, maxEtaSmallerThanParticleEta_expectNoPass)
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(30.*M_PI/180.), 0.0, 1.0*cos(30.*M_PI/180.), 1.0); // rho=1, eta=+1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -151,7 +168,11 @@ TEST_F(GenParticleGenericFilter_test, maxEtaGreaterThanParticleEta_expectPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(45.*M_PI/180.), 0.0, 1.0*cos(45.*M_PI/180.), 1.0); // rho=1, eta=+0.88
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -163,7 +184,11 @@ TEST_F(GenParticleGenericFilter_test, particlePositiveEtaWithinEtaRange_expectPa
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(45.*M_PI/180.), 0.0, 1.0*cos(45.*M_PI/180.), 1.0); // rho=1, eta=+0.88
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -175,7 +200,11 @@ TEST_F(GenParticleGenericFilter_test, particleNegativeEtaWithinEtaRange_expectPa
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(135.*M_PI/180.), 0.0, 1.0*cos(135.*M_PI/180.), 1.0); // rho=1, eta=-0.88
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -187,7 +216,11 @@ TEST_F(GenParticleGenericFilter_test, particlePositiveEtaOutsideEtaRange_expectN
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(45.*M_PI/180.), 0.0, 1.0*cos(45.*M_PI/180.), 1.0); // rho=1, eta=+0.88
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -199,7 +232,11 @@ TEST_F(GenParticleGenericFilter_test, particleNegativeEtaOutsideEtaRange_expectN
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(135.*M_PI/180.), 0.0, 1.0*cos(135.*M_PI/180.), 1.0); // rho=1, eta=-0.88
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -210,7 +247,11 @@ TEST_F(GenParticleGenericFilter_test, minPhiGreaterThanParticlePhi_expectNoPass)
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*cos(-1.1), 1.0*sin(-1.1), 0.0, 1.0); // rho=1, phi=-1.1
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -221,7 +262,11 @@ TEST_F(GenParticleGenericFilter_test, maxPhiSmallerThanParticlePhi_expectNoPass)
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*cos(1.1), 1.0*sin(1.1), 0.0, 1.0); // rho=1, phi=1.1
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -231,7 +276,11 @@ TEST_F(GenParticleGenericFilter_test, pdgDoesntMatchParticle_expectNoPass) {
EXPECT_TRUE( m_filterTool->setProperty("ParticlePDG", "[123,34,5678]").isSuccess() );
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr();
+#else
const HepMC::GenParticle part{};
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -241,7 +290,11 @@ TEST_F(GenParticleGenericFilter_test, pdgMatchesParticle_expectPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom(0, 0, 0, 0);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom, /*pdg id=*/34);
+#else
const HepMC::GenParticle part(mom, /*pdg id=*/34);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -251,7 +304,11 @@ TEST_F(GenParticleGenericFilter_test, lastPdgMatchesParticle_expectPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom(0, 0, 0, 0);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom, /*pdg id=*/5678);
+#else
const HepMC::GenParticle part(mom, /*pdg id=*/5678);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -261,7 +318,11 @@ TEST_F(GenParticleGenericFilter_test, minMomentumSmallerThanParticleMom_expectPa
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(100.1, 0., 0., 0.);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -272,7 +333,11 @@ TEST_F(GenParticleGenericFilter_test, minMomentumGreaterThanParticleMom_expectNo
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(99.9, 0., 0., 0.);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -283,7 +348,11 @@ TEST_F(GenParticleGenericFilter_test, maxMomentumGreaterThanParticleMom_expectPa
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(0., 0., 99.9, 0.);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -294,7 +363,11 @@ TEST_F(GenParticleGenericFilter_test, maxMomentumSmallerThanParticleMom_expectNo
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(0., 0., 100.1, 0.);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -306,7 +379,11 @@ TEST_F(GenParticleGenericFilter_test, particleMomentumWithinMomRange_expectPass)
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(0., 101., 0., 0.);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -318,7 +395,11 @@ TEST_F(GenParticleGenericFilter_test, particleMomentumBelowMomRange_expectNoPass
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(0., 99.9, 0., 0.);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -330,7 +411,11 @@ TEST_F(GenParticleGenericFilter_test, particleMomentumAboveMomRange_expectNoPass
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(0., 0., 1000.1, 0.);
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -341,11 +426,19 @@ TEST_F(GenParticleGenericFilter_test, productionVertexInsideApplicableRadius_exp
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector pos(0., 0., 0., 0.);
+#ifdef HEPMC3
+ HepMC3::GenVertex vtx(pos);
+ auto part = HepMC::newGenParticlePtr();
+ vtx.add_particle_out(part);
+
+ ASSERT_TRUE( m_filterTool->pass(part) );
+#else
HepMC::GenVertex vtx(pos);
auto part = HepMC::newGenParticlePtr(); // need dynamic allocation as GenVertex takes ownership
vtx.add_particle_out(part);
ASSERT_TRUE( m_filterTool->pass(*part) );
+#endif
}
@@ -358,10 +451,17 @@ TEST_F(GenParticleGenericFilter_test, productionVertexOutsideApplicableRadiusAnd
auto part = HepMC::newGenParticlePtr(mom4, /*pdg id=*/11); // need dynamic allocation as GenVertex takes ownership
const HepMC::FourVector pos(0., 100., 0., 0.);
+#ifdef HEPMC3
+ HepMC3::GenVertex vtx(pos);
+ vtx.add_particle_out(part);
+
+ ASSERT_TRUE( m_filterTool->pass(part) );
+#else
HepMC::GenVertex vtx(pos);
vtx.add_particle_out(part);
ASSERT_TRUE( m_filterTool->pass(*part) );
+#endif
}
@@ -374,10 +474,17 @@ TEST_F(GenParticleGenericFilter_test, productionVertexWithinApplicableRadiusAndU
auto part = HepMC::newGenParticlePtr(mom4, /*pdg id=*/11); // need dynamic allocation as GenVertex takes ownership
const HepMC::FourVector pos(0., 9.9, 0., 0.);
+#ifdef HEPMC3
+ HepMC3::GenVertex vtx(pos);
+ vtx.add_particle_out(part);
+
+ ASSERT_FALSE( m_filterTool->pass(part) );
+#else
HepMC::GenVertex vtx(pos);
vtx.add_particle_out(part);
ASSERT_FALSE( m_filterTool->pass(*part) );
+#endif
}
@@ -391,11 +498,17 @@ TEST_F(GenParticleGenericFilter_test, productionVertexFarForwardInsideApplicable
auto part = HepMC::newGenParticlePtr(mom4, /*pdg id=*/11); // need dynamic allocation as GenVertex takes ownership
const HepMC::FourVector pos(0., 0., 9999., 0.);
+#ifdef HEPMC3
+ HepMC3::GenVertex vtx(pos);
+ vtx.add_particle_out(part);
+ ASSERT_FALSE( m_filterTool->pass(part) );
+#else
HepMC::GenVertex vtx(pos);
vtx.add_particle_out(part);
ASSERT_FALSE( m_filterTool->pass(*part) );
+#endif
}
@@ -409,10 +522,17 @@ TEST_F(GenParticleGenericFilter_test, productionVertexFarForwardOutsideApplicabl
auto part = HepMC::newGenParticlePtr(mom4, /*pdg id=*/11); // need dynamic allocation as GenVertex takes ownership
const HepMC::FourVector pos(1.1, 0., 9999., 0.);
+#ifdef HEPMC3
+ HepMC3::GenVertex vtx(pos);
+ vtx.add_particle_out(part);
+
+ ASSERT_TRUE( m_filterTool->pass(part) );
+#else
HepMC::GenVertex vtx(pos);
vtx.add_particle_out(part);
ASSERT_TRUE( m_filterTool->pass(*part) );
+#endif
}
} // namespace ISFTesting
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx
index 8bd2fec655ccc9287d77f364ea7cd69ac30cc922..0456c492d9a8f3565ead3653b1051872ac18e05d 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleInteractingFilter_test.cxx
@@ -27,6 +27,7 @@
// Truth related includes
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
namespace ISFTesting {
@@ -109,7 +110,11 @@ TEST_F(GenParticleInteractingFilter_test, allPropertiesUnset_stdParticle_expectP
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -118,7 +123,11 @@ TEST_F(GenParticleInteractingFilter_test, allPropertiesUnset_stdParticle_expectN
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/12);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/12);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -127,7 +136,11 @@ TEST_F(GenParticleInteractingFilter_test, allPropertiesUnset_exoticParticle_expe
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/4110000);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/4110000);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -138,7 +151,11 @@ TEST_F(GenParticleInteractingFilter_test, stdParticle_expectPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/11);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/11);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
@@ -148,7 +165,11 @@ TEST_F(GenParticleInteractingFilter_test, stdParticle_expectNoPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/12);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/12);
+#endif
ASSERT_FALSE( m_filterTool->pass(part) );
}
@@ -158,7 +179,11 @@ TEST_F(GenParticleInteractingFilter_test, exoticParticle_expectPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
const HepMC::FourVector mom4(1.0*sin(150.*M_PI/180.), 0.0, 1.0*cos(150.*M_PI/180.), 1.0); // rho=1, eta=-1.32
+#ifdef HEPMC3
+ HepMC::GenParticlePtr part=HepMC::newGenParticlePtr(mom4, /*pdg id=*/4110000);
+#else
const HepMC::GenParticle part(mom4, /*pdg id=*/4110000);
+#endif
ASSERT_TRUE( m_filterTool->pass(part) );
}
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleLifetimeFilter_test.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleLifetimeFilter_test.cxx
index 81187e7f99f7b0fb777a892b727ef3eaad0cf331..9db4a0b022bc3116be9d96424005d2e32eb3af82 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleLifetimeFilter_test.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/test/GenParticleLifetimeFilter_test.cxx
@@ -25,6 +25,7 @@
// Truth related includes
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
namespace ISFTesting {
@@ -106,7 +107,11 @@ protected:
TEST_F(GenParticleLifetimeFilter_test, allPropertiesUnset_expectPass) {
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
+#ifdef HEPMC3
+ auto part = HepMC::newGenParticlePtr();
+#else
const HepMC::GenParticle part{};
+#endif
ASSERT_TRUE( m_filterTool->pass(part) ); // will pass as no end vertex
}
@@ -115,7 +120,11 @@ TEST_F(GenParticleLifetimeFilter_test, setMinimumLifetime_expectPass) {
EXPECT_TRUE( m_filterTool->setProperty("MinimumLifetime", "1.3").isSuccess() );
EXPECT_TRUE( m_filterTool->initialize().isSuccess() );
+#ifdef HEPMC3
+ auto part = HepMC::newGenParticlePtr();
+#else
const HepMC::GenParticle part{};
+#endif
ASSERT_TRUE( m_filterTool->pass(part) ); // will pass as no end vertex
}
@@ -129,7 +138,11 @@ TEST_F(GenParticleLifetimeFilter_test, addProdVtx_expectPass) {
HepMC::GenVertex prodVtx(prodPos);
auto part = HepMC::newGenParticlePtr(); // need dynamic allocation as GenVertex takes ownership
prodVtx.add_particle_out(part);
+#ifdef HEPMC3
+ ASSERT_TRUE( m_filterTool->pass(part) ); // will pass as no end vertex
+#else
ASSERT_TRUE( m_filterTool->pass(*part) ); // will pass as no end vertex
+#endif
}
@@ -144,7 +157,11 @@ TEST_F(GenParticleLifetimeFilter_test, minLifetimeGreaterThanParticleLifetime_ex
const HepMC::FourVector endPos(0., 0., 0., 1.);
HepMC::GenVertex endVtx(endPos);
endVtx.add_particle_in(part);
+#ifdef HEPMC3
+ ASSERT_FALSE( m_filterTool->pass(part) ); // will fail as particle lifetime is only 1.0
+#else
ASSERT_FALSE( m_filterTool->pass(*part) ); // will fail as particle lifetime is only 1.0
+#endif
}
@@ -159,7 +176,11 @@ TEST_F(GenParticleLifetimeFilter_test, minLifetimeLessThanParticleLifetime_expec
const HepMC::FourVector endPos(0., 0., 0., 2.);
HepMC::GenVertex endVtx(endPos);
endVtx.add_particle_in(part);
+#ifdef HEPMC3
+ ASSERT_TRUE( m_filterTool->pass(part) ); // will pass as particle lifetime is 2.0
+#else
ASSERT_TRUE( m_filterTool->pass(*part) ); // will pass as particle lifetime is 2.0
+#endif
}
@@ -171,7 +192,11 @@ TEST_F(GenParticleLifetimeFilter_test, endVtxButNoProdVtx_expectNoPass) {
const HepMC::FourVector endPos(0., 0., 0., 2.);
HepMC::GenVertex endVtx(endPos);
endVtx.add_particle_in(part);
+#ifdef HEPMC3
+ ASSERT_FALSE( m_filterTool->pass(part) ); // will fail as prodVtx undefined
+#else
ASSERT_FALSE( m_filterTool->pass(*part) ); // will fail as prodVtx undefined
+#endif
}
} // namespace ISFTesting
diff --git a/Simulation/ISF/ISF_SimulationSelectors/src/ConeSimSelector.cxx b/Simulation/ISF/ISF_SimulationSelectors/src/ConeSimSelector.cxx
index d298c9de756c187a313b25b030c14985838878a8..1a89e4ae86e3c8a2bd284a5a49a85911c1fc3410 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/src/ConeSimSelector.cxx
+++ b/Simulation/ISF/ISF_SimulationSelectors/src/ConeSimSelector.cxx
@@ -142,7 +142,7 @@ void ISF::ConeSimSelector::update(const ISFParticle& particle)
}
// test whether any of the pdg codes is found in the genParticle history
- HepMC::ConstGenParticlePtr relative = HepMCHelper::findRealtiveWithPDG( *genParticle, m_relation, m_relatives);
+ HepMC::ConstGenParticlePtr relative = HepMCHelper::findRealtiveWithPDG( genParticle, m_relation, m_relatives);
if (relative)
{
diff --git a/Simulation/ISF/ISF_SimulationSelectors/src/TruthAssocSimSelector.cxx b/Simulation/ISF/ISF_SimulationSelectors/src/TruthAssocSimSelector.cxx
index 4bf6af110ea8935baa3c1501977481db28c3f91c..62fc69e8e6ed4c491ed33a7f0d97b6bf37c13769 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/src/TruthAssocSimSelector.cxx
+++ b/Simulation/ISF/ISF_SimulationSelectors/src/TruthAssocSimSelector.cxx
@@ -73,7 +73,7 @@ bool ISF::TruthAssocSimSelector::passSelectorCuts(const ISFParticle& particle)
if (genParticle)
{
// test whether any of the pdg codes is found in the genParticle history
- HepMC::ConstGenParticlePtr relative = HepMCHelper::findRealtiveWithPDG( *genParticle, m_relation, m_relatives);
+ HepMC::ConstGenParticlePtr relative = HepMCHelper::findRealtiveWithPDG( genParticle, m_relation, m_relatives);
// in case a relative was found
if (relative)
{
@@ -84,7 +84,7 @@ bool ISF::TruthAssocSimSelector::passSelectorCuts(const ISFParticle& particle)
<< " barcode=" << particle.barcode() << ")"
<< " passes due relative particle"
<< " (pdg=" << relative->pdg_id() << ","
- << " barcode=" << HepMC::barcode(*relative) << ")" );
+ << " barcode=" << HepMC::barcode(relative) << ")" );
// selector cuts passed
return true;
} // found relative
diff --git a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
index 1bf94188e53084c4a4143b2fb4c8766546e102c8..5fd42e4bc53bcff86931840b1dab4a65551a7dc1 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
@@ -421,10 +421,10 @@ if hasattr(runArgs,"AMITag"):
svcMgr.TagInfoMgr.ExtraTagValuePairs.update({"AMITag": runArgs.AMITag})
#==========================================================
-# Use LZIB for compression of temporary outputs of AthenaMP
+# Use ZLIB for compression of all temporary outputs
#==========================================================
from AthenaCommon.AppMgr import ServiceMgr as svcMgr; import AthenaPoolCnvSvc.AthenaPool
-if hasattr(runArgs, "outputRDOFile") and '_000' in runArgs.outputRDOFile:
+if hasattr(runArgs, "outputRDOFile") and ('_000' in runArgs.outputRDOFile or 'tmp.' in runArgs.outputRDOFile):
svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolRDOOutput()+ "'; COMPRESSION_ALGORITHM = '1'" ]
svcMgr.AthenaPoolCnvSvc.PoolAttributes += [ "DatabaseName = '" + athenaCommonFlags.PoolRDOOutput()+ "'; COMPRESSION_LEVEL = '1'" ]
diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.fcp.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.fcp.py
new file mode 100755
index 0000000000000000000000000000000000000000..c76ea87746e88136d48cde9eaac9fe7cfdbeeade
--- /dev/null
+++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.fcp.py
@@ -0,0 +1,76 @@
+#########################################################################
+# preInclude.fcp.py - Wendy Taylor 23 Jun 2011 #
+#########################################################################
+
+def load_files_for_fcp_scenario(MASS, CHARGE, X, Y):
+ import os, shutil, sys
+
+ CODE=int(20000000)+int(X)*1000+int(Y)*10
+ print("Trying to load %s, %s for particle with code %s" % (X, Y, CODE))
+
+ pdgLine1="M {code} {intmass}.E+03 +0.0E+00 -0.0E+00 fcp +\n".format(code=CODE,intmass=int(MASS))
+ pdgLine2="W {code} 0.E+00 +0.0E+00 -0.0E+00 fcp +\n".format(code=CODE)
+ particleLine1="{code} {intmass}.00 {fcharge} 0.0 # fcp\n".format(code=CODE,intmass=int(MASS), fcharge=float(CHARGE))
+ particleLine2="-{code} {intmass}.00 -{fcharge} 0.0 # fcpBar\n".format(code=CODE,intmass=int(MASS), fcharge=float(CHARGE))
+
+ pdgmod = os.path.isfile('PDGTABLE.MeV')
+ if pdgmod is True:
+ os.remove('PDGTABLE.MeV')
+ os.system('get_files -data PDGTABLE.MeV')
+ f=open('PDGTABLE.MeV','a')
+ f.writelines(str(pdgLine1))
+ f.writelines(str(pdgLine2))
+ f.close()
+ partmod = os.path.isfile('particles.txt')
+ if partmod is True:
+ os.remove('particles.txt')
+ f=open('particles.txt','w')
+ f.writelines(str(particleLine1))
+ f.writelines(str(particleLine2))
+ f.close()
+
+ del pdgLine1
+ del pdgLine2
+ del particleLine1
+ del particleLine2
+
+doG4SimConfig = True
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+import PyUtils.AthFile as af
+try:
+ f = af.fopen(athenaCommonFlags.FilesInput()[0])
+
+ if "StreamHITS" in f.infos["stream_names"]:
+ from Digitization.DigitizationFlags import digitizationFlags
+ simdict = digitizationFlags.specialConfiguration.get_Value()
+ doG4SimConfig = False
+ else:
+ from G4AtlasApps.SimFlags import simFlags
+ if not "InteractingPDGCodes" in simFlags.specialConfiguration.get_Value():
+ assert "CHARGE" in simFlags.specialConfiguration.get_Value()
+ assert "X" in simFlags.specialConfiguration.get_Value()
+ assert "Y" in simFlags.specialConfiguration.get_Value()
+ CODE=int(20000000)+int(simFlags.specialConfiguration.get_Value()["X"])*1000+int(simFlags.specialConfiguration.get_Value()["Y"])*10
+ simFlags.specialConfiguration.get_Value()['InteractingPDGCodes'] = str([CODE,-1*CODE])
+ simdict = simFlags.specialConfiguration.get_Value()
+except:
+ from G4AtlasApps.SimFlags import simFlags
+ simdict = simFlags.specialConfiguration.get_Value()
+
+assert "MASS" in simdict
+assert "CHARGE" in simdict
+assert "X" in simdict
+assert "Y" in simdict
+load_files_for_fcp_scenario(simdict["MASS"], simdict["CHARGE"], simdict["X"], simdict["Y"])
+
+if doG4SimConfig:
+ from G4AtlasApps import AtlasG4Eng
+ AtlasG4Eng.G4Eng.log.info("Unlocking simFlags.EquationOfMotion to reset the value for Monopole simulation.")
+ from G4AtlasApps.SimFlags import simFlags
+ simFlags.PhysicsOptions += ["MonopolePhysicsTool"]
+ # add monopole-specific configuration for looper killer
+ simFlags.OptionalUserActionList.addAction('G4UA::MonopoleLooperKillerTool')
+ # add default HIP killer
+ simFlags.OptionalUserActionList.addAction('G4UA::HIPKillerTool')
+
+del doG4SimConfig, simdict
diff --git a/Simulation/Tests/DigitizationTests/test/test_PileUpDigiComparison.sh b/Simulation/Tests/DigitizationTests/test/test_PileUpDigiComparison.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e97e3189f892316b5f3ffd8680d05340bc132758
--- /dev/null
+++ b/Simulation/Tests/DigitizationTests/test/test_PileUpDigiComparison.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# art-description: Run a digitization example to compare configuration between ConfGetter and the new ComponentAccumulator approch.
+# art-type: grid
+# art-include: master/Athena
+# art-output: mc16a_ttbar.CG.RDO.pool.root
+# art-output: mc16a_ttbar.CA.RDO.pool.root
+# art-output: log.*
+
+DigitizationPUConfigNew_test.py
+rc=$?
+echo "art-result: $rc CAdigi"
+
+DigiOutFileName="mc16d_ttbar.CG.RDO.pool.root"
+HighPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/*"
+LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
+
+rc2=-9999
+if [ $rc -eq 0 ]
+then
+ # config only
+ Digi_tf.py \
+ --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
+ --conditionsTag default:OFLCOND-MC16-SDR-20 \
+ --digiSeedOffset1 170 --digiSeedOffset2 170 \
+ --geometryVersion default:ATLAS-R2-2016-01-00-01 \
+ --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
+ --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} \
+ --jobNumber 1 \
+ --maxEvents 4 \
+ --numberOfCavernBkg 0 \
+ --numberOfHighPtMinBias 0.2099789464 \
+ --numberOfLowPtMinBias 80.290021063135 \
+ --outputRDOFile ${DigiOutFileName} \
+ --digiSteeringConf "StandardSignalOnlyTruth" \
+ --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' 'job+=CfgMgr.JobOptsDumperAlg(FileName="DigiPUConfigCG.txt")' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --pileupFinalBunch 6 \
+ --preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
+ --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py,RunDependentSimData/configLumi_run300000_mc16d.py' \
+ --skipEvents 0 \
+ --athenaopts '"--config-only=DigiPUConfigCG.pkl"'
+ # full run
+ Digi_tf.py \
+ --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
+ --conditionsTag default:OFLCOND-MC16-SDR-20 \
+ --digiSeedOffset1 170 --digiSeedOffset2 170 \
+ --geometryVersion default:ATLAS-R2-2016-01-00-01 \
+ --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
+ --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} \
+ --jobNumber 1 \
+ --maxEvents 4 \
+ --numberOfCavernBkg 0 \
+ --numberOfHighPtMinBias 0.2099789464 \
+ --numberOfLowPtMinBias 80.290021063135 \
+ --outputRDOFile ${DigiOutFileName} \
+ --digiSteeringConf "StandardSignalOnlyTruth" \
+ --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'condSeq.LArAutoCorrTotalCondAlg.deltaBunch=1' 'job+=CfgMgr.JobOptsDumperAlg(FileName="DigiPUConfigCG.txt")' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --pileupFinalBunch 6 \
+ --preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' \
+ --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py,RunDependentSimData/configLumi_run300000_mc16d.py' \
+ --skipEvents 0
+fi
+
+echo "art-result: $rc2 STdigi"
+
+rc3=-9999
+if [ $rc2 -eq 0 ]
+then
+ acmd.py diff-root mc16d_ttbar.CG.RDO.pool.root mc16d_ttbar.CA.RDO.pool.root --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_HITStoRDO_timings index_ref --error-mode resilient
+ rc3=$?
+fi
+
+echo "art-result: $rc3 comparison"
diff --git a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
index 173e660195c5a8f83d245a2b9a7f0afe9bb76613..29ed3a489040b87978ae51d6e507d481cf42d443 100644
--- a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
+++ b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
@@ -9,6 +9,9 @@
//
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/Flow.h"
+#include "AtlasHepMC/Polarization.h"
//
#include "InDetSimEvent/SiHit.h"
#include "MuonSimEvent/TGCSimHit.h"
@@ -203,8 +206,13 @@ StatusCode McEventCollectionFilter::ReduceMCEventCollection(){
const HepMC::FourVector& pmvxpos=hScatVx->position();
genVertex->set_position(pmvxpos);
//to set geantino kinematic phi=eta=0, E=p=E_hard_scat
+#ifdef HEPMC3
+ auto itrp = hScatVx->particles_in().begin();
+ if (hScatVx->particles_in().size()==2){
+#else
HepMC::GenVertex::particles_in_const_iterator itrp =hScatVx->particles_in_const_begin();
if (hScatVx->particles_in_size()==2){
+#endif
HepMC::FourVector mom1=(*itrp)->momentum();
HepMC::FourVector mom2=(*(++itrp))->momentum();
HepMC::FourVector vxmom;
@@ -217,6 +225,9 @@ StatusCode McEventCollectionFilter::ReduceMCEventCollection(){
}
}
+#ifdef HEPMC3
+ if(!evt->vertices().empty()) for (auto vtx: evt->vertices()) evt->remove_vertex(vtx);
+#else
if(!evt->vertices_empty()){
HepMC::GenEvent::vertex_iterator itvtx = evt->vertices_begin();
for (;itvtx != evt ->vertices_end(); ++itvtx ) {
@@ -225,6 +236,7 @@ StatusCode McEventCollectionFilter::ReduceMCEventCollection(){
delete vtx;
}
}
+#endif
//--------------------------------------
if(m_IsKeepTRTElect){
diff --git a/TestBeam/TBTPCnv/CMakeLists.txt b/TestBeam/TBTPCnv/CMakeLists.txt
index c0ee9e57d6a747a9f1026c9249f724551914809c..89c29ac376be97edcb5f34d44cd61420a74387ea 100644
--- a/TestBeam/TBTPCnv/CMakeLists.txt
+++ b/TestBeam/TBTPCnv/CMakeLists.txt
@@ -1,111 +1,37 @@
-################################################################################
-# Package: TBTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TBTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- TestBeam/TBEvent
- PRIVATE
- DetectorDescription/Identifier )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TBTPCnv
src/*.cxx
PUBLIC_HEADERS TBTPCnv
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBEvent AthenaPoolCnvSvcLib
+ LINK_LIBRARIES TBEvent AthenaPoolCnvSvcLib
PRIVATE_LINK_LIBRARIES Identifier )
atlas_add_dictionary( TBTPCnvDict
TBTPCnv/TBTPCnvDict.h
TBTPCnv/selection.xml
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TBEvent Identifier TBTPCnv )
-
-
-atlas_add_test( TBADCRawContCnv_p1_test
- SOURCES
- test/TBADCRawContCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBBPCCont_p1_test
- SOURCES
- test/TBBPCContCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBEventInfoCnv_p1_test
- SOURCES
- test/TBEventInfoCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBLArDigitContainerCnv_p1_test
- SOURCES
- test/TBLArDigitContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBMWPCContCnv_p1_test
- SOURCES
- test/TBMWPCContCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBPhaseCnv_p1_test
- SOURCES
- test/TBPhaseCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBScintillatorContCnv_p1_test
- SOURCES
- test/TBScintillatorContCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBTailCatcherCnv_p1_test
- SOURCES
- test/TBTailCatcherCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBTDCCnv_p1_test
- SOURCES
- test/TBTDCCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBTDCRawContCnv_p1_test
- SOURCES
- test/TBTDCRawContCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBTrackCnv_p1_test
- SOURCES
- test/TBTrackCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBTrackInfoCnv_p1_test
- SOURCES
- test/TBTrackInfoCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-atlas_add_test( TBTriggerPatternUnitCnv_p1_test
- SOURCES
- test/TBTriggerPatternUnitCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TBTPCnv )
-
-
-
+ LINK_LIBRARIES TBTPCnv )
+
+# Tests in the package:
+function( _add_test name )
+ atlas_add_test( ${name}
+ SOURCES test/${name}.cxx
+ LINK_LIBRARIES GaudiKernel TBTPCnv TestTools )
+endfunction( _add_test )
+
+_add_test( TBADCRawContCnv_p1_test )
+_add_test( TBBPCContCnv_p1_test )
+_add_test( TBEventInfoCnv_p1_test )
+_add_test( TBLArDigitContainerCnv_p1_test )
+_add_test( TBMWPCContCnv_p1_test )
+_add_test( TBPhaseCnv_p1_test )
+_add_test( TBScintillatorContCnv_p1_test )
+_add_test( TBTailCatcherCnv_p1_test )
+_add_test( TBTDCCnv_p1_test )
+_add_test( TBTDCRawContCnv_p1_test )
+_add_test( TBTrackCnv_p1_test )
+_add_test( TBTrackInfoCnv_p1_test )
+_add_test( TBTriggerPatternUnitCnv_p1_test )
diff --git a/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py b/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py
index 966587c1cb1157a7da141c5a747dc0054914da07..6dd69ed6f87bd027dc64435d9979b893a225b754 100644
--- a/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py
@@ -53,6 +53,11 @@ def TileInfoLoaderCfg(flags, **kwargs):
if G4V >= 10.0 :
EmScaleA = 33.7
+ # Value for G4 10.6 since September-2020
+ # see https://its.cern.ch/jira/browse/ATLASSIM-4401
+ if G4V >= 10.05 :
+ EmScaleA = 32.9
+
# Old value
if physicsList == 'QGSP_EMV' or physicsList == 'QGSP_BERT_EMV' or physicsList == '':
EmScaleA = 35.9
diff --git a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
index 45857ba68fdd448dc24f66be045949f82f5f2378..07368f70b3bcf4649388ec0ef56f6bb97456fc41 100644
--- a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
+++ b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
@@ -29,6 +29,7 @@ def createTileConfigFlags():
tcf.addFlag('Tile.doOverflowFit', True)
tcf.addFlag('Tile.zeroAmplitudeWithoutDigits', _zeroAmplitudeWithouDigits)
tcf.addFlag('Tile.correctPedestalDifference', _correctPedestalDifference)
+ tcf.addFlag('Tile.correctTimeJumps', _correctTimeJumps)
tcf.addFlag('Tile.RawChannelContainer', _getRawChannelContainer)
tcf.addFlag('Tile.useDCS', _useDCS)
tcf.addFlag('Tile.TimingType', _getTimingType)
@@ -106,6 +107,13 @@ def _correctPedestalDifference(prevFlags):
return False
+def _correctTimeJumps(prevFlags):
+ if not (prevFlags.Input.isMC or prevFlags.Overlay.DataOverlay) and prevFlags.Input.Format == 'BS':
+ return True
+ else:
+ return False
+
+
def _getRunType(prevFlags):
# Tile run types: UNDEFINED, PHY, PED, LAS, BILAS, CIS, MONOCIS
from AthenaConfiguration.AutoConfigFlags import GetFileMD
diff --git a/TileCalorimeter/TileEvent/TileEvent/ATLAS_CHECK_THREAD_SAFETY b/TileCalorimeter/TileEvent/TileEvent/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..902b81eba5b7b8b9f3081300de98d5f14781e9e4
--- /dev/null
+++ b/TileCalorimeter/TileEvent/TileEvent/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+TileCalorimeter/TileEvent
diff --git a/TileCalorimeter/TileEvent/src/TileCell.cxx b/TileCalorimeter/TileEvent/src/TileCell.cxx
index 8cd8fa5f4fbc726f3c06e9af813bdfde64ca44ba..8288c71f45ec82cd1412fa637706e3e10ff80eb8 100755
--- a/TileCalorimeter/TileEvent/src/TileCell.cxx
+++ b/TileCalorimeter/TileEvent/src/TileCell.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -30,7 +30,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
//=========================
// Constructors
diff --git a/TileCalorimeter/TileEvent/src/TileLaserObject.cxx b/TileCalorimeter/TileEvent/src/TileLaserObject.cxx
index 4df7013980786c4f5a5bc6763e6d4d9db5548653..37c2593c623476934045e1463b608e71ae5c7c50 100644
--- a/TileCalorimeter/TileEvent/src/TileLaserObject.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLaserObject.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*author Renato Febbraro*/
@@ -317,7 +317,7 @@ void TileLaserObject::setDiode(const unsigned int diode,
} // IF
}else{
// log<<MSG::ERROR<<"Exit code in method TileLaserObject::setDiode"<<endmsg;
- exit(0);
+ std::abort();
}
}
@@ -337,7 +337,7 @@ void TileLaserObject::setPmt(const unsigned int pmt,
} // IF
}else{
// log<<MSG::ERROR<<"Exit code in method TileLaserObject::setPmt"<<endmsg;
- exit(0);
+ std::abort();
}
}
diff --git a/TileCalorimeter/TileEvent/src/TileRawData.cxx b/TileCalorimeter/TileEvent/src/TileRawData.cxx
index 061f3d3121f037169f3976fc4188423432e2d3c0..a9f9336717999f9fe2b4cf35b7a0180157bd127c 100755
--- a/TileCalorimeter/TileEvent/src/TileRawData.cxx
+++ b/TileCalorimeter/TileEvent/src/TileRawData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -29,7 +29,9 @@
#include <iomanip>
// get cabling
-TileCablingService * s_cabling = TileCablingService::getInstance();
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileRawData::TileRawData( const Identifier& id )
: m_adc_hwid (s_cabling->s2h_adc_id(id))
diff --git a/TileCalorimeter/TileEvent/src/TileSimData.cxx b/TileCalorimeter/TileEvent/src/TileSimData.cxx
index 57caa20da6559481b0591cbb8f36cdc5b0aef034..ed4d69fe02be7f4e27ecfa96102a6383c6cf6e44 100755
--- a/TileCalorimeter/TileEvent/src/TileSimData.cxx
+++ b/TileCalorimeter/TileEvent/src/TileSimData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -27,7 +27,9 @@
#include <iostream>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileSimData::TileSimData( const Identifier& id ) : m_pmt_id( id )
{
diff --git a/TileCalorimeter/TileEvent/src/TileTTL1.cxx b/TileCalorimeter/TileEvent/src/TileTTL1.cxx
index 330074c6eda2ee235d95e205fb3bdcdf8c90ecea..bafe805f55b4f7f413b8ce3d24be329d2cd255d1 100755
--- a/TileCalorimeter/TileEvent/src/TileTTL1.cxx
+++ b/TileCalorimeter/TileEvent/src/TileTTL1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -27,7 +27,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileTTL1::TileTTL1( const Identifier& id,
const std::vector<float>& digits ) :
diff --git a/TileCalorimeter/TileEvent/src/TileTTL1Cell.cxx b/TileCalorimeter/TileEvent/src/TileTTL1Cell.cxx
index a8896e95f8bb1e9f93f74db00da3b90ca8c6b234..b10b1d047197e35adab380ce04f7d0e63bf2654e 100755
--- a/TileCalorimeter/TileEvent/src/TileTTL1Cell.cxx
+++ b/TileCalorimeter/TileEvent/src/TileTTL1Cell.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -30,7 +30,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
//=========================
// Constructors
diff --git a/TileCalorimeter/TileEvent/src/TileTrigger.cxx b/TileCalorimeter/TileEvent/src/TileTrigger.cxx
index d5f76e596e07c400ca65b37fb40bc4c0d97c26d3..f029661683afbd549dc78f4d1a13a2b8ef070ea2 100755
--- a/TileCalorimeter/TileEvent/src/TileTrigger.cxx
+++ b/TileCalorimeter/TileEvent/src/TileTrigger.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -27,7 +27,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileTrigger::TileTrigger(int id, const Identifier& mtid, double mtsum,
std::vector<Identifier>& boardtid, std::vector<double>& boardtsum,
diff --git a/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
index 8e063f7f7e23390bc83505a78717424c28b3476f..a3990be1f280ddce238da1270156113e396f7511 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableBeamElemContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -247,7 +248,7 @@ void test1()
int main()
{
std::cout << "TileMutableBeamElemContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
index 56e58dece28c2ecc0ade3b4e0392b3351d634922..ee0aed60ff2d6762967e0972a2c3f63df3a1ad21 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/testTileMutableDataContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -27,16 +25,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -247,7 +248,7 @@ void test1()
int main()
{
std::cout << "TileMutableDataContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
index 426215257e0b31fe23e113ae632f6903e0d9567b..c14b0983f9dc6079ffd01f15c97f70bcd551677b 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableDigitsContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,20 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -265,7 +267,7 @@ void test1()
int main()
{
std::cout << "TileMutableDigitsContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
index 7932cf21060feb4ac95df023ec18aa1327ef7081..6106657ab3c5599c3445f09b83ffd9f17f7c4698 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableHitContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -236,7 +237,7 @@ void test1()
int main()
{
std::cout << "TileMutableHitContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
index 10c14c6f0c76b1e75b986450be75cae5e2eef59b..820a30ae4d69cd8f737bcb409ac69ae881e17f27 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableRawChannelContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -283,7 +284,7 @@ void test1()
int main()
{
std::cout << "TileMutableRawChannelContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileMonitoring/CMakeLists.txt b/TileCalorimeter/TileMonitoring/CMakeLists.txt
index 63fa307b2d3212f157038132d79a917f295de7fb..c2ef7632ef60f0c1a6a7098c86642cbf36a4f19d 100644
--- a/TileCalorimeter/TileMonitoring/CMakeLists.txt
+++ b/TileCalorimeter/TileMonitoring/CMakeLists.txt
@@ -89,6 +89,11 @@ atlas_add_test( TileMuonFitMonitorAlgorithm_test
PROPERTIES TIMEOUT 600
POST_EXEC_SCRIPT nopost.sh)
+atlas_add_test( TileRODMonitorAlgorithm_test
+ SCRIPT python -m TileMonitoring.TileRODMonitorAlgorithm
+ PROPERTIES TIMEOUT 600
+ POST_EXEC_SCRIPT nopost.sh)
+
atlas_add_test( TileMonitoringConfig_test
SCRIPT python -m TileMonitoring.TileMonitoringConfig
PROPERTIES TIMEOUT 300
diff --git a/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py b/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py
index 418bfb06bad58c09313c07830d732252b922f7d1..72312f926ff4945d6447c5080348ad8c542f8754 100644
--- a/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py
+++ b/TileCalorimeter/TileMonitoring/python/TileMonitoringCfgHelper.py
@@ -23,6 +23,9 @@ _partitionName = {0: 'AUX', 1 : 'LBA', 2 : 'LBC', 3 : 'EBA', 4 : 'EBC', 5 : 'All
_gainName = {0 : 'LG', 1 : 'HG'}
_sampleName = {0 : 'SampA', 1 : 'SampB', 2 : 'SampD', 3 : 'SampE', 4 : 'AllSamp'}
+_cellNameTMDB_LB = ["D0", "D1L", "D1R", "D2R", "D2L", "D3L", "D3R", ""]
+_cellNameTMDB_EB = ["D5L", "D5R", "D6L", "D6R"]
+
def getCellName(partition, channel):
'''
This function returns name of Tile cell for given partition and channel.
@@ -188,6 +191,13 @@ def getLabels(labels, partition = ''):
return labels
+def getCellNameTMDB(partition, channel):
+ return _cellNameTMDB_LB[channel] if partition.startswith('L') else _cellNameTMDB_EB[channel]
+
+def getCellChannelTMDB_Labels(partition):
+ return _cellNameTMDB_LB if partition.startswith('L') else _cellNameTMDB_EB
+
+
def addValueVsModuleAndChannelMaps(group, name, title, path, subDirectory = False, type = 'TH2D', value = '', trigger = '', run = ''):
'''
This function configures 2D histograms (maps) with Tile monitored value vs module and channel per partion.
@@ -575,3 +585,48 @@ def addTileModuleArray(helper, algorithm, name, title, path,
xbins = Tile.MAX_DRAWER, xmin = -0.5, xmax = Tile.MAX_DRAWER - 0.5,
run = run, triggers = triggers, subDirectory = subDirectory,
xlabels = ('modules'), perPartition = True, separator = separator )
+
+
+
+def addTileTMDB_2DHistogramsArray(helper, algorithm, name = '', value = '',
+ title = '', path = '', type = 'TH2D', run = ''):
+
+ array = helper.addArray([int(Tile.MAX_ROS - 1)], algorithm, name)
+ for postfix, tool in array.Tools.items():
+ ros = int(postfix.split('_').pop()) + 1
+
+ partition = getPartitionName(ros)
+ nxlabels = getModuleLabels(partition)
+ nylabels = getCellChannelTMDB_Labels(partition)
+ ybins = len(nylabels)
+
+ fullName = 'module,channel' + (',' + value if 'Profile' in type else '') + ';'
+ fullName += getTileHistogramName(name, partition = partition)
+
+ fullTitle = getTileHistogramTitle(title, run = run, partition = partition)
+
+ tool.defineHistogram( fullName, path = path, type = type, title = fullTitle,
+ xlabels = nxlabels, ylabels = nylabels,
+ xbins = Tile.MAX_DRAWER, xmin = -0.5, xmax = Tile.MAX_DRAWER - 0.5,
+ ybins = ybins, ymin = -0.5, ymax = ybins - 0.5)
+
+
+
+def addTileTMDB_1DHistogramsArray(helper, algorithm, name = '', xvalue = '', value = '', title = '',
+ path = '', xbins = 0, xmin = 0, xmax = 0, type = 'TH1D', run = ''):
+
+ for ros in range(1, Tile.MAX_ROS):
+ partition = getPartitionName(ros)
+ histName = "{}_{}".format(name, partition)
+ nChannels = len(_cellNameTMDB_LB) if partition.startswith('L') else len(_cellNameTMDB_EB)
+ array = helper.addArray([nChannels], algorithm, histName)
+ for postfix, tool in array.Tools.items():
+ channel = int(postfix.split('_').pop())
+
+ fullName = xvalue + (',' + value if 'Profile' in type else '') + ';'
+ fullName += histName + '_' + getCellNameTMDB(partition, channel)
+
+ fullTitle = getTileHistogramTitle(title, run = run, partition = partition)
+
+ tool.defineHistogram( fullName, path = path, type = type, title = fullTitle,
+ xbins = xbins, xmin = xmin, xmax = xmax)
\ No newline at end of file
diff --git a/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py
index e63686d0163f1f106c0974aec14d1c0ef69eef1e..ed69925e3d4c6dc85cf81a57b89308132eecfdda 100644
--- a/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileMuIdMonitorAlgorithm.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
'''
@file TileMuIdMonitorAlgorithm.py
@@ -14,6 +14,12 @@ def TileMuIdMonitoringConfig(flags, **kwargs):
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
result = ComponentAccumulator()
+ from TileGeoModel.TileGMConfig import TileGMCfg
+ result.merge(TileGMCfg(flags))
+
+ from LArGeoAlgsNV.LArGMConfig import LArGMCfg
+ result.merge(LArGMCfg(flags))
+
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
from AthenaMonitoring import AthMonitorCfgHelper
diff --git a/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
new file mode 100644
index 0000000000000000000000000000000000000000..fcaf3497604c8d0a7da837072fdea1c9b99b60b9
--- /dev/null
+++ b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
@@ -0,0 +1,215 @@
+#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+'''
+@file TileRODMonitorAlgorithm.py
+@brief Python configuration of TileRODMonitorAlgorithm algorithm for the Run III
+'''
+
+def TileRODMonitoringConfig(flags, **kwargs):
+ ''' Function to configure TileRODMonitorAlgorithm algorithm in the monitoring system.'''
+
+ # Define one top-level monitoring algorithm. The new configuration
+ # framework uses a component accumulator.
+ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+ result = ComponentAccumulator()
+
+ from TileRecUtils.TileDQstatusConfig import TileDQstatusAlgCfg
+ result.merge( TileDQstatusAlgCfg(flags) )
+
+ from TileGeoModel.TileGMConfig import TileGMCfg
+ result.merge(TileGMCfg(flags))
+
+ from TileConditions.TileCablingSvcConfig import TileCablingSvcCfg
+ result.merge( TileCablingSvcCfg(flags) )
+
+ from TileConditions.TileBadChannelsConfig import TileBadChannelsCondAlgCfg
+ result.merge( TileBadChannelsCondAlgCfg(flags, **kwargs) )
+
+ kwargs.setdefault('CheckDCS', flags.Tile.useDCS)
+ if kwargs['CheckDCS']:
+ from TileConditions.TileDCSConfig import TileDCSCondAlgCfg
+ result.merge( TileDCSCondAlgCfg(flags) )
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+
+ kwargs.setdefault('fillRODFragmentSizeHistograms', True)
+ fillRODFragmentSizeHistograms = kwargs['fillRODFragmentSizeHistograms']
+ if fillRODFragmentSizeHistograms:
+ result.addService(CompFactory.ROBDataProviderSvc())
+
+ # The following class will make a sequence, configure algorithms, and link
+ # them to GenericMonitoringTools
+ from AthenaMonitoring import AthMonitorCfgHelper
+ helper = AthMonitorCfgHelper(flags,'TileRODMonitoring')
+
+ # Adding an TileRODMonitorAlgorithm algorithm to the helper
+ tileRODMonAlg = helper.addAlgorithm(CompFactory.TileRODMonitorAlgorithm, 'TileRODMonAlg')
+
+ # L1Trigger Type Bits:
+ # bit0_RNDM, bit1_ZeroBias, bit2_L1Cal, bit3_Muon,
+ # bit4_RPC, bit5_FTK, bit6_CTP, bit7_Calib, AnyPhysTrig
+ kwargs.setdefault('fillHistogramsForL1Triggers', ['AnyPhysTrig', 'bit7_Calib'])
+ l1Triggers = kwargs['fillHistogramsForL1Triggers']
+
+ kwargs.setdefault('EnergyThreshold', 300.)
+ energyThreshold = kwargs['EnergyThreshold']
+
+ kwargs.setdefault('TileRawChannelContainer', flags.Tile.RawChannelContainer)
+ kwargs.setdefault('NumberOfROBFragmets', 32)
+ nROBs = kwargs['NumberOfROBFragmets']
+
+ for k, v in kwargs.items():
+ setattr(tileRODMonAlg, k, v)
+
+ run = str(flags.Input.RunNumber[0])
+
+ # Configure histogram with TileRODMonAlg algorithm execution time
+ executeTimeGroup = helper.addGroup(tileRODMonAlg, 'TileRODMonExecuteTime', 'Tile/')
+ executeTimeGroup.defineHistogram('TIME_execute', path = 'ROD', type='TH1F',
+ title = 'Time for execute TileRODMonAlg algorithm;time [#ms]',
+ xbins = 100, xmin = 0, xmax = 100000)
+
+
+ from TileMonitoring.TileMonitoringCfgHelper import addTile1DHistogramsArray
+
+ # Configure histograms with relative difference between Tile DSP and offline energies
+ titleEnergyDiff = 'Relative difference between E_{DSP} and E_{OFFLINE}'
+ titleEnergyDiff += ';(E_{DSP}- E_{OFFLINE})/E_{OFFLINE}'
+ addTile1DHistogramsArray(helper, tileRODMonAlg, name = 'TileDspEnergyDiff',
+ xvalue = 'energyDiff', title = titleEnergyDiff, path = 'Tile/ROD',
+ xbins = 41, xmin = -0.205, xmax = 0.205, type = 'TH1D', run = run,
+ triggers = l1Triggers, perPartition = True)
+
+ # Configure histograms with difference between Tile DSP and offline times
+ titleTimeDiff = 'Difference between t_{DSP} and t_{OFFLINE}'
+ titleTimeDiff += ';t_{DSP}- t_{OFFLINE} [ns]'
+ addTile1DHistogramsArray(helper, tileRODMonAlg, name = 'TileDspTimeDiff',
+ xvalue = 'timeDiff', title = titleTimeDiff, path = 'Tile/ROD',
+ xbins = 101, xmin = -50.5, xmax = 50.5, type = 'TH1D', run = run,
+ triggers = l1Triggers, perPartition = True)
+
+ # Configure histograms with difference between Tile DSP and offline times vs offline time
+ titleTimeDiffVsTime = 'Difference between t_{DSP} and t_{OFFLINE}'
+ titleTimeDiffVsTime += ';t_{OFFLINE} [ns];t_{DSP}- t_{OFFLINE} [ns]'
+ addTile1DHistogramsArray(helper, tileRODMonAlg, name = 'TileDspTimeDiffVsTime',
+ xvalue = 'time', value = 'timeDiff', title = titleTimeDiffVsTime,
+ path = 'Tile/ROD', xbins = 51, xmin = -25.5, xmax = 25.5,
+ type = 'TProfile', run = run, triggers = l1Triggers, perPartition = True)
+
+ # Configure histograms with difference between Tile DSP and offline times vs offline energy
+ titleTimeDiffVsEnergy = 'Difference between t_{DSP} and t_{OFFLINE}'
+ titleTimeDiffVsEnergy += ';E_{OFFLINE} [MeV];t_{DSP}- t_{OFFLINE}'
+ addTile1DHistogramsArray(helper, tileRODMonAlg, name = 'TileDspTimeDiffVsEnergy',
+ xvalue = 'energy', value = 'timeDiff', title = titleTimeDiffVsEnergy,
+ path = 'Tile/ROD', xbins = 75, xmin = energyThreshold, xmax = 15000.,
+ type = 'TProfile', run = run, triggers = l1Triggers, perPartition = True)
+
+
+ from TileMonitoring.TileMonitoringCfgHelper import addTile2DHistogramsArray
+
+ # Configure histograms with relative difference between Tile DSP and offline energies vs offline time
+ titleEnergyDiffVsTime = 'Relative difference between E_{DSP} and E_{OFFLINE}'
+ titleEnergyDiffVsTime += ';t_{DSP} [ns];(E_{DSP}- E_{OFFLINE})/E_{OFFLINE}'
+ addTile2DHistogramsArray(helper, tileRODMonAlg, name = 'TileDspEnergyDiffVsTime',
+ xvalue = 'time', yvalue = 'energyDiff',
+ title = titleEnergyDiffVsTime, path = 'Tile/ROD',
+ xbins = 51, xmin = -25.5, xmax = 25.5,
+ ybins = 30, ymin = -0.35, ymax = 0.1,
+ type = 'TH2D', run = run, triggers = l1Triggers, perPartition = True)
+
+ # Configure histograms with relative difference between Tile DSP and offline energies vs offline energy
+ titleEnergyDiffVsEnergy = 'Relative difference between E_{DSP} and E_{OFFLINE}'
+ titleEnergyDiffVsEnergy += ';E_{OFFLINE} [MeV];(E_{DSP}- E_{OFFLINE})/E_{OFFLINE}'
+ addTile2DHistogramsArray(helper, tileRODMonAlg, name = 'TileDspEnergyDiffVsEnergy',
+ xvalue = 'energy', yvalue = 'energyDiff',
+ title = titleEnergyDiffVsEnergy, path = 'Tile/ROD',
+ xbins = 75, xmin = energyThreshold, xmax = 15000.,
+ ybins = 82, ymin = -0.205, ymax = 0.205,
+ type = 'TH2D', run = run, triggers = l1Triggers, perPartition = True)
+
+
+ from TileMonitoring.TileMonitoringCfgHelper import addTileModuleChannelMapsArray
+
+ # Configure histograms with everagy Tile channel time per partition
+ titleChanTime = ('Tile DSP Channel Time (t_{DSP}) [ns], E_{ch} > %s MeV' % energyThreshold)
+ addTileModuleChannelMapsArray(helper, tileRODMonAlg, name = 'TileDspChannelTime', type = 'TProfile2D',
+ value = 'time', title = titleChanTime, path = 'Tile/ROD',
+ run = run, triggers = l1Triggers, separator = '_')
+
+
+ if fillRODFragmentSizeHistograms:
+ # Configure histogram with all Tile ROD fragments size vs luminosity block
+ titleAllRodFragSize = 'All Tile ROD fragments size vs luminosity block;LumiBlock;# words'
+ addTile1DHistogramsArray(helper, tileRODMonAlg, name = 'TileRodFragmentSizeLB',
+ xvalue = 'lumiBlock', value = 'allRodFragsSize',
+ title = titleAllRodFragSize, path = 'Tile/ROD',
+ xbins = 1000, xmin = -0.5, xmax = 999.5,
+ type = 'TProfile', run = run, triggers = l1Triggers,
+ perPartition = False, opt = 'kAddBinsDynamically')
+
+ from TileCalibBlobObjs.Classes import TileCalibUtils as Tile
+ from TileMonitoring.TileMonitoringCfgHelper import getPartitionName
+
+ # Configure histogram with Tile ROD fragment size vs fragment number and partition
+ titleRodFragSize = 'Tile ROD fragment size [word]; Fragment;'
+ partitionLabels = [getPartitionName(ros) for ros in range(1, Tile.MAX_ROS)]
+ addTile2DHistogramsArray(helper, tileRODMonAlg, name = 'TileRodFragmentMapSize',
+ xvalue = 'fragment', yvalue = 'partition', value = 'rodFragSize',
+ title = titleRodFragSize, path = 'Tile/ROD',
+ xbins = nROBs, xmin = -0.5, xmax = nROBs - 0.5,
+ ybins = Tile.MAX_ROS - 1, ymin = 0.5, ymax = Tile.MAX_ROS - 0.5,
+ type = 'TProfile2D', run = run, triggers = l1Triggers, ylabels = partitionLabels)
+
+
+ accumalator = helper.result()
+ result.merge(accumalator)
+ return result
+
+if __name__=='__main__':
+
+ # Setup the Run III behavior
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior = True
+
+ # Setup logs
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import INFO
+ log.setLevel(INFO)
+
+ # Set the Athena configuration flags
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
+ ConfigFlags.Output.HISTFileName = 'TileRODMonitorOutput.root'
+ ConfigFlags.DQ.useTrigger = False
+ ConfigFlags.DQ.enableLumiAccess = False
+ ConfigFlags.Tile.doOptATLAS = True
+ ConfigFlags.Exec.MaxEvents = 3
+ ConfigFlags.fillFromArgs()
+ ConfigFlags.lock()
+
+ # Initialize configuration object, add accumulator, merge, and run.
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ cfg = MainServicesCfg(ConfigFlags)
+
+ from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
+ tileTypeNames = ['TileRawChannelContainer/TileRawChannelCnt', 'TileDigitsContainer/TileDigitsCnt']
+ cfg.merge( ByteStreamReadCfg(ConfigFlags, type_names = tileTypeNames) )
+
+ from TileRecUtils.TileRawChannelMakerConfig import TileRawChannelMakerCfg
+ cfg.merge( TileRawChannelMakerCfg(ConfigFlags) )
+
+ cfg.merge( TileRODMonitoringConfig(ConfigFlags) )
+
+ cfg.printConfig(withDetails = True, summariseProps = True)
+ ConfigFlags.dump()
+
+ cfg.store( open('TileRODMonitorAlgorithm.pkl','wb') )
+
+ sc = cfg.run()
+
+ import sys
+ # Success should be 0
+ sys.exit(not sc.isSuccess())
diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
new file mode 100644
index 0000000000000000000000000000000000000000..e056dc41f0c1e03ec141033a19787e2ee7a6f5af
--- /dev/null
+++ b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
@@ -0,0 +1,115 @@
+#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+
+'''@file TileTMDBDigitsMonitorAlgorithm.py
+@author
+@date
+@brief Python configuration of TileTMDBDigitsMonitorAlgorithm algorithm for the Run III
+'''
+
+def TileTMDBDigitsMonitoringConfig(flags):
+ '''Function to configures some algorithms in the monitoring system.'''
+ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+ result = ComponentAccumulator()
+
+ from TileConditions.TileCablingSvcConfig import TileCablingSvcCfg
+ result.merge( TileCablingSvcCfg(flags) )
+
+ from AthenaMonitoring import AthMonitorCfgHelper
+ helper = AthMonitorCfgHelper(flags, 'TileTMDBDigitsMonitoring')
+
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ tileTMDBDigitsMonAlg = helper.addAlgorithm(CompFactory.TileTMDBDigitsMonitorAlgorithm, 'TileTMDBDigitsMonAlg')
+
+ tileTMDBDigitsMonAlg.TriggerChain = ''
+
+
+ run = str(flags.Input.RunNumber[0])
+ from TileMonitoring.TileMonitoringCfgHelper import addTileTMDB_1DHistogramsArray, addTileTMDB_2DHistogramsArray
+
+
+
+
+ addTileTMDB_2DHistogramsArray(helper, tileTMDBDigitsMonAlg, name = 'TMDBDigitsPedestal',
+ value = 'pedestal', title = 'Mean pedestal (sample[0])',
+ path = 'Tile/TMDBDigits', type='TProfile2D', run = run)
+
+ addTileTMDB_2DHistogramsArray(helper, tileTMDBDigitsMonAlg, name = 'TMDBDigitsAmplitude',
+ value = 'amplitude', title = 'Difference between maximum and minimum sample',
+ path = 'Tile/TMDBDigits', type='TProfile2D', run = run)
+
+ addTileTMDB_2DHistogramsArray(helper, tileTMDBDigitsMonAlg, name = 'TMDBDigitsHFN',
+ value = 'HFN', title = 'Mean RMS of 7 samples (HFN)',
+ path = 'Tile/TMDBDigits', type='TProfile2D', run = run)
+
+
+ addTileTMDB_1DHistogramsArray(helper, tileTMDBDigitsMonAlg, name = 'TMDBDigitsCellPedestal',
+ xvalue = 'pedestal', title = 'Pedestal (sample[0]);[ADC]',
+ path = 'Tile/TMDBDigits', type='TH1D', run = run,
+ xbins = 101, xmin = -0.5, xmax = 100.5)
+
+ addTileTMDB_1DHistogramsArray(helper, tileTMDBDigitsMonAlg, name = 'TMDBDigitsCellHFN',
+ xvalue = 'HFN', title = 'Mean RMS (HFN);[ADC]',
+ path = 'Tile/TMDBDigits', type='TH1D', run = run,
+ xbins = 41, xmin = -0.5, xmax = 40.5)
+
+ addTileTMDB_1DHistogramsArray(helper, tileTMDBDigitsMonAlg, name = 'TMDBDigitsCellAmplitude',
+ xvalue = 'amplitude', title = 'Difference between maximum and minimum sample;[ADC]',
+ path = 'Tile/TMDBDigits', type='TH1D', run = run,
+ xbins = 101, xmin = -0.5, xmax = 100.5)
+
+
+ accumalator = helper.result()
+ result.merge(accumalator)
+ return result
+
+
+
+if __name__=='__main__':
+ # Setup the Run III behavior
+ from AthenaCommon.Configurable import Configurable
+ Configurable.configurableRun3Behavior = 1
+
+ # Setup logs
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import INFO
+ log.setLevel(INFO)
+
+ # Set the Athena configuration flags
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+ ConfigFlags.Input.Files = defaultTestFiles.RAW
+ ConfigFlags.Output.HISTFileName = 'TileTMDBDigitsMonitorOutput.root'
+ ConfigFlags.DQ.useTrigger = False
+ ConfigFlags.DQ.enableLumiAccess = False
+
+ ConfigFlags.lock()
+
+ # Initialize configuration object, add accumulator, merge, and run.
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ cfg = MainServicesCfg(ConfigFlags)
+
+
+ from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
+ tileTypeNames = ['TileDigitsContainer/MuRcvDigitsCnt']
+ cfg.merge( ByteStreamReadCfg(ConfigFlags, type_names = tileTypeNames) )
+
+
+
+ tileTMDBDigitsMonitorAccumulator = TileTMDBDigitsMonitoringConfig(ConfigFlags)
+
+ cfg.merge(tileTMDBDigitsMonitorAccumulator)
+
+ cfg.printConfig(withDetails = True, summariseProps = True)
+ ConfigFlags.dump()
+
+
+ cfg.store( open('TileTMDBDigitsMonitorAlgorithm.pkl','wb') )
+
+ sc = cfg.run(maxEvents=-1)
+
+ import sys
+ sys.exit(not sc.isSuccess())
diff --git a/TileCalorimeter/TileMonitoring/src/TileRODMonitorAlgorithm.cxx b/TileCalorimeter/TileMonitoring/src/TileRODMonitorAlgorithm.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..663ce8b9fe92c2251ab78b491817174e4cff305c
--- /dev/null
+++ b/TileCalorimeter/TileMonitoring/src/TileRODMonitorAlgorithm.cxx
@@ -0,0 +1,333 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "TileRODMonitorAlgorithm.h"
+#include "TileIdentifier/TileHWID.h"
+#include "TileCalibBlobObjs/TileCalibUtils.h"
+
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/ReadCondHandle.h"
+
+StatusCode TileRODMonitorAlgorithm::initialize() {
+
+ ATH_MSG_DEBUG("in initialize()");
+
+ // initialize superclass
+ ATH_CHECK( TileMonitorAlgorithm::initialize() );
+
+ std::sort(m_fragIDsToIgnoreDMUerrors.begin(), m_fragIDsToIgnoreDMUerrors.end());
+
+ ATH_CHECK( detStore()->retrieve(m_tileHWID) );
+
+ ATH_CHECK( m_cablingSvc.retrieve() );
+ m_cabling = m_cablingSvc->cablingService();
+
+ ATH_CHECK( m_rawChannelContainerKey.initialize() );
+ ATH_CHECK( m_dspRawChannelContainerKey.initialize() );
+ ATH_CHECK( m_DQstatusKey.initialize() );
+ ATH_CHECK( m_badChannelsKey.initialize() );
+ ATH_CHECK( m_emScaleKey.initialize() );
+ ATH_CHECK( m_DCSStateKey.initialize(m_checkDCS) );
+
+ if (m_comparisonUnit <= TileRawChannelUnit::OnlineMegaElectronVolts) {
+ m_finalRawChannelUnit = static_cast<TileRawChannelUnit::UNIT>(m_comparisonUnit.value());
+ }
+
+ if (m_timeRange.size() != 2) {
+ ATH_MSG_FATAL( "Size of TimeRange should be 2 (from,to), but is " << m_timeRange.size() );
+ return StatusCode::FAILURE;
+ }
+
+ using namespace Monitored;
+ using Tile = TileCalibUtils;
+
+ int nL1Triggers = getNumberOfL1Triggers();
+
+ m_energyDiffGroups = buildToolMap<std::vector<int>>(m_tools, "TileDspEnergyDiff",
+ Tile::MAX_ROS - 1, nL1Triggers);
+
+ m_energyDiffVsTimeGroups = buildToolMap<std::vector<int>>(m_tools, "TileDspEnergyDiffVsTime",
+ Tile::MAX_ROS - 1, nL1Triggers);
+
+ m_energyDiffVsEnergyGroups = buildToolMap<std::vector<int>>(m_tools, "TileDspEnergyDiffVsEnergy",
+ Tile::MAX_ROS - 1, nL1Triggers);
+
+ m_timeDiffGroups = buildToolMap<std::vector<int>>(m_tools, "TileDspTimeDiff",
+ Tile::MAX_ROS - 1, nL1Triggers);
+
+ m_timeDiffVsTimeGroups = buildToolMap<std::vector<int>>(m_tools, "TileDspTimeDiffVsTime",
+ Tile::MAX_ROS - 1, nL1Triggers);
+
+ m_timeDiffVsEnergyGroups = buildToolMap<std::vector<int>>(m_tools, "TileDspTimeDiffVsEnergy",
+ Tile::MAX_ROS - 1, nL1Triggers);
+
+ m_dspChanTimeGroups = buildToolMap<std::vector<int>>(m_tools, "TileDspChannelTime",
+ Tile::MAX_ROS - 1, nL1Triggers);
+
+ if (m_fillRODfragSizeHistograms) {
+ ATH_CHECK( m_robSvc.retrieve() );
+
+ if (m_nROBs > MAX_TILE_ROBS) {
+ int nROBsSetUp = m_nROBs;
+ m_nROBs = MAX_TILE_ROBS;
+ ATH_MSG_INFO( "Decreasing number of ROBs from " << nROBsSetUp << " to " << m_nROBs );
+ }
+
+ m_tileRobIds.reserve((Tile::MAX_ROS - 1) * m_nROBs); // Partitions * fragments
+ for (unsigned int rodId : {0x510000, 0x520000, 0x530000, 0x540000}) {
+ for (unsigned int fragment = 0; fragment < m_nROBs; ++fragment) {
+ m_tileRobIds.push_back(rodId + fragment);
+ }
+ }
+
+ m_rodFragSizeMapGroups = buildToolMap<int>(m_tools, "TileRodFragmentMapSize", nL1Triggers);
+ m_rodFragSizeLBGroups = buildToolMap<int>(m_tools, "TileRodFragmentSizeLB", nL1Triggers);
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode TileRODMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const {
+
+ using Tile = TileCalibUtils;
+
+ // In case you want to measure the execution time
+ auto timer = Monitored::Timer("TIME_execute");
+
+ const xAOD::EventInfo* eventInfo = GetEventInfo(ctx).get();
+
+ ATH_MSG_DEBUG(*eventInfo);
+
+ const TileDQstatus* dqStatus = SG::makeHandle(m_DQstatusKey, ctx).get();
+ const TileDCSState* dcsState = m_checkDCS ? SG::ReadCondHandle(m_DCSStateKey, ctx).cptr() : nullptr;
+
+ SG::ReadCondHandle<TileBadChannels> badChannels(m_badChannelsKey, ctx);
+ SG::ReadCondHandle<TileEMScale> emScale(m_emScaleKey, ctx);
+
+ SG::ReadHandle<TileRawChannelContainer> rawChannelContainer(m_rawChannelContainerKey, ctx);
+ ATH_CHECK( rawChannelContainer.isValid() );
+
+ TileRawChannelUnit::UNIT rawChannelUnit = rawChannelContainer->get_unit();
+
+ float referenceTimes[Tile::MAX_ROS - 1][Tile::MAX_DRAWER][Tile::MAX_CHAN] = {{{0}}};
+ float referenceEnergies[Tile::MAX_ROS - 1][Tile::MAX_DRAWER][Tile::MAX_CHAN] = {{{0}}};
+
+ for (const TileRawChannelCollection* rawChannelCollection : *rawChannelContainer) {
+ if (rawChannelCollection->empty() ) continue;
+
+ HWIdentifier adc_id = rawChannelCollection->front()->adc_HWID();
+ int ros = m_tileHWID->ros(adc_id);
+ int drawer = m_tileHWID->drawer(adc_id);
+ unsigned int drawerIdx = TileCalibUtils::getDrawerIdx(ros, drawer);
+ int partition = ros - 1;
+
+ bool checkDQ = true;
+
+ int fragId = rawChannelCollection->identify();
+ if (std::binary_search(m_fragIDsToIgnoreDMUerrors.begin(), m_fragIDsToIgnoreDMUerrors.end(), fragId)) {
+ checkDQ = false;
+ }
+
+ for (const TileRawChannel* rawChannel : *rawChannelCollection) {
+
+ adc_id = rawChannel->adc_HWID();
+ int channel = m_tileHWID->channel(adc_id);
+ int adc = m_tileHWID->adc(adc_id);
+
+ if (m_cabling->isDisconnected(ros, drawer, channel)) {
+ ATH_MSG_VERBOSE(m_tileHWID->to_string(adc_id) << ": channlel is disconnected => skipping!");
+ continue;
+ }
+
+ if (checkDQ && !(dqStatus->isAdcDQgood(ros, drawer, channel, adc))) {
+ ATH_MSG_VERBOSE(m_tileHWID->to_string(adc_id) << ": DQ is BAD => skipping!");
+ continue;
+ }
+
+ if (m_checkDCS && dcsState->isStatusBad(ros, drawer, channel)) {
+ ATH_MSG_VERBOSE(m_tileHWID->to_string(adc_id) << ": DCS is Bad => skipping!");
+ continue;
+ }
+
+ if (badChannels->getAdcStatus(adc_id).isBad()) {
+ ATH_MSG_VERBOSE(m_tileHWID->to_string(adc_id) << ": Status is BAD => skipping!");
+ continue;
+ }
+
+ if (ros > 2) { // Check if channel is MBTS, no MBTS in LB
+ int pmt;
+ int index;
+ m_cabling->h2s_cell_id_index(adc_id, index, pmt);
+ if (index < -1) {
+ ATH_MSG_VERBOSE(m_tileHWID->to_string(adc_id) << ": MBTS => skipping!");
+ continue;
+ }
+ }
+
+ float amplitude = rawChannel->amplitude();
+ if (rawChannelUnit != m_comparisonUnit) {
+ amplitude = emScale->calibrateChannel(drawerIdx, channel, adc, amplitude, rawChannelUnit, m_finalRawChannelUnit);
+ }
+
+ float time = rawChannel->uncorrTime();
+ if (amplitude > m_energyThreshold && time > m_timeRange[0] && time < m_timeRange[1]) {
+ referenceEnergies[partition][drawer][channel] = amplitude;
+ referenceTimes[partition][drawer][channel] = time;
+ }
+ }
+ }
+
+ std::vector<float> timeDiffs[Tile::MAX_ROS - 1];
+ std::vector<float> energyDiffs[Tile::MAX_ROS - 1];
+ std::vector<float> offlineEnergies[Tile::MAX_ROS - 1];
+ std::vector<float> offlineTimes[Tile::MAX_ROS - 1];
+
+ std::vector<float> dspTimes[Tile::MAX_ROS - 1];
+ std::vector<float> dspTimesChannels[Tile::MAX_ROS - 1];
+ std::vector<float> dspTimesDrawers[Tile::MAX_ROS - 1];
+
+ SG::ReadHandle<TileRawChannelContainer> dspRawChannelContainer(m_dspRawChannelContainerKey, ctx);
+ ATH_CHECK( dspRawChannelContainer.isValid() );
+
+ TileRawChannelUnit::UNIT dspRawChannelUnit = dspRawChannelContainer->get_unit();
+ for (const TileRawChannelCollection* rawChannelCollection : *dspRawChannelContainer) {
+ if (rawChannelCollection->empty() ) continue;
+
+ HWIdentifier adc_id = rawChannelCollection->front()->adc_HWID();
+ int ros = m_tileHWID->ros(adc_id);
+ int drawer = m_tileHWID->drawer(adc_id);
+ unsigned int drawerIdx = TileCalibUtils::getDrawerIdx(ros, drawer);
+ int partition = ros - 1;
+
+ for (const TileRawChannel* rawChannel : *rawChannelCollection) {
+ adc_id = rawChannel->adc_HWID();
+ int channel = m_tileHWID->channel(adc_id);
+ int adc = m_tileHWID->adc(adc_id);
+
+ float offlineEnergy = referenceEnergies[partition][drawer][channel];
+ if (offlineEnergy > m_energyThreshold) {
+ offlineEnergies[partition].push_back(offlineEnergy);
+
+ float offlineTime = referenceTimes[partition][drawer][channel];
+ offlineTimes[partition].push_back(offlineTime);
+
+ float dspEnergy = rawChannel->amplitude();
+ float dspTime = rawChannel->uncorrTime();
+ dspTimes[partition].push_back(dspTime);
+ dspTimesDrawers[partition].push_back(drawer);
+ dspTimesChannels[partition].push_back(channel);
+
+ if (dspRawChannelUnit != m_finalRawChannelUnit) {
+ dspEnergy = emScale->calibrateChannel(drawerIdx, channel, adc, dspEnergy, dspRawChannelUnit, m_finalRawChannelUnit);
+ }
+
+ float energyDiff = (dspEnergy - offlineEnergy) / offlineEnergy;
+ energyDiffs[partition].push_back(energyDiff);
+
+ float timeDiff = dspTime - offlineTime;
+ timeDiffs[partition].push_back(timeDiff);
+
+ ATH_MSG_VERBOSE(m_tileHWID->to_string(adc_id) << ": (DSP/OFFLINE)"
+ << ", energy " << dspEnergy << "/" << offlineEnergy
+ << ", time " << dspTime << "/" << offlineTime);
+ }
+ }
+ }
+
+ // Indices of L1 trigger histograms to be filled in the current event
+ std::vector<int> l1TriggersIndices = getL1TriggerIndices(eventInfo->level1TriggerType());
+
+ for (unsigned int partition = 0; partition < Tile::MAX_ROS - 1; ++partition) {
+ if (!energyDiffs[partition].empty()) {
+ auto monTime = Monitored::Collection("time", offlineTimes[partition]);
+ auto monEnergy = Monitored::Collection("energy", offlineEnergies[partition]);
+ auto monEnergyDiff = Monitored::Collection("energyDiff", energyDiffs[partition]);
+ for (int l1TriggerIdx : l1TriggersIndices) {
+ fill(m_tools[m_energyDiffGroups[partition][l1TriggerIdx]], monEnergyDiff);
+ fill(m_tools[m_energyDiffVsTimeGroups[partition][l1TriggerIdx]], monTime, monEnergyDiff);
+ fill(m_tools[m_energyDiffVsEnergyGroups[partition][l1TriggerIdx]], monEnergy, monEnergyDiff);
+ }
+ }
+
+ if (!timeDiffs[partition].empty()) {
+ auto monTime = Monitored::Collection("time", offlineTimes[partition]);
+ auto monEnergy = Monitored::Collection("energy", offlineEnergies[partition]);
+ auto monTimeDiff = Monitored::Collection("timeDiff", timeDiffs[partition]);
+ for (int l1TriggerIdx : l1TriggersIndices) {
+ fill(m_tools[m_timeDiffGroups[partition][l1TriggerIdx]], monTimeDiff);
+ fill(m_tools[m_timeDiffVsTimeGroups[partition][l1TriggerIdx]], monTime, monTimeDiff);
+ fill(m_tools[m_timeDiffVsEnergyGroups[partition][l1TriggerIdx]], monEnergy, monTimeDiff);
+ }
+ }
+ if (!timeDiffs[partition].empty()) {
+ auto monTime = Monitored::Collection("time", offlineTimes[partition]);
+ auto monEnergy = Monitored::Collection("energy", offlineEnergies[partition]);
+ auto monTimeDiff = Monitored::Collection("timeDiff", timeDiffs[partition]);
+ for (int l1TriggerIdx : l1TriggersIndices) {
+ fill(m_tools[m_timeDiffGroups[partition][l1TriggerIdx]], monTimeDiff);
+ fill(m_tools[m_timeDiffVsTimeGroups[partition][l1TriggerIdx]], monTime, monTimeDiff);
+ fill(m_tools[m_timeDiffVsEnergyGroups[partition][l1TriggerIdx]], monEnergy, monTimeDiff);
+ }
+ }
+
+ if (!dspTimes[partition].empty()) {
+ auto monTime = Monitored::Collection("time", dspTimes[partition]);
+ auto monModule = Monitored::Collection("module", dspTimesDrawers[partition]);
+ auto monChannel = Monitored::Collection("channel", dspTimesChannels[partition]);
+ for (int l1TriggerIdx : l1TriggersIndices) {
+ fill(m_tools[m_dspChanTimeGroups[partition][l1TriggerIdx]], monModule, monChannel, monTime);
+ }
+ }
+
+ }
+
+
+ if (m_fillRODfragSizeHistograms) {
+ int allTileRodFragsSize = 0;
+ std::vector<int> roses;
+ std::vector<int> fragments;
+ std::vector<int> fragmentSizes;
+
+ std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> robFragments;
+ m_robSvc->getROBData(m_tileRobIds, robFragments);
+
+ for (const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment* robFragment : robFragments) {
+ uint32_t rodSourceId = robFragment->rod_source_id();
+ unsigned int ros = (rodSourceId & 0x0F0000) >> 16;
+ unsigned int fragment = rodSourceId & 0x0000FF;
+ int rodFragmentSize = robFragment->rod_fragment_size_word();
+
+ allTileRodFragsSize += rodFragmentSize;
+ if (ros > 0 && ros < Tile::MAX_ROS && fragment < m_nROBs) {
+ roses.push_back(ros);
+ fragments.push_back(fragment);
+ fragmentSizes.push_back(rodFragmentSize);
+ ATH_MSG_VERBOSE("ROS = " << ros << ", ROD fragment = " << fragment << ", size = " << rodFragmentSize);
+ }
+ }
+
+ ATH_MSG_DEBUG( "All Tile ROD fragemsts size: " << allTileRodFragsSize << " in LB " << eventInfo->lumiBlock());
+
+ auto lumiBlock = Monitored::Scalar<int>("lumiBlock", eventInfo->lumiBlock());
+ auto monRodFragsSize = Monitored::Scalar<int>("allRodFragsSize", allTileRodFragsSize);
+ for (int l1TriggerIdx : l1TriggersIndices) {
+ fill(m_tools[m_rodFragSizeLBGroups[l1TriggerIdx]], lumiBlock, monRodFragsSize);
+ }
+
+ if (!fragmentSizes.empty()) {
+ auto monPartition = Monitored::Collection("partition", roses);
+ auto monFragment = Monitored::Collection("fragment", fragments);
+ auto monFragmentSize = Monitored::Collection("rodFragSize", fragmentSizes);
+ for (int l1TriggerIdx : l1TriggersIndices) {
+ fill(m_tools[m_rodFragSizeMapGroups[l1TriggerIdx]], monFragment, monPartition, monFragmentSize);
+ }
+ }
+ }
+
+
+ fill("TileRODMonExecuteTime", timer);
+
+ return StatusCode::SUCCESS;
+}
diff --git a/TileCalorimeter/TileMonitoring/src/TileRODMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileRODMonitorAlgorithm.h
new file mode 100644
index 0000000000000000000000000000000000000000..b1da4dc06858bb18deea21822df2f650ce9b7729
--- /dev/null
+++ b/TileCalorimeter/TileMonitoring/src/TileRODMonitorAlgorithm.h
@@ -0,0 +1,122 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TILEMONITORING_TILERODMONITORALGORITHM_H
+#define TILEMONITORING_TILERODMONITORALGORITHM_H
+
+#include "TileEvent/TileDQstatus.h"
+#include "TileIdentifier/TileRawChannelUnit.h"
+#include "TileEvent/TileRawChannelContainer.h"
+#include "TileConditions/TileDCSState.h"
+#include "TileConditions/TileBadChannels.h"
+#include "TileConditions/TileEMScale.h"
+#include "TileConditions/TileCablingSvc.h"
+#include "TileMonitorAlgorithm.h"
+
+#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/ReadCondHandleKey.h"
+
+class TileHWID;
+class TileCablingService;
+
+/** @class TileRODMonitorAlgorithm
+ * @brief Class for Tile digi noise based monitoring
+ */
+
+class TileRODMonitorAlgorithm : public TileMonitorAlgorithm {
+
+ public:
+
+ using TileMonitorAlgorithm::TileMonitorAlgorithm;
+ virtual ~TileRODMonitorAlgorithm() = default;
+ virtual StatusCode initialize() override;
+ virtual StatusCode fillHistograms(const EventContext& ctx) const override;
+
+ private:
+
+ Gaudi::Property<bool> m_checkDCS{this, "CheckDCS", false, "Check Tile DCS status"};
+ Gaudi::Property<std::vector<unsigned int>> m_triggerTypes{this,
+ "TriggerTypes", {}, "Given trigger types only events with these TT will be used, otherwise all"};
+
+ Gaudi::Property<std::vector<int>> m_fragIDsToIgnoreDMUerrors{this,
+ "FragIDsToIgnoreDMUErrors", {}, "List of Tile frag IDs for which ignore DMU errors"};
+
+ Gaudi::Property<unsigned int> m_comparisonUnit{this,
+ "ComparisonUnit", TileRawChannelUnit::MegaElectronVolts, "Units to compare Tile raw channel containers"};
+
+ Gaudi::Property<float> m_energyThreshold{this,
+ "EnergyThreshold", 300.0F, "Energy threshold in MeV"};
+
+ Gaudi::Property<std::vector<float>> m_timeRange{this,
+ "TimeRange", {-65.0F, 65.0F}, "Time range to be monitored, default: (-65,65)"};
+
+ Gaudi::Property<unsigned int> m_nROBs{this,
+ "NumberOfROBFragmets", MAX_TILE_ROBS, "Number of Tile ROB fragments"};
+
+ Gaudi::Property<bool> m_fillRODfragSizeHistograms{this,
+ "fillRODFragmentSizeHistograms", true, "Fill summary histograms with ROD fragment size"};
+
+ SG::ReadHandleKey<TileDQstatus> m_DQstatusKey{this,
+ "TileDQstatus", "TileDQstatus", "Tile DQ status name"};
+
+ /**
+ * @brief Name of TileDCSState object in condition store
+ */
+ SG::ReadCondHandleKey<TileDCSState> m_DCSStateKey{this,
+ "TileDCS", "TileDCS", "Input Tile DCS status"};
+
+ SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this,
+ "TileRawChannelContainer", "TileRawChannelOpt2", "Input Tile reference raw channel container key"};
+
+ SG::ReadHandleKey<TileRawChannelContainer> m_dspRawChannelContainerKey{this,
+ "TileRawChannelContainerDSP", "TileRawChannelCnt", "Input Tile DSP raw channel container key"};
+
+ /**
+ * @brief Name of TileBadChannels in condition store
+ */
+ SG::ReadCondHandleKey<TileBadChannels> m_badChannelsKey{this,
+ "TileBadChannels", "TileBadChannels", "Input Tile bad channel status"};
+
+ /**
+ * @brief Name of TileEMScale in condition store
+ */
+ SG::ReadCondHandleKey<TileEMScale> m_emScaleKey{this,
+ "TileEMScale", "TileEMScale", "Input Tile EMS calibration constants"};
+
+ /**
+ * @brief Name of Tile cabling service
+ */
+ ServiceHandle<TileCablingSvc> m_cablingSvc{ this,
+ "TileCablingSvc", "TileCablingSvc", "The Tile cabling service"};
+
+ /**
+ * @brief Name of ROB data provider service
+ */
+ ServiceHandle<IROBDataProviderSvc> m_robSvc{this,
+ "ROBDataProviderSvc", "ROBDataProviderSvc", "The ROB data provider service"};
+
+ const TileHWID* m_tileHWID{nullptr};
+ const TileCablingService* m_cabling{nullptr};
+ TileRawChannelUnit::UNIT m_finalRawChannelUnit{TileRawChannelUnit::Invalid};
+
+ std::vector<int> m_rodFragSizeMapGroups;
+ std::vector<int> m_rodFragSizeLBGroups;
+ std::vector<std::vector<std::vector<int>>> m_rodFragSizeGroups;
+
+ std::vector<std::vector<int>> m_energyDiffGroups;
+ std::vector<std::vector<int>> m_energyDiffVsTimeGroups;
+ std::vector<std::vector<int>> m_energyDiffVsEnergyGroups;
+ std::vector<std::vector<int>> m_timeDiffGroups;
+ std::vector<std::vector<int>> m_timeDiffVsTimeGroups;
+ std::vector<std::vector<int>> m_timeDiffVsEnergyGroups;
+ std::vector<std::vector<int>> m_dspChanTimeGroups;
+
+ std::vector<uint32_t> m_tileRobIds;
+ static constexpr int MAX_TILE_ROBS = 32;
+};
+
+
+#endif // TILEMONITORING_TILERODMONITORALGORITHM_H
diff --git a/TileCalorimeter/TileMonitoring/src/TileTMDBDigitsMonitorAlgorithm.cxx b/TileCalorimeter/TileMonitoring/src/TileTMDBDigitsMonitorAlgorithm.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..26ce59a572b403a9bd84dfd32bfe1dc595ac7b33
--- /dev/null
+++ b/TileCalorimeter/TileMonitoring/src/TileTMDBDigitsMonitorAlgorithm.cxx
@@ -0,0 +1,172 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// Tile includes
+#include "TileTMDBDigitsMonitorAlgorithm.h"
+#include "TileIdentifier/TileHWID.h"
+#include "TileCalibBlobObjs/TileCalibUtils.h"
+
+#include <math.h>
+// Athena includes
+#include "StoreGate/ReadHandle.h"
+
+
+TileTMDBDigitsMonitorAlgorithm::TileTMDBDigitsMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
+ :AthMonitorAlgorithm(name, pSvcLocator)
+ , m_tileHWID(nullptr)
+{
+
+}
+
+TileTMDBDigitsMonitorAlgorithm::~TileTMDBDigitsMonitorAlgorithm() {
+}
+
+
+StatusCode TileTMDBDigitsMonitorAlgorithm::initialize() {
+
+ ATH_CHECK( AthMonitorAlgorithm::initialize() );
+
+ ATH_MSG_DEBUG("in initialize()");
+
+ ATH_CHECK( detStore()->retrieve(m_tileHWID) );
+
+ ATH_CHECK( m_digitsContainerKey.initialize() );
+
+ using Tile = TileCalibUtils;
+ using namespace Monitored;
+
+ m_hfnGroups = buildToolMap<int>(m_tools, "TMDBDigitsHFN", Tile::MAX_ROS - 1);
+ m_pedGroups = buildToolMap<int>(m_tools, "TMDBDigitsPedestal", Tile::MAX_ROS - 1);
+ m_ampGroups = buildToolMap<int>(m_tools, "TMDBDigitsAmplitude", Tile::MAX_ROS - 1);
+
+
+ if (m_nChannels.size() != (Tile::MAX_ROS - 1)) {
+ ATH_MSG_FATAL( "Size of NumberOfChannels should be 4 (LBA, LBC, EBA, EBC), but is " << m_nChannels.size() );
+ return StatusCode::FAILURE;
+ }
+
+ std::vector<std::string> partitionName = {"LBA", "LBC", "EBA", "EBC"}; // ROS - 1 to partition name map
+ for (unsigned int partition = 0; partition < Tile::MAX_ROS-1; ++partition) {
+ m_cellPedGroups.push_back(buildToolMap<int>(m_tools,
+ "TMDBDigitsCellPedestal_" + partitionName[partition],
+ m_nChannels[partition]));
+ m_cellHFNGroups.push_back(buildToolMap<int>(m_tools,
+ "TMDBDigitsCellHFN_" + partitionName[partition],
+ m_nChannels[partition]));
+ m_cellAmpGroups.push_back(buildToolMap<int>(m_tools,
+ "TMDBDigitsCellAmplitude_" + partitionName[partition],
+ m_nChannels[partition]));
+ }
+
+
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode TileTMDBDigitsMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const {
+
+ ATH_MSG_DEBUG( "in fillHistograms()" );
+ using Tile = TileCalibUtils;
+ std::vector<int> drawers[Tile::MAX_ROS - 1];
+ std::vector<int> channels[Tile::MAX_ROS - 1];
+ std::vector<float> pedestals[Tile::MAX_ROS - 1];
+ std::vector<float> amplitudes[Tile::MAX_ROS - 1];
+ std::vector<float> hfns[Tile::MAX_ROS - 1];
+ static constexpr int TMDB_MAX_CHANNEL = 8;
+ std::vector<float> cellPedestals[Tile::MAX_ROS - 1][TMDB_MAX_CHANNEL];
+ std::vector<float> cellHFNs[Tile::MAX_ROS - 1][TMDB_MAX_CHANNEL];
+ std::vector<float> cellAmplitudes[Tile::MAX_ROS - 1][TMDB_MAX_CHANNEL];
+
+ SG::ReadHandle<TileDigitsContainer> digitsContainer(m_digitsContainerKey, ctx);
+ ATH_CHECK( digitsContainer.isValid() );
+
+ for (IdentifierHash hash : digitsContainer->GetAllCurrentHashes()) {
+ const TileDigitsCollection* digitsCollection = digitsContainer->indexFindPtr (hash);
+
+ int fragId = digitsCollection->identify();
+ unsigned int drawer = (fragId & 0x3F);
+ unsigned int ros = fragId >> 8;
+ unsigned int partition = ros - 1;
+
+ for (const TileDigits* tile_digits : *digitsCollection) {
+
+ HWIdentifier adc_id = tile_digits->adc_HWID();
+ int channel = m_tileHWID->channel(adc_id);
+ std::vector<float> digits = tile_digits->samples();
+
+ double mean_samp = 0.0;
+ double rms_samp = 0.0;
+ unsigned int n_digits = digits.size();
+
+ for (double digit : digits) {
+ mean_samp += digit;
+ rms_samp += digit * digit;
+ }
+
+ if (n_digits > 1) {
+ drawers[partition].push_back(drawer);
+ channels[partition].push_back(channel);
+
+ double ped = digits[0];
+ pedestals[partition].push_back(ped);
+
+ mean_samp /= n_digits;
+ rms_samp = rms_samp / n_digits - mean_samp * mean_samp;
+ rms_samp = (rms_samp > 0.0) ? sqrt(rms_samp * n_digits / (n_digits - 1)) : 0.0;
+ hfns[partition].push_back(rms_samp);
+
+ //-- temporary until TMDB raw channel monitoring tool be ready --//
+
+ auto min_max = std::minmax_element(digits.begin(), digits.end());
+ float min_digit = *min_max.first;
+ float max_digit = *min_max.second;
+ float amplitude = max_digit - min_digit;
+ amplitudes[partition].push_back(amplitude);
+
+
+ //---------------------------------------------------------------//
+ if (channel < m_nChannels[partition]) {
+ cellPedestals[partition][channel].push_back(ped);
+ cellHFNs[partition][channel].push_back(rms_samp);
+ cellAmplitudes[partition][channel].push_back(amplitude);
+ }
+
+ }
+ }
+ }
+
+
+ for (unsigned int partition = 0; partition < Tile::MAX_ROS - 1; ++partition) {
+ if (!pedestals[partition].empty()) {
+ auto monModule = Monitored::Collection("module", drawers[partition]);
+ auto monChannel = Monitored::Collection("channel", channels[partition]);
+ auto monPedestal = Monitored::Collection("pedestal", pedestals[partition]);
+ fill(m_tools[m_pedGroups[partition]], monModule, monChannel, monPedestal);
+
+ auto monHFN = Monitored::Collection("HFN", hfns[partition]);
+ fill(m_tools[m_hfnGroups[partition]], monModule, monChannel, monHFN);
+
+ auto monAmplitude = Monitored::Collection("amplitude", amplitudes[partition]);
+ fill(m_tools[m_ampGroups[partition]], monModule, monChannel, monAmplitude);
+
+ for (int channel = 0; channel < int(m_nChannels[partition]); ++channel) {
+ if (!cellPedestals[partition][channel].empty()) {
+ auto monPedestal = Monitored::Collection("pedestal", cellPedestals[partition][channel]);
+ fill(m_tools[m_cellPedGroups[partition][channel]], monPedestal);
+ }
+ if (!cellHFNs[partition][channel].empty()) {
+ auto monHFN = Monitored::Collection("HFN", cellHFNs[partition][channel]);
+ fill(m_tools[m_cellHFNGroups[partition][channel]], monHFN);
+ }
+ if (!cellAmplitudes[partition][channel].empty()) {
+ auto monAmplitude = Monitored::Collection("amplitude", cellAmplitudes[partition][channel]);
+ fill(m_tools[m_cellAmpGroups[partition][channel]], monAmplitude);
+ }
+ }
+ }
+ }
+
+
+ return StatusCode::SUCCESS;
+}
diff --git a/TileCalorimeter/TileMonitoring/src/TileTMDBDigitsMonitorAlgorithm.h b/TileCalorimeter/TileMonitoring/src/TileTMDBDigitsMonitorAlgorithm.h
new file mode 100644
index 0000000000000000000000000000000000000000..7ea2f4dc01c97b17875b2005d813385ff6fd0db9
--- /dev/null
+++ b/TileCalorimeter/TileMonitoring/src/TileTMDBDigitsMonitorAlgorithm.h
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TILEMONITORING_TILETMDBDIGITSMONITORALGORITHM_H
+#define TILEMONITORING_TILETMDBDIGITSMONITORALGORITHM_H
+
+// Tile includes
+#include "TileEvent/TileDigitsContainer.h"
+
+
+// Atlas includes
+#include "AthenaMonitoring/AthMonitorAlgorithm.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+#include "StoreGate/ReadHandleKey.h"
+
+class TileHWID;
+
+class TileTMDBDigitsMonitorAlgorithm : public AthMonitorAlgorithm {
+ public:
+ TileTMDBDigitsMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
+ virtual ~TileTMDBDigitsMonitorAlgorithm();
+ virtual StatusCode initialize() override;
+ virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
+ private:
+
+ std::string m_digitsContainerName;
+ const TileHWID* m_tileHWID;
+ //int m_nSamples;
+
+ std::vector<int> m_pedGroups;
+ std::vector<int> m_hfnGroups;
+ std::vector<int> m_ampGroups;
+
+ SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey{this,
+ "MuRcvDigitsCnt", "MuRcvDigitsCnt", "Muon digits container"};
+
+ Gaudi::Property<std::vector<int>> m_nChannels{this,
+ "NumberOfChannels", {8, 8, 4, 4}, "Number of TMDB channels per module in (LBA, LBC, EBA, EBC)"};
+
+ std::vector<std::vector<int>> m_cellPedGroups;
+ std::vector<std::vector<int>> m_cellHFNGroups;
+ std::vector<std::vector<int>> m_cellAmpGroups;
+
+};
+#endif // TILEMONITORING_TILETMDBDIGITSMONITORALGORITHM_H
diff --git a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx b/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
index 2570ba2eb2a66e7dc62709d3b07802f8592bec5f..6b42257bfd6fc082b30f323166ea0a535b76ab26 100644
--- a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
+++ b/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
@@ -35,6 +35,8 @@
#include "../TileRawChannelTimeMonitorAlgorithm.h"
#include "../TileRawChannelNoiseMonitorAlgorithm.h"
#include "../TileMuonFitMonitorAlgorithm.h"
+#include "../TileRODMonitorAlgorithm.h"
+#include "../TileTMDBDigitsMonitorAlgorithm.h"
DECLARE_COMPONENT( TileFatherMonTool )
DECLARE_COMPONENT( TilePaterMonTool )
@@ -73,3 +75,5 @@ DECLARE_COMPONENT( TileDigiNoiseMonitorAlgorithm )
DECLARE_COMPONENT( TileRawChannelTimeMonitorAlgorithm )
DECLARE_COMPONENT( TileRawChannelNoiseMonitorAlgorithm )
DECLARE_COMPONENT( TileMuonFitMonitorAlgorithm )
+DECLARE_COMPONENT( TileRODMonitorAlgorithm )
+DECLARE_COMPONENT( TileTMDBDigitsMonitorAlgorithm )
diff --git a/TileCalorimeter/TileRecUtils/CMakeLists.txt b/TileCalorimeter/TileRecUtils/CMakeLists.txt
index 0b4ee0695cc804e7200556ccb41ac2f509132d94..cbb9ea23b52a76646e70a15cef96c3c103db36cf 100644
--- a/TileCalorimeter/TileRecUtils/CMakeLists.txt
+++ b/TileCalorimeter/TileRecUtils/CMakeLists.txt
@@ -66,7 +66,7 @@ atlas_add_dictionary( TileRecUtilsDict
atlas_add_test( TileCellBuilder_test
SCRIPT test/TileCellBuilder_test.sh
PROPERTIES TIMEOUT 600
- LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available" )
+ LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
# The entries
@@ -76,25 +76,25 @@ atlas_add_test( TileCellBuilder_test
atlas_add_test( TileCellBuilderFromHit_test
SCRIPT test/TileCellBuilderFromHit_test.sh
PROPERTIES TIMEOUT 600
- LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|IncrementalExecutor::executeFunction|You are probably missing the definition|Maybe you need to load|No RecFlags available" )
+ LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|IncrementalExecutor::executeFunction|You are probably missing the definition|Maybe you need to load|No RecFlags available|IOVDbSvc +INFO" )
atlas_add_test( TileRawChannelBuilder_test
SCRIPT test/TileRawChannelBuilder_test.sh
PROPERTIES TIMEOUT 600
- LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available" )
+ LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
atlas_add_test( TileDQstatusAlg_test
SCRIPT test/TileDQstatusAlg_test.sh
PROPERTIES TIMEOUT 600
- LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available" )
+ LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
atlas_add_test( TileDQstatusTool_test
SCRIPT test/TileDQstatusTool_test.sh
PROPERTIES TIMEOUT 600
- LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available" )
+ LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
# Tests:
atlas_add_test( TileRawChannelBuilderFitConfig_test
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileTimeBCOffsetFilter.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileTimeBCOffsetFilter.h
new file mode 100644
index 0000000000000000000000000000000000000000..2b0c8342aca292c4a5330fee0c024bf77958401a
--- /dev/null
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileTimeBCOffsetFilter.h
@@ -0,0 +1,101 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TILERECUTILS_ITILETIMEBCOFFSETFILTER_H
+#define TILERECUTILS_ITILETIMEBCOFFSETFILTER_H
+
+/********************************************************************
+ *
+ * NAME: TileTileBCOffsetFilter
+ * PACKAGE: TileCalorimeter/TileRecUtils
+ *
+ * AUTHOR : T. Davidek, A. Solodkov
+ * CREATED: Feb 2019
+ *
+ * PURPOSE: mask the time offsets by +/-1 or +/-2 bunch crossings in the given
+ * Tile DMU
+ *
+ * Input: TileRawChannelContainer
+ * Output: TileRawChannelContainer is modified
+ * Parameters: none
+ *
+ ********************************************************************/
+
+// Tile includes
+#include "TileRecUtils/ITileRawChannelTool.h"
+#include "TileConditions/TileCondToolEmscale.h"
+#include "TileConditions/TileCablingSvc.h"
+#include "TileConditions/ITileDCSTool.h"
+#include "TileConditions/ITileBadChanTool.h"
+#include "TileEvent/TileDQstatus.h"
+
+// Atlas includes
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+#include <vector>
+
+// forward declarations
+class TileHWID;
+class TileRawChannel;
+class TileRawChannelContainer;
+class TileRawChannelCollection;
+class TileCablingService;
+
+/**
+ @class TileTimeBCOffsetFilter
+ @brief This tool sets bad status for channels with 25ns or 50ns timing jump
+ */
+class TileTimeBCOffsetFilter: public extends<AthAlgTool, ITileRawChannelTool> {
+
+ public:
+
+ TileTimeBCOffsetFilter(const std::string& type, const std::string& name,
+ const IInterface* parent);
+
+ virtual ~TileTimeBCOffsetFilter() {};
+
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
+
+ virtual StatusCode process (TileMutableRawChannelContainer& rchCont) const override;
+
+ private:
+
+ int find_partner(int ros, int channel) const;
+ bool drawer_ok(const int drawerIndex, std::vector<bool> & channel_time_ok,
+ std::vector<int> & bad_dmu) const;
+ bool ch_masked_or_empty(int ros, int drawer, int channel, int gain,
+ const TileDQstatus* DQstatus) const;
+ bool isChanDCSgood(int ros, int drawer, int channel) const;
+
+ const TileHWID* m_tileHWID; //!< Pointer to TileHWID
+
+ const TileCablingService* m_cabling; //!< TileCabling instance
+
+ ServiceHandle<TileCablingSvc> m_cablingSvc{ this,
+ "TileCablingSvc", "TileCablingSvc", "The Tile cabling service"};
+
+ ToolHandle<ITileDCSTool> m_tileDCS{this, "TileDCSTool", "TileDCSTool", "Tile DCS tool"};
+
+ ToolHandle<TileCondToolEmscale> m_tileToolEmscale{this,
+ "TileCondToolEmscale", "TileCondToolEmscale", "Tile EM scale calibration tool"};
+
+ ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
+ "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
+
+ // properties
+ SG::ReadHandleKey<TileDQstatus> m_DQstatusKey{this, "TileDQstatus",
+ "TileDQstatus",
+ "TileDQstatus key"};
+
+ float m_ene_threshold_3chan;
+ float m_ene_threshold_1chan;
+ float m_time_threshold_diff;
+ bool m_checkDCS;
+
+};
+#endif
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
index e9b1b0b922db9ab5904822521f21ecf3d07fd042..d47a9ed4335edcd978a1f434eab82b85c5107239 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
@@ -152,7 +152,13 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelNoiseFilter.TileCondToolNoiseSample.TileOnlineSampleNoise = ''
NoiseFilterTools += [theTileRawChannelNoiseFilter]
- if globalflags.DataSource() == 'data' and not globalflags.isOverlay():
+ if globalflags.DataSource() == 'data' and not globalflags.isOverlay():
+ if jobproperties.TileRecFlags.correctTimeJumps():
+ from TileRecUtils.TileRecUtilsConf import TileTimeBCOffsetFilter
+ theTileTimeBCOffsetFilter = TileTimeBCOffsetFilter()
+ NoiseFilterTools += [theTileTimeBCOffsetFilter]
+
+ if len(NoiseFilterTools) > 0:
from TileRecUtils.TileRecUtilsConf import TileRawChannelCorrectionAlg
theTileRawChannelCorrectionAlg = TileRawChannelCorrectionAlg()
theTileRawChannelCorrectionAlg.NoiseFilterTools= NoiseFilterTools
diff --git a/TileCalorimeter/TileRecUtils/python/TileRecFlags.py b/TileCalorimeter/TileRecUtils/python/TileRecFlags.py
index b233c3310a8ace358675da3a7caf06a59bebbd36..6da8521c9e739b1bf4c51316680fc84d64362190 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRecFlags.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRecFlags.py
@@ -209,14 +209,15 @@ class readDigits(JobProperty):
allowedTypes = ['bool']
StoredValue = True
-
+#
class doTileOverflowFit(JobProperty):
""" set to True if apply fit builder for raw channels with overflow
"""
statusOn = True
allowedTypes = ['bool']
StoredValue = True
-
+
+#
class simulateTrips(JobProperty):
""" set to True if drawer trips simulation has to be done
"""
@@ -224,7 +225,7 @@ class simulateTrips(JobProperty):
allowedTypes = ['bool']
StoredValue = False
-
+#
class zeroAmplitudeWithoutDigits(JobProperty):
""" zero amplitude in Tile raw channel container from DSP reconstructed with OF1 method
if amplitude is above threshold but there are no corresponding digits
@@ -234,6 +235,7 @@ class zeroAmplitudeWithoutDigits(JobProperty):
allowedTypes = ['bool']
StoredValue = True
+#
class correctPedestalDifference(JobProperty):
""" correct amplitude in Tile raw channel container from DSP reconstructed with OF1 method
if there is online pedestal difference
@@ -242,7 +244,15 @@ class correctPedestalDifference(JobProperty):
allowedTypes = ['bool']
StoredValue = True
-
+#
+class correctTimeJumps(JobProperty):
+ """ appply time correction for channels with possible +/-25 ns time jumps
+ """
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
+
# Defines the container for the performance monitoring flags
class TileRecFlags(JobPropertyContainer):
""" The global Tile reconstruction flag/job property container.
@@ -283,7 +293,8 @@ list_jobproperties = [
doTileOverflowFit,
simulateTrips,
zeroAmplitudeWithoutDigits,
- correctPedestalDifference
+ correctPedestalDifference,
+ correctTimeJumps
]
for i in list_jobproperties:
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
index 26e7e3fc1ab72c25a6f7339e27da3b95ccd22d2e..7b1a53e2fd82e90c178ec6092974cd3c7483847b 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
@@ -1,16 +1,16 @@
-Fri Nov 29 11:05:44 CET 2019
+Tue Oct 6 19:52:23 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.9] [x86_64-centos7-gcc8-opt] [tilecal-12bit/82699bf159] -- built on [2019-11-29T1101]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileRecUtils/TileCellBuilderFromHit_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5635 configurables from 11 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.9
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on pcpraha5 on Fri Nov 29 11:05:50 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:52:34 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7151 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host pcpraha5.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -56,13 +51,14 @@ PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -83,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2007 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -169,7 +165,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2988 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -187,7 +183,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -199,15 +195,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -217,7 +213,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -263,15 +259,15 @@ TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-ClassIDSvc INFO getRegistryEntries: read 380 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 319 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 271 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 4706 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6722 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool1 INFO Noise Sigma 0 MeV is selected!
AtRndmGenSvc INFO Initializing AtRndmGenSvc - package version RngComps-00-00-00
@@ -283,7 +279,7 @@ ToolSvc.tool1 INFO min time thr -25 ns
ToolSvc.tool1 INFO taking hits from 'TileHitCnt'
ToolSvc.tool1 INFO Storing E4' cells in E4prContainer
ToolSvc.tool1 INFO TileCellBuilderFromHit initialization completed
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
ToolSvc.tool2 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool2 INFO Noise Sigma 0 MeV is selected!
ToolSvc.tool2 INFO max time thr 25 ns
@@ -298,7 +294,6 @@ ToolSvc.tool3 INFO min time thr -25 ns
ToolSvc.tool3 INFO taking hits from 'TileHitCnt'
ToolSvc.tool3 INFO Storing E4' cells in E4prContainer
ToolSvc.tool3 INFO TileCellBuilderFromHit initialization completed
-HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -315,17 +310,17 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 114 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -339,12 +334,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -375,8 +370,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -388,8 +383,8 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/TileCalorimeter/TileRecUtils/CMakeFiles/unitTestRun/tilecellbuilder_bct2.bch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/build1/tsulaia/athena-devel/build/TileCalorimeter/TileRecUtils/CMakeFiles/unitTestRun/tilecellbuilder_bct2.bch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -401,9 +396,9 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 674 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 204 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 9 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 444 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
AtRndmGenSvc INFO Stream = Tile_DigitsMaker, Seed1 = 288581169, Seed2 = 758068585
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
@@ -426,22 +421,22 @@ AtRndmGenSvc INFO FINALISING
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.02 ))s
-IOVDbSvc INFO bytes in (( 0.41 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.31 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.06 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.36 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.26 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.tool3 INFO Finalizing
@@ -450,9 +445,9 @@ ToolSvc.tool1 INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 280 [ms] Ave/Min/Max= 140(+- 140)/ 0/ 280 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 320 [ms] Ave/Min/Max= 24.6(+- 79.7)/ 0/ 300 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 26 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.5 [s] Ave/Min/Max= 0.25(+- 0.25)/ 0/ 0.5 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max= 0.0431(+- 0.141)/ 0/ 0.53 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 38.1 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
index a7f332aae587052481ead1e83524035cce18fc5a..88c8c54bda4cc0d117732ceb45dbeb45afa9c2f8 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
@@ -1,16 +1,16 @@
-Fri Nov 29 11:05:09 CET 2019
+Tue Oct 6 19:51:26 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.9] [x86_64-centos7-gcc8-opt] [tilecal-12bit/82699bf159] -- built on [2019-11-29T1101]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileRecUtils/TileCellBuilder_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5635 configurables from 11 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.9
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on pcpraha5 on Fri Nov 29 11:05:15 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:51:38 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7151 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host pcpraha5.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -56,13 +51,14 @@ PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -83,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2007 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -169,7 +165,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2988 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -187,7 +183,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -199,15 +195,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -217,7 +213,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -263,17 +259,17 @@ TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
tilecellbuilder... INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-ClassIDSvc INFO getRegistryEntries: read 380 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 4905 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5090 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
prepalg1 INFO Initializing prepalg1...
-ClassIDSvc INFO getRegistryEntries: read 106 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 14 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1795 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Storing MBTS cells in MBTSContainer
ToolSvc.tool1 INFO none of thresholds set, all RawChannels will be converted to Cells
ToolSvc.tool1 INFO taking RawChannels from 'TileRawChannelCnt'
@@ -326,7 +322,6 @@ ToolSvc.tool11 INFO none of thresholds set, all RawChannels will be conver
ToolSvc.tool11 INFO taking RawChannels from 'TileRawChannelCnt'
ToolSvc.tool11 INFO Storing E4' cells in E4prContainer
ToolSvc.tool11 INFO TileCellBuilder initialization completed
-HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -343,17 +338,17 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 114 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -367,12 +362,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -403,8 +398,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -416,8 +411,8 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
-tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/localscratch4/pleskot/tilecal/r22-tilecal-12bit/build/TileCalorimeter/TileRecUtils/CMakeFiles/unitTestRun/tilecellbuilder_bct2.bch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder... INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/build1/tsulaia/athena-devel/build/TileCalorimeter/TileRecUtils/CMakeFiles/unitTestRun/tilecellbuilder_bct2.bch"
tilecellbuilder... INFO No TileBchStatus::isBad() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
tilecellbuilder... INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -429,13 +424,12 @@ tilecellbuilder... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
tilecellbuilder... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
tilecellbuilder... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
tilecellbuilder... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 674 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 196 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 9 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 68 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 436 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 49 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
-ClassIDSvc INFO getRegistryEntries: read 17 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 96 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #3, run #1 2 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #3, run #1 3 events processed so far <<<===
@@ -470,23 +464,23 @@ testalg1 INFO Finalizing testalg1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.06 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.04 ))s
-IOVDbSvc INFO bytes in (( 0.53 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.44 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.09 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.44 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.39 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.tool11 INFO Finalizing
@@ -501,9 +495,9 @@ ToolSvc.tool1 INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 290 [ms] Ave/Min/Max= 145(+- 145)/ 0/ 290 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 320 [ms] Ave/Min/Max= 24.6(+- 79.7)/ 0/ 300 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 26.1 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.51 [s] Ave/Min/Max= 0.255(+- 0.245)/ 0.01/ 0.5 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.0423(+- 0.138)/ 0/ 0.52 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 38.9 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
index a5ee1a2b0af2247e1c8f55e5c466a73619907f8a..0394f00dd50d4056980f3d54c322d984c0fc903a 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
@@ -1,16 +1,16 @@
-Fri Nov 29 11:06:55 CET 2019
+Tue Oct 6 19:54:13 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.9] [x86_64-centos7-gcc8-opt] [tilecal-12bit/82699bf159] -- built on [2019-11-29T1101]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileRecUtils/TileDQstatusAlg_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5635 configurables from 11 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.9
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on pcpraha5 on Fri Nov 29 11:07:01 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:54:24 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7151 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host pcpraha5.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -56,13 +51,14 @@ PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -83,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2007 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -175,7 +171,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2988 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -184,7 +180,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24344Kb Time = 0.43S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.6S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -195,7 +191,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -207,9 +203,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -244,8 +240,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.12S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.14S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -255,7 +251,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -299,12 +295,11 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 4905 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5090 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
record1 INFO Initializing record1...
-ClassIDSvc INFO getRegistryEntries: read 106 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
check1 INFO Initializing check1...
-HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -321,17 +316,17 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 114 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -345,12 +340,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -381,9 +376,9 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 674 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 206 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 12 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2221 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
@@ -400,31 +395,31 @@ check1 INFO Finalizing check1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.24 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.25 ))s
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.05 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.02 ))s
-IOVDbSvc INFO bytes in (( 0.37 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.81 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.06 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.31 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.77 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 280 [ms] Ave/Min/Max= 140(+- 140)/ 0/ 280 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 310 [ms] Ave/Min/Max= 23.8(+- 77)/ 0/ 290 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 25.7 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.25)/ 0.01/ 0.51 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.57 [s] Ave/Min/Max= 0.0438(+- 0.141)/ 0/ 0.53 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 36.3 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
index 8173dca6aeaf989487dff883969d46a4a243fb75..b35d5645c6a3b70ff27f00d53be161cdf1c73cd9 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
@@ -1,16 +1,16 @@
-Fri Nov 29 11:07:30 CET 2019
+Tue Oct 6 19:55:07 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.9] [x86_64-centos7-gcc8-opt] [tilecal-12bit/82699bf159] -- built on [2019-11-29T1101]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileRecUtils/TileDQstatusTool_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5635 configurables from 11 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.9
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on pcpraha5 on Fri Nov 29 11:07:36 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:55:18 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7151 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host pcpraha5.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -56,13 +51,14 @@ PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -83,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2007 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -175,7 +171,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2988 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -184,7 +180,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24344Kb Time = 0.43S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.56S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -195,7 +191,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -207,9 +203,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -244,8 +240,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.13S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.15S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -255,7 +251,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -301,10 +297,9 @@ TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
PyComponentMgr INFO Initializing PyComponentMgr...
test1 INFO Initializing test1...
-ClassIDSvc INFO getRegistryEntries: read 5116 CLIDRegistry entries for module ALL
-HistogramPersis...WARNING Histograms saving not required.
+ClassIDSvc INFO getRegistryEntries: read 7355 CLIDRegistry entries for module ALL
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/NLN'
@@ -320,17 +315,17 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 114 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -344,12 +339,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -381,8 +376,8 @@ TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
*** Starting test1
-ClassIDSvc INFO getRegistryEntries: read 674 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 185 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 155 CLIDRegistry entries for module ALL
*** Starting test2
*** Starting test3
*** Starting test4
@@ -404,31 +399,31 @@ test1 INFO Finalizing test1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.04 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.02 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.02 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.02 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.02 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.03 ))s
-IOVDbSvc INFO bytes in (( 0.38 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.27 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.07 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.31 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.23 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 280 [ms] Ave/Min/Max= 140(+- 140)/ 0/ 280 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 310 [ms] Ave/Min/Max= 23.8(+- 77)/ 0/ 290 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 28.5 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.25)/ 0.01/ 0.51 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.57 [s] Ave/Min/Max= 0.0438(+- 0.141)/ 0/ 0.53 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 39.5 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
index 33779261bc48cdd8c02c90200c86a7372b38073c..6f3ea37b082648488c8fae3f8606785f3eacb721 100644
--- a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
@@ -1,16 +1,16 @@
-Fri Nov 29 11:06:19 CET 2019
+Tue Oct 6 19:53:18 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.9] [x86_64-centos7-gcc8-opt] [tilecal-12bit/82699bf159] -- built on [2019-11-29T1101]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileRecUtils/TileRawChannelBuilder_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5635 configurables from 11 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.9
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r2)
- running on pcpraha5 on Fri Nov 29 11:06:26 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:53:29 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7151 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host pcpraha5.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -56,13 +51,14 @@ PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 14 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1629 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -83,8 +79,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2007 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -175,7 +171,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2988 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -184,7 +180,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25368Kb Time = 0.44S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.55S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -195,7 +191,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -207,9 +203,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -244,8 +240,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.12S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.16S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -255,7 +251,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -299,21 +295,20 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 380 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 4905 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 452 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5090 CLIDRegistry entries for module ALL
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even... INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
PyComponentMgr INFO Initializing PyComponentMgr...
prepalg1 INFO Initializing prepalg1...
-ClassIDSvc INFO getRegistryEntries: read 106 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 108 CLIDRegistry entries for module ALL
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 105 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2182 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO TileRawChannelBuilder::initialize()
ToolSvc.tool2 INFO TileRawChannelBuilder::initialize()
ToolSvc.tool2.n... INFO Initializing...
-HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -330,17 +325,17 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 114 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -354,12 +349,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-11-28T2131/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -390,8 +385,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 674 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 185 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 657 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 133 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
@@ -412,23 +407,23 @@ testalg1 INFO Finalizing testalg1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.25 ))s
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.04 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.03 ))s
-IOVDbSvc INFO bytes in (( 0.42 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.61 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.08 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.35 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.57 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.tool2 INFO Finalizing
@@ -436,9 +431,9 @@ ToolSvc.tool1 INFO Finalizing
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 310 [ms] Ave/Min/Max= 155(+- 145)/ 10/ 300 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 340 [ms] Ave/Min/Max= 26.2(+- 85)/ 0/ 320 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 26.3 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.26)/ 0/ 0.52 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.57 [s] Ave/Min/Max= 0.0438(+- 0.143)/ 0/ 0.54 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 37.6 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
index 1e66afd98153d674c63e6a8576fd2fdba8dae54f..76f01e7108f2ba52dd33891104fd49ce99873d37 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
@@ -468,10 +468,11 @@ const char * TileRawChannelBuilder::BadPatternName(float ped) {
"11 - jump down in last sample in low gain",
"12 - jump up in one sample above const",
"13 - jump down in one sample below const",
- "14 - unknown error"
+ "14 - unrecoverable timing jump"
+ "15 - unknown error"
};
- return errname[std::min(24, std::max(0, int((ped + 500) * 1e-4)))];
+ return errname[std::min(25, std::max(0, int((ped + 500) * 1e-4)))];
}
@@ -574,8 +575,10 @@ StatusCode TileRawChannelBuilder::commitContainer()
ATH_MSG_VERBOSE( "Ch "<<m_tileHWID->to_string(adc_id)
<<" amp " << rch->amplitude() << " ped " << rch->pedestal()
<< " corr " << corr );
- rch->setAmplitude (rch->amplitude() - corr);
- rch->setPedestal (rch->pedestal() + corr);
+ if (corr<10000.) {
+ rch->setAmplitude (rch->amplitude() - corr); // just baseline shift
+ }
+ rch->setPedestal (rch->pedestal() + corr); // baseline shift or change in error status
} else {
ATH_MSG_WARNING(" Problem in applying noise corrections "
<< " can not find channel in DSP container with HWID "
diff --git a/TileCalorimeter/TileRecUtils/src/TileTimeBCOffsetFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileTimeBCOffsetFilter.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..672abe3e9b440f89a464be5184b484cfbaf8a026
--- /dev/null
+++ b/TileCalorimeter/TileRecUtils/src/TileTimeBCOffsetFilter.cxx
@@ -0,0 +1,368 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/********************************************************************
+ *
+ * NAME: TileTileBCOffsetFilter
+ * PACKAGE: offline/TileCalorimeter/TileRecUtils
+ *
+ * AUTHOR : T. Davidek, A. Solodkov
+ * CREATED: Feb 2019
+ *
+ * PURPOSE: mask the time offsets by +/-1 or +/-2 bunch crossings in the given
+ * Tile DMU
+ *
+ * Input: TileRawChannelContainer
+ * Output: TileRawChannelContainer is modified
+ * Parameters: none
+ *
+ ********************************************************************/
+
+// Tile includes
+#include "TileRecUtils/TileTimeBCOffsetFilter.h"
+#include "TileIdentifier/TileHWID.h"
+#include "TileEvent/TileRawChannel.h"
+#include "TileEvent/TileRawChannelContainer.h"
+#include "TileIdentifier/TileRawChannelUnit.h"
+#include "TileCalibBlobObjs/TileCalibUtils.h"
+
+// Atlas includes
+#include "AthenaKernel/errorcheck.h"
+#include "Identifier/HWIdentifier.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+
+
+//========================================================
+// constructor
+TileTimeBCOffsetFilter::TileTimeBCOffsetFilter(const std::string& type,
+ const std::string& name, const IInterface* parent)
+ : base_class(type, name, parent)
+ , m_tileHWID(nullptr)
+ , m_cabling(nullptr)
+{
+ declareProperty("EneThreshold3", m_ene_threshold_3chan = 3000);
+ declareProperty("EneThreshold1", m_ene_threshold_1chan = 4000);
+ declareProperty("TimeThreshold", m_time_threshold_diff = 15);
+
+ declareProperty("CheckDCS", m_checkDCS = false);
+}
+
+StatusCode TileTimeBCOffsetFilter::initialize() {
+ ATH_MSG_INFO( "TileTimeBCOffsetFilter::initialize()" );
+
+ if (msgLvl(MSG::DEBUG)) {
+ msg(MSG::DEBUG) << "EneThreshold3 = "
+ << m_ene_threshold_3chan << endmsg;
+ msg(MSG::DEBUG) << "EneThreshold1 = "
+ << m_ene_threshold_1chan << endmsg;
+ msg(MSG::DEBUG) << "TimeThreshold = "
+ << m_time_threshold_diff << endmsg;
+ msg(MSG::DEBUG) << "CheckDCS = "
+ << ((m_checkDCS)?"true":"false") << endmsg;
+ }
+
+ ATH_CHECK( detStore()->retrieve(m_tileHWID) );
+
+ //=== get TileCondToolEmscale
+ ATH_CHECK( m_tileToolEmscale.retrieve() );
+
+ //=== get TileBadChanTool
+ ATH_CHECK( m_tileBadChanTool.retrieve() );
+
+ CHECK( m_tileDCS.retrieve(EnableTool{m_checkDCS}) );
+
+ ATH_CHECK( m_cablingSvc.retrieve() );
+ m_cabling = m_cablingSvc->cablingService();
+
+ ATH_CHECK( m_DQstatusKey.initialize() );
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode TileTimeBCOffsetFilter::finalize() {
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+TileTimeBCOffsetFilter::process (TileMutableRawChannelContainer& rchCont) const
+{
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ ATH_MSG_DEBUG("in process()");
+
+ // Now retrieve the TileDQstatus
+ const TileDQstatus* DQstatus = SG::makeHandle (m_DQstatusKey, ctx).get();
+
+ const int nchan_dmu = 3; // number of channels in a single DMU
+
+ TileRawChannelUnit::UNIT rchUnit = rchCont.get_unit();
+
+ for (IdentifierHash hash : rchCont.GetAllCurrentHashes()) {
+ TileRawChannelCollection* coll = rchCont.indexFindPtr (hash);
+
+ if (coll->size() != TileCalibUtils::MAX_CHAN) {
+ ATH_MSG_DEBUG("drawer container does not contain all channels");
+ continue;
+ }
+
+ /* Get drawer ID and build drawer index. */
+ HWIdentifier drawer_id = m_tileHWID->drawer_id(coll->identify());
+ int ros = m_tileHWID->ros(drawer_id);
+ int drawer = m_tileHWID->drawer(drawer_id);
+
+ unsigned int drawerIdx = TileCalibUtils::getDrawerIdx(ros, drawer);
+ std::vector<bool> channel_time_ok(TileCalibUtils::MAX_CHAN,true);
+ std::vector<int> bad_dmu;
+ if (drawer_ok(drawerIdx,channel_time_ok,bad_dmu)) continue;
+ if (msgLvl(MSG::VERBOSE)) {
+ for (unsigned int ch=0; ch<TileCalibUtils::MAX_CHAN; ++ch) {
+ if (!channel_time_ok[ch]) {
+ const char * part[5] = {"AUX","LBA","LBC","EBA","EBC"};
+ ATH_MSG_VERBOSE( "Checking timing jump in module " << part[ros]
+ << std::setw(2) << std::setfill('0') << drawer+1
+ << " channel " << std::setw(2) << std::setfill(' ') << ch );
+ }
+ }
+ }
+
+ // in loop below rely on the channel order 0..47 inside collection
+ // print an ERROR and do nothing if order is wrong
+
+ for (int dmu : bad_dmu) {
+ ATH_MSG_VERBOSE( "Checking DMU " << dmu);
+ int dmu_offset = dmu * nchan_dmu;
+
+ /* the order is: [0] - channel on a different DMU, being a partner of
+ one of the channels on this DMU. We call it reference channel.
+ Indices [1]..[3] correspond to the channels on this DMU.
+ There might be more reference channels in one DMU (e.g. LB DMU#0 has
+ two partners on different DMU: ch=3 and ch=4), in that case we pick up
+ that with the highest energy.*/
+ bool ch_status[nchan_dmu+1];
+ int ch_number[nchan_dmu+1];
+ float ch_amp[nchan_dmu+1];
+ float ch_time[nchan_dmu+1];
+ bool ch_mask[nchan_dmu+1];
+
+ // search for reference channels, picking that with highest energy
+ int ch_p = -1, ch_0 = -1;
+ float ch_p_amp = -1000000;
+ for(int i=0; i < nchan_dmu; ++i) {
+ int ch = i+dmu_offset;
+ int ch_p_tmp = find_partner(ros,ch);
+ if ((ch_p_tmp >= 0) && (ch_p_tmp/nchan_dmu != dmu)) { // partner on different DMU
+ const TileRawChannel * rch = coll->at(ch_p_tmp);
+ HWIdentifier adc_id = rch->adc_HWID();
+ if (m_tileHWID->channel(adc_id) != ch_p_tmp) {
+ ATH_MSG_ERROR("Channels in drawer collection are out of order");
+ continue;
+ }
+ int gain = m_tileHWID->adc(adc_id);
+ if (channel_time_ok[ch_p_tmp] &&
+ (! ch_masked_or_empty(ros,drawer,ch_p_tmp,gain,DQstatus))) {
+ float amp = rch->amplitude();
+ if (rchUnit != TileRawChannelUnit::OnlineMegaElectronVolts) {
+ amp = m_tileToolEmscale->channelCalib(drawerIdx, ch_p_tmp, gain, amp, rchUnit, TileRawChannelUnit::MegaElectronVolts);
+ }
+ if (amp > ch_p_amp) {
+ ch_p = ch_p_tmp;
+ ch_p_amp = amp;
+ ch_0 = ch;
+ }
+ }
+ }
+ }
+ if (ch_p < 0) { // no suitable reference channel found, cannot do anything
+ continue;
+ }
+
+ ch_number[0] = ch_p;
+ ch_status[0] = channel_time_ok[ch_p];
+ ch_number[1] = ch_0;
+ ch_status[1] = channel_time_ok[ch_0];
+ int index = 2;
+ for(int i=0; i < nchan_dmu; ++i) {
+ int ch = i+dmu_offset;
+ if (ch != ch_0) {
+ ch_number[index] = ch;
+ ch_status[index] = channel_time_ok[ch];
+ ++index;
+ }
+ }
+
+ // init ch_amp, ch_time, ch_mask; ch_status already filled-in above
+ int nprob = 0; // number of potentially problematic channels in the DMU
+ for(int i=0; i <= nchan_dmu; ++i) {
+ int ch = ch_number[i];
+ const TileRawChannel * rch = coll->at(ch);
+ HWIdentifier adc_id = rch->adc_HWID();
+ if (m_tileHWID->channel(adc_id) != ch) {
+ ATH_MSG_ERROR("Channels in drawer collection are out of order");
+ continue;
+ }
+ int gain = m_tileHWID->adc(adc_id);
+ if (ch_masked_or_empty(ros,drawer,ch,gain,DQstatus)) {
+ ch_number[i] = -10;
+ ch_amp[i] = 0;
+ ch_time[i] = 0;
+ ch_mask[i] = false;
+ } else {
+ ch_amp[i] = rch->amplitude();
+ if (rchUnit != TileRawChannelUnit::OnlineMegaElectronVolts) {
+ ch_amp[i] = m_tileToolEmscale->channelCalib(drawerIdx, ch, gain, ch_amp[i], rchUnit, TileRawChannelUnit::MegaElectronVolts);
+ }
+ ch_time[i] = rch->time();
+ ch_mask[i] = false;
+ if ((i > 0) && (! ch_status[i])) ++nprob;
+ }
+ }
+
+ ATH_MSG_VERBOSE( "DMU " << dmu << " number of problems found " << nprob);
+ if (nprob == 0) continue; // no potential problems, skipping
+
+ float ene_threshold;
+ if (nprob == 1) {
+ ene_threshold = m_ene_threshold_1chan;
+ } else {
+ ene_threshold = m_ene_threshold_3chan;
+ }
+ /* Look at both reference and potentially affected channels in the given
+ DMU. At least one channel of the four should be above threshold,
+ and the time difference of affected channsl wrt reference channel
+ should be above 15 ns. */
+ bool ene_above = false;
+ for(int i=0; i <= nchan_dmu; ++i) {
+ ene_above = ene_above || ((ch_number[i] >= 0) && (ch_amp[i] > ene_threshold));
+ }
+ if (ene_above) { // at least 1 channel above the threshold
+ ATH_MSG_VERBOSE( "Energy above threshold");
+ /* first check whether the times of 1-3 channels on the DMU are within
+ 15 ns, also calculate the average time */
+ bool time_dmu_same = true;
+ float time_dmu_aver = 0;
+ int n_dmu_aver = 0;
+ for(int i=1; (i <= nchan_dmu) && time_dmu_same; ++i) { //
+ if (ch_number[i] < 0) continue;
+ time_dmu_aver += ch_time[i];
+ ++n_dmu_aver;
+ for(int j=i+1; (j <= nchan_dmu) && time_dmu_same; ++j) {
+ if (ch_number[j] >= 0) {
+ time_dmu_same = time_dmu_same &&
+ (fabs(ch_time[i]-ch_time[j]) < m_time_threshold_diff);
+ }
+ }
+ }
+ if (time_dmu_same) {
+ time_dmu_aver /= n_dmu_aver;
+ ATH_MSG_VERBOSE( "Average time "<< time_dmu_aver);
+ if (fabs(ch_time[0]-time_dmu_aver) > m_time_threshold_diff) {
+ for(int i=1; i <= nchan_dmu; ++i) {
+ if (ch_number[i] >= 0) ch_mask[i] = true;
+ }
+ }
+ } else {
+ ATH_MSG_VERBOSE( "Can not determine average time");
+ }
+ }
+ // now apply mask to RawChannelContainer for channels spotted above
+ for(int i=1; i<= nchan_dmu;++i) {
+ if ((ch_number[i] >= 0) && ch_mask[i]) {
+ ATH_MSG_VERBOSE( "Masking channel " << ch_number[i]);
+ coll->at(ch_number[i])->setPedestal(240000.0);
+ }
+ }
+ } // end-of-loop over all DMUs in the given drawer
+ } // end-of loop over drawers
+
+ return StatusCode::SUCCESS;
+}
+
+bool TileTimeBCOffsetFilter::drawer_ok(int drawerIdx,
+ std::vector<bool> & channel_time_ok,
+ std::vector<int> & bad_dmu) const {
+ /* checks whether the whole drawer is ok, i.e. none of its channel
+ is potentially suffering from the +/-25 ns (or +/-50 ns) time shifts
+ and fill vectors with status for every channel at the same time
+ */
+ bool status = true;
+ int last_dmu = -1;
+ const int nchan_dmu = 3; // number of channels in a single DMU
+ for (unsigned int ch=0; ch<TileCalibUtils::MAX_CHAN; ++ch) {
+ TileBchStatus chStatus = m_tileBadChanTool->getAdcStatus(drawerIdx, ch, 0);
+ if (chStatus.isTimingDmuBcOffset()) { // channel timing is not stable
+ int dmu = ch/nchan_dmu;
+ if (dmu!=last_dmu) {
+ bad_dmu.push_back(dmu);
+ last_dmu=dmu;
+ }
+ channel_time_ok[ch] = false;
+ status = false;
+ }
+ }
+ return status;
+}
+
+bool TileTimeBCOffsetFilter::ch_masked_or_empty(int ros, int drawer, int channel, int gain,
+ const TileDQstatus* DQstatus) const {
+ // check if channel is connected
+ int index, pmt;
+ m_cabling->h2s_cell_id_index(ros, drawer, channel, index, pmt);
+ if (index < 0) return true; // disconnected or MBTS
+
+ // DB status
+ int drawerIdx = TileCalibUtils::getDrawerIdx(ros, drawer);
+ TileBchStatus chStatus = m_tileBadChanTool->getAdcStatus(drawerIdx, channel, gain);
+ if (chStatus.isBad()) return true;
+
+ // check DQstatus now
+ bool bad = !(DQstatus->isAdcDQgood(ros, drawer, channel, gain)
+ && isChanDCSgood(ros, drawer, channel));
+ return bad;
+}
+
+bool TileTimeBCOffsetFilter::isChanDCSgood (int ros, int drawer, int channel) const
+{
+ bool good=true;
+
+ if (m_checkDCS) {
+
+ TileDCSState::TileDCSStatus status = m_tileDCS->getDCSStatus(ros, drawer, channel);
+
+ if (status > TileDCSState::WARNING) {
+ good=false;
+ ATH_MSG_DEBUG("Module=" << TileCalibUtils::getDrawerString(ros, drawer)
+ << " channel=" << channel
+ << " masking becasue of bad DCS status=" << status);
+ }
+ }
+
+ return good;
+}
+
+
+int TileTimeBCOffsetFilter::find_partner(int ros, int ch) const {
+ /* returns the "partner" channel, i.e. the channel reading the same cell
+ as channel "ch" */
+ int lbcells[48] = {
+ -1, 4, 3, 2, 1, 8, 7, 6, 5,
+ 10, 9, 12, 11, 14, 13, 18, 17, 16, 15,
+ 20, 19, 22, 21, 26, 25, 24, 23,
+ 28, 27, 32, -1, -1, 29,
+ 34, 33, 38, 37, 36, 35,
+ 40, 39, 44, 47, -1, 41, 46, 45, 42
+ };
+ int ebcells[48] = {
+ -1, -1, 3, 2, 5, 4,
+ 7, 6, 9, 8, 11, 10,
+ -1, -1, 15, 14, 17, 16,
+ -1, -1, 21, 20, 23, 22,
+ -1, -1, -1, -1, -1, -1,
+ 35, 32, 31, -1, -1, 30,
+ 39, 38, 37, 36, 41, 40,
+ -1, -1, -1, -1, -1, -1
+ };
+ if (ros < 3) // LB
+ return lbcells[ch];
+ else // EB
+ return ebcells[ch];
+}
diff --git a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
index b8c6ac7f1042025c9ff546cdeb3b1d40f1fce26a..e5ec8b5129a74f946779cc5001f5533c56693f60 100644
--- a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
+++ b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
@@ -16,6 +16,7 @@
#include "TileRecUtils/TileCellNoiseFilter.h"
#include "TileRecUtils/TileRawChannelNoiseFilter.h"
#include "TileRecUtils/TileRawChannelOF1Corrector.h"
+#include "TileRecUtils/TileTimeBCOffsetFilter.h"
#include "../TileTowerBuilderTool.h"
#include "../TileDigitsDumper.h"
#include "../TileRawChannelDumper.h"
@@ -44,6 +45,7 @@ DECLARE_COMPONENT( TileTowerBuilderTool )
DECLARE_COMPONENT( TileCellNoiseFilter )
DECLARE_COMPONENT( TileRawChannelNoiseFilter )
DECLARE_COMPONENT( TileRawChannelOF1Corrector )
+DECLARE_COMPONENT( TileTimeBCOffsetFilter )
DECLARE_COMPONENT( TileRawChannelMaker )
DECLARE_COMPONENT( TileRawChannelVerify )
DECLARE_COMPONENT( TileRawCorrelatedNoise )
diff --git a/TileCalorimeter/TileSimAlgs/share/TileSamplingFraction_jobOptions.py b/TileCalorimeter/TileSimAlgs/share/TileSamplingFraction_jobOptions.py
index 6c9bc980c7cdfe7172ba7feadf3a817e7858d8ee..badb520f1414d4597591675e5814237a9886da87 100644
--- a/TileCalorimeter/TileSimAlgs/share/TileSamplingFraction_jobOptions.py
+++ b/TileCalorimeter/TileSimAlgs/share/TileSamplingFraction_jobOptions.py
@@ -34,6 +34,9 @@ try:
if G4V >= 10.0 :
EmScaleA = 33.7
+ if G4V >= 10.05 :
+ EmScaleA = 32.9
+
# old value
if physicsList == 'QGSP_EMV' or physicsList == 'QGSP_BERT_EMV' or physicsList == '' :
EmScaleA = 35.9
diff --git a/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt b/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt
index e6b171ee81e8893ab8e62c5ae36e230a9163fcfc..4b90a794ae06fcfe79c0fbc98dd7849a1a0acdca 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt
+++ b/TileCalorimeter/TileSvc/TileByteStream/CMakeLists.txt
@@ -51,7 +51,7 @@ atlas_add_component( TileByteStream
LINK_LIBRARIES TileByteStreamLib )
-set( extra_patterns "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|INFO opening|loading cache|start processing|done processing|WARNING ../MuRcvDigitsCnt|WARNING ../MuRcvRawChCnt|TileL2Builder initialization completed|Initializing TileMuRcvContByteStreamTool|filled inputFileSummary from file|Picked valid file|No SimFlags|INFO Initializing" )
+set( extra_patterns "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|INFO opening|loading cache|start processing|done processing|WARNING ../MuRcvDigitsCnt|WARNING ../MuRcvRawChCnt|TileL2Builder initialization completed|Initializing TileMuRcvContByteStreamTool|filled inputFileSummary from file|Picked valid file|No SimFlags|INFO Initializing|IOVDbSvc[0-9 ]+INFO" )
atlas_add_test( TileDigitsContByteStreamCnv_test
SCRIPT test/TileDigitsContByteStreamCnv_test.sh
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
index 80bba733b55f49470a6931732415bf1ec8845a38..a40aa5355cdfcb3f27e2ec1f66b689f3ad674fe8 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
@@ -1,16 +1,16 @@
-Wed Jun 3 16:09:45 PDT 2020
+Tue Oct 6 19:57:24 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileDigitsContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:09:55 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:57:37 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7006 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -57,7 +52,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -67,11 +62,11 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully
ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddre... INFO initialized
ByteStreamAddre... INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2575 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2643 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -90,7 +85,7 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -181,7 +176,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -190,7 +185,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25364Kb Time = 0.75S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.54S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -201,7 +196,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -213,9 +208,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,8 +245,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.2S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.15S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -261,7 +256,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -305,7 +300,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 4030 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4147 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
Finalizer INFO Initializing Finalizer...
ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
@@ -316,7 +311,7 @@ ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # S
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 425 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -341,12 +336,13 @@ IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -360,12 +356,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -396,8 +392,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 2266 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2315 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD... INFO TileL2Builder initialization completed
ToolSvc.TileDig... INFO Initializing TileDigitsContByteStreamTool
AthenaEventLoopMgr INFO ===>>> done processing event #1129572, run #204073 1 events processed so far <<<===
@@ -612,23 +608,23 @@ Finalize: compared 20 dumps
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.90 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 1.10 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 1.11 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 1.11 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.81 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.72 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.63 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.63 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.75 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.63 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.72 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.06 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.68 ))s
-IOVDbSvc INFO bytes in (( 9.84 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.23 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.58 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 1.58 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 8.26 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.54 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.TileDig... INFO Finalizing TileDigitsContByteStreamTool successfuly
@@ -637,18 +633,18 @@ ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 270 [ms] Ave/Min/Max= 135(+- 125)/ 10/ 260 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 320 [ms] Ave/Min/Max= 24.6(+- 74.5)/ 0/ 280 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 7.88 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.5 [s] Ave/Min/Max= 0.25(+- 0.25)/ 0/ 0.5 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.0423(+- 0.138)/ 0/ 0.52 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 10.7 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Py:Athena INFO leaving with code 0: "successful run"
-Wed Jun 3 16:10:29 PDT 2020
+Tue Oct 6 19:57:54 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -657,9 +653,9 @@ Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileDigitsContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -674,29 +670,24 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
MessageSvc INFO Activating in a separate thread
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:10:38 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:58:05 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7378 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -707,7 +698,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStreamMetadataTool INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSequencerSvc INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -717,11 +708,11 @@ IOVDbSvc INFO Service IOVDbSvc initia
ByteStreamAddressProviderSvc INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddressProviderSvc INFO initialized
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2575 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2643 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -740,7 +731,7 @@ IOVDbSvc INFO Added taginfo remove fo
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -831,7 +822,7 @@ BarrelConstruction INFO Use sagging in geomet
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -840,7 +831,7 @@ EMECConstruction INFO multi-layered version o
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25364Kb Time = 0.72S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.66S
GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -851,7 +842,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -863,9 +854,9 @@ CaloIDHelper_IDDetDescrCnv INFO in createObj: creating
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -900,8 +891,8 @@ GeoModelSvc.TileDetectorTool INFO Global positioning of
GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.21S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.18S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -911,10 +902,10 @@ TileCablingSvc INFO RUN2 ATLAS geometry fla
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc 0 INFO getRegistryEntries: read 4295 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 4417 CLIDRegistry entries for module ALL
PyComponentMgr 0 INFO Initializing PyComponentMgr...
Finalizer 0 INFO Initializing Finalizer...
-ClassIDSvc 0 INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Initializing CondInputLoader...
CondInputLoader 0 INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -1010,12 +1001,13 @@ IOVDbSvc 0 0 INFO Opening COOL connection
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc 0 0 INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -1029,12 +1021,12 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-TileNeighbour 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -1042,211 +1034,211 @@ Domain[ROOT_All] 0 0 INFO -> Access DbDatabase
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #1129572, run #204073 on slot 0, 0 events processed so far <<<===
-ClassIDSvc 0 0 INFO getRegistryEntries: read 471 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 1795 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 503 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1812 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
ToolSvc.TileDigitsContByteStreamTool 0 0 INFO Initializing TileDigitsContByteStreamTool
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> start processing event #1129665, run #204073 on slot 1, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> start processing event #1131212, run #204073 on slot 2, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> start processing event #1131086, run #204073 on slot 3, 0 events processed so far <<<===
AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #1129572, run #204073 on slot 0, 1 events processed so far <<<===
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> done processing event #1129665, run #204073 on slot 1, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> done processing event #1131212, run #204073 on slot 2, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> start processing event #1130272, run #204073 on slot 0, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> start processing event #1131269, run #204073 on slot 1, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> start processing event #1130716, run #204073 on slot 2, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> done processing event #1131086, run #204073 on slot 3, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> done processing event #1130272, run #204073 on slot 0, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 0 INFO ===>>> start processing event #1132019, run #204073 on slot 0, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 3 INFO ===>>> start processing event #1132092, run #204073 on slot 3, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> done processing event #1131269, run #204073 on slot 1, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> done processing event #1130716, run #204073 on slot 2, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1129665, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #1131212, run #204073 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #1131086, run #204073 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #1130272, run #204073 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #1129665, run #204073 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #1131212, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #1131086, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #1131269, run #204073 on slot 0, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #1130716, run #204073 on slot 1, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #1132019, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #1130272, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #1131269, run #204073 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #1130716, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #1132092, run #204073 on slot 0, 7 events processed so far <<<===
AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #1130238, run #204073 on slot 1, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 2 INFO ===>>> start processing event #1134553, run #204073 on slot 2, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 0 INFO ===>>> done processing event #1132019, run #204073 on slot 0, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 3 INFO ===>>> done processing event #1132092, run #204073 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> start processing event #1134553, run #204073 on slot 3, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #1132019, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #1132092, run #204073 on slot 0, 9 events processed so far <<<===
AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #1130238, run #204073 on slot 1, 10 events processed so far <<<===
AthenaHiveEventLoopMgr 11 0 INFO ===>>> start processing event #1130999, run #204073 on slot 0, 10 events processed so far <<<===
AthenaHiveEventLoopMgr 12 1 INFO ===>>> start processing event #1133461, run #204073 on slot 1, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 3 INFO ===>>> start processing event #1131152, run #204073 on slot 3, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 2 INFO ===>>> done processing event #1134553, run #204073 on slot 2, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> start processing event #1131152, run #204073 on slot 2, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> done processing event #1134553, run #204073 on slot 3, 11 events processed so far <<<===
AthenaHiveEventLoopMgr 11 0 INFO ===>>> done processing event #1130999, run #204073 on slot 0, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 0 INFO ===>>> start processing event #1130142, run #204073 on slot 0, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 2 INFO ===>>> start processing event #1132770, run #204073 on slot 2, 12 events processed so far <<<===
AthenaHiveEventLoopMgr 12 1 INFO ===>>> done processing event #1133461, run #204073 on slot 1, 13 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 3 INFO ===>>> done processing event #1131152, run #204073 on slot 3, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> start processing event #1130142, run #204073 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> start processing event #1132770, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #1132365, run #204073 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> done processing event #1131152, run #204073 on slot 2, 14 events processed so far <<<===
AthenaHiveEventLoopMgr 14 0 INFO ===>>> done processing event #1130142, run #204073 on slot 0, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> start processing event #1132365, run #204073 on slot 0, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 1 INFO ===>>> start processing event #1136791, run #204073 on slot 1, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 3 INFO ===>>> start processing event #1133781, run #204073 on slot 3, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 2 INFO ===>>> done processing event #1132770, run #204073 on slot 2, 16 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> done processing event #1132365, run #204073 on slot 0, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 0 INFO ===>>> start processing event #1132067, run #204073 on slot 0, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 2 INFO ===>>> start processing event #1138637, run #204073 on slot 2, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 1 INFO ===>>> done processing event #1136791, run #204073 on slot 1, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 3 INFO ===>>> done processing event #1133781, run #204073 on slot 3, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #1139495, run #204073 on slot 1, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 3 INFO ===>>> start processing event #1140193, run #204073 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #1136791, run #204073 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 2 INFO ===>>> start processing event #1133781, run #204073 on slot 2, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> done processing event #1132770, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #1132365, run #204073 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #1136791, run #204073 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 0 INFO ===>>> start processing event #1132067, run #204073 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 1 INFO ===>>> start processing event #1138637, run #204073 on slot 1, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 3 INFO ===>>> start processing event #1139495, run #204073 on slot 3, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 2 INFO ===>>> done processing event #1133781, run #204073 on slot 2, 19 events processed so far <<<===
AthenaHiveEventLoopMgr 19 0 INFO ===>>> done processing event #1132067, run #204073 on slot 0, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 2 INFO ===>>> done processing event #1138637, run #204073 on slot 2, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #1139495, run #204073 on slot 1, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 0 INFO ===>>> start processing event #1142953, run #204073 on slot 0, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 1 INFO ===>>> start processing event #1139127, run #204073 on slot 1, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 2 INFO ===>>> start processing event #1141272, run #204073 on slot 2, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 3 INFO ===>>> done processing event #1140193, run #204073 on slot 3, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 0 INFO ===>>> done processing event #1142953, run #204073 on slot 0, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 0 INFO ===>>> start processing event #1137117, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 1 INFO ===>>> done processing event #1138637, run #204073 on slot 1, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 0 INFO ===>>> start processing event #1140193, run #204073 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 1 INFO ===>>> start processing event #1142953, run #204073 on slot 1, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 2 INFO ===>>> start processing event #1139127, run #204073 on slot 2, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 3 INFO ===>>> done processing event #1139495, run #204073 on slot 3, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 0 INFO ===>>> done processing event #1140193, run #204073 on slot 0, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 1 INFO ===>>> done processing event #1142953, run #204073 on slot 1, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> start processing event #1141272, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> start processing event #1137117, run #204073 on slot 1, 24 events processed so far <<<===
AthenaHiveEventLoopMgr 27 3 INFO ===>>> start processing event #1139599, run #204073 on slot 3, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 1 INFO ===>>> done processing event #1139127, run #204073 on slot 1, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 2 INFO ===>>> done processing event #1141272, run #204073 on slot 2, 26 events processed so far <<<===
-AthenaHiveEventLoopMgr 28 1 INFO ===>>> start processing event #1140314, run #204073 on slot 1, 26 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 2 INFO ===>>> start processing event #1133685, run #204073 on slot 2, 26 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 0 INFO ===>>> done processing event #1137117, run #204073 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 2 INFO ===>>> done processing event #1139127, run #204073 on slot 2, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> done processing event #1141272, run #204073 on slot 0, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> done processing event #1137117, run #204073 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 0 INFO ===>>> start processing event #1140314, run #204073 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 1 INFO ===>>> start processing event #1133685, run #204073 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 2 INFO ===>>> start processing event #1143279, run #204073 on slot 2, 27 events processed so far <<<===
AthenaHiveEventLoopMgr 27 3 INFO ===>>> done processing event #1139599, run #204073 on slot 3, 28 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 0 INFO ===>>> start processing event #1143279, run #204073 on slot 0, 28 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 3 INFO ===>>> start processing event #1137563, run #204073 on slot 3, 28 events processed so far <<<===
-AthenaHiveEventLoopMgr 28 1 INFO ===>>> done processing event #1140314, run #204073 on slot 1, 29 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 2 INFO ===>>> done processing event #1133685, run #204073 on slot 2, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 0 INFO ===>>> done processing event #1140314, run #204073 on slot 0, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 1 INFO ===>>> done processing event #1133685, run #204073 on slot 1, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 0 INFO ===>>> start processing event #1137563, run #204073 on slot 0, 30 events processed so far <<<===
AthenaHiveEventLoopMgr 32 1 INFO ===>>> start processing event #1139927, run #204073 on slot 1, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 2 INFO ===>>> start processing event #1141197, run #204073 on slot 2, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 0 INFO ===>>> done processing event #1143279, run #204073 on slot 0, 31 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 3 INFO ===>>> done processing event #1137563, run #204073 on slot 3, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 0 INFO ===>>> start processing event #1140039, run #204073 on slot 0, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 3 INFO ===>>> start processing event #1142531, run #204073 on slot 3, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 3 INFO ===>>> start processing event #1141197, run #204073 on slot 3, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 2 INFO ===>>> done processing event #1143279, run #204073 on slot 2, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 0 INFO ===>>> done processing event #1137563, run #204073 on slot 0, 32 events processed so far <<<===
AthenaHiveEventLoopMgr 32 1 INFO ===>>> done processing event #1139927, run #204073 on slot 1, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 2 INFO ===>>> done processing event #1141197, run #204073 on slot 2, 34 events processed so far <<<===
-AthenaHiveEventLoopMgr 36 1 INFO ===>>> start processing event #1139475, run #204073 on slot 1, 34 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 2 INFO ===>>> start processing event #1139958, run #204073 on slot 2, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 0 INFO ===>>> start processing event #1140039, run #204073 on slot 0, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 1 INFO ===>>> start processing event #1142531, run #204073 on slot 1, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 2 INFO ===>>> start processing event #1139475, run #204073 on slot 2, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 3 INFO ===>>> done processing event #1141197, run #204073 on slot 3, 34 events processed so far <<<===
AthenaHiveEventLoopMgr 34 0 INFO ===>>> done processing event #1140039, run #204073 on slot 0, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 3 INFO ===>>> done processing event #1142531, run #204073 on slot 3, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 0 INFO ===>>> start processing event #1143765, run #204073 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 1 INFO ===>>> done processing event #1142531, run #204073 on slot 1, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> start processing event #1139958, run #204073 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> start processing event #1143765, run #204073 on slot 1, 36 events processed so far <<<===
AthenaHiveEventLoopMgr 39 3 INFO ===>>> start processing event #1143097, run #204073 on slot 3, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 36 1 INFO ===>>> done processing event #1139475, run #204073 on slot 1, 37 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 2 INFO ===>>> done processing event #1139958, run #204073 on slot 2, 38 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 0 INFO ===>>> done processing event #1143765, run #204073 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 2 INFO ===>>> done processing event #1139475, run #204073 on slot 2, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> done processing event #1139958, run #204073 on slot 0, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> done processing event #1143765, run #204073 on slot 1, 39 events processed so far <<<===
AthenaHiveEventLoopMgr 40 0 INFO ===>>> start processing event #1134147, run #204073 on slot 0, 39 events processed so far <<<===
AthenaHiveEventLoopMgr 41 1 INFO ===>>> start processing event #1137156, run #204073 on slot 1, 39 events processed so far <<<===
AthenaHiveEventLoopMgr 42 2 INFO ===>>> start processing event #1136377, run #204073 on slot 2, 39 events processed so far <<<===
AthenaHiveEventLoopMgr 39 3 INFO ===>>> done processing event #1143097, run #204073 on slot 3, 40 events processed so far <<<===
AthenaHiveEventLoopMgr 40 0 INFO ===>>> done processing event #1134147, run #204073 on slot 0, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 0 INFO ===>>> start processing event #1137842, run #204073 on slot 0, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 44 3 INFO ===>>> start processing event #1141705, run #204073 on slot 3, 41 events processed so far <<<===
AthenaHiveEventLoopMgr 41 1 INFO ===>>> done processing event #1137156, run #204073 on slot 1, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 0 INFO ===>>> start processing event #1137842, run #204073 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 1 INFO ===>>> start processing event #1141705, run #204073 on slot 1, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 3 INFO ===>>> start processing event #1143410, run #204073 on slot 3, 42 events processed so far <<<===
AthenaHiveEventLoopMgr 42 2 INFO ===>>> done processing event #1136377, run #204073 on slot 2, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 1 INFO ===>>> start processing event #1143410, run #204073 on slot 1, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> start processing event #1144170, run #204073 on slot 2, 43 events processed so far <<<===
AthenaHiveEventLoopMgr 43 0 INFO ===>>> done processing event #1137842, run #204073 on slot 0, 44 events processed so far <<<===
-AthenaHiveEventLoopMgr 44 3 INFO ===>>> done processing event #1141705, run #204073 on slot 3, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 1 INFO ===>>> done processing event #1143410, run #204073 on slot 1, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 0 INFO ===>>> start processing event #1145987, run #204073 on slot 0, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 48 1 INFO ===>>> start processing event #1145633, run #204073 on slot 1, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 3 INFO ===>>> start processing event #1135005, run #204073 on slot 3, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> done processing event #1144170, run #204073 on slot 2, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 0 INFO ===>>> done processing event #1145987, run #204073 on slot 0, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 48 1 INFO ===>>> done processing event #1145633, run #204073 on slot 1, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 0 INFO ===>>> start processing event #1142167, run #204073 on slot 0, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 1 INFO ===>>> start processing event #1144646, run #204073 on slot 1, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 2 INFO ===>>> start processing event #1145027, run #204073 on slot 2, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 3 INFO ===>>> done processing event #1135005, run #204073 on slot 3, 50 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 0 INFO ===>>> done processing event #1142167, run #204073 on slot 0, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #1144112, run #204073 on slot 0, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 3 INFO ===>>> start processing event #1138485, run #204073 on slot 3, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 1 INFO ===>>> done processing event #1144646, run #204073 on slot 1, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 2 INFO ===>>> done processing event #1145027, run #204073 on slot 2, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 0 INFO ===>>> start processing event #1144170, run #204073 on slot 0, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> start processing event #1145987, run #204073 on slot 2, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 1 INFO ===>>> done processing event #1141705, run #204073 on slot 1, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 3 INFO ===>>> done processing event #1143410, run #204073 on slot 3, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 0 INFO ===>>> done processing event #1144170, run #204073 on slot 0, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 0 INFO ===>>> start processing event #1145633, run #204073 on slot 0, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 1 INFO ===>>> start processing event #1135005, run #204073 on slot 1, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 3 INFO ===>>> start processing event #1142167, run #204073 on slot 3, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> done processing event #1145987, run #204073 on slot 2, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 0 INFO ===>>> done processing event #1145633, run #204073 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 1 INFO ===>>> done processing event #1135005, run #204073 on slot 1, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 0 INFO ===>>> start processing event #1144646, run #204073 on slot 0, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 1 INFO ===>>> start processing event #1145027, run #204073 on slot 1, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 2 INFO ===>>> start processing event #1144112, run #204073 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 3 INFO ===>>> done processing event #1142167, run #204073 on slot 3, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 0 INFO ===>>> done processing event #1144646, run #204073 on slot 0, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 1 INFO ===>>> done processing event #1145027, run #204073 on slot 1, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 0 INFO ===>>> start processing event #1138485, run #204073 on slot 0, 53 events processed so far <<<===
AthenaHiveEventLoopMgr 55 1 INFO ===>>> start processing event #1144565, run #204073 on slot 1, 53 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 2 INFO ===>>> start processing event #1139498, run #204073 on slot 2, 53 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #1144112, run #204073 on slot 0, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 3 INFO ===>>> done processing event #1138485, run #204073 on slot 3, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 3 INFO ===>>> start processing event #1139498, run #204073 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 2 INFO ===>>> done processing event #1144112, run #204073 on slot 2, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 0 INFO ===>>> done processing event #1138485, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> start processing event #1136546, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 2 INFO ===>>> start processing event #1143799, run #204073 on slot 2, 55 events processed so far <<<===
AthenaHiveEventLoopMgr 55 1 INFO ===>>> done processing event #1144565, run #204073 on slot 1, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 57 0 INFO ===>>> start processing event #1136546, run #204073 on slot 0, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 1 INFO ===>>> start processing event #1143799, run #204073 on slot 1, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 59 3 INFO ===>>> start processing event #1142877, run #204073 on slot 3, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 2 INFO ===>>> done processing event #1139498, run #204073 on slot 2, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 3 INFO ===>>> done processing event #1139498, run #204073 on slot 3, 57 events processed so far <<<===
AthenaHiveEventLoopMgr 57 0 INFO ===>>> done processing event #1136546, run #204073 on slot 0, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 0 INFO ===>>> start processing event #1149894, run #204073 on slot 0, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 2 INFO ===>>> start processing event #1145364, run #204073 on slot 2, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 1 INFO ===>>> done processing event #1143799, run #204073 on slot 1, 59 events processed so far <<<===
-AthenaHiveEventLoopMgr 59 3 INFO ===>>> done processing event #1142877, run #204073 on slot 3, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 1 INFO ===>>> start processing event #1143770, run #204073 on slot 1, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 3 INFO ===>>> start processing event #1148361, run #204073 on slot 3, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 0 INFO ===>>> done processing event #1149894, run #204073 on slot 0, 61 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 2 INFO ===>>> done processing event #1145364, run #204073 on slot 2, 62 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 1 INFO ===>>> done processing event #1143770, run #204073 on slot 1, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 0 INFO ===>>> start processing event #1148167, run #204073 on slot 0, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 1 INFO ===>>> start processing event #1138948, run #204073 on slot 1, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> start processing event #1144808, run #204073 on slot 2, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 3 INFO ===>>> done processing event #1148361, run #204073 on slot 3, 64 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 0 INFO ===>>> done processing event #1148167, run #204073 on slot 0, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 0 INFO ===>>> start processing event #1145832, run #204073 on slot 0, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 3 INFO ===>>> start processing event #1153100, run #204073 on slot 3, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 1 INFO ===>>> done processing event #1138948, run #204073 on slot 1, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> done processing event #1144808, run #204073 on slot 2, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> start processing event #1142877, run #204073 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> start processing event #1149894, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 3 INFO ===>>> start processing event #1145364, run #204073 on slot 3, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 2 INFO ===>>> done processing event #1143799, run #204073 on slot 2, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> done processing event #1142877, run #204073 on slot 0, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> done processing event #1149894, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> start processing event #1143770, run #204073 on slot 0, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> start processing event #1148361, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 2 INFO ===>>> start processing event #1148167, run #204073 on slot 2, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 3 INFO ===>>> done processing event #1145364, run #204073 on slot 3, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> done processing event #1143770, run #204073 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> done processing event #1148361, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #1138948, run #204073 on slot 0, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #1144808, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> start processing event #1145832, run #204073 on slot 3, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 2 INFO ===>>> done processing event #1148167, run #204073 on slot 2, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #1138948, run #204073 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #1144808, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> start processing event #1153100, run #204073 on slot 0, 67 events processed so far <<<===
AthenaHiveEventLoopMgr 69 1 INFO ===>>> start processing event #1142524, run #204073 on slot 1, 67 events processed so far <<<===
AthenaHiveEventLoopMgr 70 2 INFO ===>>> start processing event #1138294, run #204073 on slot 2, 67 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 0 INFO ===>>> done processing event #1145832, run #204073 on slot 0, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 3 INFO ===>>> done processing event #1153100, run #204073 on slot 3, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> done processing event #1145832, run #204073 on slot 3, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> done processing event #1153100, run #204073 on slot 0, 69 events processed so far <<<===
AthenaHiveEventLoopMgr 69 1 INFO ===>>> done processing event #1142524, run #204073 on slot 1, 70 events processed so far <<<===
AthenaHiveEventLoopMgr 71 0 INFO ===>>> start processing event #1138350, run #204073 on slot 0, 70 events processed so far <<<===
AthenaHiveEventLoopMgr 72 1 INFO ===>>> start processing event #1149424, run #204073 on slot 1, 70 events processed so far <<<===
AthenaHiveEventLoopMgr 73 3 INFO ===>>> start processing event #1151102, run #204073 on slot 3, 70 events processed so far <<<===
AthenaHiveEventLoopMgr 70 2 INFO ===>>> done processing event #1138294, run #204073 on slot 2, 71 events processed so far <<<===
AthenaHiveEventLoopMgr 71 0 INFO ===>>> done processing event #1138350, run #204073 on slot 0, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 0 INFO ===>>> start processing event #1152242, run #204073 on slot 0, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 2 INFO ===>>> start processing event #1148416, run #204073 on slot 2, 72 events processed so far <<<===
AthenaHiveEventLoopMgr 72 1 INFO ===>>> done processing event #1149424, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> start processing event #1152242, run #204073 on slot 0, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> start processing event #1148416, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 2 INFO ===>>> start processing event #1142753, run #204073 on slot 2, 73 events processed so far <<<===
AthenaHiveEventLoopMgr 73 3 INFO ===>>> done processing event #1151102, run #204073 on slot 3, 74 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 1 INFO ===>>> start processing event #1142753, run #204073 on slot 1, 74 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 3 INFO ===>>> start processing event #1149997, run #204073 on slot 3, 74 events processed so far <<<===
AthenaHiveEventLoopMgr 74 0 INFO ===>>> done processing event #1152242, run #204073 on slot 0, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 2 INFO ===>>> done processing event #1148416, run #204073 on slot 2, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 0 INFO ===>>> start processing event #1151617, run #204073 on slot 0, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 2 INFO ===>>> start processing event #1149794, run #204073 on slot 2, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 1 INFO ===>>> done processing event #1142753, run #204073 on slot 1, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 3 INFO ===>>> done processing event #1149997, run #204073 on slot 3, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 1 INFO ===>>> start processing event #1152504, run #204073 on slot 1, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 3 INFO ===>>> start processing event #1142485, run #204073 on slot 3, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 0 INFO ===>>> done processing event #1151617, run #204073 on slot 0, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 2 INFO ===>>> done processing event #1149794, run #204073 on slot 2, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 0 INFO ===>>> start processing event #1151364, run #204073 on slot 0, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 2 INFO ===>>> start processing event #1143901, run #204073 on slot 2, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 1 INFO ===>>> done processing event #1152504, run #204073 on slot 1, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 3 INFO ===>>> done processing event #1142485, run #204073 on slot 3, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> done processing event #1148416, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #1149997, run #204073 on slot 0, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #1151617, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 3 INFO ===>>> start processing event #1149794, run #204073 on slot 3, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 2 INFO ===>>> done processing event #1142753, run #204073 on slot 2, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #1149997, run #204073 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #1151617, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> start processing event #1152504, run #204073 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> start processing event #1142485, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 2 INFO ===>>> start processing event #1151364, run #204073 on slot 2, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 3 INFO ===>>> done processing event #1149794, run #204073 on slot 3, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> done processing event #1152504, run #204073 on slot 0, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> done processing event #1142485, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> start processing event #1143901, run #204073 on slot 0, 82 events processed so far <<<===
AthenaHiveEventLoopMgr 84 1 INFO ===>>> start processing event #1153979, run #204073 on slot 1, 82 events processed so far <<<===
AthenaHiveEventLoopMgr 85 3 INFO ===>>> start processing event #1150212, run #204073 on slot 3, 82 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 0 INFO ===>>> done processing event #1151364, run #204073 on slot 0, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 2 INFO ===>>> done processing event #1143901, run #204073 on slot 2, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 0 INFO ===>>> start processing event #1152633, run #204073 on slot 0, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 2 INFO ===>>> start processing event #1155482, run #204073 on slot 2, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 2 INFO ===>>> done processing event #1151364, run #204073 on slot 2, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> done processing event #1143901, run #204073 on slot 0, 84 events processed so far <<<===
AthenaHiveEventLoopMgr 84 1 INFO ===>>> done processing event #1153979, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> start processing event #1152633, run #204073 on slot 0, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> start processing event #1155482, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 2 INFO ===>>> start processing event #1150472, run #204073 on slot 2, 85 events processed so far <<<===
AthenaHiveEventLoopMgr 85 3 INFO ===>>> done processing event #1150212, run #204073 on slot 3, 86 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 1 INFO ===>>> start processing event #1150472, run #204073 on slot 1, 86 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 3 INFO ===>>> start processing event #1140275, run #204073 on slot 3, 86 events processed so far <<<===
AthenaHiveEventLoopMgr 86 0 INFO ===>>> done processing event #1152633, run #204073 on slot 0, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 2 INFO ===>>> done processing event #1155482, run #204073 on slot 2, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 0 INFO ===>>> start processing event #1145882, run #204073 on slot 0, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 2 INFO ===>>> start processing event #1151732, run #204073 on slot 2, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 1 INFO ===>>> done processing event #1150472, run #204073 on slot 1, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 3 INFO ===>>> done processing event #1140275, run #204073 on slot 3, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 1 INFO ===>>> start processing event #1137896, run #204073 on slot 1, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 3 INFO ===>>> start processing event #1156381, run #204073 on slot 3, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 0 INFO ===>>> done processing event #1145882, run #204073 on slot 0, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 2 INFO ===>>> done processing event #1151732, run #204073 on slot 2, 92 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 0 INFO ===>>> start processing event #1149161, run #204073 on slot 0, 92 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 2 INFO ===>>> start processing event #1153794, run #204073 on slot 2, 92 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 1 INFO ===>>> done processing event #1137896, run #204073 on slot 1, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 3 INFO ===>>> done processing event #1156381, run #204073 on slot 3, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> done processing event #1155482, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #1140275, run #204073 on slot 0, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> start processing event #1145882, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 3 INFO ===>>> start processing event #1151732, run #204073 on slot 3, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 2 INFO ===>>> done processing event #1150472, run #204073 on slot 2, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #1140275, run #204073 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> done processing event #1145882, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> start processing event #1137896, run #204073 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> start processing event #1156381, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 2 INFO ===>>> start processing event #1149161, run #204073 on slot 2, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 3 INFO ===>>> done processing event #1151732, run #204073 on slot 3, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> done processing event #1137896, run #204073 on slot 0, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> done processing event #1156381, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> start processing event #1153794, run #204073 on slot 0, 94 events processed so far <<<===
AthenaHiveEventLoopMgr 96 1 INFO ===>>> start processing event #1151312, run #204073 on slot 1, 94 events processed so far <<<===
AthenaHiveEventLoopMgr 97 3 INFO ===>>> start processing event #1148893, run #204073 on slot 3, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 0 INFO ===>>> done processing event #1149161, run #204073 on slot 0, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 2 INFO ===>>> done processing event #1153794, run #204073 on slot 2, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #1156938, run #204073 on slot 0, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 2 INFO ===>>> start processing event #1156351, run #204073 on slot 2, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 2 INFO ===>>> done processing event #1149161, run #204073 on slot 2, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> done processing event #1153794, run #204073 on slot 0, 96 events processed so far <<<===
AthenaHiveEventLoopMgr 96 1 INFO ===>>> done processing event #1151312, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #1156938, run #204073 on slot 0, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> start processing event #1156351, run #204073 on slot 1, 97 events processed so far <<<===
AthenaHiveEventLoopMgr 97 3 INFO ===>>> done processing event #1148893, run #204073 on slot 3, 98 events processed so far <<<===
AthenaHiveEventLoopMgr 98 0 INFO ===>>> done processing event #1156938, run #204073 on slot 0, 99 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 2 INFO ===>>> done processing event #1156351, run #204073 on slot 2, 100 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 2 INFO ---> Loop Finished (seconds): 5.47151
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> done processing event #1156351, run #204073 on slot 1, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ---> Loop Finished (seconds): 5.79007
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
@@ -1263,7 +1255,7 @@ AvalancheSchedulerSvc INFO Joining Scheduler threa
PyComponentMgr INFO Finalizing PyComponentMgr...
EventDataSvc INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.65 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
@@ -1275,10 +1267,10 @@ IOVDbFolder INFO Folder /TILE/OFL02/NOIS
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.54 ))s
-IOVDbSvc INFO bytes in (( 1.19 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.05 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 1.19 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
@@ -1289,9 +1281,9 @@ ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 270 [ms] Ave/Min/Max= 135(+- 125)/ 10/ 260 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 300 [ms] Ave/Min/Max= 150(+- 130)/ 20/ 280 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 9.51 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.51 [s] Ave/Min/Max= 0.255(+- 0.245)/ 0.01/ 0.5 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max= 0.28(+- 0.24)/ 0.04/ 0.52 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 11.3 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
index ca5eaeeea7e3b5b09934bf6330b794a2693b01a1..a0b772d19e8e4a81565cd1ff097d503e84feee02 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
@@ -1,16 +1,16 @@
-Wed Jun 3 16:17:59 PDT 2020
+Tue Oct 6 20:00:19 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileL2ContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:18:07 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 20:00:32 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7006 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -57,7 +52,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -67,10 +62,10 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully
ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddre... INFO initialized
ByteStreamAddre... INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -89,8 +84,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2586 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2653 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -181,7 +176,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -190,7 +185,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24340Kb Time = 0.71S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25380Kb Time = 0.57S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -201,7 +196,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -213,9 +208,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,8 +245,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.18S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.2S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -261,7 +256,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -305,7 +300,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 4030 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4147 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
Finalizer INFO Initializing Finalizer...
ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
@@ -316,7 +311,7 @@ ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # S
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 425 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -341,12 +336,13 @@ IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -360,12 +356,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -396,8 +392,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 2266 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2315 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD... INFO TileL2Builder initialization completed
ToolSvc.TileL2C... INFO Initializing TileL2ContByteStreamTool
AthenaEventLoopMgr INFO ===>>> done processing event #1129572, run #204073 1 events processed so far <<<===
@@ -612,23 +608,23 @@ Finalize: compared 10 dumps
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.45 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.44 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.59 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.57 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.38 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.39 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.40 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.40 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.55 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.48 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.58 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.06 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.54 ))s
-IOVDbSvc INFO bytes in (( 5.84 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.00 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.02 ))s
+IOVDbSvc INFO bytes in (( 0.37 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.99 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 4.85 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.33 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.TileROD... INFO Finalizing
@@ -636,18 +632,18 @@ ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 240 [ms] Ave/Min/Max= 120(+- 110)/ 10/ 230 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 270 [ms] Ave/Min/Max= 20.8(+- 66.4)/ 0/ 250 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 6.93 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.5 [s] Ave/Min/Max= 0.25(+- 0.25)/ 0/ 0.5 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.55 [s] Ave/Min/Max= 0.0423(+- 0.138)/ 0/ 0.52 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 9.11 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Py:Athena INFO leaving with code 0: "successful run"
-Wed Jun 3 16:18:31 PDT 2020
+Tue Oct 6 20:00:46 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -656,9 +652,9 @@ Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileL2ContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -673,29 +669,24 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
MessageSvc INFO Activating in a separate thread
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:18:37 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 20:00:58 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7378 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -706,7 +697,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStreamMetadataTool INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSequencerSvc INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -716,10 +707,10 @@ IOVDbSvc INFO Service IOVDbSvc initia
ByteStreamAddressProviderSvc INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddressProviderSvc INFO initialized
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -738,8 +729,8 @@ IOVDbSvc INFO Added taginfo remove fo
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2586 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2653 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -830,7 +821,7 @@ BarrelConstruction INFO Use sagging in geomet
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -839,7 +830,7 @@ EMECConstruction INFO multi-layered version o
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25364Kb Time = 0.68S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25380Kb Time = 0.61S
GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -850,7 +841,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -862,9 +853,9 @@ CaloIDHelper_IDDetDescrCnv INFO in createObj: creating
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -900,7 +891,7 @@ GeoModelSvc.TileDetectorTool INFO Global positioning of
GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.15S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -910,10 +901,10 @@ TileCablingSvc INFO RUN2 ATLAS geometry fla
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc 0 INFO getRegistryEntries: read 4295 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 4417 CLIDRegistry entries for module ALL
PyComponentMgr 0 INFO Initializing PyComponentMgr...
Finalizer 0 INFO Initializing Finalizer...
-ClassIDSvc 0 INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Initializing CondInputLoader...
CondInputLoader 0 INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -1007,12 +998,13 @@ IOVDbSvc 0 0 INFO Opening COOL connection
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc 0 0 INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -1026,12 +1018,12 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-TileNeighbour 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -1039,211 +1031,211 @@ Domain[ROOT_All] 0 0 INFO -> Access DbDatabase
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #1129572, run #204073 on slot 0, 0 events processed so far <<<===
-ClassIDSvc 0 0 INFO getRegistryEntries: read 471 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 1795 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 503 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1812 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
ToolSvc.TileL2ContByteStreamTool 0 0 INFO Initializing TileL2ContByteStreamTool
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> start processing event #1129665, run #204073 on slot 1, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> start processing event #1131212, run #204073 on slot 2, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> start processing event #1131086, run #204073 on slot 3, 0 events processed so far <<<===
AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #1129572, run #204073 on slot 0, 1 events processed so far <<<===
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> done processing event #1129665, run #204073 on slot 1, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> done processing event #1131212, run #204073 on slot 2, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> start processing event #1130272, run #204073 on slot 0, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> start processing event #1131269, run #204073 on slot 1, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> start processing event #1130716, run #204073 on slot 2, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> done processing event #1131086, run #204073 on slot 3, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> done processing event #1130272, run #204073 on slot 0, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> done processing event #1131269, run #204073 on slot 1, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 0 INFO ===>>> start processing event #1132019, run #204073 on slot 0, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 1 INFO ===>>> start processing event #1132092, run #204073 on slot 1, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 3 INFO ===>>> start processing event #1130238, run #204073 on slot 3, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> done processing event #1130716, run #204073 on slot 2, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 0 INFO ===>>> done processing event #1132019, run #204073 on slot 0, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 1 INFO ===>>> done processing event #1132092, run #204073 on slot 1, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 0 INFO ===>>> start processing event #1134553, run #204073 on slot 0, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 1 INFO ===>>> start processing event #1130999, run #204073 on slot 1, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 12 2 INFO ===>>> start processing event #1133461, run #204073 on slot 2, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 3 INFO ===>>> done processing event #1130238, run #204073 on slot 3, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 0 INFO ===>>> done processing event #1134553, run #204073 on slot 0, 11 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 1 INFO ===>>> done processing event #1130999, run #204073 on slot 1, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 0 INFO ===>>> start processing event #1131152, run #204073 on slot 0, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 1 INFO ===>>> start processing event #1130142, run #204073 on slot 1, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 3 INFO ===>>> start processing event #1132770, run #204073 on slot 3, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 12 2 INFO ===>>> done processing event #1133461, run #204073 on slot 2, 13 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 0 INFO ===>>> done processing event #1131152, run #204073 on slot 0, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 1 INFO ===>>> done processing event #1130142, run #204073 on slot 1, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> start processing event #1132365, run #204073 on slot 0, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 1 INFO ===>>> start processing event #1136791, run #204073 on slot 1, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 2 INFO ===>>> start processing event #1133781, run #204073 on slot 2, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 3 INFO ===>>> done processing event #1132770, run #204073 on slot 3, 16 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> done processing event #1132365, run #204073 on slot 0, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 1 INFO ===>>> done processing event #1136791, run #204073 on slot 1, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 0 INFO ===>>> start processing event #1132067, run #204073 on slot 0, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 1 INFO ===>>> start processing event #1138637, run #204073 on slot 1, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 3 INFO ===>>> start processing event #1139495, run #204073 on slot 3, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 2 INFO ===>>> done processing event #1133781, run #204073 on slot 2, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 0 INFO ===>>> done processing event #1132067, run #204073 on slot 0, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 1 INFO ===>>> done processing event #1138637, run #204073 on slot 1, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 0 INFO ===>>> start processing event #1140193, run #204073 on slot 0, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 1 INFO ===>>> start processing event #1142953, run #204073 on slot 1, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 2 INFO ===>>> start processing event #1139127, run #204073 on slot 2, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 3 INFO ===>>> done processing event #1139495, run #204073 on slot 3, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 0 INFO ===>>> done processing event #1140193, run #204073 on slot 0, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 1 INFO ===>>> done processing event #1142953, run #204073 on slot 1, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 0 INFO ===>>> start processing event #1141272, run #204073 on slot 0, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 1 INFO ===>>> start processing event #1137117, run #204073 on slot 1, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 3 INFO ===>>> start processing event #1139599, run #204073 on slot 3, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 2 INFO ===>>> done processing event #1139127, run #204073 on slot 2, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 0 INFO ===>>> done processing event #1141272, run #204073 on slot 0, 26 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 1 INFO ===>>> done processing event #1137117, run #204073 on slot 1, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 28 0 INFO ===>>> start processing event #1140314, run #204073 on slot 0, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 1 INFO ===>>> start processing event #1133685, run #204073 on slot 1, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> start processing event #1143279, run #204073 on slot 2, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 3 INFO ===>>> done processing event #1139599, run #204073 on slot 3, 28 events processed so far <<<===
-AthenaHiveEventLoopMgr 28 0 INFO ===>>> done processing event #1140314, run #204073 on slot 0, 29 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 1 INFO ===>>> done processing event #1133685, run #204073 on slot 1, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 0 INFO ===>>> start processing event #1137563, run #204073 on slot 0, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 32 1 INFO ===>>> start processing event #1139927, run #204073 on slot 1, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 3 INFO ===>>> start processing event #1141197, run #204073 on slot 3, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> done processing event #1143279, run #204073 on slot 2, 31 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 0 INFO ===>>> done processing event #1137563, run #204073 on slot 0, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 32 1 INFO ===>>> done processing event #1139927, run #204073 on slot 1, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 0 INFO ===>>> start processing event #1140039, run #204073 on slot 0, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 1 INFO ===>>> start processing event #1142531, run #204073 on slot 1, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 36 2 INFO ===>>> start processing event #1139475, run #204073 on slot 2, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 3 INFO ===>>> done processing event #1141197, run #204073 on slot 3, 34 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 0 INFO ===>>> done processing event #1140039, run #204073 on slot 0, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 1 INFO ===>>> done processing event #1142531, run #204073 on slot 1, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 0 INFO ===>>> start processing event #1139958, run #204073 on slot 0, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 1 INFO ===>>> start processing event #1143765, run #204073 on slot 1, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 3 INFO ===>>> start processing event #1143097, run #204073 on slot 3, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 36 2 INFO ===>>> done processing event #1139475, run #204073 on slot 2, 37 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 0 INFO ===>>> done processing event #1139958, run #204073 on slot 0, 38 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 1 INFO ===>>> done processing event #1143765, run #204073 on slot 1, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 40 0 INFO ===>>> start processing event #1134147, run #204073 on slot 0, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 41 1 INFO ===>>> start processing event #1137156, run #204073 on slot 1, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> start processing event #1136377, run #204073 on slot 2, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 3 INFO ===>>> done processing event #1143097, run #204073 on slot 3, 40 events processed so far <<<===
-AthenaHiveEventLoopMgr 40 0 INFO ===>>> done processing event #1134147, run #204073 on slot 0, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 41 1 INFO ===>>> done processing event #1137156, run #204073 on slot 1, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 0 INFO ===>>> start processing event #1137842, run #204073 on slot 0, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 44 1 INFO ===>>> start processing event #1141705, run #204073 on slot 1, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 3 INFO ===>>> start processing event #1143410, run #204073 on slot 3, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> done processing event #1136377, run #204073 on slot 2, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 0 INFO ===>>> done processing event #1137842, run #204073 on slot 0, 44 events processed so far <<<===
-AthenaHiveEventLoopMgr 44 1 INFO ===>>> done processing event #1141705, run #204073 on slot 1, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 0 INFO ===>>> start processing event #1144170, run #204073 on slot 0, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 1 INFO ===>>> start processing event #1145987, run #204073 on slot 1, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 48 2 INFO ===>>> start processing event #1145633, run #204073 on slot 2, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 3 INFO ===>>> done processing event #1143410, run #204073 on slot 3, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 0 INFO ===>>> done processing event #1144170, run #204073 on slot 0, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 1 INFO ===>>> done processing event #1145987, run #204073 on slot 1, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 0 INFO ===>>> start processing event #1135005, run #204073 on slot 0, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 1 INFO ===>>> start processing event #1142167, run #204073 on slot 1, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 3 INFO ===>>> start processing event #1144646, run #204073 on slot 3, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 48 2 INFO ===>>> done processing event #1145633, run #204073 on slot 2, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 0 INFO ===>>> done processing event #1135005, run #204073 on slot 0, 50 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 1 INFO ===>>> done processing event #1142167, run #204073 on slot 1, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 0 INFO ===>>> start processing event #1145027, run #204073 on slot 0, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 1 INFO ===>>> start processing event #1144112, run #204073 on slot 1, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 2 INFO ===>>> start processing event #1138485, run #204073 on slot 2, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 3 INFO ===>>> done processing event #1144646, run #204073 on slot 3, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 0 INFO ===>>> done processing event #1145027, run #204073 on slot 0, 53 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 1 INFO ===>>> done processing event #1144112, run #204073 on slot 1, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 55 0 INFO ===>>> start processing event #1144565, run #204073 on slot 0, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 1 INFO ===>>> start processing event #1139498, run #204073 on slot 1, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 57 3 INFO ===>>> start processing event #1136546, run #204073 on slot 3, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 2 INFO ===>>> done processing event #1138485, run #204073 on slot 2, 55 events processed so far <<<===
-AthenaHiveEventLoopMgr 55 0 INFO ===>>> done processing event #1144565, run #204073 on slot 0, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 1 INFO ===>>> done processing event #1139498, run #204073 on slot 1, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 0 INFO ===>>> start processing event #1143799, run #204073 on slot 0, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 59 1 INFO ===>>> start processing event #1142877, run #204073 on slot 1, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 2 INFO ===>>> start processing event #1149894, run #204073 on slot 2, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 57 3 INFO ===>>> done processing event #1136546, run #204073 on slot 3, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 0 INFO ===>>> done processing event #1143799, run #204073 on slot 0, 59 events processed so far <<<===
-AthenaHiveEventLoopMgr 59 1 INFO ===>>> done processing event #1142877, run #204073 on slot 1, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 0 INFO ===>>> start processing event #1145364, run #204073 on slot 0, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 1 INFO ===>>> start processing event #1143770, run #204073 on slot 1, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 3 INFO ===>>> start processing event #1148361, run #204073 on slot 3, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 2 INFO ===>>> done processing event #1149894, run #204073 on slot 2, 61 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 0 INFO ===>>> done processing event #1145364, run #204073 on slot 0, 62 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 1 INFO ===>>> done processing event #1143770, run #204073 on slot 1, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 0 INFO ===>>> start processing event #1148167, run #204073 on slot 0, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 1 INFO ===>>> start processing event #1138948, run #204073 on slot 1, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> start processing event #1144808, run #204073 on slot 2, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 3 INFO ===>>> done processing event #1148361, run #204073 on slot 3, 64 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 0 INFO ===>>> done processing event #1148167, run #204073 on slot 0, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 1 INFO ===>>> done processing event #1138948, run #204073 on slot 1, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 0 INFO ===>>> start processing event #1145832, run #204073 on slot 0, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 1 INFO ===>>> start processing event #1153100, run #204073 on slot 1, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 3 INFO ===>>> start processing event #1142524, run #204073 on slot 3, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> done processing event #1144808, run #204073 on slot 2, 67 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 0 INFO ===>>> done processing event #1145832, run #204073 on slot 0, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 1 INFO ===>>> done processing event #1153100, run #204073 on slot 1, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 70 0 INFO ===>>> start processing event #1138294, run #204073 on slot 0, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 71 1 INFO ===>>> start processing event #1138350, run #204073 on slot 1, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 2 INFO ===>>> start processing event #1149424, run #204073 on slot 2, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 3 INFO ===>>> done processing event #1142524, run #204073 on slot 3, 70 events processed so far <<<===
-AthenaHiveEventLoopMgr 70 0 INFO ===>>> done processing event #1138294, run #204073 on slot 0, 71 events processed so far <<<===
-AthenaHiveEventLoopMgr 71 1 INFO ===>>> done processing event #1138350, run #204073 on slot 1, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 0 INFO ===>>> start processing event #1151102, run #204073 on slot 0, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 1 INFO ===>>> start processing event #1152242, run #204073 on slot 1, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 3 INFO ===>>> start processing event #1148416, run #204073 on slot 3, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 2 INFO ===>>> done processing event #1149424, run #204073 on slot 2, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 0 INFO ===>>> done processing event #1151102, run #204073 on slot 0, 74 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 1 INFO ===>>> done processing event #1152242, run #204073 on slot 1, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 0 INFO ===>>> start processing event #1142753, run #204073 on slot 0, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 1 INFO ===>>> start processing event #1149997, run #204073 on slot 1, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 2 INFO ===>>> start processing event #1151617, run #204073 on slot 2, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 3 INFO ===>>> done processing event #1148416, run #204073 on slot 3, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 0 INFO ===>>> done processing event #1142753, run #204073 on slot 0, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 1 INFO ===>>> done processing event #1149997, run #204073 on slot 1, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 0 INFO ===>>> start processing event #1149794, run #204073 on slot 0, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 1 INFO ===>>> start processing event #1152504, run #204073 on slot 1, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 3 INFO ===>>> start processing event #1142485, run #204073 on slot 3, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 2 INFO ===>>> done processing event #1151617, run #204073 on slot 2, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 0 INFO ===>>> done processing event #1149794, run #204073 on slot 0, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 1 INFO ===>>> done processing event #1152504, run #204073 on slot 1, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 0 INFO ===>>> start processing event #1151364, run #204073 on slot 0, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 1 INFO ===>>> start processing event #1143901, run #204073 on slot 1, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 2 INFO ===>>> start processing event #1153979, run #204073 on slot 2, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 3 INFO ===>>> done processing event #1142485, run #204073 on slot 3, 82 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 0 INFO ===>>> done processing event #1151364, run #204073 on slot 0, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 1 INFO ===>>> done processing event #1143901, run #204073 on slot 1, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 0 INFO ===>>> start processing event #1150212, run #204073 on slot 0, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 1 INFO ===>>> start processing event #1152633, run #204073 on slot 1, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 3 INFO ===>>> start processing event #1155482, run #204073 on slot 3, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 2 INFO ===>>> done processing event #1153979, run #204073 on slot 2, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 0 INFO ===>>> done processing event #1150212, run #204073 on slot 0, 86 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 1 INFO ===>>> done processing event #1152633, run #204073 on slot 1, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 0 INFO ===>>> start processing event #1150472, run #204073 on slot 0, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 1 INFO ===>>> start processing event #1140275, run #204073 on slot 1, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 2 INFO ===>>> start processing event #1145882, run #204073 on slot 2, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 3 INFO ===>>> done processing event #1155482, run #204073 on slot 3, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 0 INFO ===>>> done processing event #1150472, run #204073 on slot 0, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 1 INFO ===>>> done processing event #1140275, run #204073 on slot 1, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 0 INFO ===>>> start processing event #1151732, run #204073 on slot 0, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 1 INFO ===>>> start processing event #1137896, run #204073 on slot 1, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 3 INFO ===>>> start processing event #1156381, run #204073 on slot 3, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 2 INFO ===>>> done processing event #1145882, run #204073 on slot 2, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 0 INFO ===>>> done processing event #1151732, run #204073 on slot 0, 92 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 1 INFO ===>>> done processing event #1137896, run #204073 on slot 1, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 0 INFO ===>>> start processing event #1149161, run #204073 on slot 0, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 1 INFO ===>>> start processing event #1153794, run #204073 on slot 1, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 2 INFO ===>>> start processing event #1151312, run #204073 on slot 2, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 3 INFO ===>>> done processing event #1156381, run #204073 on slot 3, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 0 INFO ===>>> done processing event #1149161, run #204073 on slot 0, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 1 INFO ===>>> done processing event #1153794, run #204073 on slot 1, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 0 INFO ===>>> start processing event #1148893, run #204073 on slot 0, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 1 INFO ===>>> start processing event #1156938, run #204073 on slot 1, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 3 INFO ===>>> start processing event #1156351, run #204073 on slot 3, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 2 INFO ===>>> done processing event #1151312, run #204073 on slot 2, 97 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 0 INFO ===>>> done processing event #1148893, run #204073 on slot 0, 98 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 1 INFO ===>>> done processing event #1156938, run #204073 on slot 1, 99 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 3 INFO ===>>> done processing event #1156351, run #204073 on slot 3, 100 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 3 INFO ---> Loop Finished (seconds): 4.16024
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1129665, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #1131212, run #204073 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #1131086, run #204073 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #1130272, run #204073 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #1129665, run #204073 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #1131212, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #1131086, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #1131269, run #204073 on slot 0, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #1130716, run #204073 on slot 1, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #1132019, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #1130272, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #1131269, run #204073 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #1130716, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #1132092, run #204073 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #1130238, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> start processing event #1134553, run #204073 on slot 3, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #1132019, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #1132092, run #204073 on slot 0, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #1130238, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> start processing event #1130999, run #204073 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> start processing event #1133461, run #204073 on slot 1, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> start processing event #1131152, run #204073 on slot 2, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 3 INFO ===>>> done processing event #1134553, run #204073 on slot 3, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 0 INFO ===>>> done processing event #1130999, run #204073 on slot 0, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 1 INFO ===>>> done processing event #1133461, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> start processing event #1130142, run #204073 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> start processing event #1132770, run #204073 on slot 1, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #1132365, run #204073 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 2 INFO ===>>> done processing event #1131152, run #204073 on slot 2, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 0 INFO ===>>> done processing event #1130142, run #204073 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 1 INFO ===>>> done processing event #1132770, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #1136791, run #204073 on slot 0, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> start processing event #1133781, run #204073 on slot 1, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #1132067, run #204073 on slot 2, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #1132365, run #204073 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #1136791, run #204073 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> done processing event #1133781, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> start processing event #1138637, run #204073 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #1139495, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> start processing event #1140193, run #204073 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #1132067, run #204073 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 0 INFO ===>>> done processing event #1138637, run #204073 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #1139495, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> start processing event #1142953, run #204073 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> start processing event #1139127, run #204073 on slot 1, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> start processing event #1141272, run #204073 on slot 2, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> done processing event #1140193, run #204073 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> done processing event #1142953, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 1 INFO ===>>> done processing event #1139127, run #204073 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> start processing event #1137117, run #204073 on slot 0, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> start processing event #1139599, run #204073 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> start processing event #1140314, run #204073 on slot 3, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 2 INFO ===>>> done processing event #1141272, run #204073 on slot 2, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 0 INFO ===>>> done processing event #1137117, run #204073 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 1 INFO ===>>> done processing event #1139599, run #204073 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #1133685, run #204073 on slot 0, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> start processing event #1143279, run #204073 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> start processing event #1137563, run #204073 on slot 2, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 3 INFO ===>>> done processing event #1140314, run #204073 on slot 3, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #1133685, run #204073 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> done processing event #1143279, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 0 INFO ===>>> start processing event #1139927, run #204073 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 1 INFO ===>>> start processing event #1141197, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> start processing event #1140039, run #204073 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> done processing event #1137563, run #204073 on slot 2, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 0 INFO ===>>> done processing event #1139927, run #204073 on slot 0, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 1 INFO ===>>> done processing event #1141197, run #204073 on slot 1, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> start processing event #1142531, run #204073 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> start processing event #1139475, run #204073 on slot 1, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> start processing event #1139958, run #204073 on slot 2, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> done processing event #1140039, run #204073 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> done processing event #1142531, run #204073 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> done processing event #1139475, run #204073 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> start processing event #1143765, run #204073 on slot 0, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> start processing event #1143097, run #204073 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> start processing event #1134147, run #204073 on slot 3, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> done processing event #1139958, run #204073 on slot 2, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> done processing event #1143765, run #204073 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 1 INFO ===>>> done processing event #1143097, run #204073 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #1137156, run #204073 on slot 0, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> start processing event #1136377, run #204073 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> start processing event #1137842, run #204073 on slot 2, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 3 INFO ===>>> done processing event #1134147, run #204073 on slot 3, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #1137156, run #204073 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> done processing event #1136377, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 0 INFO ===>>> start processing event #1141705, run #204073 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 1 INFO ===>>> start processing event #1143410, run #204073 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> start processing event #1144170, run #204073 on slot 3, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> done processing event #1137842, run #204073 on slot 2, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 0 INFO ===>>> done processing event #1141705, run #204073 on slot 0, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 1 INFO ===>>> done processing event #1143410, run #204073 on slot 1, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 0 INFO ===>>> start processing event #1145987, run #204073 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> start processing event #1145633, run #204073 on slot 1, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> start processing event #1135005, run #204073 on slot 2, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 3 INFO ===>>> done processing event #1144170, run #204073 on slot 3, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 0 INFO ===>>> done processing event #1145987, run #204073 on slot 0, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> done processing event #1145633, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> start processing event #1142167, run #204073 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> start processing event #1144646, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> start processing event #1145027, run #204073 on slot 3, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> done processing event #1135005, run #204073 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> done processing event #1142167, run #204073 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 1 INFO ===>>> done processing event #1144646, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #1144112, run #204073 on slot 0, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #1138485, run #204073 on slot 1, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> start processing event #1144565, run #204073 on slot 2, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> done processing event #1145027, run #204073 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #1144112, run #204073 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #1138485, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> start processing event #1139498, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> start processing event #1136546, run #204073 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> start processing event #1143799, run #204073 on slot 3, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> done processing event #1144565, run #204073 on slot 2, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 0 INFO ===>>> done processing event #1139498, run #204073 on slot 0, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 1 INFO ===>>> done processing event #1136546, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> start processing event #1142877, run #204073 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> start processing event #1149894, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> start processing event #1145364, run #204073 on slot 2, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 3 INFO ===>>> done processing event #1143799, run #204073 on slot 3, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 0 INFO ===>>> done processing event #1142877, run #204073 on slot 0, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> done processing event #1149894, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> start processing event #1143770, run #204073 on slot 0, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> start processing event #1148361, run #204073 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> start processing event #1148167, run #204073 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> done processing event #1145364, run #204073 on slot 2, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> done processing event #1143770, run #204073 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 1 INFO ===>>> done processing event #1148361, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #1138948, run #204073 on slot 0, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #1144808, run #204073 on slot 1, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> start processing event #1145832, run #204073 on slot 2, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> done processing event #1148167, run #204073 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #1138948, run #204073 on slot 0, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #1144808, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> start processing event #1153100, run #204073 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> start processing event #1142524, run #204073 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> start processing event #1138294, run #204073 on slot 3, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> done processing event #1145832, run #204073 on slot 2, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 0 INFO ===>>> done processing event #1153100, run #204073 on slot 0, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 1 INFO ===>>> done processing event #1142524, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> start processing event #1138350, run #204073 on slot 0, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> start processing event #1149424, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> start processing event #1151102, run #204073 on slot 2, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 3 INFO ===>>> done processing event #1138294, run #204073 on slot 3, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 0 INFO ===>>> done processing event #1138350, run #204073 on slot 0, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> done processing event #1149424, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> start processing event #1152242, run #204073 on slot 0, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> start processing event #1148416, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> start processing event #1142753, run #204073 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> done processing event #1151102, run #204073 on slot 2, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> done processing event #1152242, run #204073 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 1 INFO ===>>> done processing event #1148416, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #1149997, run #204073 on slot 0, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #1151617, run #204073 on slot 1, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> start processing event #1149794, run #204073 on slot 2, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> done processing event #1142753, run #204073 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #1149997, run #204073 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #1151617, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> start processing event #1152504, run #204073 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> start processing event #1142485, run #204073 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> start processing event #1151364, run #204073 on slot 3, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> done processing event #1149794, run #204073 on slot 2, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 0 INFO ===>>> done processing event #1152504, run #204073 on slot 0, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 1 INFO ===>>> done processing event #1142485, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> start processing event #1143901, run #204073 on slot 0, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> start processing event #1153979, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> start processing event #1150212, run #204073 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 3 INFO ===>>> done processing event #1151364, run #204073 on slot 3, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 0 INFO ===>>> done processing event #1143901, run #204073 on slot 0, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> done processing event #1153979, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> start processing event #1152633, run #204073 on slot 0, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> start processing event #1155482, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #1150472, run #204073 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> done processing event #1150212, run #204073 on slot 2, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> done processing event #1152633, run #204073 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 1 INFO ===>>> done processing event #1155482, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #1140275, run #204073 on slot 0, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> start processing event #1145882, run #204073 on slot 1, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> start processing event #1151732, run #204073 on slot 2, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #1150472, run #204073 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #1140275, run #204073 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> done processing event #1145882, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> start processing event #1137896, run #204073 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> start processing event #1156381, run #204073 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> start processing event #1149161, run #204073 on slot 3, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> done processing event #1151732, run #204073 on slot 2, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 0 INFO ===>>> done processing event #1137896, run #204073 on slot 0, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 1 INFO ===>>> done processing event #1156381, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> start processing event #1153794, run #204073 on slot 0, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> start processing event #1151312, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> start processing event #1148893, run #204073 on slot 2, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 3 INFO ===>>> done processing event #1149161, run #204073 on slot 3, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 0 INFO ===>>> done processing event #1153794, run #204073 on slot 0, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> done processing event #1151312, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #1156938, run #204073 on slot 0, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> start processing event #1156351, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> done processing event #1148893, run #204073 on slot 2, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> done processing event #1156938, run #204073 on slot 0, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ===>>> done processing event #1156351, run #204073 on slot 1, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 1 INFO ---> Loop Finished (seconds): 5.77103
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
@@ -1260,7 +1252,7 @@ AvalancheSchedulerSvc INFO Joining Scheduler threa
PyComponentMgr INFO Finalizing PyComponentMgr...
EventDataSvc INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.13 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
@@ -1272,10 +1264,10 @@ IOVDbFolder INFO Folder /TILE/OFL02/NOIS
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.07 ))s
-IOVDbSvc INFO bytes in (( 0.20 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.05 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.20 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
@@ -1285,9 +1277,9 @@ ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 260 [ms] Ave/Min/Max= 130(+- 130)/ 0/ 260 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 300 [ms] Ave/Min/Max= 150(+- 130)/ 20/ 280 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 7.53 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.51 [s] Ave/Min/Max= 0.255(+- 0.255)/ 0/ 0.51 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max= 0.28(+- 0.25)/ 0.03/ 0.53 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 9.65 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
index a1560684b443721fdf890dde538c25575985cbad..6be2e77d660e848c80ec89a7f0bb9c59047c082c 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
@@ -1,16 +1,16 @@
-Wed Jun 3 16:19:25 PDT 2020
+Tue Oct 6 20:01:15 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileLaserObjByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:19:34 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 20:01:26 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7006 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -57,7 +52,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -67,10 +62,10 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully
ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddre... INFO initialized
ByteStreamAddre... INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -89,7 +84,7 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -180,7 +175,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2990 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -189,7 +184,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25364Kb Time = 0.69S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.69S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -200,7 +195,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -212,9 +207,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -249,8 +244,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.18S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.17S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -260,7 +255,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -304,7 +299,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 4701 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4819 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
Finalizer INFO Initializing Finalizer...
ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
@@ -315,7 +310,7 @@ ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # S
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 425 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00/data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -340,12 +335,13 @@ IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -359,12 +355,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -395,8 +391,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 2266 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2315 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD... INFO TileL2Builder initialization completed
AthenaEventLoopMgr INFO ===>>> done processing event #18124, run #363899 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #18125, run #363899 1 events processed so far <<<===
@@ -610,23 +606,23 @@ Finalize: compared 10 dumps
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.18 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104912 (( 0.48 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.41 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.41 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.45 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.40 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.40 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.38 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641536 (( 0.49 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43176 (( 0.49 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.56 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.06 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.12 ))s
-IOVDbSvc INFO bytes in (( 4.81 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.06 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104912 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641536 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43176 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.02 ))s
+IOVDbSvc INFO bytes in (( 0.40 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.30 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 4.51 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.08 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.33 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.TileROD... INFO Finalizing
@@ -634,18 +630,18 @@ ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 240 [ms] Ave/Min/Max= 120(+- 120)/ 0/ 240 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 280 [ms] Ave/Min/Max= 21.5(+- 69)/ 0/ 260 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 3.32 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.52 [s] Ave/Min/Max= 0.26(+- 0.25)/ 0.01/ 0.51 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max= 0.0431(+- 0.141)/ 0/ 0.53 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 4.4 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Py:Athena INFO leaving with code 0: "successful run"
-Wed Jun 3 16:19:46 PDT 2020
+Tue Oct 6 20:01:35 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -654,9 +650,9 @@ Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileLaserObjByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -671,29 +667,24 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
MessageSvc INFO Activating in a separate thread
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:19:53 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 20:01:47 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7378 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -704,7 +695,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStreamMetadataTool INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSequencerSvc INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -714,10 +705,10 @@ IOVDbSvc INFO Service IOVDbSvc initia
ByteStreamAddressProviderSvc INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddressProviderSvc INFO initialized
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -736,7 +727,7 @@ IOVDbSvc INFO Added taginfo remove fo
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 26 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -827,7 +818,7 @@ BarrelConstruction INFO Use sagging in geomet
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2990 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3005 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -836,7 +827,7 @@ EMECConstruction INFO multi-layered version o
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 26388Kb Time = 0.68S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.57S
GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -847,7 +838,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -859,9 +850,9 @@ CaloIDHelper_IDDetDescrCnv INFO in createObj: creating
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -896,8 +887,8 @@ GeoModelSvc.TileDetectorTool INFO Global positioning of
GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.18S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.15S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -907,10 +898,10 @@ TileCablingSvc INFO RUN2 ATLAS geometry fla
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc 0 INFO getRegistryEntries: read 4966 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 5089 CLIDRegistry entries for module ALL
PyComponentMgr 0 INFO Initializing PyComponentMgr...
Finalizer 0 INFO Initializing Finalizer...
-ClassIDSvc 0 INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Initializing CondInputLoader...
CondInputLoader 0 INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -1004,12 +995,13 @@ IOVDbSvc 0 0 INFO Opening COOL connection
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc 0 0 INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -1023,12 +1015,12 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-TileNeighbour 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -1036,210 +1028,210 @@ Domain[ROOT_All] 0 0 INFO -> Access DbDatabase
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #18124, run #363899 on slot 0, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> start processing event #18125, run #363899 on slot 1, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> start processing event #18126, run #363899 on slot 2, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> start processing event #18127, run #363899 on slot 3, 0 events processed so far <<<===
-ClassIDSvc 0 0 INFO getRegistryEntries: read 471 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 1795 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 503 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1812 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #18124, run #363899 on slot 0, 1 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> done processing event #18126, run #363899 on slot 2, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> start processing event #18128, run #363899 on slot 0, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 2 INFO ===>>> start processing event #18129, run #363899 on slot 2, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> done processing event #18125, run #363899 on slot 1, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> done processing event #18127, run #363899 on slot 3, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #18130, run #363899 on slot 1, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 3 INFO ===>>> start processing event #18131, run #363899 on slot 3, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> done processing event #18128, run #363899 on slot 0, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #18132, run #363899 on slot 0, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 2 INFO ===>>> done processing event #18129, run #363899 on slot 2, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 2 INFO ===>>> start processing event #18133, run #363899 on slot 2, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #18125, run #363899 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #18126, run #363899 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #18127, run #363899 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #18128, run #363899 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #18125, run #363899 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #18126, run #363899 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #18129, run #363899 on slot 0, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #18130, run #363899 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #18127, run #363899 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #18128, run #363899 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #18131, run #363899 on slot 2, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> start processing event #18132, run #363899 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #18129, run #363899 on slot 0, 6 events processed so far <<<===
AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #18130, run #363899 on slot 1, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 3 INFO ===>>> done processing event #18131, run #363899 on slot 3, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 1 INFO ===>>> start processing event #18134, run #363899 on slot 1, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 3 INFO ===>>> start processing event #18135, run #363899 on slot 3, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #18132, run #363899 on slot 0, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 2 INFO ===>>> done processing event #18133, run #363899 on slot 2, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 12 0 INFO ===>>> start processing event #18136, run #363899 on slot 0, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 2 INFO ===>>> start processing event #18137, run #363899 on slot 2, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 3 INFO ===>>> done processing event #18135, run #363899 on slot 3, 11 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 3 INFO ===>>> start processing event #18138, run #363899 on slot 3, 11 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 1 INFO ===>>> done processing event #18134, run #363899 on slot 1, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 1 INFO ===>>> start processing event #18139, run #363899 on slot 1, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 2 INFO ===>>> done processing event #18137, run #363899 on slot 2, 13 events processed so far <<<===
-AthenaHiveEventLoopMgr 12 0 INFO ===>>> done processing event #18136, run #363899 on slot 0, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> start processing event #18140, run #363899 on slot 0, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 2 INFO ===>>> start processing event #18141, run #363899 on slot 2, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 3 INFO ===>>> done processing event #18138, run #363899 on slot 3, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 3 INFO ===>>> start processing event #18142, run #363899 on slot 3, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 1 INFO ===>>> done processing event #18139, run #363899 on slot 1, 16 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> done processing event #18140, run #363899 on slot 0, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 0 INFO ===>>> start processing event #18143, run #363899 on slot 0, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 1 INFO ===>>> start processing event #18144, run #363899 on slot 1, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 2 INFO ===>>> done processing event #18141, run #363899 on slot 2, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 2 INFO ===>>> start processing event #18145, run #363899 on slot 2, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 3 INFO ===>>> done processing event #18142, run #363899 on slot 3, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 0 INFO ===>>> done processing event #18143, run #363899 on slot 0, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 0 INFO ===>>> start processing event #18146, run #363899 on slot 0, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 3 INFO ===>>> start processing event #18147, run #363899 on slot 3, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 2 INFO ===>>> done processing event #18145, run #363899 on slot 2, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 1 INFO ===>>> done processing event #18144, run #363899 on slot 1, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 1 INFO ===>>> start processing event #18148, run #363899 on slot 1, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 2 INFO ===>>> start processing event #18149, run #363899 on slot 2, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 0 INFO ===>>> done processing event #18146, run #363899 on slot 0, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 0 INFO ===>>> start processing event #18150, run #363899 on slot 0, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 3 INFO ===>>> done processing event #18147, run #363899 on slot 3, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 1 INFO ===>>> done processing event #18148, run #363899 on slot 1, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 1 INFO ===>>> start processing event #18151, run #363899 on slot 1, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> start processing event #18133, run #363899 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> start processing event #18134, run #363899 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #18131, run #363899 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> done processing event #18132, run #363899 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> start processing event #18135, run #363899 on slot 2, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 3 INFO ===>>> start processing event #18136, run #363899 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> done processing event #18133, run #363899 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> done processing event #18134, run #363899 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> start processing event #18137, run #363899 on slot 0, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 1 INFO ===>>> start processing event #18138, run #363899 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> done processing event #18135, run #363899 on slot 2, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 3 INFO ===>>> done processing event #18136, run #363899 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> start processing event #18139, run #363899 on slot 2, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #18140, run #363899 on slot 3, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> done processing event #18137, run #363899 on slot 0, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 1 INFO ===>>> done processing event #18138, run #363899 on slot 1, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #18141, run #363899 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> start processing event #18142, run #363899 on slot 1, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> done processing event #18139, run #363899 on slot 2, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #18140, run #363899 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #18143, run #363899 on slot 2, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 3 INFO ===>>> start processing event #18144, run #363899 on slot 3, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #18141, run #363899 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> done processing event #18142, run #363899 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> start processing event #18145, run #363899 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 1 INFO ===>>> start processing event #18146, run #363899 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #18143, run #363899 on slot 2, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 3 INFO ===>>> done processing event #18144, run #363899 on slot 3, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> start processing event #18147, run #363899 on slot 2, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 3 INFO ===>>> start processing event #18148, run #363899 on slot 3, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> done processing event #18145, run #363899 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 1 INFO ===>>> done processing event #18146, run #363899 on slot 1, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> start processing event #18149, run #363899 on slot 0, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> start processing event #18150, run #363899 on slot 1, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> done processing event #18147, run #363899 on slot 2, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 3 INFO ===>>> done processing event #18148, run #363899 on slot 3, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 2 INFO ===>>> start processing event #18151, run #363899 on slot 2, 25 events processed so far <<<===
AthenaHiveEventLoopMgr 28 3 INFO ===>>> start processing event #18152, run #363899 on slot 3, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 2 INFO ===>>> done processing event #18149, run #363899 on slot 2, 26 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 0 INFO ===>>> done processing event #18150, run #363899 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> done processing event #18149, run #363899 on slot 0, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> done processing event #18150, run #363899 on slot 1, 27 events processed so far <<<===
AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #18153, run #363899 on slot 0, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> start processing event #18154, run #363899 on slot 2, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 1 INFO ===>>> done processing event #18151, run #363899 on slot 1, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> start processing event #18154, run #363899 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 2 INFO ===>>> done processing event #18151, run #363899 on slot 2, 28 events processed so far <<<===
AthenaHiveEventLoopMgr 28 3 INFO ===>>> done processing event #18152, run #363899 on slot 3, 29 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 1 INFO ===>>> start processing event #18155, run #363899 on slot 1, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> start processing event #18155, run #363899 on slot 2, 29 events processed so far <<<===
AthenaHiveEventLoopMgr 32 3 INFO ===>>> start processing event #18156, run #363899 on slot 3, 29 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> done processing event #18154, run #363899 on slot 2, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 2 INFO ===>>> start processing event #18157, run #363899 on slot 2, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #18153, run #363899 on slot 0, 31 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 1 INFO ===>>> done processing event #18155, run #363899 on slot 1, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 0 INFO ===>>> start processing event #18158, run #363899 on slot 0, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 1 INFO ===>>> start processing event #18159, run #363899 on slot 1, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #18153, run #363899 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> done processing event #18154, run #363899 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> start processing event #18157, run #363899 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> start processing event #18158, run #363899 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> done processing event #18155, run #363899 on slot 2, 32 events processed so far <<<===
AthenaHiveEventLoopMgr 32 3 INFO ===>>> done processing event #18156, run #363899 on slot 3, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> start processing event #18159, run #363899 on slot 2, 33 events processed so far <<<===
AthenaHiveEventLoopMgr 36 3 INFO ===>>> start processing event #18160, run #363899 on slot 3, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 2 INFO ===>>> done processing event #18157, run #363899 on slot 2, 34 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 0 INFO ===>>> done processing event #18158, run #363899 on slot 0, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> done processing event #18157, run #363899 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> done processing event #18158, run #363899 on slot 1, 35 events processed so far <<<===
AthenaHiveEventLoopMgr 37 0 INFO ===>>> start processing event #18161, run #363899 on slot 0, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 2 INFO ===>>> start processing event #18162, run #363899 on slot 2, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 1 INFO ===>>> done processing event #18159, run #363899 on slot 1, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 1 INFO ===>>> start processing event #18163, run #363899 on slot 1, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> start processing event #18162, run #363899 on slot 1, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> done processing event #18159, run #363899 on slot 2, 36 events processed so far <<<===
AthenaHiveEventLoopMgr 36 3 INFO ===>>> done processing event #18160, run #363899 on slot 3, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 2 INFO ===>>> start processing event #18163, run #363899 on slot 2, 37 events processed so far <<<===
AthenaHiveEventLoopMgr 40 3 INFO ===>>> start processing event #18164, run #363899 on slot 3, 37 events processed so far <<<===
AthenaHiveEventLoopMgr 37 0 INFO ===>>> done processing event #18161, run #363899 on slot 0, 38 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 2 INFO ===>>> done processing event #18162, run #363899 on slot 2, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> done processing event #18162, run #363899 on slot 1, 39 events processed so far <<<===
AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #18165, run #363899 on slot 0, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> start processing event #18166, run #363899 on slot 2, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 1 INFO ===>>> done processing event #18163, run #363899 on slot 1, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> start processing event #18166, run #363899 on slot 1, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 2 INFO ===>>> done processing event #18163, run #363899 on slot 2, 40 events processed so far <<<===
AthenaHiveEventLoopMgr 40 3 INFO ===>>> done processing event #18164, run #363899 on slot 3, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 1 INFO ===>>> start processing event #18167, run #363899 on slot 1, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> start processing event #18167, run #363899 on slot 2, 41 events processed so far <<<===
AthenaHiveEventLoopMgr 44 3 INFO ===>>> start processing event #18168, run #363899 on slot 3, 41 events processed so far <<<===
AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #18165, run #363899 on slot 0, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> done processing event #18166, run #363899 on slot 2, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> done processing event #18166, run #363899 on slot 1, 43 events processed so far <<<===
AthenaHiveEventLoopMgr 45 0 INFO ===>>> start processing event #18169, run #363899 on slot 0, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> start processing event #18170, run #363899 on slot 2, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 1 INFO ===>>> done processing event #18167, run #363899 on slot 1, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> start processing event #18170, run #363899 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> done processing event #18167, run #363899 on slot 2, 44 events processed so far <<<===
AthenaHiveEventLoopMgr 44 3 INFO ===>>> done processing event #18168, run #363899 on slot 3, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 1 INFO ===>>> start processing event #18171, run #363899 on slot 1, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> start processing event #18171, run #363899 on slot 2, 45 events processed so far <<<===
AthenaHiveEventLoopMgr 48 3 INFO ===>>> start processing event #18172, run #363899 on slot 3, 45 events processed so far <<<===
AthenaHiveEventLoopMgr 45 0 INFO ===>>> done processing event #18169, run #363899 on slot 0, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> done processing event #18170, run #363899 on slot 2, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> done processing event #18170, run #363899 on slot 1, 47 events processed so far <<<===
AthenaHiveEventLoopMgr 49 0 INFO ===>>> start processing event #18173, run #363899 on slot 0, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 2 INFO ===>>> start processing event #18174, run #363899 on slot 2, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 1 INFO ===>>> done processing event #18171, run #363899 on slot 1, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 1 INFO ===>>> start processing event #18175, run #363899 on slot 1, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 0 INFO ===>>> done processing event #18173, run #363899 on slot 0, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 48 3 INFO ===>>> done processing event #18172, run #363899 on slot 3, 50 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 0 INFO ===>>> start processing event #18176, run #363899 on slot 0, 50 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 3 INFO ===>>> start processing event #18177, run #363899 on slot 3, 50 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 2 INFO ===>>> done processing event #18174, run #363899 on slot 2, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 2 INFO ===>>> start processing event #18178, run #363899 on slot 2, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 1 INFO ===>>> done processing event #18175, run #363899 on slot 1, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 55 1 INFO ===>>> start processing event #18179, run #363899 on slot 1, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 3 INFO ===>>> done processing event #18177, run #363899 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> start processing event #18174, run #363899 on slot 1, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> done processing event #18171, run #363899 on slot 2, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 3 INFO ===>>> done processing event #18172, run #363899 on slot 3, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 2 INFO ===>>> start processing event #18175, run #363899 on slot 2, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> start processing event #18176, run #363899 on slot 3, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 0 INFO ===>>> done processing event #18173, run #363899 on slot 0, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> done processing event #18174, run #363899 on slot 1, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #18177, run #363899 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #18178, run #363899 on slot 1, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 2 INFO ===>>> done processing event #18175, run #363899 on slot 2, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 3 INFO ===>>> done processing event #18176, run #363899 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> start processing event #18179, run #363899 on slot 2, 53 events processed so far <<<===
AthenaHiveEventLoopMgr 56 3 INFO ===>>> start processing event #18180, run #363899 on slot 3, 53 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 0 INFO ===>>> done processing event #18176, run #363899 on slot 0, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 2 INFO ===>>> done processing event #18178, run #363899 on slot 2, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #18177, run #363899 on slot 0, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #18178, run #363899 on slot 1, 55 events processed so far <<<===
AthenaHiveEventLoopMgr 57 0 INFO ===>>> start processing event #18181, run #363899 on slot 0, 55 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 2 INFO ===>>> start processing event #18182, run #363899 on slot 2, 55 events processed so far <<<===
-AthenaHiveEventLoopMgr 55 1 INFO ===>>> done processing event #18179, run #363899 on slot 1, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 1 INFO ===>>> start processing event #18182, run #363899 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> done processing event #18179, run #363899 on slot 2, 56 events processed so far <<<===
AthenaHiveEventLoopMgr 56 3 INFO ===>>> done processing event #18180, run #363899 on slot 3, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 59 1 INFO ===>>> start processing event #18183, run #363899 on slot 1, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 2 INFO ===>>> start processing event #18183, run #363899 on slot 2, 57 events processed so far <<<===
AthenaHiveEventLoopMgr 60 3 INFO ===>>> start processing event #18184, run #363899 on slot 3, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 2 INFO ===>>> done processing event #18182, run #363899 on slot 2, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 2 INFO ===>>> start processing event #18185, run #363899 on slot 2, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 57 0 INFO ===>>> done processing event #18181, run #363899 on slot 0, 59 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 0 INFO ===>>> start processing event #18186, run #363899 on slot 0, 59 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 3 INFO ===>>> done processing event #18184, run #363899 on slot 3, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 59 1 INFO ===>>> done processing event #18183, run #363899 on slot 1, 61 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 1 INFO ===>>> start processing event #18187, run #363899 on slot 1, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> done processing event #18181, run #363899 on slot 0, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 1 INFO ===>>> done processing event #18182, run #363899 on slot 1, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> start processing event #18185, run #363899 on slot 0, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 1 INFO ===>>> start processing event #18186, run #363899 on slot 1, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 2 INFO ===>>> done processing event #18183, run #363899 on slot 2, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 3 INFO ===>>> done processing event #18184, run #363899 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 2 INFO ===>>> start processing event #18187, run #363899 on slot 2, 61 events processed so far <<<===
AthenaHiveEventLoopMgr 64 3 INFO ===>>> start processing event #18188, run #363899 on slot 3, 61 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 0 INFO ===>>> done processing event #18186, run #363899 on slot 0, 62 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 2 INFO ===>>> done processing event #18185, run #363899 on slot 2, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> done processing event #18185, run #363899 on slot 0, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 1 INFO ===>>> done processing event #18186, run #363899 on slot 1, 63 events processed so far <<<===
AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #18189, run #363899 on slot 0, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> start processing event #18190, run #363899 on slot 2, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 3 INFO ===>>> done processing event #18188, run #363899 on slot 3, 64 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 1 INFO ===>>> done processing event #18187, run #363899 on slot 1, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 1 INFO ===>>> start processing event #18191, run #363899 on slot 1, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #18190, run #363899 on slot 1, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 2 INFO ===>>> done processing event #18187, run #363899 on slot 2, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> done processing event #18188, run #363899 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> start processing event #18191, run #363899 on slot 2, 65 events processed so far <<<===
AthenaHiveEventLoopMgr 68 3 INFO ===>>> start processing event #18192, run #363899 on slot 3, 65 events processed so far <<<===
AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #18189, run #363899 on slot 0, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 0 INFO ===>>> start processing event #18193, run #363899 on slot 0, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> done processing event #18190, run #363899 on slot 2, 67 events processed so far <<<===
-AthenaHiveEventLoopMgr 70 2 INFO ===>>> start processing event #18194, run #363899 on slot 2, 67 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 0 INFO ===>>> done processing event #18193, run #363899 on slot 0, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 71 0 INFO ===>>> start processing event #18195, run #363899 on slot 0, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 1 INFO ===>>> done processing event #18191, run #363899 on slot 1, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 3 INFO ===>>> done processing event #18192, run #363899 on slot 3, 70 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 1 INFO ===>>> start processing event #18196, run #363899 on slot 1, 70 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 3 INFO ===>>> start processing event #18197, run #363899 on slot 3, 70 events processed so far <<<===
-AthenaHiveEventLoopMgr 70 2 INFO ===>>> done processing event #18194, run #363899 on slot 2, 71 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 2 INFO ===>>> start processing event #18198, run #363899 on slot 2, 71 events processed so far <<<===
-AthenaHiveEventLoopMgr 71 0 INFO ===>>> done processing event #18195, run #363899 on slot 0, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 1 INFO ===>>> done processing event #18196, run #363899 on slot 1, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 0 INFO ===>>> start processing event #18199, run #363899 on slot 0, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 1 INFO ===>>> start processing event #18200, run #363899 on slot 1, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 3 INFO ===>>> done processing event #18197, run #363899 on slot 3, 74 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 2 INFO ===>>> done processing event #18198, run #363899 on slot 2, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 2 INFO ===>>> start processing event #18201, run #363899 on slot 2, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 3 INFO ===>>> start processing event #18202, run #363899 on slot 3, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 0 INFO ===>>> done processing event #18199, run #363899 on slot 0, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 0 INFO ===>>> start processing event #18203, run #363899 on slot 0, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 1 INFO ===>>> done processing event #18200, run #363899 on slot 1, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 1 INFO ===>>> start processing event #18204, run #363899 on slot 1, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 3 INFO ===>>> done processing event #18202, run #363899 on slot 3, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 3 INFO ===>>> start processing event #18205, run #363899 on slot 3, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 2 INFO ===>>> done processing event #18201, run #363899 on slot 2, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 2 INFO ===>>> start processing event #18206, run #363899 on slot 2, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 0 INFO ===>>> done processing event #18203, run #363899 on slot 0, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 1 INFO ===>>> done processing event #18204, run #363899 on slot 1, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 0 INFO ===>>> start processing event #18207, run #363899 on slot 0, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 1 INFO ===>>> start processing event #18208, run #363899 on slot 1, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 3 INFO ===>>> done processing event #18205, run #363899 on slot 3, 82 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 2 INFO ===>>> done processing event #18206, run #363899 on slot 2, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 2 INFO ===>>> start processing event #18209, run #363899 on slot 2, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 3 INFO ===>>> start processing event #18210, run #363899 on slot 3, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 0 INFO ===>>> done processing event #18207, run #363899 on slot 0, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 1 INFO ===>>> done processing event #18208, run #363899 on slot 1, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 0 INFO ===>>> start processing event #18211, run #363899 on slot 0, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 1 INFO ===>>> start processing event #18212, run #363899 on slot 1, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 2 INFO ===>>> done processing event #18209, run #363899 on slot 2, 86 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 2 INFO ===>>> start processing event #18213, run #363899 on slot 2, 86 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 3 INFO ===>>> done processing event #18210, run #363899 on slot 3, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 3 INFO ===>>> start processing event #18214, run #363899 on slot 3, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 1 INFO ===>>> done processing event #18212, run #363899 on slot 1, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 0 INFO ===>>> done processing event #18211, run #363899 on slot 0, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 0 INFO ===>>> start processing event #18215, run #363899 on slot 0, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 1 INFO ===>>> start processing event #18216, run #363899 on slot 1, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 2 INFO ===>>> done processing event #18213, run #363899 on slot 2, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 3 INFO ===>>> done processing event #18214, run #363899 on slot 3, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 2 INFO ===>>> start processing event #18217, run #363899 on slot 2, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 3 INFO ===>>> start processing event #18218, run #363899 on slot 3, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 0 INFO ===>>> done processing event #18215, run #363899 on slot 0, 92 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 1 INFO ===>>> done processing event #18216, run #363899 on slot 1, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 0 INFO ===>>> start processing event #18219, run #363899 on slot 0, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 1 INFO ===>>> start processing event #18220, run #363899 on slot 1, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 2 INFO ===>>> done processing event #18217, run #363899 on slot 2, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 2 INFO ===>>> start processing event #18221, run #363899 on slot 2, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 3 INFO ===>>> done processing event #18218, run #363899 on slot 3, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 0 INFO ===>>> done processing event #18219, run #363899 on slot 0, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #18222, run #363899 on slot 0, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 3 INFO ===>>> start processing event #18223, run #363899 on slot 3, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 1 INFO ===>>> done processing event #18220, run #363899 on slot 1, 97 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 2 INFO ===>>> done processing event #18221, run #363899 on slot 2, 98 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 3 INFO ===>>> done processing event #18223, run #363899 on slot 3, 99 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 0 INFO ===>>> done processing event #18222, run #363899 on slot 0, 100 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 0 INFO ---> Loop Finished (seconds): 1.93978
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #18190, run #363899 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> start processing event #18193, run #363899 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 1 INFO ===>>> start processing event #18194, run #363899 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> done processing event #18191, run #363899 on slot 2, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 3 INFO ===>>> done processing event #18192, run #363899 on slot 3, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 2 INFO ===>>> start processing event #18195, run #363899 on slot 2, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 3 INFO ===>>> start processing event #18196, run #363899 on slot 3, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> done processing event #18193, run #363899 on slot 0, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 1 INFO ===>>> done processing event #18194, run #363899 on slot 1, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> start processing event #18197, run #363899 on slot 0, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 1 INFO ===>>> start processing event #18198, run #363899 on slot 1, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 2 INFO ===>>> done processing event #18195, run #363899 on slot 2, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 3 INFO ===>>> done processing event #18196, run #363899 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 2 INFO ===>>> start processing event #18199, run #363899 on slot 2, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> start processing event #18200, run #363899 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> done processing event #18197, run #363899 on slot 0, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 1 INFO ===>>> done processing event #18198, run #363899 on slot 1, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #18201, run #363899 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #18202, run #363899 on slot 1, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 2 INFO ===>>> done processing event #18199, run #363899 on slot 2, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> done processing event #18200, run #363899 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> start processing event #18203, run #363899 on slot 2, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 3 INFO ===>>> start processing event #18204, run #363899 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #18201, run #363899 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #18202, run #363899 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> start processing event #18205, run #363899 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> start processing event #18206, run #363899 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> done processing event #18203, run #363899 on slot 2, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 3 INFO ===>>> done processing event #18204, run #363899 on slot 3, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 2 INFO ===>>> start processing event #18207, run #363899 on slot 2, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> start processing event #18208, run #363899 on slot 3, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> done processing event #18205, run #363899 on slot 0, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> done processing event #18206, run #363899 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> start processing event #18209, run #363899 on slot 0, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> start processing event #18210, run #363899 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 2 INFO ===>>> done processing event #18207, run #363899 on slot 2, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> done processing event #18208, run #363899 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> start processing event #18211, run #363899 on slot 2, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #18212, run #363899 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> done processing event #18209, run #363899 on slot 0, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> done processing event #18210, run #363899 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #18213, run #363899 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> start processing event #18214, run #363899 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> done processing event #18211, run #363899 on slot 2, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #18212, run #363899 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> start processing event #18215, run #363899 on slot 2, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> start processing event #18216, run #363899 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #18213, run #363899 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> done processing event #18214, run #363899 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> start processing event #18217, run #363899 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 1 INFO ===>>> start processing event #18218, run #363899 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> done processing event #18215, run #363899 on slot 2, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> done processing event #18216, run #363899 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 2 INFO ===>>> start processing event #18219, run #363899 on slot 2, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> start processing event #18220, run #363899 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> done processing event #18217, run #363899 on slot 0, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 1 INFO ===>>> done processing event #18218, run #363899 on slot 1, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> start processing event #18221, run #363899 on slot 0, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> start processing event #18222, run #363899 on slot 1, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 2 INFO ===>>> done processing event #18219, run #363899 on slot 2, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> done processing event #18220, run #363899 on slot 3, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> start processing event #18223, run #363899 on slot 2, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> done processing event #18221, run #363899 on slot 0, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> done processing event #18222, run #363899 on slot 1, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> done processing event #18223, run #363899 on slot 2, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ---> Loop Finished (seconds): 1.36429
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
@@ -1256,7 +1248,7 @@ AvalancheSchedulerSvc INFO Joining Scheduler threa
PyComponentMgr INFO Finalizing PyComponentMgr...
EventDataSvc INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.50 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
@@ -1268,10 +1260,10 @@ IOVDbFolder INFO Folder /TILE/OFL02/NOIS
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.39 ))s
-IOVDbSvc INFO bytes in (( 0.88 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.05 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.88 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.05 ))s
IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
@@ -1281,9 +1273,9 @@ ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 290 [ms] Ave/Min/Max= 145(+- 135)/ 10/ 280 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 320 [ms] Ave/Min/Max= 160(+- 140)/ 20/ 300 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 2.81 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.5 [s] Ave/Min/Max= 0.25(+- 0.24)/ 0.01/ 0.49 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.54 [s] Ave/Min/Max= 0.27(+- 0.24)/ 0.03/ 0.51 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 4.11 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
index 9d6904eac926931fbc292f570e88c437366fb130..d6d8dcb174af74fb36e09954ab59214a0d4a9eb1 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
@@ -1,16 +1,16 @@
-Wed Jun 3 16:20:37 PDT 2020
+Tue Oct 6 20:02:00 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileMuRcvContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:20:46 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 20:02:11 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7006 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -57,7 +52,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -67,10 +62,10 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully
ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddre... INFO initialized
ByteStreamAddre... INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -89,8 +84,8 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2586 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2653 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -181,7 +176,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -190,7 +185,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24340Kb Time = 0.7S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25380Kb Time = 0.58S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -201,7 +196,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -213,9 +208,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,8 +245,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.17S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.16S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -261,7 +256,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -305,7 +300,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 4030 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4147 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
Finalizer INFO Initializing Finalizer...
ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
@@ -316,7 +311,7 @@ ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # S
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 425 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TileByteStream/TileByteStream-02-00-00/data18_tilecomm.00363899.calibration_tile.daq.RAW._lb0000._TileREB-ROS._0005-200ev.data
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -341,12 +336,13 @@ IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -360,12 +356,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -396,8 +392,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 2266 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2315 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD... INFO TileL2Builder initialization completed
ToolSvc.TileMuR... INFO Initializing TileMuRcvContByteStreamTool
AthenaEventLoopMgr INFO ===>>> done processing event #18124, run #363899 1 events processed so far <<<===
@@ -612,23 +608,23 @@ Finalize: compared 10 dumps
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.18 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104912 (( 0.20 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.18 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.17 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.15 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.16 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.16 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.16 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641536 (( 0.18 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43176 (( 0.15 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.16 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.06 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.12 ))s
-IOVDbSvc INFO bytes in (( 2.02 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.23 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104912 (( 0.05 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.23 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641536 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43176 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.79 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.30 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 1.72 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.25 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.55 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.TileMuR... INFO Finalizing TileMuRcvContByteStreamTool successfuly
@@ -637,18 +633,18 @@ ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 250 [ms] Ave/Min/Max= 125(+- 125)/ 0/ 250 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 290 [ms] Ave/Min/Max= 22.3(+- 71.7)/ 0/ 270 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 3.53 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.53 [s] Ave/Min/Max= 0.265(+- 0.265)/ 0/ 0.53 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.58 [s] Ave/Min/Max= 0.0446(+- 0.146)/ 0/ 0.55 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 4.41 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Py:Athena INFO leaving with code 0: "successful run"
-Wed Jun 3 16:20:55 PDT 2020
+Tue Oct 6 20:02:21 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -657,9 +653,9 @@ Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileMuRcvContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -674,29 +670,24 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
MessageSvc INFO Activating in a separate thread
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:21:02 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 20:02:32 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7378 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -707,7 +698,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStreamMetadataTool INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSequencerSvc INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -717,10 +708,10 @@ IOVDbSvc INFO Service IOVDbSvc initia
ByteStreamAddressProviderSvc INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddressProviderSvc INFO initialized
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -739,8 +730,8 @@ IOVDbSvc INFO Added taginfo remove fo
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 2586 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2653 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -831,7 +822,7 @@ BarrelConstruction INFO Use sagging in geomet
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -840,7 +831,7 @@ EMECConstruction INFO multi-layered version o
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25364Kb Time = 0.71S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25380Kb Time = 0.54S
GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -851,7 +842,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -863,9 +854,9 @@ CaloIDHelper_IDDetDescrCnv INFO in createObj: creating
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -900,8 +891,8 @@ GeoModelSvc.TileDetectorTool INFO Global positioning of
GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.18S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.14S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -911,10 +902,10 @@ TileCablingSvc INFO RUN2 ATLAS geometry fla
TileCablingSvc INFO Cabling for RUN2a (2018) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 5
AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc 0 INFO getRegistryEntries: read 4295 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 4417 CLIDRegistry entries for module ALL
PyComponentMgr 0 INFO Initializing PyComponentMgr...
Finalizer 0 INFO Initializing Finalizer...
-ClassIDSvc 0 INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Initializing CondInputLoader...
CondInputLoader 0 INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -1008,12 +999,13 @@ IOVDbSvc 0 0 INFO Opening COOL connection
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc 0 0 INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -1027,12 +1019,12 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-TileNeighbour 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -1040,211 +1032,211 @@ Domain[ROOT_All] 0 0 INFO -> Access DbDatabase
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #18124, run #363899 on slot 0, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> start processing event #18125, run #363899 on slot 1, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> start processing event #18126, run #363899 on slot 2, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> start processing event #18127, run #363899 on slot 3, 0 events processed so far <<<===
-ClassIDSvc 0 0 INFO getRegistryEntries: read 471 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 1795 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 503 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1812 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
ToolSvc.TileMuRcvContByteStreamTool 0 0 INFO Initializing TileMuRcvContByteStreamTool
AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #18124, run #363899 on slot 0, 1 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> start processing event #18128, run #363899 on slot 0, 1 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> done processing event #18127, run #363899 on slot 3, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> done processing event #18125, run #363899 on slot 1, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> done processing event #18126, run #363899 on slot 2, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> start processing event #18129, run #363899 on slot 1, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> start processing event #18130, run #363899 on slot 2, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 3 INFO ===>>> start processing event #18131, run #363899 on slot 3, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> done processing event #18128, run #363899 on slot 0, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #18132, run #363899 on slot 0, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> done processing event #18129, run #363899 on slot 1, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> done processing event #18130, run #363899 on slot 2, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #18133, run #363899 on slot 1, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 2 INFO ===>>> start processing event #18134, run #363899 on slot 2, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 3 INFO ===>>> done processing event #18131, run #363899 on slot 3, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #18132, run #363899 on slot 0, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 0 INFO ===>>> start processing event #18135, run #363899 on slot 0, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #18125, run #363899 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #18126, run #363899 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #18127, run #363899 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #18128, run #363899 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #18125, run #363899 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #18126, run #363899 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #18129, run #363899 on slot 0, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #18130, run #363899 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #18127, run #363899 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #18128, run #363899 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #18131, run #363899 on slot 2, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> start processing event #18132, run #363899 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #18129, run #363899 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #18130, run #363899 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> start processing event #18133, run #363899 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> start processing event #18134, run #363899 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #18131, run #363899 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> done processing event #18132, run #363899 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> start processing event #18135, run #363899 on slot 2, 9 events processed so far <<<===
AthenaHiveEventLoopMgr 12 3 INFO ===>>> start processing event #18136, run #363899 on slot 3, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #18133, run #363899 on slot 1, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 2 INFO ===>>> done processing event #18134, run #363899 on slot 2, 11 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 1 INFO ===>>> start processing event #18137, run #363899 on slot 1, 11 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 2 INFO ===>>> start processing event #18138, run #363899 on slot 2, 11 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 0 INFO ===>>> done processing event #18135, run #363899 on slot 0, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> done processing event #18133, run #363899 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> done processing event #18134, run #363899 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> start processing event #18137, run #363899 on slot 0, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 1 INFO ===>>> start processing event #18138, run #363899 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> done processing event #18135, run #363899 on slot 2, 12 events processed so far <<<===
AthenaHiveEventLoopMgr 12 3 INFO ===>>> done processing event #18136, run #363899 on slot 3, 13 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 0 INFO ===>>> start processing event #18139, run #363899 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> start processing event #18139, run #363899 on slot 2, 13 events processed so far <<<===
AthenaHiveEventLoopMgr 16 3 INFO ===>>> start processing event #18140, run #363899 on slot 3, 13 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 1 INFO ===>>> done processing event #18137, run #363899 on slot 1, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 2 INFO ===>>> done processing event #18138, run #363899 on slot 2, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 1 INFO ===>>> start processing event #18141, run #363899 on slot 1, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 2 INFO ===>>> start processing event #18142, run #363899 on slot 2, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 0 INFO ===>>> done processing event #18139, run #363899 on slot 0, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 0 INFO ===>>> done processing event #18137, run #363899 on slot 0, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 1 INFO ===>>> done processing event #18138, run #363899 on slot 1, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> start processing event #18141, run #363899 on slot 0, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> start processing event #18142, run #363899 on slot 1, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 2 INFO ===>>> done processing event #18139, run #363899 on slot 2, 16 events processed so far <<<===
AthenaHiveEventLoopMgr 16 3 INFO ===>>> done processing event #18140, run #363899 on slot 3, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 0 INFO ===>>> start processing event #18143, run #363899 on slot 0, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> start processing event #18143, run #363899 on slot 2, 17 events processed so far <<<===
AthenaHiveEventLoopMgr 20 3 INFO ===>>> start processing event #18144, run #363899 on slot 3, 17 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 1 INFO ===>>> done processing event #18141, run #363899 on slot 1, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 2 INFO ===>>> done processing event #18142, run #363899 on slot 2, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #18145, run #363899 on slot 1, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 2 INFO ===>>> start processing event #18146, run #363899 on slot 2, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 0 INFO ===>>> done processing event #18143, run #363899 on slot 0, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 0 INFO ===>>> done processing event #18141, run #363899 on slot 0, 18 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 1 INFO ===>>> done processing event #18142, run #363899 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> start processing event #18145, run #363899 on slot 0, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 1 INFO ===>>> start processing event #18146, run #363899 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 2 INFO ===>>> done processing event #18143, run #363899 on slot 2, 20 events processed so far <<<===
AthenaHiveEventLoopMgr 20 3 INFO ===>>> done processing event #18144, run #363899 on slot 3, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 0 INFO ===>>> start processing event #18147, run #363899 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> start processing event #18147, run #363899 on slot 2, 21 events processed so far <<<===
AthenaHiveEventLoopMgr 24 3 INFO ===>>> start processing event #18148, run #363899 on slot 3, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #18145, run #363899 on slot 1, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 2 INFO ===>>> done processing event #18146, run #363899 on slot 2, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 1 INFO ===>>> start processing event #18149, run #363899 on slot 1, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 2 INFO ===>>> start processing event #18150, run #363899 on slot 2, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 0 INFO ===>>> done processing event #18147, run #363899 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 0 INFO ===>>> done processing event #18145, run #363899 on slot 0, 22 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 1 INFO ===>>> done processing event #18146, run #363899 on slot 1, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> start processing event #18149, run #363899 on slot 0, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> start processing event #18150, run #363899 on slot 1, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 2 INFO ===>>> done processing event #18147, run #363899 on slot 2, 24 events processed so far <<<===
AthenaHiveEventLoopMgr 24 3 INFO ===>>> done processing event #18148, run #363899 on slot 3, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 0 INFO ===>>> start processing event #18151, run #363899 on slot 0, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 2 INFO ===>>> start processing event #18151, run #363899 on slot 2, 25 events processed so far <<<===
AthenaHiveEventLoopMgr 28 3 INFO ===>>> start processing event #18152, run #363899 on slot 3, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 1 INFO ===>>> done processing event #18149, run #363899 on slot 1, 26 events processed so far <<<===
-AthenaHiveEventLoopMgr 26 2 INFO ===>>> done processing event #18150, run #363899 on slot 2, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 1 INFO ===>>> start processing event #18153, run #363899 on slot 1, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> start processing event #18154, run #363899 on slot 2, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 0 INFO ===>>> done processing event #18151, run #363899 on slot 0, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 0 INFO ===>>> done processing event #18149, run #363899 on slot 0, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 26 1 INFO ===>>> done processing event #18150, run #363899 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #18153, run #363899 on slot 0, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> start processing event #18154, run #363899 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 2 INFO ===>>> done processing event #18151, run #363899 on slot 2, 28 events processed so far <<<===
AthenaHiveEventLoopMgr 28 3 INFO ===>>> done processing event #18152, run #363899 on slot 3, 29 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 0 INFO ===>>> start processing event #18155, run #363899 on slot 0, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> start processing event #18155, run #363899 on slot 2, 29 events processed so far <<<===
AthenaHiveEventLoopMgr 32 3 INFO ===>>> start processing event #18156, run #363899 on slot 3, 29 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 1 INFO ===>>> done processing event #18153, run #363899 on slot 1, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> done processing event #18154, run #363899 on slot 2, 31 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 1 INFO ===>>> start processing event #18157, run #363899 on slot 1, 31 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 2 INFO ===>>> start processing event #18158, run #363899 on slot 2, 31 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 0 INFO ===>>> done processing event #18155, run #363899 on slot 0, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #18153, run #363899 on slot 0, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 1 INFO ===>>> done processing event #18154, run #363899 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> start processing event #18157, run #363899 on slot 0, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> start processing event #18158, run #363899 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 2 INFO ===>>> done processing event #18155, run #363899 on slot 2, 32 events processed so far <<<===
AthenaHiveEventLoopMgr 32 3 INFO ===>>> done processing event #18156, run #363899 on slot 3, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 0 INFO ===>>> start processing event #18159, run #363899 on slot 0, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> start processing event #18159, run #363899 on slot 2, 33 events processed so far <<<===
AthenaHiveEventLoopMgr 36 3 INFO ===>>> start processing event #18160, run #363899 on slot 3, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 1 INFO ===>>> done processing event #18157, run #363899 on slot 1, 34 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 2 INFO ===>>> done processing event #18158, run #363899 on slot 2, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 1 INFO ===>>> start processing event #18161, run #363899 on slot 1, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 2 INFO ===>>> start processing event #18162, run #363899 on slot 2, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 0 INFO ===>>> done processing event #18159, run #363899 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 0 INFO ===>>> done processing event #18157, run #363899 on slot 0, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 1 INFO ===>>> done processing event #18158, run #363899 on slot 1, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> start processing event #18161, run #363899 on slot 0, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> start processing event #18162, run #363899 on slot 1, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 2 INFO ===>>> done processing event #18159, run #363899 on slot 2, 36 events processed so far <<<===
AthenaHiveEventLoopMgr 36 3 INFO ===>>> done processing event #18160, run #363899 on slot 3, 37 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 0 INFO ===>>> start processing event #18163, run #363899 on slot 0, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 2 INFO ===>>> start processing event #18163, run #363899 on slot 2, 37 events processed so far <<<===
AthenaHiveEventLoopMgr 40 3 INFO ===>>> start processing event #18164, run #363899 on slot 3, 37 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 1 INFO ===>>> done processing event #18161, run #363899 on slot 1, 38 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 2 INFO ===>>> done processing event #18162, run #363899 on slot 2, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 41 1 INFO ===>>> start processing event #18165, run #363899 on slot 1, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> start processing event #18166, run #363899 on slot 2, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 0 INFO ===>>> done processing event #18163, run #363899 on slot 0, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 0 INFO ===>>> done processing event #18161, run #363899 on slot 0, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 1 INFO ===>>> done processing event #18162, run #363899 on slot 1, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> start processing event #18165, run #363899 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> start processing event #18166, run #363899 on slot 1, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 2 INFO ===>>> done processing event #18163, run #363899 on slot 2, 40 events processed so far <<<===
AthenaHiveEventLoopMgr 40 3 INFO ===>>> done processing event #18164, run #363899 on slot 3, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 0 INFO ===>>> start processing event #18167, run #363899 on slot 0, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> start processing event #18167, run #363899 on slot 2, 41 events processed so far <<<===
AthenaHiveEventLoopMgr 44 3 INFO ===>>> start processing event #18168, run #363899 on slot 3, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 41 1 INFO ===>>> done processing event #18165, run #363899 on slot 1, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> done processing event #18166, run #363899 on slot 2, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 1 INFO ===>>> start processing event #18169, run #363899 on slot 1, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> start processing event #18170, run #363899 on slot 2, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 0 INFO ===>>> done processing event #18167, run #363899 on slot 0, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 0 INFO ===>>> done processing event #18165, run #363899 on slot 0, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 1 INFO ===>>> done processing event #18166, run #363899 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> start processing event #18169, run #363899 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> start processing event #18170, run #363899 on slot 1, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 2 INFO ===>>> done processing event #18167, run #363899 on slot 2, 44 events processed so far <<<===
AthenaHiveEventLoopMgr 44 3 INFO ===>>> done processing event #18168, run #363899 on slot 3, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 0 INFO ===>>> start processing event #18171, run #363899 on slot 0, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> start processing event #18171, run #363899 on slot 2, 45 events processed so far <<<===
AthenaHiveEventLoopMgr 48 3 INFO ===>>> start processing event #18172, run #363899 on slot 3, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 1 INFO ===>>> done processing event #18169, run #363899 on slot 1, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> done processing event #18170, run #363899 on slot 2, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 1 INFO ===>>> start processing event #18173, run #363899 on slot 1, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 2 INFO ===>>> start processing event #18174, run #363899 on slot 2, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 47 0 INFO ===>>> done processing event #18171, run #363899 on slot 0, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 0 INFO ===>>> done processing event #18169, run #363899 on slot 0, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 1 INFO ===>>> done processing event #18170, run #363899 on slot 1, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 0 INFO ===>>> start processing event #18173, run #363899 on slot 0, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> start processing event #18174, run #363899 on slot 1, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 47 2 INFO ===>>> done processing event #18171, run #363899 on slot 2, 48 events processed so far <<<===
AthenaHiveEventLoopMgr 48 3 INFO ===>>> done processing event #18172, run #363899 on slot 3, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 0 INFO ===>>> start processing event #18175, run #363899 on slot 0, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 2 INFO ===>>> start processing event #18175, run #363899 on slot 2, 49 events processed so far <<<===
AthenaHiveEventLoopMgr 52 3 INFO ===>>> start processing event #18176, run #363899 on slot 3, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 1 INFO ===>>> done processing event #18173, run #363899 on slot 1, 50 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 2 INFO ===>>> done processing event #18174, run #363899 on slot 2, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 0 INFO ===>>> done processing event #18175, run #363899 on slot 0, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #18177, run #363899 on slot 0, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #18178, run #363899 on slot 1, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 55 2 INFO ===>>> start processing event #18179, run #363899 on slot 2, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 0 INFO ===>>> done processing event #18173, run #363899 on slot 0, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 1 INFO ===>>> done processing event #18174, run #363899 on slot 1, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #18177, run #363899 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 1 INFO ===>>> start processing event #18178, run #363899 on slot 1, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 2 INFO ===>>> done processing event #18175, run #363899 on slot 2, 52 events processed so far <<<===
AthenaHiveEventLoopMgr 52 3 INFO ===>>> done processing event #18176, run #363899 on slot 3, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 2 INFO ===>>> start processing event #18179, run #363899 on slot 2, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 3 INFO ===>>> start processing event #18180, run #363899 on slot 3, 53 events processed so far <<<===
AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #18177, run #363899 on slot 0, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 0 INFO ===>>> start processing event #18180, run #363899 on slot 0, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 57 3 INFO ===>>> start processing event #18181, run #363899 on slot 3, 54 events processed so far <<<===
AthenaHiveEventLoopMgr 54 1 INFO ===>>> done processing event #18178, run #363899 on slot 1, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> start processing event #18181, run #363899 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 1 INFO ===>>> start processing event #18182, run #363899 on slot 1, 55 events processed so far <<<===
AthenaHiveEventLoopMgr 55 2 INFO ===>>> done processing event #18179, run #363899 on slot 2, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 1 INFO ===>>> start processing event #18182, run #363899 on slot 1, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 59 2 INFO ===>>> start processing event #18183, run #363899 on slot 2, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 0 INFO ===>>> done processing event #18180, run #363899 on slot 0, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 57 3 INFO ===>>> done processing event #18181, run #363899 on slot 3, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 0 INFO ===>>> start processing event #18184, run #363899 on slot 0, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 3 INFO ===>>> start processing event #18185, run #363899 on slot 3, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 3 INFO ===>>> done processing event #18180, run #363899 on slot 3, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 59 2 INFO ===>>> start processing event #18183, run #363899 on slot 2, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 3 INFO ===>>> start processing event #18184, run #363899 on slot 3, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 0 INFO ===>>> done processing event #18181, run #363899 on slot 0, 58 events processed so far <<<===
AthenaHiveEventLoopMgr 58 1 INFO ===>>> done processing event #18182, run #363899 on slot 1, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> start processing event #18185, run #363899 on slot 0, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 1 INFO ===>>> start processing event #18186, run #363899 on slot 1, 59 events processed so far <<<===
AthenaHiveEventLoopMgr 59 2 INFO ===>>> done processing event #18183, run #363899 on slot 2, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 1 INFO ===>>> start processing event #18186, run #363899 on slot 1, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 2 INFO ===>>> start processing event #18187, run #363899 on slot 2, 60 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 0 INFO ===>>> done processing event #18184, run #363899 on slot 0, 61 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 3 INFO ===>>> done processing event #18185, run #363899 on slot 3, 62 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 0 INFO ===>>> start processing event #18188, run #363899 on slot 0, 62 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 3 INFO ===>>> start processing event #18189, run #363899 on slot 3, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 3 INFO ===>>> done processing event #18184, run #363899 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 2 INFO ===>>> start processing event #18187, run #363899 on slot 2, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> start processing event #18188, run #363899 on slot 3, 61 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 0 INFO ===>>> done processing event #18185, run #363899 on slot 0, 62 events processed so far <<<===
AthenaHiveEventLoopMgr 62 1 INFO ===>>> done processing event #18186, run #363899 on slot 1, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #18189, run #363899 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #18190, run #363899 on slot 1, 63 events processed so far <<<===
AthenaHiveEventLoopMgr 63 2 INFO ===>>> done processing event #18187, run #363899 on slot 2, 64 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 1 INFO ===>>> start processing event #18190, run #363899 on slot 1, 64 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 2 INFO ===>>> start processing event #18191, run #363899 on slot 2, 64 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 0 INFO ===>>> done processing event #18188, run #363899 on slot 0, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 3 INFO ===>>> done processing event #18189, run #363899 on slot 3, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 0 INFO ===>>> start processing event #18192, run #363899 on slot 0, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 3 INFO ===>>> start processing event #18193, run #363899 on slot 3, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 3 INFO ===>>> done processing event #18188, run #363899 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 2 INFO ===>>> start processing event #18191, run #363899 on slot 2, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 3 INFO ===>>> start processing event #18192, run #363899 on slot 3, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #18189, run #363899 on slot 0, 66 events processed so far <<<===
AthenaHiveEventLoopMgr 66 1 INFO ===>>> done processing event #18190, run #363899 on slot 1, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> start processing event #18193, run #363899 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 1 INFO ===>>> start processing event #18194, run #363899 on slot 1, 67 events processed so far <<<===
AthenaHiveEventLoopMgr 67 2 INFO ===>>> done processing event #18191, run #363899 on slot 2, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 70 1 INFO ===>>> start processing event #18194, run #363899 on slot 1, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 71 2 INFO ===>>> start processing event #18195, run #363899 on slot 2, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 0 INFO ===>>> done processing event #18192, run #363899 on slot 0, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 3 INFO ===>>> done processing event #18193, run #363899 on slot 3, 70 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 0 INFO ===>>> start processing event #18196, run #363899 on slot 0, 70 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 3 INFO ===>>> start processing event #18197, run #363899 on slot 3, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 3 INFO ===>>> done processing event #18192, run #363899 on slot 3, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 2 INFO ===>>> start processing event #18195, run #363899 on slot 2, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 3 INFO ===>>> start processing event #18196, run #363899 on slot 3, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 0 INFO ===>>> done processing event #18193, run #363899 on slot 0, 70 events processed so far <<<===
AthenaHiveEventLoopMgr 70 1 INFO ===>>> done processing event #18194, run #363899 on slot 1, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> start processing event #18197, run #363899 on slot 0, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 1 INFO ===>>> start processing event #18198, run #363899 on slot 1, 71 events processed so far <<<===
AthenaHiveEventLoopMgr 71 2 INFO ===>>> done processing event #18195, run #363899 on slot 2, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 1 INFO ===>>> start processing event #18198, run #363899 on slot 1, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 2 INFO ===>>> start processing event #18199, run #363899 on slot 2, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 0 INFO ===>>> done processing event #18196, run #363899 on slot 0, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 3 INFO ===>>> done processing event #18197, run #363899 on slot 3, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 3 INFO ===>>> done processing event #18196, run #363899 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 2 INFO ===>>> start processing event #18199, run #363899 on slot 2, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> start processing event #18200, run #363899 on slot 3, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 0 INFO ===>>> done processing event #18197, run #363899 on slot 0, 74 events processed so far <<<===
AthenaHiveEventLoopMgr 74 1 INFO ===>>> done processing event #18198, run #363899 on slot 1, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 0 INFO ===>>> start processing event #18200, run #363899 on slot 0, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 1 INFO ===>>> start processing event #18201, run #363899 on slot 1, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 3 INFO ===>>> start processing event #18202, run #363899 on slot 3, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #18201, run #363899 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> start processing event #18202, run #363899 on slot 1, 75 events processed so far <<<===
AthenaHiveEventLoopMgr 75 2 INFO ===>>> done processing event #18199, run #363899 on slot 2, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 0 INFO ===>>> done processing event #18200, run #363899 on slot 0, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 0 INFO ===>>> start processing event #18203, run #363899 on slot 0, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 2 INFO ===>>> start processing event #18204, run #363899 on slot 2, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 1 INFO ===>>> done processing event #18201, run #363899 on slot 1, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 3 INFO ===>>> done processing event #18202, run #363899 on slot 3, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 1 INFO ===>>> start processing event #18205, run #363899 on slot 1, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 3 INFO ===>>> start processing event #18206, run #363899 on slot 3, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 0 INFO ===>>> done processing event #18203, run #363899 on slot 0, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 2 INFO ===>>> done processing event #18204, run #363899 on slot 2, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 0 INFO ===>>> start processing event #18207, run #363899 on slot 0, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 2 INFO ===>>> start processing event #18208, run #363899 on slot 2, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 1 INFO ===>>> done processing event #18205, run #363899 on slot 1, 82 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 3 INFO ===>>> done processing event #18206, run #363899 on slot 3, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 1 INFO ===>>> start processing event #18209, run #363899 on slot 1, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 3 INFO ===>>> start processing event #18210, run #363899 on slot 3, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 0 INFO ===>>> done processing event #18207, run #363899 on slot 0, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 2 INFO ===>>> done processing event #18208, run #363899 on slot 2, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 0 INFO ===>>> start processing event #18211, run #363899 on slot 0, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 2 INFO ===>>> start processing event #18212, run #363899 on slot 2, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 1 INFO ===>>> done processing event #18209, run #363899 on slot 1, 86 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 3 INFO ===>>> done processing event #18210, run #363899 on slot 3, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 1 INFO ===>>> start processing event #18213, run #363899 on slot 1, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 3 INFO ===>>> start processing event #18214, run #363899 on slot 3, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 0 INFO ===>>> done processing event #18211, run #363899 on slot 0, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 2 INFO ===>>> done processing event #18212, run #363899 on slot 2, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 0 INFO ===>>> start processing event #18215, run #363899 on slot 0, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 2 INFO ===>>> start processing event #18216, run #363899 on slot 2, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 1 INFO ===>>> done processing event #18213, run #363899 on slot 1, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 3 INFO ===>>> done processing event #18214, run #363899 on slot 3, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 1 INFO ===>>> start processing event #18217, run #363899 on slot 1, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 3 INFO ===>>> start processing event #18218, run #363899 on slot 3, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 0 INFO ===>>> done processing event #18215, run #363899 on slot 0, 92 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 2 INFO ===>>> done processing event #18216, run #363899 on slot 2, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 0 INFO ===>>> start processing event #18219, run #363899 on slot 0, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 2 INFO ===>>> start processing event #18220, run #363899 on slot 2, 93 events processed so far <<<===
-AthenaHiveEventLoopMgr 93 1 INFO ===>>> done processing event #18217, run #363899 on slot 1, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 3 INFO ===>>> done processing event #18218, run #363899 on slot 3, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 1 INFO ===>>> start processing event #18221, run #363899 on slot 1, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 3 INFO ===>>> start processing event #18222, run #363899 on slot 3, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 0 INFO ===>>> done processing event #18219, run #363899 on slot 0, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 2 INFO ===>>> done processing event #18220, run #363899 on slot 2, 97 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 0 INFO ===>>> start processing event #18223, run #363899 on slot 0, 97 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 1 INFO ===>>> done processing event #18221, run #363899 on slot 1, 98 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 3 INFO ===>>> done processing event #18222, run #363899 on slot 3, 99 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 0 INFO ===>>> done processing event #18223, run #363899 on slot 0, 100 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 0 INFO ---> Loop Finished (seconds): 1.38422
+AthenaHiveEventLoopMgr 76 3 INFO ===>>> done processing event #18200, run #363899 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> start processing event #18203, run #363899 on slot 2, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 3 INFO ===>>> start processing event #18204, run #363899 on slot 3, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #18201, run #363899 on slot 0, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 1 INFO ===>>> done processing event #18202, run #363899 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> start processing event #18205, run #363899 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> start processing event #18206, run #363899 on slot 1, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 2 INFO ===>>> done processing event #18203, run #363899 on slot 2, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 3 INFO ===>>> done processing event #18204, run #363899 on slot 3, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 2 INFO ===>>> start processing event #18207, run #363899 on slot 2, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> start processing event #18208, run #363899 on slot 3, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 0 INFO ===>>> done processing event #18205, run #363899 on slot 0, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 1 INFO ===>>> done processing event #18206, run #363899 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> start processing event #18209, run #363899 on slot 0, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> start processing event #18210, run #363899 on slot 1, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 2 INFO ===>>> done processing event #18207, run #363899 on slot 2, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 3 INFO ===>>> done processing event #18208, run #363899 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> start processing event #18211, run #363899 on slot 2, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #18212, run #363899 on slot 3, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 0 INFO ===>>> done processing event #18209, run #363899 on slot 0, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 1 INFO ===>>> done processing event #18210, run #363899 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #18213, run #363899 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> start processing event #18214, run #363899 on slot 1, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 2 INFO ===>>> done processing event #18211, run #363899 on slot 2, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #18212, run #363899 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> start processing event #18215, run #363899 on slot 2, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> start processing event #18216, run #363899 on slot 3, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #18213, run #363899 on slot 0, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 1 INFO ===>>> done processing event #18214, run #363899 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> start processing event #18217, run #363899 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 1 INFO ===>>> start processing event #18218, run #363899 on slot 1, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 2 INFO ===>>> done processing event #18215, run #363899 on slot 2, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 3 INFO ===>>> done processing event #18216, run #363899 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 2 INFO ===>>> start processing event #18219, run #363899 on slot 2, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> start processing event #18220, run #363899 on slot 3, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 93 0 INFO ===>>> done processing event #18217, run #363899 on slot 0, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 1 INFO ===>>> done processing event #18218, run #363899 on slot 1, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> start processing event #18221, run #363899 on slot 0, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> start processing event #18222, run #363899 on slot 1, 95 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 2 INFO ===>>> done processing event #18219, run #363899 on slot 2, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 3 INFO ===>>> done processing event #18220, run #363899 on slot 3, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> start processing event #18223, run #363899 on slot 2, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 0 INFO ===>>> done processing event #18221, run #363899 on slot 0, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 1 INFO ===>>> done processing event #18222, run #363899 on slot 1, 99 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ===>>> done processing event #18223, run #363899 on slot 2, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 2 INFO ---> Loop Finished (seconds): 1.34168
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
@@ -1261,7 +1253,7 @@ AvalancheSchedulerSvc INFO Joining Scheduler threa
PyComponentMgr INFO Finalizing PyComponentMgr...
EventDataSvc INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.23 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
@@ -1273,10 +1265,10 @@ IOVDbFolder INFO Folder /TILE/OFL02/NOIS
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.13 ))s
-IOVDbSvc INFO bytes in (( 0.36 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.06 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.36 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.06 ))s
IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
@@ -1287,9 +1279,9 @@ ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 290 [ms] Ave/Min/Max= 145(+- 145)/ 0/ 290 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 320 [ms] Ave/Min/Max= 160(+- 150)/ 10/ 310 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 2.99 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.51 [s] Ave/Min/Max= 0.255(+- 0.245)/ 0.01/ 0.5 [s] #= 2
+cObj_ALL INFO Time User : Tot= 0.56 [s] Ave/Min/Max= 0.28(+- 0.24)/ 0.04/ 0.52 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 4.19 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
index d4cdec9edf9b126088739ac051ac1611793f4645..f024509a3889fc942061a429e597869a9e460e06 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
@@ -1,16 +1,16 @@
-Wed Jun 3 16:11:56 PDT 2020
+Tue Oct 6 19:58:23 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileRawChannelContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -25,28 +25,23 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:12:05 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:58:35 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7006 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -57,7 +52,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -67,11 +62,11 @@ IOVDbSvc INFO Service IOVDbSvc initialised successfully
ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddre... INFO initialized
ByteStreamAddre... INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2575 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2643 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -90,7 +85,7 @@ IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -181,7 +176,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -190,7 +185,7 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25364Kb Time = 0.71S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24356Kb Time = 0.58S
GeoModelSvc.Til... INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -201,7 +196,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -213,9 +208,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,8 +245,8 @@ GeoModelSvc.Til... INFO Global positioning of barrel with rotation (0,0,0)) a
GeoModelSvc.Til... INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.Til... INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrMan... INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.2S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.14S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -261,7 +256,7 @@ TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 270 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -305,7 +300,7 @@ TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
TileEMScaleCond... INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
TileSampleNoise... INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
TileTimingCondA... INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc INFO getRegistryEntries: read 4030 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 4147 CLIDRegistry entries for module ALL
PyComponentMgr INFO Initializing PyComponentMgr...
Finalizer INFO Initializing Finalizer...
ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
@@ -316,7 +311,7 @@ ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # S
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 425 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CIS/FIT/LIN'
@@ -341,12 +336,13 @@ IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -360,12 +356,12 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -396,8 +392,8 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 2266 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2315 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD... INFO TileL2Builder initialization completed
ToolSvc.TileRaw... INFO Initializing TileRawChannelContByteStreamTool
AthenaEventLoopMgr INFO ===>>> done processing event #1129572, run #204073 1 events processed so far <<<===
@@ -612,23 +608,23 @@ Finalize: compared 20 dumps
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.60 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.16 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.13 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.13 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.10 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.12 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.12 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.12 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.19 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.63 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.72 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.06 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.50 ))s
-IOVDbSvc INFO bytes in (( 3.56 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.23 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641504 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93060 (( 0.02 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbSvc INFO bytes in (( 0.56 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 1.10 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 2.47 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.04 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 0.52 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.TileRaw... INFO Finalizing TileRawChannelContByteStreamTool successfuly
@@ -637,18 +633,18 @@ ToolSvc.ByteStr... INFO in finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 250 [ms] Ave/Min/Max= 125(+- 125)/ 0/ 250 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 290 [ms] Ave/Min/Max= 22.3(+- 71.7)/ 0/ 270 [ms] #= 13
-ChronoStatSvc INFO Time User : Tot= 9.64 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 245(+- 235)/ 10/ 480 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 0.53 [s] Ave/Min/Max= 0.0408(+- 0.13)/ 0/ 0.49 [s] #= 13
+ChronoStatSvc INFO Time User : Tot= 14.1 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
ApplicationMgr INFO Application Manager Terminated successfully
Py:Athena INFO leaving with code 0: "successful run"
-Wed Jun 3 16:12:29 PDT 2020
+Tue Oct 6 19:58:55 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.15] [x86_64-centos7-gcc8-opt] [Unknown/07d2aec7427] -- built on [2020-06-03T1607]
+Py:Athena INFO using release [WorkDir-22.0.19] [x86_64-centos7-gcc8-opt] [master-refs/ea3e66422c4] -- built on [2020-10-06T1923]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -657,9 +653,9 @@ Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "TileByteStream/TileRawChannelContByteStreamCnv_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5530 configurables from 19 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5569 configurables from 10 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.15
+EventInfoMgtInit: Got release version Athena-22.0.19
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "TileConditions/TileConditions_jobOptions.py"
Py:TileInfoConf. INFO Adding TileCablingSvc to ServiceMgr
@@ -674,29 +670,24 @@ Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise
Py:TileConditions_jobOptions.py INFO Setting 10-bit ADC configuration
Py:TileInfoConf. INFO Setting 10-bit Tile ADC
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
MessageSvc INFO Activating in a separate thread
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on zeus on Wed Jun 3 16:12:36 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v34r0)
+ running on aibuild028.cern.ch on Tue Oct 6 19:59:07 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7378 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 6906 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas1.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas2.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://frontier-atlas3.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://frontiercache.nersc.gov:3128)(proxyurl=http://atlsquid.slac.stanford.edu:3128)(proxyurl=http://atlasbpfrontier.fnal.gov:3127)(proxyurl=http://atlasbpfrontier.cern.ch:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -707,7 +698,7 @@ DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
ToolSvc.ByteStreamMetadataTool INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
+OutputStreamSequencerSvc INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
@@ -717,11 +708,11 @@ IOVDbSvc INFO Service IOVDbSvc initia
ByteStreamAddressProviderSvc INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
ByteStreamAddressProviderSvc INFO initialized
ByteStreamAddressProviderSvc INFO -- Will fill Store with id = 0
-ClassIDSvc INFO getRegistryEntries: read 2725 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2841 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2575 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2643 CLIDRegistry entries for module ALL
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -740,7 +731,7 @@ IOVDbSvc INFO Added taginfo remove fo
IOVDbSvc INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
IOVDbSvc INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 20 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -831,7 +822,7 @@ BarrelConstruction INFO Use sagging in geomet
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 2902 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2914 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -840,7 +831,7 @@ EMECConstruction INFO multi-layered version o
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstruction INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25364Kb Time = 0.73S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 25380Kb Time = 0.64S
GeoModelSvc.TileDetectorTool INFO Entering TileDetectorTool::create()
TileDddbManager INFO m_tag = ATLAS-R2-2016-01-00-01
TileDddbManager INFO n_tiglob = 5
@@ -851,7 +842,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDescrCnv INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -863,9 +854,9 @@ CaloIDHelper_IDDetDescrCnv INFO in createObj: creating
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -900,8 +891,8 @@ GeoModelSvc.TileDetectorTool INFO Global positioning of
GeoModelSvc.TileDetectorTool INFO Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
GeoModelSvc.TileDetectorTool INFO Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
TileDetDescrManager INFO Entering create_elements()
-GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 4600Kb Time = 0.19S
-ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+GeoModelSvc INFO GeoModelSvc.TileDetectorTool SZ= 3576Kb Time = 0.2S
+ClassIDSvc INFO getRegistryEntries: read 67 CLIDRegistry entries for module ALL
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
CaloIDHelper_IDDetDescrCnv INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
@@ -911,10 +902,10 @@ TileCablingSvc INFO RUN2 ATLAS geometry fla
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
AthenaHiveEventLoopMgr INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc 0 INFO getRegistryEntries: read 4295 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 4417 CLIDRegistry entries for module ALL
PyComponentMgr 0 INFO Initializing PyComponentMgr...
Finalizer 0 INFO Initializing Finalizer...
-ClassIDSvc 0 INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
+ClassIDSvc 0 INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
CondInputLoader 0 INFO Initializing CondInputLoader...
CondInputLoader 0 INFO Adding base classes:
+ ( 'CondAttrListCollection' , 'ConditionStore+/TILE/OFL02/CALIB/CES' ) ->
@@ -1010,12 +1001,13 @@ IOVDbSvc 0 0 INFO Opening COOL connection
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder 0 0 INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
IOVDbSvc 0 0 INFO Disconnecting from COOLOFL_LAR/OFLP200
+IOVDbSvc 0 0 INFO Opened read transaction for POOL PersistencySvc
Domain[ROOT_All] 0 0 INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv 0 0 INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDescrCnv 0 0 INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc 0 0 INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 201 CLIDRegistry entries for module ALL
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID 0 0 INFO initialize_from_dictionary
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
@@ -1029,12 +1021,12 @@ CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_IDDetDescrCnv 0 0 INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
-TileNeighbour 0 0 INFO Reading file /bld3/build/master/build/install/Athena/22.0.15/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour 0 0 INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-10-05T2101/Athena/22.0.19/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID 0 0 INFO initialize_from_dictionary - OK
CaloIdMgrDetDescrCnv 0 0 INFO Finished
CaloIdMgrDetDescrCnv 0 0 INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
@@ -1042,211 +1034,211 @@ Domain[ROOT_All] 0 0 INFO -> Access DbDatabase
Domain[ROOT_All] 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open 0 0 INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaHiveEventLoopMgr 0 0 INFO ===>>> start processing event #1129572, run #204073 on slot 0, 0 events processed so far <<<===
-ClassIDSvc 0 0 INFO getRegistryEntries: read 471 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 1795 CLIDRegistry entries for module ALL
-ClassIDSvc 0 0 INFO getRegistryEntries: read 91 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 503 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 1812 CLIDRegistry entries for module ALL
+ClassIDSvc 0 0 INFO getRegistryEntries: read 92 CLIDRegistry entries for module ALL
ToolSvc.TileROD_Decoder.TileL2Builder 0 0 INFO TileL2Builder initialization completed
ToolSvc.TileRawChannelContByteStreamTool 0 0 INFO Initializing TileRawChannelContByteStreamTool
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> start processing event #1129665, run #204073 on slot 1, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> start processing event #1131212, run #204073 on slot 2, 0 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> start processing event #1131086, run #204073 on slot 3, 0 events processed so far <<<===
AthenaHiveEventLoopMgr 0 0 INFO ===>>> done processing event #1129572, run #204073 on slot 0, 1 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> start processing event #1130272, run #204073 on slot 0, 1 events processed so far <<<===
-AthenaHiveEventLoopMgr 1 1 INFO ===>>> done processing event #1129665, run #204073 on slot 1, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> start processing event #1131269, run #204073 on slot 1, 2 events processed so far <<<===
-AthenaHiveEventLoopMgr 2 2 INFO ===>>> done processing event #1131212, run #204073 on slot 2, 3 events processed so far <<<===
-AthenaHiveEventLoopMgr 3 3 INFO ===>>> done processing event #1131086, run #204073 on slot 3, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> start processing event #1130716, run #204073 on slot 2, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 3 INFO ===>>> start processing event #1132019, run #204073 on slot 3, 4 events processed so far <<<===
-AthenaHiveEventLoopMgr 5 1 INFO ===>>> done processing event #1131269, run #204073 on slot 1, 5 events processed so far <<<===
-AthenaHiveEventLoopMgr 4 0 INFO ===>>> done processing event #1130272, run #204073 on slot 0, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 0 INFO ===>>> start processing event #1132092, run #204073 on slot 0, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 1 INFO ===>>> start processing event #1130238, run #204073 on slot 1, 6 events processed so far <<<===
-AthenaHiveEventLoopMgr 6 2 INFO ===>>> done processing event #1130716, run #204073 on slot 2, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 2 INFO ===>>> start processing event #1134553, run #204073 on slot 2, 7 events processed so far <<<===
-AthenaHiveEventLoopMgr 7 3 INFO ===>>> done processing event #1132019, run #204073 on slot 3, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 3 INFO ===>>> start processing event #1130999, run #204073 on slot 3, 8 events processed so far <<<===
-AthenaHiveEventLoopMgr 8 0 INFO ===>>> done processing event #1132092, run #204073 on slot 0, 9 events processed so far <<<===
-AthenaHiveEventLoopMgr 9 1 INFO ===>>> done processing event #1130238, run #204073 on slot 1, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 12 0 INFO ===>>> start processing event #1133461, run #204073 on slot 0, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 1 INFO ===>>> start processing event #1131152, run #204073 on slot 1, 10 events processed so far <<<===
-AthenaHiveEventLoopMgr 11 3 INFO ===>>> done processing event #1130999, run #204073 on slot 3, 11 events processed so far <<<===
-AthenaHiveEventLoopMgr 10 2 INFO ===>>> done processing event #1134553, run #204073 on slot 2, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 2 INFO ===>>> start processing event #1130142, run #204073 on slot 2, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 3 INFO ===>>> start processing event #1132770, run #204073 on slot 3, 12 events processed so far <<<===
-AthenaHiveEventLoopMgr 13 1 INFO ===>>> done processing event #1131152, run #204073 on slot 1, 13 events processed so far <<<===
-AthenaHiveEventLoopMgr 12 0 INFO ===>>> done processing event #1133461, run #204073 on slot 0, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> start processing event #1132365, run #204073 on slot 0, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 17 1 INFO ===>>> start processing event #1136791, run #204073 on slot 1, 14 events processed so far <<<===
-AthenaHiveEventLoopMgr 14 2 INFO ===>>> done processing event #1130142, run #204073 on slot 2, 15 events processed so far <<<===
-AthenaHiveEventLoopMgr 15 3 INFO ===>>> done processing event #1132770, run #204073 on slot 3, 16 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 2 INFO ===>>> start processing event #1133781, run #204073 on slot 2, 16 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 3 INFO ===>>> start processing event #1132067, run #204073 on slot 3, 16 events processed so far <<<===
-AthenaHiveEventLoopMgr 16 0 INFO ===>>> done processing event #1132365, run #204073 on slot 0, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> start processing event #1129665, run #204073 on slot 0, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> start processing event #1131212, run #204073 on slot 1, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> start processing event #1131086, run #204073 on slot 2, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> start processing event #1130272, run #204073 on slot 3, 1 events processed so far <<<===
+AthenaHiveEventLoopMgr 1 0 INFO ===>>> done processing event #1129665, run #204073 on slot 0, 2 events processed so far <<<===
+AthenaHiveEventLoopMgr 2 1 INFO ===>>> done processing event #1131212, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> start processing event #1131269, run #204073 on slot 0, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> start processing event #1130716, run #204073 on slot 1, 3 events processed so far <<<===
+AthenaHiveEventLoopMgr 3 2 INFO ===>>> done processing event #1131086, run #204073 on slot 2, 4 events processed so far <<<===
+AthenaHiveEventLoopMgr 4 3 INFO ===>>> done processing event #1130272, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> start processing event #1132019, run #204073 on slot 2, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> start processing event #1132092, run #204073 on slot 3, 5 events processed so far <<<===
+AthenaHiveEventLoopMgr 5 0 INFO ===>>> done processing event #1131269, run #204073 on slot 0, 6 events processed so far <<<===
+AthenaHiveEventLoopMgr 6 1 INFO ===>>> done processing event #1130716, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> start processing event #1130238, run #204073 on slot 0, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> start processing event #1134553, run #204073 on slot 1, 7 events processed so far <<<===
+AthenaHiveEventLoopMgr 7 2 INFO ===>>> done processing event #1132019, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> start processing event #1130999, run #204073 on slot 2, 8 events processed so far <<<===
+AthenaHiveEventLoopMgr 8 3 INFO ===>>> done processing event #1132092, run #204073 on slot 3, 9 events processed so far <<<===
+AthenaHiveEventLoopMgr 9 0 INFO ===>>> done processing event #1130238, run #204073 on slot 0, 10 events processed so far <<<===
+AthenaHiveEventLoopMgr 10 1 INFO ===>>> done processing event #1134553, run #204073 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 0 INFO ===>>> start processing event #1133461, run #204073 on slot 0, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 1 INFO ===>>> start processing event #1131152, run #204073 on slot 1, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 3 INFO ===>>> start processing event #1130142, run #204073 on slot 3, 11 events processed so far <<<===
+AthenaHiveEventLoopMgr 11 2 INFO ===>>> done processing event #1130999, run #204073 on slot 2, 12 events processed so far <<<===
+AthenaHiveEventLoopMgr 12 0 INFO ===>>> done processing event #1133461, run #204073 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 0 INFO ===>>> start processing event #1132770, run #204073 on slot 0, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 2 INFO ===>>> start processing event #1132365, run #204073 on slot 2, 13 events processed so far <<<===
+AthenaHiveEventLoopMgr 13 1 INFO ===>>> done processing event #1131152, run #204073 on slot 1, 14 events processed so far <<<===
+AthenaHiveEventLoopMgr 14 3 INFO ===>>> done processing event #1130142, run #204073 on slot 3, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 17 1 INFO ===>>> start processing event #1136791, run #204073 on slot 1, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 3 INFO ===>>> start processing event #1133781, run #204073 on slot 3, 15 events processed so far <<<===
+AthenaHiveEventLoopMgr 15 0 INFO ===>>> done processing event #1132770, run #204073 on slot 0, 16 events processed so far <<<===
+AthenaHiveEventLoopMgr 16 2 INFO ===>>> done processing event #1132365, run #204073 on slot 2, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 0 INFO ===>>> start processing event #1132067, run #204073 on slot 0, 17 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 2 INFO ===>>> start processing event #1138637, run #204073 on slot 2, 17 events processed so far <<<===
AthenaHiveEventLoopMgr 17 1 INFO ===>>> done processing event #1136791, run #204073 on slot 1, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 0 INFO ===>>> start processing event #1138637, run #204073 on slot 0, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #1139495, run #204073 on slot 1, 18 events processed so far <<<===
-AthenaHiveEventLoopMgr 19 3 INFO ===>>> done processing event #1132067, run #204073 on slot 3, 19 events processed so far <<<===
-AthenaHiveEventLoopMgr 18 2 INFO ===>>> done processing event #1133781, run #204073 on slot 2, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 2 INFO ===>>> start processing event #1140193, run #204073 on slot 2, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 3 INFO ===>>> start processing event #1142953, run #204073 on slot 3, 20 events processed so far <<<===
-AthenaHiveEventLoopMgr 20 0 INFO ===>>> done processing event #1138637, run #204073 on slot 0, 21 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 0 INFO ===>>> start processing event #1139127, run #204073 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 18 3 INFO ===>>> done processing event #1133781, run #204073 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 21 1 INFO ===>>> start processing event #1139495, run #204073 on slot 1, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> start processing event #1140193, run #204073 on slot 3, 19 events processed so far <<<===
+AthenaHiveEventLoopMgr 19 0 INFO ===>>> done processing event #1132067, run #204073 on slot 0, 20 events processed so far <<<===
+AthenaHiveEventLoopMgr 20 2 INFO ===>>> done processing event #1138637, run #204073 on slot 2, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> start processing event #1142953, run #204073 on slot 0, 21 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 2 INFO ===>>> start processing event #1139127, run #204073 on slot 2, 21 events processed so far <<<===
AthenaHiveEventLoopMgr 21 1 INFO ===>>> done processing event #1139495, run #204073 on slot 1, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 1 INFO ===>>> start processing event #1141272, run #204073 on slot 1, 22 events processed so far <<<===
-AthenaHiveEventLoopMgr 23 3 INFO ===>>> done processing event #1142953, run #204073 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 22 3 INFO ===>>> done processing event #1140193, run #204073 on slot 3, 23 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 1 INFO ===>>> start processing event #1141272, run #204073 on slot 1, 23 events processed so far <<<===
AthenaHiveEventLoopMgr 26 3 INFO ===>>> start processing event #1137117, run #204073 on slot 3, 23 events processed so far <<<===
-AthenaHiveEventLoopMgr 22 2 INFO ===>>> done processing event #1140193, run #204073 on slot 2, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 2 INFO ===>>> start processing event #1139599, run #204073 on slot 2, 24 events processed so far <<<===
-AthenaHiveEventLoopMgr 25 1 INFO ===>>> done processing event #1141272, run #204073 on slot 1, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 28 1 INFO ===>>> start processing event #1140314, run #204073 on slot 1, 25 events processed so far <<<===
-AthenaHiveEventLoopMgr 24 0 INFO ===>>> done processing event #1139127, run #204073 on slot 0, 26 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 0 INFO ===>>> start processing event #1133685, run #204073 on slot 0, 26 events processed so far <<<===
+AthenaHiveEventLoopMgr 23 0 INFO ===>>> done processing event #1142953, run #204073 on slot 0, 24 events processed so far <<<===
+AthenaHiveEventLoopMgr 24 2 INFO ===>>> done processing event #1139127, run #204073 on slot 2, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 0 INFO ===>>> start processing event #1139599, run #204073 on slot 0, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 2 INFO ===>>> start processing event #1140314, run #204073 on slot 2, 25 events processed so far <<<===
+AthenaHiveEventLoopMgr 25 1 INFO ===>>> done processing event #1141272, run #204073 on slot 1, 26 events processed so far <<<===
AthenaHiveEventLoopMgr 26 3 INFO ===>>> done processing event #1137117, run #204073 on slot 3, 27 events processed so far <<<===
-AthenaHiveEventLoopMgr 27 2 INFO ===>>> done processing event #1139599, run #204073 on slot 2, 28 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> start processing event #1143279, run #204073 on slot 2, 28 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 3 INFO ===>>> start processing event #1137563, run #204073 on slot 3, 28 events processed so far <<<===
-AthenaHiveEventLoopMgr 29 0 INFO ===>>> done processing event #1133685, run #204073 on slot 0, 29 events processed so far <<<===
-AthenaHiveEventLoopMgr 28 1 INFO ===>>> done processing event #1140314, run #204073 on slot 1, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 32 0 INFO ===>>> start processing event #1139927, run #204073 on slot 0, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 33 1 INFO ===>>> start processing event #1141197, run #204073 on slot 1, 30 events processed so far <<<===
-AthenaHiveEventLoopMgr 30 2 INFO ===>>> done processing event #1143279, run #204073 on slot 2, 31 events processed so far <<<===
-AthenaHiveEventLoopMgr 31 3 INFO ===>>> done processing event #1137563, run #204073 on slot 3, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 2 INFO ===>>> start processing event #1140039, run #204073 on slot 2, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 3 INFO ===>>> start processing event #1142531, run #204073 on slot 3, 32 events processed so far <<<===
-AthenaHiveEventLoopMgr 32 0 INFO ===>>> done processing event #1139927, run #204073 on slot 0, 33 events processed so far <<<===
-AthenaHiveEventLoopMgr 36 0 INFO ===>>> start processing event #1139475, run #204073 on slot 0, 33 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 1 INFO ===>>> start processing event #1133685, run #204073 on slot 1, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 3 INFO ===>>> start processing event #1143279, run #204073 on slot 3, 27 events processed so far <<<===
+AthenaHiveEventLoopMgr 27 0 INFO ===>>> done processing event #1139599, run #204073 on slot 0, 28 events processed so far <<<===
+AthenaHiveEventLoopMgr 28 2 INFO ===>>> done processing event #1140314, run #204073 on slot 2, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 0 INFO ===>>> start processing event #1137563, run #204073 on slot 0, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 2 INFO ===>>> start processing event #1139927, run #204073 on slot 2, 29 events processed so far <<<===
+AthenaHiveEventLoopMgr 29 1 INFO ===>>> done processing event #1133685, run #204073 on slot 1, 30 events processed so far <<<===
+AthenaHiveEventLoopMgr 30 3 INFO ===>>> done processing event #1143279, run #204073 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 33 1 INFO ===>>> start processing event #1141197, run #204073 on slot 1, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> start processing event #1140039, run #204073 on slot 3, 31 events processed so far <<<===
+AthenaHiveEventLoopMgr 31 0 INFO ===>>> done processing event #1137563, run #204073 on slot 0, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> start processing event #1142531, run #204073 on slot 0, 32 events processed so far <<<===
+AthenaHiveEventLoopMgr 32 2 INFO ===>>> done processing event #1139927, run #204073 on slot 2, 33 events processed so far <<<===
AthenaHiveEventLoopMgr 33 1 INFO ===>>> done processing event #1141197, run #204073 on slot 1, 34 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 1 INFO ===>>> start processing event #1139958, run #204073 on slot 1, 34 events processed so far <<<===
-AthenaHiveEventLoopMgr 34 2 INFO ===>>> done processing event #1140039, run #204073 on slot 2, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 2 INFO ===>>> start processing event #1143765, run #204073 on slot 2, 35 events processed so far <<<===
-AthenaHiveEventLoopMgr 35 3 INFO ===>>> done processing event #1142531, run #204073 on slot 3, 36 events processed so far <<<===
-AthenaHiveEventLoopMgr 36 0 INFO ===>>> done processing event #1139475, run #204073 on slot 0, 37 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 0 INFO ===>>> start processing event #1143097, run #204073 on slot 0, 37 events processed so far <<<===
-AthenaHiveEventLoopMgr 40 3 INFO ===>>> start processing event #1134147, run #204073 on slot 3, 37 events processed so far <<<===
-AthenaHiveEventLoopMgr 38 2 INFO ===>>> done processing event #1143765, run #204073 on slot 2, 38 events processed so far <<<===
-AthenaHiveEventLoopMgr 37 1 INFO ===>>> done processing event #1139958, run #204073 on slot 1, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 41 1 INFO ===>>> start processing event #1137156, run #204073 on slot 1, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> start processing event #1136377, run #204073 on slot 2, 39 events processed so far <<<===
-AthenaHiveEventLoopMgr 39 0 INFO ===>>> done processing event #1143097, run #204073 on slot 0, 40 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 0 INFO ===>>> start processing event #1137842, run #204073 on slot 0, 40 events processed so far <<<===
-AthenaHiveEventLoopMgr 40 3 INFO ===>>> done processing event #1134147, run #204073 on slot 3, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 44 3 INFO ===>>> start processing event #1141705, run #204073 on slot 3, 41 events processed so far <<<===
-AthenaHiveEventLoopMgr 41 1 INFO ===>>> done processing event #1137156, run #204073 on slot 1, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 1 INFO ===>>> start processing event #1143410, run #204073 on slot 1, 42 events processed so far <<<===
-AthenaHiveEventLoopMgr 42 2 INFO ===>>> done processing event #1136377, run #204073 on slot 2, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> start processing event #1144170, run #204073 on slot 2, 43 events processed so far <<<===
-AthenaHiveEventLoopMgr 44 3 INFO ===>>> done processing event #1141705, run #204073 on slot 3, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> start processing event #1139475, run #204073 on slot 1, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> start processing event #1139958, run #204073 on slot 2, 34 events processed so far <<<===
+AthenaHiveEventLoopMgr 34 3 INFO ===>>> done processing event #1140039, run #204073 on slot 3, 35 events processed so far <<<===
+AthenaHiveEventLoopMgr 35 0 INFO ===>>> done processing event #1142531, run #204073 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> start processing event #1143765, run #204073 on slot 0, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 3 INFO ===>>> start processing event #1143097, run #204073 on slot 3, 36 events processed so far <<<===
+AthenaHiveEventLoopMgr 36 1 INFO ===>>> done processing event #1139475, run #204073 on slot 1, 37 events processed so far <<<===
+AthenaHiveEventLoopMgr 37 2 INFO ===>>> done processing event #1139958, run #204073 on slot 2, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 1 INFO ===>>> start processing event #1134147, run #204073 on slot 1, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 2 INFO ===>>> start processing event #1137156, run #204073 on slot 2, 38 events processed so far <<<===
+AthenaHiveEventLoopMgr 38 0 INFO ===>>> done processing event #1143765, run #204073 on slot 0, 39 events processed so far <<<===
+AthenaHiveEventLoopMgr 39 3 INFO ===>>> done processing event #1143097, run #204073 on slot 3, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 0 INFO ===>>> start processing event #1136377, run #204073 on slot 0, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 3 INFO ===>>> start processing event #1137842, run #204073 on slot 3, 40 events processed so far <<<===
+AthenaHiveEventLoopMgr 40 1 INFO ===>>> done processing event #1134147, run #204073 on slot 1, 41 events processed so far <<<===
+AthenaHiveEventLoopMgr 41 2 INFO ===>>> done processing event #1137156, run #204073 on slot 2, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 1 INFO ===>>> start processing event #1141705, run #204073 on slot 1, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 2 INFO ===>>> start processing event #1143410, run #204073 on slot 2, 42 events processed so far <<<===
+AthenaHiveEventLoopMgr 42 0 INFO ===>>> done processing event #1136377, run #204073 on slot 0, 43 events processed so far <<<===
+AthenaHiveEventLoopMgr 43 3 INFO ===>>> done processing event #1137842, run #204073 on slot 3, 44 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 0 INFO ===>>> start processing event #1144170, run #204073 on slot 0, 44 events processed so far <<<===
AthenaHiveEventLoopMgr 47 3 INFO ===>>> start processing event #1145987, run #204073 on slot 3, 44 events processed so far <<<===
-AthenaHiveEventLoopMgr 43 0 INFO ===>>> done processing event #1137842, run #204073 on slot 0, 45 events processed so far <<<===
-AthenaHiveEventLoopMgr 45 1 INFO ===>>> done processing event #1143410, run #204073 on slot 1, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 48 0 INFO ===>>> start processing event #1145633, run #204073 on slot 0, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 1 INFO ===>>> start processing event #1135005, run #204073 on slot 1, 46 events processed so far <<<===
-AthenaHiveEventLoopMgr 46 2 INFO ===>>> done processing event #1144170, run #204073 on slot 2, 47 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 2 INFO ===>>> start processing event #1142167, run #204073 on slot 2, 47 events processed so far <<<===
+AthenaHiveEventLoopMgr 44 1 INFO ===>>> done processing event #1141705, run #204073 on slot 1, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> start processing event #1145633, run #204073 on slot 1, 45 events processed so far <<<===
+AthenaHiveEventLoopMgr 45 2 INFO ===>>> done processing event #1143410, run #204073 on slot 2, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> start processing event #1135005, run #204073 on slot 2, 46 events processed so far <<<===
+AthenaHiveEventLoopMgr 46 0 INFO ===>>> done processing event #1144170, run #204073 on slot 0, 47 events processed so far <<<===
AthenaHiveEventLoopMgr 47 3 INFO ===>>> done processing event #1145987, run #204073 on slot 3, 48 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> start processing event #1142167, run #204073 on slot 0, 48 events processed so far <<<===
AthenaHiveEventLoopMgr 51 3 INFO ===>>> start processing event #1144646, run #204073 on slot 3, 48 events processed so far <<<===
-AthenaHiveEventLoopMgr 49 1 INFO ===>>> done processing event #1135005, run #204073 on slot 1, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 1 INFO ===>>> start processing event #1145027, run #204073 on slot 1, 49 events processed so far <<<===
-AthenaHiveEventLoopMgr 48 0 INFO ===>>> done processing event #1145633, run #204073 on slot 0, 50 events processed so far <<<===
-AthenaHiveEventLoopMgr 50 2 INFO ===>>> done processing event #1142167, run #204073 on slot 2, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 0 INFO ===>>> start processing event #1144112, run #204073 on slot 0, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 2 INFO ===>>> start processing event #1138485, run #204073 on slot 2, 51 events processed so far <<<===
-AthenaHiveEventLoopMgr 52 1 INFO ===>>> done processing event #1145027, run #204073 on slot 1, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 55 1 INFO ===>>> start processing event #1144565, run #204073 on slot 1, 52 events processed so far <<<===
-AthenaHiveEventLoopMgr 51 3 INFO ===>>> done processing event #1144646, run #204073 on slot 3, 53 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 3 INFO ===>>> start processing event #1139498, run #204073 on slot 3, 53 events processed so far <<<===
-AthenaHiveEventLoopMgr 54 2 INFO ===>>> done processing event #1138485, run #204073 on slot 2, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 48 1 INFO ===>>> done processing event #1145633, run #204073 on slot 1, 49 events processed so far <<<===
+AthenaHiveEventLoopMgr 49 2 INFO ===>>> done processing event #1135005, run #204073 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 1 INFO ===>>> start processing event #1145027, run #204073 on slot 1, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 2 INFO ===>>> start processing event #1144112, run #204073 on slot 2, 50 events processed so far <<<===
+AthenaHiveEventLoopMgr 50 0 INFO ===>>> done processing event #1142167, run #204073 on slot 0, 51 events processed so far <<<===
+AthenaHiveEventLoopMgr 51 3 INFO ===>>> done processing event #1144646, run #204073 on slot 3, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 0 INFO ===>>> start processing event #1138485, run #204073 on slot 0, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 3 INFO ===>>> start processing event #1144565, run #204073 on slot 3, 52 events processed so far <<<===
+AthenaHiveEventLoopMgr 52 1 INFO ===>>> done processing event #1145027, run #204073 on slot 1, 53 events processed so far <<<===
+AthenaHiveEventLoopMgr 53 2 INFO ===>>> done processing event #1144112, run #204073 on slot 2, 54 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 1 INFO ===>>> start processing event #1139498, run #204073 on slot 1, 54 events processed so far <<<===
AthenaHiveEventLoopMgr 57 2 INFO ===>>> start processing event #1136546, run #204073 on slot 2, 54 events processed so far <<<===
-AthenaHiveEventLoopMgr 53 0 INFO ===>>> done processing event #1144112, run #204073 on slot 0, 55 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 0 INFO ===>>> start processing event #1143799, run #204073 on slot 0, 55 events processed so far <<<===
-AthenaHiveEventLoopMgr 56 3 INFO ===>>> done processing event #1139498, run #204073 on slot 3, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 54 0 INFO ===>>> done processing event #1138485, run #204073 on slot 0, 55 events processed so far <<<===
+AthenaHiveEventLoopMgr 55 3 INFO ===>>> done processing event #1144565, run #204073 on slot 3, 56 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 0 INFO ===>>> start processing event #1143799, run #204073 on slot 0, 56 events processed so far <<<===
AthenaHiveEventLoopMgr 59 3 INFO ===>>> start processing event #1142877, run #204073 on slot 3, 56 events processed so far <<<===
-AthenaHiveEventLoopMgr 55 1 INFO ===>>> done processing event #1144565, run #204073 on slot 1, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 60 1 INFO ===>>> start processing event #1149894, run #204073 on slot 1, 57 events processed so far <<<===
-AthenaHiveEventLoopMgr 58 0 INFO ===>>> done processing event #1143799, run #204073 on slot 0, 58 events processed so far <<<===
-AthenaHiveEventLoopMgr 57 2 INFO ===>>> done processing event #1136546, run #204073 on slot 2, 59 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 0 INFO ===>>> start processing event #1145364, run #204073 on slot 0, 59 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 2 INFO ===>>> start processing event #1143770, run #204073 on slot 2, 59 events processed so far <<<===
+AthenaHiveEventLoopMgr 56 1 INFO ===>>> done processing event #1139498, run #204073 on slot 1, 57 events processed so far <<<===
+AthenaHiveEventLoopMgr 57 2 INFO ===>>> done processing event #1136546, run #204073 on slot 2, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 60 1 INFO ===>>> start processing event #1149894, run #204073 on slot 1, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> start processing event #1145364, run #204073 on slot 2, 58 events processed so far <<<===
+AthenaHiveEventLoopMgr 58 0 INFO ===>>> done processing event #1143799, run #204073 on slot 0, 59 events processed so far <<<===
AthenaHiveEventLoopMgr 59 3 INFO ===>>> done processing event #1142877, run #204073 on slot 3, 60 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> start processing event #1143770, run #204073 on slot 0, 60 events processed so far <<<===
AthenaHiveEventLoopMgr 63 3 INFO ===>>> start processing event #1148361, run #204073 on slot 3, 60 events processed so far <<<===
AthenaHiveEventLoopMgr 60 1 INFO ===>>> done processing event #1149894, run #204073 on slot 1, 61 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 1 INFO ===>>> start processing event #1148167, run #204073 on slot 1, 61 events processed so far <<<===
-AthenaHiveEventLoopMgr 61 0 INFO ===>>> done processing event #1145364, run #204073 on slot 0, 62 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 0 INFO ===>>> start processing event #1138948, run #204073 on slot 0, 62 events processed so far <<<===
-AthenaHiveEventLoopMgr 62 2 INFO ===>>> done processing event #1143770, run #204073 on slot 2, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> start processing event #1144808, run #204073 on slot 2, 63 events processed so far <<<===
-AthenaHiveEventLoopMgr 64 1 INFO ===>>> done processing event #1148167, run #204073 on slot 1, 64 events processed so far <<<===
-AthenaHiveEventLoopMgr 63 3 INFO ===>>> done processing event #1148361, run #204073 on slot 3, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 1 INFO ===>>> start processing event #1145832, run #204073 on slot 1, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 3 INFO ===>>> start processing event #1153100, run #204073 on slot 3, 65 events processed so far <<<===
-AthenaHiveEventLoopMgr 66 2 INFO ===>>> done processing event #1144808, run #204073 on slot 2, 66 events processed so far <<<===
-AthenaHiveEventLoopMgr 65 0 INFO ===>>> done processing event #1138948, run #204073 on slot 0, 67 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 0 INFO ===>>> start processing event #1142524, run #204073 on slot 0, 67 events processed so far <<<===
-AthenaHiveEventLoopMgr 70 2 INFO ===>>> start processing event #1138294, run #204073 on slot 2, 67 events processed so far <<<===
-AthenaHiveEventLoopMgr 68 3 INFO ===>>> done processing event #1153100, run #204073 on slot 3, 68 events processed so far <<<===
-AthenaHiveEventLoopMgr 67 1 INFO ===>>> done processing event #1145832, run #204073 on slot 1, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 71 1 INFO ===>>> start processing event #1138350, run #204073 on slot 1, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 3 INFO ===>>> start processing event #1149424, run #204073 on slot 3, 69 events processed so far <<<===
-AthenaHiveEventLoopMgr 70 2 INFO ===>>> done processing event #1138294, run #204073 on slot 2, 70 events processed so far <<<===
-AthenaHiveEventLoopMgr 69 0 INFO ===>>> done processing event #1142524, run #204073 on slot 0, 71 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 0 INFO ===>>> start processing event #1151102, run #204073 on slot 0, 71 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 2 INFO ===>>> start processing event #1152242, run #204073 on slot 2, 71 events processed so far <<<===
-AthenaHiveEventLoopMgr 71 1 INFO ===>>> done processing event #1138350, run #204073 on slot 1, 72 events processed so far <<<===
-AthenaHiveEventLoopMgr 72 3 INFO ===>>> done processing event #1149424, run #204073 on slot 3, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 1 INFO ===>>> start processing event #1148416, run #204073 on slot 1, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 3 INFO ===>>> start processing event #1142753, run #204073 on slot 3, 73 events processed so far <<<===
-AthenaHiveEventLoopMgr 73 0 INFO ===>>> done processing event #1151102, run #204073 on slot 0, 74 events processed so far <<<===
-AthenaHiveEventLoopMgr 74 2 INFO ===>>> done processing event #1152242, run #204073 on slot 2, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 0 INFO ===>>> start processing event #1149997, run #204073 on slot 0, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 2 INFO ===>>> start processing event #1151617, run #204073 on slot 2, 75 events processed so far <<<===
-AthenaHiveEventLoopMgr 75 1 INFO ===>>> done processing event #1148416, run #204073 on slot 1, 76 events processed so far <<<===
-AthenaHiveEventLoopMgr 76 3 INFO ===>>> done processing event #1142753, run #204073 on slot 3, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 1 INFO ===>>> start processing event #1149794, run #204073 on slot 1, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 3 INFO ===>>> start processing event #1152504, run #204073 on slot 3, 77 events processed so far <<<===
-AthenaHiveEventLoopMgr 77 0 INFO ===>>> done processing event #1149997, run #204073 on slot 0, 78 events processed so far <<<===
-AthenaHiveEventLoopMgr 78 2 INFO ===>>> done processing event #1151617, run #204073 on slot 2, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 0 INFO ===>>> start processing event #1142485, run #204073 on slot 0, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 2 INFO ===>>> start processing event #1151364, run #204073 on slot 2, 79 events processed so far <<<===
-AthenaHiveEventLoopMgr 79 1 INFO ===>>> done processing event #1149794, run #204073 on slot 1, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 1 INFO ===>>> start processing event #1143901, run #204073 on slot 1, 80 events processed so far <<<===
-AthenaHiveEventLoopMgr 80 3 INFO ===>>> done processing event #1152504, run #204073 on slot 3, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 3 INFO ===>>> start processing event #1153979, run #204073 on slot 3, 81 events processed so far <<<===
-AthenaHiveEventLoopMgr 81 0 INFO ===>>> done processing event #1142485, run #204073 on slot 0, 82 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 0 INFO ===>>> start processing event #1150212, run #204073 on slot 0, 82 events processed so far <<<===
-AthenaHiveEventLoopMgr 82 2 INFO ===>>> done processing event #1151364, run #204073 on slot 2, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 2 INFO ===>>> start processing event #1152633, run #204073 on slot 2, 83 events processed so far <<<===
-AthenaHiveEventLoopMgr 83 1 INFO ===>>> done processing event #1143901, run #204073 on slot 1, 84 events processed so far <<<===
-AthenaHiveEventLoopMgr 84 3 INFO ===>>> done processing event #1153979, run #204073 on slot 3, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 1 INFO ===>>> start processing event #1155482, run #204073 on slot 1, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 3 INFO ===>>> start processing event #1150472, run #204073 on slot 3, 85 events processed so far <<<===
-AthenaHiveEventLoopMgr 86 2 INFO ===>>> done processing event #1152633, run #204073 on slot 2, 86 events processed so far <<<===
-AthenaHiveEventLoopMgr 85 0 INFO ===>>> done processing event #1150212, run #204073 on slot 0, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 0 INFO ===>>> start processing event #1140275, run #204073 on slot 0, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 2 INFO ===>>> start processing event #1145882, run #204073 on slot 2, 87 events processed so far <<<===
-AthenaHiveEventLoopMgr 87 1 INFO ===>>> done processing event #1155482, run #204073 on slot 1, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 1 INFO ===>>> start processing event #1151732, run #204073 on slot 1, 88 events processed so far <<<===
-AthenaHiveEventLoopMgr 88 3 INFO ===>>> done processing event #1150472, run #204073 on slot 3, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 3 INFO ===>>> start processing event #1137896, run #204073 on slot 3, 89 events processed so far <<<===
-AthenaHiveEventLoopMgr 90 2 INFO ===>>> done processing event #1145882, run #204073 on slot 2, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 61 2 INFO ===>>> done processing event #1145364, run #204073 on slot 2, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 1 INFO ===>>> start processing event #1148167, run #204073 on slot 1, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 2 INFO ===>>> start processing event #1138948, run #204073 on slot 2, 62 events processed so far <<<===
+AthenaHiveEventLoopMgr 62 0 INFO ===>>> done processing event #1143770, run #204073 on slot 0, 63 events processed so far <<<===
+AthenaHiveEventLoopMgr 63 3 INFO ===>>> done processing event #1148361, run #204073 on slot 3, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 0 INFO ===>>> start processing event #1144808, run #204073 on slot 0, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> start processing event #1145832, run #204073 on slot 3, 64 events processed so far <<<===
+AthenaHiveEventLoopMgr 64 1 INFO ===>>> done processing event #1148167, run #204073 on slot 1, 65 events processed so far <<<===
+AthenaHiveEventLoopMgr 65 2 INFO ===>>> done processing event #1138948, run #204073 on slot 2, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 1 INFO ===>>> start processing event #1153100, run #204073 on slot 1, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 2 INFO ===>>> start processing event #1142524, run #204073 on slot 2, 66 events processed so far <<<===
+AthenaHiveEventLoopMgr 66 0 INFO ===>>> done processing event #1144808, run #204073 on slot 0, 67 events processed so far <<<===
+AthenaHiveEventLoopMgr 67 3 INFO ===>>> done processing event #1145832, run #204073 on slot 3, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 0 INFO ===>>> start processing event #1138294, run #204073 on slot 0, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 3 INFO ===>>> start processing event #1138350, run #204073 on slot 3, 68 events processed so far <<<===
+AthenaHiveEventLoopMgr 68 1 INFO ===>>> done processing event #1153100, run #204073 on slot 1, 69 events processed so far <<<===
+AthenaHiveEventLoopMgr 69 2 INFO ===>>> done processing event #1142524, run #204073 on slot 2, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> start processing event #1149424, run #204073 on slot 1, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> start processing event #1151102, run #204073 on slot 2, 70 events processed so far <<<===
+AthenaHiveEventLoopMgr 70 0 INFO ===>>> done processing event #1138294, run #204073 on slot 0, 71 events processed so far <<<===
+AthenaHiveEventLoopMgr 71 3 INFO ===>>> done processing event #1138350, run #204073 on slot 3, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> start processing event #1152242, run #204073 on slot 0, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 3 INFO ===>>> start processing event #1148416, run #204073 on slot 3, 72 events processed so far <<<===
+AthenaHiveEventLoopMgr 72 1 INFO ===>>> done processing event #1149424, run #204073 on slot 1, 73 events processed so far <<<===
+AthenaHiveEventLoopMgr 73 2 INFO ===>>> done processing event #1151102, run #204073 on slot 2, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 1 INFO ===>>> start processing event #1142753, run #204073 on slot 1, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 2 INFO ===>>> start processing event #1149997, run #204073 on slot 2, 74 events processed so far <<<===
+AthenaHiveEventLoopMgr 74 0 INFO ===>>> done processing event #1152242, run #204073 on slot 0, 75 events processed so far <<<===
+AthenaHiveEventLoopMgr 75 3 INFO ===>>> done processing event #1148416, run #204073 on slot 3, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 0 INFO ===>>> start processing event #1151617, run #204073 on slot 0, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 3 INFO ===>>> start processing event #1149794, run #204073 on slot 3, 76 events processed so far <<<===
+AthenaHiveEventLoopMgr 76 1 INFO ===>>> done processing event #1142753, run #204073 on slot 1, 77 events processed so far <<<===
+AthenaHiveEventLoopMgr 77 2 INFO ===>>> done processing event #1149997, run #204073 on slot 2, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 1 INFO ===>>> start processing event #1152504, run #204073 on slot 1, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 2 INFO ===>>> start processing event #1142485, run #204073 on slot 2, 78 events processed so far <<<===
+AthenaHiveEventLoopMgr 78 0 INFO ===>>> done processing event #1151617, run #204073 on slot 0, 79 events processed so far <<<===
+AthenaHiveEventLoopMgr 79 3 INFO ===>>> done processing event #1149794, run #204073 on slot 3, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 0 INFO ===>>> start processing event #1151364, run #204073 on slot 0, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 3 INFO ===>>> start processing event #1143901, run #204073 on slot 3, 80 events processed so far <<<===
+AthenaHiveEventLoopMgr 80 1 INFO ===>>> done processing event #1152504, run #204073 on slot 1, 81 events processed so far <<<===
+AthenaHiveEventLoopMgr 81 2 INFO ===>>> done processing event #1142485, run #204073 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> start processing event #1153979, run #204073 on slot 1, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> start processing event #1150212, run #204073 on slot 2, 82 events processed so far <<<===
+AthenaHiveEventLoopMgr 82 0 INFO ===>>> done processing event #1151364, run #204073 on slot 0, 83 events processed so far <<<===
+AthenaHiveEventLoopMgr 83 3 INFO ===>>> done processing event #1143901, run #204073 on slot 3, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> start processing event #1152633, run #204073 on slot 0, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 3 INFO ===>>> start processing event #1155482, run #204073 on slot 3, 84 events processed so far <<<===
+AthenaHiveEventLoopMgr 84 1 INFO ===>>> done processing event #1153979, run #204073 on slot 1, 85 events processed so far <<<===
+AthenaHiveEventLoopMgr 85 2 INFO ===>>> done processing event #1150212, run #204073 on slot 2, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 1 INFO ===>>> start processing event #1150472, run #204073 on slot 1, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 2 INFO ===>>> start processing event #1140275, run #204073 on slot 2, 86 events processed so far <<<===
+AthenaHiveEventLoopMgr 86 0 INFO ===>>> done processing event #1152633, run #204073 on slot 0, 87 events processed so far <<<===
+AthenaHiveEventLoopMgr 87 3 INFO ===>>> done processing event #1155482, run #204073 on slot 3, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 0 INFO ===>>> start processing event #1145882, run #204073 on slot 0, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 3 INFO ===>>> start processing event #1151732, run #204073 on slot 3, 88 events processed so far <<<===
+AthenaHiveEventLoopMgr 88 1 INFO ===>>> done processing event #1150472, run #204073 on slot 1, 89 events processed so far <<<===
+AthenaHiveEventLoopMgr 89 2 INFO ===>>> done processing event #1140275, run #204073 on slot 2, 90 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 1 INFO ===>>> start processing event #1137896, run #204073 on slot 1, 90 events processed so far <<<===
AthenaHiveEventLoopMgr 93 2 INFO ===>>> start processing event #1156381, run #204073 on slot 2, 90 events processed so far <<<===
-AthenaHiveEventLoopMgr 89 0 INFO ===>>> done processing event #1140275, run #204073 on slot 0, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 94 0 INFO ===>>> start processing event #1149161, run #204073 on slot 0, 91 events processed so far <<<===
-AthenaHiveEventLoopMgr 92 3 INFO ===>>> done processing event #1137896, run #204073 on slot 3, 92 events processed so far <<<===
-AthenaHiveEventLoopMgr 91 1 INFO ===>>> done processing event #1151732, run #204073 on slot 1, 93 events processed so far <<<===
+AthenaHiveEventLoopMgr 90 0 INFO ===>>> done processing event #1145882, run #204073 on slot 0, 91 events processed so far <<<===
+AthenaHiveEventLoopMgr 91 3 INFO ===>>> done processing event #1151732, run #204073 on slot 3, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 94 0 INFO ===>>> start processing event #1149161, run #204073 on slot 0, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 3 INFO ===>>> start processing event #1153794, run #204073 on slot 3, 92 events processed so far <<<===
+AthenaHiveEventLoopMgr 92 1 INFO ===>>> done processing event #1137896, run #204073 on slot 1, 93 events processed so far <<<===
AthenaHiveEventLoopMgr 93 2 INFO ===>>> done processing event #1156381, run #204073 on slot 2, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 1 INFO ===>>> start processing event #1153794, run #204073 on slot 1, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 2 INFO ===>>> start processing event #1151312, run #204073 on slot 2, 94 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 3 INFO ===>>> start processing event #1148893, run #204073 on slot 3, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> start processing event #1151312, run #204073 on slot 1, 94 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> start processing event #1148893, run #204073 on slot 2, 94 events processed so far <<<===
AthenaHiveEventLoopMgr 94 0 INFO ===>>> done processing event #1149161, run #204073 on slot 0, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #1156938, run #204073 on slot 0, 95 events processed so far <<<===
-AthenaHiveEventLoopMgr 95 1 INFO ===>>> done processing event #1153794, run #204073 on slot 1, 96 events processed so far <<<===
-AthenaHiveEventLoopMgr 96 2 INFO ===>>> done processing event #1151312, run #204073 on slot 2, 97 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 1 INFO ===>>> start processing event #1156351, run #204073 on slot 1, 97 events processed so far <<<===
-AthenaHiveEventLoopMgr 97 3 INFO ===>>> done processing event #1148893, run #204073 on slot 3, 98 events processed so far <<<===
+AthenaHiveEventLoopMgr 95 3 INFO ===>>> done processing event #1153794, run #204073 on slot 3, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 98 0 INFO ===>>> start processing event #1156938, run #204073 on slot 0, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 3 INFO ===>>> start processing event #1156351, run #204073 on slot 3, 96 events processed so far <<<===
+AthenaHiveEventLoopMgr 96 1 INFO ===>>> done processing event #1151312, run #204073 on slot 1, 97 events processed so far <<<===
+AthenaHiveEventLoopMgr 97 2 INFO ===>>> done processing event #1148893, run #204073 on slot 2, 98 events processed so far <<<===
AthenaHiveEventLoopMgr 98 0 INFO ===>>> done processing event #1156938, run #204073 on slot 0, 99 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 1 INFO ===>>> done processing event #1156351, run #204073 on slot 1, 100 events processed so far <<<===
-AthenaHiveEventLoopMgr 99 1 INFO ---> Loop Finished (seconds): 4.85674
+AthenaHiveEventLoopMgr 99 3 INFO ===>>> done processing event #1156351, run #204073 on slot 3, 100 events processed so far <<<===
+AthenaHiveEventLoopMgr 99 3 INFO ---> Loop Finished (seconds): 6.487
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
/cvmfs/atlas-condb.cern.ch/repo/condi... INFO Database being retired...
@@ -1263,7 +1255,7 @@ AvalancheSchedulerSvc INFO Joining Scheduler threa
PyComponentMgr INFO Finalizing PyComponentMgr...
EventDataSvc INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.19 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
@@ -1275,7 +1267,7 @@ IOVDbFolder INFO Folder /TILE/OFL02/NOIS
IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.08 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.22 ))s
IOVDbSvc INFO bytes in (( 0.26 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.26 ))s
@@ -1289,9 +1281,9 @@ ToolSvc.ByteStreamMetadataTool INFO in finalize()
*****Chrono***** INFO WARNING: MT job; statistics are unreliable
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 260 [ms] Ave/Min/Max= 130(+- 130)/ 0/ 260 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 300 [ms] Ave/Min/Max= 150(+- 130)/ 20/ 280 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 13.7 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 490 [ms] Ave/Min/Max= 245(+- 235)/ 10/ 480 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 0.54 [s] Ave/Min/Max= 0.27(+- 0.24)/ 0.03/ 0.51 [s] #= 2
+ChronoStatSvc INFO Time User : Tot= 15.2 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.finalize() INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index d31f7ad43ae12699105ebcb2f9c8d3caa017c337..0a22186ef95fc34d6c1907f190aaacda932a0f33 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -5,7 +5,7 @@
284500 87473032 30 33 4 1 10 4 6 5 2 3
284500 87473037 62 39 7 0 12 2 10 6 4 2
284500 87473040 107 97 10 0 17 1 16 10 5 5
- 284500 87473051 140 112 11 1 15 1 14 23 16 7
+ 284500 87473051 140 112 11 1 16 1 15 23 16 7
284500 87473063 62 76 5 2 7 1 6 6 4 2
284500 87473068 25 34 1 1 0 0 0 0 0 0
284500 87473075 60 85 6 0 5 0 5 6 5 1
@@ -13,14 +13,14 @@
284500 87473091 41 49 3 0 4 2 2 4 2 2
284500 87473096 66 75 3 2 3 0 3 4 3 1
284500 87473104 64 63 6 0 5 1 4 4 3 1
- 284500 87473114 89 80 7 2 12 1 11 9 6 3
+ 284500 87473114 89 79 7 2 12 1 11 9 6 3
284500 87473121 93 100 6 3 15 3 12 7 6 1
284500 87473132 84 57 9 1 12 0 12 3 3 0
284500 87473137 94 70 8 3 15 0 15 8 8 0
284500 87473144 78 67 7 1 8 2 6 8 6 2
- 284500 87473154 86 89 7 0 13 2 11 9 4 5
+ 284500 87473154 86 89 7 0 14 3 11 9 4 5
284500 87473162 53 52 4 0 7 0 7 3 2 1
- 284500 87473167 77 54 6 3 13 2 11 13 8 5
+ 284500 87473167 77 54 6 3 14 2 12 13 8 5
284500 87473171 77 69 8 4 4 2 2 5 4 1
284500 87473184 75 86 5 2 8 1 7 5 3 2
284500 87473192 55 52 4 1 8 4 4 4 3 1
diff --git a/Tools/PROCTools/python/RunTier0Tests.py b/Tools/PROCTools/python/RunTier0Tests.py
index 46273f15dff3ea21cb51fc032385ad7af2f5fe24..b433b25b798d227a79919a6ff5e00db21251ac9e 100755
--- a/Tools/PROCTools/python/RunTier0Tests.py
+++ b/Tools/PROCTools/python/RunTier0Tests.py
@@ -299,11 +299,12 @@ def QTestsFailedOrPassed(q,qTestsToRun,CleanRunHeadDir,UniqID,RunPatchedOnly=Fal
############### Run Frozen Tier0 Policy Test
-def RunFrozenTier0PolicyTest(q,inputFormat,maxEvents,CleanRunHeadDir,UniqID,RunPatchedOnly=False):
+def RunFrozenTier0PolicyTest(q,inputFormat,maxEvents,CleanRunHeadDir,UniqID,DiffExclusionListsDir,RunPatchedOnly=False):
logging.info("---------------------------------------------------------------------------------------" )
logging.info("Running "+q+" Frozen Tier0 Policy Test on "+inputFormat+" for "+str(maxEvents)+" events" )
clean_dir = CleanRunHeadDir+"/clean_run_"+q+"_"+UniqID
+ diff_rules_file = DiffExclusionListsDir
if RunPatchedOnly: #overwrite
# Resolve the subfolder first. Results are stored like: main_folder/q-test/branch/version/.
@@ -311,16 +312,32 @@ def RunFrozenTier0PolicyTest(q,inputFormat,maxEvents,CleanRunHeadDir,UniqID,RunP
subfolder = os.environ['AtlasVersion'][0:4]
# Use EOS if mounted, otherwise CVMFS
clean_dir = '/eos/atlas/atlascerngroupdisk/data-art/grid-input/Tier0ChainTests/{0}/{1}/{2}'.format(q,subfolder,ciRefFileMap['{0}-{1}'.format(q,subfolder)])
+ diff_rules_file = '/eos/atlas/atlascerngroupdisk/data-art/grid-input/Tier0ChainTests/{0}/{1}'.format(q,subfolder)
if(glob.glob(clean_dir)):
logging.info("EOS is mounted, going to read the reference files from there instead of CVMFS")
clean_dir = 'root://eosatlas.cern.ch/'+clean_dir # In case outside CERN
else:
logging.info("EOS is not mounted, going to read the reference files from CVMFS")
clean_dir = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/{0}/{1}/{2}'.format(q,subfolder,ciRefFileMap['{0}-{1}'.format(q,subfolder)])
+ diff_rules_file = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/grid-input/Tier0ChainTests/{0}/{1}'.format(q,subfolder)
+
+ diff_rules_file += "/"+q+"_"+inputFormat+"_diff-exclusion-list.txt"
logging.info("Reading the reference file from location "+clean_dir)
- comparison_command = "acmd.py diff-root "+clean_dir+"/my"+inputFormat+".pool.root run_"+q+"/my"+inputFormat+".pool.root --error-mode resilient --ignore-leaves index_ref RecoTimingObj_p1_EVNTtoHITS_timings RecoTimingObj_p1_HITStoRDO_timings RecoTimingObj_p1_RAWtoESD_mems RecoTimingObj_p1_RAWtoESD_timings RecoTimingObj_p1_RAWtoALL_mems RecoTimingObj_p1_RAWtoALL_timings RAWtoALL_mems RAWtoALL_timings RAWtoESD_mems RAWtoESD_timings ESDtoAOD_mems ESDtoAOD_timings HITStoRDO_mems HITStoRDO_timings --entries "+str(maxEvents)+" > run_"+q+"/diff-root-"+q+"."+inputFormat+".log 2>&1"
+ if os.path.exists(diff_rules_file):
+ logging.info("Reading the diff rules file from location "+diff_rules_file)
+ exclusion_list = []
+ with open(diff_rules_file) as f:
+ for line in f:
+ exclusion_list.append('"'+line.rstrip()+'"')
+ else:
+ logging.info("No diff rules file exists, using the default list")
+ exclusion_list = ['"index_ref"', '"(.*)_timings$"', '"(.*)_mems$"']
+
+ exclusion_list = ' '.join(exclusion_list)
+
+ comparison_command = "acmd.py diff-root "+clean_dir+"/my"+inputFormat+".pool.root run_"+q+"/my"+inputFormat+".pool.root -v --error-mode resilient --ignore-leaves "+exclusion_list+" --entries "+str(maxEvents)+" > run_"+q+"/diff-root-"+q+"."+inputFormat+".log 2>&1"
output,error = subprocess.Popen(['/bin/bash', '-c', comparison_command], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
output,error = output.decode('utf-8'), error.decode('utf-8')
@@ -568,6 +585,14 @@ def main():
dest="ci_flag",
default=False,
help="no-setup will not setup athena - only for CI tests!")
+ parser.add_option("-z",
+ "--diffExclusionListsDir",
+ type="string",
+ dest="diffExclusionListsDir",
+ default=".",
+ help="""specify the directory that contains the lists of variables that will be omitted while comparing the
+ outputs. The default is ./ and the format of the files is ${q-test}_${format}_diff-exclusion-list.txt, e.g.
+ q431_AOD_diff-exclusion-list.txt.""")
(options,args)=parser.parse_args()
@@ -587,6 +612,7 @@ def main():
r2aMode = options.r2a_flag
trigRun2Config = options.trigRun2Config_flag
ciMode = options.ci_flag
+ DiffExclusionListsDir = options.diffExclusionListsDir
# tct_ESD = "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/rtt/prod/tct/"+latest_nightly+"/"+release+"/"+platform+"/offline/Tier0ChainTests/"+q+"/myESD.pool.root"
@@ -797,26 +823,26 @@ def main():
continue
if RunSim:
- if not RunFrozenTier0PolicyTest(q,"HITS",10,CleanRunHeadDir,UniqName,RunPatchedOnly):
+ if not RunFrozenTier0PolicyTest(q,"HITS",10,CleanRunHeadDir,UniqName,DiffExclusionListsDir,RunPatchedOnly):
All_Tests_Passed = False
elif RunOverlay:
- if not RunFrozenTier0PolicyTest(q,"RDO",10,CleanRunHeadDir,UniqName,RunPatchedOnly):
+ if not RunFrozenTier0PolicyTest(q,"RDO",10,CleanRunHeadDir,UniqName,DiffExclusionListsDir,RunPatchedOnly):
All_Tests_Passed = False
elif RunPileUp:
- if not RunFrozenTier0PolicyTest(q,"AOD",10,CleanRunHeadDir,UniqName,RunPatchedOnly):
+ if not RunFrozenTier0PolicyTest(q,"AOD",10,CleanRunHeadDir,UniqName,DiffExclusionListsDir,RunPatchedOnly):
All_Tests_Passed = False
else:
- if not RunFrozenTier0PolicyTest(q,"ESD",10,CleanRunHeadDir,UniqName,RunPatchedOnly):
+ if not RunFrozenTier0PolicyTest(q,"ESD",10,CleanRunHeadDir,UniqName,DiffExclusionListsDir,RunPatchedOnly):
All_Tests_Passed = False
- if not RunFrozenTier0PolicyTest(q,"AOD",20,CleanRunHeadDir,UniqName,RunPatchedOnly):
+ if not RunFrozenTier0PolicyTest(q,"AOD",20,CleanRunHeadDir,UniqName,DiffExclusionListsDir,RunPatchedOnly):
All_Tests_Passed = False
if RunPatchedOnly:
continue # Performance checks against static references not possible
if 'q221' in q or 'q440' in q:
- if not RunFrozenTier0PolicyTest(q,"RDO",10,CleanRunHeadDir,UniqName):
+ if not RunFrozenTier0PolicyTest(q,"RDO",10,CleanRunHeadDir,UniqName,DiffExclusionListsDir):
All_Tests_Passed = False
if not RunTest(q,qTestsToRun,"CPU Time" ,"evtloop_time" ,"msec/event" ,4,0.4,CleanRunHeadDir,UniqName):
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 75597784c7a5c421c55a2ada4881236bd8cde159..d87f4b5043ce535ab16f5d12b6923054b053aca0 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -17,6 +17,8 @@ ciRefFileMap = {
'q431-21.0' : 'v1',
'q221-21.3' : 'v1',
'q431-21.3' : 'v1',
+ 'q221-22.0' : 'v1',
+ 'q431-22.0' : 'v1',
# SimulationTier0Test_required-test
's3126-21.0' : 'v1',
's3126-21.3' : 'v1',
@@ -28,7 +30,7 @@ ciRefFileMap = {
's3505-22.0' : 'v7',
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v2',
- 'overlay-d1498-22.0' : 'v37',
+ 'overlay-d1498-22.0' : 'v38',
'overlay-bkg-21.0' : 'v1',
'overlay-bkg-22.0' : 'v4',
}
diff --git a/Tools/PathResolver/PathResolver/PathResolver.h b/Tools/PathResolver/PathResolver/PathResolver.h
index 7989bcc0bb6021e004b034d4f4a23930f0d411da..dd9c3980fff053673747be05deea240070be4ecc 100644
--- a/Tools/PathResolver/PathResolver/PathResolver.h
+++ b/Tools/PathResolver/PathResolver/PathResolver.h
@@ -5,7 +5,7 @@
#ifndef PATHRESOLVER_PATHRESOLVER_H
#define PATHRESOLVER_PATHRESOLVER_H
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include <string>
#include <atomic>
diff --git a/Tools/PyJobTransforms/python/trfExe.py b/Tools/PyJobTransforms/python/trfExe.py
index 8c961cee0bf7f0232112c79c05e92e5eb8da345a..a4544e53e31474c93f32dcaf4b0d75ccaf51a152 100755
--- a/Tools/PyJobTransforms/python/trfExe.py
+++ b/Tools/PyJobTransforms/python/trfExe.py
@@ -35,7 +35,7 @@ msg = logging.getLogger(__name__)
from PyJobTransforms.trfJobOptions import JobOptionsTemplate
from PyJobTransforms.trfUtils import asetupReport, unpackDBRelease, setupDBRelease, cvmfsDBReleaseCheck, forceToAlphaNum
-from PyJobTransforms.trfUtils import ValgrindCommand, isInteractiveEnv, calcCpuTime, calcWallTime
+from PyJobTransforms.trfUtils import ValgrindCommand, isInteractiveEnv, calcCpuTime, calcWallTime, analytic
from PyJobTransforms.trfExitCodes import trfExit
from PyJobTransforms.trfLogger import stdLogLevels
from PyJobTransforms.trfMPTools import detectAthenaMPProcs, athenaMPOutputHandler
@@ -180,6 +180,8 @@ class transformExecutor(object):
self._exeStart = self._exeStop = None
self._valStart = self._valStop = None
self._memStats = {}
+ self._memLeakResult = {}
+ self._memFullFile = None
self._eventCount = None
self._athenaMP = None
self._athenaMT = None
@@ -378,6 +380,10 @@ class transformExecutor(object):
def memStats(self):
return self._memStats
+ @property
+ def memAnalysis(self):
+ return self._memLeakResult
+
@property
def postExeCpuTime(self):
if self._exeStop and self._valStart:
@@ -714,6 +720,7 @@ class scriptExecutor(transformExecutor):
if self._memMonitor:
try:
self._memSummaryFile = 'prmon.summary.' + self._name + '.json'
+ self._memFullFile = 'prmon.full.' + self._name
memMonitorCommand = ['prmon', '--pid', str(p.pid), '--filename', 'prmon.full.' + self._name,
'--json-summary', self._memSummaryFile, '--interval', '30']
mem_proc = subprocess.Popen(memMonitorCommand, shell = False, close_fds=True, **encargs)
@@ -761,7 +768,7 @@ class scriptExecutor(transformExecutor):
msg.warning('Failed to load JSON memory summmary file {0}: {1}'.format(self._memSummaryFile, e))
self._memMonitor = False
self._memStats = {}
-
+
def validate(self):
if self._valStart is None:
@@ -1134,7 +1141,9 @@ class athenaExecutor(scriptExecutor):
self.setValStart()
self._hasValidated = True
deferredException = None
-
+ memLeakThreshold = 5000
+ _hasMemLeak = False
+
## Our parent will check the RC for us
try:
super(athenaExecutor, self).validate()
@@ -1142,7 +1151,26 @@ class athenaExecutor(scriptExecutor):
# In this case we hold this exception until the logfile has been scanned
msg.error('Validation of return code failed: {0!s}'.format(e))
deferredException = e
-
+
+ ## Get results of memory monitor analysis (slope and chi2)
+ # the analysis is a linear fit to 'pss' va 'Time' (fit to at least 5 data points)
+ # to obtain a good fit, tails are excluded from data
+ # if the slope of 'pss' is higher than 'memLeakThreshold' and an error is already caught,
+ # a message will be added to the exit message
+ # the memory leak threshold is defined based on analysing several jobs with memory leak,
+ # however it is rather arbitrary and could be modified
+ if self._memFullFile:
+ msg.info('Analysing memory monitor output file {0} for possible memory leak'.format(self._memFullFile))
+ self._memLeakResult = analytic().getFittedData(self._memFullFile)
+ if self._memLeakResult:
+ if self._memLeakResult['slope'] > memLeakThreshold:
+ _hasMemLeak = True
+ msg.warning('Possible memory leak; abnormally high values in memory monitor parameters (ignore this message if the job has finished successfully)')
+ else:
+ msg.warning('Failed to analyse the memory monitor file {0}'.format(self._memFullFile))
+ else:
+ msg.info('No memory monitor file to be analysed')
+
# Logfile scan setup
# Always use ignorePatterns from the command line
# For patterns in files, pefer the command line first, then any special settings for
@@ -1186,6 +1214,9 @@ class athenaExecutor(scriptExecutor):
# Add any logfile information we have
if worstError['nLevel'] >= stdLogLevels['ERROR']:
deferredException.errMsg = deferredException.errMsg + "; {0}".format(exitErrorMessage)
+ # Add the result of memory analysis
+ if _hasMemLeak:
+ deferredException.errMsg = deferredException.errMsg + "; Possible memory leak: 'pss' slope: {0} KB/s".format(self._memLeakResult['slope'])
raise deferredException
@@ -1195,6 +1226,9 @@ class athenaExecutor(scriptExecutor):
elif worstError['nLevel'] >= stdLogLevels['ERROR']:
self._isValidated = False
msg.error('Fatal error in athena logfile (level {0})'.format(worstError['level']))
+ # Add the result of memory analysis
+ if _hasMemLeak:
+ exitErrorMessage = exitErrorMessage + "; Possible memory leak: 'pss' slope: {0} KB/s".format(self._memLeakResult['slope'])
raise trfExceptions.TransformLogfileErrorException(trfExit.nameToCode('TRF_EXEC_LOGERROR'),
'Fatal error in athena logfile: "{0}"'.format(exitErrorMessage))
diff --git a/Tools/PyJobTransforms/python/trfReports.py b/Tools/PyJobTransforms/python/trfReports.py
index b59cf374b7cff1eaf56a643307b666407568e6ca..6f4fc1fa775aa06eed1674882c2e5c9b896e2a96 100644
--- a/Tools/PyJobTransforms/python/trfReports.py
+++ b/Tools/PyJobTransforms/python/trfReports.py
@@ -654,6 +654,8 @@ def exeResourceReport(exe, report):
if exe.memStats:
exeResource['memory'] = exe.memStats
+ if exe.memAnalysis:
+ exeResource['memoryAnalysis'] = exe.memAnalysis
if exe.eventCount:
exeResource['nevents'] = exe.eventCount
if exe.athenaMP:
diff --git a/Tools/PyJobTransforms/python/trfUtils.py b/Tools/PyJobTransforms/python/trfUtils.py
index d1bd9751a18550db17c65e4414d75f7ce44a3439..6bb8596ddcfc52863f256caa0e8ecfaae9ca2894 100644
--- a/Tools/PyJobTransforms/python/trfUtils.py
+++ b/Tools/PyJobTransforms/python/trfUtils.py
@@ -1196,6 +1196,318 @@ class ParallelJobProcessor(object):
))
msg.debug(self.statusReport())
+## @brief Analytics service class
+class analytic():
+
+ _fit = None
+
+ def __init__(self, **kwargs):
+ self._fit = None
+
+ ## Fitting function
+ # For a linear model: y(x) = slope * x + intersect
+ # @param x list of input data (list of floats or ints).
+ # @param y: list of input data (list of floats or ints).
+ # @param model: model name (string).
+ def fit(self, x, y, model='linear'):
+ try:
+ self._fit = Fit(x=x, y=y, model=model)
+ except Exception as e:
+ msg.warning('fit failed! {0}'.format(e))
+
+ return self._fit
+
+ # Return the slope of a linear fit, y(x) = slope * x + intersect
+ def slope(self):
+ slope = None
+
+ if self._fit:
+ slope = self._fit.slope()
+ else:
+ msg.warning('Fit has not been defined')
+
+ return slope
+
+ # Return a properly formatted job metrics string with analytics data.
+ # Currently the function returns a fit for 'pss' vs 'time', whose slope measures memory leaks.
+ # @param filename: memory monitor output file (string).
+ # @param x_name: optional string, name selector for table column.
+ # @param y_name: optional string, name selector for table column.
+ # @param precision: optional precision for fitted slope parameter, default 2.
+ # @param tails: should tails be used? (boolean).
+ # @param minPoints: minimun desired points of data to be fitted (after removing tail)
+ # @return: {"slope": slope, "chi2": chi2}
+ def getFittedData(self, filename, x_name='Time', y_name='pss', precision=2, tails=False, minPoints=5):
+ _memFileToTable = memFileToTable()
+ fitResult = {}
+ table = _memFileToTable.getTable(filename, header=None, separator="\t")
+ if table:
+ # extract data to be fitted
+ x, y = self.extractFromTable(table, x_name, y_name)
+ # remove tails if desired
+ # this is useful e.g. for memory monitor data where the first and last values
+ # represent allocation and de-allocation, ie not interesting
+ # here tail is defined to be first and last 20% of data
+ if not tails:
+ tail = int(len(x)/5)
+ msg.info('removing tails from the memory monitor data; 20% from each side')
+ x = x[tail:]
+ x = x[:-tail]
+ y = y[tail:]
+ y = y[:-tail]
+
+ if len(x)==len(y) and len(x) > minPoints:
+ msg.info('fitting {0} vs {1}'.format(y_name, x_name))
+ try:
+ fit = self.fit(x, y)
+ _slope = self.slope()
+ except Exception as e:
+ msg.warning('failed to fit data, x={0}, y={1}: {2}'.format(x, y, e))
+ else:
+ if _slope:
+ slope = round(fit.slope(), precision)
+ chi2 = round(fit.chi2(), precision)
+ fitResult = {"slope": slope, "chi2": chi2}
+ if slope:
+ HRslope, unit = self.formatBytes(slope)
+ msg.info('slope of the fitted line: {0} {1} (using {2} data points, chi2={3})'.format(HRslope, unit, len(x), chi2))
+ else:
+ msg.warning('wrong length of table data, x={0}, y={1} (must be same and length>={2})'.format(x, y, minPoints))
+
+ return fitResult
+
+ # Extract wanted columns. e.g. x: Time , y: pss+swap
+ # @param x_name: column name to be extracted (string).
+ # @param y_name: column name to be extracted (may contain '+'-sign) (string).
+ # @return: x (list), y (list).
+ def extractFromTable(self, table, x_name, y_name):
+ headerUpperVersion = {'pss':'PSS', 'swap':'Swap', 'rss':'RSS', 'vmem':'VMEM'}
+ x = table.get(x_name, [])
+ if '+' not in y_name:
+ y = table.get(y_name, [])
+ if len(y)==0:
+ y = table.get(headerUpperVersion[y_name], [])
+ else:
+ try:
+ y1_name = y_name.split('+')[0]
+ y2_name = y_name.split('+')[1]
+ y1_value = table.get(y1_name, [])
+ y2_value = table.get(y2_name, [])
+ if len(y1_value)==0 or len(y2_value)==0:
+ y1_value = table.get(headerUpperVersion[y1_name], [])
+ y2_value = table.get(headerUpperVersion[y2_name], [])
+ except Exception as e:
+ msg.warning('exception caught: {0}'.format(e))
+ x = []
+ y = []
+ else:
+ # create new list with added values (1,2,3) + (4,5,6) = (5,7,9)
+ y = [x0 + y0 for x0, y0 in zip(y1_value, y2_value)]
+
+ return x, y
+
+ # Make the result of slope human readable (HR)
+ # default unit is KB
+ def formatBytes(self, size):
+ # decimal system
+ power = 1000
+ n = 1
+ power_labels = {1: 'K', 2: 'M', 3: 'G', 4: 'T'}
+ while size > power:
+ size /= power
+ n += 1
+ return round(size, 2), power_labels[n]+'B/s'
+
+
+## @brief Low-level fitting class
+class Fit():
+ _model = 'linear' # fitting model
+ _x = None # x values
+ _y = None # y values
+ _xm = None # x mean
+ _ym = None # y mean
+ _ss = None # sum of square deviations
+ _ss2 = None # sum of deviations
+ _slope = None # slope
+ _intersect = None # intersect
+ _chi2 = None # chi2
+
+ def __init__(self, **kwargs):
+ # extract parameters
+ self._model = kwargs.get('model', 'linear')
+ self._x = kwargs.get('x', None)
+ self._y = kwargs.get('y', None)
+ self._math = math()
+
+ if not self._x or not self._y:
+ msg.warning('input data not defined')
+
+ if len(self._x) != len(self._y):
+ msg.warning('input data (lists) have different lengths')
+
+ # base calculations
+ if self._model == 'linear':
+ self._ss = self._math.sum_square_dev(self._x)
+ self._ss2 = self._math.sum_dev(self._x, self._y)
+ self.set_slope()
+ self._xm = self._math.mean(self._x)
+ self._ym = self._math.mean(self._y)
+ self.set_intersect()
+ self.set_chi2()
+
+ else:
+ msg.warning("\'{0}\' model is not implemented".format(self._model))
+
+ def fit(self):
+ #Return fitting object.
+ return self
+
+ def value(self, t):
+ #Return the value y(x=t) of a linear fit y(x) = slope * x + intersect.
+ return self._slope * t + self._intersect
+
+ def set_chi2(self):
+ #Calculate and set the chi2 value.
+ y_observed = self._y
+ y_expected = []
+ for x in self._x:
+ y_expected.append(self.value(x))
+ if y_observed and y_observed != [] and y_expected and y_expected != []:
+ self._chi2 = self._math.chi2(y_observed, y_expected)
+ else:
+ self._chi2 = None
+
+ def chi2(self):
+ #Return the chi2 value.
+ return self._chi2
+
+ def set_slope(self):
+ #Calculate and set the slope of the linear fit.
+ if self._ss2 and self._ss and self._ss != 0:
+ self._slope = self._ss2 / self._ss
+ else:
+ self._slope = None
+
+ def slope(self):
+ #Return the slope value.
+ return self._slope
+
+ def set_intersect(self):
+ #Calculate and set the intersect of the linear fit.
+ if self._ym and self._slope and self._xm:
+ self._intersect = self._ym - self._slope * self._xm
+ else:
+ self._intersect = None
+
+ def intersect(self):
+ #Return the intersect value.
+ return self._intersect
+
+
+## @brief some mathematical tools
+class math():
+
+ #Return the sample arithmetic mean of data.
+ def mean(self, data):
+ n = len(data)
+ if n < 1:
+ msg.warning('mean requires at least one data point')
+ return sum(data)/n
+
+ # Return sum of square deviations of sequence data.
+ # Sum (x - x_mean)**2
+ def sum_square_dev(self, data):
+ c = self.mean(data)
+ return sum((x - c) ** 2 for x in data)
+
+ # Return sum of deviations of sequence data.
+ # Sum (x - x_mean)*(y - y_mean)
+ def sum_dev(self, x, y):
+ c1 = self.mean(x)
+ c2 = self.mean(y)
+ return sum((_x - c1) * (_y - c2) for _x, _y in zip(x, y))
+
+ # Return the chi2 sum of the provided observed and expected values.
+ def chi2(self, observed, expected):
+ if 0 in expected:
+ return 0.0
+ return sum((_o - _e) ** 2 / _e for _o, _e in zip(observed, expected))
+
+
+## @brief Extract a table of data from a txt file
+# @details E.g. header="Time nprocs nthreads wtime stime utime pss rss swap vmem"
+# or the first line in the file
+# each of which will become keys in the dictionary, whose corresponding values are stored in lists, with the entries
+# corresponding to the values in the rows of the input file.
+# The output dictionary will have the format
+# {'Time': [ .. data from first row .. ], 'VMEM': [.. data from second row], ..}
+# @param filename name of input text file, full path (string).
+# @param header header string.
+# @param separator separator character (char).
+# @return dictionary.
+class memFileToTable():
+
+ def getTable(self, filename, header=None, separator="\t"):
+ tabledict = {}
+ keylist = []
+ try:
+ f = open(filename, 'r')
+ except Exception as e:
+ msg.warning("failed to open file: {0}, {1}".format(filename, e))
+ else:
+ firstline = True
+ for line in f:
+ fields = line.split(separator)
+ if firstline:
+ firstline = False
+ tabledict, keylist = self._defineTableDictKeys(header, fields, separator)
+ if not header:
+ continue
+ # from now on, fill the dictionary fields with the input data
+ i = 0
+ for field in fields:
+ # get the corresponding dictionary key from the keylist
+ key = keylist[i]
+ # store the field value in the correct list
+ tabledict[key].append(float(field))
+ i += 1
+ f.close()
+
+ return tabledict
+
+ ## @brief Define the keys for the tabledict dictionary.
+ # @param header header string.
+ # @param fields header content string.
+ # @param separator separator character (char).
+ # @return tabledict (dictionary), keylist (ordered list with dictionary key names).
+ def _defineTableDictKeys(self, header, fields, separator):
+ tabledict = {}
+ keylist = []
+
+ if not header:
+ # get the dictionary keys from the header of the file
+ for key in fields:
+ # first line defines the header, whose elements will be used as dictionary keys
+ if key == '':
+ continue
+ if key.endswith('\n'):
+ key = key[:-1]
+ tabledict[key] = []
+ keylist.append(key)
+ else:
+ # get the dictionary keys from the provided header
+ keys = header.split(separator)
+ for key in keys:
+ if key == '':
+ continue
+ if key.endswith('\n'):
+ key = key[:-1]
+ tabledict[key] = []
+ keylist.append(key)
+
+ return tabledict, keylist
+
+
### @brief return Valgrind command
# @detail This function returns a Valgrind command for use with Athena. The
# command is returned as a string (by default) or a list, as requested using
diff --git a/Tools/PyJobTransforms/test/test_HelloWorldTrf.sh b/Tools/PyJobTransforms/test/test_HelloWorldTrf.sh
index 989703b84fb3081e8da2dd58237c54d63bd5d0c4..af1afb31f1628a8710f1f11c13e9a30e83a30e21 100755
--- a/Tools/PyJobTransforms/test/test_HelloWorldTrf.sh
+++ b/Tools/PyJobTransforms/test/test_HelloWorldTrf.sh
@@ -2,6 +2,9 @@
set -e
+mkdir -p test_HelloWorldTrf
+cd test_HelloWorldTrf
+
# ST test
HelloWorld_tf.py --maxEvents=5 --CA
diff --git a/Tools/PyUtils/python/MetaReader.py b/Tools/PyUtils/python/MetaReader.py
index 76b86552df67322c6cd3aa7a46cc98922611620b..52c3d8ad8e45ba56b552affcd83d14eada4a08f9 100644
--- a/Tools/PyUtils/python/MetaReader.py
+++ b/Tools/PyUtils/python/MetaReader.py
@@ -223,8 +223,12 @@ def read_metadata(filenames, file_type = None, mode = 'lite', promote = None, me
aux = None
if key == 'TriggerMenu' and 'TriggerMenuAux.' in persistent_instances:
aux = persistent_instances['TriggerMenuAux.']
+ elif key == 'DataVector<xAOD::TriggerMenu_v1>_TriggerMenu' and 'xAOD::TriggerMenuAuxContainer_v1_TriggerMenuAux.' in persistent_instances:
+ aux = persistent_instances['xAOD::TriggerMenuAuxContainer_v1_TriggerMenuAux.']
elif key == 'TriggerMenuAux.':
continue
+ elif key == 'xAOD::TriggerMenuAuxContainer_v1_TriggerMenuAux.':
+ continue
meta_dict[filename][key] = _convert_value(content, aux)
@@ -608,9 +612,8 @@ def _extract_fields_triggermenu(interface, aux):
firstMenu = interface.at(0)
L1Items = [ item for item in firstMenu.itemNames() ]
HLTChains = [ chain for chain in firstMenu.chainNames() ]
- except Exception as err:
+ except Exception as err: # noqa: F841
msg.warn('Problem reading xAOD::TriggerMenu:')
- msg.warn(err)
result = {}
result['L1Items'] = L1Items
diff --git a/Tools/PyUtils/python/scripts/cmake_depends.py b/Tools/PyUtils/python/scripts/cmake_depends.py
index 30b92b9a377a81380a4184a4e150885c4a89b017..3a9c6d658d642e199dd3b100683efa8318122153 100644
--- a/Tools/PyUtils/python/scripts/cmake_depends.py
+++ b/Tools/PyUtils/python/scripts/cmake_depends.py
@@ -9,29 +9,21 @@ name, the dependencies are printed as a plain list or DOT graph. The recursion
depth is configurable.
"""
-import sys
import os
import re
from collections import deque
import PyUtils.acmdlib as acmdlib
import argparse
-# Hack until we switched to LCG>=97a:
+# Hack until atlasexternals!747 is deployed:
try:
import pygraphviz
except ImportError:
- if sys.version_info[0]==2:
- sys.path.append('/cvmfs/sft.cern.ch/lcg/releases/LCG_97a/pygraphviz/1.5/'+os.getenv('BINARY_TAG')+'/lib/python2.7/site-packages/')
- else:
- sys.path.append('/cvmfs/sft.cern.ch/lcg/releases/LCG_97apython3/pygraphviz/1.5/'+os.getenv('BINARY_TAG')+'/lib/python3.7/site-packages')
+ import sys
+ sys.path.append('/cvmfs/sft.cern.ch/lcg/releases/LCG_98python3/pygraphviz/1.5/'+os.getenv('BINARY_TAG')+'/lib/python3.7/site-packages')
import pygraphviz
-# Targets ending in those strings are ignored:
-custom_targets = ['Pkg', 'PkgPrivate', 'ClidGen', 'ComponentsList', 'Configurables',
- 'JobOptInstall', 'PythonBytecodeInstall', 'PythonInstall']
-
-
def read_package_list(package_file):
"""Read packages.txt as a source for the full package path"""
@@ -53,17 +45,6 @@ def externals_name(lib):
return os.path.basename(lib)
-def ignore_target(t):
- """Check if target should be ignored"""
- if t.startswith('__MUST_NOT_LINK_AGAINST') or t.startswith('-'):
- return True
-
- for s in custom_targets:
- if t.endswith(s): return True
-
- return False
-
-
def lrstrip(s, prefix, postfix):
"""Strip `prefix` and `postfix` from string `s`"""
if s.startswith(prefix): s = s[len(prefix):]
@@ -92,8 +73,6 @@ def traverse(graph, root, reverse=False, maxdepth=None, nodegetter=lambda n:n):
if node not in visited_nodes:
visited_nodes.add(node)
- if ignore_target(node.attr['label']):
- continue
# Add edges to neighbors into queue:
if maxdepth is None or level < maxdepth:
@@ -130,17 +109,20 @@ class AthGraph:
# Read dot file:
self.graph = pygraphviz.AGraph(dotfile)
+ # Build dictionary for node types:
+ legend = self.graph.get_subgraph('clusterLegend')
+ self.types = { n.attr['label'] : n.attr['shape'] for n in legend.iternodes() }
+
# Build dictionary for node names:
self.node = { n.attr['label'] : n.get_name() for n in self.graph.iternodes() }
# Extract package dependencies:
for e in self.graph.iteredges():
p = e[0].attr['label']
-
- # Decorate target with package name
+ # Decorate target with package name:
if p.startswith('Package_'):
pkg = lrstrip(p, 'Package_', '_tests')
- e[1].attr['package'] = package_paths.get(pkg,pkg)
+ e[0].attr['package'] = e[1].attr['package'] = package_paths.get(pkg,pkg)
# Assign "package" names to externals if possible:
external_nodes = filter(lambda n : 'package' not in n.attr.keys(),
@@ -149,17 +131,18 @@ class AthGraph:
name = externals_name(n.attr['label'])
n.attr['package'] = name.split('::')[0]
n.attr['label'] = name
- n.attr['external'] = True
+ n.attr['external'] = 'yes'
def get_node(self, label):
"""Return graph node for label/target"""
return self.graph.get_node(self.node[label])
- def get_labels(self, regex):
- """Return labels matching regex"""
- r = re.compile(regex)
- return [l for l in self.node if r.match(l)]
-
+ def ignore_target(self, node):
+ """Check if target should be ignored"""
+ label = node.attr['label']
+ return True if (label.startswith('__') or # internal targets
+ label.startswith('-') or # compiler flags (e.g. -pthread)
+ node.attr['shape']==self.types['Custom Target']) else False
#
# Main function and command line arguments
@@ -189,6 +172,9 @@ class AthGraph:
@acmdlib.argument('--regex', action='store_true',
help='treat NAME as regular expression')
+@acmdlib.argument('--all', action='store_true',
+ help='do not apply any target filter (e.g. custom targets)')
+
@acmdlib.argument('-d', '--dot', action='store_true',
help='print DOT graph')
@@ -224,25 +210,44 @@ def main(args):
# Helper for graph traversal below:
def getnode(node):
- if args.externals or 'external' not in node.attr.keys():
+ if not args.all and d.ignore_target(node): return None
+ if args.externals or not node.attr['external']:
a = 'label' if args.target else 'package'
return node.attr[a]
graph = pygraphviz.AGraph(name='AthGraph', directed=True)
for p in args.names:
- # In package mode construct relevant target:
- target = p if args.target else 'Package_'+p.split('/')[-1]
- targets = d.get_labels(target) if args.regex else [target]
+ target = p.split('/')[-1] # in case of full package path
+
+ # With regex, find all matching targets:
+ if args.regex:
+ r = re.compile(target)
+ targets = [getnode(n) for n in d.graph.iternodes() if r.match(n.attr['label'])]
+ targets = list(filter(lambda t : t is not None, targets))
+ else:
+ targets = [target]
+ # Find the nodes from which graph traversal starts:
sources = []
for l in targets:
- # To find clients of a package means finding clients of the targets
- # within that package. First find all targets within the package:
- if args.clients and not args.target:
- sources.extend([b for a,b in traverse(d.graph, d.get_node(l), maxdepth=1)])
- else:
- sources.extend([d.get_node(l)])
-
+ if not args.target:
+ l = 'Package_'+l
+ try:
+ if d.get_node(l).attr['external'] and not args.externals:
+ print(f"{l} is an external target. Run with -e/--externals.")
+ return 1
+
+ # To find clients of a package means finding clients of the targets
+ # within that package. First find all targets within the package:
+ if args.clients and not args.target:
+ sources.extend([b for a,b in traverse(d.graph, d.get_node(l), maxdepth=1)])
+ else:
+ sources.extend([d.get_node(l)])
+ except KeyError:
+ print(f"Target with name {l} does not exist.")
+ return 1
+
+ # Extract the dependency subgraph:
g = subgraph(d.graph, sources, reverse=args.clients,
maxdepth=args.recursive, nodegetter=getnode)
diff --git a/Tools/PyUtils/python/scripts/diff_root_files.py b/Tools/PyUtils/python/scripts/diff_root_files.py
index 68a617e66902e81a0d64a30ba985cd8c048a982e..21b3a867cc8352387809ec95fbc1bcc81199fe71 100644
--- a/Tools/PyUtils/python/scripts/diff_root_files.py
+++ b/Tools/PyUtils/python/scripts/diff_root_files.py
@@ -44,7 +44,7 @@ def _is_exit_early():
@acmdlib.argument('--ignore-leaves',
nargs='*',
default=('Token', 'index_ref',),
- help='set of leaves names to ignore from comparison; can be a branch name or a partial leaf name (without any trailing dots)')
+ help='set of leaves names to ignore from comparison; can be a branch name or a partial leaf name (accepts regex)')
@acmdlib.argument('--enforce-leaves',
nargs='*',
default=('BCID',),
@@ -134,16 +134,37 @@ def main(args):
fnew = ru.RootFileDumper(args.new, args.tree_name)
pass
+ def build_ignore_list( all_leaves, ignore_leaves ):
+ """ Here we build the list of leaves that'll be ignored in the diff"""
+
+ import re
+ result = set()
+
+ # Loop over leaves and patterns, add matches to the results
+ # The set() is taken elsewhere in the code
+ for leaf in all_leaves:
+ for pattern in ignore_leaves:
+ try:
+ m = re.match(pattern, leaf)
+ except TypeError:
+ continue
+ if m:
+ result.add(leaf)
+
+ return result
+
def tree_infos(tree, args):
nentries = tree.GetEntriesFast()
# l.GetBranch().GetName() gives the full leaf path name
- leaves = [l.GetBranch().GetName() for l in tree.GetListOfLeaves()
- if l.GetBranch().GetName() not in args.ignore_leaves]
+ all_leaves = [ l.GetBranch().GetName() for l in tree.GetListOfLeaves() ]
+ ignore_leaves = build_ignore_list( all_leaves, args.ignore_leaves )
+ leaves = [ leaf for leaf in all_leaves if leaf not in ignore_leaves ]
if args.leaves_prefix:
leaves = [l.replace(args.leaves_prefix, '') for l in leaves]
return {
- 'entries' : nentries,
+ 'entries': nentries,
'leaves': set(leaves),
+ 'ignored': ignore_leaves
}
def ordered_indices(tree, reverse_order = False):
@@ -221,7 +242,7 @@ def main(args):
msg.warning(' - [%s]', l)
# need to remove trailing dots as they confuse reach_next()
- skip_leaves = [ l.rstrip('.') for l in old_leaves | new_leaves | set(args.ignore_leaves) ]
+ skip_leaves = [ l.rstrip('.') for l in old_leaves | new_leaves | infos['old']['ignored'].union(infos['new']['ignored']) ]
for l in skip_leaves:
msg.debug('skipping [%s]', l)
diff --git a/Tools/PyUtils/test/test_cmake_depends.sh b/Tools/PyUtils/test/test_cmake_depends.sh
new file mode 100755
index 0000000000000000000000000000000000000000..df9b4df251a8c83d644b61018733ad52caedd99a
--- /dev/null
+++ b/Tools/PyUtils/test/test_cmake_depends.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# Test for cmake_depends.py.
+# Run this script with/without changes and diff output.
+#
+
+# Dependencies:
+cmds=("acmd.py cmake depends IOVDbSvc --long")
+cmds+=("acmd.py cmake depends xAODEventInfo --dot")
+cmds+=("acmd.py cmake depends xAODEventInfo --recursive --dot")
+cmds+=("acmd.py cmake depends xAODEventInfo --regex --dot")
+cmds+=("acmd.py cmake depends xAODEventInfo --recursive --regex --dot")
+# Clients:
+cmds+=("acmd.py cmake depends LArReadoutGeometry --clients --dot")
+cmds+=("acmd.py cmake depends LArReadoutGeometry --clients --target --dot")
+cmds+=("acmd.py cmake depends IOVDbDataModel --clients --recursive --dot")
+# Test of an external library:
+cmds+=("acmd.py cmake depends ActsCore --clients --target --recursive --external --dot")
+cmds+=("acmd.py cmake depends ActsCore --clients --target --recursive")
+
+for c in "${cmds[@]}"; do
+ echo "${c}"
+ eval "${c}"
+done
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsAlignmentCondAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsAlignmentCondAlg.h
index 47475f6c4bb8d6482a8fa718fe51919829a4267c..7d7ead55d61007f87f84c238b6204c8cdf38c221 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsAlignmentCondAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsAlignmentCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ACTSGEOMETRY_ACTSALIGNMENTCONDALG_H
@@ -16,13 +16,6 @@
// STL
#include <string>
-namespace InDetDD {
-class InDetDetectorManager;
-class PixelDetectorManager;
-class SCT_DetectorManager;
-class TRT_DetectorManager;
-} // namespace InDetDD
-
class EventInfo;
class ICondSvc;
class StoreGateSvc;
@@ -57,10 +50,6 @@ private:
ServiceHandle<ICondSvc> m_cs;
ServiceHandle<IActsTrackingGeometrySvc> m_trackingGeometrySvc;
-
- const InDetDD::PixelDetectorManager *p_pixelManager;
- const InDetDD::SCT_DetectorManager *p_SCTManager;
- const InDetDD::TRT_DetectorManager *p_TRTManager;
};
#endif
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h
index 422d149b88417948abf1ab2b0d54df7bbf1bc835..b48216906216ed606c044bf2a41e3c931d2e6d83 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h
@@ -43,10 +43,10 @@ public:
/// Constructor for a straw surface.
/// @param transform Transform to the straw system
- ActsDetectorElement(std::shared_ptr<const Acts::Transform3D> trf,
- const InDetDD::TRT_BaseElement* detElem,
- const Identifier& id // we need explicit ID here b/c of straws
- );
+ ActsDetectorElement(const Acts::Transform3D& trf,
+ const InDetDD::TRT_BaseElement* detElem,
+ const Identifier& id // we need explicit ID here b/c of straws
+ );
/// Destructor
virtual ~ActsDetectorElement() {}
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
index 89635fe82c745fa86a91ed512e04dff1590691d0..d87153490dbf123def419f9078d6f3bbf0970b07 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
@@ -13,7 +13,7 @@
// ACTS
#include "Acts/EventData/TrackParameters.hpp"
-#include "Acts/Geometry/GeometryID.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
// STL
#include <memory>
@@ -58,6 +58,7 @@ private:
// material track writer for the material map validation
Gaudi::Property<bool> m_writeMaterialTracks{this, "WriteMaterialTracks", false, "Write material track"};
+ Gaudi::Property<bool> m_writePropStep{this, "WritePropStep", false, "Write propagation step"};
ServiceHandle<IActsMaterialTrackWriterSvc> m_materialTrackWriterSvc;
mutable std::mutex m_writeMutex{};
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
index 9a117e51f0e6de68fc7631e44d2a66c9130038c7..957021ea77858a05a46990b9dde389ef638da0e1 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
@@ -26,11 +26,12 @@
#include "Acts/MagneticField/ConstantBField.hpp"
#include "Acts/MagneticField/MagneticFieldContext.hpp"
#include "Acts/Propagator/detail/SteppingLogger.hpp"
-#include "Acts/Propagator/DebugOutputActor.hpp"
#include "Acts/Propagator/StandardAborters.hpp"
+#include "Acts/Propagator/SurfaceCollector.hpp"
#include "Acts/Utilities/Result.hpp"
#include "Acts/Utilities/Units.hpp"
#include "Acts/Utilities/Helpers.hpp"
+#include "Acts/Utilities/Logger.hpp"
#include <cmath>
@@ -59,39 +60,37 @@ public:
private:
// set up options for propagation
using SteppingLogger = Acts::detail::SteppingLogger;
- using DebugOutput = Acts::DebugOutputActor;
using EndOfWorld = Acts::EndOfWorldReached;
- using ResultType = Acts::Result<std::pair<ActsPropagationOutput,
- DebugOutput::result_type>>;
+ using ResultType = Acts::Result<ActsPropagationOutput>;
public:
virtual
ActsPropagationOutput
propagationSteps(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const override;
virtual
- std::unique_ptr<const Acts::CurvilinearParameters>
+ std::unique_ptr<const Acts::CurvilinearTrackParameters>
propagate(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const override;
virtual
ActsPropagationOutput
propagationSteps(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const override;
virtual
- std::unique_ptr<const Acts::BoundParameters>
+ std::unique_ptr<const Acts::BoundTrackParameters>
propagate(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const override;
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
index 6ae582a783f4b1d08e89b20db65538f4185a3865..7e5b79632d396d6d50a0ae42f2dd1475642a0ba7 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
@@ -44,7 +44,16 @@ public:
private:
- Gaudi::Property<std::string> m_filePath{this, "FilePath", "material-maps.json", "Output json file for the Material Map"};
-
+ Acts::JsonGeometryConverter::Config m_cfg;
+
+ Gaudi::Property<std::string> m_filePath{this, "OutputFile", "material-maps.json", "Output json file for the Material Map"};
+ Gaudi::Property<bool> m_processSensitives{this, "processSensitives", true, "Write sensitive surface to the json file"};
+ Gaudi::Property<bool> m_processApproaches{this, "processApproaches", true, "Write approche surface to the json file"};
+ Gaudi::Property<bool> m_processRepresenting{this, "processRepresenting", true, "Write representing surface to the json file"};
+ Gaudi::Property<bool> m_processBoundaries{this, "processBoundaries", true, "Write boundary surface to the json file"};
+ Gaudi::Property<bool> m_processVolumes{this, "processVolumes", true, "Write volume to the json file"};
+ Gaudi::Property<bool> m_processDenseVolumes{this, "processDenseVolumes", false, "Write dense volume to the json file"};
+ Gaudi::Property<bool> m_processnonmaterial{this, "processnonmaterial", false, "Add proto material to all surfaces and volumes"};
};
+
#endif
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
index 4cad3f6f2e6d9f0781921fdb49447f06201ec13a..4421ca296f9100b0421f7b41a76eafb46ad84408 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
@@ -16,7 +16,7 @@
// ACTS
#include "Acts/EventData/TrackParameters.hpp"
-#include "Acts/Geometry/GeometryID.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
#include "Acts/Utilities/Helpers.hpp"
#include "Acts/Material/SurfaceMaterialMapper.hpp"
@@ -34,10 +34,10 @@ namespace Acts {
class IVolumeMaterial;
using SurfaceMaterialMap
- = std::map<GeometryID, std::shared_ptr<const ISurfaceMaterial>>;
+ = std::map<GeometryIdentifier, std::shared_ptr<const ISurfaceMaterial>>;
using VolumeMaterialMap
- = std::map<GeometryID, std::shared_ptr<const IVolumeMaterial>>;
+ = std::map<GeometryIdentifier, std::shared_ptr<const IVolumeMaterial>>;
using DetectorMaterialMaps = std::pair<SurfaceMaterialMap, VolumeMaterialMap>;
}
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
index ba327af06215ab054f10ab5665c31c43db415f6e..b9c5d4b4ef55606e337ec1b542edcb1ffafad5fa 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
@@ -36,7 +36,7 @@ class TrackingGeometry;
class CylinderVolumeHelper;
class ILayerBuilder;
-class GeometryID;
+class GeometryIdentifier;
class BinnedSurfaceMaterial;
}
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
index 6802600ea2b49db89ddacb87675d4280dc09d984..ab48e3c30b0bec1f6f99c17c60f6606713354733 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#pragma once
@@ -15,12 +15,6 @@
// STL
#include <string>
-namespace InDetDD {
- class PixelDetectorManager;
- class SCT_DetectorManager;
- class TRT_DetectorManager;
-}
-
class EventInfo;
class ICondSvc;
class IActsTrackingGeometrySvc;
@@ -53,10 +47,6 @@ private:
ServiceHandle<ICondSvc> m_cs;
ServiceHandle<IActsTrackingGeometrySvc> m_trackingGeometrySvc;
- const InDetDD::PixelDetectorManager* p_pixelManager;
- const InDetDD::SCT_DetectorManager* p_SCTManager;
- const InDetDD::TRT_DetectorManager* p_TRTManager;
-
std::vector<const GeoAlignableTransform*> m_topAligns;
};
diff --git a/Tracking/Acts/ActsGeometry/CMakeLists.txt b/Tracking/Acts/ActsGeometry/CMakeLists.txt
index 9f516690bfe7bfb7638d5c5100f415271a0e7a00..e78c9dcbb212b85b313c636093f2b882bdd2e175 100755
--- a/Tracking/Acts/ActsGeometry/CMakeLists.txt
+++ b/Tracking/Acts/ActsGeometry/CMakeLists.txt
@@ -9,8 +9,6 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/Identifier
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
Control/AthenaBaseComps
AthenaKernel
@@ -30,7 +28,7 @@ find_package( Eigen )
find_package( Boost )
find_package( nlohmann_json )
-find_package( Acts COMPONENTS Core JsonPlugin)
+find_package( Acts COMPONENTS Core PluginJson)
# Component(s) in the package:
@@ -48,10 +46,8 @@ atlas_add_library( ActsGeometryLib
ActsInteropLib
ActsGeometryInterfacesLib
ActsCore
- ActsJsonPlugin
+ ActsPluginJson
TrkGeometry
- PixelReadoutGeometry
- SCT_ReadoutGeometry
TRT_ReadoutGeometry
MagFieldElements MagFieldConditions)
@@ -84,7 +80,7 @@ atlas_add_component( ActsGeometry
ActsGeometryLib
ActsGeometryInterfacesLib
ActsCore
- ActsJsonPlugin)
+ ActsPluginJson)
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py
index d22b648a9354ce81200197cd87bb466d932bc0b4..5a6871605651c7faee52efd49bc597f1a91eb310 100644
--- a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py
+++ b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfig.py
@@ -35,12 +35,14 @@ def ActsTrackingGeometrySvcCfg(configFlags, name = "ActsTrackingGeometrySvc" ) :
from AthenaCommon.Logging import log
log.warning("ConfigFlags indicate %s should be built. Not all ID subdetectors are set, but I'll set all of them up to capture the extra setup happening here.", ", ".join(subDetectors))
+ actsTrackingGeometrySvc = Acts_ActsTrackingGeometrySvc(name, BuildSubDetectors=subDetectors)
-
- actsTrackingGeometrySvc = Acts_ActsTrackingGeometrySvc(name, BuildSubDetectors = subDetectors)
-
- from AthenaCommon.Constants import VERBOSE
- actsTrackingGeometrySvc.OutputLevel = VERBOSE
+ if configFlags.TrackingGeometry.MaterialSource == "Input":
+ actsTrackingGeometrySvc.UseMaterialMap = True
+ actsTrackingGeometrySvc.MaterialMapInputFile = "material-maps.json"
+ if configFlags.TrackingGeometry.MaterialSource.find(".json") != -1:
+ actsTrackingGeometrySvc.UseMaterialMap = True
+ actsTrackingGeometrySvc.MaterialMapInputFile = configFlags.TrackingGeometry.MaterialSource
result.addService(actsTrackingGeometrySvc)
return result
@@ -96,7 +98,7 @@ def ActsAlignmentCondAlgCfg(configFlags, name = "ActsAlignmentCondAlg", **kwargs
return result
from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
-def ActsExtrapolationToolCfg(configFlags, name = "ActsExtrapolationTool" ) :
+def ActsExtrapolationToolCfg(configFlags, name="ActsExtrapolationTool", **kwargs) :
result=ComponentAccumulator()
acc = MagneticFieldSvcCfg(configFlags)
@@ -106,6 +108,73 @@ def ActsExtrapolationToolCfg(configFlags, name = "ActsExtrapolationTool" ) :
result.merge(acc)
Acts_ActsExtrapolationTool = CompFactory.ActsExtrapolationTool
- actsExtrapolationTool = Acts_ActsExtrapolationTool(name)
+ actsExtrapolationTool = Acts_ActsExtrapolationTool(name, **kwargs)
result.addPublicTool(actsExtrapolationTool, primary=True)
return result
+
+
+def ActsMaterialTrackWriterSvcCfg(name="ActsMaterialTrackWriterSvc",
+ FilePath="MaterialTracks_mapping.root",
+ TreeName="material-tracks") :
+ result = ComponentAccumulator()
+
+ Acts_ActsMaterialTrackWriterSvc = CompFactory.ActsMaterialTrackWriterSvc
+ ActsMaterialTrackWriterSvc = Acts_ActsMaterialTrackWriterSvc(name,
+ FilePath=FilePath,
+ TreeName=TreeName)
+
+ from AthenaCommon.Constants import INFO
+ ActsMaterialTrackWriterSvc.OutputLevel = INFO
+ result.addService(ActsMaterialTrackWriterSvc, primary=True)
+ return result
+
+def ActsMaterialStepConverterToolCfg(name = "ActsMaterialStepConverterTool" ) :
+ result=ComponentAccumulator()
+
+ Acts_ActsMaterialStepConverterTool = CompFactory.ActsMaterialStepConverterTool
+ ActsMaterialStepConverterTool = Acts_ActsMaterialStepConverterTool(name)
+
+ from AthenaCommon.Constants import INFO
+ ActsMaterialStepConverterTool.OutputLevel = INFO
+
+ result.addPublicTool(ActsMaterialStepConverterTool, primary=True)
+ return result
+
+def ActsSurfaceMappingToolCfg(configFlags, name = "ActsSurfaceMappingTool" ) :
+ result=ComponentAccumulator()
+
+ acc, actsTrackingGeometryTool = ActsTrackingGeometryToolCfg(configFlags)
+ result.merge(acc)
+
+ Acts_ActsSurfaceMappingTool = CompFactory.ActsSurfaceMappingTool
+ ActsSurfaceMappingTool = Acts_ActsSurfaceMappingTool(name)
+
+ from AthenaCommon.Constants import INFO
+ ActsSurfaceMappingTool.OutputLevel = INFO
+
+ result.addPublicTool(ActsSurfaceMappingTool, primary=True)
+ return result
+
+def ActsMaterialJsonWriterToolCfg(name= "ActsMaterialJsonWriterTool", **kwargs) :
+ result=ComponentAccumulator()
+
+ Acts_ActsMaterialJsonWriterTool = CompFactory.ActsMaterialJsonWriterTool
+ ActsMaterialJsonWriterTool = Acts_ActsMaterialJsonWriterTool(name, **kwargs)
+
+ from AthenaCommon.Constants import INFO
+ ActsMaterialJsonWriterTool.OutputLevel = INFO
+
+ result.addPublicTool(ActsMaterialJsonWriterTool, primary=True)
+ return result
+
+def ActsObjWriterToolCfg(name= "ActsObjWriterTool", **kwargs) :
+ result=ComponentAccumulator()
+
+ Acts_ActsObjWriterTool = CompFactory.ActsObjWriterTool
+ ActsObjWriterTool = Acts_ActsObjWriterTool(name, **kwargs)
+
+ from AthenaCommon.Constants import INFO
+ ActsObjWriterTool.OutputLevel = INFO
+
+ result.addPublicTool(ActsObjWriterTool, primary=True)
+ return result
diff --git a/Tracking/Acts/ActsGeometry/scripts/geo_id.py b/Tracking/Acts/ActsGeometry/scripts/geo_id.py
index 10c7f456158f15e766a83e590257a5ac4a68a3fc..747bfef936d021f7bf0f39ceb0adab2c926d4c89 100755
--- a/Tracking/Acts/ActsGeometry/scripts/geo_id.py
+++ b/Tracking/Acts/ActsGeometry/scripts/geo_id.py
@@ -6,7 +6,7 @@ import sys
# file = sys.argv[1]
-class GeometryID:
+class GeometryIdentifier:
volume_mask = 0xff00000000000000
boundary_mask = 0x00ff000000000000
layer_mask = 0x0000ff0000000000
@@ -53,7 +53,7 @@ class GeometryID:
return (self._value & mask) >> self._ffs(mask)
def __repr__(self):
- fmt = "GeometryID(vol={}, bnd={}, lay={}, app={}, sen={}, chn={})"
+ fmt = "GeometryIdentifier(vol={}, bnd={}, lay={}, app={}, sen={}, chn={})"
return fmt.format(self.vol_id,
self.bnd_id,
self.lay_id,
@@ -67,7 +67,7 @@ class GeometryID:
# for idx, event in enumerate(tree):
# for geo_id_ in event.step_geo_id:
- # geo_id = GeometryID(geo_id_)
+ # geo_id = GeometryIdentifier(geo_id_)
# print(geo_id)
# print("----")
diff --git a/Tracking/Acts/ActsGeometry/share/ActsExtrapolationAlg.py b/Tracking/Acts/ActsGeometry/share/ActsExtrapolationAlg.py
index e2907f4e0508cd17c93d25e78e576bc4086e63ae..7f305015feb7dc9d7cbf7af783e7b0ff64ad62d3 100644
--- a/Tracking/Acts/ActsGeometry/share/ActsExtrapolationAlg.py
+++ b/Tracking/Acts/ActsGeometry/share/ActsExtrapolationAlg.py
@@ -51,7 +51,7 @@ if "__main__" == __name__:
ConfigFlags.Detector.GeometryCalo = True
ConfigFlags.Detector.GeometryMuon = False
ConfigFlags.Detector.GeometryTRT = True
- ConfigFlags.TrackingGeometry.MaterialSource = "Input"
+ ConfigFlags.TrackingGeometry.MaterialSource = "None"
ConfigFlags.Concurrency.NumThreads = 10
ConfigFlags.Concurrency.NumConcurrentEvents = 10
diff --git a/Tracking/Acts/ActsGeometry/share/ActsMaterialMapping_jobOptions.py b/Tracking/Acts/ActsGeometry/share/ActsMaterialMapping_jobOptions.py
index b20518e8aa9d2d6d1d72f487d9d35a9351157872..e1456fc3ca2b2de4ef28b87202e8a747ec321d41 100644
--- a/Tracking/Acts/ActsGeometry/share/ActsMaterialMapping_jobOptions.py
+++ b/Tracking/Acts/ActsGeometry/share/ActsMaterialMapping_jobOptions.py
@@ -1,139 +1,100 @@
###############################################################
#
-# Loads Detector Description for Pixel and SCT
-# and prints out various quanities for each detector element.
+# Map material from a Geantino scan onto the surfaces and
+# volumes of the detector to creat a material map.
#
###############################################################
-# Use Global flags and DetFlags.
-from AthenaCommon.DetFlags import DetFlags
-from AthenaCommon.GlobalFlags import globalflags
+##########################################################################
+# start from scratch with component accumulator
-from AthenaCommon.ConcurrencyFlags import jobproperties as jp
-nThreads = jp.ConcurrencyFlags.NumThreads()
-ServiceMgr.MessageSvc.defaultLimit = 20000
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
-# Just the pixel and SCT
-DetFlags.ID_setOn()
-DetFlags.detdescr.pixel_setOn()
-DetFlags.detdescr.SCT_setOn()
-DetFlags.Calo_setOff()
+from ActsGeometry.ActsGeometryConfig import ActsMaterialStepConverterToolCfg
+from ActsGeometry.ActsGeometryConfig import ActsSurfaceMappingToolCfg
+from ActsGeometry.ActsGeometryConfig import ActsMaterialJsonWriterToolCfg
-# MC or data - affects which conditions database instance is used
-globalflags.DataSource='geant4'
-#globalflags.DataSource='data'
+from ActsGeometry.ActsGeometryConfig import ActsAlignmentCondAlgCfg
-# Select the geometry version.
-globalflags.DetDescrVersion = 'ATLAS-R2-2016-00-00-00'
+def ActsMaterialMappingCfg(configFlags, name = "ActsMaterialMapping", **kwargs):
+ result = ComponentAccumulator()
-# print "HERE"
-# print globalflags.DetDescrVersion
+ MaterialStepConverterTool = ActsMaterialStepConverterToolCfg()
+ kwargs["MaterialStepConverterTool"] = MaterialStepConverterTool.getPrimary()
+ result.merge(MaterialStepConverterTool)
-# LorentzAngle Svc needs field now
-import MagFieldServices.SetupField
+ ActsSurfaceMappingTool = ActsSurfaceMappingToolCfg(configFlags)
+ kwargs["SurfaceMappingTool"] = ActsSurfaceMappingTool.getPrimary()
+ result.merge(ActsSurfaceMappingTool)
-# Initialize geometry
-# THIS ACTUALLY DOES STUFF!!
-from AtlasGeoModel import GeoModelInit
-from AtlasGeoModel import SetGeometryVersion
-
-# For misalignments
-from IOVDbSvc.CondDB import conddb
-conddb.setGlobalTag('OFLCOND-SIM-00-00-00')
-# conddb.addOverride("/Indet/Align", "InDetAlign_R2_Nominal")
-
-from AthenaCommon.AppMgr import ServiceMgr
-
-# Read material step file
-import AthenaPoolCnvSvc.ReadAthenaPool
-ServiceMgr.EventSelector.InputCollections = ["MaterialStepFile.root"]
-
-
-from AthenaCommon.AlgScheduler import AlgScheduler
-AlgScheduler.OutputLevel( INFO )
-AlgScheduler.ShowControlFlow( True )
-AlgScheduler.ShowDataDependencies( True )
-AlgScheduler.EnableConditions( True )
-# AlgScheduler.setDataLoaderAlg( "SGInputLoader" )
-
-
-from IOVSvc.IOVSvcConf import CondSvc
-svcMgr += CondSvc( OutputLevel=INFO )
-
-# ServiceMgr += CfgMgr.THistSvc()
-# ServiceMgr.THistSvc.Output += ["MATTRACKVAL DATAFILE='MaterialTracks.root' OPT='RECREATE'"]
-# ServiceMgr.ToolSvc.OutputLevel = VERBOSE
-
-
-# Set up ACTS tracking geometry service
-from ActsGeometry.ActsGeometryConf import ActsTrackingGeometrySvc
-trkGeomSvc = ActsTrackingGeometrySvc()
-trkGeomSvc.OutputLevel = INFO
-trkGeomSvc.BarrelMaterialBins = [40, 60] # phi z
-trkGeomSvc.EndcapMaterialBins = [50, 20] # phi r
-trkGeomSvc.BuildSubDetectors = [
- "Pixel",
- "SCT",
- # "TRT",
- # "Calo",
-]
-ServiceMgr += trkGeomSvc
-
-trkGeomTool = CfgMgr.ActsTrackingGeometryTool("ActsTrackingGeometryTool")
-trkGeomTool.OutputLevel = INFO;
-
-# Set up ACTS extrapolation cell writer service
-# exCellWriterSvc = CfgMgr.ActsExCellWriterSvc("ActsExCellWriterSvc")
-# exCellWriterSvc.FilePath = "excells_charged_mapping.root"
-# ServiceMgr += exCellWriterSvc
-mTrackWriterSvc = CfgMgr.ActsMaterialTrackWriterSvc("ActsMaterialTrackWriterSvc")
-mTrackWriterSvc.OutputLevel = INFO
-mTrackWriterSvc.FilePath = "MaterialTracks_mapping.root"
-# mTrackWriterSvc.MaxQueueSize = 10
-ServiceMgr += mTrackWriterSvc
-
-mMaterialStepConverterTool = CfgMgr.ActsMaterialStepConverterTool("ActsMaterialStepConverterTool")
-mMaterialStepConverterTool.OutputLevel = INFO
-
-mActsSurfaceMappingTool = CfgMgr.ActsSurfaceMappingTool("ActsSurfaceMappingTool")
-mActsSurfaceMappingTool.OutputLevel = INFO
-mActsSurfaceMappingTool.TrackingGeometryTool = trkGeomTool
-
-mActsMaterialJsonWriterTool = CfgMgr.ActsMaterialJsonWriterTool("ActsMaterialJsonWriterTool")
-mActsMaterialJsonWriterTool.OutputLevel = VERBOSE
-mActsMaterialJsonWriterTool.FilePath = "material-maps.json"
-
-from ActsGeometry import ActsGeometryConf
-
-## SET UP ALIGNMENT CONDITIONS ALGORITHM
-from AthenaCommon.AlgSequence import AthSequencer
-condSeq = AthSequencer("AthCondSeq")
-condSeq += ActsGeometryConf.NominalAlignmentCondAlg("NominalAlignmentCondAlg",
- OutputLevel=INFO)
-## END OF CONDITIONS SETUP
-
-# Set up algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
-
-eventPrintFrequency = 1000
-
-if hasattr(ServiceMgr,"AthenaEventLoopMgr"):
- ServiceMgr.AthenaEventLoopMgr.EventPrintoutInterval = eventPrintFrequency
-if hasattr(ServiceMgr,"AthenaHiveEventLoopMgr"):
- ServiceMgr.AthenaHiveEventLoopMgr.EventPrintoutInterval = eventPrintFrequency
-
-from GaudiAlg.GaudiAlgConf import EventCounter
-job += EventCounter(Frequency=1000)
-
-# Set up material mapping algorithm
-from ActsGeometry.ActsGeometryConf import ActsMaterialMapping
-
-alg = ActsMaterialMapping()
-alg.Cardinality = 0#nThreads
-alg.MaterialStepConverterTool = mMaterialStepConverterTool
-alg.SurfaceMappingTool = mActsSurfaceMappingTool
-alg.MaterialJsonWriterTool = mActsMaterialJsonWriterTool
-alg.OutputLevel = INFO
-job += alg
+ ActsMaterialJsonWriterTool = ActsMaterialJsonWriterToolCfg(OutputFile = "material-maps.json",
+ processSensitives = False,
+ processnonmaterial = False)
+ kwargs["MaterialJsonWriterTool"] = ActsMaterialJsonWriterTool.getPrimary()
+ result.merge(ActsMaterialJsonWriterTool)
+
+ ActsMaterialMapping = CompFactory.ActsMaterialMapping
+ alg = ActsMaterialMapping(name, **kwargs)
+ result.addEventAlgo(alg)
+
+ return result
+
+if "__main__" == __name__:
+ from AthenaCommon.Configurable import Configurable
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import VERBOSE, INFO
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+ from ActsGeometry.ActsGeometryConfig import ActsMaterialTrackWriterSvcCfg
+ Configurable.configurableRun3Behavior = True
+
+ ## Just enable ID for the moment.
+ ConfigFlags.Input.isMC = True
+ ConfigFlags.Beam.Type = ''
+ ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
+ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-SIM-00-00-00"
+ ConfigFlags.Detector.SimulateBpipe = False
+ ConfigFlags.Detector.SimulateID = False
+ ConfigFlags.Detector.GeometryBpipe = True
+ ConfigFlags.Detector.GeometryID = True
+ ConfigFlags.Detector.GeometryPixel = True
+ ConfigFlags.Detector.GeometrySCT = True
+ ConfigFlags.Detector.GeometryCalo = True
+ ConfigFlags.Detector.GeometryMuon = False
+ ConfigFlags.Detector.GeometryTRT = True
+ ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
+ ConfigFlags.Concurrency.NumThreads = 1
+ ConfigFlags.Concurrency.NumConcurrentEvents = 1
+
+ ConfigFlags.lock()
+ ConfigFlags.dump()
+
+ cfg = MainServicesCfg(ConfigFlags)
+
+ cfg.merge(ActsMaterialTrackWriterSvcCfg("ActsMaterialTrackWriterSvc",
+ "MaterialTracks_mapping.root"))
+
+ cfg.merge(PoolReadCfg(ConfigFlags))
+ eventSelector = cfg.getService("EventSelector")
+ eventSelector.InputCollections = ["MaterialStepFile.root"]
+
+ from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
+ cfg.merge(BeamPipeGeometryCfg(ConfigFlags))
+
+ alignCondAlgCfg = ActsAlignmentCondAlgCfg(ConfigFlags)
+
+ cfg.merge(alignCondAlgCfg)
+
+ alg = ActsMaterialMappingCfg(ConfigFlags,
+ OutputLevel=INFO)
+
+ cfg.merge(alg)
+
+ cfg.printConfig()
+
+ log.info("CONFIG DONE")
+
+ cfg.run(80000)
diff --git a/Tracking/Acts/ActsGeometry/share/ActsMaterialValidationAlg.py b/Tracking/Acts/ActsGeometry/share/ActsMaterialValidationAlg.py
index cdaed670692e63b85b2f4357eaeaae204d5200d9..beffb05e101d6c218ec69e2d47ff5cc1b68bc3aa 100644
--- a/Tracking/Acts/ActsGeometry/share/ActsMaterialValidationAlg.py
+++ b/Tracking/Acts/ActsGeometry/share/ActsMaterialValidationAlg.py
@@ -1,148 +1,93 @@
"""
This job options file will run an example extrapolation using the
-Acts tracking geometry, the material map and the Acts extrapolation toolchain.
+Acts tracking geometry and the Acts extrapolation toolchain.
"""
-import os
-import logging
-
-# Use Global flags and DetFlags.
-from AthenaCommon.DetFlags import DetFlags
-from AthenaCommon.GlobalFlags import globalflags
-
-from AthenaCommon.ConcurrencyFlags import jobproperties as jp
-from AthenaCommon.Logging import log as msg
-nThreads = jp.ConcurrencyFlags.NumThreads()
-# for some reason, the synchronization fails if we run in ST...
-if (nThreads < 1) :
- msg.fatal('numThreads must be >0. Did you set the --threads=N option?')
- sys.exit(AthenaCommon.ExitCodes.CONFIGURATION_ERROR)
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput = [
- "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/esd/100evts10lumiblocks.ESD.root"
-]
-
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-# build GeoModel
-import AthenaPython.ConfigLib as apcl
-cfg = apcl.AutoCfg(name = 'MaterialMapValidation', input_files=athenaCommonFlags.FilesInput())
-
-cfg.configure_job()
-
-from AthenaCommon.GlobalFlags import globalflags
-if len(globalflags.ConditionsTag())!=0:
- from IOVDbSvc.CondDB import conddb
- conddb.setGlobalTag(globalflags.ConditionsTag())
-
-from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
-InDetGeometryFlags.useDynamicAlignFolders=True
-
-# Just the pixel and SCT
-DetFlags.ID_setOn()
-DetFlags.Calo_setOn()
-
-
-# Initialize geometry
-# THIS ACTUALLY DOES STUFF!!
-from AtlasGeoModel import GeoModelInit
-from AtlasGeoModel import SetGeometryVersion
-
-from AthenaCommon.AlgScheduler import AlgScheduler
-AlgScheduler.OutputLevel( INFO )
-AlgScheduler.ShowControlFlow( True )
-AlgScheduler.ShowDataDependencies( True )
-AlgScheduler.EnableConditions( True )
-AlgScheduler.setDataLoaderAlg( "SGInputLoader" )
-
-## SET UP ALIGNMENT CONDITIONS ALGORITHM
-from IOVSvc.IOVSvcConf import CondSvc
-svcMgr += CondSvc( OutputLevel=INFO )
-from ActsGeometry import ActsGeometryConf
-from AthenaCommon.AlgSequence import AthSequencer
-condSeq = AthSequencer("AthCondSeq")
-
-# nominal alignment: all deltas are identity
-# condSeq += ActsGeometryConf.NominalAlignmentCondAlg("NominalAlignmentCondAlg",
- # OutputLevel=VERBOSE)
-
-condSeq += ActsGeometryConf.ActsAlignmentCondAlg("ActsAlignCondAlg",
- OutputLevel=INFO)
-# periodic shift alignment. Configurable z-shift per lumiblock.
-# (currently pixel only)
-# condSeq+=ActsGeometryConf.GeomShiftCondAlg("GeomShiftCondAlg_1",
- # ZShiftPerLB=0.5,
- # OutputLevel=VERBOSE)
-## END OF CONDITIONS SETUP
-
-from AthenaCommon.AppMgr import ServiceMgr
-
-# set up and configure the acts geometry construction
-from ActsGeometry.ActsGeometryConf import ActsTrackingGeometrySvc
-trkGeomSvc = ActsTrackingGeometrySvc()
-# used for the proxies during material mapping
-trkGeomSvc.BarrelMaterialBins = [40, 60] # phi z
-trkGeomSvc.EndcapMaterialBins = [50, 20] # phi r
-trkGeomSvc.OutputLevel = INFO
-trkGeomSvc.BuildSubDetectors = [
- "Pixel",
- "SCT",
- # "TRT",
- # "Calo",
-]
-trkGeomSvc.UseMaterialMap = True
-trkGeomSvc.MaterialMapInputFile = "material-maps.json"
-ServiceMgr += trkGeomSvc
-
-# We need the Magnetic fiels
-import MagFieldServices.SetupField
-
-from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
-
-# This is the main extrapolation demo algorithm
-from ActsGeometry.ActsGeometryConf import ActsExtrapolationAlg
-alg = ActsExtrapolationAlg()
-alg.EtaRange = [-2.4, 2.4]
-alg.OutputLevel = INFO
-alg.NParticlesPerEvent = int(1e4)
-
-
-# Record the material track for material map validation
-alg.WriteMaterialTracks = True
-# we only need this if the extrap alg is set up to write mat tracks
-if alg.WriteMaterialTracks == True:
- mTrackWriterSvc = CfgMgr.ActsMaterialTrackWriterSvc("ActsMaterialTrackWriterSvc")
- mTrackWriterSvc.OutputLevel = INFO
- mTrackWriterSvc.FilePath = "MaterialTracks_mapped.root"
- ServiceMgr += mTrackWriterSvc
-
-# sets up the extrapolation tool
-# this sets up the tracking geometry svc through the tracking geometry tool
-exTool = CfgMgr.ActsExtrapolationTool("ActsExtrapolationTool")
-exTool.OutputLevel = INFO
-exTool.FieldMode = "ATLAS"
-exTool.InteractionMultiScatering = True
-exTool.InteractionEloss = True
-exTool.InteractionRecord = True
-# The extrapolation tool accesses the trackinggeometry service
-# through this tool. This tool has the conditions dependencies
-# on the alignment GeoAlignmentStores (pseudo-alignment only right now).
-# For each event, the GAS for the IOV needs to be set from the algorithm.
-trkGeomTool = CfgMgr.ActsTrackingGeometryTool("ActsTrackingGeometryTool")
-trkGeomTool.OutputLevel = INFO;
-exTool.TrackingGeometryTool = trkGeomTool
-
-alg.ExtrapolationTool = exTool
-
-# Make the event heardbeat output a bit nicer
-eventPrintFrequency = 10000
-if hasattr(ServiceMgr,"AthenaEventLoopMgr"):
- ServiceMgr.AthenaEventLoopMgr.EventPrintoutInterval = eventPrintFrequency
-if hasattr(ServiceMgr,"AthenaHiveEventLoopMgr"):
- ServiceMgr.AthenaHiveEventLoopMgr.EventPrintoutInterval = eventPrintFrequency
-
-job += alg
-
-theApp.EvtMax = 10000
+# start from scratch with component accumulator
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from ActsGeometry.ActsGeometryConfig import ActsExtrapolationToolCfg
+from ActsGeometry.ActsGeometryConfig import ActsAlignmentCondAlgCfg
+
+def ActsExtrapolationAlgCfg(configFlags, name = "ActsExtrapolationAlg", **kwargs):
+ result = ComponentAccumulator()
+
+ if "ExtrapolationTool" not in kwargs:
+ extrapTool = ActsExtrapolationToolCfg(configFlags)
+ kwargs["ExtrapolationTool"] = extrapTool.getPrimary()
+ result.merge(extrapTool)
+
+ ActsExtrapolationAlg = CompFactory.ActsExtrapolationAlg
+ alg = ActsExtrapolationAlg(name, **kwargs)
+ result.addEventAlgo(alg)
+
+ return result
+
+if "__main__" == __name__:
+ from AthenaCommon.Configurable import Configurable
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import VERBOSE, INFO
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+ from ActsGeometry.ActsGeometryConfig import ActsMaterialTrackWriterSvcCfg
+ from ActsGeometry.ActsGeometryConfig import ActsExtrapolationToolCfg
+
+ Configurable.configurableRun3Behavior = True
+
+ ## Just enable ID for the moment.
+ ConfigFlags.Input.isMC = True
+ ConfigFlags.Beam.Type = ''
+ ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
+ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-SIM-00-00-00"
+ ConfigFlags.Detector.SimulateBpipe = True
+ ConfigFlags.Detector.SimulateID = True
+ ConfigFlags.Detector.GeometryBpipe = True
+ ConfigFlags.Detector.GeometryID = True
+ ConfigFlags.Detector.GeometryPixel = True
+ ConfigFlags.Detector.GeometrySCT = True
+ ConfigFlags.Detector.GeometryCalo = True
+ ConfigFlags.Detector.GeometryMuon = False
+ ConfigFlags.Detector.GeometryTRT = True
+ ConfigFlags.TrackingGeometry.MaterialSource = "material-maps.json"
+
+ ConfigFlags.Concurrency.NumThreads = 10
+ ConfigFlags.Concurrency.NumConcurrentEvents = 10
+
+ ConfigFlags.lock()
+ ConfigFlags.dump()
+
+ cfg = MainServicesCfg(ConfigFlags)
+
+ from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
+ cfg.merge(BeamPipeGeometryCfg(ConfigFlags))
+
+ alignCondAlgCfg = ActsAlignmentCondAlgCfg(ConfigFlags)
+
+ cfg.merge(alignCondAlgCfg)
+
+ cfg.merge(ActsMaterialTrackWriterSvcCfg("ActsMaterialTrackWriterSvc",
+ "MaterialTracks_mapped.root"))
+ print('DEF WRITER : ')
+ extrapol = ActsExtrapolationToolCfg(ConfigFlags,
+ InteractionMultiScatering = True,
+ InteractionEloss = True,
+ InteractionRecord = True)
+ cfg.merge(extrapol)
+
+ alg = ActsExtrapolationAlgCfg(ConfigFlags,
+ OutputLevel=INFO,
+ NParticlesPerEvent=int(1e4),
+ EtaRange=[-2.5, 2.5],
+ PtRange=[20, 100],
+ WriteMaterialTracks = True,
+ ExtrapolationTool=extrapol.getPrimary())
+
+ cfg.merge(alg)
+
+ cfg.printConfig()
+
+ log.info("CONFIG DONE")
+
+ cfg.run(100)
diff --git a/Tracking/Acts/ActsGeometry/share/ActsWriteTrackingGeometry.py b/Tracking/Acts/ActsGeometry/share/ActsWriteTrackingGeometry.py
index 6bdf79f04d72d20f359a127d1c8d743d07253715..847d14f72d2afc6f6801efd8ae30c2b24448c033 100644
--- a/Tracking/Acts/ActsGeometry/share/ActsWriteTrackingGeometry.py
+++ b/Tracking/Acts/ActsGeometry/share/ActsWriteTrackingGeometry.py
@@ -1,118 +1,91 @@
-import os
-import logging
-
-# Use Global flags and DetFlags.
-from AthenaCommon.DetFlags import DetFlags
-from AthenaCommon.GlobalFlags import globalflags
-
-from AthenaCommon.ConcurrencyFlags import jobproperties as jp
-from AthenaCommon.Logging import log as msg
-nThreads = jp.ConcurrencyFlags.NumThreads()
-# for some reason, the synchronization fails if we run in ST...
-if (nThreads < 1) :
- msg.fatal('numThreads must be >0. Did you set the --threads=N option?')
- sys.exit(AthenaCommon.ExitCodes.CONFIGURATION_ERROR)
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput = [
- "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/esd/100evts10lumiblocks.ESD.root"
-]
-
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-# build GeoModel
-import AthenaPython.ConfigLib as apcl
-cfg = apcl.AutoCfg(name = 'TrackingGeometryTest', input_files=athenaCommonFlags.FilesInput())
-
-cfg.configure_job()
-
-from AthenaCommon.GlobalFlags import globalflags
-if len(globalflags.ConditionsTag())!=0:
- from IOVDbSvc.CondDB import conddb
- conddb.setGlobalTag(globalflags.ConditionsTag())
-
-from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
-InDetGeometryFlags.useDynamicAlignFolders=True
-
-# Just the pixel and SCT
-DetFlags.ID_setOn()
-DetFlags.Calo_setOn()
-
-from AtlasGeoModel import GeoModelInit
-from AtlasGeoModel import SetGeometryVersion
-from SubDetectorEnvelopes.SubDetectorEnvelopesConfig import getEnvelopeDefSvc
-svcMgr += getEnvelopeDefSvc()
-
-
-from AthenaCommon.AlgScheduler import AlgScheduler
-AlgScheduler.OutputLevel( INFO )
-AlgScheduler.ShowControlFlow( True )
-AlgScheduler.ShowDataDependencies( True )
-AlgScheduler.EnableConditions( True )
-AlgScheduler.setDataLoaderAlg( "SGInputLoader" )
-
-## SET UP ALIGNMENT CONDITIONS ALGORITHM
-from IOVSvc.IOVSvcConf import CondSvc
-svcMgr += CondSvc( OutputLevel=INFO )
-from ActsGeometry import ActsGeometryConf
-from AthenaCommon.AlgSequence import AthSequencer
-condSeq = AthSequencer("AthCondSeq")
-
-condSeq += ActsGeometryConf.ActsAlignmentCondAlg("ActsAlignCondAlg",
- OutputLevel=VERBOSE)
-## END OF CONDITIONS SETUP
-
-
-from AthenaCommon.AppMgr import ServiceMgr
-
-# set up and configure the acts geometry construction
-from ActsGeometry.ActsGeometryConfig import ActsTrackingGeometrySvc
-trkGeomSvc = ActsTrackingGeometrySvc()
-# used for the proxies during material mapping
-trkGeomSvc.BarrelMaterialBins = [40, 60] # phi z
-trkGeomSvc.EndcapMaterialBins = [50, 20] # phi r
-trkGeomSvc.OutputLevel = INFO
-trkGeomSvc.BuildSubDetectors = [
- "Pixel",
- "SCT",
- # "TRT",
- # "Calo",
-]
-ServiceMgr += trkGeomSvc
-
-import MagFieldServices.SetupField
-
-from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
-
-trkGeomTool = CfgMgr.ActsTrackingGeometryTool("ActsTrackingGeometryTool")
-trkGeomTool.OutputLevel = INFO;
-
-# from ActsGeometry.ActsGeometryConf import ActsWriteTrackingGeometryTransforms
-# alg = ActsWriteTrackingGeometryTransforms(OutputLevel = VERBOSE)
-# alg.TrackingGeometryTool = trkGeomTool
-# job += alg
-
-mActsMaterialJsonWriterTool = CfgMgr.ActsMaterialJsonWriterTool("ActsMaterialJsonWriterTool")
-mActsMaterialJsonWriterTool.OutputLevel = VERBOSE
-mActsMaterialJsonWriterTool.FilePath = "geometry-maps.json"
-
-from ActsGeometry.ActsGeometryConf import ActsWriteTrackingGeometry
-alg = ActsWriteTrackingGeometry(OutputLevel = VERBOSE)
-alg.TrackingGeometryTool = trkGeomTool
-alg.ObjWriterTool.OutputDirectory = "obj"
-alg.ObjWriterTool.SubDetectors = ["Pixel", "SCT"]
-alg.MaterialJsonWriterTool = mActsMaterialJsonWriterTool
-
-job += alg
-
-
-# Make the event heardbeat output a bit nicer
-eventPrintFrequency = 100
-if hasattr(ServiceMgr,"AthenaEventLoopMgr"):
- ServiceMgr.AthenaEventLoopMgr.EventPrintoutInterval = eventPrintFrequency
-if hasattr(ServiceMgr,"AthenaHiveEventLoopMgr"):
- ServiceMgr.AthenaHiveEventLoopMgr.EventPrintoutInterval = eventPrintFrequency
+###############################################################
+#
+# Write the tracking geometry as a obj and json files.
+#
+###############################################################
+##########################################################################
+# start from scratch with component accumulator
-theApp.EvtMax = 1
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+from ActsGeometry.ActsGeometryConfig import ActsAlignmentCondAlgCfg
+from ActsGeometry.ActsGeometryConfig import ActsTrackingGeometryToolCfg
+from ActsGeometry.ActsGeometryConfig import ActsMaterialJsonWriterToolCfg
+from ActsGeometry.ActsGeometryConfig import ActsObjWriterToolCfg
+
+def ActsWriteTrackingGeometryCfg(configFlags, name="ActsWriteTrackingGeometry", **kwargs):
+
+ result = ComponentAccumulator()
+
+ acc, actsTrackingGeometryTool = ActsTrackingGeometryToolCfg(configFlags)
+ result.merge(acc)
+ ActsMaterialJsonWriterTool = ActsMaterialJsonWriterToolCfg(OutputFile = "geometry-maps.json",
+ processSensitives = False,
+ processnonmaterial = True)
+
+ kwargs["MaterialJsonWriterTool"] = ActsMaterialJsonWriterTool.getPrimary()
+ result.merge(ActsMaterialJsonWriterTool)
+
+ ActsObjWriterTool = ActsObjWriterToolCfg(OutputDirectory = "obj",
+ SubDetectors = ["Pixel", "SCT", "TRT"])
+
+ kwargs["ObjWriterTool"] = ActsObjWriterTool.getPrimary()
+ result.merge(ActsObjWriterTool)
+
+ ActsWriteTrackingGeometry = CompFactory.ActsWriteTrackingGeometry
+ alg = ActsWriteTrackingGeometry(name, **kwargs)
+ result.addEventAlgo(alg)
+
+ return result
+
+if "__main__" == __name__:
+ from AthenaCommon.Configurable import Configurable
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import VERBOSE, INFO
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+
+ Configurable.configurableRun3Behavior = True
+
+ ## Just enable ID for the moment.
+ ConfigFlags.Input.isMC = True
+ ConfigFlags.Beam.Type = ''
+ ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
+ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-SIM-00-00-00"
+ ConfigFlags.Detector.SimulateBpipe = False
+ ConfigFlags.Detector.SimulateID = False
+ ConfigFlags.Detector.GeometryBpipe = True
+ ConfigFlags.Detector.GeometryID = True
+ ConfigFlags.Detector.GeometryPixel = True
+ ConfigFlags.Detector.GeometrySCT = True
+ ConfigFlags.Detector.GeometryCalo = True
+ ConfigFlags.Detector.GeometryMuon = False
+ ConfigFlags.Detector.GeometryTRT = True
+
+ ConfigFlags.Concurrency.NumThreads = 1
+ ConfigFlags.Concurrency.NumConcurrentEvents = 1
+
+ ConfigFlags.lock()
+ ConfigFlags.dump()
+
+ cfg = MainServicesCfg(ConfigFlags)
+
+ from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
+ cfg.merge(BeamPipeGeometryCfg(ConfigFlags))
+
+ alignCondAlgCfg = ActsAlignmentCondAlgCfg(ConfigFlags)
+
+ cfg.merge(alignCondAlgCfg)
+
+ alg = ActsWriteTrackingGeometryCfg(ConfigFlags,
+ OutputLevel=VERBOSE)
+
+ cfg.merge(alg)
+
+ cfg.printConfig()
+
+ log.info("CONFIG DONE")
+
+ cfg.run(1)
\ No newline at end of file
diff --git a/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py b/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py
index 6da34c04734a022f5eb6cb07ff0d5c59107d6ce9..231efe63091a28f8ea2f25c2ffc6d7aa1f34e170 100644
--- a/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py
+++ b/Tracking/Acts/ActsGeometry/share/GeantinoMapping_jobOptions.py
@@ -1,6 +1,7 @@
#
# This is based on Tracking/TrkG4Components/TrkG4UserActions/share/GeantinoMapping_jobOptions.py
# Copied 11/04/2018
+# Updated 22/09/2020
#
@@ -17,7 +18,8 @@ from AthenaCommon.AlgSequence import AlgSequence
topSeq = AlgSequence()
#--- Output threshold (DEBUG, INFO, WARNING, ERROR, FATAL) ----
-#from AthenaCommon.AppMgr import ServiceMgr
+from AthenaCommon.AppMgr import ServiceMgr
+from AthenaCommon.Constants import VERBOSE, INFO
ServiceMgr.MessageSvc.OutputLevel = INFO
ServiceMgr.MessageSvc.defaultLimit = 20000
@@ -50,37 +52,39 @@ if 'myPt' not in dir() :
if 'myGeo' not in dir() :
myGeo = 'ATLAS-R2-2016-00-00-00'
-print 'Random seeds and offset as calcluated by jobOptions ', myRandomSeed1, ' ', myRandomSeed2, ' offset - ', myRandomOffset
+print('Random seeds and offset as calcluated by jobOptions ', myRandomSeed1, ' ', myRandomSeed2, ' offset - ', myRandomOffset)
# Set everything to ATLAS
DetFlags.ID_setOn()
-DetFlags.Calo_setOff()
+DetFlags.Calo_setOn()
DetFlags.Muon_setOff()
# the global flags
globalflags.ConditionsTag = 'OFLCOND-SIM-00-00-00'
-print globalflags.ConditionsTag
+print(globalflags.ConditionsTag)
#--- AthenaCommon flags ---------------------------------------
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
athenaCommonFlags.PoolEvgenInput.set_Off() ### is this necessary?
athenaCommonFlags.PoolHitsOutput = 'Hits.pool.root'
-athenaCommonFlags.EvtMax = 1000000
+athenaCommonFlags.EvtMax = 100000
#--- Simulation flags -----------------------------------------
from G4AtlasApps.SimFlags import simFlags
simFlags.load_atlas_flags() # Going to use an ATLAS layout
simFlags.SimLayout = myGeo
+simFlags.RunNumber = 284500 # MC16a run number used for all Run2 simulation
simFlags.EventFilter.set_Off()
+
myMinEta = -2.5
myMaxEta = 2.5
myPDG = 999 # 999 = Geantinos, 13 = Muons
include("GeneratorUtils/StdEvgenSetup.py")
-theApp.EvtMax = 20000
+theApp.EvtMax = 100000
import ParticleGun as PG
pg = PG.ParticleGun()
@@ -137,7 +141,10 @@ include("G4AtlasApps/G4Atlas.flat.configuration.py")
from AthenaCommon.CfgGetter import getAlgorithm
topSeq += getAlgorithm("BeamEffectsAlg", tryDefaultConfigurable=True)
-## Populate alg sequence
+from AthenaCommon.CfgGetter import getPublicTool
+topSeq.BeamEffectsAlg.GenEventManipulators = [getPublicTool("GenEventValidityChecker")]
+
+# Populate alg sequence
topSeq += getAlgorithm("G4AtlasAlg",tryDefaultConfigurable=True)
# Conditions sequence for Athena MT
diff --git a/Tracking/Acts/ActsGeometry/src/ActsAlignmentCondAlg.cxx b/Tracking/Acts/ActsGeometry/src/ActsAlignmentCondAlg.cxx
index 59ded683bf4b4cac9256b2bb39d4520635c9308d..97bbf4df466a8dec5405f29d02baeb5fa5592296 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsAlignmentCondAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsAlignmentCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ActsGeometry/ActsAlignmentCondAlg.h"
@@ -11,9 +11,6 @@
#include "GaudiKernel/EventIDRange.h"
#include "GaudiKernel/ICondSvc.h"
#include "GeoModelKernel/GeoAlignableTransform.h"
-#include "PixelReadoutGeometry/PixelDetectorManager.h"
-#include "SCT_ReadoutGeometry/SCT_DetectorManager.h"
-#include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
#include "StoreGate/StoreGateSvc.h"
#include "StoreGate/WriteCondHandle.h"
@@ -50,10 +47,6 @@ StatusCode ActsAlignmentCondAlg::initialize() {
return StatusCode::FAILURE;
}
- ATH_CHECK(detStore()->retrieve(p_pixelManager, "Pixel"));
- ATH_CHECK(detStore()->retrieve(p_SCTManager, "SCT"));
- ATH_CHECK(detStore()->retrieve(p_TRTManager, "TRT"));
-
if (m_wchk.initialize().isFailure()) {
ATH_MSG_ERROR("unable to initialize WriteCondHandle with key"
<< m_wchk.key());
diff --git a/Tracking/Acts/ActsGeometry/src/ActsCaloTrackingVolumeBuilder.cxx b/Tracking/Acts/ActsGeometry/src/ActsCaloTrackingVolumeBuilder.cxx
index b80997c2103c6c5d0c6ee796d8277c42047a6389..ee264d2380084919ec1b81bad440370398d83bc2 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsCaloTrackingVolumeBuilder.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsCaloTrackingVolumeBuilder.cxx
@@ -25,7 +25,6 @@
#include <fstream>
-using namespace Acts::VectorHelpers;
using Box = Acts::Volume::BoundingBox; // shortcut
using CVBBV = Acts::CylinderVolumeBounds::BoundValues;
@@ -96,7 +95,7 @@ ActsCaloTrackingVolumeBuilder::trackingVolume(
}
std::shared_ptr<Acts::TrackingVolume> calo
- = Acts::TrackingVolume::create(std::make_shared<Acts::Transform3D>(Acts::Transform3D::Identity()),
+ = Acts::TrackingVolume::create(Acts::Transform3D::Identity(),
caloVolBounds,
std::move(boxStore),
std::move(cellVols),
@@ -261,12 +260,8 @@ ActsCaloTrackingVolumeBuilder::trackingVolume(
tVolOrdPosNeg, std::move(binUtilityPosNeg));
double chokeZOffset = caloDZ2 + (caloDZ1 - caloDZ2)/2.;
- auto posTrf
- = std::make_shared<const Acts::Transform3D>(
- Acts::Translation3D(Acts::Vector3D::UnitZ()*chokeZOffset));
- auto negTrf
- = std::make_shared<const Acts::Transform3D>(
- Acts::Translation3D(Acts::Vector3D::UnitZ()* -1 *chokeZOffset));
+ Acts::Transform3D posTrf(Acts::Translation3D(Acts::Vector3D::UnitZ() * chokeZOffset));
+ Acts::Transform3D negTrf(Acts::Translation3D(Acts::Vector3D::UnitZ()* -1 *chokeZOffset));
auto posNegCylBounds = std::make_shared<Acts::CylinderVolumeBounds>(
caloRMin, caloRMax, (caloDZ1 - caloDZ2) / 2.);
@@ -296,23 +291,21 @@ ActsCaloTrackingVolumeBuilder::trackingVolume(
= std::make_shared<const Acts::BinnedArrayXD<Acts::TrackingVolumePtr>>(
tVolOrderedCtr, std::move(binUtilityCtr));
- auto ctrContainer = Acts::TrackingVolume::create(
- std::make_shared<const Acts::Transform3D>(Acts::Transform3D::Identity()),
- std::make_shared<Acts::CylinderVolumeBounds>(
- caloRMin, caloRMax, caloDZ2),
- tVolArrCtr);
+auto ctrContainer = Acts::TrackingVolume::create(Acts::Transform3D::Identity(),
+ std::make_shared<Acts::CylinderVolumeBounds>(
+ caloRMin, caloRMax, caloDZ2),
+ tVolArrCtr);
ATH_MSG_VERBOSE("Built central container " << *ctrContainer);
ATH_MSG_VERBOSE("- containing: " << idContainer->volumeName() << ", " << calo->volumeName());
// and now combine those together into another one
Acts::TrackingVolumeArrayCreator tvac{Acts::TrackingVolumeArrayCreator::Config{}};
- auto mainContainer = Acts::TrackingVolume::create(
- std::make_shared<const Acts::Transform3D>(Acts::Transform3D::Identity()),
- std::make_shared<Acts::CylinderVolumeBounds>(
- caloRMin, caloRMax, caloDZ1),
- tvac.trackingVolumeArray(gctx, {negContainer, ctrContainer, posContainer},
- Acts::binZ));
+auto mainContainer = Acts::TrackingVolume::create(Acts::Transform3D::Identity(),
+ std::make_shared<Acts::CylinderVolumeBounds>(
+ caloRMin, caloRMax, caloDZ1),
+ tvac.trackingVolumeArray(gctx, {negContainer, ctrContainer, posContainer},
+ Acts::binZ));
ATH_MSG_VERBOSE("Built main container: " << *mainContainer);
@@ -323,6 +316,7 @@ std::shared_ptr<Acts::CutoutCylinderVolumeBounds>
ActsCaloTrackingVolumeBuilder::makeCaloVolumeBounds(const std::vector<std::unique_ptr<Box>>& boxStore,
std::shared_ptr<const Acts::TrackingVolume> insideVolume) const
{
+ using namespace Acts::VectorHelpers;
// determine the dimensions of the
double rmin_at_center = std::numeric_limits<double>::max();
double rmin_at_choke = std::numeric_limits<double>::max();
@@ -535,11 +529,11 @@ ActsCaloTrackingVolumeBuilder::build_endcap(double z,
p7 = glob2vol * p7;
p8 = glob2vol * p8;
- auto globalToLocal = std::make_shared<Acts::Transform3D>(glob2vol.inverse());
+ auto globalToLocal = glob2vol.inverse();
auto cubo = std::make_shared<Acts::GenericCuboidVolumeBounds>(
std::array<Acts::Vector3D, 8>({{p1, p2, p3, p4, p5, p6, p7, p8}}));
- Acts::AbstractVolume vol(std::move(globalToLocal), std::move(cubo));
+ Acts::AbstractVolume vol(globalToLocal, std::move(cubo));
return vol;
}
@@ -607,12 +601,12 @@ ActsCaloTrackingVolumeBuilder::build_barrel(double r,
p7 = glob2vol * p7;
p8 = glob2vol * p8;
- auto globalToLocal = std::make_shared<Acts::Transform3D>(glob2vol.inverse());
+ auto globalToLocal = glob2vol.inverse();
auto cubo = std::make_shared<Acts::GenericCuboidVolumeBounds>(
std::array<Acts::Vector3D, 8>({{p1, p2, p3, p4, p5, p6, p7, p8}}));
- Acts::AbstractVolume vol(std::move(globalToLocal), std::move(cubo));
+ Acts::AbstractVolume vol(globalToLocal, std::move(cubo));
return vol;
}
@@ -657,11 +651,11 @@ ActsCaloTrackingVolumeBuilder::build_box(double x, double dx, double y, double d
p7 = glob2vol * p7;
p8 = glob2vol * p8;
- auto globalToLocal = std::make_shared<Acts::Transform3D>(glob2vol.inverse());
+ auto globalToLocal = glob2vol.inverse();
auto cubo = std::make_shared<Acts::GenericCuboidVolumeBounds>(
std::array<Acts::Vector3D, 8>({{p1, p2, p3, p4, p5, p6, p7, p8}}));
- Acts::AbstractVolume vol(std::move(globalToLocal), std::move(cubo));
+ Acts::AbstractVolume vol(globalToLocal, std::move(cubo));
return vol;
}
diff --git a/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx b/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx
index 44d708d65b0633b68126591140e9cf79b1161dc1..fd65d733545cec34b7dc5ddddca1d22819aeebd2 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx
@@ -90,12 +90,12 @@ ActsDetectorElement::ActsDetectorElement(
}
ActsDetectorElement::ActsDetectorElement(
- std::shared_ptr<const Transform3D> trf,
+ const Acts::Transform3D& trf,
const InDetDD::TRT_BaseElement* detElem,
const Identifier& id)
{
m_detElement = detElem;
- m_defTransform = trf;
+ m_defTransform = std::make_shared<const Acts::Transform3D>(trf);
m_explicitIdentifier = id;
// we know this is a straw
diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
index 30b177811a3716c43f13291367ec44849cf058bd..5f6e7775d878d7b19f562af99871a912a1a03643 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
@@ -119,14 +119,15 @@ StatusCode ActsExtrapolationAlg::execute(const EventContext &ctx) const {
// Perigee, no alignment -> default geo context
ActsGeometryContext gctx = m_extrapolationTool->trackingGeometryTool()
->getNominalGeometryContext();
- auto anygctx = gctx.any();
- Acts::BoundParameters startParameters(
- anygctx, std::move(cov), std::move(pars), std::move(surface));
+ Acts::BoundTrackParameters startParameters(std::move(surface), std::move(pars), std::move(cov));
output = m_extrapolationTool->propagationSteps(ctx, startParameters);
if(output.first.size() == 0) {
ATH_MSG_WARNING("Got ZERO steps from the extrapolation tool");
}
- m_propStepWriterSvc->write(output.first);
+ if (m_writePropStep) {
+ m_propStepWriterSvc->write(output.first);
+ }
+
if(m_writeMaterialTracks){
Acts::RecordedMaterialTrack track;
track.first.first = Acts::Vector3D(0,0,0);
diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
index 6c5d6459b1885cef9b09d74186ca93c444a2f840..27fc064a397a80a395158add89a0f8e1b4fc696d 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
@@ -110,7 +110,7 @@ ActsExtrapolationTool::initialize()
ActsPropagationOutput
ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir /*= Acts::forward*/,
double pathLimit /*= std::numeric_limits<double>::max()*/) const
{
@@ -125,15 +125,13 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
// Action list and abort list
using ActionList =
- Acts::ActionList<SteppingLogger, Acts::MaterialInteractor, DebugOutput>;
+ Acts::ActionList<SteppingLogger, Acts::MaterialInteractor>;
using AbortConditions = Acts::AbortList<EndOfWorld>;
using Options = Acts::PropagatorOptions<ActionList, AbortConditions>;
Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger});
options.pathLimit = pathLimit;
- bool debug = msg().level() == MSG::VERBOSE;
- options.debug = debug;
options.loopProtection
= (Acts::VectorHelpers::perp(startParameters.momentum())
@@ -147,7 +145,6 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
mInteractor.recordInteractions = m_interactionRecord;
ActsPropagationOutput output;
- DebugOutput::result_type debugOutput;
auto res = boost::apply_visitor([&](const auto& propagator) -> ResultType {
auto result = propagator.propagate(startParameters, options);
@@ -157,12 +154,11 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
auto& propRes = *result;
auto steppingResults = propRes.template get<SteppingLogger::result_type>();
- auto debugOutput = propRes.template get<DebugOutput::result_type>();
auto materialResult = propRes.template get<Acts::MaterialInteractor::result_type>();
output.first = std::move(steppingResults.steps);
output.second = std::move(materialResult);
// try to force return value optimization, not sure this is necessary
- return std::make_pair(std::move(output), std::move(debugOutput));
+ return std::move(output);
}, *m_varProp);
if (!res.ok()) {
@@ -171,11 +167,7 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
<< ". Returning empty step vector.");
return {};
}
- std::tie(output, debugOutput) = std::move(*res);
-
- if(debug) {
- ATH_MSG_VERBOSE(debugOutput.debugString);
- }
+ output = std::move(*res);
ATH_MSG_VERBOSE("Collected " << output.first.size() << " steps");
if(output.first.size() == 0) {
@@ -189,9 +181,9 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
-std::unique_ptr<const Acts::CurvilinearParameters>
+std::unique_ptr<const Acts::CurvilinearTrackParameters>
ActsExtrapolationTool::propagate(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir /*= Acts::forward*/,
double pathLimit /*= std::numeric_limits<double>::max()*/) const
{
@@ -205,15 +197,12 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
auto anygctx = gctx.any();
// Action list and abort list
- using ActionList =
- Acts::ActionList<Acts::MaterialInteractor, DebugOutput>;
+ using ActionList = Acts::ActionList<Acts::MaterialInteractor>;
using AbortConditions = Acts::AbortList<EndOfWorld>;
using Options = Acts::PropagatorOptions<ActionList, AbortConditions>;
Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger});
options.pathLimit = pathLimit;
- bool debug = msg().level() == MSG::VERBOSE;
- options.debug = debug;
options.loopProtection
= (Acts::VectorHelpers::perp(startParameters.momentum())
@@ -226,7 +215,7 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
mInteractor.energyLoss = m_interactionEloss;
mInteractor.recordInteractions = m_interactionRecord;
- auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::unique_ptr<const Acts::CurvilinearParameters> {
+ auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::unique_ptr<const Acts::CurvilinearTrackParameters> {
auto result = propagator.propagate(startParameters, options);
if (!result.ok()) {
ATH_MSG_ERROR("Got error during propagation:" << result.error()
@@ -241,7 +230,7 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
ActsPropagationOutput
ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
Acts::NavigationDirection navDir /*= Acts::forward*/,
double pathLimit /*= std::numeric_limits<double>::max()*/) const
@@ -257,14 +246,12 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
// Action list and abort list
using ActionList =
- Acts::ActionList<SteppingLogger, Acts::MaterialInteractor, DebugOutput>;
+ Acts::ActionList<SteppingLogger, Acts::MaterialInteractor>;
using AbortConditions = Acts::AbortList<EndOfWorld>;
using Options = Acts::PropagatorOptions<ActionList, AbortConditions>;
Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger});
options.pathLimit = pathLimit;
- bool debug = msg().level() == MSG::VERBOSE;
- options.debug = debug;
options.loopProtection
= (Acts::VectorHelpers::perp(startParameters.momentum())
@@ -278,7 +265,6 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
mInteractor.recordInteractions = m_interactionRecord;
ActsPropagationOutput output;
- DebugOutput::result_type debugOutput;
auto res = boost::apply_visitor([&](const auto& propagator) -> ResultType {
auto result = propagator.propagate(startParameters, target, options);
@@ -288,11 +274,10 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
auto& propRes = *result;
auto steppingResults = propRes.template get<SteppingLogger::result_type>();
- auto debugOutput = propRes.template get<DebugOutput::result_type>();
auto materialResult = propRes.template get<Acts::MaterialInteractor::result_type>();
output.first = std::move(steppingResults.steps);
output.second = std::move(materialResult);
- return std::make_pair(std::move(output), std::move(debugOutput));
+ return std::move(output);
}, *m_varProp);
if (!res.ok()) {
@@ -300,11 +285,7 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
<< ". Returning empty step vector.");
return {};
}
- std::tie(output, debugOutput) = std::move(*res);
-
- if(debug) {
- ATH_MSG_VERBOSE(debugOutput.debugString);
- }
+ output = std::move(*res);
ATH_MSG_VERBOSE("Collected " << output.first.size() << " steps");
ATH_MSG_VERBOSE(name() << "::" << __FUNCTION__ << " end");
@@ -312,9 +293,9 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
return output;
}
-std::unique_ptr<const Acts::BoundParameters>
+std::unique_ptr<const Acts::BoundTrackParameters>
ActsExtrapolationTool::propagate(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
Acts::NavigationDirection navDir /*= Acts::forward*/,
double pathLimit /*= std::numeric_limits<double>::max()*/) const
@@ -330,14 +311,12 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
// Action list and abort list
using ActionList =
- Acts::ActionList<Acts::MaterialInteractor, DebugOutput>;
+ Acts::ActionList<Acts::MaterialInteractor>;
using AbortConditions = Acts::AbortList<EndOfWorld>;
using Options = Acts::PropagatorOptions<ActionList, AbortConditions>;
Options options(anygctx, mctx, Acts::LoggerWrapper{*m_logger});
options.pathLimit = pathLimit;
- bool debug = msg().level() == MSG::VERBOSE;
- options.debug = debug;
options.loopProtection
= (Acts::VectorHelpers::perp(startParameters.momentum())
@@ -350,7 +329,7 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
mInteractor.energyLoss = m_interactionEloss;
mInteractor.recordInteractions = m_interactionRecord;
- auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::unique_ptr<const Acts::BoundParameters> {
+ auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::unique_ptr<const Acts::BoundTrackParameters> {
auto result = propagator.propagate(startParameters, target, options);
if (!result.ok()) {
ATH_MSG_ERROR("Got error during propagation: " << result.error()
diff --git a/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx b/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx
index 05c2f7deefd5fe279ee22e35628a26f7073f1453..60dcbfb12ff320020cf2beb2236ad47ec3d27464 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx
@@ -181,8 +181,7 @@ ActsLayerBuilder::buildLayers(const Acts::GeometryContext& gctx,
double layerHalfZ
= std::abs(pl.max(Acts::binZ) + pl.envelope[Acts::binZ].second - layerZ);
- auto transform
- = std::make_shared<const Transform3D>(Translation3D(0., 0., -layerZ));
+ Transform3D transform(Translation3D(0., 0., -layerZ));
// set up approach descriptor
std::shared_ptr<Acts::CylinderSurface> innerBoundary
@@ -252,62 +251,55 @@ ActsLayerBuilder::buildLayers(const Acts::GeometryContext& gctx,
if (std::abs(layerZInner) > std::abs(layerZOuter)) std::swap(layerZInner, layerZOuter);
- auto transformNominal
- = std::make_shared<const Transform3D>(Translation3D(0., 0., layerZ));
+ Transform3D transformNominal(Translation3D(0., 0., layerZ));
+ Transform3D transformInner(Translation3D(0., 0., layerZInner));
+ Transform3D transformOuter(Translation3D(0., 0., layerZOuter));
- auto transformInner
- = std::make_shared<const Transform3D>(Translation3D(0., 0., layerZInner));
+ std::shared_ptr<Acts::DiscSurface> innerBoundary = Acts::Surface::makeShared<Acts::DiscSurface>(transformInner, pl.min(Acts::binR), pl.max(Acts::binR));
- auto transformOuter
- = std::make_shared<const Transform3D>(Translation3D(0., 0., layerZOuter));
+ std::shared_ptr<Acts::DiscSurface> nominalSurface = Acts::Surface::makeShared<Acts::DiscSurface>(transformNominal, pl.min(Acts::binR), pl.max(Acts::binR));
- std::shared_ptr<Acts::DiscSurface> innerBoundary
- = Acts::Surface::makeShared<Acts::DiscSurface>(transformInner, pl.min(Acts::binR), pl.max(Acts::binR));
+ std::shared_ptr<Acts::DiscSurface> outerBoundary = Acts::Surface::makeShared<Acts::DiscSurface>(transformOuter, pl.min(Acts::binR), pl.max(Acts::binR));
- std::shared_ptr<Acts::DiscSurface> nominalSurface
- = Acts::Surface::makeShared<Acts::DiscSurface>(transformNominal, pl.min(Acts::binR), pl.max(Acts::binR));
+ size_t matBinsPhi = m_cfg.endcapMaterialBins.first;
+ size_t matBinsR = m_cfg.endcapMaterialBins.second;
- std::shared_ptr<Acts::DiscSurface> outerBoundary
- = Acts::Surface::makeShared<Acts::DiscSurface>(transformOuter, pl.min(Acts::binR), pl.max(Acts::binR));
+ Acts::BinUtility materialBinUtil(
+ matBinsPhi, -M_PI, M_PI, Acts::closed, Acts::binPhi);
+ materialBinUtil += Acts::BinUtility(
+ matBinsR, pl.min(Acts::binR), pl.max(Acts::binR), Acts::open, Acts::binR, transformNominal);
- size_t matBinsPhi = m_cfg.endcapMaterialBins.first;
- size_t matBinsR = m_cfg.endcapMaterialBins.second;
+ materialProxy = std::make_shared<const Acts::ProtoSurfaceMaterial>(materialBinUtil);
- Acts::BinUtility materialBinUtil(
- matBinsPhi, -M_PI, M_PI, Acts::closed, Acts::binPhi);
- materialBinUtil += Acts::BinUtility(
- matBinsR, pl.min(Acts::binR), pl.max(Acts::binR), Acts::open, Acts::binR, transformNominal);
+ ACTS_VERBOSE("[L] Layer is marked to carry support material on Surface ( "
+ "inner=0 / center=1 / outer=2 ) : "
+ << "inner");
+ ACTS_VERBOSE("with binning: [" << matBinsPhi << ", " << matBinsR << "]");
- materialProxy
- = std::make_shared<const Acts::ProtoSurfaceMaterial>(materialBinUtil);
+ ACTS_VERBOSE("Created ApproachSurfaces for disc layer at:");
+ ACTS_VERBOSE(" - inner: Z=" << layerZInner);
+ ACTS_VERBOSE(" - central: Z=" << layerZ);
+ ACTS_VERBOSE(" - outer: Z=" << layerZOuter);
- ACTS_VERBOSE("[L] Layer is marked to carry support material on Surface ( "
- "inner=0 / center=1 / outer=2 ) : " << "inner");
- ACTS_VERBOSE("with binning: [" << matBinsPhi << ", " << matBinsR << "]");
+ // set material on inner
+ // @TODO: make this configurable somehow
+ innerBoundary->assignSurfaceMaterial(materialProxy);
- ACTS_VERBOSE("Created ApproachSurfaces for disc layer at:");
- ACTS_VERBOSE(" - inner: Z=" << layerZInner);
- ACTS_VERBOSE(" - central: Z=" << layerZ);
- ACTS_VERBOSE(" - outer: Z=" << layerZOuter);
-
-
- // set material on inner
- // @TODO: make this configurable somehow
- innerBoundary->assignSurfaceMaterial(materialProxy);
+ int nModPhi = std::numeric_limits<int>::max();
+ int nModR = 0;
- int nModPhi = std::numeric_limits<int>::max();
- int nModR = 0;
-
- // want to figure out bins in phi
- for (const auto& srf : layerSurfaces) {
- auto elm = dynamic_cast<const ActsDetectorElement*>(srf->associatedDetectorElement());
- if (elm){
- auto id = elm->identityHelper();
- int phi_mod_max = id.phi_module_max();
- int eta_mod_max = id.eta_module_max();
- nModPhi = std::min(nModPhi, phi_mod_max+1);
- nModR = eta_mod_max+1;
- }
+ // want to figure out bins in phi
+ for (const auto &srf : layerSurfaces)
+ {
+ auto elm = dynamic_cast<const ActsDetectorElement *>(srf->associatedDetectorElement());
+ if (elm)
+ {
+ auto id = elm->identityHelper();
+ int phi_mod_max = id.phi_module_max();
+ int eta_mod_max = id.eta_module_max();
+ nModPhi = std::min(nModPhi, phi_mod_max + 1);
+ nModR = eta_mod_max + 1;
+ }
}
ACTS_VERBOSE("Identifier reports: " << nModPhi << " is lowest for " << nModR << " r-rings");
diff --git a/Tracking/Acts/ActsGeometry/src/ActsMaterialJsonWriterTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsMaterialJsonWriterTool.cxx
index b13694f69ac0b6c95fc8a4c37196315722870fc6..665eaa8bc4226fb1512517273ef7992964c53a89 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsMaterialJsonWriterTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsMaterialJsonWriterTool.cxx
@@ -4,6 +4,8 @@
#include "ActsGeometry/ActsMaterialJsonWriterTool.h"
+#include "ActsInterop/Logger.h"
+
#include <fstream>
#include <ios>
#include <iostream>
@@ -24,15 +26,24 @@ ActsMaterialJsonWriterTool::initialize()
{
ATH_MSG_INFO("Starting Material writer");
+ m_cfg.name = "JsonGeometryConverter";
+ m_cfg.logger = makeActsAthenaLogger(this, "JsonGeometryConverter");
+ m_cfg.processSensitives = m_processSensitives;
+ m_cfg.processApproaches = m_processApproaches;
+ m_cfg.processRepresenting = m_processRepresenting;
+ m_cfg.processBoundaries = m_processBoundaries;
+ m_cfg.processVolumes = m_processVolumes;
+ m_cfg.processDenseVolumes = m_processDenseVolumes;
+ m_cfg.processnonmaterial = m_processnonmaterial;
+
return StatusCode::SUCCESS;
}
void
ActsMaterialJsonWriterTool::write(const Acts::JsonGeometryConverter::DetectorMaterialMaps& detMaterial) const
{
- Acts::JsonGeometryConverter::Config cfg;
// Evoke the converter
- Acts::JsonGeometryConverter jmConverter(cfg);
+ Acts::JsonGeometryConverter jmConverter(m_cfg);
auto jout = jmConverter.materialMapsToJson(detMaterial);
// And write the file
std::ofstream ofj(m_filePath);
@@ -42,9 +53,9 @@ ActsMaterialJsonWriterTool::write(const Acts::JsonGeometryConverter::DetectorMat
void
ActsMaterialJsonWriterTool::write(const Acts::TrackingGeometry& tGeometry) const
{
- Acts::JsonGeometryConverter::Config cfg;
+
// Evoke the converter
- Acts::JsonGeometryConverter jmConverter(cfg);
+ Acts::JsonGeometryConverter jmConverter(m_cfg);
auto jout = jmConverter.trackingGeometryToJson(tGeometry);
// And write the file
std::ofstream ofj(m_filePath);
diff --git a/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx b/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
index ae6842218a4b7e3d22e60df21fb8ff5127a8d53e..26c49f5b24666efb9511b678d5ee848420404e23 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
@@ -32,7 +32,6 @@
//TEST
#include "Acts/EventData/NeutralTrackParameters.hpp"
#include "Acts/Propagator/ActionList.hpp"
-#include "Acts/Propagator/DebugOutputActor.hpp"
#include "Acts/Propagator/Navigator.hpp"
#include "Acts/Propagator/Propagator.hpp"
#include "Acts/Propagator/StandardAborters.hpp"
diff --git a/Tracking/Acts/ActsGeometry/src/ActsMaterialStepConverterTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsMaterialStepConverterTool.cxx
index 9d1c0703ad4c35317020cad8830c1da9463d97b2..aaafb14947327ddf6b22c3df0af87d4109f411ba 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsMaterialStepConverterTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsMaterialStepConverterTool.cxx
@@ -14,7 +14,7 @@
#include "TrkGeometry/MaterialStep.h"
// ACTS
-#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialSlab.hpp"
// STL
#include <iostream>
@@ -65,9 +65,9 @@ ActsMaterialStepConverterTool::convertToMaterialTrack(const Trk::MaterialStepCol
Acts::MaterialInteraction interaction;
Acts::Vector3D pos{step->hitX(), step->hitY(), step->hitZ()};
- Acts::MaterialProperties matProp(step->x0(), step->l0(), step->A(), step->Z(), step->rho(),step->steplength());
+ Acts::MaterialSlab matProp(Acts::Material::fromMassDensity(step->x0(), step->l0(), step->A(), step->Z(), step->rho()),step->steplength());
interaction.position = pos;
- interaction.materialProperties = matProp;
+ interaction.materialSlab = matProp;
sum_X0 += step->steplengthInX0();
sum_L0 += step->steplengthInL0();
nStep.push_back(interaction);
diff --git a/Tracking/Acts/ActsGeometry/src/ActsMaterialTrackWriterSvc.cxx b/Tracking/Acts/ActsGeometry/src/ActsMaterialTrackWriterSvc.cxx
index dd5b9ad679b3cb19b64ea336ec5df7975e5fc020..3116a28d45358d03f20ed1ab4cd71bbf47c0798f 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsMaterialTrackWriterSvc.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsMaterialTrackWriterSvc.cxx
@@ -8,7 +8,7 @@
#include "TTree.h"
#include "TFile.h"
-#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialSlab.hpp"
#include "Acts/Utilities/Helpers.hpp"
using namespace Acts::VectorHelpers;
@@ -220,7 +220,7 @@ ActsMaterialTrackWriterSvc::doWrite(const Acts::RecordedMaterialTrack& mTrack)
m_step_ez.push_back(posPos.z());
// the material information
- const auto& mprops = mint.materialProperties;
+ const auto& mprops = mint.materialSlab;
m_step_length.push_back(mprops.thickness());
m_step_X0.push_back(mprops.material().X0());
m_step_L0.push_back(mprops.material().L0());
diff --git a/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx b/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx
index 003a5e3b2fd0feaedac2adb9e4a73dd66044c8d0..6229793ec97c2e20f0f6de51dfa8761f43da190f 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsPropStepRootWriterSvc.cxx
@@ -120,7 +120,7 @@ ActsPropStepRootWriterSvc::writeThread()
void
ActsPropStepRootWriterSvc::doWrite(const StepVector& steps, size_t evtNum)
{
- using ag = Acts::GeometryID;
+ using ag = Acts::GeometryIdentifier;
m_eventNum = evtNum;
m_s_pX.clear();
@@ -134,14 +134,14 @@ ActsPropStepRootWriterSvc::doWrite(const StepVector& steps, size_t evtNum)
m_s_sensitiveID.clear();
for(const auto& step : steps) {
- Acts::GeometryID::Value volumeID = 0;
- Acts::GeometryID::Value boundaryID = 0;
- Acts::GeometryID::Value layerID = 0;
- Acts::GeometryID::Value approachID = 0;
- Acts::GeometryID::Value sensitiveID = 0;
+ Acts::GeometryIdentifier::Value volumeID = 0;
+ Acts::GeometryIdentifier::Value boundaryID = 0;
+ Acts::GeometryIdentifier::Value layerID = 0;
+ Acts::GeometryIdentifier::Value approachID = 0;
+ Acts::GeometryIdentifier::Value sensitiveID = 0;
// get the identification from the surface first
if (step.surface) {
- auto geoID = step.surface->geoID();
+ auto geoID = step.surface->geometryId();
sensitiveID = geoID.sensitive();
approachID = geoID.approach();
layerID = geoID.layer();
@@ -150,7 +150,7 @@ ActsPropStepRootWriterSvc::doWrite(const StepVector& steps, size_t evtNum)
}
// a current volume overwrites the surface tagged one
if (step.volume) {
- volumeID = step.volume->geoID().volume();
+ volumeID = step.volume->geometryId().volume();
}
// now fill
m_s_sensitiveID.push_back(sensitiveID);
diff --git a/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx b/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx
index 214222de2aa8563f91f857fb5ca19c3c7ef3683b..4452202ca1606d56fd2f7d00b89627f6edd555ef 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx
@@ -28,9 +28,6 @@
#include <iostream>
#include <fstream>
-using Acts::Transform3D;
-using Acts::Vector3D;
-
using namespace Acts::UnitLiterals;
const Acts::LayerVector
@@ -112,9 +109,9 @@ ActsStrawLayerBuilder::centralLayers(const Acts::GeometryContext& gctx)
for(unsigned int istraw=0;istraw<nStraws;istraw++) {
- auto trf = std::make_shared<Transform3D>(brlElem->strawTransform(istraw));
+ Acts::Transform3D trf = brlElem->strawTransform(istraw);
// need to convert translation to length unit
- trf->translation() *= 1_mm;
+ trf.translation() *= 1_mm;
auto code = brlElem->getCode();
Identifier straw_id = m_cfg.idHelper->straw_id(code.isPosZ() == 1 ? 1 : -1,
code.getPhiIndex(),
@@ -137,7 +134,7 @@ ActsStrawLayerBuilder::centralLayers(const Acts::GeometryContext& gctx)
fudge = radius / 4.;
// calculate min/max R and Z
- Vector3D ctr = straw->center(gctx);
+ Acts::Vector3D ctr = straw->center(gctx);
ext.max(Acts::binR) = std::max(ext.max(Acts::binR), ctr.perp() + radius);
ext.min(Acts::binR) = std::min(ext.min(Acts::binR), ctr.perp() - radius);
ext.max(Acts::binZ) = std::max(ext.max(Acts::binZ), ctr.z() + length);
@@ -211,9 +208,9 @@ ActsStrawLayerBuilder::endcapLayers(const Acts::GeometryContext& gctx, int side)
for(unsigned int istraw=0;istraw<nStraws;istraw++) {
- auto trf = std::make_shared<Transform3D>(ecElem->strawTransform(istraw));
+ Acts::Transform3D trf = (ecElem->strawTransform(istraw));
// need to convert translation to length unit
- trf->translation() *= 1_mm;
+ trf.translation() *= 1_mm;
auto code = ecElem->getCode();
Identifier straw_id = m_cfg.idHelper->straw_id(code.isPosZ() == 1 ? 2 : -2,
@@ -235,7 +232,7 @@ ActsStrawLayerBuilder::endcapLayers(const Acts::GeometryContext& gctx, int side)
double radius = strawBounds->get(LBBV::eR);
double length = strawBounds->get(LBBV::eHalfLengthZ);
- Vector3D ctr = straw->center(gctx);
+ Acts::Vector3D ctr = straw->center(gctx);
ext.max(Acts::binZ) = std::max(ext.max(Acts::binZ), ctr.z() + radius);
ext.min(Acts::binZ) = std::min(ext.min(Acts::binZ), ctr.z() - radius);
ext.max(Acts::binR) = std::max(ext.max(Acts::binR), ctr.perp() + length);
diff --git a/Tracking/Acts/ActsGeometry/src/ActsSurfaceMappingTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsSurfaceMappingTool.cxx
index 68fff9b388dfa31c4741ee51f60bc1ab662dbb7f..5a5c4cdb0ea224ce7061044859ab9c7614aaa5d8 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsSurfaceMappingTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsSurfaceMappingTool.cxx
@@ -49,7 +49,7 @@ ActsSurfaceMappingTool::initialize()
m_mapper = std::make_shared<Acts::SurfaceMaterialMapper>(
smmConfig,
std::move(propagator),
- Acts::getDefaultLogger("SurfaceMaterialMapper", Acts::Logging::INFO));
+ makeActsAthenaLogger(this, "SurfaceMaterialMapper"));
m_geoContext = m_trackingGeometryTool->getNominalGeometryContext().any();
diff --git a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx
index 92590d9feda66d90a89b7a94c797de328a98c000..d58de4d0e1b2981b4db9ff42feabe2146abb8ad8 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx
@@ -23,6 +23,9 @@
#include "Acts/Geometry/TrackingGeometryBuilder.hpp"
#include "Acts/Geometry/CylinderVolumeBuilder.hpp"
#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include <Acts/Plugins/Json/JsonGeometryConverter.hpp>
+#include <Acts/Plugins/Json/JsonMaterialDecorator.hpp>
+#include "Acts/Utilities/Logger.hpp"
#include "Acts/ActsVersion.hpp"
// PACKAGE
@@ -87,6 +90,22 @@ ActsTrackingGeometrySvc::initialize()
Acts::TrackingGeometryBuilder::Config tgbConfig;
tgbConfig.trackingVolumeHelper = cylinderVolumeHelper;
+
+ if(m_useMaterialMap){
+ std::shared_ptr<const Acts::IMaterialDecorator> matDeco = nullptr;
+ std::string matFile = m_materialMapInputFile;
+ if (matFile.find(".json") != std::string::npos) {
+ // Set up the converter first
+ Acts::JsonGeometryConverter::Config jsonGeoConvConfig;
+ jsonGeoConvConfig.name = "JsonGeometryConverter";
+ jsonGeoConvConfig.logger = makeActsAthenaLogger(this, "JsonGeometryConverter");
+ // Set up the json-based decorator
+ matDeco = std::make_shared<const Acts::JsonMaterialDecorator>(
+ jsonGeoConvConfig, m_materialMapInputFile, true, true);
+ }
+ tgbConfig.materialDecorator = matDeco;
+ }
+
try {
// PIXEL
if(buildSubdet.count("Pixel") > 0) {
@@ -416,9 +435,10 @@ ActsTrackingGeometrySvc::makeSCTTRTAssembly(const Acts::GeometryContext& gctx,
trtPosEC.zMin = trtBrl.zMax;
sctPosEC.zMin = trtBrl.zMax;
- // extend TRT endcaps in R so they touch SCT endcaps
- trtNegEC.rMin = sctNegEC.rMax;
- trtPosEC.rMin = sctPosEC.rMax;
+ // extend SCT in R so they touch TRT barel
+ sctBrl.rMax = trtBrl.rMin;
+ sctNegEC.rMax = trtNegEC.rMin;
+ sctPosEC.rMax = trtPosEC.rMin;
// extend TRT endcaps in r to that of Barrel
trtNegEC.rMax = trtBrl.rMax;
diff --git a/Tracking/Acts/ActsGeometry/src/ActsVolumeMappingTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsVolumeMappingTool.cxx
index 97c4a7ad8052b098eac7f7f3085ca58cf9c24a33..5434b0abbcf782539a378815d164e46174b92a2e 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsVolumeMappingTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsVolumeMappingTool.cxx
@@ -47,11 +47,10 @@ ActsVolumeMappingTool::initialize()
/// The material mapper
Acts::VolumeMaterialMapper::Config smmConfig;
- smmConfig.mapperDebugOutput = true;
m_mapper = std::make_shared<Acts::VolumeMaterialMapper>(
smmConfig,
std::move(propagator),
- Acts::getDefaultLogger("VolumeMaterialMapper", Acts::Logging::INFO));
+ makeActsAthenaLogger(this, "VolumeMaterialMapper"));
m_geoContext = m_trackingGeometryTool->getNominalGeometryContext().any();
diff --git a/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometryTransforms.cxx b/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometryTransforms.cxx
index 25dbd9a5a459457815e537961e02bc0e9fbe7574..60ab905e7f3691cf06dc2b42c7fa6ef6b2cb294d 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometryTransforms.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometryTransforms.cxx
@@ -22,7 +22,7 @@
// STL
#include <string>
-using gid = Acts::GeometryID;
+using gid = Acts::GeometryIdentifier;
ActsWriteTrackingGeometryTransforms::ActsWriteTrackingGeometryTransforms(const std::string& name,
ISvcLocator* pSvcLocator)
@@ -58,7 +58,7 @@ StatusCode ActsWriteTrackingGeometryTransforms::execute() {
return;
}
- gid geoID = srf->geoID();
+ gid geoID = srf->geometryId();
os << geoID.volume() << ";";
os << geoID.boundary() << ";";
os << geoID.layer() << ";";
diff --git a/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx b/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
index 6572e23b1715a5a1d1f1f92f8b218c8873c43382..0e40a3448726f27dc5a4c8014b276cefbf4d6db2 100644
--- a/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "ActsGeometry/GeomShiftCondAlg.h"
@@ -11,9 +11,6 @@
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "GeoModelKernel/GeoAlignableTransform.h"
-#include "PixelReadoutGeometry/PixelDetectorManager.h"
-#include "SCT_ReadoutGeometry/SCT_DetectorManager.h"
-#include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
#include "InDetReadoutGeometry/ExtendedAlignableTransform.h"
#include "GaudiKernel/ICondSvc.h"
diff --git a/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx b/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx
index 162a34efc441269d2d3f8266a2de852989b37800..4de54887c0cf14e9d4ab8b33c5af29ec24288a93 100644
--- a/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx
+++ b/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx
@@ -15,7 +15,7 @@
#include "Acts/Surfaces/PlanarBounds.hpp"
#include "Acts/Surfaces/RadialBounds.hpp"
#include "Acts/Surfaces/SurfaceBounds.hpp"
-#include "Acts/Geometry/GeometryID.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
#include "Acts/Geometry/Polyhedron.hpp"
#include "Acts/Surfaces/CylinderSurface.hpp"
@@ -166,7 +166,7 @@ Acts::ObjSurfaceWriter::write(const Acts::GeometryContext &gctx,
ACTS_VERBOSE(">>Obj: Writing out a CylinderSurface with r = "
<< cylinderBounds->get(Acts::CylinderBounds::eR));
// name the object
- auto layerID = surface.geoID().layer();
+ auto layerID = surface.geometryId().layer();
(*(m_cfg.outputStream))
<< " o Cylinder_" << std::to_string(layerID) << '\n';
// output to the file
@@ -188,7 +188,7 @@ Acts::ObjSurfaceWriter::write(const Acts::GeometryContext &gctx,
ACTS_VERBOSE(">>Obj: Writing out a DiskSurface at z = "
<< sTransform.translation().z());
// name the object
- auto layerID = surface.geoID().layer();
+ auto layerID = surface.geometryId().layer();
(*(m_cfg.outputStream)) << "o Disk_" << std::to_string(layerID) << '\n';
// we use the tube writer in the other direction
double rMin = radialBounds->rMin();
diff --git a/Tracking/Acts/ActsGeometry/src/util/RootExCellWriter.icc b/Tracking/Acts/ActsGeometry/src/util/RootExCellWriter.icc
index bebcf848194104f192418d06efcc71af650a4b96..d6604f32cb2278e2a99740b64568842ba82eb2f6 100644
--- a/Tracking/Acts/ActsGeometry/src/util/RootExCellWriter.icc
+++ b/Tracking/Acts/ActsGeometry/src/util/RootExCellWriter.icc
@@ -90,12 +90,13 @@ RootExCellWriter<T>::write(
Acts::ExtrapolationMode::CollectPassive);
/// check the layer, surface, volume ID
- geo_id_value volumeID = pars.referenceSurface().geoID().value(
- Acts::GeometryID::volume_mask);
- geo_id_value layerID = pars.referenceSurface().geoID().value(
- Acts::GeometryID::layer_mask);
- geo_id_value surfaceID = pars.referenceSurface().geoID().value(
- Acts::GeometryID::sensitive_mask);
+ geo_id_value volumeID = pars.referenceSurface().geometryId().value(
+ Acts::GeometryIdentifier::volume_mask);
+ geo_id_value layerID = pars.referenceSurface().geometryId().value(
+ Acts::GeometryIdentifier::layer_mask);
+ geo_id_value surfaceID = pars.referenceSurface().geometryId().value(
+ Acts::GeometryIdentifier::sensitive_mask);
+
///
if ((m_cfg.writeSensitive && sensitive)
|| (m_cfg.writeBoundary && boundary)
diff --git a/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h b/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h
index c012a91e8428486546c2b7aabe1ca187f7abcf27..e456f739f97ebe85ab564fe141d5712e1647e5cb 100644
--- a/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h
@@ -34,29 +34,29 @@ class IActsExtrapolationTool : virtual public IAlgTool {
virtual
ActsPropagationOutput
propagationSteps(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const = 0;
virtual
- std::unique_ptr<const Acts::CurvilinearParameters>
+ std::unique_ptr<const Acts::CurvilinearTrackParameters>
propagate(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const = 0;
virtual
ActsPropagationOutput
propagationSteps(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const = 0;
virtual
- std::unique_ptr<const Acts::BoundParameters>
+ std::unique_ptr<const Acts::BoundTrackParameters>
propagate(const EventContext& ctx,
- const Acts::BoundParameters& startParameters,
+ const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
Acts::NavigationDirection navDir = Acts::forward,
double pathLimit = std::numeric_limits<double>::max()) const = 0;
diff --git a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
index 9b742841e1606e2e238c765fdcf1c9855850440c..ed8eb9f9d52c0c47cc8e57e08829b9b42b8a5aad 100644
--- a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
+++ b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
@@ -60,19 +60,19 @@ class ActsAdaptiveMultiPriVtxFinderTool : public extends<AthAlgTool, InDet::IVer
// Track wrapper input for the Acts vertexing
class TrackWrapper {
public:
- TrackWrapper(const Trk::ITrackLink* trkLink, const Acts::BoundParameters& boundParams)
+ TrackWrapper(const Trk::ITrackLink* trkLink, const Acts::BoundTrackParameters& boundParams)
: m_trkLink(trkLink)
, m_boundParams(boundParams)
{}
- const Acts::BoundParameters& parameters() const {return m_boundParams;}
+ const Acts::BoundTrackParameters& parameters() const {return m_boundParams;}
const Trk::ITrackLink* trackLink() const {return m_trkLink;}
private:
const Trk::ITrackLink* m_trkLink;
- Acts::BoundParameters m_boundParams;
+ Acts::BoundTrackParameters m_boundParams;
};
public:
@@ -96,7 +96,7 @@ private:
findVertex(const EventContext& ctx, std::vector<std::unique_ptr<Trk::ITrackLink>> trackVector) const;
Trk::Perigee* actsBoundToTrkPerigee(
- const Acts::BoundParameters& bound, const Acts::Vector3D& surfCenter) const;
+ const Acts::BoundTrackParameters& bound, const Acts::Vector3D& surfCenter) const;
double estimateSignalCompatibility(xAOD::Vertex* vtx) const;
diff --git a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
index 69d853cb9831bec7db9f5de319ddffe1630a781b..0a037919e6622e8895a97f1bc2d9f0102ecd6305 100755
--- a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
+++ b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
@@ -79,7 +79,7 @@ ActsAdaptiveMultiPriVtxFinderTool::initialize()
// Create a custom std::function to extract BoundParameters
// from TrackWrapper
- std::function<Acts::BoundParameters(TrackWrapper)> extractParameters =
+ std::function<Acts::BoundTrackParameters(TrackWrapper)> extractParameters =
[](TrackWrapper params) { return params.parameters(); };
// Vertex fitter configuration
@@ -249,8 +249,8 @@ ActsAdaptiveMultiPriVtxFinderTool::findVertex(const EventContext& ctx, std::vect
, cov(3,0) , cov(3,1) , cov(3,2) , cov(3,3) , cov(3,4) *1./(1_MeV) , 0
, cov(4,0) *1./(1_MeV) , cov(4,1) *1./(1_MeV) , cov(4,2) *1./(1_MeV) , cov(4,3) *1./(1_MeV) , cov(4,4) *1./(1_MeV*1_MeV), 0
, 0. , 0. , 0. , 0., 0., 1.;
-
- allTracks.emplace_back(trk.get(),Acts::BoundParameters(geoContext, covMat, actsParams, perigeeSurface));
+
+ allTracks.emplace_back(trk.get(),Acts::BoundTrackParameters(perigeeSurface, actsParams, covMat));
}
std::vector<const TrackWrapper*> allTrackPtrs;
@@ -366,7 +366,7 @@ return std::make_pair(theVertexContainer, theVertexAuxContainer);
Trk::Perigee* ActsAdaptiveMultiPriVtxFinderTool::actsBoundToTrkPerigee(
- const Acts::BoundParameters& bound, const Acts::Vector3D& surfCenter) const {
+ const Acts::BoundTrackParameters& bound, const Acts::Vector3D& surfCenter) const {
using namespace Acts::UnitLiterals;
AmgSymMatrix(5)* cov = new AmgSymMatrix(5)(bound.covariance()->block<5,5>(0,0));
cov->col(Trk::qOverP) *= 1_MeV;
@@ -405,5 +405,3 @@ ActsAdaptiveMultiPriVtxFinderTool::estimateSignalCompatibility(xAOD::Vertex* vtx
}
return totalPt2 * std::sqrt((double) nTracks);
}
-
-
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldMode.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldMode.h
index bd22f5f710805658e33dc3c3150b6a00c9dcc391..21ddbc804219285951582a33bfc6a4f4b4f53d7c 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldMode.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldMode.h
@@ -1,29 +1,26 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-///////////////////////////////////////////////////////////////////
-// MagneticFieldMode.h, (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-
-#ifndef TRKGEOMETRY_MAGNETICFIELDMODE_H
-#define TRKGEOMETRY_MAGNETICFIELDMODE_H
-
-namespace Trk {
-
- /** @enum MagneticFieldMode
- MagneticFieldMode describing the field setup within a volume
-
-
-
-
- @author Andreas.Salzburger@cern.ch
- */
- enum MagneticFieldMode { NoField = 0, //!< Field is set to 0., 0., 0.,
- ConstantField = 1, //!< Field is set to be constant
- FastField = 2, //!< call the fast field access method of the FieldSvc
- FullField = 3 //!< Field is set to be realistic, but within a given Volume
- };
-
-} // end of namespace
-#endif // TRKGEOMETRY_MAGNETICFIELDMODE_H
+///////////////////////////////////////////////////////////////////
+// MagneticFieldMode.h, (c) ATLAS Detector software
+///////////////////////////////////////////////////////////////////
+#ifndef TRKGEOMETRY_MAGNETICFIELDMODE_H
+#define TRKGEOMETRY_MAGNETICFIELDMODE_H
+
+namespace Trk {
+
+/** @enum MagneticFieldMode
+ MagneticFieldMode describing the field setup within a volume
+ @author Andreas.Salzburger@cern.ch
+ */
+enum MagneticFieldMode
+{
+ NoField = 0, //!< Field is set to 0., 0., 0.,
+ ConstantField = 1, //!< Field is set to be constant
+ FastField = 2, //!< call the fast field access method of the FieldSvc
+ FullField = 3 //!< Field is set to be realistic, but within a given Volume
+};
+
+} // end of namespace
+#endif // TRKGEOMETRY_MAGNETICFIELDMODE_H
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldProperties.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldProperties.h
index 15b6aa418ee58f91094864632697e6e2dd231553..b2a4061ca0b76c87512f036e68f2b43ebbed257d 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldProperties.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldProperties.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -9,79 +9,63 @@
#ifndef TRKGEOMETRY_MAGNETICFIELDPROPERTIES_H
#define TRKGEOMETRY_MAGNETICFIELDPROPERTIES_H
-//Gaudi
-#include "GaudiKernel/MsgStream.h"
+// Gaudi
#include "GaudiKernel/GaudiException.h"
-//Trk
+#include "GaudiKernel/MsgStream.h"
+// Trk
#include "TrkGeometry/MagneticFieldMode.h"
// Amg
#include "GeoPrimitives/GeoPrimitives.h"
-//STD
+// STD
#include <iostream>
namespace Trk {
- /**
- @class MagneticFieldProperties
-
- new magnetic field properties to steer the behavior of the extrapolation
-
- @author Andreas.Salzburger@cern.ch
- */
- class MagneticFieldProperties {
-
- public:
- /**Constructor for magnetic field mode - full field is default */
- MagneticFieldProperties(MagneticFieldMode mode=Trk::FullField);
-
- /**Constructor for magnetic field mode */
- MagneticFieldProperties(const Amg::Vector3D& field);
-
- /**Copy Constructor */
- MagneticFieldProperties(const MagneticFieldProperties& matprop);
-
- /**Destructor*/
- virtual ~MagneticFieldProperties(){}
-
- /**Assignment operator */
- MagneticFieldProperties& operator=(const MagneticFieldProperties& matprop);
-
- /**Move assignment operator */
- MagneticFieldProperties& operator=(MagneticFieldProperties && matprop);
-
- /**Cast operator*/
- operator MagneticFieldMode () const;
-
- /**Returns the MagneticFieldMode as specified */
- MagneticFieldMode magneticFieldMode() const;
-
- /** Get the magnetic field - in case of constant field only - throws exception if mode is not constant */
- const Amg::Vector3D& magneticField() const;
-
- protected:
- MagneticFieldMode m_magneticFieldMode;
- Amg::Vector3D m_magneticField;
- };
-
+/**
+ @class MagneticFieldProperties
+ magnetic field properties to steer the behavior of the extrapolation
+ @author Andreas.Salzburger@cern.ch
+ @author (Athena MT) Christos Anastopoulos
+ */
+class MagneticFieldProperties
+{
+
+public:
+ /**Constructor for magnetic field mode - full field is default */
+ MagneticFieldProperties(MagneticFieldMode mode = Trk::FullField);
+ /**Constructor for magnetic field mode */
+ MagneticFieldProperties(const Amg::Vector3D& field);
+ // default copy/move/dtor
+ MagneticFieldProperties(const MagneticFieldProperties&) = default;
+ MagneticFieldProperties(MagneticFieldProperties&&) = default;
+ MagneticFieldProperties& operator=(const MagneticFieldProperties&) = default;
+ MagneticFieldProperties& operator=(MagneticFieldProperties&&) = default;
+ ~MagneticFieldProperties() = default;
+
+ /**Cast operator*/
+ operator MagneticFieldMode() const;
+
+ /**Returns the MagneticFieldMode as specified */
+ MagneticFieldMode magneticFieldMode() const;
+
+ /** Get the magnetic field - in case of constant field only - throws exception
+ * if mode is not constant */
+ const Amg::Vector3D& magneticField() const;
+
+protected:
+ MagneticFieldMode m_magneticFieldMode;
+ Amg::Vector3D m_magneticField;
+};
+
+/**Overload of << operator for both, MsgStream and std::ostream for debug
+ * output*/
+MsgStream&
+operator<<(MsgStream& sl, const MagneticFieldProperties& mprop);
+
+std::ostream&
+operator<<(std::ostream& sl, const MagneticFieldProperties& mprop);
- inline MagneticFieldProperties::operator MagneticFieldMode () const { return m_magneticFieldMode; }
-
- inline MagneticFieldMode MagneticFieldProperties::magneticFieldMode() const { return m_magneticFieldMode; }
-
- inline const Amg::Vector3D& MagneticFieldProperties::magneticField() const {
- if ( m_magneticFieldMode != Trk::ConstantField )
- throw GaudiException("Trk::MagneticFieldProperties", "You can only ask for a field value if you have a constant field!", StatusCode::FAILURE);
- return m_magneticField;
- }
-
-
-/**Overload of << operator for both, MsgStream and std::ostream for debug output*/
-MsgStream& operator << ( MsgStream& sl, const MagneticFieldProperties& mprop);
-
-std::ostream& operator << ( std::ostream& sl, const MagneticFieldProperties& mprop);
-
} // end of namespace
-
+#include "TrkGeometry/MagneticFieldProperties.icc"
#endif // TRKGEOMETRY_MAGNETICFIELDPROPERTIES_H
-
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldProperties.icc b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldProperties.icc
new file mode 100644
index 0000000000000000000000000000000000000000..6d0b61b3489db116f59a1864395f9a9392df5077
--- /dev/null
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/MagneticFieldProperties.icc
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+inline Trk::MagneticFieldProperties::MagneticFieldProperties(
+ Trk::MagneticFieldMode mode)
+ : m_magneticFieldMode(mode)
+ , m_magneticField(0., 0., 0.)
+{}
+
+inline Trk::MagneticFieldProperties::MagneticFieldProperties(
+ const Amg::Vector3D& field)
+ : m_magneticFieldMode(Trk::ConstantField)
+ , m_magneticField(field)
+{}
+
+inline Trk::MagneticFieldProperties::operator MagneticFieldMode() const
+{
+ return m_magneticFieldMode;
+}
+
+inline Trk::MagneticFieldMode
+Trk::MagneticFieldProperties::magneticFieldMode() const
+{
+ return m_magneticFieldMode;
+}
+
+inline const Amg::Vector3D&
+Trk::MagneticFieldProperties::magneticField() const
+{
+ if (m_magneticFieldMode != Trk::ConstantField)
+ throw GaudiException(
+ "Trk::MagneticFieldProperties",
+ "You can only ask for a field value if you have a constant field!",
+ StatusCode::FAILURE);
+ return m_magneticField;
+}
+
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h
index 072c141f83bff89a8e27599fb9405e562cc55915..8fffd7c08503b260b82128fb417474dd87753681 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h
@@ -410,10 +410,10 @@ namespace Trk {
void moveTV ATLAS_NOT_THREAD_SAFE(Amg::Transform3D& transform) const;
/** Forbidden copy constructor */
- TrackingVolume(const TrackingVolume&): Volume(), Material() {}
+ TrackingVolume(const TrackingVolume&) = delete;
/** Forbid assignment. */
- TrackingVolume &operator=(const TrackingVolume&) { return *this; }
+ TrackingVolume &operator=(const TrackingVolume&) = delete;
const TrackingVolume* m_motherVolume; //!< mother volume of this volume
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx
index ca7aa4626addc56e7b193b7bd045fd44edccdfab..730fe2bc5a881889faff74c857fc913207a3b1c2 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx
@@ -13,9 +13,9 @@ Trk::CompoundLayerMaterial::CompoundLayerMaterial() :
Trk::LayerMaterialProperties(),
m_materialProperties(new Trk::MaterialProperties()),
m_binUtility(nullptr),
- m_fullComposition(false)
+ m_fullComposition(false),
+ m_elementTable (Trk::SharedObject<const Trk::ElementTable>(nullptr))
{
- m_elementTable = Trk::SharedObject<const Trk::ElementTable>(nullptr);
}
Trk::CompoundLayerMaterial::CompoundLayerMaterial(const Trk::BinUtility& binutility,
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx
index 03df945f5755486e71ef66cfe65b10e84860f66d..cbdde4c2ebd1755d9df78a7ec499a8ff85d19f90 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx
@@ -118,6 +118,7 @@ Trk::Layer& Trk::Layer::operator=(const Trk::Layer& lay)
if (this != &lay){
delete m_overlapDescriptor;
delete m_surfaceArray;
+ m_layerThickness = lay.m_layerThickness;
m_enclosingTrackingVolume = lay.m_enclosingTrackingVolume;
m_enclosingDetachedTrackingVolume = lay.m_enclosingDetachedTrackingVolume;
m_overlapDescriptor = (lay.m_overlapDescriptor) ? lay.m_overlapDescriptor->clone() : nullptr;
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/MagneticFieldProperties.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/MagneticFieldProperties.cxx
index deed7bcc4c15d7abc5beb0b048edf4e77412d6b7..d1bc095be5e5c03b75a9e28597868aefa716dcf7 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/src/MagneticFieldProperties.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/MagneticFieldProperties.cxx
@@ -1,39 +1,28 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
// MagneticFieldProperties.cxx, (c) ATLAS Detector software
///////////////////////////////////////////////////////////////////
-//Trk
+// Trk
#include "TrkGeometry/MagneticFieldProperties.h"
-Trk::MagneticFieldProperties::MagneticFieldProperties(Trk::MagneticFieldMode mode) :
- m_magneticFieldMode(mode),
- m_magneticField(0., 0., 0.)
-{}
-
-Trk::MagneticFieldProperties::MagneticFieldProperties(const Amg::Vector3D& field) :
- m_magneticFieldMode(Trk::ConstantField),
- m_magneticField(field)
-{}
-
-Trk::MagneticFieldProperties::MagneticFieldProperties(const MagneticFieldProperties& matprop) = default;
-
-Trk::MagneticFieldProperties& Trk::MagneticFieldProperties::operator=(const MagneticFieldProperties& matprop) = default;
-
-Trk::MagneticFieldProperties& Trk::MagneticFieldProperties::operator=(MagneticFieldProperties && matprop) = default;
-
-/**Overload of << operator for both, MsgStream and std::ostream for debug output*/
-MsgStream& Trk::operator<<( MsgStream& sl, const Trk::MagneticFieldProperties& mprop)
+/**Overload of << operator for both, MsgStream and std::ostream for debug
+ * output*/
+MsgStream&
+Trk::operator<<(MsgStream& sl, const Trk::MagneticFieldProperties& mprop)
{
- sl << "Trk::MagneticFieldProperties, configuration: " << mprop.magneticFieldMode() << endmsg;
- return sl;
+ sl << "Trk::MagneticFieldProperties, configuration: "
+ << mprop.magneticFieldMode() << endmsg;
+ return sl;
}
-std::ostream& Trk::operator << ( std::ostream& sl, const Trk::MagneticFieldProperties& mprop)
+std::ostream&
+Trk::operator<<(std::ostream& sl, const Trk::MagneticFieldProperties& mprop)
{
- sl << "Trk::MagneticFieldProperties, configuration: " << mprop.magneticFieldMode() << std::endl;
- return sl;
+ sl << "Trk::MagneticFieldProperties, configuration: "
+ << mprop.magneticFieldMode() << std::endl;
+ return sl;
}
diff --git a/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils/ClusterSplitProbabilityContainer.h b/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils/ClusterSplitProbabilityContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..cfe2a398b7ef110eb43e7a21a626cd354d416af2
--- /dev/null
+++ b/Tracking/TrkEvent/TrkEventUtils/TrkEventUtils/ClusterSplitProbabilityContainer.h
@@ -0,0 +1,78 @@
+/* Dear emacs, this is -*-c++-*- */
+#ifndef _ClusterSplitProbabilityContainer_H_
+#define _ClusterSplitProbabilityContainer_H_
+
+#include "Identifier/Identifier.h"
+#include "TrkPrepRawData/PrepRawData.h"
+#include <unordered_map>
+#include <algorithm>
+#include <stdexcept>
+
+namespace Trk {
+ class ClusterSplitProbabilityContainerCnv_p1;
+
+ /** Container to associate Cluster with cluster splitting probabilities.
+ */
+ class ClusterSplitProbabilityContainer
+ {
+ friend class ClusterSplitProbabilityContainerCnv_p1;
+ public:
+ using ClusterIdentifier=unsigned int;
+
+ struct ProbabilityInfo : public std::pair<float,float> {
+ ProbabilityInfo(float prob1, float prob2) : std::pair<float,float>(prob1,prob2) {}
+ float splitProbability1() const { return isTooBigToBeSplit() ? 0.f : this->first; }
+ float splitProbability2() const { return isTooBigToBeSplit() ? 0.f : this->second; }
+ bool isTooBigToBeSplit() const { return first<0; }
+ bool isSplit() const { return m_isSplit;}
+ void setSplit(bool split) { m_isSplit=split;}
+ void updateSplitProbabilities(float prob1, float prob2) { this->first=prob1; this->second=prob2; m_isSplit=false;}
+ private:
+ bool m_isSplit = false;
+ };
+ static const ProbabilityInfo &getNoSplitProbability() {return s_unset; }
+
+ const ProbabilityInfo &splitProbability(const PrepRawData*cluster) const {
+ assert(cluster);
+ std::unordered_map<ClusterIdentifier, ProbabilityInfo>::const_iterator iter = m_splitProbMap.find(cluster->getHashAndIndex().hashAndIndex());
+ return (iter != m_splitProbMap.end()) ? iter->second : s_unset;
+ }
+ ProbabilityInfo *getSplitProbability(const PrepRawData*cluster) {
+ assert(cluster);
+ std::unordered_map<ClusterIdentifier, ProbabilityInfo>::iterator iter = m_splitProbMap.find(cluster->getHashAndIndex().hashAndIndex());
+ return (iter != m_splitProbMap.end()) ? &iter->second : nullptr;
+ }
+ ProbabilityInfo &setSplitInformation(const PrepRawData*cluster, float prob1, float prob2) {
+ assert(cluster);
+ // @TODO remove the precision clipping, which is currently implemented here to produce identical results wrt. the current version.
+ constexpr int splitmask = 0x7fff;
+ prob1 = int(prob1 * splitmask)/(1.*splitmask);
+ prob2 = int(prob2 * splitmask)/(1.*splitmask);
+ std::pair<std::unordered_map<ClusterIdentifier, ProbabilityInfo>::iterator,bool>
+ ret = m_splitProbMap.insert( std::make_pair( cluster->getHashAndIndex().hashAndIndex(), ProbabilityInfo(prob1, prob2) ) );
+ if (!ret.second) {
+ std::unordered_map<ClusterIdentifier, ProbabilityInfo>::iterator iter = m_splitProbMap.find(cluster->getHashAndIndex().hashAndIndex());
+ if (iter == m_splitProbMap.end()) {
+ throw std::runtime_error("Failed to set cluster splitting probability.");
+ }
+ iter->second.updateSplitProbabilities(prob1,prob2);
+ return iter->second;
+ }
+ else {
+ return ret.first->second;
+ }
+ }
+ void setTooBigToBeSplit(const PrepRawData*cluster) {
+ assert(cluster);
+ m_splitProbMap.insert( std::make_pair( cluster->getHashAndIndex().hashAndIndex(), ProbabilityInfo(-1.,-1.) ) );
+ }
+ protected:
+ std::unordered_map<ClusterIdentifier, ProbabilityInfo> m_splitProbMap;
+ static const ProbabilityInfo s_unset;
+ };
+}
+#ifndef CLIDSVC_CLASSDEF_H
+# include "AthenaKernel/CLASS_DEF.h"
+CLASS_DEF( Trk::ClusterSplitProbabilityContainer, 1313584800, 1)
+#endif
+#endif
diff --git a/Tracking/TrkEvent/TrkEventUtils/src/ClusterSplitProbabilityContainer.cxx b/Tracking/TrkEvent/TrkEventUtils/src/ClusterSplitProbabilityContainer.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..87da527743f69b550ce344d8cbdf39fc17d14789
--- /dev/null
+++ b/Tracking/TrkEvent/TrkEventUtils/src/ClusterSplitProbabilityContainer.cxx
@@ -0,0 +1,3 @@
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
+
+const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo Trk::ClusterSplitProbabilityContainer::s_unset(-1.,-1.);
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
index d76b58d2a8cea04add92bf64e6989e4d190be703..9328debc79fe6f282066e0430ef313e2eb121dac 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
@@ -9,8 +9,8 @@ atlas_add_poolcnv_library( TrkEventAthenaPoolPoolCnv
FILES TrkSpacePoint/SpacePointCollection.h
TrkSpacePoint/SpacePointContainer.h TrkTrack/TrackCollection.h
VxMultiVertex/MVFVxContainer.h VxVertex/VxContainer.h
- TrkV0Vertex/V0Container.h TrkSegment/SegmentCollection.h
- TYPES_WITH_NAMESPACE Trk::SegmentCollection Trk::TrackParticleBaseCollection
+ TrkV0Vertex/V0Container.h TrkSegment/SegmentCollection.h TrkEventUtils/ClusterSplitProbabilityContainer.h
+ TYPES_WITH_NAMESPACE Trk::SegmentCollection Trk::TrackParticleBaseCollection Trk::ClusterSplitProbabilityContainer
LINK_LIBRARIES TrkSpacePoint TrkEventTopLevelCnv TrkEventTPCnv )
# Install files from the package:
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/ClusterSplitProbabilityContainerCnv.cxx b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/ClusterSplitProbabilityContainerCnv.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..0193302198c866af48de45edea1213fb881fc3cc
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/ClusterSplitProbabilityContainerCnv.cxx
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+#include "ClusterSplitProbabilityContainerCnv.h"
+
+
+const std::string ClusterSplitProbabilityContainerCnv::s_name("ClusterSplitProbabilityContainerCnv");
+//-----------------------------------------------------------------------------
+// Constructor
+//-----------------------------------------------------------------------------
+ClusterSplitProbabilityContainerCnv::ClusterSplitProbabilityContainerCnv(ISvcLocator* svcloc)
+ : ClusterSplitProbabilityContainerCnvBase(svcloc)
+{
+}
+
+
+ClusterSplitProbabilityContainer_PERS * ClusterSplitProbabilityContainerCnv::createPersistent( Trk::ClusterSplitProbabilityContainer *transCont)
+{
+ MsgStream log(msgSvc(), s_name );
+ return m_converter.createPersistent( transCont, log );
+}
+
+//-----------------------------------------------------------------------------
+// Create transient collection
+//-----------------------------------------------------------------------------
+Trk::ClusterSplitProbabilityContainer *ClusterSplitProbabilityContainerCnv::createTransient()
+{
+ MsgStream log(msgSvc(), s_name );
+ static pool::Guid p1_guid( "33129502-20bc-44f9-acff-62e5c3670d46" );
+
+ Trk::ClusterSplitProbabilityContainer *p_collection = nullptr;
+ if( compareClassGuid( p1_guid )){
+ std::unique_ptr<ClusterSplitProbabilityContainer_PERS> pers( poolReadObject< ClusterSplitProbabilityContainer_PERS >() );
+ p_collection = m_converter.createTransient( pers.get(), log );
+ }
+ else
+ throw std::runtime_error( "Unsupported persistent version of Data Collection" );
+ return p_collection;
+}
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/src/ClusterSplitProbabilityContainerCnv.h b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/ClusterSplitProbabilityContainerCnv.h
new file mode 100644
index 0000000000000000000000000000000000000000..a291d501dc8de2f2b1769bb67b066f0cc5298cf9
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/src/ClusterSplitProbabilityContainerCnv.h
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef _Trk_ClusterSplitProbabilityContainerCnv_h_
+#define _Trk_ClusterSplitProbabilityContainerCnv_h_
+
+#include "AthenaPoolCnvSvc/T_AthenaPoolCustomCnv.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
+
+#include "TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainer_p1.h"
+#include "TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.h"
+
+
+using ClusterSplitProbabilityContainer_PERS = Trk::ClusterSplitProbabilityContainer_p1;
+using ClusterSplitProbabilityContainerCnvBase = T_AthenaPoolCustomCnv<Trk::ClusterSplitProbabilityContainer, ClusterSplitProbabilityContainer_PERS>;
+
+/** TP converter for the ClusterSplitProbabiltyContainer
+ */
+class ClusterSplitProbabilityContainerCnv
+ : public ClusterSplitProbabilityContainerCnvBase
+{
+friend class CnvFactory<ClusterSplitProbabilityContainerCnv>;
+
+public:
+ ClusterSplitProbabilityContainerCnv( ISvcLocator *svcloc );
+
+protected:
+ virtual ClusterSplitProbabilityContainer_PERS *createPersistent( Trk::ClusterSplitProbabilityContainer *transCont);
+ virtual Trk::ClusterSplitProbabilityContainer *createTransient();
+
+ Trk::ClusterSplitProbabilityContainerCnv_p1 m_converter;
+ static const std::string s_name;
+};
+#endif // _Trk_ClusterSplitProbabilityContainerCnv_h_
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt
index 52900a2532e9dddfa02181dab71cb26bc808a1c0..7f3552d555d8c8678664f13e71bad0f41529f7a5 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/CMakeLists.txt
@@ -93,6 +93,7 @@ atlas_add_tpcnv_library( TrkEventTPCnv
TrkEventTPCnv/TrkParticleBase/*.h src/TrkParticleBase/*.cxx
TrkEventTPCnv/TrkCompetingRIOsOnTrack/*.h src/TrkCompetingRIOsOnTrack/*.cxx
TrkEventTPCnv/TrkDetElementSurface/*.h src/TrkDetElementSurface/*.cxx
+ TrkEventTPCnv/TrkClusterSplitProbabilityContainer/*.h src/TrkClusterSplitProbabilityContainer/*.cxx
PUBLIC_HEADERS TrkEventTPCnv
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthLinks DataModelAthenaPoolLib
@@ -101,8 +102,8 @@ atlas_add_tpcnv_library( TrkEventTPCnv
TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack
TrkMeasurementBase TrkNeutralParameters TrkParameters TrkParametersBase
TrkParticleBase TrkPrepRawData TrkPseudoMeasurementOnTrack TrkRIO_OnTrack
- TrkSegment TrkTrack TrkTrackSummary TrkV0Vertex TrkVertexOnTrack TrkEventCnvToolsLib
- VxMultiVertex VxVertex
+ TrkSegment TrkTrack TrkTrackSummary TrkV0Vertex TrkVertexOnTrack TrkEventCnvToolsLib TrkEventUtils
+ VxMultiVertex VxVertex
PRIVATE_LINK_LIBRARIES AthenaKernel CxxUtils TrkDetDescrUtils
DEFINITIONS ${_definitions} )
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.h
new file mode 100644
index 0000000000000000000000000000000000000000..67f4ff42c7f3796e4cf7bd2763fc5fd26df7a0e4
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.h
@@ -0,0 +1,34 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef _ClusterSplitProbabilityContainerCnv_p1_H
+#define _ClusterSplitProbabilityContainerCnv_p1_H
+
+#include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
+#include "TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainer_p1.h"
+#include "GaudiKernel/MsgStream.h"
+
+namespace Trk {
+class ClusterSplitProbabilityContainerCnv_p1 :
+ public T_AthenaPoolTPCnvBase<ClusterSplitProbabilityContainer, ClusterSplitProbabilityContainer_p1>
+{
+public:
+ ClusterSplitProbabilityContainerCnv_p1() {}
+ virtual void persToTrans(const ClusterSplitProbabilityContainer_p1* persObj,
+ ClusterSplitProbabilityContainer* transObj, MsgStream& log) override;
+ virtual void transToPers(const ClusterSplitProbabilityContainer* transObj,
+ ClusterSplitProbabilityContainer_p1* persObj, MsgStream& log) override;
+};
+}
+
+template<>
+class T_TPCnv<Trk::ClusterSplitProbabilityContainer, Trk::ClusterSplitProbabilityContainer_p1>
+ : public Trk::ClusterSplitProbabilityContainerCnv_p1
+{
+public:
+};
+
+#endif
+
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainer_p1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainer_p1.h
new file mode 100644
index 0000000000000000000000000000000000000000..1e5001916044c3e874b08e0f329c9dd8f677d881
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainer_p1.h
@@ -0,0 +1,14 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef _ClusterSplitProbabilityContainer_p1_H_
+#define _ClusterSplitProbabilityContainer_p1_H_
+
+#include "ClusterSplitProbability_p1.h"
+#include <vector>
+
+namespace Trk {
+ class ClusterSplitProbabilityContainer_p1 : public std::vector<ClusterSplitProbability_p1> {};
+}
+#endif
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbability_p1.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbability_p1.h
new file mode 100644
index 0000000000000000000000000000000000000000..a21f52e88159445991ada1f5b09cf76a182144ce
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbability_p1.h
@@ -0,0 +1,25 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef _ClusterSplitProbability_p1_H_
+#define _ClusterSplitProbability_p1_H_
+
+#include "Identifier/Identifier.h"
+
+namespace Trk {
+ struct ClusterSplitProbability_p1
+ {
+ ClusterSplitProbability_p1() : m_id{}, m_splitPrpbability{}, m_isSplit{} {}
+ ClusterSplitProbability_p1(unsigned int id, float probability1, float probability2, bool is_split)
+ : m_id(id),
+ m_splitPrpbability{probability1,probability2},
+ m_isSplit(is_split)
+ {}
+
+ unsigned int m_id;
+ float m_splitPrpbability[2];
+ bool m_isSplit;
+ };
+}
+#endif
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h
index b470ec4280ca9b6d11e9030c2144f3812e01e087..ecb95908a0368277e0bd3148a724f0c91bd57bf9 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/TrkEventTPCnvDict.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRKEVENTTPCNV_TRKEVENTTPCNVDICT_H
@@ -125,5 +125,6 @@
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkParticleBase/TrackParticleBase_p1.h"
+#include "TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainer_p1.h"
#endif // TRKEVENTTPCNV_H
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml
index 2e2fc9027a0a6a45e399976dc7318c1b9b714693..a0042e0d91b37612e9cc3725b9ba80bbbb649dbb 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/TrkEventTPCnv/selection.xml
@@ -135,5 +135,9 @@
<!-- Identifier -->
<class name="Trk::DetElementSurface_p1" />
<class name="std::vector<Trk::DetElementSurface_p1>" />
-
+
+ <class name="Trk::ClusterSplitProbabilityContainer_p1" id="33129502-20bc-44f9-acff-62e5c3670d46" />
+ <class name="Trk::ClusterSplitProbability_p1" />
+ <class name="std::vector<Trk::ClusterSplitProbability_p1>" />
+
</lcgdict>
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..a3753df5409f0cd531c42aa10e8cf14d88c048c6
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.cxx
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.h"
+#include "GaudiKernel/MsgStream.h"
+
+namespace Trk {
+void ClusterSplitProbabilityContainerCnv_p1::transToPers(const Trk::ClusterSplitProbabilityContainer* transObj,
+ Trk::ClusterSplitProbabilityContainer_p1* persObj,
+ [[maybe_unused]] MsgStream& log) {
+ persObj->reserve(transObj->m_splitProbMap.size());
+ for(const std::pair<const Trk::ClusterSplitProbabilityContainer::ClusterIdentifier,
+ Trk::ClusterSplitProbabilityContainer::ProbabilityInfo> &elm : transObj->m_splitProbMap) {
+ persObj->emplace_back(elm.first,elm.second.splitProbability1(),elm.second.splitProbability2(),elm.second.isSplit());
+ }
+}
+
+void ClusterSplitProbabilityContainerCnv_p1::persToTrans(const Trk::ClusterSplitProbabilityContainer_p1* persObj,
+ Trk::ClusterSplitProbabilityContainer* transObj,
+ MsgStream& log) {
+
+ for(const ClusterSplitProbability_p1 &elm : *persObj) {
+ std::pair<std::unordered_map<Trk::ClusterSplitProbabilityContainer::ClusterIdentifier, Trk::ClusterSplitProbabilityContainer::ProbabilityInfo>::iterator, bool>
+ ret = transObj->m_splitProbMap.insert( std::make_pair(elm.m_id,Trk::ClusterSplitProbabilityContainer::ProbabilityInfo(elm.m_splitPrpbability[0],
+ elm.m_splitPrpbability[1])));
+ if (!ret.second) {
+ log << MSG::FATAL << "Failed to insert cluster split probability info for " << elm.m_id << endmsg;
+ }
+ else {
+ ret.first->second.setSplit(elm.m_isSplit);
+ }
+ }
+}
+}
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx
index 98289cec549f41db6a4cbe9206c7708aa586d5f8..a99987981de7d29616df1c05748ba64cdac607df 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkEventTPCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// generate the T/P converter entries
@@ -21,6 +21,8 @@
#include "TrkEventTPCnv/SegmentCollection_tlp1.h"
#include "TrkEventTPCnv/SegmentCollection_tlp2.h"
+#include "TrkEventTPCnv/TrkClusterSplitProbabilityContainer/ClusterSplitProbabilityContainerCnv_p1.h"
+
//-----------------------------------------------------------------------------
// TrkTrack
//-----------------------------------------------------------------------------
@@ -143,6 +145,7 @@
//-----------------------------------------------------------------------------
#include "TrkEventTPCnv/TrkParticleBase/TrackParticleBase_p1.h"
+
DECLARE_TPCNV_FACTORY(MVFVxContainerCnv_tlp1,
MVFVxContainer,
Trk::MVFVxContainer_tlp1,
@@ -167,7 +170,12 @@ DECLARE_TPCNV_FACTORY(VxContainerCnv_tlp2,
VxContainer,
Trk::VxContainer_tlp2,
Athena::TPCnvVers::Current)
-
+
+DECLARE_TPCNV_FACTORY(Trk::ClusterSplitProbabilityContainerCnv_p1,
+ Trk::ClusterSplitProbabilityContainer,
+ Trk::ClusterSplitProbabilityContainer_p1,
+ Athena::TPCnvVers::Current)
+
typedef T_TPCnv<VxContainer, Trk::VxContainer_tlp1 >
VxContainerARACnv_tlp1;
DECLARE_ARATPCNV_FACTORY(VxContainerARACnv_tlp1,
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
index fa61505d3492948c4159589b4006b7b8bd42e5b8..1d4740ebf026ea82d28c4c07e582058c9006be5e 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
@@ -24,6 +24,7 @@
#include "ActsGeometryInterfaces/IActsExtrapolationTool.h"
#include "ActsGeometry/ActsGeometryContext.h"
#include "TrkExAlgs/PropResultRootWriterSvc.h"
+#include "Acts/EventData/TrackParameters.hpp"
// STL
#include <memory>
#include <vector>
@@ -82,6 +83,31 @@ namespace Trk
StatusCode finalize() override;
private:
+
+ /** @struct ActsTrackWrapper
+ Wrapper code for Acts track parameters, to provide a position() method
+ without the need of explicitly passing the Acts::GeometryContext
+ */
+ struct ActsTrackWrapper
+ {
+ /** Constructor */
+ ActsTrackWrapper(const Acts::BoundTrackParameters* trackParams, Acts::GeometryContext& ctx)
+ : m_params(trackParams)
+ , m_geometryContext(ctx) {};
+
+ /** Position getter */
+ Acts::Vector3D position() const {return m_params->position(m_geometryContext);}
+ /** Parameter getter */
+ Acts::BoundVector parameters() const {return m_params->parameters();}
+ /** Covariance getter */
+ const std::optional<Acts::BoundSymMatrix>& covariance() const {return m_params->covariance();}
+
+ private:
+ /** The Acts track parameters */
+ const Acts::BoundTrackParameters* m_params;
+ /** The Acts geometry context */
+ Acts::GeometryContext m_geometryContext;
+ };
void generatePerigee(std::vector<perigeeParameters>& parameters);
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx b/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx
index 692a3da6dbe6ba8ccdfcdd2649bcb0e0d301bed6..9dcd0e5f31471f5a47665178afc07edde1651588 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx
@@ -22,7 +22,6 @@
#include "AthenaKernel/RNGWrapper.h"
// ACTS
-#include "Acts/EventData/TrackParameters.hpp"
#include "Acts/Surfaces/Surface.hpp"
#include "Acts/Surfaces/PerigeeSurface.hpp"
#include "Acts/Surfaces/DiscSurface.hpp"
@@ -31,7 +30,6 @@
#include "Acts/Utilities/Logger.hpp"
#include "ActsInterop/Logger.h"
#include "Acts/Propagator/detail/SteppingLogger.hpp"
-#include "ActsGeometry/ActsGeometryContext.h"
#include "ActsGeometryInterfaces/IActsTrackingGeometryTool.h"
#include "Acts/Geometry/GeometryContext.hpp"
#include "Acts/Utilities/Definitions.hpp"
@@ -138,13 +136,13 @@ StatusCode Trk::ExtrapolatorComparisonTest::initialize()
// create the Surface triplet
std::vector<std::shared_ptr<const Acts::Surface>> actsSurfaceTriplet;
- const Acts::Transform3D * posTransf = new Acts::Transform3D(Acts::Transform3D::Identity()*Acts::Translation3D(Acts::Vector3D(0.,0., halfZ)));
- const Acts::Transform3D * cTransf = new Acts::Transform3D(Acts::Transform3D::Identity()*Acts::Translation3D(Acts::Vector3D(0.,0., 0.)));
- const Acts::Transform3D * negTransf = new Acts::Transform3D(Acts::Transform3D::Identity()*Acts::Translation3D(Acts::Vector3D(0.,0.,-halfZ)));
+ Acts::Transform3D posTransf(Acts::Transform3D::Identity()*Acts::Translation3D(Acts::Vector3D(0.,0., halfZ)));
+ Acts::Transform3D cTransf(Acts::Transform3D::Identity()*Acts::Translation3D(Acts::Vector3D(0.,0., 0.)));
+ Acts::Transform3D negTransf(Acts::Transform3D::Identity()*Acts::Translation3D(Acts::Vector3D(0.,0.,-halfZ)));
- auto posSurface = Acts::Surface::makeShared<Acts::DiscSurface> (std::shared_ptr<const Acts::Transform3D>(posTransf), 0.,radius);
- auto cSurface = Acts::Surface::makeShared<Acts::CylinderSurface>(std::shared_ptr<const Acts::Transform3D>( cTransf),radius, halfZ);
- auto negSurface = Acts::Surface::makeShared<Acts::DiscSurface> (std::shared_ptr<const Acts::Transform3D>(negTransf), 0.,radius);
+ auto posSurface = Acts::Surface::makeShared<Acts::DiscSurface> (posTransf , 0.,radius);
+ auto cSurface = Acts::Surface::makeShared<Acts::CylinderSurface>( cTransf ,radius, halfZ);
+ auto negSurface = Acts::Surface::makeShared<Acts::DiscSurface> (negTransf , 0.,radius);
actsSurfaceTriplet.push_back(posSurface);
actsSurfaceTriplet.push_back(cSurface );
@@ -291,7 +289,7 @@ StatusCode Trk::ExtrapolatorComparisonTest::execute(const EventContext& ctx) con
// Perigee, no alignment -> default geo context
ActsGeometryContext gctx = m_extrapolationTool->trackingGeometryTool()->getNominalGeometryContext();
auto anygctx = gctx.any();
- const Acts::BoundParameters* startParameters = new const Acts::BoundParameters(anygctx, std::move(cov), std::move(pars), std::move(actsPerigeeSurface));
+ const Acts::BoundTrackParameters* startParameters = new const Acts::BoundTrackParameters(std::move(actsPerigeeSurface), std::move(pars), std::move(cov));
for (unsigned int surface = 0; surface < m_actsReferenceSurfaceTriples.size(); surface++) {
n_extraps++;
@@ -314,7 +312,7 @@ StatusCode Trk::ExtrapolatorComparisonTest::execute(const EventContext& ctx) con
if (destParameters) {
ATH_MSG_VERBOSE(" ACTS Extrapolator succeded!! --> Forward" );
- ATH_MSG_VERBOSE(" [ intersection ] with surface at (x,y,z) = " << destParameters->position().x() << ", " << destParameters->position().y() << ", " << destParameters->position().z() );
+ ATH_MSG_VERBOSE(" [ intersection ] with surface at (x,y,z) = " << destParameters->position(anygctx).x() << ", " << destParameters->position(anygctx).y() << ", " << destParameters->position(anygctx).z() );
ATH_MSG_VERBOSE(" [ intersection ] parameters: " << destParameters->parameters() );
ATH_MSG_VERBOSE(" [ intersection ] cov matrix: " << *destParameters->covariance() );
@@ -333,11 +331,22 @@ StatusCode Trk::ExtrapolatorComparisonTest::execute(const EventContext& ctx) con
} else if (!finalperigee) {
ATH_MSG_DEBUG(" ACTS Extrapolation to perigee failed for input parameters: " << destParameters->parameters());
}
-
- m_actsPropResultWriterSvc->write<Acts::BoundParameters>(startParameters, destParameters.release(), ms_fwd, finalperigee.release(), ms_bkw);
+
+ // Construct wrappers for Acts track parameters
+ const ActsTrackWrapper* startWrapper = new ActsTrackWrapper(startParameters, anygctx);
+ const ActsTrackWrapper* destWrapper = new ActsTrackWrapper(destParameters.release(), anygctx);
+ const ActsTrackWrapper* finalWrapper = new ActsTrackWrapper(finalperigee.release(), anygctx);
+
+ m_actsPropResultWriterSvc->write<ActsTrackWrapper>(startWrapper, destWrapper, ms_fwd, finalWrapper, ms_bkw);
+
+ delete startWrapper;
+ delete destWrapper;
+ delete finalWrapper;
} else if (!destParameters) {
ATH_MSG_DEBUG(" ACTS Extrapolation not successful! " );
- m_actsPropResultWriterSvc->write<Acts::BoundParameters>(startParameters);
+ const ActsTrackWrapper* startWrapper = new ActsTrackWrapper(startParameters, anygctx);
+ m_actsPropResultWriterSvc->write<ActsTrackWrapper>(startWrapper);
+ delete startWrapper;
}
}
delete startParameters;
diff --git a/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/RungeKuttaUtils.h b/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/RungeKuttaUtils.h
index 940308372258988781e918551f2f794bee06a5e5..90f406b03cad28bcdf0b17820a03b18a320a7646 100755
--- a/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/RungeKuttaUtils.h
+++ b/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/RungeKuttaUtils.h
@@ -122,16 +122,25 @@ namespace RungeKuttaUtils
/////////////////////////////////////////////////////////////////////////////////
bool transformLocalToGlobal(bool, const Trk::TrackParameters&, double*);
-
bool transformLocalToGlobal(bool, const Trk::NeutralParameters&, double*);
+ /////////////////////////////////////////////////////////////////////////////////
+ // Transformations from local to local system coordinates
+ /////////////////////////////////////////////////////////////////////////////////
+
+ bool
+ transformLocalToGlobal(bool,
+ const Trk::Surface*,
+ const AmgVector(5)& ATH_RESTRICT,
+ double* ATH_RESTRICT);
+
/////////////////////////////////////////////////////////////////////////////////
// Transformations from local to global system coordinates
// for Trk::PatternTrackParameters
/////////////////////////////////////////////////////////////////////////////////
bool transformLocalToGlobal(bool, const Trk::PatternTrackParameters&, double*);
-
+
/////////////////////////////////////////////////////////////////////////////////
// Transformations from global to local system coordinates
/////////////////////////////////////////////////////////////////////////////////
@@ -142,13 +151,11 @@ namespace RungeKuttaUtils
double* ATH_RESTRICT,
double* ATH_RESTRICT,
double* ATH_RESTRICT);
- /////////////////////////////////////////////////////////////////////////////////
-
- /////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
// Covariance matrix production for Trk::TrackParameters
/////////////////////////////////////////////////////////////////////////////////
- AmgSymMatrix(5)* newCovarianceMatrix(const double*, const AmgSymMatrix(5) &);
+ AmgSymMatrix(5)* newCovarianceMatrix(const double* ATH_RESTRICT, const AmgSymMatrix(5) &);
/////////////////////////////////////////////////////////////////////////////////
// Transformations from curvilinear to global system coordinates
@@ -169,17 +176,13 @@ namespace RungeKuttaUtils
/////////////////////////////////////////////////////////////////////////////////
void jacobianTransformCurvilinearToLocal(const Trk::TrackParameters&, double*);
-
void jacobianTransformCurvilinearToLocal(const Trk::PatternTrackParameters&, double*);
-
void jacobianTransformCurvilinearToLocal(double* ATH_RESTRICT, const Trk::Surface*, double* ATH_RESTRICT);
-
void jacobianTransformCurvilinearToDisc(double* ATH_RESTRICT, double* ATH_RESTRICT);
void jacobianTransformCurvilinearToPlane(double* ATH_RESTRICT, double* ATH_RESTRICT);
void jacobianTransformCurvilinearToCylinder(double* ATH_RESTRICT, double* ATH_RESTRICT);
void jacobianTransformCurvilinearToStraightLine(const double* ATH_RESTRICT, double* ATH_RESTRICT);
- bool transformLocalToGlobal(bool, const Trk::Surface*, const double* ATH_RESTRICT, double* ATH_RESTRICT);
}
}
diff --git a/Tracking/TrkExtrapolation/TrkExUtils/src/RungeKuttaUtils.cxx b/Tracking/TrkExtrapolation/TrkExUtils/src/RungeKuttaUtils.cxx
index 07b49c1268261811a11d7491725df0295c905cd0..9d99cae54bef9af90d10c9b3d8cfadef7ce139da 100755
--- a/Tracking/TrkExtrapolation/TrkExUtils/src/RungeKuttaUtils.cxx
+++ b/Tracking/TrkExtrapolation/TrkExUtils/src/RungeKuttaUtils.cxx
@@ -17,6 +17,7 @@
#include "TrkSurfaces/PlaneSurface.h"
#include "TrkSurfaces/StraightLineSurface.h"
+#include "CxxUtils/vec.h"
#include "CxxUtils/vectorize.h"
ATH_ENABLE_VECTORIZATION;
@@ -26,7 +27,141 @@ namespace{
* Hide all internal implementation methods
* inside an anonymous namespace
*/
+/*The notation of this package
+in array P[42].
+ /dL0 /dL1 /dPhi /dThe /dCM
+X ->P[0] dX / P[ 7] P[14] P[21] P[28] P[35]
+Y ->P[1] dY / P[ 8] P[15] P[22] P[29] P[36]
+Z ->P[2] dZ / P[ 9] P[16] P[23] P[30] P[37]
+Ax ->P[3] dAx/ P[10] P[17] P[24] P[31] P[38]
+Ay ->P[4] dAy/ P[11] P[18] P[25] P[32] P[39]
+Az ->P[5] dAz/ P[12] P[19] P[26] P[33] P[40]
+CM ->P[6] dCM/ P[13] P[20] P[27] P[34] P[41]
+*/
+inline void
+globalToLocalVecHelper(double* ATH_RESTRICT P,
+ const double s0,
+ const double s1,
+ const double s2,
+ const double s3,
+ const double s4)
+{
+ using namespace CxxUtils;
+ using vec2 = CxxUtils::vec<double, 2>;
+ using vec4 = CxxUtils::vec<double, 4>;
+
+ /* Calculation
+ P[ 7]-=(s0*P[ 3]); P[ 8]-=(s0*P[ 4]); P[ 9]-=(s0*P[ 5]);
+ P[10]-=(s0*P[42]); P[11]-=(s0*P[43]); P[12]-=(s0*P[44]);
+ P[14]-=(s1*P[ 3]); P[15]-=(s1*P[ 4]); P[16]-=(s1*P[ 5]);
+ P[17]-=(s1*P[42]); P[18]-=(s1*P[43]); P[19]-=(s1*P[44]);
+ P[21]-=(s2*P[ 3]); P[22]-=(s2*P[ 4]); P[23]-=(s2*P[ 5]);
+ P[24]-=(s2*P[42]); P[25]-=(s2*P[43]); P[26]-=(s2*P[44]);
+ P[28]-=(s3*P[ 3]); P[29]-=(s3*P[ 4]); P[30]-=(s3*P[ 5]);
+ P[31]-=(s3*P[42]); P[32]-=(s3*P[43]); P[33]-=(s3*P[44]);
+ P[35]-=(s4*P[ 3]); P[36]-=(s4*P[ 4]); P[37]-=(s4*P[ 5]);
+ P[38]-=(s4*P[42]); P[39]-=(s4*P[43]); P[40]-=(s4*P[44]);
+ */
+ /*
+ * The naming convention we follow is
+ * A_B -->SIMD vector of
+ * of size 2 containing
+ * {A,B}
+ * For example :
+ * dZdTheta_dAxdTheta --> {dZ/dTheta, dAx/dTheta}
+ * --> {P[30],P[31]}
+ */
+ vec2 Pmult1 = { P[3], P[4] };
+ vec4 Pmult2 = { P[5], P[42], P[43], P[44] };
+ vec2 dXdL0_dYdL0;
+ vload(dXdL0_dYdL0, &P[7]);
+ vec4 dZdL0_dAxdL0_dAydL0_dAzdL0;
+ vload(dZdL0_dAxdL0_dAydL0_dAzdL0, &P[9]);
+ dXdL0_dYdL0 -= s0 * Pmult1;
+ dZdL0_dAxdL0_dAydL0_dAzdL0 -= s0 * Pmult2;
+ vstore(&P[7], dXdL0_dYdL0);
+ vstore(&P[9], dZdL0_dAxdL0_dAydL0_dAzdL0);
+
+ vec2 dXdL1_dYdL1;
+ vload(dXdL1_dYdL1, &P[14]);
+ vec4 dZdL1_dAxdL1_dAydL1_dAzdL1;
+ vload(dZdL1_dAxdL1_dAydL1_dAzdL1, &P[16]);
+ dXdL1_dYdL1 -= s1 * Pmult1;
+ dZdL1_dAxdL1_dAydL1_dAzdL1 -= s1 * Pmult2;
+ vstore(&P[14], dXdL1_dYdL1);
+ vstore(&P[16], dZdL1_dAxdL1_dAydL1_dAzdL1);
+
+ vec2 dXdPhi_dYdPhi;
+ vload(dXdPhi_dYdPhi, &P[21]);
+ vec4 dZdPhi_dAxdPhi_dAydPhi_dAzdPhi;
+ vload(dZdPhi_dAxdPhi_dAydPhi_dAzdPhi, &P[23]);
+ dXdPhi_dYdPhi -= s2 * Pmult1;
+ dZdPhi_dAxdPhi_dAydPhi_dAzdPhi -= s2 * Pmult2;
+ vstore(&P[21], dXdPhi_dYdPhi);
+ vstore(&P[23], dZdPhi_dAxdPhi_dAydPhi_dAzdPhi);
+
+ vec2 dXdTheta_dYdTheta;
+ vload(dXdTheta_dYdTheta, &P[28]);
+ vec4 dZdTheta_dAxdTheta_dAydTheta_dAzdTheta;
+ vload(dZdTheta_dAxdTheta_dAydTheta_dAzdTheta, &P[30]);
+ dXdTheta_dYdTheta -= s3 * Pmult1;
+ dZdTheta_dAxdTheta_dAydTheta_dAzdTheta -= s3 * Pmult2;
+ vstore(&P[28], dXdTheta_dYdTheta);
+ vstore(&P[30], dZdTheta_dAxdTheta_dAydTheta_dAzdTheta);
+
+ vec2 dXdCM_dYdCM;
+ vload(dXdCM_dYdCM, &P[35]);
+ vec4 dZdCM_dAxdCM_AydCM_dAzdCM;
+ vload(dZdCM_dAxdCM_AydCM_dAzdCM, &P[37]);
+ dXdCM_dYdCM -= s4 * Pmult1;
+ dZdCM_dAxdCM_AydCM_dAzdCM -= s4 * Pmult2;
+ vstore(&P[35], dXdCM_dYdCM);
+ vstore(&P[37], dZdCM_dAxdCM_AydCM_dAzdCM);
+}
+
+inline void
+mutl3x5Helper(double* ATH_RESTRICT Jac,
+ const double* ATH_RESTRICT V,
+ const double* ATH_RESTRICT P)
+{
+ /* The following matrix multiplication
+ * 5x1 = 5x3 * 3X1
+ * for the Jacobian
+ * is repeated multiple times
+ * Jac[ 0] = Ax[0]*P[ 7]+Ax[1]*P[ 8]+Ax[2]*P[ 9]; // dL0/dL0
+ * Jac[ 1] = Ax[0]*P[14]+Ax[1]*P[15]+Ax[2]*P[16]; // dL0/dL1
+ * Jac[ 2] = Ax[0]*P[21]+Ax[1]*P[22]+Ax[2]*P[23]; // dL0/dPhi
+ * Jac[ 3] = Ax[0]*P[28]+Ax[1]*P[29]+Ax[2]*P[30]; // dL0/dThe
+ * Jac[ 4] = Ax[0]*P[35]+Ax[1]*P[36]+Ax[2]*P[37]; // dL0/dCM
+ * Jac[ 5] = Ay[0]*P[ 7]+Ay[1]*P[ 8]+Ay[2]*P[ 9]; // dL1/dL0
+ * Jac[ 6] = Ay[0]*P[14]+Ay[1]*P[15]+Ay[2]*P[16]; // dL1/dL1
+ * Jac[ 7] = Ay[0]*P[21]+Ay[1]*P[22]+Ay[2]*P[23]; // dL1/dPhi
+ * Jac[ 8] = Ay[0]*P[28]+Ay[1]*P[29]+Ay[2]*P[30]; // dL1/dThe
+ * Jac[ 9] = Ay[0]*P[35]+Ay[1]*P[36]+Ay[2]*P[37]; // dL1/dCM
+ */
+ using vec2 = CxxUtils::vec<double, 2>;
+ vec2 V1 = { V[0], V[0] };
+ vec2 V2 = { V[1], V[1] };
+ vec2 V3 = { V[2], V[2] };
+
+ // 1st and 2nd element
+ vec2 P1v1 = { P[0], P[7] };
+ vec2 P1v2 = { P[1], P[8] };
+ vec2 P1v3 = { P[2], P[9] };
+ vec2 res1 = V1 * P1v1 + V2 * P1v2 + V3 * P1v3;
+ CxxUtils::vstore(&Jac[0], res1);
+
+ // 3th and 4th element
+ vec2 P2v1 = { P[14], P[21] };
+ vec2 P2v2 = { P[15], P[22] };
+ vec2 P2v3 = { P[16], P[23] };
+ vec2 res2 = V1 * P2v1 + V2 * P2v2 + V3 * P2v3;
+ CxxUtils::vstore(&Jac[2], res2);
+
+ // The 5th element
+ Jac[4] = V[0] * P[28] + V[1] * P[29] + V[2] * P[30];
+}
void
transformGlobalToPlane(const Amg::Transform3D& T,
@@ -53,35 +188,12 @@ transformGlobalToPlane(const Amg::Transform3D& T,
if(A!=0.) A=1./A;
S[0]*=A; S[1]*=A; S[2]*=A;
- const double s0 = P[ 7]*S[0]+P[ 8]*S[1]+P[ 9]*S[2];
- const double s1 = P[14]*S[0]+P[15]*S[1]+P[16]*S[2];
- const double s2 = P[21]*S[0]+P[22]*S[1]+P[23]*S[2];
- const double s3 = P[28]*S[0]+P[29]*S[1]+P[30]*S[2];
- const double s4 = P[35]*S[0]+P[36]*S[1]+P[37]*S[2];
-
- P[ 7]-=(s0*P[ 3]); P[ 8]-=(s0*P[ 4]); P[ 9]-=(s0*P[ 5]);
- P[10]-=(s0*P[42]); P[11]-=(s0*P[43]); P[12]-=(s0*P[44]);
- P[14]-=(s1*P[ 3]); P[15]-=(s1*P[ 4]); P[16]-=(s1*P[ 5]);
- P[17]-=(s1*P[42]); P[18]-=(s1*P[43]); P[19]-=(s1*P[44]);
- P[21]-=(s2*P[ 3]); P[22]-=(s2*P[ 4]); P[23]-=(s2*P[ 5]);
- P[24]-=(s2*P[42]); P[25]-=(s2*P[43]); P[26]-=(s2*P[44]);
- P[28]-=(s3*P[ 3]); P[29]-=(s3*P[ 4]); P[30]-=(s3*P[ 5]);
- P[31]-=(s3*P[42]); P[32]-=(s3*P[43]); P[33]-=(s3*P[44]);
- P[35]-=(s4*P[ 3]); P[36]-=(s4*P[ 4]); P[37]-=(s4*P[ 5]);
- P[38]-=(s4*P[42]); P[39]-=(s4*P[43]); P[40]-=(s4*P[44]);
-
+ double s[5]={};
+ mutl3x5Helper(s,S,&P[7]);
+ globalToLocalVecHelper(P, s[0], s[1], s[2], s[3], s[4]);
// Jacobian production
- //
- Jac[ 0] = Ax[0]*P[ 7]+Ax[1]*P[ 8]+Ax[2]*P[ 9]; // dL0/dL0
- Jac[ 1] = Ax[0]*P[14]+Ax[1]*P[15]+Ax[2]*P[16]; // dL0/dL1
- Jac[ 2] = Ax[0]*P[21]+Ax[1]*P[22]+Ax[2]*P[23]; // dL0/dPhi
- Jac[ 3] = Ax[0]*P[28]+Ax[1]*P[29]+Ax[2]*P[30]; // dL0/dThe
- Jac[ 4] = Ax[0]*P[35]+Ax[1]*P[36]+Ax[2]*P[37]; // dL0/dCM
- Jac[ 5] = Ay[0]*P[ 7]+Ay[1]*P[ 8]+Ay[2]*P[ 9]; // dL1/dL0
- Jac[ 6] = Ay[0]*P[14]+Ay[1]*P[15]+Ay[2]*P[16]; // dL1/dL1
- Jac[ 7] = Ay[0]*P[21]+Ay[1]*P[22]+Ay[2]*P[23]; // dL1/dPhi
- Jac[ 8] = Ay[0]*P[28]+Ay[1]*P[29]+Ay[2]*P[30]; // dL1/dThe
- Jac[ 9] = Ay[0]*P[35]+Ay[1]*P[36]+Ay[2]*P[37]; // dL1/dCM
+ mutl3x5Helper(&Jac[0],Ax,&P[7]);
+ mutl3x5Helper(&Jac[5],Ay,&P[7]);
}
/////////////////////////////////////////////////////////////////////////////////
@@ -116,45 +228,23 @@ transformGlobalToDisc(const Amg::Transform3D& T,
if(A!=0.) A=1./A;
S[0]*=A; S[1]*=A; S[2]*=A;
- const double s0 = P[ 7]*S[0]+P[ 8]*S[1]+P[ 9]*S[2];
- const double s1 = P[14]*S[0]+P[15]*S[1]+P[16]*S[2];
- const double s2 = P[21]*S[0]+P[22]*S[1]+P[23]*S[2];
- const double s3 = P[28]*S[0]+P[29]*S[1]+P[30]*S[2];
- const double s4 = P[35]*S[0]+P[36]*S[1]+P[37]*S[2];
-
- P[ 7]-=(s0*P[ 3]); P[ 8]-=(s0*P[ 4]); P[ 9]-=(s0*P[ 5]);
- P[10]-=(s0*P[42]); P[11]-=(s0*P[43]); P[12]-=(s0*P[44]);
- P[14]-=(s1*P[ 3]); P[15]-=(s1*P[ 4]); P[16]-=(s1*P[ 5]);
- P[17]-=(s1*P[42]); P[18]-=(s1*P[43]); P[19]-=(s1*P[44]);
- P[21]-=(s2*P[ 3]); P[22]-=(s2*P[ 4]); P[23]-=(s2*P[ 5]);
- P[24]-=(s2*P[42]); P[25]-=(s2*P[43]); P[26]-=(s2*P[44]);
- P[28]-=(s3*P[ 3]); P[29]-=(s3*P[ 4]); P[30]-=(s3*P[ 5]);
- P[31]-=(s3*P[42]); P[32]-=(s3*P[43]); P[33]-=(s3*P[44]);
- P[35]-=(s4*P[ 3]); P[36]-=(s4*P[ 4]); P[37]-=(s4*P[ 5]);
- P[38]-=(s4*P[42]); P[39]-=(s4*P[43]); P[40]-=(s4*P[44]);
-
+ double s[5]={};
+ mutl3x5Helper(s,S,&P[7]);
+ globalToLocalVecHelper(P, s[0], s[1], s[2], s[3], s[4]);
// Jacobian production
//
double Ri = 1./par[0];
- const double A0 =(RC*Ax[0]+RS*Ay[0])*Ri;
- const double A1 =(RC*Ax[1]+RS*Ay[1])*Ri;
- const double A2 =(RC*Ax[2]+RS*Ay[2])*Ri;
- const double B0 =(RC*Ay[0]-RS*Ax[0])*(Ri=1./R2);
- const double B1 =(RC*Ay[1]-RS*Ax[1])*Ri;
- const double B2 =(RC*Ay[2]-RS*Ax[2])*Ri;
-
- Jac[ 0] = A0*P[ 7]+A1*P[ 8]+A2*P[ 9]; // dL0/dL0
- Jac[ 1] = A0*P[14]+A1*P[15]+A2*P[16]; // dL0/dL1
- Jac[ 2] = A0*P[21]+A1*P[22]+A2*P[23]; // dL0/dPhi
- Jac[ 3] = A0*P[28]+A1*P[29]+A2*P[30]; // dL0/dThe
- Jac[ 4] = A0*P[35]+A1*P[36]+A2*P[37]; // dL0/dCM
- Jac[ 5] = B0*P[ 7]+B1*P[ 8]+B2*P[ 9]; // dL1/dL0
- Jac[ 6] = B0*P[14]+B1*P[15]+B2*P[16]; // dL1/dL1
- Jac[ 7] = B0*P[21]+B1*P[22]+B2*P[23]; // dL1/dPhi
- Jac[ 8] = B0*P[28]+B1*P[29]+B2*P[30]; // dL1/dThe
- Jac[ 9] = B0*P[35]+B1*P[36]+B2*P[37]; // dL1/dCM
-}
+ const double Av[3] = { (RC * Ax[0] + RS * Ay[0]) * Ri,
+ (RC * Ax[1] + RS * Ay[1]) * Ri,
+ (RC * Ax[2] + RS * Ay[2]) * Ri };
+ const double Bv[3] = { (RC * Ay[0] - RS * Ax[0]) * (Ri = 1. / R2),
+ (RC * Ay[1] - RS * Ax[1]) * Ri,
+ (RC * Ay[2] - RS * Ax[2]) * Ri };
+
+ mutl3x5Helper(&Jac[0],Av,&P[7]);
+ mutl3x5Helper(&Jac[5],Bv,&P[7]);
+}
/////////////////////////////////////////////////////////////////////////////////
// Global position transformation to local Cylinder system coordinate
/////////////////////////////////////////////////////////////////////////////////
@@ -192,39 +282,18 @@ transformGlobalToCylinder(const Amg::Transform3D& T,
const double az = P[5]-Az[2]*C; z-=(B*Az[2]);
double A =(ax*x+ay*y+az*z); if(A!=0.) A=1./A; x*=A; y*=A; z*=A;
- const double s0 = P[ 7]*x+P[ 8]*y+P[ 9]*z;
- const double s1 = P[14]*x+P[15]*y+P[16]*z;
- const double s2 = P[21]*x+P[22]*y+P[23]*z;
- const double s3 = P[28]*x+P[29]*y+P[30]*z;
- const double s4 = P[35]*x+P[36]*y+P[37]*z;
-
- P[ 7]-=(s0*P[ 3]); P[ 8]-=(s0*P[ 4]); P[ 9]-=(s0*P[ 5]);
- P[10]-=(s0*P[42]); P[11]-=(s0*P[43]); P[12]-=(s0*P[44]);
- P[14]-=(s1*P[ 3]); P[15]-=(s1*P[ 4]); P[16]-=(s1*P[ 5]);
- P[17]-=(s1*P[42]); P[18]-=(s1*P[43]); P[19]-=(s1*P[44]);
- P[21]-=(s2*P[ 3]); P[22]-=(s2*P[ 4]); P[23]-=(s2*P[ 5]);
- P[24]-=(s2*P[42]); P[25]-=(s2*P[43]); P[26]-=(s2*P[44]);
- P[28]-=(s3*P[ 3]); P[29]-=(s3*P[ 4]); P[30]-=(s3*P[ 5]);
- P[31]-=(s3*P[42]); P[32]-=(s3*P[43]); P[33]-=(s3*P[44]);
- P[35]-=(s4*P[ 3]); P[36]-=(s4*P[ 4]); P[37]-=(s4*P[ 5]);
- P[38]-=(s4*P[42]); P[39]-=(s4*P[43]); P[40]-=(s4*P[44]);
-
+ const double S[3] = { x, y, z };
+ double s[5] = {};
+ mutl3x5Helper(s, S, &P[7]);
+ globalToLocalVecHelper(P, s[0], s[1], s[2], s[3], s[4]);
// Jacobian production
//
- const double A0 =(RC*Ay[0]-RS*Ax[0])*(R=1./R);
- const double A1 =(RC*Ay[1]-RS*Ax[1])* R;
- const double A2 =(RC*Ay[2]-RS*Ax[2])* R;
-
- Jac[ 0] = A0*P[ 7]+A1*P[ 8]+A2*P[ 9]; // dL0/dL0
- Jac[ 1] = A0*P[14]+A1*P[15]+A2*P[16]; // dL0/dL1
- Jac[ 2] = A0*P[21]+A1*P[22]+A2*P[23]; // dL0/dPhi
- Jac[ 3] = A0*P[28]+A1*P[29]+A2*P[30]; // dL0/dThe
- Jac[ 4] = A0*P[35]+A1*P[36]+A2*P[37]; // dL0/dCM
- Jac[ 5] = Az[0]*P[ 7]+Az[1]*P[ 8]+Az[2]*P[ 9]; // dL1/dL0
- Jac[ 6] = Az[0]*P[14]+Az[1]*P[15]+Az[2]*P[16]; // dL1/dL1
- Jac[ 7] = Az[0]*P[21]+Az[1]*P[22]+Az[2]*P[23]; // dL1/dPhi
- Jac[ 8] = Az[0]*P[28]+Az[1]*P[29]+Az[2]*P[30]; // dL1/dThe
- Jac[ 9] = Az[0]*P[35]+Az[1]*P[36]+Az[2]*P[37]; // dL1/dP4
+ const double Av[3] = { (RC * Ay[0] - RS * Ax[0]) * (R = 1. / R),
+ (RC * Ay[1] - RS * Ax[1]) * R,
+ (RC * Ay[2] - RS * Ax[2]) * R };
+
+ mutl3x5Helper(&Jac[0], Av, &P[7]);
+ mutl3x5Helper(&Jac[5], Az, &P[7]);
}
/////////////////////////////////////////////////////////////////////////////////
@@ -270,29 +339,14 @@ transformGlobalToLine(const Amg::Transform3D& T,
const double s4 = (((P[28]*X+P[29]*Y+P[30]*Z)+x*(d4*A[0]-P[31]))+(y*(d4*A[1]-P[32])+z*(d4*A[2]-P[33])))*a;
const double s5 = (((P[35]*X+P[36]*Y+P[37]*Z)+x*(d5*A[0]-P[38]))+(y*(d5*A[1]-P[39])+z*(d5*A[2]-P[40])))*a;
- P[ 7]+=(s1*P[ 3]); P[ 8]+=(s1*P[ 4]); P[ 9]+=(s1*P[ 5]);
- P[10]+=(s1*P[42]); P[11]+=(s1*P[43]); P[12]+=(s1*P[44]);
- P[14]+=(s2*P[ 3]); P[15]+=(s2*P[ 4]); P[16]+=(s2*P[ 5]);
- P[17]+=(s2*P[42]); P[18]+=(s2*P[43]); P[19]+=(s2*P[44]);
- P[21]+=(s3*P[ 3]); P[22]+=(s3*P[ 4]); P[23]+=(s3*P[ 5]);
- P[24]+=(s3*P[42]); P[25]+=(s3*P[43]); P[26]+=(s3*P[44]);
- P[28]+=(s4*P[ 3]); P[29]+=(s4*P[ 4]); P[30]+=(s4*P[ 5]);
- P[31]+=(s4*P[42]); P[32]+=(s4*P[43]); P[33]+=(s4*P[44]);
- P[35]+=(s5*P[ 3]); P[36]+=(s5*P[ 4]); P[37]+=(s5*P[ 5]);
- P[38]+=(s5*P[42]); P[39]+=(s5*P[43]); P[40]+=(s5*P[44]);
+ //pass -1 (As we want do add rather subtract in the helper)
+ globalToLocalVecHelper(P, -1.*s1, -1.*s2, -1.*s3, -1.*s4, -1.*s5);
// Jacobian production
//
- Jac[ 0] = Bx *P[ 7]+By *P[ 8]+Bz *P[ 9]; // dL0/dL0
- Jac[ 1] = Bx *P[14]+By *P[15]+Bz *P[16]; // dL0/dL1
- Jac[ 2] = Bx *P[21]+By *P[22]+Bz *P[23]; // dL0/dPhi
- Jac[ 3] = Bx *P[28]+By *P[29]+Bz *P[30]; // dL0/dThe
- Jac[ 4] = Bx *P[35]+By *P[36]+Bz *P[37]; // dL0/dCM
- Jac[ 5] = A[0]*P[ 7]+A[1]*P[ 8]+A[2]*P[ 9]; // dL1/dL0
- Jac[ 6] = A[0]*P[14]+A[1]*P[15]+A[2]*P[16]; // dL1/dL1
- Jac[ 7] = A[0]*P[21]+A[1]*P[22]+A[2]*P[23]; // dL1/dPhi
- Jac[ 8] = A[0]*P[28]+A[1]*P[29]+A[2]*P[30]; // dL1/dThe
- Jac[ 9] = A[0]*P[35]+A[1]*P[36]+A[2]*P[37]; // dL1/dCM
+ const double B[3]={Bx,By,Bz};
+ mutl3x5Helper(&Jac[0],B,&P[7]);
+ mutl3x5Helper(&Jac[5],A,&P[7]);
}
/////////////////////////////////////////////////////////////////////////////////
@@ -341,7 +395,7 @@ transformGlobalToCone(const Amg::Transform3D& T,
void
transformPlaneToGlobal(bool useJac,
const Amg::Transform3D& T,
- const double* ATH_RESTRICT p,
+ const AmgVector(5)& ATH_RESTRICT p,
double* ATH_RESTRICT P)
{
const double Ax[3] = {T(0,0),T(1,0),T(2,0)};
@@ -368,7 +422,7 @@ transformPlaneToGlobal(bool useJac,
void
transformDiscToGlobal(bool useJac,
const Amg::Transform3D& T,
- const double* ATH_RESTRICT p,
+ const AmgVector(5)& ATH_RESTRICT p,
double* ATH_RESTRICT P)
{
const double Ax[3] = {T(0,0),T(1,0),T(2,0)};
@@ -398,7 +452,7 @@ void
transformCylinderToGlobal(bool useJac,
const Amg::Transform3D& T,
double R,
- const double* ATH_RESTRICT p,
+ const AmgVector(5)& ATH_RESTRICT p,
double* ATH_RESTRICT P)
{
const double Ax[3] = {T(0,0),T(1,0),T(2,0)};
@@ -427,7 +481,7 @@ transformCylinderToGlobal(bool useJac,
void
transformLineToGlobal(bool useJac,
const Amg::Transform3D& T,
- const double* ATH_RESTRICT p,
+ const AmgVector(5)& ATH_RESTRICT p,
double* ATH_RESTRICT P)
{
const double A[3] = {T(0,2),T(1,2),T(2,2)};
@@ -471,10 +525,7 @@ bool Trk::RungeKuttaUtils::transformLocalToGlobal
{
const Trk::TrackParameters* pTp = &Tp; if(!pTp) return false;
- const AmgVector(5) Vp = Tp.parameters();
- double p[5] = {Vp[0],Vp[1],Vp[2],Vp[3],Vp[4]};
-
- return transformLocalToGlobal(useJac,&Tp.associatedSurface(),p,P);
+ return transformLocalToGlobal(useJac,&Tp.associatedSurface(),Tp.parameters(),P);
}
/////////////////////////////////////////////////////////////////////////////////
@@ -487,10 +538,7 @@ bool Trk::RungeKuttaUtils::transformLocalToGlobal
{
const Trk::NeutralParameters* pTp = &Tp; if(!pTp) return false;
- const AmgVector(5) Vp = Tp.parameters();
- double p[5] = {Vp[0],Vp[1],Vp[2],Vp[3],Vp[4]};
-
- return transformLocalToGlobal(useJac,&Tp.associatedSurface(),p,P);
+ return transformLocalToGlobal(useJac,&Tp.associatedSurface(),Tp.parameters(),P);
}
/////////////////////////////////////////////////////////////////////////////////
@@ -501,7 +549,12 @@ bool Trk::RungeKuttaUtils::transformLocalToGlobal
bool Trk::RungeKuttaUtils::transformLocalToGlobal
(bool useJac,const Trk::PatternTrackParameters& Tp,double* P)
{
- return transformLocalToGlobal(useJac,Tp.associatedSurface(),Tp.par(),P);
+ // TODO: Remove copies when Trk::PatternTrackParameters migrates uses AMG types.
+ const double * p = Tp.par();
+ AmgVector(5) tmp;
+ tmp << p[0], p[1], p[2], p[3], p[4];
+
+ return transformLocalToGlobal(useJac,Tp.associatedSurface(),tmp,P);
}
/////////////////////////////////////////////////////////////////////////////////
@@ -879,84 +932,59 @@ std::pair<double,int> Trk::RungeKuttaUtils::stepEstimator
}
*/
}
- return std::make_pair(Sm,N);
+ return std::make_pair(Sm, N);
}
/////////////////////////////////////////////////////////////////////////////////
// New covariance matrix calculation from old matrix and jacobian
/////////////////////////////////////////////////////////////////////////////////
-AmgSymMatrix(5)* Trk::RungeKuttaUtils::newCovarianceMatrix
-(const double* J,const AmgSymMatrix(5)& M)
+AmgSymMatrix(5) * Trk::RungeKuttaUtils::newCovarianceMatrix(
+ const double* ATH_RESTRICT J,
+ const AmgSymMatrix(5) & M)
{
AmgSymMatrix(5)* nM = new AmgSymMatrix(5);
AmgSymMatrix(5)& m = (*nM);
- const double V[15]={M(0,0),
- M(1,0),M(1,1),
- M(2,0),M(2,1),M(2,2),
- M(3,0),M(3,1),M(3,2),M(3,3),
- M(4,0),M(4,1),M(4,2),M(4,3),M(4,4)};
-
- const double a11 = (J[ 0]*V[ 0]+J[ 1]*V[ 1]+J[ 2]*V[ 3])+(J[ 3]*V[ 6]+J[ 4]*V[10]);
- const double a12 = (J[ 0]*V[ 1]+J[ 1]*V[ 2]+J[ 2]*V[ 4])+(J[ 3]*V[ 7]+J[ 4]*V[11]);
- const double a13 = (J[ 0]*V[ 3]+J[ 1]*V[ 4]+J[ 2]*V[ 5])+(J[ 3]*V[ 8]+J[ 4]*V[12]);
- const double a14 = (J[ 0]*V[ 6]+J[ 1]*V[ 7]+J[ 2]*V[ 8])+(J[ 3]*V[ 9]+J[ 4]*V[13]);
- const double a15 = (J[ 0]*V[10]+J[ 1]*V[11]+J[ 2]*V[12])+(J[ 3]*V[13]+J[ 4]*V[14]);
-
- m(0,0) = (a11*J[ 0]+a12*J[ 1]+a13*J[ 2])+(a14*J[ 3]+a15*J[ 4]);
-
- const double a21 = (J[ 5]*V[ 0]+J[ 6]*V[ 1]+J[ 7]*V[ 3])+(J[ 8]*V[ 6]+J[ 9]*V[10]);
- const double a22 = (J[ 5]*V[ 1]+J[ 6]*V[ 2]+J[ 7]*V[ 4])+(J[ 8]*V[ 7]+J[ 9]*V[11]);
- const double a23 = (J[ 5]*V[ 3]+J[ 6]*V[ 4]+J[ 7]*V[ 5])+(J[ 8]*V[ 8]+J[ 9]*V[12]);
- const double a24 = (J[ 5]*V[ 6]+J[ 6]*V[ 7]+J[ 7]*V[ 8])+(J[ 8]*V[ 9]+J[ 9]*V[13]);
- const double a25 = (J[ 5]*V[10]+J[ 6]*V[11]+J[ 7]*V[12])+(J[ 8]*V[13]+J[ 9]*V[14]);
-
- m(1,0) = (a21*J[ 0]+a22*J[ 1]+a23*J[ 2])+(a24*J[ 3]+a25*J[ 4]);
- m(1,1) = (a21*J[ 5]+a22*J[ 6]+a23*J[ 7])+(a24*J[ 8]+a25*J[ 9]);
- m(0,1) = m(1,0);
-
- const double a31 = (J[10]*V[ 0]+J[11]*V[ 1]+J[12]*V[ 3])+(J[13]*V[ 6]+J[14]*V[10]);
- const double a32 = (J[10]*V[ 1]+J[11]*V[ 2]+J[12]*V[ 4])+(J[13]*V[ 7]+J[14]*V[11]);
- const double a33 = (J[10]*V[ 3]+J[11]*V[ 4]+J[12]*V[ 5])+(J[13]*V[ 8]+J[14]*V[12]);
- const double a34 = (J[10]*V[ 6]+J[11]*V[ 7]+J[12]*V[ 8])+(J[13]*V[ 9]+J[14]*V[13]);
- const double a35 = (J[10]*V[10]+J[11]*V[11]+J[12]*V[12])+(J[13]*V[13]+J[14]*V[14]);
-
- m(2,0) = (a31*J[ 0]+a32*J[ 1]+a33*J[ 2])+(a34*J[ 3]+a35*J[ 4]);
- m(2,1) = (a31*J[ 5]+a32*J[ 6]+a33*J[ 7])+(a34*J[ 8]+a35*J[ 9]);
- m(2,2) = (a31*J[10]+a32*J[11]+a33*J[12])+(a34*J[13]+a35*J[14]);
- m(0,2) = m(2,0);
- m(1,2) = m(2,1);
-
- const double a41 = (J[15]*V[ 0]+J[16]*V[ 1]+J[17]*V[ 3])+(J[18]*V[ 6]+J[19]*V[10]);
- const double a42 = (J[15]*V[ 1]+J[16]*V[ 2]+J[17]*V[ 4])+(J[18]*V[ 7]+J[19]*V[11]);
- const double a43 = (J[15]*V[ 3]+J[16]*V[ 4]+J[17]*V[ 5])+(J[18]*V[ 8]+J[19]*V[12]);
- const double a44 = (J[15]*V[ 6]+J[16]*V[ 7]+J[17]*V[ 8])+(J[18]*V[ 9]+J[19]*V[13]);
- const double a45 = (J[15]*V[10]+J[16]*V[11]+J[17]*V[12])+(J[18]*V[13]+J[19]*V[14]);
-
- m(3,0) = (a41*J[ 0]+a42*J[ 1]+a43*J[ 2])+(a44*J[ 3]+a45*J[ 4]);
- m(3,1) = (a41*J[ 5]+a42*J[ 6]+a43*J[ 7])+(a44*J[ 8]+a45*J[ 9]);
- m(3,2) = (a41*J[10]+a42*J[11]+a43*J[12])+(a44*J[13]+a45*J[14]);
- m(3,3) = (a41*J[15]+a42*J[16]+a43*J[17])+(a44*J[18]+a45*J[19]);
- m(0,3) = m(3,0);
- m(1,3) = m(3,1);
- m(2,3) = m(3,2);
-
- const double a51 = J[20]*V[10];
- const double a52 = J[20] * V[11];
- const double a53 = J[20] * V[12];
- const double a54 = J[20] * V[13];
- const double a55 = J[20] * V[14];
-
- m(4,0) = (a51*J[ 0]+a52*J[ 1]+a53*J[ 2])+(a54*J[ 3]+a55*J[ 4]);
- m(4,1) = (a51*J[ 5]+a52*J[ 6]+a53*J[ 7])+(a54*J[ 8]+a55*J[ 9]);
- m(4,2) = (a51*J[10]+a52*J[11]+a53*J[12])+(a54*J[13]+a55*J[14]);
- m(4,3) = (a51*J[15]+a52*J[16]+a53*J[17])+(a54*J[18]+a55*J[19]);
- m(4,4) = a55*J[20];
- m(0,4) = m(4,0);
- m(1,4) = m(4,1);
- m(2,4) = m(4,2);
- m(3,4) = m(4,3);
+ Eigen::Map<const AmgVector(5)> JacMap0(&J[0], 5, 1);
+ const AmgVector(5) a1 = M * JacMap0; //(5x5 * 5x1)
+ m(0, 0) = a1.dot(JacMap0); // dot product
+
+ Eigen::Map<const AmgVector(5)> JacMap5(&J[5]);
+ const AmgVector(5) a2 = M * JacMap5;
+ m(1, 0) = a2.dot(JacMap0);
+ m(1, 1) = a2.dot(JacMap5);
+ m(0, 1) = m(1, 0);
+
+ Eigen::Map<const AmgVector(5)> JacMap10(&J[10], 5, 1);
+ const AmgVector(5) a3 = M * JacMap10;
+ m(2, 0) = a3.dot(JacMap0);
+ m(2, 1) = a3.dot(JacMap5);
+ m(2, 2) = a3.dot(JacMap10);
+ m(0, 2) = m(2, 0);
+ m(1, 2) = m(2, 1);
+
+ Eigen::Map<const AmgVector(5)> JacMap15(&J[15], 5, 1);
+ const AmgVector(5) a4 = M * JacMap15;
+ m(3, 0) = a4.dot(JacMap0);
+ m(3, 1) = a4.dot(JacMap5);
+ m(3, 2) = a4.dot(JacMap10);
+ m(3, 3) = a4.dot(JacMap15);
+ m(0, 3) = m(3, 0);
+ m(1, 3) = m(3, 1);
+ m(2, 3) = m(3, 2);
+
+ const AmgVector(5) a5 = M.row(4) * J[20];
+ m(4, 0) = a5.dot(JacMap0);
+ m(4, 1) = a5.dot(JacMap5);
+ m(4, 2) = a5.dot(JacMap10);
+ m(4, 3) = a5.dot(JacMap15);
+ m(4, 4) = a5[4] * J[20];
+ m(0, 4) = m(4, 0);
+ m(1, 4) = m(4, 1);
+ m(2, 4) = m(4, 2);
+ m(3, 4) = m(4, 3);
+
return nM;
}
@@ -967,7 +995,7 @@ AmgSymMatrix(5)* Trk::RungeKuttaUtils::newCovarianceMatrix
bool
Trk::RungeKuttaUtils::transformLocalToGlobal(bool useJac,
const Trk::Surface* Su,
- const double* ATH_RESTRICT p,
+ const AmgVector(5)& ATH_RESTRICT p,
double* ATH_RESTRICT P)
{
if(!Su) return false;
@@ -1052,22 +1080,9 @@ void Trk::RungeKuttaUtils::transformGlobalToCurvilinear
if(A!=0.) A=1./A;
S[0]*=A; S[1]*=A; S[2]*=A;
- const double s0 = P[ 7]*S[0]+P[ 8]*S[1]+P[ 9]*S[2];
- const double s1 = P[14]*S[0]+P[15]*S[1]+P[16]*S[2];
- const double s2 = P[21]*S[0]+P[22]*S[1]+P[23]*S[2];
- const double s3 = P[28]*S[0]+P[29]*S[1]+P[30]*S[2];
- const double s4 = P[35]*S[0]+P[36]*S[1]+P[37]*S[2];
-
- P[ 7]-=(s0*P[ 3]); P[ 8]-=(s0*P[ 4]); P[ 9]-=(s0*P[ 5]);
- P[10]-=(s0*P[42]); P[11]-=(s0*P[43]); P[12]-=(s0*P[44]);
- P[14]-=(s1*P[ 3]); P[15]-=(s1*P[ 4]); P[16]-=(s1*P[ 5]);
- P[17]-=(s1*P[42]); P[18]-=(s1*P[43]); P[19]-=(s1*P[44]);
- P[21]-=(s2*P[ 3]); P[22]-=(s2*P[ 4]); P[23]-=(s2*P[ 5]);
- P[24]-=(s2*P[42]); P[25]-=(s2*P[43]); P[26]-=(s2*P[44]);
- P[28]-=(s3*P[ 3]); P[29]-=(s3*P[ 4]); P[30]-=(s3*P[ 5]);
- P[31]-=(s3*P[42]); P[32]-=(s3*P[43]); P[33]-=(s3*P[44]);
- P[35]-=(s4*P[ 3]); P[36]-=(s4*P[ 4]); P[37]-=(s4*P[ 5]);
- P[38]-=(s4*P[42]); P[39]-=(s4*P[43]); P[40]-=(s4*P[44]);
+ double s[5]={};
+ mutl3x5Helper(s,S,&P[7]);
+ globalToLocalVecHelper(P, s[0], s[1], s[2], s[3], s[4]);
double P3,P4,C = P[3]*P[3]+P[4]*P[4];
if(C > 1.e-20) {C= 1./C ; P3 = P[3]*C; P4 =P[4]*C; C =-sqrt(C);}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfBetheHeitlerEffects.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfBetheHeitlerEffects.h
index 591ad30217889a8f39e992dd4ff593c09791be76..9337cccbf7147d60f279f59f7aa8bc8096a9cdc2 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfBetheHeitlerEffects.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfBetheHeitlerEffects.h
@@ -27,15 +27,43 @@ class GsfBetheHeitlerEffects
{
public:
+ static constexpr int maxNumberofComponents = 8;
+ static constexpr int maxOrderPolynomial = 10;
+ struct ComponentValues
+ {
+ // Default ctors/dtor/assignment operators
+ ComponentValues() = default;
+ ~ComponentValues() = default;
+ ComponentValues(const ComponentValues&) = default;
+ ComponentValues& operator=(const ComponentValues&) = default;
+ ComponentValues(ComponentValues&&) = default;
+ ComponentValues& operator=(ComponentValues&&) = default;
+ // Constructor with arguments
+ ComponentValues(double aWeight, double aMean, double aVariance)
+ : weight(aWeight)
+ , mean(aMean)
+ , variance(aVariance)
+ {}
+ double weight;
+ double mean;
+ double variance;
+ };
+
+ using MixtureParameters = std::array<ComponentValues, maxNumberofComponents>;
+
/** Helper class for construction and evaluation of polynomial */
class Polynomial
{
public:
- // Default constructor
Polynomial() = default;
-
- /** Constructor from a vector of coefficients (in decreasing order of powers
- * of x */
+ ~Polynomial() = default;
+ Polynomial(const Polynomial&) = default;
+ Polynomial& operator=(const Polynomial&) = default;
+ Polynomial(Polynomial&&) = default;
+ Polynomial& operator=(Polynomial&&) = default;
+
+ /** Constructor from a vector of coefficients
+ * (in decreasing order of powers of x) */
Polynomial(const std::vector<double>& coefficients)
: m_coefficients(coefficients){};
@@ -56,26 +84,6 @@ public:
std::vector<double> m_coefficients;
};
- struct ComponentValues
- {
- // Default ctors/dtor/assignment operators
- ComponentValues() = default;
- ~ComponentValues() = default;
- ComponentValues(const ComponentValues&) = default;
- ComponentValues& operator=(const ComponentValues&) = default;
- ComponentValues(ComponentValues&&) = default;
- ComponentValues& operator=(ComponentValues&&) = default;
- // Constructor with arguments
- ComponentValues(double aWeight, double aMean, double aVariance)
- : weight(aWeight)
- , mean(aMean)
- , variance(aVariance)
- {}
- double weight;
- double mean;
- double variance;
- };
-
GsfBetheHeitlerEffects(const std::string&,
const std::string&,
const IInterface*);
@@ -93,23 +101,19 @@ public:
ParticleHypothesis particleHypothesis =
nonInteracting) const override final;
- typedef std::vector<ComponentValues> MixtureParameters;
private:
-
// Read polynomial fit parameters from a specified file
bool readParameters();
// Read coeffients for a single polynomial fit
Polynomial readPolynomial(std::ifstream&, const int);
-
- std::vector<Polynomial> m_polynomialWeights;
- std::vector<Polynomial> m_polynomialMeans;
- std::vector<Polynomial> m_polynomialVariances;
- std::vector<Polynomial> m_polynomialWeightsHighX0;
- std::vector<Polynomial> m_polynomialMeansHighX0;
- std::vector<Polynomial> m_polynomialVariancesHighX0;
-
+ std::array<Polynomial,maxNumberofComponents> m_polynomialWeights;
+ std::array<Polynomial,maxNumberofComponents> m_polynomialMeans;
+ std::array<Polynomial,maxNumberofComponents> m_polynomialVariances;
+ std::array<Polynomial,maxNumberofComponents> m_polynomialWeightsHighX0;
+ std::array<Polynomial,maxNumberofComponents> m_polynomialMeansHighX0;
+ std::array<Polynomial,maxNumberofComponents> m_polynomialVariancesHighX0;
int m_numberOfComponents;
int m_transformationCode;
@@ -122,11 +126,10 @@ private:
double m_xOverRange;
double m_upperRange;
double m_componentMeanCut;
-
+
bool m_useHighX0;
std::string m_parameterisationFileName;
std::string m_parameterisationFileNameHighX0;
-
};
}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfCombinedMaterialEffects.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfCombinedMaterialEffects.h
index c22f1c11c5ce7156c841a29a355c6a20d8090c56..1a903fd9a7ea5b2441f08784c1b5bb6fba5c71ca 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfCombinedMaterialEffects.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfCombinedMaterialEffects.h
@@ -16,7 +16,6 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "TrkExInterfaces/IEnergyLossUpdator.h"
-#include "TrkExInterfaces/IMultipleScatteringUpdator.h"
#include "TrkGaussianSumFilter/IBetheHeitlerEffects.h"
#include "TrkGaussianSumFilter/IMultiStateMaterialEffects.h"
@@ -35,10 +34,7 @@ public:
virtual ~GsfCombinedMaterialEffects() override;
/** AlgTool initialise method */
- virtual StatusCode initialize() override;
-
- /** AlgTool finalise method */
- StatusCode finalize() override;
+ virtual StatusCode initialize() override final;
virtual void compute(
IMultiStateMaterialEffects::Cache&,
@@ -73,12 +69,6 @@ private:
PropDirection direction = anyDirection,
ParticleHypothesis particleHypothesis = nonInteracting) const;
- ToolHandle<IMultipleScatteringUpdator> m_msUpdator{
- this,
- "MultipleScatteringUpdator",
- "Trk::MultipleScatteringUpdator/AtlasMultipleScatteringUpdator",
- ""
- };
ToolHandle<IEnergyLossUpdator> m_EnergyLossUpdator{
this,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h
index 0d936b2d1dde39c753c6fd8b2b5904737bae67e1..fc6e6283a8ba87e7ab637586f982dc4786fca345 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfExtrapolator.h
@@ -19,8 +19,8 @@
#include "TrkExInterfaces/INavigator.h"
#include "TrkExInterfaces/IPropagator.h"
#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
-#include "TrkGaussianSumFilter/IMultiStateMaterialEffects.h"
-
+#include "TrkGaussianSumFilter/IMaterialMixtureConvolution.h"
+#include "TrkExInterfaces/IMultipleScatteringUpdator.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "TrkMaterialOnTrack/MaterialEffectsOnTrack.h"
@@ -41,9 +41,6 @@ class TrackingVolume;
class TrackingGeometry;
class TrackStateOnSurface;
class MaterialProperties;
-class IMultiComponentStateMerger;
-class IMaterialMixtureConvolution;
-class IMultipleScatteringUpdator;
/** @class GsfExtrapolator */
class GsfExtrapolator final
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IBetheHeitlerEffects.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IBetheHeitlerEffects.h
index 029d8860859bcb8f0b3ccc936315913c7a59cf31..8af03a16a9e7037318df80089e49e789bd1bcfb6 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IBetheHeitlerEffects.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IBetheHeitlerEffects.h
@@ -16,13 +16,9 @@
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-
+#include "TrkMultiComponentStateOnSurface/ComponentParameters.h"
#include "TrkEventPrimitives/ParticleHypothesis.h"
#include "TrkEventPrimitives/PropDirection.h"
-#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
-
-#include <Eigen/StdVector>
-#include <memory>
namespace Trk {
struct GSFEnergyLossCache
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h
index 4719b503c6f6f50f230690b901a22818918391dc..eb225a2f91d33dc10826bc8dfd7dc36aae735c05 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h
@@ -8,7 +8,7 @@
* @date 26th November 2019
*
*
- * @brief Uyilities to facilitate the calculation of the
+ * @brief Utilities to facilitate the calculation of the
* divergence between components of the mixture
* and the merging of similar componets.
*
@@ -101,9 +101,13 @@ struct Component1D
* @brief Merge the componentsIn and return
* which componets got merged
*
- * The input component array is assumed to be
- * GSFUtils::alignment aligned.
+ * inputSize is expected to be >0, <128
+ * and reducedSize < inputsize. Invalid input
+ * will cause a runtime exception
*
+ * Furthemore, the input component array is assumed to be
+ * GSFUtils::alignment aligned.
+ * Can be created via the AlignedDynArray.
*/
std::vector<std::pair<int16_t, int16_t>>
findMerges(Component1D* componentsIn,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h
index fb739c82bb923ab1ddb825766d087061664ad8a9..d48ba5e71ec32e5beec17afb35e7a8fd39022175 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h
@@ -60,10 +60,6 @@ combineWithWeight(const MultiComponentState&,
const bool useMode = false,
const double fractionPDFused = 1.0);
-std::unique_ptr<Trk::ComponentParameters>
-compute(const MultiComponentState*,
- const bool useMode = false,
- const double fractionPDFused = 1.0);
}
} // end Trk namespace
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
index 4175ea9040458135c606260f8164df699c1b298c..191521a60cca0eb1692368c4ea628e9faf41cb68 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
@@ -27,13 +27,7 @@ namespace QuickCloseComponentsMultiStateMerger {
MultiComponentState
merge(Trk::MultiComponentState&&, const unsigned int maximumNumberOfComponents);
-/// Method for merging and assembling a state
-MultiComponentState
-mergeFullDistArray(MultiComponentStateAssembler::Cache& cache,
- Trk::MultiComponentState&,
- const unsigned int maximumNumberOfComponents);
}
-
}
#endif
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
index afef29f20f45ef69d7c37a7b60ecd1811255d6af..77bada201f6e21ab29fcce823e56058cfa57c81f 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
@@ -87,9 +87,9 @@ Trk::GaussianSumFitter::initialize()
"Trk::ParticleHypothesis: "
<< m_overideMaterialEffects);
}
- if( m_maximumNumberOfComponents > 16){
- ATH_MSG_FATAL("Requested MaximumNumberOfComponents > 16");
- return StatusCode::FAILURE;
+ if (m_maximumNumberOfComponents > 16) {
+ ATH_MSG_FATAL("Requested MaximumNumberOfComponents > 16");
+ return StatusCode::FAILURE;
}
// Initialise the closest track parameters search algorithm
Amg::Vector3D referencePosition(m_sortingReferencePoint[0],
@@ -207,8 +207,6 @@ Trk::GaussianSumFitter::fit(
++measurementOnTrack) {
if (!(*measurementOnTrack)) {
- ATH_MSG_DEBUG("This track contains an empty MeasurementBase object... "
- "Ignoring object");
continue;
}
@@ -219,17 +217,12 @@ Trk::GaussianSumFitter::fit(
}
if (!rioOnTrack) {
- ATH_MSG_DEBUG(
- "Measurement could not be cast as a RIO_OnTrack object... continuing");
continue;
}
const PrepRawData* prepRawData = rioOnTrack->prepRawData();
if (!prepRawData) {
- ATH_MSG_DEBUG(
- "Defined RIO_OnTrack object has no associated PrepRawData object..."
- << "this object will be ignored in fit");
continue;
}
@@ -293,7 +286,6 @@ Trk::GaussianSumFitter::fit(
particleHypothesis);
if (!forwardTrajectory || forwardTrajectory->empty()) {
- ATH_MSG_DEBUG("Forward GSF fit failed... Exiting!");
++m_ForwardFailure;
return nullptr;
}
@@ -304,7 +296,6 @@ Trk::GaussianSumFitter::fit(
// Protect against failed smoother fit
if (!smoothedTrajectory) {
- ATH_MSG_DEBUG("Smoother GSF fit failed... Exiting!");
++m_SmootherFailure;
return nullptr;
}
@@ -312,7 +303,6 @@ Trk::GaussianSumFitter::fit(
// Outlier m_logic and track finalisation
std::unique_ptr<FitQuality> fitQuality = buildFitQuality(*smoothedTrajectory);
if (!fitQuality) {
- ATH_MSG_DEBUG("Chi squared could not be calculated... Bailing");
++m_fitQualityFailure;
return nullptr;
}
@@ -321,12 +311,9 @@ Trk::GaussianSumFitter::fit(
const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface =
makePerigee(
ctx, extrapolatorCache, *smoothedTrajectory, particleHypothesis);
- ATH_MSG_DEBUG(
- "perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface);
if (perigeeMultiStateOnSurface) {
smoothedTrajectory->push_back(perigeeMultiStateOnSurface);
} else {
- ATH_MSG_DEBUG("Perigee asked to be created but failed.....Exiting");
++m_PerigeeFailure;
return nullptr;
}
@@ -402,9 +389,6 @@ Trk::GaussianSumFitter::fit(
}
if (!ccot) {
cleanedMeasurementSet.push_back(*itSet);
- } else {
- ATH_MSG_DEBUG(
- "The MeasurementBase object is a Trk::CaloCluster_OnTrack");
}
}
}
@@ -436,13 +420,11 @@ Trk::GaussianSumFitter::fit(
particleHypothesis);
if (!forwardTrajectory) {
- ATH_MSG_DEBUG("Forward GSF fit failed... Exiting!");
++m_ForwardFailure;
return nullptr;
}
if (forwardTrajectory->empty()) {
- ATH_MSG_DEBUG("No states in forward trajectory... Exiting!");
++m_ForwardFailure;
return nullptr;
}
@@ -454,7 +436,6 @@ Trk::GaussianSumFitter::fit(
// Protect against failed smoother fit
if (!smoothedTrajectory) {
- ATH_MSG_DEBUG("Smoother GSF fit failed... Exiting!");
++m_SmootherFailure;
return nullptr;
}
@@ -463,7 +444,6 @@ Trk::GaussianSumFitter::fit(
std::unique_ptr<FitQuality> fitQuality = buildFitQuality(*smoothedTrajectory);
if (!fitQuality) {
- ATH_MSG_DEBUG("Chi squared could not be calculated... Bailing");
++m_fitQualityFailure;
return nullptr;
}
@@ -472,13 +452,9 @@ Trk::GaussianSumFitter::fit(
const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface =
makePerigee(
ctx, extrapolatorCache, *smoothedTrajectory, particleHypothesis);
- ATH_MSG_DEBUG(
- "perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface);
-
if (perigeeMultiStateOnSurface) {
smoothedTrajectory->push_back(perigeeMultiStateOnSurface);
} else {
- ATH_MSG_DEBUG("Perigee asked to be created but failed.....Exiting");
++m_PerigeeFailure;
return nullptr;
}
@@ -529,8 +505,6 @@ Trk::GaussianSumFitter::fit(const EventContext& ctx,
/* determine the Track Parameter which is the start of the trajectory,
i.e. closest to the reference point */
- ATH_MSG_DEBUG("get track parameters near origin "
- << (m_doHitSorting ? "via STL sort" : "from 1st state"));
const TrackParameters* estimatedStartParameters =
m_doHitSorting ? *(std::min_element(intrk.trackParameters()->begin(),
@@ -544,14 +518,10 @@ Trk::GaussianSumFitter::fit(const EventContext& ctx,
m_sortingReferencePoint[1],
m_sortingReferencePoint[2]);
- TrackFitInputPreparator* inputPreparator =
- new TrackFitInputPreparator(referencePosition);
-
- PrepRawDataSet orderedPRDColl = inputPreparator->stripPrepRawData(
+ TrackFitInputPreparator inputPreparator(referencePosition);
+ PrepRawDataSet orderedPRDColl = inputPreparator.stripPrepRawData(
intrk, addPrdColl, m_doHitSorting, true /* do not lose outliers! */);
- delete inputPreparator;
-
return fit(
ctx, orderedPRDColl, *estimatedStartParameters, runOutlier, matEffects);
}
@@ -711,7 +681,6 @@ Trk::GaussianSumFitter::makePerigee(
particleHypothesis);
if (stateExtrapolatedToPerigee.empty()) {
- ATH_MSG_DEBUG("Track could not be extrapolated to perigee... returning 0");
return nullptr;
}
@@ -751,7 +720,6 @@ Trk::GaussianSumFitter::makePerigee(
nullptr,
pattern,
modeQoverP);
- ATH_MSG_DEBUG("makePerigee() returning sucessfully!");
return perigeeMultiStateOnSurface;
}
@@ -857,7 +825,6 @@ Trk::GaussianSumFitter::fitPRD(
configuredParticleHypothesis);
if (!stepIsValid) {
- ATH_MSG_DEBUG("Fitter step is not valid... Exiting!");
return nullptr;
}
}
@@ -976,11 +943,7 @@ Trk::GaussianSumFitter::stepForwardFit(
false,
particleHypothesis);
if (extrapolatedState.empty()) {
- ATH_MSG_DEBUG("Extrapolation failed... returning false");
return false;
- } else {
- ATH_MSG_DEBUG(
- "Extrapolation worked... state size: " << extrapolatedState.size());
}
// =======================
// Measurement Preparation
@@ -1016,15 +979,12 @@ Trk::GaussianSumFitter::stepForwardFit(
*measurement,
*fitQuality);
if (updatedState.empty()) {
- ATH_MSG_DEBUG("Measurement update of the state failed... Exiting!");
return false;
}
// Reject hits with excessive Chi2
if (fitQuality->chiSquared() >
m_cutChiSquaredPerNumberDOF * fitQuality->numberDoF()) {
- ATH_MSG_DEBUG("Update with new measurement caused track to fail Chi "
- "Squared test, removing the object");
fitQuality = std::make_unique<FitQuality>(1, 1);
std::bitset<TrackStateOnSurface::NumberOfTrackStateOnSurfaceTypes> type(0);
type.set(TrackStateOnSurface::Outlier);
@@ -1073,8 +1033,8 @@ Trk::GaussianSumFitter::fit(
* In general for things we want to control their lifetime locally
* we use unique_ptr
*
- * For things where we get or pass ownership to a multistate and then continue
- * to use them we opt for const ptr* for now.
+ * For things where we will not really own, but we need to point at
+ * we opt for const ptr*
*/
auto smoothedTrajectory = std::make_unique<Trk::SmoothedTrajectory>();
auto smootherPredictionMultiState =
@@ -1083,12 +1043,11 @@ Trk::GaussianSumFitter::fit(
* Get the initial smoother prediction. It is the last prediction in the
* forwards trajectory
*/
- /* these can be owned by the input so const ptr*/
+
+ // these can be owned by the input so const ptr*/
const Trk::TrackStateOnSurface* smootherPredictionStateOnSurface =
forwardTrajectory.back();
- /*
- * We can have single or Multi components here, so we choose what to clone
- */
+ // We can have single or Multi components here, so we choose what to clone
const Trk::MultiComponentStateOnSurface*
smootherPredictionMultiStateOnSurface = nullptr;
@@ -1119,10 +1078,9 @@ Trk::GaussianSumFitter::fit(
*/
Trk::FitQualityOnSurface fitQuality;
/*
- * The following 2 pointers if not null will be owned by the
+ * The following pointer if not null will be owned by the
* MultiComponentStateOnSurface* updatedStateOnSurface
- * at the end of the code and we need to re-use them.
- * So const ptr
+ * at the end of the code and we need to re-use it
*/
const Trk::MeasurementBase* firstSmootherMeasurementOnTrack =
smootherPredictionStateOnSurface->measurementOnTrack()->clone();
@@ -1138,7 +1096,6 @@ Trk::GaussianSumFitter::fit(
fitQuality);
if (firstSmoothedState.empty()) {
- ATH_MSG_DEBUG("First GSF smoothing update failed... Exiting!");
delete firstSmootherMeasurementOnTrack;
return nullptr;
}
@@ -1513,11 +1470,10 @@ Trk::GaussianSumFitter::addCCOT(
}
// Build TSOS with CCOT at the surface of the surface of calo
- Trk::MultiComponentStateOnSurface* updatedMCSOS =
- new Trk::MultiComponentStateOnSurface(
- ccot->clone(),
- MultiComponentStateHelpers::clone(updatedState).release(),
- (std::make_unique<Trk::FitQualityOnSurface>(fitQuality)).release());
+ auto updatedMCSOS = std::make_unique<Trk::MultiComponentStateOnSurface>(
+ ccot->clone(),
+ MultiComponentStateHelpers::clone(updatedState).release(),
+ (std::make_unique<Trk::FitQualityOnSurface>(fitQuality)).release());
// Extrapolate back to the surface nearest the origin
extrapolatedState = m_extrapolator->extrapolateDirectly(ctx,
@@ -1528,7 +1484,6 @@ Trk::GaussianSumFitter::addCCOT(
Trk::nonInteracting);
if (extrapolatedState.empty()) {
- delete updatedMCSOS;
return {};
}
@@ -1545,8 +1500,8 @@ Trk::GaussianSumFitter::addCCOT(
defPar.push_back(locX);
Trk::LocalParameters locpars(defPar);
- Trk::PseudoMeasurementOnTrack* pseudoMeasurement =
- new PseudoMeasurementOnTrack(locpars, covMatrix, *currentSurface);
+ auto pseudoMeasurement = std::make_unique<Trk::PseudoMeasurementOnTrack>(
+ locpars, covMatrix, *currentSurface);
// Combine the state using and find the mode of the distribution
std::unique_ptr<Trk::TrackParameters> combinedState =
@@ -1555,14 +1510,15 @@ Trk::GaussianSumFitter::addCCOT(
m_updator.fitQuality(extrapolatedState, *ccot));
// Build a TSOS using the dummy measurement and combined state
- Trk::MultiComponentStateOnSurface* finalSOS =
- new Trk::MultiComponentStateOnSurface(
- pseudoMeasurement,
- combinedState.release(),
- MultiComponentStateHelpers::clone(extrapolatedState).release(),
- combinedFitQuality.release());
- smoothedTrajectory.push_back(updatedMCSOS);
- smoothedTrajectory.push_back(finalSOS);
+ auto finalSOS = std::make_unique<Trk::MultiComponentStateOnSurface>(
+ pseudoMeasurement.release(),
+ combinedState.release(),
+ MultiComponentStateHelpers::clone(extrapolatedState).release(),
+ combinedFitQuality.release());
+
+ // Pointers owned by the smoothedTrajectory
+ smoothedTrajectory.push_back(updatedMCSOS.release());
+ smoothedTrajectory.push_back(finalSOS.release());
return extrapolatedState;
}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfBetheHeitlerEffects.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfBetheHeitlerEffects.cxx
index 3c6063f1c849aa314188a699efce428357dcf5ff..f0b4b8517b43ae3550db7f34848c2bb914252b4d 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfBetheHeitlerEffects.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfBetheHeitlerEffects.cxx
@@ -20,6 +20,9 @@
#include <fstream>
namespace {
+
+using BH = Trk::GsfBetheHeitlerEffects;
+
template<class T>
bool
inRange(const T& var, const T& lo, const T& hi)
@@ -49,118 +52,111 @@ betheHeitlerVariance(const double r)
}
void
-correctWeights(Trk::GsfBetheHeitlerEffects::MixtureParameters& mixture)
+correctWeights(BH::MixtureParameters& mixture, const int numberOfComponents)
{
- if (mixture.empty()) {
+ if (numberOfComponents < 1) {
return;
}
-
// Obtain the sum of weights
double weightSum(0.);
-
- Trk::GsfBetheHeitlerEffects::MixtureParameters::const_iterator component =
- mixture.begin();
- for (; component != mixture.end(); ++component) {
- weightSum += (*component).weight;
+ for (int i = 0; i < numberOfComponents; ++i) {
+ weightSum += mixture[i].weight;
}
-
// Rescale so that total weighting is 1
- Trk::GsfBetheHeitlerEffects::MixtureParameters::iterator modifiableComponent =
- mixture.begin();
-
- for (; modifiableComponent != mixture.end(); ++modifiableComponent) {
- (*modifiableComponent).weight /= weightSum;
+ for (int i = 0; i < numberOfComponents; ++i) {
+ mixture[i].weight /= weightSum;
}
}
double
-correctedFirstMean(
- const double pathlengthInX0,
- const Trk::GsfBetheHeitlerEffects::MixtureParameters& mixture)
+correctedFirstMean(const double pathlengthInX0,
+ const BH::MixtureParameters& mixture,
+ const int numberOfComponents)
{
-
- if (mixture.empty()) {
- return 0.;
+ if (numberOfComponents < 1) {
+ return 0;
}
// Obtain the difference between the true and weighted sum
double meanBH = betheHeitlerMean(pathlengthInX0);
- Trk::GsfBetheHeitlerEffects::MixtureParameters::const_iterator component =
- mixture.begin() + 1;
- for (; component != mixture.end(); ++component) {
- meanBH -= (*component).weight * (*component).mean;
+ for (int i = 1; i < numberOfComponents; ++i) {
+ meanBH -= mixture[i].weight * mixture[i].mean;
}
+
// return the corrected mean for the first component
return std::max(std::min(meanBH / mixture[0].weight, 1.), 0.);
}
double
-correctedFirstVariance(
- const double pathlengthInX0,
- const Trk::GsfBetheHeitlerEffects::MixtureParameters& mixture)
+correctedFirstVariance(const double pathlengthInX0,
+ const BH::MixtureParameters& mixture,
+ const int numberOfComponents)
{
-
- if (mixture.empty()) {
- return 0.;
+ if (numberOfComponents < 1) {
+ return 0;
}
// Obtain the difference between the true and weighed sum variances
double varianceBH =
betheHeitlerVariance(pathlengthInX0) +
(betheHeitlerMean(pathlengthInX0) * betheHeitlerMean(pathlengthInX0));
+
varianceBH -= mixture[0].weight * mixture[0].mean * mixture[0].mean;
- Trk::GsfBetheHeitlerEffects::MixtureParameters::const_iterator component =
- mixture.begin() + 1;
- for (; component != mixture.end(); ++component) {
- varianceBH -= (*component).weight * ((*component).mean * (*component).mean +
- (*component).variance);
+ for (int i = 1; i < numberOfComponents; ++i) {
+ varianceBH -= mixture[i].weight *
+ (mixture[i].mean * mixture[i].mean + mixture[i].variance);
}
+
return std::max(varianceBH / mixture[0].weight, 0.);
}
-Trk::GsfBetheHeitlerEffects::MixtureParameters
+BH::MixtureParameters
getTranformedMixtureParameters(
- const std::vector<Trk::GsfBetheHeitlerEffects::Polynomial>& polynomialWeights,
- const std::vector<Trk::GsfBetheHeitlerEffects::Polynomial>& polynomialMeans,
- const std::vector<Trk::GsfBetheHeitlerEffects::Polynomial>& polynomialVariances,
+ const std::array<BH::Polynomial, BH::maxNumberofComponents>&
+ polynomialWeights,
+ const std::array<BH::Polynomial, BH::maxNumberofComponents>& polynomialMeans,
+ const std::array<BH::Polynomial, BH::maxNumberofComponents>&
+ polynomialVariances,
const double pathlengthInX0,
const int numberOfComponents)
{
- Trk::GsfBetheHeitlerEffects::MixtureParameters mixture;
- mixture.reserve(numberOfComponents);
+ BH::MixtureParameters mixture{};
for (int i = 0; i < numberOfComponents; ++i) {
const double updatedWeight = polynomialWeights[i](pathlengthInX0);
const double updatedMean = polynomialMeans[i](pathlengthInX0);
const double updatedVariance = polynomialVariances[i](pathlengthInX0);
- mixture.emplace_back(logisticFunction(updatedWeight),
- logisticFunction(updatedMean),
- exp(updatedVariance));
+ mixture[i] = { logisticFunction(updatedWeight),
+ logisticFunction(updatedMean),
+ std::exp(updatedVariance) };
}
return mixture;
}
-Trk::GsfBetheHeitlerEffects::MixtureParameters
+BH::MixtureParameters
getMixtureParameters(
- const std::vector<Trk::GsfBetheHeitlerEffects::Polynomial>& polynomialWeights,
- const std::vector<Trk::GsfBetheHeitlerEffects::Polynomial>& polynomialMeans,
- const std::vector<Trk::GsfBetheHeitlerEffects::Polynomial>& polynomialVariances,
+ const std::array<BH::Polynomial, BH::maxNumberofComponents>&
+ polynomialWeights,
+ const std::array<BH::Polynomial, BH::maxNumberofComponents>& polynomialMeans,
+ const std::array<BH::Polynomial, BH::maxNumberofComponents>&
+ polynomialVariances,
const double pathlengthInX0,
const int numberOfComponents)
{
- Trk::GsfBetheHeitlerEffects::MixtureParameters mixture;
- mixture.reserve(numberOfComponents);
+ BH::MixtureParameters mixture{};
for (int i = 0; i < numberOfComponents; ++i) {
const double updatedWeight = polynomialWeights[i](pathlengthInX0);
const double updatedMean = polynomialMeans[i](pathlengthInX0);
const double updatedVariance = polynomialVariances[i](pathlengthInX0);
- mixture.emplace_back(
- updatedWeight, updatedMean, updatedVariance * updatedVariance);
+ mixture[i] = { updatedWeight,
+ updatedMean,
+ updatedVariance * updatedVariance };
}
return mixture;
}
+
} // end of Anonymous namespace for Helper methods
Trk::GsfBetheHeitlerEffects::GsfBetheHeitlerEffects(const std::string& type,
@@ -217,6 +213,8 @@ Trk::GsfBetheHeitlerEffects::initialize()
bool
Trk::GsfBetheHeitlerEffects::readParameters()
{
+
+ // Read std polynomial
std::string resolvedFileName =
PathResolver::find_file(m_parameterisationFileName, "DATAPATH");
if (!resolvedFileName.empty()) {
@@ -238,14 +236,14 @@ Trk::GsfBetheHeitlerEffects::readParameters()
fin >> orderPolynomial;
fin >> m_transformationCode;
//
- if (not inRange(m_numberOfComponents, 0, 8)) {
- ATH_MSG_ERROR("numberOfComponents Parameter out of range 0-8: "
- << m_numberOfComponents);
+ if (not inRange(m_numberOfComponents, 0, maxNumberofComponents)) {
+ ATH_MSG_ERROR("numberOfComponents Parameter out of range 0- "
+ << maxNumberofComponents << " : " << m_numberOfComponents);
return false;
}
- if (not inRange(orderPolynomial, 0, 10)) {
- ATH_MSG_ERROR(
- "orderPolynomial Parameter out of range 0-10: " << orderPolynomial);
+ if (not inRange(orderPolynomial, 0, maxOrderPolynomial)) {
+ ATH_MSG_ERROR("orderPolynomial Parameter out of range 0- "
+ << maxOrderPolynomial << " : " << orderPolynomial);
return false;
}
if (not inRange(m_transformationCode, 0, 10)) {
@@ -260,11 +258,13 @@ Trk::GsfBetheHeitlerEffects::readParameters()
int componentIndex = 0;
for (; componentIndex < m_numberOfComponents; ++componentIndex) {
- m_polynomialWeights.push_back(readPolynomial(fin, orderPolynomial));
- m_polynomialMeans.push_back(readPolynomial(fin, orderPolynomial));
- m_polynomialVariances.push_back(readPolynomial(fin, orderPolynomial));
+ m_polynomialWeights[componentIndex] = readPolynomial(fin, orderPolynomial);
+ m_polynomialMeans[componentIndex] = readPolynomial(fin, orderPolynomial);
+ m_polynomialVariances[componentIndex] =
+ readPolynomial(fin, orderPolynomial);
}
+ // Read the high X0 polynomial
if (m_useHighX0) {
resolvedFileName =
PathResolver::find_file(m_parameterisationFileNameHighX0, "DATAPATH");
@@ -288,14 +288,20 @@ Trk::GsfBetheHeitlerEffects::readParameters()
fin >> orderPolynomial;
fin >> m_transformationCodeHighX0;
//
- if (not inRange(m_numberOfComponentsHighX0, 0, 8)) {
- ATH_MSG_ERROR("numberOfComponents Parameter out of range 0-8: "
+ if (not inRange(m_numberOfComponentsHighX0, 0, maxNumberofComponents)) {
+ ATH_MSG_ERROR("numberOfComponentsHighX0 Parameter out of range 0- "
+ << maxNumberofComponents << " : "
<< m_numberOfComponentsHighX0);
return false;
}
- if (not inRange(orderPolynomial, 0, 10)) {
- ATH_MSG_ERROR(
- "orderPolynomial Parameter out of range 0-10: " << orderPolynomial);
+ if (m_numberOfComponentsHighX0 != m_numberOfComponents) {
+ ATH_MSG_ERROR(" numberOfComponentsHighX0 != numberOfComponents");
+ return false;
+ }
+
+ if (not inRange(orderPolynomial, 0, maxOrderPolynomial)) {
+ ATH_MSG_ERROR("orderPolynomial Parameter out of range 0- "
+ << maxOrderPolynomial << " : " << orderPolynomial);
return false;
}
if (not inRange(m_transformationCodeHighX0, 0, 10)) {
@@ -310,10 +316,12 @@ Trk::GsfBetheHeitlerEffects::readParameters()
int componentIndex = 0;
for (; componentIndex < m_numberOfComponentsHighX0; ++componentIndex) {
- m_polynomialWeightsHighX0.push_back(readPolynomial(fin, orderPolynomial));
- m_polynomialMeansHighX0.push_back(readPolynomial(fin, orderPolynomial));
- m_polynomialVariancesHighX0.push_back(
- readPolynomial(fin, orderPolynomial));
+ m_polynomialWeightsHighX0[componentIndex] =
+ readPolynomial(fin, orderPolynomial);
+ m_polynomialMeansHighX0[componentIndex] =
+ readPolynomial(fin, orderPolynomial);
+ m_polynomialVariancesHighX0[componentIndex] =
+ readPolynomial(fin, orderPolynomial);
}
}
return true;
@@ -354,9 +362,6 @@ Trk::GsfBetheHeitlerEffects::compute(
double pathlengthInX0 = pathLength / radiationLength;
if (pathlengthInX0 < m_singleGaussianRange) {
- ATH_MSG_DEBUG("Trying to apply energy loss to "
- << pathlengthInX0
- << " x/x0. No Bethe-Heitler effects applied");
cache.weights.push_back(1.);
cache.deltaPs.push_back(0.);
cache.deltaQOvePCov.push_back(0.);
@@ -366,10 +371,10 @@ Trk::GsfBetheHeitlerEffects::compute(
// If the amount of material is between 0.0001 and 0.01 return the gaussian
// approximation to the Bethe-Heitler distribution
if (pathlengthInX0 < m_lowerRange) {
- const double meanZ = exp(-1. * pathlengthInX0);
+ const double meanZ = std::exp(-1. * pathlengthInX0);
const double sign = (direction == Trk::oppositeMomentum) ? 1. : -1.;
- const double varZ =
- exp(-1. * pathlengthInX0 * log(3.) / log(2.)) - exp(-2. * pathlengthInX0);
+ const double varZ = std::exp(-1. * pathlengthInX0 * std::log(3.) / std::log(2.)) -
+ std::exp(-2. * pathlengthInX0);
double deltaP(0.);
double varQoverP(0.);
if (direction == Trk::alongMomentum) {
@@ -423,17 +428,19 @@ Trk::GsfBetheHeitlerEffects::compute(
}
// Correct the mixture
- correctWeights(mixture);
+ correctWeights(mixture, m_numberOfComponents);
if (m_correctionFlag == 1) {
- mixture[0].mean = correctedFirstMean(pathlengthInX0, mixture);
+ mixture[0].mean =
+ correctedFirstMean(pathlengthInX0, mixture, m_numberOfComponents);
}
if (m_correctionFlag == 2) {
- mixture[0].mean = correctedFirstMean(pathlengthInX0, mixture);
- mixture[0].variance = correctedFirstVariance(pathlengthInX0, mixture);
+ mixture[0].mean =
+ correctedFirstMean(pathlengthInX0, mixture, m_numberOfComponents);
+ mixture[0].variance =
+ correctedFirstVariance(pathlengthInX0, mixture, m_numberOfComponents);
}
- //
int componentIndex = 0;
double weightToBeRemoved(0.);
int componentWithHighestMean(0);
@@ -476,10 +483,6 @@ Trk::GsfBetheHeitlerEffects::compute(
varianceInverseMomentum =
mixture[componentIndex].variance / (momentum * momentum);
} // end backwards propagation if clause
-
- AmgSymMatrix(5) newCovarianceMatrix;
- newCovarianceMatrix.setZero();
- newCovarianceMatrix(Trk::qOverP, Trk::qOverP) = varianceInverseMomentum;
cache.deltaQOvePCov.push_back(varianceInverseMomentum);
} // end for loop over all components
}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfCombinedMaterialEffects.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfCombinedMaterialEffects.cxx
index fdd34dbfe29a7e71db9d1c83c634bb1afeeaa9b9..6448dc58c53a4b9103dc4c4b5852f9b7b7f78830 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfCombinedMaterialEffects.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfCombinedMaterialEffects.cxx
@@ -9,10 +9,9 @@
*/
#include "TrkGaussianSumFilter/GsfCombinedMaterialEffects.h"
-
-#include "GaudiKernel/ToolHandle.h"
#include "TrkEventPrimitives/ParamDefs.h"
-#include "TrkGeometry/Layer.h"
+#include "TrkExUtils/MaterialInteraction.h"
+#include "TrkGeometry/MaterialProperties.h"
#include "TrkMaterialOnTrack/EnergyLoss.h"
#include "TrkParameters/TrackParameters.h"
#include "TrkSurfaces/Surface.h"
@@ -35,17 +34,8 @@ Trk::GsfCombinedMaterialEffects::~GsfCombinedMaterialEffects() = default;
StatusCode
Trk::GsfCombinedMaterialEffects::initialize()
{
- ATH_CHECK(m_msUpdator.retrieve());
ATH_CHECK(m_EnergyLossUpdator.retrieve());
ATH_CHECK(m_betheHeitlerEffects.retrieve());
- ATH_MSG_INFO("Initialisation of " << name() << " was successful");
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-Trk::GsfCombinedMaterialEffects::finalize()
-{
- ATH_MSG_INFO("Finalisation of " << name() << " was successful");
return StatusCode::SUCCESS;
}
@@ -68,10 +58,8 @@ Trk::GsfCombinedMaterialEffects::compute(
* 1. Retrieve multiple scattering corrections
*/
GSFScatteringCache cache_multipleScatter;
- this->scattering(cache_multipleScatter,
- componentParameters,
- materialProperties,
- pathLength);
+ this->scattering(
+ cache_multipleScatter, componentParameters, materialProperties, pathLength);
/*
* 2. Retrieve energy loss corrections
@@ -157,20 +145,20 @@ Trk::GsfCombinedMaterialEffects::scattering(
}
const Amg::Vector3D& globalMomentum = trackParameters->momentum();
- double p = globalMomentum.mag();
-
+ const double p = globalMomentum.mag();
double pathcorrection = 1.;
if (materialProperties.thickness() != 0) {
pathcorrection = pathLength / materialProperties.thickness();
}
-
- // Here we know the path length to be meff.thicknessX0, so we set
- // pathcorrection = 1 and create a dummy materialProperties with the
- // properties we are interested in
- MaterialProperties mprop(
- materialProperties.thicknessInX0(), 1., 0., 0., 0., 0.);
- const double angularVariation =
- m_msUpdator->sigmaSquare(mprop, p, pathcorrection, Trk::muon);
+ const double t = pathcorrection * materialProperties.thicknessInX0();
+ // We were/are using muon here,
+ // not sure is what we want 100%.
+ const double m = s_particleMasses.mass[Trk::muon];
+ const double E = sqrt(p * p + m * m);
+ const double beta = p / E;
+ const Trk::MaterialInteraction matInt;
+ const double sigma = matInt.sigmaMS(t, p, beta);
+ const double angularVariation = sigma * sigma;
const double sinTheta = std::sin(trackParameters->parameters()[Trk::theta]);
cache.deltaThetaCov = angularVariation;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
index 414d2b8889267855240c7b09d67ea6ba0e00c891..f45a8b0cb81e4c2be0086d2d2bb59fcd0a898906 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
@@ -7,6 +7,7 @@
#include "CxxUtils/vec.h"
#include "TrkGaussianSumFilter/AlignedDynArray.h"
#include <limits>
+#include <stdexcept>
#if !defined(__GNUC__)
#define __builtin_assume_aligned(X, N) X
@@ -39,6 +40,26 @@ struct triangularToIJ
int16_t J = -1;
};
+std::vector<triangularToIJ>
+createToIJ128()
+{
+ // Create a trangular array mapping for the maximum size
+ // we will ever have 8 (max bethe heitle material) x16 (state components)
+ // =128. 128 * (128-1)/2 = 8128
+ //
+ // The typical number we use is 6x12 = 72.
+ //
+ constexpr int16_t n = 128;
+ constexpr int32_t nn = n * (n - 1) / 2;
+ std::vector<triangularToIJ> indexMap(nn);
+ for (int16_t i = 1; i < n; ++i) {
+ const int32_t indexConst = (i - 1) * i / 2;
+ for (int16_t j = 0; j < i; ++j) {
+ indexMap[indexConst + j] = { i, j };
+ }
+ }
+ return indexMap;
+}
/**
* Based on
* https://www.sciencedirect.com/science/article/pii/089812218990103X
@@ -187,7 +208,7 @@ resetDistances(float* distancesIn, const int32_t minj, const int32_t n)
}
}
-}
+} // anonymous namespace
namespace GSFUtils {
/**
@@ -201,21 +222,18 @@ findMerges(Component1D* componentsIn,
{
Component1D* components = static_cast<Component1D*>(
__builtin_assume_aligned(componentsIn, alignment));
+
+ // Sanity check. Function throw on invalid inputs
+ if (inputSize < 0 || inputSize > 128 || reducedSize > inputSize) {
+ throw std::runtime_error("Invalid InputSize or reducedSize");
+ }
+ // We need just one for the full duration of a job
+ const static std::vector<triangularToIJ> convert = createToIJ128();
+
// Based on the inputSize allocate enough space for the pairwise distances
const int16_t n = inputSize;
const int32_t nn = n * (n - 1) / 2;
- // Create a trianular mapping for the pairwise distances
- // We now that the size is nn
- std::vector<triangularToIJ> convert(nn);
- for (int16_t i = 1; i < n; ++i) {
- const int32_t indexConst = (i - 1) * i / 2;
- for (int16_t j = 0; j < i; ++j) {
- convert[indexConst + j] = { i, j };
- }
- }
// We work with a multiple of 8*floats (32 bytes).
- // Ensures also that the size parameter passed to aligned alloc
- // is an integral multiple of alignment (32 bytes).
const int32_t nn2 = (nn & 7) == 0 ? nn : nn + (8 - (nn & 7));
AlignedDynArray<float, alignment> distances(
nn2, std::numeric_limits<float>::max());
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx
index 7ae67a4ba4d12af0c49c0a1cda9dc3d5672368ba..1870407f4a9732c04e5696297692093669d11dec 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx
@@ -16,132 +16,13 @@
#include "TrkParameters/TrackParameters.h"
#include "TrkSurfaces/Surface.h"
-std::unique_ptr<Trk::TrackParameters>
-Trk::MultiComponentStateCombiner::combine(
- const Trk::MultiComponentState& uncombinedState,
- const bool useMode,
- const double fractionPDFused)
-{
- std::unique_ptr<Trk::ComponentParameters> combinedComponent =
- compute(&uncombinedState, useMode, fractionPDFused);
- return std::move(combinedComponent->first);
-}
-
-std::unique_ptr<Trk::ComponentParameters>
-Trk::MultiComponentStateCombiner::combineWithWeight(
- const Trk::MultiComponentState& uncombinedState,
- const bool useMode,
- const double fractionPDFused)
-
-{
- return compute(&uncombinedState, useMode, fractionPDFused);
-}
-
-void
-Trk::MultiComponentStateCombiner::combineWithWeight(
- Trk::ComponentParameters& mergeTo,
- const Trk::ComponentParameters& addThis)
-{
- const Trk::TrackParameters* secondParameters = addThis.first.get();
- combineWithWeight(mergeTo,
- secondParameters->parameters(),
- secondParameters->covariance(),
- addThis.second);
-}
-
-void
-Trk::MultiComponentStateCombiner::combineWithWeight(
- Trk::ComponentParameters& mergeTo,
- const AmgVector(5) & secondParameters,
- const AmgSymMatrix(5) * secondMeasuredCov,
- const double secondWeight)
-{
- double firstWeight = mergeTo.second;
- auto trackParameters = mergeTo.first.get();
- const AmgVector(5)& firstParameters = trackParameters->parameters();
- AmgVector(5) finalParameters(firstParameters);
- // Check to see if first track parameters are measured or not
- double finalWeight = firstWeight;
- combineParametersWithWeight(
- finalParameters, finalWeight, secondParameters, secondWeight);
-
- if (trackParameters->covariance() && secondMeasuredCov) {
- AmgSymMatrix(5) finalMeasuredCov(*trackParameters->covariance());
- combineCovWithWeight(firstParameters,
- finalMeasuredCov,
- firstWeight,
- secondParameters,
- *secondMeasuredCov,
- secondWeight);
-
- mergeTo.first->updateParameters(finalParameters, finalMeasuredCov);
- mergeTo.second = finalWeight;
- } else {
- mergeTo.first->updateParameters(finalParameters, nullptr);
- mergeTo.second = finalWeight;
- }
-}
-
-void
-Trk::MultiComponentStateCombiner::combineParametersWithWeight(
- AmgVector(5) & firstParameters,
- double& firstWeight,
- const AmgVector(5) & secondParameters,
- const double secondWeight)
-{
-
- double totalWeight = firstWeight + secondWeight;
-
- // Ensure that we don't have any problems with the cyclical nature of phi
- // Use first state as reference poin
- double deltaPhi = firstParameters[2] - secondParameters[2];
- if (deltaPhi > M_PI) {
- firstParameters[2] -= 2 * M_PI;
- } else if (deltaPhi < -M_PI) {
- firstParameters[2] += 2 * M_PI;
- }
-
- firstParameters =
- firstWeight * firstParameters + secondWeight * secondParameters;
- firstParameters /= totalWeight;
-
- // Ensure that phi is between -pi and pi
- //
- firstParameters[2] = CxxUtils::wrapToPi(firstParameters[2]);
- firstWeight = totalWeight;
-}
-
-void
-Trk::MultiComponentStateCombiner::combineCovWithWeight(
- const AmgVector(5) & firstParameters,
- AmgSymMatrix(5) & firstMeasuredCov,
- const double firstWeight,
- const AmgVector(5) & secondParameters,
- const AmgSymMatrix(5) & secondMeasuredCov,
- const double secondWeight)
-{
-
- double totalWeight = firstWeight + secondWeight;
-
- // Extract local error matrix: Must make sure track parameters are measured,
- // ie have an associated error matrix.
-
- AmgVector(5) parameterDifference = firstParameters - secondParameters;
- parameterDifference[2] = CxxUtils::wrapToPi(parameterDifference[2]);
- parameterDifference /= totalWeight;
-
- firstMeasuredCov *= firstWeight;
- firstMeasuredCov += secondWeight * secondMeasuredCov;
- firstMeasuredCov /= totalWeight;
- firstMeasuredCov += firstWeight * secondWeight * parameterDifference *
- parameterDifference.transpose();
-}
+namespace {
+// Actual implementation method for combining a multi component state
std::unique_ptr<Trk::ComponentParameters>
-Trk::MultiComponentStateCombiner::compute(
- const Trk::MultiComponentState* uncombinedState,
- const bool useMode,
- const double fractionPDFused)
+computeImpl(const Trk::MultiComponentState* uncombinedState,
+ const bool useMode,
+ const double fractionPDFused)
{
if (uncombinedState->empty()) {
return nullptr;
@@ -183,7 +64,7 @@ Trk::MultiComponentStateCombiner::compute(
for (; component != uncombinedState->end(); ++component) {
- const TrackParameters* trackParameters = (*component).first.get();
+ const Trk::TrackParameters* trackParameters = (*component).first.get();
double weight = (*component).second;
AmgVector(5) parameters = trackParameters->parameters();
@@ -335,6 +216,129 @@ Trk::MultiComponentStateCombiner::compute(
delete covariance;
}
- return std::make_unique<ComponentParameters>(
+ return std::make_unique<Trk::ComponentParameters>(
std::move(combinedTrackParameters), totalWeight);
}
+} // end anonymous namespace
+
+std::unique_ptr<Trk::TrackParameters>
+Trk::MultiComponentStateCombiner::combine(
+ const Trk::MultiComponentState& uncombinedState,
+ const bool useMode,
+ const double fractionPDFused)
+{
+ std::unique_ptr<Trk::ComponentParameters> combinedComponent =
+ computeImpl(&uncombinedState, useMode, fractionPDFused);
+ return std::move(combinedComponent->first);
+}
+
+std::unique_ptr<Trk::ComponentParameters>
+Trk::MultiComponentStateCombiner::combineWithWeight(
+ const Trk::MultiComponentState& uncombinedState,
+ const bool useMode,
+ const double fractionPDFused)
+
+{
+ return computeImpl(&uncombinedState, useMode, fractionPDFused);
+}
+
+void
+Trk::MultiComponentStateCombiner::combineWithWeight(
+ Trk::ComponentParameters& mergeTo,
+ const Trk::ComponentParameters& addThis)
+{
+ const Trk::TrackParameters* secondParameters = addThis.first.get();
+ combineWithWeight(mergeTo,
+ secondParameters->parameters(),
+ secondParameters->covariance(),
+ addThis.second);
+}
+
+void
+Trk::MultiComponentStateCombiner::combineWithWeight(
+ Trk::ComponentParameters& mergeTo,
+ const AmgVector(5) & secondParameters,
+ const AmgSymMatrix(5) * secondMeasuredCov,
+ const double secondWeight)
+{
+ double firstWeight = mergeTo.second;
+ auto trackParameters = mergeTo.first.get();
+ const AmgVector(5)& firstParameters = trackParameters->parameters();
+ AmgVector(5) finalParameters(firstParameters);
+ // Check to see if first track parameters are measured or not
+ double finalWeight = firstWeight;
+ combineParametersWithWeight(
+ finalParameters, finalWeight, secondParameters, secondWeight);
+
+ if (trackParameters->covariance() && secondMeasuredCov) {
+ AmgSymMatrix(5) finalMeasuredCov(*trackParameters->covariance());
+ combineCovWithWeight(firstParameters,
+ finalMeasuredCov,
+ firstWeight,
+ secondParameters,
+ *secondMeasuredCov,
+ secondWeight);
+
+ mergeTo.first->updateParameters(finalParameters, finalMeasuredCov);
+ mergeTo.second = finalWeight;
+ } else {
+ mergeTo.first->updateParameters(finalParameters, nullptr);
+ mergeTo.second = finalWeight;
+ }
+}
+
+void
+Trk::MultiComponentStateCombiner::combineParametersWithWeight(
+ AmgVector(5) & firstParameters,
+ double& firstWeight,
+ const AmgVector(5) & secondParameters,
+ const double secondWeight)
+{
+
+ double totalWeight = firstWeight + secondWeight;
+
+ // Ensure that we don't have any problems with the cyclical nature of phi
+ // Use first state as reference poin
+ double deltaPhi = firstParameters[2] - secondParameters[2];
+ if (deltaPhi > M_PI) {
+ firstParameters[2] -= 2 * M_PI;
+ } else if (deltaPhi < -M_PI) {
+ firstParameters[2] += 2 * M_PI;
+ }
+
+ firstParameters =
+ firstWeight * firstParameters + secondWeight * secondParameters;
+ firstParameters /= totalWeight;
+
+ // Ensure that phi is between -pi and pi
+ //
+ firstParameters[2] = CxxUtils::wrapToPi(firstParameters[2]);
+ firstWeight = totalWeight;
+}
+
+void
+Trk::MultiComponentStateCombiner::combineCovWithWeight(
+ const AmgVector(5) & firstParameters,
+ AmgSymMatrix(5) & firstMeasuredCov,
+ const double firstWeight,
+ const AmgVector(5) & secondParameters,
+ const AmgSymMatrix(5) & secondMeasuredCov,
+ const double secondWeight)
+{
+
+ double totalWeight = firstWeight + secondWeight;
+
+ // Extract local error matrix: Must make sure track parameters are measured,
+ // ie have an associated error matrix.
+
+ AmgVector(5) parameterDifference = firstParameters - secondParameters;
+ parameterDifference[2] = CxxUtils::wrapToPi(parameterDifference[2]);
+ parameterDifference /= totalWeight;
+
+ firstMeasuredCov *= firstWeight;
+ firstMeasuredCov += secondWeight * secondMeasuredCov;
+ firstMeasuredCov /= totalWeight;
+ firstMeasuredCov += firstWeight * secondWeight * parameterDifference *
+ parameterDifference.transpose();
+}
+
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
index 6357bb24e5c007daddf9fc62e2331c545df25375..b0259fdef2cd2cb1e74dbfeb894a916a46718b9b 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
@@ -19,6 +19,59 @@
#include <limits>
using namespace GSFUtils;
+namespace {
+
+/// Method for merging and assembling a state
+Trk::MultiComponentState
+mergeFullDistArray(Trk::MultiComponentStateAssembler::Cache& cache,
+ Trk::MultiComponentState& statesToMerge,
+ const unsigned int maximumNumberOfComponents)
+{
+ const int32_t n = statesToMerge.size();
+ AlignedDynArray<Component1D, alignment> components(n);
+ for (int32_t i = 0; i < n; ++i) {
+ const AmgSymMatrix(5)* measuredCov = statesToMerge[i].first->covariance();
+ const AmgVector(5)& parameters = statesToMerge[i].first->parameters();
+ // Fill in infomation
+ const double cov =
+ measuredCov ? (*measuredCov)(Trk::qOverP, Trk::qOverP) : -1.;
+ components[i].mean = parameters[Trk::qOverP];
+ components[i].cov = cov;
+ components[i].invCov = cov > 0 ? 1. / cov : 1e10;
+ components[i].weight = statesToMerge[i].second;
+ }
+
+ // Gather the merges
+ const std::vector<std::pair<int16_t, int16_t>> merges =
+ findMerges(components.buffer(), n, maximumNumberOfComponents);
+
+ // Do the full 5D calculations of the merge
+ for (const auto& mergePair : merges) {
+ const int16_t mini = mergePair.first;
+ const int16_t minj = mergePair.second;
+ Trk::MultiComponentStateCombiner::combineWithWeight(statesToMerge[mini],
+ statesToMerge[minj]);
+ statesToMerge[minj].first.reset();
+ statesToMerge[minj].second = 0.;
+ }
+ // Assemble the final result
+ for (auto& state : statesToMerge) {
+ // Avoid merge ones
+ if (!state.first) {
+ continue;
+ }
+ cache.multiComponentState.emplace_back(
+ Trk::ComponentParameters(state.first.release(), state.second));
+ cache.validWeightSum += state.second;
+ }
+ Trk::MultiComponentState mergedState =
+ Trk::MultiComponentStateAssembler::assembledState(cache);
+ // Clear the state vector
+ statesToMerge.clear();
+ return mergedState;
+}
+
+} // end anonympus namespace
Trk::MultiComponentState
Trk::QuickCloseComponentsMultiStateMerger::merge(
@@ -61,53 +114,3 @@ Trk::QuickCloseComponentsMultiStateMerger::merge(
return mergeFullDistArray(cache, statesToMerge, maximumNumberOfComponents);
}
-
-Trk::MultiComponentState
-Trk::QuickCloseComponentsMultiStateMerger::mergeFullDistArray(
- MultiComponentStateAssembler::Cache& cache,
- Trk::MultiComponentState& statesToMerge,
- const unsigned int maximumNumberOfComponents)
-{
- const int32_t n = statesToMerge.size();
- AlignedDynArray<Component1D, alignment> components(n);
- for (int32_t i = 0; i < n; ++i) {
- const AmgSymMatrix(5)* measuredCov = statesToMerge[i].first->covariance();
- const AmgVector(5)& parameters = statesToMerge[i].first->parameters();
- // Fill in infomation
- const double cov =
- measuredCov ? (*measuredCov)(Trk::qOverP, Trk::qOverP) : -1.;
- components[i].mean = parameters[Trk::qOverP];
- components[i].cov = cov;
- components[i].invCov = cov > 0 ? 1. / cov : 1e10;
- components[i].weight = statesToMerge[i].second;
- }
-
- // Gather the merges
- const std::vector<std::pair<int16_t, int16_t>> merges =
- findMerges(components.buffer(), n, maximumNumberOfComponents);
-
- // Do the full 5D calculations of the merge
- for (const auto& mergePair : merges) {
- const int16_t mini = mergePair.first;
- const int16_t minj = mergePair.second;
- MultiComponentStateCombiner::combineWithWeight(statesToMerge[mini],
- statesToMerge[minj]);
- statesToMerge[minj].first.reset();
- statesToMerge[minj].second = 0.;
- }
- // Assemble the final result
- for (auto& state : statesToMerge) {
- // Avoid merge ones
- if (!state.first) {
- continue;
- }
- cache.multiComponentState.push_back(
- ComponentParameters(state.first.release(), state.second));
- cache.validWeightSum += state.second;
- }
- Trk::MultiComponentState mergedState =
- MultiComponentStateAssembler::assembledState(cache);
- // Clear the state vector
- statesToMerge.clear();
- return mergedState;
-}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt b/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt
index 7e4cdf5c7b0b88dcec38b97b06f4626015f29d6c..7e4df7878139e7b60b450659a6cec71447502827 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt
@@ -37,6 +37,7 @@ atlas_add_library(
TrkToolInterfaces
MagFieldElements
MagFieldConditions
+ InDetReadoutGeometry
)
# Component(s) in the package:
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h
index b70dec6a6089aff46e00ee16817554b31d6ed6d6..581eb4a25610d63c40a8ea59b8623e5bf885c0ba 100755
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h
@@ -47,7 +47,7 @@ namespace Trk {
const MeasurementBase *measurement(void);
void setTrackParameters(std::unique_ptr<const TrackParameters>);
- const TrackParameters *trackParameters(void);
+ const TrackParameters *trackParameters(void) const;
GXFMaterialEffects *materialEffects();
const Surface *surface() const;
@@ -114,6 +114,9 @@ namespace Trk {
*/
bool getStateType(TrackStateOnSurface::TrackStateOnSurfaceType type) const;
+ std::optional<std::vector<std::unique_ptr<const TrackParameters>>> & getHoles(void);
+ void setHoles(std::vector<std::unique_ptr<const TrackParameters>> &&);
+
private:
std::unique_ptr<const MeasurementBase> m_measurement; //!< The measurement defining the track state
std::bitset<TrackStateOnSurface::NumberOfTrackStateOnSurfaceTypes> m_tsType; //!< type of track state, eg Fittable, Outlier, Scatterer, Brem, Hole
@@ -132,7 +135,7 @@ namespace Trk {
bool m_recalib; //!< Has this measurement already been recalibrated?
bool m_measphi;
Amg::Vector3D m_globpos;
- std::optional<std::vector<const TrackParameters *>> m_preholes;
+ std::optional<std::vector<std::unique_ptr<const TrackParameters>>> m_holes;
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
@@ -150,7 +153,7 @@ namespace Trk {
return m_covariancematrix;
}
- inline const TrackParameters *GXFTrackState::trackParameters(void) {
+ inline const TrackParameters *GXFTrackState::trackParameters(void) const {
return m_trackpar.get();
}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h
index 2983f85ff095420eed9965f2e4a8f6c271b77f13..cc6439560e592f22bc99bd25e21ff934847d1b2a 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h
@@ -71,6 +71,7 @@ namespace Trk {
int numberOfPseudoMeasurements();
int numberOfOutliers();
+ const std::vector<std::unique_ptr<GXFTrackState>> & trackStates() const;
std::vector<std::unique_ptr<GXFTrackState>> & trackStates();
std::vector < std::pair < double, double >>&scatteringAngles();
std::vector < std::pair < double, double >>&scatteringSigmas();
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
index 50928716eec88438c9a5a52d2014c9074f22ed66..eb0d98f5298dbec23b65b6737f928ff80e99bef4 100755
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
@@ -17,6 +17,7 @@
#include "TrkToolInterfaces/IResidualPullCalculator.h"
#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
#include "TrkToolInterfaces/IUpdator.h"
+#include "TrkToolInterfaces/IBoundaryCheckTool.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkExInterfaces/IPropagator.h"
@@ -157,6 +158,19 @@ namespace Trk {
std::optional<std::vector<std::unique_ptr<const TrackParameters>>> m_preholes;
};
+ /*
+ * This struct serves as a very simple container for the five different
+ * hole and dead module states that we want to count, which are the dead
+ * Pixels, dead SCTs, Pixel holes, SCT holes, and SCT double holes.
+ */
+ struct TrackHoleCount {
+ unsigned int m_pixel_hole = 0;
+ unsigned int m_sct_hole = 0;
+ unsigned int m_sct_double_hole = 0;
+ unsigned int m_pixel_dead = 0;
+ unsigned int m_sct_dead = 0;
+ };
+
struct Cache {
/*
* Currently the information about what type of fit is being passed by the
@@ -531,6 +545,27 @@ namespace Trk {
ParticleHypothesis
) const;
+ /**
+ * @brief Helper method which performs an extrapolation with additional
+ * logic for hole search.
+ *
+ * This method is a wrapper around extrapolateStepwise from the
+ * extrapolator interface, with the added functionality that it will null
+ * any returned track parameters which are on the start and end surface.
+ *
+ * @param[in] ctx An event context for extrapolation.
+ * @param[in] src The track parameters to start extrapolating from.
+ * @param[in] dst The track state to extrapolate to.
+ * @param[in] propdir The propagation direction.
+ * @return A vector of track states, just like normal extrapolation.
+ */
+ std::vector<std::unique_ptr<const TrackParameters>> holesearchExtrapolation(
+ const EventContext & ctx,
+ const TrackParameters & src,
+ const GXFTrackState & dst,
+ PropDirection propdir
+ ) const;
+
std::unique_ptr<const TrackParameters> makePerigee(
Cache &,
const TrackParameters &,
@@ -641,6 +676,7 @@ namespace Trk {
const GXFTrackState &,
PropDirection,
MagneticFieldProperties,
+ bool,
bool
) const;
@@ -671,6 +707,7 @@ namespace Trk {
* @param[in] propdir The propagation direction.
* @param[in] bf The magnetic field properties.
* @param[in] calcderiv If set, calculate the derivative.
+ * @param[in] holesearch If set, search for holes.
*
* @return An instance of PropagationResult, which is a struct with three
* members. Firstly, it contains a unique pointer to a set of track
@@ -689,9 +726,98 @@ namespace Trk {
const GXFTrackState &,
PropDirection,
MagneticFieldProperties,
+ bool,
bool
) const;
+ /**
+ * @brief Extracts a collection of track states which are important for
+ * hole search.
+ *
+ * This method helps extract the measurement (and outlier) states from a
+ * track. These are the states between which we want to do a hole search,
+ * so the result of calling this method can be used as a source of truth
+ * for conducting a hole search on the track.
+ *
+ * This method only returns states between the first and last measurements
+ * on the track, which is the region in which we are interested in doing a
+ * hole search.
+ *
+ * As an example, if we denote scatterers as S, and measurements as M, this
+ * method would reduce the following track with numbered states:
+ *
+ * 1 2 3 4 5 6 7 8 9
+ * M S S M M S M S S
+ *
+ * Into a list of references [1, 4, 5, 7].
+ *
+ * This method ensures that each pair of consecutive states in the return
+ * value list is a target for a hole search extrapolation.
+ *
+ * @param[in] trajectory The trajectory from which to extract states.
+ * @return A vector of state references as described above.
+ */
+ std::vector<std::reference_wrapper<GXFTrackState>> holeSearchStates(
+ GXFTrajectory & trajectory
+ ) const;
+
+ /**
+ * @brief Conduct a hole search between a list of states, possibly reusing
+ * existing information.
+ *
+ * Given a collection of state references, this method will conduct a hole
+ * search between consecutive pairs of states, possibly reusing existing
+ * information stored in the state data types. The method will check
+ * whether the state contains any previous hole search data and use it. If
+ * there is no data, it will run additional extrapolations to gather that
+ * data. It will then use a helper method to count holes and dead modules
+ * and return a total count.
+ *
+ * In some cases, this method may error. Should this occur, it will return
+ * a non-extant value.
+ *
+ * @param[in] ctx An event context used for extrapolation.
+ * @param[in] states A list of states to operate on, using consecutive
+ * states as extrapolation regions.
+ * @return A list of hole counts if the process succeeded, or a non-extant
+ * value in case of an error.
+ */
+ std::optional<GlobalChi2Fitter::TrackHoleCount> holeSearchProcess(
+ const EventContext & ctx,
+ const std::vector<std::reference_wrapper<GXFTrackState>> & states
+ ) const;
+
+ /**
+ * @brief Helper method for the hole search that does the actual counting
+ * of holes and dead modules.
+ *
+ * This is a helper function that does a lot of esoteric and weird things
+ * that you most likely won't need to know about. The gist of it is that
+ * you pass it a vector of track parameters and a counting object, and it
+ * will update those counters according to its analysis of the track
+ * parameters.
+ *
+ * Unfortunately, due to the design of this method, it requires quite a lot
+ * of persistent state between invocations for the same track. That's bad
+ * design of course, but it is how it is for now. This means that there
+ * are quite a few state parameters.
+ *
+ * @param[in] hc A list of candidate hole track parameters to analyse.
+ * @param[in,out] id_set A set of identifiers found to be holes or dead.
+ * @param[in,out] sct_set A set of identifiers of SCT holes.
+ * @param[in,out] rv The hole count container to update.
+ * @param[in] count_holes Holes are counted only if this is enabled.
+ * @param[in] count_dead Dead modules are counted only if this is enabled.
+ */
+ void holeSearchHelper(
+ const std::vector<std::unique_ptr<const TrackParameters>> & hc,
+ std::set<Identifier> & id_set,
+ std::set<Identifier> & sct_set,
+ TrackHoleCount & rv,
+ bool count_holes,
+ bool count_dead
+ ) const;
+
FitterStatusCode calculateTrackParameters(
const EventContext& ctx,
GXFTrajectory&,
@@ -756,6 +882,7 @@ namespace Trk {
ToolHandle<Trk::ITrkMaterialProviderTool> m_caloMaterialProvider {this, "CaloMaterialProvider", "Trk::TrkMaterialProviderTool/TrkMaterialProviderTool", ""};
ToolHandle<IMaterialEffectsOnTrackProvider> m_calotool {this, "MuidTool", "Rec::MuidMaterialEffectsOnTrackProvider/MuidMaterialEffectsOnTrackProvider", ""};
ToolHandle<IMaterialEffectsOnTrackProvider> m_calotoolparam {this, "MuidToolParam", "", ""};
+ ToolHandle<IBoundaryCheckTool> m_boundaryCheckTool {this, "BoundaryCheckTool", "", "Boundary checking tool for detector sensitivities" };
ServiceHandle<ITrackingGeometrySvc> m_trackingGeometrySvc;
@@ -791,6 +918,7 @@ namespace Trk {
Gaudi::Property<bool> m_useCaloTG {this, "UseCaloTG", false};
Gaudi::Property<bool> m_rejectLargeNScat {this, "RejectLargeNScat", false};
Gaudi::Property<bool> m_createSummary {this, "CreateTrackSummary", true};
+ Gaudi::Property<bool> m_holeSearch {this, "DoHoleSearch", false};
Gaudi::Property<double> m_outlcut {this, "OutlierCut", 5.0};
Gaudi::Property<double> m_p {this, "Momentum", 0.0};
@@ -804,6 +932,13 @@ namespace Trk {
ParticleMasses m_particleMasses;
+ /*
+ * This little volume defines the inner detector. Its exact size is set at
+ * the time that the fitter object is created. We just make one and keep
+ * it around to save us a few allocations.
+ */
+ Trk::Volume m_idVolume;
+
/*
* The following members are mutable. They keep track of the number of
* fits that have returned with a certain status. Since this must be
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx
index 4350cb6cb3fbe4465c1be7028c69049a745a8eb6..973b803de05da09e4d73b3af40995e553ad08f2a 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx
@@ -249,4 +249,12 @@ namespace Trk {
bool GXFTrackState::getStateType(TrackStateOnSurface::TrackStateOnSurfaceType t) const {
return m_tsType.test(t);
}
+
+ std::optional<std::vector<std::unique_ptr<const TrackParameters>>> & GXFTrackState::getHoles(void) {
+ return m_holes;
+ }
+
+ void GXFTrackState::setHoles(std::vector<std::unique_ptr<const TrackParameters>> && v) {
+ m_holes = std::move(v);
+ }
}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx
index fb7139514cb9e8f6b515e96b5f809c7d079d1482..dbbc23c960ba20f02eda39d69ef86ce1f5604d1f 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx
@@ -558,6 +558,10 @@ namespace Trk {
}
}
+ const std::vector<std::unique_ptr<GXFTrackState>> & GXFTrajectory::trackStates() const {
+ return m_states;
+ }
+
std::vector<std::unique_ptr<GXFTrackState>> & GXFTrajectory::trackStates() {
return m_states;
}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
index d85eb877e0d52f18944125975d53610ee4f0b3c1..14727f1955b4531ed814a595d238d8f063193588 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
@@ -23,6 +23,9 @@
#include "TrkGeometry/TrackingVolume.h"
#include "TrkGeometry/TrackingGeometry.h"
+#include "TrkVolumes/Volume.h"
+#include "TrkVolumes/CylinderVolumeBounds.h"
+
#include "TrkExUtils/TransportJacobian.h"
#include "TrkMaterialOnTrack/EnergyLoss.h"
@@ -48,6 +51,8 @@
#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "MagFieldElements/AtlasFieldCache.h"
+#include "InDetReadoutGeometry/SiDetectorElement.h"
+
#include "CLHEP/Matrix/Matrix.h"
#include "CLHEP/Matrix/SymMatrix.h"
#include "CLHEP/Matrix/Vector.h"
@@ -139,6 +144,14 @@ namespace {
return nullptr;
}
}
+
+ bool trackParametersClose(const Trk::TrackParameters & a, const Trk::TrackParameters & b, double e) {
+ return (
+ std::abs(a.parameters()[0] - b.parameters()[0]) < e &&
+ std::abs(a.parameters()[1] - b.parameters()[1]) < e &&
+ std::abs(a.parameters()[2] - b.parameters()[2]) < e
+ );
+ }
}
namespace Trk {
@@ -148,7 +161,8 @@ namespace Trk {
const IInterface * p
):
base_class(t, n, p),
- m_trackingGeometrySvc("", n)
+ m_trackingGeometrySvc("", n),
+ m_idVolume(nullptr, std::make_unique<Trk::CylinderVolumeBounds>(560, 2750).release())
{
declareProperty("TrackingGeometrySvc", m_trackingGeometrySvc);
}
@@ -169,7 +183,14 @@ namespace Trk {
ATH_CHECK(m_navigator.retrieve());
ATH_CHECK(m_residualPullCalculator.retrieve());
ATH_CHECK(m_propagator.retrieve());
-
+
+ if (!m_boundaryCheckTool.name().empty()) {
+ ATH_CHECK(m_boundaryCheckTool.retrieve());
+ } else if (m_holeSearch.value()) {
+ ATH_MSG_ERROR("Hole search requested but no boundary check tool provided.");
+ return StatusCode::FAILURE;
+ }
+
if (m_calomat) {
ATH_CHECK(m_calotool.retrieve());
@@ -209,6 +230,17 @@ namespace Trk {
m_caloMaterialProvider.disable();
}
+ /*
+ * Doing a hole search only makes sense if we are also creating a track
+ * summary, because the track summary is the only way for us to export the
+ * hole search information out of the fitter. For this reason, we disable
+ * the hole search in the case that track summaries are disabled.
+ */
+ if (m_holeSearch.value() && !m_createSummary.value()) {
+ ATH_MSG_ERROR("Hole search requested but track summaries are disabled.");
+ return StatusCode::FAILURE;
+ }
+
ATH_MSG_INFO("fixed momentum: " << m_p);
return StatusCode::SUCCESS;
@@ -7130,6 +7162,322 @@ namespace Trk {
return std::make_unique<GXFTrackState>(std::move(per), TrackStateOnSurface::Perigee);
}
+ void GlobalChi2Fitter::holeSearchHelper(
+ const std::vector<std::unique_ptr<const TrackParameters>> & hc,
+ std::set<Identifier> & id_set,
+ std::set<Identifier> & sct_set,
+ TrackHoleCount & rv,
+ bool count_holes,
+ bool count_dead
+ ) const {
+ /*
+ * Our input is a list of track states, which we are iterating over. We
+ * need to examine each one and update the values in our track hole count
+ * accordingly.
+ */
+ for (const std::unique_ptr<const TrackParameters> & tp : hc) {
+ /*
+ * It is possible, expected even, for some of these pointers to be null.
+ * In those cases, it would be dangerous to continue, so we need to make
+ * sure we skip them.
+ */
+ if (tp == nullptr) {
+ continue;
+ }
+
+ /*
+ * Extract the detector element of the track parameter surface for
+ * examination. If for whatever reason there is none (i.e. the surface
+ * is not a detector at all), we can skip it and continue.
+ */
+ const TrkDetElementBase * de = tp->associatedSurface().associatedDetectorElement();
+
+ if (de == nullptr) {
+ continue;
+ }
+
+ Identifier id = de->identify();
+
+ /*
+ * If, for whatever reason, we have already visited this detector, we do
+ * not want to visit it again. Otherwise we might end up with modules
+ * counted twice, and that would be very bad.
+ */
+ if (id_set.find(id) != id_set.end()) {
+ continue;
+ }
+
+ /*
+ * This is the meat of the pudding, we use the boundary checking tool
+ * to see whether this set of parameters is a hole candidate, a dead
+ * module, or not a hole at all.
+ */
+ BoundaryCheckResult bc = m_boundaryCheckTool->boundaryCheck(*tp);
+
+ if (bc == BoundaryCheckResult::DeadElement && count_dead) {
+ /*
+ * If the module is dead, our job is very simple. We just check
+ * whether it is a Pixel or an SCT and increment the appropriate
+ * counter. We also insert the module into our set of visited elements.
+ */
+ if (m_DetID->is_pixel(id)) {
+ ++rv.m_pixel_dead;
+ } else if (m_DetID->is_sct(id)) {
+ ++rv.m_sct_dead;
+ }
+ id_set.insert(id);
+ } else if (bc == BoundaryCheckResult::Candidate && count_holes) {
+ /*
+ * If the module is a candidate, it's much the same, but we also need
+ * to handle double SCT holes.
+ */
+ if (m_DetID->is_pixel(id)) {
+ ++rv.m_pixel_hole;
+ } else if (m_DetID->is_sct(id)) {
+ ++rv.m_sct_hole;
+
+ /*
+ * To check for SCT double holes, we need to first fetch the other
+ * side of the current SCT. Thankfully, the detector description
+ * makes this very easy.
+ */
+ const InDetDD::SiDetectorElement* e = dynamic_cast<const InDetDD::SiDetectorElement *>(de);
+ const Identifier os = e->otherSide()->identify();
+
+ /*
+ * We keep a special set containing only SCT hole IDs. We simply
+ * check whether the ID of the other side of the SCT is in this set
+ * to confirm that we have a double hole. Note that the first side
+ * in a double hole will be counted as a SCT hole only, and the
+ * second side will count as another hole as well as a double hole,
+ * which is exactly the behaviour we would expect to see.
+ */
+ if (sct_set.find(os) != sct_set.end()) {
+ ++rv.m_sct_double_hole;
+ }
+
+ /*
+ * We need to add our SCT to the SCT identifier set if it is a
+ * candidate hit, otherwise known as a hole in this context.
+ */
+ sct_set.insert(id);
+ }
+
+ /*
+ * SCTs are also added to the set of all identifiers to avoid double
+ * counting them.
+ */
+ id_set.insert(id);
+ }
+ }
+ }
+
+ std::vector<std::reference_wrapper<GXFTrackState>> GlobalChi2Fitter::holeSearchStates(
+ GXFTrajectory & trajectory
+ ) const {
+ /*
+ * Firstly, we will need to find the last measurement state on our track.
+ * This will allow us to break the main loop later once we are done with
+ * our work.
+ */
+ GXFTrackState * lastmeas = nullptr;
+
+ for (const std::unique_ptr<GXFTrackState> & s : trajectory.trackStates()) {
+ if (s->getStateType(TrackStateOnSurface::Measurement)) {
+ lastmeas = s.get();
+ }
+ }
+
+ /*
+ * We create a vector of reference wrappers and reserve at least enough
+ * space to contain the entire trajectory. This is perhaps a little
+ * wasteful since we will never need this much space, but it may be more
+ * efficient than taking the resizing pentalty on the chin.
+ */
+ std::vector<std::reference_wrapper<GXFTrackState>> rv;
+ rv.reserve(trajectory.trackStates().size());
+
+ /*
+ * The main body of our method now. We iterate over all track states in
+ * the track, at least until we find the last measurement state as found
+ * above.
+ */
+ for (const std::unique_ptr<GXFTrackState> & s : trajectory.trackStates()) {
+ /*
+ * We are only interested in collecting measurements, perigees, and any
+ * outlier states.
+ */
+ if (
+ s->getStateType(TrackStateOnSurface::Measurement) ||
+ s->getStateType(TrackStateOnSurface::Perigee) ||
+ s->getStateType(TrackStateOnSurface::Outlier)
+ ) {
+ /*
+ * We store a reference to the current track state in our return value
+ * vector.
+ */
+ rv.emplace_back(*s);
+
+ /*
+ * We want to make sure we do not collect any TRT results or other
+ * non-SCT and non-Pixel detector types. For that, we need to access
+ * the details of the detector element and determine the detector type.
+ */
+ const TrkDetElementBase * de = s->trackParameters()->associatedSurface().associatedDetectorElement();
+
+ if (de != nullptr) {
+ Identifier id = de->identify();
+
+ if (!m_DetID->is_pixel(id) && !m_DetID->is_sct(id)) {
+ break;
+ }
+ }
+
+ /*
+ * We also have no interest in going past the final measurement, so we
+ * break out of the loop if we find it.
+ */
+ if (s.get() == lastmeas) {
+ break;
+ }
+ }
+ }
+
+ return rv;
+ }
+
+ std::optional<GlobalChi2Fitter::TrackHoleCount> GlobalChi2Fitter::holeSearchProcess(
+ const EventContext & ctx,
+ const std::vector<std::reference_wrapper<GXFTrackState>> & states
+ ) const {
+ /*
+ * Firstly, we need to guard against tracks having too few measurement
+ * states to perform a good hole search. This is a mechanism that we
+ * inherit from the reference hole search. If we have too few states, we
+ * return a non-extant result to indicate an error state.
+ *
+ * TODO: The minimum value of 3 is also borrowed from the reference
+ * implementation. It's hardcoded for now, but could be a parameter in the
+ * future.
+ */
+ constexpr uint min_meas = 3;
+ if (std::count_if(states.begin(), states.end(), [](const GXFTrackState & s){ return s.getStateType(TrackStateOnSurface::Measurement); }) < min_meas) {
+ return {};
+ }
+
+ bool seen_meas = false;
+ TrackHoleCount rv;
+ std::set<Identifier> id_set;
+ std::set<Identifier> sct_set;
+
+ /*
+ * Using an old-school integer-based for loop because we need to iterate
+ * over successive pairs of states to do an extrapolation between.
+ */
+ for (std::size_t i = 0; i < states.size() - 1; i++) {
+ /*
+ * Gather references to the state at the beginning of the extrapolation,
+ * named beg, and the end, named end.
+ */
+ GXFTrackState & beg = states[i];
+ GXFTrackState & end = states[i + 1];
+
+ /*
+ * Update the boolean keeping track of whether we have seen a measurement
+ * or outlier yet. Once we see one, this will remain true forever, but
+ * it helps us make sure we don't collect holes before the first
+ * measurement.
+ */
+ seen_meas |= beg.getStateType(TrackStateOnSurface::Measurement) || beg.getStateType(TrackStateOnSurface::Outlier);
+
+ /*
+ * Calculate the distance between the position of the starting parameters
+ * and the end parameters. If this distance is sufficiently small, there
+ * can be no elements between them (for example, between two SCTs), and
+ * we don't need to do an extrapolation. This can easily save us a few
+ * microseconds.
+ */
+ double dist = (beg.trackParameters()->position() - end.trackParameters()->position()).norm();
+
+ /*
+ * Only proceed to count holes if we have seen a measurement before (this
+ * may include the starting track state, if it is a measurement) and the
+ * distance between start and end is at least 2.5 millimeters.
+ */
+ if (seen_meas && dist >= 2.5) {
+ /*
+ * First, we retrieve the hole data stored in the beginning state. Note
+ * that this may very well be non-extant, but it is possible for the
+ * fitter to have deposited some hole information into the track state
+ * earlier on in the fitting process.
+ */
+ std::optional<std::vector<std::unique_ptr<const TrackParameters>>> & hc = beg.getHoles();
+ std::vector<std::unique_ptr<const TrackParameters>> states;
+
+ /*
+ * Gather the track states between the start and end of the
+ * extrapolation. If the track state contained hole search information,
+ * we simply move that out and use it. If there was no information, we
+ * do a fresh extrapolation. This can be a CPU hog!
+ */
+ if (hc.has_value()) {
+ states = std::move(*hc);
+ } else {
+ states = holesearchExtrapolation(ctx, *beg.trackParameters(), end, alongMomentum);
+ }
+
+ /*
+ * Finally, we process the collected hole candidate states, checking
+ * them for liveness and other properties. This helper function will
+ * increment the values in rv accordingly.
+ */
+ holeSearchHelper(states, id_set, sct_set, rv, true, true);
+ }
+ }
+
+ /*
+ * Once we are done processing our measurements, we also need to do a
+ * final blind extrapolation to collect and dead modules (but not holes)
+ * behind the last measurement. For this, we do a blind extrapolation
+ * from the final state.
+ */
+ GXFTrackState & last = states.back();
+
+ /*
+ * To do the blind extrapolation, we need to have a set of track parameters
+ * for our last measurement state. We also check whether the position of
+ * the last measurement is still inside the inner detector. If it is not,
+ * we don't need to blindly extrapolate because we're only interested in
+ * collecting inner detector dead modules. This check saves us a few tens
+ * of microseconds.
+ */
+ if (
+ last.trackParameters() != nullptr &&
+ m_idVolume.inside(last.trackParameters()->position())
+ ) {
+ /*
+ * Simply conduct the blind extrapolation, and then use the helper tool
+ * to ensure that the hole counts are updated.
+ */
+ std::vector<std::unique_ptr<const Trk::TrackParameters>> bl = m_extrapolator->extrapolateBlindly(
+ *last.trackParameters(),
+ Trk::alongMomentum,
+ false,
+ Trk::pion,
+ &m_idVolume
+ );
+
+ /*
+ * Note that we have flipped one of the boolean parameters of the helper
+ * method here to make sure it only collects dead modules, not hole
+ * candidates.
+ */
+ holeSearchHelper(bl, id_set, sct_set, rv, false, true);
+ }
+
+ return rv;
+ }
+
std::unique_ptr<Track> GlobalChi2Fitter::makeTrack(
const EventContext & ctx,
Cache & cache,
@@ -7200,6 +7548,52 @@ namespace Trk {
*/
if (m_createSummary.value()) {
std::unique_ptr<TrackSummary> ts = std::make_unique<TrackSummary>();
+
+ /*
+ * This segment determines the hole search behaviour of the track fitter.
+ * It is only invoked if the DoHoleSearch parameter is set, but it can
+ * take a significant amount of CPU time, since the hole search is rather
+ * expensive. Beware of that!
+ */
+ if (m_holeSearch.value()) {
+ std::optional<TrackHoleCount> hole_count;
+
+ /*
+ * First, we collect a list of states that will act as our hole search
+ * extrapolation states. This will serve as our source of truth in
+ * regards to which track states we need to extrapolate between.
+ */
+ std::vector<std::reference_wrapper<GXFTrackState>> states = holeSearchStates(tmptrajectory);
+
+ /*
+ * Then, collect the actual hole search infomation using our state list
+ * from before. This is the expensive operation, as it will invoke a
+ * series of extrapolations if not all states have existing hole
+ * information! It will also check all the hole candidates to see if
+ * they are actually holes or not.
+ */
+ hole_count = holeSearchProcess(ctx, states);
+
+ /*
+ * Note that the hole search is not guaranteed to return a useful set
+ * of values. It can, for example, reach an error state if the number
+ * of measurements on a track is below a certain threshold. In that
+ * case, a non-extant result will be returned, which we must guard
+ * against. In that case, the hole counts will remain unset.
+ */
+ if (hole_count.has_value()) {
+ /*
+ * If the hole search did return good results, we can proceed to
+ * simply copy the numerical values in the track summary.
+ */
+ ts->update(Trk::numberOfPixelHoles, hole_count->m_pixel_hole);
+ ts->update(Trk::numberOfSCTHoles, hole_count->m_sct_hole);
+ ts->update(Trk::numberOfSCTDoubleHoles, hole_count->m_sct_double_hole);
+ ts->update(Trk::numberOfPixelDeadSensors, hole_count->m_pixel_dead);
+ ts->update(Trk::numberOfSCTDeadSensors, hole_count->m_sct_dead);
+ }
+ }
+
rv->setTrackSummary(std::move(ts));
}
@@ -7209,13 +7603,65 @@ namespace Trk {
GlobalChi2Fitter::~GlobalChi2Fitter() {
}
+ std::vector<std::unique_ptr<const TrackParameters>> GlobalChi2Fitter::holesearchExtrapolation(
+ const EventContext & ctx,
+ const TrackParameters & src,
+ const GXFTrackState & dst,
+ PropDirection propdir
+ ) const {
+ /*
+ * First, we conduct a bog standard stepwise extrapolation. This will
+ * yield some unwanted results, but we will filter those later.
+ */
+ std::vector<std::unique_ptr<const TrackParameters>> rv = m_extrapolator->extrapolateStepwise(
+ ctx, src, *dst.surface(), propdir, false
+ );
+
+ /*
+ * It is possible for the first returned track parameter to be on the same
+ * surface as we started on. That's probably due to some rounding errors.
+ * We check for this possibility, and set the pointer to null if it
+ * occurs. Note that this leaves some null pointers in the returned vector
+ * but this is more performant compared to removing them properly.
+ */
+ if (
+ rv.size() > 0 && (
+ &rv.front()->associatedSurface() == dst.surface() ||
+ &rv.front()->associatedSurface() == &src.associatedSurface() ||
+ trackParametersClose(*rv.front(), src, 0.001) ||
+ trackParametersClose(*rv.front(), *dst.trackParameters(), 0.001)
+ )
+ ) {
+ rv.front().reset(nullptr);
+ }
+
+ /*
+ * Same logic, but for the last returned element. In that case, we get a
+ * set of parameters on the destination surface, which we also do not
+ * want.
+ */
+ if (
+ rv.size() > 1 && (
+ &rv.back()->associatedSurface() == dst.surface() ||
+ &rv.back()->associatedSurface() == &src.associatedSurface() ||
+ trackParametersClose(*rv.back(), src, 0.001) ||
+ trackParametersClose(*rv.back(), *dst.trackParameters(), 0.001)
+ )
+ ) {
+ rv.back().reset(nullptr);
+ }
+
+ return rv;
+ }
+
GlobalChi2Fitter::PropagationResult GlobalChi2Fitter::calculateTrackParametersPropagateHelper(
const EventContext & ctx,
const TrackParameters & prev,
const GXFTrackState & ts,
PropDirection propdir,
MagneticFieldProperties bf,
- bool calcderiv
+ bool calcderiv,
+ bool holesearch
) const {
std::unique_ptr<const TrackParameters> rv;
TransportJacobian * jac = nullptr;
@@ -7238,10 +7684,16 @@ namespace Trk {
}
}
+ std::optional<std::vector<std::unique_ptr<const TrackParameters>>> extrapolation;
+
+ if (holesearch) {
+ extrapolation = holesearchExtrapolation(ctx, prev, ts, propdir);
+ }
+
return PropagationResult {
std::move(rv),
std::unique_ptr<TransportJacobian>(jac),
- {}
+ std::move(extrapolation)
};
}
@@ -7251,19 +7703,20 @@ namespace Trk {
const GXFTrackState & ts,
PropDirection propdir,
MagneticFieldProperties bf,
- bool calcderiv
+ bool calcderiv,
+ bool holesearch
) const {
PropagationResult rv;
rv = calculateTrackParametersPropagateHelper(
- ctx, prev, ts, propdir, bf, calcderiv
+ ctx, prev, ts, propdir, bf, calcderiv, holesearch
);
if (rv.m_parameters == nullptr) {
propdir = invertPropdir(propdir);
rv = calculateTrackParametersPropagateHelper(
- ctx, prev, ts, propdir, bf, calcderiv
+ ctx, prev, ts, propdir, bf, calcderiv, holesearch
);
}
@@ -7307,7 +7760,8 @@ namespace Trk {
*states[hitno],
propdir,
trajectory.m_fieldprop,
- calcderiv
+ calcderiv,
+ false
);
if (
@@ -7387,7 +7841,8 @@ namespace Trk {
*states[hitno],
propdir,
trajectory.m_fieldprop,
- calcderiv
+ calcderiv,
+ false
);
if (
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/ATLAS_CHECK_THREAD_SAFETY b/Tracking/TrkTools/TrkAmbiguityProcessor/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..ad42328853f7550a8be5e5f706ccde21fa379d6c
--- /dev/null
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Tracking/TrkTools/TrkAmbiguityProcessor
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt b/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt
index 796f2383c99c159cc9818f8e45f76997cbba35ee..ad18e45b367a80ac8240f488bfad8da3f0b8ab8d 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/CMakeLists.txt
@@ -9,18 +9,15 @@ atlas_subdir( TrkAmbiguityProcessor )
atlas_depends_on_subdirs( PRIVATE
Control/AthenaBaseComps
Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- GaudiKernel
- InnerDetector/InDetRecEvent/InDetPrepRawData
+ GaudiKernel
InnerDetector/InDetRecTools/InDetRecToolInterfaces
- Tracking/TrkDetDescr/TrkDetElementBase
+ InnerDetector/InDetRecEvent/InDetPrepRawData
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkRIO_OnTrack
Tracking/TrkEvent/TrkTrack
Tracking/TrkEvent/TrkTrackSummary
Tracking/TrkEvent/TrkTruthData
- Tracking/TrkEvent/TrkCaloClusterROI
Tracking/TrkFitter/TrkFitterInterfaces
Tracking/TrkTools/TrkToolInterfaces
Tracking/TrkValidation/TrkValInterfaces
@@ -42,5 +39,5 @@ atlas_add_component( TrkAmbiguityProcessor
src/RenounceToolInputsVisitor.cxx
src/components/*.cxx
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AthenaBaseComps AtlasDetDescr GaudiKernel InDetPrepRawData InDetRecToolInterfaces TrkDetElementBase TrkEventPrimitives TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData TrkFitterInterfaces TrkToolInterfaces TrkValInterfaces TrkExInterfaces)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AthenaBaseComps GaudiKernel InDetRecToolInterfaces InDetPrepRawData TrkEventPrimitives TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData TrkFitterInterfaces TrkToolInterfaces TrkValInterfaces TrkExInterfaces)
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.cxx
index c11b3fce63c1114d990ffe0246d28fadff045c4f..b130beafbd73535281f1d3be79a90e7548195b7a 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.cxx
@@ -87,7 +87,10 @@ Trk::DenseEnvironmentsAmbiguityProcessorTool::initialize(){
}
ATH_CHECK( m_extrapolatorTool.retrieve());
-
+
+ ATH_CHECK(m_clusterSplitProbContainerIn.initialize(!m_clusterSplitProbContainerIn.key().empty()));
+ ATH_CHECK(m_clusterSplitProbContainerOut.initialize(!m_clusterSplitProbContainerOut.key().empty()));
+
// Configuration of the material effects
Trk::ParticleSwitcher particleSwitch;
m_particleHypothesis = particleSwitch.particle[m_matEffects];
@@ -173,6 +176,29 @@ Trk::DenseEnvironmentsAmbiguityProcessorTool::solveTracks(const TracksScores &tr
scoreTrackFitflagMap.emplace(scoreTrack.second, TrackPtr(scoreTrack.first) );
stat.incrementCounterByRegion(CounterIndex::kNcandidates,scoreTrack.first);
}
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ SG::ReadHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerIn;
+ if (!m_clusterSplitProbContainerIn.key().empty()) {
+ splitProbContainerIn = SG::ReadHandle( m_clusterSplitProbContainerIn, ctx);
+ if (!splitProbContainerIn.isValid()) {
+ ATH_MSG_ERROR( "Failed to get input cluster split probability container " << m_clusterSplitProbContainerIn.key());
+ }
+ }
+ std::unique_ptr<Trk::ClusterSplitProbabilityContainer> splitProbContainerCleanup(!m_clusterSplitProbContainerIn.key().empty()
+ ? std::make_unique<ClusterSplitProbabilityContainer>(*splitProbContainerIn)
+ : std::make_unique<ClusterSplitProbabilityContainer>());
+ SG::WriteHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerHandle;
+ Trk::ClusterSplitProbabilityContainer *splitProbContainer;
+ if (!m_clusterSplitProbContainerOut.key().empty()) {
+ splitProbContainerHandle=SG::WriteHandle<Trk::ClusterSplitProbabilityContainer>( m_clusterSplitProbContainerOut, ctx);
+ if (splitProbContainerHandle.record(std::move(splitProbContainerCleanup)).isFailure()) {
+ ATH_MSG_FATAL( "Failed to record output cluster split probability container " << m_clusterSplitProbContainerOut.key());
+ }
+ splitProbContainer = splitProbContainerHandle.ptr();
+ }
+ else {
+ splitProbContainer = splitProbContainerCleanup.get();
+ }
ATH_MSG_DEBUG ("Starting to solve tracks");
// now loop as long as map is not empty
while ( !scoreTrackFitflagMap.empty() ){
@@ -184,8 +210,8 @@ Trk::DenseEnvironmentsAmbiguityProcessorTool::solveTracks(const TracksScores &tr
// clean it out to make sure not to many shared hits
ATH_MSG_DEBUG ("--- Trying next track "<<atrack.track()<<"\t with score "<<-ascore);
std::unique_ptr<Trk::Track> cleanedTrack;
- const auto & [tmpCleanedTrack, keepOriginal] = m_selectionTool->getCleanedOutTrack( atrack.track() , -ascore, prdToTrackMap);
- cleanedTrack.reset(tmpCleanedTrack);
+ const auto &[cleanedTrack_tmp, keepOriginal] = m_selectionTool->getCleanedOutTrack( atrack.track() , -ascore, *splitProbContainer, prdToTrackMap);
+ cleanedTrack.reset(cleanedTrack_tmp);
ATH_MSG_DEBUG ("--- cleaned next track "<< cleanedTrack.get());
// cleaned track is input track and fitted
if (keepOriginal && atrack.fitted()){
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.h b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.h
index 13a6111353978ceffa6fca2177742104f86d4f85..bb82e3210ec709a96dab62a5f6f01937d2ac3de6 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.h
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityProcessorTool.h
@@ -12,6 +12,7 @@
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
//need to include the following, since its a typedef and can't be forward declared.
#include "TrkTrack/TrackCollection.h"
@@ -107,6 +108,11 @@ namespace Trk {
which are removed are made */
ToolHandle<IAmbiTrackSelectionTool> m_selectionTool;
+ SG::ReadHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerIn
+ {this, "InputClusterSplitProbabilityName", "",""};
+ SG::WriteHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerOut
+ {this, "OutputClusterSplitProbabilityName", "",""};
+
bool m_rejectInvalidTracks;
};
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx
index 90aac7985425c99954df631e8a4c7c71686bbfe1..30e245bbe62142011410b1a86d570bb31df371a9 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx
@@ -28,7 +28,6 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::DenseEnvironmentsAmbiguitySco
:
AthAlgTool(t,n,p),
m_scoringTool("Trk::TrackScoringTool/TrackScoringTool"),
- m_selectionTool("InDet::InDetDenseEnvAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool"),
m_splitProbTool("InDet::NnPixelClusterSplitProbTool/NnPixelClusterSplitProbTool"),
m_etaBounds{0.8, 1.6, 2.5,4.0},
m_stat(m_etaBounds)
@@ -36,7 +35,6 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::DenseEnvironmentsAmbiguitySco
declareInterface<ITrackAmbiguityScoreProcessorTool>(this);
declareProperty("ScoringTool" , m_scoringTool);
- declareProperty("SelectionTool" , m_selectionTool);
declareProperty("SplitProbTool" , m_splitProbTool);
declareProperty("SplitClusterMap_old" , m_splitClusterMapKey_last);
declareProperty("SplitClusterMap_new" , m_splitClusterMapKey);
@@ -59,9 +57,9 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::initialize(){
ATH_CHECK( m_assoToolNotGanged.retrieve( DisableTool{m_assoToolNotGanged.empty()} )) ;
ATH_CHECK( m_assoMapName.initialize(!m_assoMapName.key().empty()) );
- ATH_CHECK( m_selectionTool.retrieve());
-
ATH_CHECK(m_splitProbTool.retrieve( DisableTool{m_splitProbTool.empty()} ));
+ ATH_CHECK(m_clusterSplitProbContainerIn.initialize(!m_clusterSplitProbContainerIn.key().empty()) );
+ ATH_CHECK(m_clusterSplitProbContainerOut.initialize(!m_clusterSplitProbContainerOut.key().empty()) );
ATH_CHECK( m_splitClusterMapKey_last.initialize(!m_splitClusterMapKey_last.key().empty()) );
ATH_CHECK( m_splitClusterMapKey.initialize(!m_splitClusterMapKey.key().empty()) );
@@ -101,10 +99,11 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::statistics() {
void
Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::process(const TrackCollection & tracks,
Trk::TracksScores* trackScoreTrackMap) const{
+ const EventContext& ctx = Gaudi::Hive::currentContext();
InDet::PixelGangedClusterAmbiguities *splitClusterMap = nullptr;
if(!m_splitClusterMapKey.key().empty()){
if(!m_splitClusterMapKey_last.key().empty()){
- SG::ReadHandle<InDet::PixelGangedClusterAmbiguities> splitClusterMapHandle_last(m_splitClusterMapKey_last);
+ SG::ReadHandle<InDet::PixelGangedClusterAmbiguities> splitClusterMapHandle_last(m_splitClusterMapKey_last,ctx);
if ( !splitClusterMapHandle_last.isValid() ){
ATH_MSG_ERROR("Could not read last splitClusterMap.");
}
@@ -114,13 +113,39 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::process(const TrackCollection
splitClusterMap = new InDet::PixelGangedClusterAmbiguities();
}
}
+
+ SG::ReadHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerIn;
+ if (!m_clusterSplitProbContainerIn.key().empty()) {
+ splitProbContainerIn = SG::ReadHandle( m_clusterSplitProbContainerIn, ctx);
+ if (!splitProbContainerIn.isValid()) {
+ ATH_MSG_ERROR( "Failed to get input cluster split probability container " << m_clusterSplitProbContainerIn.key());
+ }
+ }
+ std::unique_ptr<Trk::ClusterSplitProbabilityContainer> splitProbContainerCleanup(!m_clusterSplitProbContainerIn.key().empty()
+ ? std::make_unique<ClusterSplitProbabilityContainer>(*splitProbContainerIn)
+ : std::make_unique<ClusterSplitProbabilityContainer>());
+ SG::WriteHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerHandle;
+ Trk::ClusterSplitProbabilityContainer *splitProbContainer;
+
+ // Have to write the ClusterSplitProbabilityContainer first, to allow child tools to already use this new container.
+ if (!m_clusterSplitProbContainerOut.key().empty()) {
+ splitProbContainerHandle = SG::WriteHandle<Trk::ClusterSplitProbabilityContainer>( m_clusterSplitProbContainerOut, ctx);
+ if (splitProbContainerHandle.record(std::move(splitProbContainerCleanup)).isFailure()) {
+ ATH_MSG_FATAL( "Failed to record output cluster split probability container " << m_clusterSplitProbContainerOut.key());
+ }
+ splitProbContainer=splitProbContainerHandle.ptr();
+ }
+ else {
+ splitProbContainer=splitProbContainerCleanup.get();
+ }
+
addNewTracks(tracks, trackScoreTrackMap);
std::unique_ptr<Trk::PRDtoTrackMap> prdToTrackMap( m_assoToolNotGanged.isEnabled()
? m_assoToolNotGanged->createPRDtoTrackMap()
: m_assoTool->createPRDtoTrackMap() );
- overlappingTracks(trackScoreTrackMap, splitClusterMap, *prdToTrackMap);
+ overlappingTracks(trackScoreTrackMap, splitClusterMap, *splitProbContainer, *prdToTrackMap);
if (!m_assoMapName.key().empty()) {
- if (SG::WriteHandle<Trk::PRDtoTrackMap>(m_assoMapName).record(
+ if (SG::WriteHandle<Trk::PRDtoTrackMap>(m_assoMapName,ctx).record(
(m_assoToolNotGanged.isEnabled()
? m_assoToolNotGanged->reduceToStorableMap(std::move(prdToTrackMap))
: m_assoTool->reduceToStorableMap(std::move(prdToTrackMap)) )).isFailure()) {
@@ -128,7 +153,7 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::process(const TrackCollection
}
}
if(!m_splitClusterMapKey.key().empty()){
- SG::WriteHandle<InDet::PixelGangedClusterAmbiguities> splitClusterMapHandle(m_splitClusterMapKey);
+ SG::WriteHandle<InDet::PixelGangedClusterAmbiguities> splitClusterMapHandle(m_splitClusterMapKey,ctx);
splitClusterMapHandle = std::unique_ptr<InDet::PixelGangedClusterAmbiguities>(splitClusterMap);
if( !splitClusterMapHandle.isValid() ){
ATH_MSG_ERROR("Could not record splitClusterMap.");
@@ -167,38 +192,39 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::addNewTracks(const TrackColle
}
//==================================================================================================
-void
+void
Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::updatePixelSplitInformationForCluster(const std::pair<const InDet::PixelCluster* const,
- const Trk::TrackParameters*> & clusterTrkPara,
- InDet::PixelGangedClusterAmbiguities *splitClusterMap) const{
+ const Trk::TrackParameters*> & clusterTrkPara,
+ InDet::PixelGangedClusterAmbiguities *splitClusterMap,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer) const
+{
// Recalculate the split prob with the use of the track parameters
InDet::PixelClusterSplitProb splitProb = m_splitProbTool->splitProbability( *clusterTrkPara.first, *clusterTrkPara.second );
- // update the split prob information on the cluster -- the use of the split flag is now questionable -- possible it will now indicate if the cluster is shared between multiple tracks
- InDet::PixelCluster* pixelCluster = const_cast<InDet::PixelCluster*> ( clusterTrkPara.first );
+ // update the split prob information on the cluster -- the use of the split flag is now questionable -- possible itP will now indicate if the cluster is shared between multiple tracks
+ const InDet::PixelCluster* pixelCluster = clusterTrkPara.first;
//TODO: const_cast?
+ if (msgLvl(MSG::DEBUG)) {
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &splitProbCurrent = (pixelCluster
+ ? splitProbContainer.splitProbability(pixelCluster)
+ : Trk::ClusterSplitProbabilityContainer::getNoSplitProbability());
- ATH_MSG_DEBUG ( "---- "<< pixelCluster->globalPosition().perp()
- <<" Updating split probs 1: Old " << pixelCluster->splitProbability1() << " New " << splitProb.splitProbability(2)
- <<" Probs 2: Old " << pixelCluster->splitProbability2() << " New " << splitProb.splitProbability(3)
- << "\n"
- << " --- pixelCluster: " << *pixelCluster
- << "\n"
- << " --- trk params: " << *clusterTrkPara.second );
-
- if ( splitProb.splitProbability(2) < 0 ){
- pixelCluster->packSplitInformation( false, 0.0, 0.0 );
- pixelCluster->setTooBigToBeSplit( true );
- } else {
- pixelCluster->packSplitInformation( false, splitProb.splitProbability(2), splitProb.splitProbability(3) ) ;
- pixelCluster->setTooBigToBeSplit( false );
+ ATH_MSG_DEBUG ( "---- "<< pixelCluster->globalPosition().perp()
+ <<" Updating split probs 1: " << pixelCluster->identify() << ": Old " << splitProbCurrent.splitProbability1() << " New " << splitProb.splitProbability(2)
+ <<" Probs 2: Old " << splitProbCurrent.splitProbability2() << " New " << splitProb.splitProbability(3)
+ << "\n"
+ << " --- pixelCluster: " << *pixelCluster
+ << "\n"
+ << " --- trk params: " << *clusterTrkPara.second );
}
-
+ const Trk::ClusterSplitProbabilityContainer::ProbabilityInfo &
+ splitProbNew = splitProbContainer.setSplitInformation(pixelCluster, splitProb.splitProbability(2), splitProb.splitProbability(3));
+
if(splitClusterMap){
- if( pixelCluster->splitProbability2() >= m_sharedProbCut2){
+ if( splitProbNew.splitProbability2() >= m_sharedProbCut2){
splitClusterMap->insert(std::make_pair( pixelCluster, pixelCluster ) );
splitClusterMap->insert(std::make_pair( pixelCluster, pixelCluster ) );
- } else if ( pixelCluster->splitProbability1() >= m_sharedProbCut ){
+ } else if ( splitProbNew.splitProbability1() >= m_sharedProbCut ){
splitClusterMap->insert(std::make_pair( pixelCluster, pixelCluster ) );
}
}
@@ -206,10 +232,12 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::updatePixelSplitInformationFo
}
//==================================================================================================
-void
+void
Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::overlappingTracks(const TracksScores* scoredTracks,
- InDet::PixelGangedClusterAmbiguities *splitClusterMap,
- Trk::PRDtoTrackMap &prdToTrackMap) const{
+ InDet::PixelGangedClusterAmbiguities *splitClusterMap,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
+ Trk::PRDtoTrackMap &prdToTrackMap) const
+{
const Trk::IPRDtoTrackMapTool *the_asso_tool = (m_assoToolNotGanged.isEnabled() ? &(*m_assoToolNotGanged) : &(*m_assoTool));
// Function currnetly does nothing useful expect for printout debug information
ATH_MSG_DEBUG ("Starting to resolve overlapping tracks");
@@ -255,41 +283,43 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::overlappingTracks(const Track
//Update the pixel split information if the element is unique (The second element of the pair indiciates if the element was inserted into the map)
auto ret = setOfPixelClustersOnTrack.insert(std::make_pair( pixel, (*tsos)->trackParameters() ));
if (ret.second && m_splitProbTool.isEnabled()) {
- updatePixelSplitInformationForCluster( *(ret.first), splitClusterMap);
+ updatePixelSplitInformationForCluster( *(ret.first), splitClusterMap, splitProbContainer);
}
setOfPixelClustersToTrackAssoc.insert( std::make_pair( pixel, scoredTracksItem.first ) );
}
}
}
+ if (msgLvl(MSG::VERBOSE)) {
// now loop as long as map is not empty
- std::vector< std::pair< const InDet::PixelCluster*, const Trk::Track* > > sorted;
- sorted.reserve( setOfPixelClustersToTrackAssoc.size() );
- for( const std::pair< const InDet::PixelCluster* const, const Trk::Track* > &pixelTrackItem : setOfPixelClustersToTrackAssoc ) {
- sorted.emplace_back(pixelTrackItem );
- }
- std::sort( sorted.begin(), sorted.end(), [](const std::pair< const InDet::PixelCluster*, const Trk::Track* > &a,
- const std::pair< const InDet::PixelCluster*, const Trk::Track* > &b) {
- return a.first->getHashAndIndex().collHash() < b.first->getHashAndIndex().collHash()
- || ( a.first->getHashAndIndex().collHash() == b.first->getHashAndIndex().collHash()
- && a.first->getHashAndIndex().objIndex() < b.first->getHashAndIndex().objIndex() );
- });
- for (const std::pair< const InDet::PixelCluster*, const Trk::Track* > &pixelTrackItem : sorted) {
- ATH_MSG_VERBOSE ("---- Checking if track shares pixel hits if other tracks: " << pixelTrackItem.first << " with R " << pixelTrackItem.first->globalPosition().perp() );
- // find out how many tracks use this hit already
- Trk::PRDtoTrackMap::ConstPrepRawDataTrackMapRange range = prdToTrackMap.onTracks( *pixelTrackItem.first );
- int numberOfTracksWithThisPrd = std::distance(range.first,range.second);
- if (msgLvl(MSG::VERBOSE)) {
- TString tracks("---- number of tracks with this shared Prd: ");
- tracks += numberOfTracksWithThisPrd;
- for (Trk::IPRD_AssociationTool::ConstPRD_MapIt it =range.first; it != range.second;++it ){
- tracks += " ";
- tracks += Form( " %p",(void*)(it->second));
- double pt = (it->second->trackParameters() ? it->second->trackParameters()->front()->pT() : -1);
- tracks += Form(":%.3f", pt);
- tracks += Form(",%i",static_cast<int>(it->second->measurementsOnTrack()->size()));
- }
- ATH_MSG_VERBOSE (tracks);
- }
+ std::vector< std::pair< const InDet::PixelCluster*, const Trk::Track* > > sorted;
+ sorted.reserve( setOfPixelClustersToTrackAssoc.size() );
+ for( const std::pair< const InDet::PixelCluster* const, const Trk::Track* > &pixelTrackItem : setOfPixelClustersToTrackAssoc ) {
+ sorted.emplace_back(pixelTrackItem );
+ }
+ std::sort( sorted.begin(), sorted.end(), [](const std::pair< const InDet::PixelCluster*, const Trk::Track* > &a,
+ const std::pair< const InDet::PixelCluster*, const Trk::Track* > &b) {
+ return a.first->getHashAndIndex().collHash() < b.first->getHashAndIndex().collHash()
+ || ( a.first->getHashAndIndex().collHash() == b.first->getHashAndIndex().collHash()
+ && a.first->getHashAndIndex().objIndex() < b.first->getHashAndIndex().objIndex() );
+ });
+ for (const std::pair< const InDet::PixelCluster*, const Trk::Track* > &pixelTrackItem : sorted) {
+ ATH_MSG_VERBOSE ("---- Checking if track shares pixel hits if other tracks: " << pixelTrackItem.first << " with R " << pixelTrackItem.first->globalPosition().perp() );
+ // find out how many tracks use this hit already
+ Trk::PRDtoTrackMap::ConstPrepRawDataTrackMapRange range = prdToTrackMap.onTracks( *pixelTrackItem.first );
+ int numberOfTracksWithThisPrd = std::distance(range.first,range.second);
+ if (msgLvl(MSG::VERBOSE)) {
+ TString tracks("---- number of tracks with this shared Prd: ");
+ tracks += numberOfTracksWithThisPrd;
+ for (Trk::IPRD_AssociationTool::ConstPRD_MapIt it =range.first; it != range.second;++it ){
+ tracks += " ";
+ tracks += Form( " %p",(void*)(it->second));
+ double pt = (it->second->trackParameters() ? it->second->trackParameters()->front()->pT() : -1);
+ tracks += Form(":%.3f", pt);
+ tracks += Form(",%i",static_cast<int>(it->second->measurementsOnTrack()->size()));
+ }
+ ATH_MSG_VERBOSE (tracks);
+ }
+ }
}
}
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.h b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.h
index df34c8de899c134d58f27ab3971afd7820fe9985..c2c66e81c31d9ad5af14176f8ecc0008ae5224b6 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.h
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.h
@@ -11,7 +11,6 @@
#include "TrkToolInterfaces/ITrackAmbiguityScoreProcessorTool.h"
#include "TrkEventPrimitives/TrackScore.h"
#include "TrkFitterInterfaces/ITrackFitter.h"
-#include "TrkToolInterfaces/IAmbiTrackSelectionTool.h"
#include "InDetPrepRawData/PixelGangedClusterAmbiguities.h"
//need to include the following, since its a typedef and can't be forward declared.
@@ -21,6 +20,7 @@
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
#include "AmbiCounter.icc"
#include <map>
#include <set>
@@ -78,12 +78,14 @@ namespace Trk {
/** Find SiS Tracks that share hits in the track score map*/
void overlappingTracks(const TracksScores* scoreTrackMap,
InDet::PixelGangedClusterAmbiguities *splitClusterMap,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
Trk::PRDtoTrackMap &prd_to_track_map) const;
/** Update pixel split information based using the fitted track*/
void updatePixelSplitInformationForCluster(const std::pair<const InDet::PixelCluster* const,
const Trk::TrackParameters*> & clusterTrkPara,
- InDet::PixelGangedClusterAmbiguities *splitClusterMap) const;
+ InDet::PixelGangedClusterAmbiguities *splitClusterMap,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer) const;
/**Scoring tool
@@ -97,10 +99,6 @@ namespace Trk {
ToolHandle<Trk::IPRDtoTrackMapTool> m_assoToolNotGanged
{this, "AssociationToolNotGanged", "Trk::PRDtoTrackMapTool" }; // @TODO why are ganged pixels ignored ?
- /** selection tool - here the decision which hits remain on a track and
- which are removed are made */
- ToolHandle<IAmbiTrackSelectionTool> m_selectionTool;
-
/** recalculate split prob tool **/
ToolHandle<InDet::IPixelClusterSplitProbTool> m_splitProbTool;
@@ -114,6 +112,11 @@ namespace Trk {
SG::WriteHandleKey<Trk::PRDtoTrackMap> m_assoMapName
{this,"AssociationMapName",""}; ///< the key given to the newly created association map
+ SG::ReadHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerIn
+ {this,"InputClusterSplitProbabilityName",""}; ///< the key given to the newly created association map
+ SG::WriteHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerOut
+ {this,"OutputClusterSplitProbabilityName",""}; ///< the key given to the newly created association map
+
/**NN split sprob cut for 2 particle clusters */
float m_sharedProbCut;
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.cxx
index 70da48d5cb0c448a5e0692c52f0365cf7a7eb17b..cde397de640ddf4a3ed4a9b9323ae4cda4a40aaf 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.cxx
@@ -3,7 +3,6 @@
*/
#include "SimpleAmbiguityProcessorTool.h"
-#include "AtlasDetDescr/AtlasDetectorID.h"
#include "TrackScoringTool.h"
#include "TrkParameters/TrackParameters.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
@@ -77,6 +76,9 @@ StatusCode Trk::SimpleAmbiguityProcessorTool::initialize(){
if (m_tryBremFit) {
ATH_MSG_INFO( "Try brem fit and recovery for electron like tracks.");
}
+
+ ATH_CHECK(m_clusterSplitProbContainerIn.initialize(!m_clusterSplitProbContainerIn.key().empty()));
+ ATH_CHECK(m_clusterSplitProbContainerOut.initialize(!m_clusterSplitProbContainerOut.key().empty()));
// statistics
if (m_etaBounds.size() != Counter::nRegions) {
ATH_MSG_ERROR( "There must be exactly " << Counter::nRegions
@@ -194,7 +196,32 @@ Trk::SimpleAmbiguityProcessorTool::solveTracks(TrackScoreMap& trackScoreTrackMap
Trk::PRDtoTrackMap &prdToTrackMap,
std::vector<std::unique_ptr<const Trk::Track> >& trackDustbin,
Counter &stat) const{
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ SG::ReadHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerIn;
+ if (!m_clusterSplitProbContainerIn.key().empty()) {
+ splitProbContainerIn = SG::ReadHandle( m_clusterSplitProbContainerIn, ctx);
+ if (!splitProbContainerIn.isValid()) {
+ ATH_MSG_ERROR( "Failed to get input cluster split probability container " << m_clusterSplitProbContainerIn.key());
+ }
+ }
+ std::unique_ptr<Trk::ClusterSplitProbabilityContainer> splitProbContainerCleanup(!m_clusterSplitProbContainerIn.key().empty()
+ ? std::make_unique<ClusterSplitProbabilityContainer>(*splitProbContainerIn)
+ : std::make_unique<ClusterSplitProbabilityContainer>());
+ SG::WriteHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerHandle;
+ Trk::ClusterSplitProbabilityContainer *splitProbContainer;
+ if (!m_clusterSplitProbContainerOut.key().empty()) {
+ splitProbContainerHandle = SG::WriteHandle<Trk::ClusterSplitProbabilityContainer>( m_clusterSplitProbContainerOut, ctx);
+ if (splitProbContainerHandle.record(std::move(splitProbContainerCleanup)).isFailure()) {
+ ATH_MSG_FATAL( "Failed to record output cluster split probability container " << m_clusterSplitProbContainerOut.key());
+ }
+ splitProbContainer=splitProbContainerHandle.ptr();
+ }
+ else {
+ splitProbContainer=splitProbContainerCleanup.get();
+ }
+
std::unique_ptr<TrackCollection> finalTracks(std::make_unique<TrackCollection>());
+
ATH_MSG_DEBUG ("Starting to solve tracks");
// now loop as long as map is not empty
while ( !trackScoreTrackMap.empty() ){
@@ -206,7 +233,7 @@ Trk::SimpleAmbiguityProcessorTool::solveTracks(TrackScoreMap& trackScoreTrackMap
// clean it out to make sure not to many shared hits
ATH_MSG_VERBOSE ("--- Trying next track "<<atrack.track()<<"\t with score "<<-ascore);
std::unique_ptr<Trk::Track> cleanedTrack;
- auto [cleanedTrack_tmp,keep_orig] = m_selectionTool->getCleanedOutTrack( atrack.track() , -(ascore), prdToTrackMap);
+ auto [cleanedTrack_tmp,keep_orig] = m_selectionTool->getCleanedOutTrack( atrack.track() , -(ascore), *splitProbContainer, prdToTrackMap);
cleanedTrack.reset( cleanedTrack_tmp);
// cleaned track is input track and fitted
if (keep_orig && atrack.fitted() ){
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.h b/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.h
index 532d2f3f1554de573b3a6df12ebf4f5379c6f495..958b33bb4fdac1ed5c3c0dd3a04f6b6e77ec9e4d 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.h
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/SimpleAmbiguityProcessorTool.h
@@ -14,6 +14,7 @@
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
#include "TrkToolInterfaces/IExtendedTrackSummaryTool.h"
//need to include the following, since its a typedef and can't be forward declared.
@@ -118,6 +119,10 @@ namespace Trk {
ToolHandle<Trk::IPRDtoTrackMapTool> m_assoTool{this, "AssociationTool", "Trk::PRDtoTrackMapTool" };
/** selection tool - here the decision which hits remain on a track and which are removed are made */
ToolHandle<IAmbiTrackSelectionTool> m_selectionTool;
+ SG::ReadHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerIn
+ {this, "InputClusterSplitProbabilityName", "",""};
+ SG::WriteHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerOut
+ {this, "OutputClusterSplitProbabilityName", "",""};
};
} //end ns
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx
index 49db0a8696391ffc15ab52caf4368237a343a0fd..8518b52bdf9ee1ac83790e84f51e4c9663c5818e 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx
@@ -5,7 +5,6 @@
#include "TrkToolInterfaces/ITrackSummaryTool.h"
#include "TrackScoringTool.h"
-#include "TrkDetElementBase/TrkDetElementBase.h"
#include "TrkTrack/Track.h"
#include "TrkEventPrimitives/FitQuality.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
@@ -19,13 +18,11 @@ Trk::TrackScoringTool::TrackScoringTool(const std::string& t,
const IInterface* p )
:
AthAlgTool(t,n,p),
- m_trkSummaryTool("Trk::TrackSummaryTool"),
m_summaryTypeScore(Trk::numberOfTrackSummaryTypes)
{
declareInterface<ITrackScoringTool>(this);
- declareProperty("SumHelpTool", m_trkSummaryTool);
- //set some test values
+ //set some test values
m_summaryTypeScore[Trk::numberOfPixelHits] = 20;
m_summaryTypeScore[Trk::numberOfPixelSharedHits] = -10; // a shared hit is only half the weight
m_summaryTypeScore[Trk::numberOfPixelHoles] = -10; // a hole is bad
@@ -60,8 +57,6 @@ Trk::TrackScoringTool::~TrackScoringTool(){
StatusCode
Trk::TrackScoringTool::initialize(){
ATH_CHECK( AlgTool::initialize());
- ATH_CHECK( m_trkSummaryTool.retrieve());
- ATH_MSG_VERBOSE("Retrieved tool " << m_trkSummaryTool );
return StatusCode::SUCCESS;
}
@@ -70,22 +65,13 @@ StatusCode Trk::TrackScoringTool::finalize(){
}
Trk::TrackScore
-Trk::TrackScoringTool::score( const Track& track, const bool suppressHoleSearch ) const{
-
- // Used to call the now removed not MT safe
- // summary = m_trkSummaryTool->createSummary(track);
- // We keep the non-thread safe logic only here.
- // Locally to where is actually used
- // To decide for a better design
- //
- Trk::Track& nonConstTrack = const_cast<Trk::Track&>(track);
- if (suppressHoleSearch) {
- nonConstTrack.setTrackSummary(m_trkSummaryTool->summaryNoHoleSearch(track));
- } else {
- nonConstTrack.setTrackSummary(m_trkSummaryTool->summary(track));
- }
- Trk::TrackScore score = TrackScore(simpleScore(track, *(nonConstTrack.trackSummary())));
- return score;
+Trk::TrackScoringTool::score( const Track& track, [[maybe_unused]] const bool suppressHoleSearch ) const{
+ if (!track.trackSummary()) {
+ ATH_MSG_FATAL("Attempt to score a track without a summary.");
+ }
+
+ Trk::TrackScore score = TrackScore( simpleScore(track, *track.trackSummary()) );
+ return score;
}
Trk::TrackScore
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.h b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.h
index 1894f845d284b99353b0d36b362e1d73583e0c81..8fa58c99f01ddd8c9b1aee8dcf3d51dfcee595c9 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.h
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.h
@@ -16,7 +16,6 @@ namespace Trk
{
class Track;
-class ITrackSummaryTool;
class TrackSummary;
/**Concrete implementation of the ITrackScoringTool pABC*/
@@ -34,9 +33,6 @@ class TrackSummary;
TrackScore simpleScore( const Track& track, const TrackSummary& trackSummary ) const override;
private:
- /**\todo make this const, once createSummary method is const*/
- ToolHandle<ITrackSummaryTool> m_trkSummaryTool;
-
/**holds the scores assigned to each Trk::SummaryType from the track's Trk::TrackSummary*/
std::vector<TrackScore> m_summaryTypeScore;
};
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.cxx
index 77476c2939b984d474e0c74dabfe1faeec91e79c..2acda79ae103ce470c4c528df650b6c6e5b6d147 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.cxx
@@ -42,6 +42,10 @@ Trk::TrackSelectionProcessorTool::initialize(){
ATH_CHECK( m_assoTool.retrieve() );
ATH_CHECK( m_scoringTool.retrieve());
ATH_CHECK(m_selectionTool.retrieve());
+
+ ATH_CHECK(m_clusterSplitProbContainerIn.initialize(!m_clusterSplitProbContainerIn.key().empty()));
+ ATH_CHECK(m_clusterSplitProbContainerOut.initialize(!m_clusterSplitProbContainerOut.key().empty()));
+
if (m_disableSorting) ATH_MSG_INFO( "Internal sorting disabled, using external ordering!" );
return sc;
}
@@ -141,10 +145,37 @@ Trk::TrackSelectionProcessorTool::addNewTracks(TrackScoreMap &trackScoreTrackMap
ATH_MSG_DEBUG ("Number of tracks in map:"<<trackScoreTrackMap.size());
}
-void
+void
Trk::TrackSelectionProcessorTool::solveTracks(TrackScoreMap &trackScoreTrackMap,
- Trk::PRDtoTrackMap &prdToTrackMap,
- TrackCollection &result) const{
+ Trk::PRDtoTrackMap &prdToTrackMap,
+ TrackCollection &result) const
+{
+ using namespace std;
+
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ SG::ReadHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerIn;
+ if (!m_clusterSplitProbContainerIn.key().empty()) {
+ splitProbContainerIn = SG::ReadHandle( m_clusterSplitProbContainerIn, ctx);
+ if (!splitProbContainerIn.isValid()) {
+ ATH_MSG_ERROR( "Failed to get input cluster split probability container " << m_clusterSplitProbContainerIn.key());
+ }
+ }
+ std::unique_ptr<Trk::ClusterSplitProbabilityContainer> splitProbContainerCleanup(!m_clusterSplitProbContainerIn.key().empty()
+ ? std::make_unique<ClusterSplitProbabilityContainer>(*splitProbContainerIn)
+ : std::make_unique<ClusterSplitProbabilityContainer>());
+ SG::WriteHandle<Trk::ClusterSplitProbabilityContainer> splitProbContainerHandle;
+ Trk::ClusterSplitProbabilityContainer *splitProbContainer;
+ if (!m_clusterSplitProbContainerOut.key().empty()) {
+ splitProbContainerHandle = SG::WriteHandle<Trk::ClusterSplitProbabilityContainer>( m_clusterSplitProbContainerOut, ctx);
+ if (splitProbContainerHandle.record(std::move(splitProbContainerCleanup)).isFailure()) {
+ ATH_MSG_FATAL( "Failed to record output cluster split probability container " << m_clusterSplitProbContainerOut.key());
+ }
+ splitProbContainer=splitProbContainerHandle.ptr();
+ }
+ else {
+ splitProbContainer=splitProbContainerCleanup.get();
+ }
+
ATH_MSG_VERBOSE ("Starting to solve tracks");
// now loop as long as map is not empty
while ( !trackScoreTrackMap.empty() ) {
@@ -154,7 +185,7 @@ Trk::TrackSelectionProcessorTool::solveTracks(TrackScoreMap &trackScoreTrackMap,
trackScoreTrackMap.erase(itnext);
ATH_MSG_VERBOSE ("--- Trying next track "<<atrack.track()<<"\t with score "<<-ascore);
std::unique_ptr<Trk::Track> cleanedTrack;
- const auto &[cleanedTrack_tmp, keepOriginal] = m_selectionTool->getCleanedOutTrack( atrack.track() , -(ascore), prdToTrackMap);
+ const auto &[cleanedTrack_tmp, keepOriginal] = m_selectionTool->getCleanedOutTrack( atrack.track() , -(ascore), *splitProbContainer, prdToTrackMap);
cleanedTrack.reset(cleanedTrack_tmp);
if (keepOriginal ){
// track can be kept as identical to the input track
@@ -163,7 +194,9 @@ Trk::TrackSelectionProcessorTool::solveTracks(TrackScoreMap &trackScoreTrackMap,
StatusCode sc = m_assoTool->addPRDs(prdToTrackMap,*atrack);
if (sc.isFailure()) ATH_MSG_ERROR( "addPRDs() failed" );
// add to output list
- result.push_back( const_cast<Track*>(atrack.track()) );
+ Track *track_view ATLAS_THREAD_SAFE = const_cast<Track*>(atrack.track()); // ok, becasue the destination container is just a view on elements stored in the input track collection.
+ result.push_back( track_view );
+
} else if ( !cleanedTrack ) {
// track should be discarded
ATH_MSG_DEBUG ("Track "<< atrack.track() << " doesn't meet the cuts of the AmbiTrack Selection tool");
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.h b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.h
index 229b3d322cd711aad1c84ae0b2ada4b6418d690c..934499414c1ec57dd737b9f5f49f66222d9ed65a 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.h
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackSelectionProcessorTool.h
@@ -14,6 +14,7 @@
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+#include "TrkEventUtils/ClusterSplitProbabilityContainer.h"
//need to include the following, since its a typedef and can't be forward declared.
#include "TrkTrack/TrackCollection.h"
@@ -107,6 +108,11 @@ namespace Trk {
SG::ReadHandleKey<Trk::PRDtoTrackMap> m_assoMapName
{this,"AssociationMapName",""}; ///< the key given to the newly created association map
+ SG::ReadHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerIn
+ {this, "InputClusterSplitProbabilityName", "",""};
+ SG::WriteHandleKey<Trk::ClusterSplitProbabilityContainer> m_clusterSplitProbContainerOut
+ {this, "OutputClusterSplitProbabilityName", "",""};
+
/** option to disable sorting based on track score and
use the ordering provided externally*/
bool m_disableSorting;
diff --git a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h
index 9bedd6c2317b65b5bc6af6add0e227814b25e0b8..3e17ff4712643611560ea4c8bbedafcb7662dfec 100755
--- a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h
+++ b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IAmbiTrackSelectionTool.h
@@ -10,7 +10,6 @@
#include "GaudiKernel/IAlgTool.h"
#include "TrkEventPrimitives/TrackScore.h"
-#include "CxxUtils/checker_macros.h"
#include <vector>
namespace Trk
@@ -18,7 +17,8 @@ namespace Trk
class Track;
class PrepRawData;
class PRDtoTrackMap;
-
+ class ClusterSplitProbabilityContainer;
+
/** @class Trk::IAmbiTrackSelectionTool
@brief Interface for building new tracks using information about shared and already associated hits.
@@ -31,20 +31,19 @@ namespace Trk
/** Performs cleaning of a track from already used hits.
@param track the input track to be checked and cleaned.
- @param prd_to_track_map a map to identify shared hits.
@param score the score tha twas given to the input track
+ @param prd_to_track_map a map to identify shared hits.
+ @param clusterSplitProbMap map which associates pixel cluster to cluster splitting probabilities.
@return tuple where the first element is a potiner to a new track or a nullptr and the second element is a flag which is set to false if the input track is to be rejected.
The second element of the returned tuple is false if the input input track is to be rejected.
The input track is rejected if it does not fulfil quality criteria or if a new cleaned track is created
replacing the input track. The second element of the returned tuple is true if the input track does not
reuire cleaning, fulfils the quality criteria and should be kept.
*/
- // Implementation in InDetDenseEnvAmbiTrackSelectionTool
- // is not thread-safe.
- virtual std::tuple<Trk::Track*,bool> getCleanedOutTrack ATLAS_NOT_THREAD_SAFE
- (const Trk::Track *track,
- const Trk::TrackScore score,
- Trk::PRDtoTrackMap &prd_to_track_map) const =0;
+ virtual std::tuple<Trk::Track*,bool> getCleanedOutTrack(const Trk::Track *track,
+ const Trk::TrackScore score,
+ Trk::ClusterSplitProbabilityContainer &splitProbContainer,
+ Trk::PRDtoTrackMap &prd_to_track_map) const =0;
};
} // end of namespace
diff --git a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IExtendedTrackSummaryTool.h b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IExtendedTrackSummaryTool.h
index da1c39a339ddbd99184aaab8bbcc8a3eca6c0f58..8837a91c0bf9404d094bb18ba1be45a95669fc87 100644
--- a/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IExtendedTrackSummaryTool.h
+++ b/Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IExtendedTrackSummaryTool.h
@@ -26,6 +26,7 @@ public:
static const InterfaceID& interfaceID();
using ITrackSummaryTool::summary;
+ using ITrackSummaryTool::updateTrackSummary;
using ITrackSummaryTool::summaryNoHoleSearch;
using ITrackSummaryTool::updateSharedHitCount;
using ITrackSummaryTool::updateAdditionalInfo;
@@ -56,6 +57,13 @@ public:
const Track& track,
const Trk::PRDtoTrackMap* prd_to_track_map) const = 0;
+ /** method which can be used to update the summary of a track.
+ * If a summary is present is modified in place
+ * otherwise a new one is created.
+ */
+ virtual void updateTrackSummary(Track& track,
+ const Trk::PRDtoTrackMap* prd_to_track_map,
+ bool suppress_hole_search = false) const = 0;
/* Start from a copy of the existing input track summary if there,
* otherwise start from a new one. Fill it and return it.
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool/TrackSummaryTool.h b/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool/TrackSummaryTool.h
index f0d51ac8888fb304c7294fea1abe5047e032abf4..9014d072681fbc27415650e88125137a5e25ac55 100755
--- a/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool/TrackSummaryTool.h
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool/TrackSummaryTool.h
@@ -50,7 +50,6 @@ class TrackSummaryTool : public extends<AthAlgTool, IExtendedTrackSummaryTool>
public:
TrackSummaryTool(const std::string&, const std::string&, const IInterface*);
virtual ~TrackSummaryTool();
-
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
@@ -78,10 +77,7 @@ public:
* Trk::PRDtoTrackMap
* Does hole search
*/
- virtual void updateTrack(Track& track) const override
- {
- computeAndReplaceTrackSummary(track,nullptr,false /*DO NOT suppress hole search*/);
- }
+ virtual void updateTrack(Track& track) const override;
/* Start from a copy of the existing input track summary if there,
* otherwise start from a new one. Fill it and return it.
@@ -120,47 +116,29 @@ public:
* If a summary is present it is modified in place.
* Otherwise a new one is created and filled.
*/
- virtual void updateTrackSummary(Track& track) const override
- {
- /*suppress hole search*/
- UpdateSummary(track, nullptr, true);
- /*Needed for expected B-Layer*/
- m_idTool->updateExpectedHitInfo(track, *track.trackSummary());
- }
-
-
+ virtual void updateTrackSummary(Track& track) const override;
+
+ /** method which can be used to update the summary of a track
+ * If a summary is present it is modified in place.
+ * Otherwise a new one is created and filled.
+ */
+ virtual void updateTrackSummary(
+ Track& track,
+ const Trk::PRDtoTrackMap* prd_to_track_map,
+ bool suppress_hole_search = false) const override;
+
/** method to update the shared hit content only, this is optimised for track
* collection merging. */
virtual void updateSharedHitCount(
Track& track,
- const Trk::PRDtoTrackMap* prd_to_track_map) const override
- {
- if (!track.trackSummary()) {
- computeAndReplaceTrackSummary(
- track, prd_to_track_map, false /*DO NOT suppress hole search*/);
- } else {
- updateSharedHitCount(track, prd_to_track_map, *track.trackSummary());
- }
- }
+ const Trk::PRDtoTrackMap* prd_to_track_map) const override;
/** method to update additional information (PID,shared hits, dEdX), this is
* optimised for track collection merging.
*/
virtual void updateAdditionalInfo(
Track& track,
- const Trk::PRDtoTrackMap* prd_to_track_map) const override
- {
- if (!track.trackSummary()) {
- computeAndReplaceTrackSummary(
- track, prd_to_track_map, false /*DO NOT suppress hole search*/);
- } else {
- updateAdditionalInfo(
- track,
- prd_to_track_map,
- *track.trackSummary(),
- true); // @TODO set to false; true for backward compatibility
- }
- }
+ const Trk::PRDtoTrackMap* prd_to_track_map) const override;
/** Update the shared hit count of the given track summary.
* @param summary the summary to be updated i.e. a copy of the track summary
@@ -179,15 +157,7 @@ public:
/** method to update the shared hit content only, this is optimised for track
* collection merging. */
- virtual void updateSharedHitCount(Track& track) const override
- {
- if (!track.trackSummary()) {
- computeAndReplaceTrackSummary(
- track, nullptr, false /*DO NOT suppress hole search*/);
- } else {
- updateSharedHitCount(track, nullptr, *track.trackSummary());
- }
- }
+ virtual void updateSharedHitCount(Track& track) const override;
/** Update the shared hit counts, expected hit, PID information and eventually
* the detailed track summaries.
@@ -204,27 +174,12 @@ public:
*/
virtual void updateAdditionalInfo(const Track& track,
const Trk::PRDtoTrackMap* prd_to_track_map,
- TrackSummary& summary) const override
- {
- updateAdditionalInfo(track, prd_to_track_map, summary, false);
- }
+ TrackSummary& summary) const override;
/** method to update additional information (PID,shared hits, dEdX), this is
* optimised for track collection merging.
*/
- virtual void updateAdditionalInfo(Track& track) const override
- {
- if (!track.trackSummary()) {
- computeAndReplaceTrackSummary(
- track, nullptr, false /*DO NOT suppress hole search*/);
- } else {
- updateAdditionalInfo(
- track,
- nullptr,
- *track.trackSummary(),
- true); // @TODO set to false; true for backward compatibility
- }
- }
+ virtual void updateAdditionalInfo(Track& track) const override;
private:
@@ -242,18 +197,8 @@ private:
*/
void UpdateSummary(Track& track,
const Trk::PRDtoTrackMap* prd_to_track_map,
- bool suppress_hole_search) const
- {
- if (!track.trackSummary()) {
- track.setTrackSummary(std::make_unique<Trk::TrackSummary>());
- }
- fillSummary(*(track.trackSummary()),
- track,
- prd_to_track_map,
- m_doHolesInDet && !suppress_hole_search,
- m_doHolesMuon && !suppress_hole_search);
- }
-
+ bool suppress_hole_search) const;
+
void updateAdditionalInfo(const Track& track,
const Trk::PRDtoTrackMap* prd_to_track_map,
TrackSummary& summary,
@@ -358,4 +303,6 @@ private:
};
}
+
+#include "TrkTrackSummaryTool/TrackSummaryTool.icc"
#endif
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool/TrackSummaryTool.icc b/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool/TrackSummaryTool.icc
new file mode 100644
index 0000000000000000000000000000000000000000..2323c82101e68cf6fa0e3a8b3c8f90fbe305e6cb
--- /dev/null
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/TrkTrackSummaryTool/TrackSummaryTool.icc
@@ -0,0 +1,108 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+namespace Trk {
+inline void
+TrackSummaryTool::updateTrack(Track& track) const
+{
+ computeAndReplaceTrackSummary(
+ track, nullptr, false /*DO NOT suppress hole search*/);
+}
+
+inline void
+TrackSummaryTool::updateTrackSummary(Track& track) const
+{
+ /*suppress hole search*/
+ UpdateSummary(track, nullptr, true);
+ /*Needed for expected B-Layer*/
+ m_idTool->updateExpectedHitInfo(track, *track.trackSummary());
+}
+
+inline void
+TrackSummaryTool::updateTrackSummary(Track& track,
+ const Trk::PRDtoTrackMap* prd_to_track_map,
+ bool suppress_hole_search) const
+{
+ UpdateSummary(track, prd_to_track_map, suppress_hole_search);
+}
+
+inline void
+TrackSummaryTool::updateSharedHitCount(
+ Track& track,
+ const Trk::PRDtoTrackMap* prd_to_track_map) const
+{
+ if (!track.trackSummary()) {
+ computeAndReplaceTrackSummary(
+ track, prd_to_track_map, false /*DO NOT suppress hole search*/);
+ } else {
+ updateSharedHitCount(track, prd_to_track_map, *track.trackSummary());
+ }
+}
+
+inline void
+TrackSummaryTool::updateAdditionalInfo(
+ Track& track,
+ const Trk::PRDtoTrackMap* prd_to_track_map) const
+{
+ if (!track.trackSummary()) {
+ computeAndReplaceTrackSummary(
+ track, prd_to_track_map, false /*DO NOT suppress hole search*/);
+ } else {
+ updateAdditionalInfo(
+ track,
+ prd_to_track_map,
+ *track.trackSummary(),
+ true); // @TODO set to false; true for backward compatibility
+ }
+}
+
+inline void
+TrackSummaryTool::updateSharedHitCount(Track& track) const
+{
+ if (!track.trackSummary()) {
+ computeAndReplaceTrackSummary(
+ track, nullptr, false /*DO NOT suppress hole search*/);
+ } else {
+ updateSharedHitCount(track, nullptr, *track.trackSummary());
+ }
+}
+
+inline void
+TrackSummaryTool::updateAdditionalInfo(
+ const Track& track,
+ const Trk::PRDtoTrackMap* prd_to_track_map,
+ TrackSummary& summary) const
+{
+ updateAdditionalInfo(track, prd_to_track_map, summary, false);
+}
+
+inline void
+TrackSummaryTool::updateAdditionalInfo(Track& track) const
+{
+ if (!track.trackSummary()) {
+ computeAndReplaceTrackSummary(
+ track, nullptr, false /*DO NOT suppress hole search*/);
+ } else {
+ updateAdditionalInfo(
+ track,
+ nullptr,
+ *track.trackSummary(),
+ true); // @TODO set to false; true for backward compatibility
+ }
+}
+inline void
+TrackSummaryTool::UpdateSummary(Track& track,
+ const Trk::PRDtoTrackMap* prd_to_track_map,
+ bool suppress_hole_search) const
+{
+ if (!track.trackSummary()) {
+ track.setTrackSummary(std::make_unique<Trk::TrackSummary>());
+ }
+ fillSummary(*(track.trackSummary()),
+ track,
+ prd_to_track_map,
+ m_doHolesInDet && !suppress_hole_search,
+ m_doHolesMuon && !suppress_hole_search);
+}
+}
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 88098c10d29d0452a608f082cd501f1d9248668d..189943c2024abd9b46b877cf9f442fef654edac3 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -237,8 +237,8 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
- spTool.RegSel_Pixel = makeRegSelTool_Pixel()
- spTool.RegSel_SCT = makeRegSelTool_SCT()
+ spTool.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ spTool.RegSelTool_SCT = makeRegSelTool_SCT()
ToolSvc += spTool
self.SpacePointProviderTool=spTool
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index 098c684fa716cdf0e98237c9e02791e997408c22..825d9743efe7bedbdf19cc0b5321ede88c99d423 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -379,17 +379,20 @@ namespace InDet {
}
StatusCode TrigFastTrackFinder::execute() {
+
auto ctx = getContext();
//RoI preparation/update
+
SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey, ctx);
+
ATH_CHECK(roiCollection.isValid());
- TrigRoiDescriptorCollection::const_iterator roi = roiCollection->begin();
- TrigRoiDescriptorCollection::const_iterator roiE = roiCollection->end();
+
TrigRoiDescriptor internalRoI;
- for (; roi != roiE; ++roi) {
- internalRoI.push_back(*roi);
- }
- internalRoI.manageConstituents(false);//Don't try to delete RoIs at the end
+
+ if ( roiCollection->size()>1 ) ATH_MSG_WARNING( "More than one Roi in the collection: " << m_roiCollectionKey << ", this is not supported - use a composite Roi" );
+ if ( roiCollection->size()>0 ) internalRoI = **roiCollection->begin();
+
+ // internalRoI.manageConstituents(false);//Don't try to delete RoIs at the end
m_countTotalRoI++;
SG::WriteHandle<TrackCollection> outputTracks(m_outputTracksKey, ctx);
@@ -582,7 +585,7 @@ StatusCode TrigFastTrackFinder::findTracks(InDet::SiTrackMakerEventData_xk &trac
for(unsigned int tripletIdx=0;tripletIdx!=triplets.size();tripletIdx++) {
- TrigInDetTriplet seed = triplets[tripletIdx];
+ const TrigInDetTriplet &seed = triplets[tripletIdx];
const Trk::SpacePoint* osp1 = seed.s1().offlineSpacePoint();
const Trk::SpacePoint* osp2 = seed.s2().offlineSpacePoint();
@@ -1275,8 +1278,7 @@ void TrigFastTrackFinder::makeSeedsOnGPU(const TrigCombinatorialSettings& tcs, c
const TrigSiSpacePointBase& SPi = vsp[pOutput->m_innerIndex[k]];
const TrigSiSpacePointBase& SPm = vsp[pOutput->m_middleIndex[k]];
const TrigSiSpacePointBase& SPo = vsp[pOutput->m_outerIndex[k]];
- TrigInDetTriplet t(SPi, SPm, SPo, pOutput->m_Q[k]);
- output.push_back(t);
+ output.emplace_back(SPi, SPm, SPo, pOutput->m_Q[k]);
}
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DummyUnseededAllTEAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DummyUnseededAllTEAlgo.h
index 75fdd950b6b19ad18dafa9343c66f4ada9ed02b1..a896f38fef37b2028875a713dcac1821bf1bddac 100755
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DummyUnseededAllTEAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DummyUnseededAllTEAlgo.h
@@ -23,9 +23,10 @@
#include <string>
#include "TrigInterfaces/AllTEAlgo.h"
+#include "IRegionSelector/IRegSelTool.h"
+#include "GaudiKernel/ToolHandle.h"
-class IRegSelSvc;
namespace HLT {
class TriggerElement;
@@ -64,8 +65,9 @@ namespace PESA
bool m_prefetchPIX;
bool m_prefetchSCT;
- std::string m_regionSelectorName;
- IRegSelSvc* m_regionSelector;
+ std::string m_regionSelectorName;
+ ToolHandle<IRegSelTool> m_regionSelector_pix { this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel" };
+ ToolHandle<IRegSelTool> m_regionSelector_sct { this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" };
};
} // end of namespace
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/SeededSuperRoiAllTEAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/SeededSuperRoiAllTEAlgo.h
index e92833f1941d5d004330a282835ce60d21e22653..05a841068725e9fae2d5a3cdbb651e7cb57427bc 100755
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/SeededSuperRoiAllTEAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/SeededSuperRoiAllTEAlgo.h
@@ -25,7 +25,6 @@
#include "TrigInterfaces/AllTEAlgo.h"
-class IRegSelSvc;
namespace HLT {
class TriggerElement;
@@ -69,10 +68,6 @@ namespace PESA
double m_etaHalfWidth;
double m_phiHalfWidth;
-
- std::string m_regionSelectorName;
- IRegSelSvc* m_regionSelector;
-
};
} // end of namespace
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/python/GenericDummyUnseededAllTEAlgoConfig.py b/Trigger/TrigAlgorithms/TrigGenericAlgs/python/GenericDummyUnseededAllTEAlgoConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..54131fc50a168fd7bb8fa0edc2e4033ba390f4d0
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/python/GenericDummyUnseededAllTEAlgoConfig.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+
+from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
+
+class GenericDummyUnseededAllTEAlgo( PESA__DummyUnseededAllTEAlgo ) :
+ __slots__ = []
+ def __init__(self, name="GenericAllTEAlgo" ) :
+ super ( GenericDummyUnseededAllTEAlgo, self ).__init__(name)
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
+
+ self.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ self.RegSelTool_SCT = makeRegSelTool_SCT()
+
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/python/__init__.py b/Trigger/TrigAlgorithms/TrigGenericAlgs/python/__init__.py
new file mode 100755
index 0000000000000000000000000000000000000000..21595c979074f05049bc1f15eaf2b46c7e5e271d
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/python/__init__.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+#needed for installation
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DummyUnseededAllTEAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DummyUnseededAllTEAlgo.cxx
index 63a53e922ed963d4120d8c673795cc0407e5a60b..a9518e6ba4b8d4bb5e71bdecc498595712def610 100755
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DummyUnseededAllTEAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DummyUnseededAllTEAlgo.cxx
@@ -5,7 +5,7 @@
#include "TrigGenericAlgs/DummyUnseededAllTEAlgo.h"
#include "TrigNavigation/TriggerElement.h"
-#include "IRegionSelector/IRegSelSvc.h"
+
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
@@ -13,15 +13,13 @@ using namespace PESA;
DummyUnseededAllTEAlgo::DummyUnseededAllTEAlgo(const std::string& name, ISvcLocator* pSvcLocator)
: HLT::AllTEAlgo(name, pSvcLocator),
- m_was_run(false),
- m_regionSelector(0)
+ m_was_run(false)
{
declareProperty("NumberOfOutputTEs", m_numberOfOutputTEs = 1, "configure the number of output TEs this algorithm will create");
declareProperty("createRoIDescriptors", m_createRoIDescriptors=true, "create RoI descriptors ate eta&phi == 0 if set true");
declareProperty("runOncePerEvent", m_runOncePerEvent=false, "run opnly once per event");
declareProperty("prefetchPIX", m_prefetchPIX=false, "register ROB requests for pixels");
declareProperty("prefetchSCT", m_prefetchSCT=false, "register ROB requests for SCT");
- declareProperty("RegionSelectorTool", m_regionSelectorName = "RegSelSvc", "instance of the RegionSelector service");
}
@@ -29,12 +27,15 @@ HLT::ErrorCode DummyUnseededAllTEAlgo::hltInitialize(){
m_was_run=false;
- if ( (serviceLocator()->service( m_regionSelectorName, m_regionSelector)).isFailure() ) {
- msg() << MSG::FATAL
- << "Unable to retrieve RegionSelector Service " << m_regionSelectorName << endmsg;
- return HLT::BAD_JOB_SETUP;
- };
-
+ if ( m_regionSelector_pix.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( m_regionSelector_pix.propertyName()
+ << m_regionSelector_pix.type() );
+ }
+ if ( m_regionSelector_sct.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( m_regionSelector_sct.propertyName()
+ << m_regionSelector_sct.type() );
+ }
+
return HLT::OK;
}
@@ -88,15 +89,23 @@ HLT::ErrorCode DummyUnseededAllTEAlgo::hltEndEvent() {
return HLT::OK;
}
-HLT::ErrorCode DummyUnseededAllTEAlgo::prepareRobRequests(const std::vector<HLT::TEConstVec>& /* inputTE */){
+HLT::ErrorCode DummyUnseededAllTEAlgo::prepareRobRequests(const std::vector<HLT::TEConstVec>& /* inputTE */) {
+
+ /// FIXME: this seems potentually problematic - this is dummy unseededAllTEAlgo, but will allways
+ /// request ALL pixel and SCT robs, which would suggest that this is ONLT for fullscan ID processing
+ /// if this is the case, it should be renamed DummyFullscanUnseededAllTEAlgo
+ ///
+ /// Additionally, could potentially cache these lists of robs, otherwise we are passing to and from
+ /// the same maximal lists for every event. This is not a const method, so this should even work
std::vector<unsigned int> uIntListOfRobs;
if (m_prefetchPIX){
- m_regionSelector->DetROBIDListUint( PIXEL, uIntListOfRobs);
+ m_regionSelector_pix->ROBIDList( RoiDescriptor(true), uIntListOfRobs );
}
+
if (m_prefetchSCT){
- m_regionSelector->DetROBIDListUint( SCT, uIntListOfRobs);
+ m_regionSelector_sct->ROBIDList( RoiDescriptor(true), uIntListOfRobs );
}
config()->robRequestInfo()->addRequestScheduledRobIDs(uIntListOfRobs);
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/SeededSuperRoiAllTEAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/SeededSuperRoiAllTEAlgo.cxx
index 027e31b9ff0f7d475a0df28ff09a1570c79913de..0981eb37e1064dd4236c423922641513fa348c96 100755
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/SeededSuperRoiAllTEAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/SeededSuperRoiAllTEAlgo.cxx
@@ -5,7 +5,6 @@
#include "TrigGenericAlgs/SeededSuperRoiAllTEAlgo.h"
#include "TrigNavigation/TriggerElement.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "CxxUtils/phihelper.h"
@@ -16,8 +15,7 @@ SeededSuperRoiAllTEAlgo::SeededSuperRoiAllTEAlgo(const std::string& name, ISvcLo
: HLT::AllTEAlgo(name, pSvcLocator),
m_runOncePerEvent(true),
m_was_run(false),
- m_useRoiSizes(true),
- m_regionSelector(0)
+ m_useRoiSizes(true)
{
declareProperty("NumberOfOutputTEs", m_numberOfOutputTEs = 1, "configure the number of output TEs this algorithm will create");
declareProperty("createRoIDescriptors", m_createRoIDescriptors=true, "create SuperRoi descriptor if set true");
@@ -27,7 +25,6 @@ SeededSuperRoiAllTEAlgo::SeededSuperRoiAllTEAlgo(const std::string& name, ISvcLo
declareProperty("UseRoiSizes", m_useRoiSizes=true, "User RoI sizes rather than width parameters");
declareProperty("EtaHalfWidth", m_etaHalfWidth=0.1, "RoI eta half width");
declareProperty("PhiHalfWidth", m_phiHalfWidth=0.1, "RoI phi half width");
- declareProperty("RegionSelectorTool", m_regionSelectorName = "RegSelSvc", "instance of the RegionSelector service");
}
@@ -35,12 +32,6 @@ HLT::ErrorCode SeededSuperRoiAllTEAlgo::hltInitialize(){
m_was_run=false;
- if ( (serviceLocator()->service( m_regionSelectorName, m_regionSelector)).isFailure() ) {
- msg() << MSG::FATAL
- << "Unable to retrieve RegionSelector Service " << m_regionSelectorName << endmsg;
- return HLT::BAD_JOB_SETUP;
- };
-
return HLT::OK;
}
@@ -159,16 +150,6 @@ HLT::ErrorCode SeededSuperRoiAllTEAlgo::hltEndEvent() {
HLT::ErrorCode SeededSuperRoiAllTEAlgo::prepareRobRequests(const std::vector<HLT::TEConstVec>& /* inputTE */){
- std::vector<unsigned int> uIntListOfRobs;
-
- if (m_prefetchPIX){
- m_regionSelector->DetROBIDListUint( PIXEL, uIntListOfRobs);
- }
- if (m_prefetchSCT){
- m_regionSelector->DetROBIDListUint( SCT, uIntListOfRobs);
- }
-
- config()->robRequestInfo()->addRequestScheduledRobIDs(uIntListOfRobs);
return HLT::OK;
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
index 28850a51337721e4ee0fe49b56bb0f7894893fd3..29e30c2672b28bdc7636a67a924820c017c697ec 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
@@ -9,7 +9,7 @@
#include "RoiDescriptor/RoiDescriptor.h"
#include "IRegionSelector/RoiUtil.h"
#include "IRegionSelector/IRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
namespace PESA
{
@@ -20,7 +20,6 @@ namespace PESA
m_etaHalfWidth(0.),
m_phiHalfWidth(0.),
m_zHalfWidth(0.),
- m_regionSelector("RegSelSvc", name),
m_requestPIXRobs(true),
m_requestSCTRobs(true),
m_monitorDuplicateRoIs(true),
@@ -29,7 +28,6 @@ namespace PESA
{
declareProperty("EtaHalfWidth", m_etaHalfWidth);
declareProperty("PhiHalfWidth", m_phiHalfWidth);
- declareProperty("RegionSelectorTool", m_regionSelector);
declareProperty("RequestPIXRobs", m_requestPIXRobs);
declareProperty("RequestSCTRobs", m_requestSCTRobs);
declareProperty("MonitorDuplicateRoIs", m_monitorDuplicateRoIs);
@@ -73,10 +71,19 @@ namespace PESA
}
// Retrieving Region Selector Tool:
- if ( (m_requestPIXRobs || m_requestSCTRobs) && m_regionSelector.retrieve().isFailure() ) {
- ATH_MSG_FATAL( m_regionSelector.propertyName()
+ if ( m_requestPIXRobs && m_regionSelector_pix.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( m_regionSelector_pix.propertyName()
<< " : Unable to retrieve RegionSelector tool "
- << m_regionSelector.type() );
+ << m_regionSelector_pix.type() );
+ return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
+ }
+
+
+ // Retrieving Region Selector Tool:
+ if ( m_requestSCTRobs && m_regionSelector_sct.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( m_regionSelector_sct.propertyName()
+ << " : Unable to retrieve RegionSelector tool "
+ << m_regionSelector_sct.type() );
return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
}
@@ -258,7 +265,7 @@ namespace PESA
std::vector<unsigned int> uIntListOfRobs;
if (m_requestPIXRobs) {
- m_regionSelector->DetROBIDListUint( PIXEL, *roi, uIntListOfRobs );
+ m_regionSelector_pix->ROBIDList( *roi, uIntListOfRobs );
ATH_MSG_DEBUG( "list of ROBs ID in PIX: " );
for(uint i_lid(0); i_lid<uIntListOfRobs.size(); i_lid++)
@@ -269,7 +276,7 @@ namespace PESA
}
if (m_requestSCTRobs){
- m_regionSelector->DetROBIDListUint( SCT, *roi, uIntListOfRobs );
+ m_regionSelector_sct->ROBIDList( *roi, uIntListOfRobs );
ATH_MSG_DEBUG( "list of ROBs ID in SCT: " );
for(uint i_lid(0); i_lid<uIntListOfRobs.size(); i_lid++)
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h
index d24dd472f1a2f3f55a2c50f7a072cdf319343266..1a9a58433db54d66bbad14de251674f5f9fb31e0 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h
@@ -22,8 +22,8 @@
//!< Trigger specific stuff
#include "TrigInterfaces/FexAlgo.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
+#include "IRegionSelector/IRegSelTool.h"
-class IRegSelSvc;
namespace PESA
@@ -47,7 +47,9 @@ namespace PESA
float m_zHalfWidth;
//ROB prefetching
- ServiceHandle<IRegSelSvc> m_regionSelector;
+ ToolHandle<IRegSelTool> m_regionSelector_pix { this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel" };
+ ToolHandle<IRegSelTool> m_regionSelector_sct { this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" };
+
//!< region selector service
bool m_requestPIXRobs;
bool m_requestSCTRobs;
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetTLASelector.h b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetTLASelector.h
new file mode 100644
index 0000000000000000000000000000000000000000..01a4e3d416ffb90a1f6f6400a1535e78cba6d760
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTJetTLASelector.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+/**
+ * @class TrigHLTJetTLASelector
+ * @brief Algorithm to select jets from the TLA/scouting stream
+ * and store them in a vector of jets to be passed on
+ * @author Antonio Boveia
+ * @author Caterina Doglioni
+**/
+
+#ifndef TRIGHLTJETTLASELECTOR_H
+#define TRIGHLTJETTLASELECTOR_H
+
+#include "Gaudi/Property.h"
+#include "xAODJet/JetContainer.h"
+#include "xAODJet/JetAuxContainer.h"
+#include "xAODJet/Jet.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/WriteHandleKey.h"
+
+class TrigHLTJetTLASelector
+: public AthReentrantAlgorithm
+{
+ public:
+ TrigHLTJetTLASelector (const std::string& name, ISvcLocator* svcLocator);
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
+
+ private:
+ // Declare the keys used to access the data: one for reading and one
+ // for writing. This initializer list syntax also informs the scheduler of the
+ // data dependency, obviating the need for a separate declareProperty(...)
+
+ SG::ReadHandleKey< xAOD::JetContainer > m_inputJetsKey {
+ this, "TLAInputJetCollection", "HLT_xAOD__JetContainer_a4tcemsubjesISFS", "input jet container key"};
+ SG::WriteHandleKey< xAOD::JetContainer > m_outputJetsKey {
+ this, "TLAOutputJetCollection", "HLT_TrigHLTJetTLASelectorCollection", "output jet container key"};
+
+ Gaudi::Property<float> m_jetPtThreshold {this, "jetPtThreshold", 0. , "Threshold for saving jets in TLA container"};
+ Gaudi::Property<int> m_maxNJets {this, "maxNJets", -1 , "Maximum number of jets saved in TLA container"};
+
+};
+
+#endif
+
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetTLASelector.py b/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetTLASelector.py
new file mode 100644
index 0000000000000000000000000000000000000000..47a551ae1dd3ce29878a3693a405a05247b8e910
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetTLASelector.py
@@ -0,0 +1,28 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+# Import message level flags.
+from GaudiKernel.Constants import WARNING
+# (VERBOSE,
+# DEBUG,
+# INFO,
+# WARNING,
+# ERROR,
+# FATAL,)
+
+def getConfiguredTLASelector(jetPtThreshold=20000, maxNJets=-1, inputJetsKey="HLT_xAOD__JetContainer_a4tcemsubjesISFS", outputJetsKey="HLT_xAOD__JetContainer_a4tcemsubjesISFS_TLA", outputLevel=WARNING) :
+
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
+ from TrigEDMConfig.TriggerEDMRun3 import recordable
+
+ myTrigHLTJetTLASelector = conf2toConfigurable( CompFactory.TrigHLTJetTLASelector() )
+ myTrigHLTJetTLASelector.jetPtThreshold = jetPtThreshold
+ myTrigHLTJetTLASelector.maxNJets = maxNJets
+ #check that the collection is suitable:
+ outputJetsName = recordable(outputJetsKey)
+ myTrigHLTJetTLASelector.TLAInputJetCollection = inputJetsKey
+ myTrigHLTJetTLASelector.TLAOutputJetCollection = outputJetsName
+ myTrigHLTJetTLASelector.OutputLevel = outputLevel
+
+ return myTrigHLTJetTLASelector
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetTLASelector.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetTLASelector.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..54fcc32b654d0aaabae500099e3aa41b12ad1d29
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetTLASelector.cxx
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+#include "TrigHLTJetRec/TrigHLTJetTLASelector.h"
+#include "xAODBase/IParticleHelpers.h"
+
+
+//Helper functions
+struct DescendingEt{
+
+ bool operator()(const xAOD::Jet* l, const xAOD::Jet* r) const {
+ return l->p4().Et() > r->p4().Et();
+ }
+
+};
+
+struct HasPtAboveThreshold {
+
+ HasPtAboveThreshold(double thresholdPt) : thresholdPt(thresholdPt) {}
+ double thresholdPt;
+
+ bool operator()(const xAOD::Jet* myjet) const {
+ return myjet->p4().Pt() > thresholdPt;
+ }
+
+};
+
+//class members
+
+ TrigHLTJetTLASelector::TrigHLTJetTLASelector (const std::string& name, ISvcLocator* svcLocator)
+: AthReentrantAlgorithm (name, svcLocator)
+{
+
+}
+
+
+StatusCode TrigHLTJetTLASelector::initialize()
+{
+ // This function will check that the properties were initialized properly
+ // by job configuration.
+
+ ATH_MSG_DEBUG("Initializing " << name() << "...");
+
+ ATH_MSG_DEBUG("pT threshold for output jet collection: " << (float) m_jetPtThreshold );
+ ATH_MSG_DEBUG("Maximum number of jets kept " << (int) m_maxNJets );
+
+ //check that the handlers are correctly initialized
+ CHECK( m_inputJetsKey.initialize() );
+ CHECK( m_outputJetsKey.initialize() );
+
+ if (m_maxNJets == 0) {
+ ATH_MSG_ERROR("This algorithm will keep no jets (m_maxNJets property <=0), so it should not be running at all.");
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode TrigHLTJetTLASelector::execute (const EventContext& ctx) const
+{
+
+ ATH_MSG_DEBUG("Executing " << name() << ".");
+
+ //get jets
+ auto h_inJets = SG::makeHandle(m_inputJetsKey, ctx );
+ auto h_outJets = SG::makeHandle(m_outputJetsKey, ctx );
+ ATH_MSG_DEBUG("Retrieving jets from: " << h_inJets.key());
+ ATH_MSG_DEBUG("Placing jets in: " << h_outJets.key());
+ ATH_CHECK(h_inJets.isValid());
+ const xAOD::JetContainer* inputJets = h_inJets.get();
+ std::vector<const xAOD::Jet*> originalJets(inputJets->begin(), inputJets->end());
+
+ // define the maximum number of jets we care about: either equivalent to m_maxNJets if smaller than size of vector, or keep all jets (in case of negative value)
+ std::vector<const xAOD::Jet*>::iterator it_maxJetBound;
+
+ if ((int)m_maxNJets > 0) it_maxJetBound = m_maxNJets < int(originalJets.size()) ? originalJets.begin()+m_maxNJets : originalJets.end();
+ else it_maxJetBound = originalJets.end();
+
+ // check the sort order of the input container is ok
+ // use a partial sort to save some time
+ std::partial_sort (originalJets.begin(), it_maxJetBound, originalJets.end(), DescendingEt());
+
+ // get an iterator to the last element above the pT threshold (because we ordered the jets, this is the last jet we want)
+ std::vector<const xAOD::Jet*>::iterator it_ptThresholdBound;
+ it_ptThresholdBound = std::partition(originalJets.begin(), it_maxJetBound, HasPtAboveThreshold((float)m_jetPtThreshold));
+
+ //make the output jet container
+ ATH_CHECK( h_outJets.record (std::make_unique<xAOD::JetContainer>(),
+ std::make_unique<xAOD::JetAuxContainer>() ) );
+
+
+ //loop on all the jets from the beginning to the last jet we want, and put them the output jet collection
+ //also, set a link to their parent jet
+ for( auto it_jet=originalJets.begin(); it_jet!=it_ptThresholdBound; ++it_jet ) {
+ xAOD::Jet* copiedJet = new xAOD::Jet(*(*it_jet));
+
+ ATH_CHECK(setOriginalObjectLink(*(*it_jet),*copiedJet));
+
+ h_outJets->push_back(copiedJet);
+ }
+
+ for (const xAOD::Jet* jet : *h_outJets) {
+ ATH_MSG_DEBUG("Jet pT: " << jet->pt());
+ }
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
index b07dae3b28f8f95757f120b4df5a0c7aa7e8330b..8953293e7013cccb6f0c1f3632434d40cf64f0ee 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
@@ -28,6 +28,7 @@
#include "TrigHLTJetRec/EMTopoRejectionTool.h"
#include "TrigHLTJetRec/PFlowRejectionTool.h"
#include "TrigHLTJetRec/NonPositiveEnergyRejectionTool.h"
+#include "TrigHLTJetRec/TrigHLTJetTLASelector.h"
DECLARE_COMPONENT(IParticleNullRejectionTool)
DECLARE_COMPONENT(IParticlePtEtaRejectionTool)
@@ -61,3 +62,6 @@ DECLARE_COMPONENT( TrigJetFromPseudojet )
DECLARE_COMPONENT( TriggerJetBuildTool )
DECLARE_COMPONENT( TriggerJetGroomerTool )
+
+DECLARE_COMPONENT( TrigHLTJetTLASelector )
+
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt
index f937005ae5faf71f59b9b0203e7279f12f9f3e39..4913e6602b6edf101cb250b6fbdc3cab5de7fe86 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt
@@ -12,7 +12,7 @@ atlas_add_component( TrigMuonEF
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib CaloEvent CscClusterizationLib CxxUtils EventPrimitives FourMomUtils GaudiKernel IRegionSelector InDetTrackSelectionToolLib MuidInterfaces MuonCnvToolInterfacesLib MuonCombinedEvent MuonCombinedToolInterfaces MuonIdHelpersLib MuonPattern MuonPrepRawData MuonRIO_OnTrack MuonReadoutGeometry MuonRecToolInterfaces MuonSegment MuonSegmentCombinerToolInterfaces MuonSegmentMakerToolInterfaces Particle RecoToolInterfaces StoreGateLib TrigCompositeUtilsLib TrigConfHLTData TrigInDetEvent TrigInterfacesLib TrigMuonEvent TrigMuonToolInterfaces TrigNavigationLib TrigParticle TrigSteeringEvent TrigTimeAlgsLib TrkEventPrimitives TrkParameters TrkSegment TrkToolInterfaces TrkTrack TrkTrackSummary xAODCaloEvent xAODMuon xAODTracking xAODTrigMuon )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib CaloEvent CscClusterizationLib CxxUtils EventPrimitives FourMomUtils GaudiKernel IRegionSelector InDetTrackSelectionToolLib MuidInterfaces MuonCablingData MuonCnvToolInterfacesLib MuonCombinedEvent MuonCombinedToolInterfaces MuonIdHelpersLib MuonPattern MuonPrepRawData MuonRIO_OnTrack MuonReadoutGeometry MuonRecToolInterfaces MuonSegment MuonSegmentCombinerToolInterfaces MuonSegmentMakerToolInterfaces Particle RecoToolInterfaces RPC_CondCablingLib StoreGateLib TrigCompositeUtilsLib TrigConfHLTData TrigInDetEvent TrigInterfacesLib TrigMuonEvent TrigMuonToolInterfaces TrigNavigationLib TrigParticle TrigSteeringEvent TrigTimeAlgsLib TrkEventPrimitives TrkParameters TrkSegment TrkToolInterfaces TrkTrack TrkTrackSummary xAODCaloEvent xAODMuon xAODTracking xAODTrigMuon )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
index e5701f82322b3dde68b7a544659a620ac1113a08..b60697b17d69ae8aa4a71bde92b952a985c81c79 100755
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
@@ -363,6 +363,8 @@ def TMEF_MuonCreatorTool(name="TMEF_MuonCreatorTool",**kwargs):
from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool
pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
kwargs.setdefault("ParticleCaloExtensionTool", pcExtensionTool)
+ #Should be safe as the dynamic alignment is only for data
+ kwargs.setdefault("ParticleCaloExtensionToolID", pcExtensionTool)
kwargs.setdefault('TrackParticleCreator','TMEF_TrkToTrackParticleConvTool')
kwargs.setdefault("AmbiguityProcessor", CfgGetter.getPublicTool('TrigMuonAmbiProcessor'))
kwargs.setdefault('MakeTrackAtMSLink',True)
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.cxx b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.cxx
index f8ce12efabcffa6389dccc566bdab6e296981df3..0b79de7ca0b627837c690dedce43cda3a708e894 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.cxx
@@ -486,6 +486,8 @@ StatusCode TrigMuonEFStandaloneTrackTool::initialize()
ATH_CHECK(m_cscClustersKey.initialize());
//segment overlap removal
ATH_CHECK( m_segmentOverlapRemovalTool.retrieve() );
+ ATH_CHECK(m_mdtCablingKey.initialize());
+ ATH_CHECK(m_rpcCablingKey.initialize());
return StatusCode::SUCCESS;
}
@@ -902,6 +904,18 @@ if (m_useMdtData>0) {
}
if (m_rpcPrepDataProvider->decode( getRpcRobList(muonRoI) ).isSuccess()) {
ATH_MSG_DEBUG("ROB-based seeded PRD decoding of RPC done successfully");
+ SG::ReadCondHandle<RpcCablingCondData> rpcCableHandle{m_rpcCablingKey};
+ const RpcCablingCondData* rpcCabling{*rpcCableHandle};
+ if(!rpcCabling){
+ ATH_MSG_ERROR("nullptr to the read rpc cabling conditions object");
+ return HLT::NAV_ERROR;
+ }
+ rpc_hash_ids.clear();
+ if(rpcCabling->giveRDO_fromROB(m_RpcRobList, rpc_hash_ids).isFailure()){
+ ATH_MSG_ERROR("could not convert RPC robs to hash ID vector");
+ return HLT::NAV_ERROR;
+ }
+
} else {
ATH_MSG_WARNING("ROB-based seeded PRD decoding of RPC failed");
}
@@ -941,6 +955,13 @@ if (m_useMdtData>0) {
}
if (m_mdtPrepDataProvider->decode( getMdtRobList(muonRoI) ).isSuccess()) {
ATH_MSG_DEBUG("ROB-based seeded decoding of MDT done successfully");
+ SG::ReadCondHandle<MuonMDT_CablingMap> mdtCableHandle{m_mdtCablingKey};
+ const MuonMDT_CablingMap* mdtCabling{*mdtCableHandle};
+ if(!mdtCabling){
+ ATH_MSG_ERROR("nullptr to the read mdt cabling conditions object");
+ return HLT::NAV_ERROR;
+ }
+ mdt_hash_ids = mdtCabling->getChamberHashVec(m_MdtRobList);
} else {
ATH_MSG_WARNING("ROB-based seeded decoding of MDT failed");
}
@@ -1170,7 +1191,7 @@ if (m_useMdtData>0) {
// Get MDT container
if (m_useMdtData && !mdt_hash_ids.empty()) {
-
+
const MdtPrepDataContainer* mdtPrds = 0;
SG::ReadHandle<Muon::MdtPrepDataContainer> MdtCont(m_mdtKey);
if( !MdtCont.isValid() ) {
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.h b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.h
index 0e894020396983aedd82c1ff0631cdd66c21f0bd..b883e5b20081042d5ba1cfa135bf71beab12bb4b 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.h
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFStandaloneTrackTool.h
@@ -35,6 +35,8 @@
#include "xAODTracking/TrackParticleAuxContainer.h"
#include "MuonCombinedEvent/MuonCandidateCollection.h"
#include <fstream>
+#include "MuonCablingData/MuonMDT_CablingMap.h"
+#include "RPC_CondCabling/RpcCablingCondData.h"
#include "MuonSegmentMakerToolInterfaces/IMuonSegmentOverlapRemovalTool.h"
#include "CxxUtils/checker_macros.h"
@@ -383,6 +385,8 @@ class TrigMuonEFStandaloneTrackTool : public AthAlgTool,
bool m_ignoreCSC;
ToolHandle<Muon::IMuonSegmentOverlapRemovalTool> m_segmentOverlapRemovalTool;
+ SG::ReadCondHandleKey<MuonMDT_CablingMap> m_mdtCablingKey{this, "MdtCablingKey", "MuonMDT_CablingMap", "Key of MuonMDT_CablingMap"};
+ SG::ReadCondHandleKey<RpcCablingCondData> m_rpcCablingKey{this, "RpcCablingKey", "RpcCablingCondData", "Key of RpcCablingCondData"};
};
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx
index 5823bcb2dd20a7c13b242f2549b89ad0e7fcc17e..5a5b19a347d7cde6caa00881195a9d472195b155 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.cxx
@@ -25,10 +25,8 @@ StatusCode RoIPEBInfoWriterTool::initialize() {
ATH_MSG_DEBUG("Extra PEBInfo attached to every passed event: " << m_extraPebInfo);
// Ugly solution - need to translate strings into enums. Wouldn't be needed if DETID enum was accessible from python.
+
const std::unordered_map<std::string_view,DETID> detNameDict = {
- {"PIXEL", DETID::PIXEL},
- {"SCT", DETID::SCT},
- {"TRT", DETID::TRT},
{"LAR", DETID::LAR},
{"TTEM", DETID::TTEM},
{"TTHEC", DETID::TTHEC},
@@ -43,18 +41,35 @@ StatusCode RoIPEBInfoWriterTool::initialize() {
{"MM", DETID::MM},
{"STGC", DETID::STGC},
};
+
+ const std::unordered_map< std::string_view, ToolHandle<IRegSelTool> > detTools = {
+ { "PIXEL", m_regionSelector_pix },
+ { "SCT", m_regionSelector_sct },
+ { "TRT", m_regionSelector_trt }
+ };
+
for (std::string_view name : m_detNames) {
if (name=="All") {
for (const auto& p : detNameDict) m_dets.insert(p.second);
+ for (const auto& p : detTools) m_tools.insert(p.second);
break;
}
- const auto it = detNameDict.find(name);
- if (it==detNameDict.cend()) {
- ATH_MSG_ERROR("The detector name " << name << " cannot be translated into RegSelEnum DETID");
- return StatusCode::FAILURE;
+
+ const auto itt = detTools.find(name);
+ if ( itt!=detTools.cend() ) {
+ ATH_MSG_DEBUG("The detector name " << name << " being inserted from the RegSelTools database");
+ m_tools.insert(itt->second);
+ }
+ else {
+ ATH_MSG_DEBUG("The detector name " << name << " not in the RegSelTools database - trying RegSelEnum database");
+ const auto it = detNameDict.find(name);
+ if (it==detNameDict.cend()) {
+ ATH_MSG_ERROR("The detector name " << name << " cannot be translated into RegSelEnum DETID");
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG("Adding " << name << "=" << it->second << " to detector list");
+ m_dets.insert(it->second);
}
- ATH_MSG_DEBUG("Adding " << name << "=" << it->second << " to detector list");
- m_dets.insert(it->second);
}
return StatusCode::SUCCESS;
@@ -86,6 +101,12 @@ PEBInfoWriterToolBase::PEBInfo RoIPEBInfoWriterTool::createPEBInfo(const PEBInfo
TrigRoiDescriptor roiForPEB(eta, etaMin, etaMax, phi, phiMin, phiMax);
+ for ( auto tool : m_tools ) {
+ std::vector<uint32_t> detROBs;
+ tool->ROBIDList( roiForPEB, detROBs);
+ pebi.robs.insert(detROBs.begin(),detROBs.end());
+ }
+
for (const DETID detid : m_dets) {
std::vector<uint32_t> detROBs;
m_regionSelector->DetROBIDListUint(detid, roiForPEB, detROBs);
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h
index 253c420d906b1cafb5bbbc9517b84409609cbeb5..f1f893825978b832843fea07cc663b44ccd89666 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/src/RoIPEBInfoWriterTool.h
@@ -8,6 +8,7 @@
#include "TrigPartialEventBuilding/PEBInfoWriterToolBase.h"
#include "IRegionSelector/RegSelEnums.h"
#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRegSelTool.h"
/** @class RoIPEBInfoWriterTool
* @brief Tool writing ROB list corresponding to an RoI in given detectors for use in PEBInfoWriterAlg
@@ -31,6 +32,20 @@ private:
this, "RegionSelector", "RegSelSvc/RegSelSvc", "Region Selector service"
};
+ ToolHandle<IRegSelTool> m_regionSelector_pix {
+ this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel", "Region Selector Tool"
+ };
+
+ ToolHandle<IRegSelTool> m_regionSelector_sct {
+ this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT", "Region Selector Tool"
+ };
+
+ ToolHandle<IRegSelTool> m_regionSelector_trt {
+ this, "RegSelTool_TRT", "RegSelTool/RegSelTool_TRT", "Region Selector Tool"
+ };
+
+
+
// ------------------------- Properties --------------------------------------
Gaudi::Property<float> m_etaEdge {
this, "EtaEdge", 5.0, "Upper limit of |eta| range"
@@ -58,7 +73,9 @@ private:
/// Static PEB Info which contains ExtraROBs and ExtraSubDets
PEBInfoWriterToolBase::PEBInfo m_extraPebInfo;
/// m_detNames translated into set of DETID, filled at initialisation
- std::set<DETID> m_dets;
+ std::set<DETID> m_dets;
+ std::set<ToolHandle<IRegSelTool> > m_tools;
+
};
#endif // TrigPartialEventBuilding_RoIPEBInfoWriterTool_h
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
index b5617482676d9e88c8b89ba4d8f878505e73575e..e4353a7b87ddac23a8a1effa845b2de1a9170e4d 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package( tdaq-common )
atlas_add_component( TrigT2MinBias
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthViews AthenaBaseComps AthenaMonitoringKernelLib CaloEvent CaloIdentifier DecisionHandlingLib GaudiKernel IRegionSelector InDetIdentifier InDetPrepRawData InDetRawData StoreGateLib TileByteStreamLib TileConditionsLib TileEvent TileIdentifier TrigCaloEvent TrigCompositeUtilsLib TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigSteeringEvent TrigT2CaloCommonLib TrigTimeAlgsLib TrkSpacePoint ZdcConditions ZdcEvent ZdcIdentifier xAODEventInfo xAODTrigMinBias xAODTrigger )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthViews AthenaBaseComps AthenaMonitoringKernelLib CaloEvent CaloIdentifier DecisionHandlingLib GaudiKernel IRegionSelector RoiDescriptor InDetIdentifier InDetPrepRawData InDetRawData StoreGateLib TileByteStreamLib TileConditionsLib TileEvent TileIdentifier TrigCaloEvent TrigCompositeUtilsLib TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigSteeringEvent TrigT2CaloCommonLib TrigTimeAlgsLib TrkSpacePoint ZdcConditions ZdcEvent ZdcIdentifier xAODEventInfo xAODTrigMinBias xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
index f72969c45a86fb1bd02add9fa56b466876be15a0..9a628e21429834a936766b9d61f346a399c986e6 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
@@ -416,6 +416,12 @@ class MbSpFex ( TrigCountSpacePoints ) :
self.PixelClusSizeMin = trigT2MinBiasProperties.pixelClusSizeMin()
self.PixelClusSizeMax = trigT2MinBiasProperties.pixelClusSizeMax()
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
+
+ self.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ self.RegSelTool_SCT = makeRegSelTool_SCT()
+
#self.SpacePointProviderTool = ospTool
time = TrigTimeHistToolConfig("MbSpFexTimers")
time.NumberOfHistBins = 100
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx
index d2f9b4e4f8eb3a122e1eea0b2c0800f5c0010cfa..92992e33897e11d2c7b0b14876a2fb12564dd602 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/T2ZdcFex.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "T2ZdcFex.h"
@@ -194,7 +194,6 @@ HLT::ErrorCode T2ZdcFex::hltInitialize() {
}
m_zdcID = zdcID;
- ZdcCablingService::getInstance()->setZdcID(m_zdcID);
// Create timers
if(timerSvc()) {
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx
index d5ffe2de28917be59ae8cb46ea004f6631204bfb..e0a280de66a643ac046dd9f7595d16d6687fc578 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx
@@ -12,7 +12,8 @@
#include "InDetIdentifier/SCT_ID.h"
#include "InDetIdentifier/PixelID.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "RoiDescriptor/RoiDescriptor.h"
+#include "IRegionSelector/IRegSelTool.h"
#include "InDetPrepRawData/SiClusterContainer.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
@@ -33,7 +34,6 @@
TrigCountSpacePoints::TrigCountSpacePoints(const std::string& name, ISvcLocator* pSvcLocator)
: HLT::AllTEAlgo(name, pSvcLocator),
m_hltExecuteInitialisationRun(kFALSE),
- m_regionSelector("RegSelSvc", name),
m_doPixelSp(true),
m_doSctSp(true),
m_doOnlyBLayer(false),
@@ -55,7 +55,6 @@ TrigCountSpacePoints::TrigCountSpacePoints(const std::string& name, ISvcLocator*
declareProperty( "PixelSP_ContainerName", m_pixelSpName = "PixelTrigSpacePoints" );
declareProperty( "SCT_SP_ContainerName", m_sctSpName = "SCT_TrigSpacePoints" );
- declareProperty("RegionSelectorTool", m_regionSelector);
declareProperty( "ReadPixelSp", m_doPixelSp = true );
declareProperty( "ReadSctSp", m_doSctSp = true );
declareProperty( "OnlyCountBLayer", m_doOnlyBLayer = false );
@@ -171,8 +170,15 @@ HLT::ErrorCode TrigCountSpacePoints::hltInitialize() {
ATH_MSG_DEBUG("Initialize this TrigCountSpacePoints: " << name());
// Retrieving Region Selector Tool
- if ( m_regionSelector.retrieve().isFailure() ) {
- ATH_MSG_FATAL("Unable to retrieve RegionSelector tool " << m_regionSelector.type());
+ if ( m_regionSelector_pix.retrieve().isFailure() ) {
+ ATH_MSG_FATAL("Unable to retrieve RegionSelector tool " << m_regionSelector_pix.type());
+ return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
+ }
+
+
+ // Retrieving Region Selector Tool
+ if ( m_regionSelector_sct.retrieve().isFailure() ) {
+ ATH_MSG_FATAL("Unable to retrieve RegionSelector tool " << m_regionSelector_sct.type());
return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
}
@@ -392,7 +398,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri
//sc = StatusCode::FAILURE;
}
- m_regionSelector->DetHashIDList(PIXEL, m_listOfPixIds );
+ m_regionSelector_pix->HashIDList( RoiDescriptor(true), m_listOfPixIds );
m_pixListSize = m_listOfPixIds.size();//.....................................................................
if( m_pixListSize != 0 ){
@@ -612,7 +618,7 @@ HLT::ErrorCode TrigCountSpacePoints::hltExecute(std::vector<std::vector<HLT::Tri
}
- m_regionSelector->DetHashIDList(SCT, m_listOfSctIds );
+ m_regionSelector_sct->HashIDList( RoiDescriptor(true), m_listOfSctIds );
m_sctListSize = m_listOfSctIds.size();
if( m_sctListSize !=0 ){
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h
index e1ae048b3b8edca80a87b9926bee56c4f2deddfa..2e6ab53235a508858e1b74a5c251cef5996c3766 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h
@@ -11,11 +11,12 @@
#include "xAODTrigMinBias/TrigSpacePointCounts.h"
#include "xAODTrigMinBias/TrigHisto2D.h"
+#include "IRegionSelector/IRegSelTool.h"
class SCT_ID;
class PixelID;
class TrigSpacePointCounts;
-class IRegSelSvc;
+
/** @class TrigCountSpacePoints
@@ -47,7 +48,8 @@ class TrigCountSpacePoints: public HLT::AllTEAlgo {
HLT::ErrorCode checkDetectorMask();
Bool_t m_hltExecuteInitialisationRun; //!< Flag to run extra initialisation on the first event when xAOD::EventInfo is present
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector_pix{ this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel" }; //!< region selector service
+ ToolHandle<IRegSelTool> m_regionSelector_sct{ this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" }; //!< region selector service
bool m_doPixelSp; //!< Flag to switch on or off Pixel space point retrieval
bool m_doSctSp; //!< Flag to switch on or off SCT space point retrieval
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py
index 322a14c5c333671cbbbdafd80668ddd9babb9e44..551d1853df1860e15f6f9708e7205047783043e2 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauAlgorithmsHolder.py
@@ -364,7 +364,6 @@ def getTauVertexVariables():
from tauRecTools.tauRecToolsConf import TauVertexVariables
TauVertexVariables = TauVertexVariables( name = _name,
- TrackToVertexIPEstimator = getTauTrackToVertexIPEstimator(),
VertexFitter = getTauAdaptiveVertexFitter(),
SeedFinder = getTauCrossDistancesSeedFinder(),
)
@@ -708,7 +707,8 @@ def getTauTrackFinder(applyZ0cut=False, maxDeltaZ0=2, noSelector = False, prefix
removeTracksOutsideZ0wrtLeadTrk = applyZ0cut,
ParticleCaloExtensionTool = getParticleCaloExtensionTool(),
BypassSelector = noSelector,
- BypassExtrapolator = True
+ BypassExtrapolator = True,
+ TrackToVertexIPEstimator = getTauTrackToVertexIPEstimator()
)
# Selector not needed for fast-tracks
# Extrapolator never needed
diff --git a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py
index 35c2417cf93cc122fa63cf32735682bf899b11a7..322877c9e030d2ed7c08eb16f78b30d17e866665 100644
--- a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py
+++ b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py
@@ -35,10 +35,9 @@ def muCombCfg(flags, postFix="", useBackExtrp=True):
idScanEndcap2Res = [0.030, 0.0000002]
idScanEndcap3Res = [0.036, 0.0000004]
idScanEndcap4Res = [0.046, 0.0000002]
-
- from TrigmuComb.TrigmuCombMTConfig import muCombMT
from TrigmuComb.TrigmuCombMonitoring import TrigMuCombMonitoring
- muCombAlg = muCombMT(name = "Muon"+postFix,
+ muCombMT = CompFactory.muCombMT
+ muCombAlg = muCombMT(name = "MuComb"+postFix,
MuCombStrategy = 0,
UseBackExtrapolatorG4 = useBackExtrp,
MinPtTRK = 0.,
@@ -51,19 +50,20 @@ def muCombCfg(flags, postFix="", useBackExtrp=True):
IDSCANEndcap3Res = idScanEndcap3Res,
IDSCANEndcap4Res = idScanEndcap4Res,
IDalgo = "InDetTrigTrackingxAODCnv_Muon_FTF",
- MonTool = TrigMuCombMonitoring() )
+ MonTool = TrigMuCombMonitoring())
return acc, muCombAlg
-def l2MuCombRecoCfg(flags):
+def l2MuCombRecoCfg(flags, name="L2MuCombReco"):
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
- reco = InViewReco("L2MuCombReco")
+ reco = InViewReco(name)
acc, alg = muCombCfg(flags)
alg.L2StandAloneMuonContainerName=muFastInfo
alg.L2CombinedMuonContainerName = muCombInfo
+ alg.TrackParticlesContainerName="TrigFastTrackFinder_Tracks__Muon"
muCombAcc = ComponentAccumulator()
muCombAcc.addEventAlgo(alg)
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx
index a6c1d244cadcb833d435ebfc6f6762aa3a0ff43b..fef29e726b27388fe3927cb66d2677f84290a2e3 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx
@@ -8,7 +8,7 @@
#include <iostream>
// Gaudi/Athena include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// Local include(s):
#include "TrigBunchCrossingTool/BunchCrossing.h"
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx
index 30efce35947cec41fb43a02714c0af666f16c966..784aa36732353990f3d5a8ef74ceed5acdf32f0f 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx
@@ -9,7 +9,7 @@
#include <iostream>
// Gaudi/Athena include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// Local include(s):
#include "TrigBunchCrossingTool/BunchTrain.h"
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/SetPrint.h b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/SetPrint.h
index 68bcdb1b77ef8f2b0f2c0fdb48a208267691c844..c51371673125b2fa973f1410701fd1889d6060c4 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/SetPrint.h
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/SetPrint.h
@@ -13,7 +13,7 @@
#include <iostream>
// Gaudi/Athena include(s):
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
/// Helper operator for printing std::set variables easily
template< typename T >
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchCrossing.h b/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchCrossing.h
index d2d1e52c6a948d1118f5b83835c2fe8724615ea0..34d36651fd495b9277d2b72f00b77c52999d22c9 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchCrossing.h
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchCrossing.h
@@ -12,7 +12,7 @@
#include <iosfwd>
// Gaudi/Athena include(s):
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
namespace Trig {
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchTrain.h b/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchTrain.h
index 1b5ba7e0d29a11db992b6e69383a12ce95e69aa1..fb69f98d23767360e937677370d927dc0a1b7620 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchTrain.h
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/TrigBunchCrossingTool/BunchTrain.h
@@ -13,7 +13,7 @@
#include <iosfwd>
// Gaudi/Athena include(s):
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
// Local include(s):
#include "TrigBunchCrossingTool/BunchCrossing.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
index 223dbd2c8ae0f2fb28797539161a5ad3c39f464f..8dbd32782f2ca1f8d73dfb80e9556bc3376cf52f 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
@@ -45,7 +45,7 @@
#ifndef XAOD_STANDALONE
#include "AthenaBaseComps/AthCheckMacros.h"
#else
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#endif
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h
index cca01aa534ee0a794d64371dc3ea7ba36519314f..6722804588566321a4c4cc300f4db7075d0754d2 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h
@@ -35,7 +35,7 @@
#include "TrigDecisionTool/IDecisionUnpacker.h"
#include "TrigDecisionTool/Logger.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "AsgDataHandles/ReadHandleKey.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
index 97e8c0946e40f56feec922218335459bd059cdd1..11d0c99a25edf005b1b5865b74cd00024dbed31d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
@@ -19,7 +19,7 @@
#include "TrigDecisionTool/DecisionObjectHandle.h"
#include "TrigDecisionTool/EventPtrDef.h"
#include "TrigDecisionEvent/TrigDecision.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "StoreGate/ReadHandleKey.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
index 78558a853108bffa8ac4ca1538af62965c7dcd52..276a25d11d8ca53b8c13dea8fe7c629256d48e5a 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
@@ -18,7 +18,7 @@
#include "TrigDecisionTool/Logger.h"
#include "TrigDecisionTool/DecisionObjectHandle.h"
#include "EventInfo/EventInfo.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "StoreGate/ReadHandleKey.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
index 09b72d0f6904028d9cfa661307ec2e27ff0110a8..2b8ca014591cc96a0872d82b857dc415877e60ae 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
@@ -12,7 +12,7 @@
#include <string>
// ASG include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// xAOD include(s):
#include "xAODTrigger/TrigDecision.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h
index bf9e0054424b2d22628d0e31b8387b8e6dc6a4e1..84880279c5c1b142eaf6703ac2f9769fe009b5b9 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h
@@ -12,7 +12,7 @@
#include "TrigDecisionTool/IDecisionUnpacker.h"
#include "TrigDecisionTool/Logger.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "AsgDataHandles/ReadHandleKey.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h
index 33eccfd95d313b3c55034de38033eed97d8d591b..eb93a78d9ac907b597a1c6a086aba8d7fefc8c4d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h
@@ -11,7 +11,7 @@
#include "TrigDecisionTool/IDecisionUnpacker.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "DecisionObjectHandleEventInfo.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
index 08f816388597458fd16ae2bb2a219a54e8873219..19f8a4c51da2cd910cee279a3a18536ea5dcf6bc 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
@@ -9,7 +9,7 @@
#define TRIGDECISIONTOOL_DECISIONUNPACKERSTANDALONE_H
// ASG include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
// Trigger configuration include(s):
#include "TrigConfHLTData/HLTChain.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h
index 221cf757745ccca64b334c03805eb4b7d2ef73e6..bd144b15a31f7a8c01604dcdc1f70b66d71ddf97 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h
@@ -25,7 +25,7 @@
#include "boost/shared_ptr.hpp"
#include "boost/lexical_cast.hpp"
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
#include "TrigNavStructure/TriggerElement.h"
#include "xAODTrigger/EmTauRoI.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h
index 651808deff561d753b925a01c5ede98c43189c49..e4c5a196be8dbd40e573b0366f008e41c9e5523d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h
@@ -42,7 +42,7 @@
#include "TrigNavStructure/TrigNavStructure.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#include "TrigNavStructure/TypedHolder.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h
index 8d1ce94bc48e3e7286590184e510c73fa85f71c3..6c7c6236c79da932af4e8286cc38954e86f34c15 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h
@@ -8,7 +8,7 @@
#ifndef TRIG_IDECISIONUNPACKER_H
#define TRIG_IDECISIONUNPACKER_H
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
#include <map>
#include <unordered_map>
#include <string>
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
index 9f80cf80987c71372fca7d9c550dc0dae10186ab..d293be661e2064c255d0958891d4b507cfbe82c4 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
@@ -19,7 +19,7 @@
#include <string>
#ifdef XAOD_STANDALONE
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#endif
#ifndef XAOD_STANDALONE
#include "AthenaKernel/getMessageSvc.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h
index 1bc0d47cd520a66f125580f846d7a15481514a98..da39c2e27b3862b5d1fb9d853703a74e7c633260 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h
@@ -19,7 +19,7 @@
* @author Joerg Stelzer <Joerg.Stelzer@cern.ch> - DESY
*
***********************************************************************************/
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
#include "TrigDecisionTool/ChainGroupFunctions.h"
#include "TrigDecisionTool/Conditions.h"
#include "TrigDecisionTool/ChainGroup.h"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
index 11153f96a2ec372b2e3e56c487961ecfa2c50471..69774a2b07a24c1c2897f1d868aba02a5df80b8d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
@@ -6,14 +6,10 @@ testChains = {
// "Truth",
- //"HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF",
"HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon",
- //"HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig",
- "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon",
- //"HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF",
+ "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonForEF",
"HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon",
- //"HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig",
- "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonforEF",
+ "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonForEF",
"HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF",
"HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig",
@@ -29,11 +25,12 @@ testChains = {
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig",
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig:HLT_TAURoI",
- "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF",
- "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig",
-
- "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS",
- "HLT_j45_ftf_L1J15:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS",
+ "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF",
+ "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig",
+
+ "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS:post:rvtx=HLT_IDVertex_FS",
+ "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS:post:rvtx=HLT_IDVertex_FS",
+ "HLT_j45_ftf_L1J15:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS:post:rvtx=HLT_IDVertex_FS",
"HLT_mb_sptrk_L1RD0_FILLED:HLT_IDTrack_MinBias_FTF",
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-vtx.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-vtx.dat
new file mode 100644
index 0000000000000000000000000000000000000000..a04c564b5e7bc9744761d6958d33f114a340cf14
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-vtx.dat
@@ -0,0 +1,62 @@
+// emacs: this is -*- c++ -*-
+
+pT = 1000;
+eta = 2.5;
+// npix = 1;
+// nsct = 2;
+npix = 2; /// double up, this is number of degrees of freedomw and really means 2 pixel "clusters"
+nsct = 4;
+
+nsiholes = 2;
+
+expectBL = 1;
+
+pT_rec = 0;
+eta_rec = 5;
+Rmatch = 0.05;
+
+
+dumpflag = 0;
+
+a0v = 10.5;
+z0v = 10.5;
+
+refChain = "Offline";
+//refChain = "Electrons";
+//refChain = "Muons";
+//refChain = "Taus";
+
+/// NB: For the "Truth" chains, need to specify what
+/// sort of particle (ie which pdgID) is needed
+/// Fixme: should add a flag to enable/disable this
+/// what if we want all final state particles
+/// independent of pdgID?
+
+//pdgId=11; // electron --entered in command line now
+
+// Nentries = 10000;
+
+MinVertices = 0;
+
+VertexSelection = "0"; // possible flags: BestPT2, LeadPT, Ntracks
+// VertexSelectionRec = "0";
+
+// FilterRoi = { 2.4, 1, 2 };
+ntracks = 2;
+
+#include "TIDAdata-chains-run3.dat"
+
+InitialiseFirstEvent = 1;
+
+outputFile = "data-vtx.root";
+
+// #include "dataset.dat"
+
+
+// GRL = "/afs/cern.ch/user/s/sutt/tida/data16_13TeV.periodAllYear_HEAD_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml";
+
+#include "grl.dat"
+
+
+DataFiles = { "TrkNtuple-0000.root"};
+
diff --git a/Trigger/TrigAnalysis/TrigMuonMatching/util/TrigMuonMatching_example.cxx b/Trigger/TrigAnalysis/TrigMuonMatching/util/TrigMuonMatching_example.cxx
index ebd665abd2e845b5161c9c13bb92210b125c98a7..1aef2af9b2875081409d97540ae0e3821cdbf0c7 100644
--- a/Trigger/TrigAnalysis/TrigMuonMatching/util/TrigMuonMatching_example.cxx
+++ b/Trigger/TrigAnalysis/TrigMuonMatching/util/TrigMuonMatching_example.cxx
@@ -7,7 +7,7 @@
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/tools/ReturnCheck.h"
#include "xAODRootAccess/TEvent.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#endif
#include "TrigConfxAOD/xAODConfigTool.h"
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching/util/TrigTauMatching_example.cxx b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching/util/TrigTauMatching_example.cxx
index e15db176bf5ba3cc12684f64eddfcf4395ba7bfb..cccf60df8ebfc589a89eae521173ea9b4975bd74 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching/util/TrigTauMatching_example.cxx
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching/util/TrigTauMatching_example.cxx
@@ -8,7 +8,7 @@
#include "xAODRootAccess/tools/ReturnCheck.h"
#include "xAODRootAccess/TEvent.h"
#include "xAODCore/ShallowCopy.h"
-#include "AsgTools/Check.h"
+#include "AsgMessaging/Check.h"
#endif
#include "TrigConfxAOD/xAODConfigTool.h"
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h
index 5ca655b13d0b8594018e6bfe697bf315f1a19261..2df9acf2b86d2125bcd7bc879d703168a74c7027 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h
@@ -8,7 +8,7 @@
#define TRIGGERMATCHINGTOOL_MINIMALSUMASSOCIATION_H
#include "TriggerMatchingTool/IAssociationStrategy.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
class MinimalSumAssociation : public IAssociationStrategy, public asg::AsgMessaging {
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h
index bc46c415a6306ac54b8a7fd21a782c045168fbbd..fc68b7d60a8067ce3f51c6356fb1d26ffe762769 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h
@@ -12,7 +12,7 @@
#include "TriggerMatchingTool/MatchingTool.h"
#include "TriggerMatchingTool/IAssociationStrategy.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
namespace Trig {
diff --git a/Trigger/TrigConfiguration/TrigConfIO/python/HLTTriggerConfigAccess.py b/Trigger/TrigConfiguration/TrigConfIO/python/HLTTriggerConfigAccess.py
index 6eff14b80d23fcb0f77f451fabebe32356c35cd7..b64305dfdb79153ddd92a953740d32c6b51429dc 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/python/HLTTriggerConfigAccess.py
+++ b/Trigger/TrigConfiguration/TrigConfIO/python/HLTTriggerConfigAccess.py
@@ -23,7 +23,7 @@ class HLTMenuAccess(TriggerConfigAccess):
return self["chains"].keys()
def chains(self):
- return iter(self)
+ return self["chains"]
def streams(self):
return self["streams"]
diff --git a/Trigger/TrigConfiguration/TrigConfIO/python/L1TriggerConfigAccess.py b/Trigger/TrigConfiguration/TrigConfIO/python/L1TriggerConfigAccess.py
index a65c73ef09f31f80badf4d5565901eacaad2f433..4ce2fb5226ce9dca1b798eff66cdd8a1ee97674b 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/python/L1TriggerConfigAccess.py
+++ b/Trigger/TrigConfiguration/TrigConfIO/python/L1TriggerConfigAccess.py
@@ -35,7 +35,7 @@ class L1MenuAccess(TriggerConfigAccess):
return self._config["items"]
def thresholdTypes(self):
- thrTypes = self._config["thresholds"].keys()
+ thrTypes = list(self._config["thresholds"].keys())
if "legacyCalo" in thrTypes:
thrTypes.remove("legacyCalo")
thrTypes += self._config["thresholds"]["legacyCalo"].keys()
diff --git a/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py b/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py
index 5bf1fff4605a4c8ccafd75d23f023af0a11a8a37..029113e24ebf13ee00592995e04cf9fa6e7d25b5 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py
+++ b/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py
@@ -127,6 +127,8 @@ class ConfigDBLoader(ConfigLoader):
connection = connect(userpw["user"], userpw["password"], tns, threaded=False)
elif connSvc.startswith("frontier:"):
raise NotImplementedError("Python-loading of trigger configuration from Frontier has not yet been implemented")
+ elif connSvc.startswith("sqlite_file:"):
+ raise NotImplementedError("Python-loading of trigger configuration from sqlite has not yet been implemented")
return connection, schema
except Exception as e:
raise RuntimeError(e)
diff --git a/Trigger/TrigConfiguration/TrigConfIO/scripts/AtlTriggerDBCopy.py b/Trigger/TrigConfiguration/TrigConfIO/scripts/AtlTriggerDBCopy.py
index 0e84acaddab78afd53cc72074782f4cd6c21df44..ca0af41bae964f52c388db294f13f0365e270302 100755
--- a/Trigger/TrigConfiguration/TrigConfIO/scripts/AtlTriggerDBCopy.py
+++ b/Trigger/TrigConfiguration/TrigConfIO/scripts/AtlTriggerDBCopy.py
@@ -10,19 +10,18 @@ import sqlite3
def parseCmdline():
import argparse
- parser = argparse.ArgumentParser(prog = "AtlTriggerDBCopy.py")
+ parser = argparse.ArgumentParser(prog = "AtlTriggerDBCopy.py", description="Example: %(prog)s -d TRIGGERDBMC -c triggerDBMC_Run2.db")
parser.add_argument("-d", "--dbalias", dest="dbalias", help="TriggerDB connection alias for the source DB")
parser.add_argument("-c", "--create", dest="createfile", help="create sqlite db file")
- parser.add_argument("-u", "--update", dest="updatefile", help="update sqlite db file")
parser.add_argument("-v", help="increase output verbosity", action="count", default=0)
args = parser.parse_args()
if not args.dbalias:
print("No source Trigger DB specified")
parser.print_help()
return None
- if not args.createfile and not args.updatefile:
- print("No sqlite target file specified (use create or update)")
- parser.print_help()
+ if not args.createfile:
+ print("No sqlite target file specified")
+ parser.print_help(parser)
return None
return args
@@ -63,8 +62,8 @@ class SQLiteInserter:
print("Not connected to an output file, will print the insert commands instead")
import os
if filename and os.path.exists(filename):
- print(f"File or path {filename} exists already, will not overwrite it and only print the insert commands instead")
- self.filename = None
+ print(f"Target file {filename} exists already, will abort in order to prevent overwriting")
+ raise RuntimeError("Target file already exists")
if self.filename is not None:
self.connection = sqlite3.connect(self.filename)
self.cursor = self.connection.cursor()
@@ -109,11 +108,10 @@ class OracleExporter:
self.tables = None
self.ignoreTablesR2 = [ 'TT_WRITELOCK', 'HLT_SMT_TO_HRE', 'HLT_PARAMETER', 'HLT_RELEASE', 'TRIGGER_LOG',
'DBCOPY_SOURCE_DATABASE', 'HLT_RULE_SET', 'TEMP', 'HLT_RULE_PARAMETER', 'HLT_RULE_COMPONENT',
- 'ACTIVE_MASTERS', 'HLT_SETUP', 'TT_USERS', 'HLT_RULE', "HLT_HRC_TO_HRP", "HLT_HRE_TO_HRS",
+ 'HLT_SETUP', 'TT_USERS', 'HLT_RULE', "HLT_HRC_TO_HRP", "HLT_HRE_TO_HRS",
"HLT_HRS_TO_HRU", "HLT_HRU_TO_HRC", "HLT_PRESCALE_SET_ALIAS", "HLT_PRESCALE_SET_COLL",
- "PRESCALE_SET_ALIAS", "TRIGGER_ALIAS", "L1_PRESCALE_SET_ALIAS", "L1_PITS", "L1_CALO_SIN_COS",
- "L1_CI_TO_CSC", "L1_DEAD_TIME", "L1_JET_INPUT", "L1_MUON_THRESHOLD_SET", "HLT_TRIGGER_TYPE",
- "L1_CTP_FILES", "L1_CTP_SMX" ]
+ "PRESCALE_SET_ALIAS", "TRIGGER_ALIAS", "L1_PRESCALE_SET_ALIAS", "L1_CALO_SIN_COS",
+ "L1_CI_TO_CSC", "L1_JET_INPUT", "L1_MUON_THRESHOLD_SET", "L1_CTP_FILES", "L1_CTP_SMX" ]
def getTables(self, isRun2MC = True):
if self.tables:
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/Root/prepareTriggerMenu.cxx b/Trigger/TrigConfiguration/TrigConfxAOD/Root/prepareTriggerMenu.cxx
index fc8d52c37c6b996b4ca522937871194c45500af9..86f3999fc2dfa295647a68d1fd5cc6a4adffe3e4 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/Root/prepareTriggerMenu.cxx
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/Root/prepareTriggerMenu.cxx
@@ -5,7 +5,7 @@
// $Id: prepareTriggerMenu.cxx 792850 2017-01-18 18:58:03Z ssnyder $
// Infrastructure include(s):
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
// Trigger configuration include(s):
#include "TrigConfL1Data/CTPConfig.h"
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h b/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h
index 0fd9b4129252144982e124c1d831496c004dc7b4..08453573b75a0c47bae3dcd1ef3f0b63b65486ee 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h
@@ -9,7 +9,7 @@
#define TRIGCONFXAOD_TOOLS_PREPARETRIGGERMENU_H
// Infrastructure include(s):
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
// xAOD include(s):
#include "xAODTrigger/TriggerMenu.h"
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/share/xAODMenuWriterTest_jobOptions.py b/Trigger/TrigConfiguration/TrigConfxAOD/share/xAODMenuWriterTest_jobOptions.py
index 0be1059d608ffbaec8ba40ba055a0a6448ff2baa..50c1ce8b58a2b90d5185e6bea38d05feec959fc7 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/share/xAODMenuWriterTest_jobOptions.py
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/share/xAODMenuWriterTest_jobOptions.py
@@ -55,10 +55,6 @@ xaodStream.AddItem( "xAOD::TruthVertexAuxContainer_v1#*" )
xaodStream.AddItem( "xAOD::TruthEventContainer_v1#*" )
xaodStream.AddItem( "xAOD::TruthEventAuxContainer_v1#*" )
-# Make sure that the event format object is added to the output:
-theApp.CreateSvc += [ "xAODMaker::EventFormatSvc" ]
-xaodStream.AddMetaDataItem( "xAOD::EventFormat_v1#EventFormat" )
-
# Convert the LVL1 information:
from xAODTriggerCnv.xAODRoICreator import xAODRoICreator
xAODRoICreator()
diff --git a/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableConstructorBase.h b/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableConstructorBase.h
index d4bccd4dfd4e396289c8f40dfa209a500f9483b6..96085f29c53444b0b38c40478e18579d1e39870e 100644
--- a/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableConstructorBase.h
+++ b/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableConstructorBase.h
@@ -11,7 +11,7 @@
#include "TableEntry.h"
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include "TString.h"
diff --git a/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableEntry.h b/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableEntry.h
index a5b2218cdbe610db4a45e71c606ec39115cc1344..f183eb5b7edad4b72c801bf19be0c78546931b90 100644
--- a/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableEntry.h
+++ b/Trigger/TrigCost/TrigCostAnalysis/TrigCostAnalysis/TableEntry.h
@@ -9,7 +9,7 @@
#include <unordered_map>
#include <vector>
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include "TString.h"
diff --git a/Trigger/TrigCost/TrigCostAnalysis/util/trigCostHistToCSV.cxx b/Trigger/TrigCost/TrigCostAnalysis/util/trigCostHistToCSV.cxx
index eab0ab15d5eeae2bf51d731d0861c9b7e905bad5..44b80ef6e04d632a2083ff5963b2e5776ec40180 100644
--- a/Trigger/TrigCost/TrigCostAnalysis/util/trigCostHistToCSV.cxx
+++ b/Trigger/TrigCost/TrigCostAnalysis/util/trigCostHistToCSV.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "AsgTools/MsgStream.h"
+#include "AsgMessaging/MsgStream.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include <string.h>
diff --git a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..03cd05e8c4c22817e3e0bdb3df11c7e6fb16f198
--- /dev/null
+++ b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigEvent/TrigInDetEvent
diff --git a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigInDetTrack.h b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigInDetTrack.h
index c90debefb1b21b4ae16741f169dae604ad0cae69..8261e7a40d0f1a47fd946537ed04614ce284366e 100755
--- a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigInDetTrack.h
+++ b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigInDetTrack.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGINDETTRACK_H
@@ -154,7 +154,8 @@ class TrigInDetTrack {
/** Chi2 of the track fit normalized on number of DOF */
double chi2() const { return m_chi2; }
/** Pixel and SCT spacepoints associated with track */
- std::vector <const TrigSiSpacePoint*>* siSpacePoints() const { return m_siSpacePoints; }
+ std::vector <const TrigSiSpacePoint*>* siSpacePoints() { return m_siSpacePoints; }
+ const std::vector <const TrigSiSpacePoint*>* siSpacePoints() const { return m_siSpacePoints; }
/** Number of Pixel spacepoints associated with track */
inline int NPixelSpacePoints() const { return m_NPixelSpacePoints;}
@@ -173,7 +174,10 @@ class TrigInDetTrack {
/** Number of high-threshold TRT hits associated with track */
inline int NTRHits() const { return m_NTRHits; }
/** TRT drift circles associated with track */
- std::vector<const InDet::TRT_DriftCircle*>* trtDriftCircles() const {
+ std::vector<const InDet::TRT_DriftCircle*>* trtDriftCircles() {
+ return m_trtDriftCircles;
+ }
+ const std::vector<const InDet::TRT_DriftCircle*>* trtDriftCircles() const {
return m_trtDriftCircles;
}
/** RDOs associated with track */
diff --git a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigL2Vertex.h b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigL2Vertex.h
index dc2195cceabbca431ca8dfcc57dece29e8123c31..091d8df86e75d0876f373cabf9ade5fa60c49466 100755
--- a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigL2Vertex.h
+++ b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigL2Vertex.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGINDETEVENT_TRIGL2VERTEX_H
@@ -147,6 +147,8 @@ class TrigL2Vertex
public:
TrigL2Vertex();
~TrigL2Vertex();
+ TrigL2Vertex(const TrigL2Vertex&) = delete;
+ TrigL2Vertex& operator=(const TrigL2Vertex&) = delete;
bool prepareForFit();//!< resets all internal structures + initialization of the covariance
void reset();//!< resets all internal structures
double chi2();//!< returns accumulated \f$\chi^2\f$ of the fit
diff --git a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h
index e3a24116f301ef41932fb763606c942e688cc395..ba2fb1a59f054da39a2511f653bad42bf7dc03dc 100755
--- a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h
+++ b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGINDETEVENT_TRIGVERTEX_H
@@ -132,7 +132,8 @@ class TrigVertex{
int ndof() const { return m_nDOF; } //!< Number of degree-of-freedom of the vertex fit
const double* cov() const { return &m_cov[0];} //!< covariance of the vertex position, packed as follows
- TrackInVertexList* tracks() const { return m_tracks; }//!< std::list of track pointers associated with the vertex
+ TrackInVertexList* tracks() { return m_tracks; }//!< std::list of track pointers associated with the vertex
+ const TrackInVertexList* tracks() const { return m_tracks; }//!< std::list of track pointers associated with the vertex
double x() const { return m_x; } //!< x-position
double y() const { return m_y; } //!< y-position
double z() const { return m_z; } //!< z-position
diff --git a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h
index 7ee305780887d3791d714dc807583b30996c6d32..21a924368336b10c5a17c88fe21cca6d9db50428 100644
--- a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h
+++ b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h
@@ -12,7 +12,7 @@
#include <boost/variant.hpp>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "TrigNavStructure/Types.h"
#include "TrigNavStructure/BaseHolder.h"
#include "TrigNavStructure/TriggerElement.h"
diff --git a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
index f4acb15c1930e1c482fe2b1144c1380beecc4c6e..1632aba5c76613e2cf328d1185a4eee526b8d21a 100644
--- a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
+++ b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
@@ -30,7 +30,7 @@ typedef asg::SgTEvent* EventPtr;
typedef StoreGateSvc* EventPtr;
#endif //XAOD_STANDALONE
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
//forward declarations
diff --git a/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h b/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h
index e8552160379bdbe14277973d4eea50e88c4e037a..c4106400edc80859be1554f12ef48e3f122de96b 100644
--- a/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h
+++ b/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h
@@ -10,7 +10,7 @@
#include <string>
#include "TrigNavStructure/ITrigHolderFactory.h"
#include "TrigNavStructure/BaseHolder.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include "GaudiKernel/ServiceHandle.h"
class IConversionSvc;
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h
index b06062a6a31eb13d9eda909955847115016d0b89..cf0ae8609e4d376229c180d759a252777f07c21b 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h
+++ b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h
@@ -28,8 +28,8 @@
#include "TrigConfHLTData/HLTChain.h"
#ifdef XAOD_STANDALONE
-#include "AsgTools/MsgStream.h"
-#include "AsgTools/MsgStreamMacros.h"
+#include "AsgMessaging/MsgStream.h"
+#include "AsgMessaging/MsgStreamMacros.h"
#endif
#ifndef XAOD_STANDALONE
#include "GaudiKernel/MsgStream.h"
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetOnlineMonitoringMTConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetOnlineMonitoringMTConfig.py
index 82042b783b8de12bc79f53dc0947ce332f948538..2c575e3ad3702e883c92d7abd80108a6e558e1ed 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetOnlineMonitoringMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetOnlineMonitoringMTConfig.py
@@ -2,10 +2,11 @@
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
class TrigBjetOnlineMonitoring(GenericMonitoringTool):
- def make_btag_hists(self, btag_name, btag_opts):
- self.defineHistogram('btag_'+btag_name+'_pb', title=btag_name+" PB", **btag_opts)
- self.defineHistogram('btag_'+btag_name+'_pc', title=btag_name+" PC", **btag_opts)
- self.defineHistogram('btag_'+btag_name+'_pu', title=btag_name+" PU", **btag_opts)
+ def make_flavor_hists(self, tagger):
+ for probability in ['pb','pc','pu']:
+ self.defineHistogram('btag_'+tagger+'_'+probability, title=tagger+' '+probability.capitalize(), type='TH1F', path='EXPERT', xbins=100, xmin=0, xmax=1)
+ self.defineHistogram('btag_'+tagger+'_llr', title=tagger+' LLR', type='TH1F', path='EXPERT', xbins=100, xmin=-10, xmax=50)
+
def __init__ (self, name="TrigBjetOnlineMonitoring"):
super(TrigBjetOnlineMonitoring, self).__init__(name)
@@ -19,6 +20,11 @@ class TrigBjetOnlineMonitoring(GenericMonitoringTool):
self.defineHistogram('jet_count', title="Number of Jets", xbins = 20, xmin=0, xmax=20, **TH1F_opts)
self.defineHistogram('vertex_count', title="Number of Vertices", xbins = 200, xmin=0, xmax=200, **TH1F_opts)
+ # Primary Vertex Histogram
+ self.defineHistogram('primVtx_x', title="Primary Vertex X", xbins = default_bin_count, xmin=-2, xmax=2, **TH1F_opts)
+ self.defineHistogram('primVtx_y', title="Primary Vertex Y", xbins = default_bin_count, xmin=-2, xmax=2, **TH1F_opts)
+ self.defineHistogram('primVtx_z', title="Primary Vertex Z", xbins = default_bin_count, xmin=-300, xmax=300, **TH1F_opts)
+
## Track Histograms
self.defineHistogram('track_Et', title="Track Transverse Energy;E_{T} (GeV)", xbins = default_bin_count, xmin=0, xmax=200, **TH1F_opts)
self.defineHistogram('track_eta', title="Track #eta;#eta", xbins = default_bin_count, xmin=-5, xmax=5, **TH1F_opts)
@@ -28,12 +34,12 @@ class TrigBjetOnlineMonitoring(GenericMonitoringTool):
self.defineHistogram('track_d0', title="Track d_{0};d_{0} (mm)", xbins = default_bin_count, xmin=-5, xmax=5, **TH1F_opts)
self.defineHistogram('track_d0err', title="Track d_{0} Error;d_{0} Error (mm)", xbins = default_bin_count, xmin=0, xmax=10, **TH1F_opts)
self.defineHistogram('track_d0sig', title="Track d_{0} Significance;d_{0} #sigma", xbins = default_bin_count, xmin=-100, xmax=100, **TH1F_opts)
- self.defineHistogram('track_z0', title="Track z_{0};z_{0} (mm)", xbins = default_bin_count, xmin=-100, xmax=100, **TH1F_opts)
+ self.defineHistogram('track_z0', title="Track z_{0};z_{0} (mm)", xbins = default_bin_count, xmin=-200, xmax=200, **TH1F_opts)
self.defineHistogram('track_z0err', title="Track z_{0} Error;z_{0} Error (mm)", xbins = default_bin_count, xmin=0, xmax=10, **TH1F_opts)
self.defineHistogram('track_z0sig', title="Track z_{0} Significance;z_{0} #sigma", xbins = default_bin_count, xmin=-1000, xmax=1000, **TH1F_opts)
# Jet Histograms
- self.defineHistogram('jet_pt', title="Jet Transverse Momentum;p_{T} (GeV)", xbins = default_bin_count, xmin=0, xmax=200, **TH1F_opts)
+ self.defineHistogram('jet_pt', title="Jet Transverse Momentum;p_{T} (GeV)", xbins = default_bin_count, xmin=0, xmax=1000, **TH1F_opts)
self.defineHistogram('jet_eta', title="Jet #eta;#eta", xbins = default_bin_count, xmin=-5, xmax=5, **TH1F_opts)
self.defineHistogram('jet_phi', title="Jet #phi;#phi", xbins = default_bin_count, xmin=-3.5, xmax=3.5, **TH1F_opts)
self.defineHistogram('jet_eta,jet_phi', path='EXPERT', type='TH2F', title="Jet #eta vs #phi;#eta;#phi",
@@ -41,16 +47,64 @@ class TrigBjetOnlineMonitoring(GenericMonitoringTool):
# B-Tagging Histograms
- btag_options=TH1F_opts.copy()
- btag_options.update({'xbins':default_bin_count, 'xmin':0, 'xmax':1})
- self.make_btag_hists('IP2D', btag_options)
- self.make_btag_hists('IP3D', btag_options)
- self.make_btag_hists('SV1', btag_options)
- self.make_btag_hists('DL1r', btag_options)
- self.make_btag_hists('RNNIP', btag_options)
+ for tagger in ['IP2D', 'IP3D', 'DL1r', 'rnnip']: self.make_flavor_hists(tagger)
+
self.defineHistogram('btag_MV2c10', title="MV2c10", xbins = default_bin_count, xmin=-1, xmax=1, **TH1F_opts)
- self.defineHistogram('btag_valD0wrtPVofTracks', title="Track d_{0} w/ Respect to PV of Tracks;d_{0} (mm)", xbins = default_bin_count, xmin=-2, xmax=2, **TH1F_opts)
- self.defineHistogram('btag_sigD0wrtPVofTracks', title="Track d_{0} Significance w/ Respect to PV of Tracks;d_{0} #sigma", xbins = default_bin_count, xmin=-100, xmax=100, **TH1F_opts)
- self.defineHistogram('btag_valZ0wrtPVofTracks', title="Track z_{0} w/ Respect to PV of Tracks;z_{0} (mm)", xbins = default_bin_count, xmin=-2, xmax=2, **TH1F_opts)
- self.defineHistogram('btag_sigZ0wrtPVofTracks', title="Track z_{0} Significance w/ Respect to PV of Tracks;z_{0} #sigma", xbins = default_bin_count, xmin=-100, xmax=100, **TH1F_opts)
+
+ aux_variables_list = [ # title, xmin, xmax, xbins, plottype
+ ('JetFitter_N2Tpair', 0, 100, 100, 'TH1I'),
+ ('JetFitter_nVTX', 0, 50, 50, 'TH1I'),
+ ('JetFitter_nSingleTracks', 0, 50, 50, 'TH1I'),
+ ('JetFitter_nTracksAtVtx', 0, 50, 50, 'TH1I'),
+ ('JetFitter_mass', 0, 20000, 1000, 'TH1F'),
+ ('JetFitter_energyFraction', 0, 1.1, 100, 'TH1F'),
+ ('JetFitter_significance3d', 0, 100, 100, 'TH1F'),
+ ('JetFitter_deltaeta', 0, 2, 100, 'TH1F'),
+ ('JetFitter_deltaphi', 0, 2, 100, 'TH1F'),
+ ('JetFitter_isDefaults', 0, 2, 2, 'TH1I'),
+ ('JetFitter_deltaR', 0, 2, 100, 'TH1F'),
+
+ ('SV1_NGTinSvx', 0, 100, 100, 'TH1I'),
+ ('SV1_masssvx', 0, 10000, 1000, 'TH1F'),
+ ('SV1_isDefaults', 0, 2, 2, 'TH1I'),
+ ('SV1_N2Tpair', 0, 50, 50, 'TH1I'),
+ ('SV1_efracsvx', 0, 1.1, 100, 'TH1F'),
+ ('SV1_deltaR', 0, 2, 100, 'TH1F'),
+ ('SV1_Lxy', 0, 100, 100, 'TH1F'),
+ ('SV1_L3d', 0, 100, 100, 'TH1F'),
+ ('SV1_significance3d', 0, 50, 100, 'TH1F'),
+
+ ('IP2D_isDefaults', 0, 2, 2, 'TH1I'),
+ ('IP2D_bu', 0, 50, 100, 'TH1F'),
+ ('IP2D_bc', 0, 50, 100, 'TH1F'),
+ ('IP2D_cu', 0, 50, 100, 'TH1F'),
+ ('IP3D_isDefaults', 0, 2, 2, 'TH1I'),
+ ('IP3D_bu', 0, 50, 100, 'TH1F'),
+ ('IP3D_bc', 0, 50, 100, 'TH1F'),
+ ('IP3D_cu', 0, 50, 100, 'TH1F'),
+
+ ('JetFitterSecondaryVertex_nTracks', 0, 50, 50, 'TH1I'),
+ ('JetFitterSecondaryVertex_isDefaults', 0, 2, 2, 'TH1I'),
+ ('JetFitterSecondaryVertex_mass', 0, 1e4, 100, 'TH1F'),
+ ('JetFitterSecondaryVertex_energy', 0, 1e6, 100, 'TH1F'),
+ ('JetFitterSecondaryVertex_energyFraction', 0, 1.1, 100, 'TH1F'),
+ ('JetFitterSecondaryVertex_displacement3d', 0, 500, 100, 'TH1F'),
+ ('JetFitterSecondaryVertex_displacement2d', 0, 500, 100, 'TH1F'),
+ ('JetFitterSecondaryVertex_maximumTrackRelativeEta', 0, 8, 100, 'TH1F'),
+ ('JetFitterSecondaryVertex_minimumTrackRelativeEta', 0, 8, 100, 'TH1F'),
+ ('JetFitterSecondaryVertex_averageTrackRelativeEta', 0, 8, 100, 'TH1F'),
+
+ ('maximumTrackRelativeEta', 0, 8, 100, 'TH1F'),
+ ('minimumTrackRelativeEta', 0, 8, 100, 'TH1F'),
+ ('averageTrackRelativeEta', 0, 8, 100, 'TH1F')
+ ]
+
+ for title, xmin, xmax, xbins, plottype in aux_variables_list:
+ self.defineHistogram(title, title=title, xmin=xmin, xmax=xmax, xbins=xbins, type=plottype, path='EXPERT')
+
+ self.defineHistogram('IP3D_valD0wrtPVofTracks', title="Track d_{0} w/ Respect to PV of Tracks of IP3D;d_{0} (mm)", xmin=-2, xmax=2, xbins = default_bin_count, **TH1F_opts)
+ self.defineHistogram('IP3D_sigD0wrtPVofTracks', title="Track d_{0} Significance w/ Respect to PV of Tracks of IP3D;d_{0} #sigma", xmin=-100, xmax=100, xbins = default_bin_count, **TH1F_opts)
+ self.defineHistogram('IP3D_valZ0wrtPVofTracks', title="Track z_{0} w/ Respect to PV of Tracks of IP3D;z_{0} (mm)", xmin=-2, xmax=2, xbins = default_bin_count, **TH1F_opts)
+ self.defineHistogram('IP3D_sigZ0wrtPVofTracks', title="Track z_{0} Significance w/ Respect to PV of Tracks of IP3D;z_{0} #sigma", xmin=-100, xmax=100, xbins = default_bin_count, **TH1F_opts)
+
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx
index 0292bb962e2d5526df1d65dee659a0c85a2637d4..ad1cd899055d16160254e4c7ea87265e41424deb 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx
@@ -134,9 +134,10 @@ StatusCode TrigBjetBtagHypoAlgMT::execute( const EventContext& context ) const {
// online monitoring for btagging, with a check to ensure the PV is marked
ElementLink< xAOD::VertexContainer > vertexEL;
- CHECK( retrieveObjectFromNavigation( m_prmVtxLink.value(), vertexEL, prevDecisionContainer->at(index) ) );
+ CHECK( retrieveObjectFromNavigation( m_prmVtxLink.value(), vertexEL, prevDecisionContainer->at(index) ) );
if ( (*vertexEL)->vertexType() == xAOD::VxType::VertexType::PriVtx ) {
+ CHECK( monitor_primary_vertex( vertexEL ) );
CHECK( monitor_btagging( bTaggingEL ) );
}
@@ -264,7 +265,7 @@ StatusCode TrigBjetBtagHypoAlgMT::monitor_tracks( const ElementLinkVector< xAOD:
}
-StatusCode TrigBjetBtagHypoAlgMT::monitor_flavor_tag_variable( const ElementLinkVector< xAOD::BTaggingContainer >& bTaggingEL, const std::string& var_name ) const {
+StatusCode TrigBjetBtagHypoAlgMT::monitor_flavor_probabilities( const ElementLinkVector< xAOD::BTaggingContainer >& bTaggingEL, const std::string& var_name ) const {
auto monitor_pu = Monitored::Collection( "btag_"+var_name+"_pu", bTaggingEL,
[var_name](const ElementLink< xAOD::BTaggingContainer >& bTagLink) {
double pu = -1;
@@ -286,19 +287,83 @@ StatusCode TrigBjetBtagHypoAlgMT::monitor_flavor_tag_variable( const ElementLink
return pc;
} );
- auto monitor_group_for_flavor_tag_var = Monitored::Group( m_monTool, monitor_pu, monitor_pb, monitor_pc );
+ auto monitor_llr = Monitored::Collection( "btag_"+var_name+"_llr", bTaggingEL,
+ [var_name](const ElementLink< xAOD::BTaggingContainer >& bTagLink) {
+ double llr = -1;
+ (*bTagLink)->loglikelihoodratio( var_name, llr );
+ return llr;
+ } );
+
+ auto monitor_group_for_flavor_tag_var = Monitored::Group( m_monTool, monitor_pu, monitor_pb, monitor_pc, monitor_llr );
return StatusCode::SUCCESS;
}
-
+
+
+StatusCode TrigBjetBtagHypoAlgMT::monitor_primary_vertex( const ElementLink< xAOD::VertexContainer >& primVertexEL ) const {
+ auto monitor_for_primVtx_x = Monitored::Scalar( "primVtx_x", (*primVertexEL)->x() );
+ auto monitor_for_primVtx_y = Monitored::Scalar( "primVtx_y", (*primVertexEL)->y() );
+ auto monitor_for_primVtx_z = Monitored::Scalar( "primVtx_z", (*primVertexEL)->z() );
+
+ auto monitor_group_for_primary_vertex = Monitored::Group( m_monTool, monitor_for_primVtx_x, monitor_for_primVtx_y, monitor_for_primVtx_z );
+ return StatusCode::SUCCESS;
+}
+
StatusCode TrigBjetBtagHypoAlgMT::monitor_btagging( const ElementLinkVector< xAOD::BTaggingContainer >& bTaggingEL ) const {
- // Monitor IP2D, IP3D, SV1, DL1r, RNNIP
- CHECK( monitor_flavor_tag_variable(bTaggingEL, "IP2D") );
- CHECK( monitor_flavor_tag_variable(bTaggingEL, "IP3D") );
- CHECK( monitor_flavor_tag_variable(bTaggingEL, "SV1") );
- CHECK( monitor_flavor_tag_variable(bTaggingEL, "DL1r") );
- CHECK( monitor_flavor_tag_variable(bTaggingEL, "RNNIP") );
+ // Monitor flavor probabilites
+ CHECK( monitor_flavor_probabilities(bTaggingEL, "IP2D") );
+ CHECK( monitor_flavor_probabilities(bTaggingEL, "IP3D") );
+ CHECK( monitor_flavor_probabilities(bTaggingEL, "DL1r") );
+ CHECK( monitor_flavor_probabilities(bTaggingEL, "rnnip") );
+
+ MONITOR_BTAG_AUX_VAR(JetFitter_N2Tpair, int, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_nVTX, int, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_nSingleTracks, int, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_nTracksAtVtx, int, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_mass, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_energyFraction, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_significance3d, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_deltaeta, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_deltaphi, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_isDefaults, char, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitter_deltaR, float, bTaggingEL);
+
+ MONITOR_BTAG_AUX_VAR(SV1_NGTinSvx, int, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_masssvx, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_isDefaults, char, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_N2Tpair, int, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_efracsvx, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_deltaR, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_Lxy, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_L3d, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(SV1_significance3d, float, bTaggingEL);
+
+ MONITOR_BTAG_AUX_VAR(IP2D_isDefaults, char, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(IP2D_bu, double, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(IP2D_bc, double, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(IP2D_cu, double, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(IP3D_isDefaults, char, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(IP3D_bu, double, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(IP3D_bc, double, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(IP3D_cu, double, bTaggingEL);
+
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_nTracks, int, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_isDefaults, char, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_mass, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_energy, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_energyFraction, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_displacement3d, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_displacement2d, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_maximumTrackRelativeEta, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_minimumTrackRelativeEta, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(JetFitterSecondaryVertex_averageTrackRelativeEta, float, bTaggingEL);
+
+ MONITOR_BTAG_AUX_VAR(maximumTrackRelativeEta, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(minimumTrackRelativeEta, float, bTaggingEL);
+ MONITOR_BTAG_AUX_VAR(averageTrackRelativeEta, float, bTaggingEL);
+
+
// Monitor MV2c10
auto monitor_for_MV2c10 = Monitored::Collection( "btag_MV2c10", bTaggingEL,
@@ -307,28 +372,66 @@ StatusCode TrigBjetBtagHypoAlgMT::monitor_btagging( const ElementLinkVector< xAO
(*bTagLink)->MVx_discriminant( "MV2c10", mv2c10_discriminant );
return mv2c10_discriminant;
} );
- auto monitor_group_for_btagging = Monitored::Group( m_monTool, monitor_for_MV2c10);
+
+ auto monitor_group_for_btagging = Monitored::Group( m_monTool,
+ monitor_for_JetFitter_N2Tpair,
+ monitor_for_JetFitter_nVTX,
+ monitor_for_JetFitter_nSingleTracks,
+ monitor_for_JetFitter_nTracksAtVtx,
+ monitor_for_JetFitter_mass,
+ monitor_for_JetFitter_energyFraction,
+ monitor_for_JetFitter_significance3d,
+ monitor_for_JetFitter_deltaeta,
+ monitor_for_JetFitter_deltaphi,
+ monitor_for_JetFitter_isDefaults,
+ monitor_for_JetFitter_deltaR,
+ monitor_for_SV1_NGTinSvx,
+ monitor_for_SV1_masssvx,
+ monitor_for_SV1_isDefaults,
+ monitor_for_SV1_N2Tpair,
+ monitor_for_SV1_efracsvx,
+ monitor_for_SV1_deltaR,
+ monitor_for_SV1_Lxy,
+ monitor_for_SV1_L3d,
+ monitor_for_SV1_significance3d,
+ monitor_for_IP2D_bu,
+ monitor_for_IP2D_isDefaults,
+ monitor_for_IP2D_bc,
+ monitor_for_IP2D_cu,
+ monitor_for_IP3D_bu,
+ monitor_for_IP3D_isDefaults,
+ monitor_for_IP3D_bc,
+ monitor_for_IP3D_cu,
+ monitor_for_JetFitterSecondaryVertex_nTracks,
+ monitor_for_JetFitterSecondaryVertex_isDefaults,
+ monitor_for_JetFitterSecondaryVertex_mass,
+ monitor_for_JetFitterSecondaryVertex_energy,
+ monitor_for_JetFitterSecondaryVertex_energyFraction,
+ monitor_for_JetFitterSecondaryVertex_displacement3d,
+ monitor_for_JetFitterSecondaryVertex_displacement2d,
+ monitor_for_JetFitterSecondaryVertex_maximumTrackRelativeEta,
+ monitor_for_JetFitterSecondaryVertex_minimumTrackRelativeEta,
+ monitor_for_JetFitterSecondaryVertex_averageTrackRelativeEta,
+ monitor_for_maximumTrackRelativeEta,
+ monitor_for_minimumTrackRelativeEta,
+ monitor_for_averageTrackRelativeEta,
+ monitor_for_MV2c10
+ );
- // Monitor tracks used in calculating btagging quantities
for ( const ElementLink< xAOD::BTaggingContainer >& bTagLink : bTaggingEL ) {
- auto monitor_for_btag_valD0wrtPVofTracks = Monitored::Collection( "btag_valD0wrtPVofTracks",
- (*bTagLink)->auxdata< std::vector<float> >("IP3D_valD0wrtPVofTracks"));
- auto monitor_for_btag_sigD0wrtPVofTracks = Monitored::Collection( "btag_sigD0wrtPVofTracks",
- (*bTagLink)->auxdata< std::vector<float> >("IP3D_sigD0wrtPVofTracks"));
- auto monitor_for_btag_valZ0wrtPVofTracks = Monitored::Collection( "btag_valZ0wrtPVofTracks",
- (*bTagLink)->auxdata< std::vector<float> >("IP3D_valZ0wrtPVofTracks"));
- auto monitor_for_btag_sigZ0wrtPVofTracks = Monitored::Collection( "btag_sigZ0wrtPVofTracks",
- (*bTagLink)->auxdata< std::vector<float> >("IP3D_sigZ0wrtPVofTracks"));
+ MONITOR_BTAG_AUX_TRACK_VAR(IP3D_valD0wrtPVofTracks, float);
+ MONITOR_BTAG_AUX_TRACK_VAR(IP3D_sigD0wrtPVofTracks, float);
+ MONITOR_BTAG_AUX_TRACK_VAR(IP3D_valZ0wrtPVofTracks, float);
+ MONITOR_BTAG_AUX_TRACK_VAR(IP3D_sigZ0wrtPVofTracks, float);
auto monitor_group_for_btag_track_vars = Monitored::Group( m_monTool,
- monitor_for_btag_valD0wrtPVofTracks, monitor_for_btag_sigD0wrtPVofTracks,
- monitor_for_btag_valZ0wrtPVofTracks, monitor_for_btag_sigZ0wrtPVofTracks
+ monitor_for_IP3D_valD0wrtPVofTracks, monitor_for_IP3D_sigD0wrtPVofTracks,
+ monitor_for_IP3D_valZ0wrtPVofTracks, monitor_for_IP3D_sigZ0wrtPVofTracks
);
}
-
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h
index 8a064606bfc989a31d38c1015d2b6cc5491d6dea..9b04198988673009c09e50d41d5e3c3f9ace8599 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h
@@ -24,6 +24,18 @@
#include "AthenaMonitoringKernel/Monitored.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+#define MONITOR_BTAG_AUX_TRACK_VAR(VAR_NAME, VAR_TYPE ) \
+ auto monitor_for_##VAR_NAME = Monitored::Collection( #VAR_NAME, \
+ (*bTagLink)->auxdata< std::vector<VAR_TYPE> >( #VAR_NAME ));
+
+#define MONITOR_BTAG_AUX_VAR(VAR_NAME, VAR_TYPE, CONTAINER ) \
+ auto monitor_for_##VAR_NAME = Monitored::Collection( #VAR_NAME, CONTAINER, \
+ [](const ElementLink< xAOD::BTaggingContainer >& bTagLink) { \
+ return (*bTagLink)->auxdata<VAR_TYPE>( #VAR_NAME ); \
+ } \
+ );
+
+
class TrigBjetBtagHypoAlgMT : public TrigBjetHypoAlgBaseMT {
public:
TrigBjetBtagHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator );
@@ -37,7 +49,8 @@ class TrigBjetBtagHypoAlgMT : public TrigBjetHypoAlgBaseMT {
// online monitoring
virtual StatusCode monitor_jets( const ElementLinkVector<xAOD::JetContainer >& jetELs ) const ;
virtual StatusCode monitor_tracks( const ElementLinkVector< xAOD::TrackParticleContainer >& trackELs ) const;
- virtual StatusCode monitor_flavor_tag_variable( const ElementLinkVector< xAOD::BTaggingContainer >& bTaggingEL, const std::string& var_name) const;
+ virtual StatusCode monitor_primary_vertex( const ElementLink< xAOD::VertexContainer >& primVertexEL ) const;
+ virtual StatusCode monitor_flavor_probabilities( const ElementLinkVector< xAOD::BTaggingContainer >& bTaggingEL, const std::string& var_name) const;
virtual StatusCode monitor_btagging( const ElementLinkVector< xAOD::BTaggingContainer >& bTaggingEL ) const;
private:
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoMonitoringConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoMonitoringConfig.py
index c571b0e8ae186337641029b70691e83a2ade87af..be62d8360a9e2c69db52659587d356125528cf4d 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoMonitoringConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoMonitoringConfig.py
@@ -23,7 +23,7 @@ class TrigMultiTrkComboHypoMonitoring(GenericMonitoringTool):
defineHistogram('bphysChi2', type='TH1F', path='EXPERT', title="chi2 fit of N tracks; fit chi2 of N selected tracks", xbins=100, xmin=0, xmax=100),
defineHistogram('bphysFitMass', type='TH1F', path='EXPERT', title="fit mass of N tracks; fit mass of N selected tracks [GeV]", xbins=100, xmin=0, xmax=20),
defineHistogram('bphysMass', type='TH1F', path='EXPERT', title="mass of N tracks; mass of N selected tracks [GeV]", xbins=100, xmin=0, xmax=20),
- defineHistogram('bphysCharge', type='TH1F', path='EXPERT', title="total charge of N tracks", xbins=20, xmin=-10, xmax=10),
+ defineHistogram('bphysCharge', type='TH1F', path='EXPERT', title="total charge of N tracks; Total Charge", xbins=20, xmin=-10, xmax=10),
defineHistogram('TIME_all', type='TH1F', path='EXPERT', title='execution time; [microseconds]', xbins=100, xmin=0, xmax=1000),
]
@@ -31,9 +31,9 @@ class TrigMultiTrkComboHypoToolMonitoring(GenericMonitoringTool):
def __init__ (self, name):
super(TrigMultiTrkComboHypoToolMonitoring, self).__init__(name)
self.Histograms = [
- defineHistogram('totCharge', type='TH1F', path='EXPERT', title="Total Charge of tracks", xbins=21, xmin=-10, xmax=10),
- defineHistogram('CutCounter', type='TH1F', path='EXPERT', title="mass of track pairs; m_{#mu#mu} [GeV]", xbins=5, xmin=-0.5, xmax=4.5),
+ defineHistogram('totCharge', type='TH1F', path='EXPERT', title="Total Charge of N tracks; Total Charge", xbins=21, xmin=-10, xmax=10),
+ defineHistogram('CutCounter', type='TH1F', path='EXPERT', title="Checksum of passed cuts; N passed cuts", xbins=5, xmin=-0.5, xmax=4.5),
defineHistogram('FitChi2', type='TH1F', path='EXPERT', title="chi2 fit of N tracks; fit chi2 of N selected tracks", xbins=100, xmin=0, xmax=100),
- defineHistogram('VertexMass', type='TH1F', path='EXPERT', title="Number of tracks selected; N selected tracks", xbins=100, xmin=0, xmax=20),
- defineHistogram('trackPts', type='TH1F', path='EXPERT', title="pair mass of N tracks; pair mass of N selected tracks [GeV]", xbins=100, xmin=0, xmax=20)
+ defineHistogram('VertexMass', type='TH1F', path='EXPERT', title="mass of track pairs; m_{#mu#mu} [GeV]", xbins=100, xmin=0, xmax=20),
+ defineHistogram('trackPts', type='TH1F', path='EXPERT', title="p_{T} of tracks before cut; tracks before selection p_{T} [GeV]", xbins=100, xmin=0, xmax=40)
]
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py
index e8a6238c17f386e78642bd42d90b09af05f82e71..2d606e035e4607d23c3b9f207d39ca5273f3af5a 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py
@@ -8,7 +8,14 @@ log = logging.getLogger("TrigEgammaHypo.TrigEgammaPrecisionElectronHypoTool")
from AthenaCommon.SystemOfUnits import GeV
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import TrigElectronSelectors
-def _IncTool(name, threshold, sel):
+# isolation cuts
+IsolationCut = {
+ None: None,
+ 'ivarloose': 0.1,
+ 'ivarmedium': 0.065,
+ 'ivartight': 0.05
+ }
+def _IncTool(name, threshold, sel, iso):
log.debug('TrigEgammaPrecisionElectronHypoTool _IncTool("'+name+'", threshold = '+str(threshold) + ', sel = '+str(sel))
@@ -59,6 +66,13 @@ def _IncTool(name, threshold, sel):
# No other cuts applied
tool.dETACLUSTERthr = 9999.
tool.dPHICLUSTERthr = 9999.
+
+
+ if iso and iso != '':
+ if iso not in IsolationCut:
+ log.error('Isolation cut %s not defined!', iso)
+ log.debug('Configuring Isolation cut %s with value %d',iso,IsolationCut[iso])
+ tool.RelPtConeCut = IsolationCut[iso]
return tool
@@ -75,10 +89,14 @@ def TrigEgammaPrecisionElectronHypoToolFromDict( d ):
def __sel(cpart):
return cpart['addInfo'][0] if cpart['addInfo'] else cpart['IDinfo']
+
+ def __iso(cpart):
+ return cpart['isoInfo']
+
name = d['chainName']
- return _IncTool( name, __th( cparts[0]), __sel( cparts[0] ) )
+ return _IncTool( name, __th( cparts[0]), __sel( cparts[0] ), __iso ( cparts[0]) )
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py
index 62c0a226c6b7f3aa22f88bdc7afcdffd4302c237..eebbd4a6f6ae98322a2bc5fb5cb08a406e0135bd 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py
@@ -1,12 +1,20 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger("TrigEgammaHypo.TrigEgammaPrecisionPhotonHypoTool")
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import TrigPhotonSelectors
-def _IncTool(name, threshold, sel):
- log.debug('TrigEgammaPrecisionPhotonHypoTool _IncTool("'+name+'", threshold = '+str(threshold) + ', sel = '+str(sel))
+CaloIsolationCut = {
+ None: None,
+ 'icaloloose': 0.1,
+ 'icalomedium': 0.075,
+ 'icalotight': 0.
+ }
+
+def _IncTool(name, threshold, sel, iso):
+
+ log.debug('TrigEgammaPrecisionPhotonHypoTool _IncTool("'+name+'", threshold = '+str(threshold) + ', sel = '+str(sel)+', iso = '+str(iso))
from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaPrecisionPhotonHypoToolInc
@@ -39,6 +47,13 @@ def _IncTool(name, threshold, sel):
# configure the selector tool corresponding the selection set by sel
tool.PhotonIsEMSelector = TrigPhotonSelectors(sel)
+ if iso and iso != '':
+ if iso not in CaloIsolationCut:
+ log.error('Isolation cut %s not defined!', iso)
+ log.debug('Configuring Isolation cut %s with value %d',iso,CaloIsolationCut[iso])
+ tool.RelEtConeCut = CaloIsolationCut[iso]
+
+
return tool
@@ -52,9 +67,13 @@ def TrigEgammaPrecisionPhotonHypoToolFromDict( d ):
def __sel(cpart):
return cpart['addInfo'][0] if cpart['addInfo'] else cpart['IDinfo']
+
+ def __iso(cpart):
+ return cpart['isoInfo']
+
name = d['chainName']
- return _IncTool( name, __th( cparts[0]), __sel( cparts[0] ) )
+ return _IncTool( name, __th( cparts[0]), __sel( cparts[0] ), __iso( cparts[0]) )
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..774ae3deb10013bf6df03ba05994396656b96d03
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.cxx
@@ -0,0 +1,76 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**************************************************************************
+ **
+ ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.h
+ **
+ ** Description: - Hypothesis Tool: search for photon pairs with
+ ** deltaPhi more than a threshold value; intended for H->gg
+ **
+ ** Author: D. BakshiGupta <debottam.bakshigupta@cern.ch>
+ **
+ **************************************************************************/
+
+
+#include "TrigEgammaDPhiHypoTool.h"
+
+#include <cmath>
+
+using namespace TrigCompositeUtils;
+
+TrigEgammaDPhiHypoTool::TrigEgammaDPhiHypoTool(const std::string& type, const std::string& name, const IInterface* parent)
+ : ComboHypoToolBase(type, name, parent) {}
+
+
+StatusCode TrigEgammaDPhiHypoTool::initialize()
+{
+ ATH_MSG_DEBUG("AcceptAll = " << m_acceptAll );
+ ATH_MSG_DEBUG("ThresholdDPhiCut = " << m_thresholdDPhiCut );
+
+ if ( not m_monTool.name().empty() ) {
+ ATH_CHECK( m_monTool.retrieve() );
+ ATH_MSG_DEBUG("m_monTool name: " << m_monTool);
+ }
+
+ ATH_MSG_DEBUG("Initialization completed successfully");
+
+ return StatusCode::SUCCESS;
+}
+
+bool TrigEgammaDPhiHypoTool::executeAlg(std::vector<LegDecision> &combination) const {
+
+ auto dphiOfAccepted = Monitored::Scalar( "DphiOfAccepted" , -99 );
+ auto monitorIt = Monitored::Group( m_monTool, dphiOfAccepted);
+//retrieve the elements
+ std::vector<ElementLink<xAOD::IParticleContainer>> selected_photons;
+ for (auto el: combination){
+ auto EL= el.second;
+ auto photonLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *EL, featureString() ).link;
+ selected_photons.push_back(photonLink);
+ }
+ auto photonLink1=selected_photons[0];
+ auto photonLink2=selected_photons[1];
+ TLorentzVector hlv1 = (*photonLink1)->p4();
+ TLorentzVector hlv2 = (*photonLink2)->p4();
+ dphiOfAccepted = hlv1.DeltaPhi(hlv2);
+ ATH_MSG_DEBUG("Found two Photons with deltaPhi " <<dphiOfAccepted);
+
+ // apply the cut
+ bool pass=true;
+ if (dphiOfAccepted<m_thresholdDPhiCut){
+ ATH_MSG_DEBUG("Combination failed deltaPhi cut: " << dphiOfAccepted << " is below " << m_thresholdDPhiCut);
+ pass=false;
+ }
+
+ if (pass)
+ ATH_MSG_DEBUG( " deltaPhi " << dphiOfAccepted << " is above the threshold "<<m_thresholdDPhiCut<<" This selection passed! ");
+
+return pass;
+
+}
+
+
+
+
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..4133d609766e7f733efe7b12af461c976a178d3d
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.h
@@ -0,0 +1,75 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGEGAMMAHYPO_TRIGEGAMMADPHIHYPOTOOL_H
+#define TRIGEGAMMAHYPO_TRIGEGAMMADPHIHYPOTOOL_H
+
+/**************************************************************************
+ **
+ ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDPhiHypoTool.h
+ **
+ ** Description: - Hypothesis Tool: search for photon pairs with
+ ** deltaPhi more than a threshold value; intended for H->gg
+ **
+ ** Author: Debottam BakshiGupta <debottam.bakshigupta@cern.ch>
+ **
+ **************************************************************************/
+
+#include <string>
+#include <vector>
+
+#include "DecisionHandling/ComboHypoToolBase.h"
+
+#include "xAODTracking/TrackParticleContainer.h"
+#include "xAODTrigEgamma/TrigPhoton.h"
+#include "xAODEgamma/PhotonContainer.h"
+#include "xAODEgamma/EgammaContainer.h"
+#include "xAODBase/IParticleContainer.h"
+
+#include "TrigCompositeUtils/HLTIdentifier.h"
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
+
+#include "AthenaMonitoringKernel/Monitored.h"
+#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+
+
+/**
+ * \class TrigEgammaDPhiHypoTool
+ * \brief TrigEgammaDPhiHypoTool is a ComboHypoTool that calculates the deltaPhi distance
+ * Apply the threshold cut and accepts the event if condition is
+ * satisfied
+ *
+ */
+
+
+class TrigEgammaDPhiHypoTool: public ComboHypoToolBase {
+
+ public:
+
+ TrigEgammaDPhiHypoTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ virtual ~TrigEgammaDPhiHypoTool() {};
+ virtual StatusCode initialize() override;
+
+
+ private:
+
+ virtual bool executeAlg(std::vector<LegDecision>& thecomb) const override;
+
+ // flags
+ Gaudi::Property< bool > m_acceptAll {this, "AcceptAll", false, "Ignore selection" };
+
+ // cuts
+ Gaudi::Property<float> m_thresholdDPhiCut {this,"ThresholdDPhiCut", 1.5, "minimum deltaPhi required between two photons"};
+
+ // monitoring
+ ToolHandle<GenericMonitoringTool> m_monTool { this, "MonTool", "", "Monitoring tool" };
+
+}; // TRIGEGAMMAHYPO_TRIGEGAMMADPHIHYPOTOOL_H
+#endif
+
+
+
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.cxx
similarity index 57%
rename from Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.cxx
index 136668950ef97a470a11e4402ef43b8fc53c6309..f54cb97af906092d7816c55980268d3b0af4aa65 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.cxx
@@ -4,7 +4,7 @@
/**************************************************************************
**
- ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
+ ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.h
**
** Description: - Hypothesis Tool: search for electron pairs with
** invariant mass in some interval; intended for Z->ee
@@ -19,17 +19,17 @@
**************************************************************************/
-#include "TrigEgammaDielectronMassHypoTool.h"
+#include "TrigEgammaMassHypoTool.h"
#include <cmath>
using namespace TrigCompositeUtils;
-TrigEgammaDielectronMassHypoTool::TrigEgammaDielectronMassHypoTool(const std::string& type, const std::string& name, const IInterface* parent)
+TrigEgammaMassHypoTool::TrigEgammaMassHypoTool(const std::string& type, const std::string& name, const IInterface* parent)
: ComboHypoToolBase(type, name, parent) {}
-StatusCode TrigEgammaDielectronMassHypoTool::initialize()
+StatusCode TrigEgammaMassHypoTool::initialize()
{
ATH_MSG_DEBUG("AcceptAll = " << m_acceptAll );
ATH_MSG_DEBUG("LowerMassCut = " << m_lowerMassElectronClusterCut );
@@ -45,31 +45,33 @@ StatusCode TrigEgammaDielectronMassHypoTool::initialize()
return StatusCode::SUCCESS;
}
-bool TrigEgammaDielectronMassHypoTool::executeAlg(std::vector<LegDecision> &combination) const {
+bool TrigEgammaMassHypoTool::executeAlg(std::vector<LegDecision> &combination) const {
+ auto massOfAccepted = Monitored::Scalar( "MassOfAccepted" , -1.0 );
+ auto monitorIt = Monitored::Group( m_monTool, massOfAccepted);
-//retrieve the electrons
- std::vector<ElementLink<xAOD::ElectronContainer>> selected_electrons;
+//retrieve the elements
+ std::vector<ElementLink<xAOD::IParticleContainer>> selected_electrons;
for (auto el: combination){
auto EL= el.second;
- auto electronLink = TrigCompositeUtils::findLink<xAOD::ElectronContainer>( *EL, featureString() ).link;
+ auto electronLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *EL, featureString() ).link;
selected_electrons.push_back(electronLink);
}
auto electronLink1=selected_electrons[0];
auto electronLink2=selected_electrons[1];
TLorentzVector hlv1 = (*electronLink1)->p4();
TLorentzVector hlv2 = (*electronLink2)->p4();
- double mass = (hlv1+hlv2).M();
- ATH_MSG_DEBUG("Found two Electrons with mass " <<mass);
+ massOfAccepted = (hlv1+hlv2).M();
+ ATH_MSG_DEBUG("Found two Electrons with mass " <<massOfAccepted);
// apply the cut
bool pass=true;
- if (mass<m_lowerMassElectronClusterCut || mass>m_upperMassElectronClusterCut){
- ATH_MSG_DEBUG("Combination failed mass cut: " << mass << " not in [" << m_lowerMassElectronClusterCut << "," << m_upperMassElectronClusterCut << "]");
+ if (massOfAccepted < m_lowerMassElectronClusterCut || massOfAccepted > m_upperMassElectronClusterCut){
+ ATH_MSG_DEBUG("Combination failed mass cut: " << massOfAccepted << " not in [" << m_lowerMassElectronClusterCut << "," << m_upperMassElectronClusterCut << "]");
pass=false;
}
if (pass)
- ATH_MSG_DEBUG( " Invariant mass " << mass << " is within [" <<m_lowerMassElectronClusterCut<< "," << m_upperMassElectronClusterCut << "] This seleciton passed! ");
+ ATH_MSG_DEBUG( " Invariant mass " << massOfAccepted << " is within [" <<m_lowerMassElectronClusterCut<< "," << m_upperMassElectronClusterCut << "] This selection passed! ");
return pass;
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.h
similarity index 80%
rename from Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
rename to Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.h
index 424dea96b825cbe1773d9ff98540fd1b925d298a..f64ac521ba7f57502c3c3df5bddfb8a0295619bf 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TRIGEGAMMAHYPO_TRIGEGAMMADIELECTRONMASSHYPOTOOL_H
-#define TRIGEGAMMAHYPO_TRIGEGAMMADIELECTRONMASSHYPOTOOL_H
+#ifndef TRIGEGAMMAHYPO_TRIGEGAMMAMASSHYPOTOOL_H
+#define TRIGEGAMMAHYPO_TRIGEGAMMAMASSHYPOTOOL_H
/**************************************************************************
**
- ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
+ ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.h
**
** Description: - Hypothesis Tool: search for electron pairs with
** invariant mass in some interval; intended for Z->ee
@@ -29,6 +29,7 @@
#include "xAODTracking/TrackParticleContainer.h"
#include "xAODTrigEgamma/TrigElectron.h"
#include "xAODEgamma/ElectronContainer.h"
+#include "xAODBase/IParticleContainer.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
@@ -38,23 +39,23 @@
/**
- * \class TrigEgammaDielectronMassHypoTool
- * \brief TrigEgammaDielectronMassHypoTool is a ComboHypoTool that calculates the inv mass
+ * \class TrigEgammaMassHypoTool
+ * \brief TrigEgammaMassHypoTool is a ComboHypoTool that calculates the inv mass
* Apply inv mass cuts (upper and lower cut) to the two electrons and accepts the event if condition is
* satisfied
*
*/
-class TrigEgammaDielectronMassHypoTool: public ComboHypoToolBase {
+class TrigEgammaMassHypoTool: public ComboHypoToolBase {
public:
- TrigEgammaDielectronMassHypoTool(const std::string& type,
+ TrigEgammaMassHypoTool(const std::string& type,
const std::string& name,
const IInterface* parent);
- virtual ~TrigEgammaDielectronMassHypoTool() {};
+ virtual ~TrigEgammaMassHypoTool() {};
virtual StatusCode initialize() override;
@@ -73,7 +74,7 @@ class TrigEgammaDielectronMassHypoTool: public ComboHypoToolBase {
ToolHandle<GenericMonitoringTool> m_monTool { this, "MonTool", "", "Monitoring tool" };
-}; // TRIGEGAMMAHYPO_TRIGEGAMMADIELECTRONMASSHYPOTOOL_H
+}; // TRIGEGAMMAHYPO_TRIGEGAMMAMASSHYPOTOOL_H
#endif
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx
index 284c40895c2ce013ed11883e6cccff06a57bad13..2aa52f195167ddd5bbe0615639b5cafcfc7f8fd2 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.cxx
@@ -20,6 +20,7 @@ TrigEgammaPrecisionElectronHypoToolInc::TrigEgammaPrecisionElectronHypoToolInc(
m_decisionId( HLT::Identifier::fromToolName( name ) )
{
declareProperty("ElectronLHSelector" ,m_egammaElectronLHTool );
+ declareProperty("RelPtConeCut" ,m_RelPtConeCut=-999.);
}
StatusCode TrigEgammaPrecisionElectronHypoToolInc::initialize() {
@@ -62,24 +63,21 @@ bool TrigEgammaPrecisionElectronHypoToolInc::decide( const ITrigEgammaPrecisionE
bool pass = false;
- // Likelihood output
- std::vector<float> lhval_monitored;
- // Lumi monitoring
- std::vector<double> avgmu_monitored;
-
auto ET = Monitored::Scalar( "Et_em" , -1.0 );
- auto dEta = Monitored::Scalar( "dEta", -1. );
+ auto dEta = Monitored::Scalar( "dEta", -1. );
auto dPhi = Monitored::Scalar( "dPhi", -1. );
auto etaBin = Monitored::Scalar( "EtaBin", -1. );
- auto monEta = Monitored::Scalar( "Eta", -99. );
+ auto monEta = Monitored::Scalar( "Eta", -99. );
auto monPhi = Monitored::Scalar( "Phi", -99. );
auto PassedCuts = Monitored::Scalar<int>( "CutCounter", -1 );
- auto mon_lhval = Monitored::Collection("LikelihoodRatio", lhval_monitored);
- auto mon_mu = Monitored::Collection("mu", avgmu_monitored);
+ auto mon_lhval = Monitored::Scalar("LikelihoodRatio", -99.);
+ auto mon_mu = Monitored::Scalar("mu", -1.);
+ auto mon_ptcone20 = Monitored::Scalar("ptcone20", -99.);
+ auto mon_relptcone20 = Monitored::Scalar("ptcone20", -99.);
auto monitorIt = Monitored::Group( m_monTool,
dEta, dPhi,
etaBin, monEta,
- monPhi,PassedCuts,mon_lhval,mon_mu);
+ monPhi,PassedCuts,mon_lhval,mon_mu, mon_ptcone20, mon_relptcone20);
// when leaving scope it will ship data to monTool
PassedCuts = PassedCuts + 1; //got called (data in place)
@@ -168,14 +166,14 @@ bool TrigEgammaPrecisionElectronHypoToolInc::decide( const ITrigEgammaPrecisionE
if(eventInfoDecor.isPresent()) {
avg_mu = eventInfoDecor(0);
ATH_MSG_DEBUG("Average mu " << avg_mu);
- avgmu_monitored.push_back(avg_mu);
+ mon_mu = avg_mu;
asg::AcceptData accept = m_egammaElectronLHTool->accept(ctx,input.electron,avg_mu);
pass = (bool) accept;
// Monitor the LH value
lhval=m_egammaElectronLHTool->calculate(ctx, input.electron,avg_mu);
ATH_MSG_DEBUG("LHValue with avgmu " << lhval);
- lhval_monitored.push_back(lhval);
+ mon_lhval = lhval;
}
else{
ATH_MSG_WARNING("EventInfo decoration not available!");
@@ -184,15 +182,12 @@ bool TrigEgammaPrecisionElectronHypoToolInc::decide( const ITrigEgammaPrecisionE
// Monitor the LH value
lhval=m_egammaElectronLHTool->calculate(ctx, input.electron);
ATH_MSG_DEBUG("LHValue without avgmu " << lhval);
- lhval_monitored.push_back(lhval);
+ mon_lhval = lhval;
}
- ATH_MSG_DEBUG("AthenaLHSelectorTool: TAccept = " << pass);
-
-
float Rhad1(0), Rhad(0), Reta(0), Rphi(0), e277(0), weta2c(0), //emax2(0),
Eratio(0), DeltaE(0), f1(0), weta1c(0), wtot(0), fracm(0);
- float ptcone20(999), ptcone30(999), ptcone40(999), etcone20(999), etcone30(999), etcone40(999), topoetcone20(999), topoetcone30(999), topoetcone40(999);
+ float ptcone20(999), ptcone30(999), ptcone40(999), etcone20(999), etcone30(999), etcone40(999), topoetcone20(999), topoetcone30(999), topoetcone40(999), relptcone20(999);
// variables based on HCAL
@@ -270,14 +265,33 @@ bool TrigEgammaPrecisionElectronHypoToolInc::decide( const ITrigEgammaPrecisionE
ATH_MSG_DEBUG( " topoetcone20 " << topoetcone20 ) ;
ATH_MSG_DEBUG( " topoetcone30 " << topoetcone30 ) ;
ATH_MSG_DEBUG( " topoetcone40 " << topoetcone40 ) ;
-
-
+ // Monitor showershapes
+ mon_ptcone20 = ptcone20;
+ relptcone20 = ptcone20/input.electron->pt();
+ ATH_MSG_DEBUG("relptcone20 = " <<relptcone20 );
+ mon_relptcone20 = relptcone20;
+ ATH_MSG_DEBUG("m_RelPtConeCut = " << m_RelPtConeCut );
+
+ // Evaluating lh *after* retrieving variables for monitoing and debuging purposes
+ ATH_MSG_DEBUG("AthenaLHSelectorTool: TAccept = " << pass);
if ( !pass ){
ATH_MSG_DEBUG("REJECT Likelihood failed");
+ return pass;
} else {
ATH_MSG_DEBUG("ACCEPT Likelihood passed");
}
+ // Check if need to apply isolation
+ // First check logic. if cut is very negative, then no isolation cut is defined
+ // if m_RelPtConeCut <-100 then hypo is configured not to apply isolation
+ if (m_RelPtConeCut < -100){
+ ATH_MSG_DEBUG(" not applying isolation. Returning NOW");
+ ATH_MSG_DEBUG("TAccept = " << pass);
+ return pass;
+ }
+ // Then, It will pass if relptcone20 is less than cut:
+ pass = (relptcone20 < m_RelPtConeCut);
+ //
// Reach this point successfully
ATH_MSG_DEBUG( "pass = " << pass );
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h
index c4c37d3e3cc903b3ce9ed78f372996d580c5e251..f39964f8e3816eb057b7ac501cc51fc470400ebc 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoToolInc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGEGAMMAHYPO_TRIGPRECISIONELECTRONPRECISIONHYPOTOOLINC_H
#define TRIGEGAMMAHYPO_TRIGPRECISIONELECTRONPRECISIONHYPOTOOLINC_H 1
@@ -50,6 +50,9 @@ class TrigEgammaPrecisionElectronHypoToolInc : public extends<AthAlgTool, ITrigE
/*Likelihood tool*/
ToolHandle<IAsgElectronLikelihoodTool> m_egammaElectronLHTool;
+
+ /* TRack isolation cut */
+ float m_RelPtConeCut;
/*Luminosity info*/
SG::ReadDecorHandleKey<xAOD::EventInfo> m_avgMuKey { this, "AveIntPerXKey", "EventInfo.AveIntPerXDecor", "Decoration for Average Interaction Per Crossing" };
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx
index d3c6bbc166589e5341812f54522dca0982acd6f4..fa119ef3cf7224e6aa1f86339e29c77115e7e165 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include <algorithm>
@@ -17,6 +17,8 @@ TrigEgammaPrecisionPhotonHypoToolInc::TrigEgammaPrecisionPhotonHypoToolInc( cons
: base_class( type, name, parent ),
m_decisionId( HLT::Identifier::fromToolName( name ) ) {
declareProperty("PhotonIsEMSelector" ,m_egammaPhotonCutIDTool );
+ declareProperty("RelEtConeCut" ,m_RelEtConeCut=-999.);
+
}
StatusCode TrigEgammaPrecisionPhotonHypoToolInc::initialize() {
@@ -35,6 +37,10 @@ StatusCode TrigEgammaPrecisionPhotonHypoToolInc::initialize() {
ATH_MSG_DEBUG( "Retrieving egammaPhotonCutIDTool..." );
CHECK( m_egammaPhotonCutIDTool.retrieve() );
+ // Retrieving Luminosity info
+ ATH_MSG_DEBUG( "Retrieving luminosityCondData..." );
+ ATH_CHECK( m_avgMuKey.initialize() );
+
unsigned int nEtaBin = m_etabin.size();
#define CHECK_SIZE( __n) if ( m_##__n.size() != (nEtaBin - 1) ) \
{ ATH_MSG_DEBUG(" __n size is " << m_##__n.size() << " but needs to be " << (nEtaBin - 1) ); return StatusCode::FAILURE; }
@@ -63,11 +69,14 @@ bool TrigEgammaPrecisionPhotonHypoToolInc::decide( const ITrigEgammaPrecisionPho
auto etaBin = Monitored::Scalar( "EtaBin", -1. );
auto monEta = Monitored::Scalar( "Eta", -99. );
auto monPhi = Monitored::Scalar( "Phi", -99. );
+ auto mon_mu = Monitored::Scalar("mu", -1.);
+ auto mon_etcone20 = Monitored::Scalar("etcone20", -99.);
+ auto mon_reletcone20 = Monitored::Scalar("reletcone20", -99.);
auto PassedCuts = Monitored::Scalar<int>( "CutCounter", -1 );
auto monitorIt = Monitored::Group( m_monTool, ET,
dEta, dPhi,
etaBin, monEta,
- monPhi,PassedCuts );
+ monPhi, mon_mu, mon_etcone20, mon_reletcone20, PassedCuts );
// when leaving scope it will ship data to monTool
PassedCuts = PassedCuts + 1; //got called (data in place)
@@ -146,10 +155,19 @@ bool TrigEgammaPrecisionPhotonHypoToolInc::decide( const ITrigEgammaPrecisionPho
std::bitset<32> isEMdecision = m_egammaPhotonCutIDTool->accept(input.photon).getCutResultInvertedBitSet();
ATH_MSG_DEBUG("isEM Result bitset: " << isEMdecision);
+ // get average luminosity information to calculate LH
+
+ float avg_mu = 0;
+ SG::ReadDecorHandle<xAOD::EventInfo,float> eventInfoDecor(m_avgMuKey);
+ if(eventInfoDecor.isPresent()) {
+ avg_mu = eventInfoDecor(0);
+ ATH_MSG_DEBUG("Average mu " << avg_mu);
+ mon_mu = avg_mu;
+ }
float Rhad1(0), Rhad(0), Reta(0), Rphi(0), e277(0), weta2c(0), //emax2(0),
Eratio(0), DeltaE(0), f1(0), weta1c(0), wtot(0), fracm(0);
- float ptcone20(999), ptcone30(999), ptcone40(999), etcone20(999), etcone30(999), etcone40(999), topoetcone20(999), topoetcone30(999), topoetcone40(999);
+ float ptcone20(999), ptcone30(999), ptcone40(999), etcone20(999), etcone30(999), etcone40(999), topoetcone20(999), topoetcone30(999), topoetcone40(999), reletcone20(999);
// variables based on HCAL
@@ -223,6 +241,12 @@ bool TrigEgammaPrecisionPhotonHypoToolInc::decide( const ITrigEgammaPrecisionPho
ATH_MSG_DEBUG( " topoetcone20 " << topoetcone20 ) ;
ATH_MSG_DEBUG( " topoetcone30 " << topoetcone30 ) ;
ATH_MSG_DEBUG( " topoetcone40 " << topoetcone40 ) ;
+ // Monitor showershapes
+ mon_etcone20 = etcone20;
+ reletcone20 = etcone20/input.photon->caloCluster()->et();
+ ATH_MSG_DEBUG("reletcone20 = " <<reletcone20 );
+ mon_reletcone20 = reletcone20;
+ ATH_MSG_DEBUG("m_RelEtConeCut = " << m_RelEtConeCut );
// Decode isEM bits of result to see which bits passed and which bits fialed
@@ -230,9 +254,25 @@ bool TrigEgammaPrecisionPhotonHypoToolInc::decide( const ITrigEgammaPrecisionPho
if ( !pass ){
ATH_MSG_DEBUG("REJECT isEM failed");
+ return pass;
} else {
ATH_MSG_DEBUG("ACCEPT isEM passed");
}
+ // Check if need to apply isolation
+ // First check logic. if cut is very negative, then no isolation cut is defined
+ // if m_RelEtConeCut <-100 then hypo is configured not to apply isolation
+ if (m_RelEtConeCut < -100){
+ ATH_MSG_DEBUG(" not applying isolation. Returning NOW");
+ ATH_MSG_DEBUG("TAccept = " << pass);
+ return pass;
+ }
+ // Then, It will pass if reletcone20 is less than cut:
+ pass = (reletcone20 < m_RelEtConeCut);
+ //
+ // Reach this point successfully
+ ATH_MSG_DEBUG( "pass = " << pass );
+
+ return pass;
// Reach this point successfully
ATH_MSG_DEBUG( "pass = " << pass );
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h
index 952b6ebb0070566855f4cc36692aaab589dc68ab..2a31172ff82aac24514fdde9b4642c3719dbe7ce 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoToolInc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGEGAMMAHYPO_TRIGPRECISIONPHOTONHYPOTOOLINC_H
#define TRIGEGAMMAHYPO_TRIGPRECISIONPHOTONHYPOTOOLINC_H 1
@@ -16,6 +16,7 @@
#include "ITrigEgammaPrecisionPhotonHypoTool.h"
#include "PATCore/AcceptData.h"
#include "EgammaAnalysisInterfaces/IAsgPhotonIsEMSelector.h"
+#include "StoreGate/ReadDecorHandle.h"
/**
* @class Implementation of the Egamma selection for Photons
@@ -44,8 +45,14 @@ class TrigEgammaPrecisionPhotonHypoToolInc : public extends<AthAlgTool, ITrigEga
Gaudi::Property< float > m_detacluster { this, "dETACLUSTERthr", 0. , "" };
Gaudi::Property< float > m_dphicluster { this, "dPHICLUSTERthr", 0. , "" };
+ /* Calo isolation cut */
+ float m_RelEtConeCut;
+
ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
ToolHandle<IAsgPhotonIsEMSelector> m_egammaPhotonCutIDTool;
+/*Luminosity info*/
+ SG::ReadDecorHandleKey<xAOD::EventInfo> m_avgMuKey { this, "AveIntPerXKey", "EventInfo.AveIntPerXDecor", "Decoration for Average Interaction Per Crossing" };
+
int findCutIndex( float eta ) const;
};
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
index c86f08703b724c4b1654307eb764edfdd034cf00..07f91d74934353e19d2218be9fb416383aa1ae40 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
@@ -26,7 +26,8 @@
#include "../TrigEgammaPrecisionCaloHypoAlgMT.h"
#include "../TrigEgammaPrecisionPhotonHypoAlgMT.h"
#include "../TrigEgammaPrecisionElectronHypoAlgMT.h"
-#include "../TrigEgammaDielectronMassHypoTool.h"
+#include "../TrigEgammaMassHypoTool.h"
+#include "../TrigEgammaDPhiHypoTool.h"
DECLARE_COMPONENT( TrigL2CaloHypo )
DECLARE_COMPONENT( TrigL2ElectronFex )
@@ -56,5 +57,5 @@ DECLARE_COMPONENT( TrigEgammaFastPhotonHypoTool )
DECLARE_COMPONENT( TrigEgammaPrecisionCaloHypoAlgMT )
DECLARE_COMPONENT( TrigEgammaPrecisionPhotonHypoAlgMT )
DECLARE_COMPONENT( TrigEgammaPrecisionElectronHypoAlgMT )
-DECLARE_COMPONENT( TrigEgammaDielectronMassHypoTool )
-
+DECLARE_COMPONENT( TrigEgammaMassHypoTool )
+DECLARE_COMPONENT( TrigEgammaDPhiHypoTool )
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
index 53f9ec62020b7b0b3121b168676f6778461494f3..28a2d7923e65bd45fd4dd36c6a6d8b85764ca4f1 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
@@ -129,6 +129,25 @@ def trigJetHypoToolFromDict(chain_dict):
return tool
+def trigJetTLAHypoToolFromDict(chain_dict):
+ """Produce a TLA jet trigger hypo tool from a chainDict"""
+
+ log.info('trigJetTLAHypoToolFromDict chainDict %s', str(chain_dict))
+
+ chain_name = chain_dict['chainName']
+ tool = CompFactory.TrigJetTLAHypoToolMT(name=chain_name)
+
+ # obtain a Helper Tool (possibly a tree of tools) to
+ # make the hypo decision.
+ # CD: why do we do this? Question to TJ
+ tool.helper_tool = trigJetHypoToolHelperFromDict(chain_dict)
+
+ # controls whether debug visitor is sent to helper tool
+ debug = False # SET TO False WHEN COMMITTING
+ tool.visit_debug = debug
+ log.debug('%s', tool)
+
+ return tool
import unittest
class TestStringMethods(unittest.TestCase):
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlgMT.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..894cc90bcbe6a4529d4137d4db82a698f16aa1bc
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlgMT.cxx
@@ -0,0 +1,124 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+#include <algorithm>
+#include "Gaudi/Property.h"
+#include "TrigJetTLAHypoAlgMT.h"
+#include "TrigCompositeUtils/HLTIdentifier.h"
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
+
+
+using namespace TrigCompositeUtils;
+
+using xAOD::JetContainer;
+
+TrigJetTLAHypoAlgMT::TrigJetTLAHypoAlgMT( const std::string& name,
+ ISvcLocator* pSvcLocator ) :
+ ::HypoBase( name, pSvcLocator ) {
+
+ }
+
+
+StatusCode TrigJetTLAHypoAlgMT::initialize() {
+ CHECK( m_hypoTools.retrieve() );
+
+ CHECK( m_TLAjetsKey.initialize() );
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode TrigJetTLAHypoAlgMT::execute( const EventContext& context ) const {
+
+ ATH_MSG_DEBUG ( "Executing " << name() << "..." );
+
+ // get the HLT decision container for the previous decisions (one per jet in the original collection)
+
+ ATH_MSG_DEBUG("Retrieving HLT decision \"" << decisionInput().key() << "\"");
+ auto previousDecisionsHandle = SG::makeHandle(decisionInput(), context );
+ ATH_CHECK(previousDecisionsHandle.isValid());
+ const DecisionContainer* prevDecisions = previousDecisionsHandle.get();
+
+ // read in the TLA jets collection, and obtain a bare pointer to it
+
+ ATH_MSG_DEBUG("Retrieving jets from the TLA container \"" << m_TLAjetsKey << "\"");
+ auto TLAJetsHandle = SG::makeHandle(m_TLAjetsKey, context );
+ ATH_CHECK(TLAJetsHandle.isValid());
+ const JetContainer* TLAjets = TLAJetsHandle.get();
+
+
+ //this is to check that we don't have TLA jet containers without any previous associated decision
+ bool atLeastOneDecision = false;
+
+ //container for output decisions
+ SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context);
+ DecisionContainer* outputDecisions = outputHandle.ptr();
+
+ //information to pass to hypoTool: jet pointer and decision
+ std::vector<std::pair<const xAOD::Jet*,Decision*>> jetHypoInputs;
+
+ //since the two aren't necessarily index-parallel, we need to match the previous decisions to the new jets
+ //loop on the TLA container jets
+ for (const xAOD::Jet* TLAjet : *TLAjets) {
+
+ bool associatedWithPreviousStep = false;
+ const Decision* previousDecision = nullptr;
+ for (const Decision* testDecision : *prevDecisions) {
+
+ //deltaR-match the jet attached from the previous decision
+
+ TrigCompositeUtils::LinkInfo< xAOD::JetContainer > myFeature = TrigCompositeUtils::findLink< xAOD::JetContainer >( testDecision, TrigCompositeUtils::featureString());
+ ATH_CHECK( myFeature.isValid() );
+ const xAOD::Jet* testJet = *(myFeature.link);
+
+ //check the deltaR between this jet and the TLA jet we're testing
+ //use a tight (?) deltaR = 0.1 matching as they should be the same jet
+ if ( testJet->p4().DeltaR(TLAjet->p4()) < 0.1 ) {
+ //if they match, set the bools to True
+ previousDecision = testDecision;
+ associatedWithPreviousStep = true;
+ atLeastOneDecision = true;
+
+ //prepare the necessary information to the HypoTool:
+ // - the new decision
+ Decision* newDecision = TrigCompositeUtils::newDecisionIn(outputDecisions, previousDecision, "", context);
+ // - the ElementLink to the TLA-jet
+ ElementLink<xAOD::JetContainer> jetLink = ElementLink<xAOD::JetContainer>(*TLAjets, TLAjet->index());
+ ATH_CHECK( jetLink.isValid() );
+ // - associate the two
+ newDecision->setObjectLink<xAOD::JetContainer>(featureString(), jetLink);
+ // - put in the vector that will eventually be handed off to the HypoTool
+ jetHypoInputs.push_back( std::make_pair(TLAjet, newDecision) );
+
+ } // end check on whether this TLA-jet corresponds to this decision-jet
+
+ //if the jet has found a decision, move onto the next jet
+ if (associatedWithPreviousStep) break;
+
+ }//end loop on decisions
+
+ }//end loop on TLA jets
+
+ // check that this jet collection has a previous decision (at least one has to have it, otherwise trigger navigation doesn't work)
+ if (!atLeastOneDecision) {
+
+ ATH_MSG_ERROR("Unable to associate a previous decision to any jet in the vector of TLA jets.\
+ The chain seeding the TLA selector should have at least one jet contributing to the decision that fulfills the requirements of the TLA jets saved in the stream.\
+ If this is not the case, please contact the developers.");
+ return StatusCode::FAILURE;
+
+ }//end if on at least one decision in this jet collection
+
+ for (const auto& tool: m_hypoTools) {
+
+ ATH_MSG_DEBUG("Now computing decision for " << tool->name());
+ CHECK(tool->decide(jetHypoInputs));
+
+ }//end loop on hypoTools
+
+ //extra run-time checks
+ ATH_CHECK( hypoBaseOutputProcessing(outputHandle) );
+
+ return StatusCode::SUCCESS;
+
+}//end execute
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlgMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlgMT.h
new file mode 100644
index 0000000000000000000000000000000000000000..7b955851121576482fb551206edbfb1b740685e3
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoAlgMT.h
@@ -0,0 +1,48 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+*/
+
+#ifndef TrigHLTJetHypo_TrigJetTLAHypoAlgMT_H
+#define TrigHLTJetHypo_TrigJetTLAHypoAlgMT_H
+
+#include <string>
+
+#include "TrigJetTLAHypoAlgMT.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "xAODJet/JetContainer.h"
+
+#include "DecisionHandling/HypoBase.h"
+
+#include "TrigJetTLAHypoToolMT.h"
+
+/**
+ * @class TrigJetTLAHypoAlgMT
+ * @brief HypoAlg for TLA algorithm
+ * @details HypoAlg needed to associate trigger navigation to jets seleected for writing out by TLA algorithm
+ * @author Antonio Boveia
+ * @author Caterina Doglioni
+ * @author Teng Jian Khoo
+ * @author Tim Martin
+ * @author Rafal Bielski
+ **/
+
+class TrigJetTLAHypoAlgMT : public ::HypoBase {
+ public:
+
+ TrigJetTLAHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator );
+
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute( const EventContext& context ) const override;
+
+ private:
+
+ ToolHandleArray<TrigJetTLAHypoToolMT> m_hypoTools {
+ this, "HypoTools", {}, "Hypo tools"};
+
+ SG::ReadHandleKey< xAOD::JetContainer > m_TLAjetsKey {
+ this, "Jets", "Jets", "TLA jet container key"};
+
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoToolMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoToolMT.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..1f70667eb3e1d049176115bfe94a6c26f949bf8d
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoToolMT.cxx
@@ -0,0 +1,101 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// ********************************************************************
+//
+// NAME: TrigJetTLAHypoToolMT.cxx
+// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
+//
+//
+// ********************************************************************
+
+#include "TrigJetTLAHypoToolMT.h"
+#include "TrigJetHypoToolHelperMT.h"
+
+#include "GaudiKernel/StatusCode.h"
+
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/lineSplitter.h"
+#include "./DebugInfoCollector.h"
+#include "./xAODJetCollector.h"
+
+#include "TrigCompositeUtils/HLTIdentifier.h"
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
+#include "xAODTrigger/TrigCompositeContainer.h"
+
+using TrigCompositeUtils::DecisionID;
+using TrigCompositeUtils::Decision;
+using TrigCompositeUtils::DecisionContainer;
+using TrigCompositeUtils::DecisionIDContainer;
+using TrigCompositeUtils::decisionIDs;
+
+TrigJetTLAHypoToolMT::TrigJetTLAHypoToolMT(const std::string& type,
+ const std::string& name,
+ const IInterface* parent) :
+ AthAlgTool(type, name, parent),
+ m_decisionId(HLT::Identifier::fromToolName(name)){
+
+}
+
+
+TrigJetTLAHypoToolMT::~TrigJetTLAHypoToolMT(){
+}
+
+StatusCode TrigJetTLAHypoToolMT::initialize(){
+ DebugInfoCollector collector(name());
+ CHECK(m_helper->getDescription(collector));
+ auto s = collector.toString();
+
+ for(const auto& l : lineSplitter(s)){
+ ATH_MSG_INFO(l);
+ }
+
+ if (m_visitDebug){
+ collector.write();
+ }
+ return StatusCode::SUCCESS;
+}
+
+StatusCode TrigJetTLAHypoToolMT::finalize(){
+ return StatusCode::SUCCESS;
+}
+
+StatusCode
+TrigJetTLAHypoToolMT::decide(std::vector<JetDecision>& jetHypoInputs) const {
+
+ int decision_count=0;
+
+ std::unique_ptr<ITrigJetHypoInfoCollector> infocollector(nullptr);
+
+ // jet hypo inputs:
+ // pairs of const xAOD::Jet* (first) and mutable Decision* (second)
+
+ for (auto& pair : jetHypoInputs) {
+
+ //check that the previous decision comes from the appropriate chain
+ DecisionIDContainer previousDecisionIDs;
+ const auto previousDecisionEL = TrigCompositeUtils::getLinkToPrevious(pair.second).at(0); // We know that the parent HypoAlg added exactly one parent.
+ decisionIDs(*previousDecisionEL, previousDecisionIDs);
+ //check that the previous decision corresponding to this decisionId was positive
+ if ( previousDecisionIDs.count( m_decisionId.numeric() ) > 0) {
+ TrigCompositeUtils::addDecisionID(getId().numeric(), pair.second);
+ ++decision_count;
+ }
+ }
+
+
+ std::string msg = "TrigJetTLAHypoToolMT: Passthrough decision count " + std::to_string(decision_count);
+
+ ATH_MSG_DEBUG(msg);
+
+ if (infocollector){
+ infocollector->collect("TrigJetTLAHypoToolMT", msg);
+ infocollector->write();
+ }
+ return StatusCode::SUCCESS;
+}
+
+const HLT::Identifier& TrigJetTLAHypoToolMT::getId() const{
+ return m_decisionId;
+}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoToolMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoToolMT.h
new file mode 100644
index 0000000000000000000000000000000000000000..0639004ac532c5695afc9f3448099f88674705cd
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetTLAHypoToolMT.h
@@ -0,0 +1,69 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+#ifndef TRIGJETTLAHYPOTOOLMT_H
+#define TRIGJETTLAHYPOTOOLMT_H
+/********************************************************************
+ *
+ * NAME: TrigJetTLAHypoToolMT.h
+ * PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
+ *
+ * * @class TrigJetTLAHypoToolMT
+ * * @brief HypoTool for TLA algorithm
+ * * @details HypoTool needed to associate trigger navigation to jets seleected for writing out by TLA algorithm
+ * * @author Antonio Boveia
+ * * @author Caterina Doglioni
+ * * @author Teng Jian Khoo
+ * * @author Tim Martin
+ * * @author Rafal Bielski
+ *
+ *
+ ********************************************************************/
+
+#include "TrigCompositeUtils/HLTIdentifier.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
+#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+
+#include "TrigHLTJetHypo/ITrigJetHypoToolHelperMT.h"
+
+#include "xAODEventInfo/EventInfo.h"
+#include "xAODJet/JetContainer.h"
+
+class TrigJetTLAHypoToolMT: public AthAlgTool{
+
+ public:
+
+ TrigJetTLAHypoToolMT(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ ~TrigJetTLAHypoToolMT();
+ StatusCode initialize();
+ StatusCode finalize();
+
+ // typedef for passing jet - decision object assocation
+ using JetDecision = std::pair<const xAOD::Jet*,TrigCompositeUtils::Decision*>;
+
+ StatusCode
+ decide(std::vector<JetDecision>& jetHypoInputs) const;
+
+ const HLT::Identifier& getId() const;
+
+ private:
+
+ // Identifier is used to keep track of which tool made which decision.
+ // The information is stored in the event store.
+ HLT::Identifier m_decisionId;
+
+ ToolHandle<ITrigJetHypoToolHelperMT> m_helper {
+ this, "helper_tool", {}, "Jet hypo helper AlgTool"};
+
+ Gaudi::Property<bool>
+ m_visitDebug {this, "visit_debug", false, "debug flag"};
+
+
+
+};
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
index 7bac3f6c859eb47d55528c833f1d7b67833b3eb9..4a5ea51baf2b5e5c4f2f58ca5f467ba50e892333 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
@@ -42,6 +42,8 @@
#include "../OrHelperTool.h"
#include "../TrigJetHypoToolMT.h"
#include "../TrigJetHypoToolHelperMT.h"
+#include "../TrigJetTLAHypoAlgMT.h"
+#include "../TrigJetTLAHypoToolMT.h"
#include "../CombinationsHelperTool.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/BasicCleanerTool.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/AntiCleanerTool.h"
@@ -51,6 +53,7 @@
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/NullCleanerTool.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/TightCleanerTool.h"
+
DECLARE_COMPONENT(TrigHLTJetHypo2)
DECLARE_COMPONENT(TrigEFRazorAllTE)
@@ -91,6 +94,8 @@ DECLARE_COMPONENT(TrigJetConditionConfig_qjet_mass)
DECLARE_COMPONENT(TrigJetHypoAlgMT)
DECLARE_COMPONENT(TrigJetHypoToolMT)
+DECLARE_COMPONENT(TrigJetTLAHypoAlgMT)
+DECLARE_COMPONENT(TrigJetTLAHypoToolMT)
DECLARE_COMPONENT(TrigJetHypoToolHelperMT)
DECLARE_COMPONENT(CombinationsHelperTool)
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
index 7b1dcb881865a88e6ad34c8dd5de954e3b5545f6..acc336c8781aa536db2e21190562d6dd32e680bd 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_add_component( TrigLongLivedParticlesHypo
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloEvent CxxUtils GaudiKernel IRegionSelector InDetIdentifier InDetPrepRawData TrigCaloEvent TrigInDetEvent TrigInterfacesLib TrigParticle TrigSteeringEvent TrigTimeAlgsLib TrkSpacePoint xAODEventInfo xAODJet xAODTracking xAODTrigger )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloEvent CxxUtils GaudiKernel IRegionSelector RoiDescriptor InDetIdentifier InDetPrepRawData TrigCaloEvent TrigInDetEvent TrigInterfacesLib TrigParticle TrigSteeringEvent TrigTimeAlgsLib TrkSpacePoint xAODEventInfo xAODJet xAODTracking xAODTrigger )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigLLPInnerDetectorHypo.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigLLPInnerDetectorHypo.h
index 649d897c9c5586f05c0597079e56a1ad8beeb221..a97558a9b8c403f39da0eaf5789adf431732647e 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigLLPInnerDetectorHypo.h
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigLLPInnerDetectorHypo.h
@@ -18,10 +18,13 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrigInterfaces/HypoAlgo.h"
+#include "IRegionSelector/IRegSelTool.h"
+
+
class StoreGateSvc;
class SCT_ID;
class PixelID;
-class IRegSelSvc;
+
class TrigLLPInnerDetectorHypo: public HLT::HypoAlgo {
@@ -40,7 +43,9 @@ class TrigLLPInnerDetectorHypo: public HLT::HypoAlgo {
HLT::ErrorCode checkDetectorMask();
Bool_t m_hltExecuteInitialisationRun; //!< Flag to run extra initialisation on the first event when xAOD::EventInfo is present
- ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
+
+ ToolHandle<IRegSelTool> m_regionSelector_pix { this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel" }; //!< region selector tool
+ ToolHandle<IRegSelTool> m_regionSelector_sct { this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" }; //!< region selector tool
const PixelID* m_pixHelper;
const SCT_ID* m_sctHelper;
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx
index 2482c6ff75bf337f9265fa98ff0dc9be6c73170b..a2a2094b4727698a4314c5a2e3e5a82980919da6 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLLPInnerDetectorHypo.cxx
@@ -8,12 +8,12 @@
#include "eformat/DetectorMask.h"
#include "eformat/SourceIdentifier.h"
+#include "RoiDescriptor/RoiDescriptor.h"
+
#include "InDetPrepRawData/PixelCluster.h"
#include "InDetIdentifier/SCT_ID.h"
#include "InDetIdentifier/PixelID.h"
-#include "IRegionSelector/IRegSelSvc.h"
-
#include "InDetPrepRawData/SiClusterContainer.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "InDetPrepRawData/SCT_ClusterContainer.h"
@@ -31,14 +31,12 @@
TrigLLPInnerDetectorHypo::TrigLLPInnerDetectorHypo(const std::string& name, ISvcLocator* pSvcLocator)
: HLT::HypoAlgo(name, pSvcLocator),
m_hltExecuteInitialisationRun(kFALSE),
- m_regionSelector("RegSelSvc", name),
m_pixHelper(0),
m_sctHelper(0)
{
declareProperty("PixelSP_ContainerName", m_pixelSpName = "PixelTrigSpacePoints" );
declareProperty("SCT_SP_ContainerName", m_sctSpName = "SCT_TrigSpacePoints" );
- declareProperty("RegionSelectorTool", m_regionSelector);
declareProperty("MaxNModIdentifier", m_maxnid = 100 );
declareProperty("PixelModuleThreshold", m_pixModuleThreshold = 50 );
@@ -102,11 +100,21 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltInitialize() {
ATH_MSG_DEBUG( "Initialize: " << name() );
- if ( m_regionSelector.retrieve().isFailure() ) {
- ATH_MSG_FATAL( "Unable to retrieve RegionSelector tool " << m_regionSelector.type() );
+ if ( m_regionSelector_pix.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( "Unable to retrieve RegionSelector tool " << m_regionSelector_pix.type() );
return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
- } else
- ATH_MSG_INFO( "Successfully initialised RegionSelector tool !" );
+ } else {
+ ATH_MSG_INFO( "Successfully initialised Pixel RegionSelector tool !" );
+ }
+
+
+ if ( m_regionSelector_sct.retrieve().isFailure() ) {
+ ATH_MSG_FATAL( "Unable to retrieve RegionSelector tool " << m_regionSelector_sct.type() );
+ return HLT::ErrorCode(HLT::Action::ABORT_JOB, HLT::Reason::BAD_JOB_SETUP);
+ } else {
+ ATH_MSG_INFO( "Successfully initialised SCT RegionSelector tool !" );
+ }
+
StatusCode sc_pixH = detStore()->retrieve(m_pixHelper, "PixelID");
if( sc_pixH.isFailure() ){
@@ -227,7 +235,7 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* /
ATH_MSG_DEBUG( "Successfully retrieved pixel SP container!" );
}
- m_regionSelector->DetHashIDList(PIXEL, m_listOfPixIds );
+ m_regionSelector_pix->HashIDList( RoiDescriptor(true), m_listOfPixIds );
m_pixListSize = m_listOfPixIds.size();
if( m_pixListSize != 0 ){
@@ -304,7 +312,7 @@ HLT::ErrorCode TrigLLPInnerDetectorHypo::hltExecute(const HLT::TriggerElement* /
return HLT::TOOL_FAILURE;
}
- m_regionSelector->DetHashIDList(SCT, m_listOfSctIds );
+ m_regionSelector_sct->HashIDList( RoiDescriptor(true), m_listOfSctIds );
m_sctListSize = m_listOfSctIds.size();
if( m_sctListSize !=0 ){
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h
index 28dc97bff581c0c0c48b896f092bcb63179f7c36..e9b27b5cba31905774dfe7e259367bf7b5e76d5a 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h
@@ -20,7 +20,7 @@
#include "TrigMultiVarHypo/tools/procedures/Norm1.h"
#include "AthenaMonitoringKernel/MonitoredTimer.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
#include <memory>
#include <string>
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h
index a8aacc1500a7982114d26ba5579b262e8ccd1d56..d936779394e17c3befd7b37030a64f57c2af584f 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h
@@ -20,7 +20,7 @@
#include <memory>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
namespace Ringer{
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDiMuDecoratorTool.cxx b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDiMuDecoratorTool.cxx
index b9e80ea56036fdb9cb2198d11941aa098cbfaf35..7996facba14a7d6b87d956a57cf00c6d23092877 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDiMuDecoratorTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDiMuDecoratorTool.cxx
@@ -117,6 +117,7 @@ StatusCode BphysTrigDiMuDecoratorTool::decorateVertex(const xAOD::Vertex* vtx,
std::unique_ptr<xAOD::Vertex> bsVertex = std::make_unique<xAOD::Vertex>();
bsVertex->makePrivateStore();
AmgSymMatrix(3) cov;
+ cov.setZero();
if (beamspot.isValid()) {
bsVertex->setX(beamspot->beamPos()[0]);
bsVertex->setY(beamspot->beamPos()[1]);
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index 994f265356beb1d40d11dbdd48aaf9378b191613..6dab07fb71e7586bbd1fee6ebfeae6e92e7c1459 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -60,12 +60,12 @@ Chain2JetCollDict['MT'] = {
'HLT_j460_a10_lcw_subjes_L1J100' : 'HLT_AntiKt10LCTopoJets_subjes',
'HLT_j460_a10t_lcw_jes_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jes',
'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jes',
- 'HLT_j45_ftf_pf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
- 'HLT_j45_ftf_subjesgscIS_pf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf',
- 'HLT_j45_ftf_subresjesgscIS_pf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf',
- 'HLT_j85_ftf_pf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
- 'HLT_j45_ftf_pf_nojcalib_L1J20' : 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf',
- 'HLT_j45_ftf_csskpf_nojcalib_L1J20' : 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf',
+ 'HLT_j45_pf_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
+ 'HLT_j45_pf_subjesgscIS_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf',
+ 'HLT_j45_pf_subresjesgscIS_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf',
+ 'HLT_j85_pf_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
+ 'HLT_j45_pf_nojcalib_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf',
+ 'HLT_j45_csskpf_nojcalib_ftf_L1J20' : 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf',
}
TurnOnCurves['MT'] = { # ref chain, offline jet coll
'HLT_j420_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
@@ -74,7 +74,7 @@ TurnOnCurves['MT'] = { # ref chain, offline jet coll
'HLT_j460_a10_lcw_subjes_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
'HLT_j460_a10t_lcw_jes_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : ['HLT_j80_L1J15','AntiKt4EMTopoJets'],
- 'HLT_j85_ftf_pf_L1J20' : ['HLT_j45_ftf_pf_L1J20','AntiKt4EMPFlowJets'],
+ 'HLT_j85_pf_ftf_L1J20' : ['HLT_j45_pf_ftf_L1J20','AntiKt4EMPFlowJets'],
}
# Legacy
@@ -471,14 +471,14 @@ def jetEfficiencyMonitoringConfig(inputFlags,onlinejetcoll,offlinejetcoll,chain,
if 'smc' in chain:
trigConf.appendHistos(
SelectSpec( 'm50', '50<m', chainFolder, FillerTools = [
- ToolSpec('JetHistoTriggEfficiency', chain,
+ ToolSpec('JetHistoTriggEfficiency', chain+'_m50',
Group='jetTrigGroup_'+chain+'_m50',
Var=retrieveVarToolConf("pt"), # In this context we can not just pass a str alias to describe a histo variable
ProbeTrigChain=chain,defineHistoFunc=defineHistoForJetTrigg
),
] ),
SelectSpec( 'et500', '500<et', chainFolder, FillerTools = [
- ToolSpec('JetHistoTriggEfficiency', chain,
+ ToolSpec('JetHistoTriggEfficiency', chain+'_et500',
Group='jetTrigGroup_'+chain+'_et500',
Var=retrieveVarToolConf("m"), # In this context we can not just pass a str alias to describe a histo variable
ProbeTrigChain=chain,defineHistoFunc=defineHistoForJetTrigg
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/TrigMETMonitoring/HLTMETMonTool.h b/Trigger/TrigMonitoring/TrigMETMonitoring/TrigMETMonitoring/HLTMETMonTool.h
index d50951b758cba17345ddc5788a51fb4389b7b7e0..e4314e98c612acb98da1c641fe168b447dd2c5ea 100755
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/TrigMETMonitoring/HLTMETMonTool.h
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/TrigMETMonitoring/HLTMETMonTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef HLTMETMONTOOL_H
@@ -23,6 +23,8 @@
#include "xAODEgamma/ElectronContainer.h"
#include "xAODEgamma/Electron.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
+
#include "TLorentzVector.h"
#include <string>
@@ -60,6 +62,7 @@ private:
void addHLTvsOffHistograms();
void addL1vsOffHistograms();
void addElMuHistograms();
+ void addClusterHistograms();
// methods to make filling easier
void fillL1BasicHistograms(float l1_mex,float l1_mex_log,float l1_mey,float l1_mey_log,float l1_met,float l1_met_log,float l1_sumet,float l1_sumet_log,float l1_phi,float saturated);
void fillL1JetHistograms(float l1_jet_pt,float l1_jet_eta);
@@ -152,6 +155,8 @@ private:
std::string m_electron_key;
std::string m_electron_run3_key;
std::string m_electron_base_trigger;
+ std::string m_cluster_key;
+ std::string m_cluster_run3_key;
double m_muon_pt_thresh;
double m_electron_pt_thresh;
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx b/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx
index fa1d839fe9f6156360417b1985ddcc5185b059d3..b2335a0c2d76e5d60b226e8587c0d5caa77a9524 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/src/HLTMETMonTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigMETMonitoring/HLTMETMonTool.h"
@@ -88,6 +88,11 @@ HLTMETMonTool::HLTMETMonTool(const std::string & type, const std::string & name,
declareProperty("electron_base", m_electron_base_trigger="HLT_e5_lhloose");
declareProperty("electron_pt_thresh", m_electron_pt_thresh=20.0);
+ // topocluster keys
+ declareProperty("cluster_key", m_cluster_key="HLT_xAOD__CaloClusterContainer_TrigCaloClusterMaker");
+ declareProperty("cluster_run3_key", m_cluster_run3_key="HLT_TopoCaloClustersLCFS");
+
+
//
declareProperty("comp_names", m_compNames);
declareProperty("bit_names", m_bitNames);
@@ -247,8 +252,8 @@ StatusCode HLTMETMonTool::book() {
setCurrentMonGroup(monFolderName);
addL1BasicHistograms();
- // jXENOISECUT L1 histograms
- monFolderName = monGroupName + "/jXENOISECUT";
+ // jNOISECUT L1 histograms
+ monFolderName = monGroupName + "/jNOISECUT";
addMonGroup(new MonGroup(this, monFolderName, run));
setCurrentMonGroup(monFolderName);
addL1BasicHistograms();
@@ -426,6 +431,14 @@ StatusCode HLTMETMonTool::book() {
setCurrentMonGroup(monFolderName);
addElMuHistograms();
+
+ // Book HLT Cluster histograms **********
+ monFolderName = monGroupName + "/Cluster";
+ addMonGroup(new MonGroup(this, monFolderName.c_str(), run));
+ setCurrentMonGroup(monFolderName);
+ addClusterHistograms();
+
+
return StatusCode::SUCCESS;
}
@@ -711,6 +724,19 @@ StatusCode HLTMETMonTool::fillMETHist() {
}
+ // retrieve Cluster container
+ const xAOD::CaloClusterContainer *hlt_clusterEFcontainer = 0;
+ sc = evtStore()->retrieve(hlt_clusterEFcontainer, m_cluster_key);
+ if (sc.isFailure() || !hlt_clusterEFcontainer) {
+ sc = evtStore()->retrieve(hlt_clusterEFcontainer, m_cluster_run3_key);
+ if (sc.isFailure() || !hlt_clusterEFcontainer) {
+ ATH_MSG_WARNING("Could not retrieve cluster container with key " << m_cluster_key << " from TDS");
+ }
+ } else {
+ ATH_MSG_DEBUG("Accessing EF cluster container with " << hlt_clusterEFcontainer->size() << " elements");
+ }
+
+
// Check if signal-like muon exists
ATH_MSG_DEBUG("Going to iterate through muon container");
bool METMuonFilled = false; // flag is set to true if event satisfies signal-like requirement
@@ -1133,7 +1159,7 @@ StatusCode HLTMETMonTool::fillMETHist() {
fillL1BasicHistograms(l1_noisecut_mex,l1_noisecut_mex_log,l1_noisecut_mey,l1_noisecut_mey_log,l1_noisecut_met,l1_noisecut_met_log,l1_noisecut_sumet,l1_noisecut_sumet_log,l1_noisecut_phi,saturated_noisecut);
}
- // L1 jXENOISECUT
+ // L1 jNOISECUT
monFolderName = monGroupName + "/jNOISECUT";
setCurrentMonGroup(monFolderName.c_str());
@@ -1758,6 +1784,23 @@ StatusCode HLTMETMonTool::fillMETHist() {
ATH_MSG_DEBUG("Electron multiciplicity: " << electronMult);
if((h = hist("HLT_electronmult") )) h->Fill(electronMult);
}
+
+ //////////////////////////
+ // Clusters
+ monFolderName = monGroupName + "/Cluster";
+ setCurrentMonGroup(monFolderName);
+
+ if (hlt_clusterEFcontainer) {
+ if ((h = hist("HLT_nClusters"))) h->Fill(hlt_clusterEFcontainer->size());
+ for (auto cluster : *hlt_clusterEFcontainer) {
+ if ((h = hist("HLT_cluster_E"))) h->Fill(cluster->calE()/CLHEP::GeV);
+ if ((h = hist("HLT_cluster_Eta"))) h->Fill(cluster->calEta());
+ if ((h = hist("HLT_cluster_Phi"))) h->Fill(cluster->calPhi());
+ if ((h = hist("HLT_cluster_M"))) h->Fill(cluster->calM()/CLHEP::GeV);
+ }
+ }
+
+
return sc;
}
@@ -2131,6 +2174,14 @@ void HLTMETMonTool::addElMuHistograms() {
}
+//___________________________________________________________________________________________________________
+void HLTMETMonTool::addClusterHistograms() {
+ addHistogram(new TH1F("HLT_nClusters", "HLT Number of Clusters", 100, 0, 2000));
+ addHistogram(new TH1F("HLT_cluster_E", "HLT Cluster E (GeV)", 100, 0, 50));
+ addHistogram(new TH1F("HLT_cluster_Eta", "HLT Cluster Eta", 100, -5, 5));
+ addHistogram(new TH1F("HLT_cluster_Phi", "HLT Cluster Phi", 100, -3.5, 3.5));
+ addHistogram(new TH1F("HLT_cluster_M", "HLT Cluster M (GeV)", 100, 0, 50));
+}
//___________________________________________________________________________________________________________
void HLTMETMonTool::trigger_decision() {
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
index a07f9ec663db08bd5da6cf58307239524257b5d0..2b95787a71a7b3bf86f3ce6e6781ec8ec2150bb0 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigMETMonitorAlgorithm.h"
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h
index da040becf0c277d358c8a2d9806b2a6920ba0993..70efa912b191bc65654e9ea21480a50c4a68aacc 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMETMONITORING_TRIGMETMONITORALGORITHM_H
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py
index 0561a361f78a55d3db02614c84fc23e6cba0f695..aa18add7adfcf44313f1a3f52bd660b87e5debad 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py
@@ -76,6 +76,16 @@ def EFMuonMonConfig(helper):
type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+ # EFIso
+ histGroup.defineHistogram(chain+'_PtCone03;EFIso_PtCone03',
+ title='EFIso sum Pt in 0.3 cone '+chain+';Sum p_{T} [GeV];Events',
+ type='TH1F', path='',xbins=50, xmin=0., xmax=25.)
+
+ histGroup.defineHistogram(chain+'_PtCone03overMuonPt;EFIso_PtCone03overMuonPt',
+ title='EFIso sum Pt in 0.3 cone / muon Pt '+chain+';Sum p_{T} in 0.3 cone / muon p_{T};Events',
+ type='TH1F', path='',xbins=100,xmin=0.,xmax=0.5)
+
+
# OfflineSA
histGroup.defineHistogram(chain+'_OfflineSA_Pt;OfflineSA_Pt',
title='OfflineSA Pt '+chain+';p_{T} [GeV];Events',
@@ -251,4 +261,15 @@ def EFMuonMonConfig(helper):
cutmask=chain+'_matchedL2CB',
type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=108,ymin=-2.7,ymax=2.7)
+
+ # EFIso vs. OfflineIso muons
+ histGroup.defineHistogram(chain+'_MatchedEFPIsotCone03,'+chain+'_OfflineIsoPtCone03;EFIso_OfflineIso_CorPtCone03',
+ title='sum Pt in 0.3 cone correlation EFIso vs. OfflineIso '+chain+';EFIso Sum p_{T} [GeV];OfflineIso Sum p_{T} [GeV];Events',
+ type='TH2F', path='',xbins=50, xmin=0., xmax=25., ybins=50, ymin=0., ymax=25.)
+
+ histGroup.defineHistogram(chain+'_MatchedEFIsoPtCone03overMuonPt,'+chain+'_OfflineIsoPtCone03overMuonPt;EFIso_OfflineIso_CorPtCone03overMuonPt',
+ title='sum Pt in 0.3 cone / muon Pt correlation EFIso vs. OfflineIso '+chain+';EFIso Sum p_{T} in 0.3 cone / muon p_{T};OfflineIso Sum p_{T} in 0.3 cone / muon p_{T};Events',
+ type='TH2F', path='',xbins=100,xmin=0.,xmax=0.5, ybins=100,ymin=0.,ymax=0.5)
+
+
return
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L1MuonMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L1MuonMonConfig.py
index 740775e1965572040f322fe3b3b1be366430e8bd..aa460d2a9009d60618c13cbc66761a098b58bca5 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L1MuonMonConfig.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L1MuonMonConfig.py
@@ -4,7 +4,7 @@
def L1MuonMonConfig(helper):
from AthenaConfiguration.ComponentFactory import CompFactory
- monAlg = helper.addAlgorithm(CompFactory.L1MuonMonMT,'L1MuonMonMT')
+ monAlg = helper.addAlgorithm(CompFactory.L1MuonMonMT,'L1MuonMonMTAlg')
histGroup = helper.addGroup(monAlg, 'L1MuonMonMT', 'HLT/MuonMon/')
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/MuonTriggerCountMTConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/MuonTriggerCountMTConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d472f7cce9c2aaf33765db1a452c1470189a7b0
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/MuonTriggerCountMTConfig.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+
+
+def MuonTriggerCountMTConfig(helper):
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+
+ GroupName = 'TriggerCount'
+ Chains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_mu50_L1MU20', 'HLT_mu60_0eta105_msonly_L1MU20', 'HLT_2mu14_L12MU10', 'HLT_mu22_mu8noL1_L1MU20']
+
+ monAlg = helper.addAlgorithm(CompFactory.MuonTriggerCountMT,'MuonTriggerCountMT')
+ # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed.
+ monAlg.MonitoredChains = Chains
+ monAlg.Group = GroupName
+
+
+ histGroup = helper.addGroup(monAlg, GroupName, 'HLT/MuonMon/TriggerCount')
+
+ histGroup.defineHistogram('TriggerCount;Monitoring_Chain',
+ title='Monitoring Chain Count;;Events',
+ type='TH1I',path='', xlabels=Chains)
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py
index d78213eea681308d478772e905b6a60da8601e2c..655a6341da13d356466007689f8efd86397743c0 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py
@@ -6,6 +6,7 @@ from TrigMuonMonitoringMT.L2MuonSAMonConfig import L2MuonSAMonConfig
from TrigMuonMonitoringMT.L2muCombMonConfig import L2muCombMonConfig
from TrigMuonMonitoringMT.EFMuonMonConfig import EFMuonMonConfig
from TrigMuonMonitoringMT.TrigMuonEfficiencyMonConfig import TrigMuonEfficiencyMonTTbarConfig, TrigMuonEfficiencyMonZTPConfig
+from TrigMuonMonitoringMT.MuonTriggerCountMTConfig import MuonTriggerCountMTConfig
def TrigMuonMonConfig(inputFlags):
@@ -19,5 +20,6 @@ def TrigMuonMonConfig(inputFlags):
EFMuonMonConfig(helper)
TrigMuonEfficiencyMonTTbarConfig(helper)
TrigMuonEfficiencyMonZTPConfig(helper)
+ MuonTriggerCountMTConfig(helper)
return helper.result()
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
index bd5fb0120e73d8d913fbb48120ad278fdaa73108..b97e9f985b752bfe0b003815aa4c9defb5076aad 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
@@ -6,6 +6,7 @@
#include "xAODTrigMuon/TrigMuonDefs.h"
#include "MuonMatchingTool.h"
+#include "StoreGate/ReadDecorHandle.h"
EFMuonMonMT :: EFMuonMonMT(const std::string& name, ISvcLocator* pSvcLocator )
: TrigMuonMonitorAlgorithm(name, pSvcLocator)
@@ -16,55 +17,81 @@ StatusCode EFMuonMonMT :: initialize(){
StatusCode sc = TrigMuonMonitorAlgorithm::initialize();
ATH_CHECK( m_EFSAMuonContainerKey.initialize() );
ATH_CHECK( m_EFCBMuonContainerKey.initialize() );
+ ATH_CHECK( m_MStrackContainerKey.initialize() );
+ ATH_CHECK( m_CBtrackContainerKey.initialize() );
+ ATH_CHECK( m_muonIso30Key.initialize() );
return sc;
}
-StatusCode EFMuonMonMT :: fillVariablesPerChain(const EventContext& , const std::string &chain) const {
+StatusCode EFMuonMonMT :: fillVariablesPerChain(const EventContext &ctx, const std::string &chain) const {
ATH_MSG_DEBUG ("Filling histograms for " << name() << "...");
+ const float ZERO_LIMIT = 0.00001;
+
// EFSA
- std::vector< TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> > featureContSA = getTrigDecisionTool()->features<xAOD::MuonContainer>( chain, TrigDefs::includeFailedDecisions, "HLT_Muons_");
+ std::vector< TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> > featureContSA = getTrigDecisionTool()->features<xAOD::MuonContainer>( chain, TrigDefs::includeFailedDecisions, "HLT_Muons_.*");
+
for (const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muSALinkInfo : featureContSA) {
ATH_CHECK( muSALinkInfo.isValid() );
const ElementLink<xAOD::MuonContainer> muSAEL = muSALinkInfo.link;
- const xAOD::TrackParticle* EFSATrack = (*muSAEL)->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
- if ( !EFSATrack ) continue;
+ if ( (*muSAEL)->muonType() != xAOD::Muon::MuonType::MuonStandAlone ) continue;
- // basic EDM variables
- auto EFSAPt = Monitored::Scalar<float>(chain+"_EFSA_Pt",-999.);
- auto EFSAEta = Monitored::Scalar<float>(chain+"_EFSA_Eta",-999.);
- auto EFSAPhi = Monitored::Scalar<float>(chain+"_EFSA_Phi",-999.);
+ auto EFSAPt = Monitored::Scalar<float>(chain+"_EFSA_Pt", -999.);
+ auto EFSAEta = Monitored::Scalar<float>(chain+"_EFSA_Eta", -999.);
+ auto EFSAPhi = Monitored::Scalar<float>(chain+"_EFSA_Phi", -999.);
- EFSAPt = EFSATrack->pt()/1e3 * EFSATrack->charge(); // convert to GeV
- EFSAEta = EFSATrack->eta();
- EFSAPhi = EFSATrack->phi();
+ EFSAPt = (*muSAEL)->pt()/1e3 * (*muSAEL)->charge();
+ EFSAEta = (*muSAEL)->eta();
+ EFSAPhi = (*muSAEL)->phi();
fill(m_group+"_"+chain, EFSAPt, EFSAEta, EFSAPhi);
}
// EFCB
- std::vector< TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> > featureContCB = getTrigDecisionTool()->features<xAOD::MuonContainer>( chain, TrigDefs::includeFailedDecisions, "HLT_MuonsCB");
+ std::vector< TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> > featureContCB = getTrigDecisionTool()->features<xAOD::MuonContainer>( chain, TrigDefs::includeFailedDecisions, "HLT_MuonsCB.*");
+
for (const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muCBLinkInfo : featureContCB) {
ATH_CHECK( muCBLinkInfo.isValid() );
const ElementLink<xAOD::MuonContainer> muCBEL = muCBLinkInfo.link;
- const xAOD::TrackParticle* EFCBTrack = (*muCBEL)->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle);
- if ( !EFCBTrack ) continue;
+ if ( (*muCBEL)->muonType() != xAOD::Muon::MuonType::Combined ) continue;
- // basic EDM variables
- auto EFCBPt = Monitored::Scalar<float>(chain+"_EFCB_Pt",-999.);
- auto EFCBEta = Monitored::Scalar<float>(chain+"_EFCB_Eta",-999.);
- auto EFCBPhi = Monitored::Scalar<float>(chain+"_EFCB_Phi",-999.);
+ auto EFCBPt = Monitored::Scalar<float>(chain+"_EFCB_Pt", -999.);
+ auto EFCBEta = Monitored::Scalar<float>(chain+"_EFCB_Eta", -999.);
+ auto EFCBPhi = Monitored::Scalar<float>(chain+"_EFCB_Phi", -999.);
- EFCBPt = EFCBTrack->pt()/1e3 * EFCBTrack->charge(); // convert to GeV
- EFCBEta = EFCBTrack->eta();
- EFCBPhi = EFCBTrack->phi();
+ EFCBPt = (*muCBEL)->pt()/1e3 * (*muCBEL)->charge();
+ EFCBEta = (*muCBEL)->eta();
+ EFCBPhi = (*muCBEL)->phi();
fill(m_group+"_"+chain, EFCBPt, EFCBEta, EFCBPhi);
}
+
+ // EFIso
+ std::vector< TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> > featureContIso = getTrigDecisionTool()->features<xAOD::MuonContainer>( chain, TrigDefs::includeFailedDecisions, "HLT_MuonsIso");
+ for (const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muIsoLinkInfo : featureContIso) {
+ ATH_CHECK( muIsoLinkInfo.isValid() );
+ const ElementLink<xAOD::MuonContainer> muIsoEL = muIsoLinkInfo.link;
+ if ( (*muIsoEL)->muonType() != xAOD::Muon::MuonType::Combined ) continue;
+
+ // basic variables used decision
+ auto PtCone03 = Monitored::Scalar<float>(chain+"_PtCone03",-999.);
+ auto PtCone03overMuonPt = Monitored::Scalar<float>(chain+"_PtCone03overMuonPt",-999.);
+
+ SG::ReadDecorHandle<xAOD::MuonContainer, double> muonIso30 ( m_muonIso30Key, ctx );
+ float ptcone30 = muonIso30(*(*muIsoEL));
+
+ if (ptcone30 > ZERO_LIMIT ){
+ PtCone03 = ptcone30/1e3;
+ PtCone03overMuonPt = ptcone30 / (*muIsoEL)->pt();
+ }
+
+ fill(m_group+"_"+chain, PtCone03, PtCone03overMuonPt);
+ }
+
return StatusCode::SUCCESS;
}
@@ -73,6 +100,8 @@ StatusCode EFMuonMonMT :: fillVariablesPerOfflineMuonPerChain(const EventContext
ATH_MSG_DEBUG ("Filling histograms for " << name() << "...");
+ const float ZERO_LIMIT = 0.00001;
+
const xAOD::TrackParticle* OfflineSATrack = mu->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
const xAOD::TrackParticle* OfflineCBTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle);
@@ -108,8 +137,7 @@ StatusCode EFMuonMonMT :: fillVariablesPerOfflineMuonPerChain(const EventContext
// get the EFSA muon matched to offlineSA muon
const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> EFSAMuonLinkInfo = m_matchTool->matchEFSALinkInfo(mu, chain);
if( EFSAMuonLinkInfo.isValid() ){
- const ElementLink<xAOD::MuonContainer> EFSAMuon = EFSAMuonLinkInfo.link;
- const xAOD::TrackParticle* EFSATrack = (*EFSAMuon)->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ const xAOD::TrackParticle* EFSATrack = m_matchTool->SearchEFTrack(ctx, EFSAMuonLinkInfo, m_MStrackContainerKey);
if ( EFSATrack ){
matchedEFSA = true;
@@ -179,8 +207,7 @@ StatusCode EFMuonMonMT :: fillVariablesPerOfflineMuonPerChain(const EventContext
// get the closest EFCB muon
const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> EFCBMuonLinkInfo = m_matchTool->matchEFCBLinkInfo(mu, chain);
if( EFCBMuonLinkInfo.isValid() ){
- const ElementLink<xAOD::MuonContainer> EFCBMuon = EFCBMuonLinkInfo.link;
- const xAOD::TrackParticle* EFCBTrack = (*EFCBMuon)->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle);
+ const xAOD::TrackParticle* EFCBTrack = m_matchTool->SearchEFTrack(ctx, EFCBMuonLinkInfo, m_CBtrackContainerKey);
if ( EFCBTrack ){
matchedEFCB = true;
@@ -218,6 +245,36 @@ StatusCode EFMuonMonMT :: fillVariablesPerOfflineMuonPerChain(const EventContext
MatchedEFCBPt, MatchedEFCBEta, MatchedEFCBPhi, CBdPt, CBdEta, CBdPhi, CBdR, matchedEFCB, matchedL2CB);
}
+
+ // offoine isolation variable
+ float OfflineIsoptcone30=-1.;
+ mu->isolation(OfflineIsoptcone30, xAOD::Iso::IsolationType::ptvarcone30);
+ if ( OfflineIsoptcone30 > ZERO_LIMIT ){
+
+ auto OfflineIsoPtCone03 = Monitored::Scalar<float>(chain+"_OfflineIsoPtCone03",-999.);
+ auto OfflineIsoPtCone03overMuonPt = Monitored::Scalar<float>(chain+"_OfflineIsoPtCone03overMuonPt",-999.);
+ auto MatchedEFIsoPtCone03 = Monitored::Scalar<float>(chain+"_MatchedEFPIsotCone03",-999.);
+ auto MatchedEFIsoPtCone03overMuonPt = Monitored::Scalar<float>(chain+"_MatchedEFIsoPtCone03overMuonPt",-999.);
+
+ OfflineIsoPtCone03 = OfflineIsoptcone30/1e3;
+ OfflineIsoPtCone03overMuonPt = OfflineIsoptcone30 / mu->pt();
+
+ // get the closest EFIso muon
+ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> EFIsoMuonLinkInfo = m_matchTool->matchEFIsoLinkInfo(mu, chain);
+ if( EFIsoMuonLinkInfo.isValid() ){
+ const ElementLink<xAOD::MuonContainer> EFIsoMuon = EFIsoMuonLinkInfo.link;
+
+ SG::ReadDecorHandle<xAOD::MuonContainer, double> muonIso30 ( m_muonIso30Key, ctx );
+ float EFIsoptcone30 = muonIso30(*(*EFIsoMuon));
+
+ if ( EFIsoptcone30 > ZERO_LIMIT ){
+ MatchedEFIsoPtCone03 = EFIsoptcone30/1e3;
+ MatchedEFIsoPtCone03overMuonPt = EFIsoptcone30 / (*EFIsoMuon)->pt();
+ }
+ }
+ fill(m_group+"_"+chain, OfflineIsoPtCone03, OfflineIsoPtCone03overMuonPt, MatchedEFIsoPtCone03, MatchedEFIsoPtCone03overMuonPt);
+ }
+
return StatusCode::SUCCESS;
}
@@ -226,8 +283,8 @@ StatusCode EFMuonMonMT :: fillVariables(const EventContext &ctx) const {
ATH_MSG_DEBUG ("Filling histograms for " << name() << "...");
- ATH_CHECK( fillVariableEtaPhi<xAOD::Muon>(ctx, m_EFSAMuonContainerKey, "EFSA", &MuonMatchingTool::PosForMatchSATrack));
- ATH_CHECK( fillVariableEtaPhi<xAOD::Muon>(ctx, m_EFCBMuonContainerKey, "EFCB", &MuonMatchingTool::PosForMatchCBTrack));
+ ATH_CHECK( fillVariableEtaPhi<xAOD::Muon>(ctx, m_EFSAMuonContainerKey, "EFSA", &MuonMatchingTool::trigPosForMatchSATrack));
+ ATH_CHECK( fillVariableEtaPhi<xAOD::Muon>(ctx, m_EFCBMuonContainerKey, "EFCB", &MuonMatchingTool::trigPosForMatchCBTrack));
return StatusCode::SUCCESS;
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.h
index 1475e7fe8af5cee6524dc51461ea0d931ec4c219..59bca7ce2fd103a52945fb36a6fc0a6138d536e4 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.h
@@ -27,6 +27,10 @@ class EFMuonMonMT : public TrigMuonMonitorAlgorithm{
private:
SG::ReadHandleKey<xAOD::MuonContainer> m_EFSAMuonContainerKey {this, "EFSAMuonContainerName", "HLT_Muons_RoI", "EFSAMuon container"};
SG::ReadHandleKey<xAOD::MuonContainer> m_EFCBMuonContainerKey {this, "EFCBMuonContainerName", "HLT_MuonsCB_RoI", "EFCBMuon container"};
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_MStrackContainerKey {this, "ExtrapolatedMStrackConntainner", "HLT_MSExtrapolatedMuons_RoITrackParticles", "EFCBMuon container"};
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_CBtrackContainerKey {this, "CBtrackContainerName", "HLT_CBCombinedMuon_RoITrackParticles", "EFCBMuon container"};
+ SG::ReadDecorHandleKey<xAOD::MuonContainer> m_muonIso30Key {this, "MuonIso03Name", "HLT_MuonsIso.ptcone03", "Isolation in ptcone03" };
+
};
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx
index c6efdba50540378d9a44652d3e7836604fb6bc7e..04e2db60ba0d02d69c65cf87734f45d972b8f28c 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx
@@ -128,8 +128,6 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerChain(const EventContext &ctx, const
// super point
std::vector<float> sp_r, sp_z;
- sp_r.clear();
- sp_z.clear();
auto mon_sp_r= Monitored::Collection(chain+"_MDTpoints_r", sp_r);
auto mon_sp_z= Monitored::Collection(chain+"_MDTpoints_z", sp_z);
@@ -165,9 +163,6 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerChain(const EventContext &ctx, const
std::vector<float> res_inn, res_mid, res_out;
- res_inn.clear();
- res_mid.clear();
- res_out.clear();
auto mon_res_inn = Monitored::Collection(chain+"_MDT_Inn_residual",res_inn);
auto mon_res_mid = Monitored::Collection(chain+"_MDT_Mid_residual",res_mid);
@@ -296,8 +291,6 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerOfflineMuonPerChain(const EventConte
// inverse pt resolution depends on charge of offline muon
std::vector<float> invptresol_pos, invptresol_neg;
- invptresol_pos.clear();
- invptresol_neg.clear();
auto mon_invptresol_pos = Monitored::Collection(chain+"_invptresol_pos",invptresol_pos);
auto mon_invptresol_neg = Monitored::Collection(chain+"_invptresol_neg",invptresol_neg);
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
index f35b45fead82f70bd2396826ac345aad3d327b99..c84bb5e61d21fb2dc59b3f9425fda50e8d8164e6 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
@@ -152,7 +152,6 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
// Muon Feature error
std::vector<int> vec_MF_error;
- vec_MF_error.clear();
auto MF_error = Monitored::Collection(chain+"_MF_error",vec_MF_error);
bool error = false;
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
index 527b9503a059ad8ddb82da870cc76f6fd077b748..a071cbcc357327ed6f106ae62dcb333a69c612b2 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
@@ -24,6 +24,8 @@ StatusCode MuonMatchingTool :: initialize(){
ATH_CHECK( m_L2muCombContainerKey.initialize() );
ATH_CHECK( m_EFSAMuonContainerKey.initialize() );
ATH_CHECK( m_EFCBMuonContainerKey.initialize() );
+ ATH_CHECK( m_MStrackContainerKey.initialize() );
+ ATH_CHECK( m_CBtrackContainerKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -42,6 +44,14 @@ std::tuple<bool, double,double> MuonMatchingTool :: trigPosForMatch<xAOD::L2Stan
}
+std::tuple<bool, double,double> MuonMatchingTool :: trigPosForMatchSATrack(const xAOD::Muon *mu){
+ return mu->muonType() == xAOD::Muon::MuonType::MuonStandAlone ? std::forward_as_tuple(true, mu->eta(), mu->phi()) : std::forward_as_tuple(false, 0., 0.);
+}
+
+std::tuple<bool, double,double> MuonMatchingTool :: trigPosForMatchCBTrack(const xAOD::Muon *mu){
+ return mu->muonType() == xAOD::Muon::MuonType::Combined ? std::forward_as_tuple(true, mu->eta(), mu->phi()) : std::forward_as_tuple(false, 0., 0.);
+}
+
std::tuple<bool, double,double> MuonMatchingTool :: PosForMatchSATrack(const xAOD::Muon *mu){
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
return MuonTrack ? std::forward_as_tuple(true, MuonTrack->eta(), MuonTrack->phi()) : std::forward_as_tuple(false, 0., 0.);
@@ -53,7 +63,8 @@ std::tuple<bool, double,double> MuonMatchingTool :: PosForMatchCBTrack(const xAO
}
-const xAOD::Muon* MuonMatchingTool :: matchEFSA( const xAOD::Muon *mu, std::string trig, bool &pass) const {
+
+const xAOD::Muon* MuonMatchingTool :: matchEFSA(const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFSA()");
const xAOD::TrackParticle* MuonTrack = nullptr;
using Type = xAOD::Muon::TrackParticleType;
@@ -64,10 +75,10 @@ const xAOD::Muon* MuonMatchingTool :: matchEFSA( const xAOD::Muon *mu, std::str
MuonTrack = mu->trackParticle(type);
if (MuonTrack) break;
}
- return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, "HLT_Muons_", &MuonMatchingTool::PosForMatchSATrack) : nullptr;
+ return MuonTrack ? match<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_Muons_.*", &MuonMatchingTool::trigPosForMatchSATrack) : nullptr;
}
-const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFSALinkInfo( const xAOD::Muon *mu, std::string trig) const {
+const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFSALinkInfo(const xAOD::Muon *mu, std::string trig) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFSALinkInfo()");
bool pass = false;
TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> muonLinkInfo;
@@ -80,9 +91,10 @@ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matc
MuonTrack = mu->trackParticle(type);
if (MuonTrack) break;
}
- return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_Muons_", &MuonMatchingTool::PosForMatchSATrack) : muonLinkInfo;
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_Muons_.*", &MuonMatchingTool::trigPosForMatchSATrack) : muonLinkInfo;
}
+
const xAOD::Muon* MuonMatchingTool :: matchEFSAReadHandle( const EventContext& ctx, const xAOD::Muon *mu) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFSAReadHandle()");
const xAOD::TrackParticle* MuonTrack = nullptr;
@@ -94,14 +106,14 @@ const xAOD::Muon* MuonMatchingTool :: matchEFSAReadHandle( const EventContext& c
MuonTrack = mu->trackParticle(type);
if (MuonTrack) break;
}
- return MuonTrack ? matchReadHandle<xAOD::Muon>( MuonTrack, m_EFreqdR, m_EFSAMuonContainerKey, ctx, &MuonMatchingTool::PosForMatchSATrack) : nullptr;
+ return MuonTrack ? matchReadHandle<xAOD::Muon>( MuonTrack, m_EFreqdR, m_EFSAMuonContainerKey, ctx, &MuonMatchingTool::trigPosForMatchSATrack) : nullptr;
}
const xAOD::Muon* MuonMatchingTool :: matchEFCB( const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFCB()");
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsCB", &MuonMatchingTool::PosForMatchCBTrack) : nullptr;
+ return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsCB.*", &MuonMatchingTool::trigPosForMatchCBTrack) : nullptr;
}
const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFCBLinkInfo( const xAOD::Muon *mu, std::string trig) const {
@@ -109,20 +121,59 @@ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matc
bool pass = false;
TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> muonLinkInfo;
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsCB", &MuonMatchingTool::PosForMatchCBTrack) : muonLinkInfo;
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsCB.*", &MuonMatchingTool::trigPosForMatchCBTrack) : muonLinkInfo;
}
const xAOD::Muon* MuonMatchingTool :: matchEFCBReadHandle( const EventContext& ctx, const xAOD::Muon *mu) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFCBReadHandle()");
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? matchReadHandle<xAOD::Muon>( MuonTrack, m_EFreqdR, m_EFCBMuonContainerKey, ctx, &MuonMatchingTool::PosForMatchCBTrack) : nullptr;
+ return MuonTrack ? matchReadHandle<xAOD::Muon>( MuonTrack, m_EFreqdR, m_EFCBMuonContainerKey, ctx, &MuonMatchingTool::trigPosForMatchCBTrack) : nullptr;
}
-const xAOD::Muon* MuonMatchingTool :: matchEFIso( const xAOD::Muon *mu, std::string trig, bool &pass) const {
+const xAOD::Muon* MuonMatchingTool :: matchEFIso( const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFIso()");
const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
- return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsIso", &MuonMatchingTool::PosForMatchCBTrack) : nullptr;
+ return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsIso", &MuonMatchingTool::trigPosForMatchCBTrack) : nullptr;
+}
+
+
+const xAOD::TrackParticle* MuonMatchingTool :: SearchEFTrack(const EventContext &ctx, const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muLinkInfo, SG::ReadHandleKey<xAOD::TrackParticleContainer> ReadHandleKey) const {
+ const xAOD::TrackParticle* MatchedTrack = nullptr;
+ const ElementLink<xAOD::MuonContainer> muEL = muLinkInfo.link;
+ float EFEta = (*muEL)->eta();
+ float EFPhi = (*muEL)->phi();
+ float mindR = 999.;
+
+ SG::ReadHandle<xAOD::TrackParticleContainer> trackHandle(ReadHandleKey, ctx);
+ if ( !trackHandle.isValid() ) return MatchedTrack;
+
+ const auto track = m_trigDec->associateToEventView<xAOD::TrackParticleContainer>(trackHandle, muLinkInfo);
+ const xAOD::TrackParticleContainer::const_iterator begin = track.first;
+ const xAOD::TrackParticleContainer::const_iterator end = track.second;
+
+ for (xAOD::TrackParticleContainer::const_iterator it = begin; it != end; ++it) {
+
+ float deta = EFEta - (*it)->eta();
+ float dphi = xAOD::P4Helpers::deltaPhi(EFPhi, (*it)->phi() );
+ float dR = sqrt(deta*deta + dphi*dphi);
+
+ if( dR< mindR ){
+ mindR = dR;
+ MatchedTrack = (*it);
+ }
+ }
+
+ return MatchedTrack;
+
+}
+
+const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFIsoLinkInfo( const xAOD::Muon *mu, std::string trig) const {
+ ATH_MSG_DEBUG("MuonMonitoring::matchEFCBLinkInfo()");
+ bool pass = false;
+ TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> muonLinkInfo;
+ const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, "HLT_MuonsIso", &MuonMatchingTool::trigPosForMatchCBTrack) : muonLinkInfo;
}
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
index 9a39791eb98b22dd2d10d84d0c8145fb97f69b5b..1f35f6c17170b569bab3cfe21c754ba6bd444265 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
@@ -160,6 +160,25 @@ class MuonMatchingTool : public AthAlgTool {
*/
const xAOD::Muon* matchEFIso(const xAOD::Muon *mu, std::string trigger, bool &pass) const;
+ /**
+ * @brief Function that searches for an EF isolation muon (EFIso) candidate and judges if it is matched to a given track particle.
+ * @param mu Offline muon around which EFIso candidates are searched.
+ * @param trigger Considered chain name, e.g. HLT_mu26_ivarmedium_L1MU20, etc.
+ * @return Pointer to the matched candidate. This is inValid link when there is no candidate found.
+ * Important: a valid pointer doesn't mean that it passed the hypothesis, users should check @c pass for the decision.
+ */
+ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> matchEFIsoLinkInfo( const xAOD::Muon *mu, std::string trig) const;
+
+
+ /**
+ * @brief Function that searches for an EF muon track (e.g. ExtrapolatedMuonSpectrometerTrackParticle, CombinedTrackParticle) matched to a EF muon.
+ * @param ctx Reference to the @c EventContext needed for accessing the @c TrackParticle container.
+ * @param muLinkInfo LinkInfo of EF muon.
+ * @param ReadHandleKey of TrackParticle container.
+ * @return Pointer to the matched TrackParticle. This is @c nullpt rwhen there is no TrackParticle found.
+ */
+ const xAOD::TrackParticle* SearchEFTrack(const EventContext &ctx, const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muLinkInfo, SG::ReadHandleKey<xAOD::TrackParticleContainer> ReadHandleKey) const;
+
/**
* @brief Function that searches for an offline muon matched to L2SA muon
@@ -200,6 +219,8 @@ class MuonMatchingTool : public AthAlgTool {
static double reqdRL1byPt(double mupt);
+ static std::tuple<bool,double,double> trigPosForMatchSATrack(const xAOD::Muon *mu);
+ static std::tuple<bool,double,double> trigPosForMatchCBTrack(const xAOD::Muon *mu);
static std::tuple<bool,double,double> PosForMatchSATrack(const xAOD::Muon *mu);
static std::tuple<bool,double,double> PosForMatchCBTrack(const xAOD::Muon *mu);
@@ -249,9 +270,10 @@ class MuonMatchingTool : public AthAlgTool {
* @see MuonMatchingTool.icc for the implementation and MuonMatchingTool.cxx for the instantiation.
* @todo Consider improving the argument list.
*/
- template<class T, class OFFL> const TrigCompositeUtils::LinkInfo<DataVector<T> > matchLinkInfo(const OFFL *offl, std::string trigger, float reqdR, bool &pass,
- const std::string containerSGKey = "",
- std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*) = &MuonMatchingTool::trigPosForMatch<T>) const;
+ template<class T, class OFFL>
+ const TrigCompositeUtils::LinkInfo<DataVector<T> > matchLinkInfo(const OFFL *offl, std::string trigger, float reqdR, bool &pass,
+ const std::string containerSGKey = "",
+ std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*) = &MuonMatchingTool::trigPosForMatch<T>) const;
/**
* @brief Function that searches for an online muon candidate of type T and judges if it is matched to a given offline muon.
@@ -266,8 +288,8 @@ class MuonMatchingTool : public AthAlgTool {
* @todo Consider improving the argument list.
*/
template<class T, class OFFL> const T* match(const OFFL *offl, std::string trigger, float reqdR, bool &pass,
- const std::string containerSGKey = "",
- std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*) = &MuonMatchingTool::trigPosForMatch<T>) const;
+ const std::string containerSGKey = "",
+ std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*) = &MuonMatchingTool::trigPosForMatch<T>) const;
/**
* @brief Function that searches for an offline muon candidate matched to online muon of type T.
@@ -300,6 +322,8 @@ class MuonMatchingTool : public AthAlgTool {
SG::ReadHandleKey<xAOD::L2CombinedMuonContainer> m_L2muCombContainerKey {this, "L2CombinedMuonContainerName", "HLT_MuonL2CBInfo", "L2muComb container"};
SG::ReadHandleKey<xAOD::MuonContainer> m_EFSAMuonContainerKey {this, "EFSAMuonContainerName", "HLT_Muons_RoI", "EFSAMuon container"};
SG::ReadHandleKey<xAOD::MuonContainer> m_EFCBMuonContainerKey {this, "EFCBMuonContainerName", "HLT_MuonsCB_RoI", "EFCBMuon container"};
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_MStrackContainerKey {this, "ExtrapolatedMStrackConntainner", "HLT_MSExtrapolatedMuons_RoITrackParticles", "ExtrapolatedMuons track container"};
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_CBtrackContainerKey {this, "CBtrackContainerName", "HLT_CBCombinedMuon_RoITrackParticles", "CombinedMuon track container"};
// properties
Gaudi::Property<bool> m_use_extrapolator {this, "UseExtrapolator", false, "Flag to enable the extrapolator for matching offline and trigger muons"};
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..dd0937ebbddd9227e3b87703a5aaab528e4982eb
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.cxx
@@ -0,0 +1,24 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MuonTriggerCountMT.h"
+
+
+MuonTriggerCountMT :: MuonTriggerCountMT(const std::string& name, ISvcLocator* pSvcLocator )
+ : TrigMuonMonitorAlgorithm(name, pSvcLocator)
+{}
+
+
+StatusCode MuonTriggerCountMT :: fillVariables(const EventContext&) const {
+
+ ATH_MSG_DEBUG ("Filling histograms for " << name() << "...");
+
+ std::vector<std::string> passed_chains;
+ for ( auto c: m_monitored_chains ) { if (getTrigDecisionTool()->isPassed(c)) passed_chains.push_back(c); }
+ auto passed = Monitored::Collection("TriggerCount", passed_chains );
+
+ fill(m_group, passed);
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.h
new file mode 100644
index 0000000000000000000000000000000000000000..c4dcb77eadb5f787f210c6554e2f1ea280e230d7
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonTriggerCountMT.h
@@ -0,0 +1,24 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MUONNTRIGGERCOUNTMT_L1MUONMONMT_H
+#define MUONNTRIGGERCOUNTMT_L1MUONMONMT_H
+
+#include "TrigMuonMonitorAlgorithm.h"
+
+
+/*
+This is a class for monitoring L1Muon.
+ */
+class MuonTriggerCountMT : public TrigMuonMonitorAlgorithm{
+
+ public:
+ MuonTriggerCountMT(const std::string& name, ISvcLocator* pSvcLocator );
+
+ protected:
+ virtual StatusCode fillVariables(const EventContext &ctx) const override;
+
+};
+
+#endif //MUONNTRIGGERCOUNTMT_L1MUONMONMT_H
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx
index 2f427a3fe1818f5923ff337a72ada46e73b3b6c6..c777bdba46d99b8c1d4e3f13a9c158fd74283f8e 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx
@@ -8,6 +8,7 @@
#include "../EFMuonMonMT.h"
#include "../TrigMuonEfficiencyMonMT.h"
#include "../MuonMatchingTool.h"
+#include "../MuonTriggerCountMT.h"
DECLARE_COMPONENT( L1MuonMonMT )
DECLARE_COMPONENT( L2MuonSAMonMT )
@@ -15,3 +16,4 @@ DECLARE_COMPONENT( L2muCombMonMT )
DECLARE_COMPONENT( EFMuonMonMT )
DECLARE_COMPONENT( TrigMuonEfficiencyMonMT )
DECLARE_COMPONENT( MuonMatchingTool )
+DECLARE_COMPONENT( MuonTriggerCountMT )
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/TrigSteerMonitor/ITrigErrorMonTool.h b/Trigger/TrigMonitoring/TrigSteerMonitor/TrigSteerMonitor/ITrigErrorMonTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..2a372954a71497b29b2661d7ed90b2f668d310e2
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/TrigSteerMonitor/ITrigErrorMonTool.h
@@ -0,0 +1,22 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef TRIGSTEERMONITOR_ITRIGERRORMONTOOL_H
+#define TRIGSTEERMONITOR_ITRIGERRORMONTOOL_H
+
+#include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/EventContext.h"
+
+/**
+ * @class ITrigErrorMonTool
+ * @brief Interface of a tool which retrieves and monitors all non-success status codes returned by algorithms
+ **/
+class ITrigErrorMonTool : virtual public IAlgTool {
+public:
+ DeclareInterfaceID(ITrigErrorMonTool, 1, 0);
+
+ /// Produce a subset of IAlgExecStateSvc::algExecStates with only non-success StatusCodes and fill relevant histograms
+ virtual std::unordered_map<std::string_view, StatusCode> algExecErrors(const EventContext& eventContext) const = 0;
+};
+
+#endif // TRIGSTEERMONITOR_ITRIGERRORMONTOOL_H
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorConfig.py b/Trigger/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorConfig.py
index 99c55a6258959c6c21e818a897bdb3ebd2a3ab4c..23be91a7d8f3955d93d4270017358861a76b4724 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorConfig.py
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorConfig.py
@@ -59,3 +59,14 @@ def SchedulerMonSvcCfg(flags, name='SchedulerMonSvc'):
acc = ComponentAccumulator()
acc.addService(monsvc)
return acc
+
+def getTrigErrorMonTool(name='TrigErrorMonTool'):
+ errorMonTool = CompFactory.TrigErrorMonTool(name)
+ errorMonTool.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name)
+
+ errorMonTool.MonTool.defineHistogram(
+ 'ErrorAlgName,ErrorCode', path='EXPERT', type='TH2I',
+ title='Error StatusCodes per algorithm;Algorithm name;StatusCode',
+ xbins=1, xmin=0, xmax=1, ybins=1, ymin=0, ymax=1)
+
+ return errorMonTool
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigErrorMonTool.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigErrorMonTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..52263624a1264b6c432d25d35fe1e8bac19c2530
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigErrorMonTool.cxx
@@ -0,0 +1,47 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigErrorMonTool.h"
+#include "GaudiKernel/IAlgExecStateSvc.h"
+
+// =============================================================================
+// Standard constructor
+// =============================================================================
+TrigErrorMonTool::TrigErrorMonTool(const std::string& type, const std::string& name, const IInterface* parent)
+: base_class(type, name, parent) {}
+
+// =============================================================================
+// Implementation of IStateful::initialize
+// =============================================================================
+StatusCode TrigErrorMonTool::initialize() {
+ ATH_CHECK(m_monTool.retrieve(DisableTool{m_monTool.name().empty()}));
+ ATH_CHECK(m_aess.retrieve());
+ return StatusCode::SUCCESS;
+}
+
+// =============================================================================
+// Implementation of IStateful::finalize
+// =============================================================================
+StatusCode TrigErrorMonTool::finalize() {
+ ATH_CHECK(m_monTool.release());
+ ATH_CHECK(m_aess.release());
+ return StatusCode::SUCCESS;
+}
+
+// =============================================================================
+// The main method of the tool, ITrigErrorMonTool::algExecErrors
+// =============================================================================
+std::unordered_map<std::string_view, StatusCode> TrigErrorMonTool::algExecErrors(const EventContext& eventContext) const {
+ std::unordered_map<std::string_view, StatusCode> algErrors;
+ for (const auto& [key, state] : m_aess->algExecStates(eventContext)) {
+ if (!state.execStatus().isSuccess()) {
+ ATH_MSG_DEBUG("Algorithm " << key << " returned StatusCode " << state.execStatus().message()
+ << " in event " << eventContext.eventID());
+ algErrors[key.str()] = state.execStatus();
+ auto monErrorAlgName = Monitored::Scalar<std::string>("ErrorAlgName", key.str());
+ auto monErrorCode = Monitored::Scalar<std::string>("ErrorCode", state.execStatus().message());
+ auto mon = Monitored::Group(m_monTool, monErrorAlgName, monErrorCode);
+ }
+ }
+ return algErrors;
+}
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigErrorMonTool.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigErrorMonTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..ebbbe1ddd40afa51268493b13f0bd8209074a087
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigErrorMonTool.h
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef TRIGSTEERMONITOR_TRIGERRORMONTOOL_H
+#define TRIGSTEERMONITOR_TRIGERRORMONTOOL_H
+
+#include "TrigSteerMonitor/ITrigErrorMonTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+#include "GaudiKernel/EventContext.h"
+
+class IAlgExecStateSvc;
+
+/**
+ * @class TrigErrorMonTool
+ * @brief Retrieves and monitors all non-success status codes returned by algorithms
+ **/
+class TrigErrorMonTool : public extends<AthAlgTool, ITrigErrorMonTool> {
+public:
+ TrigErrorMonTool(const std::string& type, const std::string& name, const IInterface* parent);
+
+ // ------------------------- IStateful methods -------------------------------
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
+
+ // ------------------------- ITrigErrorMonTool methods -----------------------
+ /// Produce a subset of IAlgExecStateSvc::algExecStates with only non-success StatusCodes and fill relevant histograms
+ virtual std::unordered_map<std::string_view, StatusCode> algExecErrors(const EventContext& eventContext) const override;
+
+private:
+ ServiceHandle<IAlgExecStateSvc> m_aess{this, "AlgExecStateSvc", "AlgExecStateSvc"};
+ ToolHandle<GenericMonitoringTool> m_monTool{this, "MonTool", "", "Monitoring tool"};
+};
+
+
+#endif // TRIGSTEERMONITOR_TRIGERRORMONTOOL_H
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx
index 9e4c016cad15b6aabc48468eb687796833f8bd4b..99609106c35a75e7178d56db83fe52bc7eca7716 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/components/TrigSteerMonitor_entries.cxx
@@ -12,6 +12,7 @@
#include "../TrigSignatureMoniMT.h"
#include "../DecisionCollectorTool.h"
#include "../SchedulerMonSvc.h"
+#include "../TrigErrorMonTool.h"
DECLARE_COMPONENT( TrigSteerMoni )
DECLARE_COMPONENT( TrigChainMoni )
@@ -27,3 +28,4 @@ DECLARE_COMPONENT( TrigMemAuditor )
DECLARE_COMPONENT( TrigSignatureMoniMT )
DECLARE_COMPONENT( DecisionCollectorTool )
DECLARE_COMPONENT( SchedulerMonSvc )
+DECLARE_COMPONENT( TrigErrorMonTool )
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
index 114a3df0814b56cc22dd195efdb75959638d2c5b..f764c4bb49571483703de5a4ee9648a34e4f5aa9 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
@@ -244,6 +244,20 @@ void TrigTauMonitorAlgorithm::fillRNNTrack(const std::string trigger, std::vecto
auto monGroup = getGroup(trigger+( online ? "/RNN/HLT/InputTrack" : "/RNN/Offline/InputTrack"));
for(auto tau: tau_vec){
+ // Don't call ->allTracks() unless the element links are valid
+ static const SG::AuxElement::ConstAccessor< std::vector<ElementLink<xAOD::TauTrackContainer>> > tauTrackAcc("tauTrackLinks");
+ bool linksValid = true;
+ for (const ElementLink<xAOD::TauTrackContainer>& trackEL : tauTrackAcc(*tau)) {
+ if (!trackEL.isValid()) {
+ linksValid = false;
+ }
+ break;
+ }
+ if (!linksValid) {
+ ATH_MSG_WARNING("Invalid track element links from TauJet in " << trigger);
+ continue;
+ }
+
auto tracks = tau->allTracks();
auto track_pt_jetseed_log = Monitored::Collection("track_pt_jetseed_log", tau_vec, [] (const xAOD::TauJet* tau){ return TMath::Log10( tau->ptJetSeed());});
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/Root/NavGraph.cxx b/Trigger/TrigSteer/TrigCompositeUtils/Root/NavGraph.cxx
index cd7e5476855cef6b2ac5736fddc2b2ffd60bdaa7..b142c11527a2c440c9b40a47e21a3eff033fb7ed 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/Root/NavGraph.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/Root/NavGraph.cxx
@@ -66,7 +66,18 @@ namespace TrigCompositeUtils {
void NavGraph::printAllPaths(MsgStream& log, MSG::Level msgLevel) const {
- for (const NavGraphNode* finalNode : finalNodes()) {
+ // finalNodes() is a set<NavGraphNode*>, so iteration over it
+ // will not be in any well-defined order. Sort the set of pointers
+ // by name so that the output is predictable.
+ std::vector<const NavGraphNode*> nodes (finalNodes().begin(),
+ finalNodes().end());
+ std::sort (nodes.begin(), nodes.end(),
+ [] (const NavGraphNode* a, const NavGraphNode* b)
+ {
+ return a->node()->name() < b->node()->name();
+ });
+
+ for (const NavGraphNode* finalNode : nodes) {
recursivePrintNavPath(*finalNode, 0, log, msgLevel);
}
}
@@ -86,4 +97,4 @@ namespace TrigCompositeUtils {
}
}
-}
\ No newline at end of file
+}
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc
index 6bf1ad5c9f9ac2084b67e17c4e60a393aca1470e..34d6931f0cb022ecdb095bf2f5ced53293ce84d3 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc
+++ b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc
@@ -3,6 +3,7 @@
*/
#include "AsgMessaging/MessageCheck.h"
+#include <regex>
namespace TrigCompositeUtils {
@@ -139,8 +140,8 @@ namespace TrigCompositeUtils {
return;
}
auto it = std::remove_if(vector.begin(), vector.end(), [&](const ElementLink<CONTAINER>& el) {
- return (el.dataID().find(containerSGKey) == std::string::npos);
- });
+ return !std::regex_match( el.dataID(), std::regex(containerSGKey) );
+ });
// Collection has been re-ordered to put the bad elements at the end
vector.erase(it, vector.end());
}
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref b/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref
index dc820ea3ae65b754f7d03c84a823f1af31d62485..90da1821f2ac89c6266b7010b0946db8e0f9cac3 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref
+++ b/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref
@@ -1,15 +1,15 @@
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on pc-tbed-pub-21.cern.ch on Mon Aug 3 16:45:27 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Fri Oct 2 12:36:26 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-ClassIDSvc INFO getRegistryEntries: read 5171 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7552 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 379 CLIDRegistry entries for module ALL
TrigTraversal INFO HLT_mufast_chain
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
@@ -97,46 +97,46 @@ TrigTraversal INFO |-> HLTNav_MyDecisionContainer #32 (MUEM
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #31 (MUEM_F_1__EM0)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
TrigTraversal INFO [All passing features] HLT_mufast_chain features size:1
- Feature 0 pt:20, state:ACTIVE
+ Feature pt:20, state:ACTIVE
TrigTraversal INFO [All passing features] HLT_mu_chain features size:2
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
TrigTraversal INFO [All passing features] HLT_mu_em_chain features size:4
- Feature 0 pt:21, state:ACTIVE
- Feature 1 pt:20, state:ACTIVE
- Feature 2 pt:31, state:ACTIVE
- Feature 3 pt:30, state:ACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:30, state:ACTIVE
+ Feature pt:31, state:ACTIVE
TrigTraversal INFO [All passing features] HLT_em_chain features size:2
- Feature 0 pt:31, state:ACTIVE
- Feature 1 pt:30, state:ACTIVE
+ Feature pt:30, state:ACTIVE
+ Feature pt:31, state:ACTIVE
TrigTraversal INFO [All passing features] All chains features size:4
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
- Feature 2 pt:31, state:ACTIVE
- Feature 3 pt:30, state:ACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:30, state:ACTIVE
+ Feature pt:31, state:ACTIVE
TrigTraversal INFO [Final passing feature] HLT_mufast_chain features size:1
- Feature 0 pt:20, state:ACTIVE
+ Feature pt:20, state:ACTIVE
TrigTraversal INFO [Final passing feature] HLT_mu_chain features size:2
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
TrigTraversal INFO [Final passing feature] HLT_mu_em_chain features size:2
- Feature 0 pt:21, state:ACTIVE
- Feature 1 pt:31, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:31, state:ACTIVE
TrigTraversal INFO [Final passing feature] HLT_em_chain features size:1
- Feature 0 pt:31, state:ACTIVE
+ Feature pt:31, state:ACTIVE
TrigTraversal INFO [Final passing feature] All chains features size:3
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
- Feature 2 pt:31, state:ACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:31, state:ACTIVE
---------- Now Include Failing Features
TrigTraversal INFO HLT_mufast_chain
@@ -237,68 +237,69 @@ TrigTraversal INFO |-> HLTNav_MyDecisionContainer #33 (MUEM_H
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #32 (MUEM_IM_1__EM0)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #31 (MUEM_F_1__EM0)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
-TrigTraversal INFO |-> HLTNav_MyDecisionContainer #6 (MU_H_1__MU0)
-TrigTraversal INFO |-> HLTNav_MyDecisionContainer #5 (MU_IM_1__MU0)
-TrigTraversal INFO |-> HLTNav_MyDecisionContainer #4 (MU_F_1__MU0)
-TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #9 (MUEM_H_1__MU0)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #8 (MUEM_IM_1__MU0)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #7 (MUEM_F_1__MU0)
TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #6 (MU_H_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #5 (MU_IM_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #4 (MU_F_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
TrigTraversal INFO [All passing/failing features] HLT_mufast_chain features size:2
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:5, state:INACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:5, state:INACTIVE
TrigTraversal INFO [All passing/failing features] HLT_mu_chain features size:3
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
- Feature 2 pt:5, state:INACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:5, state:INACTIVE
TrigTraversal INFO [All passing/failing features] HLT_mu_em_chain features size:5
- Feature 0 pt:21, state:ACTIVE
- Feature 1 pt:20, state:ACTIVE
- Feature 2 pt:31, state:ACTIVE
- Feature 3 pt:30, state:ACTIVE
- Feature 4 pt:5, state:INACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:30, state:ACTIVE
+ Feature pt:31, state:ACTIVE
+ Feature pt:5, state:INACTIVE
TrigTraversal INFO [All passing/failing features] HLT_em_chain features size:2
- Feature 0 pt:31, state:ACTIVE
- Feature 1 pt:30, state:ACTIVE
+ Feature pt:30, state:ACTIVE
+ Feature pt:31, state:ACTIVE
TrigTraversal INFO [All passing/failing features] All chains features size:5
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
- Feature 2 pt:31, state:ACTIVE
- Feature 3 pt:30, state:ACTIVE
- Feature 4 pt:5, state:INACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:30, state:ACTIVE
+ Feature pt:31, state:ACTIVE
+ Feature pt:5, state:INACTIVE
TrigTraversal INFO [Final passing/failing feature] HLT_mufast_chain features size:2
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:5, state:INACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:5, state:INACTIVE
TrigTraversal INFO [Final passing/failing feature] HLT_mu_chain features size:3
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
- Feature 2 pt:5, state:INACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:5, state:INACTIVE
TrigTraversal INFO [Final passing/failing feature] HLT_mu_em_chain features size:3
- Feature 0 pt:21, state:ACTIVE
- Feature 1 pt:31, state:ACTIVE
- Feature 2 pt:5, state:INACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:31, state:ACTIVE
+ Feature pt:5, state:INACTIVE
TrigTraversal INFO [Final passing/failing feature] HLT_em_chain features size:1
- Feature 0 pt:31, state:ACTIVE
+ Feature pt:31, state:ACTIVE
TrigTraversal INFO [Final passing/failing feature] All chains features size:4
- Feature 0 pt:20, state:ACTIVE
- Feature 1 pt:21, state:ACTIVE
- Feature 2 pt:31, state:ACTIVE
- Feature 3 pt:5, state:INACTIVE
+ Feature pt:20, state:ACTIVE
+ Feature pt:21, state:ACTIVE
+ Feature pt:31, state:ACTIVE
+ Feature pt:5, state:INACTIVE
---------- Check Explicit Type
TrigTraversal INFO [Explicit Final Muon Features] HLT_mu_em_chain features size:2
- Feature 0 pt:21, state:UNSET
- Feature 1 pt:5, state:UNSET
+ Feature pt:21, state:UNSET
+ Feature pt:5, state:UNSET
TrigTraversal INFO [Explicit Final Electron Features] HLT_mu_em_chain features size:1
- Feature 0 pt:31, state:UNSET
+ Feature pt:31, state:UNSET
+
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
index 7ae89a7d3f021351bf8af542d667142d981278de..b8fad06f77450a9aa8c203a77e0aa9ccbe511589 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
@@ -492,7 +492,7 @@ int main ATLAS_NOT_THREAD_SAFE () {
printFeatures(features_final_em, "[Explicit Final Electron Features] HLT_mu_em_chain", log);
// Check filtering on the collection name. Note sub-string matching, omitting the "My".
- std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em_correctContainer = recursiveGetFeaturesOfType<xAOD::ElectronContainer>(graph_HLT_mu_em_chain, "ElectronContainer");
+ std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em_correctContainer = recursiveGetFeaturesOfType<xAOD::ElectronContainer>(graph_HLT_mu_em_chain, ".*ElectronContainer.*");
std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em_incorrectContainer = recursiveGetFeaturesOfType<xAOD::ElectronContainer>(graph_HLT_mu_em_chain, "WrongContainerName");
VALUE ( features_final_em_correctContainer.size() ) EXPECTED ( features_final_em.size() );
VALUE ( features_final_em_incorrectContainer.size() ) EXPECTED ( 0 );
@@ -510,15 +510,25 @@ void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >&
using namespace TrigCompositeUtils;
std::stringstream ss;
ss << name << " features size:" << featureContainer.size() << std::endl;
- size_t count = 0;
+ std::vector<std::string> strings;
for (const TrigCompositeUtils::LinkInfo<CONTAINER>& featureLinkInfo : featureContainer) {
+ std::stringstream ss1;
std::string stateStr;
switch (featureLinkInfo.state) {
case ActiveState::ACTIVE: stateStr = "ACTIVE"; break;
case ActiveState::INACTIVE: stateStr = "INACTIVE"; break;
case ActiveState::UNSET: default: stateStr = "UNSET"; break;
}
- ss << " Feature " << count++ << " pt:" << (*featureLinkInfo.link)->pt() << ", state:" << stateStr << std::endl;
+ ss1 << " Feature pt:" << (*featureLinkInfo.link)->pt() << ", state:" << stateStr << std::endl;
+ strings.push_back (ss1.str());
+ }
+
+ // The ordering of elements in featureContainer is unpredictable
+ // due to the iteration over set<NavGraphNode*>.
+ // Sort the results so that the output is reproducible.
+ std::sort (strings.begin(), strings.end());
+ for (const std::string& s : strings) {
+ ss << s;
}
log << MSG::INFO << ss.str() << endmsg;
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h
index f03bbf78af40f4c50f587fa6682b54800b9d2305..ba41b04f1dab6b4ca095fde42a38a621c18af656 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl1.h
@@ -38,9 +38,6 @@ namespace TCS {
parType_t p_MinET1[4] = { 0,0,0,0 };
parType_t p_MinET2[4] = { 0,0,0,0 };
- TH1 * m_histAcceptDEta1[4] = {};
- TH1 * m_histRejectDEta1[4] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h
index fe2ac2afdbcf361f121b33ee9c0c5ffcd1e4b162..dfa342c95602f4c6503129758a1fbdff433af26f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaIncl2.h
@@ -38,9 +38,6 @@ namespace TCS {
parType_t p_MinET1[4] = { 0,0,0,0 };
parType_t p_MinET2[4] = { 0,0,0,0 };
- TH1 * m_histAcceptDEta2[4] = {};
- TH1 * m_histRejectDEta2[4] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h
index a2c8c720b06e470b5523ded10aa3a185f1eef842..f57dc339704a19df25eac8be8284cb185eec32b3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl1.h
@@ -42,8 +42,6 @@ namespace TCS {
parType_t p_MinET1[3] = { 0,0,0 };
parType_t p_MinET2[3] = { 0,0,0 };
- TH2 * m_histAccept[3] = {};
- TH2 * m_histReject[3] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h
index eb4210f4c5b755ccd49c92528a8ab719792b2f84..0d29a003b6d5117207f1503bc014beeff9488259 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaEtaPhiIncl2.h
@@ -42,8 +42,6 @@ namespace TCS {
parType_t p_MinET1[3] = { 0,0,0 };
parType_t p_MinET2[3] = { 0,0,0 };
- TH2 * m_histAccept[3] = {};
- TH2 * m_histReject[3] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h
index ac91c479fc921baa50ec080510fae5fbb4140f86..d46c76c946bd88c6c7d0df678bed9b3eb015eedc 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl1.h
@@ -38,8 +38,6 @@ namespace TCS {
parType_t p_MinET1[2] = { 0,0 };
parType_t p_MinET2[2] = { 0,0 };
- TH1 * m_histAcceptDPhi2[2] = {};
- TH1 * m_histRejectDPhi2[2] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h
index 8e2e650e18b1925332e6d349d409e7ccc195a2aa..2cc72ab6ffdd54085191474a7463915dc5fe35ed 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaPhiIncl2.h
@@ -39,8 +39,6 @@ namespace TCS {
parType_t p_MinET1[2] = { 0,0 };
parType_t p_MinET2[2] = { 0,0 };
- TH1 * m_histAcceptDPhi2[2] = {};
- TH1 * m_histRejectDPhi2[2] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h
index 29909d87d60d2dd48c9b458891e99965f7669a79..0c45fcc56c7c48682764ebaeb05f1a3e84397b2f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl1.h
@@ -44,8 +44,6 @@ namespace TCS {
parType_t p_MinET1 = { 0 };
parType_t p_MinET2 = { 0 };
- TH2 * m_histAccept[3] = {};
- TH2 * m_histReject[3] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h
index 72a5340a2faae7fa68132480f35eb6c871139a55..5ff724ab74733d69b501eccadbd666fc0537c441 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRApproxBoxCutIncl2.h
@@ -44,8 +44,6 @@ namespace TCS {
parType_t p_MinET1 = { 0 };
parType_t p_MinET2 = { 0 };
- TH2 * m_histAccept[3] = {};
- TH2 * m_histReject[3] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h
index ff0bb5a9e02d65c4b930e0411f7238f4513fc453..5f3fb11c08c39063e220c49f17875edb51bae969 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// DeltaRSqrIncl1.h
// TopoCore
@@ -42,8 +42,6 @@ namespace TCS {
parType_t p_MinET2 = { 0 };
parType_t p_OneBarrel = { 0 };
- TH1 * m_histAccept[3] = {};
- TH1 * m_histReject[3] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h
index 0d6a6d90163a9939533c27d02846dcba5c242477..0cfcc0fe883ae0caf067b8db609f0728ff76958c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/DeltaRSqrIncl2.h
@@ -38,8 +38,6 @@ namespace TCS {
parType_t p_MinET1[3] = { 0,0,0 };
parType_t p_MinET2[3] = { 0,0,0 };
- TH1 * m_histAccept[3] = {};
- TH1 * m_histReject[3] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtaPhiWindow.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtaPhiWindow.h
index 1052ac618e5278b5b7e2212f8ab5e443bd312a54..e0f7e402748f88fd9a1ce90276c39f4a4ca6d1f6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtaPhiWindow.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/EtaPhiWindow.h
@@ -46,8 +46,6 @@ private:
parType_t p_PhiMax = { 0 };
parType_t p_PhiMin = { 0 };
- TH2 * m_histAccept[1] = {};
- TH2 * m_histReject[1] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ExclusiveJets.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ExclusiveJets.h
index f72a0c33d8742f12cf2bf80b0bcccedbf37c5fe3..e320f0a3e1ae86d8f1d115732d2f3e9585f740b3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ExclusiveJets.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/ExclusiveJets.h
@@ -33,10 +33,7 @@ namespace TCS {
parType_t p_MaxEta1[6] = { 0,0,0,0,0,0 };
parType_t p_MinEta2[6] = { 0,0,0,0,0,0 };
parType_t p_MaxEta2[6] = { 0,0,0,0,0,0 };
- TH2F * m_histAcceptExclusiveJets[6] = {};
- TH2F * m_histRejectExclusiveJets[6] = {};
- TH2F * m_histAcceptEta1Eta2[6] = {};
- TH2F * m_histRejectEta1Eta2[6] = {};
+
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassDeltaPhiInclusive2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassDeltaPhiInclusive2.h
index d00c38f82c02830b8e8421d30a141d8e018d53d2..7bf79acd2f98ac0c6de7885ece52e9fc3178fa9f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassDeltaPhiInclusive2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassDeltaPhiInclusive2.h
@@ -48,11 +48,6 @@ namespace TCS {
parType_t p_DeltaPhiMin[6] = { 0,0,0,0,0,0 };
parType_t p_DeltaPhiMax[6] = { 0,0,0,0,0,0 };
- std::vector<std::string> m_histAcceptM;
- std::vector<std::string> m_histRejectM;
- std::vector<std::string> m_histAcceptEta1Eta2;
- std::vector<std::string> m_histRejectEta1Eta2;
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h
index 50e59d76394723264fa5a39fd29ac687128cae5c..90d9a232486a82b58e8c1cd23db02c1179ea828d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive1.h
@@ -39,9 +39,6 @@ namespace TCS {
parType_t p_MinET2[6] = { 0 ,0,0,0,0,0};
parType_t p_OneBarrel = { 0 };
- TH1 * m_histAcceptINV1[6] = {};
- TH1 * m_histRejectINV1[6] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h
index d391e15f86227ea5668c450ecb07d8c4dd41949c..ed99534d88e8addf301a99950360c427d3b3c8ea 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusive2.h
@@ -46,10 +46,6 @@ namespace TCS {
parType_t p_MinEta2 = { 0 };
parType_t p_MaxEta2 = { 0 };
- TH1 * m_histAcceptM[6] = {};
- TH1 * m_histRejectM[6] = {};
- TH2 * m_histAcceptEta1Eta2[6] = {};
- TH2 * m_histRejectEta1Eta2[6] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl1.h
index ef091aaf6408ac31621316494bec979500e1bac8..0e0725160b3a2aaa78543590529676cc4897e51c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// InvariantMassInclusiveDeltaRSqrIncl1.h
// TopoCore
@@ -43,9 +43,6 @@ namespace TCS {
parType_t p_DeltaRMin[6] = { 0,0,0,0,0,0 };
parType_t p_DeltaRMax[6] = { 0,0,0,0,0,0 };
- TH2 * m_histAcceptM[6] = {};
- TH2 * m_histRejectM[6] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl2.h
index 6d26d069e1bce0399642aabdae0733368dc00659..4c540658875643920004efb824ef3b66ff369440 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassInclusiveDeltaRSqrIncl2.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// InvariantMassInclusiveDeltaRSqrIncl2.h
// TopoCore
@@ -48,8 +48,6 @@ namespace TCS {
parType_t p_DeltaRMin[6] = { 0,0,0,0,0,0 };
parType_t p_DeltaRMax[6] = { 0,0,0,0,0,0 };
- TH2 * m_histAcceptM[6] = {};
- TH2 * m_histRejectM[6] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h
index 12665a8684b180a9368b449806e134a2ab2df86c..f2836d898d8dd2bd9f28435a9577ba4c740a995e 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/InvariantMassThreeTOBsIncl.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// InvariantMassThreeTOBsIncl.h
// TopoCore
@@ -37,9 +37,6 @@ namespace TCS {
parType_t p_MinET1[6] = { 0 ,0,0,0,0,0};
parType_t p_OneBarrel = { 0 };
- TH1 * m_histAcceptINVThree[6] = {};
- TH1 * m_histRejectINVThree[6] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h
index 902dc290c871ef6957210624548bec458463aa42..f7b2c55803b7b427d3393c25155d3f4385b527de 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/JetHT.h
@@ -36,9 +36,6 @@ namespace TCS {
parType_t p_EtaMax = { 49 };
parType_t p_HT[6] = { 0 , 0,0,0,0,0 };
- TH1 * m_histAcceptHT[6] = {};
- TH1 * m_histRejectHT[6] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h
index 44eecaccf2d1a82f6b3c60f75d70c6418cf6d4ce..68a52b9a1c1708be3c1ea3eab49ba14ca2aa3325 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/MinDeltaPhiIncl2.h
@@ -38,9 +38,6 @@ namespace TCS {
parType_t p_MinET1 = { 0 };
parType_t p_MinET2 = { 0 };
- TH1 * m_histAcceptMinDPhi2[3]= {};
- TH1 * m_histRejectMinDPhi2[3] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h
index 65e58b368f0c1b0cc3e18d997d3a38f3be0dea10..86db60881f0559a2a49ebf8bc259887e995ee595 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/SimpleCone.h
@@ -35,9 +35,6 @@ namespace TCS {
parType_t p_EtaMax = { 49 };
parType_t p_MinSumET[6] = { 0 , 0,0,0,0,0 };
- TH1 * m_histAcceptSimpleCone[6] = {};
- TH1 * m_histRejectSimpleCone[6] = {};
-
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h
index a0a58c9294ffa9a200f1f061ccb0079528617478..106205fa92e109b358d7ee518ae2cd4c7055fdc9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/L1TopoAlgorithms/TransverseMassInclusive1.h
@@ -36,8 +36,6 @@ namespace TCS {
parType_t p_MinET1[6] = { 0,0,0,0,0,0 };
parType_t p_MinET2[6] = { 0,0,0,0,0,0 };
- TH1 * m_histAcceptM[6] = {};
- TH1 * m_histRejectM[6] = {};
};
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx
index 4fe5a5b27ff3f3deb5be947a056f2919559fea93..df377622a24cfb153c46ccf2569ab04821225988 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx
@@ -25,8 +25,6 @@
REGISTER_ALG_TCS(DeltaEtaIncl1)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
#define LOG cout << fullname() << ": "
@@ -89,23 +87,15 @@ TCS::DeltaEtaIncl1::initialize() {
}
TRG_MSG_INFO("number output : " << numberOutputBits());
- // create strings for histogram names
- std::vector<std::ostringstream> MyAcceptHist(numberOutputBits());
- std::vector<std::ostringstream> MyRejectHist(numberOutputBits());
-
- for (unsigned int i=0;i<numberOutputBits();i++) {
- MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta";
- MyRejectHist[i] << "Reject" << p_DeltaEtaMin[i] << "DEta";
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hDeltaEtaIncl1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaEtaIncl1_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "DETA", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i]);
+ bookHist(m_histReject, hname_reject, "DETA", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i]);
}
- for (unsigned int i=0; i<numberOutputBits();i++) {
-
- const std::string& MyTitle1 = MyAcceptHist[i].str();
- const std::string& MyTitle2 = MyRejectHist[i].str();
-
- registerHist(m_histAcceptDEta1[i] = new TH1F(MyTitle1.c_str(),MyTitle1.c_str(),100,0.,4.));
- registerHist(m_histRejectDEta1[i] = new TH1F(MyTitle2.c_str(),MyTitle2.c_str(),100,0.,4.));
- }
return StatusCode::SUCCESS;
}
@@ -130,9 +120,9 @@ TCS::DeltaEtaIncl1::processBitCorrect( const std::vector<TCS::TOBArray const *>
++tob2) {
for(unsigned int i=0; i < numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
// DeltaEta cuts
unsigned int deltaEta = TSU::Kinematics::calcDeltaEtaBW( *tob1, *tob2 );
std::stringstream msgss;
@@ -150,9 +140,9 @@ TCS::DeltaEtaIncl1::processBitCorrect( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDEta1[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histAccept[i],(float)deltaEta);
} else if(fillReject) {
- fillHist1D(m_histRejectDEta1[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histReject[i],(float)deltaEta);
}
msgss << (accept?"pass":"fail") << "|";
TRG_MSG_DEBUG(msgss.str());
@@ -184,9 +174,9 @@ TCS::DeltaEtaIncl1::process( const std::vector<TCS::TOBArray const *> & input,
++tob2) {
for(unsigned int i=0; i < numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
// DeltaEta cuts
unsigned int deltaEta = TSU::Kinematics::calcDeltaEta( *tob1, *tob2 );
std::stringstream msgss;
@@ -204,9 +194,9 @@ TCS::DeltaEtaIncl1::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDEta1[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histAccept[i],(float)deltaEta);
} else if(fillReject) {
- fillHist1D(m_histRejectDEta1[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histReject[i],(float)deltaEta);
}
msgss << (accept?"pass":"fail") << "|";
TRG_MSG_DEBUG(msgss.str());
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx
index a081723593dce663fd0510abc6748611e4070f90..4ec3f32b1c81807c53a03658ad637175df38bb18 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx
@@ -25,8 +25,6 @@
REGISTER_ALG_TCS(DeltaEtaIncl2)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
#define LOG cout << fullname() << ": "
@@ -88,26 +86,17 @@ TCS::DeltaEtaIncl2::initialize() {
TRG_MSG_INFO("MinET2 : " << p_MinET2[i]);
}
TRG_MSG_INFO("number output : " << numberOutputBits());
-
- // create strings for histogram names
- std::vector<std::ostringstream> MyAcceptHist(numberOutputBits());
- std::vector<std::ostringstream> MyRejectHist(numberOutputBits());
- for (unsigned int i=0;i<numberOutputBits();i++) {
- MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta";
- MyRejectHist[i] << "Reject" << p_DeltaEtaMin[i] << "DEta";
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hDeltaEtaIncl2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaEtaIncl2_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "DETA", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i]);
+ bookHist(m_histReject, hname_reject, "DETA", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i]);
}
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const std::string& MyTitle1 = MyAcceptHist[i].str();
- const std::string& MyTitle2 = MyRejectHist[i].str();
-
- registerHist(m_histAcceptDEta2[i] = new TH1F(MyTitle1.c_str(),MyTitle1.c_str(),100,0.,4.));
- registerHist(m_histRejectDEta2[i] = new TH1F(MyTitle2.c_str(),MyTitle2.c_str(),100,0.,4.));
- }
-
-
return StatusCode::SUCCESS;
}
@@ -140,9 +129,9 @@ TCS::DeltaEtaIncl2::processBitCorrect( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDEta2[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histAccept[i],(float)deltaEta);
} else if(fillReject) {
- fillHist1D(m_histRejectDEta2[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histReject[i],(float)deltaEta);
}
TRG_MSG_DEBUG("DeltaEta = " << deltaEta << " -> accept bit " << i << " -> "
<< (accept?"pass":"fail"));
@@ -183,9 +172,9 @@ TCS::DeltaEtaIncl2::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDEta2[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histAccept[i],(float)deltaEta);
} else if(fillReject) {
- fillHist1D(m_histRejectDEta2[i]->GetName(),(float)deltaEta*0.10);
+ fillHist1D(m_histReject[i],(float)deltaEta);
}
TRG_MSG_DEBUG("DeltaEta = " << deltaEta << " -> accept bit " << i << " -> "
<< (accept?"pass":"fail"));
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx
index e421603763161cfca064f1fb2dc53c4bf19cec8e..f367d26cd34daa9d8c0267661e420c880135816d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl1.cxx
@@ -22,7 +22,6 @@
REGISTER_ALG_TCS(DeltaEtaPhiIncl1)
-using namespace std;
TCS::DeltaEtaPhiIncl1::DeltaEtaPhiIncl1(const std::string & name) : DecisionAlg(name)
{
@@ -83,19 +82,16 @@ TCS::DeltaEtaPhiIncl1::initialize() {
TRG_MSG_INFO("NumberLeading1 : " << p_NumberLeading1); // note that the reading of generic parameters doesn't work yet
TRG_MSG_INFO("NumberLeading2 : " << p_NumberLeading2);
TRG_MSG_INFO("number output : " << numberOutputBits());
+
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int EtaPhi_bin=100;
- float EtaPhi_min=0;
- float EtaPhi_max=70;
- // eta2 vs. eta1
- snprintf(hname_accept, buf_len, "Accept_DeltaEtaPhiIncl1_bit%d", i);
- snprintf(hname_reject, buf_len, "Reject_DeltaEtaPhiIncl1_bit%d", i);
- registerHist(m_histAccept[i] = new TH2F(hname_accept, hname_accept, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- registerHist(m_histReject[i] = new TH2F(hname_reject, hname_reject, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- }
+ std::string hname_accept = "hDeltaEtaPhiIncl1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaEtaPhiIncl1_reject_bit"+std::to_string((int)i);
+ // deta vs dphi
+ bookHist(m_histAccept, hname_accept, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ bookHist(m_histReject, hname_reject, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ }
+
return StatusCode::SUCCESS;
}
@@ -128,9 +124,9 @@ TCS::DeltaEtaPhiIncl1::processBitCorrect( const std::vector<TCS::TOBArray const
<< ", DeltaPhi = " << deltaPhi << ", DeltaEta = " << deltaEta << " -> ";
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = ( deltaEta >= p_DeltaEtaMin[i] || deltaPhi >= p_DeltaPhiMin[i] ) && deltaPhi <= p_DeltaPhiMax[i] && deltaEta <= p_DeltaEtaMax[i];
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -140,9 +136,9 @@ TCS::DeltaEtaPhiIncl1::processBitCorrect( const std::vector<TCS::TOBArray const
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histAccept[i],(float)deltaEta,(float)deltaPhi);
} else if(fillReject) {
- fillHist2D(m_histReject[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histReject[i],(float)deltaEta,(float)deltaPhi);
}
msgss << "DeltaEtaPhiIncl1 alg bit" << i << (accept?" pass":" fail") << "|";
}
@@ -186,9 +182,9 @@ TCS::DeltaEtaPhiIncl1::process( const std::vector<TCS::TOBArray const *> & input
<< ", DeltaEta = " << deltaEta << " -> ";
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = ( deltaEta >= p_DeltaEtaMin[i] || deltaPhi >= p_DeltaPhiMin[i] ) && deltaPhi <= p_DeltaPhiMax[i] && deltaEta <= p_DeltaEtaMax[i];
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -198,9 +194,9 @@ TCS::DeltaEtaPhiIncl1::process( const std::vector<TCS::TOBArray const *> & input
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histAccept[i],(float)deltaEta,(float)deltaPhi);
} else if(fillReject) {
- fillHist2D(m_histReject[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histReject[i],(float)deltaEta,(float)deltaPhi);
}
msgss << "DeltaEtaPhiIncl1 alg bit" << i << (accept?" pass":" fail") << "|";
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx
index a78706b0d0312d013d4cf89a6697889e684a5d59..acb8953eb78b77337251d92816d308858eef6086 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaPhiIncl2.cxx
@@ -22,7 +22,6 @@
REGISTER_ALG_TCS(DeltaEtaPhiIncl2)
-using namespace std;
TCS::DeltaEtaPhiIncl2::DeltaEtaPhiIncl2(const std::string & name) : DecisionAlg(name)
{
@@ -84,19 +83,16 @@ TCS::DeltaEtaPhiIncl2::initialize() {
TRG_MSG_INFO("NumberLeading2 : " << p_NumberLeading2);
TRG_MSG_INFO("number output : " << numberOutputBits());
+
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int EtaPhi_bin=100;
- float EtaPhi_min=0;
- float EtaPhi_max=70;
- // eta2 vs. eta1
- snprintf(hname_accept, buf_len, "Accept_DeltaEtaPhiIncl2_bit%d", i);
- snprintf(hname_reject, buf_len, "Reject_DeltaEtaPhiIncl2_bit%d", i);
- registerHist(m_histAccept[i] = new TH2F(hname_accept, hname_accept, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- registerHist(m_histReject[i] = new TH2F(hname_reject, hname_reject, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- }
+ std::string hname_accept = "hDeltaEtaPhiIncl2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaEtaPhiIncl2_reject_bit"+std::to_string((int)i);
+ // deta vs dphi
+ bookHist(m_histAccept, hname_accept, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ bookHist(m_histReject, hname_reject, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ }
+
return StatusCode::SUCCESS;
}
@@ -139,9 +135,9 @@ TCS::DeltaEtaPhiIncl2::processBitCorrect( const std::vector<TCS::TOBArray const
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histAccept[i],(float)deltaEta,(float)deltaPhi);
} else if(fillReject) {
- fillHist2D(m_histReject[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histReject[i],(float)deltaEta,(float)deltaPhi);
}
msgss << "DeltaRApproxBoxCutIncl2 alg bit" << i << (accept?" pass":" fail") << "|";
}
@@ -192,9 +188,9 @@ TCS::DeltaEtaPhiIncl2::process( const std::vector<TCS::TOBArray const *> & input
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histAccept[i],(float)deltaEta,(float)deltaPhi);
} else if(fillReject) {
- fillHist2D(m_histReject[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histReject[i],(float)deltaEta,(float)deltaPhi);
}
msgss << "DeltaRApproxBoxCutIncl2 alg bit" << i << (accept?" pass":" fail") << "|";
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx
index c2f3500f901d689418d706c9e6226eecfd2ee655..115e4b6df41e71447de63ad34f06b3e34c6f14b8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl1.cxx
@@ -21,7 +21,6 @@
REGISTER_ALG_TCS(DeltaPhiIncl1)
-using namespace std;
TCS::DeltaPhiIncl1::DeltaPhiIncl1(const std::string & name) : DecisionAlg(name)
{
@@ -71,27 +70,16 @@ TCS::DeltaPhiIncl1::initialize() {
TRG_MSG_INFO("NumberLeading2 : " << p_NumberLeading2);
TRG_MSG_INFO("number output : " << numberOutputBits());
- // create strings for histogram names
- std::vector<std::ostringstream> MyAcceptHist(numberOutputBits());
- std::vector<std::ostringstream> MyRejectHist(numberOutputBits());
- int dphi_bin=100;
- float dphi_min=0;
- float dphi_max=3.4;
-
- for (unsigned int i=0;i<numberOutputBits();i++) {
- MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "DPHI" << p_DeltaPhiMax[i];
- MyRejectHist[i] << "Reject" << p_DeltaPhiMin[i] << "DPHI" << p_DeltaPhiMax[i];
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hDeltaPhiIncl1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaPhiIncl1_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "DPHI", 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ bookHist(m_histReject, hname_reject, "DPHI", 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
}
-
- for (unsigned int i=0; i<numberOutputBits();i++) {
-
- const std::string& MyTitle1 = MyAcceptHist[i].str();
- const std::string& MyTitle2 = MyRejectHist[i].str();
-
- registerHist(m_histAcceptDPhi2[i] = new TH1F(MyTitle1.c_str(),MyTitle1.c_str(),dphi_bin,dphi_min,dphi_max));
- registerHist(m_histRejectDPhi2[i] = new TH1F(MyTitle2.c_str(),MyTitle2.c_str(),dphi_bin,dphi_min,dphi_max));
- }
+
return StatusCode::SUCCESS;
}
@@ -121,9 +109,9 @@ TCS::DeltaPhiIncl1::processBitCorrect( const std::vector<TCS::TOBArray const *>
<< ", DeltaPhi = " << deltaPhi << " -> ";
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = deltaPhi >= p_DeltaPhiMin[i] && deltaPhi <= p_DeltaPhiMax[i];
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -133,9 +121,9 @@ TCS::DeltaPhiIncl1::processBitCorrect( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histAccept[i],deltaPhi);
} else if(fillReject) {
- fillHist1D(m_histRejectDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histReject[i],deltaPhi);
}
TRG_MSG_DEBUG("DeltaPhiIncl1 = " << deltaPhi << " -> "
<< (accept?"pass":"fail"));
@@ -175,9 +163,9 @@ TCS::DeltaPhiIncl1::process( const std::vector<TCS::TOBArray const *> & input,
<< ", DeltaPhi = " << deltaPhi << " -> ";
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = deltaPhi >= p_DeltaPhiMin[i] && deltaPhi <= p_DeltaPhiMax[i];
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -187,9 +175,9 @@ TCS::DeltaPhiIncl1::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histAccept[i],deltaPhi);
} else if(fillReject) {
- fillHist1D(m_histRejectDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histReject[i],deltaPhi);
}
TRG_MSG_DEBUG("DeltaPhiIncl1 = " << deltaPhi << " -> "
<< (accept?"pass":"fail"));
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx
index 9977142d1cd99b05ceb32cfbd7ab1f27d32a63b9..cd782796a491acbbccf5485b79e8c0be3f17de4f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx
@@ -71,27 +71,16 @@ TCS::DeltaPhiIncl2::initialize() {
TRG_MSG_INFO("NumberLeading2 : " << p_NumberLeading2);
TRG_MSG_INFO("number output : " << numberOutputBits());
- // create strings for histogram names
- std::vector<std::ostringstream> MyAcceptHist(numberOutputBits());
- std::vector<std::ostringstream> MyRejectHist(numberOutputBits());
- int dphi_bin=100;
- float dphi_min=0;
- float dphi_max=3.4;
-
- for (unsigned int i=0;i<numberOutputBits();i++) {
- MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "DPHI" << p_DeltaPhiMax[i];
- MyRejectHist[i] << "Reject" << p_DeltaPhiMin[i] << "DPHI" << p_DeltaPhiMax[i];
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hDeltaPhiIncl2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaPhiIncl2_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "DPHI", 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ bookHist(m_histReject, hname_reject, "DPHI", 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
}
-
- for (unsigned int i=0; i<numberOutputBits();i++) {
-
- const std::string& MyTitle1 = MyAcceptHist[i].str();
- const std::string& MyTitle2 = MyRejectHist[i].str();
-
- registerHist(m_histAcceptDPhi2[i] = new TH1F(MyTitle1.c_str(),MyTitle1.c_str(),dphi_bin,dphi_min,dphi_max));
- registerHist(m_histRejectDPhi2[i] = new TH1F(MyTitle2.c_str(),MyTitle2.c_str(),dphi_bin,dphi_min,dphi_max));
- }
+
return StatusCode::SUCCESS;
}
@@ -126,9 +115,9 @@ TCS::DeltaPhiIncl2::processBitCorrect( const std::vector<TCS::TOBArray const *>
output[i]->push_back(TCS::CompositeTOB(*tob1, *tob2));
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histAccept[i],deltaPhi);
} else if(fillReject) {
- fillHist1D(m_histRejectDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histReject[i],deltaPhi);
}
TRG_MSG_DEBUG("DeltaPhiIncl2 = " << deltaPhi << " -> "
<< (accept?"pass":"fail"));
@@ -171,9 +160,9 @@ TCS::DeltaPhiIncl2::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back(TCS::CompositeTOB(*tob1, *tob2));
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histAccept[i],deltaPhi);
} else if(fillReject) {
- fillHist1D(m_histRejectDPhi2[i]->GetName(),deltaPhi);
+ fillHist1D(m_histReject[i],deltaPhi);
}
TRG_MSG_DEBUG("DeltaPhiIncl2 = " << deltaPhi << " -> "
<< (accept?"pass":"fail"));
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
index fbf50fdc782faa119f90ee146efbe6ea3c060bb3..ce755cd5a87346800587811c945afa1cde9cba88 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* DeltaRApproxBoxCutIncl1.cpp
@@ -21,8 +21,6 @@
REGISTER_ALG_TCS(DeltaRApproxBoxCutIncl1)
-using namespace std;
-
namespace {
unsigned int
calcDeltaPhi(const TCS::GenericTOB* tob1, const TCS::GenericTOB* tob2) {
@@ -35,7 +33,7 @@ namespace {
unsigned int
calcDeltaEta(const TCS::GenericTOB* tob1, const TCS::GenericTOB* tob2) {
- double deta = fabs( tob1->eta() - tob2->eta() );
+ double deta = std::abs( tob1->eta() - tob2->eta() );
return deta;
}
}
@@ -96,19 +94,16 @@ TCS::DeltaRApproxBoxCutIncl1::initialize() {
TRG_MSG_INFO("MinET1 : " << p_MinET1);
TRG_MSG_INFO("MinET2 : " << p_MinET2);
TRG_MSG_INFO("number output : " << numberOutputBits());
+
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int EtaPhi_bin=100;
- float EtaPhi_min=0;
- float EtaPhi_max=70;
- // eta2 vs. eta1
- snprintf(hname_accept, buf_len, "Accept_DeltaRApproxBoxCutIncl1_bit%d", i);
- snprintf(hname_reject, buf_len, "Reject_DeltaRApproxBoxCutIncl1_bit%d", i);
- registerHist(m_histAccept[i] = new TH2F(hname_accept, hname_accept, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- registerHist(m_histReject[i] = new TH2F(hname_reject, hname_reject, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- }
+ std::string hname_accept = "hDeltaRApproxBoxCutIncl1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaRApproxBoxCutIncl1_reject_bit"+std::to_string((int)i);
+ // deta vs dphi
+ bookHist(m_histAccept, hname_accept, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ bookHist(m_histReject, hname_reject, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ }
+
return StatusCode::SUCCESS;
}
@@ -135,13 +130,13 @@ TCS::DeltaRApproxBoxCutIncl1::process( const std::vector<TCS::TOBArray const *>
tob1 != input[0]->end() && distance( input[0]->begin(), tob1) < nLeading;
++tob1)
{
- if( parType_t((*tob1)->Et()) <= min(p_MinET1,p_MinET2)) continue; // ET cut
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1,p_MinET2)) continue; // ET cut
TCS::TOBArray::const_iterator tob2 = tob1; ++tob2;
for( ;
tob2 != input[0]->end() && distance( input[0]->begin(), tob2) < p_NumberLeading2;
++tob2) {
- if( parType_t((*tob2)->Et()) <= min(p_MinET1,p_MinET2)) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1,p_MinET2)) && (parType_t((*tob2)->Et()) <= max(p_MinET1,p_MinET2))) continue;
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1,p_MinET2)) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1,p_MinET2)) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1,p_MinET2))) continue;
// DeltaPhi cuts
unsigned int deltaPhi = calcDeltaPhi( *tob1, *tob2 );
// DeltaEta cuts
@@ -166,9 +161,9 @@ TCS::DeltaRApproxBoxCutIncl1::process( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histAccept[i],(float)deltaEta,(float)deltaPhi);
} else if(fillReject) {
- fillHist2D(m_histReject[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histReject[i],(float)deltaEta,(float)deltaPhi);
}
msgss << "DeltaRApproxBoxCutIncl1 alg bit" << i << (accept?" pass":" fail") << "|";
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx
index e1deabde6e3f9ef8f2f81280e0013e323e92f855..adca231c44502e720fb3f3b20a97e92f5e55b2f2 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRApproxBoxCutIncl2.cxx
@@ -20,7 +20,6 @@
REGISTER_ALG_TCS(DeltaRApproxBoxCutIncl2)
-using namespace std;
namespace {
unsigned int
@@ -98,19 +97,16 @@ TCS::DeltaRApproxBoxCutIncl2::initialize() {
TRG_MSG_INFO("MinET2 : " << p_MinET2);
TRG_MSG_INFO("number output : " << numberOutputBits());
+
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int EtaPhi_bin=100;
- float EtaPhi_min=0;
- float EtaPhi_max=70;
- // eta2 vs. eta1
- snprintf(hname_accept, buf_len, "Accept_DeltaRApproxBoxCutIncl2_bit%d", i);
- snprintf(hname_reject, buf_len, "Reject_DeltaRApproxBoxCutIncl2_bit%d", i);
- registerHist(m_histAccept[i] = new TH2F(hname_accept, hname_accept, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- registerHist(m_histReject[i] = new TH2F(hname_reject, hname_reject, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- }
+ std::string hname_accept = "hDeltaRApproxBoxCutIncl2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaRApproxBoxCutIncl2_reject_bit"+std::to_string((int)i);
+ // deta vs dphi
+ bookHist(m_histAccept, hname_accept, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ bookHist(m_histReject, hname_reject, "DETA vs DPHI", 100, p_DeltaEtaMin[i], p_DeltaEtaMax[i], 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
+ }
+
return StatusCode::SUCCESS;
}
@@ -166,9 +162,9 @@ TCS::DeltaRApproxBoxCutIncl2::process( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histAccept[i],(float)deltaEta,(float)deltaPhi);
} else if(fillReject) {
- fillHist2D(m_histReject[i]->GetName(),(float)deltaEta,(float)deltaPhi);
+ fillHist2D(m_histReject[i],(float)deltaEta,(float)deltaPhi);
}
msgss << "DeltaRApproxBoxCutIncl2 alg bit" << i << (accept?" pass":" fail") << "|";
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx
index 24afe630d30d68d05cc07c7faa19ae643d0cabe5..693ed0743733b8fb67dfdef2cd8bc3f075eaa3fa 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl1.cxx
@@ -21,10 +21,9 @@
REGISTER_ALG_TCS(DeltaRSqrIncl1)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DeltaRSqrIncl1: "
+#define LOG std::cout << "TCS::DeltaRSqrIncl1: "
TCS::DeltaRSqrIncl1::DeltaRSqrIncl1(const std::string & name) : DecisionAlg(name)
{
@@ -76,16 +75,16 @@ TCS::DeltaRSqrIncl1::initialize() {
TRG_MSG_INFO("MinET2 : " << p_MinET2);
TRG_MSG_INFO("number output : " << numberOutputBits());
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int deltaR_max = sqrt(p_DeltaRMax[i]);
- // mass
- snprintf(hname_accept, buf_len, "Accept_DeltaRSqrIncl1_bit%d", i);
- snprintf(hname_reject, buf_len, "Reject_DeltaRSqrIncl1_bit%d", i);
- registerHist(m_histAccept[i] = new TH1F(hname_accept, hname_accept, 100, 0.0, 2*deltaR_max));
- registerHist(m_histReject[i] = new TH1F(hname_reject, hname_reject, 100, 0.0, 2*deltaR_max));
+
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hDeltaRSqrIncl1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaRSqrIncl1_reject_bit"+std::to_string((int)i);
+ // dR
+ bookHist(m_histAccept, hname_accept, "DR", 100, sqrt(p_DeltaRMin[i]), sqrt(p_DeltaRMax[i]));
+ bookHist(m_histReject, hname_reject, "DR", 100, sqrt(p_DeltaRMin[i]), sqrt(p_DeltaRMax[i]));
}
+
return StatusCode::SUCCESS;
}
@@ -102,13 +101,13 @@ TCS::DeltaRSqrIncl1::processBitCorrect( const std::vector<TCS::TOBArray const *>
tob1 != input[0]->end() && distance( input[0]->begin(), tob1) < p_NumberLeading1;
++tob1)
{
- if( parType_t((*tob1)->Et()) <= min(p_MinET1,p_MinET2)) continue; // ET cut
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1,p_MinET2)) continue; // ET cut
TCS::TOBArray::const_iterator tob2 = tob1; ++tob2;
for( ;
tob2 != input[0]->end() && distance( input[0]->begin(), tob2) < p_NumberLeading2;
++tob2) {
- if( parType_t((*tob2)->Et()) <= min(p_MinET1,p_MinET2)) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1,p_MinET2)) && (parType_t((*tob2)->Et()) <= max(p_MinET1,p_MinET2))) continue;
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1,p_MinET2)) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1,p_MinET2)) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1,p_MinET2))) continue;
// OneBarrel
if (p_OneBarrel && parType_t(abs((*tob1)->eta())) > 10 && parType_t(abs((*tob2)->eta())) > 10 ) continue;
// DeltaR2 cuts
@@ -124,9 +123,9 @@ TCS::DeltaRSqrIncl1::processBitCorrect( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAccept[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histAccept[i],sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist1D(m_histReject[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histReject[i],sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " deltaR2 = " << deltaR2);
}
@@ -148,13 +147,13 @@ TCS::DeltaRSqrIncl1::process( const std::vector<TCS::TOBArray const *> & input,
tob1 != input[0]->end() && distance( input[0]->begin(), tob1) < p_NumberLeading1;
++tob1)
{
- if( parType_t((*tob1)->Et()) <= min(p_MinET1,p_MinET2)) continue; // ET cut
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1,p_MinET2)) continue; // ET cut
TCS::TOBArray::const_iterator tob2 = tob1; ++tob2;
for( ;
tob2 != input[0]->end() && distance( input[0]->begin(), tob2) < p_NumberLeading2;
++tob2) {
- if( parType_t((*tob2)->Et()) <= min(p_MinET1,p_MinET2)) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1,p_MinET2)) && (parType_t((*tob2)->Et()) <= max(p_MinET1,p_MinET2))) continue;
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1,p_MinET2)) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1,p_MinET2)) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1,p_MinET2))) continue;
// OneBarrel
if (p_OneBarrel && parType_t(abs((*tob1)->eta())) > 10 && parType_t(abs((*tob2)->eta())) > 10 ) continue;
// DeltaR2 cuts
@@ -170,9 +169,9 @@ TCS::DeltaRSqrIncl1::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAccept[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histAccept[i],sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist1D(m_histReject[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histReject[i],sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " deltaR2 = " << deltaR2);
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx
index ee55070db2f3cbc0a00fda8220d6b8a90740e428..e6213716dbb11b7461a33b21affe4cee7518e38d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaRSqrIncl2.cxx
@@ -21,10 +21,9 @@
REGISTER_ALG_TCS(DeltaRSqrIncl2)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DeltaRSqrIncl2: "
+#define LOG std::cout << "TCS::DeltaRSqrIncl2: "
TCS::DeltaRSqrIncl2::DeltaRSqrIncl2(const std::string & name) : DecisionAlg(name)
{
@@ -76,16 +75,16 @@ TCS::DeltaRSqrIncl2::initialize() {
TRG_MSG_INFO("NumberLeading2 : " << p_NumberLeading2);
TRG_MSG_INFO("number output : " << numberOutputBits());
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int deltaR_max = sqrt(p_DeltaRMax[i]);
- // mass
- snprintf(hname_accept, buf_len, "Accept_DeltaRSqrIncl2_bit%d", i);
- snprintf(hname_reject, buf_len, "Reject_DeltaRSqrIncl2_bit%d", i);
- registerHist(m_histAccept[i] = new TH1F(hname_accept, hname_accept, 100, 0.0, 2*deltaR_max));
- registerHist(m_histReject[i] = new TH1F(hname_reject, hname_reject, 100, 0.0, 2*deltaR_max));
- }
+
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hDeltaRSqrIncl2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hDeltaRSqrIncl2_reject_bit"+std::to_string((int)i);
+ // dR
+ bookHist(m_histAccept, hname_accept, "DR", 100, sqrt(p_DeltaRMin[i]), sqrt(p_DeltaRMax[i]));
+ bookHist(m_histReject, hname_reject, "DR", 100, sqrt(p_DeltaRMin[i]), sqrt(p_DeltaRMax[i]));
+ }
+
return StatusCode::SUCCESS;
}
@@ -121,9 +120,9 @@ TCS::DeltaRSqrIncl2::processBitCorrect( const std::vector<TCS::TOBArray const *>
output[i]->push_back(TCS::CompositeTOB(*tob1, *tob2));
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAccept[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histAccept[i],sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist1D(m_histReject[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histReject[i],sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " deltaR2 = " << deltaR2);
}
@@ -169,9 +168,9 @@ TCS::DeltaRSqrIncl2::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back(TCS::CompositeTOB(*tob1, *tob2));
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAccept[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histAccept[i],sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist1D(m_histReject[i]->GetName(),sqrt((float)deltaR2));
+ fillHist1D(m_histReject[i],sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " deltaR2 = " << deltaR2);
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx
index 01acb08916269649dceae7cf43ada866733bb776..5e19282c2005c9992004c66d31c19788f46a4326 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl2.cxx
@@ -20,10 +20,9 @@
REGISTER_ALG_TCS(DisambiguationDRIncl2)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DisambiguationDRIncl2: "
+#define LOG std::cout << "TCS::DisambiguationDRIncl2: "
TCS::DisambiguationDRIncl2::DisambiguationDRIncl2(const std::string & name) : DecisionAlg(name)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx
index b1cb364612812b5a2cf4b75bd48e29ccf694e857..66281666584f14f9e9ce4a0fa8d25533805e17a2 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDRIncl3.cxx
@@ -20,10 +20,9 @@
REGISTER_ALG_TCS(DisambiguationDRIncl3)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DisambiguationDRIncl3: "
+#define LOG std::cout << "TCS::DisambiguationDRIncl3: "
TCS::DisambiguationDRIncl3::DisambiguationDRIncl3(const std::string & name) : DecisionAlg(name)
{
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
index 9b079155c5f8ab8f9cf907b831edd6692ae5d879..d16a33b25cbe145d45822d0b27ce898b2846e866 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationDetaDPhiIncl3.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* DisambiguationDetaDPhiIncl3.cpp
@@ -20,10 +20,9 @@
REGISTER_ALG_TCS(DisambiguationDetaDPhiIncl3)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DisambiguationDetaDPhiIncl3: "
+#define LOG std::cout << "TCS::DisambiguationDetaDPhiIncl3: "
TCS::DisambiguationDetaDPhiIncl3::DisambiguationDetaDPhiIncl3(const std::string & name) : DecisionAlg(name)
@@ -129,16 +128,16 @@ TCS::DisambiguationDetaDPhiIncl3::processBitCorrect( const std::vector<TCS::TOBA
{
if( parType_t((*tob1)->Et()) <= p_MinET1) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
// DeltaPhi cuts
unsigned int deltaPhi = TSU::Kinematics::calcDeltaPhiBW( *tob1, *tob2 );
@@ -152,8 +151,8 @@ TCS::DisambiguationDetaDPhiIncl3::processBitCorrect( const std::vector<TCS::TOBA
tob3 != input[2]->end() ;
++tob3) {
if( parType_t((*tob3)->Et()) <= p_MinET3) continue; // ET cut
- if( parType_t(fabs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
- if( parType_t(fabs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
unsigned int deltaR13 = TSU::Kinematics::calcDeltaR2BW( *tob1, *tob3 );
unsigned int deltaR23 = TSU::Kinematics::calcDeltaR2BW( *tob2, *tob3 );
for(unsigned int i=0; i<numberOutputBits(); ++i) {
@@ -191,16 +190,16 @@ TCS::DisambiguationDetaDPhiIncl3::process( const std::vector<TCS::TOBArray const
{
if( parType_t((*tob1)->Et()) <= p_MinET1) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1 ) continue; // Eta cut
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2 ) continue; // Eta cut
// DeltaPhi cuts
unsigned int deltaPhi = TSU::Kinematics::calcDeltaPhi( *tob1, *tob2 );
@@ -214,8 +213,8 @@ TCS::DisambiguationDetaDPhiIncl3::process( const std::vector<TCS::TOBArray const
tob3 != input[2]->end() ;
++tob3) {
if( parType_t((*tob3)->Et()) <= p_MinET3) continue; // ET cut
- if( parType_t(fabs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
- if( parType_t(fabs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) > p_EtaMax3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob3)->eta())) < p_EtaMin3 ) continue; // Eta cut
unsigned int deltaR13 = TSU::Kinematics::calcDeltaR2( *tob1, *tob3 );
unsigned int deltaR23 = TSU::Kinematics::calcDeltaR2( *tob2, *tob3 );
for(unsigned int i=0; i<numberOutputBits(); ++i) {
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx
index bd71ac1513b6a0195a95d58414bc4f571d461317..66e7e66fa8fa8ce04bbf73840bf78876bf861729 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl2.cxx
@@ -19,10 +19,9 @@
REGISTER_ALG_TCS(DisambiguationIncl2)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DisambiguationIncl2: "
+#define LOG std::cout << "TCS::DisambiguationIncl2: "
TCS::DisambiguationIncl2::DisambiguationIncl2(const std::string & name) : DecisionAlg(name)
{
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx
index 40aae7cfee8b5bf51822117f598f874e047273f3..871f282dc9116b45a693d2d60dc16e6032480f03 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationIncl3.cxx
@@ -19,10 +19,9 @@
REGISTER_ALG_TCS(DisambiguationIncl3)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DisambiguationIncl3: "
+#define LOG std::cout << "TCS::DisambiguationIncl3: "
TCS::DisambiguationIncl3::DisambiguationIncl3(const std::string & name) : DecisionAlg(name)
{
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx
index c2364e3bfc134538f1ca35ce8f105a466f601d7a..3b575685bb66f839ffffdd8732b31311e4dbb4b8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DisambiguationInvmIncl2.cxx
@@ -24,10 +24,9 @@
REGISTER_ALG_TCS(DisambiguationInvmIncl2)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::DisambiguationInvmIncl2: "
+#define LOG std::cout << "TCS::DisambiguationInvmIncl2: "
namespace {
unsigned int
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx
index bc27f4d188bd60765de34db7bd41a2b721cc1390..58bdcd3528db6df131f9aad13bfdd51cdab03de9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtCut.cxx
@@ -19,9 +19,6 @@
REGISTER_ALG_TCS(EtCut)
-using namespace std;
-
-
TCS::EtCut::EtCut(const std::string & name) : DecisionAlg(name)
{
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtaPhiWindow.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtaPhiWindow.cxx
index da1cfb5169d7459b88583d0787c0154dc1224c7f..16653c8f83ef7dcda721a1ae43be844c3ea625db 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtaPhiWindow.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/EtaPhiWindow.cxx
@@ -61,19 +61,16 @@ TCS::EtaPhiWindow::initialize()
TRG_MSG_INFO("PhiMin : "<<p_PhiMin);
TRG_MSG_INFO("PhiMax : "<<p_PhiMax);
TRG_MSG_INFO("number of output bits : "<<numberOutputBits());
- // book histograms
- for(unsigned int i=0; i<numberOutputBits(); ++i) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int EtaPhi_bin=100;
- float EtaPhi_min=-50;
- float EtaPhi_max=50;
- // eta2 vs. eta1
- snprintf(hname_accept, buf_len, "Accept_EtaPhiWindow_bit%d", i);
- snprintf(hname_reject, buf_len, "Reject_EtaPhiWindow_bit%d", i);
- registerHist(m_histAccept[i] = new TH2F(hname_accept, hname_accept, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- registerHist(m_histReject[i] = new TH2F(hname_reject, hname_reject, EtaPhi_bin, EtaPhi_min, EtaPhi_max, EtaPhi_bin, EtaPhi_min, EtaPhi_max));
- }
+
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hEtaPhiWindow_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hEtaPhiWindow_reject_bit"+std::to_string((int)i);
+ // deta vs dphi
+ bookHist(m_histAccept, hname_accept, "ETA vs PHI", 100, p_EtaMin, p_EtaMax, 100, p_PhiMin, p_PhiMax);
+ bookHist(m_histReject, hname_reject, "ETA vs PHI", 100, p_EtaMin, p_EtaMax, 100, p_PhiMin, p_PhiMax);
+ }
+
return StatusCode::SUCCESS;
}
//----------------------------------------------------------
@@ -103,9 +100,9 @@ TCS::EtaPhiWindow::processBitCorrect(const std::vector<TCS::TOBArray const *> &i
const bool alreadyFilled = decision.bit(0);
output[0]->push_back(TCS::CompositeTOB(*tob1));
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[0]->GetName(),(float)(*tob1)->eta(),(float)(*tob1)->phi());
+ fillHist2D(m_histAccept[0],(float)(*tob1)->eta(),(float)(*tob1)->phi());
} else if(fillReject) {
- fillHist2D(m_histReject[0]->GetName(),(float)(*tob1)->eta(),(float)(*tob1)->phi());
+ fillHist2D(m_histReject[0],(float)(*tob1)->eta(),(float)(*tob1)->phi());
}
TRG_MSG_DEBUG("TOB "<<iTob
<<" ET = "<<(*tob1)->Et()
@@ -144,9 +141,9 @@ TCS::EtaPhiWindow::process(const std::vector<TCS::TOBArray const *> &input,
const bool alreadyFilled = decision.bit(0);
output[0]->push_back(TCS::CompositeTOB(*tob1));
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAccept[0]->GetName(),(float)(*tob1)->eta(),(float)(*tob1)->phi());
+ fillHist2D(m_histAccept[0],(float)(*tob1)->eta(),(float)(*tob1)->phi());
} else if(fillReject) {
- fillHist2D(m_histReject[0]->GetName(),(float)(*tob1)->eta(),(float)(*tob1)->phi());
+ fillHist2D(m_histReject[0],(float)(*tob1)->eta(),(float)(*tob1)->phi());
}
TRG_MSG_DEBUG("TOB "<<iTob
<<" ET = "<<(*tob1)->Et()
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ExclusiveJets.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ExclusiveJets.cxx
index 2bc20b4478b4a908ec2d17ccaf7f6e484271d739..7d55c20175d636af6acae66fd4cb9c732ee61784 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ExclusiveJets.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/ExclusiveJets.cxx
@@ -28,8 +28,8 @@
#include "L1TopoSimulationUtils/Kinematics.h"
//
REGISTER_ALG_TCS(ExclusiveJets)
-using namespace std;
-TCS::ExclusiveJets::ExclusiveJets(const string & name) : DecisionAlg(name)
+
+TCS::ExclusiveJets::ExclusiveJets(const std::string & name) : DecisionAlg(name)
{
defineParameter("InputWidth", 3);
defineParameter("MaxTob", 0);
@@ -84,33 +84,25 @@ TCS::ExclusiveJets::initialize() {
}
TRG_MSG_INFO("number output : " << numberOutputBits());
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int eta1_min = p_MinEta1[i];
- int eta1_max = p_MaxEta1[i];
- int eta2_min = p_MinEta1[i];
- int eta2_max = p_MaxEta1[i];
- int et_min = p_MinET1[i];
- int xi_min = p_XiMin[i];
- int xi_max = p_XiMax[i];
- // mass histograms
- snprintf(hname_accept, buf_len, "Accept_%s-J%d-%dETA%d-%dETA%d_%s_bit%d_%dM%d", name().c_str(), et_min, eta1_min, eta1_max, eta2_min, eta2_max, className().c_str(), i, xi_min, xi_max);
- snprintf(hname_reject, buf_len, "Reject_%s-J%d-%dETA%d-%dETA%d_%s_bit%d_%dM%d", name().c_str(), et_min, eta1_min, eta1_max, eta2_min, eta2_max, className().c_str(), i, xi_min, xi_max);
- registerHist(m_histAcceptExclusiveJets[i] = new TH2F(hname_accept, hname_accept, 100, 0.0, 2*xi_max, 100, 0.0, 2*xi_max));
- registerHist(m_histRejectExclusiveJets[i] = new TH2F(hname_reject, hname_reject, 100, 0.0, 2*xi_max, 100, 0.0, 2*xi_max));
+
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hExclusiveJets_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hExclusiveJets_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAcceptX, hname_accept, "Xi1 vs Xi2", 100, p_XiMin[i], p_XiMax[i], 100, p_XiMin[i], p_XiMax[i]);
+ bookHist(m_histRejectX, hname_reject, "Xi1 vs Xi2", 100, p_XiMin[i], p_XiMax[i], 100, p_XiMin[i], p_XiMax[i]);
// eta2 vs. eta1
- snprintf(hname_accept, buf_len, "Accept_%s-J%d-%dETA%d-%dETA%d_%s_bit%d_%dM%d_Eta1Eta2", name().c_str(), et_min, eta1_min, eta1_max, eta2_min, eta2_max, className().c_str(), i, xi_min, xi_max);
- snprintf(hname_reject, buf_len, "Reject_%s-J%d-%dETA%d-%dETA%d_%s_bit%d_%dM%d_Eta1Eta2", name().c_str(), et_min, eta1_min, eta1_max, eta2_min, eta2_max, className().c_str(), i, xi_min, xi_max);
- registerHist(m_histAcceptEta1Eta2[i] = new TH2F(hname_accept, hname_accept, 100, -50.0, +50.0, 100, -50.0, +50.0));
- registerHist(m_histRejectEta1Eta2[i] = new TH2F(hname_reject, hname_reject, 100, -50.0, +50.0, 100, -50.0, +50.0));
+ bookHist(m_histAcceptEta1Eta2, hname_accept, "ETA vs ETA", 100, p_MinEta1[i], p_MaxEta1[i], 100, p_MinEta2[i], p_MaxEta2[i]);
+ bookHist(m_histRejectEta1Eta2, hname_reject, "ETA vs ETA", 100, p_MinEta1[i], p_MaxEta1[i], 100, p_MinEta2[i], p_MaxEta2[i]);
}
+
return StatusCode::SUCCESS;
}
TCS::StatusCode
-TCS::ExclusiveJets::processBitCorrect( const vector<TCS::TOBArray const *> & input,
- const vector<TCS::TOBArray *> & output,
+TCS::ExclusiveJets::processBitCorrect( const std::vector<TCS::TOBArray const *> & input,
+ const std::vector<TCS::TOBArray *> & output,
Decision & decision ) // Not really bitwise, keep the name for the future
{
if(input.size() == 1) {
@@ -151,11 +143,11 @@ TCS::ExclusiveJets::processBitCorrect( const vector<TCS::TOBArray const *> & inp
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAcceptExclusiveJets[i]->GetName(),xi_1,xi_2);
- fillHist2D(m_histAcceptEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist2D(m_histAcceptX[i],xi_1,xi_2);
+ fillHist2D(m_histAcceptEta1Eta2[i],eta1, eta2);
} else if(fillReject) {
- fillHist2D(m_histRejectExclusiveJets[i]->GetName(),xi_1,xi_2);
- fillHist2D(m_histRejectEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist2D(m_histRejectX[i],xi_1,xi_2);
+ fillHist2D(m_histRejectEta1Eta2[i],eta1, eta2);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " xi_1 = " << xi_1);
@@ -168,8 +160,8 @@ TCS::ExclusiveJets::processBitCorrect( const vector<TCS::TOBArray const *> & inp
return TCS::StatusCode::SUCCESS;
}
TCS::StatusCode
-TCS::ExclusiveJets::process( const vector<TCS::TOBArray const *> & input,
- const vector<TCS::TOBArray *> & output,
+TCS::ExclusiveJets::process( const std::vector<TCS::TOBArray const *> & input,
+ const std::vector<TCS::TOBArray *> & output,
Decision & decision )
{
if(input.size() == 1) {
@@ -210,11 +202,11 @@ TCS::ExclusiveJets::process( const vector<TCS::TOBArray const *> & input,
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAcceptExclusiveJets[i]->GetName(),xi_1,xi_2);
- fillHist2D(m_histAcceptEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist2D(m_histAcceptX[i],xi_1,xi_2);
+ fillHist2D(m_histAcceptEta1Eta2[i],eta1, eta2);
} else if(fillReject) {
- fillHist2D(m_histRejectExclusiveJets[i]->GetName(),xi_1,xi_2);
- fillHist2D(m_histRejectEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist2D(m_histRejectX[i],xi_1,xi_2);
+ fillHist2D(m_histRejectEta1Eta2[i],eta1, eta2);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " xi_1 = " << xi_1);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassDeltaPhiInclusive2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassDeltaPhiInclusive2.cxx
index 44de5924af600a9b8da7de033d31a4ca63bad7b4..d80b2f826445156a25ee053b5b2e6892e8b93a8c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassDeltaPhiInclusive2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassDeltaPhiInclusive2.cxx
@@ -27,8 +27,6 @@
REGISTER_ALG_TCS(InvariantMassDeltaPhiInclusive2)
-using namespace std;
-
TCS::InvariantMassDeltaPhiInclusive2::InvariantMassDeltaPhiInclusive2(const std::string & name) : DecisionAlg(name)
{
@@ -127,8 +125,8 @@ TCS::InvariantMassDeltaPhiInclusive2::initialize() {
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- string hname_accept = "hInvariantMassDeltaPhiInclusive2_accept_bit"+to_string((int)i);
- string hname_reject = "hInvariantMassDeltaPhiInclusive2_reject_bit"+to_string((int)i);
+ std::string hname_accept = "hInvariantMassDeltaPhiInclusive2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hInvariantMassDeltaPhiInclusive2_reject_bit"+std::to_string((int)i);
// mass
bookHist(m_histAcceptM, hname_accept, "INVM vs DPHI", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]), 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
bookHist(m_histRejectM, hname_reject, "INVM vs DPHI", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]), 100, p_DeltaPhiMin[i], p_DeltaPhiMax[i]);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx
index 697e5640075589ce80794623486ca4e92e66025d..1ebdf15ae715b357cf6c3e41b08e5ce5319a54c6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx
@@ -30,7 +30,6 @@
REGISTER_ALG_TCS(InvariantMassInclusive1)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
#define LOG cout << "TCS::InvariantMassInclusive1: "
@@ -105,19 +104,15 @@ TCS::InvariantMassInclusive1::initialize() {
}
TRG_MSG_INFO("number output : " << numberOutputBits());
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int mass_min = sqrt(p_InvMassMin[i]);
- int mass_max = sqrt(p_InvMassMax[i]);
- // mass histograms
- snprintf(hname_accept, buf_len, "Accept_%s_%s_bit%d_%dM%d", name().c_str(), className().c_str(), i, mass_min, mass_max);
- snprintf(hname_reject, buf_len, "Reject_%s_%s_bit%d_%dM%d", name().c_str(), className().c_str(), i, mass_min, mass_max);
- registerHist(m_histAcceptINV1[i] = new TH1F(hname_accept, hname_accept, 100, 0.0, 2*mass_max));
- registerHist(m_histRejectINV1[i] = new TH1F(hname_reject, hname_reject, 100, 0.0, 2*mass_max));
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hInvariantMassInclusive1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hInvariantMassInclusive1_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
+ bookHist(m_histReject, hname_reject, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
}
-
-
+
return StatusCode::SUCCESS;
}
@@ -150,9 +145,9 @@ TCS::InvariantMassInclusive1::processBitCorrect( const std::vector<TCS::TOBArray
unsigned int invmass2 = TSU::Kinematics::calcInvMassBW( *tob1, *tob2 );
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = invmass2 >= p_InvMassMin[i] && invmass2 <= p_InvMassMax[i]; //
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -162,9 +157,9 @@ TCS::InvariantMassInclusive1::processBitCorrect( const std::vector<TCS::TOBArray
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptINV1[i]->GetName(),sqrt((float)invmass2));
+ fillHist1D(m_histAccept[i],sqrt((float)invmass2));
} else if(fillReject) {
- fillHist1D(m_histRejectINV1[i]->GetName(),sqrt((float)invmass2));
+ fillHist1D(m_histReject[i],sqrt((float)invmass2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2);
}
@@ -209,9 +204,9 @@ TCS::InvariantMassInclusive1::process( const std::vector<TCS::TOBArray const *>
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = invmass2 >= p_InvMassMin[i] && invmass2 <= p_InvMassMax[i]; //
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -221,9 +216,9 @@ TCS::InvariantMassInclusive1::process( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptINV1[i]->GetName(),sqrt((float)invmass2));
+ fillHist1D(m_histAccept[i],sqrt((float)invmass2));
} else if(fillReject) {
- fillHist1D(m_histRejectINV1[i]->GetName(),sqrt((float)invmass2));
+ fillHist1D(m_histReject[i],sqrt((float)invmass2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2);
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx
index 6daa338dbba8f35a720fdc3ff406f6214cf7b70d..9291d1cb3a3b49b6d1093ee624e8c91a18364ed3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive2.cxx
@@ -28,7 +28,6 @@
REGISTER_ALG_TCS(InvariantMassInclusive2)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
#define LOG cout << "TCS::InvariantMassInclusive2: "
@@ -112,23 +111,19 @@ TCS::InvariantMassInclusive2::initialize() {
TRG_MSG_INFO("MaxEta2 : "<<p_MaxEta2 );
TRG_MSG_INFO("number output : " << numberOutputBits());
+
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int mass_min = sqrt(p_InvMassMin[i]);
- int mass_max = sqrt(p_InvMassMax[i]);
+ std::string hname_accept = "hInvariantMassDeltaPhiInclusive2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hInvariantMassDeltaPhiInclusive2_reject_bit"+std::to_string((int)i);
// mass
- snprintf(hname_accept, buf_len, "Accept_InvariantMassInclusive2_bit%d_%dM%d_Mass", i, mass_min, mass_max);
- snprintf(hname_reject, buf_len, "Reject_InvariantMassInclusive2_bit%d_%dM%d_Mass", i, mass_min, mass_max);
- registerHist(m_histAcceptM[i] = new TH1F(hname_accept, hname_accept, 100, 0.0, 2*mass_max));
- registerHist(m_histRejectM[i] = new TH1F(hname_reject, hname_reject, 100, 0.0, 2*mass_max));
+ bookHist(m_histAcceptM, hname_accept, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
+ bookHist(m_histRejectM, hname_reject, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
// eta2 vs. eta1
- snprintf(hname_accept, buf_len, "Accept_InvariantMassInclusive2_bit%d_%dM%d_Eta1Eta2", i, mass_min, mass_max);
- snprintf(hname_reject, buf_len, "Reject_InvariantMassInclusive2_bit%d_%dM%d_Eta1Eta2", i, mass_min, mass_max);
- registerHist(m_histAcceptEta1Eta2[i] = new TH2F(hname_accept, hname_accept, 100, -50.0, +50.0, 100, -50.0, +50.0));
- registerHist(m_histRejectEta1Eta2[i] = new TH2F(hname_reject, hname_reject, 100, -50.0, +50.0, 100, -50.0, +50.0));
+ bookHist(m_histAcceptEta1Eta2, hname_accept, "ETA vs ETA", 100, p_MinEta1, p_MaxEta1, 100, p_MinEta2, p_MaxEta2);
+ bookHist(m_histRejectEta1Eta2, hname_reject, "ETA vs ETA", 100, p_MinEta1, p_MaxEta1, 100, p_MinEta2, p_MaxEta2);
}
+
return StatusCode::SUCCESS;
}
@@ -172,11 +167,11 @@ TCS::InvariantMassInclusive2::processBitCorrect( const std::vector<TCS::TOBArray
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptM[i]->GetName(),sqrt((float)invmass2));
- fillHist2D(m_histAcceptEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist1D(m_histAcceptM[i],sqrt((float)invmass2));
+ fillHist2D(m_histAcceptEta1Eta2[i],eta1, eta2);
} else if(fillReject) {
- fillHist1D(m_histRejectM[i]->GetName(),sqrt((float)invmass2));
- fillHist2D(m_histRejectEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist1D(m_histRejectM[i],sqrt((float)invmass2));
+ fillHist2D(m_histRejectEta1Eta2[i],eta1, eta2);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2);
}
@@ -227,11 +222,11 @@ TCS::InvariantMassInclusive2::process( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptM[i]->GetName(),sqrt((float)invmass2));
- fillHist2D(m_histAcceptEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist1D(m_histAcceptM[i],sqrt((float)invmass2));
+ fillHist2D(m_histAcceptEta1Eta2[i],eta1, eta2);
} else if(fillReject) {
- fillHist1D(m_histRejectM[i]->GetName(),sqrt((float)invmass2));
- fillHist2D(m_histRejectEta1Eta2[i]->GetName(),eta1, eta2);
+ fillHist1D(m_histRejectM[i],sqrt((float)invmass2));
+ fillHist2D(m_histRejectEta1Eta2[i],eta1, eta2);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept ?"pass":"fail") << " invmass2 = " << invmass2);
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl1.cxx
index 9b570754bdb09f387b2ae85c400a443261233a32..df634f59ae701b056a35a429c7669636b11ca7c4 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* Based on InvariantMassInclusive1 and DeltaRSqrIncl1. 01/03/2019.
@@ -32,7 +32,6 @@
REGISTER_ALG_TCS(InvariantMassInclusiveDeltaRSqrIncl1)
-using namespace std;
TCS::InvariantMassInclusiveDeltaRSqrIncl1::InvariantMassInclusiveDeltaRSqrIncl1(const std::string & name) : DecisionAlg(name)
{
@@ -118,28 +117,16 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl1::initialize() {
TRG_MSG_INFO("number output : " << numberOutputBits());
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int n_bin = 100;
- int MassDeltaR_min = 0;
- int mass_min = sqrt(p_InvMassMin[i]);
- int mass_max = sqrt(p_InvMassMax[i]);
- // if minimum mass requirement less than twice of bin length,
- // adjust to range by changing maximum mass with the 10 time of bin length.
- // This is necessary when range is too wide and minimum cut unvisible.
- // Later will be changed with more automated way.
- if ( 2*(mass_max-mass_min)/n_bin > mass_min && mass_min != 0.0 )
- { mass_max=10*(mass_max-mass_min)/n_bin; }
- int deltaR_max = sqrt(p_DeltaRMax[i]);
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hInvariantMassDeltaRSqrIncl1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hInvariantMassDeltaRSqrIncl1_reject_bit"+std::to_string((int)i);
// mass
- snprintf(hname_accept, buf_len, "Accept_InvariantMassInclusiveDeltaRSqrIncl1_bit%d_%dM%d_Mass", i, mass_min, mass_max);
- snprintf(hname_reject, buf_len, "Reject_InvariantMassInclusiveDeltaRSqrIncl1_bit%d_%dM%d_Mass", i, mass_min, mass_max);
- registerHist(m_histAcceptM[i] = new TH2F(hname_accept, hname_accept, n_bin, MassDeltaR_min, 2*mass_max, n_bin, MassDeltaR_min, 2*deltaR_max));
- registerHist(m_histRejectM[i] = new TH2F(hname_reject, hname_reject, n_bin, MassDeltaR_min, 2*mass_max, n_bin, MassDeltaR_min, 2*deltaR_max));
- }
+ bookHist(m_histAcceptM, hname_accept, "INVM vs DR", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]), 100, p_DeltaRMin[i], p_DeltaRMax[i]);
+ bookHist(m_histRejectM, hname_reject, "INVM vs DR", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]), 100, p_DeltaRMin[i], p_DeltaRMax[i]);
+
+ }
-
return StatusCode::SUCCESS;
}
@@ -175,9 +162,9 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl1::processBitCorrect( const std::vector<
TRG_MSG_DEBUG("Jet1 = " << **tob1 << ", Jet2 = " << **tob2 << ", invmass2 = " << invmass2 << ", deltaR2 = " << deltaR2);
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = invmass2 >= p_InvMassMin[i] && invmass2 <= p_InvMassMax[i] && deltaR2 >= p_DeltaRMin[i] && deltaR2 <= p_DeltaRMax[i];
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -187,9 +174,9 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl1::processBitCorrect( const std::vector<
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAcceptM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histAcceptM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist2D(m_histRejectM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histRejectM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2 << " deltaR2 = " << deltaR2 );
}
@@ -235,9 +222,9 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl1::process( const std::vector<TCS::TOBAr
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool accept = false;
- if( parType_t((*tob1)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( parType_t((*tob2)->Et()) <= min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
- if( (parType_t((*tob1)->Et()) <= max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= max(p_MinET1[i],p_MinET2[i]))) continue;
+ if( parType_t((*tob1)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( parType_t((*tob2)->Et()) <= std::min(p_MinET1[i],p_MinET2[i])) continue; // ET cut
+ if( (parType_t((*tob1)->Et()) <= std::max(p_MinET1[i],p_MinET2[i])) && (parType_t((*tob2)->Et()) <= std::max(p_MinET1[i],p_MinET2[i]))) continue;
accept = invmass2 >= p_InvMassMin[i] && invmass2 <= p_InvMassMax[i] && deltaR2 >= p_DeltaRMin[i] && deltaR2 <= p_DeltaRMax[i];
const bool fillAccept = fillHistos() and (fillHistosBasedOnHardware() ? getDecisionHardwareBit(i) : accept);
const bool fillReject = fillHistos() and not fillAccept;
@@ -247,9 +234,9 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl1::process( const std::vector<TCS::TOBAr
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAcceptM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histAcceptM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist2D(m_histRejectM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histRejectM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2 << " deltaR2 = " << deltaR2 );
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl2.cxx
index 73fb49af41d01df5c74663661a84f38e52ab6581..f7cf29606e5509d3f0d59d64585a0cb485fb57a9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusiveDeltaRSqrIncl2.cxx
@@ -29,7 +29,6 @@
REGISTER_ALG_TCS(InvariantMassInclusiveDeltaRSqrIncl2)
-using namespace std;
TCS::InvariantMassInclusiveDeltaRSqrIncl2::InvariantMassInclusiveDeltaRSqrIncl2(const std::string & name) : DecisionAlg(name)
@@ -130,25 +129,14 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl2::initialize() {
// book histograms
for(unsigned int i=0; i<numberOutputBits(); ++i) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int n_bin = 100;
- int MassDeltaR_min = 0;
- int mass_min = sqrt(p_InvMassMin[i]);
- int mass_max = sqrt(p_InvMassMax[i]);
- // if minimum mass requirement less than twice of bin length,
- // adjust to range by changing maximum mass with the 10 time of bin length.
- // This is necessary when range is too wide and minimum cut unvisible.
- // Later will be changed with more automated way.
- if ( 2*(mass_max-mass_min)/n_bin > mass_min && mass_min != 0.0 )
- { mass_max=10*(mass_max-mass_min)/n_bin; }
- int deltaR_max = sqrt(p_DeltaRMax[i]);
+ std::string hname_accept = "hInvariantMassDeltaRSqrIncl2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hInvariantMassDeltaRSqrIncl2_reject_bit"+std::to_string((int)i);
// mass
- snprintf(hname_accept, buf_len, "Accept_InvariantMassInclusiveDeltaRSqrIncl2_bit%d_%dM%d_Mass", i, mass_min, mass_max);
- snprintf(hname_reject, buf_len, "Reject_InvariantMassInclusiveDeltaRSqrIncl2_bit%d_%dM%d_Mass", i, mass_min, mass_max);
- registerHist(m_histAcceptM[i] = new TH2F(hname_accept, hname_accept, n_bin, MassDeltaR_min, 2*mass_max, n_bin, MassDeltaR_min, 2*deltaR_max));
- registerHist(m_histRejectM[i] = new TH2F(hname_reject, hname_reject, n_bin, MassDeltaR_min, 2*mass_max, n_bin, MassDeltaR_min, 2*deltaR_max));
+ bookHist(m_histAcceptM, hname_accept, "INVM vs DR", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]), 100, p_DeltaRMin[i], p_DeltaRMax[i]);
+ bookHist(m_histRejectM, hname_reject, "INVM vs DR", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]), 100, p_DeltaRMin[i], p_DeltaRMax[i]);
+
}
+
return StatusCode::SUCCESS;
}
@@ -195,9 +183,9 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl2::processBitCorrect( const std::vector<
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAcceptM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histAcceptM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist2D(m_histRejectM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histRejectM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2 << " deltaR2 = " << deltaR2 );
}
@@ -251,9 +239,9 @@ TCS::InvariantMassInclusiveDeltaRSqrIncl2::process( const std::vector<TCS::TOBAr
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist2D(m_histAcceptM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histAcceptM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
} else if(fillReject) {
- fillHist2D(m_histRejectM[i]->GetName(),sqrt((float)invmass2),sqrt((float)deltaR2));
+ fillHist2D(m_histRejectM[i],sqrt((float)invmass2),sqrt((float)deltaR2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2 << " deltaR2 = " << deltaR2 );
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl.cxx
index 8950ab01bda28ce4647ed29604651aa60b7380de..2803a8db97cc01fa6530ccf949438b26e1d946c6 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassThreeTOBsIncl.cxx
@@ -39,9 +39,8 @@
REGISTER_ALG_TCS(InvariantMassThreeTOBsIncl)
-using namespace std;
-TCS::InvariantMassThreeTOBsIncl::InvariantMassThreeTOBsIncl(const string & name) : DecisionAlg(name)
+TCS::InvariantMassThreeTOBsIncl::InvariantMassThreeTOBsIncl(const std::string & name) : DecisionAlg(name)
{
defineParameter("InputWidth", 3);
defineParameter("MaxTob", 0);
@@ -98,17 +97,15 @@ TCS::InvariantMassThreeTOBsIncl::initialize() {
}
TRG_MSG_INFO("number output : " << numberOutputBits());
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int mass_min = sqrt(p_InvMassMin[i]);
- int mass_max = sqrt(p_InvMassMax[i]);
- // mass histograms
- snprintf(hname_accept, buf_len, "Accept_%s_%s_bit%d_%dM%d", name().c_str(), className().c_str(), i, mass_min, mass_max);
- snprintf(hname_reject, buf_len, "Reject_%s_%s_bit%d_%dM%d", name().c_str(), className().c_str(), i, mass_min, mass_max);
- registerHist(m_histAcceptINVThree[i] = new TH1F(hname_accept, hname_accept, 100, 0.0, 2*mass_max));
- registerHist(m_histRejectINVThree[i] = new TH1F(hname_reject, hname_reject, 100, 0.0, 2*mass_max));
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hInvariantMassThreeTOBsIncl_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hInvariantMassThreeTOBsIncl_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
+ bookHist(m_histReject, hname_reject, "INVM", 100, sqrt(p_InvMassMin[i]), sqrt(p_InvMassMax[i]));
}
+
return StatusCode::SUCCESS;
@@ -117,8 +114,8 @@ TCS::InvariantMassThreeTOBsIncl::initialize() {
TCS::StatusCode
-TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const vector<TCS::TOBArray const *> & input,
- const vector<TCS::TOBArray *> & output,
+TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const std::vector<TCS::TOBArray const *> & input,
+ const std::vector<TCS::TOBArray *> & output,
Decision & decision )
{
@@ -158,7 +155,7 @@ TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const vector<TCS::TOBArray c
const bool fillReject = fillHistos() and not fillAccept;
const bool alreadyFilled = decision.bit(i);
if( accept ) {
- vector<TCS::GenericTOB*> TOBvector;
+ std::vector<TCS::GenericTOB*> TOBvector;
TOBvector.push_back( *tob1 );
TOBvector.push_back( *tob2 );
TOBvector.push_back( *tob3 );
@@ -167,9 +164,9 @@ TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const vector<TCS::TOBArray c
TOBvector.clear();
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptINVThree[i]->GetName(),sqrt(invmass2));
+ fillHist1D(m_histAccept[i],sqrt(invmass2));
} else if(fillReject) {
- fillHist1D(m_histRejectINVThree[i]->GetName(),sqrt(invmass2));
+ fillHist1D(m_histReject[i],sqrt(invmass2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2);
@@ -188,8 +185,8 @@ TCS::InvariantMassThreeTOBsIncl::processBitCorrect( const vector<TCS::TOBArray c
}
TCS::StatusCode
-TCS::InvariantMassThreeTOBsIncl::process( const vector<TCS::TOBArray const *> & input,
- const vector<TCS::TOBArray *> & output,
+TCS::InvariantMassThreeTOBsIncl::process( const std::vector<TCS::TOBArray const *> & input,
+ const std::vector<TCS::TOBArray *> & output,
Decision & decision )
{
@@ -230,7 +227,7 @@ TCS::InvariantMassThreeTOBsIncl::process( const vector<TCS::TOBArray const *> &
const bool fillReject = fillHistos() and not fillAccept;
const bool alreadyFilled = decision.bit(i);
if( accept ) {
- vector<TCS::GenericTOB*> TOBvector;
+ std::vector<TCS::GenericTOB*> TOBvector;
TOBvector.push_back( *tob1 );
TOBvector.push_back( *tob2 );
TOBvector.push_back( *tob3 );
@@ -239,9 +236,9 @@ TCS::InvariantMassThreeTOBsIncl::process( const vector<TCS::TOBArray const *> &
TOBvector.clear();
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptINVThree[i]->GetName(),sqrt(invmass2));
+ fillHist1D(m_histAccept[i],sqrt(invmass2));
} else if(fillReject) {
- fillHist1D(m_histRejectINVThree[i]->GetName(),sqrt(invmass2));
+ fillHist1D(m_histReject[i],sqrt(invmass2));
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " invmass2 = " << invmass2);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
index c017583ee11e4ffa5610864f53bbac99bafeb3a4..9f75ca7a417fed57785f552552d8bf4068f953c8 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* JetHT.cpp
@@ -24,10 +24,8 @@
REGISTER_ALG_TCS(JetHT)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << name() << ": "
+#define LOG std::cout << name() << ": "
TCS::JetHT::JetHT(const std::string & name) : DecisionAlg(name)
@@ -70,25 +68,15 @@ TCS::JetHT::initialize() {
}
TRG_MSG_INFO("number output : " << numberOutputBits());
- // create strings for histogram names
- std::vector<std::ostringstream> MyAcceptHist(numberOutputBits());
- std::vector<std::ostringstream> MyRejectHist(numberOutputBits());
-
- for (unsigned int i=0;i<numberOutputBits();i++) {
- MyAcceptHist[i] << "Accept" << p_HT[i] << "HT";
- MyRejectHist[i] << "Reject" << p_HT[i] << "HT";
- }
-
- for (unsigned int i=0; i<numberOutputBits();i++) {
-
- const std::string& MyTitle1 = MyAcceptHist[i].str();
- const std::string& MyTitle2 = MyRejectHist[i].str();
-
- registerHist(m_histAcceptHT[i] = new TH1F(MyTitle1.c_str(),MyTitle1.c_str(),100,0,p_HT[i]*2));
- registerHist(m_histRejectHT[i] = new TH1F(MyTitle2.c_str(),MyTitle2.c_str(),100,0,p_HT[i]*2));
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hJetHT_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hJetHT_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "HT", 100, 0, p_HT[i]);
+ bookHist(m_histReject, hname_reject, "HT", 100, 0, p_HT[i]);
}
-
return StatusCode::SUCCESS;
}
@@ -120,8 +108,8 @@ TCS::JetHT::process( const std::vector<TCS::TOBArray const *> & input,
++tob)
{
- if( parType_t(fabs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
if( parType_t((*tob)->Et()) <= p_MinET ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << (*tob)->Et());
@@ -141,9 +129,9 @@ TCS::JetHT::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back( CompositeTOB( GenericTOB::createOnHeap( GenericTOB(sumET,0,0) ) ));
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptHT[i]->GetName(),sumET);
+ fillHist1D(m_histAccept[i],sumET);
} else if(fillReject) {
- fillHist1D(m_histRejectHT[i]->GetName(),sumET);
+ fillHist1D(m_histReject[i],sumET);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " HT = " << sumET);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
index bb8371872bb3aa0f3b4c1706a0c852a101eadde3..6cf7999707f8d6be4191e8cf302e12b7848e7cdf 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetMatch.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* JetMatch.cpp
@@ -19,10 +19,9 @@
REGISTER_ALG_TCS(JetMatch)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << name() << ": "
+#define LOG std::cout << name() << ": "
TCS::JetMatch::JetMatch(const std::string & name) : DecisionAlg(name)
@@ -80,15 +79,15 @@ TCS::JetMatch::process( const std::vector<TCS::TOBArray const *> & input,
}
// vector of passing tob
- vector<TCS::GenericTOB*> TOBvector;
+ std::vector<TCS::GenericTOB*> TOBvector;
// loop over all jets
unsigned int objC(0);
for( TCS::GenericTOB * tob : *input[0]) {
++objC;
- if( parType_t(fabs(tob->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin ) continue; // Eta cut
if( tob->EtWide() <= p_MinET1 ) continue; // E_T cut
if( tob->EtNarrow() <= p_MinET2 ) continue; // E_T cut
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx
index 6de767b978ca4a25050c1da23d0dc284e11bf602..2b9908f1355cc5b9aa0180cb2f449088d7890e8f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/LAr.cxx
@@ -19,9 +19,6 @@
REGISTER_ALG_TCS(LAr)
-using namespace std;
-
-
TCS::LAr::LAr(const std::string & name) : DecisionAlg(name)
{
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx
index fc3e8d43c3a85528c269c28457114de1774940e3..e9638d1eafa6ce73ddc05cad746d063a75ed5e62 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/METCut.cxx
@@ -20,8 +20,6 @@
REGISTER_ALG_TCS(METCut)
-using namespace std;
-
TCS::METCut::METCut(const std::string & name) : DecisionAlg(name)
{
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx
index 435efb2196b04b3a754b227021ea5297c12542ac..9844bfbf9d4187c6f2b8e794b24e1ffac03da6ea 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx
@@ -26,10 +26,8 @@
REGISTER_ALG_TCS(MinDeltaPhiIncl2)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::MinDeltaPhiIncl2: "
+#define LOG std::cout << "TCS::MinDeltaPhiIncl2: "
TCS::MinDeltaPhiIncl2::MinDeltaPhiIncl2(const std::string & name) : DecisionAlg(name)
{
@@ -70,23 +68,15 @@ TCS::MinDeltaPhiIncl2::initialize() {
TRG_MSG_INFO("MinET2 : " << p_MinET2);
TRG_MSG_INFO("nummber output : " << numberOutputBits());
- // create strings for histogram names
- std::vector<std::ostringstream> MyAcceptHist(numberOutputBits());
- std::vector<std::ostringstream> MyRejectHist(numberOutputBits());
-
- for (unsigned int i=0;i< numberOutputBits();i++) {
- MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "MinDPhi2";
- MyRejectHist[i] << "Reject" << p_DeltaPhiMin[i] << "MinDPhi2";
- }
-
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const std::string& MyTitle1 = MyAcceptHist[i].str();
- const std::string& MyTitle2 = MyRejectHist[i].str();
-
- registerHist(m_histAcceptMinDPhi2[i] = new TH1F(MyTitle1.c_str(),MyTitle1.c_str(),100,0,3.5));
- registerHist(m_histRejectMinDPhi2[i] = new TH1F(MyTitle2.c_str(),MyTitle2.c_str(),100,0,3.5));
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hMinDeltaPhiIncl2_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hMinDeltaPhiIncl2_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "DPHI", 100, p_DeltaPhiMin[i], 70);
+ bookHist(m_histReject, hname_reject, "DPHI", 100, p_DeltaPhiMin[i], 70);
}
-
+
return StatusCode::SUCCESS;
}
@@ -99,7 +89,7 @@ TCS::MinDeltaPhiIncl2::processBitCorrect( const std::vector<TCS::TOBArray const
{
// mindphi
- unsigned int mindphi = *min_element(begin(p_DeltaPhiMin),end(p_DeltaPhiMin));
+ unsigned int mindphi = *std::min_element(std::begin(p_DeltaPhiMin),std::end(p_DeltaPhiMin));
bool firstphi = true;
// declare iterator for the tob with min dphi
@@ -151,9 +141,9 @@ TCS::MinDeltaPhiIncl2::processBitCorrect( const std::vector<TCS::TOBArray const
output[i]->push_back(TCS::CompositeTOB(*tobmin1, *tobmin2));
}
if(fillAccept and not alreadyFilled){
- fillHist1D(m_histAcceptMinDPhi2[i]->GetName(),(float)mindphi*0.10);
+ fillHist1D(m_histAccept[i],(float)mindphi);
} else if(fillReject){
- fillHist1D(m_histRejectMinDPhi2[i]->GetName(),(float)mindphi*0.10);
+ fillHist1D(m_histReject[i],(float)mindphi);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail"));
} // for(i)
@@ -171,7 +161,7 @@ TCS::MinDeltaPhiIncl2::process( const std::vector<TCS::TOBArray const *> & input
{
// mindphi
- unsigned int mindphi = *min_element(begin(p_DeltaPhiMin),end(p_DeltaPhiMin));
+ unsigned int mindphi = *std::min_element(std::begin(p_DeltaPhiMin),std::end(p_DeltaPhiMin));
bool firstphi = true;
// declare iterator for the tob with min dphi
@@ -223,9 +213,9 @@ TCS::MinDeltaPhiIncl2::process( const std::vector<TCS::TOBArray const *> & input
output[i]->push_back(TCS::CompositeTOB(*tobmin1, *tobmin2));
}
if(fillAccept and not alreadyFilled){
- fillHist1D(m_histAcceptMinDPhi2[i]->GetName(),(float)mindphi*0.10);
+ fillHist1D(m_histAccept[i],(float)mindphi);
} else if(fillReject) {
- fillHist1D(m_histRejectMinDPhi2[i]->GetName(),(float)mindphi*0.10);
+ fillHist1D(m_histReject[i],(float)mindphi);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail"));
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx
index 75f6f565faa971237525fecb18d7788d662970f7..56f0d5e9ffd26fb1b7bc6f93699e5b3b33e96620 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Multiplicity.cxx
@@ -20,9 +20,6 @@
REGISTER_ALG_TCS(Multiplicity)
-using namespace std;
-
-
TCS::Multiplicity::Multiplicity(const std::string & name) : DecisionAlg(name)
{
@@ -72,7 +69,7 @@ TCS::Multiplicity::process( const std::vector<TCS::TOBArray const *> & input,
// counter
int nmuon = 0;
// vector of tobs passing cuts
- vector<TCS::GenericTOB*> TOBvector;
+ std::vector<TCS::GenericTOB*> TOBvector;
for( TOBArray::const_iterator tob1 = input[0]->begin();
tob1 != input[0]->end() && distance( input[0]->begin(), tob1) < nLeading;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
index 110d71dbad20156e4b520f94bef3715eff5d625b..93f57b9b3ead36dfb90fd74a7d60a1536b2f881c 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MultiplicityCustom.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* MultiplicityCustom.cpp
@@ -18,9 +18,6 @@
REGISTER_ALG_TCS(MultiplicityCustom)
-using namespace std;
-
-
TCS::MultiplicityCustom::MultiplicityCustom(const std::string & name) : DecisionAlg(name)
{
@@ -82,14 +79,14 @@ TCS::MultiplicityCustom::process( const std::vector<TCS::TOBArray const *> & inp
// counter
unsigned int nmult = 0;
// vector of tobs passing cuts
- vector<TCS::GenericTOB*> TOBvector;
+ std::vector<TCS::GenericTOB*> TOBvector;
for( TOBArray::const_iterator tob1 = input[0]->begin();
tob1 != input[0]->end() && distance( input[0]->begin(), tob1) < nLeading;
++tob1)
{
- if (parType_t(fabs((*tob1)-> eta())) < p_EtaMin) continue;
- if (parType_t(fabs((*tob1)-> eta())) > p_EtaMax) continue;
+ if (parType_t(std::abs((*tob1)-> eta())) < p_EtaMin) continue;
+ if (parType_t(std::abs((*tob1)-> eta())) > p_EtaMax) continue;
if( parType_t((*tob1)->Et()) <= p_MinET ) continue; // E_T cut
//
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
index 12ab5e8d85837274842056f7ce1efe8a0bc0c4b9..caf98facaf53372f3c4b714bce06b48b3f10209f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/NotMatch.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* NotMatch.cpp
@@ -18,7 +18,6 @@
REGISTER_ALG_TCS(NotMatch)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
#define LOG cout << "TCS::NotMatch: "
@@ -122,22 +121,22 @@ TCS::NotMatch::processBitCorrect( const std::vector<TCS::TOBArray const *> & inp
unsigned int deltaR2= 999;
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool all_unmatched = true;
- vector<GenericTOB*> unmatched_tobs;
+ std::vector<GenericTOB*> unmatched_tobs;
for( TOBArray::const_iterator tob1 = input[0]->begin();
tob1 != input[0]->end() && distance(input[0]->begin(), tob1) < p_NumberLeading1;
++tob1)
{
if( parType_t((*tob1)->Et()) <= p_MinET1[i]) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
matched = false;
deltaR2 = 999;
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2 && matched != true ;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2[i]) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
// test DeltaR2Min, DeltaR2Max
deltaR2 = calcDeltaR2BW( *tob1, *tob2 );
if (deltaR2 <= p_DRCut[i]) matched = true;
@@ -172,22 +171,22 @@ TCS::NotMatch::process( const std::vector<TCS::TOBArray const *> & input,
unsigned int deltaR2= 999;
for(unsigned int i=0; i<numberOutputBits(); ++i) {
bool all_unmatched = true;
- vector<GenericTOB*> unmatched_tobs;
+ std::vector<GenericTOB*> unmatched_tobs;
for( TOBArray::const_iterator tob1 = input[0]->begin();
tob1 != input[0]->end() && distance(input[0]->begin(), tob1) < p_NumberLeading1;
++tob1)
{
if( parType_t((*tob1)->Et()) <= p_MinET1[i]) continue; // ET cut
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax1[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin1[i] ) continue; // Eta cut
matched = false;
deltaR2 = 999;
for( TCS::TOBArray::const_iterator tob2 = input[1]->begin();
tob2 != input[1]->end() && distance(input[1]->begin(), tob2) < p_NumberLeading2 && matched != true ;
++tob2) {
if( parType_t((*tob2)->Et()) <= p_MinET2[i]) continue; // ET cut
- if( parType_t(fabs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
- if( parType_t(fabs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) > p_EtaMax2[i] ) continue; // Eta cut
+ if( parType_t(std::abs((*tob2)->eta())) < p_EtaMin2[i] ) continue; // Eta cut
// test DeltaR2Min, DeltaR2Max
deltaR2 = calcDeltaR2( *tob1, *tob2 );
if (deltaR2 <= p_DRCut[i]) matched = true;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
index 2b927a3450b5d82cd433b5a13445472201ee2140..5a9dfcad8ebfe28ea3afbed2774f4036880933f1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* Ratio.cpp
@@ -19,10 +19,8 @@
REGISTER_ALG_TCS(Ratio)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << name() << ": "
+#define LOG std::cout << name() << ": "
TCS::Ratio::Ratio(const std::string & name) : DecisionAlg(name)
@@ -102,8 +100,8 @@ TCS::Ratio::process( const std::vector<TCS::TOBArray const *> & input,
for( TCS::GenericTOB * tob : *input[1]) {
- if( parType_t(fabs(tob->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin ) continue; // Eta cut
if( tob->Et() <= p_MinET2 ) continue; // E_T cut
TRG_MSG_DEBUG("Jet ET = " << tob->Et());
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
index 68d98a05da33b5f44c717e4fde14ec178650b683..200156b1e2a6003b1481c40df31565f266474179 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/Ratio2.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* Ratio2.cpp
@@ -19,10 +19,8 @@
REGISTER_ALG_TCS(Ratio2)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << name() << ": "
+#define LOG std::cout << name() << ": "
TCS::Ratio2::Ratio2(const std::string & name) : DecisionAlg(name)
@@ -97,8 +95,8 @@ TCS::Ratio2::process( const std::vector<TCS::TOBArray const *> & input,
for( TCS::GenericTOB * tob : *input[1]) {
- if( parType_t(fabs(tob->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin ) continue; // Eta cut
if( tob->Et() <= p_MinET2 ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << tob->Et());
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx
index fe3a84986c5e3315a00629e78401bb59c40fc52c..90e8ae3ed8e4c18d3c91638cb51310b2643334be 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioMatch.cxx
@@ -19,10 +19,9 @@
REGISTER_ALG_TCS(RatioMatch)
-using namespace std;
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << name() << ": "
+#define LOG std::cout << name() << ": "
/* NOT USED
namespace {
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
index 164f4e7f0d45009c7adb1eafafaff97353570379..0900ad4a3a772a24d6bf91be559bb3716b6235c7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/RatioSum.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* RatioSum.cpp
@@ -22,10 +22,8 @@
REGISTER_ALG_TCS(RatioSum)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << name() << ": "
+#define LOG std::cout << name() << ": "
TCS::RatioSum::RatioSum(const std::string & name) : DecisionAlg(name)
@@ -201,8 +199,8 @@ TCS::RatioSum::process( const std::vector<TCS::TOBArray const *> & input,
unsigned int objC(0);
for( TCS::GenericTOB * tob : *input[1]) {
- if( parType_t(fabs(tob->eta())) > p_EtaMax2 ) continue; // Eta cut
- if( parType_t(fabs(tob->eta())) < p_EtaMin2 ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) > p_EtaMax2 ) continue; // Eta cut
+ if( parType_t(std::abs(tob->eta())) < p_EtaMin2 ) continue; // Eta cut
if( tob->Et() <= p_MinET2 ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << tob->Et());
@@ -218,8 +216,8 @@ TCS::RatioSum::process( const std::vector<TCS::TOBArray const *> & input,
++tob1)
{
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax3 ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax3 ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin3 ) continue; // Eta cut
if( (*tob1)->Et() <= p_MinET3 ) continue; // E_T cut
sumET += (*tob1)->Et() ;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
index 923961e4fabdd17a9eb8b0e86a631d4918ca9338..2be36ed6ca8a64687c87a3a825e94cf2cb05df18 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/SimpleCone.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************
* SimpleCone.cpp
@@ -24,10 +24,8 @@
REGISTER_ALG_TCS(SimpleCone)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << name() << ": "
+#define LOG std::cout << name() << ": "
TCS::SimpleCone::SimpleCone(const std::string & name) : DecisionAlg(name)
@@ -73,25 +71,15 @@ TCS::SimpleCone::initialize() {
}
TRG_MSG_INFO("number output : " << numberOutputBits());
- // create strings for histogram names
- std::vector<std::ostringstream> MyAcceptHist(numberOutputBits());
- std::vector<std::ostringstream> MyRejectHist(numberOutputBits());
-
- for (unsigned int i=0;i<numberOutputBits();i++) {
- MyAcceptHist[i] << "Accept" << p_MinSumET[i] << "SimpleCone";
- MyRejectHist[i] << "Reject" << p_MinSumET[i] << "SimpleCone";
- }
-
- for (unsigned int i=0; i<numberOutputBits();i++) {
-
- const std::string& MyTitle1 = MyAcceptHist[i].str();
- const std::string& MyTitle2 = MyRejectHist[i].str();
-
- registerHist(m_histAcceptSimpleCone[i] = new TH1F(MyTitle1.c_str(),MyTitle1.c_str(),100,0,p_MinSumET[i]*2));
- registerHist(m_histRejectSimpleCone[i] = new TH1F(MyTitle2.c_str(),MyTitle2.c_str(),100,0,p_MinSumET[i]*2));
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hSimpleCone_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hSimpleCone_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "ET", 100, 0, p_MinSumET[i]);
+ bookHist(m_histReject, hname_reject, "ET", 100, 0, p_MinSumET[i]);
}
-
return StatusCode::SUCCESS;
}
@@ -122,8 +110,8 @@ TCS::SimpleCone::process( const std::vector<TCS::TOBArray const *> & input,
tob != input[0]->end() && distance(input[0]->begin(), tob) < p_NumberLeading1;
++tob) {
- if( parType_t(fabs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs((*tob)->eta())) < p_EtaMin ) continue; // Eta cut
if( parType_t((*tob)->Et()) <= p_MinET ) continue; // E_T cut
TRG_MSG_DEBUG("Jet : ET = " << (*tob)->Et());
@@ -135,8 +123,8 @@ TCS::SimpleCone::process( const std::vector<TCS::TOBArray const *> & input,
++tob1) {
if( tob1 == tob ) continue; // Avoid double counting of central jet
- if( parType_t(fabs((*tob1)->eta())) > p_EtaMax ) continue; // Eta cut
- if( parType_t(fabs((*tob1)->eta())) < p_EtaMin ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) > p_EtaMax ) continue; // Eta cut
+ if( parType_t(std::abs((*tob1)->eta())) < p_EtaMin ) continue; // Eta cut
if( parType_t((*tob1)->Et()) <= p_MinET ) continue; // E_T cut
double deta = ( (*tob)->etaDouble() - (*tob1)->etaDouble() );
@@ -163,9 +151,9 @@ TCS::SimpleCone::process( const std::vector<TCS::TOBArray const *> & input,
output[i]->push_back( CompositeTOB( GenericTOB::createOnHeap( GenericTOB(leadingET,0,0) ) ));
}
if(fillAccept)
- fillHist1D(m_histAcceptSimpleCone[i]->GetName(),leadingET);
+ fillHist1D(m_histAccept[i],leadingET);
else if(fillReject)
- fillHist1D(m_histRejectSimpleCone[i]->GetName(),leadingET);
+ fillHist1D(m_histReject[i],leadingET);
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " SimpleCone = " << leadingET);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx
index ed473fb2fcc3d7bdbfadb8ce42b2d18bcec5e1d4..13194780a8abcf8c62ed0b4482b7f670a50d0641 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/TransverseMassInclusive1.cxx
@@ -28,10 +28,8 @@
//
REGISTER_ALG_TCS(TransverseMassInclusive1)
-using namespace std;
-
// not the best solution but we will move to athena where this comes for free
-#define LOG cout << "TCS::TransverseMassInclusive1: "
+#define LOG std::cout << "TCS::TransverseMassInclusive1: "
@@ -113,18 +111,15 @@ TCS::TransverseMassInclusive1::initialize() {
TRG_MSG_INFO("NumberLeading1 : " << p_NumberLeading1);
TRG_MSG_INFO("number output : " << numberOutputBits());
- for (unsigned int i=0; i<numberOutputBits();i++) {
- const int buf_len = 512;
- char hname_accept[buf_len], hname_reject[buf_len];
- int Tmass_min = p_TMassMin[i];
- int Tmass_max = 1000;
- // Tmass
- snprintf(hname_accept, buf_len, "Accept_TransverseMassInclusive1_bit%d_%dM%d_Mass", i, Tmass_min, Tmass_max);
- snprintf(hname_reject, buf_len, "Reject_TransverseMassInclusive1_bit%d_%dM%d_Mass", i, Tmass_min, Tmass_max);
- registerHist(m_histAcceptM[i] = new TH1F(hname_accept, hname_accept, 100, 0.0, 2*Tmass_max));
- registerHist(m_histRejectM[i] = new TH1F(hname_reject, hname_reject, 100, 0.0, 2*Tmass_max));
- }
-
+ // book histograms
+ for(unsigned int i=0; i<numberOutputBits(); ++i) {
+ std::string hname_accept = "hTransverseMassInclusive1_accept_bit"+std::to_string((int)i);
+ std::string hname_reject = "hTransverseMassInclusive1_reject_bit"+std::to_string((int)i);
+ // mass
+ bookHist(m_histAccept, hname_accept, "MT", 100, p_TMassMin[i], 2000);
+ bookHist(m_histReject, hname_reject, "MT", 100, p_TMassMin[i], 2000);
+ }
+
return StatusCode::SUCCESS;
}
@@ -168,9 +163,9 @@ TCS::TransverseMassInclusive1::processBitCorrect( const std::vector<TCS::TOBArra
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptM[i]->GetName(),(float)tmass2);
+ fillHist1D(m_histAccept[i],(float)tmass2);
} else if(fillReject) {
- fillHist1D(m_histRejectM[i]->GetName(),(float)tmass2);
+ fillHist1D(m_histReject[i],(float)tmass2);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " tmass2 = " << tmass2);
}
@@ -224,9 +219,9 @@ TCS::TransverseMassInclusive1::process( const std::vector<TCS::TOBArray const *>
output[i]->push_back( TCS::CompositeTOB(*tob1, *tob2) );
}
if(fillAccept and not alreadyFilled) {
- fillHist1D(m_histAcceptM[i]->GetName(),(float)tmass2);
+ fillHist1D(m_histAccept[i],(float)tmass2);
} else if(fillReject) {
- fillHist1D(m_histRejectM[i]->GetName(),(float)tmass2);
+ fillHist1D(m_histReject[i],(float)tmass2);
}
TRG_MSG_DEBUG("Decision " << i << ": " << (accept?"pass":"fail") << " tmass2 = " << tmass2);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoConfig/Root/test/go.sh b/Trigger/TrigT1/L1Topo/L1TopoConfig/Root/test/go.sh
deleted file mode 100644
index 04cd7e4425bebd796136cdc780019421a8f6dac3..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/L1Topo/L1TopoConfig/Root/test/go.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-cd ../../cmt
-cmt config
-cmt make
-cd ../src/test
-
-TrigConfTopoReader L1TopoMenu_smk_2323.xml
\ No newline at end of file
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h
index ca75e662c2041965b8473c49cffa0eb5774b8faa..90ea57bc7617b9f627bd5363c970eb0c68bd6fee 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/L1TopoInterfaces/DecisionAlg.h
@@ -69,6 +69,17 @@ namespace TCS {
*/
bool fillHistos() const;
+ protected:
+ std::vector<std::string> m_histAccept;
+ std::vector<std::string> m_histReject;
+ std::vector<std::string> m_histAcceptM;
+ std::vector<std::string> m_histRejectM;
+ std::vector<std::string> m_histAcceptX;
+ std::vector<std::string> m_histRejectX;
+ std::vector<std::string> m_histAcceptEta1Eta2;
+ std::vector<std::string> m_histRejectEta1Eta2;
+
+
private:
virtual StatusCode doReset();
diff --git a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx
index 04beaa2184ec5f420484f511b9d0faee30e6d112..a38063fe9ef92d40df410077df2af9bf39ed2ea1 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoInterfaces/Root/ConfigurableAlg.cxx
@@ -206,7 +206,7 @@ void ConfigurableAlg::bookHist(std::vector<std::string> ®Name, const std::str
xmin_new=-70;
xmax_new=70;
}
- if ( title.find("DETA") != std::string::npos || title.find("DPHI") != std::string::npos ){
+ if ( title.find("DETA") != std::string::npos || title.find("DPHI") != std::string::npos || title.find("DR") != std::string::npos ){
xmin_new=0;
xmax_new=70;
}
@@ -263,11 +263,11 @@ void ConfigurableAlg::bookHist(std::vector<std::string> ®Name, const std::str
ymin_new=-70;
ymax_new=70;
}
- if ( xName.find("DETA") != std::string::npos || xName.find("DPHI") != std::string::npos ){
+ if ( xName.find("DETA") != std::string::npos || xName.find("DPHI") != std::string::npos || xName.find("DR") != std::string::npos ){
xmin_new=0;
xmax_new=70;
}
- if ( yName.find("DETA") != std::string::npos || yName.find("DPHI") != std::string::npos ){
+ if ( yName.find("DETA") != std::string::npos || yName.find("DPHI") != std::string::npos || yName.find("DR") != std::string::npos ){
ymin_new=0;
ymax_new=70;
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1TopoSimulationTest.py b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1TopoSimulationTest.py
index 9af066f0d83a27f687263b3da8779fba7ddaf4e4..b9a4f1ddca2b3876c6ef608352691fd36e5ad5c7 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1TopoSimulationTest.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1TopoSimulationTest.py
@@ -7,7 +7,7 @@ import os,psutil,sys
from AthenaCommon.Logging import logging
log = logging.getLogger('L1TopoSimulationTest.py')
-fmenu ,fTOBs = 'L1Topoconfig_MC_pp_v8_OnlyThreadSaveAlgs.xml','eventdump_new.txt'
+fmenu ,fTOBs = 'L1Topoconfig_MC_pp_v8_NewNaming.xml','eventdump_new.txt'
print ('File for menu :',fmenu)
print ('File for TOBs :',fTOBs)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/AthenaL1TopoHistSvc.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/AthenaL1TopoHistSvc.cxx
index 425c475ff086821a23bc17108a3b18162a26a7f3..031f2706a025ee404ed2ed3abbbc269c80e7f399 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/AthenaL1TopoHistSvc.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/AthenaL1TopoHistSvc.cxx
@@ -41,10 +41,9 @@ public:
if(m_histSvc) {
string histName = h->GetName();
auto colPos = histName.find_first_of('/');
- //Key will use original name when all algorithms changed with bookHist()
- const string key = histName.substr(colPos+1);
+ const string key = histName;
const string fullName( m_baseDir + histName );
- h->SetName(key.c_str());
+ h->SetName(histName.substr(colPos+1).c_str());
std::unique_ptr<TH1> uhist(h);
LockedHandle<TH1> lh;
if( ! m_histSvc->regShared(fullName, std::move(uhist), lh).isSuccess() ) {
@@ -62,10 +61,9 @@ public:
if(m_histSvc) {
string histName = h->GetName();
auto colPos = histName.find_first_of('/');
- //Key will use original name when all algorithms changed with bookHist()
- const string key = histName.substr(colPos+1);
+ const string key = histName;
const string fullName( m_baseDir + histName );
- h->SetName(key.c_str());
+ h->SetName(histName.substr(colPos+1).c_str());
std::unique_ptr<TH2> uhist(h);
LockedHandle<TH2> lh;
if( ! m_histSvc->regShared(fullName, std::move(uhist), lh).isSuccess() ) {
@@ -89,9 +87,7 @@ public:
}
void fillHist1D(const std::string & histName,double x) {
- //This will be removed when all algorithms changed with bookHist()
- auto colPos = histName.find_first_of('/');
- const string key = histName.substr(colPos+1);
+ const string key = histName;
if(m_hist1D.find(key) == m_hist1D.end()) {
TRG_MSG_ERROR("1D-hist with registration key " << key << " does not exist");
}
@@ -99,9 +95,7 @@ public:
}
void fillHist2D(const std::string & histName,double x,double y) {
- //This will be removed when all algorithms changed with bookHist()
- auto colPos = histName.find_first_of('/');
- const string key = histName.substr(colPos+1);
+ const string key = histName;
if(m_hist2D.find(key) == m_hist2D.end()) {
TRG_MSG_ERROR("2D-hist with registration key " << key << " does not exist");
}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx
index c01d89f3cb0cc9163e9bc19e5ac54df4c37631a0..c3578f93e54c46f597df1147f1c4425ef2b74be9 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx
@@ -104,6 +104,11 @@ L1TopoSimulation::L1TopoSimulation(const std::string &name, ISvcLocator *pSvcLoc
LVL1::L1TopoSimulation::~L1TopoSimulation()
{}
+bool
+LVL1::L1TopoSimulation::isClonable() const
+{
+ return true;
+}
StatusCode
LVL1::L1TopoSimulation::initialize() {
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h
index 79baea4c52a81f6e6e8ee7006e14c6e916ca62ad..c49166093cbbe1b4e9966c5ded451ce76da7ec54 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h
@@ -53,6 +53,10 @@ namespace LVL1 {
virtual StatusCode execute() override;
virtual StatusCode finalize() override;
+
+ // make algorithm is clonable
+ virtual bool isClonable() const override;
+
/**
@brief Retrieve the L1Topo hardware bits from the DAQ RODs
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/TrigT1CaloByteStream/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigT1/TrigT1CaloByteStream/TrigT1CaloByteStream/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..6b806d30ce2b26adec01d4b4f350d2f84ad49517
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/TrigT1CaloByteStream/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigT1/TrigT1CaloByteStream
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
index e93d5ae36e174e267e513e79ee120e4bcd3aad21..aa4f10e19a7b6b820ca92dc0e543a33c5640c625 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/CPBSCollection.h"
@@ -33,8 +34,7 @@ CpByteStreamCnv::CpByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamCnv"),
m_tool("LVL1BS::CpByteStreamTool/CpByteStreamTool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long CpByteStreamCnv::storageType()
StatusCode CpByteStreamCnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode CpByteStreamCnv::initialize()
StatusCode CpByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::CPBSCollection* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
- m_log << MSG::ERROR << " Cannot cast to CPBSCollection" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to CPBSCollection";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h
index 3f995f7dea0dc807147e21c95321457daa57a1f0..2bb844f9462e93f9c56dcc30731ddbea5acd698a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPBYTESTREAMCNV_H
@@ -62,11 +62,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
index 38b8c76ceca91d324ffa1153335acaca4ee7daa2..637d5bd0ecb964c86611fb820792c855f1e7d732 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/CPBSCollectionV1.h"
@@ -33,8 +34,7 @@ CpByteStreamV1Cnv::CpByteStreamV1Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamV1Cnv"),
m_tool("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long CpByteStreamV1Cnv::storageType()
StatusCode CpByteStreamV1Cnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode CpByteStreamV1Cnv::initialize()
StatusCode CpByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::CPBSCollectionV1* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
- m_log << MSG::ERROR << " Cannot cast to CPBSCollectionV1" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << "Cannot cast to CPBSCollectionV1";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
index ecc81b558ff1080fab980573f769cda50ea68a11..f5a2af4f15edfcf1e34c7648e34bdcc000d7801d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPBYTESTREAMV1CNV_H
@@ -9,7 +9,6 @@
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -56,11 +55,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
index 569094b68d74c159e6d9a313a0e375f97d8de82f..36d9aad6afbe1c8284b3382606127df0c3a0142a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/CPBSCollectionV2.h"
@@ -33,8 +34,7 @@ CpByteStreamV2Cnv::CpByteStreamV2Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamV2Cnv"),
m_tool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,10 @@ long CpByteStreamV2Cnv::storageType()
StatusCode CpByteStreamV2Cnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( sc.isFailure() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +72,11 @@ StatusCode CpByteStreamV2Cnv::initialize()
StatusCode CpByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::CPBSCollectionV2* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
- m_log << MSG::ERROR << " Cannot cast to CPBSCollectionV2" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to CPBSCollectionV2";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
index 1ea5ead440796023be35bc3d45958b1ea7c1f48f..7b83f410f1851d4db82fc16ae456a2907570eb34 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPBYTESTREAMV2CNV_H
@@ -56,11 +56,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
index 9dca2a78374baa360b7b3e764b0440bc8f6f9fb2..2c4966e11e5eb770bf1a27ce9697e41bdb003402 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -55,9 +55,7 @@ CpByteStreamV2Tool::CpByteStreamV2Tool(const std::string &type,
m_robDataProvider("ROBDataProviderSvc", name),
m_channels(80), m_crates(4), m_modules(14), m_cmxs(2), m_maxTobs(5),
m_chips(16), m_locs(4),
- m_coreOverlap(0), m_subDetector(eformat::TDAQ_CALO_CLUSTER_PROC_DAQ),
- m_srcIdMap(0), m_towerKey(0), m_cpmSubBlock(0), m_cmxCpSubBlock(0),
- m_rodStatus(0), m_fea(0)
+ m_subDetector(eformat::TDAQ_CALO_CLUSTER_PROC_DAQ)
{
declareInterface<CpByteStreamV2Tool>(this);
@@ -72,7 +70,7 @@ CpByteStreamV2Tool::CpByteStreamV2Tool(const std::string &type,
"Offset of CP crate numbers in RDOs");
// Properties for reading bytestream only
- declareProperty("ROBSourceIDs", m_sourceIDs,
+ declareProperty("ROBSourceIDs", m_sourceIDsProp,
"ROB fragment source identifiers");
// Properties for writing bytestream only
@@ -111,13 +109,6 @@ StatusCode CpByteStreamV2Tool::initialize()
CHECK(m_errorTool.retrieve());
CHECK(m_robDataProvider.retrieve());
- m_srcIdMap = new L1CaloSrcIdMap();
- m_towerKey = new LVL1::TriggerTowerKey();
- m_cpmSubBlock = new CpmSubBlockV2();
- m_cmxCpSubBlock = new CmxCpSubBlock();
- m_rodStatus = new std::vector<uint32_t>(2);
- m_fea = new FullEventAssembler<L1CaloSrcIdMap>();
-
return StatusCode::SUCCESS;
}
@@ -125,92 +116,88 @@ StatusCode CpByteStreamV2Tool::initialize()
StatusCode CpByteStreamV2Tool::finalize()
{
- delete m_fea;
- delete m_rodStatus;
- delete m_cmxCpSubBlock;
- delete m_cpmSubBlock;
- delete m_towerKey;
- delete m_srcIdMap;
return StatusCode::SUCCESS;
}
// Conversion bytestream to CPM towers
StatusCode CpByteStreamV2Tool::convert(
const std::string& sgKey,
- DataVector<LVL1::CPMTower> *const ttCollection)
+ DataVector<LVL1::CPMTower> *const ttCollection) const
{
- const std::vector<uint32_t>& vID(sourceIDs(sgKey));
+ const std::vector<uint32_t>& vID(sourceIDs());
// // get ROB fragments
IROBDataProviderSvc::VROBFRAG robFrags;
m_robDataProvider->getROBData(vID, robFrags, "CpByteStreamV2Tool");
ATH_MSG_DEBUG("Number of ROB fragments:" << robFrags.size());
- return convert(robFrags, ttCollection);
+ return convert(sgKey, robFrags, ttCollection);
}
StatusCode CpByteStreamV2Tool::convert(
+ const std::string& sgKey,
const IROBDataProviderSvc::VROBFRAG &robFrags,
- DataVector<LVL1::CPMTower> *const ttCollection)
+ DataVector<LVL1::CPMTower> *const ttCollection) const
{
CpmTowerData data (ttCollection);
- return convertBs(robFrags, data);
+ return convertBs(sgKey, robFrags, data);
}
// Conversion bytestream to CMX-CP TOBs
StatusCode CpByteStreamV2Tool::convert(
const std::string& sgKey,
- DataVector<LVL1::CMXCPTob> *const tobCollection)
+ DataVector<LVL1::CMXCPTob> *const tobCollection) const
{
- const std::vector<uint32_t>& vID(sourceIDs(sgKey));
+ const std::vector<uint32_t>& vID(sourceIDs());
// // get ROB fragments
IROBDataProviderSvc::VROBFRAG robFrags;
m_robDataProvider->getROBData(vID, robFrags, "CpByteStreamV2Tool");
ATH_MSG_DEBUG("Number of ROB fragments:" << robFrags.size());
- return convert(robFrags, tobCollection);
+ return convert(sgKey, robFrags, tobCollection);
}
StatusCode CpByteStreamV2Tool::convert(
+ const std::string& sgKey,
const IROBDataProviderSvc::VROBFRAG &robFrags,
- DataVector<LVL1::CMXCPTob> *const tobCollection)
+ DataVector<LVL1::CMXCPTob> *const tobCollection) const
{
CmxCpTobData data (tobCollection);
- return convertBs(robFrags, data);
+ return convertBs(sgKey, robFrags, data);
}
// Conversion bytestream to CMX-CP hits
StatusCode CpByteStreamV2Tool::convert(
const std::string& sgKey,
- DataVector<LVL1::CMXCPHits> *const hitCollection)
+ DataVector<LVL1::CMXCPHits> *const hitCollection) const
{
- const std::vector<uint32_t>& vID(sourceIDs(sgKey));
+ const std::vector<uint32_t>& vID(sourceIDs());
// // get ROB fragments
IROBDataProviderSvc::VROBFRAG robFrags;
m_robDataProvider->getROBData(vID, robFrags, "CpByteStreamV2Tool");
ATH_MSG_DEBUG("Number of ROB fragments:" << robFrags.size());
- return convert(robFrags, hitCollection);
+ return convert(sgKey, robFrags, hitCollection);
}
StatusCode CpByteStreamV2Tool::convert(
+ const std::string& sgKey,
const IROBDataProviderSvc::VROBFRAG &robFrags,
- DataVector<LVL1::CMXCPHits> *const hitCollection)
+ DataVector<LVL1::CMXCPHits> *const hitCollection) const
{
CmxCpHitsData data (hitCollection);
- return convertBs(robFrags, data);
+ return convertBs(sgKey, robFrags, data);
}
// Conversion of CP container to bytestream
StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
- RawEventWrite *const re)
+ RawEventWrite *const re) const
{
const bool debug = msgLvl(MSG::DEBUG);
if (debug) msg(MSG::DEBUG);
// Clear the event assembler
-
- m_fea->clear();
- const uint16_t minorVersion = m_srcIdMap->minorVersion();
- m_fea->setRodMinorVersion(minorVersion);
- m_rodStatusMap.clear();
+ FullEventAssembler<L1CaloSrcIdMap> fea;
+ fea.clear();
+ const uint16_t minorVersion = m_srcIdMap.minorVersion();
+ fea.setRodMinorVersion(minorVersion);
// Pointer to ROD data vector
@@ -218,9 +205,19 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
// Set up the container maps
- setupCpmTowerMap(cp->towers());
- setupCmxCpTobMap(cp->tobs());
- setupCmxCpHitsMap(cp->hits());
+ LVL1::TriggerTowerKey towerKey;
+
+ // CPM tower map
+ ConstCpmTowerMap ttMap;
+ setupCpmTowerMap(cp->towers(), ttMap, towerKey);
+
+ // CMX-CP TOB map
+ ConstCmxCpTobMap tobMap;
+ setupCmxCpTobMap(cp->tobs(), tobMap);
+
+ // CMX-CP hits map
+ ConstCmxCpHitsMap hitsMap;
+ setupCmxCpHitsMap(cp->hits(), hitsMap);
// Loop over data
@@ -254,7 +251,11 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
// Get number of CPM slices and triggered slice offset
// for this slink
if ( ! slinkSlices(crate, module, modulesPerSlink,
- timeslices, trigCpm))
+ timeslices, trigCpm,
+ ttMap,
+ tobMap,
+ hitsMap,
+ towerKey))
{
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
@@ -276,23 +277,22 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
}
L1CaloUserHeader userHeader;
userHeader.setCpm(trigCpmNew);
- const uint32_t rodIdCpm = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
+ const uint32_t rodIdCpm = m_srcIdMap.getRodID(hwCrate, slink, daqOrRoi,
m_subDetector);
- theROD = m_fea->getRodData(rodIdCpm);
+ theROD = fea.getRodData(rodIdCpm);
theROD->push_back(userHeader.header());
- m_rodStatusMap.insert(make_pair(rodIdCpm, m_rodStatus));
}
if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block for each slice (except Neutral format)
- m_cpmBlocks.clear();
+ DataVector<CpmSubBlockV2> cpmBlocks;
for (int slice = 0; slice < timeslicesNew; ++slice)
{
CpmSubBlockV2 *const subBlock = new CpmSubBlockV2();
subBlock->setCpmHeader(m_version, m_dataFormat, slice,
hwCrate, module, timeslicesNew);
- m_cpmBlocks.push_back(subBlock);
+ cpmBlocks.push_back(subBlock);
if (neutralFormat) break;
}
@@ -306,8 +306,8 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
int layer = 0;
if (m_cpmMaps->mapping(crate, module, chan, eta, phi, layer))
{
- const unsigned int key = m_towerKey->ttKey(phi, eta);
- const LVL1::CPMTower *const tt = findCpmTower(key);
+ const unsigned int key = towerKey.ttKey(phi, eta);
+ const LVL1::CPMTower *const tt = findCpmTower(key, ttMap);
if (tt )
{
std::vector<int> emData;
@@ -329,7 +329,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
(hadErrBits.get(LVL1::DataError::LinkDown) << 1) |
hadErrBits.get(LVL1::DataError::Parity);
const int index = ( neutralFormat ) ? 0 : slice;
- CpmSubBlockV2 *const subBlock = m_cpmBlocks[index];
+ CpmSubBlockV2 *const subBlock = cpmBlocks[index];
subBlock->fillTowerData(slice, chan, emData[slice],
hadData[slice], emErr, hadErr);
if ((emErrBits.error() >> LVL1::DataError::GLinkParity))
@@ -354,7 +354,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
// Pack and write the sub-blocks
DataVector<CpmSubBlockV2>::iterator pos;
- for (pos = m_cpmBlocks.begin(); pos != m_cpmBlocks.end(); ++pos)
+ for (pos = cpmBlocks.begin(); pos != cpmBlocks.end(); ++pos)
{
CpmSubBlockV2 *const subBlock = *pos;
if ( !subBlock->pack())
@@ -378,7 +378,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
// Create a sub-block for each slice (except Neutral format)
- m_cmxBlocks.clear();
+ DataVector<CmxCpSubBlock> cmxBlocks;
const int summing = (crate == m_crates - 1) ? CmxSubBlock::SYSTEM
: CmxSubBlock::CRATE;
for (int slice = 0; slice < timeslicesNew; ++slice)
@@ -386,7 +386,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
CmxCpSubBlock *const block = new CmxCpSubBlock();
block->setCmxHeader(m_version, m_dataFormat, slice, hwCrate,
summing, CmxSubBlock::CMX_CP, cmx, timeslicesNew);
- m_cmxBlocks.push_back(block);
+ cmxBlocks.push_back(block);
if (neutralFormat) break;
}
@@ -399,7 +399,8 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
for (int loc = 0; loc < m_locs; ++loc)
{
const int key = tobKey(crate, cmx, cpm, chip, loc);
- const LVL1::CMXCPTob *const ct = findCmxCpTob(key);
+ const LVL1::CMXCPTob *const ct = findCmxCpTob(key,
+ tobMap);
if ( ct )
{
std::vector<int> energy;
@@ -420,7 +421,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
err |= (errBits.get(LVL1::DataError::ParityPhase3)) << 4;
err |= (errBits.get(LVL1::DataError::Overflow)) << 5;
const int index = ( neutralFormat ) ? 0 : slice;
- CmxCpSubBlock *const subBlock = m_cmxBlocks[index];
+ CmxCpSubBlock *const subBlock = cmxBlocks[index];
subBlock->setTob(slice, cpm, chip, loc, energy[slice],
isolation[slice], err);
subBlock->setPresenceMap(slice, cpm, presence[slice]);
@@ -435,7 +436,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
for (int source = 0; source < LVL1::CMXCPHits::MAXSOURCE; ++source)
{
const int key = hitsKey(crate, cmx, source);
- const LVL1::CMXCPHits *const ch = findCmxCpHits(key);
+ const LVL1::CMXCPHits *const ch = findCmxCpHits(key, hitsMap);
if ( ch )
{
std::vector<unsigned int> hits0;
@@ -451,7 +452,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
const LVL1::DataError err0Bits(err0[slice]);
const LVL1::DataError err1Bits(err1[slice]);
const int index = ( neutralFormat ) ? 0 : slice;
- CmxCpSubBlock *const subBlock = m_cmxBlocks[index];
+ CmxCpSubBlock *const subBlock = cmxBlocks[index];
subBlock->setHits(slice, source, 0, hits0[slice], // Assuming CMXCPHits::source == CmxCpSubBlock::source
err0Bits.get(LVL1::DataError::Parity));
subBlock->setHits(slice, source, 1, hits1[slice],
@@ -464,7 +465,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
}
}
}
- for (CmxCpSubBlock* subBlock : m_cmxBlocks)
+ for (CmxCpSubBlock* subBlock : cmxBlocks)
{
if ( !subBlock->pack())
{
@@ -483,55 +484,65 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
// Fill the raw event
- m_fea->fill(re, msg());
-
- // Set ROD status words
-
- //L1CaloRodStatus::setStatus(re, m_rodStatusMap, m_srcIdMap);
+ fea.fill(re, msg());
return StatusCode::SUCCESS;
}
// Return reference to vector with all possible Source Identifiers
-const std::vector<uint32_t> &CpByteStreamV2Tool::sourceIDs(
- const std::string &sgKey)
+std::vector<uint32_t> CpByteStreamV2Tool::makeSourceIDs() const
{
- // Check if overlap tower channels wanted
- const std::string flag("Overlap");
- const std::string::size_type pos = sgKey.find(flag);
- m_coreOverlap =
- (pos == std::string::npos || pos != sgKey.length() - flag.length()) ? 0 : 1;
-
- if (m_sourceIDs.empty())
+ std::vector<uint32_t> sourceIDs;
+
+ if (!m_sourceIDsProp.empty()) {
+ sourceIDs = m_sourceIDsProp;
+ }
+ else {
+ const int maxCrates = m_crates + m_crateOffsetHw;
+ const int maxSlinks = m_srcIdMap.maxSlinks();
+ for (int hwCrate = m_crateOffsetHw; hwCrate < maxCrates; ++hwCrate)
{
- const int maxCrates = m_crates + m_crateOffsetHw;
- const int maxSlinks = m_srcIdMap->maxSlinks();
- for (int hwCrate = m_crateOffsetHw; hwCrate < maxCrates; ++hwCrate)
- {
- for (int slink = 0; slink < maxSlinks; ++slink)
- {
- const int daqOrRoi = 0;
- const uint32_t rodId = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
- m_subDetector);
- const uint32_t robId = m_srcIdMap->getRobID(rodId);
- m_sourceIDs.push_back(robId);
- }
- }
+ for (int slink = 0; slink < maxSlinks; ++slink)
+ {
+ const int daqOrRoi = 0;
+ const uint32_t rodId = m_srcIdMap.getRodID(hwCrate, slink, daqOrRoi,
+ m_subDetector);
+ const uint32_t robId = m_srcIdMap.getRobID(rodId);
+ sourceIDs.push_back(robId);
+ }
}
- return m_sourceIDs;
+ }
+ return sourceIDs;
+}
+
+const std::vector<uint32_t> &CpByteStreamV2Tool::sourceIDs() const
+{
+ static const std::vector<uint32_t> sourceIDs = makeSourceIDs();
+ return sourceIDs;
}
// Convert bytestream to given container type
StatusCode CpByteStreamV2Tool::convertBs(
+ const std::string& sgKey,
const IROBDataProviderSvc::VROBFRAG &robFrags,
- CpByteStreamToolData& data)
+ CpByteStreamToolData& data) const
{
+ LocalData ld;
+
+ const std::string flag("Overlap");
+ const std::string::size_type pos = sgKey.find(flag);
+ ld.coreOverlap =
+ (pos == std::string::npos || pos != sgKey.length() - flag.length()) ? 0 : 1;
+
const bool debug = msgLvl(MSG::DEBUG);
if (debug) msg(MSG::DEBUG);
- // Loop over ROB fragments
+ CmxCpSubBlock cmxCpSubBlock;
+ CpmSubBlockV2 cpmSubBlock;
+
+ // Loop over ROB fragments
int robCount = 0;
std::set<uint32_t> dupCheck;
@@ -582,12 +593,12 @@ StatusCode CpByteStreamV2Tool::convertBs(
// Check identifier
const uint32_t sourceID = (*rob)->rod_source_id();
- if (m_srcIdMap->getRobID(sourceID) != robid ||
- m_srcIdMap->subDet(sourceID) != m_subDetector ||
- m_srcIdMap->daqOrRoi(sourceID) != 0 ||
- (m_srcIdMap->slink(sourceID) != 0 && m_srcIdMap->slink(sourceID) != 2) ||
- m_srcIdMap->crate(sourceID) < m_crateOffsetHw ||
- m_srcIdMap->crate(sourceID) >= m_crateOffsetHw + m_crates)
+ if (m_srcIdMap.getRobID(sourceID) != robid ||
+ m_srcIdMap.subDet(sourceID) != m_subDetector ||
+ m_srcIdMap.daqOrRoi(sourceID) != 0 ||
+ (m_srcIdMap.slink(sourceID) != 0 && m_srcIdMap.slink(sourceID) != 2) ||
+ m_srcIdMap.crate(sourceID) < m_crateOffsetHw ||
+ m_srcIdMap.crate(sourceID) >= m_crateOffsetHw + m_crates)
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_ROD_ID);
if (debug)
@@ -602,16 +613,16 @@ StatusCode CpByteStreamV2Tool::convertBs(
// Check minor version
const int minorVersion = (*rob)->rod_version() & 0xffff;
- if (minorVersion <= m_srcIdMap->minorVersionPreLS1())
+ if (minorVersion <= m_srcIdMap.minorVersionPreLS1())
{
if (debug) msg() << "Skipping pre-LS1 data" << endmsg;
continue;
}
- const int rodCrate = m_srcIdMap->crate(sourceID);
+ const int rodCrate = m_srcIdMap.crate(sourceID);
if (debug)
{
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
+ << " slink " << m_srcIdMap.slink(sourceID) << endmsg;
}
// First word should be User Header
@@ -643,13 +654,13 @@ StatusCode CpByteStreamV2Tool::convertBs(
// Loop over sub-blocks
- m_rodErr = L1CaloSubBlock::ERROR_NONE;
+ ld.rodErr = L1CaloSubBlock::ERROR_NONE;
while (payload != payloadEnd)
{
if (L1CaloSubBlock::wordType(*payload) != L1CaloSubBlock::HEADER)
{
if (debug) msg() << "Unexpected data sequence" << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
+ ld.rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
@@ -665,20 +676,20 @@ StatusCode CpByteStreamV2Tool::convertBs(
// CMX
if (CmxSubBlock::cmxType(*payload) == CmxSubBlock::CMX_CP)
{
- m_cmxCpSubBlock->clear();
- payload = m_cmxCpSubBlock->read(payload, payloadEnd);
- if (m_cmxCpSubBlock->crate() != rodCrate)
+ cmxCpSubBlock.clear();
+ payload = cmxCpSubBlock.read(payload, payloadEnd);
+ if (cmxCpSubBlock.crate() != rodCrate)
{
if (debug) msg() << "Inconsistent crate number in ROD source ID"
<< endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
+ ld.rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (data.m_collection == CMX_CP_TOBS || data.m_collection == CMX_CP_HITS)
{
- decodeCmxCp(m_cmxCpSubBlock, trigCpm, data);
- if (m_rodErr != L1CaloSubBlock::ERROR_NONE)
+ decodeCmxCp(&cmxCpSubBlock, trigCpm, data, ld);
+ if (ld.rodErr != L1CaloSubBlock::ERROR_NONE)
{
if (debug) msg() << "decodeCmxCp failed" << endmsg;
break;
@@ -688,26 +699,26 @@ StatusCode CpByteStreamV2Tool::convertBs(
else
{
if (debug) msg() << "Invalid CMX type in module field" << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
+ ld.rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
}
else
{
// CPM
- m_cpmSubBlock->clear();
- payload = m_cpmSubBlock->read(payload, payloadEnd);
- if (m_cpmSubBlock->crate() != rodCrate)
+ cpmSubBlock.clear();
+ payload = cpmSubBlock.read(payload, payloadEnd);
+ if (cpmSubBlock.crate() != rodCrate)
{
if (debug) msg() << "Inconsistent crate number in ROD source ID"
<< endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
+ ld.rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (data.m_collection == CPM_TOWERS)
{
- decodeCpm(m_cpmSubBlock, trigCpm, static_cast<CpmTowerData&>(data));
- if (m_rodErr != L1CaloSubBlock::ERROR_NONE)
+ decodeCpm(&cpmSubBlock, trigCpm, static_cast<CpmTowerData&>(data), ld);
+ if (ld.rodErr != L1CaloSubBlock::ERROR_NONE)
{
if (debug) msg() << "decodeCpm failed" << endmsg;
break;
@@ -715,9 +726,9 @@ StatusCode CpByteStreamV2Tool::convertBs(
}
}
}
- if (m_rodErr != L1CaloSubBlock::ERROR_NONE)
+ if (ld.rodErr != L1CaloSubBlock::ERROR_NONE)
{
- m_errorTool->rodError(robid, m_rodErr);
+ m_errorTool->rodError(robid, ld.rodErr);
}
}
return StatusCode::SUCCESS;
@@ -726,7 +737,8 @@ StatusCode CpByteStreamV2Tool::convertBs(
// Unpack CMX-CP sub-block
void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
- CpByteStreamToolData& data)
+ CpByteStreamToolData& data,
+ LocalData& ld) const
{
const bool debug = msgLvl(MSG::DEBUG);
if (debug) msg(MSG::DEBUG);
@@ -752,14 +764,14 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
if (debug) msg() << "Triggered slice from header "
<< "inconsistent with number of slices: "
<< trigCpm << ", " << timeslices << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_SLICES;
+ ld.rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum)
{
if (debug) msg() << "Total slices inconsistent with slice number: "
<< timeslices << ", " << sliceNum << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_SLICES;
+ ld.rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
// Unpack sub-block
@@ -770,7 +782,7 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
std::string errMsg(subBlock->unpackErrorMsg());
msg() << "CMX-CP sub-block unpacking failed: " << errMsg << endmsg;
}
- m_rodErr = subBlock->unpackErrorCode();
+ ld.rodErr = subBlock->unpackErrorCode();
return;
}
@@ -821,47 +833,47 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
LVL1::CMXCPTob *tb = findCmxCpTob(tdata, key);
if ( ! tb ) // create new CMX TOB
{
- m_energyVec.assign(timeslices, 0);
- m_isolVec.assign(timeslices, 0);
- m_errorVec.assign(timeslices, 0);
- m_presenceMapVec.assign(timeslices, 0);
- m_energyVec[slice] = energy;
- m_isolVec[slice] = isolation;
- m_errorVec[slice] = error;
- m_presenceMapVec[slice] = presenceMap;
+ ld.energyVec.assign(timeslices, 0);
+ ld.isolVec.assign(timeslices, 0);
+ ld.errorVec.assign(timeslices, 0);
+ ld.presenceMapVec.assign(timeslices, 0);
+ ld.energyVec[slice] = energy;
+ ld.isolVec[slice] = isolation;
+ ld.errorVec[slice] = error;
+ ld.presenceMapVec[slice] = presenceMap;
auto tbp =
std::make_unique<LVL1::CMXCPTob>(swCrate, cmx, cpm, chip, loc,
- m_energyVec, m_isolVec, m_errorVec,
- m_presenceMapVec, trigCpm);
+ ld.energyVec, ld.isolVec, ld.errorVec,
+ ld.presenceMapVec, trigCpm);
tdata.m_tobMap.insert(std::make_pair(key, tbp.get()));
tdata.m_tobCollection->push_back(std::move(tbp));
}
else
{
- m_energyVec = tb->energyVec();
- m_isolVec = tb->isolationVec();
- m_errorVec = tb->errorVec();
- m_presenceMapVec = tb->presenceMapVec();
- const int nsl = m_energyVec.size();
+ ld.energyVec = tb->energyVec();
+ ld.isolVec = tb->isolationVec();
+ ld.errorVec = tb->errorVec();
+ ld.presenceMapVec = tb->presenceMapVec();
+ const int nsl = ld.energyVec.size();
if (timeslices != nsl)
{
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
<< endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_SLICES;
+ ld.rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
- if (m_energyVec[slice] != 0 || m_isolVec[slice] != 0 ||
- m_errorVec[slice] != 0)
+ if (ld.energyVec[slice] != 0 || ld.isolVec[slice] != 0 ||
+ ld.errorVec[slice] != 0)
{
if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
+ ld.rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
- m_energyVec[slice] = energy;
- m_isolVec[slice] = isolation;
- m_errorVec[slice] = error;
- m_presenceMapVec[slice] = presenceMap;
- tb->addTob(m_energyVec, m_isolVec, m_errorVec, m_presenceMapVec);
+ ld.energyVec[slice] = energy;
+ ld.isolVec[slice] = isolation;
+ ld.errorVec[slice] = error;
+ ld.presenceMapVec[slice] = presenceMap;
+ tb->addTob(ld.energyVec, ld.isolVec, ld.errorVec, ld.presenceMapVec);
}
}
}
@@ -899,47 +911,47 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
LVL1::CMXCPHits *ch = findCmxCpHits(hdata, key);
if ( ! ch ) // create new CMX hits
{
- m_hitsVec0.assign(timeslices, 0);
- m_hitsVec1.assign(timeslices, 0);
- m_errVec0.assign(timeslices, 0);
- m_errVec1.assign(timeslices, 0);
- m_hitsVec0[slice] = hits0;
- m_hitsVec1[slice] = hits1;
- m_errVec0[slice] = err0;
- m_errVec1[slice] = err1;
+ ld.hitsVec0.assign(timeslices, 0);
+ ld.hitsVec1.assign(timeslices, 0);
+ ld.errVec0.assign(timeslices, 0);
+ ld.errVec1.assign(timeslices, 0);
+ ld.hitsVec0[slice] = hits0;
+ ld.hitsVec1[slice] = hits1;
+ ld.errVec0[slice] = err0;
+ ld.errVec1[slice] = err1;
auto chp =
std::make_unique<LVL1::CMXCPHits>(swCrate, cmx, source,
- m_hitsVec0, m_hitsVec1,
- m_errVec0, m_errVec1, trigCpm);
+ ld.hitsVec0, ld.hitsVec1,
+ ld.errVec0, ld.errVec1, trigCpm);
hdata.m_hitsMap.insert(std::make_pair(key, chp.get()));
hdata.m_hitCollection->push_back(std::move(chp));
}
else
{
- m_hitsVec0 = ch->hitsVec0();
- m_hitsVec1 = ch->hitsVec1();
- m_errVec0 = ch->errorVec0();
- m_errVec1 = ch->errorVec1();
- const int nsl = m_hitsVec0.size();
+ ld.hitsVec0 = ch->hitsVec0();
+ ld.hitsVec1 = ch->hitsVec1();
+ ld.errVec0 = ch->errorVec0();
+ ld.errVec1 = ch->errorVec1();
+ const int nsl = ld.hitsVec0.size();
if (timeslices != nsl)
{
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
<< endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_SLICES;
+ ld.rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
- if (m_hitsVec0[slice] != 0 || m_hitsVec1[slice] != 0 ||
- m_errVec0[slice] != 0 || m_errVec1[slice] != 0)
+ if (ld.hitsVec0[slice] != 0 || ld.hitsVec1[slice] != 0 ||
+ ld.errVec0[slice] != 0 || ld.errVec1[slice] != 0)
{
if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
+ ld.rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
- m_hitsVec0[slice] = hits0;
- m_hitsVec1[slice] = hits1;
- m_errVec0[slice] = err0;
- m_errVec1[slice] = err1;
- ch->addHits(m_hitsVec0, m_hitsVec1, m_errVec0, m_errVec1);
+ ld.hitsVec0[slice] = hits0;
+ ld.hitsVec1[slice] = hits1;
+ ld.errVec0[slice] = err0;
+ ld.errVec1[slice] = err1;
+ ch->addHits(ld.hitsVec0, ld.hitsVec1, ld.errVec0, ld.errVec1);
}
}
}
@@ -952,7 +964,8 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
// Unpack CPM sub-block
void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm,
- CpmTowerData& data)
+ CpmTowerData& data,
+ LocalData& ld) const
{
const bool debug = msgLvl(MSG::DEBUG);
const bool verbose = msgLvl(MSG::VERBOSE);
@@ -972,7 +985,7 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm,
if (module < 1 || module > m_modules)
{
if (debug) msg() << "Unexpected module number: " << module << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
+ ld.rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
return;
}
if (timeslices <= trigCpm)
@@ -980,14 +993,14 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm,
if (debug) msg() << "Triggered slice from header "
<< "inconsistent with number of slices: "
<< trigCpm << ", " << timeslices << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_SLICES;
+ ld.rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum)
{
if (debug) msg() << "Total slices inconsistent with slice number: "
<< timeslices << ", " << sliceNum << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_SLICES;
+ ld.rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
// Unpack sub-block
@@ -998,7 +1011,7 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm,
std::string errMsg(subBlock->unpackErrorMsg());
msg() << "CPM sub-block unpacking failed: " << errMsg << endmsg;
}
- m_rodErr = subBlock->unpackErrorCode();
+ ld.rodErr = subBlock->unpackErrorCode();
return;
}
@@ -1045,33 +1058,33 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm,
int layer = 0;
if (m_cpmMaps->mapping(crate, module, chan, eta, phi, layer))
{
- if (layer == m_coreOverlap)
+ if (layer == ld.coreOverlap)
{
- const unsigned int key = m_towerKey->ttKey(phi, eta);
+ const unsigned int key = ld.towerKey.ttKey(phi, eta);
LVL1::CPMTower *tt = findCpmTower(data, key);
if ( ! tt ) // create new CPM tower
{
- m_emVec.assign(timeslices, 0);
- m_hadVec.assign(timeslices, 0);
- m_emErrVec.assign(timeslices, 0);
- m_hadErrVec.assign(timeslices, 0);
- m_emVec[slice] = em;
- m_hadVec[slice] = had;
- m_emErrVec[slice] = emErr1;
- m_hadErrVec[slice] = hadErr1;
+ ld.emVec.assign(timeslices, 0);
+ ld.hadVec.assign(timeslices, 0);
+ ld.emErrVec.assign(timeslices, 0);
+ ld.hadErrVec.assign(timeslices, 0);
+ ld.emVec[slice] = em;
+ ld.hadVec[slice] = had;
+ ld.emErrVec[slice] = emErr1;
+ ld.hadErrVec[slice] = hadErr1;
auto ttp =
- std::make_unique<LVL1::CPMTower>(phi, eta, m_emVec, m_emErrVec,
- m_hadVec, m_hadErrVec, trigCpm);
+ std::make_unique<LVL1::CPMTower>(phi, eta, ld.emVec, ld.emErrVec,
+ ld.hadVec, ld.hadErrVec, trigCpm);
data.m_ttMap.insert(std::make_pair(key, ttp.get()));
data.m_ttCollection->push_back(std::move(ttp));
}
else
{
- m_emVec = tt->emEnergyVec();
- m_hadVec = tt->hadEnergyVec();
- m_emErrVec = tt->emErrorVec();
- m_hadErrVec = tt->hadErrorVec();
- const int nsl = m_emVec.size();
+ ld.emVec = tt->emEnergyVec();
+ ld.hadVec = tt->hadEnergyVec();
+ ld.emErrVec = tt->emErrorVec();
+ ld.hadErrVec = tt->hadErrorVec();
+ const int nsl = ld.emVec.size();
if (timeslices != nsl)
{
if (debug)
@@ -1079,22 +1092,22 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm,
msg() << "Inconsistent number of slices in sub-blocks"
<< endmsg;
}
- m_rodErr = L1CaloSubBlock::ERROR_SLICES;
+ ld.rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
- if (m_emVec[slice] != 0 || m_hadVec[slice] != 0 ||
- m_emErrVec[slice] != 0 || m_hadErrVec[slice] != 0)
+ if (ld.emVec[slice] != 0 || ld.hadVec[slice] != 0 ||
+ ld.emErrVec[slice] != 0 || ld.hadErrVec[slice] != 0)
{
if (debug) msg() << "Duplicate data for slice "
<< slice << endmsg;
- m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
+ ld.rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
- m_emVec[slice] = em;
- m_hadVec[slice] = had;
- m_emErrVec[slice] = emErr1;
- m_hadErrVec[slice] = hadErr1;
- tt->fill(m_emVec, m_emErrVec, m_hadVec, m_hadErrVec, trigCpm);
+ ld.emVec[slice] = em;
+ ld.hadVec[slice] = had;
+ ld.emErrVec[slice] = emErr1;
+ ld.hadErrVec[slice] = hadErr1;
+ tt->fill(ld.emVec, ld.emErrVec, ld.hadVec, ld.hadErrVec, trigCpm);
}
}
}
@@ -1119,10 +1132,11 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm,
// Find a CPM tower for given key
const
-LVL1::CPMTower *CpByteStreamV2Tool::findCpmTower(const unsigned int key) const
+LVL1::CPMTower *CpByteStreamV2Tool::findCpmTower(const unsigned int key,
+ const ConstCpmTowerMap& ttMap) const
{
- ConstCpmTowerMap::const_iterator mapIter = m_ttMap.find(key);
- if (mapIter != m_ttMap.end()) return mapIter->second;
+ ConstCpmTowerMap::const_iterator mapIter = ttMap.find(key);
+ if (mapIter != ttMap.end()) return mapIter->second;
return nullptr;
}
@@ -1137,10 +1151,11 @@ LVL1::CPMTower *CpByteStreamV2Tool::findCpmTower(const CpmTowerData& data,
// Find CMX-CP TOB for given key
const
-LVL1::CMXCPTob *CpByteStreamV2Tool::findCmxCpTob(const int key) const
+LVL1::CMXCPTob *CpByteStreamV2Tool::findCmxCpTob(const int key,
+ const ConstCmxCpTobMap& tobMap) const
{
- ConstCmxCpTobMap::const_iterator mapIter = m_tobMap.find(key);
- if (mapIter != m_tobMap.end()) return mapIter->second;
+ ConstCmxCpTobMap::const_iterator mapIter = tobMap.find(key);
+ if (mapIter != tobMap.end()) return mapIter->second;
return nullptr;
}
@@ -1155,10 +1170,11 @@ LVL1::CMXCPTob *CpByteStreamV2Tool::findCmxCpTob(const CmxCpTobData& data,
// Find CMX-CP hits for given key
const
-LVL1::CMXCPHits *CpByteStreamV2Tool::findCmxCpHits(const int key) const
+LVL1::CMXCPHits *CpByteStreamV2Tool::findCmxCpHits(const int key,
+ const ConstCmxCpHitsMap& hitsMap) const
{
- ConstCmxCpHitsMap::const_iterator mapIter = m_hitsMap.find(key);
- if (mapIter != m_hitsMap.end()) return mapIter->second;
+ ConstCmxCpHitsMap::const_iterator mapIter = hitsMap.find(key);
+ if (mapIter != hitsMap.end()) return mapIter->second;
return nullptr;
}
@@ -1173,9 +1189,11 @@ LVL1::CMXCPHits *CpByteStreamV2Tool::findCmxCpHits(const CmxCpHitsData& data,
// Set up CPM tower map
void CpByteStreamV2Tool::setupCpmTowerMap(const CpmTowerCollection *
- const ttCollection)
+ const ttCollection,
+ ConstCpmTowerMap& ttMap,
+ LVL1::TriggerTowerKey& towerKey) const
{
- m_ttMap.clear();
+ ttMap.clear();
if (ttCollection)
{
CpmTowerCollection::const_iterator pos = ttCollection->begin();
@@ -1183,8 +1201,8 @@ void CpByteStreamV2Tool::setupCpmTowerMap(const CpmTowerCollection *
for (; pos != pose; ++pos)
{
const LVL1::CPMTower *const tt = *pos;
- const unsigned int key = m_towerKey->ttKey(tt->phi(), tt->eta());
- m_ttMap.insert(std::make_pair(key, tt));
+ const unsigned int key = towerKey.ttKey(tt->phi(), tt->eta());
+ ttMap.insert(std::make_pair(key, tt));
}
}
}
@@ -1192,9 +1210,10 @@ void CpByteStreamV2Tool::setupCpmTowerMap(const CpmTowerCollection *
// Set up CMX-CP TOB map
void CpByteStreamV2Tool::setupCmxCpTobMap(const CmxCpTobCollection *
- const tobCollection)
+ const tobCollection,
+ ConstCmxCpTobMap& tobMap) const
{
- m_tobMap.clear();
+ tobMap.clear();
if (tobCollection)
{
CmxCpTobCollection::const_iterator pos = tobCollection->begin();
@@ -1208,7 +1227,7 @@ void CpByteStreamV2Tool::setupCmxCpTobMap(const CmxCpTobCollection *
const int chip = tob->chip();
const int loc = tob->location();
const int key = tobKey(crate, cmx, cpm, chip, loc);
- m_tobMap.insert(std::make_pair(key, tob));
+ tobMap.insert(std::make_pair(key, tob));
}
}
}
@@ -1216,9 +1235,10 @@ void CpByteStreamV2Tool::setupCmxCpTobMap(const CmxCpTobCollection *
// Set up CMX-CP hits map
void CpByteStreamV2Tool::setupCmxCpHitsMap(const CmxCpHitsCollection *
- const hitCollection)
+ const hitCollection,
+ ConstCmxCpHitsMap& hitsMap) const
{
- m_hitsMap.clear();
+ hitsMap.clear();
if (hitCollection)
{
CmxCpHitsCollection::const_iterator pos = hitCollection->begin();
@@ -1230,7 +1250,7 @@ void CpByteStreamV2Tool::setupCmxCpHitsMap(const CmxCpHitsCollection *
const int cmx = hits->cmx();
const int source = hits->source();
const int key = hitsKey(crate, cmx, source);
- m_hitsMap.insert(std::make_pair(key, hits));
+ hitsMap.insert(std::make_pair(key, hits));
}
}
}
@@ -1254,7 +1274,11 @@ int CpByteStreamV2Tool::hitsKey(const int crate, const int cmx,
// Get number of slices and triggered slice offset for next slink
bool CpByteStreamV2Tool::slinkSlices(const int crate, const int module,
- const int modulesPerSlink, int ×lices, int &trigCpm)
+ const int modulesPerSlink, int ×lices, int &trigCpm,
+ const ConstCpmTowerMap& ttMap,
+ const ConstCmxCpTobMap& tobMap,
+ const ConstCmxCpHitsMap& hitsMap,
+ LVL1::TriggerTowerKey& towerKey) const
{
int slices = -1;
int trigC = m_dfltSlices / 2;
@@ -1266,8 +1290,8 @@ bool CpByteStreamV2Tool::slinkSlices(const int crate, const int module,
double phi = 0.;
int layer = 0;
if ( !m_cpmMaps->mapping(crate, mod, chan, eta, phi, layer)) continue;
- const unsigned int key = m_towerKey->ttKey(phi, eta);
- const LVL1::CPMTower *const tt = findCpmTower(key);
+ const unsigned int key = towerKey.ttKey(phi, eta);
+ const LVL1::CPMTower *const tt = findCpmTower(key, ttMap);
if ( !tt ) continue;
const int numdat = 4;
std::vector<int> sums(numdat);
@@ -1309,7 +1333,8 @@ bool CpByteStreamV2Tool::slinkSlices(const int crate, const int module,
for (int loc = 0; loc < m_locs; ++loc)
{
const int key = tobKey(crate, cmx, cpm, chip, loc);
- const LVL1::CMXCPTob *const tob = findCmxCpTob(key);
+ const LVL1::CMXCPTob *const tob = findCmxCpTob(key,
+ tobMap);
if (tob)
{
const int numdat = 3;
@@ -1342,7 +1367,9 @@ bool CpByteStreamV2Tool::slinkSlices(const int crate, const int module,
for (int source = 0; source < LVL1::CMXCPHits::MAXSOURCE; ++source)
{
const int key = hitsKey(crate, cmx, source);
- const LVL1::CMXCPHits *const hits = findCmxCpHits(key);
+
+ const LVL1::CMXCPHits *const hits = findCmxCpHits(key,
+ hitsMap);
if (hits)
{
const int numdat = 4;
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.h
index 2843ffa580e9a3814d5bcab01475a682b5880902..b3653412790c6bece90a6095d00fee69cbd79216 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPBYTESTREAMV2TOOL_H
@@ -11,6 +11,8 @@
#include <string>
#include <vector>
+#include "TrigT1CaloUtils/TriggerTowerKey.h"
+#include "L1CaloSrcIdMap.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "ByteStreamData/RawEvent.h"
@@ -58,31 +60,67 @@ class CpByteStreamV2Tool : public AthAlgTool {
/// AlgTool InterfaceID
static const InterfaceID& interfaceID();
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/// Convert ROB fragments to CPM towers
- StatusCode convert(const std::string& sgKey, DataVector<LVL1::CPMTower>* ttCollection);
- StatusCode convert(const IROBDataProviderSvc::VROBFRAG& robFrags,
- DataVector<LVL1::CPMTower>* ttCollection);
+ StatusCode convert(const std::string& sgKey, DataVector<LVL1::CPMTower>* ttCollection) const;
+ StatusCode convert(const std::string& sgKey,
+ const IROBDataProviderSvc::VROBFRAG& robFrags,
+ DataVector<LVL1::CPMTower>* ttCollection) const;
/// Convert ROB fragments to CMX-CP TOBs
StatusCode convert(const std::string& sgKey,
- DataVector<LVL1::CMXCPTob>* tobCollection);
- StatusCode convert(const IROBDataProviderSvc::VROBFRAG& robFrags,
- DataVector<LVL1::CMXCPTob>* tobCollection);
+ DataVector<LVL1::CMXCPTob>* tobCollection) const;
+ StatusCode convert(const std::string& sgKey,
+ const IROBDataProviderSvc::VROBFRAG& robFrags,
+ DataVector<LVL1::CMXCPTob>* tobCollection) const;
/// Convert ROB fragments to CMX-CP hits
StatusCode convert(const std::string& sgKey,
- DataVector<LVL1::CMXCPHits>* hitCollection);
- StatusCode convert(const IROBDataProviderSvc::VROBFRAG& robFrags,
- DataVector<LVL1::CMXCPHits>* hitCollection);
+ DataVector<LVL1::CMXCPHits>* hitCollection) const;
+ StatusCode convert(const std::string& sgKey,
+ const IROBDataProviderSvc::VROBFRAG& robFrags,
+ DataVector<LVL1::CMXCPHits>* hitCollection) const;
/// Convert CP Container to bytestream
- StatusCode convert(const LVL1::CPBSCollectionV2* cp, RawEventWrite* re);
+ StatusCode convert(const LVL1::CPBSCollectionV2* cp, RawEventWrite* re) const;
/// Return reference to vector with all possible Source Identifiers
- const std::vector<uint32_t>& sourceIDs(const std::string& sgKey);
+ const std::vector<uint32_t>& sourceIDs() const;
private:
+ struct LocalData
+ {
+ /// Tower channels to accept (1=Core, 2=Overlap)
+ int coreOverlap = 0;
+ /// Unpacking error code
+ unsigned int rodErr = 0;
+ /// Energy vector for unpacking
+ std::vector<int> energyVec;
+ /// Isolation vector for unpacking
+ std::vector<int> isolVec;
+ /// TOB error vector for unpacking
+ std::vector<int> errorVec;
+ /// Presence map vector for unpacking
+ std::vector<unsigned int> presenceMapVec;
+ /// Hits0 vector for unpacking
+ std::vector<unsigned int> hitsVec0;
+ /// Hits1 vector for unpacking
+ std::vector<unsigned int> hitsVec1;
+ /// Error0 vector for unpacking
+ std::vector<int> errVec0;
+ /// Error1 vector for unpacking
+ std::vector<int> errVec1;
+ /// EM data vector for unpacking
+ std::vector<int> emVec;
+ /// Had data vector for unpacking
+ std::vector<int> hadVec;
+ /// EM error data vector for unpacking
+ std::vector<int> emErrVec;
+ /// Had error data vector for unpacking
+ std::vector<int> hadErrVec;
+ /// Trigger tower key provider
+ LVL1::TriggerTowerKey towerKey;
+ };
enum CollectionType { CPM_TOWERS, CMX_CP_TOBS, CMX_CP_HITS };
@@ -127,30 +165,43 @@ class CpByteStreamV2Tool : public AthAlgTool {
CmxCpHitsMap m_hitsMap;
};
+ /// Create list of all source IDs.
+ std::vector<uint32_t> makeSourceIDs() const;
+
/// Convert bytestream to given container type
- StatusCode convertBs(const IROBDataProviderSvc::VROBFRAG& robFrags,
- CpByteStreamToolData& data);
+ StatusCode convertBs(const std::string& sgKey,
+ const IROBDataProviderSvc::VROBFRAG& robFrags,
+ CpByteStreamToolData& data) const;
/// Unpack CMX-CP sub-block
- void decodeCmxCp(CmxCpSubBlock* subBlock, int trigCpm, CpByteStreamToolData& data);
+ void decodeCmxCp(CmxCpSubBlock* subBlock, int trigCpm, CpByteStreamToolData& data,
+ LocalData& ld) const;
/// Unpack CPM sub-block
- void decodeCpm(CpmSubBlockV2* subBlock, int trigCpm, CpmTowerData& data);
+ void decodeCpm(CpmSubBlockV2* subBlock, int trigCpm, CpmTowerData& data,
+ LocalData& ld) const;
/// Find a CPM tower for given key
- const LVL1::CPMTower* findCpmTower(unsigned int key) const;
+ const LVL1::CPMTower* findCpmTower(unsigned int key,
+ const ConstCpmTowerMap& ttMap) const;
LVL1::CPMTower* findCpmTower(const CpmTowerData& data, unsigned int key) const;
/// Find CMX-CP TOB for given key
- const LVL1::CMXCPTob* findCmxCpTob(int key) const;
+ const LVL1::CMXCPTob* findCmxCpTob(int key,
+ const ConstCmxCpTobMap& tobMap) const;
LVL1::CMXCPTob* findCmxCpTob(const CmxCpTobData& data, int key) const;
/// Find CMX-CP hits for given key
- const LVL1::CMXCPHits* findCmxCpHits(int key) const;
+ const LVL1::CMXCPHits* findCmxCpHits(int key,
+ const ConstCmxCpHitsMap& hitsMap) const;
LVL1::CMXCPHits* findCmxCpHits(const CmxCpHitsData& data, int key) const;
/// Set up CPM tower map
- void setupCpmTowerMap(const CpmTowerCollection* ttCollection);
+ void setupCpmTowerMap(const CpmTowerCollection* ttCollection,
+ ConstCpmTowerMap& ttMap,
+ LVL1::TriggerTowerKey& towerKey) const;
/// Set up CMX-CP TOB map
- void setupCmxCpTobMap(const CmxCpTobCollection* tobCollection);
+ void setupCmxCpTobMap(const CmxCpTobCollection* tobCollection,
+ ConstCmxCpTobMap& tobMap) const;
/// Set up CMX-CP hits map
- void setupCmxCpHitsMap(const CmxCpHitsCollection* hitCollection);
+ void setupCmxCpHitsMap(const CmxCpHitsCollection* hitCollection,
+ ConstCmxCpHitsMap& hitsMap) const;
/// Key for TOBs
int tobKey(int crate, int cmx, int cpm, int chip, int loc) const;
@@ -159,101 +210,55 @@ class CpByteStreamV2Tool : public AthAlgTool {
/// Get number of slices and triggered slice offset for next slink
bool slinkSlices(int crate, int module, int modulesPerSlink,
- int& timeslices, int& trigJem);
+ int& timeslices, int& trigJem,
+ const ConstCpmTowerMap& ttMap,
+ const ConstCmxCpTobMap& tobMap,
+ const ConstCmxCpHitsMap& hitsMap,
+ LVL1::TriggerTowerKey& towerKey) const;
/// Channel mapping tool
ToolHandle<LVL1::IL1CaloMappingTool> m_cpmMaps;
/// Error collection tool
ToolHandle<LVL1BS::L1CaloErrorByteStreamTool> m_errorTool;
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
- /// Hardware crate number offset
+ /// Property: Hardware crate number offset
int m_crateOffsetHw;
- /// Software crate number offset
+ /// Property: Software crate number offset
int m_crateOffsetSw;
- /// Sub_block header version
+ /// Property: Sub_block header version
int m_version;
- /// Data compression format
+ /// Property: Data compression format
int m_dataFormat;
/// Number of channels per module
- int m_channels;
- /// Number of crates
+ const int m_channels;
+ /// Property: Number of crates
int m_crates;
/// Number of CPM modules per crate
- int m_modules;
+ const int m_modules;
/// Number of CMXs per crate
- int m_cmxs;
+ const int m_cmxs;
/// Maximum number of TOBS per module
- int m_maxTobs;
+ const int m_maxTobs;
/// Number of chips
- int m_chips;
+ const int m_chips;
/// Number of Local coordinates
- int m_locs;
- /// Number of slinks per crate when writing out bytestream
+ const int m_locs;
+ /// Property: Number of slinks per crate when writing out bytestream
int m_slinks;
- /// Default number of slices in simulation
+ /// Property: Default number of slices in simulation
int m_dfltSlices;
- /// Force number of slices in bytestream
+ /// Property: Force number of slices in bytestream
int m_forceSlices;
- /// Minimum crate number when writing out bytestream
+ /// Property: Minimum crate number when writing out bytestream
int m_crateMin;
- /// Maximum crate number when writing out bytestream
+ /// Property: Maximum crate number when writing out bytestream
int m_crateMax;
- /// Tower channels to accept (1=Core, 2=Overlap)
- int m_coreOverlap;
- /// Unpacking error code
- unsigned int m_rodErr;
- /// ROB source IDs
- std::vector<uint32_t> m_sourceIDs;
/// Sub-detector type
- eformat::SubDetector m_subDetector;
+ const eformat::SubDetector m_subDetector;
/// Source ID converter
- L1CaloSrcIdMap* m_srcIdMap;
- /// Trigger tower key provider
- LVL1::TriggerTowerKey* m_towerKey;
- /// CPM sub-block for unpacking
- CpmSubBlockV2* m_cpmSubBlock;
- /// CMX-CP sub-block for unpacking
- CmxCpSubBlock* m_cmxCpSubBlock;
- /// Energy vector for unpacking
- std::vector<int> m_energyVec;
- /// Isolation vector for unpacking
- std::vector<int> m_isolVec;
- /// TOB error vector for unpacking
- std::vector<int> m_errorVec;
- /// Presence map vector for unpacking
- std::vector<unsigned int> m_presenceMapVec;
- /// Hits0 vector for unpacking
- std::vector<unsigned int> m_hitsVec0;
- /// Hits1 vector for unpacking
- std::vector<unsigned int> m_hitsVec1;
- /// Error0 vector for unpacking
- std::vector<int> m_errVec0;
- /// Error1 vector for unpacking
- std::vector<int> m_errVec1;
- /// EM data vector for unpacking
- std::vector<int> m_emVec;
- /// Had data vector for unpacking
- std::vector<int> m_hadVec;
- /// EM error data vector for unpacking
- std::vector<int> m_emErrVec;
- /// Had error data vector for unpacking
- std::vector<int> m_hadErrVec;
- /// Vector for current CPM sub-blocks
- DataVector<CpmSubBlockV2> m_cpmBlocks;
- /// Vector for current CMX-CP sub-blocks
- DataVector<CmxCpSubBlock> m_cmxBlocks;
- /// CPM tower map
- ConstCpmTowerMap m_ttMap;
- /// CMX-CP TOB map
- ConstCmxCpTobMap m_tobMap;
- /// CMX-CP hits map
- ConstCmxCpHitsMap m_hitsMap;
- /// ROD Status words
- std::vector<uint32_t>* m_rodStatus;
- /// ROD status map
- std::map<uint32_t, std::vector<uint32_t>* > m_rodStatusMap;
- /// Event assembler
- FullEventAssembler<L1CaloSrcIdMap>* m_fea;
+ const L1CaloSrcIdMap m_srcIdMap;
+ /// Property: ROB source IDs
+ std::vector<uint32_t> m_sourceIDsProp;
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.h
deleted file mode 100644
index 7a745443ff47d3829da373f87f32a6e26bc8212e..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGT1CALOBYTESTREAM_CPREADBYTESTREAMCNV_H
-#define TRIGT1CALOBYTESTREAM_CPREADBYTESTREAMCNV_H
-
-#include <string>
-
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-
-class DataObject;
-class IOpaqueAddress;
-class IROBDataProviderSvc;
-class ISvcLocator;
-class StatusCode;
-
-template <typename> class CnvFactory;
-
-
-namespace LVL1BS {
-
-class CpByteStreamTool;
-
-/** ByteStream converter for CP component containers.
- *
- * @author Peter Faulkner
- */
-
-template <typename Container>
-class CpReadByteStreamCnv: public Converter {
-
- friend class CnvFactory<CpReadByteStreamCnv<Container> >;
-
-protected:
-
- CpReadByteStreamCnv(ISvcLocator* svcloc);
-
-public:
-
- ~CpReadByteStreamCnv();
-
- virtual StatusCode initialize();
- /// Create Container from ByteStream
- virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
-
- // Storage type and class ID
- virtual long repSvcType() const { return i_repSvcType(); }
- static long storageType();
- static const CLID& classID();
-
-private:
-
- /// Converter name
- std::string m_name;
-
- /// Tool that does the actual work
- ToolHandle<LVL1BS::CpByteStreamTool> m_tool;
-
- /// Service for reading bytestream
- ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
-};
-
-} // end namespace
-
-#include "CpReadByteStreamCnv.icc"
-
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
deleted file mode 100644
index 303e0273900f4349c6715822ed6cb93cfe7bec08..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include <vector>
-#include <stdint.h>
-#include <typeinfo>
-
-#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
-#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-
-#include "ByteStreamData/RawEvent.h"
-#include "ByteStreamData/ROBData.h"
-
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-
-#include "AthenaKernel/ClassID_traits.h"
-#include "AthenaKernel/StorableConversions.h"
-
-#include "CpByteStreamTool.h"
-
-namespace LVL1BS {
-
-template <typename Container>
-CpReadByteStreamCnv<Container>::CpReadByteStreamCnv( ISvcLocator* svcloc )
- : Converter( storageType(), classID(), svcloc ),
- m_name("CpReadByteStreamCnv"),
- m_tool("LVL1BS::CpByteStreamTool/CpByteStreamTool"),
- m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
-{
-}
-
-template <typename Container>
-CpReadByteStreamCnv<Container>::~CpReadByteStreamCnv()
-{
-}
-
-// CLID
-
-template <typename Container>
-const CLID& CpReadByteStreamCnv<Container>::classID()
-{
- return ClassID_traits<Container>::ID();
-}
-
-template <typename Container>
-long CpReadByteStreamCnv<Container>::storageType()
-{
- return ByteStreamAddress::storageType();
-}
-
-// Init method gets all necessary services etc.
-
-
-template <typename Container>
-StatusCode CpReadByteStreamCnv<Container>::initialize()
-{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
-
- return StatusCode::SUCCESS;
-}
-
-// createObj should create the RDO from bytestream.
-
-template <typename Container>
-StatusCode CpReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
- DataObject*& pObj )
-{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
- ByteStreamAddress *pBS_Addr;
- pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
- if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
- return StatusCode::FAILURE;
- }
-
- const std::string nm = *( pBS_Addr->par() );
-
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
-
- // get SourceIDs
- const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
-
- // get ROB fragments
- IROBDataProviderSvc::VROBFRAG robFrags;
- m_robDataProvider->getROBData( vID, robFrags );
-
- // size check
- Container* const collection = new Container;
- if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
- }
- if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
- return StatusCode::SUCCESS;
- }
-
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
-
- pObj = SG::asStorable(collection);
-
- return sc;
-}
-
-} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
index bf34a314dd9457c8caa8e6f18af940f89692f047..8f3598b39740839c08402e62c460892f4e1a74db 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
@@ -59,9 +59,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
index eb9b9eeceb1c204b43947dd0fd766d156912f130..8bc7c26ac7a77064956c9f4c5ee727c407f70753 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -20,6 +20,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "CpByteStreamV1Tool.h"
@@ -30,8 +31,7 @@ CpReadByteStreamV1Cnv<Container>::CpReadByteStreamV1Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamV1Cnv"),
m_tool("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
- m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_robDataProvider("ROBDataProviderSvc", m_name)
{
}
@@ -61,31 +61,10 @@ template <typename Container>
StatusCode CpReadByteStreamV1Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
+ ATH_CHECK( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -96,18 +75,18 @@ template <typename Container>
StatusCode CpReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -117,26 +96,20 @@ StatusCode CpReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- Container* const collection = new Container;
+ auto collection = std::make_unique<Container>();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
+ pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, collection.get()) );
- pObj = SG::asStorable(collection);
+ pObj = SG::asStorable(std::move(collection));
- return sc;
+ return StatusCode::SUCCESS;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
index 9a5b91ff89914788fcc164694c10567c73ce15ac..d5660c39f3287e4d5446151b78be008ae825615f 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,6 +23,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/CPMTower.h"
@@ -38,7 +39,7 @@ CpReadByteStreamV1V2Cnv::CpReadByteStreamV1V2Cnv( ISvcLocator* svcloc )
m_tool1("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
m_tool2("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -64,35 +65,11 @@ long CpReadByteStreamV1V2Cnv::storageType()
StatusCode CpReadByteStreamV1V2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tools
- sc = m_tool1.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool1 << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool1 << endmsg;
- sc = m_tool2.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool2 << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool2 << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool1.retrieve() );
+ ATH_CHECK( m_tool2.retrieve() );
+ ATH_CHECK( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -102,22 +79,22 @@ StatusCode CpReadByteStreamV1V2Cnv::initialize()
StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID1(m_tool1->sourceIDs(nm));
- const std::vector<uint32_t>& vID2(m_tool2->sourceIDs(nm));
+ const std::vector<uint32_t>& vID2(m_tool2->sourceIDs());
// get ROB fragments
IROBDataProviderSvc::VROBFRAG robFrags1;
@@ -126,36 +103,26 @@ StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID2, robFrags2 );
// size check
- DataVector<LVL1::CPMTower>* const towerCollection = new DataVector<LVL1::CPMTower>;
+ auto towerCollection = std::make_unique<DataVector<LVL1::CPMTower> >();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags1.size()
- << ", " << robFrags2.size() << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags1.size()
+ << ", " << robFrags2.size();
}
if (robFrags1.size() == 0 && robFrags2.size() == 0) {
- pObj = SG::asStorable(towerCollection) ;
+ pObj = SG::asStorable(std::move(towerCollection)) ;
return StatusCode::SUCCESS;
}
// Pre-LS1 data
if (robFrags1.size() > 0) {
- StatusCode sc = m_tool1->convert(robFrags1, towerCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete towerCollection;
- return sc;
- }
+ ATH_CHECK( m_tool1->convert(robFrags1, towerCollection.get()) );
}
// Post-LS1 data
if (robFrags2.size() > 0) {
- StatusCode sc = m_tool2->convert(robFrags2, towerCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete towerCollection;
- return sc;
- }
- }
+ ATH_CHECK( m_tool2->convert(nm, robFrags2, towerCollection.get()) );
+ }
- pObj = SG::asStorable(towerCollection);
+ pObj = SG::asStorable(std::move(towerCollection));
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
index 6b2087b61b043a5a41a74cc290334ef251ce7421..7b8a4308ff8cc48df19713db4c55f5ec740850c3 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPREADBYTESTREAMV1V2CNV_H
@@ -65,9 +65,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
index ee6fa1ac8ed3e971bd964e06b30325cf22a957e5..d5307350bb0d6fd8a99a2e53ae74f45cade8b316 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPREADBYTESTREAMV2CNV_H
@@ -59,9 +59,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
index 404d8925284be9b70a21825ea3e31efde2b31a90..9a0076c579e0b53ba1342ad3be01cc0841263b62 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -20,6 +20,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "CpByteStreamV2Tool.h"
@@ -31,7 +32,7 @@ CpReadByteStreamV2Cnv<Container>::CpReadByteStreamV2Cnv( ISvcLocator* svcloc )
m_name("CpReadByteStreamV2Cnv"),
m_tool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -61,31 +62,10 @@ template <typename Container>
StatusCode CpReadByteStreamV2Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
+ ATH_CHEKC( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -96,19 +76,15 @@ template <typename Container>
StatusCode CpReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
-
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -117,26 +93,20 @@ StatusCode CpReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- Container* const collection = new Container;
+ auto collection = std::make_unique<Container>();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
+ pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, collection.get()) );
- pObj = SG::asStorable(collection);
+ pObj = SG::asStorable(std::move(collection));
- return sc;
+ return StatusCode::SUCCESS;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
index daedba54f63a2a071e3a449305a673013f2d82e0..62d3ba80fba4e87d11a85ff26fc3e3e9d941d19b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,6 +23,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/CPMRoI.h"
@@ -37,7 +38,7 @@ CpmRoiByteStreamCnv::CpmRoiByteStreamCnv( ISvcLocator* svcloc )
m_tool("LVL1BS::CpmRoiByteStreamTool/CpmRoiByteStreamTool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -63,41 +64,18 @@ long CpmRoiByteStreamCnv::storageType()
StatusCode CpmRoiByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
// Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
+ StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
+ REPORT_MESSAGE (MSG::WARNING) << "Failed to retrieve service "
+ << m_robDataProvider;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -108,18 +86,18 @@ StatusCode CpmRoiByteStreamCnv::initialize()
StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -129,26 +107,20 @@ StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- DataVector<LVL1::CPMRoI>* const roiCollection = new DataVector<LVL1::CPMRoI>;
+ auto roiCollection = std::make_unique<DataVector<LVL1::CPMRoI> >();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(roiCollection) ;
+ pObj = SG::asStorable(std::move(roiCollection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, roiCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete roiCollection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, roiCollection.get()) );
- pObj = SG::asStorable(roiCollection);
+ pObj = SG::asStorable(std::move(roiCollection));
- return sc;
+ return StatusCode::SUCCESS;
}
// createRep should create the bytestream from RDOs.
@@ -156,13 +128,11 @@ StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
StatusCode CpmRoiByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::CPMRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<CPMRoI>" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to DataVector<CPMRoI>";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h
index bfab7240320793db37fef2fca7edadba6ce45b1f..193989e3864e29d5977297d37406569398be27d4 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPMROIBYTESTREAMCNV_H
@@ -69,7 +69,6 @@ private:
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
index 44878ee3482062c9b47cbcd0b163ba88dd23e72b..de4f2977fda595ec8bb3d8be591e368e9d5cb8c5 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,6 +23,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/CPMRoI.h"
@@ -37,7 +38,7 @@ CpmRoiByteStreamV1Cnv::CpmRoiByteStreamV1Cnv( ISvcLocator* svcloc )
m_tool("LVL1BS::CpmRoiByteStreamV1Tool/CpmRoiByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -63,41 +64,18 @@ long CpmRoiByteStreamV1Cnv::storageType()
StatusCode CpmRoiByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
// Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
+ StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
+ REPORT_MESSAGE (MSG::WARNING) << "Failed to retrieve service "
+ << m_robDataProvider;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -108,18 +86,18 @@ StatusCode CpmRoiByteStreamV1Cnv::initialize()
StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -129,26 +107,20 @@ StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- DataVector<LVL1::CPMRoI>* const roiCollection = new DataVector<LVL1::CPMRoI>;
+ auto roiCollection = std::make_unique<DataVector<LVL1::CPMRoI> >();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(roiCollection) ;
+ pObj = SG::asStorable(std::move(roiCollection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, roiCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete roiCollection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, roiCollection.get()) );
- pObj = SG::asStorable(roiCollection);
+ pObj = SG::asStorable(std::move(roiCollection));
- return sc;
+ return StatusCode::SUCCESS;
}
// createRep should create the bytestream from RDOs.
@@ -156,13 +128,11 @@ StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode CpmRoiByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::CPMRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<CPMRoI>" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to DataVector<CPMRoI>";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
index 5f5463f2d7278071618337980350b304ed1f1663..c7d5dc1e3b3c102bf5ea57227571c659fc9d45c1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPMROIBYTESTREAMV1CNV_H
@@ -63,7 +63,6 @@ private:
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
index a34558df2e8b0aeefd5536853c07f4cc9897e2d0..4ecbe43930e1e582553074c1db256df78b688b52 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,6 +23,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/CPMTobRoI.h"
@@ -37,7 +38,7 @@ CpmRoiByteStreamV2Cnv::CpmRoiByteStreamV2Cnv( ISvcLocator* svcloc )
m_tool("LVL1BS::CpmRoiByteStreamV2Tool/CpmRoiByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -63,41 +64,18 @@ long CpmRoiByteStreamV2Cnv::storageType()
StatusCode CpmRoiByteStreamV2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
// Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
+ StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
+ REPORT_MESSAGE (MSG::WARNING) << "Failed to retrieve service "
+ << m_robDataProvider;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -108,18 +86,18 @@ StatusCode CpmRoiByteStreamV2Cnv::initialize()
StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -129,26 +107,20 @@ StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- DataVector<LVL1::CPMTobRoI>* const roiCollection = new DataVector<LVL1::CPMTobRoI>;
+ auto roiCollection = std::make_unique<DataVector<LVL1::CPMTobRoI> >();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) <<" Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(roiCollection) ;
+ pObj = SG::asStorable(std::move(roiCollection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, roiCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete roiCollection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, roiCollection.get()) );
- pObj = SG::asStorable(roiCollection);
+ pObj = SG::asStorable(std::move(roiCollection));
- return sc;
+ return StatusCode::SUCCESS;
}
// createRep should create the bytestream from RDOs.
@@ -156,13 +128,11 @@ StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode CpmRoiByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::CPMTobRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<CPMTobRoI>" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to DataVector<CPMTobRoI>";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
index 6f80a49e0af6b2c81b6f4af84aefba2ad1297ca1..e97d2c4d8b2ad38eeab21b8ce10ada466e1b1e41 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPMROIBYTESTREAMV2CNV_H
@@ -63,7 +63,6 @@ private:
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
index b1bb4cebd7d9df3f348c4c420c5f20760fecc6e3..4d079ee4c3f3e1727b9d5583dd30a3edddc4770b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/JEPBSCollection.h"
@@ -33,8 +34,7 @@ JepByteStreamCnv::JepByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("JepByteStreamCnv"),
m_tool("LVL1BS::JepByteStreamTool/JepByteStreamTool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long JepByteStreamCnv::storageType()
StatusCode JepByteStreamCnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode JepByteStreamCnv::initialize()
StatusCode JepByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPBSCollection* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPBSCollection" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to JEPBSCollection";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h
index c09e547c2bd74819aada8a971257036fb10cbfb4..0e5a5457a5d9f4d72897e3e7e07cf26417007b58 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPBYTESTREAMCNV_H
@@ -62,11 +62,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
index acd48877dd647e82c900c1c27675dc0fc568a3e9..14ceefa9e1d720e19f233d4acc2ebd05ce360b51 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/JEPBSCollectionV1.h"
@@ -33,8 +34,7 @@ JepByteStreamV1Cnv::JepByteStreamV1Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("JepByteStreamV1Cnv"),
m_tool("LVL1BS::JepByteStreamV1Tool/JepByteStreamV1Tool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long JepByteStreamV1Cnv::storageType()
StatusCode JepByteStreamV1Cnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode JepByteStreamV1Cnv::initialize()
StatusCode JepByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPBSCollectionV1* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPBSCollectionV1" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to JEPBSCollectionV1";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
index b7242d9814287909cdb4520eb63439fd45e7ec1a..1d8ebb467b25133873828ddb8d09fe0ca0781826 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPBYTESTREAMV1CNV_H
@@ -56,11 +56,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
index e4c469825fd63f57ac823eb60c6b1e926b6bff46..057507e5fc14d38d4d454de62177b3b82369e15d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/JEPBSCollectionV2.h"
@@ -33,8 +34,7 @@ JepByteStreamV2Cnv::JepByteStreamV2Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("JepByteStreamV2Cnv"),
m_tool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long JepByteStreamV2Cnv::storageType()
StatusCode JepByteStreamV2Cnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode JepByteStreamV2Cnv::initialize()
StatusCode JepByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPBSCollectionV2* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPBSCollectionV2" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to JEPBSCollectionV2";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
index 9b438874c5a6a078aa6857aaed709c3160903423..107bf8dc8af04c6d2e992c1dbc54670a04d54ad0 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPBYTESTREAMV2CNV_H
@@ -56,11 +56,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.h
deleted file mode 100644
index b3a0a0e911a4602f5cfea83717df2176515f7e0e..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGT1CALOBYTESTREAM_JEPREADBYTESTREAMCNV_H
-#define TRIGT1CALOBYTESTREAM_JEPREADBYTESTREAMCNV_H
-
-#include <string>
-
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-
-class DataObject;
-class IOpaqueAddress;
-class IROBDataProviderSvc;
-class ISvcLocator;
-class StatusCode;
-
-template <typename> class CnvFactory;
-
-
-namespace LVL1BS {
-
-class JepByteStreamTool;
-
-/** ByteStream converter for JEP component containers.
- *
- * @author Peter Faulkner
- */
-
-template <typename Container>
-class JepReadByteStreamCnv: public Converter {
-
- friend class CnvFactory<JepReadByteStreamCnv<Container> >;
-
-protected:
-
- JepReadByteStreamCnv(ISvcLocator* svcloc);
-
-public:
-
- ~JepReadByteStreamCnv();
-
- virtual StatusCode initialize();
- /// Create Container from ByteStream
- virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
-
- // Storage type and class ID
- virtual long repSvcType() const { return i_repSvcType(); }
- static long storageType();
- static const CLID& classID();
-
-private:
-
- /// Converter name
- std::string m_name;
-
- /// Tool that does the actual work
- ToolHandle<JepByteStreamTool> m_tool;
-
- /// Service for reading bytestream
- ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
-};
-
-} // end namespace
-
-#include "JepReadByteStreamCnv.icc"
-
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
deleted file mode 100644
index 59ac60b26053fd703bc29232ef6e23f261af768f..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include <vector>
-#include <stdint.h>
-#include <typeinfo>
-
-#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
-#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-
-#include "ByteStreamData/RawEvent.h"
-#include "ByteStreamData/ROBData.h"
-
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-
-#include "AthenaKernel/ClassID_traits.h"
-#include "AthenaKernel/StorableConversions.h"
-
-#include "JepByteStreamTool.h"
-
-namespace LVL1BS {
-
-template <typename Container>
-JepReadByteStreamCnv<Container>::JepReadByteStreamCnv( ISvcLocator* svcloc )
- : Converter( storageType(), classID(), svcloc ),
- m_name("JepReadByteStreamCnv"),
- m_tool("LVL1BS::JepByteStreamTool/JepByteStreamTool"),
- m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
-{
-}
-
-template <typename Container>
-JepReadByteStreamCnv<Container>::~JepReadByteStreamCnv()
-{
-}
-
-// CLID
-
-template <typename Container>
-const CLID& JepReadByteStreamCnv<Container>::classID()
-{
- return ClassID_traits<Container>::ID();
-}
-
-long JepReadByteStreamCnv<Container>::storageType()
-{
- return ByteStreamAddress::storageType();
-}
-
-// Init method gets all necessary services etc.
-
-
-template <typename Container>
-StatusCode JepReadByteStreamCnv<Container>::initialize()
-{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
-
- return StatusCode::SUCCESS;
-}
-
-// createObj should create the RDO from bytestream.
-
-template <typename Container>
-StatusCode JepReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
- DataObject*& pObj )
-{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
- ByteStreamAddress *pBS_Addr;
- pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
- if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
- return StatusCode::FAILURE;
- }
-
- const std::string nm = *( pBS_Addr->par() );
-
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
-
- // get SourceIDs
- const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
-
- // get ROB fragments
- IROBDataProviderSvc::VROBFRAG robFrags;
- m_robDataProvider->getROBData( vID, robFrags );
-
- // size check
- Container* const collection = new Container;
- if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
- }
- if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
- return StatusCode::SUCCESS;
- }
-
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
-
- pObj = SG::asStorable(collection);
-
- return sc;
-}
-
-} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
index 4d128e9fd83daa095d085dcb2689084a073a6ea2..6f905cb06d6daa5a82eca7a83c6be79cc0a8a983 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPREADBYTESTREAMV1CNV_H
@@ -60,9 +60,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
index ae49f932598dd02a2b1d1b77b337ff00f1db4016..788491d1ab5492397c48ca56f48f3f9fd016d372 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -20,6 +20,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "JepByteStreamV1Tool.h"
@@ -31,7 +32,7 @@ JepReadByteStreamV1Cnv<Container>::JepReadByteStreamV1Cnv( ISvcLocator* svcloc )
m_name("JepReadByteStreamV1Cnv"),
m_tool("LVL1BS::JepByteStreamV1Tool/JepByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -61,31 +62,10 @@ template <typename Container>
StatusCode JepReadByteStreamV1Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
+ ATH_CHECK( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -96,18 +76,18 @@ template <typename Container>
StatusCode JepReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -117,26 +97,20 @@ StatusCode JepReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- Container* const collection = new Container;
+ auto collection = std::make_unique<Container>();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
+ pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, collection.get()) );
- pObj = SG::asStorable(collection);
+ pObj = SG::asStorable(std::move(collection));
- return sc;
+ return StatusCode::SUCCESS;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
index 2a0acf8560adeb4df9a5d47681d8e4e18cb77dbc..ac3746194a050a60aef687c387a0336023abe657 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPREADBYTESTREAMV1V2CNV_H
@@ -66,9 +66,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
index b1a71bb45d4b6c9d48c0c114e0d937b542381732..2b32a33b6796e7769e300a0ef79dcfb57120eb76 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,6 +23,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "JepByteStreamV1Tool.h"
#include "JepByteStreamV2Tool.h"
@@ -36,7 +37,7 @@ JepReadByteStreamV1V2Cnv<Container>::JepReadByteStreamV1V2Cnv( ISvcLocator* svcl
m_tool1("LVL1BS::JepByteStreamV1Tool/JepByteStreamV1Tool"),
m_tool2("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -66,35 +67,11 @@ template <typename Container>
StatusCode JepReadByteStreamV1V2Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tools
- sc = m_tool1.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool1 << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool1 << endmsg;
- sc = m_tool2.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool2 << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool2 << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool1.retrieve() );
+ ATH_CHECK( m_tool2.retrieve() );
+ ATH_CHECK( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -105,18 +82,18 @@ template <typename Container>
StatusCode JepReadByteStreamV1V2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID1(m_tool1->sourceIDs(nm));
@@ -129,36 +106,26 @@ StatusCode JepReadByteStreamV1V2Cnv<Container>::createObj( IOpaqueAddress* pAddr
m_robDataProvider->getROBData( vID2, robFrags2 );
// size check
- Container* const collection = new Container;
+ auto collection = std::make_unique<Container>();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags1.size()
- << ", " << robFrags2.size() << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags1.size()
+ << ", " << robFrags2.size();
}
if (robFrags1.size() == 0 && robFrags2.size() == 0) {
- pObj = SG::asStorable(collection) ;
+ pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
}
// Pre-LS1 data
if (robFrags1.size() > 0) {
- StatusCode sc = m_tool1->convert(robFrags1, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool1->convert(robFrags1, collection.get()) );
}
// Post-LS1 data
if (robFrags2.size() > 0) {
- StatusCode sc = m_tool2->convert(robFrags2, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool2->convert(robFrags2, collection.get()) );
}
- pObj = SG::asStorable(collection);
+ pObj = SG::asStorable(std::move(collection));
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
index e2c407133c862fa6f9404f16b6d2d611a5fc6442..bf9ccab5e24c5ebf0bc4d0bc8c9b18181d241336 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPREADBYTESTREAMV2CNV_H
@@ -59,9 +59,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
index 92a5f1d292e3a2403b6ae80ad52358d9391cd8a8..fdcdaa758d56e886cf7dec8036b7d9705f2ce669 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -20,6 +20,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "JepByteStreamV2Tool.h"
@@ -31,7 +32,7 @@ JepReadByteStreamV2Cnv<Container>::JepReadByteStreamV2Cnv( ISvcLocator* svcloc )
m_name("JepReadByteStreamV2Cnv"),
m_tool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -60,31 +61,10 @@ template <typename Container>
StatusCode JepReadByteStreamV2Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
+ ATH_CHECK( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -95,18 +75,18 @@ template <typename Container>
StatusCode JepReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -116,24 +96,18 @@ StatusCode JepReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- Container* const collection = new Container;
+ auto collection = std::make_unique<Container>();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
+ pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, collection.get()) );
- pObj = SG::asStorable(collection);
+ pObj = SG::asStorable(std::move(collection));
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
index 5ce5ba0d4fa7e5cb1a9d9d935232c5b367d87db1..dab2dc2ce7eebaf11b9a018a2fa6c7893d8c42d7 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/JEPRoIBSCollection.h"
@@ -33,8 +34,7 @@ JepRoiByteStreamCnv::JepRoiByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("JepRoiByteStreamCnv"),
m_tool("LVL1BS::JepRoiByteStreamTool/JepRoiByteStreamTool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long JepRoiByteStreamCnv::storageType()
StatusCode JepRoiByteStreamCnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode JepRoiByteStreamCnv::initialize()
StatusCode JepRoiByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPRoIBSCollection* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollection" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to JEPRoIBSCollection";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h
index 86a955aada9dc4b1135cbc110eab88f7a9b9ea6b..edb9ce6ef309e23cea6db9eb839ab3e7cd2c7331 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPROIBYTESTREAMCNV_H
@@ -62,11 +62,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
index 41a1faa5e82d879d564201df875c12c8b3cd93b3..f4545b970523da54c08391adba7322998936c4e7 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/JEPRoIBSCollectionV1.h"
@@ -33,8 +34,7 @@ JepRoiByteStreamV1Cnv::JepRoiByteStreamV1Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("JepRoiByteStreamV1Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV1Tool/JepRoiByteStreamV1Tool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long JepRoiByteStreamV1Cnv::storageType()
StatusCode JepRoiByteStreamV1Cnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode JepRoiByteStreamV1Cnv::initialize()
StatusCode JepRoiByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPRoIBSCollectionV1* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollectionV1" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to JEPRoIBSCollectionV1";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
index 200e9e8e4277f92cd32cd96e55ac25cf9c4a35d0..5ab627cda897dcfa46709c29c7be0748100a2bbc 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPROIBYTESTREAMV1CNV_H
@@ -57,11 +57,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
index eb2470f40b394eace32dd993294b8cbe00387608..4def9f1d8dae83f97a90ec0965b9879a6684d714 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/JEPRoIBSCollectionV2.h"
@@ -33,8 +34,7 @@ JepRoiByteStreamV2Cnv::JepRoiByteStreamV2Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("JepRoiByteStreamV2Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV2Tool/JepRoiByteStreamV2Tool"),
- m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name)
{
}
@@ -59,31 +59,9 @@ long JepRoiByteStreamV2Cnv::storageType()
StatusCode JepRoiByteStreamV2Cnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -93,13 +71,11 @@ StatusCode JepRoiByteStreamV2Cnv::initialize()
StatusCode JepRoiByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPRoIBSCollectionV2* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollectionV2" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to JEPRoIBSCollectionV2";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
index c46cb7d96d02a8e8dd978f34ce938eca6e2889a8..b3f17797f9c06c1321d9b5587802ed8aebf5c9af 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPROIBYTESTREAMV2CNV_H
@@ -56,11 +56,6 @@ private:
/// Service for writing bytestream
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.h
deleted file mode 100644
index dccbab8a0d4da551cc4032801495cf28d7c8f4e5..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGT1CALOBYTESTREAM_JEPROIREADBYTESTREAMCNV_H
-#define TRIGT1CALOBYTESTREAM_JEPROIREADBYTESTREAMCNV_H
-
-#include <string>
-
-#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Converter.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-
-class DataObject;
-class IOpaqueAddress;
-class IROBDataProviderSvc;
-class ISvcLocator;
-class StatusCode;
-
-template <typename> class CnvFactory;
-
-
-namespace LVL1BS {
-
-class JepRoiByteStreamTool;
-
-/** ByteStream converter for JEP component containers.
- *
- * @author Peter Faulkner
- */
-
-template <typename Container>
-class JepRoiReadByteStreamCnv: public Converter {
-
- friend class CnvFactory<JepRoiReadByteStreamCnv<Container> >;
-
-protected:
-
- JepRoiReadByteStreamCnv(ISvcLocator* svcloc);
-
-public:
-
- ~JepRoiReadByteStreamCnv();
-
- virtual StatusCode initialize();
- /// Create Container from ByteStream
- virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
-
- // Storage type and class ID
- virtual long repSvcType() const { return i_repSvcType(); }
- static long storageType();
- static const CLID& classID();
-
-private:
-
- /// Converter name
- std::string m_name;
-
- /// Tool that does the actual work
- ToolHandle<LVL1BS::JepRoiByteStreamTool> m_tool;
-
- /// Service for reading bytestream
- ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
-};
-
-} // end namespace
-
-#include "JepRoiReadByteStreamCnv.icc"
-
-#endif
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
deleted file mode 100644
index 112e6145cacb0017304a1fb60b01c2491ce84a64..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include <vector>
-#include <stdint.h>
-#include <typeinfo>
-
-#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
-#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-
-#include "ByteStreamData/RawEvent.h"
-#include "ByteStreamData/ROBData.h"
-
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-
-#include "AthenaKernel/ClassID_traits.h"
-#include "AthenaKernel/StorableConversions.h"
-
-#include "JepRoiByteStreamTool.h"
-
-namespace LVL1BS {
-
-template <typename Container>
-JepRoiReadByteStreamCnv<Container>::JepRoiReadByteStreamCnv(
- ISvcLocator* svcloc )
- : Converter( storageType(), classID(), svcloc ),
- m_name("JepRoiReadByteStreamCnv"),
- m_tool("LVL1BS::JepRoiByteStreamTool/JepRoiByteStreamTool"),
- m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
-{
-}
-
-template <typename Container>
-JepRoiReadByteStreamCnv<Container>::~JepRoiReadByteStreamCnv()
-{
-}
-
-// CLID
-
-template <typename Container>
-const CLID& JepRoiReadByteStreamCnv<Container>::classID()
-{
- return ClassID_traits<Container>::ID();
-}
-
-long JepRoiReadByteStreamCnv<Container>::storageType()
-{
- return ByteStreamAddress::storageType();
-}
-
-// Init method gets all necessary services etc.
-
-
-template <typename Container>
-StatusCode JepRoiReadByteStreamCnv<Container>::initialize()
-{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
-
- return StatusCode::SUCCESS;
-}
-
-// createObj should create the RDO from bytestream.
-
-template <typename Container>
-StatusCode JepRoiReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
- DataObject*& pObj )
-{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
- ByteStreamAddress *pBS_Addr;
- pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
- if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg;
- return StatusCode::FAILURE;
- }
-
- const std::string nm = *( pBS_Addr->par() );
-
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
-
- // get SourceIDs
- const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
-
- // get ROB fragments
- IROBDataProviderSvc::VROBFRAG robFrags;
- m_robDataProvider->getROBData( vID, robFrags );
-
- // size check
- Container* const collection = new Container;
- if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
- }
- if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
- return StatusCode::SUCCESS;
- }
-
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
-
- pObj = SG::asStorable(collection);
-
- return sc;
-}
-
-} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
index 0a1a63d663a763cabfc53aff405191043c3c8d7a..c0586aef79eb25e2a81d116f85449fcef418d58a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPROIREADBYTESTREAMV1CNV_H
@@ -60,9 +60,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
index c75b442e0c8ccd0e599b48c3a244e5e15b8902bc..2f77a7089b2c71ca4c4ec9722abe1fb77d707834 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -20,6 +20,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "JepRoiByteStreamV1Tool.h"
@@ -32,7 +33,7 @@ JepRoiReadByteStreamV1Cnv<Container>::JepRoiReadByteStreamV1Cnv(
m_name("JepRoiReadByteStreamV1Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV1Tool/JepRoiByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -62,31 +63,10 @@ template <typename Container>
StatusCode JepRoiReadByteStreamV1Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
+ ATH_CHECK( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -97,18 +77,18 @@ template <typename Container>
StatusCode JepRoiReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,26 +98,20 @@ StatusCode JepRoiReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAdd
m_robDataProvider->getROBData( vID, robFrags );
// size check
- Container* const collection = new Container;
+ auto collection = std::make_unique<Container>();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
+ pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, collection.get()) );
- pObj = SG::asStorable(collection);
+ pObj = SG::asStorable(std::move(collection));
- return sc;
+ return StatusCode::SUCCESS;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
index 569fe838788c43db7719bd8d657603f2a951c937..135b2e0a17f20c07665489ce2651dc424f43e8f3 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_JEPROIREADBYTESTREAMV2CNV_H
@@ -59,9 +59,7 @@ private:
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
index 8eb3d7a1c6ec5373123453faf2d3f74eba969a76..5f881e0ad974460ce00590c358d2cfb59b06e8bc 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -20,6 +20,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "JepRoiByteStreamV2Tool.h"
@@ -32,7 +33,7 @@ JepRoiReadByteStreamV2Cnv<Container>::JepRoiReadByteStreamV2Cnv(
m_name("JepRoiReadByteStreamV2Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV2Tool/JepRoiByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -62,31 +63,10 @@ template <typename Container>
StatusCode JepRoiReadByteStreamV2Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << "<"
- << typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
-
- // Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
- return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
- }
+
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
+ ATH_CHECK( m_robDataProvider.retrieve() );
return StatusCode::SUCCESS;
}
@@ -97,18 +77,18 @@ template <typename Container>
StatusCode JepRoiReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,26 +98,20 @@ StatusCode JepRoiReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAdd
m_robDataProvider->getROBData( vID, robFrags );
// size check
- Container* const collection = new Container;
+ auto collection = std::make_unique<Container>();
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(collection) ;
+ pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, collection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete collection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, collection.get()) );
- pObj = SG::asStorable(collection);
+ pObj = SG::asStorable(std::move(collection));
- return sc;
+ return StatusCode::SUCCESS;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
index 0aa93dd9364302a88e6af9e0b555c8c17061e37a..3caae1aa87ab9c611ea178f618f7498d93431631 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -15,6 +15,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "SGTools/StlVectorClids.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "L1CaloErrorByteStreamTool.h"
@@ -26,7 +27,7 @@ L1CaloErrorByteStreamCnv::L1CaloErrorByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("L1CaloErrorByteStreamCnv"),
m_tool("LVL1BS::L1CaloErrorByteStreamTool/L1CaloErrorByteStreamTool"),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -52,19 +53,9 @@ long L1CaloErrorByteStreamCnv::storageType()
StatusCode L1CaloErrorByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -74,32 +65,26 @@ StatusCode L1CaloErrorByteStreamCnv::initialize()
StatusCode L1CaloErrorByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
- std::vector<unsigned int>* const errCollection =
- new std::vector<unsigned int>;
+ auto errCollection = std::make_unique<std::vector<unsigned int> >();
- StatusCode sc = m_tool->errors(errCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete errCollection;
- return sc;
- }
+ ATH_CHECK( m_tool->errors(errCollection.get()) );
- pObj = SG::asStorable(errCollection);
+ pObj = SG::asStorable(std::move(errCollection));
- return sc;
+ return StatusCode::SUCCESS;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
index 44f330227ead4694c667007a60882b2bdfb7484e..e5bd2983637f7eaedad98449b684dbacdbb33d79 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_L1CALOERRORBYTESTREAMCNV_H
@@ -54,9 +54,7 @@ private:
ToolHandle<LVL1BS::L1CaloErrorByteStreamTool> m_tool;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h
index 27fadc8e2d70b459fb8b76a7aeaddc942477e84f..934e9556c0943cc7f738c371fc6930eae3c86f1c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_L1CALOERRORBYTESTREAMTOOL_H
@@ -13,6 +13,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "AthenaKernel/SlotSpecificObj.h"
+#include "CxxUtils/checker_macros.h"
class IInterface;
class InterfaceID;
@@ -55,7 +56,7 @@ class L1CaloErrorByteStreamTool : public AthAlgTool {
ErrorMap m_rodMap;
std::mutex m_mutex;
};
- mutable SG::SlotSpecificObj<ErrorMaps> m_maps;
+ mutable SG::SlotSpecificObj<ErrorMaps> m_maps ATLAS_THREAD_SAFE;
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.cxx
index a74dd44723e7fbd9dd5dc8ff0c6c31f1477043ff..65d55d9ea2c59b2f2b85723950316608c036a81a 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -14,7 +14,7 @@ L1CaloSrcIdMap::L1CaloSrcIdMap()
// Make a ROD Source ID
uint32_t L1CaloSrcIdMap::getRodID(int crate, int slink, int daqOrRoi,
- eformat::SubDetector subdet)
+ eformat::SubDetector subdet) const
{
// module ID = r0sscccc (ROD-spec-version1_06d, P33)
uint16_t moduleId = (daqOrRoi << 7) | (slink << 4) | crate;
@@ -24,14 +24,14 @@ uint32_t L1CaloSrcIdMap::getRodID(int crate, int slink, int daqOrRoi,
// Make a ROB Source ID from a ROD source ID
-uint32_t L1CaloSrcIdMap::getRobID(uint32_t rod_id)
+uint32_t L1CaloSrcIdMap::getRobID(uint32_t rod_id) const
{
return rod_id;
}
// Make a ROS Source ID from a ROB source ID
-uint32_t L1CaloSrcIdMap::getRosID(uint32_t rob_id)
+uint32_t L1CaloSrcIdMap::getRosID(uint32_t rob_id) const
{
eformat::helper::SourceIdentifier id(rob_id);
eformat::helper::SourceIdentifier id2(id.subdetector_id(), 0);
@@ -40,7 +40,7 @@ uint32_t L1CaloSrcIdMap::getRosID(uint32_t rob_id)
// Make a SubDetector ID from ROS source ID
-uint32_t L1CaloSrcIdMap::getDetID(uint32_t ros_id)
+uint32_t L1CaloSrcIdMap::getDetID(uint32_t ros_id) const
{
eformat::helper::SourceIdentifier id(ros_id);
eformat::helper::SourceIdentifier id2(id.subdetector_id(), 0);
@@ -49,7 +49,7 @@ uint32_t L1CaloSrcIdMap::getDetID(uint32_t ros_id)
// Return crate from unpacked moduleID
-int L1CaloSrcIdMap::crate(uint32_t code)
+int L1CaloSrcIdMap::crate(uint32_t code) const
{
eformat::helper::SourceIdentifier id(code);
return id.module_id() & 0xf;
@@ -57,7 +57,7 @@ int L1CaloSrcIdMap::crate(uint32_t code)
// Return daqOrRoi from unpacked moduleID
-int L1CaloSrcIdMap::daqOrRoi(uint32_t code)
+int L1CaloSrcIdMap::daqOrRoi(uint32_t code) const
{
eformat::helper::SourceIdentifier id(code);
return (id.module_id() >> 7) & 0x1;
@@ -65,7 +65,7 @@ int L1CaloSrcIdMap::daqOrRoi(uint32_t code)
// Return slink from unpacked moduleID
-int L1CaloSrcIdMap::slink(uint32_t code)
+int L1CaloSrcIdMap::slink(uint32_t code) const
{
eformat::helper::SourceIdentifier id(code);
return (id.module_id() >> 4) & 0x3;
@@ -74,14 +74,14 @@ int L1CaloSrcIdMap::slink(uint32_t code)
// Return the maximum possible number of slinks given number of
// bits in module ID
-int L1CaloSrcIdMap::maxSlinks()
+int L1CaloSrcIdMap::maxSlinks() const
{
return 4;
}
// Return sub-detector for given ID
-eformat::SubDetector L1CaloSrcIdMap::subDet(uint32_t code) {
+eformat::SubDetector L1CaloSrcIdMap::subDet(uint32_t code) const {
eformat::helper::SourceIdentifier id(code);
return id.subdetector_id();
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.h
index 329f47eabcd791298a6f7dc89aff3826ff2ee7d1..8badc9f824dbf5d3ac36282f82ed103644768337 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloSrcIdMap.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_L1CALOSRCIDMAP_H
@@ -26,37 +26,37 @@ public:
/// Make a ROD Source ID
uint32_t getRodID (int crate, int slink, int daqOrRoi,
- eformat::SubDetector subdet);
+ eformat::SubDetector subdet) const;
/// Make a ROB Source ID from a ROD source ID
- uint32_t getRobID (uint32_t rod_id);
+ uint32_t getRobID (uint32_t rod_id) const;
/// Make a ROS Source ID from a ROB source ID
- uint32_t getRosID (uint32_t rob_id);
+ uint32_t getRosID (uint32_t rob_id) const;
/// Make a SubDetector ID from ROS source ID
- uint32_t getDetID (uint32_t ros_id);
+ uint32_t getDetID (uint32_t ros_id) const;
/// Return crate from unpacked moduleID
- int crate(uint32_t code);
+ int crate(uint32_t code) const;
/// Return daqOrRoi from unpacked moduleID
- int daqOrRoi(uint32_t code);
+ int daqOrRoi(uint32_t code) const;
/// Return slink from unpacked moduleID
- int slink(uint32_t code);
+ int slink(uint32_t code) const;
/// Return the maximum possible number of slinks
- int maxSlinks();
+ int maxSlinks() const;
/// Return sub-detector for given ID
- eformat::SubDetector subDet(uint32_t code);
+ eformat::SubDetector subDet(uint32_t code) const;
/// Return ROD header minor version to use when writing BS
- uint16_t minorVersion() {return 0x1004;} // Or may go up to 0x2000, CHECK
+ uint16_t minorVersion() const {return 0x1004;} // Or may go up to 0x2000, CHECK
/// Return last ROD header minor version for pre-LS1 data
- uint16_t minorVersionPreLS1() {return 0x1003;}
+ uint16_t minorVersionPreLS1() const {return 0x1003;}
};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
index f03157a3df818d102d8bd3963e6671c7e029c703..2083ea628e10b3e8674cdc5694f2330b6fe363c5 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,6 +23,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/TriggerTower.h"
@@ -37,7 +38,7 @@ PpmByteStreamV1Cnv::PpmByteStreamV1Cnv( ISvcLocator* svcloc )
m_tool("LVL1BS::PpmByteStreamV1Tool/PpmByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_debug(false)
{
}
@@ -63,43 +64,19 @@ long PpmByteStreamV1Cnv::storageType()
StatusCode PpmByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- //Get ByteStreamCnvSvc
- sc = m_ByteStreamEventAccess.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endmsg;
- return sc;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endmsg;
- }
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
+ ATH_CHECK( m_tool.retrieve() );
// Get ROBDataProvider
- sc = m_robDataProvider.retrieve();
+ StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endmsg;
+ REPORT_MESSAGE (MSG::WARNING) << "Failed to retrieve service "
+ << m_robDataProvider;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
- } else {
- m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endmsg;
}
-
return StatusCode::SUCCESS;
}
@@ -108,18 +85,18 @@ StatusCode PpmByteStreamV1Cnv::initialize()
StatusCode PpmByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
+ if (m_debug) {
+ REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
+ }
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -129,27 +106,20 @@ StatusCode PpmByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
m_robDataProvider->getROBData( vID, robFrags );
// size check
- DataVector<LVL1::TriggerTower>* const ttCollection =
- new DataVector<LVL1::TriggerTower>(SG::VIEW_ELEMENTS);
+ auto ttCollection = std::make_unique<DataVector<LVL1::TriggerTower> >(SG::VIEW_ELEMENTS);
if (m_debug) {
- m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endmsg;
+ REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
if (robFrags.size() == 0) {
- pObj = SG::asStorable(ttCollection) ;
+ pObj = SG::asStorable(std::move(ttCollection)) ;
return StatusCode::SUCCESS;
}
- StatusCode sc = m_tool->convert(robFrags, ttCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete ttCollection;
- return sc;
- }
+ ATH_CHECK( m_tool->convert(robFrags, ttCollection.get()) );
- pObj = SG::asStorable(ttCollection);
+ pObj = SG::asStorable(std::move(ttCollection));
- return sc;
+ return StatusCode::SUCCESS;
}
// createRep should create the bytestream from RDOs.
@@ -157,13 +127,11 @@ StatusCode PpmByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode PpmByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
-
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::TriggerTower>* ttCollection = 0;
if( !SG::fromStorable( pObj, ttCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<TriggerTower>" << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to DataVector<TriggerTower>";
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
index c41c9f7c0b95f4727ff95fe8759e32a81e8edc22..555d8e3b201736b74ae48795bfdff139ef8d1a45 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_PPMBYTESTREAMV1CNV_H
@@ -64,9 +64,7 @@ private:
ServiceHandle<IByteStreamEventAccess> m_ByteStreamEventAccess;
/// Message log
- mutable MsgStream m_log;
bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.cxx
index 3377ab851aa656dbcce6b0d9106a7f9e6186f324..b5933f3a032d32d2e98198c49a1df3dfa7b16825 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -40,7 +40,7 @@ const int PpmSubBlockV1::s_timeoutBit;
const int PpmSubBlockV1::s_mcmAbsentBit;
const int PpmSubBlockV1::s_channelDisabledBit;
-PpmSubBlockV1::PpmSubBlockV1() : m_globalError(0), m_globalDone(false),
+PpmSubBlockV1::PpmSubBlockV1() : m_globalError(0),
m_lutOffset(-1), m_fadcOffset(-1),
m_pedestal(10), m_fadcBaseline(0),
m_fadcThreshold(0), m_runNumber(0)
@@ -57,7 +57,6 @@ void PpmSubBlockV1::clear()
{
L1CaloSubBlock::clear();
m_globalError = 0;
- m_globalDone = false;
m_lutOffset = -1;
m_fadcOffset = -1;
m_datamap.clear();
@@ -184,8 +183,10 @@ void PpmSubBlockV1::fillPpmError(const int chan, const int errorWord)
if (m_errormap.empty()) m_errormap.resize(s_glinkPins);
// Expand one ASIC channel disabled bit to four
const uint32_t chanDisabled = (errorWord & 0x1) << asic(chan);
- m_errormap[pin(chan)] |= (((errorWord >> 1) << s_asicChannels)
+ uint32_t word = (((errorWord >> 1) << s_asicChannels)
| chanDisabled) & s_errorMask;
+ m_errormap[pin(chan)] |= word;
+ m_globalError |= word;
}
// Store an error word corresponding to a G-Link pin
@@ -194,6 +195,10 @@ void PpmSubBlockV1::fillPpmPinError(const int pin, const int errorWord)
{
if (m_errormap.empty()) m_errormap.resize(s_glinkPins);
m_errormap[pin] = errorWord & s_errorMask;
+ m_globalError = 0;
+ for (uint32_t word : m_errormap) {
+ m_globalError |= word;
+ }
}
// Return the error word for a data channel
@@ -223,13 +228,6 @@ int PpmSubBlockV1::ppmPinError(const int pin) const
bool PpmSubBlockV1::errorBit(const int bit) const
{
- if ( ! m_globalDone) {
- std::vector<uint32_t>::const_iterator pos;
- for (pos = m_errormap.begin(); pos != m_errormap.end(); ++pos) {
- m_globalError |= *pos;
- }
- m_globalDone = true;
- }
return m_globalError & (0x1 << bit);
}
@@ -390,10 +388,12 @@ bool PpmSubBlockV1::unpackNeutral()
if (!rc) setUnpackErrorCode(UNPACK_DATA_TRUNCATED);
// Errors
m_errormap.clear();
+ m_globalError = 0;
for (int pin = 0; pin < s_glinkPins; ++pin) {
uint32_t error = unpackerNeutral(pin, s_errorBits);
error |= unpackerNeutralParityError(pin) << s_errorBits;
m_errormap.push_back(error);
+ m_globalError |= error;
}
return rc;
}
@@ -432,8 +432,11 @@ bool PpmSubBlockV1::unpackUncompressedErrors()
{
unpackerInit();
m_errormap.clear();
+ m_globalError = 0;
for (int pin = 0; pin < s_glinkPins; ++pin) {
- m_errormap.push_back(unpacker(s_wordLen));
+ uint32_t word = unpacker(s_wordLen);
+ m_errormap.push_back(word);
+ m_globalError |= word;
}
bool rc = unpackerSuccess();
if (!rc) setUnpackErrorCode(UNPACK_DATA_TRUNCATED);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.h
index 67d3fe9fe7d76cc9303ac8a623bc4c78e90c7935..c6ee67cd389fdfd2b50c5439948181c57a688814 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmSubBlockV1.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_PPMSUBBLOCKV1_H
@@ -173,8 +173,7 @@ class PpmSubBlockV1 : public L1CaloSubBlock {
bool unpackUncompressedErrors();
// Global error flags
- mutable uint32_t m_globalError;
- mutable bool m_globalDone;
+ uint32_t m_globalError;
// Triggered slice offsets, pedestal value
int m_lutOffset;
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
index e80e5d042bfc928596dc1b20bea904f2e222ecfb..298dfe7f01f81e6ac84063cd26c36e2b4d5e2685 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,6 +21,7 @@
#include "AthenaKernel/ClassID_traits.h"
#include "AthenaKernel/StorableConversions.h"
+#include "AthenaKernel/errorcheck.h"
#include "TrigT1CaloEvent/RODHeader.h"
@@ -33,8 +34,7 @@ namespace LVL1BS {
RodHeaderByteStreamCnv::RodHeaderByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("RodHeaderByteStreamCnv"),
- m_tool("LVL1BS::RodHeaderByteStreamTool/RodHeaderByteStreamTool"),
- m_log(msgSvc(), m_name), m_debug(false)
+ m_tool("LVL1BS::RodHeaderByteStreamTool/RodHeaderByteStreamTool")
{
}
@@ -59,20 +59,8 @@ long RodHeaderByteStreamCnv::storageType()
StatusCode RodHeaderByteStreamCnv::initialize()
{
- m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
- m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endmsg;
-
- StatusCode sc = Converter::initialize();
- if ( sc.isFailure() )
- return sc;
-
- // Retrieve Tool
- sc = m_tool.retrieve();
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
- return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
+ ATH_CHECK( Converter::initialize() );
+ ATH_CHECK( m_tool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -82,29 +70,21 @@ StatusCode RodHeaderByteStreamCnv::initialize()
StatusCode RodHeaderByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
-
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
+ REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
// size check
- DataVector<LVL1::RODHeader>* const rhCollection =
- new DataVector<LVL1::RODHeader>;
- StatusCode sc = m_tool->convert(nm, rhCollection);
- if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
- delete rhCollection;
- return sc;
- }
+ auto rhCollection = std::make_unique<DataVector<LVL1::RODHeader> >();
+ ATH_CHECK( m_tool->convert(nm, rhCollection.get()) );
- pObj = SG::asStorable(rhCollection);
+ pObj = SG::asStorable(std::move(rhCollection));
- return sc;
+ return StatusCode::SUCCESS;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
index 8a607846a6d7a2042b66deae62d0da458a8e4e45..ccb2345159d64e2114b2802470d4b349f9fc1d24 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_RODHEADERBYTESTREAMCNV_H
@@ -53,13 +53,6 @@ private:
/// Tool that does the actual work
ToolHandle<LVL1BS::RodHeaderByteStreamTool> m_tool;
-
-
-
- /// Message log
- mutable MsgStream m_log;
- bool m_debug;
-
};
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CaloUserHeader.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CaloUserHeader.cxx
index 859b2a833f90558cf6e5782a2befd0a9b8b05714..802c0d3b35bf80ffde626fe797225291df62a753 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CaloUserHeader.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CaloUserHeader.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloUserHeader.h"
@@ -8,7 +8,7 @@
using namespace LVL1BS;
namespace {
- WordDecoder caloUserWordDecoder({
+ const WordDecoder caloUserWordDecoder({
BitField("Length", 0, 4),
BitField("L1A Slice: PP FADC", 4, 5),
BitField("LUT", 9, 3),
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockHeader.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockHeader.cxx
index 9f24dd6210f38d44c630c86ae972e9bb5c75ee44..31c5b7ad863c41efcd74568b16c25a5240998085 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockHeader.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockHeader.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "SubBlockHeader.h"
@@ -9,7 +9,7 @@
using namespace LVL1BS;
namespace {
- WordDecoder subBlockHeaderDecoder(
+ const WordDecoder subBlockHeaderDecoder(
{
BitField("Type", 28, 4),
BitField("Version", 25, 3),
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.cxx
index 67e54e930d3adf1cb1a6c8026ea9403f3b0da41a..794379f3a94742d833b130bdd7309879f6dae304 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "SubBlockStatus.h"
@@ -9,7 +9,7 @@
using namespace LVL1BS;
namespace {
- WordDecoder subBlockStatusDecoder(
+ const WordDecoder subBlockStatusDecoder(
{
BitField("Timeout", 7, 1),
BitField("Link", 6, 1),
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
index 4cf615e6d1e13a1d70adbf3cd694e3148d413885..0b81df5c3fda339582d8f7b891a99d7e0b15ef4c 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/LVL1CaloMonitoringConfig.py
@@ -14,6 +14,10 @@ def LVL1CaloMonitoringConfig(flags):
result = ComponentAccumulator()
+ # If we're not putting trigger objects in event store, can't monitor them
+ if not flags.DQ.triggerDataAvailable:
+ return result
+
isData = not flags.Input.isMC
# monitoring algorithm configs
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py
index 34d39834237ef615cfbaf2d344dfad9d85c8eca5..b08a4acf744dc81a7b6e65f1f08e4b81eff6a670 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py
@@ -76,9 +76,9 @@ def PprMonitoringConfig(inputFlags):
# Eta-phi maps
histPath = trigPath+'/LUT-CP/EtaPhiMaps'
- myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_lutcp_AverageEt', title='EM Average LUT-CP Et for Et > 5 GeV/2', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_cpET_5_phiBins', weight='cpET_EM')
+ myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM,cpET_EM;h_ppm_em_2d_etaPhi_tt_lutcp_AverageEt', title='EM Average LUT-CP Et for Et > 5 GeV/2', type='TProfile2D', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_cpET_5_phiBins')
- myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_lutcp_AverageEt', title='HAD Average LUT-CP Et for Et > 5 GeV/2', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_cpET_5_phiBins', weight='cpET_HAD')
+ myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD,cpET_HAD;h_ppm_had_2d_etaPhi_tt_lutcp_AverageEt', title='HAD Average LUT-CP Et for Et > 5 GeV/2', type='TProfile2D', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_cpET_5_phiBins')
########################
@@ -103,9 +103,9 @@ def PprMonitoringConfig(inputFlags):
# Eta-phi maps
histPath = trigPath+'/LUT-JEP/EtaPhiMaps'
- myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_lutjep_AverageEt', title='EM Average LUT-JEP Et for Et > 5 GeV', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_jepET_5_phiBins', weight='jepET_EM')
+ myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM,jepET_EM;h_ppm_em_2d_etaPhi_tt_lutjep_AverageEt', title='EM Average LUT-JEP Et for Et > 5 GeV', type='TProfile2D', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_jepET_5_phiBins')
- myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_lutjep_AverageEt', title='HAD Average LUT-JEP Et for Et > 5 GeV', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_jepET_5_phiBins', weight='jepET_HAD')
+ myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD,jepET_HAD;h_ppm_had_2d_etaPhi_tt_lutjep_AverageEt', title='HAD Average LUT-JEP Et for Et > 5 GeV', type='TProfile2D', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_jepET_5_phiBins')
####################
@@ -116,13 +116,13 @@ def PprMonitoringConfig(inputFlags):
# EM tower maps
myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_adc_HitMap', title='#eta - #phi map of EM FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_timeslice')
- myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of EM FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_timeslice', weight='emTT_ADC')
+ myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM,emTT_ADC;h_ppm_em_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of EM FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TProfile2D', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_timeslice')
# HAD tower maps
myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_adc_HitMap', title='#eta - #phi map of HAD FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_timeslice')
- myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of HAD FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_timeslice', weight='hadTT_ADC')
+ myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD,hadTT_ADC;h_ppm_had_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of HAD FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TProfile2D', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_timeslice')
diff --git a/Trigger/TrigTools/TrigInDetConf/python/RoiManipulators.py b/Trigger/TrigTools/TrigInDetConf/python/RoiManipulators.py
index f387c5660ccdcd2578cd74d9ac7b42498ed49c3e..1f111e49f8d9f055628150ac5c0ec4bf2d1ac12a 100644
--- a/Trigger/TrigTools/TrigInDetConf/python/RoiManipulators.py
+++ b/Trigger/TrigTools/TrigInDetConf/python/RoiManipulators.py
@@ -7,6 +7,12 @@ class IDTrigRoiUpdater ( PESA__TrigRoiUpdater ):
def __init__(self, name="IDTrigRoiUpdater_Electron_IDT", type="electron"):
super ( PESA__TrigRoiUpdater, self ).__init__(name)
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_SCT
+
+ self.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ self.RegSelTool_SCT = makeRegSelTool_SCT()
+
from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings
self.EtaHalfWidth = InDetTrigSliceSettings[('etaHalfWidth',type)]
self.PhiHalfWidth = InDetTrigSliceSettings[('phiHalfWidth',type)]
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index b42c63542a2482405aeb7f74345ffcd1dff1d5a9..c6c2a91ffd3586d5f98747f683938f06c8e915b6 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -122,13 +122,21 @@ def makeInDetPrecisionTracking( config = None,
from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProviderTool
InDetTRTRawDataProviderTool = TRTRawDataProviderTool( name = "%sTRTRawDataProviderTool%s"%(algNamePrefix, signature),
Decoder = InDetTRTRodDecoder )
+
ToolSvc += InDetTRTRawDataProviderTool
+
+
+
# load the TRTRawDataProvider
from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProvider
InDetTRTRawDataProvider = TRTRawDataProvider(name = "%sTRTRawDataProvider%s"%(algNamePrefix, signature),
RDOKey = TrigTRTKeys.RDOs,
ProviderTool = InDetTRTRawDataProviderTool)
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ InDetTRTRawDataProvider.RegSelTool = makeRegSelTool_TRT()
+
InDetTRTRawDataProvider.isRoI_Seeded = True
InDetTRTRawDataProvider.RoIs = rois
@@ -156,6 +164,9 @@ def makeInDetPrecisionTracking( config = None,
TRT_DriftCircleTool = InDetTrigTRT_DriftCircleTool )
InDetTrigTRTRIOMaker.isRoI_Seeded = True
InDetTrigTRTRIOMaker.RoIs = rois
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+ InDetTrigTRTRIOMaker.RegSelTool = makeRegSelTool_TRT()
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPatternPropagator, InDetTrigPatternUpdator
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
index 6acaa889727aa2a1e94b4887174ac8de53ee09c0..ab0d0a6b87f006d7f393bba45cf300147fe7e04c 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
@@ -112,6 +112,10 @@ def makeInDetAlgs( config = None, rois = 'EMViewRoIs', doFTF = True, viewVerifie
InDetPixelRawDataProvider.RDOCacheKey = InDetCacheNames.PixRDOCacheKey
InDetPixelRawDataProvider.BSErrorsCacheKey = InDetCacheNames.PixBSErrCacheKey
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+
+ InDetPixelRawDataProvider.RegSelTool = makeRegSelTool_Pixel()
+
viewAlgs.append(InDetPixelRawDataProvider)
@@ -158,9 +162,6 @@ def makeInDetAlgs( config = None, rois = 'EMViewRoIs', doFTF = True, viewVerifie
#Pixel clusterisation
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import TrigPixelLorentzAngleTool, TrigSCTLorentzAngleTool
- from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
- PixelConfigCondAlg.UseCalibConditions = False
-
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool_" + signature,
SCTLorentzAngleTool = TrigSCTLorentzAngleTool,
@@ -194,6 +195,9 @@ def makeInDetAlgs( config = None, rois = 'EMViewRoIs', doFTF = True, viewVerifie
InDetPixelClusterization.RoIs = rois
InDetPixelClusterization.ClusterContainerCacheKey = InDetCacheNames.Pixel_ClusterKey
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ InDetPixelClusterization.RegSelTool = makeRegSelTool_Pixel()
+
viewAlgs.append(InDetPixelClusterization)
# Create SCT_ConditionsSummaryTool
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 9099aac72f957488fae1c25d2a8b21b9606ae71f..0fe5301a3765b207ef3af4ff299371169e6c37b5 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -386,15 +386,7 @@ def TrigInDetCondCfg( flags ):
from PixelCabling.PixelCablingConfigNew import PixelCablingSvcCfg
# module parameters
- acc.merge(PixelConfigCondAlgCfg(flags,
- UseCalibConditions=False,
- UseDeadmapConditions=True,
- UseDCSStateConditions=False,
- UseDCSStatusConditions=False,
- UseDCSHVConditions=True,
- UseDCSTemperatureConditions=True,
- UseTDAQConditions=False))
-
+ acc.merge(PixelConfigCondAlgCfg(flags))
# charge calibration
acc.merge(PixelChargeCalibCondAlgCfg(flags))
# NEW FOR RUN3 acc.merge(PixelChargeLUTCalibCondAlgCfg(flags))
@@ -431,7 +423,10 @@ def TrigInDetCondCfg( flags ):
acc.merge( mfsc )
return acc
-def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
+def TrigInDetConfig( inflags, roisKey="EMRoIs", signatureName='' ):
+
+ # redirect InDet.Tracking flags to point to a specific trigger setting
+ flags = inflags.cloneAndReplace("InDet.Tracking", "Trigger.InDetTracking."+signatureName)
#If signature specified add suffix to the name of each algorithms
signature = "_" + signatureName if signatureName else ''
@@ -441,9 +436,17 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
from InDetRecExample.InDetKeys import InDetKeys
- # Region selector tool for SCT
+ # Region selector tools for Pixel, SCT and TRT
+
+ from RegionSelector.RegSelToolConfig import regSelTool_Pixel_Cfg
+ RegSelTool_Pixel = acc.popToolsAndMerge(regSelTool_Pixel_Cfg(flags))
+
from RegionSelector.RegSelToolConfig import regSelTool_SCT_Cfg
- RegSelTool_SCT = acc.popToolsAndMerge(regSelTool_SCT_Cfg(flags))
+ RegSelTool_SCT = acc.popToolsAndMerge(regSelTool_SCT_Cfg(flags))
+
+ from RegionSelector.RegSelToolConfig import regSelTool_TRT_Cfg
+ RegSelTool_TRT = acc.popToolsAndMerge(regSelTool_TRT_Cfg(flags))
+
verifier = CompFactory.AthViews.ViewDataVerifier( name = 'VDVInDet'+signature,
DataObjects= [('xAOD::EventInfo', 'StoreGateSvc+EventInfo'),
@@ -484,11 +487,17 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
PixelRawDataProvider=CompFactory.PixelRawDataProvider
InDetPixelRawDataProvider = PixelRawDataProvider(name = "InDetPixelRawDataProvider"+ signature,
RDOKey = InDetKeys.PixelRDOs(),
- ProviderTool = InDetPixelRawDataProviderTool,)
+ ProviderTool = InDetPixelRawDataProviderTool )
InDetPixelRawDataProvider.isRoI_Seeded = True
InDetPixelRawDataProvider.RoIs = roisKey
InDetPixelRawDataProvider.RDOCacheKey = InDetCacheNames.PixRDOCacheKey
+
+# from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+# InDetPixelRawDataProvider.RegSelTool = makeRegSelTool_Pixel()
+
+ InDetPixelRawDataProvider.RegSelTool = RegSelTool_Pixel
+
acc.addEventAlgo(InDetPixelRawDataProvider)
@@ -513,7 +522,9 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
InDetSCTRawDataProvider.isRoI_Seeded = True
InDetSCTRawDataProvider.RoIs = roisKey
InDetSCTRawDataProvider.RDOCacheKey = InDetCacheNames.SCTRDOCacheKey
+
InDetSCTRawDataProvider.RegSelTool = RegSelTool_SCT
+
acc.addEventAlgo(InDetSCTRawDataProvider)
# load the SCTEventFlagWriter
@@ -545,6 +556,11 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
InDetTRTRawDataProvider.isRoI_Seeded = True
InDetTRTRawDataProvider.RoIs = roisKey
+# from RegionSelector.RegSelToolConfig import makeRegSelTool_TRT
+# InDetTRTRawDataProvider.RegSelTool_TRT = makeRegSelTool_TRT()
+
+ InDetTRTRawDataProvider.RegSelTool = RegSelTool_TRT
+
acc.addEventAlgo(InDetTRTRawDataProvider)
@@ -575,10 +591,14 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
DataObjectName = InDetKeys.PixelRDOs(),
AmbiguitiesMap = 'TrigPixelClusterAmbiguitiesMap',
ClustersName = "PixelTrigClusters",)
- InDetPixelClusterization
+
InDetPixelClusterization.isRoI_Seeded = True
InDetPixelClusterization.RoIs = roisKey
InDetPixelClusterization.ClusterContainerCacheKey = InDetCacheNames.Pixel_ClusterKey
+
+ # from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel
+ InDetPixelClusterization.RegSelTool = RegSelTool_Pixel
+
acc.addEventAlgo(InDetPixelClusterization)
from InDetConfig.InDetRecToolConfig import InDetSCT_ConditionsSummaryToolCfg
@@ -659,9 +679,9 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
DoPhiFiltering = True,
UseBeamTilt = False,
UseNewLayerScheme = True,
- RegSel_Pixel = pixRegSelTool,
- RegSel_SCT = sctRegSelTool,
- layerNumberTool = acc.getPublicTool("TrigL2LayerNumberTool_FTF") ) )
+ RegSelTool_Pixel = pixRegSelTool,
+ RegSelTool_SCT = sctRegSelTool,
+ layerNumberTool = acc.getPublicTool("TrigL2LayerNumberTool_FTF") ) )
# TODO remove once offline configured counterparts are available?
@@ -715,13 +735,10 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
return acc
-def indetInViewRecoCfg( inflags, viewMakerName, signature='' ):
+def indetInViewRecoCfg( flags, viewMakerName, signature='' ):
""" TBD if this function should be defined here or moved to the menu are, for sake of symmetry it is kept here now
There would certainly be additional algorithms
"""
- # redirect InDet.Tracking flags to point to a specific trigger setting
- flags = inflags.cloneAndReplace("InDet.Tracking", "Trigger.InDetTracking."+signature)
-
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
reco = InViewReco( viewMakerName )
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py
index 6c9e24bbad58e1d8b58f039a740cc57160502a21..a984bb29856117bc606ac2cc81098aabd404e5b4 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py
@@ -20,9 +20,15 @@ def __electronFlags():
flags.checkRedundantSeeds=True
return flags
+def __muonFlags():
+ flags = __sliceFlags()
+ flags.minPT=Units.GeV * 1.0
+ return flags
+
def createTrigTrackingFlags():
flags = AthConfigFlags()
flags.addFlagsCategory('Trigger.InDetTracking.Electron', __electronFlags, prefix=True)
+ flags.addFlagsCategory('Trigger.InDetTracking.Muon', __muonFlags, prefix=True)
return flags
if __name__ == "__main__":
diff --git a/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt b/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt
index e6dcc1b165aa0b041780abbbc8935c6e898172db..9429b5539d2ee7e7d2c35ff7113b5ca82b082021 100644
--- a/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigInDetPattRecoTools/CMakeLists.txt
@@ -14,5 +14,6 @@ find_package(Boost)
atlas_add_test( mockSeeds
SOURCES test/mockSeeds.cxx
- LINK_LIBRARIES PathResolver TrigInDetEvent TrigInDetPattRecoEvent TrigInDetPattRecoTools TrigSteeringEvent IRegionSelector )
+ LINK_LIBRARIES PathResolver TrigInDetEvent TrigInDetPattRecoEvent TrigInDetPattRecoTools TrigSteeringEvent IRegionSelector
+ PROPERTIES TIMEOUT 300 )
diff --git a/Trigger/TrigTools/TrigInDetPattRecoTools/src/TrigTrackSeedGenerator.cxx b/Trigger/TrigTools/TrigInDetPattRecoTools/src/TrigTrackSeedGenerator.cxx
index e6907a64206f6a10c6c010062ee066dfb6960b4d..9e8d086b96bb49dbbe46e823710e89acf9166fbb 100644
--- a/Trigger/TrigTools/TrigInDetPattRecoTools/src/TrigTrackSeedGenerator.cxx
+++ b/Trigger/TrigTools/TrigInDetPattRecoTools/src/TrigTrackSeedGenerator.cxx
@@ -330,7 +330,7 @@ bool TrigTrackSeedGenerator::validateLayerPairNew(int layerI, int layerJ, float
bool isBarrel = (typeJ == 0);
- if(isBarrel && fabs(refCoordJ-rm)>m_maxDeltaRadius) return false;
+ if(isBarrel && std::fabs(refCoordJ-rm)>m_maxDeltaRadius) return false;
//boundaries for nextLayer
@@ -343,8 +343,8 @@ bool TrigTrackSeedGenerator::validateLayerPairNew(int layerI, int layerJ, float
m_minCoord = m_zMinus + refCoordJ*(zm-m_zMinus)/rm;//+deltaRefCoord
m_maxCoord = m_zPlus + refCoordJ*(zm-m_zPlus)/rm;//-deltaRefCoord
- m_minCoord -= deltaRefCoord*fabs(zm-m_zMinus)/rm;//corrections due to the layer width
- m_maxCoord += deltaRefCoord*fabs(zm-m_zPlus)/rm;
+ m_minCoord -= deltaRefCoord*std::fabs(zm-m_zMinus)/rm;//corrections due to the layer width
+ m_maxCoord += deltaRefCoord*std::fabs(zm-m_zPlus)/rm;
//if(m_minCoord>m_maxCoord) {
//std::cout<<"1 WRONG ORDER: m_minCoord="<<m_minCoord<<" m_maxCoord="<<m_maxCoord<<std::endl;
//}
@@ -353,8 +353,8 @@ bool TrigTrackSeedGenerator::validateLayerPairNew(int layerI, int layerJ, float
m_minCoord = m_zPlus + refCoordJ*(zm-m_zPlus)/rm;//+deltaRefCoord
m_maxCoord = m_zMinus + refCoordJ*(zm-m_zMinus)/rm;//-deltaRefCoord
- m_minCoord -= deltaRefCoord*fabs(zm-m_zPlus)/rm;
- m_maxCoord += deltaRefCoord*fabs(zm-m_zMinus)/rm;
+ m_minCoord -= deltaRefCoord*std::fabs(zm-m_zPlus)/rm;
+ m_maxCoord += deltaRefCoord*std::fabs(zm-m_zMinus)/rm;
//if(m_minCoord>m_maxCoord) {
//std::cout<<"2 WRONG ORDER: m_minCoord="<<m_minCoord<<" m_maxCoord="<<m_maxCoord<<std::endl;
//}
@@ -382,8 +382,8 @@ bool TrigTrackSeedGenerator::validateLayerPairNew(int layerI, int layerJ, float
m_minCoord = (refCoordJ-m_zMinus)*rm/(zm-m_zMinus);
m_maxCoord = (refCoordJ-m_zPlus)*rm/(zm-m_zPlus);
- m_minCoord -= deltaRefCoord*rm/fabs(zm-m_zMinus);
- m_maxCoord += deltaRefCoord*rm/fabs(zm-m_zPlus);
+ m_minCoord -= deltaRefCoord*rm/std::fabs(zm-m_zMinus);
+ m_maxCoord += deltaRefCoord*rm/std::fabs(zm-m_zPlus);
if(zm <= m_zPlus) m_maxCoord = maxB;
@@ -405,8 +405,8 @@ bool TrigTrackSeedGenerator::validateLayerPairNew(int layerI, int layerJ, float
m_minCoord = (refCoordJ-m_zPlus)*rm/(zm-m_zPlus);
m_maxCoord = (refCoordJ-m_zMinus)*rm/(zm-m_zMinus);
- m_minCoord -= deltaRefCoord*rm/fabs(zm-m_zPlus);
- m_maxCoord += deltaRefCoord*rm/fabs(zm-m_zMinus);
+ m_minCoord -= deltaRefCoord*rm/std::fabs(zm-m_zPlus);
+ m_maxCoord += deltaRefCoord*rm/std::fabs(zm-m_zMinus);
//if(m_minCoord>m_maxCoord) {
//std::cout<<"32 WRONG ORDER: m_minC="<<m_minCoord<<" m_maxC="<<m_maxCoord<<" rm="<<rm<<" zm="<<zm<<" refC="<<refCoordJ<<" zminus="<<m_zMinus<<" zplus="<<m_zPlus<<std::endl;
//}
@@ -429,8 +429,8 @@ bool TrigTrackSeedGenerator::validateLayerPairNew(int layerI, int layerJ, float
m_minCoord = (refCoordJ-m_zPlus)*rm/(zm-m_zPlus);
m_maxCoord = (refCoordJ-m_zMinus)*rm/(zm-m_zMinus);
- m_minCoord -= deltaRefCoord*rm/fabs(zm-m_zPlus);
- m_maxCoord += deltaRefCoord*rm/fabs(zm-m_zMinus);
+ m_minCoord -= deltaRefCoord*rm/std::fabs(zm-m_zPlus);
+ m_maxCoord += deltaRefCoord*rm/std::fabs(zm-m_zMinus);
if(zm > m_zMinus) m_maxCoord = maxB;
if(m_minCoord > maxB) return false;
if(m_maxCoord < minB) return false;
@@ -450,8 +450,8 @@ bool TrigTrackSeedGenerator::validateLayerPairNew(int layerI, int layerJ, float
m_minCoord = (refCoordJ-m_zMinus)*rm/(zm-m_zMinus);
m_maxCoord = (refCoordJ-m_zPlus)*rm/(zm-m_zPlus);
- m_minCoord -= deltaRefCoord*rm/fabs(zm-m_zMinus);
- m_maxCoord += deltaRefCoord*rm/fabs(zm-m_zPlus);
+ m_minCoord -= deltaRefCoord*rm/std::fabs(zm-m_zMinus);
+ m_maxCoord += deltaRefCoord*rm/std::fabs(zm-m_zPlus);
//if(m_minCoord>m_maxCoord) {
//std::cout<<"42 WRONG ORDER: m_minC="<<m_minCoord<<" m_maxC="<<m_maxCoord<<" rm="<<rm<<" zm="<<zm<<" refC="<<refCoordJ<<" zminus="<<m_zMinus<<" zplus="<<m_zPlus<<std::endl;
//}
@@ -529,8 +529,8 @@ int TrigTrackSeedGenerator::processSpacepointRange(int lJ, float rm, float zm, b
float dr = rsp - rm;
- if(fabs(dr)>m_maxDeltaRadius ) continue;
- if(fabs(dr)<m_minDeltaRadius ) continue;
+ if(std::fabs(dr)>m_maxDeltaRadius ) continue;
+ if(std::fabs(dr)<m_minDeltaRadius ) continue;
//inner doublet check
@@ -538,7 +538,7 @@ int TrigTrackSeedGenerator::processSpacepointRange(int lJ, float rm, float zm, b
float dz = zsp - zm;
float tau = dz/dr;
- if (fabs(tau) > 7.41) continue;
+ if (std::fabs(tau) > 7.41) continue;
float z0 = zm - rm*tau;
@@ -573,8 +573,8 @@ int TrigTrackSeedGenerator::processSpacepointRangeZv(float rm, float zm, bool ch
float zsp = (*spIt)->z();
float dr = rsp - rm;
- if(fabs(dr)>m_maxDeltaRadius ) continue;
- if(fabs(dr)<m_minDeltaRadius ) continue;
+ if(std::fabs(dr)>m_maxDeltaRadius ) continue;
+ if(std::fabs(dr)<m_minDeltaRadius ) continue;
//inner doublet check
@@ -582,7 +582,7 @@ int TrigTrackSeedGenerator::processSpacepointRangeZv(float rm, float zm, bool ch
float dz = zsp - zm;
float tau = dz/dr;
- if (fabs(tau) > 7.41) continue;//|eta|<2.7
+ if (std::fabs(tau) > 7.41) continue;//|eta|<2.7
if(dr<0) {
m_SoA.m_spi[m_nInner++] = *spIt;
@@ -768,7 +768,7 @@ void TrigTrackSeedGenerator::createTriplets(const TrigSiSpacePointBase* pS, int
const float Q = fabs_d0*fabs_d0;
if(output.size()>=m_settings.m_maxTripletBufferLength) {
std::sort(output.begin(), output.end(),
- [](TrigInDetTriplet A, const TrigInDetTriplet B) {
+ [](const TrigInDetTriplet& A, const TrigInDetTriplet& B) {
return A.Q() > B.Q();
}
);
@@ -780,10 +780,7 @@ void TrigTrackSeedGenerator::createTriplets(const TrigSiSpacePointBase* pS, int
output.erase(it);
}
- TrigInDetTriplet t(*m_SoA.m_spi[innIdx], *pS, *m_SoA.m_spo[outIdx-nInner], Q);
-
-
- output.push_back(t);
+ output.emplace_back(*m_SoA.m_spi[innIdx], *pS, *m_SoA.m_spo[outIdx-nInner], Q);
}
}
}
@@ -1056,7 +1053,7 @@ void TrigTrackSeedGenerator::createTripletsNew(const TrigSiSpacePointBase* pS, i
const double Q = fabs_d0*fabs_d0;
if(output.size()>=m_settings.m_maxTripletBufferLength) {
std::sort(output.begin(), output.end(),
- [](const TrigInDetTriplet A, const TrigInDetTriplet B) {
+ [](const TrigInDetTriplet& A, const TrigInDetTriplet& B) {
return A.Q() > B.Q();
}
);
@@ -1082,8 +1079,7 @@ void TrigTrackSeedGenerator::createTripletsNew(const TrigSiSpacePointBase* pS, i
const TrigSiSpacePointBase* pSPI = (type1==0) ? m_SoA.m_sorted_sp[iter1] : m_SoA.m_sorted_sp[iter2];
const TrigSiSpacePointBase* pSPO = (type1==0) ? m_SoA.m_sorted_sp[iter2] : m_SoA.m_sorted_sp[iter1];
- TrigInDetTriplet t(*pSPI, *pS, *pSPO, Q);
- output.push_back(t);
+ output.emplace_back(*pSPI, *pS, *pSPO, Q);
}
iter1++;
@@ -1105,7 +1101,7 @@ void TrigTrackSeedGenerator::storeTriplets(std::vector<TrigInDetTriplet>& triple
void TrigTrackSeedGenerator::getSeeds(std::vector<TrigInDetTriplet>& vs) {
vs.clear();
std::sort(m_triplets.begin(), m_triplets.end(),
- [](const TrigInDetTriplet A, const TrigInDetTriplet B) {
+ [](const TrigInDetTriplet& A, const TrigInDetTriplet& B) {
return A.Q() < B.Q();
}
);
diff --git a/Trigger/TrigTools/TrigInDetPattRecoTools/test/mockSeeds.cxx b/Trigger/TrigTools/TrigInDetPattRecoTools/test/mockSeeds.cxx
index 0a202071155a0dd5e8c2431f837c7b3fb0e8ac5c..ccceccd706934fe4be1d52bb0bdbca44edd90683 100644
--- a/Trigger/TrigTools/TrigInDetPattRecoTools/test/mockSeeds.cxx
+++ b/Trigger/TrigTools/TrigInDetPattRecoTools/test/mockSeeds.cxx
@@ -1,4 +1,5 @@
#include <boost/tokenizer.hpp>
+#include <cmath>
#include <string>
#include <vector>
#include <iostream>
@@ -245,7 +246,7 @@ int main()
for (unsigned int i = 0; i < times.size(); i++) {
dev_time += (times[i] - mean_time)*(times[i] - mean_time);
}
- dev_time = sqrt(dev_time/times.size());
+ dev_time = std::sqrt(dev_time/times.size());
std::cout << "Seed making time: " << mean_time << " +/- " << dev_time << " microseconds" << std::endl;
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
index aefb54809a0679ba70330baed16593d7c8e9faa5..5206c65d27f561253c1b24bdc9ffeaddbaeba285 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
@@ -24,16 +24,10 @@ TrigSpacePointConversionTool::TrigSpacePointConversionTool(const std::string& t,
const std::string& n,
const IInterface* p ) :
AthAlgTool(t,n,p),
- m_layerNumberTool("TrigL2LayerNumberTool"),
- m_regsel_pix( "RegSelTool/RegSelTool_Pixel", this),
- m_regsel_sct( "RegSelTool/RegSel_SCT", this)
+ m_layerNumberTool("TrigL2LayerNumberTool")
{
declareInterface< ITrigSpacePointConversionTool >( this );
- // declareProperty( "RegionSelectorService", m_regionSelectorName = "RegSelSvc" );
- declareProperty( "RegSel_Pixel", m_regsel_pix);
- declareProperty( "RegSel_SCT", m_regsel_sct);
-
declareProperty( "DoPhiFiltering", m_filter_phi = true );
declareProperty( "UseBeamTilt", m_useBeamTilt = true );
declareProperty( "UseNewLayerScheme", m_useNewScheme = false );
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h
index 284bf60acc22c8b876c6f612496af444d471cc03..3e2dfc61d0d756d0f044841b13f4df59dfd54710 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h
@@ -62,8 +62,8 @@ class TrigSpacePointConversionTool : virtual public ITrigSpacePointConversionToo
void transformSpacePoints(std::vector<TrigSiSpacePointBase>&, const EventContext&) const;
/// new region selector tools
- ToolHandle<IRegSelTool> m_regsel_pix;
- ToolHandle<IRegSelTool> m_regsel_sct;
+ ToolHandle<IRegSelTool> m_regsel_pix { this, "RegSelTool_Pixel", "RegSelTool/RegSelTool_Pixel" };
+ ToolHandle<IRegSelTool> m_regsel_sct { this, "RegSelTool_SCT", "RegSelTool/RegSelTool_SCT" };
};
#endif
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 43b21e35d9af26a4230b5edd0132a2da7cc22496..2060d7418e7358f86c29c77b89bf4ac6c007ff84 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -1,912 +1,1011 @@
+TrigSignatureMoniMT INFO HLT_10j40_pf_subresjesgscIS_ftf_L14J15 #3575805394
+TrigSignatureMoniMT INFO -- #3575805394 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3575805394 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_10j40_subjesIS_L14J15 #2760204981
+TrigSignatureMoniMT INFO -- #2760204981 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2760204981 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_10j40_subresjesgscIS_ftf_L14J15 #3568675904
+TrigSignatureMoniMT INFO -- #3568675904 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3568675904 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2e12_lhloose_mu10_L12EM8VH_MU10 #2518246928
-TrigSignatureMoniMT INFO -- #2518246928 Events 1 1 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2518246928 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2518246928 Events 1 1 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2518246928 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
-TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #3136730292 Features 12 296 14 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #3136730292 Features 12 294 14 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VH #2280638160
-TrigSignatureMoniMT INFO -- #2280638160 Events 2 2 2 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2280638160 Features 2 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2280638160 Events 2 2 2 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2280638160 Features 2 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
-TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 7 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1767768251 Features 7 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 7 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1767768251 Features 7 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e24_lhvloose_L12EM20VH #1796849979
-TrigSignatureMoniMT INFO -- #1796849979 Events 2 2 2 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1796849979 Features 2 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1796849979 Events 2 2 2 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1796849979 Features 2 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
-TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 20 20 20 - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2613484113 Features 342 3678 780 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2613484113 Features 342 3676 780 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g10_loose_mu20_L1MU20 #3765708828
-TrigSignatureMoniMT INFO -- #3765708828 Events 8 8 1 1 1 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3765708828 Features 2 2 6 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3765708828 Events 8 8 1 1 1 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3765708828 Features 2 2 6 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I #2606736960
+TrigSignatureMoniMT INFO -- #2606736960 Events 0 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2606736960 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM15VH #3837353071
-TrigSignatureMoniMT INFO -- #3837353071 Events 2 2 2 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3837353071 Features 2 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3837353071 Events 2 2 2 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3837353071 Features 2 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_2g20_tight_icaloloose_L12EM15VH #1319738689
+TrigSignatureMoniMT INFO -- #1319738689 Events 2 2 2 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1319738689 Features 2 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g22_tight_L12EM15VH #708421357
-TrigSignatureMoniMT INFO -- #708421357 Events 2 2 2 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #708421357 Features 2 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #708421357 Events 2 2 2 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #708421357 Features 2 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g25_loose_g15_loose_L12EM20VH #1367194755
-TrigSignatureMoniMT INFO -- #1367194755 Events 2 2 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1367194755 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1367194755 Events 2 2 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1367194755 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH #58053304
-TrigSignatureMoniMT INFO -- #58053304 Events 2 2 2 1 1 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #58053304 Features 5 4 1 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #58053304 Events 2 2 2 1 1 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #58053304 Features 5 4 1 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH #3965466087
-TrigSignatureMoniMT INFO -- #3965466087 Events 2 2 1 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3965466087 Features 1 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3965466087 Events 2 2 1 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3965466087 Features 1 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g50_loose_L12EM20VH #3590373854
-TrigSignatureMoniMT INFO -- #3590373854 Events 2 2 2 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3590373854 Features 2 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3590373854 Events 2 2 2 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3590373854 Features 2 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3495282139
-TrigSignatureMoniMT INFO -- #3495282139 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3495282139 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3495282139 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3495282139 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #2680976232
-TrigSignatureMoniMT INFO -- #2680976232 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2680976232 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2680976232 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2680976232 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
-TrigSignatureMoniMT INFO -- #1295975955 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1295975955 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100 #891415013
-TrigSignatureMoniMT INFO -- #891415013 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #891415013 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #891415013 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #891415013 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j60_L1J15 #927735533
-TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 10 - - 10
-TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 28 - -
+TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 10 - - - 10
+TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 28 - - -
TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 #3498558358
-TrigSignatureMoniMT INFO -- #3498558358 Events 3 3 0 0 0 0 3 3 3 2 - - - - 0
-TrigSignatureMoniMT INFO -- #3498558358 Features 0 0 0 0 12 12 16 4 - - - -
+TrigSignatureMoniMT INFO -- #3498558358 Events 3 3 0 0 0 0 2 2 2 2 - - - - - 0
+TrigSignatureMoniMT INFO -- #3498558358 Features 0 0 0 0 8 8 8 4 - - - - -
TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 #234102568
-TrigSignatureMoniMT INFO -- #234102568 Events 3 3 0 0 0 0 3 3 3 2 - - - - 0
-TrigSignatureMoniMT INFO -- #234102568 Features 0 0 0 0 12 12 16 4 - - - -
+TrigSignatureMoniMT INFO -- #234102568 Events 3 3 0 0 0 0 2 2 2 2 - - - - - 0
+TrigSignatureMoniMT INFO -- #234102568 Features 0 0 0 0 8 8 8 4 - - - - -
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 #2619091790
-TrigSignatureMoniMT INFO -- #2619091790 Events 3 3 0 0 0 0 3 1 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 12 4 4 4 - - - -
+TrigSignatureMoniMT INFO -- #2619091790 Events 3 3 0 0 0 0 2 1 1 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 8 4 4 4 - - - - -
TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #557204938
-TrigSignatureMoniMT INFO -- #557204938 Events 3 3 0 0 0 0 3 1 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 12 4 4 4 - - - -
+TrigSignatureMoniMT INFO -- #557204938 Events 3 3 0 0 0 0 2 1 1 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 8 4 4 4 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_L12MU4 #2999632714
-TrigSignatureMoniMT INFO -- #2999632714 Events 4 4 0 0 0 0 4 4 4 4 - - - - 4
-TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 16 16 24 20 - - - -
+TrigSignatureMoniMT INFO -- #2999632714 Events 4 4 0 0 0 0 3 3 2 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 12 12 8 8 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 #1730084172
-TrigSignatureMoniMT INFO -- #1730084172 Events 4 4 0 0 0 0 4 4 4 4 - - - - 0
-TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 16 16 24 10 - - - -
+TrigSignatureMoniMT INFO -- #1730084172 Events 4 4 0 0 0 0 3 3 2 2 - - - - - 0
+TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 12 12 8 4 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 #4276347155
-TrigSignatureMoniMT INFO -- #4276347155 Events 4 4 0 0 0 0 4 4 4 4 - - - - 0
-TrigSignatureMoniMT INFO -- #4276347155 Features 0 0 0 0 16 16 24 10 - - - -
+TrigSignatureMoniMT INFO -- #4276347155 Events 4 4 0 0 0 0 3 3 2 2 - - - - - 0
+TrigSignatureMoniMT INFO -- #4276347155 Features 0 0 0 0 12 12 8 4 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 #4008168535
-TrigSignatureMoniMT INFO -- #4008168535 Events 4 4 0 0 0 0 4 4 4 4 - - - - 0
-TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 16 16 24 10 - - - -
+TrigSignatureMoniMT INFO -- #4008168535 Events 4 4 0 0 0 0 3 3 2 2 - - - - - 0
+TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 12 12 8 4 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 4 4 0 0 0 0 4 4 4 4 - - - - 4
-TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 16 16 24 20 - - - -
+TrigSignatureMoniMT INFO -- #1584776935 Events 4 4 0 0 0 0 3 3 2 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 12 12 8 8 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
-TrigSignatureMoniMT INFO -- #2046267508 Events 4 4 0 0 0 0 4 3 - - - - - - 3
-TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 16 12 - - - - - -
+TrigSignatureMoniMT INFO -- #2046267508 Events 4 4 0 0 0 0 3 2 - - - - - - - 2
+TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 12 8 - - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
-TrigSignatureMoniMT INFO -- #1316992871 Events 10 10 0 0 0 0 4 3 3 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 16 12 18 16 - - - -
+TrigSignatureMoniMT INFO -- #1316992871 Events 10 10 0 0 0 0 3 2 2 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 12 8 8 8 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 4 4 0 0 0 0 4 3 - - - - - - 3
-TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 16 12 - - - - - -
+TrigSignatureMoniMT INFO -- #3304584056 Events 4 4 0 0 0 0 3 2 - - - - - - - 2
+TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 12 8 - - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
-TrigSignatureMoniMT INFO -- #1747073535 Events 4 4 0 0 0 0 4 3 3 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 16 12 18 16 - - - -
+TrigSignatureMoniMT INFO -- #1747073535 Events 4 4 0 0 0 0 3 2 2 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 12 8 8 8 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
-TrigSignatureMoniMT INFO -- #2398136098 Events 4 4 0 0 0 0 4 3 3 3 - - - - 3
-TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 16 12 18 16 - - - -
+TrigSignatureMoniMT INFO -- #2398136098 Events 4 4 0 0 0 0 3 2 2 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 12 8 8 8 - - - - -
TrigSignatureMoniMT INFO HLT_3j200_L1J100 #2199422919
-TrigSignatureMoniMT INFO -- #2199422919 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2199422919 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2199422919 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2199422919 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_3j200_pf_subresjesgscIS_ftf_L1J100 #794428037
+TrigSignatureMoniMT INFO -- #794428037 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #794428037 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_3j200_subresjesgscIS_ftf_L1J100 #1801834652
+TrigSignatureMoniMT INFO -- #1801834652 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1801834652 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 #1832399408
-TrigSignatureMoniMT INFO -- #1832399408 Events 0 0 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1832399408 Events 0 0 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 #1199773318
-TrigSignatureMoniMT INFO -- #1199773318 Events 0 0 0 0 0 0 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1199773318 Events 0 0 0 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 0 0 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 #424835335
-TrigSignatureMoniMT INFO -- #424835335 Events 0 0 0 0 0 0 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #424835335 Events 0 0 0 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 0 0 0 0 - - - - - -
+TrigSignatureMoniMT INFO HLT_4j120_pf_subresjesgscIS_ftf_L13J50 #1755129033
+TrigSignatureMoniMT INFO -- #1755129033 Events 1 1 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1755129033 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_4j120_subjesIS_L13J50 #3722303680
+TrigSignatureMoniMT INFO -- #3722303680 Events 1 1 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3722303680 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_4j120_subresjesgscIS_ftf_L13J50 #91006165
+TrigSignatureMoniMT INFO -- #91006165 Events 1 1 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #91006165 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 #1834383636
-TrigSignatureMoniMT INFO -- #1834383636 Events 0 0 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1834383636 Events 0 0 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 #1175391812
-TrigSignatureMoniMT INFO -- #1175391812 Events 7 7 0 0 0 0 0 0 0 0 0 1 - - 1
-TrigSignatureMoniMT INFO -- #1175391812 Features 0 0 0 0 0 0 0 0 0 5 - -
+TrigSignatureMoniMT INFO -- #1175391812 Events 7 7 0 0 0 0 0 0 0 0 0 1 - - - 1
+TrigSignatureMoniMT INFO -- #1175391812 Features 0 0 0 0 0 0 0 0 0 5 - - -
+TrigSignatureMoniMT INFO HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15 #4189027854
+TrigSignatureMoniMT INFO -- #4189027854 Events 9 9 0 0 0 0 0 0 0 0 0 1 - - - 1
+TrigSignatureMoniMT INFO -- #4189027854 Features 0 0 0 0 0 0 0 0 0 5 - - -
+TrigSignatureMoniMT INFO HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15 #819918597
+TrigSignatureMoniMT INFO -- #819918597 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #819918597 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j85_pf_subresjesgscIS_ftf_L14J15 #4208121018
+TrigSignatureMoniMT INFO -- #4208121018 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #4208121018 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j85_subjesIS_L14J15 #2745094401
+TrigSignatureMoniMT INFO -- #2745094401 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2745094401 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j85_subresjesgscIS_ftf_L14J15 #1148892499
+TrigSignatureMoniMT INFO -- #1148892499 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1148892499 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15 #1526259867
+TrigSignatureMoniMT INFO -- #1526259867 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1526259867 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j55_subjesIS_0eta240_L14J15 #68179418
+TrigSignatureMoniMT INFO -- #68179418 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #68179418 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j55_subresjesgscIS_ftf_0eta240_L14J15 #1068073241
+TrigSignatureMoniMT INFO -- #1068073241 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1068073241 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j70_pf_subresjesgscIS_ftf_L14J15 #1755772565
+TrigSignatureMoniMT INFO -- #1755772565 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1755772565 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j70_subjesIS_L14J15 #1003115860
+TrigSignatureMoniMT INFO -- #1003115860 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1003115860 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j70_subresjesgscIS_ftf_L14J15 #59957514
+TrigSignatureMoniMT INFO -- #59957514 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #59957514 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_7j45_pf_subresjesgscIS_ftf_L14J15 #2701381398
+TrigSignatureMoniMT INFO -- #2701381398 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2701381398 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_7j45_subjesIS_L14J15 #2617173782
+TrigSignatureMoniMT INFO -- #2617173782 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2617173782 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_7j45_subresjesgscIS_ftf_L14J15 #2928962349
+TrigSignatureMoniMT INFO -- #2928962349 Events 9 9 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2928962349 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_JetDS_j0_L1J100 #3302698716
+TrigSignatureMoniMT INFO -- #3302698716 Events 3 3 0 0 0 0 0 0 0 0 0 3 3 3 - 3
+TrigSignatureMoniMT INFO -- #3302698716 Features 0 0 0 0 0 0 0 0 0 81 32 3 -
TrigSignatureMoniMT INFO HLT_alfacalib_AlfaPEB_L1ALFA_ANY #4094852824
-TrigSignatureMoniMT INFO -- #4094852824 Events 0 0 0 - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4094852824 Features 0 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4094852824 Events 0 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4094852824 Features 0 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15 #3989372080
-TrigSignatureMoniMT INFO -- #3989372080 Events 20 0 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3989372080 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3989372080 Events 20 0 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3989372080 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_beamspot_trkFS_trkfast_BeamSpotPEB_L1J15 #628534730
-TrigSignatureMoniMT INFO -- #628534730 Events 20 0 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #628534730 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #628534730 Events 20 0 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #628534730 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480
-TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_cscmon_L1All #1000936179
-TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e12_lhloose_2mu10_L12MU10 #4167710884
-TrigSignatureMoniMT INFO -- #4167710884 Events 3 3 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4167710884 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #4167710884 Events 3 3 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4167710884 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710
-TrigSignatureMoniMT INFO -- #3471067710 Events 6 6 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3471067710 Events 6 6 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_nod0_L1EM22VHI #4128870680
-TrigSignatureMoniMT INFO -- #4128870680 Events 6 6 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #4128870680 Events 6 6 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e17_lhloose_mu14_L1EM15VH_MU10 #899946230
-TrigSignatureMoniMT INFO -- #899946230 Events 3 3 2 2 2 2 2 2 2 2 - - - - 2
-TrigSignatureMoniMT INFO -- #899946230 Features 2 45 4 2 2 2 2 2 - - - -
+TrigSignatureMoniMT INFO -- #899946230 Events 3 3 2 2 2 2 2 2 2 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #899946230 Features 2 45 4 2 2 2 2 2 - - - - -
TrigSignatureMoniMT INFO HLT_e17_lhvloose_nod0_L1EM15VH #140779220
-TrigSignatureMoniMT INFO -- #140779220 Events 8 8 6 6 6 5 - - - - - - - - 5
-TrigSignatureMoniMT INFO -- #140779220 Features 6 78 10 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #140779220 Events 8 8 6 6 6 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #140779220 Features 6 78 10 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3 #1784800924
-TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH #2668628593
-TrigSignatureMoniMT INFO -- #2668628593 Events 2 2 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2668628593 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2668628593 Events 2 2 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2668628593 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e24_lhmedium_g25_medium_L12EM20VH #2785977835
-TrigSignatureMoniMT INFO -- #2785977835 Events 2 2 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2785977835 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2785977835 Events 2 2 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2785977835 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH #9348946
-TrigSignatureMoniMT INFO -- #9348946 Events 2 2 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #9348946 Events 2 2 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
-TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - - - - - - - - 6
-TrigSignatureMoniMT INFO -- #1703681121 Features 7 133 7 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #1703681121 Features 7 133 7 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM22VHI #1995263521
-TrigSignatureMoniMT INFO -- #1995263521 Events 6 6 5 5 5 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #1995263521 Features 5 64 8 4 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1995263521 Events 6 6 5 5 5 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #1995263521 Features 5 64 8 4 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e26_lhtight_ivarloose_L1EM22VHI #2918307206
+TrigSignatureMoniMT INFO -- #2918307206 Events 6 6 5 5 5 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2918307206 Features 5 64 8 3 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e26_lhtight_ivarmedium_L1EM22VHI #2653558903
+TrigSignatureMoniMT INFO -- #2653558903 Events 6 6 5 5 5 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2653558903 Features 5 64 8 3 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e26_lhtight_ivartight_L1EM22VHI #1679339192
+TrigSignatureMoniMT INFO -- #1679339192 Events 6 6 5 5 5 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #1679339192 Features 5 64 8 3 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM22VHI #939763520
-TrigSignatureMoniMT INFO -- #939763520 Events 6 6 5 5 5 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #939763520 Features 5 64 8 4 - - - - - - - -
+TrigSignatureMoniMT INFO -- #939763520 Events 6 6 5 5 5 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #939763520 Features 5 64 8 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM24VHI #4227411116
-TrigSignatureMoniMT INFO -- #4227411116 Events 6 6 5 5 5 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #4227411116 Features 5 64 8 4 - - - - - - - -
+TrigSignatureMoniMT INFO -- #4227411116 Events 6 6 5 5 5 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #4227411116 Features 5 64 8 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM22VHI #2128128255
-TrigSignatureMoniMT INFO -- #2128128255 Events 6 6 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2128128255 Events 6 6 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut1step_g5_etcut_L12EM3 #1745513164
-TrigSignatureMoniMT INFO -- #1745513164 Events 20 20 17 17 17 - - - - - - - - - 17
-TrigSignatureMoniMT INFO -- #1745513164 Features 55 55 55 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1745513164 Events 20 20 17 17 17 - - - - - - - - - - 17
+TrigSignatureMoniMT INFO -- #1745513164 Features 55 55 55 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
-TrigSignatureMoniMT INFO -- #683953566 Events 20 20 20 20 20 - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #683953566 Features 171 1839 390 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #683953566 Events 20 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #683953566 Features 171 1838 390 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 20 20 20 - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #324908483 Features 137 1652 190 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #324908483 Events 20 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #324908483 Features 137 1652 190 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_L1EM3 #736648247
-TrigSignatureMoniMT INFO -- #736648247 Events 20 20 18 18 18 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #736648247 Features 54 586 109 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #736648247 Events 20 20 18 18 18 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #736648247 Features 54 585 109 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #1053337356 Features 56 652 116 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #1053337356 Features 56 650 116 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_L1EM3 #2713915187
-TrigSignatureMoniMT INFO -- #2713915187 Events 20 20 18 18 18 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #2713915187 Features 53 581 106 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2713915187 Events 20 20 18 18 18 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2713915187 Features 53 580 106 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 16 16 16 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #176627878 Features 48 532 93 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #176627878 Events 20 20 16 16 16 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #176627878 Features 48 531 93 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_L1EM3 #2070133824
-TrigSignatureMoniMT INFO -- #2070133824 Events 20 20 18 18 18 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #2070133824 Features 51 562 101 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2070133824 Events 20 20 18 18 18 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2070133824 Features 51 561 101 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_nod0_L1EM3 #3303895627
-TrigSignatureMoniMT INFO -- #3303895627 Events 20 20 18 18 18 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #3303895627 Features 51 562 101 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3303895627 Events 20 20 18 18 18 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #3303895627 Features 51 561 101 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #2758326765 Features 45 514 84 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2758326765 Features 45 513 84 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_nod0_L1EM3 #1690619419
-TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 16 16 16 4 - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #1690619419 Features 45 514 84 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 16 16 16 4 - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #1690619419 Features 45 513 84 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM22VHI #298591874
-TrigSignatureMoniMT INFO -- #298591874 Events 6 6 2 2 2 2 - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #298591874 Features 2 33 4 2 - - - - - - - -
+TrigSignatureMoniMT INFO -- #298591874 Events 6 6 2 2 2 2 - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #298591874 Features 2 33 4 2 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_nod0_L1EM22VHI #4115486024
-TrigSignatureMoniMT INFO -- #4115486024 Events 6 6 2 2 2 2 - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #4115486024 Features 2 33 4 2 - - - - - - - -
+TrigSignatureMoniMT INFO -- #4115486024 Events 6 6 2 2 2 2 - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #4115486024 Features 2 33 4 2 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 20 20 20 - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1959043579 Features 89 1132 112 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1959043579 Features 89 1131 112 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_lhmedium_mu24_L1MU20 #2970063918
-TrigSignatureMoniMT INFO -- #2970063918 Events 8 8 7 7 7 2 2 1 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #2970063918 Features 9 92 17 2 2 1 1 1 - - - -
+TrigSignatureMoniMT INFO -- #2970063918 Events 8 8 7 7 7 2 2 1 1 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #2970063918 Features 9 92 17 2 2 1 1 1 - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM22VHI #3879926061
-TrigSignatureMoniMT INFO -- #3879926061 Events 6 6 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3879926061 Events 6 6 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
-TrigSignatureMoniMT INFO -- #1045486446 Events 6 6 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1045486446 Events 6 6 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_loose_L1EM22VHI #1776910226
-TrigSignatureMoniMT INFO -- #1776910226 Events 6 6 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1776910226 Events 6 6 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
-TrigSignatureMoniMT INFO -- #2706532790 Events 14 14 14 14 12 12 - - - - - - - - 12
-TrigSignatureMoniMT INFO -- #2706532790 Features 24 24 22 20 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2706532790 Events 14 14 14 14 12 12 - - - - - - - - - 12
+TrigSignatureMoniMT INFO -- #2706532790 Features 24 24 22 20 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_L1EM15VH #270010748
+TrigSignatureMoniMT INFO -- #270010748 Events 8 8 8 8 8 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #270010748 Features 8 8 16 5 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_icaloloose_L1EM15VH #4091638976
+TrigSignatureMoniMT INFO -- #4091638976 Events 8 8 8 8 8 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #4091638976 Features 8 8 16 5 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_icalomedium_L1EM15VH #2032419080
+TrigSignatureMoniMT INFO -- #2032419080 Events 8 8 8 8 8 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #2032419080 Features 8 8 16 5 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_icalotight_L1EM15VH #2824200612
+TrigSignatureMoniMT INFO -- #2824200612 Events 8 8 8 8 8 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2824200612 Features 8 8 16 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_etcut_L1EM20VH #1417839619
-TrigSignatureMoniMT INFO -- #1417839619 Events 7 7 7 7 7 - - - - - - - - - 7
-TrigSignatureMoniMT INFO -- #1417839619 Features 11 11 10 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1417839619 Events 7 7 7 7 7 - - - - - - - - - - 7
+TrigSignatureMoniMT INFO -- #1417839619 Features 11 11 10 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_loose_L1EM20VH #3476696431
-TrigSignatureMoniMT INFO -- #3476696431 Events 7 7 7 7 7 6 - - - - - - - - 6
-TrigSignatureMoniMT INFO -- #3476696431 Features 9 9 18 7 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3476696431 Events 7 7 7 7 7 6 - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #3476696431 Features 9 9 18 7 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_L1EM20VH #1519793981
-TrigSignatureMoniMT INFO -- #1519793981 Events 7 7 7 7 7 6 - - - - - - - - 6
-TrigSignatureMoniMT INFO -- #1519793981 Features 7 7 13 6 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1519793981 Events 7 7 7 7 7 6 - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #1519793981 Features 7 7 13 6 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_mu24_ivarmedium_L1MU20 #1007052793
-TrigSignatureMoniMT INFO -- #1007052793 Events 8 8 2 2 2 2 2 1 1 1 0 - - - 0
-TrigSignatureMoniMT INFO -- #1007052793 Features 2 2 4 2 2 1 1 1 0 - - -
+TrigSignatureMoniMT INFO -- #1007052793 Events 8 8 2 2 2 2 2 1 1 1 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1007052793 Features 2 2 4 2 2 1 1 1 0 - - - -
TrigSignatureMoniMT INFO HLT_g25_tight_L1EM20VH #3370790749
-TrigSignatureMoniMT INFO -- #3370790749 Events 7 7 7 7 7 5 - - - - - - - - 5
-TrigSignatureMoniMT INFO -- #3370790749 Features 7 7 13 5 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3370790749 Events 7 7 7 7 7 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #3370790749 Features 7 7 13 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g300_etcut_L1EM22VHI #310189774
-TrigSignatureMoniMT INFO -- #310189774 Events 6 6 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #310189774 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #310189774 Events 6 6 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #310189774 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g35_loose_mu18_L1EM24VHI #3939387897
-TrigSignatureMoniMT INFO -- #3939387897 Events 6 6 2 2 2 2 2 1 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #3939387897 Features 2 2 4 2 2 1 1 1 - - - -
+TrigSignatureMoniMT INFO -- #3939387897 Events 6 6 2 2 2 2 2 1 1 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #3939387897 Features 2 2 4 2 2 1 1 1 - - - - -
TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
-TrigSignatureMoniMT INFO -- #1158879722 Events 2 2 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1158879722 Events 2 2 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 #471243435
-TrigSignatureMoniMT INFO -- #471243435 Events 20 20 20 20 20 - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #471243435 Features 137 137 190 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #471243435 Events 20 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #471243435 Features 137 137 190 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 #3486231698
-TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 20 20 20 20 - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3486231698 Features 137 137 190 118 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 20 20 20 20 - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3486231698 Features 137 137 190 118 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 #3230088967
-TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 17 17 17 9 - - - - - - - - 9
-TrigSignatureMoniMT INFO -- #3230088967 Features 56 56 116 12 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 17 17 17 9 - - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #3230088967 Features 56 56 116 12 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 #385248610
-TrigSignatureMoniMT INFO -- #385248610 Events 20 20 16 16 16 9 - - - - - - - - 9
-TrigSignatureMoniMT INFO -- #385248610 Features 48 48 93 12 - - - - - - - -
+TrigSignatureMoniMT INFO -- #385248610 Events 20 20 16 16 16 9 - - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #385248610 Features 48 48 93 12 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
-TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 16 16 16 9 - - - - - - - - 9
-TrigSignatureMoniMT INFO -- #3280865118 Features 45 45 84 9 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 16 16 16 9 - - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #3280865118 Features 45 45 84 9 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
-TrigSignatureMoniMT INFO -- #1341875780 Events 0 0 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1341875780 Events 0 0 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 402 - -
+TrigSignatureMoniMT INFO -- #4034799151 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - - 15
+TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 402 - - -
TrigSignatureMoniMT INFO HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100 #219711753
-TrigSignatureMoniMT INFO -- #219711753 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #219711753 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #219711753 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #219711753 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3084792704 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
-TrigSignatureMoniMT INFO -- #3769257182 Events 2 2 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3769257182 Events 2 2 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_bmv2c1060_split_L1J100 #710546402
-TrigSignatureMoniMT INFO -- #710546402 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #710546402 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #710546402 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #710546402 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_boffperf_split_L1J100 #540369970
-TrigSignatureMoniMT INFO -- #540369970 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #540369970 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #540369970 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #540369970 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100 #2074989613
-TrigSignatureMoniMT INFO -- #2074989613 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2074989613 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2074989613 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2074989613 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100 #4176355792
-TrigSignatureMoniMT INFO -- #4176355792 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #4176355792 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #4176355792 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #4176355792 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
-TrigSignatureMoniMT INFO -- #2659902019 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j420_subjesgscIS_ftf_L1J20 #2116995085
-TrigSignatureMoniMT INFO -- #2116995085 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2116995085 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2659902019 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_j420_pf_subresjesgscIS_ftf_L1J100 #3936932891
+TrigSignatureMoniMT INFO -- #3936932891 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3936932891 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_j420_subresjesgscIS_ftf_L1J100 #2477128298
+TrigSignatureMoniMT INFO -- #2477128298 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2477128298 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
-TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 49 - -
+TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - - 19
+TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 49 - - -
TrigSignatureMoniMT INFO HLT_j45_csskpf_nojcalib_ftf_L1J20 #2528888897
-TrigSignatureMoniMT INFO -- #2528888897 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - 16
-TrigSignatureMoniMT INFO -- #2528888897 Features 0 0 0 0 0 0 0 0 0 30 - -
+TrigSignatureMoniMT INFO -- #2528888897 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - - 16
+TrigSignatureMoniMT INFO -- #2528888897 Features 0 0 0 0 0 0 0 0 0 31 - - -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
-TrigSignatureMoniMT INFO -- #3295122398 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 27 - -
+TrigSignatureMoniMT INFO -- #3295122398 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - - 15
+TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 27 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 49 - -
+TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - - 19
+TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 49 - - -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
-TrigSignatureMoniMT INFO -- #2042444294 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - 17
-TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 39 - -
+TrigSignatureMoniMT INFO -- #2042444294 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - - 17
+TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 39 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_ftf_L1J20 #3679554988
-TrigSignatureMoniMT INFO -- #3679554988 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - 18
-TrigSignatureMoniMT INFO -- #3679554988 Features 0 0 0 0 0 0 0 0 0 38 - -
+TrigSignatureMoniMT INFO -- #3679554988 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - - 18
+TrigSignatureMoniMT INFO -- #3679554988 Features 0 0 0 0 0 0 0 0 0 39 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_nojcalib_ftf_L1J20 #4202219904
-TrigSignatureMoniMT INFO -- #4202219904 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - 17
-TrigSignatureMoniMT INFO -- #4202219904 Features 0 0 0 0 0 0 0 0 0 37 - -
+TrigSignatureMoniMT INFO -- #4202219904 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - - 17
+TrigSignatureMoniMT INFO -- #4202219904 Features 0 0 0 0 0 0 0 0 0 38 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_subjesgscIS_ftf_L1J20 #2187173741
-TrigSignatureMoniMT INFO -- #2187173741 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - 18
-TrigSignatureMoniMT INFO -- #2187173741 Features 0 0 0 0 0 0 0 0 0 38 - -
+TrigSignatureMoniMT INFO -- #2187173741 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - - 18
+TrigSignatureMoniMT INFO -- #2187173741 Features 0 0 0 0 0 0 0 0 0 39 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_subresjesgscIS_ftf_L1J20 #3567642453
-TrigSignatureMoniMT INFO -- #3567642453 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - 18
-TrigSignatureMoniMT INFO -- #3567642453 Features 0 0 0 0 0 0 0 0 0 38 - -
+TrigSignatureMoniMT INFO -- #3567642453 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - - 18
+TrigSignatureMoniMT INFO -- #3567642453 Features 0 0 0 0 0 0 0 0 0 39 - - -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
-TrigSignatureMoniMT INFO -- #1542468090 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 26 - -
+TrigSignatureMoniMT INFO -- #1542468090 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - - 15
+TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 26 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_011jvt_L1J15 #266323220
-TrigSignatureMoniMT INFO -- #266323220 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #266323220 Features 0 0 0 0 0 0 0 0 0 32 - -
+TrigSignatureMoniMT INFO -- #266323220 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - - 15
+TrigSignatureMoniMT INFO -- #266323220 Features 0 0 0 0 0 0 0 0 0 32 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_015jvt_L1J15 #3102941497
-TrigSignatureMoniMT INFO -- #3102941497 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #3102941497 Features 0 0 0 0 0 0 0 0 0 32 - -
+TrigSignatureMoniMT INFO -- #3102941497 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - - 15
+TrigSignatureMoniMT INFO -- #3102941497 Features 0 0 0 0 0 0 0 0 0 32 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_059jvt_L1J15 #2237035634
-TrigSignatureMoniMT INFO -- #2237035634 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #2237035634 Features 0 0 0 0 0 0 0 0 0 32 - -
+TrigSignatureMoniMT INFO -- #2237035634 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - - 15
+TrigSignatureMoniMT INFO -- #2237035634 Features 0 0 0 0 0 0 0 0 0 32 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_L1J15 #1960278431
-TrigSignatureMoniMT INFO -- #1960278431 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #1960278431 Features 0 0 0 0 0 0 0 0 0 50 - -
+TrigSignatureMoniMT INFO -- #1960278431 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - - 19
+TrigSignatureMoniMT INFO -- #1960278431 Features 0 0 0 0 0 0 0 0 0 50 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20 #980453000
-TrigSignatureMoniMT INFO -- #980453000 Events 19 19 0 0 0 0 0 0 0 0 0 19 11 - 11
-TrigSignatureMoniMT INFO -- #980453000 Features 0 0 0 0 0 0 0 0 0 49 21 -
+TrigSignatureMoniMT INFO -- #980453000 Events 19 19 0 0 0 0 0 0 0 0 0 19 11 - - 11
+TrigSignatureMoniMT INFO -- #980453000 Features 0 0 0 0 0 0 0 0 0 49 20 - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20 #3374916154
-TrigSignatureMoniMT INFO -- #3374916154 Events 19 19 0 0 0 0 0 0 0 0 0 19 19 - 19
-TrigSignatureMoniMT INFO -- #3374916154 Features 0 0 0 0 0 0 0 0 0 49 49 -
+TrigSignatureMoniMT INFO -- #3374916154 Events 19 19 0 0 0 0 0 0 0 0 0 19 19 - - 19
+TrigSignatureMoniMT INFO -- #3374916154 Features 0 0 0 0 0 0 0 0 0 49 49 - -
TrigSignatureMoniMT INFO HLT_j45_subresjesgscIS_ftf_L1J15 #1213239619
-TrigSignatureMoniMT INFO -- #1213239619 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #1213239619 Features 0 0 0 0 0 0 0 0 0 45 - -
+TrigSignatureMoniMT INFO -- #1213239619 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - - 19
+TrigSignatureMoniMT INFO -- #1213239619 Features 0 0 0 0 0 0 0 0 0 45 - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
-TrigSignatureMoniMT INFO -- #3327656707 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3327656707 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #215408633 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #215408633 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 #1151767619
-TrigSignatureMoniMT INFO -- #1151767619 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1151767619 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1151767619 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1151767619 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3875082669 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3781128663
-TrigSignatureMoniMT INFO -- #3781128663 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3781128663 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3781128663 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3781128663 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_L1J100 #1509950051
-TrigSignatureMoniMT INFO -- #1509950051 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1509950051 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1509950051 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1509950051 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #249842682
-TrigSignatureMoniMT INFO -- #249842682 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #249842682 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #249842682 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #249842682 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_L1J100 #3452032818
-TrigSignatureMoniMT INFO -- #3452032818 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3452032818 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3452032818 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3452032818 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_lcw_nojcalib_L1J100 #3093997295
-TrigSignatureMoniMT INFO -- #3093997295 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3093997295 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3093997295 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3093997295 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_pf_nojcalib_ftf_L1J100 #2138269254
-TrigSignatureMoniMT INFO -- #2138269254 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2138269254 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2138269254 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2138269254 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
-TrigSignatureMoniMT INFO -- #2296827117 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2296827117 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
-TrigSignatureMoniMT INFO -- #436385969 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #436385969 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100 #3224465417
-TrigSignatureMoniMT INFO -- #3224465417 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3224465417 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3224465417 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3224465417 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_L1J100 #1966129844
-TrigSignatureMoniMT INFO -- #1966129844 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1966129844 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1966129844 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1966129844 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
-TrigSignatureMoniMT INFO -- #3634067472 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3634067472 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j80_L1J15 #2440872308
-TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 0 0 0 0 0 0 0 0 0 13 - - 13
-TrigSignatureMoniMT INFO -- #2440872308 Features 0 0 0 0 0 0 0 0 0 23 - -
+TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 0 0 0 0 0 0 0 0 0 13 - - - 13
+TrigSignatureMoniMT INFO -- #2440872308 Features 0 0 0 0 0 0 0 0 0 23 - - -
TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 #582699527
-TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #582699527 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #582699527 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 19 19 0 0 0 0 0 0 0 0 0 13 - - 13
-TrigSignatureMoniMT INFO -- #510475538 Features 0 0 0 0 0 0 0 0 0 21 - -
+TrigSignatureMoniMT INFO -- #510475538 Events 19 19 0 0 0 0 0 0 0 0 0 13 - - - 13
+TrigSignatureMoniMT INFO -- #510475538 Features 0 0 0 0 0 0 0 0 0 21 - - -
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 19 19 0 0 0 0 0 0 0 0 0 13 - - 13
-TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 21 - -
+TrigSignatureMoniMT INFO -- #877042532 Events 19 19 0 0 0 0 0 0 0 0 0 13 - - - 13
+TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 21 - - -
TrigSignatureMoniMT INFO HLT_j85_pf_ftf_L1J20 #789444389
-TrigSignatureMoniMT INFO -- #789444389 Events 19 19 0 0 0 0 0 0 0 0 0 10 - - 10
-TrigSignatureMoniMT INFO -- #789444389 Features 0 0 0 0 0 0 0 0 0 14 - -
+TrigSignatureMoniMT INFO -- #789444389 Events 19 19 0 0 0 0 0 0 0 0 0 10 - - - 10
+TrigSignatureMoniMT INFO -- #789444389 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
-TrigSignatureMoniMT INFO -- #4097312640 Events 20 0 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4097312640 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4097312640 Events 20 0 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4097312640 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU20 #997163309
-TrigSignatureMoniMT INFO -- #997163309 Events 8 8 0 0 0 0 0 - - - - - - - 0
-TrigSignatureMoniMT INFO -- #997163309 Features 0 0 0 0 0 - - - - - - -
+TrigSignatureMoniMT INFO -- #997163309 Events 8 8 0 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #997163309 Features 0 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4_EMPTY #782182242
-TrigSignatureMoniMT INFO -- #782182242 Events 0 0 0 0 0 0 0 - - - - - - - 0
-TrigSignatureMoniMT INFO -- #782182242 Features 0 0 0 0 0 - - - - - - -
+TrigSignatureMoniMT INFO -- #782182242 Events 0 0 0 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #782182242 Features 0 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu10_L1MU10 #209090273
-TrigSignatureMoniMT INFO -- #209090273 Events 10 10 0 0 0 0 10 10 10 9 - - - - 9
-TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 13 12 13 11 - - - -
+TrigSignatureMoniMT INFO -- #209090273 Events 10 10 0 0 0 0 10 10 10 9 - - - - - 9
+TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 12 12 13 11 - - - - -
TrigSignatureMoniMT INFO HLT_mu10_ivarmedium_mu10_10invm70_L12MU10 #2386882549
-TrigSignatureMoniMT INFO -- #2386882549 Events 3 3 0 0 0 0 3 2 2 2 2 - - - 2
-TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 6 4 4 4 2 - - -
+TrigSignatureMoniMT INFO -- #2386882549 Events 3 3 0 0 0 0 2 2 2 2 2 - - - - 2
+TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 4 4 4 4 2 - - - -
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 #48780310
-TrigSignatureMoniMT INFO -- #48780310 Events 10 10 0 0 0 0 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #48780310 Features 0 0 0 0 0 0 - - - - - -
+TrigSignatureMoniMT INFO -- #48780310 Events 10 10 0 0 0 0 0 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #48780310 Features 0 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bBmumu_L1MU11_2MU6 #947854469
-TrigSignatureMoniMT INFO -- #947854469 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #947854469 Features 0 0 0 0 8 0 6 0 - - - -
+TrigSignatureMoniMT INFO -- #947854469 Events 4 4 0 0 0 0 3 0 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #947854469 Features 0 0 0 0 6 0 4 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bDimu2700_L1MU11_2MU6 #4293593869
-TrigSignatureMoniMT INFO -- #4293593869 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4293593869 Features 0 0 0 0 8 0 6 0 - - - -
+TrigSignatureMoniMT INFO -- #4293593869 Events 4 4 0 0 0 0 3 0 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4293593869 Features 0 0 0 0 6 0 4 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bDimu_L1MU11_2MU6 #2381335347
-TrigSignatureMoniMT INFO -- #2381335347 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2381335347 Features 0 0 0 0 8 0 6 0 - - - -
+TrigSignatureMoniMT INFO -- #2381335347 Events 4 4 0 0 0 0 3 0 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2381335347 Features 0 0 0 0 6 0 4 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6 #2504965945
-TrigSignatureMoniMT INFO -- #2504965945 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2504965945 Features 0 0 0 0 8 0 6 0 - - - -
+TrigSignatureMoniMT INFO -- #2504965945 Events 4 4 0 0 0 0 3 0 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2504965945 Features 0 0 0 0 6 0 4 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bPhi_L1MU11_2MU6 #2079901197
-TrigSignatureMoniMT INFO -- #2079901197 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2079901197 Features 0 0 0 0 8 0 6 0 - - - -
+TrigSignatureMoniMT INFO -- #2079901197 Events 4 4 0 0 0 0 3 0 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2079901197 Features 0 0 0 0 6 0 4 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bTau_L1MU11_2MU6 #1292401093
-TrigSignatureMoniMT INFO -- #1292401093 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1292401093 Features 0 0 0 0 8 0 6 0 - - - -
+TrigSignatureMoniMT INFO -- #1292401093 Events 4 4 0 0 0 0 3 0 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1292401093 Features 0 0 0 0 6 0 4 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6 #1171632195
-TrigSignatureMoniMT INFO -- #1171632195 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 8 0 6 0 - - - -
+TrigSignatureMoniMT INFO -- #1171632195 Events 4 4 0 0 0 0 3 0 2 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 6 0 4 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu14_L1MU10 #1696906927
-TrigSignatureMoniMT INFO -- #1696906927 Events 10 10 0 0 0 0 10 7 7 7 - - - - 7
-TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 13 8 8 8 - - - -
+TrigSignatureMoniMT INFO -- #1696906927 Events 10 10 0 0 0 0 10 8 8 7 - - - - - 7
+TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 12 9 10 8 - - - - -
TrigSignatureMoniMT INFO HLT_mu20_2mu4noL1_L1MU20 #1029128679
-TrigSignatureMoniMT INFO -- #1029128679 Events 8 8 0 0 0 0 8 5 5 5 0 0 1 1 1
-TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 10 6 6 6 0 0 2 2
+TrigSignatureMoniMT INFO -- #1029128679 Events 8 8 0 0 0 0 8 5 5 5 0 0 0 1 1 1
+TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 10 6 6 6 0 0 0 2 2
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526
-TrigSignatureMoniMT INFO -- #2083734526 Events 10 10 0 0 0 0 10 5 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 14 6 5 - - - - -
+TrigSignatureMoniMT INFO -- #2083734526 Events 10 10 0 0 0 0 10 6 5 - - - - - - 5
+TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 13 7 5 - - - - - -
TrigSignatureMoniMT INFO HLT_mu20_ivarmedium_mu8noL1_L1MU20 #3249386942
-TrigSignatureMoniMT INFO -- #3249386942 Events 8 8 0 0 0 0 8 5 5 5 3 0 1 1 1
-TrigSignatureMoniMT INFO -- #3249386942 Features 0 0 0 0 10 6 6 6 3 0 1 1
+TrigSignatureMoniMT INFO -- #3249386942 Events 8 8 0 0 0 0 8 5 5 5 3 0 0 1 1 1
+TrigSignatureMoniMT INFO -- #3249386942 Features 0 0 0 0 10 6 6 6 3 0 0 1 1
TrigSignatureMoniMT INFO HLT_mu22_2mu4noL1_L1MU20 #3427670100
-TrigSignatureMoniMT INFO -- #3427670100 Events 8 8 0 0 0 0 8 5 5 5 0 0 1 1 1
-TrigSignatureMoniMT INFO -- #3427670100 Features 0 0 0 0 10 6 6 6 0 0 2 2
+TrigSignatureMoniMT INFO -- #3427670100 Events 8 8 0 0 0 0 8 5 4 4 0 0 0 1 1 1
+TrigSignatureMoniMT INFO -- #3427670100 Features 0 0 0 0 10 6 5 5 0 0 0 2 2
TrigSignatureMoniMT INFO HLT_mu22_mu8noL1_L1MU20 #3165652409
-TrigSignatureMoniMT INFO -- #3165652409 Events 8 8 0 0 0 0 8 5 5 5 0 0 2 2 2
-TrigSignatureMoniMT INFO -- #3165652409 Features 0 0 0 0 10 6 6 6 0 0 3 3
+TrigSignatureMoniMT INFO -- #3165652409 Events 8 8 0 0 0 0 8 5 4 4 0 0 0 2 2 2
+TrigSignatureMoniMT INFO -- #3165652409 Features 0 0 0 0 10 6 5 5 0 0 0 3 3
TrigSignatureMoniMT INFO HLT_mu24_2mu4noL1_L1MU20 #3233544630
-TrigSignatureMoniMT INFO -- #3233544630 Events 8 8 0 0 0 0 8 5 5 5 0 0 1 1 1
-TrigSignatureMoniMT INFO -- #3233544630 Features 0 0 0 0 10 6 6 6 0 0 2 2
+TrigSignatureMoniMT INFO -- #3233544630 Events 8 8 0 0 0 0 8 5 4 4 0 0 0 1 1 1
+TrigSignatureMoniMT INFO -- #3233544630 Features 0 0 0 0 10 6 5 5 0 0 0 2 2
TrigSignatureMoniMT INFO HLT_mu24_L1MU20 #417425162
-TrigSignatureMoniMT INFO -- #417425162 Events 8 8 0 0 0 0 8 5 5 5 - - - - 5
-TrigSignatureMoniMT INFO -- #417425162 Features 0 0 0 0 10 6 6 6 - - - -
+TrigSignatureMoniMT INFO -- #417425162 Events 8 8 0 0 0 0 8 5 4 4 - - - - - 4
+TrigSignatureMoniMT INFO -- #417425162 Features 0 0 0 0 10 6 5 5 - - - - -
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
-TrigSignatureMoniMT INFO -- #677658909 Events 8 8 0 0 0 0 6 6 6 6 - - - - 6
-TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 7 7 7 7 - - - -
+TrigSignatureMoniMT INFO -- #677658909 Events 8 8 0 0 0 0 6 6 5 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 7 7 6 6 - - - - -
TrigSignatureMoniMT INFO HLT_mu24_ivarmedium_L1MU20 #737407430
-TrigSignatureMoniMT INFO -- #737407430 Events 8 8 0 0 0 0 8 5 5 5 3 - - - 3
-TrigSignatureMoniMT INFO -- #737407430 Features 0 0 0 0 10 6 6 6 3 - - -
+TrigSignatureMoniMT INFO -- #737407430 Events 8 8 0 0 0 0 8 5 4 4 2 - - - - 2
+TrigSignatureMoniMT INFO -- #737407430 Features 0 0 0 0 10 6 5 5 2 - - - -
TrigSignatureMoniMT INFO HLT_mu24_mu10noL1_L1MU20 #2563354236
-TrigSignatureMoniMT INFO -- #2563354236 Events 8 8 0 0 0 0 8 5 5 5 0 0 2 2 2
-TrigSignatureMoniMT INFO -- #2563354236 Features 0 0 0 0 10 6 6 6 0 0 3 3
+TrigSignatureMoniMT INFO -- #2563354236 Events 8 8 0 0 0 0 8 5 4 4 0 0 0 2 2 2
+TrigSignatureMoniMT INFO -- #2563354236 Features 0 0 0 0 10 6 5 5 0 0 0 3 3
TrigSignatureMoniMT INFO HLT_mu26_L1MU20 #311138376
-TrigSignatureMoniMT INFO -- #311138376 Events 8 8 0 0 0 0 8 5 4 3 - - - - 3
-TrigSignatureMoniMT INFO -- #311138376 Features 0 0 0 0 10 6 5 4 - - - -
+TrigSignatureMoniMT INFO -- #311138376 Events 8 8 0 0 0 0 8 5 4 3 - - - - - 3
+TrigSignatureMoniMT INFO -- #311138376 Features 0 0 0 0 10 6 5 4 - - - - -
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 #3411723090
-TrigSignatureMoniMT INFO -- #3411723090 Events 8 8 0 0 0 0 8 5 4 3 2 - - - 2
-TrigSignatureMoniMT INFO -- #3411723090 Features 0 0 0 0 10 6 5 4 2 - - -
+TrigSignatureMoniMT INFO -- #3411723090 Events 8 8 0 0 0 0 8 5 4 3 2 - - - - 2
+TrigSignatureMoniMT INFO -- #3411723090 Features 0 0 0 0 10 6 5 4 2 - - - -
TrigSignatureMoniMT INFO HLT_mu26_mu10noL1_L1MU20 #2318302287
-TrigSignatureMoniMT INFO -- #2318302287 Events 8 8 0 0 0 0 8 5 4 3 0 0 1 1 1
-TrigSignatureMoniMT INFO -- #2318302287 Features 0 0 0 0 10 6 5 4 0 0 2 2
+TrigSignatureMoniMT INFO -- #2318302287 Events 8 8 0 0 0 0 8 5 4 3 0 0 0 1 1 1
+TrigSignatureMoniMT INFO -- #2318302287 Features 0 0 0 0 10 6 5 4 0 0 0 2 2
TrigSignatureMoniMT INFO HLT_mu26_mu8noL1_L1MU20 #2233067926
-TrigSignatureMoniMT INFO -- #2233067926 Events 8 8 0 0 0 0 8 5 4 3 0 0 1 1 1
-TrigSignatureMoniMT INFO -- #2233067926 Features 0 0 0 0 10 6 5 4 0 0 2 2
+TrigSignatureMoniMT INFO -- #2233067926 Events 8 8 0 0 0 0 8 5 4 3 0 0 0 1 1 1
+TrigSignatureMoniMT INFO -- #2233067926 Features 0 0 0 0 10 6 5 4 0 0 0 2 2
TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 #1963262787
-TrigSignatureMoniMT INFO -- #1963262787 Events 8 8 0 0 0 0 8 5 4 3 2 - - - 2
-TrigSignatureMoniMT INFO -- #1963262787 Features 0 0 0 0 10 6 5 3 2 - - -
+TrigSignatureMoniMT INFO -- #1963262787 Events 8 8 0 0 0 0 8 5 4 3 2 - - - - 2
+TrigSignatureMoniMT INFO -- #1963262787 Features 0 0 0 0 10 6 5 3 2 - - - -
TrigSignatureMoniMT INFO HLT_mu28_mu8noL1_L1MU20 #86648125
-TrigSignatureMoniMT INFO -- #86648125 Events 8 8 0 0 0 0 8 5 4 3 0 0 1 1 1
-TrigSignatureMoniMT INFO -- #86648125 Features 0 0 0 0 10 6 5 3 0 0 1 1
+TrigSignatureMoniMT INFO -- #86648125 Events 8 8 0 0 0 0 8 5 4 3 0 0 0 1 1 1
+TrigSignatureMoniMT INFO -- #86648125 Features 0 0 0 0 10 6 5 3 0 0 0 1 1
TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
-TrigSignatureMoniMT INFO -- #597064890 Events 8 8 0 0 0 0 8 5 3 2 1 - - - 1
-TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 10 6 4 2 1 - - -
+TrigSignatureMoniMT INFO -- #597064890 Events 8 8 0 0 0 0 8 5 3 2 1 - - - - 1
+TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 10 6 4 2 1 - - - -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
-TrigSignatureMoniMT INFO -- #3657158931 Events 8 8 0 0 0 0 8 5 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 10 6 1 1 - - - -
+TrigSignatureMoniMT INFO -- #3657158931 Events 8 8 0 0 0 0 8 5 2 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 10 6 2 1 - - - - -
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 #827327262
-TrigSignatureMoniMT INFO -- #827327262 Events 8 8 0 0 0 0 8 5 1 1 1 - - - 1
-TrigSignatureMoniMT INFO -- #827327262 Features 0 0 0 0 10 6 1 1 1 - - -
+TrigSignatureMoniMT INFO -- #827327262 Events 8 8 0 0 0 0 8 5 2 1 1 - - - - 1
+TrigSignatureMoniMT INFO -- #827327262 Features 0 0 0 0 10 6 2 1 1 - - - -
TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 #1642591450
-TrigSignatureMoniMT INFO -- #1642591450 Events 8 8 0 0 0 0 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 0 2 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1642591450 Events 8 8 0 0 0 0 1 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 0 2 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu60_L1MU20 #2871837722
-TrigSignatureMoniMT INFO -- #2871837722 Events 8 8 0 0 0 0 8 5 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 10 6 1 1 - - - -
+TrigSignatureMoniMT INFO -- #2871837722 Events 8 8 0 0 0 0 8 5 1 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 10 6 1 1 - - - - -
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 10 10 0 0 0 0 10 10 - - - - - - 10
-TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 14 13 - - - - - -
+TrigSignatureMoniMT INFO -- #996392590 Events 10 10 0 0 0 0 10 10 - - - - - - - 10
+TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 13 12 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 10 10 0 0 0 0 10 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 14 13 16 15 - - - -
+TrigSignatureMoniMT INFO -- #2560542253 Events 10 10 0 0 0 0 10 10 10 10 - - - - - 10
+TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 13 12 13 13 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 10 10 0 0 0 0 10 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 14 14 17 17 - - - -
+TrigSignatureMoniMT INFO -- #934918532 Events 10 10 0 0 0 0 10 10 10 10 - - - - - 10
+TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 13 13 13 13 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 10 10 0 0 0 0 10 10 10 10 6 - - - 6
-TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 14 13 16 15 6 - - -
+TrigSignatureMoniMT INFO -- #1012713062 Events 10 10 0 0 0 0 10 10 10 10 6 - - - - 6
+TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 13 12 13 13 6 - - - -
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 10 10 0 0 0 0 10 0 10 - - - - - 10
-TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 14 0 17 - - - - -
+TrigSignatureMoniMT INFO -- #3895421032 Events 10 10 0 0 0 0 10 0 10 - - - - - - 10
+TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 13 0 13 - - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 4 4 0 0 0 0 4 4 4 4 - - - - 4
-TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 8 8 12 10 - - - -
+TrigSignatureMoniMT INFO -- #1713982776 Events 4 4 0 0 0 0 3 3 2 2 - - - - - 2
+TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 6 6 4 4 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 10 10 0 0 0 0 10 10 10 10 0 0 5 3 3
-TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 14 13 16 15 0 0 8 6
+TrigSignatureMoniMT INFO -- #451489897 Events 10 10 0 0 0 0 10 10 10 10 0 0 0 5 3 3
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 13 12 13 13 0 0 0 7 5
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 0 0 0 0 10 - - - - - - - 10
-TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 14 - - - - - - -
+TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 0 0 0 0 10 - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 13 - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu6fast_j45_nojcalib_L1J20 #1776326110
-TrigSignatureMoniMT INFO -- #1776326110 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1776326110 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu6fast_xe30_mht_L1XE10 #1876869651
-TrigSignatureMoniMT INFO -- #1876869651 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1876869651 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu80_L1MU20 #387900377
-TrigSignatureMoniMT INFO -- #387900377 Events 8 8 0 0 0 0 8 5 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 10 6 0 0 - - - -
+TrigSignatureMoniMT INFO -- #387900377 Events 8 8 0 0 0 0 8 5 1 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 10 6 1 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 #761101109
-TrigSignatureMoniMT INFO -- #761101109 Events 8 8 0 0 0 0 8 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 10 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #761101109 Events 8 8 0 0 0 0 8 0 1 - - - - - - 1
+TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 10 0 1 - - - - - -
TrigSignatureMoniMT INFO HLT_mu8_L1MU6 #1467711434
-TrigSignatureMoniMT INFO -- #1467711434 Events 10 10 0 0 0 0 10 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 14 13 15 15 - - - -
+TrigSignatureMoniMT INFO -- #1467711434 Events 10 10 0 0 0 0 10 10 10 10 - - - - - 10
+TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 13 12 13 13 - - - - -
+TrigSignatureMoniMT INFO HLT_noalg_L1All #2979253164
+TrigSignatureMoniMT INFO -- #2979253164 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2979253164 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo #355689512
-TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #355689512 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #355689512 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo_EMPTY #3717801557
-TrigSignatureMoniMT INFO -- #3717801557 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3717801557 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM10VH #314199913
-TrigSignatureMoniMT INFO -- #314199913 Events 11 11 - - - - - - - - - - - - 11
-TrigSignatureMoniMT INFO -- #314199913 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #314199913 Events 11 11 - - - - - - - - - - - - - 11
+TrigSignatureMoniMT INFO -- #314199913 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM12 #3885916609
-TrigSignatureMoniMT INFO -- #3885916609 Events 16 16 - - - - - - - - - - - - 16
-TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3885916609 Events 16 16 - - - - - - - - - - - - - 16
+TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15 #480733925
-TrigSignatureMoniMT INFO -- #480733925 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #480733925 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #480733925 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #480733925 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15VH #2374865899
-TrigSignatureMoniMT INFO -- #2374865899 Events 8 8 - - - - - - - - - - - - 8
-TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2374865899 Events 8 8 - - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM20VH #3719542824
-TrigSignatureMoniMT INFO -- #3719542824 Events 7 7 - - - - - - - - - - - - 7
-TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3719542824 Events 7 7 - - - - - - - - - - - - - 7
+TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM22VHI #1723589313
-TrigSignatureMoniMT INFO -- #1723589313 Events 6 6 - - - - - - - - - - - - 6
-TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1723589313 Events 6 6 - - - - - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM3 #4169267792
-TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM7 #3226970354
-TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM8VH #4065285611
-TrigSignatureMoniMT INFO -- #4065285611 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4065285611 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J100 #1026959128
-TrigSignatureMoniMT INFO -- #1026959128 Events 3 3 - - - - - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1026959128 Events 3 3 - - - - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J15 #1976430774
-TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J20 #2241112369
-TrigSignatureMoniMT INFO -- #2241112369 Events 19 19 - - - - - - - - - - - - 19
-TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2241112369 Events 19 19 - - - - - - - - - - - - - 19
+TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J25 #39428635
-TrigSignatureMoniMT INFO -- #39428635 Events 17 17 - - - - - - - - - - - - 17
-TrigSignatureMoniMT INFO -- #39428635 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #39428635 Events 17 17 - - - - - - - - - - - - - 17
+TrigSignatureMoniMT INFO -- #39428635 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J30 #3523994129
-TrigSignatureMoniMT INFO -- #3523994129 Events 17 17 - - - - - - - - - - - - 17
-TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3523994129 Events 17 17 - - - - - - - - - - - - - 17
+TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J40 #1497591431
-TrigSignatureMoniMT INFO -- #1497591431 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1497591431 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J400 #2494874701
-TrigSignatureMoniMT INFO -- #2494874701 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2494874701 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J50 #3346352675
-TrigSignatureMoniMT INFO -- #3346352675 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3346352675 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J75 #1651897827
-TrigSignatureMoniMT INFO -- #1651897827 Events 6 6 - - - - - - - - - - - - 6
-TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1651897827 Events 6 6 - - - - - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J85 #166231461
-TrigSignatureMoniMT INFO -- #166231461 Events 5 5 - - - - - - - - - - - - 5
-TrigSignatureMoniMT INFO -- #166231461 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #166231461 Events 5 5 - - - - - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #166231461 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1MBTS_1_1_EMPTY #3063661803
-TrigSignatureMoniMT INFO -- #3063661803 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3063661803 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3063661803 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3063661803 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1MBTS_1_EMPTY #4174355886
-TrigSignatureMoniMT INFO -- #4174355886 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4174355886 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4174355886 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4174355886 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1MBTS_2_EMPTY #2028932677
-TrigSignatureMoniMT INFO -- #2028932677 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2028932677 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2028932677 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2028932677 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_EMPTY #914660695
-TrigSignatureMoniMT INFO -- #914660695 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #914660695 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #914660695 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #914660695 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_FILLED #211699639
-TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #211699639 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #211699639 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Standby #420861540
-TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #420861540 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #420861540 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12 #4248050338
-TrigSignatureMoniMT INFO -- #4248050338 Events 18 18 - - - - - - - - - - - - 18
-TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4248050338 Events 18 18 - - - - - - - - - - - - - 18
+TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12IM #357557968
-TrigSignatureMoniMT INFO -- #357557968 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #357557968 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #357557968 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #357557968 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU20IM #1931583332
-TrigSignatureMoniMT INFO -- #1931583332 Events 10 10 - - - - - - - - - - - - 10
-TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1931583332 Events 10 10 - - - - - - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU30 #1944789678
-TrigSignatureMoniMT INFO -- #1944789678 Events 13 13 - - - - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1944789678 Events 13 13 - - - - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU40 #1394621652
-TrigSignatureMoniMT INFO -- #1394621652 Events 7 7 - - - - - - - - - - - - 7
-TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1394621652 Events 7 7 - - - - - - - - - - - - - 7
+TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU60 #3332424451
-TrigSignatureMoniMT INFO -- #3332424451 Events 5 5 - - - - - - - - - - - - 5
-TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3332424451 Events 5 5 - - - - - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE10 #1583053368
-TrigSignatureMoniMT INFO -- #1583053368 Events 19 19 - - - - - - - - - - - - 19
-TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1583053368 Events 19 19 - - - - - - - - - - - - - 19
+TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE30 #2047368922
-TrigSignatureMoniMT INFO -- #2047368922 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2047368922 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE300 #1315853555
-TrigSignatureMoniMT INFO -- #1315853555 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1315853555 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE35 #2313039014
-TrigSignatureMoniMT INFO -- #2313039014 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2313039014 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE40 #4293469116
-TrigSignatureMoniMT INFO -- #4293469116 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4293469116 Events 14 14 - - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE45 #2365048177
-TrigSignatureMoniMT INFO -- #2365048177 Events 13 13 - - - - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2365048177 Events 13 13 - - - - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE50 #1168752081
-TrigSignatureMoniMT INFO -- #1168752081 Events 10 10 - - - - - - - - - - - - 10
-TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1168752081 Events 10 10 - - - - - - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE55 #268928384
-TrigSignatureMoniMT INFO -- #268928384 Events 8 8 - - - - - - - - - - - - 8
-TrigSignatureMoniMT INFO -- #268928384 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #268928384 Events 8 8 - - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #268928384 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE60 #4154240531
-TrigSignatureMoniMT INFO -- #4154240531 Events 8 8 - - - - - - - - - - - - 8
-TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4154240531 Events 8 8 - - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE70 #3765216228
-TrigSignatureMoniMT INFO -- #3765216228 Events 4 4 - - - - - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3765216228 Events 4 4 - - - - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE80 #2742079961
-TrigSignatureMoniMT INFO -- #2742079961 Events 3 3 - - - - - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2742079961 Events 3 3 - - - - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_bkg_L1Bkg #2032528907
-TrigSignatureMoniMT INFO -- #2032528907 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2032528907 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM3_EMPTY #2458124284
-TrigSignatureMoniMT INFO -- #2458124284 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2458124284 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM7_EMPTY #299938202
-TrigSignatureMoniMT INFO -- #299938202 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #299938202 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #299938202 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #299938202 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_EMPTY #3144024902
-TrigSignatureMoniMT INFO -- #3144024902 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3144024902 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_FIRSTEMPTY #3840098930
-TrigSignatureMoniMT INFO -- #3840098930 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3840098930 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_31ETA49_EMPTY #4143623058
-TrigSignatureMoniMT INFO -- #4143623058 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4143623058 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_EMPTY #2991490897
-TrigSignatureMoniMT INFO -- #2991490897 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2991490897 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2991490897 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2991490897 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_FIRSTEMPTY #2214697960
-TrigSignatureMoniMT INFO -- #2214697960 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2214697960 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2214697960 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2214697960 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1RD1_EMPTY #3925252528
-TrigSignatureMoniMT INFO -- #3925252528 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3925252528 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_EMPTY #56818284
-TrigSignatureMoniMT INFO -- #56818284 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #56818284 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #56818284 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #56818284 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_FILLED #1198298874
-TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_UNPAIRED_ISO #2536676873
-TrigSignatureMoniMT INFO -- #2536676873 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2536676873 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_l1calo_L1J400 #1694511185
-TrigSignatureMoniMT INFO -- #1694511185 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1694511185 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_mb_L1RD2_EMPTY #3788962163
-TrigSignatureMoniMT INFO -- #3788962163 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3788962163 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_zb_L1ZB #1289992951
-TrigSignatureMoniMT INFO -- #1289992951 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1289992951 Events 0 0 - - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_sct_noise_SCTPEB_L1RD0_EMPTY #3024203296
-TrigSignatureMoniMT INFO -- #3024203296 Events 0 0 0 - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3024203296 Features 0 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3024203296 Events 0 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3024203296 Features 0 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 #2342716369
-TrigSignatureMoniMT INFO -- #2342716369 Events 0 0 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2342716369 Events 0 0 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 #372992233
-TrigSignatureMoniMT INFO -- #372992233 Events 18 18 18 18 - - - - - - - - - - 18
-TrigSignatureMoniMT INFO -- #372992233 Features 42 42 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #372992233 Events 18 18 18 18 - - - - - - - - - - - 18
+TrigSignatureMoniMT INFO -- #372992233 Features 42 42 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU60 #1376650121
-TrigSignatureMoniMT INFO -- #1376650121 Events 5 5 5 5 - - - - - - - - - - 5
-TrigSignatureMoniMT INFO -- #1376650121 Features 6 6 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1376650121 Events 5 5 5 5 - - - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #1376650121 Features 6 6 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_track_L1TAU100 #714660857
-TrigSignatureMoniMT INFO -- #714660857 Events 0 0 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #714660857 Events 0 0 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwoMVA_L1TAU100 #2725693236
-TrigSignatureMoniMT INFO -- #2725693236 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2725693236 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwo_L1TAU100 #886074432
-TrigSignatureMoniMT INFO -- #886074432 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #886074432 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwoEF_L1TAU100 #1720193283
-TrigSignatureMoniMT INFO -- #1720193283 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1720193283 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1720193283 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1720193283 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwo_L1TAU100 #4069120574
-TrigSignatureMoniMT INFO -- #4069120574 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4069120574 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4069120574 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4069120574 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 #1747754287
-TrigSignatureMoniMT INFO -- #1747754287 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1747754287 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwoMVA_L1TAU100 #2334140248
-TrigSignatureMoniMT INFO -- #2334140248 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2334140248 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwo_L1TAU100 #1799096347
-TrigSignatureMoniMT INFO -- #1799096347 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1799096347 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau200_medium1_tracktwoEF_L1TAU100 #4203471951
-TrigSignatureMoniMT INFO -- #4203471951 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4203471951 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4203471951 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4203471951 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100 #1468926272
-TrigSignatureMoniMT INFO -- #1468926272 Events 0 0 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1468926272 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1468926272 Events 0 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1468926272 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_track_L1TAU12IM #554271976
-TrigSignatureMoniMT INFO -- #554271976 Events 14 14 14 14 - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #554271976 Features 24 24 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #554271976 Events 14 14 14 14 - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #554271976 Features 24 24 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
-TrigSignatureMoniMT INFO -- #988149859 Events 14 14 14 13 13 - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #988149859 Features 24 17 17 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #988149859 Events 14 14 14 13 13 - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #988149859 Features 24 17 17 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
-TrigSignatureMoniMT INFO -- #3346942453 Events 14 14 14 13 13 - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #3346942453 Features 24 17 17 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3346942453 Events 14 14 14 13 13 - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #3346942453 Features 24 17 17 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
-TrigSignatureMoniMT INFO -- #169452969 Events 14 14 12 11 9 - - - - - - - - - 9
-TrigSignatureMoniMT INFO -- #169452969 Features 22 15 10 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #169452969 Events 14 14 12 11 9 - - - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #169452969 Features 22 15 10 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
-TrigSignatureMoniMT INFO -- #2490017573 Events 14 14 12 11 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 22 15 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2490017573 Events 14 14 12 11 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2490017573 Features 22 15 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
-TrigSignatureMoniMT INFO -- #506456080 Events 14 14 12 11 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #506456080 Features 22 15 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #506456080 Events 14 14 12 11 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #506456080 Features 22 15 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
-TrigSignatureMoniMT INFO -- #4055280067 Events 14 14 12 11 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4055280067 Features 22 15 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4055280067 Events 14 14 12 11 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4055280067 Features 22 15 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
-TrigSignatureMoniMT INFO -- #1433975745 Events 14 14 12 11 4 - - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #1433975745 Features 22 15 5 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1433975745 Events 14 14 12 11 4 - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #1433975745 Features 22 15 5 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
-TrigSignatureMoniMT INFO -- #2222894847 Events 14 14 12 11 5 - - - - - - - - - 5
-TrigSignatureMoniMT INFO -- #2222894847 Features 22 15 5 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2222894847 Events 14 14 12 11 5 - - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #2222894847 Features 22 15 5 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
-TrigSignatureMoniMT INFO -- #698603885 Events 14 14 12 11 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 22 15 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #698603885 Events 14 14 12 11 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #698603885 Features 22 15 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
-TrigSignatureMoniMT INFO -- #112814536 Events 14 14 14 13 13 - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #112814536 Features 24 17 17 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #112814536 Events 14 14 14 13 13 - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #112814536 Features 24 17 17 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
-TrigSignatureMoniMT INFO -- #1129072492 Events 14 14 14 13 13 - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #1129072492 Features 24 17 17 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1129072492 Events 14 14 14 13 13 - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #1129072492 Features 24 17 17 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
-TrigSignatureMoniMT INFO -- #2472860683 Events 14 14 12 11 4 - - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #2472860683 Features 22 15 4 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2472860683 Events 14 14 12 11 4 - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2472860683 Features 22 15 4 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
-TrigSignatureMoniMT INFO -- #2537544560 Events 14 14 12 11 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 22 15 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2537544560 Events 14 14 12 11 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2537544560 Features 22 15 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
-TrigSignatureMoniMT INFO -- #2992830434 Events 14 14 12 11 9 - - - - - - - - - 9
-TrigSignatureMoniMT INFO -- #2992830434 Features 22 15 10 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2992830434 Events 14 14 12 11 9 - - - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #2992830434 Features 22 15 10 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
-TrigSignatureMoniMT INFO -- #1275052132 Events 14 14 12 11 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 22 15 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1275052132 Events 14 14 12 11 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1275052132 Features 22 15 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
-TrigSignatureMoniMT INFO -- #2456480859 Events 14 14 11 10 4 - - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #2456480859 Features 20 14 4 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2456480859 Events 14 14 11 10 4 - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2456480859 Features 20 14 4 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25 #1794354861
-TrigSignatureMoniMT INFO -- #1794354861 Events 6 6 6 3 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1794354861 Features 15 6 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1794354861 Events 6 6 6 3 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1794354861 Features 15 6 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau80_medium1_tracktwo_L1TAU60 #598963338
-TrigSignatureMoniMT INFO -- #598963338 Events 5 5 4 2 1 - - - - - - - - - 1
-TrigSignatureMoniMT INFO -- #598963338 Features 5 2 1 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #598963338 Events 5 5 4 2 1 - - - - - - - - - - 1
+TrigSignatureMoniMT INFO -- #598963338 Features 5 2 1 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I #1075975502
-TrigSignatureMoniMT INFO -- #1075975502 Events 3 3 2 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1075975502 Features 6 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1075975502 Events 3 3 2 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1075975502 Features 6 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40 #400305971
-TrigSignatureMoniMT INFO -- #400305971 Events 3 3 2 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #400305971 Features 5 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #400305971 Events 3 3 2 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #400305971 Features 5 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655
-TrigSignatureMoniMT INFO -- #1063154655 Events 0 0 0 - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1063154655 Features 0 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1063154655 Events 0 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1063154655 Features 0 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_timeburner_L1All #819160059
-TrigSignatureMoniMT INFO -- #819160059 Events 20 0 0 - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #819160059 Events 20 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_unconvtrk0_L1EM3 #2063803903
+TrigSignatureMoniMT INFO -- #2063803903 Events 20 20 0 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2063803903 Features 0 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
-TrigSignatureMoniMT INFO -- #532175988 Events 10 10 0 0 0 0 0 0 0 0 0 9 - - 9
-TrigSignatureMoniMT INFO -- #532175988 Features 0 0 0 0 0 0 0 0 0 9 - -
+TrigSignatureMoniMT INFO -- #532175988 Events 10 10 0 0 0 0 0 0 0 0 0 9 - - - 9
+TrigSignatureMoniMT INFO -- #532175988 Features 0 0 0 0 0 0 0 0 0 9 - - -
TrigSignatureMoniMT INFO HLT_xe100_pfsum_L1XE50 #1890237897
-TrigSignatureMoniMT INFO -- #1890237897 Events 10 10 0 0 0 0 0 0 0 0 0 4 - - 4
-TrigSignatureMoniMT INFO -- #1890237897 Features 0 0 0 0 0 0 0 0 0 4 - -
+TrigSignatureMoniMT INFO -- #1890237897 Events 10 10 0 0 0 0 0 0 0 0 0 5 - - - 5
+TrigSignatureMoniMT INFO -- #1890237897 Features 0 0 0 0 0 0 0 0 0 5 - - -
TrigSignatureMoniMT INFO HLT_xe100_tcpufit_L1XE50 #2803198799
-TrigSignatureMoniMT INFO -- #2803198799 Events 10 10 0 0 0 0 0 0 0 0 0 6 - - 6
-TrigSignatureMoniMT INFO -- #2803198799 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO -- #2803198799 Events 10 10 0 0 0 0 0 0 0 0 0 6 - - - 6
+TrigSignatureMoniMT INFO -- #2803198799 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_L1XE50 #1055916731
-TrigSignatureMoniMT INFO -- #1055916731 Events 10 10 0 0 0 0 0 0 0 0 0 7 - - 7
-TrigSignatureMoniMT INFO -- #1055916731 Features 0 0 0 0 0 0 0 0 0 7 - -
+TrigSignatureMoniMT INFO -- #1055916731 Events 10 10 0 0 0 0 0 0 0 0 0 6 - - - 6
+TrigSignatureMoniMT INFO -- #1055916731 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_xe85_tcpufit_xe65_cell_L1XE50 #451622546
-TrigSignatureMoniMT INFO -- #451622546 Events 10 10 0 0 0 0 0 0 0 0 0 6 - - 6
-TrigSignatureMoniMT INFO -- #451622546 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO -- #451622546 Events 10 10 0 0 0 0 0 0 0 0 0 5 - - - 5
+TrigSignatureMoniMT INFO -- #451622546 Features 0 0 0 0 0 0 0 0 0 5 - - -
TrigSignatureMoniMT INFO HLT_xe110_mht_L1XE50 #3030733259
-TrigSignatureMoniMT INFO -- #3030733259 Events 10 10 0 0 0 0 0 0 0 0 0 7 - - 7
-TrigSignatureMoniMT INFO -- #3030733259 Features 0 0 0 0 0 0 0 0 0 7 - -
+TrigSignatureMoniMT INFO -- #3030733259 Events 10 10 0 0 0 0 0 0 0 0 0 7 - - - 7
+TrigSignatureMoniMT INFO -- #3030733259 Features 0 0 0 0 0 0 0 0 0 7 - - -
TrigSignatureMoniMT INFO HLT_xe110_tc_em_L1XE50 #607113828
-TrigSignatureMoniMT INFO -- #607113828 Events 10 10 0 0 0 0 0 0 0 0 0 5 - - 5
-TrigSignatureMoniMT INFO -- #607113828 Features 0 0 0 0 0 0 0 0 0 5 - -
+TrigSignatureMoniMT INFO -- #607113828 Events 10 10 0 0 0 0 0 0 0 0 0 5 - - - 5
+TrigSignatureMoniMT INFO -- #607113828 Features 0 0 0 0 0 0 0 0 0 5 - - -
TrigSignatureMoniMT INFO HLT_xe110_tcpufit_L1XE50 #892853397
-TrigSignatureMoniMT INFO -- #892853397 Events 10 10 0 0 0 0 0 0 0 0 0 6 - - 6
-TrigSignatureMoniMT INFO -- #892853397 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO -- #892853397 Events 10 10 0 0 0 0 0 0 0 0 0 6 - - - 6
+TrigSignatureMoniMT INFO -- #892853397 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 #1649696554
-TrigSignatureMoniMT INFO -- #1649696554 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - 17
-TrigSignatureMoniMT INFO -- #1649696554 Features 0 0 0 0 0 0 0 0 0 17 - -
+TrigSignatureMoniMT INFO -- #1649696554 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - - 17
+TrigSignatureMoniMT INFO -- #1649696554 Features 0 0 0 0 0 0 0 0 0 17 - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - 14
-TrigSignatureMoniMT INFO -- #3768353779 Features 0 0 0 0 0 0 0 0 0 14 - -
+TrigSignatureMoniMT INFO -- #3768353779 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
+TrigSignatureMoniMT INFO -- #3768353779 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_cvfpufit_L1XE10 #3860749499
-TrigSignatureMoniMT INFO -- #3860749499 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - 14
-TrigSignatureMoniMT INFO -- #3860749499 Features 0 0 0 0 0 0 0 0 0 14 - -
+TrigSignatureMoniMT INFO -- #3860749499 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
+TrigSignatureMoniMT INFO -- #3860749499 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #3626903018
-TrigSignatureMoniMT INFO -- #3626903018 Events 19 19 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #3626903018 Features 0 0 0 0 0 0 0 0 0 19 - -
+TrigSignatureMoniMT INFO -- #3626903018 Events 19 19 0 0 0 0 0 0 0 0 0 19 - - - 19
+TrigSignatureMoniMT INFO -- #3626903018 Features 0 0 0 0 0 0 0 0 0 19 - - -
TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_em_subjesgscIS_L1XE10 #689201557
-TrigSignatureMoniMT INFO -- #689201557 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - 14
-TrigSignatureMoniMT INFO -- #689201557 Features 0 0 0 0 0 0 0 0 0 14 - -
+TrigSignatureMoniMT INFO -- #689201557 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
+TrigSignatureMoniMT INFO -- #689201557 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10 #1886909707
-TrigSignatureMoniMT INFO -- #1886909707 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 15 - -
+TrigSignatureMoniMT INFO -- #1886909707 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
+TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_pfopufit_L1XE10 #2252641537
-TrigSignatureMoniMT INFO -- #2252641537 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - 14
-TrigSignatureMoniMT INFO -- #2252641537 Features 0 0 0 0 0 0 0 0 0 14 - -
+TrigSignatureMoniMT INFO -- #2252641537 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
+TrigSignatureMoniMT INFO -- #2252641537 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - 16
-TrigSignatureMoniMT INFO -- #998713382 Features 0 0 0 0 0 0 0 0 0 16 - -
+TrigSignatureMoniMT INFO -- #998713382 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - - 16
+TrigSignatureMoniMT INFO -- #998713382 Features 0 0 0 0 0 0 0 0 0 16 - - -
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - 14
-TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 14 - -
+TrigSignatureMoniMT INFO -- #1583719916 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
+TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - 17
-TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 17 - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - - 17
+TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 17 - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
-TrigSignatureMoniMT INFO -- #531141817 Events 10 10 0 0 0 0 0 0 0 0 0 7 - - 7
-TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 7 - -
+TrigSignatureMoniMT INFO -- #531141817 Events 10 10 0 0 0 0 0 0 0 0 0 7 - - - 7
+TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 7 - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_xe110_tcpufit_L1XE50 #115518400
-TrigSignatureMoniMT INFO -- #115518400 Events 10 10 0 0 0 0 0 0 0 0 0 5 - - 5
-TrigSignatureMoniMT INFO -- #115518400 Features 0 0 0 0 0 0 0 0 0 5 - -
+TrigSignatureMoniMT INFO -- #115518400 Events 10 10 0 0 0 0 0 0 0 0 0 5 - - - 5
+TrigSignatureMoniMT INFO -- #115518400 Features 0 0 0 0 0 0 0 0 0 5 - - -
TrigSignatureMoniMT INFO HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50 #302256132
-TrigSignatureMoniMT INFO -- #302256132 Events 10 10 0 0 0 0 0 0 0 0 0 4 - - 4
-TrigSignatureMoniMT INFO -- #302256132 Features 0 0 0 0 0 0 0 0 0 4 - -
+TrigSignatureMoniMT INFO -- #302256132 Events 10 10 0 0 0 0 0 0 0 0 0 4 - - - 4
+TrigSignatureMoniMT INFO -- #302256132 Features 0 0 0 0 0 0 0 0 0 4 - - -
diff --git a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
index b79b909a9db537df7afb7b87e37f12c42c3a41e1..80bc59b6fef0e28732a66f65198c45f7fb59f9fa 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
@@ -10,8 +10,8 @@ find_package( requests )
# Install files from the package:
atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/TrigInDetValidation_*.py share/Cosmic.py)
-atlas_install_data( share/*.json)
+atlas_install_joboptions( share/*.py)
+atlas_install_data( share/*.json )
atlas_install_runtime( test/TrigInDetValidation_TestConfiguration.xml share/TrigInDetValidation_*.py TIDAbuild )
atlas_install_scripts( scripts/TIDA*.py test/test*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=ATL902 )
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index a2729962d6a8f9b8c2a0651365dc217d8759c280..1fdbf0dd4623c1be090390d909cfad5bfb02dd42 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -22,7 +22,7 @@ from AthenaCommon.Utils.unixtools import FindFile
class TrigInDetReco(ExecStep):
- def __init__(self, name='TrigInDetReco', postexec_file='' ):
+ def __init__(self, name='TrigInDetReco', postinclude_file='' ):
ExecStep.__init__(self, name)
## super(TrigInDetReco, self).__init__(name)
self.type = 'Reco_tf'
@@ -34,6 +34,7 @@ class TrigInDetReco(ExecStep):
self.timeout = 18*3600
self.slices = []
self.preexec_trig = ' '
+ self.postinclude_trig = postinclude_file
self.preexec_reco = ';'.join([
'from RecExConfig.RecFlags import rec',
'rec.doForwardDet=False',
@@ -58,11 +59,6 @@ class TrigInDetReco(ExecStep):
])
self.postexec_trig = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.RDO_TRIG=100000000000']"
- if postexec_file!='' :
- pe_file = open( postexec_file )
- self.postexec_trig += ";"+pe_file.read()
- print( "postexec_trig: ", self.postexec_trig )
-
self.postexec_reco = "from AthenaCommon.AppMgr import ServiceMgr; ServiceMgr.AthenaPoolCnvSvc.MaxFileSizes=['tmp.ESD=100000000000']"
self.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" '
@@ -85,7 +81,7 @@ class TrigInDetReco(ExecStep):
chains += "'HLT_tau25_idperf_tracktwoMVA_L1TAU12IM',"
flags += 'doTauSlice=True;'
if (i=='bjet') :
- chains += "'HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20',"
+ chains += "'HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20','HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20',"
flags += 'doBjetSlice=True;'
if ( i=='fsjet' or i=='fs' or i=='jet' ) :
chains += "'HLT_j45_ftf_L1J15',"
@@ -103,10 +99,13 @@ class TrigInDetReco(ExecStep):
chains += ']'
self.preexec_trig = 'doEmptyMenu=True;'+flags+'selectChains='+chains
+
self.args += ' --preExec "RDOtoRDOTrigger:{:s};" "all:{:s};" "RAWtoESD:{:s};" "ESDtoAOD:{:s};"'.format(
self.preexec_trig, self.preexec_all, self.preexec_reco, self.preexec_aod)
if (self.postexec_trig != ' '):
self.args += ' --postExec "RDOtoRDOTrigger:{:s};" "RAWtoESD:{:s};" '.format(self.postexec_trig, self.postexec_reco)
+ if (self.postinclude_trig != ''):
+ self.args += ' --postInclude "RDOtoRDOTrigger:{:s}" '.format(self.postinclude_trig)
super(TrigInDetReco, self).configure(test)
@@ -211,8 +210,8 @@ class TrigInDetCompStep(RefComparisonStep):
if (self.test=='ttbar'):
self.output_dir = self.output_dir+"-"+self.slice
- if (self.type == 'offl'):
- self.output_dir = self.output_dir+'-offl'
+ if (self.type == 'offline'):
+ self.output_dir = self.output_dir+'-offline'
self.input_file = 'data-hists-offline.root'
self.args += self.input_file + ' '
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TIDAml_extensions.py b/Trigger/TrigValidation/TrigInDetValidation/share/TIDAml_extensions.py
index 7cc870252a8e940b1ede3170727b668f5d907073..158b8b4453ed61aa62a1caa9392f60069bc1e916 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TIDAml_extensions.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TIDAml_extensions.py
@@ -1,7 +1,8 @@
-ftf = findAlgorithm(topSequence, "TrigFastTrackFinder_JetFS")
-ftf.doSeedRedundancyCheck = True
-ftf.UseTrigSeedML = 1 #can be 0, 1, 2, or 3, 0 means the
-# ML-based seed filtering is off
-ftf.TrigSeedML_LUT = 'trigseed_ML_medium.lut'
-ftf.OutputLevel=DEBUG
+ftf = findAlgorithm(topSequence, "TrigFastTrackFinder__jet")
+### ML seeding not yet in master. This file is a placeholder until it is implemented.
+#ftf.doSeedRedundancyCheck = True
+#ftf.UseTrigSeedML = 1 #can be 0, 1, 2, or 3, 0 means the
+## ML-based seed filtering is off
+#ftf.TrigSeedML_LUT = 'trigseed_ML_medium.lut'
+#ftf.OutputLevel=DEBUG
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
index dce517b9b1d764e1380ec2302d8e6f789aed9ae6..d92aee0f710b01cc1043f26811451ab9395c1333 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
@@ -149,7 +149,9 @@ if ( True ) :
# ":HLT_IDTrack_FS_FTF",
# ":HLT_IDTrack_FS_FTF:roi=HLT_FSRoI:vtx=HLT_IDVertex_FS",
- "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_FS_FTF:roi=HLT_FSRoI:vtx=HLT_IDVertex_FS",
+ "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:key=HLT_IDTrack_Bjet_FTF",
+ "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:key=HLT_IDTrack_Bjet_IDTrig",
+ "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:key=HLT_IDTrack_FS_FTF:roi=HLT_FSRoI:vtx=HLT_IDVertex_FS",
"HLT_j45_ftf_L1J15:key=HLT_IDTrack_FS_FTF:roi=HLT_FSRoI:vtx=HLT_IDVertex_FS",
"HLT_mu.*_idperf.*:HLT_IDTrack_Muon_FTF",
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
index 010a4e1cf97bf7a4ca5f61c0531cac78b2617496..25b27f48a2e18e54b42fcfafad4b39fca0963371 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
@@ -29,12 +29,21 @@ except getopt.GetoptError:
print("-n N run only on N events per job")
-LEvents = 0
-local = False
-exclude = False
-postproc = False
+Events_local = 0
+local = False
+exclude = False
+postproc = False
+lowpt_local = []
+try: GridFiles
+except NameError: GridFiles=False
+
+if GridFiles==True :
+ use_gridfiles = True
+else:
+ use_gridfiles = False
+
for opt,arg in opts:
if opt in ("-l", "--local"):
local=True
@@ -43,10 +52,10 @@ for opt,arg in opts:
if opt=="-p":
postproc=True
if opt=="-n":
- LEvents=arg
+ Events_local=arg
-if 'postexec' in dir() :
- rdo2aod = TrigInDetReco( postexec_file=postexec )
+if 'postinclude_file' in dir() :
+ rdo2aod = TrigInDetReco( postinclude_file = postinclude_file )
else :
rdo2aod = TrigInDetReco()
@@ -56,25 +65,37 @@ rdo2aod.slices = Slices
rdo2aod.threads = Threads
rdo2aod.concurrent_events = Slots
+if "Lowpt" in locals() :
+ if isinstance( Lowpt, list ) :
+ lowpt_local = Lowpt
+ else :
+ lowpt_local = [ Lowpt ]
+else :
+ lowpt_local = [ False ]
+
+
+if "Args" not in locals() :
+ Args = " "
# allow command line to override programed number of events to process
-if LEvents != 0 :
- rdo2aod.max_events = LEvents
+if Events_local != 0 :
+ rdo2aod.max_events = Events_local
else :
rdo2aod.max_events = Events
rdo2aod.perfmon = False
rdo2aod.timeout = 18*3600
-rdo2aod.input = Input # defined in TrigValTools/share/TrigValInputs.json
+rdo2aod.input = Input # defined in TrigValTools/share/TrigValInputs.json
-if local:
+if use_gridfiles:
+ if local:
# rdo2aod.input = 'Single_el_larged0' # defined in TrigValTools/share/TrigValInputs.json
- rdo2aod.input = Input # should match definition in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += ' --inputRDOFile=$ArtInFile '
+ rdo2aod.input = Input # should match definition in TrigValTools/share/TrigValInputs.json
+ else:
+ rdo2aod.input = ''
+ rdo2aod.args += ' --inputRDOFile=$ArtInFile '
@@ -99,16 +120,15 @@ for ref in TrackReference :
hist_file = 'data-hists.root'
ext = ''
- ext1 = ''
if ( ref == 'Truth' ) :
- args = 'TIDAdata-run3.dat -b Test_bin.dat -o '+hist_file
+ args = 'TIDAdata-run3.dat -b Test_bin.dat -o ' + hist_file + Args
elif ( ref == 'Offline' ) :
+ # if more than one reefrence ...
if len(TrackReference)>1 :
hist_file = 'data-hists-offline.root'
- ext = '_off'
- ext1 = 'offl'
- args = 'TIDAdata-run3-offline.dat -b Test_bin.dat -o '+hist_file
+ ext = 'offline'
+ args = 'TIDAdata-run3-offline.dat -r Offline -b Test_bin.dat -o ' + hist_file
else :
# here actually we should allow functionality
# to use different pdgid truth or offline as
@@ -126,18 +146,26 @@ for ref in TrackReference :
# Now the comparitor steps
# here, the compararitor must know the name of the root file to process
- # we set it in the comparitor job, using the _off extension
- # this isn't ideal, since we set the hist file in this code,
+ # we set it in the comparitor job, using the "offline" extension
+ # this isn't ideal, since we set the hist file in this code also
# so really we should pass it in consistently, and the options
# for the directory names should be unrelated
-
+
for slice in Slices :
- comp1=TrigInDetCompStep( 'Comp_L2'+slice+ext, 'L2', slice, type=ext1)
- test.check_steps.append(comp1)
-
- if ( RunEF ) :
- comp2=TrigInDetCompStep( 'Comp_EF'+slice+ext, 'EF', slice, type=ext1)
- test.check_steps.append(comp2)
+ for _lowpt in lowpt_local :
+
+ stagetag = slice+ext
+ if _lowpt :
+ stagetag += "-lowpt"
+
+ print( "stagetag "+stagetag )
+
+ comp1=TrigInDetCompStep( 'Comp_L2'+stagetag, 'L2', slice, type=ext, lowpt=_lowpt )
+ test.check_steps.append(comp1)
+
+ if ( RunEF ) :
+ comp2=TrigInDetCompStep( 'Comp_EF'+stagetag, 'EF', slice, type=ext, lowpt=_lowpt )
+ test.check_steps.append(comp2)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
index 73b75efff6261551082fd12f288c7b5fa979f140..efd06d7fc0863eae20513e672a7605388af11326 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
@@ -3,13 +3,13 @@
"chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon"
},
"EFmuon":{
- "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonforEF"
+ "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonForEF"
},
"L2muonLowpt":{
"chains" : "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon"
},
"EFmuonLowpt":{
- "chains" : "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonforEF"
+ "chains" : "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuonForEF"
},
"L2electron":{
"chains" : "HLT_e17_lhvloose_nod0_L1EM15VH:HLT_IDTrack_Electron_FTF"
@@ -30,10 +30,10 @@
"chains" : "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF:HLT_Roi_TauCore HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig:HLT_TAURoI"
},
"L2bjet":{
- "chains" : "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF"
+ "chains" : "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF"
},
"EFbjet":{
- "chains" : "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig"
+ "chains" : "HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig"
},
"L2FS":{
"chains" : "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_FS_FTF:HLT_FSRoI:HLT_IDVertex_FS"
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
index 81ccb5ba4b9c5f9d5da268415225d92bcc902379..6e7be8e1d757a46977c924d2b9c24752cfdef582 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
@@ -96,19 +96,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py
index 69ec8f6584f9dbb0b7907c622849d5ada238aa36..c0b2e77ab9c12f15ee5999976f1bd81ab179fe53 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40_mt.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
index 4cd643a07d049c3c85193aade6f0f8563de7d8ec..52c850c961165d71d6dd59a3c55b6122363f082b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
index 1c43c8664a8b4b3eb1a3d6cea2800620bf0960a3..4ac76f32f8c1a7ba4d079e651c8e0e7b455f5b47 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py
index c7f1fa50f7b4571c85fefcfaf4376d9574e55d6c..fd9ef5187a06d18ba4639670ca87cbc2dc15adbb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_mt.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
index 4ffd5df12dbfe5a744f7b06fb83419162eb9f183..927a393c34e6ff0ceb976c1d98c01e90f8b8f6d4 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
@@ -96,19 +96,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py
index 07649383b63317da7bad7a3dcd935158535bc903..7e3e64be260835e8adf3776a1e86db71ed9d5dee 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu_mt.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py
index 58396e47f29abb82f761786712bae1f1b6aeb35c..e85b7fadb9d3a82c6430fe475efe2f9431b9f3f3 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_mt.py
@@ -96,19 +96,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
index 092c2a68e3ba2161f95769536d4b2a32ff1dd7e3..6427e643af7636a9ca0946268f66bf51d67ee034 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py
index 3576f7f167d536532602f17000a47637b386904f..76095b55c3da9ae5d0ee9d26ba61ac5e9ef74ad1 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40_mt.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
index 34b754fab8bf24cb74b8b5d47bfc5f76ee4a47a4..6ac9af2d62a050c1741a96ba8225f273a154ba97 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py
index bbc1c4c283ba919e962322a2edf940133f87bc02..3a09f79728db4cde3f28de22a091ee3b89fde9ec 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40_mt.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFeleLowpt','EF','electron',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2ele_off','L2','electron')
-comp5.type='offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFele_off','EF','electron')
-comp6.type='offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2eleLowpt_off','L2','electron',lowpt=True)
-comp7.type='offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFeleLowpt_off','EF','electron',lowpt=True)
-comp8.type='offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
index 6fe968139ba3126c5c29b632752db2807d396d8f..af59f067543aa08b6cc7d28d80cc8ae17c348c73 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_ml_pu40.py
@@ -3,7 +3,6 @@
# art-description: art job for fsjet_ml_pu40
# art-type: grid
# art-include: master/Athena
-# art-input: valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315
# art-input-nfiles: 3
# art-athena-mt: 4
# art-memory: 4096
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py
index 7215b315d0af0c394b1234bb9871922edd3d9390..1ae91bacce43836497c084fb114abbd1a94a21dc 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40.py
@@ -3,7 +3,6 @@
# art-description: art job for fsjet_pu40
# art-type: grid
# art-include: master/Athena
-# art-input: valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315
# art-input-nfiles: 3
# art-athena-mt: 4
# art-memory: 4096
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_mt.py
index 8ffa41345cf08531a60a1c4268645437abd7e917..4360e666a676720dadb833219ae1fb5d097cad5e 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fsjet_pu40_mt.py
@@ -3,7 +3,6 @@
# art-description: art job for fsjet_pu40_mt
# art-type: grid
# art-include: master/Athena
-# art-input: valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315
# art-input-nfiles: 3
# art-athena-mt: 4
# art-memory: 4096
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
index 66b7477c5d5a9b267fd0cc578c0af5f2269d5319..9ea8361af669cfe89a85e208919a01dad4bea15b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
@@ -5,7 +5,6 @@
# art-type: grid
# art-include: master/Athena
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
-# art-input: mc15_13TeV.361203.Pythia8_A2_MSTW2008LO_ND_minbias.recon.RDO.e3639_s2606_s2174_r7661_tid07858100_00
# art-athena-mt: 4
# art-memory: 4096
# art-output: *.txt
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias_mt.py
index 99fed652af5e273f99d116bf40a255c550733675..c15bd428cca8c9e0f7d1d34e58f0441776a8601b 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias_mt.py
@@ -5,7 +5,6 @@
# art-type: grid
# art-include: master/Athena
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
-# art-input: mc15_13TeV.361203.Pythia8_A2_MSTW2008LO_ND_minbias.recon.RDO.e3639_s2606_s2174_r7661_tid07858100_00
# art-athena-nfiles: 4
# art-athena-mt: 4
# art-memory: 4096
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
index 5fdbf2ce1b077a3014efab075b31f64b7dcd56a6..da6abbc0f00dbf4750d2ade060e4cf42ce0428f1 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
@@ -92,19 +92,19 @@ comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py
index 899cff53906cfedd6f975e8439f92101caf323aa..cd4fd198ae58b6c8acfea76066e580171fe140e5 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys_mt.py
@@ -92,19 +92,19 @@ comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
index f88401a4f6f90b9b3eb0629e48d31d56d4d0c39e..e4e07c42a1a13fae54c7be02997bfd9f2cc50c31 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py
index ff730d9aa732f5b44d728456c3051315a4f2bc51..e8ae714e91ac5cce5ccd108be4e8120d4c65f85d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_mt.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
index e9b5f086437ade4d571281558db930a61f3b5f79..202384a123070da312ba9c106d49623a27c23582 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py
index bd05f49197d38b0861d6f6bc53992268447c807c..44a3bef9eb28e2b46b10d151e78b3aa5d44e862d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu_mt.py
@@ -99,19 +99,19 @@ comp4=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
test.check_steps.append(comp4)
comp5=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp5.type = 'offl'
+comp5.type = 'offline'
test.check_steps.append(comp5)
comp6=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp6.type = 'offl'
+comp6.type = 'offline'
test.check_steps.append(comp6)
comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
+comp7.type = 'offline'
test.check_steps.append(comp7)
comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
+comp8.type = 'offline'
test.check_steps.append(comp8)
# CPU cost steps
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
index 202d49a31921ce55acebc89c5f5e5ef59aded857..cfee297e6e69c43a39addbe6c996b153b57efa6f 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
@@ -5,7 +5,7 @@
# art-include: master/Athena
# art-input: mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143
# art-input-nfiles: 4
-# art-athena-mt: 4
+# art-athena-mt: 1
# art-memory: 4096
# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
# art-output: *.txt
@@ -27,99 +27,18 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon']
+RunEF = True
+Events = 2000
+Threads = 1
+Slots = 1 # what about the mt: 4 art directive ? nfiles: 3 ?
+Input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
-import sys,getopt
+TrackReference = [ 'Truth', 'Offline' ]
+Lowpt = [ False, True ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon']
-rdo2aod.max_events = 8000
-rdo2aod.threads = 1 # TODO: change to 4
-rdo2aod.concurrent_events = 1 # TODO: change to 4
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep('TrigInDetDict')
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp3.type = 'offl'
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp4.type = 'offl'
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True)
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt-old.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt-old.py
new file mode 100755
index 0000000000000000000000000000000000000000..59d3c9157039750270ecbd2419b3cf5ec9a73999
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt-old.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python
+
+# art-description: art job for mu_Zmumu_pu40_mt-old
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143
+# art-input-nfiles: 4
+# art-athena-mt: 4
+# art-memory: 4096
+# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['muon']
+rdo2aod.max_events = 8000
+rdo2aod.threads = 4
+rdo2aod.concurrent_events = 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep('TrigInDetDict')
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+ rdict2 = TrigInDetdictStep('TrigInDetDict2')
+ rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
+ test.check_steps.append(rdict2)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
+test.check_steps.append(comp2)
+
+comp3=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
+comp3.type = 'offline'
+test.check_steps.append(comp3)
+
+comp4=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
+comp4.type = 'offline'
+test.check_steps.append(comp4)
+
+comp5=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True)
+test.check_steps.append(comp5)
+
+comp6=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
+test.check_steps.append(comp6)
+
+comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
+comp7.type = 'offline'
+test.check_steps.append(comp7)
+
+comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
+comp8.type = 'offline'
+test.check_steps.append(comp8)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py
index b3886bb083bbde1f243756823b8950b0002e6f5c..58c31f0e5ca5543aa335c3bd456d882a8f1b93af 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py
@@ -27,99 +27,20 @@
# art-output: *.dat
-from TrigValTools.TrigValSteering import Test, CheckSteps
-from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+Slices = ['muon']
+RunEF = True
+Events = 8000
+Threads = 4
+Slots = 4 # what about the mt: 4 art directive ? nfiles: 3 ?
+Input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
+GridFiles=True
-import sys,getopt
+Args = " -p 13 "
+TrackReference = [ 'Truth', 'Offline' ]
+Lowpt = [ False, True ]
-try:
- opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
-except getopt.GetoptError:
- print("Usage: ")
- print("-l(--local) run locally with input file from art eos grid-input")
- print("-x don't run athena or post post-processing, only plotting")
- print("-p run post-processing, even if -x is set")
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
-local=False
-exclude=False
-postproc=False
-for opt,arg in opts:
- if opt in ("-l", "--local"):
- local=True
- if opt=="-x":
- exclude=True
- if opt=="-p":
- postproc=True
-
-
-rdo2aod = TrigInDetReco()
-rdo2aod.slices = ['muon']
-rdo2aod.max_events = 8000
-rdo2aod.threads = 4
-rdo2aod.concurrent_events = 4
-rdo2aod.perfmon = False
-rdo2aod.timeout = 18*3600
-if local:
- rdo2aod.input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
-else:
- rdo2aod.input = ''
- rdo2aod.args += '--inputRDOFile=$ArtInFile '
-
-
-test = Test.Test()
-test.art_type = 'grid'
-if (not exclude):
- test.exec_steps = [rdo2aod]
- test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
- test.check_steps = CheckSteps.default_check_steps(test)
-
-
-# Run Tidardict
-if ((not exclude) or postproc ):
- rdict = TrigInDetdictStep('TrigInDetDict')
- rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
- test.check_steps.append(rdict)
- rdict2 = TrigInDetdictStep('TrigInDetDict2')
- rdict2.args='TIDAdata-run3-offline.dat -r Offline -f data-hists-offline.root -b Test_bin.dat '
- test.check_steps.append(rdict2)
-
-# Now the comparitor steps
-comp=TrigInDetCompStep('Comp_L2muon','L2','muon')
-test.check_steps.append(comp)
-
-comp2=TrigInDetCompStep('Comp_EFmuon','EF','muon')
-test.check_steps.append(comp2)
-
-comp3=TrigInDetCompStep('Comp_L2muon_off','L2','muon')
-comp3.type = 'offl'
-test.check_steps.append(comp3)
-
-comp4=TrigInDetCompStep('Comp_EFmuon_off','EF','muon')
-comp4.type = 'offl'
-test.check_steps.append(comp4)
-
-comp5=TrigInDetCompStep('Comp_L2muonLowpt','L2','muon',lowpt=True)
-test.check_steps.append(comp5)
-
-comp6=TrigInDetCompStep('Comp_EFmuonLowpt','EF','muon',lowpt=True)
-test.check_steps.append(comp6)
-
-comp7=TrigInDetCompStep('Comp_L2muonLowpt_off','L2','muon',lowpt=True)
-comp7.type = 'offl'
-test.check_steps.append(comp7)
-
-comp8=TrigInDetCompStep('Comp_EFmuonLowpt_off','EF','muon',lowpt=True)
-comp8.type = 'offl'
-test.check_steps.append(comp8)
-
-# CPU cost steps
-cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False)
-test.check_steps.append(cpucost)
-
-cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
-test.check_steps.append(cpucost2)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py b/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
index 646180b431bad4da4b4d37eed953d2fac0eac9e9..2fcbff183e6c26ed3f06962df6b1fc2daab601b2 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
+++ b/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
@@ -87,6 +87,12 @@ def myPebInfoWriterTool(name, eventBuildType):
tool.EtaWidth = 0.1
tool.PhiWidth = 0.1
tool.DetNames = ['All']
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel, makeRegSelTool_SCT, makeRegSelTool_TRT
+ tool.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ tool.RegSelTool_SCT = makeRegSelTool_SCT()
+ tool.RegSelTool_TRT = makeRegSelTool_TRT()
+
tool.ExtraROBs = []
tool.ExtraSubDets = []
tool.addHLTResultToROBList() # add the main (full) HLT result to the list
@@ -98,6 +104,12 @@ def myPebInfoWriterTool(name, eventBuildType):
tool.PhiWidth = 0.5
tool.DetNames = ['MDT', 'CSC', 'RPC', 'TGC', 'MM', 'STGC'] # all muon detectors
tool.ExtraROBs = []
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel, makeRegSelTool_SCT, makeRegSelTool_TRT
+ tool.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ tool.RegSelTool_SCT = makeRegSelTool_SCT()
+ tool.RegSelTool_TRT = makeRegSelTool_TRT()
+
elif 'ElectronDSTest' in eventBuildType:
# ElectronDSTest is an example of pure Data Scouting,
# where only the special HLT result is saved and nothing else
@@ -110,6 +122,12 @@ def myPebInfoWriterTool(name, eventBuildType):
tool.EtaWidth = 0.3
tool.PhiWidth = 0.3
tool.DetNames = ['PIXEL', 'SCT', 'TRT', 'TTEM', 'TTHEC', 'FCALEM', 'FCALHAD']
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel, makeRegSelTool_SCT, makeRegSelTool_TRT
+ tool.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ tool.RegSelTool_SCT = makeRegSelTool_SCT()
+ tool.RegSelTool_TRT = makeRegSelTool_TRT()
+
tool.ExtraROBs = []
tool.ExtraSubDets = []
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 2a50937dc8064a0bc5ecd4a33aee16cb70649557..673cb5fc606571ef59d1424b6b4fa5b31f253441 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1,912 +1,1011 @@
+TrigSignatureMoniMT INFO HLT_10j40_pf_subresjesgscIS_ftf_L14J15 #3575805394
+TrigSignatureMoniMT INFO -- #3575805394 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3575805394 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_10j40_subjesIS_L14J15 #2760204981
+TrigSignatureMoniMT INFO -- #2760204981 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2760204981 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_10j40_subresjesgscIS_ftf_L14J15 #3568675904
+TrigSignatureMoniMT INFO -- #3568675904 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3568675904 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2e12_lhloose_mu10_L12EM8VH_MU10 #2518246928
-TrigSignatureMoniMT INFO -- #2518246928 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2518246928 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2518246928 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2518246928 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
-TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 4 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3136730292 Features 4 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 4 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3136730292 Features 4 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VH #2280638160
-TrigSignatureMoniMT INFO -- #2280638160 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2280638160 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2280638160 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2280638160 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
-TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e24_lhvloose_L12EM20VH #1796849979
-TrigSignatureMoniMT INFO -- #1796849979 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1796849979 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1796849979 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1796849979 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
-TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 15 13 13 - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #2613484113 Features 94 324 178 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 15 13 13 - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #2613484113 Features 94 324 178 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g10_loose_mu20_L1MU20 #3765708828
-TrigSignatureMoniMT INFO -- #3765708828 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3765708828 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3765708828 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3765708828 Features 0 0 0 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I #2606736960
+TrigSignatureMoniMT INFO -- #2606736960 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2606736960 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM15VH #3837353071
-TrigSignatureMoniMT INFO -- #3837353071 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3837353071 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_2g20_tight_icaloloose_L12EM15VH #1319738689
+TrigSignatureMoniMT INFO -- #1319738689 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1319738689 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g22_tight_L12EM15VH #708421357
-TrigSignatureMoniMT INFO -- #708421357 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #708421357 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #708421357 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #708421357 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g25_loose_g15_loose_L12EM20VH #1367194755
-TrigSignatureMoniMT INFO -- #1367194755 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1367194755 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1367194755 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1367194755 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH #58053304
-TrigSignatureMoniMT INFO -- #58053304 Events 20 20 1 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #58053304 Features 1 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #58053304 Events 20 20 1 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #58053304 Features 1 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH #3965466087
-TrigSignatureMoniMT INFO -- #3965466087 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3965466087 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g50_loose_L12EM20VH #3590373854
-TrigSignatureMoniMT INFO -- #3590373854 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3590373854 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3590373854 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3590373854 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3495282139
-TrigSignatureMoniMT INFO -- #3495282139 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3495282139 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3495282139 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3495282139 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #2680976232
-TrigSignatureMoniMT INFO -- #2680976232 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2680976232 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2680976232 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2680976232 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
-TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100 #891415013
-TrigSignatureMoniMT INFO -- #891415013 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #891415013 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #891415013 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #891415013 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2j60_L1J15 #927735533
-TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 #3498558358
-TrigSignatureMoniMT INFO -- #3498558358 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3498558358 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3498558358 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3498558358 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 #234102568
-TrigSignatureMoniMT INFO -- #234102568 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #234102568 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #234102568 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #234102568 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 #2619091790
-TrigSignatureMoniMT INFO -- #2619091790 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2619091790 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #557204938
-TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_L12MU4 #2999632714
-TrigSignatureMoniMT INFO -- #2999632714 Events 20 20 0 0 0 0 1 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 4 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2999632714 Events 20 20 0 0 0 0 1 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 4 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 #1730084172
-TrigSignatureMoniMT INFO -- #1730084172 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 4 2 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1730084172 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 4 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 #4276347155
-TrigSignatureMoniMT INFO -- #4276347155 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4276347155 Features 0 0 0 0 4 2 0 0 - - - -
+TrigSignatureMoniMT INFO -- #4276347155 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4276347155 Features 0 0 0 0 4 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 #4008168535
-TrigSignatureMoniMT INFO -- #4008168535 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 4 2 0 0 - - - -
+TrigSignatureMoniMT INFO -- #4008168535 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 4 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 0 0 0 0 1 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 4 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 0 0 0 0 1 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 4 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
-TrigSignatureMoniMT INFO -- #2046267508 Events 20 20 0 0 0 0 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 0 0 - - - - - -
+TrigSignatureMoniMT INFO -- #2046267508 Events 20 20 0 0 0 0 0 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
-TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 0 0 0 0 1 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 4 0 - - - - - -
+TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 0 0 0 0 1 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 4 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
-TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
-TrigSignatureMoniMT INFO -- #2398136098 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2398136098 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_3j200_L1J100 #2199422919
-TrigSignatureMoniMT INFO -- #2199422919 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2199422919 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2199422919 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2199422919 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_3j200_pf_subresjesgscIS_ftf_L1J100 #794428037
+TrigSignatureMoniMT INFO -- #794428037 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #794428037 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_3j200_subresjesgscIS_ftf_L1J100 #1801834652
+TrigSignatureMoniMT INFO -- #1801834652 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1801834652 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 #1832399408
-TrigSignatureMoniMT INFO -- #1832399408 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1832399408 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 #1199773318
-TrigSignatureMoniMT INFO -- #1199773318 Events 20 20 0 0 0 0 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1199773318 Events 20 20 0 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 0 0 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 #424835335
-TrigSignatureMoniMT INFO -- #424835335 Events 20 20 0 0 0 0 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #424835335 Events 20 20 0 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 0 0 0 0 - - - - - -
+TrigSignatureMoniMT INFO HLT_4j120_pf_subresjesgscIS_ftf_L13J50 #1755129033
+TrigSignatureMoniMT INFO -- #1755129033 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1755129033 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_4j120_subjesIS_L13J50 #3722303680
+TrigSignatureMoniMT INFO -- #3722303680 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3722303680 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_4j120_subresjesgscIS_ftf_L13J50 #91006165
+TrigSignatureMoniMT INFO -- #91006165 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #91006165 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 #1834383636
-TrigSignatureMoniMT INFO -- #1834383636 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1834383636 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 #1175391812
-TrigSignatureMoniMT INFO -- #1175391812 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1175391812 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1175391812 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1175391812 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15 #4189027854
+TrigSignatureMoniMT INFO -- #4189027854 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #4189027854 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15 #819918597
+TrigSignatureMoniMT INFO -- #819918597 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #819918597 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j85_pf_subresjesgscIS_ftf_L14J15 #4208121018
+TrigSignatureMoniMT INFO -- #4208121018 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #4208121018 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j85_subjesIS_L14J15 #2745094401
+TrigSignatureMoniMT INFO -- #2745094401 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2745094401 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_5j85_subresjesgscIS_ftf_L14J15 #1148892499
+TrigSignatureMoniMT INFO -- #1148892499 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1148892499 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15 #1526259867
+TrigSignatureMoniMT INFO -- #1526259867 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1526259867 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j55_subjesIS_0eta240_L14J15 #68179418
+TrigSignatureMoniMT INFO -- #68179418 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #68179418 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j55_subresjesgscIS_ftf_0eta240_L14J15 #1068073241
+TrigSignatureMoniMT INFO -- #1068073241 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1068073241 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j70_pf_subresjesgscIS_ftf_L14J15 #1755772565
+TrigSignatureMoniMT INFO -- #1755772565 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1755772565 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j70_subjesIS_L14J15 #1003115860
+TrigSignatureMoniMT INFO -- #1003115860 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1003115860 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_6j70_subresjesgscIS_ftf_L14J15 #59957514
+TrigSignatureMoniMT INFO -- #59957514 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #59957514 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_7j45_pf_subresjesgscIS_ftf_L14J15 #2701381398
+TrigSignatureMoniMT INFO -- #2701381398 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2701381398 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_7j45_subjesIS_L14J15 #2617173782
+TrigSignatureMoniMT INFO -- #2617173782 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2617173782 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_7j45_subresjesgscIS_ftf_L14J15 #2928962349
+TrigSignatureMoniMT INFO -- #2928962349 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2928962349 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_JetDS_j0_L1J100 #3302698716
+TrigSignatureMoniMT INFO -- #3302698716 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3302698716 Features 0 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_alfacalib_AlfaPEB_L1ALFA_ANY #4094852824
-TrigSignatureMoniMT INFO -- #4094852824 Events 20 20 20 - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4094852824 Features 20 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4094852824 Events 20 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4094852824 Features 20 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15 #3989372080
-TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_beamspot_trkFS_trkfast_BeamSpotPEB_L1J15 #628534730
-TrigSignatureMoniMT INFO -- #628534730 Events 20 20 20 20 - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #628534730 Features 20 20 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #628534730 Events 20 20 20 20 - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #628534730 Features 20 20 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480
-TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_cscmon_L1All #1000936179
-TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e12_lhloose_2mu10_L12MU10 #4167710884
-TrigSignatureMoniMT INFO -- #4167710884 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4167710884 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #4167710884 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4167710884 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710
-TrigSignatureMoniMT INFO -- #3471067710 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3471067710 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_nod0_L1EM22VHI #4128870680
-TrigSignatureMoniMT INFO -- #4128870680 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #4128870680 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e17_lhloose_mu14_L1EM15VH_MU10 #899946230
-TrigSignatureMoniMT INFO -- #899946230 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #899946230 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #899946230 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #899946230 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_e17_lhvloose_nod0_L1EM15VH #140779220
-TrigSignatureMoniMT INFO -- #140779220 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #140779220 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #140779220 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #140779220 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3 #1784800924
-TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH #2668628593
-TrigSignatureMoniMT INFO -- #2668628593 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2668628593 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2668628593 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2668628593 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e24_lhmedium_g25_medium_L12EM20VH #2785977835
-TrigSignatureMoniMT INFO -- #2785977835 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2785977835 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2785977835 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2785977835 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH #9348946
-TrigSignatureMoniMT INFO -- #9348946 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #9348946 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
-TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1703681121 Features 1 2 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1703681121 Features 1 2 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM22VHI #1995263521
-TrigSignatureMoniMT INFO -- #1995263521 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1995263521 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1995263521 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1995263521 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e26_lhtight_ivarloose_L1EM22VHI #2918307206
+TrigSignatureMoniMT INFO -- #2918307206 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2918307206 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e26_lhtight_ivarmedium_L1EM22VHI #2653558903
+TrigSignatureMoniMT INFO -- #2653558903 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2653558903 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e26_lhtight_ivartight_L1EM22VHI #1679339192
+TrigSignatureMoniMT INFO -- #1679339192 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1679339192 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM22VHI #939763520
-TrigSignatureMoniMT INFO -- #939763520 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #939763520 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #939763520 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #939763520 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM24VHI #4227411116
-TrigSignatureMoniMT INFO -- #4227411116 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4227411116 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #4227411116 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4227411116 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM22VHI #2128128255
-TrigSignatureMoniMT INFO -- #2128128255 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2128128255 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut1step_g5_etcut_L12EM3 #1745513164
-TrigSignatureMoniMT INFO -- #1745513164 Events 20 20 10 10 10 - - - - - - - - - 10
-TrigSignatureMoniMT INFO -- #1745513164 Features 23 23 23 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1745513164 Events 20 20 10 10 10 - - - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #1745513164 Features 23 23 23 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
-TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #683953566 Features 48 163 90 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #683953566 Features 48 163 90 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #324908483 Features 41 148 49 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #324908483 Features 41 148 49 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_L1EM3 #736648247
-TrigSignatureMoniMT INFO -- #736648247 Events 20 20 9 9 9 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #736648247 Features 18 52 28 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #736648247 Events 20 20 9 9 9 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #736648247 Features 18 52 28 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 31 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 31 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_L1EM3 #2713915187
-TrigSignatureMoniMT INFO -- #2713915187 Events 20 20 9 9 9 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2713915187 Features 19 55 28 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2713915187 Events 20 20 9 9 9 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2713915187 Features 19 55 28 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #176627878 Features 13 51 30 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #176627878 Features 13 51 30 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_L1EM3 #2070133824
-TrigSignatureMoniMT INFO -- #2070133824 Events 20 20 8 8 8 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2070133824 Features 16 43 25 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2070133824 Events 20 20 8 8 8 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2070133824 Features 16 43 25 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_nod0_L1EM3 #3303895627
-TrigSignatureMoniMT INFO -- #3303895627 Events 20 20 8 8 8 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3303895627 Features 16 43 25 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3303895627 Events 20 20 8 8 8 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3303895627 Features 16 43 25 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2758326765 Features 13 51 30 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2758326765 Features 13 51 30 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_nod0_L1EM3 #1690619419
-TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 9 9 9 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1690619419 Features 13 51 30 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 9 9 9 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1690619419 Features 13 51 30 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM22VHI #298591874
-TrigSignatureMoniMT INFO -- #298591874 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #298591874 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #298591874 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #298591874 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_nod0_L1EM22VHI #4115486024
-TrigSignatureMoniMT INFO -- #4115486024 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4115486024 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #4115486024 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4115486024 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - - - - - - - - 11
-TrigSignatureMoniMT INFO -- #1959043579 Features 26 96 21 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - - - - - - - - - 11
+TrigSignatureMoniMT INFO -- #1959043579 Features 26 96 21 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_lhmedium_mu24_L1MU20 #2970063918
-TrigSignatureMoniMT INFO -- #2970063918 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2970063918 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2970063918 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2970063918 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM22VHI #3879926061
-TrigSignatureMoniMT INFO -- #3879926061 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3879926061 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
-TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_loose_L1EM22VHI #1776910226
-TrigSignatureMoniMT INFO -- #1776910226 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1776910226 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
-TrigSignatureMoniMT INFO -- #2706532790 Events 20 20 4 4 3 3 - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #2706532790 Features 5 5 4 4 - - - - - - - -
+TrigSignatureMoniMT INFO -- #2706532790 Events 20 20 4 4 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2706532790 Features 5 5 4 4 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_L1EM15VH #270010748
+TrigSignatureMoniMT INFO -- #270010748 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #270010748 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_icaloloose_L1EM15VH #4091638976
+TrigSignatureMoniMT INFO -- #4091638976 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4091638976 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_icalomedium_L1EM15VH #2032419080
+TrigSignatureMoniMT INFO -- #2032419080 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2032419080 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g20_tight_icalotight_L1EM15VH #2824200612
+TrigSignatureMoniMT INFO -- #2824200612 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2824200612 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_etcut_L1EM20VH #1417839619
-TrigSignatureMoniMT INFO -- #1417839619 Events 20 20 3 3 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #1417839619 Features 3 3 2 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1417839619 Events 20 20 3 3 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #1417839619 Features 3 3 2 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_loose_L1EM20VH #3476696431
-TrigSignatureMoniMT INFO -- #3476696431 Events 20 20 2 2 2 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3476696431 Features 2 2 6 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3476696431 Events 20 20 2 2 2 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3476696431 Features 2 2 6 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_L1EM20VH #1519793981
-TrigSignatureMoniMT INFO -- #1519793981 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1519793981 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1519793981 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1519793981 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_mu24_ivarmedium_L1MU20 #1007052793
-TrigSignatureMoniMT INFO -- #1007052793 Events 20 20 0 0 0 0 0 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1007052793 Features 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1007052793 Events 20 20 0 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1007052793 Features 0 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_g25_tight_L1EM20VH #3370790749
-TrigSignatureMoniMT INFO -- #3370790749 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #3370790749 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3370790749 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3370790749 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g300_etcut_L1EM22VHI #310189774
-TrigSignatureMoniMT INFO -- #310189774 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #310189774 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #310189774 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #310189774 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g35_loose_mu18_L1EM24VHI #3939387897
-TrigSignatureMoniMT INFO -- #3939387897 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3939387897 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3939387897 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3939387897 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
-TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 #471243435
-TrigSignatureMoniMT INFO -- #471243435 Events 20 20 13 13 13 - - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #471243435 Features 41 41 50 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #471243435 Events 20 20 13 13 13 - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #471243435 Features 41 41 50 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 #3486231698
-TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 13 13 13 13 - - - - - - - - 13
-TrigSignatureMoniMT INFO -- #3486231698 Features 41 41 50 36 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 13 13 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #3486231698 Features 41 41 50 36 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 #3230088967
-TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 10 10 10 2 - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #3230088967 Features 15 15 31 2 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 10 10 10 2 - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #3230088967 Features 15 15 31 2 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 #385248610
-TrigSignatureMoniMT INFO -- #385248610 Events 20 20 9 9 9 2 - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #385248610 Features 13 13 30 2 - - - - - - - -
+TrigSignatureMoniMT INFO -- #385248610 Events 20 20 9 9 9 2 - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #385248610 Features 13 13 30 2 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
-TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - - - - - - - - 1
-TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 30 1 - - - - - - - -
+TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - - - - - - - - - 1
+TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 30 1 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
-TrigSignatureMoniMT INFO -- #1341875780 Events 20 20 0 0 0 0 0 0 0 0 0 8 - - 8
-TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 0 0 0 117 - -
+TrigSignatureMoniMT INFO -- #1341875780 Events 20 20 0 0 0 0 0 0 0 0 0 8 - - - 8
+TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 0 0 0 117 - - -
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 0 0 0 0 0 0 0 0 0 2 - - 2
-TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 24 - -
+TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 0 0 0 0 0 0 0 0 0 2 - - - 2
+TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 24 - - -
TrigSignatureMoniMT INFO HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100 #219711753
-TrigSignatureMoniMT INFO -- #219711753 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #219711753 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #219711753 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #219711753 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
-TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_bmv2c1060_split_L1J100 #710546402
-TrigSignatureMoniMT INFO -- #710546402 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #710546402 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #710546402 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #710546402 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_boffperf_split_L1J100 #540369970
-TrigSignatureMoniMT INFO -- #540369970 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #540369970 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #540369970 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #540369970 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100 #2074989613
-TrigSignatureMoniMT INFO -- #2074989613 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2074989613 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2074989613 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2074989613 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100 #4176355792
-TrigSignatureMoniMT INFO -- #4176355792 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #4176355792 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #4176355792 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #4176355792 Features 0 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
-TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j420_subjesgscIS_ftf_L1J20 #2116995085
-TrigSignatureMoniMT INFO -- #2116995085 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2116995085 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_j420_pf_subresjesgscIS_ftf_L1J100 #3936932891
+TrigSignatureMoniMT INFO -- #3936932891 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3936932891 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_j420_subresjesgscIS_ftf_L1J100 #2477128298
+TrigSignatureMoniMT INFO -- #2477128298 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2477128298 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
-TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - 6
-TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - - 6
+TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_j45_csskpf_nojcalib_ftf_L1J20 #2528888897
-TrigSignatureMoniMT INFO -- #2528888897 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #2528888897 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #2528888897 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #2528888897 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
-TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - 6
-TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - - 6
+TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
-TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_ftf_L1J20 #3679554988
-TrigSignatureMoniMT INFO -- #3679554988 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #3679554988 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #3679554988 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #3679554988 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_nojcalib_ftf_L1J20 #4202219904
-TrigSignatureMoniMT INFO -- #4202219904 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #4202219904 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #4202219904 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #4202219904 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_subjesgscIS_ftf_L1J20 #2187173741
-TrigSignatureMoniMT INFO -- #2187173741 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #2187173741 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #2187173741 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #2187173741 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_subresjesgscIS_ftf_L1J20 #3567642453
-TrigSignatureMoniMT INFO -- #3567642453 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #3567642453 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #3567642453 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #3567642453 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
-TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_011jvt_L1J15 #266323220
-TrigSignatureMoniMT INFO -- #266323220 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #266323220 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #266323220 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #266323220 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_015jvt_L1J15 #3102941497
-TrigSignatureMoniMT INFO -- #3102941497 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #3102941497 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #3102941497 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #3102941497 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_059jvt_L1J15 #2237035634
-TrigSignatureMoniMT INFO -- #2237035634 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #2237035634 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #2237035634 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #2237035634 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_L1J15 #1960278431
-TrigSignatureMoniMT INFO -- #1960278431 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - 7
-TrigSignatureMoniMT INFO -- #1960278431 Features 0 0 0 0 0 0 0 0 0 7 - -
+TrigSignatureMoniMT INFO -- #1960278431 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - - 7
+TrigSignatureMoniMT INFO -- #1960278431 Features 0 0 0 0 0 0 0 0 0 7 - - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20 #980453000
-TrigSignatureMoniMT INFO -- #980453000 Events 20 20 0 0 0 0 0 0 0 0 0 5 0 - 0
-TrigSignatureMoniMT INFO -- #980453000 Features 0 0 0 0 0 0 0 0 0 5 0 -
+TrigSignatureMoniMT INFO -- #980453000 Events 20 20 0 0 0 0 0 0 0 0 0 5 0 - - 0
+TrigSignatureMoniMT INFO -- #980453000 Features 0 0 0 0 0 0 0 0 0 5 0 - -
TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20 #3374916154
-TrigSignatureMoniMT INFO -- #3374916154 Events 20 20 0 0 0 0 0 0 0 0 0 5 5 - 5
-TrigSignatureMoniMT INFO -- #3374916154 Features 0 0 0 0 0 0 0 0 0 5 5 -
+TrigSignatureMoniMT INFO -- #3374916154 Events 20 20 0 0 0 0 0 0 0 0 0 5 5 - - 5
+TrigSignatureMoniMT INFO -- #3374916154 Features 0 0 0 0 0 0 0 0 0 5 5 - -
TrigSignatureMoniMT INFO HLT_j45_subresjesgscIS_ftf_L1J15 #1213239619
-TrigSignatureMoniMT INFO -- #1213239619 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - 7
-TrigSignatureMoniMT INFO -- #1213239619 Features 0 0 0 0 0 0 0 0 0 7 - -
+TrigSignatureMoniMT INFO -- #1213239619 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - - 7
+TrigSignatureMoniMT INFO -- #1213239619 Features 0 0 0 0 0 0 0 0 0 7 - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
-TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #215408633 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 #1151767619
-TrigSignatureMoniMT INFO -- #1151767619 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1151767619 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1151767619 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1151767619 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3781128663
-TrigSignatureMoniMT INFO -- #3781128663 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3781128663 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3781128663 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3781128663 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_L1J100 #1509950051
-TrigSignatureMoniMT INFO -- #1509950051 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1509950051 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1509950051 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1509950051 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #249842682
-TrigSignatureMoniMT INFO -- #249842682 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #249842682 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #249842682 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #249842682 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_L1J100 #3452032818
-TrigSignatureMoniMT INFO -- #3452032818 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3452032818 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3452032818 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3452032818 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_lcw_nojcalib_L1J100 #3093997295
-TrigSignatureMoniMT INFO -- #3093997295 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3093997295 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3093997295 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3093997295 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_pf_nojcalib_ftf_L1J100 #2138269254
-TrigSignatureMoniMT INFO -- #2138269254 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2138269254 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2138269254 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2138269254 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
-TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
-TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100 #3224465417
-TrigSignatureMoniMT INFO -- #3224465417 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3224465417 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3224465417 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3224465417 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_L1J100 #1966129844
-TrigSignatureMoniMT INFO -- #1966129844 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1966129844 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1966129844 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1966129844 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
-TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j80_L1J15 #2440872308
-TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #2440872308 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #2440872308 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 #582699527
-TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #582699527 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #582699527 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #510475538 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #510475538 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #510475538 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #877042532 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j85_pf_ftf_L1J20 #789444389
-TrigSignatureMoniMT INFO -- #789444389 Events 20 20 0 0 0 0 0 0 0 0 0 2 - - 2
-TrigSignatureMoniMT INFO -- #789444389 Features 0 0 0 0 0 0 0 0 0 2 - -
+TrigSignatureMoniMT INFO -- #789444389 Events 20 20 0 0 0 0 0 0 0 0 0 2 - - - 2
+TrigSignatureMoniMT INFO -- #789444389 Features 0 0 0 0 0 0 0 0 0 2 - - -
TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
-TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 19 - - - - - - - - - - 19
-TrigSignatureMoniMT INFO -- #4097312640 Features 20 19 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 19 - - - - - - - - - - - 19
+TrigSignatureMoniMT INFO -- #4097312640 Features 20 19 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU20 #997163309
-TrigSignatureMoniMT INFO -- #997163309 Events 20 20 0 0 0 0 0 - - - - - - - 0
-TrigSignatureMoniMT INFO -- #997163309 Features 0 0 0 0 0 - - - - - - -
+TrigSignatureMoniMT INFO -- #997163309 Events 20 20 0 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #997163309 Features 0 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4_EMPTY #782182242
-TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 0 0 0 0 - - - - - - - 0
-TrigSignatureMoniMT INFO -- #782182242 Features 0 0 0 0 0 - - - - - - -
+TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #782182242 Features 0 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu10_L1MU10 #209090273
-TrigSignatureMoniMT INFO -- #209090273 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #209090273 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu10_ivarmedium_mu10_10invm70_L12MU10 #2386882549
-TrigSignatureMoniMT INFO -- #2386882549 Events 20 20 0 0 0 0 0 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #2386882549 Events 20 20 0 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 #48780310
-TrigSignatureMoniMT INFO -- #48780310 Events 20 20 0 0 0 0 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #48780310 Features 0 0 0 0 0 0 - - - - - -
+TrigSignatureMoniMT INFO -- #48780310 Events 20 20 0 0 0 0 0 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #48780310 Features 0 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bBmumu_L1MU11_2MU6 #947854469
-TrigSignatureMoniMT INFO -- #947854469 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #947854469 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #947854469 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #947854469 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bDimu2700_L1MU11_2MU6 #4293593869
-TrigSignatureMoniMT INFO -- #4293593869 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4293593869 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #4293593869 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #4293593869 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bDimu_L1MU11_2MU6 #2381335347
-TrigSignatureMoniMT INFO -- #2381335347 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2381335347 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2381335347 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2381335347 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6 #2504965945
-TrigSignatureMoniMT INFO -- #2504965945 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2504965945 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2504965945 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2504965945 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bPhi_L1MU11_2MU6 #2079901197
-TrigSignatureMoniMT INFO -- #2079901197 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2079901197 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2079901197 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2079901197 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bTau_L1MU11_2MU6 #1292401093
-TrigSignatureMoniMT INFO -- #1292401093 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1292401093 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1292401093 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1292401093 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6 #1171632195
-TrigSignatureMoniMT INFO -- #1171632195 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 0 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1171632195 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu14_L1MU10 #1696906927
-TrigSignatureMoniMT INFO -- #1696906927 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1696906927 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu20_2mu4noL1_L1MU20 #1029128679
-TrigSignatureMoniMT INFO -- #1029128679 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #1029128679 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526
-TrigSignatureMoniMT INFO -- #2083734526 Events 20 20 0 0 0 0 1 1 1 - - - - - 1
-TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 1 1 1 - - - - -
+TrigSignatureMoniMT INFO -- #2083734526 Events 20 20 0 0 0 0 1 1 1 - - - - - - 1
+TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 1 1 1 - - - - - -
TrigSignatureMoniMT INFO HLT_mu20_ivarmedium_mu8noL1_L1MU20 #3249386942
-TrigSignatureMoniMT INFO -- #3249386942 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3249386942 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3249386942 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3249386942 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu22_2mu4noL1_L1MU20 #3427670100
-TrigSignatureMoniMT INFO -- #3427670100 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3427670100 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3427670100 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3427670100 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu22_mu8noL1_L1MU20 #3165652409
-TrigSignatureMoniMT INFO -- #3165652409 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3165652409 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3165652409 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3165652409 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu24_2mu4noL1_L1MU20 #3233544630
-TrigSignatureMoniMT INFO -- #3233544630 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3233544630 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3233544630 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3233544630 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu24_L1MU20 #417425162
-TrigSignatureMoniMT INFO -- #417425162 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #417425162 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #417425162 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #417425162 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
-TrigSignatureMoniMT INFO -- #677658909 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #677658909 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu24_ivarmedium_L1MU20 #737407430
-TrigSignatureMoniMT INFO -- #737407430 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #737407430 Features 0 0 0 0 1 1 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #737407430 Events 20 20 0 0 0 0 1 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #737407430 Features 0 0 0 0 1 1 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu24_mu10noL1_L1MU20 #2563354236
-TrigSignatureMoniMT INFO -- #2563354236 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #2563354236 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #2563354236 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #2563354236 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu26_L1MU20 #311138376
-TrigSignatureMoniMT INFO -- #311138376 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #311138376 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #311138376 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #311138376 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 #3411723090
-TrigSignatureMoniMT INFO -- #3411723090 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #3411723090 Features 0 0 0 0 1 1 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #3411723090 Events 20 20 0 0 0 0 1 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #3411723090 Features 0 0 0 0 1 1 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu26_mu10noL1_L1MU20 #2318302287
-TrigSignatureMoniMT INFO -- #2318302287 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #2318302287 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #2318302287 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #2318302287 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu26_mu8noL1_L1MU20 #2233067926
-TrigSignatureMoniMT INFO -- #2233067926 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #2233067926 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #2233067926 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #2233067926 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 #1963262787
-TrigSignatureMoniMT INFO -- #1963262787 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1963262787 Features 0 0 0 0 1 1 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1963262787 Events 20 20 0 0 0 0 1 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1963262787 Features 0 0 0 0 1 1 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu28_mu8noL1_L1MU20 #86648125
-TrigSignatureMoniMT INFO -- #86648125 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #86648125 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #86648125 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #86648125 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
-TrigSignatureMoniMT INFO -- #597064890 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 1 1 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #597064890 Events 20 20 0 0 0 0 1 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 1 1 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
-TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 #827327262
-TrigSignatureMoniMT INFO -- #827327262 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #827327262 Features 0 0 0 0 1 1 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #827327262 Events 20 20 0 0 0 0 1 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #827327262 Features 0 0 0 0 1 1 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 #1642591450
-TrigSignatureMoniMT INFO -- #1642591450 Events 20 20 0 0 0 0 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #1642591450 Events 20 20 0 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 0 0 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu60_L1MU20 #2871837722
-TrigSignatureMoniMT INFO -- #2871837722 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2871837722 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 20 20 0 0 0 0 1 1 - - - - - - 1
-TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 1 1 - - - - - -
+TrigSignatureMoniMT INFO -- #996392590 Events 20 20 0 0 0 0 1 1 - - - - - - - 1
+TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 1 1 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #934918532 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 1 1 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 0 0 0 0 1 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 1 1 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 0 0 0 0 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 0 0 0 0 1 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 1 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 0 0 0 0 1 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 2 0 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 0 0 0 0 1 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 2 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 1 1 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 1 1 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 0 0 0 0 1 - - - - - - - 1
-TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 1 - - - - - - -
+TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 0 0 0 0 1 - - - - - - - - 1
+TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 1 - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu6fast_j45_nojcalib_L1J20 #1776326110
-TrigSignatureMoniMT INFO -- #1776326110 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1776326110 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu6fast_xe30_mht_L1XE10 #1876869651
-TrigSignatureMoniMT INFO -- #1876869651 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1876869651 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu80_L1MU20 #387900377
-TrigSignatureMoniMT INFO -- #387900377 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #387900377 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 1 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 #761101109
-TrigSignatureMoniMT INFO -- #761101109 Events 20 20 0 0 0 0 1 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 1 0 0 - - - - -
+TrigSignatureMoniMT INFO -- #761101109 Events 20 20 0 0 0 0 1 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 1 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu8_L1MU6 #1467711434
-TrigSignatureMoniMT INFO -- #1467711434 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 1 1 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1467711434 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 1 1 0 0 - - - - -
+TrigSignatureMoniMT INFO HLT_noalg_L1All #2979253164
+TrigSignatureMoniMT INFO -- #2979253164 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2979253164 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo #355689512
-TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #355689512 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #355689512 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo_EMPTY #3717801557
-TrigSignatureMoniMT INFO -- #3717801557 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3717801557 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM10VH #314199913
-TrigSignatureMoniMT INFO -- #314199913 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #314199913 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #314199913 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #314199913 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM12 #3885916609
-TrigSignatureMoniMT INFO -- #3885916609 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3885916609 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15 #480733925
-TrigSignatureMoniMT INFO -- #480733925 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #480733925 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #480733925 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #480733925 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15VH #2374865899
-TrigSignatureMoniMT INFO -- #2374865899 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2374865899 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM20VH #3719542824
-TrigSignatureMoniMT INFO -- #3719542824 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3719542824 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM22VHI #1723589313
-TrigSignatureMoniMT INFO -- #1723589313 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1723589313 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM3 #4169267792
-TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM7 #3226970354
-TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM8VH #4065285611
-TrigSignatureMoniMT INFO -- #4065285611 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4065285611 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J100 #1026959128
-TrigSignatureMoniMT INFO -- #1026959128 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1026959128 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J15 #1976430774
-TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J20 #2241112369
-TrigSignatureMoniMT INFO -- #2241112369 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2241112369 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J25 #39428635
-TrigSignatureMoniMT INFO -- #39428635 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #39428635 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #39428635 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #39428635 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J30 #3523994129
-TrigSignatureMoniMT INFO -- #3523994129 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3523994129 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J40 #1497591431
-TrigSignatureMoniMT INFO -- #1497591431 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1497591431 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J400 #2494874701
-TrigSignatureMoniMT INFO -- #2494874701 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2494874701 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J50 #3346352675
-TrigSignatureMoniMT INFO -- #3346352675 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3346352675 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J75 #1651897827
-TrigSignatureMoniMT INFO -- #1651897827 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1651897827 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J85 #166231461
-TrigSignatureMoniMT INFO -- #166231461 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #166231461 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #166231461 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #166231461 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1MBTS_1_1_EMPTY #3063661803
-TrigSignatureMoniMT INFO -- #3063661803 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3063661803 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3063661803 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3063661803 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1MBTS_1_EMPTY #4174355886
-TrigSignatureMoniMT INFO -- #4174355886 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4174355886 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4174355886 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4174355886 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1MBTS_2_EMPTY #2028932677
-TrigSignatureMoniMT INFO -- #2028932677 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2028932677 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2028932677 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2028932677 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_EMPTY #914660695
-TrigSignatureMoniMT INFO -- #914660695 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #914660695 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #914660695 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #914660695 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_FILLED #211699639
-TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #211699639 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #211699639 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Standby #420861540
-TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #420861540 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #420861540 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12 #4248050338
-TrigSignatureMoniMT INFO -- #4248050338 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4248050338 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12IM #357557968
-TrigSignatureMoniMT INFO -- #357557968 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #357557968 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #357557968 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #357557968 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU20IM #1931583332
-TrigSignatureMoniMT INFO -- #1931583332 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1931583332 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU30 #1944789678
-TrigSignatureMoniMT INFO -- #1944789678 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1944789678 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU40 #1394621652
-TrigSignatureMoniMT INFO -- #1394621652 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1394621652 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU60 #3332424451
-TrigSignatureMoniMT INFO -- #3332424451 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3332424451 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE10 #1583053368
-TrigSignatureMoniMT INFO -- #1583053368 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1583053368 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE30 #2047368922
-TrigSignatureMoniMT INFO -- #2047368922 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2047368922 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE300 #1315853555
-TrigSignatureMoniMT INFO -- #1315853555 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1315853555 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE35 #2313039014
-TrigSignatureMoniMT INFO -- #2313039014 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2313039014 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE40 #4293469116
-TrigSignatureMoniMT INFO -- #4293469116 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4293469116 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE45 #2365048177
-TrigSignatureMoniMT INFO -- #2365048177 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2365048177 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE50 #1168752081
-TrigSignatureMoniMT INFO -- #1168752081 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1168752081 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE55 #268928384
-TrigSignatureMoniMT INFO -- #268928384 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #268928384 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #268928384 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #268928384 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE60 #4154240531
-TrigSignatureMoniMT INFO -- #4154240531 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4154240531 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE70 #3765216228
-TrigSignatureMoniMT INFO -- #3765216228 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3765216228 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE80 #2742079961
-TrigSignatureMoniMT INFO -- #2742079961 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2742079961 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_bkg_L1Bkg #2032528907
-TrigSignatureMoniMT INFO -- #2032528907 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2032528907 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM3_EMPTY #2458124284
-TrigSignatureMoniMT INFO -- #2458124284 Events 20 20 - - - - - - - - - - - - 15
-TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2458124284 Events 20 20 - - - - - - - - - - - - - 15
+TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM7_EMPTY #299938202
-TrigSignatureMoniMT INFO -- #299938202 Events 20 20 - - - - - - - - - - - - 9
-TrigSignatureMoniMT INFO -- #299938202 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #299938202 Events 20 20 - - - - - - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #299938202 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_EMPTY #3144024902
-TrigSignatureMoniMT INFO -- #3144024902 Events 20 20 - - - - - - - - - - - - 8
-TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3144024902 Events 20 20 - - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_FIRSTEMPTY #3840098930
-TrigSignatureMoniMT INFO -- #3840098930 Events 20 20 - - - - - - - - - - - - 8
-TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3840098930 Events 20 20 - - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_31ETA49_EMPTY #4143623058
-TrigSignatureMoniMT INFO -- #4143623058 Events 20 20 - - - - - - - - - - - - 1
-TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4143623058 Events 20 20 - - - - - - - - - - - - - 1
+TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_EMPTY #2991490897
-TrigSignatureMoniMT INFO -- #2991490897 Events 20 20 - - - - - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #2991490897 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2991490897 Events 20 20 - - - - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2991490897 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_FIRSTEMPTY #2214697960
-TrigSignatureMoniMT INFO -- #2214697960 Events 20 20 - - - - - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #2214697960 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2214697960 Events 20 20 - - - - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2214697960 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1RD1_EMPTY #3925252528
-TrigSignatureMoniMT INFO -- #3925252528 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3925252528 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_EMPTY #56818284
-TrigSignatureMoniMT INFO -- #56818284 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #56818284 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #56818284 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #56818284 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_FILLED #1198298874
-TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_UNPAIRED_ISO #2536676873
-TrigSignatureMoniMT INFO -- #2536676873 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2536676873 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_l1calo_L1J400 #1694511185
-TrigSignatureMoniMT INFO -- #1694511185 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1694511185 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_mb_L1RD2_EMPTY #3788962163
-TrigSignatureMoniMT INFO -- #3788962163 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3788962163 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_zb_L1ZB #1289992951
-TrigSignatureMoniMT INFO -- #1289992951 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1289992951 Events 20 20 - - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_sct_noise_SCTPEB_L1RD0_EMPTY #3024203296
-TrigSignatureMoniMT INFO -- #3024203296 Events 20 20 20 - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3024203296 Features 20 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3024203296 Events 20 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3024203296 Features 20 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 #2342716369
-TrigSignatureMoniMT INFO -- #2342716369 Events 20 20 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2342716369 Events 20 20 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 #372992233
-TrigSignatureMoniMT INFO -- #372992233 Events 20 20 4 4 - - - - - - - - - - 4
-TrigSignatureMoniMT INFO -- #372992233 Features 5 5 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #372992233 Events 20 20 4 4 - - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #372992233 Features 5 5 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU60 #1376650121
-TrigSignatureMoniMT INFO -- #1376650121 Events 20 20 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1376650121 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1376650121 Events 20 20 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1376650121 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_track_L1TAU100 #714660857
-TrigSignatureMoniMT INFO -- #714660857 Events 20 20 0 0 - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #714660857 Events 20 20 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwoMVA_L1TAU100 #2725693236
-TrigSignatureMoniMT INFO -- #2725693236 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2725693236 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwo_L1TAU100 #886074432
-TrigSignatureMoniMT INFO -- #886074432 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #886074432 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwoEF_L1TAU100 #1720193283
-TrigSignatureMoniMT INFO -- #1720193283 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1720193283 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1720193283 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1720193283 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwo_L1TAU100 #4069120574
-TrigSignatureMoniMT INFO -- #4069120574 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4069120574 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4069120574 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4069120574 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 #1747754287
-TrigSignatureMoniMT INFO -- #1747754287 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1747754287 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwoMVA_L1TAU100 #2334140248
-TrigSignatureMoniMT INFO -- #2334140248 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2334140248 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwo_L1TAU100 #1799096347
-TrigSignatureMoniMT INFO -- #1799096347 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1799096347 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau200_medium1_tracktwoEF_L1TAU100 #4203471951
-TrigSignatureMoniMT INFO -- #4203471951 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4203471951 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4203471951 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4203471951 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100 #1468926272
-TrigSignatureMoniMT INFO -- #1468926272 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1468926272 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1468926272 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1468926272 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_track_L1TAU12IM #554271976
-TrigSignatureMoniMT INFO -- #554271976 Events 20 20 3 3 - - - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #554271976 Features 4 4 - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #554271976 Events 20 20 3 3 - - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #554271976 Features 4 4 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
-TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 3 - - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #988149859 Features 4 4 4 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 3 - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #988149859 Features 4 4 4 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
-TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 3 - - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #3346942453 Features 4 4 4 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 3 - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #3346942453 Features 4 4 4 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
-TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #169452969 Features 4 4 3 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #169452969 Features 4 4 3 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
-TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 4 4 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2490017573 Features 4 4 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
-TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #506456080 Features 4 4 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #506456080 Features 4 4 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
-TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #4055280067 Features 4 4 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4055280067 Features 4 4 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
-TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #1433975745 Features 4 4 2 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #1433975745 Features 4 4 2 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
-TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #2222894847 Features 4 4 2 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #2222894847 Features 4 4 2 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
-TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 4 4 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #698603885 Features 4 4 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
-TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 3 - - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #112814536 Features 4 4 4 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 3 - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #112814536 Features 4 4 4 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
-TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 3 - - - - - - - - - 3
-TrigSignatureMoniMT INFO -- #1129072492 Features 4 4 4 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 3 - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #1129072492 Features 4 4 4 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
-TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #2472860683 Features 4 4 2 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #2472860683 Features 4 4 2 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
-TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 4 4 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2537544560 Features 4 4 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
-TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #2992830434 Features 4 4 3 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #2992830434 Features 4 4 3 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
-TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 4 4 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1275052132 Features 4 4 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
-TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 2 - - - - - - - - - 2
-TrigSignatureMoniMT INFO -- #2456480859 Features 4 4 2 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 2 - - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #2456480859 Features 4 4 2 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25 #1794354861
-TrigSignatureMoniMT INFO -- #1794354861 Events 20 20 1 1 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1794354861 Features 2 2 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1794354861 Events 20 20 1 1 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1794354861 Features 2 2 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau80_medium1_tracktwo_L1TAU60 #598963338
-TrigSignatureMoniMT INFO -- #598963338 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #598963338 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #598963338 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #598963338 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I #1075975502
-TrigSignatureMoniMT INFO -- #1075975502 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #1075975502 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1075975502 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1075975502 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40 #400305971
-TrigSignatureMoniMT INFO -- #400305971 Events 20 20 0 0 0 - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #400305971 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO -- #400305971 Events 20 20 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #400305971 Features 0 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655
-TrigSignatureMoniMT INFO -- #1063154655 Events 20 20 20 - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #1063154655 Features 20 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #1063154655 Events 20 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1063154655 Features 20 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_timeburner_L1All #819160059
-TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - - - - - - - -
+TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_unconvtrk0_L1EM3 #2063803903
+TrigSignatureMoniMT INFO -- #2063803903 Events 20 20 0 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2063803903 Features 0 - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
-TrigSignatureMoniMT INFO -- #532175988 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - 1
-TrigSignatureMoniMT INFO -- #532175988 Features 0 0 0 0 0 0 0 0 0 1 - -
+TrigSignatureMoniMT INFO -- #532175988 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - - 1
+TrigSignatureMoniMT INFO -- #532175988 Features 0 0 0 0 0 0 0 0 0 1 - - -
TrigSignatureMoniMT INFO HLT_xe100_pfsum_L1XE50 #1890237897
-TrigSignatureMoniMT INFO -- #1890237897 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - 1
-TrigSignatureMoniMT INFO -- #1890237897 Features 0 0 0 0 0 0 0 0 0 1 - -
+TrigSignatureMoniMT INFO -- #1890237897 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - - 1
+TrigSignatureMoniMT INFO -- #1890237897 Features 0 0 0 0 0 0 0 0 0 1 - - -
TrigSignatureMoniMT INFO HLT_xe100_tcpufit_L1XE50 #2803198799
-TrigSignatureMoniMT INFO -- #2803198799 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2803198799 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2803198799 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2803198799 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_L1XE50 #1055916731
-TrigSignatureMoniMT INFO -- #1055916731 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - 1
-TrigSignatureMoniMT INFO -- #1055916731 Features 0 0 0 0 0 0 0 0 0 1 - -
+TrigSignatureMoniMT INFO -- #1055916731 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - - 1
+TrigSignatureMoniMT INFO -- #1055916731 Features 0 0 0 0 0 0 0 0 0 1 - - -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_xe85_tcpufit_xe65_cell_L1XE50 #451622546
-TrigSignatureMoniMT INFO -- #451622546 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #451622546 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #451622546 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #451622546 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_xe110_mht_L1XE50 #3030733259
-TrigSignatureMoniMT INFO -- #3030733259 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - 1
-TrigSignatureMoniMT INFO -- #3030733259 Features 0 0 0 0 0 0 0 0 0 1 - -
+TrigSignatureMoniMT INFO -- #3030733259 Events 20 20 0 0 0 0 0 0 0 0 0 1 - - - 1
+TrigSignatureMoniMT INFO -- #3030733259 Features 0 0 0 0 0 0 0 0 0 1 - - -
TrigSignatureMoniMT INFO HLT_xe110_tc_em_L1XE50 #607113828
-TrigSignatureMoniMT INFO -- #607113828 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #607113828 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #607113828 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #607113828 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_xe110_tcpufit_L1XE50 #892853397
-TrigSignatureMoniMT INFO -- #892853397 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #892853397 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #892853397 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #892853397 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 #1649696554
-TrigSignatureMoniMT INFO -- #1649696554 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #1649696554 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #1649696554 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #1649696554 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #3768353779 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #3768353779 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_xe30_cvfpufit_L1XE10 #3860749499
-TrigSignatureMoniMT INFO -- #3860749499 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - 6
-TrigSignatureMoniMT INFO -- #3860749499 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO -- #3860749499 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - - 6
+TrigSignatureMoniMT INFO -- #3860749499 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #3626903018
-TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 0 0 0 0 0 0 0 0 0 14 - - 14
-TrigSignatureMoniMT INFO -- #3626903018 Features 0 0 0 0 0 0 0 0 0 14 - -
+TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 0 0 0 0 0 0 0 0 0 14 - - - 14
+TrigSignatureMoniMT INFO -- #3626903018 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_em_subjesgscIS_L1XE10 #689201557
-TrigSignatureMoniMT INFO -- #689201557 Events 20 20 0 0 0 0 0 0 0 0 0 5 - - 5
-TrigSignatureMoniMT INFO -- #689201557 Features 0 0 0 0 0 0 0 0 0 5 - -
+TrigSignatureMoniMT INFO -- #689201557 Events 20 20 0 0 0 0 0 0 0 0 0 5 - - - 5
+TrigSignatureMoniMT INFO -- #689201557 Features 0 0 0 0 0 0 0 0 0 5 - - -
TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10 #1886909707
-TrigSignatureMoniMT INFO -- #1886909707 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - 4
-TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 4 - -
+TrigSignatureMoniMT INFO -- #1886909707 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - - 4
+TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 4 - - -
TrigSignatureMoniMT INFO HLT_xe30_pfopufit_L1XE10 #2252641537
-TrigSignatureMoniMT INFO -- #2252641537 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - 4
-TrigSignatureMoniMT INFO -- #2252641537 Features 0 0 0 0 0 0 0 0 0 4 - -
+TrigSignatureMoniMT INFO -- #2252641537 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - - 4
+TrigSignatureMoniMT INFO -- #2252641537 Features 0 0 0 0 0 0 0 0 0 4 - - -
TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 20 20 0 0 0 0 0 0 0 0 0 5 - - 5
-TrigSignatureMoniMT INFO -- #998713382 Features 0 0 0 0 0 0 0 0 0 5 - -
+TrigSignatureMoniMT INFO -- #998713382 Events 20 20 0 0 0 0 0 0 0 0 0 5 - - - 5
+TrigSignatureMoniMT INFO -- #998713382 Features 0 0 0 0 0 0 0 0 0 5 - - -
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - 6
-TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - - 6
+TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - 4
-TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 4 - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - - 4
+TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 4 - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
-TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_xe110_tcpufit_L1XE50 #115518400
-TrigSignatureMoniMT INFO -- #115518400 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #115518400 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #115518400 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #115518400 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50 #302256132
-TrigSignatureMoniMT INFO -- #302256132 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #302256132 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #302256132 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #302256132 Features 0 0 0 0 0 0 0 0 0 0 - - -
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
index 03b000d1d0d3ce1311dad690d06357e7698fd7b1..958c933a3c3201cc7b45a42a3d149c6a5b25235c 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
@@ -10,8 +10,8 @@
from TrigEDMConfig.TriggerEDMRun1 import TriggerL2List,TriggerEFList,TriggerResultsRun1List
from TrigEDMConfig.TriggerEDMRun2 import TriggerResultsList,TriggerLvl1List,TriggerIDTruth,TriggerHLTList,EDMDetails,EDMLibraries,TriggerL2EvolutionList,TriggerEFEvolutionList
-from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, AllowedOutputFormats
-
+from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, AllowedOutputFormats,addExtraCollectionsToEDMList
+from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
from AthenaCommon.Logging import logging
log = logging.getLogger('TriggerEDM')
@@ -22,6 +22,12 @@ import six
# For Run 3
#
#************************************************************
+# Let adding collections via preExec for detailed validation
+if flags.Trigger.ExtraEDMList:
+ log.info( "Adding extra collections to EDM (): {}".format(len(TriggerHLTListRun3), flags.Trigger.ExtraEDMList) )
+ addExtraCollectionsToEDMList(TriggerHLTListRun3, flags.Trigger.ExtraEDMList)
+ log.info( "Number of EDM items after adding extra collections: {}".format(len(TriggerHLTListRun3)) )
+
def getTriggerEDMList(key, runVersion):
"""
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index c90249b85ba77d943ed72bf33cf37d7b4d53d42c..f50ac967409aa0571b53d2369d90c17cbd9c6b2b 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -338,6 +338,11 @@ TriggerHLTListRun3 = [
('xAOD::JetContainer#HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetAuxContainer#HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+ # TLA jets
+
+ ('xAOD::JetContainer#HLT_AntiKt4EMTopoJets_subjesIS_TLA', 'BS JetDS ESD', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt4EMTopoJets_subjesIS_TLAAux.'+JetVars, 'BS JetDS ESD', 'Jet'),
+
# FS tracks
('xAOD::TrackParticleContainer#HLT_IDTrack_FS_FTF', 'BS ESD AODFULL', 'Jet'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_FS_FTFAux.', 'BS ESD AODFULL', 'Jet'),
@@ -534,3 +539,42 @@ def addHLTNavigationToEDMList(edmList, allDecisions, hypoDecisions):
edmList.extend([
(typeName, HLTNavEDMTargets, 'Steer'),
(typeNameAux, HLTNavEDMTargets, 'Steer')])
+
+def addExtraCollectionsToEDMList(edmList, extraList):
+ """
+ Extend edmList with extraList, keeping track whether a completely new
+ collection is being added, or a dynamic variable is added to an existing collection.
+ The format of extraList is the same as those of TriggerHLTListRun3.
+ """
+ existing_collections = [(c[0].split("#")[1]).split(".")[0] for c in edmList]
+ for item in extraList:
+ colname = (item[0].split("#")[1]).split(".")[0]
+ if colname not in existing_collections:
+ # a new collection is added
+ edmList.append(item)
+ __log.info("added new item to Trigger EDM: {}".format(item))
+ else:
+ if "Aux." in item[0]:
+ # probably an extra dynamic variable is added
+ # new variables to add:
+ dynVars = (item[0].split("#")[1]).split(".")[1:]
+ # find the index of the existing item
+ existing_item_nr = [i for i,s in enumerate(edmList) if colname == (s[0].split("#")[1]).split(".")[0]]
+ if len(existing_item_nr) != 1:
+ __log.error("Found {} existing edm items corresponding to new item {}, but it must be exactly one!".format(len(existing_item_nr), item))
+ # merge lists of variables
+ existing_dynVars = (edmList[existing_item_nr[0]][0].split("#")[1]).split(".")[1:]
+ dynVars.extend(existing_dynVars)
+ # remove duplicates:
+ dynVars = list(dict.fromkeys(dynVars))
+ newVars = '.'.join(dynVars)
+ typename = item[0].split("#")[0]
+ __log.info("old item in Trigger EDM: {}".format(edmList[existing_item_nr[0]]))
+ targets = edmList[existing_item_nr[0]][1]
+ signature = edmList[existing_item_nr[0]][2]
+ edmList.pop(existing_item_nr[0])
+ edmList.insert(existing_item_nr[0] , (typename + "#" + colname + "." + newVars, targets, signature))
+ __log.info("updated item in Trigger EDM: {}".format(edmList[existing_item_nr[0]]))
+ else:
+ # asking to add some collection which is already in the list - do nothing
+ pass
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt b/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
index 1c0d28c58ca9099bd75df90592ae0b61854b7946..f3b6e1be2175f875e38551ab4b15dfa02e292dfb 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
@@ -4,7 +4,7 @@
atlas_subdir( TriggerJobOpts )
# Install files from the package:
-atlas_install_python_modules( python/*.py ${ATLAS_FLAKE8} )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/SliceFlagsMT.py b/Trigger/TriggerCommon/TriggerJobOpts/python/SliceFlagsMT.py
index fc81778f69eed406788d2050be9561c5816099c0..63371925ede90ef4503d2d8a514c6b01ad378cb5 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/SliceFlagsMT.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/SliceFlagsMT.py
@@ -16,4 +16,5 @@ import TriggerJobOpts.StreamingSliceFlags
import TriggerJobOpts.MonitorSliceFlags
import TriggerJobOpts.BeamspotSliceFlags
import TriggerJobOpts.EnhancedBiasSliceFlags
+import TriggerJobOpts.UnconventionalTrackingSliceFlags
import TriggerJobOpts.TestSliceFlags
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 982ba3d80f4857ffd18173903d2869a0ee28c67c..24cb4b5f01dbee30919e8a3076d44c777acf2ca5 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -33,7 +33,7 @@ def collectHypos( steps ):
__log.debug( "collecting hypos from step " + stepSeq.getName() )
# start = {}
for seq,algs in six.iteritems (flatAlgorithmSequences( stepSeq )):
- for alg in algs:
+ for alg in sorted(algs, key=lambda t: str(t.name)):
if isSequence( alg ):
continue
# will replace by function once dependencies are sorted
@@ -45,7 +45,7 @@ def collectHypos( steps ):
else:
__log.verbose("Not a hypo" + alg.getName())
- return hypos
+ return OrderedDict(hypos)
def __decisionsFromHypo( hypo ):
""" return all chains served by this hypo and the key of produced decision object """
@@ -159,7 +159,7 @@ def collectDecisionObjects( hypos, filters, l1decoder, hltSummary ):
decisionObjects.update(decObjHypo)
decisionObjects.update(decObjFilter)
decisionObjects.update(decObjSummary)
- return sorted(decisionObjects)
+ return list(sorted(decisionObjects))
def triggerSummaryCfg(flags, hypos):
"""
@@ -335,9 +335,10 @@ def triggerBSOutputCfg(flags, summaryAlg, offline=False):
# Tool serialising EDM objects to fill the HLT result
serialiser = TriggerEDMSerialiserToolCfg('Serialiser')
- for item, modules in six.iteritems (ItemModuleDict):
- __log.debug('adding to serialiser list: %s, modules: %s', item, modules)
- serialiser.addCollection(item, modules)
+ for item, modules in ItemModuleDict.items():
+ sModules = sorted(modules)
+ __log.debug('adding to serialiser list: %s, modules: %s', item, sModules)
+ serialiser.addCollection(item, sModules)
# Tools adding stream tags and trigger bits to HLT result
stmaker = StreamTagMakerToolCfg()
@@ -433,10 +434,17 @@ def triggerPOOLOutputCfg(flags, edmSet):
return acc
-def triggerMergeViewsAndAddMissingEDMCfg( edmSet, hypos, viewMakers, decObj, decObjHypoOut ):
+def triggerMergeViewsAndAddMissingEDMCfg( flags, edmSet, hypos, viewMakers, decObj, decObjHypoOut ):
HLTEDMCreatorAlg, HLTEDMCreator=CompFactory.getComps("HLTEDMCreatorAlg","HLTEDMCreator",)
- from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3
+ from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTListRun3, addExtraCollectionsToEDMList
+
+ __log.info( "Number of EDM items in triggerMergeViewsAndAddMissingEDMCfg: {}".format(len(TriggerHLTListRun3)) )
+ if flags.Trigger.ExtraEDMList:
+ __log.info( "Adding extra collections to EDM: {}".format(flags.Trigger.ExtraEDMList) )
+ addExtraCollectionsToEDMList(TriggerHLTListRun3, flags.Trigger.ExtraEDMList)
+ __log.info( "Number of EDM items after adding extra collections: {}".format(len(TriggerHLTListRun3)) )
+
alg = HLTEDMCreatorAlg("EDMCreatorAlg")
@@ -577,14 +585,16 @@ def triggerRunCfg( flags, seqName = None, menu=None ):
# Add HLT Navigation to EDM list
from TrigEDMConfig import TriggerEDMRun3
+ __log.info( "Number of EDM items before adding navigation: {}".format(len(TriggerEDMRun3.TriggerHLTListRun3)) )
TriggerEDMRun3.addHLTNavigationToEDMList(TriggerEDMRun3.TriggerHLTListRun3, decObj, decObjHypoOut)
+ __log.info( "Number of EDM items after adding navigation: {}".format(len(TriggerEDMRun3.TriggerHLTListRun3)) )
# Configure output writing
outputAcc, edmSet = triggerOutputCfg( flags, summaryAlg )
acc.merge( outputAcc )
if edmSet:
- mergingAlg = triggerMergeViewsAndAddMissingEDMCfg( [edmSet] , hypos, viewMakers, decObj, decObjHypoOut )
+ mergingAlg = triggerMergeViewsAndAddMissingEDMCfg( flags, [edmSet] , hypos, viewMakers, decObj, decObjHypoOut )
acc.addEventAlgo( mergingAlg, sequenceName="HLTFinalizeSeq" )
return acc
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 20b243769ba91f9e613c0a16f74f0d592d7db22a..d46f3d48a559f3b82dc7136d69eb06fbb3bc82f2 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -154,6 +154,9 @@ def createTriggerFlags():
# list of objects to be written to ESD
flags.addFlag('Trigger.ESDEDMSet', 'ESD')
+ # to allow stroing extra EDM items via preExec
+ flags.addFlag('Trigger.ExtraEDMList', [])
+
# tag to be used for condutions used by HLT code
flags.addFlag('Trigger.OnlineCondTag', 'CONDBR2-HLTP-2018-01')
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index 764f7f1e0ab96afbb69165c15bc080e1de8749a3..e7ea511f414c689c0e4b065ff876a010175f727e 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -706,7 +706,6 @@ _flags.append(inputLVL1configFile)
# remove prescale suffixes
def _getMenuBaseName(menuName):
- log = logging.getLogger(__name__)
m = re.match(r'(.*v\d(?:_primaries)?).*', menuName)
if m:
menuName = m.groups()[0]
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/UnconventionalTrackingSliceFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/UnconventionalTrackingSliceFlags.py
new file mode 100644
index 0000000000000000000000000000000000000000..0862c49c1a3f57c46e677087eaec455e90213dd5
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/UnconventionalTrackingSliceFlags.py
@@ -0,0 +1,45 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+""" UnconventionalTracking slice specific flags """
+
+from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
+from AthenaCommon.JobProperties import jobproperties # noqa: F401
+from TriggerJobOpts.CommonSignatureHelper import CommonSignatureHelper
+
+__doc__="UnconventionalTracking slice specific flags "
+
+
+_flags = []
+
+
+class SliceList(JobProperty):
+ """ List of chains provided by the Unconventional Tracking slice """
+ statusOn=True
+ allowedTypes=['list']
+ StoredValue=[]
+_flags.append(SliceList)
+
+
+class signatures(JobProperty):
+ """ signatures in UnconventionalTracking slice """
+ statusOn=True
+ allowedTypes = ['list']
+ StoredValue = []
+_flags.append(signatures)
+
+
+class UnconventionalTrackingSlice(JobPropertyContainer, CommonSignatureHelper):
+ """ UnconventionalTracking Slice Flags """
+
+from TriggerJobOpts.TriggerFlags import TriggerFlags
+TriggerFlags.add_Container(UnconventionalTrackingSlice)
+
+# add add common slice flags
+#TriggerFlags.UnconventionalTrackingSlice.import_JobProperties('TriggerJobOpts.CommonSignatureFlags')
+
+for flag in _flags:
+ TriggerFlags.UnconventionalTrackingSlice.add_JobProperty(flag)
+del _flags
+
+# make an alias
+UnconventionalTrackingSliceFlags = TriggerFlags.UnconventionalTrackingSlice
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 2a9b7361c5a8f3d487307cb496d8149bcd5a35a5..8db42b0135da28dd333fdcb46e2a7a45c868d222 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -1,3 +1,4 @@
+
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
################################################################################
# TriggerJobOpts/runHLT_standalone.py
@@ -60,6 +61,7 @@ class opt:
doMonitorSlice = True
doBeamspotSlice = True
doCosmicSlice = True
+ doUnconventionalTrackingSlice = True
reverseViews = False
filterViews = False
enabledSignatures = []
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
index b16166cd575300d61e3337424a767f94fccdf5a2..cdd5b876965ec573bd57f11e3d248b2fe671aa00 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
@@ -109,9 +109,11 @@ class L2EFChain_Beamspot(L2EFChainDef):
from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
[trk_alg] = TrigInDetSequence("BeamSpot", "beamSpot", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
- self.L2sequenceList += [ [[""], [PESA__DummyUnseededAllTEAlgo("L2DummyAlgo")]+trk_alg, 'L2_BeamSpottracks']]
+ dummyAllTEAlgo = GenericDummyUnseededAllTEAlgo("L2DummyAlgo")
+
+ self.L2sequenceList += [ [[""], [dummyAllTEAlgo]+trk_alg, 'L2_BeamSpottracks']]
self.L2sequenceList +=[[['L2_BeamSpottracks'], [theFex], 'L2_fex']]
self.L2sequenceList +=[[['L2_fex'], [theAlg], 'L2_']]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py
index 9b34fcf6cf0562ba1c46e4a44a817f8b7608f0c6..b654305120af105a482850da6267a3bc9093f02a 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py
@@ -194,8 +194,9 @@ class L2EFChain_CosmicTemplate(L2EFChainDef):
newchainName = self.chainName[:pos]
# common L2 sequence
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
- theAllTEDummyFakeROI = PESA__DummyUnseededAllTEAlgo("Cosmic"+newchainName+"AllTEDummy")
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
+
+ theAllTEDummyFakeROI = GenericDummyUnseededAllTEAlgo("Cosmic"+newchainName+"AllTEDummy")
from TrigHypoCommonTools.TrigHypoCommonToolsConf import L1InfoHypo
theL1InfoHypo = L1InfoHypo("L1InfoHypo"+newchainName)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py
index 73b28774b2d8267a7d91c0ce35d4398314cf4d24..ff3686fb439c112f119031ad8d9222f4f8053f19 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py
@@ -70,10 +70,12 @@ class L2EFChain_EnhancedBiasTemplate(L2EFChainDef):
# sequence/signature/TErenaming
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
from TrigHypoCommonTools.TrigHypoCommonToolsConf import L1InfoHypo
- self.dummyAlg = PESA__DummyUnseededAllTEAlgo("EF_DummyFEX_%s" %(self.algType))
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
+
+
+ self.dummyAlg = GenericDummyUnseededAllTEAlgo("EF_DummyFEX_%s" %(self.algType))
self.dummyAlg.createRoIDescriptors = False
self.dummyAlg.NumberOfOutputTEs = 1
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/commonUtils/makeCaloSequences.py b/Trigger/TriggerCommon/TriggerMenu/python/commonUtils/makeCaloSequences.py
index d8305ca86f48365b5b51aad5ce000026fae420cb..1c05001d1fd023edf3a4af381422f7398652a01d 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/commonUtils/makeCaloSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/commonUtils/makeCaloSequences.py
@@ -6,6 +6,7 @@ import sys
import traceback
+
def exc2string2():
"""Provide traceback ehen an exception has been raised"""
llist = sys.exc_info()
@@ -19,8 +20,6 @@ def exc2string2():
try:
from TriggerMenu.commonUtils.LeptonIsoEDConfig import TrigHLTEnergyDensityCentral, TrigHLTEnergyDensityForward
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo as DummyAlgo
-
from TrigCaloRec.TrigCaloRecConfig import (TrigCaloCellMaker_jet_fullcalo,
TrigCaloClusterMaker_topo)
@@ -59,15 +58,19 @@ def EnergyDensitySequence(te_in):
def fullScanTopoClusterSequence():
te_in = ''
te_out = 'EF_FSTopoClusters'
-
- alglist = [DummyAlgo('RoiCreator'),
- TrigCaloCellMaker_jet_fullcalo('TriggerCaloCellMaker_FS',
- doNoise=0,
- AbsE=True,
- doPers=True),
- TrigCaloClusterMaker_topo('TopoCaloClusterMaker_topo_FS',
- doMoments=True,
- doLC=True)]
+
+ # from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo as DummyAlgp
+
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
+
+ alglist = [ GenericDummyUnseededAllTEAlgo('RoiCreator'),
+ TrigCaloCellMaker_jet_fullcalo('TriggerCaloCellMaker_FS',
+ doNoise=0,
+ AbsE=True,
+ doPers=True),
+ TrigCaloClusterMaker_topo('TopoCaloClusterMaker_topo_FS',
+ doMoments=True,
+ doLC=True)]
return SequenceSpecifier(te_in, te_out, alglist).generate()
@@ -83,7 +86,11 @@ def getFullScanCaloSequences():
'''
import collections
caloSeqMap = collections.OrderedDict()
- theDummyRoiCreator=DummyAlgo('RoiCreator')
+
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo # as DummyAlgp
+
+ theDummyRoiCreator = GenericDummyUnseededAllTEAlgo('RoiCreator')
+
cellMaker=TrigCaloCellMaker_jet_fullcalo('TriggerCaloCellMaker_FS',
doNoise=0,
AbsE=True,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py
index f4be6aaa92aa6fda317d551d6e05a8c0ac188f42..bc54e6d0a190f8eea7c7b902966cd7ee89b84c91 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py
@@ -14,9 +14,9 @@ from TrigHIHypo.UE import theUEMaker, theFSCellMaker, theElectronUEMonitoring
from TrigMultiVarHypo.TrigL2CaloRingerHypoConfig import TrigL2CaloRingerFexHypo_e_NoCut
from TrigEgammaHypo.TrigEFCaloHypoConfig import TrigEFCaloHypo_EtCut
from TrigEgammaHypo.TrigL2ElectronFexConfig import L2ElectronFex_Clean
-from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyCopyAllTEAlgo
from TriggerMenu.commonUtils.makeCaloSequences import getFullScanCaloSequences
-from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo as DummyRoI
+from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyCopyAllTEAlgo
+from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo as DummyRoI
from TriggerJobOpts.TriggerFlags import TriggerFlags
logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger("TriggerMenu.egamma.ElectronDef")
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/egamma/PhotonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/egamma/PhotonDef.py
index d3aacd655b002ba1e8b1f824f89abca1f3fa0d40..fdd1a2b86f4d15b4deae08550314f530e5c59cd8 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/egamma/PhotonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/egamma/PhotonDef.py
@@ -15,7 +15,7 @@ from TriggerMenu.menu.HltConfig import L2EFChainDef, mergeRemovingOverlap
from TrigHIHypo.UE import theUEMaker, theFSCellMaker
from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyCopyAllTEAlgo
-from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo as DummyRoI
+from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo as DumyRoI
from TriggerMenu.commonUtils.makeCaloSequences import getFullScanCaloSequences
from TrigTRTHighTHitCounter.TrigTRTHighTHitCounterConf import TrigTRTHTHCounter, TrigTRTHTHhypo
##################
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
index ad15f311427462ebb9f256f1d263345567da9e10..a43fe4e0421d1a4ca2d5bf2f4932430adfd9a828 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
@@ -21,8 +21,8 @@ efid = TrigEFIDSequence("minBias","minBias","InsideOut").getSequence()
efid_heavyIon = TrigEFIDSequence("heavyIonFS","heavyIonFS","InsideOut").getSequence()
efid2P = TrigEFIDSequence("minBias2P","minBias2","InsideOutLowPt").getSequence()
-from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo as DummyRoI
-dummyRoI=DummyRoI(name='MinBiasDummyRoI', createRoIDescriptors = True, NumberOfOutputTEs=1)
+from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo as DummyRoI
+dummyRoI=DummyRoI(name='MinBiasDummyRoI' ) #, createRoIDescriptors = True, NumberOfOutputTEs=1)
# for HI
from TrigHIHypo.TrigHIHypoConfig import HIEFTrackHypo_AtLeastOneTrack
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
index 728f807ba3f9fc47ca7112b30b173014c9e7b1f0..da7f85ffc9e4fc6a9018aa1e8c37b3f9080b6fa6 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
@@ -471,6 +471,7 @@ class AlgFactory(object):
def superRoIMaker(self):
+
factory = 'SeededAlgo'
name = '"SeededAlgo_%s"' % self.seed
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator_test.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator_test.py
index e3c123a5160d39c17796f9ddc30b3523abced772..1843e99de86b8a8661d3e5ed76f1aca599fdacb1 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator_test.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator_test.py
@@ -14,11 +14,11 @@ class Test_jetDefInstantiator(unittest.TestCase):
inst = Instantiator()
self.assertTrue(len(inst.cache) == 0)
self.assertTrue(
- inst(alg).__class__.__name__ == 'PESA__DummyUnseededAllTEAlgo')
+ inst(alg).__class__.__name__ == 'GenericDummyUnseededAllTEAlgo')
self.assertTrue(len(inst.cache) == 1)
inst(alg)
self.assertTrue(
- inst(alg).__class__.__name__ == 'PESA__DummyUnseededAllTEAlgo')
+ inst(alg).__class__.__name__ == 'GenericDummyUnseededAllTEAlgo')
def test_1(self):
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
index d46b3c6c2100df179bf7ca6848edc897d558dcee..8c04cc348fff5b4fd44b48eafd7e98c6673481b7 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
@@ -52,7 +52,7 @@ from TrigMissingETMuon.TrigMissingETMuonConfig import (EFTrigMissingETMuon_Fex,
EFTrigMissingETMuon_Fex_topoclPUC,
L2TrigMissingETMuon_Fex)
-from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
+from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
from TriggerMenu.jet.JetDef import generateHLTChainDef
from TriggerMenu.menu import DictFromChainName
@@ -417,7 +417,7 @@ class L2EFChain_met(L2EFChainDef):
from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
trk_algs = TrigInDetSequence("FullScan", "fullScan", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
print (trk_algs[0])
- dummyAlg = PESA__DummyUnseededAllTEAlgo("EF_DummyFEX_xe")
+ dummyAlg = GenericDummyUnseededAllTEAlgo("EF_DummyFEX_xe")
self.EFsequenceList +=[[ [''], [dummyAlg]+trk_algs[0], 'EF_xe_step3' ]]
elif EFrecoAlg=='trkmht':
@@ -430,7 +430,7 @@ class L2EFChain_met(L2EFChainDef):
#adding FullScan tracks
from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
trk_algs = TrigInDetSequence("FullScan", "fullScan", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
- dummyAlg = PESA__DummyUnseededAllTEAlgo("EF_DummyFEX_xe")
+ dummyAlg = GenericDummyUnseededAllTEAlgo("EF_DummyFEX_xe")
self.EFsequenceList +=[[ [''], [dummyAlg]+trk_algs[0], 'EF_xe_step0' ]]
self.EFsequenceList +=[[ [output4,'EF_xe_step0',muonSeed], [theEFMETFex], 'EF_xe_step1' ]]
@@ -447,7 +447,7 @@ class L2EFChain_met(L2EFChainDef):
##adding FullScan tracks
from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
trk_algs = TrigInDetSequence("FullScan", "fullScan", "IDTrig", sequenceFlavour=["FTF"]).getSequence()
- dummyAlg = PESA__DummyUnseededAllTEAlgo("EF_DummyFEX_xe")
+ dummyAlg = GenericDummyUnseededAllTEAlgo("EF_DummyFEX_xe")
self.EFsequenceList +=[[ [''], [dummyAlg]+trk_algs[0], 'EF_xe_step0' ]]
self.EFsequenceList +=[[ [output3,'EF_xe_step0',muonSeed], [theEFMETFex], 'EF_xe_step1' ]]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
index 3941483ed56ad9494d38af1c0c846689ffa1740f..50c316ac50d4b8ae444d1f5053b0875f203bb684 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
@@ -30,9 +30,9 @@ efid2P = TrigEFIDSequence("minBias2P","minBias2","InsideOutLowPt").getSequence()
from TrigMinBias.TrigMinBiasConfig import (EFMbTrkFex,EFMbTrkHypoExclusiveLoose,EFMbTrkHypoExclusiveTight,EFMbTrkHypo,
EFMbVxFex,MbVxHypo,MbTrkHypo)
-from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo as DummyRoI
+from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
from TrigGenericAlgs.TrigGenericAlgsConf import PrescaleAlgo
-dummyRoI=DummyRoI(name='MinBiasDummyRoI', createRoIDescriptors = True, NumberOfOutputTEs=1)
+dummyRoI=GenericDummyUnseededAllTEAlgo(name='MinBiasDummyRoI' ) # these aren't needed - they are he default settings already ! , createRoIDescriptors = True, NumberOfOutputTEs=1)
terminateAlgo = PrescaleAlgo('terminateAlgo')
# for HI
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
index 020efa740599f8a050cde4f69c92179873d9a787..1a8ff9653e6c5426ded0c04459beb40cf2b3d135 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
@@ -1079,7 +1079,7 @@ class L2EFChain_mu(L2EFChainDef):
########### EF algos #################
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFExtrapolatorMultiHypoConfig, TrigMuonEFExtrapolatorHypoConfig
@@ -1171,7 +1171,7 @@ class L2EFChain_mu(L2EFChainDef):
if 'msonly' in self.chainPart['reccalibInfo']:
self.EFsequenceList += [['',
- [PESA__DummyUnseededAllTEAlgo("EFDummyAlgo")],
+ [GenericDummyUnseededAllTEAlgo("EFDummyAlgo")],
'EF_dummy']]
self.EFsequenceList += [['EF_dummy',
[CfgGetter.getAlgorithm("TrigMuSuperEF_FSSA")],
@@ -1181,7 +1181,7 @@ class L2EFChain_mu(L2EFChainDef):
'EF_SA_FS2']]
else:
self.EFsequenceList += [['',
- [PESA__DummyUnseededAllTEAlgo("EFDummyAlgo")],
+ [GenericDummyUnseededAllTEAlgo("EFDummyAlgo")],
'EF_dummy']]
self.EFsequenceList += [['EF_dummy',
[CfgGetter.getAlgorithm("TrigMuSuperEF_FSSA")],
@@ -1323,7 +1323,7 @@ class L2EFChain_mu(L2EFChainDef):
########### Sequence List ##############
if "0eta010" in self.chainPart['etaRange'] or "0eta500" in self.chainPart["etaRange"]:
#seed = '0eta0'
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
from TrigMuonEF.TrigMuonEFConfig import TrigMuonEFFSRoiMakerUnseededConfig, TrigMuonEFFSRoiMakerConfig
if "0eta010" in self.chainPart['etaRange']:
theEFRoIMaker = TrigMuonEFFSRoiMakerUnseededConfig("TrigMuonEFFSRoiMakerUnseeded_0eta010", RoISizeEta=0.1)
@@ -1338,7 +1338,7 @@ class L2EFChain_mu(L2EFChainDef):
theEFRoIMakerCT = TrigMuonEFFSRoiMakerConfig("TrigMuonEFFSRoiMakerCT", RoISizeEta=0.1)
self.EFsequenceList += [["",
- [PESA__DummyUnseededAllTEAlgo("EFDummyAlgo")],
+ [GenericDummyUnseededAllTEAlgo("EFDummyAlgo")],
'EF_CT_seed']]
self.EFsequenceList += [['EF_CT_seed',
[theEFRoIMaker],
@@ -1402,7 +1402,7 @@ class L2EFChain_mu(L2EFChainDef):
########### EF algos #################
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFExtrapolatorMultiHypoConfig, TrigMuonEFExtrapolatorHypoConfig
@@ -1481,7 +1481,7 @@ class L2EFChain_mu(L2EFChainDef):
########### Sequence List ##############
self.EFsequenceList += [['',
- [PESA__DummyUnseededAllTEAlgo("EFDummyAlgo",createRoIDescriptors=True)],
+ [GenericDummyUnseededAllTEAlgo("EFDummyAlgo",createRoIDescriptors=True)],
'EF_dummy']]
if "nscan03" in self.chainPart['FSinfo']:
cone = "_cone03"
@@ -1965,6 +1965,11 @@ class L2EFChain_mu(L2EFChainDef):
RoiUpdater.EtaHalfWidth = 0.10
RoiUpdater.PhiHalfWidth = 0.10
+ from RegionSelector.RegSelToolConfif import makeRegSelTool_Pixel
+ from RegionSelector.RegSelToolConfif import makeRegSelTool_SCT
+ RoiUpdater.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ RoiUpdater.RegSelTool_SCT = makeRegSelTool_SCT()
+
from TrigL2MuonSA.TrigL2MuonSAConfig import TrigL2MuonSAConfig
theL2StandAloneAlg = TrigL2MuonSAConfig(L2AlgName)
from TrigMuonHypo.TrigMuonHypoConfig import MufastHypoConfig
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDefIdTest.py b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDefIdTest.py
index 1b5efadb3fa43ac83a2520f9a410c26ed6fab192..d423245472569b7dd00a0c69126df76ba0d99d97 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDefIdTest.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDefIdTest.py
@@ -492,7 +492,7 @@ class L2EFChain_mu(L2EFChainDef):
########### EF algos #################
- from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo
+ from TrigGenericAlgs.GenericDummyUnseededAllTEAlgoConfig import GenericDummyUnseededAllTEAlgo
from AthenaCommon import CfgGetter
@@ -562,7 +562,7 @@ class L2EFChain_mu(L2EFChainDef):
########### Sequence List ##############
self.EFsequenceList += [['',
- [PESA__DummyUnseededAllTEAlgo("EFDummyAlgo")]+
+ [GenericDummyUnseededAllTEAlgo("EFDummyAlgo")]+
[CfgGetter.getAlgorithm("TrigMuSuperEF_FSSA"),
theTrigMuonEFSA_FS_Hypo],
'EF_SA_FS']]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
index 7e0d8a6407f5b482542da2dc2e6e8cc1ab74b857..30eb25f176178ce758b0f84b881158719e49ad0c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
@@ -111,6 +111,7 @@ atlas_install_scripts( scripts/generateMenuMT.py
scripts/test_HLTmenu.sh
scripts/generateL1MenuRun3.py
scripts/trigCompareOldandNewL1Menus.py
+ scripts/trigL1MenuMigrationCheck.sh
scripts/verify_menu_config.py
scripts/test_full_menu_cf.py )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
index 4bf4949af6622fa30afa41b1a92736a758c75027..62cecf49b001a81011d80be1c72b2ebffb2bad8a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
@@ -61,6 +61,12 @@ def pebInfoWriterTool(name, eventBuildType):
elif 'LArPEB' in eventBuildType:
tool = RoIPEBInfoWriterToolCfg(name)
tool.DetNames = ['PIXEL', 'SCT', 'TRT', 'TTEM', 'TTHEC', 'FCALEM', 'FCALHAD']
+
+ from RegionSelector.RegSelToolConfig import makeRegSelTool_Pixel, makeRegSelTool_SCT, makeRegSelTool_TRT
+ tool.RegSelTool_Pixel = makeRegSelTool_Pixel()
+ tool.RegSelTool_SCT = makeRegSelTool_SCT()
+ tool.RegSelTool_TRT = makeRegSelTool_TRT()
+
tool.MaxRoIs = 5
tool.addHLTResultToROBList() # add the main (full) HLT result to the list
tool.addCTPResultToROBList() # add the CTP result to the list
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index baa42bc230ff14e9b2237f2853db2e1c23cb12ea..b1e35ad0e2757bca1f2092e50e47be85beb5f3bc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -12,6 +12,7 @@ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import fastElectro
from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionElectronSequenceSetup import precisionElectronMenuSequence
+from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
#----------------------------------------------------------------
# fragments generating configuration will be functions in New JO,
# so let's make them functions already now
@@ -29,13 +30,18 @@ def precisionCaloSequenceCfg( flags ):
def precisionElectronSequenceCfg( flags ):
return precisionElectronMenuSequence()
+
# this must be moved to the HypoTool file:
def diElectronMassComboHypoToolFromDict(chainDict):
- from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaDielectronMassHypoTool
+ from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaMassHypoTool
name = chainDict['chainName']
- tool= TrigEgammaDielectronMassHypoTool(name)
+ monTool = GenericMonitoringTool("MonTool_"+name)
+ monTool.Histograms = [defineHistogram('MassOfAccepted', type='TH1F', path='EXPERT', title="Mass in accepted combinations [MeV]", xbins=75, xmin=0, xmax=150000)]
+ tool= TrigEgammaMassHypoTool(name)
tool.LowerMassElectronClusterCut = 50000
tool.UpperMassElectronClusterCut = 130000
+ monTool.HistPath = 'EgammaMassHypo/'+tool.getName()
+ tool.MonTool = monTool
return tool
#----------------------------------------------------------------
@@ -69,11 +75,21 @@ class ElectronChainConfiguration(ChainConfigurationBase):
'lhvloosenoringer' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
'lhmediumnoringer' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
'lhtightnoringer' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhlooseivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhlooseivarmedium' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhlooseivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhlmediumivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhlmediumivarmedium': ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhlmediumivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhtightivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhtightivarmedium' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
+ 'lhtightivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionElectron'],
}
log.debug('electron chain part = ' + str(self.chainPart))
key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['L2IDAlg'] + self.chainPart['isoInfo']
+
for addInfo in self.chainPart['addInfo']:
key+=addInfo
@@ -110,10 +126,14 @@ class ElectronChainConfiguration(ChainConfigurationBase):
return self.getStep(3,stepName,[ precisionCaloSequenceCfg])
def getPrecisionElectron(self):
+
+ isocut = self.chainPart['isoInfo']
+ log.debug(' isolation cut = ' + str(isocut))
+
if "Zee" in self.chainName:
- stepName = "precision_topoelectron"
+ stepName = "precision_topoelectron"+isocut
return self.getStep(4,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diElectronMassComboHypoToolFromDict])
else:
- stepName = "precision_electron"
+ stepName = "precision_electron"+isocut
return self.getStep(4,stepName,[ precisionElectronSequenceCfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
index c52532fcbf3e6304f85024758f16e6459bdcfbb2..d5505e52f60b135acb4e1ca2ce486f1bea61a367 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
@@ -13,7 +13,7 @@ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCa
from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonSequenceSetup import fastPhotonMenuSequence, precisionPhotonMenuSequence
from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuSequence
-
+from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
#----------------------------------------------------------------
# fragments generating configuration will be functions in New JO,
# so let's make them functions already now
@@ -30,6 +30,17 @@ def precisionPhotonCaloSequenceCfg( flags ):
def precisionPhotonSequenceCfg( flags ):
return precisionPhotonMenuSequence('Photon')
+def diphotonDPhiHypoToolFromDict(chainDict):
+ from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaDPhiHypoTool
+ name = chainDict['chainName']
+ monTool = GenericMonitoringTool("MonTool_"+name)
+ monTool.Histograms = [defineHistogram('DphiOfAccepted', type='TH1F', path='EXPERT', title="PrecisionCalo Hypo entries per Phi;Phi", xbins=128, xmin=-3.2, xmax=3.2)]
+ tool= TrigEgammaDPhiHypoTool(name)
+ tool.ThresholdDPhiCut = 1.5
+ monTool.HistPath = 'EgammaDphiHypo/'+tool.getName()
+ tool.MonTool = monTool
+ return tool
+
#----------------------------------------------------------------
# Class to configure chain
#----------------------------------------------------------------
@@ -47,14 +58,21 @@ class PhotonChainConfiguration(ChainConfigurationBase):
# --------------------
# define here the names of the steps and obtain the chainStep configuration
# --------------------
- etcut_sequence = [self.getFastCalo(), self.getFastPhoton(), self.getPrecisionCaloPhoton()]
- photon_sequence = [self.getFastCalo(), self.getFastPhoton(), self.getPrecisionCaloPhoton(), self.getPrecisionPhoton()]
stepDictionary = {
- "etcut": etcut_sequence,
- "etcutetcut": etcut_sequence,
- "loose": photon_sequence,
- "medium": photon_sequence,
- "tight": photon_sequence,
+ "etcut": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton'],
+ "etcutetcut": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton'],
+ "loose": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "medium": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "tight": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "looseicaloloose": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "mediumicaloloose": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "tighticaloloose": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "looseicalomedium": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "mediumicalomedium": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "tighticalomedium": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "looseicalotight": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "mediumicalotight": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
+ "tighticalotight": ['getFastCalo', 'getFastPhoton', 'getPrecisionCaloPhoton', 'getPrecisionPhoton'],
}
## This needs to be configured by the Egamma Developer!!
@@ -73,7 +91,8 @@ class PhotonChainConfiguration(ChainConfigurationBase):
for step in steps:
log.debug('Adding photon trigger step ' + str(step))
- chainSteps+=[step]
+ chainstep = getattr(self, step)()
+ chainSteps+=[chainstep]
myChain = self.buildChain(chainSteps)
return myChain
@@ -95,5 +114,9 @@ class PhotonChainConfiguration(ChainConfigurationBase):
return self.getStep(3,stepName,[ precisionPhotonCaloSequenceCfg])
def getPrecisionPhoton(self):
- stepName = "PhotonPrecision"
- return self.getStep(4,stepName,[ precisionPhotonSequenceCfg])
+ if "dPhi15" in self.chainName:
+ stepName = "precision_topophoton"
+ return self.getStep(4,stepName,sequenceCfgArray=[precisionPhotonSequenceCfg], comboTools=[diphotonDPhiHypoToolFromDict])
+ else:
+ stepName = "precision_photon"
+ return self.getStep(4,stepName,[ precisionPhotonSequenceCfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
index b26abbfc3d37ce4949721b304a3908a259a25bdb..906e8cf658bd4dbd49f0621e47316f818f033315 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# menu components
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
index a3f965858011033e9557c4f9ba6a9e226c75e469..c73e14378ddbd87127fbb7befd0b201fbd3e37cb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from TriggerMenuMT.HLTMenuConfig.Electron.ElectronRecoSequences import l2CaloRecoCfg, l2CaloHypoCfg
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import CAMenuSequence, \
@@ -8,6 +8,7 @@ from TrigEgammaHypo.TrigEgammaFastCaloHypoTool import TrigEgammaFastCaloHypoTool
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TrigEDMConfig.TriggerEDMRun3 import recordable
from AthenaConfiguration.ComponentFactory import CompFactory
+from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import getChainMultFromDict
# TODO remove once full tracking is in place
def fakeHypoAlgCfg(flags, name="FakeHypoForElectron"):
@@ -44,7 +45,7 @@ def generateChains( flags, chainDict ):
accCalo.printConfig()
- fastCaloStep = ChainStep(name=firstStepName, Sequences=[fastCaloSequence], chainDicts=[chainDict])
+ fastCaloStep = ChainStep(name=firstStepName, Sequences=[fastCaloSequence], chainDicts=[chainDict], multiplicity=getChainMultFromDict(chainDict))
secondStepName = 'ElectronFTF'
@@ -75,7 +76,7 @@ def generateChains( flags, chainDict ):
HypoToolGen = makeFakeHypoTool,
CA = accTrk)
- fastInDetStep = ChainStep( name=secondStepName, Sequences=[fastInDetSequence], chainDicts=[chainDict])
+ fastInDetStep = ChainStep( name=secondStepName, Sequences=[fastInDetSequence], chainDicts=[chainDict], multiplicity=getChainMultFromDict(chainDict))
l1Thresholds=[]
for part in chainDict['chainParts']:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
index 3ffa4b5744a51516a5591385eabaf5c1e94cba61..5b54d52c4abb4062c21c7d99f5365ea531db1767 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
@@ -62,13 +62,21 @@ class JetChainConfiguration(ChainConfigurationBase):
# --------------------
# Only one step for now, but we might consider adding steps for
# reclustering and trimming workflows
- steps=[self.getJetChainStep()]
+
+ step1_jetCollectionName, step1= self.getJetChainStep()
+ steps=[step1]
chainSteps = []
for step in steps:
chainSteps+=[step]
-
+
+
+ if "JetDS" in self.chainName:
+ TLAStep = self.getJetTLAChainStep(step1_jetCollectionName)
+ chainSteps+= [TLAStep]
+
myChain = self.buildChain(chainSteps)
+
return myChain
@@ -84,13 +92,18 @@ class JetChainConfiguration(ChainConfigurationBase):
stepName = "Step1_jet_"+jetDefStr
from AthenaConfiguration.AllConfigFlags import ConfigFlags
jetSeq1 = RecoFragmentsPool.retrieve( jetMenuSequence, ConfigFlags, **self.recoDict ) # the None will be used for flags in future
+ step1_jetCollectionName = jetSeq1.hypo.Alg.Jets
+ chainStep1 = ChainStep(stepName, [jetSeq1], multiplicity=[1], chainDicts=[self.dict])
+
+ return step1_jetCollectionName, chainStep1
- return ChainStep(stepName, [jetSeq1], multiplicity=[1], chainDicts=[self.dict])
+ def getJetTLAChainStep(self, jetCollectionName):
+ #maybe not needed
+ from TriggerMenuMT.HLTMenuConfig.Jet.JetTLAConfiguration import jetTLAMenuSequence
+ stepName = "Step2_jetTLA_"+jetCollectionName
+ jetSeq2 = RecoFragmentsPool.retrieve( jetTLAMenuSequence, jetCollectionName ) # the None will be used for flags in future
+ chainStep2 = ChainStep(stepName, [jetSeq2], multiplicity=[1], chainDicts=[self.dict])
-
-
-
+ return chainStep2
-
-
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
index b32595769aa9a22c4d273973e4ce96839b5d7c80..ec486493dcbb9a4fe254ce0d72109a9fd430bc45 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
@@ -19,7 +19,7 @@ def jetMenuSequence(configFlags,**recoDict):
hypo = TrigJetHypoAlgMT("TrigJetHypoAlgMT_"+jetRecoDictToString(recoDict))
hypo.Jets = sequenceOut
- return MenuSequence( Sequence = JetAthSequence,
- Maker = InputMakerAlg,
- Hypo = hypo,
- HypoToolGen = trigJetHypoToolFromDict )
+ return MenuSequence( Sequence = JetAthSequence,
+ Maker = InputMakerAlg,
+ Hypo = hypo,
+ HypoToolGen = trigJetHypoToolFromDict )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
index 7e871e53d9525af1cfeecb9210dad69f88fbf8e0..c12e27287296daa56c9fbbb33f0273a65166f1bc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
@@ -7,7 +7,9 @@
# and translate it into the python configuration objects used by
# jet reco code.
-from JetRecConfig.JetDefinition import JetConstit, xAODType, JetDefinition
+from JetRecConfig.JetDefinition import JetConstitSeq,JetConstitSource, xAODType, JetDefinition
+from . import TriggerJetMods # this is to define the ConstitFourMom_copy JetModifierC
+TriggerJetMods.ConstitFourMom_copy
from AthenaCommon.Logging import logging
log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Jet.JetRecoConfiguration")
@@ -39,36 +41,57 @@ def defineJetConstit(jetRecoDict,clustersKey=None,pfoPrefix=None):
constitMods = []
# Get the details of the constituent definition:
# type, mods and the input container name
+
+
if "pf" in jetRecoDict["dataType"]:
if pfoPrefix is None:
raise RuntimeError("JetRecoConfiguration: Cannot define PF jets without pfo prefix!")
+
+ trkopt = jetRecoDict['trkopt']
+ from JetRecConfig.ConstModHelpers import constitModWithAlternateTrk
+ # Generate a new JetConstitModifier with track proterties setup according to trkopt
+ constitModWithAlternateTrk("CorrectPFO", trkopt)
+ constitMods = ["CorrectPFO"+trkopt]
# apply constituent pileup suppression
if "cs" in jetRecoDict["dataType"]:
constitMods.append("CS")
if "sk" in jetRecoDict["dataType"]:
constitMods.append("SK")
+ # Generate a new JetConstitModifier with track proterties setup according to trkopt
+ constitModWithAlternateTrk("CHS", trkopt) #
+ constitMods += ["CHS"+trkopt]
+
+ inputPFO = pfoPrefix+"ParticleFlowObjects"
+ modstring = ''.join(constitMods[1:-1])
+ if modstring == '':
+ modstring='CHS'
+
if not constitMods:
- jetConstit = JetConstit( xAODType.ParticleFlow, constitMods, rawname=pfoPrefix+"ParticleFlowObjects", inputname=pfoPrefix+"CHSParticleFlowObjects")
+ jetConstit = JetConstitSeq( "HLT_EMPFlow", xAODType.ParticleFlow, constitMods, inputname=inputPFO, outputname=pfoPrefix+"CHSParticleFlowObjects", label="EMPFlow")
else:
- jetConstit = JetConstit( xAODType.ParticleFlow, constitMods, rawname=pfoPrefix+"ParticleFlowObjects", prefix=pfoPrefix)
-
+ jetConstit = JetConstitSeq( "HLT_EMPFlow"+modstring, xAODType.ParticleFlow, constitMods, inputname=inputPFO, outputname=pfoPrefix+modstring+"ParticleFlowObjects",label='EMPFlow'+(modstring if modstring!='CHS' else '') )
+
+
if "tc" in jetRecoDict["dataType"]:
- # apply this scale
- if jetRecoDict["calib"] == "em":
- constitMods = ["EM"] + constitMods
- elif jetRecoDict["calib"] == "lcw":
- constitMods = ["LC"] + constitMods
- # read from this cluster collection,
- # overriding the standard offline collection
- jetConstit = JetConstit( xAODType.CaloCluster, constitMods, rawname=clustersKey, prefix="HLT_")
# apply constituent pileup suppression
if "cs" in jetRecoDict["dataType"]:
constitMods.append("CS")
if "sk" in jetRecoDict["dataType"]:
constitMods.append("SK")
- jetConstit.modifiers = constitMods
- if clustersKey is not None and jetRecoDict["dataType"]=="tc":
- jetConstit.inputname = clustersKey
+ # build a modifier identifier :
+ modstring = ''.join(constitMods)
+ # prepend the cluster calib state :
+ if jetRecoDict["calib"] == "em":
+ constitMods = ["EM"] + constitMods
+ elif jetRecoDict["calib"] == "lcw":
+ constitMods = ["LC"] + constitMods
+
+ jetConstit = JetConstitSeq( "HLT_"+constitMods[0]+"Topo",xAODType.CaloCluster, constitMods, inputname=clustersKey, outputname=clustersKey+modstring,label=constitMods[0]+'Topo'+modstring)
+
+ # declare our new JetConstitSeq in the standard dictionary
+ from JetRecConfig.StandardJetConstits import jetconstitdic
+ jetconstitdic.setdefault(jetConstit.name, jetConstit)
+
return jetConstit
@@ -79,7 +102,7 @@ def interpretRecoAlg(recoAlg):
# Arbitrary min pt for fastjet, set to be low enough for MHT(?)
# Could/should adjust higher for large-R
-def defineJets(jetRecoDict,clustersKey=None,pfoPrefix=None):
+def defineJets(jetRecoDict,clustersKey=None,prefix='',pfoPrefix=None):
minpt = {
4: 7000,
10: 50000,
@@ -87,20 +110,26 @@ def defineJets(jetRecoDict,clustersKey=None,pfoPrefix=None):
jetalg, jetradius, jetextra = interpretRecoAlg(jetRecoDict["recoAlg"])
actualradius = float(jetradius)/10
jetConstit = defineJetConstit(jetRecoDict,clustersKey,pfoPrefix)
- jetDef = JetDefinition( "AntiKt", actualradius, jetConstit, ptmin=minpt[jetradius])
+
+ suffix="_"+jetRecoDict["jetCalib"]
+ if jetRecoDict["trkopt"] != "notrk":
+ suffix += "_{}".format(jetRecoDict["trkopt"])
+
+
+ jetDef = JetDefinition( "AntiKt", actualradius, jetConstit, ptmin=minpt[jetradius], prefix=prefix, suffix=suffix)
return jetDef
-def defineReclusteredJets(jetRecoDict):
- rcJetConstit = JetConstit( xAODType.Jet, [])
+def defineReclusteredJets(jetRecoDict,smallRjets):
+ rcJetConstit = JetConstitSource("RCJet", xAODType.Jet, smallRjets, label='JetRC')
rcJetDef = JetDefinition( "AntiKt", 1.0, rcJetConstit)
return rcJetDef
-def defineGroomedJets(jetRecoDict,ungroomedDef,ungroomedJetsName):
+def defineGroomedJets(jetRecoDict,ungroomedDef):#,ungroomedJetsName):
from JetRecConfig.JetGrooming import JetTrimming, JetSoftDrop
groomAlg = jetRecoDict["recoAlg"][3:] if 'sd' in jetRecoDict["recoAlg"] else jetRecoDict["recoAlg"][-1]
groomDef = {
- "sd":JetSoftDrop(ungroomedDef,ungroomedJetsName,zcut=0.1,beta=1.0),
- "t" :JetTrimming(ungroomedDef,ungroomedJetsName,smallR=0.2,ptfrac=0.05),
+ "sd":JetSoftDrop(ungroomedDef,zcut=0.1,beta=1.0),
+ "t" :JetTrimming(ungroomedDef,smallR=0.2,ptfrac=0.05),
}[groomAlg]
return groomDef
@@ -115,9 +144,9 @@ def getModSpec(modname,modspec=''):
def defineTrackMods(trkopt):
trkmods = [
- (jetmoddict["TrackMoments"],trkopt),
- (jetmoddict["JVF"],trkopt),
- (jetmoddict["JVT"],trkopt)
+ "TrackMoments:"+trkopt,
+ "JVF:"+trkopt,
+ "JVT:"+trkopt,
]
return trkmods
@@ -167,16 +196,16 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
calibSeq += "_Insitu"
calibSpec = ":".join( [calibContext, dataSource, calibSeq, rhoKey, pvname, gscDepth] )
- from .TriggerJetMods import ConstitFourMom_copy
+
if jetalg=="a4":
- calibMods = [(ConstitFourMom_copy,""),
- getModSpec("CaloEnergies"), # Needed for GSC
- getModSpec("Calib",calibSpec),
- getModSpec("Sort")]
+ calibMods = ["ConstitFourMom_copy",
+ "CaloEnergies", # Needed for GSC
+ "Calib:"+calibSpec,
+ "Sort"]
else:
- calibMods = [(ConstitFourMom_copy,""),
- getModSpec("Calib",calibSpec),
- getModSpec("Sort")]
+ calibMods = ["ConstitFourMom_copy",
+ "Calib:"+calibSpec,
+ "Sort"]
filtercut = {"a4":7000, "a10":50000, "a10r": 50000, "a10t":50000, "a10sd":50000}[jetalg]
- return calibMods + [getModSpec("Filter",filtercut)]
+ return calibMods + ["Filter:"+str(filtercut)]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
index 54d1b7d8202a5e9084bc37e0621723a40eafc9f5..9189cd93342c2a3d9e5a3ae02cd04302bba7a2d6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
@@ -7,6 +7,9 @@ from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import RecoFragment
from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
from TriggerMenuMT.HLTMenuConfig.Jet import JetRecoConfiguration
from JetRecConfig.JetRecConfig import getConstitPJGAlg, getJetAlgorithm
+from JetRecConfig import JetInputConfig
+from JetRecConfig import JetRecConfig
+
from TrigEDMConfig.TriggerEDMRun3 import recordable
# Translate the reco dict to a string for suffixing etc
@@ -81,28 +84,25 @@ def standardJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
from eflowRec.PFHLTSequence import PFHLTSequence
(pfseq, pfoPrefix) = RecoFragmentsPool.retrieve(PFHLTSequence, configFlags, clustersin=clustersKey, tracktype=jetRecoDict["trkopt"])
recoSeq += pfseq
- jetDef = JetRecoConfiguration.defineJets(jetRecoDict,pfoPrefix=pfoPrefix)
+ jetDef = JetRecoConfiguration.defineJets(jetRecoDict,pfoPrefix=pfoPrefix, prefix=jetNamePrefix)
else:
- jetDef = JetRecoConfiguration.defineJets(jetRecoDict,clustersKey=clustersKey)
- useConstitMods = ["sktc","cssktc", "pf", "csskpf"]
- doConstitMods = jetRecoDict["dataType"] in useConstitMods
+ jetDef = JetRecoConfiguration.defineJets(jetRecoDict,clustersKey=clustersKey, prefix=jetNamePrefix)
- # chosen jet collection
- jetsFullName = jetNamePrefix+jetDef.basename+"Jets_"+jetRecoDict["jetCalib"]
- if jetRecoDict["trkopt"] != "notrk":
- jetsFullName += "_{}".format(jetRecoDict["trkopt"])
+ doConstitMods = jetRecoDict["dataType"] in ["sktc","cssktc", "pf", "csskpf"]
+
+ jetsFullName = jetDef.fullname()
sequenceOut = recordable(jetsFullName)
+ JetRecConfig.instantiateAliases(jetDef)
if doConstitMods:
# Get online monitoring jet rec tool
from JetRecTools import OnlineMon
monJetRecTool = OnlineMon.getMonTool_Algorithm("HLTJets/"+jetsFullName+"/")
from JetRecConfig.ConstModHelpers import getConstitModAlg
- if jetRecoDict["trkopt"] == "notrk":
- recoSeq += getConstitModAlg(jetDef.inputdef,suffix="HLT",tvaKey="JetTrackVtxAssoc",vtxKey="PrimaryVertices",monTool=monJetRecTool)
- else:
- recoSeq += getConstitModAlg(jetDef.inputdef,suffix="HLT",tvaKey=trkcolls["TVA"],vtxKey=trkcolls["Vertices"],monTool=monJetRecTool)
+ constitModAlg = getConstitModAlg(jetDef.inputdef, monTool=monJetRecTool)
+ if constitModAlg:
+ recoSeq += constitModAlg
# Add the PseudoJetGetter alg to the sequence
constitPJAlg = getConstitPJGAlg( jetDef.inputdef )
@@ -114,7 +114,6 @@ def standardJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
if trkcolls:
pjs.append(trkcolls["GhostTracks"])
- from JetRecConfig import JetRecConfig
jetModList = []
if jetRecoDict["trkopt"] != "notrk":
trkMods = JetRecoConfiguration.defineTrackMods(jetRecoDict["trkopt"])
@@ -123,7 +122,7 @@ def standardJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
rhoKey = "auto"
if "sub" in jetRecoDict["jetCalib"]:
# Add the event shape alg if needed for area subtraction
- eventShapeAlg = JetRecConfig.getEventShapeAlg( jetDef.inputdef, constitPJKey, "HLT_" )
+ eventShapeAlg = JetInputConfig.buildEventShapeAlg( jetDef, "HLT_" )
recoSeq += conf2toConfigurable(eventShapeAlg)
# Not currently written because impossible to merge
# across event views, which is maybe a concern in
@@ -131,19 +130,26 @@ def standardJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
rhoKey = eventShapeAlg.EventDensityTool.OutputContainer
# Import the standard jet modifiers as defined for offline
- # We can add/configure these differently if desired. In particular,
- # we could define a TriggerJetMods module if settings need to
- # diverge substantially e.g. track/vertex collections
+ # We can add/configure these differently if desired.
calibMods = JetRecoConfiguration.defineCalibFilterMods(jetRecoDict,dataSource, rhoKey)
jetModList += calibMods
+
# Get online monitoring tool
from JetRec import JetOnlineMon
monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+jetsFullName+"/")
+ jetDef.modifiers = jetModList
+ # recall instantiateAliases because we updated the modifiers
+ JetRecConfig.instantiateAliases(jetDef)
+
+ # make sure all our JetModifier have their track inputs set up according to trkopt
+ from JetRecConfig.JetModConfig import jetModWithAlternateTrk
+ jetModWithAlternateTrk(jetDef, jetRecoDict['trkopt'] )
+
# Generate a JetAlgorithm to run the jet finding and modifiers
# (via a JetRecTool instance).
- jetRecAlg = JetRecConfig.getJetAlgorithm(jetsFullName, jetDef, pjs, jetModList, monTool)
+ jetRecAlg = JetRecConfig.getJetAlgorithm(jetsFullName, jetDef, pjs, monTool)
recoSeq += conf2toConfigurable( jetRecAlg )
# End of basic jet reco
return recoSeq, sequenceOut, jetDef
@@ -162,25 +168,26 @@ def groomedJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
# Need to forward the pseudojets of the parents to the groomer
parentpjs = getattr(ungroomedJetRecoSequence,"jetalg_{}".format(ungroomedJetsName)).Tools[0].InputPseudoJets
- groomDef = JetRecoConfiguration.defineGroomedJets(jetRecoDict,ungroomedDef,ungroomedJetsName)
- groomedJetsFullName = jetNamePrefix+groomDef.basename+"Jets_"+jetRecoDict["jetCalib"]
+
+ groomDef = JetRecoConfiguration.defineGroomedJets(jetRecoDict,ungroomedDef)#,ungroomedJetsName)
+ groomedJetsFullName = groomDef.fullname()+"_"+jetRecoDict["jetCalib"]
if jetRecoDict["trkopt"]!="notrk":
groomedJetsFullName += "_"+jetRecoDict["trkopt"]
- groomedModList = JetRecoConfiguration.defineCalibFilterMods(jetRecoDict,dataSource)
+ groomDef.modifiers = JetRecoConfiguration.defineCalibFilterMods(jetRecoDict,dataSource)
# Can add substructure mods here
# Get online monitoring tool
from JetRec import JetOnlineMon
monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+groomedJetsFullName+"/")
- from JetRecConfig.JetGroomConfig import getJetGroomAlg
- groomalg = getJetGroomAlg(groomedJetsFullName,groomDef,parentpjs,groomedModList,monTool)
+ from JetRecConfig.JetGroomConfig import getJetGroomAlg, instantiateGroomingAliases
+ instantiateGroomingAliases(groomDef)
+ groomalg = getJetGroomAlg(groomedJetsFullName,groomDef,parentpjs,monTool)
recoSeq += conf2toConfigurable( groomalg )
- sequenceOut = recordable(groomedJetsFullName)
- jetDef = groomDef
- return recoSeq, sequenceOut, jetDef
+ sequenceOut = recordable(groomedJetsFullName)
+ return recoSeq, sequenceOut, groomDef
# Reclustering -- call the basic jet reco and add this to the sequence,
@@ -202,9 +209,8 @@ def reclusteredJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
OutputContainer=filteredJetsName,
PtMin=rcJetPtMin)
- rcJetDef = JetRecoConfiguration.defineReclusteredJets(jetRecoDict)
- rcJetDef.inputdef.inputname = filteredJetsName
- rcJetsFullName = jetNamePrefix+rcJetDef.basename+"RCJets_"+jetRecoDict["jetCalib"]
+ rcJetDef = JetRecoConfiguration.defineReclusteredJets(jetRecoDict, filteredJetsName)
+ rcJetsFullName = jetNamePrefix+rcJetDef.basename+"Jets_"+jetRecoDict["jetCalib"]
rcModList = [] # Could set substructure mods
rcJetDef.modifiers = rcModList
@@ -217,7 +223,7 @@ def reclusteredJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+rcJetsFullName+"/")
rcPJs = [rcConstitPJKey]
- rcJetRecAlg = getJetAlgorithm(rcJetsFullName, rcJetDef, rcPJs, rcModList, monTool)
+ rcJetRecAlg = getJetAlgorithm(rcJetsFullName, rcJetDef, rcPJs, monTool)
recoSeq += conf2toConfigurable( rcJetRecAlg )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTLAConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTLAConfiguration.py
new file mode 100644
index 0000000000000000000000000000000000000000..fe25509c75d54d1d0439acb81aedbb7504618aad
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTLAConfiguration.py
@@ -0,0 +1,52 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
+from AthenaCommon.CFElements import parOR, seqAND
+
+#from GaudiKernel.Constants import (VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL)
+from GaudiKernel.Constants import WARNING
+
+#this can eventually become a TLA/PEB sequence, but let's start with TLA only
+def jetTLASequence(jetDefString):
+
+ #make a new reco sequence, empty at this point now
+ recoSeq = parOR("JetTLASeq_"+jetDefString, [])
+
+ #import the TLA algorithm that selects jets and makes a new collection to pass to [what used to be the ScoutingStreamWriter]
+ from TrigHLTJetRec import TrigHLTJetTLASelector
+
+ tempInputCollection = jetDefString
+ sequenceOut=jetDefString+"_TLA"
+ TLAAlg=TrigHLTJetTLASelector.getConfiguredTLASelector(inputJetsKey=tempInputCollection, outputJetsKey=sequenceOut, outputLevel=WARNING)
+ recoSeq+=TLAAlg
+
+ return (recoSeq, sequenceOut)
+
+#Configure an AthSequence for jet TLA - will eventually also include PEB
+def jetTLAAthSequence(jetDefString):
+ from AthenaConfiguration.ComponentFactory import CompFactory
+
+ InputMakerAlg = CompFactory.InputMakerForRoI( "IM_TLAJet_step2" )
+ InputMakerAlg.RoITool = CompFactory.ViewCreatorInitialROITool()
+ InputMakerAlg.mergeUsingFeature = True
+
+ (JetTLASequence, sequenceOut) = RecoFragmentsPool.retrieve( jetTLASequence, jetDefString )
+ JetTLAAthSequence = seqAND("jetTLAAthSequence_"+jetDefString,[InputMakerAlg, JetTLASequence ])
+
+ return (JetTLAAthSequence, InputMakerAlg, sequenceOut)
+
+def jetTLAMenuSequence(jetDefString):
+
+ from TrigHLTJetHypo.TrigHLTJetHypoConf import TrigJetTLAHypoAlgMT
+ from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetTLAHypoToolFromDict
+
+ (JetTLAAthSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(jetTLAAthSequence,jetDefString)
+
+ hypo = TrigJetTLAHypoAlgMT("TrigJetTLAHypoAlgMT_"+jetDefString)
+ hypo.Jets = sequenceOut
+
+ return MenuSequence( Sequence = JetTLAAthSequence,
+ Maker = InputMakerAlg,
+ Hypo = hypo,
+ HypoToolGen = trigJetTLAHypoToolFromDict )
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/TriggerJetMods.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/TriggerJetMods.py
index 408f56fc5fb4618d86e963b2bf7a6da04febd095..89531ab3a8530735ef8d1f6d908551942e31a848 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/TriggerJetMods.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/TriggerJetMods.py
@@ -17,4 +17,6 @@ def getConstitFourMomTool_copy():
return cfourmom
ConstitFourMom_copy = JetModifier("JetConstitFourMomTool", "constitfourmom_copy",
- helperfn=getConstitFourMomTool_copy)
+ createfn=getConstitFourMomTool_copy)
+from JetRecConfig.StandardJetMods import jetmoddict
+jetmoddict['ConstitFourMom_copy'] = ConstitFourMom_copy
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
index 183e5aa9f0c845e35f2af47ab8a95e6857561da4..5683afb49b17b36d8451e2f8a26dc083556eecfd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
@@ -56,22 +56,24 @@ def generateChains( flags, chainDict ):
#sequencing of actual jet reconstruction
from JetRecConfig import JetRecConfig
- from JetRecConfig.JetDefinition import JetConstit, JetDefinition, xAODType
-
+ from JetRecConfig.JetDefinition import JetConstitSeq, JetDefinition, xAODType, JetInputDef
+ from JetRecConfig.StandardJetConstits import jetinputdefdic
+
+ # declare a jet source for the HLT clusters if needed :
+ jetinputdefdic.setdefault(clustersname , JetInputDef(clustersname, xAODType.CaloCluster) )
#hardcoded jet collection for now
clustermods = ["ECPSFrac","ClusterMoments"]
trigMinPt = 7e3
- HLT_EMTopo = JetConstit( xAODType.CaloCluster, ["EM"])
- HLT_EMTopo.rawname = clustersname
- HLT_EMTopo.inputname = clustersname
- HLT_AntiKt4EMTopo_subjesIS = JetDefinition( "AntiKt", 0.4, HLT_EMTopo, ptmin=trigMinPt,ptminfilter=trigMinPt)
+ HLT_EMTopo = JetConstitSeq( "HLT_EMTopo",xAODType.CaloCluster, ["EM"], clustersname, clustersname,label="EMTopo")
+
+ HLT_AntiKt4EMTopo_subjesIS = JetDefinition( "AntiKt", 0.4, HLT_EMTopo, ptmin=trigMinPt,ptminfilter=trigMinPt,
+ prefix="HLT_",
+ suffix = "_subjesIS",
+ )
HLT_AntiKt4EMTopo_subjesIS.modifiers = ["Calib:TrigRun2:data:JetArea_EtaJES_GSC_Insitu:HLT_Kt4EMTopoEventShape","Sort"] + clustermods
- jetprefix="HLT_"
- jetsuffix="_subjesIS"
- evsprefix="HLT_"
# May need a switch to disable automatic modifier prerequisite generation
- jetRecoComps = JetRecConfig.JetRecCfg(HLT_AntiKt4EMTopo_subjesIS, flags, jetprefix, jetsuffix, evsprefix)
+ jetRecoComps = JetRecConfig.JetRecCfg(HLT_AntiKt4EMTopo_subjesIS, flags)
inEventReco.mergeReco(jetRecoComps)
acc.merge(inEventReco,stepReco.getName())
@@ -79,7 +81,7 @@ def generateChains( flags, chainDict ):
#hypo
from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetHypoToolFromDict
hypo = CompFactory.TrigJetHypoAlgMT("TrigJetHypoAlgMT_a4tcem_subjesIS")
- jetsfullname = jetprefix+HLT_AntiKt4EMTopo_subjesIS.basename+"Jets"+jetsuffix
+ jetsfullname = HLT_AntiKt4EMTopo_subjesIS.fullname()
hypo.Jets = jetsfullname
acc.addEventAlgo(hypo)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
index 0d8ee40c27af82dab0051e271acaf1be136c5bc1..91b456ed7964e603e47594ae71b630e7ae542d5e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
@@ -144,6 +144,7 @@ class TrkMHTConfig(AlgConfig):
jetRecoDict = jetRecoDictForMET(trkopt="ftf", **recoDict)
# TODO - right now jet calibration is hardcoded to EM
jetRecoDict["calib"] = "em"
+
jetSeq, jetName, jetDef = RecoFragmentsPool.retrieve(
jetRecoSequence, ConfigFlags, **jetRecoDict
)
@@ -168,7 +169,7 @@ class TrkMHTConfig(AlgConfig):
self.fexAlg.TrackSelTool.maxZ0SinTheta = 1.5
self.fexAlg.TrackSelTool.maxD0overSigmaD0 = 3
self.fexAlg.TrackSelTool.minPt = 1 * Units.GeV
-
+
class PFSumConfig(AlgConfig):
@classmethod
@@ -273,7 +274,6 @@ class MHTPufitConfig(AlgConfig):
def __init__(self, **recoDict):
super(MHTPufitConfig, self).__init__(**recoDict)
from ..Jet.JetRecoSequences import jetRecoSequence
- from ..Jet.JetRecoConfiguration import defineJets
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
caloClusterRecoSequence,
)
@@ -300,23 +300,22 @@ class MHTPufitConfig(AlgConfig):
clustersin=clusterName,
tracktype=jetRecoDict["trkopt"],
)
- jetDef = defineJets(jetRecoDict, pfoPrefix=pfoPrefix)
+ #jetDef = defineJets(jetRecoDict, pfoPrefix=pfoPrefix)
elif jetRecoDict["dataType"] == "tc":
- jetDef = defineJets(jetRecoDict, clustersKey=clusterName)
+ pass
+ #jetDef = defineJets(jetRecoDict, clustersKey=clusterName)
else:
raise ValueError(
"Unexpected jetDataType {}".format(jetRecoDict["dataType"])
)
- inputName = jetDef.inputdef.inputname
+ inputName = jetDef.inputdef.containername
calibHasAreaSub = "sub" in jetRecoDict["jetCalib"]
if calibHasAreaSub:
- from JetRecConfig.JetRecConfig import getEventShapeAlg, getConstitPJGAlg
-
- evtShapeAlg = getEventShapeAlg(
- jetDef.inputdef,
- getConstitPJGAlg(jetDef.inputdef).OutputContainer,
- "HLT_",
- )
+ from JetRecConfig.JetRecConfig import instantiateAliases
+ from JetRecConfig.JetInputConfig import buildEventShapeAlg
+ instantiateAliases(jetDef)
+ evtShapeAlg = buildEventShapeAlg( jetDef, "HLT_" )
+
rhoKey = evtShapeAlg.EventDensityTool.OutputContainer
else:
rhoKey = ""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
index d3a86c27f3c681c2a4ab55359f408790a70e7be0..ce5aedd1244a59e4b94fb4deeeca6801e491e474 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
@@ -57,13 +57,18 @@ def pfoRecoSequence(dummyFlags, RoIs, **recoDict):
jetRecoDict["calib"] = "em"
jetRecoDict["dataType"] = "pf"
constit = defineJetConstit(jetRecoDict, pfoPrefix=pfoPrefix)
+ from JetRecConfig.ConstModHelpers import aliasToInputDef
+ constit = aliasToInputDef(constit)
constit_mod_seq = getConstitModAlg(
constit,
- "HLT",
- tvaKey="JetTrackVtxAssoc_{trkopt}".format(**jetRecoDict),
- vtxKey="HLT_IDVertex_FS",
+ # "HLT",
+ # tvaKey="JetTrackVtxAssoc_{trkopt}".format(**jetRecoDict),
+ # vtxKey="HLT_IDVertex_FS",
)
- return [tcSeq, pfSeq, constit_mod_seq], pfoPrefix
+ allSeqs = [tcSeq, pfSeq]
+ if constit_mod_seq :
+ allSeqs.append(constit_mod_seq)
+ return allSeqs, pfoPrefix
def cvfClusterSequence(dummyFlags, RoIs, **recoDict):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
index 3bedb167003137d9673ad61ae5ca8ee32ad8f27c..eadbcb44b6f8147790f5877dd795f0f59c6655ad 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
@@ -103,7 +103,7 @@ def splitChainInDict(chainName):
from TrigCompositeUtils.TrigCompositeUtils import legName
chainDict = TriggerConfigHLT.getChainDictFromChainName(chainName)
if len(chainDict['chainParts']) ==1:
- return [chainDict]
+ return [deepcopy(chainDict)]
listOfChainDicts = []
for count, chainDictPart in enumerate(chainDict['chainParts']):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
index 43c8626b8c53888335abf2fec51b8454c0dc5f05..a7985f669abc46205923a217cfa46cf7fe8a3f7c 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
@@ -149,7 +149,7 @@ def getChainMultFromDict(chainDict):
allMultis = []
for cpart in chainDict['chainParts']:
if cpart['multiplicity'] != '':
- allMultis.append(cpart['multiplicity'])
+ allMultis.append( int(cpart['multiplicity']))
return allMultis
@@ -276,7 +276,7 @@ def analyseChainName(chainName, L1thresholds, L1item):
(AllowedCalibChainIdentifiers, 'Calib', 'calib'),
(AllowedMonitorChainIdentifiers, 'Monitor', 'calib'),
(AllowedBeamspotChainIdentifiers, 'Beamspot', 'beamspot'),
- (['eb'], 'EnhancedBias', 'eb') ]:
+ (['eb'], 'EnhancedBias', 'eb')]:
if cpart in chainCategory[0]:
log.debug('Doing chain type {}'.format(chainCategory[1]))
multichainindex.append(hltChainNameShort.index(cpart))
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index 139b8e871d87f2a9faa5eea11c9ae40af521edff..47b508b57744cead0aa12484615e0726b3d1844c 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -66,7 +66,7 @@ class GenerateMenuMT(object):
self.signaturesToGenerate = []
self.allSignatures = ['Egamma', 'Muon', 'Jet', 'Bjet', 'Bphysics', 'MET', 'Tau',
'HeavyIon', 'Beamspot', 'Cosmic', 'EnhancedBias',
- 'Monitor', 'Calib', 'Streaming', 'Combined', 'MinBias', 'Test'] #, AFP
+ 'Monitor', 'Calib', 'Streaming', 'Combined', 'MinBias', 'UnconventionalTracking', 'Test'] #, AFP
self.calibCosmicMonSigs = ['Streaming','Monitor','Beamspot','Cosmic', 'Calib'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
# flags
@@ -86,6 +86,7 @@ class GenerateMenuMT(object):
self.doMonitorChains = True
self.doBeamspotChains = True
self.doEnhancedBiasChains = True
+ self.doUnconventionalTrackingChains = True
self.doCombinedChains = True
self.doTestChains = True
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
index 46d1bc651051194cb1a99f5fc18242182e947c1c..ad2ca2e8bbd522d0b70ae0a4238987888b6fd1bc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
@@ -1,8 +1,7 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.CFElements import seqAND
-from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import generateDecisionTreeOld
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig_newJO import generateDecisionTree
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
@@ -105,19 +104,9 @@ def generateMenu( flags ):
log.info('Obtained Menu Chain objects')
# pass all menuChain to CF builder
- useReworked = True
-
- if useReworked:
- menuAcc.wasMerged()
- menuAcc = generateDecisionTree(menuChains)
- else:
- menuAcc.wasMerged()
- menuAcc = ComponentAccumulator()
- mainSequenceName = 'HLTAllSteps'
- menuAcc.addSequence( seqAND(mainSequenceName) )
- chainsAcc = generateDecisionTreeOld(menuAcc.getSequence(mainSequenceName), menuChains, allChainDicts)
- menuAcc.merge(chainsAcc)
-
+ menuAcc.wasMerged()
+ menuAcc = generateDecisionTree(menuChains)
+
menuAcc.printConfig()
log.info('CF is built')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
index b4a112df0a0bbee00903a67ac53e5b90b5fc3b74..8cb1cb454e15cb34937d47a02aa9895b36a8e518 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
@@ -107,9 +107,8 @@ def createCFTree(CFseq):
for menuseq in CFseq.step.sequences:
menuseq.addToSequencer(recoSeqSet,hypoSet)
- #list(dict.fromkeys()) is guaranteed to respect ordering from python 3.7 onwards
- stepReco += list(dict.fromkeys([recoseq for recoseq in recoSeqSet]))
- seqAndView += list(dict.fromkeys([hypo for hypo in hypoSet]))
+ stepReco += sorted(list(recoSeqSet), key=lambda t: t.name())
+ seqAndView += sorted(list(hypoSet), key=lambda t: t.name())
if CFseq.step.isCombo:
seqAndView += CFseq.step.combo.Alg
@@ -190,7 +189,7 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None):
appendCAtoAthena( monAcc )
Configurable.configurableRun3Behavior=1
- edmAlg = triggerMergeViewsAndAddMissingEDMCfg(['AOD', 'ESD'], hypos, viewMakers, decObj, decObjHypoOut)
+ edmAlg = triggerMergeViewsAndAddMissingEDMCfg(ConfigFlags, ['AOD', 'ESD'], hypos, viewMakers, decObj, decObjHypoOut)
Configurable.configurableRun3Behavior=0
# C) Finally, we create the EDM output
hltFinalizeSeq += conf2toConfigurable(edmAlg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
index 87091d47e19225ac12f87e61b4f7d1474045edf4..f7e351239c6c37f8f7207e1213f81bf306ca5789 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
@@ -1,13 +1,16 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from functools import lru_cache
+from AthenaCommon.CFElements import findAllAlgorithms, parOR, seqAND
+from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainInDict
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import (isComboHypoAlg,
+ isHypoBase,
+ isInputMakerBase)
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import isInputMakerBase, isHypoBase, isComboHypoAlg
-from AthenaCommon.CFElements import parOR, seqAND, findAllAlgorithms
-from AthenaCommon.Logging import logging
+
log = logging.getLogger( __name__ )
def printStepsMatrix(matrix):
@@ -19,22 +22,13 @@ def printStepsMatrix(matrix):
print('---- {}: {}'.format(chainName, namesInCell)) # noqa: ATL901
print('-------------------------') # noqa: ATL901
-def memoize(f):
- """ caches call of the helper functions, (copied from the internet) remove when we move to python 3.2 or newer and rplace by functools.lru_cache"""
- memo = {}
- def helper(*x):
- tupledx = tuple(x)
- if tupledx not in memo:
- memo[tupledx] = f(*x)
- return memo[tupledx]
- return helper
def generateDecisionTree(chains):
acc = ComponentAccumulator()
mainSequenceName = 'HLTAllSteps'
acc.addSequence( seqAND(mainSequenceName) )
- @memoize
+ @lru_cache(None)
def getFiltersStepSeq( stepNumber ):
"""
Returns sequence containing all filters for a step
@@ -46,7 +40,7 @@ def generateDecisionTree(chains):
acc.addSequence( seq, parentName = mainSequenceName )
return seq
- @memoize
+ @lru_cache(None)
def getRecosStepSeq( stepNumber ):
"""
"""
@@ -56,7 +50,7 @@ def generateDecisionTree(chains):
acc.addSequence( seq, parentName = mainSequenceName )
return seq
- @memoize
+ @lru_cache(None)
def getSingleMenuSeq( stepNumber, stepName ):
"""
"""
@@ -67,7 +61,7 @@ def generateDecisionTree(chains):
acc.addSequence(seq, parentName = allRecoSeqName )
return seq
- @memoize
+ @lru_cache(None)
def getComboSequences( stepNumber, stepName ):
"""
"""
@@ -80,7 +74,7 @@ def generateDecisionTree(chains):
acc.addSequence( parOR(stepComboRecoName), parentName=stepComboName )
return acc.getSequence(stepComboName), acc.getSequence(stepComboRecoName)
- @memoize
+ @lru_cache(None)
def getFilterAlg( stepNumber, stepName ):
"""
Returns, if need be created, filter for a given step
@@ -98,7 +92,7 @@ def generateDecisionTree(chains):
log.debug('Creted filter {}'.format(filterName))
return filterAlg
- @memoize
+ @lru_cache(None)
def findInputMaker( stepCounter, stepName ):
seq = getSingleMenuSeq( stepCounter, stepName )
algs = findAllAlgorithms( seq )
@@ -107,7 +101,7 @@ def generateDecisionTree(chains):
return alg
raise Exception("No input maker in seq "+seq.name)
- @memoize
+ @lru_cache(None)
def findAllInputMakers( stepCounter, stepName ):
seq = getSingleMenuSeq( stepCounter, stepName )
algs = findAllAlgorithms( seq )
@@ -120,7 +114,7 @@ def generateDecisionTree(chains):
return result
else:
raise Exception("No input maker in seq "+seq.name)
- @memoize
+ @lru_cache(None)
def findComboHypoAlg( stepCounter, stepName ):
seq = getSingleMenuSeq( stepCounter, stepName )
algs = findAllAlgorithms( seq )
@@ -129,7 +123,7 @@ def generateDecisionTree(chains):
return alg
raise Exception("No combo hypo alg in seq "+seq.name)
- @memoize
+ @lru_cache(None)
def findHypoAlg( stepCounter, stepName ):
seq = getSingleMenuSeq( stepCounter, stepName )
algs = findAllAlgorithms( seq )
@@ -139,7 +133,7 @@ def generateDecisionTree(chains):
raise Exception("No hypo alg in seq "+seq.name)
- @memoize
+ @lru_cache(None)
def findAllHypoAlgs( stepCounter, stepName ):
seq = getSingleMenuSeq( stepCounter, stepName )
algs = findAllAlgorithms( seq )
@@ -180,7 +174,7 @@ def generateDecisionTree(chains):
return p.rstrip("_")
p = n
- @memoize
+ @lru_cache(None)
def prevStepOutput( chain, stepCounter ):
"""
Returns list of decision collections that are outputs of previous step as well as the hypo alg name that outpus it
@@ -191,11 +185,7 @@ def generateDecisionTree(chains):
else:
prevCounter = stepCounter-1
prevName = chain.steps[prevCounter-1].name # counting steps from 1, for indexing need one less
- prevStep = chain.steps[prevCounter-1]
- if prevStep.isCombo:
- prevHypoAlg = findComboHypoAlg( prevCounter, prevName )
- else:
- prevHypoAlg = findHypoAlg( prevCounter, prevName )
+ prevHypoAlg = findComboHypoAlg( prevCounter, prevName )
out = prevHypoAlg.HypoOutputDecisions
prevHypoAlgName = prevHypoAlg.name
@@ -206,19 +196,14 @@ def generateDecisionTree(chains):
for chain in chains:
for stepCounter, step in enumerate( chain.steps, 1 ):
getFilterAlg( stepCounter, step.name )
- menuSeqName = getSingleMenuSeq( stepCounter, step.name ).name
- if step.isCombo:
- # add sequences that allows reconstructions to be run in parallel, followed (in sequence) by the combo hypo
- comboSeq, comboRecoSeq = getComboSequences( stepCounter, step.name )
- for sequence in step.sequences:
- acc.merge( sequence.ca, sequenceName=comboRecoSeq.name)
-
- comboHypo = CompFactory.ComboHypo( "CH"+step.name )
- acc.addEventAlgo( comboHypo, sequenceName=comboSeq.name )
- pass
- else:
- acc.merge( step.sequences[0].ca, sequenceName=menuSeqName )
-
+ getSingleMenuSeq( stepCounter, step.name ).name
+ # add sequences that allows reconstructions to be run in parallel, followed (in sequence) by the combo hypo
+ comboSeq, comboRecoSeq = getComboSequences( stepCounter, step.name )
+ for sequence in step.sequences:
+ acc.merge( sequence.ca, sequenceName=comboRecoSeq.name)
+ comboHypo = CompFactory.ComboHypo( "CH"+step.name, CheckMultiplicityMap = len(step.sequences) != 1 )
+ acc.addEventAlgo( comboHypo, sequenceName=comboSeq.name )
+ pass
# cleanup settings made by Chain & related objects (can be removed in the future)
for chain in chains:
@@ -237,16 +222,14 @@ def generateDecisionTree(chains):
hypoAlg.HypoInputDecisions = ""
hypoAlg.HypoOutputDecisions = ""
- if step.isCombo:
- comboHypoAlg = findComboHypoAlg( stepCounter, step.name )
- comboHypoAlg.MultiplicitiesMap = {}
- comboHypoAlg.HypoInputDecisions = []
- comboHypoAlg.HypoOutputDecisions = []
+ comboHypoAlg = findComboHypoAlg( stepCounter, step.name )
+ comboHypoAlg.MultiplicitiesMap = {}
+ comboHypoAlg.HypoInputDecisions = []
+ comboHypoAlg.HypoOutputDecisions = []
# connect all outputs (decision DF) and add chains to filter on
for chain in chains:
-
for stepCounter, step in enumerate( chain.steps, 1 ):
# Filters linking
filterAlg = getFilterAlg( stepCounter, step.name )
@@ -275,36 +258,35 @@ def generateDecisionTree(chains):
hypoOut = CFNaming.hypoAlgOutName( hypoAlg.name )
hypoAlg.HypoOutputDecisions = assureUnsetOrTheSame( hypoAlg.HypoOutputDecisions, hypoOut,
"{} hypo output".format( hypoAlg.name ) )
+
hypoAlg.HypoTools.append( step.sequences[sequenceCounter]._hypoToolConf.confAndCreate( chainDict ) )
pass
- if step.isCombo:
- for seqCounter in range( len( step.sequences ) ) :
- chainLegDict = splitChainInDict( chain.name )[seqCounter]
- __setup( seqCounter, chainLegDict )
-
- comboHypoAlg = findComboHypoAlg( stepCounter, step.name )
- comboHypoAlg.MultiplicitiesMap[chain.name] = step.multiplicity
-
- elementaryHypos = findAllHypoAlgs( stepCounter, step.name )
- for hypo in elementaryHypos:
- if hypo == comboHypoAlg:
- continue
- comboHypoAlg.HypoInputDecisions = addAndAssureUniqness( comboHypoAlg.HypoInputDecisions, hypo.HypoOutputDecisions,
- "{} comboHypo input".format( comboHypoAlg.name ) )
-
- comboOut = CFNaming.comboHypoOutputName( comboHypoAlg.name, hypo.name )
- comboHypoAlg.HypoOutputDecisions = addAndAssureUniqness( comboHypoAlg.HypoOutputDecisions, comboOut,
- "{} comboHypo output".format( comboHypoAlg.name ) )
-
- # Combo Hypo Tools
- for comboToolConf in step.comboToolConfs:
- comboHypoAlg.ComboHypoTools.append( comboToolConf.confAndCreate( TriggerConfigHLT.getChainDictFromChainName( chain.name ) ) )
-
- else:
- assert len( step.sequences ) == 1, "chain {} step {} is not combo bye has number of sequences = {}".format( chain.name, stepCounter, len( step.sequences ) )
- __setup( 0, TriggerConfigHLT.getChainDictFromChainName( chain.name ) )
-
+ chainDictLegs = splitChainInDict( chain.name )
+ # possible cases: A) number of seqeunces == number of chain parts, e5_mu10 or just e3 type of chain
+ # ([0, 1], [0, 1]) is the set of indices
+ indices = zip( range( len( step.sequences ) ), range( len( chainDictLegs ) ) )# case A
+ # B) number of sequences == 1 && number of chain parts > 1 for single signature assymetric combined chains e5_e3 type chain
+ if len(step.sequences) == 1 and len(chainDictLegs) > 1:
+ indices = zip( [0]*len(chainDictLegs), range( len( chainDictLegs ) ) )
+
+ for seqCounter, chainDictCounter in indices:
+ chainLegDict = chainDictLegs[chainDictCounter]
+ __setup( seqCounter, chainLegDict )
+ comboHypoAlg = findComboHypoAlg( stepCounter, step.name )
+ comboHypoAlg.MultiplicitiesMap[chain.name] = step.multiplicity
+ elementaryHypos = findAllHypoAlgs( stepCounter, step.name )
+ for hypo in elementaryHypos:
+ if hypo == comboHypoAlg:
+ continue
+ comboHypoAlg.HypoInputDecisions = addAndAssureUniqness( comboHypoAlg.HypoInputDecisions, hypo.HypoOutputDecisions,
+ "{} comboHypo input".format( comboHypoAlg.name ) )
+ comboOut = CFNaming.comboHypoOutputName( comboHypoAlg.name, hypo.name )
+ comboHypoAlg.HypoOutputDecisions = addAndAssureUniqness( comboHypoAlg.HypoOutputDecisions, comboOut,
+ "{} comboHypo output".format( comboHypoAlg.name ) )
+ # Combo Hypo Tools
+ for comboToolConf in step.comboToolConfs:
+ comboHypoAlg.ComboHypoTools.append( comboToolConf.confAndCreate( TriggerConfigHLT.getChainDictFromChainName( chain.name ) ) )
for chain in chains:
log.info( "CF algorithms for chain {}".format( chain.name ) )
@@ -326,6 +308,7 @@ def generateDecisionTree(chains):
else:
hypoAlg = findHypoAlg( stepCounter, step.name )
log.info(" HypoAlg {} Inputs {} Outputs {} Tools {}".format( hypoAlg.name, hypoAlg.HypoInputDecisions, hypoAlg.HypoOutputDecisions, [t.name for t in hypoAlg.HypoTools] ) )
+
return acc
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 22de3a5adc50b3b251d69b9354fb9603e3edbb0d..a58dbadc1d15893af824fafedc10d7a3fb2244b9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -118,6 +118,9 @@ def setupMenu():
# Primary
ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarmedium_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivartight_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_nod0_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_nod0_L1EM24VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e60_lhmedium_L1EM22VHI', groups=SingleElectronGroup),
@@ -147,12 +150,17 @@ def setupMenu():
ChainProp(name='HLT_g25_loose_L1EM20VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g25_medium_L1EM20VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g25_tight_L1EM20VH', groups=SinglePhotonGroup),
+ ChainProp(name='HLT_g20_tight_L1EM15VH', groups=SinglePhotonGroup),
+ ChainProp(name='HLT_g20_tight_icaloloose_L1EM15VH', groups=SinglePhotonGroup),
+ ChainProp(name='HLT_g20_tight_icalomedium_L1EM15VH', groups=SinglePhotonGroup),
+ ChainProp(name='HLT_g20_tight_icalotight_L1EM15VH', groups=SinglePhotonGroup),
# Primary photon chains
ChainProp(name='HLT_g140_loose_L1EM22VHI', groups=SinglePhotonGroup),
ChainProp(name='HLT_2g35_medium_L12EM20VH', groups=MultiPhotonGroup),
ChainProp(name='HLT_g35_medium_g25_medium_L12EM20VH', groups=MultiPhotonGroup),
ChainProp(name='HLT_2g20_tight_L12EM15VH', groups=MultiPhotonGroup),
#ChainProp(name='HLT_2g22_tight_L12EM15VHI', groups=MultiPhotonGroup),
+ ChainProp(name='HLT_2g20_tight_icaloloose_L12EM15VH', groups=MultiPhotonGroup),
ChainProp(name='HLT_2g22_tight_L12EM15VH', groups=MultiPhotonGroup),
ChainProp(name='HLT_2g50_loose_L12EM20VH', groups=MultiPhotonGroup),
@@ -164,6 +172,10 @@ def setupMenu():
# for moving to PhysicsP1, ATR-21242
ChainProp(name='HLT_g140_etcut_L1EM22VHI', groups=SinglePhotonGroup),
+
+ #ATR-21882
+ ChainProp(name='HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I', l1SeedThresholds=['EM12'], groups=MultiPhotonGroup),
+
ChainProp(name='HLT_g300_etcut_L1EM22VHI', groups=SinglePhotonGroup),
]
@@ -187,10 +199,10 @@ def setupMenu():
ChainProp(name='HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50', l1SeedThresholds=['XE50']*3, mergingStrategy='parallel', groups=MultiMETGroup),
]
+
TriggerFlags.JetSlice.signatures = TriggerFlags.JetSlice.signatures() + [
ChainProp(name='HLT_j85_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_L1J15', groups=SingleJetGroup),
- ChainProp(name='HLT_j420_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subjesgscIS_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subresjesgscIS_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subjesgscIS_ftf_011jvt_L1J15', groups=SingleJetGroup),
@@ -199,14 +211,11 @@ def setupMenu():
ChainProp(name='HLT_j45_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j85_ftf_L1J20', groups=SingleJetGroup),
-
ChainProp(name='HLT_j45_pf_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_pf_subjesgscIS_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_pf_subresjesgscIS_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j85_pf_ftf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j420_subjesgscIS_ftf_L1J20', groups=SingleJetGroup),
-
ChainProp(name='HLT_j45_nojcalib_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_sktc_nojcalib_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_cssktc_nojcalib_L1J20', groups=SingleJetGroup),
@@ -229,11 +238,47 @@ def setupMenu():
ChainProp(name='HLT_j460_a10sd_csskpf_jes_ftf_35smcINF_L1J100', groups=SingleJetGroup),
ChainProp(name='HLT_2j330_a10sd_csskpf_jes_ftf_35smcINF_L1J100', groups=SingleJetGroup),
- ChainProp(name='HLT_3j200_L1J20', groups=MultiJetGroup),
ChainProp(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20', groups=SingleJetGroup),
# ATR-20624
ChainProp(name='HLT_j0_perf_L1J12_EMPTY', stream=['Main'], groups=SingleJetGroup),
+
+ # TLA test chain, ATR-20395
+ ChainProp(name='HLT_JetDS_j0_L1J100', stream=['JetDS'], groups=SingleJetGroup),
+
+ # ATR-22096
+ ChainProp(name='HLT_j420_subresjesgscIS_ftf_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j420_pf_subresjesgscIS_ftf_L1J100', groups=SingleJetGroup),
+ #
+ ChainProp(name='HLT_3j200_subresjesgscIS_ftf_L1J100', groups=MultiJetGroup),
+ ChainProp(name='HLT_3j200_pf_subresjesgscIS_ftf_L1J100', groups=MultiJetGroup),
+ #
+ ChainProp(name='HLT_4j120_subjesIS_L13J50', groups=MultiJetGroup),
+ ChainProp(name='HLT_4j120_subresjesgscIS_ftf_L13J50', groups=MultiJetGroup),
+ ChainProp(name='HLT_4j120_pf_subresjesgscIS_ftf_L13J50', groups=MultiJetGroup),
+ #
+ ChainProp(name='HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
+ #
+ ChainProp(name='HLT_5j85_subjesIS_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_5j85_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_5j85_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ #
+ ChainProp(name='HLT_6j55_subjesIS_0eta240_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_6j55_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
+ #
+ ChainProp(name='HLT_6j70_subjesIS_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_6j70_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_6j70_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ #
+ ChainProp(name='HLT_7j45_subjesIS_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_7j45_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_7j45_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ #
+ ChainProp(name='HLT_10j40_subjesIS_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_10j40_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_10j40_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
]
TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [
@@ -333,6 +378,7 @@ def setupMenu():
#ChainProp(name='HLT_noalg_zb_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=ZeroBiasGroup),
ChainProp(name='HLT_noalg_L1MBTS_2_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), #ATR-21999
ChainProp(name='HLT_noalg_L1MBTS_1_1_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), #ATR-21999
+ ChainProp(name='HLT_noalg_L1All', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['RATE:SeededStreamers', 'BW:Other']), # ATR-22072, for rates in MC. To move to MC menu once good nightly in LS2_v1.
]
TriggerFlags.MonitorSlice.signatures = TriggerFlags.MonitorSlice.signatures() + [
@@ -343,4 +389,7 @@ def setupMenu():
TriggerFlags.EnhancedBiasSlice.signatures = TriggerFlags.EnhancedBiasSlice.signatures() + [ ]
+ TriggerFlags.UnconventionalTrackingSlice.signatures = TriggerFlags.UnconventionalTrackingSlice.signatures() + [
+ ChainProp(name='HLT_unconvtrk0_L1EM3', groups=SinglePhotonGroup, l1SeedThresholds=['FSNOSEED']),
+ ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
index 4d7d83583376656992385c9e0bdd110d4013abd3..955836c64b6ade964589996b286a5786b1e9e928 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDefInMenu import ChainProp
import six
@@ -34,6 +34,7 @@ def setupMenu(flags):
#---------------------------------------------------------------------
SingleMuonGroup = ['RATE:SingleMuon', 'BW:Muon']
SingleElectronGroup = ['RATE:SingleElectron', 'BW:Electron']
+ MultiElectronGroup = ['RATE:MultiElectron', 'BW:Electron']
SinglePhotonGroup = ['RATE:SinglePhoton', 'BW:Photon']
SingleJetGroup = ['RATE:SingleJet', 'BW:Jet']
CombinedGroup = ['RATE:Combined', 'BW:Combined']
@@ -41,11 +42,18 @@ def setupMenu(flags):
flags.Trigger.menu.muon = [
ChainProp(name='HLT_mu20_L1MU20', groups=SingleMuonGroup),
ChainProp(name='HLT_mu10_L1MU10', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu8_L1MU6', groups=SingleMuonGroup)
+ ChainProp(name='HLT_mu8_L1MU6', groups=SingleMuonGroup),
+
+ ChainProp(name='HLT_mu20_msonly_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu10_msonly_L1MU10', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu8_msonly_L1MU6', groups=SingleMuonGroup)
]
flags.Trigger.menu.electron = [
ChainProp(name='HLT_e3_etcut_L1EM3', groups=SingleElectronGroup),
+ ChainProp(name='HLT_2e3_etcut_L12EM3', groups=MultiElectronGroup),
+# this chain does not work yet
+ ChainProp(name='HLT_e5_etcut_e3_etcut_L12EM3', groups=MultiElectronGroup),
ChainProp(name='HLT_e5_etcut_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e7_etcut_L1EM7', groups=SingleElectronGroup)
]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
index 55a0690d61884ba351aff35323161257f3b7d95b..2d5252be534c8fec6cc94597afc10051cd999031 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
@@ -20,7 +20,8 @@ the_signature_grouping = OrderedDict([
('Jet','JetMET'),
('MET','JetMET'),
('Bjet','JetMET'),
- ('MuonnoL1', 'MuonnoL1')
+ ('MuonnoL1', 'MuonnoL1'),
+ ('UnconventionalTracking','UnconventionalTracking'),
])
def getAlignmentGroupFromPattern(sName, extra):
@@ -122,4 +123,3 @@ def setChainSignatures(signatures, lengthOfChainConfigs):
# maybe they should all be added to the_signature_grouping, even if they never
# need to be merged together
return signatures, lengthOfChainConfigs
-
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 180a86b256a033b3386fcbac3b55f12d0434efb9..49e3c9685e2667a03ea34f226adce304d761f062 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -777,10 +777,12 @@ class ChainStep(object):
# include cases of emtpy steps with multiplicity = [] or multiplicity=[0,0,0///]
if sum(multiplicity)==0:
multiplicity=[]
-
+
+ # This check is commented out (temporarily before can be removed completely) to support signatures wiht one sequence and multiplicty > 1, e.g. HLT_2e3
+ # In such case there is only one sequence, however the multiplicty is == 2
# sanity check on inputs
- if len(Sequences) != len(multiplicity):
- raise RuntimeError("Tried to configure a ChainStep %s with %i Sequences and %i multiplicities. These lists must have the same size" % (name, len(Sequences), len(multiplicity)) )
+ #if len(Sequences) != len(multiplicity):
+ # raise RuntimeError("Tried to configure a ChainStep %s with %i Sequences and %i multiplicities. These lists must have the same size" % (name, len(Sequences), len(multiplicity)) )
self.name = name
self.sequences=Sequences
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index f00186c181c169bdee7aaf4bc32113d601619ff8..6ad08d81ca8fa866498fa49c3d3182269b5baebd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -144,3 +144,4 @@ def setupMenu():
# Random Seeded EB chains which select at the HLT based on L1 TBP bits
TriggerFlags.EnhancedBiasSlice.signatures = [ ]
+ TriggerFlags.UnconventionalTrackingSlice.signatures = [ ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 063988bdec99e2902d1b088e1888f2d54269c185..3140cc69c7890bc49f1c0c15244e7ba0280a8c71 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -28,6 +28,7 @@ SliceIDDict = {
'Monitor' : 'mon',
'Beamspot' : 'beamspot',
'EnhancedBias' : 'eb',
+ 'UnconventionalTracking' : 'unconvtrk',
'Test' : 'TestChain',
}
@@ -36,6 +37,7 @@ AllowedSignatures = ["jet", "bjet", "ht",
"muon",
"met",
"tau",
+ "unconvtrk",
"minbias",
"heavyion",
"cosmic",
@@ -62,7 +64,7 @@ ChainDictTemplate = {
#==========================================================
# Test chains
#==========================================================
-# ---- Test Dictinary of all allowed Values ----
+# ---- Test Dictionary of all allowed Values ----
TestChainParts = {
'L1threshold' : '',
'signature' : ['Test'],
@@ -90,7 +92,7 @@ TestChainParts_Default = {
# Jet
#==========================================================
AllowedTopos_jet = []
-# ---- Jet Dictinary of all allowed Values ----
+# ---- Jet Dictionary of all allowed Values ----
JetChainParts = {
'signature' : ['Jet'],
'alignmentGroup': ['Jet','JetMET'],
@@ -114,7 +116,7 @@ JetChainParts = {
'addInfo' : ['perf'],
'TLA' : [],
- 'dataScouting' : [],
+ 'dataScouting' : ['JetDS'],
'topo' : AllowedTopos_jet,
@@ -135,7 +137,7 @@ JetChainParts = {
'smc' : ['30smcINF', '35smcINF', '40smcINF', '50smcINF', '60smcINF', 'nosmc'],
}
-# ---- Jet Dictinary of default Values ----
+# ---- Jet Dictionary of default Values ----
JetChainParts_Default = {
'signature' : ['Jet'],
'alignmentGroup': ['Jet'],
@@ -173,13 +175,13 @@ bJetChainParts_Default = {
#==========================================================
# HT chains
#==========================================================
-# ---- HT Dictinary of all allowed Values ----
+# ---- HT Dictionary of all allowed Values ----
HTChainParts = deepcopy(JetChainParts)
HTChainParts['signature'] = ['HT']
HTChainParts['trigType'] = ['ht']
HTChainParts['extra'] = ['j20', 'j25', 'j30', 'test4']
-# ---- HTDictinary of default Values ----
+# ---- HTDictionary of default Values ----
HTChainParts_Default = deepcopy(JetChainParts_Default)
HTChainParts_Default['signature'] = ['HT']
HTChainParts_Default['trigType'] = 'ht'
@@ -190,7 +192,7 @@ HTChainParts_Default['extra'] = ''
#==========================================================
AllowedTopos_mu = []
-# ---- Muon Dictinary of all allowed Values ----
+# ---- Muon Dictionary of all allowed Values ----
MuonChainParts = {
'signature' : ['Muon'],
'alignmentGroup' : ['Muon','MuonnoL1'],
@@ -208,7 +210,7 @@ MuonChainParts = {
'topo' : AllowedTopos_mu,
'flavour' : [],
}
-# ---- MuonDictinary of default Values ----
+# ---- MuonDictionary of default Values ----
MuonChainParts_Default = {
'signature' : ['Muon'],
'alignmentGroup' : ['Muon'],
@@ -231,12 +233,12 @@ MuonChainParts_Default = {
#==========================================================
AllowedTopos_Bphysics = ['bJpsimumu','bUpsimumu','bBmumu','bDimu','bDimu2700','bPhi','bTau']
-# ---- Bphysics Dictinary of all allowed Values ----
+# ---- Bphysics Dictionary of all allowed Values ----
BphysicsChainParts = deepcopy(MuonChainParts)
BphysicsChainParts['signature'] = ['Bphysics']
BphysicsChainParts['topo'] = AllowedTopos_Bphysics
-# ---- Bphysics Dictinary of default Values ----
+# ---- Bphysics Dictionary of default Values ----
BphysicsChainParts_Default = deepcopy(MuonChainParts_Default)
BphysicsChainParts_Default['signature'] = ['Bphysics']
BphysicsChainParts_Default['topo'] = []
@@ -286,7 +288,7 @@ TauChainParts_Default = {
# MET
#==========================================================
AllowedTopos_xe = []
-# ---- Met Dictinary of all allowed Values ----
+# ---- Met Dictionary of all allowed Values ----
METChainParts = {
'signature' : ['MET'],
'alignmentGroup' : ['MET','JetMET'],
@@ -306,7 +308,7 @@ METChainParts = {
'EFmuonCorr' : [],
'addInfo' : ['FStracks'],
}
-# ---- MetDictinary of default Values ----
+# ---- MetDictionary of default Values ----
METChainParts_Default = {
'signature' : ['MET'],
'alignmentGroup' : ['MET'],
@@ -327,12 +329,12 @@ METChainParts_Default = {
#==========================================================
# XS
#==========================================================
-# ---- xs Dictinary of all allowed Values ----
+# ---- xs Dictionary of all allowed Values ----
XSChainParts = METChainParts
XSChainParts['signature'] = ['XS']
XSChainParts['trigType'] = ['xs']
-# ---- xs Dictinary of default Values ----
+# ---- xs Dictionary of default Values ----
XSChainParts_Default = METChainParts_Default
XSChainParts_Default['signature'] = ['XS']
XSChainParts_Default['trigType'] = ['xs']
@@ -340,12 +342,12 @@ XSChainParts_Default['trigType'] = ['xs']
#==========================================================
# TE
#==========================================================
-# ---- te Dictinary of all allowed Values ----
+# ---- te Dictionary of all allowed Values ----
TEChainParts = METChainParts
TEChainParts['signature'] = ['TE']
TEChainParts['trigType'] = ['te']
-# ---- te Dictinary of default Values ----
+# ---- te Dictionary of default Values ----
TEChainParts_Default = METChainParts_Default
TEChainParts_Default['signature'] = ['TE']
TEChainParts_Default['trigType'] = ['te']
@@ -354,7 +356,7 @@ TEChainParts_Default['trigType'] = ['te']
# Electron Chains
#==========================================================
AllowedTopos_e = ["Jpsiee","Zeg","Zee"]
-# ---- Electron Dictinary of all allowed Values ----
+# ---- Electron Dictionary of all allowed Values ----
ElectronChainParts = {
'signature' : ['Electron'],
'alignmentGroup' : ['Electron','Egamma'],
@@ -366,14 +368,14 @@ ElectronChainParts = {
'threshold' : '',
'etaRange' : [],
'IDinfo' : ['lhvloose','lhloose','lhmedium','lhtight'],
- 'isoInfo' : [],
+ 'isoInfo' : ['ivarloose','ivarmedium','ivartight'],
'trkInfo' : ['nod0', 'idperf'],
'caloInfo' : [],
'lhInfo' : [],
'L2IDAlg' : ['noringer'],
'addInfo' : [ 'etcut', 'etcut1step',"v2","v3"],
}
-# ---- Egamma Dictinary of default Values ----
+# ---- Egamma Dictionary of default Values ----
ElectronChainParts_Default = {
'signature' : ['Electron'],
'alignmentGroup' : ['Electron'],
@@ -400,7 +402,7 @@ ElectronChainParts_Default = {
#==========================================================
# Photon chains
#==========================================================
-# ---- Photon Dictinary of all allowed Values ----
+# ---- Photon Dictionary of all allowed Values ----
PhotonChainParts = {
'L1threshold' : '',
'signature' : ['Photon'],
@@ -411,7 +413,7 @@ PhotonChainParts = {
'threshold' : '',
'extra' : [],
'IDinfo' : ['etcut','loose','medium','tight'],
- 'isoInfo' : [],
+ 'isoInfo' : ['icaloloose','icalomedium','icalotight'],
'reccalibInfo' : [],
'trkInfo' : [],
'caloInfo' : [],
@@ -421,7 +423,7 @@ PhotonChainParts = {
'addInfo' : ['etcut',],
}
-# ---- Photon Dictinary of default Values ----
+# ---- Photon Dictionary of default Values ----
PhotonChainParts_Default = {
'signature' : ['Photon'],
'alignmentGroup' : ['Photon'],
@@ -470,7 +472,7 @@ MinBiasChainParts = {
'recoAlg' : ['mbts', 'sptrk', 'sp', 'noalg', 'perf', 'hmt', 'hmtperf', 'idperf', 'zdcperf'],
'addInfo' : ['peb'],
}
-# ---- MinBiasDictinary of default Values ----
+# ---- MinBiasDictionary of default Values ----
MinBiasChainParts_Default = {
'signature' : ['MinBias'],
'alignmentGroup' : ['MinBias'],
@@ -517,7 +519,7 @@ HeavyIonChainParts = {
'gap' : [],
}
-# ---- HeavyIonDictinary of default Values ----
+# ---- HeavyIonDictionary of default Values ----
HeavyIonChainParts_Default = {
'signature' : ['HeavyIon'],
'alignmentGroup' : ['HeavyIon'],
@@ -547,7 +549,7 @@ AllowedCosmicChainIdentifiers = ['larps','larhec',
'tilecalib',
'sct', 'id',]
-# ---- Cosmic Chain Dictinary of all allowed Values ----
+# ---- Cosmic Chain Dictionary of all allowed Values ----
CosmicChainParts = {
'signature' : ['Cosmic'],
'alignmentGroup' : ['Cosmic'],
@@ -563,7 +565,7 @@ CosmicChainParts = {
'extra' : '',
}
-# ---- Cosmic Chain Default Dictinary of all allowed Values ----
+# ---- Cosmic Chain Default Dictionary of all allowed Values ----
CosmicChainParts_Default = {
'signature' : ['Cosmic'],
'alignmentGroup' : ['Cosmic'],
@@ -585,7 +587,7 @@ CosmicChainParts_Default = {
#==========================================================
AllowedStreamingChainIdentifiers = ['noalg']
-# ---- Streaming Chain Dictinary of all allowed Values ----
+# ---- Streaming Chain Dictionary of all allowed Values ----
StreamingChainParts = {
'signature' : ['Streaming'],
'alignmentGroup' : ['Streaming'],
@@ -603,7 +605,7 @@ StreamingChainParts = {
'algo' : ['NoAlg']
}
-# ---- Cosmic Chain Default Dictinary of all allowed Values ----
+# ---- Cosmic Chain Default Dictionary of all allowed Values ----
StreamingChainParts_Default = {
'signature' : ['Streaming'],
'alignmentGroup' : ['Streaming'],
@@ -629,7 +631,7 @@ AllowedCalibChainIdentifiers = ['csccalib', 'larcalib',
'calibAFP',
]
-# ---- Calib Chain Dictinary of all allowed Values ----
+# ---- Calib Chain Dictionary of all allowed Values ----
##stramingInfo not use in ChainConfiguration, only to distinguish streaming
CalibChainParts = {
@@ -648,7 +650,7 @@ CalibChainParts = {
'extra' : ['rerun','bs',''],
}
-# ---- Calib Chain Default Dictinary of all allowed Values ----
+# ---- Calib Chain Default Dictionary of all allowed Values ----
CalibChainParts_Default = {
'signature' : ['Calib'],
'alignmentGroup' : ['Calib'],
@@ -676,7 +678,7 @@ AllowedMonitorChainIdentifiers = ['robrequest', 'timeburner', 'costmonitor',
'mistimemoncaltimenomu','mistimemoncaltime',
'mistimemonj400',]
-# ---- Monitor Chain Dictinary of all allowed Values ----
+# ---- Monitor Chain Dictionary of all allowed Values ----
MonitorChainParts = {
'signature' : ['Monitor'],
'alignmentGroup' : ['Monitor'],
@@ -690,7 +692,7 @@ MonitorChainParts = {
'extra' : '',
}
-# ---- Monitor Chain Default Dictinary of all allowed Values ----
+# ---- Monitor Chain Default Dictionary of all allowed Values ----
MonitorChainParts_Default = {
'signature' : ['Monitor'],
'alignmentGroup' : ['Monitor'],
@@ -710,7 +712,7 @@ MonitorChainParts_Default = {
#==========================================================
AllowedEBChainIdentifiers = ['eb']
-# ---- Enhanced Bias Chain Dictinary of all allowed Values ----
+# ---- Enhanced Bias Chain Dictionary of all allowed Values ----
EnhancedBiasChainParts = {
'signature' : ['EnhancedBias'],
'alignmentGroup' : ['EnhancedBias'],
@@ -723,7 +725,7 @@ EnhancedBiasChainParts = {
'extra' : '',
}
-# ---- EnhancedBias Chain Default Dictinary of all allowed Values ----
+# ---- EnhancedBias Chain Default Dictionary of all allowed Values ----
EnhancedBiasChainParts_Default = {
'signature' : ['EnhancedBias'],
'alignmentGroup' : ['EnhancedBias'],
@@ -756,7 +758,7 @@ BeamspotChainParts = {
'extra' : '',
}
-# ---- Beamspot Chain Default Dictinary of all allowed Values ----
+# ---- Beamspot Chain Default Dictionary of all allowed Values ----
BeamspotChainParts_Default = {
'signature' : ['Beamspot'],
'alignmentGroup' : ['Beamspot'],
@@ -773,17 +775,45 @@ BeamspotChainParts_Default = {
'extra' : '',
}
+#==========================================================
+# Unconventional Tracking
+#==========================================================
+# ---- Unconventional Tracking Dictionary of all allowed Values ----
+UnconventionalTrackingChainParts = {
+ 'signature' : ['UnconventionalTracking'],
+ 'alignmentGroup' : ['UnconventionalTracking'],
+ 'L1threshold' : '',
+ 'chainPartName' : [],
+ 'multiplicity' : '',
+ 'trigType' : ['unconvtrk'],
+ 'threshold' : '',
+ 'extra' : '',
+ 'addInfo' : [],
+}
+# ---- Unconventional Tracking Dictionary of default Values ----
+UnconventionalTrackingChainParts_Default = {
+ 'signature' : ['UnconventionalTracking'],
+ 'alignmentGroup' : ['UnconventionalTracking'],
+ 'L1threshold' : '',
+ 'chainPartName' : [],
+ 'multiplicity' : '',
+ 'trigType' : ['unconvtrk'],
+ 'threshold' : '',
+ 'extra' : '',
+ 'addInfo' : [],
+}
+
#==========================================================
# Combined Chains
#==========================================================
AllowedTopos_comb = []
-# ---- Combined Dictinary of all allowed Values ----
+# ---- Combined Dictionary of all allowed Values ----
CombinedChainParts = deepcopy(PhotonChainParts)
CombinedChainParts['signature'] = ['Photon','Muon']
CombinedChainParts['chainParts'] = ['g','mu'],
CombinedChainParts['topo'] = AllowedTopos_comb
-# ---- Combined Dictinary of default Values ----
+# ---- Combined Dictionary of default Values ----
CombinedChainParts_Default = deepcopy(PhotonChainParts_Default)
CombinedChainParts_Default['signature'] = ['Photon','Muon']
CombinedChainParts_Default['chainParts'] = ['g','mu'],
@@ -860,6 +890,8 @@ def getSignatureInformation(signature):
return [BeamspotChainParts_Default, BeamspotChainParts]
if signature == "EnhancedBias":
return [EnhancedBiasChainParts_Default, EnhancedBiasChainParts]
+ if signature == "UnconventionalTracking":
+ return [UnconventionalTrackingChainParts_Default, UnconventionalTrackingChainParts]
if signature == "Test":
return [TestChainParts_Default, TestChainParts]
else:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py
index 11f817b1526110d2da1ba3a2d381fdbb44874cdd..5d7fb7bd26e7bebca2c450db9e46fbe3ee372c4a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py
@@ -42,6 +42,8 @@ _all_streams = [
StreamInfo('Background', 'physics', True, True),
StreamInfo('Standby', 'physics', True, True),
StreamInfo('L1Calo', 'physics', True, True),
+ # TLA/PEB/DATA SCOUTING (physics) STREAMS
+ StreamInfo('JetDS','physics',True,False),
# EXPRESS STREAM
StreamInfo('express', 'express', True, True),
# MONITORING STREAMS
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index 5780500ccf8a50192d1d4fc3ccbc1db07a813019..1db8754f0591af5659981532677918d5b9ab171f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -4,7 +4,9 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import CAMenuSequence, Chai
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TrigL2MuonSA.TrigL2MuonSAConfig_newJO import l2MuFastAlgCfg, l2MuFastHypoCfg
-from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromDict, TrigMuonEFMSonlyHypoToolFromDict
+from TrigmuComb.TrigmuCombConfig_newJO import l2MuCombRecoCfg, l2MuCombHypoCfg
+from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromDict, TrigmuCombHypoToolFromDict, TrigMuonEFMSonlyHypoToolFromDict
+from TrigInDetConfig.TrigInDetConfig import TrigInDetConfig
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
@@ -47,6 +49,13 @@ def MuFastViewDataVerifier():
result.addEventAlgo(alg)
return result
+def MuCombViewDataVerifier():
+ result = ComponentAccumulator()
+ alg = CompFactory.AthViews.ViewDataVerifier( name = "VDVMuComb",
+ DataObjects = [( 'xAOD::L2StandAloneMuonContainer' , 'StoreGateSvc+MuonL2SAInfo' )])
+ result.addEventAlgo(alg)
+ return result
+
#Not the ideal place to keep the track cnv alg configuration. Temproarily adding it here
#until a better location can be found
def MuonTrackCollectionCnvToolCfg(flags, name = "MuonTrackCollectionCnvTool", **kwargs):
@@ -210,82 +219,117 @@ def generateChains( flags, chainDict ):
l2muFastStep = ChainStep( name=stepName, Sequences=[l2muFastSequence], chainDicts=[chainDict] )
- ### Set muon step2 ###
- # Please set up L2muComb step here
-
- #EF MS only
- stepEFMSName = 'EFMSMuon'
- stepEFMSReco, stepEFMSView = createStepView(stepEFMSName)
-
- #Clone and replace offline flags so we can set muon trigger specific values
- muonflags = flags.cloneAndReplace('Muon', 'Trigger.Offline.Muon')
- muonflags.Muon.useTGCPriorNextBC=True
- muonflags.Muon.enableErrorTuning=False
- muonflags.Muon.MuonTrigger=True
- muonflags.Muon.SAMuonTrigger=True
- muonflags.lock()
-
- accMS = ComponentAccumulator()
- accMS.addSequence(stepEFMSView)
-
- from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
- recoMS = InViewReco("EFMuMSReco")
- recoMS.inputMaker().RequireParentView = True
+ if 'msonly' not in chainDict['chainName']:
+ #only run in combined muon chains
+ ### Set muon step2 - L2muComb ###
+ stepL2CBName = 'L2MuonCB'
+ stepL2CBReco, stepL2CBView = createStepView(stepL2CBName)
+
+ accL2CB = ComponentAccumulator()
+ accL2CB.addSequence(stepL2CBView)
+
+ # Set EventViews for L2MuonCB step
+ recoL2CB = l2MuCombRecoCfg(flags)
+ #external data loading to view
+ recoL2CB.inputMaker().RequireParentView = True
+ recoL2CB.mergeReco( MuCombViewDataVerifier() )
+
+ #ID tracking
+ accID = TrigInDetConfig( flags, roisKey=recoL2CB.inputMaker().InViewRoIs, signatureName="Muon" )
+ recoL2CB.mergeReco(accID)
+
+ accL2CB.merge(recoL2CB, sequenceName = stepL2CBReco.getName())
+
+ l2muCombHypo = l2MuCombHypoCfg( flags,
+ name = 'TrigL2MuCombHypo',
+ muCombInfo = 'HLT_MuonL2CBInfo' )
+
+ accL2CB.addEventAlgo(l2muCombHypo, sequenceName=stepL2CBView.getName())
+
+ l2muCombSequence = CAMenuSequence( Sequence = recoL2CB.sequence(),
+ Maker = recoL2CB.inputMaker(),
+ Hypo = l2muCombHypo,
+ HypoToolGen = TrigmuCombHypoToolFromDict,
+ CA = accL2CB )
+
+ l2muCombStep = ChainStep( name=stepL2CBName, Sequences=[l2muCombSequence], chainDicts=[chainDict] )
- #Probably this block will eventually need to move somewhere more central
- from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
- accMS.merge( BeamPipeGeometryCfg(flags) )
-
- from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
- accMS.merge(PixelGeometryCfg(flags))
+
+ if 'msonly' in chainDict['chainName']:
+ #only runningn in MS-only chains for now
+ #EF MS only
+ stepEFMSName = 'EFMSMuon'
+ stepEFMSReco, stepEFMSView = createStepView(stepEFMSName)
+
+ #Clone and replace offline flags so we can set muon trigger specific values
+ muonflags = flags.cloneAndReplace('Muon', 'Trigger.Offline.Muon')
+ muonflags.Muon.useTGCPriorNextBC=True
+ muonflags.Muon.enableErrorTuning=False
+ muonflags.Muon.MuonTrigger=True
+ muonflags.Muon.SAMuonTrigger=True
+ muonflags.lock()
+
+ accMS = ComponentAccumulator()
+ accMS.addSequence(stepEFMSView)
+
+ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
+ recoMS = InViewReco("EFMuMSReco")
+ recoMS.inputMaker().RequireParentView = True
- from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
- accMS.merge(SCT_GeometryCfg(flags))
+ #Probably this block will eventually need to move somewhere more central
+ from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
+ accMS.merge( BeamPipeGeometryCfg(flags) )
+
+ from PixelGeoModel.PixelGeoModelConfig import PixelGeometryCfg
+ accMS.merge(PixelGeometryCfg(flags))
- from TRT_GeoModel.TRT_GeoModelConfig import TRT_GeometryCfg
- accMS.merge(TRT_GeometryCfg(flags))
+ from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
+ accMS.merge(SCT_GeometryCfg(flags))
+
+ from TRT_GeoModel.TRT_GeoModelConfig import TRT_GeometryCfg
+ accMS.merge(TRT_GeometryCfg(flags))
- from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
- accMS.merge(TrackingGeometrySvcCfg(flags))
- ###################
+ from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
+ accMS.merge(TrackingGeometrySvcCfg(flags))
+ ###################
- EFMuonViewDataVerifier = EFMuonViewDataVerifierCfg()
- recoMS.mergeReco(EFMuonViewDataVerifier)
+ EFMuonViewDataVerifier = EFMuonViewDataVerifierCfg()
+ recoMS.mergeReco(EFMuonViewDataVerifier)
- from MuonConfig.MuonSegmentFindingConfig import MooSegmentFinderAlgCfg
- segCfg = MooSegmentFinderAlgCfg(muonflags,name="TrigMooSegmentFinder",UseTGCNextBC=False, UseTGCPriorBC=False)
- recoMS.mergeReco(segCfg)
+ from MuonConfig.MuonSegmentFindingConfig import MooSegmentFinderAlgCfg
+ segCfg = MooSegmentFinderAlgCfg(muonflags,name="TrigMooSegmentFinder",UseTGCNextBC=False, UseTGCPriorBC=False)
+ recoMS.mergeReco(segCfg)
- from MuonConfig.MuonTrackBuildingConfig import MuonTrackBuildingCfg
- trkCfg = MuonTrackBuildingCfg(muonflags, name="TrigMuPatTrackBuilder")
- recoMS.mergeReco(trkCfg)
+ from MuonConfig.MuonTrackBuildingConfig import MuonTrackBuildingCfg
+ trkCfg = MuonTrackBuildingCfg(muonflags, name="TrigMuPatTrackBuilder")
+ recoMS.mergeReco(trkCfg)
- cnvCfg = MuonTrackParticleCnvCfg(muonflags, name = "TrigMuonTrackParticleCnvAlg")
- recoMS.mergeReco(cnvCfg)
+ cnvCfg = MuonTrackParticleCnvCfg(muonflags, name = "TrigMuonTrackParticleCnvAlg")
+ recoMS.mergeReco(cnvCfg)
- from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedMuonCandidateAlgCfg
- candCfg = MuonCombinedMuonCandidateAlgCfg(muonflags, name = "TrigMuonCandidateAlg")
- recoMS.mergeReco(candCfg)
+ from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedMuonCandidateAlgCfg
+ candCfg = MuonCombinedMuonCandidateAlgCfg(muonflags, name = "TrigMuonCandidateAlg")
+ recoMS.mergeReco(candCfg)
- from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCreatorAlgCfg
- creatorCfg = MuonCreatorAlgCfg(muonflags, name = "TrigMuonCreatorAlg")
- recoMS.mergeReco(creatorCfg)
+ from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCreatorAlgCfg
+ creatorCfg = MuonCreatorAlgCfg(muonflags, name = "TrigMuonCreatorAlg")
+ recoMS.mergeReco(creatorCfg)
- accMS.merge(recoMS, sequenceName=stepEFMSReco.getName())
+ accMS.merge(recoMS, sequenceName=stepEFMSReco.getName())
- efmuMSHypo = efMuMSHypoCfg( muonflags,
- name = 'TrigMuonEFMSonlyHypo',
- inputMuons = "Muons" )
+ efmuMSHypo = efMuMSHypoCfg( muonflags,
+ name = 'TrigMuonEFMSonlyHypo',
+ inputMuons = "Muons" )
- accMS.addEventAlgo(efmuMSHypo, sequenceName=stepEFMSView.getName())
+ accMS.addEventAlgo(efmuMSHypo, sequenceName=stepEFMSView.getName())
- efmuMSSequence = CAMenuSequence( Sequence = recoMS.sequence(),
- Maker = recoMS.inputMaker(),
- Hypo = efmuMSHypo,
- HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict,
- CA = accMS )
+ efmuMSSequence = CAMenuSequence( Sequence = recoMS.sequence(),
+ Maker = recoMS.inputMaker(),
+ Hypo = efmuMSHypo,
+ HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict,
+ CA = accMS )
- efmuMSStep = ChainStep( name=stepEFMSName, Sequences=[efmuMSSequence], chainDicts=[chainDict] )
+ efmuMSStep = ChainStep( name=stepEFMSName, Sequences=[efmuMSSequence], chainDicts=[chainDict] )
l1Thresholds=[]
for part in chainDict['chainParts']:
@@ -293,7 +337,9 @@ def generateChains( flags, chainDict ):
log.debug('dictionary is: %s\n', pprint.pformat(chainDict))
-
- chain = Chain( name=chainDict['chainName'], L1Thresholds=l1Thresholds, ChainSteps=[ l2muFastStep, efmuMSStep ] )
+ if 'msonly' in chainDict['chainName']:
+ chain = Chain( name=chainDict['chainName'], L1Thresholds=l1Thresholds, ChainSteps=[ l2muFastStep, efmuMSStep ] )
+ else:
+ chain = Chain( name=chainDict['chainName'], L1Thresholds=l1Thresholds, ChainSteps=[ l2muFastStep, l2muCombStep ] )
return chain
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/GenerateUnconventionalTrackingChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/GenerateUnconventionalTrackingChainDefs.py
new file mode 100644
index 0000000000000000000000000000000000000000..a71d9b172722bdb9735b2d869392dec9f23c9c8e
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/GenerateUnconventionalTrackingChainDefs.py
@@ -0,0 +1,21 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.UnconventionalTrackingChainConfiguration import UnconventionalTrackingChainConfiguration
+
+import pprint
+from AthenaCommon.Logging import logging
+log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.generateChainConfigs' )
+log.info("Importing %s",__name__)
+
+
+
+def generateChainConfigs( chainDict ):
+ log.debug('dictionary is: %s\n', pprint.pformat(chainDict))
+
+ # Unconventional tracking chain is assembled always from the full dictionary (multiple legs are handled internally by the jet reco / hypo)
+ theChainDef = UnconventionalTrackingChainConfiguration(chainDict)
+
+ unconventionalTrackingChain = theChainDef.assembleChain()
+
+
+ return unconventionalTrackingChain
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
new file mode 100644
index 0000000000000000000000000000000000000000..2f84064bc1494a34e1974fad43c77131e753578c
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.Logging import logging
+logging.getLogger().info("Importing %s",__name__)
+log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.UnconventionalTrackingDef")
+
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
+
+
+def unconventionalTrackingChainParts(chainParts):
+ unconvtrkChainParts = []
+ for p in chainParts:
+ if p['trigType'] == 'unconvtrk':
+ unconvtrkChainParts.append(p)
+ return unconvtrkChainParts
+
+#----------------------------------------------------------------
+# Class to configure chain
+#----------------------------------------------------------------
+class UnconventionalTrackingChainConfiguration(ChainConfigurationBase):
+
+ def __init__(self, chainDict):
+ ChainConfigurationBase.__init__(self,chainDict)
+
+ # ----------------------
+ # Assemble the chain depending on information from chainName
+ # ----------------------
+ def assembleChain(self):
+ log.debug("Assembling chain " + self.chainName)
+
+ steps=[self.getEmptyStep(1, 'unconv_empty')]
+
+ chainSteps = []
+ for step in steps:
+ chainSteps+=[step]
+
+ myChain = self.buildChain(chainSteps)
+ return myChain
+
+
+ # --------------------
+ # Configuration of steps
+ # --------------------
+ def getUnconventionalTrackingChainStep(self):
+ pass
+
+
+
+
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py
index e2adb3164467a647e5d3c25cff833a4514dba38e..5fcc5071ece84bea508aa12e7492f8cfab3e26b7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py
@@ -12,20 +12,14 @@ class BoardType(Enum):
NONE = 1
MUCTPI = 2
TOPO = 3
- MERGER = 4
- CTPIN = 5
+ CTPIN = 4
+ MERGER = 5
def __repr__(self):
return self.name
def __str__(self):
return self.name
-
-
-class MenuBoardsCollection(object):
- def __init__(self):
- self.boards = {}
-
- def addBoard(self, boardDef):
- name = boardDef["name"]
+ @staticmethod
+ def fromBoardName(name):
if 'muctpi' in name.lower():
btype = BoardType.MUCTPI
elif 'alfactpin' in name.lower():
@@ -37,25 +31,28 @@ class MenuBoardsCollection(object):
elif 'ctpin' in name.lower():
btype = BoardType.CTPIN
else:
- btype = BoardType.NONE
+ raise RuntimeError("No BoardType defined for board %s" % name)
+ return btype
- isLegacy = 'legacy' in boardDef
- self.boards[name] = Board(name, btype, isLegacy)
+class MenuBoardsCollection(object):
+ def __init__(self):
+ self.boards = {}
+ def addBoard(self, boardDef):
+ name = boardDef["name"]
+ btype = BoardType.fromBoardName(name)
+ isLegacy = 'legacy' in boardDef
+ self.boards[name] = Board(name, btype, isLegacy)
if "connectors" in boardDef:
self.boards[name].addOutputConnectorNames([c["name"] for c in boardDef["connectors"]])
-
return self.boards[name]
def json(self):
- boardOrder = ["MuCTPi", "Topo1", "Topo2", "Topo3", "Ctpin", "Ctpin7", "Ctpin8", "Ctpin9",
- "LegacyTopo0", "LegacyTopo1", "LegacyTopoMerger", "AlfaCtpin"]
from collections import OrderedDict as odict
confObj = odict()
- for boardName in boardOrder:
- if boardName in self.boards:
- confObj[boardName] = self.boards[boardName].json()
+ for boardName in sorted(self.boards):
+ confObj[boardName] = self.boards[boardName].json()
return confObj
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
index 4752255af54200376c797cb875febe4445a77cee..7544eff43215f107672640311d788cfe01f1fe2f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
@@ -46,11 +46,13 @@ class MenuItemsCollection(object):
if item is None:
return self
if item.name in self.items:
- log.warning("LVL1 item %s is already in the menu, will not add it again", item.name)
- return self
+ msg = "LVL1 item %s is already in the menu, will not add it again" % item.name
+ log.error(msg)
+ raise RuntimeError(msg)
if item.ctpid in [x.ctpid for x in self.items.values()]:
- log.warning("LVL1 item with ctpid %i is already in the menu, will not add %s", item.ctpid, item.name)
- return self
+ msg = "LVL1 item %s with ctpid %i is already in the menu, will not add %s with the same ctpid" % (self.itemById(item.ctpid).name, item.ctpid, item.name)
+ log.error(msg)
+ raise RuntimeError(msg)
self.items[ item.name ] = item
return self
@@ -60,6 +62,10 @@ class MenuItemsCollection(object):
def __len__(self):
return len(self.items)
+ def itemById(self,ctpid):
+ itemById = {it.ctpid:it for it in self.items.values()}
+ return itemById[ctpid] if ctpid in itemById else None
+
def itemNames(self):
return self.items.keys()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
index 08566f9453239705742959d64156b92626df3da8..2f9a5233326f92ecd86bb125400fd2c410aed86a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
@@ -20,8 +20,11 @@ class TopoMenuDef:
self.outputlines = outputlines
self.outputbits = outputbits
- def __repr__(self):
+ def __str__(self):
return self.algoname
+ def __repr__(self):
+ return f"name = {self.algoname}, outputlines = {self.outputlines}, outputbits = {self.outputbits}"
+
def isMultiplicityDefinition(self):
return self.algoname.startswith("Mult")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index 2e2a44ae9fd42115b7fea71407dcc838bb05e002..846421800e0cf9a4e680641c2ce533c42fd30568 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -495,6 +495,7 @@ class ItemDef:
MenuItem('L1_TAU25IM_2TAU20IM_2J25_3J20').setLogic( d.HA25IM & d.HA20IM.x(2) & d.J25.x(2) & d.J20.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20IM_2TAU12IM_4J12').setLogic( d.HA20IM & d.HA12IM.x(2) & d.J12.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU20IM_2TAU12IM_4J12.0ETA23').setLogic( d.HA20IM & d.HA12IM.x(2) & d.J120ETA23.x(4) & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_TAU20IM_2TAU12IM_4J12.0ETA28').setLogic( d.HA20IM & d.HA12IM.x(2) & d.J120ETA28.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_TAU60_2TAU40').setLogic( d.HA60 & d.HA40.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_2TAU12I_TAU20_J25_2J15_3J12' ).setLogic( d.HA12I.x(2) & d.HA20 & d.J25 & d.J15.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
#######
@@ -1698,7 +1699,7 @@ class ItemDef:
MenuItem('L1_EM15TAU12I-J25').setLogic( d.R2TOPO_1DISAMB_EM15his2_TAU12abi_J25ab & physcond)
MenuItem('L1_DR-EM15TAU12I').setLogic( d.R2TOPO_DISAMB_0DR28_EM15his2_TAU12abi & physcond)
- MenuItem('L1_DR-EM15TAU12I-J25').setLogic( d.TOPO_1DISAMB_J25ab_0DR28_EM15his2_TAU12abi & physcond)
+ MenuItem('L1_DR-EM15TAU12I-J25').setLogic( d.TOPO_2DISAMB_J25ab_0DR28_EM15his2_TAU12abi & physcond)
MenuItem('L1_TAU20ITAU12I-J25').setLogic( d.R2TOPO_1DISAMB_TAU20abi_TAU12abi_J25ab & physcond)
MenuItem('L1_DR25-TAU20ITAU12I').setLogic( d.TOPO_0DR25_TAU20abi_TAU12abi & physcond)
@@ -1742,6 +1743,7 @@ class ItemDef:
MenuItem('L1_BPH-2M9-2MU6' ).setLogic( d.R2TOPO_2INVM9_2MU6ab & d.MU6.x(2) & physcond)
MenuItem('L1_BPH-8M15-2MU6_BPH-0DR22-2MU6' ).setLogic( d.R2TOPO_8INVM15_2MU6ab & d.R2TOPO_0DR22_2MU6ab & d.MU6.x(2) & physcond) # 96% for Upsi
+ MenuItem('L1_BPH-8M15-2MU4-BO' ).setLogic( d.TOPO_8INVM15_2CMU4ab & physcond) # 96% for Upsi
# Barrel and BarrelOnly items w/o topo selection
MenuItem('L1_2MU4-B' ).setLogic( d.MU4.x(2) & d.R2TOPO_MULT_CMU4ab & physcond) # 2MU4_Barrel
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py
new file mode 100644
index 0000000000000000000000000000000000000000..e06a8e50fe1485a62296df33fa7bdbc35d835068
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py
@@ -0,0 +1,102 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from collections import namedtuple, OrderedDict as odict
+
+from AthenaCommon.Logging import logging
+log = logging.getLogger("L1.Config.LegacyTopoMergerMap")
+
+MC = namedtuple('MC', "target_bit, topo_board, source_bit, signals")
+
+# the following mapping is hardcoded to match the hardwired legacy L1Topo
+# merger board based on specifications from Stefan Haas
+__mapping = [
+ MC(target_bit = 0, topo_board = 0, source_bit = 0, signals = ( "900INVM9999-AJ30s6-AJ20s6", None )),
+ MC(target_bit = 1, topo_board = 0, source_bit = 1, signals = ( "800INVM9999-AJ30s6-AJ20s6", None )),
+ MC(target_bit = 2, topo_board = 0, source_bit = 2, signals = ( "700INVM9999-AJ30s6-AJ20s6", None )),
+ MC(target_bit = 3, topo_board = 0, source_bit = 3, signals = ( "500INVM9999-AJ30s6-AJ20s6", None )),
+ MC(target_bit = 4, topo_board = 0, source_bit = 4, signals = ( "400INVM9999-AJ30s6-AJ20s6", "0DR03-EM7ab-CJ15ab" )),
+ MC(target_bit = 5, topo_board = 0, source_bit = 5, signals = ( "300INVM9999-AJ30s6-AJ20s6", "10MINDPHI-J20s2-XE30" )),
+ MC(target_bit = 6, topo_board = 0, source_bit = 6, signals = ( "200INVM9999-AJ30s6-AJ20s6", "10MINDPHI-J20s2-XE50" )),
+ MC(target_bit = 7, topo_board = 0, source_bit = 7, signals = ( "100INVM9999-AJ30s6-AJ20s6", "100RATIO-0MATCH-TAU30si2-EMall" )),
+ MC(target_bit = 8, topo_board = 0, source_bit = 8, signals = ( "0INVM9-EM7ab-EMab", "NOT-0MATCH-TAU30si1-EMall" )),
+ MC(target_bit = 9, topo_board = 0, source_bit = 9, signals = ( "HT150-J20s5pETA31", None )),
+ MC(target_bit = 10, topo_board = 0, source_bit = 10, signals = ( "HT190-J15s5pETA21", None )),
+ MC(target_bit = 11, topo_board = 0, source_bit = 11, signals = ( "1INVM5-EMs1-EMs6", None )),
+ MC(target_bit = 12, topo_board = 0, source_bit = 12, signals = ( "1INVM5-EM7s1-EMs6", "27DPHI32-EMs1-EMs6" )),
+ MC(target_bit = 13, topo_board = 0, source_bit = 13, signals = ( "1INVM5-EM12s1-EMs6", None )),
+ MC(target_bit = 14, topo_board = 0, source_bit = 14, signals = ( None, None )),
+ MC(target_bit = 15, topo_board = 0, source_bit = 15, signals = ( "400INVM9999-AJ30s6pETA31-AJ20s6p31ETA49", None )),
+ MC(target_bit = 16, topo_board = 0, source_bit = 16, signals = ( None, "DISAMB-30INVM-EM20his2-TAU12ab" )),
+ MC(target_bit = 17, topo_board = 0, source_bit = 17, signals = ( None, None )),
+ MC(target_bit = 18, topo_board = 0, source_bit = 18, signals = ( None, None )),
+ MC(target_bit = 19, topo_board = 0, source_bit = 19, signals = ( "1DISAMB-J25ab-0DR28-EM15his2-TAU12abi", None)),
+ MC(target_bit = 20, topo_board = 0, source_bit = 28, signals = ( None, "600INVM9999-J30s6-AJ20s6" )),
+ MC(target_bit = 21, topo_board = 0, source_bit = 29, signals = ( None, "500INVM9999-J30s6-AJ20s6" )),
+ MC(target_bit = 22, topo_board = 0, source_bit = 30, signals = ( None, "400INVM9999-J30s6-AJ20s6" )),
+ MC(target_bit = 23, topo_board = 0, source_bit = 31, signals = ( None, "200INVM9999-J30s6-AJ20s6" )),
+ MC(target_bit = 24, topo_board = 1, source_bit = 10, signals = ( None, None )),
+ MC(target_bit = 25, topo_board = 1, source_bit = 11, signals = ( None, "SC111-CJ15abpETA26" )),
+ MC(target_bit = 26, topo_board = 1, source_bit = 18, signals = ( None, "0DR28-TAU20abi-TAU12abi" )),
+ MC(target_bit = 27, topo_board = 1, source_bit = 19, signals = ( None, "1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi" )),
+ MC(target_bit = 28, topo_board = 1, source_bit = 20, signals = ( None, "1DISAMB-TAU12abi-J25ab" )),
+ MC(target_bit = 29, topo_board = 1, source_bit = 21, signals = ( None, None )),
+ MC(target_bit = 30, topo_board = 1, source_bit = 28, signals = ( "0DETA20-J50s1-Js2", None )),
+ MC(target_bit = 31, topo_board = 1, source_bit = 29, signals = ( None, None )),
+]
+
+
+def createMergerBoard(legacyBoard0, legacyBoard1):
+
+ legacyOccupation = [[32*[None],32*[None]],[32*[None],32*[None]]]
+ for boardNumber, board in enumerate([legacyBoard0, legacyBoard1]):
+ for conn in board["connectors"][0]["algorithmGroups"]:
+ fpga = conn['fpga']
+ clock = conn['clock']
+ for topoAlgDef in conn['algorithms']:
+ lines = topoAlgDef.outputlines
+ if len(lines)==1:
+ legacyOccupation[boardNumber][clock][ 16*fpga + topoAlgDef.outputbits] = lines[0]
+ else:
+ for bit,line in enumerate(lines):
+ legacyOccupation[boardNumber][clock][ 16*fpga + bit + topoAlgDef.outputbits[0]] = line
+
+ signals = [32*[None], 32*[None]]
+ for mc in __mapping:
+ for clock in [0,1]:
+ algFromMapping = mc.signals[clock]
+ if algFromMapping is None:
+ continue
+ signals[clock][mc.target_bit] = algFromMapping
+ algFromLegacyBoardDef = legacyOccupation[mc.topo_board][clock][mc.source_bit]
+ if algFromMapping != algFromLegacyBoardDef:
+ fpga = mc.source_bit // 16
+ bit = mc.source_bit % 16
+ msg = f"Legacy board mapping expects line {algFromMapping} on LegacyBoard{mc.topo_board}, fpga {fpga}, " +\
+ f"clock {clock}, bit {bit} but board defines {algFromLegacyBoardDef}"
+ log.error(msg)
+ raise RuntimeError("Mapping doesn't match LegacyBoard definition")
+
+
+
+
+ board = odict()
+ board["connectors"] = []
+ board["type"] = "merger"
+ board["connectors"].append({
+ "name" : "LegacyTopoMerged",
+ "format" : "simple",
+ "nbitsDefault" : 1,
+ "type" : "electrical",
+ "legacy" : False,
+ "signalGroups" : [
+ {
+ "clock" : 0,
+ "signals" : signals[0]
+ },
+ {
+ "clock" : 1,
+ "signals" : signals[1]
+ }
+ ]
+ })
+ return odict( [("LegacyTopoMerger", board)] )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
index 5ba79fdd298a463e06004c976c3b1ad4a7f5d100..c8bc26fb2624afd078e418d97e5d577097d4e1e1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
@@ -245,6 +245,7 @@ class ThresholdDefLegacy:
ThresholdValue.setDefaults('JET', {'window' : 8})
+ # Standart jet (-31<=eta<=31)
for thrV in [5, 10, 12, 15, 20, 25, 30, 35, 40, 50, 60, 70, 75, 85, 100, 120, 150,175, 250, 400]:
LegacyThreshold('J%i' % thrV, 'JET').addThrValue(CL.JetOff).addThrValue(thrV, etamin=-31, etamax=31, priority=1) # jets are between -31 and 31 -ATR-11526
@@ -259,10 +260,8 @@ class ThresholdDefLegacy:
for thrV in [75]:
LegacyThreshold('J%iA' % thrV, 'JET').addThrValue(CL.JetOff).addThrValue( thrV, etamin = 15, etamax = 23, priority=1)
LegacyThreshold('J%iC' % thrV, 'JET').addThrValue(CL.JetOff).addThrValue( thrV, etamin = -23, etamax = -15, priority=1)
-
-
# Central jet
- for (thrV, etamax) in [(12,23), (15,25), (17,22), (20,28), (25,23), (35,23), (20,49), (30,49), (40,25), (45,20)]:
+ for (thrV, etamax) in [(12,23), (12,28), (15,25), (17,22), (20,28), (25,23), (35,23), (20,49), (30,49), (40,25), (45,20)]:
LegacyThreshold('J%i.0ETA%i' % (thrV, etamax), 'JET').addThrValue(CL.JetOff).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1)
# Standard forward jet
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index 136c89817634967d7830c53811f3099d4b1930e5..f87b3af90d3f9144bfbffa541a5b853ca90db4df 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from .TypeWideThresholdConfig import getTypeWideThresholdConfig
@@ -25,14 +25,14 @@ class TopoAlgoDef:
_emscale_for_decision = 1000 / getTypeWideThresholdConfig("EM")["resolutionMeV"]
- alg = AlgConf.ClusterNoSort( name = 'EMall', inputs = 'ClusterTobArray', outputs = 'EMall', algoId = -1 )
+ alg = AlgConf.ClusterNoSort( name = 'EMall', inputs = 'ClusterTobArray', outputs = 'EMall' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('OutputWidth', HW.InputWidthEM)
alg.addvariable('IsoMask', 0)
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'TAUabi', inputs = 'ClusterTobArray', outputs = 'TAUabi', algoId = -1 )
+ alg = AlgConf.ClusterSelect( name = 'TAUabi', inputs = 'ClusterTobArray', outputs = 'TAUabi' )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
@@ -44,7 +44,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'EMabi', inputs = 'ClusterTobArray', outputs = 'EMabi', algoId = -1 )
+ alg = AlgConf.ClusterSelect( name = 'EMabi', inputs = 'ClusterTobArray', outputs = 'EMabi' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
@@ -56,7 +56,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'EMabhi', inputs = 'ClusterTobArray', outputs = 'EMabhi', algoId = -1 )
+ alg = AlgConf.ClusterSelect( name = 'EMabhi', inputs = 'ClusterTobArray', outputs = 'EMabhi' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
@@ -68,7 +68,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'TAUab', inputs = 'ClusterTobArray', outputs = 'TAUab', algoId = -1 )
+ alg = AlgConf.ClusterSelect( name = 'TAUab', inputs = 'ClusterTobArray', outputs = 'TAUab' )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
@@ -80,7 +80,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSort( name = 'EMs', inputs = 'ClusterTobArray', outputs = 'EMs', algoId = -1 )
+ alg = AlgConf.ClusterSort( name = 'EMs', inputs = 'ClusterTobArray', outputs = 'EMs' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
@@ -92,7 +92,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSort( name = 'EMshi', inputs = 'ClusterTobArray', outputs = 'EMshi', algoId = -1 )
+ alg = AlgConf.ClusterSort( name = 'EMshi', inputs = 'ClusterTobArray', outputs = 'EMshi' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
@@ -104,7 +104,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSort( name = 'TAUsi', inputs = 'ClusterTobArray', outputs = 'TAUsi', algoId = -1 )
+ alg = AlgConf.ClusterSort( name = 'TAUsi', inputs = 'ClusterTobArray', outputs = 'TAUsi' )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortTAU)
alg.addgeneric('OutputWidth', HW.OutputWidthSortTAU)
@@ -116,14 +116,14 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetNoSort( name = 'AJall', inputs = 'JetTobArray', outputs = 'AJall', algoId = -1 )
+ alg = AlgConf.JetNoSort( name = 'AJall', inputs = 'JetTobArray', outputs = 'AJall' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
alg.addgeneric('JetSize', HW.DefaultJetSize)
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetNoSort( name = 'AJjall', inputs = 'JetTobArray', outputs = 'AJjall', algoId = -1 )
+ alg = AlgConf.JetNoSort( name = 'AJjall', inputs = 'JetTobArray', outputs = 'AJjall' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
alg.addgeneric('JetSize', 1 if HW.DefaultJetSize.value==2 else 2)
@@ -132,7 +132,7 @@ class TopoAlgoDef:
# for 0MATCH-4AJ20-4AJj15
#if not usev8:
- alg = AlgConf.JetNoSortMatch( name = 'AJMatchall', inputs = 'JetTobArray', outputs = 'AJMatchall', algoId = -1 )
+ alg = AlgConf.JetNoSortMatch( name = 'AJMatchall', inputs = 'JetTobArray', outputs = 'AJMatchall' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
alg.addgeneric('JetSize', 2 if HW.DefaultJetSize.value==2 else 1)
@@ -156,7 +156,7 @@ class TopoAlgoDef:
_minet = 15
- alg = AlgConf.JetSelect( name = jet_type+'ab', inputs = 'JetTobArray', outputs = jet_type+'ab', algoId = -1 )
+ alg = AlgConf.JetSelect( name = jet_type+'ab', inputs = 'JetTobArray', outputs = jet_type+'ab' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectJET )
@@ -168,7 +168,7 @@ class TopoAlgoDef:
alg.addgeneric('DoEtaCut', 1)
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetSort( name = 'AJjs', inputs = 'JetTobArray', outputs = 'AJjs', algoId = -1)
+ alg = AlgConf.JetSort( name = 'AJjs', inputs = 'JetTobArray', outputs = 'AJjs')
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -182,7 +182,7 @@ class TopoAlgoDef:
#input list needed for ATR-18824
if usev8:
- alg = AlgConf.JetSort( name = 'FJjs23ETA49', inputs = 'JetTobArray', outputs = 'FJjs23ETA49', algoId = -1)
+ alg = AlgConf.JetSort( name = 'FJjs23ETA49', inputs = 'JetTobArray', outputs = 'FJjs23ETA49')
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -194,7 +194,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetSort( name = 'CJsETA21', inputs = 'JetTobArray', outputs = 'CJsETA21', algoId = -1)
+ alg = AlgConf.JetSort( name = 'CJsETA21', inputs = 'JetTobArray', outputs = 'CJsETA21')
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
@@ -218,7 +218,7 @@ class TopoAlgoDef:
_mineta = 31
_minet = 15
- alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s', algoId = -1 )
+ alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -242,7 +242,7 @@ class TopoAlgoDef:
jetabseta = 26
_minet = 15
- alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s', algoId = -1 )
+ alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s' )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -254,20 +254,20 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.METNoSort( name = 'XENoSort', inputs = 'MetTobArray', outputs = 'XENoSort', algoId = -1 )
+ alg = AlgConf.METNoSort( name = 'XENoSort', inputs = 'MetTobArray', outputs = 'XENoSort' )
alg.addgeneric('InputWidth', HW.InputWidthMET)
alg.addgeneric('OutputWidth', HW.OutputWidthMET)
tm.registerTopoAlgo(alg)
- alg = AlgConf.MetSort( name = 'XE', inputs = 'MetTobArray', outputs = 'XE', algoId = -1 )
+ alg = AlgConf.MetSort( name = 'XE', inputs = 'MetTobArray', outputs = 'XE' )
alg.addgeneric('InputWidth', HW.InputWidthMET)
alg.addgeneric('OutputWidth', HW.OutputWidthMET)
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSelect( name = 'MUab', inputs = 'MuonTobArray', outputs = 'MUab', algoId = -1 )
+ alg = AlgConf.MuonSelect( name = 'MUab', inputs = 'MuonTobArray', outputs = 'MUab' )
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
@@ -278,7 +278,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSort( name = 'MUs', inputs = 'MuonTobArray', outputs = 'MUs', algoId = -1 )
+ alg = AlgConf.MuonSort( name = 'MUs', inputs = 'MuonTobArray', outputs = 'MUs' )
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
@@ -289,7 +289,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSelect( name = 'CMUab', inputs = 'MuonTobArray', outputs = 'CMUab', algoId = -1 )
+ alg = AlgConf.MuonSelect( name = 'CMUab', inputs = 'MuonTobArray', outputs = 'CMUab' )
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
@@ -300,7 +300,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSort_1BC( name = 'LMUs', inputs = 'LateMuonTobArray', outputs = 'LMUs', algoId = -1 )
+ alg = AlgConf.MuonSort_1BC( name = 'LMUs', inputs = 'LateMuonTobArray', outputs = 'LMUs' )
alg.addgeneric('InputWidth', HW.InputWidthMU)
#alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
@@ -312,7 +312,7 @@ class TopoAlgoDef:
# Abbreviated lists:
- alg = AlgConf.ClusterSelect( name = 'EMab', inputs = 'ClusterTobArray', outputs = 'EMab', algoId = -1 )
+ alg = AlgConf.ClusterSelect( name = 'EMab', inputs = 'ClusterTobArray', outputs = 'EMab' )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
@@ -327,14 +327,14 @@ class TopoAlgoDef:
# All lists:
- alg = AlgConf.ClusterNoSort( name = 'TAUall', inputs = 'ClusterTobArray', outputs = 'TAUall', algoId = -1)
+ alg = AlgConf.ClusterNoSort( name = 'TAUall', inputs = 'ClusterTobArray', outputs = 'TAUall')
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('OutputWidth', HW.InputWidthTAU)
alg.addvariable('IsoMask', 0)
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonNoSort( name = 'MUall', inputs = 'MuonTobArray', outputs = 'MUall', algoId = -1)
+ alg = AlgConf.MuonNoSort( name = 'MUall', inputs = 'MuonTobArray', outputs = 'MUall')
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('OutputWidth', HW.InputWidthMU)
tm.registerTopoAlgo(alg)
@@ -370,7 +370,7 @@ class TopoAlgoDef:
d.otype, str(d.ocut2) , d.olist, str(d.nleading2) if d.olist=="s" else "")
toponames.append(toponame)
- alg = AlgConf.InvariantMassInclusive1( name = d.algoname, inputs = inputList, outputs = toponames, algoId = -1)
+ alg = AlgConf.InvariantMassInclusive1( name = d.algoname, inputs = inputList, outputs = toponames)
alg.addgeneric('InputWidth', d.inputwidth1)
alg.addgeneric('MaxTob', d.nleading1)
@@ -418,7 +418,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.InvariantMassInclusive1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.InvariantMassInclusive2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
@@ -470,7 +470,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.DeltaRSqrIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
@@ -515,7 +515,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist1, d.otype2 + d.olist2]
algoname = AlgConf.DeltaEtaPhiIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaEtaPhiIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
alg.addgeneric('NumResultBits', 1)
@@ -565,7 +565,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1] if d.otype1==d.otype2 else [d.otype1 + d.olist1, d.otype2 + d.olist2]
algoname = AlgConf.DeltaRSqrIncl1 if d.otype1==d.otype2 else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
if d.otype1==d.otype2:
@@ -620,7 +620,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.JetHT( name = toponame, inputs = inputList, outputs = [toponame], algoId = -1 )
+ alg = AlgConf.JetHT( name = toponame, inputs = inputList, outputs = [toponame] )
alg.addgeneric('InputWidth', d.inputwidth)
@@ -654,7 +654,7 @@ class TopoAlgoDef:
toponame = "%iINVM%i-%s%s%s%s-EMs6" % (d.minInvm, d.maxInvm, d.otype, str(ocut) if ocut > 0 else "", d.olist, str(d.nleading) if d.olist=="s" else "")
toponames.append(toponame)
- alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = [inputList, 'EMs'], outputs = toponames, algoId = -1)
+ alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = [inputList, 'EMs'], outputs = toponames)
alg.addgeneric('InputWidth1', d.inputwidth)
@@ -700,7 +700,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', d.inputwidth)
@@ -733,7 +733,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.TransverseMassInclusive1( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.TransverseMassInclusive1( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ] )
@@ -747,18 +747,9 @@ class TopoAlgoDef:
# VBF deta
- if usev7:
- algoList = [
- {"minDeta": 63, "maxDeta": 127, "otype" : "FJ", "ocut1" : 20, "olist" : "s", "nleading1" : 1, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20, "nleading2": 2}, #63DETA127-FJ20s1-FJ20s2
- {"minDeta": 0, "maxDeta": 20, "otype" : "J", "ocut1" : 50, "olist" : "s", "nleading1" : 1, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 0, "nleading2": 2}, #0DETA20-J50s1-Js2
- ]
- elif usev8:
- algoList = [
- {"minDeta": 0, "maxDeta": 20, "otype" : "J", "ocut1" : 50, "olist" : "s", "nleading1" : 1, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 0, "nleading2": 2}, #0DETA20-J50s1-Js2
- ]
- else:
- algoList = []
-
+ algoList = [
+ {"minDeta": 0, "maxDeta": 20, "otype" : "J", "ocut1" : 50, "olist" : "s", "nleading1" : 1, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 0, "nleading2": 2}, #0DETA20-J50s1-Js2
+ ]
for x in algoList:
class d:
pass
@@ -772,7 +763,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = d.otype + d.olist
- alg = AlgConf.DeltaEtaIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
+ alg = AlgConf.DeltaEtaIncl1( name = toponame, inputs = inputList, outputs = toponame )
@@ -813,7 +804,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', d.inputwidth)
alg.addgeneric('InputWidth2', 1)
@@ -835,7 +826,10 @@ class TopoAlgoDef:
{"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 4, "olist1" : "ab", "otype2" : "CJ", "ocut2": 20, "olist2" : "ab"}, #0DR04-MU6ab-CJ20ab
]
if usev8:
- algoList = []
+ algoList = [
+ {"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 4, "olist1" : "ab", "otype2" : "CJ", "ocut2": 15, "olist2" : "ab"}, #0DR04-MU4ab-CJ15ab
+ {"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 6, "olist1" : "ab", "otype2" : "CJ", "ocut2": 20, "olist2" : "ab"}, #0DR04-MU6ab-CJ20ab
+ ]
for x in algoList:
@@ -849,7 +843,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ])
alg.addgeneric('InputWidth1', HW.OutputWidthSelectMU)
alg.addgeneric('InputWidth2', HW.OutputWidthSelectJET)
@@ -861,26 +855,46 @@ class TopoAlgoDef:
alg.addvariable('DeltaRMin', d.minDr*d.minDr, 0)
alg.addvariable('DeltaRMax', d.maxDr*d.maxDr, 0)
tm.registerTopoAlgo(alg)
-
+
+
+ # MULT-BIT
+ for x in [
+ {"otype1" : "CMU" ,"ocut1": 4, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "inputwidth1": HW.OutputWidthSelectMU}, #MULT-CMU4ab
+ {"otype1" : "CMU" ,"ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "inputwidth1": HW.OutputWidthSelectMU}, #MULT-CMU6ab
+ ]:
+ class d:
+ pass
+ for k in x:
+ setattr (d, k, x[k])
+ toponame = "MULT-%s%s%s" % (d.otype1, str(d.ocut1), d.olist1) # noqa: F821
+ toponames = [toponame+"[0]", toponame+"[1]"]
+ log.debug("Define %s with outputs %r", toponame, toponames)
+ inputList = [d.otype1 + d.olist1] # noqa: F821
+ alg = AlgConf.Multiplicity( name = toponame, inputs = inputList, outputs = toponames)
+ alg.addgeneric('InputWidth', d.inputwidth1) # noqa: F821
+ alg.addgeneric('NumResultBits', 2)
+ alg.addvariable('MinET', d.ocut1-1) # for MU threshold -1 # noqa: F821
+ tm.registerTopoAlgo(alg)
+
+
# dimu INVM items
+ toponame = "8INVM15-2CMU4ab"
+ log.debug("Define %s", toponame)
+ inputList = ['CMUab']
+ alg = AlgConf.InvariantMassInclusive1( name = toponame, inputs = inputList, outputs = toponame )
+ alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
+ alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
+ alg.addgeneric('NumResultBits', 1)
+ alg.addvariable('MinMSqr', 8*8)
+ alg.addvariable('MaxMSqr', 15*15)
+ alg.addvariable('MinET1', 4)
+ alg.addvariable('MinET2', 4)
+ tm.registerTopoAlgo(alg)
+
if not usev8:
algolist=[
- # {"minInvm": 2, "maxInvm": 999, "mult": 2, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" :"", "ocut2" : 0, "onebarrel": 0},
- # {"minInvm": 2, "maxInvm": 999, "mult": 1, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" :"MU", "ocut2" : 4, "onebarrel": 0},
- # {"minInvm": 2, "maxInvm": 999, "mult": 1, "otype1" : "MU", "ocut1": 6, "olist" : "ab", "otype2" :"MU", "ocut2" : 4, "onebarrel": 1},
- # {"minInvm": 2, "maxInvm": 999, "mult": 1, "otype1" : "CMU","ocut1": 6, "olist" : "ab", "otype2" :"CMU","ocut2" : 4, "onebarrel": 0},
-
-
- # {"minInvm": 4, "maxInvm": 8, "mult": 2, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" : "", "ocut2" : 0, "onebarrel": 0},
- # {"minInvm": 4, "maxInvm": 8, "mult": 1, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" : "MU","ocut2" : 4, "onebarrel": 0},
- # {"minInvm": 4, "maxInvm": 8, "mult": 1, "otype1" : "MU", "ocut1": 6, "olist" : "ab", "otype2" : "MU","ocut2" : 4, "onebarrel": 1},
- # {"minInvm": 4, "maxInvm": 8, "mult": 1, "otype1" : "CMU","ocut1": 6, "olist" : "ab", "otype2" : "CMU","ocut2": 4, "onebarrel": 0},
- #SX
- #{"minInvm": 1, "maxInvm": 19, "mult": 1, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" :"MU", "ocut2" : 4, "onebarrel": 0}, #1INVM19-CMU4ab-MU4ab
{"minInvm": 2, "maxInvm": 8, "mult": 1, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" :"MU", "ocut2" : 4, "onebarrel": 0}, #2INVM8-CMU4ab-MU4ab
- #{"minInvm": 1, "maxInvm": 19, "mult": 2, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" :"", "ocut2" : 0, "onebarrel": 0}, #1INVM19-2CMU4ab
- #{"minInvm": 2, "maxInvm": 8, "mult": 2, "otype1" : "CMU","ocut1": 4, "olist" : "ab", "otype2" :"", "ocut2" : 0, "onebarrel": 0}, #2INVM8-2CMU4ab
{"minInvm": 2, "maxInvm": 8, "mult": 1, "otype1" : "MU", "ocut1": 6, "olist" : "ab", "otype2" : "MU","ocut2" : 4, "onebarrel": 1}, #2INVM8-ONEBARREL-MU6ab-MU4ab
]
if usev8:
@@ -902,7 +916,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.InvariantMassInclusive1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.InvariantMassInclusive2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
@@ -948,7 +962,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.DeltaRSqrIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
@@ -968,11 +982,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
# deta-dphi with ab+ab
- if usev7:
- algoList = [
- {"minDeta": 0, "maxDeta": 20, "minDphi": 0, "maxDphi": 20, "mult": 1, "otype1" : "TAU", "ocut1": 20, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU},
- ]
- elif usev8:
+ if usev8:
algoList = []
# {"minDeta": 0, "maxDeta": "04", "minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "EM", "ocut1": 8, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 10, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU},
# {"minDeta": 0, "maxDeta": "04", "minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "EM", "ocut1": 15, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 0, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU},
@@ -999,7 +1009,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist1, d.otype2 + d.olist2]
algoname = AlgConf.DeltaEtaPhiIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaEtaPhiIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
alg.addgeneric('NumResultBits', 1)
if (d.mult>1 or d.otype1==d.otype2):
@@ -1047,7 +1057,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DeltaEtaIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = AlgConf.DeltaEtaIncl2( name = toponame, inputs = inputList, outputs = [ toponame ])
alg.addgeneric('NumResultBits', 1)
alg.addgeneric('InputWidth1', d.nleading1)
@@ -1081,7 +1091,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DeltaPhiIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = AlgConf.DeltaPhiIncl2( name = toponame, inputs = inputList, outputs = [ toponame ])
alg.addgeneric('NumResultBits', 1)
alg.addgeneric('InputWidth1', d.nleading1)
@@ -1098,7 +1108,7 @@ class TopoAlgoDef:
# JetMatch
if not usev8:
toponame = "0MATCH-4AJ20pETA31-4AJj15pETA31"
- alg = AlgConf.MultiplicityCustom( name = toponame, inputs = [ 'AJMatchall' ], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.MultiplicityCustom( name = toponame, inputs = [ 'AJMatchall' ], outputs = [ toponame ] )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('NumResultBits', 1)
alg.addvariable('MinET', 0)
@@ -1110,7 +1120,7 @@ class TopoAlgoDef:
# NoMatch for W T&P
if not usev8:
toponame = "NOT-02MATCH-EM10s1-AJj15allpETA49"
- alg = AlgConf.NotMatch( name = toponame, inputs = [ 'EMs', 'AJjall'], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.NotMatch( name = toponame, inputs = [ 'EMs', 'AJjall'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
alg.addgeneric('InputWidth2', HW.InputWidthJET)
alg.addgeneric('MaxTob1', 1)
@@ -1127,7 +1137,7 @@ class TopoAlgoDef:
# RATIO SUM for W T&P
#toponame = "05RATIO-XE0-SUM0-EM10s1-HT0-AJj15allpETA49"
- #alg = AlgConf.RatioSum( name = toponame, inputs = ['XE', 'AJjall', 'EMs'], outputs = [ toponame ], algoId = -1 );
+ #alg = AlgConf.RatioSum( name = toponame, inputs = ['XE', 'AJjall', 'EMs'], outputs = [ toponame ] );
#alg.addgeneric('InputWidth1', 1)
#alg.addgeneric('InputWidth2', HW.InputWidthJET)
#alg.addgeneric('InputWidth3', HW.OutputWidthSortEM)
@@ -1168,7 +1178,7 @@ class TopoAlgoDef:
toponame = "%02d%s-XE0-HT0-AJj%sallpETA49" % (d.minRatio, d.Ratio, str(d.ocut))
log.debug("Define %s", toponame)
- alg = AlgConf.Ratio( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.Ratio( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', 1)
alg.addgeneric('InputWidth2', HW.InputWidthJET)
alg.addgeneric('MaxTob1', 1)
@@ -1185,7 +1195,7 @@ class TopoAlgoDef:
# RATIO MATCH dedicated to Exotic
toponame = '100RATIO-0MATCH-TAU30si2-EMall'
- alg = AlgConf.RatioMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.RatioMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
alg.addgeneric('InputWidth2', HW.InputWidthEM)
alg.addgeneric('MaxTob1', 2)
@@ -1198,7 +1208,7 @@ class TopoAlgoDef:
# NOT MATCH dedicated to Exotic
toponame = 'NOT-0MATCH-TAU30si1-EMall'
- alg = AlgConf.NotMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = -1 )
+ alg = AlgConf.NotMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ] )
alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
alg.addgeneric('InputWidth2', HW.InputWidthEM)
alg.addgeneric('MaxTob1', 1)
@@ -1213,27 +1223,24 @@ class TopoAlgoDef:
alg.addvariable('DRCut', 0)
tm.registerTopoAlgo(alg)
- # DISAMB 2 lists
- for x in [
- {"disamb": 1, "otype1" : "TAU", "ocut1": 12, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU, "otype2" : "J", "ocut2": 25, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET}, #1DISAMB-TAU12abi-J25ab
- #{"disamb": 0, "otype1" : "EM", "ocut1": 15, "olist1" : "abhi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "TAU", "ocut2": 40, "olist2": "ab", "nleading2": HW.OutputWidthSelectTAU},
- #{"disamb": 1, "otype1" : "TAU", "ocut1": 20, "olist1" : "ab", "nleading1": HW.OutputWidthSelectTAU, "otype2" : "J", "ocut2": 20, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET},
- #{"disamb": 0, "otype1" : "EM", "ocut1": 15, "olist1" : "abhi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU},
- ]:
-
+ # DISAMB 1 and 2 lists
+ algolist=[
+ { "disamb": 1, "otype1" : "TAU", "ocut1": 12, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU,
+ "otype2" : "J", "ocut2": 25, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET}, #1DISAMB-TAU12abi-J25ab
+ { "disamb": 2, "otype1" : "TAU", "ocut1": 12, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU,
+ "otype2" : "J", "ocut2": 25, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET}, #2DISAMB-TAU12abi-J25ab
+ ]
+ for x in algolist:
class d:
pass
for k in x:
setattr (d, k, x[k])
-
obj1 = "%s%s%s" % (d.otype1, str(d.ocut1), d.olist1)
obj2 = "-%s%s%s" % (d.otype2, str(d.ocut2), d.olist2)
- toponame = "%sDISAMB-%s%s" % ( d.disamb if d.disamb>0 else "", obj1, obj2)
-
+ toponame = "%sDISAMB-%s%s" % ( d.disamb if d.disamb>0 else "", obj1, obj2)
log.debug("Define %s", toponame)
-
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DisambiguationIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
+ alg = AlgConf.DisambiguationIncl2( name = toponame, inputs = inputList, outputs = [ toponame ])
alg.addgeneric('InputWidth1', d.nleading1 if d.olist1.find("ab")>=0 else -1000)
alg.addgeneric('InputWidth2', d.nleading2 if d.olist2.find("ab")>